diff options
| author | Avra Sengupta <asengupt@redhat.com> | 2016-02-10 15:02:48 +0530 |
|---|---|---|
| committer | Rajesh Joseph <rjoseph@redhat.com> | 2016-02-24 05:53:07 -0800 |
| commit | 4777f12ba5a930016faa6ef9114d8ffc8304c77b (patch) | |
| tree | 631346f2a83879ca7b54864634f945078be4f7d0 /xlators/mgmt/glusterd/src | |
| parent | 7a3644f367f1dae5caa098e28f3ee79a19720c1a (diff) | |
glusterd/snapshot : Remove stale pmap registry entry
Backport of http://review.gluster.org/#/c/13420/
Perform a pmap_registry_remove on a stale registry
entry from the previous run of snapd, which makes the
query callback always return the older port number.
Change-Id: I7fc504d2b09d32a9c945ec2c33e0e092a0d186ec
BUG: 1309233
Signed-off-by: Avra Sengupta <asengupt@redhat.com>
Reviewed-on: http://review.gluster.org/13420
Smoke: Gluster Build System <jenkins@build.gluster.com>
NetBSD-regression: NetBSD Build System <jenkins@build.gluster.org>
CentOS-regression: Gluster Build System <jenkins@build.gluster.com>
Reviewed-by: Rajesh Joseph <rjoseph@redhat.com>
(cherry picked from commit bfe689d25ecde567a90135b47f31b89d7714aaf4)
Reviewed-on: http://review.gluster.org/13457
Diffstat (limited to 'xlators/mgmt/glusterd/src')
| -rw-r--r-- | xlators/mgmt/glusterd/src/glusterd-snapd-svc.c | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/xlators/mgmt/glusterd/src/glusterd-snapd-svc.c b/xlators/mgmt/glusterd/src/glusterd-snapd-svc.c index 2df94eb92bb..993419c8926 100644 --- a/xlators/mgmt/glusterd/src/glusterd-snapd-svc.c +++ b/xlators/mgmt/glusterd/src/glusterd-snapd-svc.c @@ -294,6 +294,17 @@ glusterd_snapdsvc_start (glusterd_svc_t *svc, int flags) "--brick-name", snapd_id, "-S", svc->conn.sockpath, NULL); + /* Do a pmap registry remove on the older connected port */ + if (volinfo->snapd.port) { + ret = pmap_registry_remove (this, volinfo->snapd.port, + snapd_id, GF_PMAP_PORT_BRICKSERVER, + NULL); + if (ret) { + snprintf (msg, sizeof (msg), "Failed to remove pmap " + "registry for older signin"); + goto out; + } + } snapd_port = pmap_registry_alloc (THIS); if (!snapd_port) { |