← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to tests/lib/server_mgmt/drizzled.py

  • Committer: Lee Bieber
  • Date: 2011-02-11 20:30:05 UTC
  • mfrom: (2157.1.3 build)
  • Revision ID: kalebral@gmail.com-20110211203005-757o1y2yf78dxzqr
Merge Stewart - 716848: drizzleimport displays wrong program_name
Merge Stewart - update README file
Merge Andrew and Joe - Exposes the InnoDB SYS_REPLICATION_LOG to data_dictionary so that it is fast and fixes many issues we have been having

Show diffs side-by-side

added added

removed removed

Lines of Context:
tests/lib/server_mgmt/drizzled.py
40
40
 
41
41
    """
42
42
 
43
 
    def __init__( self
44
 
                , name
45
 
                , server_manager
46
 
                , default_storage_engine
47
 
                , server_options
48
 
                , requester
49
 
                , workdir_root):
 
43
    def __init__(self, name, server_manager, server_options
 
44
                , requester, workdir_root):
50
45
        self.skip_keys = [ 'server_manager'
51
46
                         , 'system_manager'
52
47
                         , 'dirset'
60
55
        self.initial_run = 1
61
56
        self.owner = requester
62
57
        self.server_options = server_options
63
 
        self.default_storage_engine = default_storage_engine
64
58
        self.server_manager = server_manager
65
59
        # We register with server_manager asap
66
60
        self.server_manager.log_server(self, requester)
67
61
 
68
62
        self.system_manager = self.server_manager.system_manager
69
63
        self.valgrind = self.system_manager.valgrind
70
 
        self.gdb = self.system_manager.gdb
71
64
        if self.valgrind:
72
65
            self.valgrind_time_buffer = 10
73
66
        else:
164
157
            as desired / intended
165
158
 
166
159
        """
167
 
 
168
 
        server_args = [ self.process_server_options()
169
 
                      , "--mysql-protocol.port=%d" %(self.master_port)
170
 
                      , "--mysql-protocol.connect-timeout=60"
171
 
                      , "--innodb.data-file-path=ibdata1:20M:autoextend"
172
 
                      , "--sort-buffer-size=256K"
173
 
                      , "--max-heap-table-size=1M"
174
 
                      , "--mysql-unix-socket-protocol.path=%s" %(self.socket_file)
175
 
                      , "--pid-file=%s" %(self.pid_file)
176
 
                      , "--drizzle-protocol.port=%d" %(self.drizzle_tcp_port)
177
 
                      , "--default-storage-engine=%s" %(self.default_storage_engine)
178
 
                      , "--datadir=%s" %(self.datadir)
179
 
                      , "--tmpdir=%s" %(self.tmpdir)
180
 
                      , self.secure_file_string
181
 
                      , self.user_string
182
 
                      ]
183
 
 
184
 
        if self.gdb:
185
 
            server_args.append('--gdb')
186
 
            return self.system_manager.handle_gdb_reqs(self, server_args)
187
 
        else:
188
 
            return "%s %s %s & " % ( self.cmd_prefix
189
 
                                   , self.server_path
190
 
                                   , " ".join(server_args)
191
 
                                   )
192
 
 
 
160
      
 
161
        return "%s %s %s --mysql-protocol.port=%d --mysql-protocol.connect-timeout=60 --mysql-unix-socket-protocol.path=%s --pid-file=%s --drizzle-protocol.port=%d --datadir=%s --tmpdir=%s --innodb.data-file-path=ibdata1:20M:autoextend --sort-buffer-size=256K --max-heap-table-size=1M %s %s > %s 2>&1 & " % ( self.cmd_prefix
 
162
                                               , self.server_path
 
163
                                               , self.process_server_options()
 
164
                                               , self.master_port
 
165
                                               , self.socket_file
 
166
                                               , self.pid_file
 
167
                                               , self.drizzle_tcp_port
 
168
                                               , self.datadir
 
169
                                               , self.tmpdir
 
170
                                               , self.secure_file_string
 
171
                                               , self.user_string 
 
172
                                               , self.error_log
 
173
                                               )
193
174
 
194
175
    def get_stop_cmd(self):
195
176
        """ Return the command that will shut us down """