diff --git a/src/box/box.cc b/src/box/box.cc index ae4959d6f4ba13a11d596cc0abe93bf0cd58af53..ee12d5738ff600d35edc599d3af896c3183f2cca 100644 --- a/src/box/box.cc +++ b/src/box/box.cc @@ -1703,7 +1703,8 @@ bootstrap_from_master(struct replica *master) applier_resume_to_state(applier, APPLIER_READY, TIMEOUT_INFINITY); assert(applier->state == APPLIER_READY); - say_info("bootstrapping replica from %s", + say_info("bootstrapping replica from %s at %s", + tt_uuid_str(&master->uuid), sio_strfaddr(&applier->addr, applier->addr_len)); /* diff --git a/src/box/replication.cc b/src/box/replication.cc index 48956d2ed6c4be633c943ba55817b8f868cefa85..26bbbe32a860599a854ddc684bd54844378bfd33 100644 --- a/src/box/replication.cc +++ b/src/box/replication.cc @@ -659,14 +659,15 @@ replicaset_needs_rejoin(struct replica **master) return false; } + const char *uuid_str = tt_uuid_str(&replica->uuid); const char *addr_str = sio_strfaddr(&applier->addr, applier->addr_len); char *local_vclock_str = vclock_to_string(&replicaset.vclock); char *remote_vclock_str = vclock_to_string(&ballot->vclock); char *gc_vclock_str = vclock_to_string(&ballot->gc_vclock); - say_info("can't follow %s: required %s available %s", - addr_str, local_vclock_str, gc_vclock_str); + say_info("can't follow %s at %s: required %s available %s", + uuid_str, addr_str, local_vclock_str, gc_vclock_str); if (vclock_compare(&replicaset.vclock, &ballot->vclock) > 0) { /* @@ -674,9 +675,10 @@ replicaset_needs_rejoin(struct replica **master) * the master. Don't rebootstrap as we don't want * to lose any data. */ - say_info("can't rebootstrap from %s: " + say_info("can't rebootstrap from %s at %s: " "replica has local rows: local %s remote %s", - addr_str, local_vclock_str, remote_vclock_str); + uuid_str, addr_str, local_vclock_str, + remote_vclock_str); goto next; }