diff options
| author | Jeff Darcy <jdarcy@redhat.com> | 2013-12-11 16:26:25 -0500 |
|---|---|---|
| committer | Jeff Darcy <jdarcy@redhat.com> | 2013-12-11 16:26:25 -0500 |
| commit | ef171ff2bfd114e46442441fbdeb692a416cc951 (patch) | |
| tree | 27ac663045954c8efb145fbbae3df87d7bbfe5b3 /xlators/mgmt/glusterd/src/glusterd-handler.c | |
| parent | 4bbbda2017be3cfae57c122d70d11c9470364f63 (diff) | |
Roll-up patch for NSR so far.
Previous history:
https://forge.gluster.org/~jdarcy/glusterfs-core/glusterfs-nsr
Change-Id: I2b56328788753c6a74d9589815f2dd705ac9ce6a
Signed-off-by: Jeff Darcy <jdarcy@redhat.com>
Diffstat (limited to 'xlators/mgmt/glusterd/src/glusterd-handler.c')
| -rw-r--r-- | xlators/mgmt/glusterd/src/glusterd-handler.c | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/xlators/mgmt/glusterd/src/glusterd-handler.c b/xlators/mgmt/glusterd/src/glusterd-handler.c index 3aafa122b..c7bf53b4e 100644 --- a/xlators/mgmt/glusterd/src/glusterd-handler.c +++ b/xlators/mgmt/glusterd/src/glusterd-handler.c @@ -49,6 +49,7 @@ #include "globals.h" #include "glusterd-syncop.h" +#include "glusterd-etcd.h" #ifdef HAVE_BD_XLATOR #include <lvm2app.h> @@ -2380,7 +2381,18 @@ __glusterd_handle_probe_query (rpcsvc_request_t *req) gf_log ("", GF_LOG_ERROR, "Failed to add peer %s", remote_hostname); rsp.op_errno = GF_PROBE_ADD_FAILED; + goto respond; } + gf_log (THIS->name, GF_LOG_INFO, + "joining, should point etcd at %s", remote_hostname); + /* + * We should have started a standalone etcd before. Now we + * need a new one, with a new config. + */ + stop_etcd(conf->etcd_pid); + nuke_etcd_dir(); + conf->etcd_pid = start_etcd (uuid_utoa(MY_UUID), + remote_hostname); } respond: |