From c02661a69dfc0c6949666f972129e2983a52cb1f Mon Sep 17 00:00:00 2001 From: Vijay Bellur Date: Thu, 2 Sep 2010 08:05:36 +0000 Subject: mgmt/glusterd: retrieve version upon restart Signed-off-by: Vijay Bellur Signed-off-by: Vijay Bellur BUG: 1265 () URL: http://bugs.gluster.com/cgi-bin/bugzilla3/show_bug.cgi?id=1265 --- xlators/mgmt/glusterd/src/glusterd-store.c | 3 +++ xlators/mgmt/glusterd/src/glusterd-utils.c | 3 +++ 2 files changed, 6 insertions(+) diff --git a/xlators/mgmt/glusterd/src/glusterd-store.c b/xlators/mgmt/glusterd/src/glusterd-store.c index 1e464eae961..3072fc92110 100644 --- a/xlators/mgmt/glusterd/src/glusterd-store.c +++ b/xlators/mgmt/glusterd/src/glusterd-store.c @@ -940,6 +940,9 @@ glusterd_store_retrieve_volume (char *volname) } else if (!strncmp (key, GLUSTERD_STORE_KEY_VOL_STATUS, strlen (GLUSTERD_STORE_KEY_VOL_STATUS))) { volinfo->status = atoi (value); + } else if (!strncmp (key, GLUSTERD_STORE_KEY_VOL_VERSION, + strlen (GLUSTERD_STORE_KEY_VOL_VERSION))) { + volinfo->version = atoi (value); } else if (!strncmp (key, GLUSTERD_STORE_KEY_VOL_PORT, strlen (GLUSTERD_STORE_KEY_VOL_PORT))) { volinfo->port = atoi (value); diff --git a/xlators/mgmt/glusterd/src/glusterd-utils.c b/xlators/mgmt/glusterd/src/glusterd-utils.c index 4d9834adb33..cfa4a7dc4d7 100644 --- a/xlators/mgmt/glusterd/src/glusterd-utils.c +++ b/xlators/mgmt/glusterd/src/glusterd-utils.c @@ -174,6 +174,9 @@ glusterd_is_local_addr (char *hostname) } ifr++; } + + if (sd > 0) + close (sd); } -- cgit