diff --git a/src/box/box.cc b/src/box/box.cc index 6e01eb8402a6229b704719b656d540308f2892a5..ee934b615ead588150315b63d3550bb1341489b1 100644 --- a/src/box/box.cc +++ b/src/box/box.cc @@ -233,8 +233,8 @@ box_leave_local_standby_mode(void *data __attribute__((unused))) if (recovery_has_remote(recovery_state)) recovery_follow_remote(recovery_state); - title("primary", NULL); - say_info("I am primary"); + title("running", NULL); + say_info("ready to accept requests"); } /** diff --git a/src/box/replica.cc b/src/box/replica.cc index b4699a317c302613829eae3543d94502bb2fd812..bb9a9975876aa862eaa310bf33807b0363297407 100644 --- a/src/box/replica.cc +++ b/src/box/replica.cc @@ -189,7 +189,9 @@ replica_bootstrap(struct recovery_state *r) static void remote_set_status(struct remote *remote, const char *status) { - title("replica", "%s/%s", uri_to_string(&remote->uri), status); + (void) remote; + (void) status; + /* title("replica", "%s/%s", uri_to_string(&remote->uri), status); */ } static void diff --git a/test/box/info.result b/test/box/info.result index 42cbbf4313b44108afb4d53f24fdfb96bf0bb585..a015c6c0f638c5af5ddbc55d840af997b622b31f 100644 --- a/test/box/info.result +++ b/test/box/info.result @@ -38,7 +38,7 @@ box.info.recovery_last_update ... box.info.status --- -- primary +- running ... string.len(box.info.build.target) > 0 --- diff --git a/test/lib/tarantool_server.py b/test/lib/tarantool_server.py index 605140d79026367c249f1c9f92e50c77db9b7dd0..332d37cbfd996000cb9c4c950c361d366d5ffe17 100644 --- a/test/lib/tarantool_server.py +++ b/test/lib/tarantool_server.py @@ -525,7 +525,7 @@ class TarantoolServer(Server): try: temp = AdminConnection('localhost', self.admin.port) ans = yaml.load(temp.execute('box.info.status'))[0] - if ans in ('primary', 'hot_standby', 'orphan') or ans.startswith('replica'): + if ans in ('running', 'hot_standby', 'orphan'): return True else: raise Exception("Strange output for `box.info.status`: %s" % (ans)) diff --git a/test/replication/suite.ini b/test/replication/suite.ini index ab9af45495f3cdfe00ddc9f0dd7055b2afa2e9b1..c0a179cce971a84ef394aa6bb06c3a4b3403a547 100644 --- a/test/replication/suite.ini +++ b/test/replication/suite.ini @@ -2,4 +2,4 @@ core = tarantool script = master.lua description = tarantool/box, replication -disabled = consistent.test.lua +disabled = consistent.test.lua status.test.py diff --git a/test/replication/swap.test.py b/test/replication/swap.test.py index 451bf93a2c2cf0ff2b22d5441e5315bb3ab1f65e..9ab52906849697806133fde44f6633a9a9284ccc 100644 --- a/test/replication/swap.test.py +++ b/test/replication/swap.test.py @@ -39,12 +39,12 @@ replica.sql.py_con.authenticate(LOGIN, PASSWORD) master.admin("s = box.schema.create_space('tweedledum', {id = 0})") master.admin("s:create_index('primary', {type = 'hash'})") -## gh-343: replica.cc must not add login and password to proc title -status = replica.get_param("status") -host_port = "%s:%s" % (HOST, master.sql.port) -m = re.search(r'replica/(.*)/.*', status) -if not m or m.group(1) != host_port: - print 'invalid box.info.status', status, 'expected host:port', host_port +### gh-343: replica.cc must not add login and password to proc title +#status = replica.get_param("status") +#host_port = "%s:%s" % (HOST, master.sql.port) +#m = re.search(r'replica/(.*)/.*', status) +#if not m or m.group(1) != host_port: +# print 'invalid box.info.status', status, 'expected host:port', host_port master_id = master.get_param('node')['id'] replica_id = replica.get_param('node')['id']