gfapi: unglobalize oldvol{file,len}

Multiple initialization of volumes works fine now.

Change-Id: Ibc16957b39325817bc6f9ab90ebac9cefdafabf8
BUG: 839950
Signed-off-by: Anand Avati <avati@redhat.com>
Reviewed-on: http://review.gluster.com/3734
Tested-by: Gluster Build System <jenkins@build.gluster.com>
Reviewed-by: Amar Tumballi <amarts@redhat.com>

3 files changed, 35 insertions, 12 deletions

diff --git a/api/src/glfs-internal.h b/api/src/glfs-internal.h
index 967be475cce..0d67b6e249d 100644
--- a/api/src/glfs-internal.h
+++ b/api/src/glfs-internal.h
@@ -32,6 +32,9 @@ struct glfs {
 	int                 ret;
 
 	xlator_t           *active_subvol;
+
+	char               *oldvolfile;
+	ssize_t             oldvollen;
 };
 
 struct glfs_fd {
diff --git a/api/src/glfs-mem-types.h b/api/src/glfs-mem-types.h
index dc5da30557a..e2e9b4c1ed7 100644
--- a/api/src/glfs-mem-types.h
+++ b/api/src/glfs-mem-types.h
@@ -21,6 +21,7 @@ enum glfs_mem_types_ {
         glfs_mt_xlator_t,
 	glfs_mt_glfs_fd_t,
 	glfs_mt_glfs_io_t,
+	glfs_mt_volfile_t,
         glfs_mt_end
 
 };
diff --git a/api/src/glfs-mgmt.c b/api/src/glfs-mgmt.c
index 526d1ae4d7d..8283bd3fe57 100644
--- a/api/src/glfs-mgmt.c
+++ b/api/src/glfs-mgmt.c
@@ -37,6 +37,7 @@
 #include "xlator.h"
 
 #include "glfs-internal.h"
+#include "glfs-mem-types.h"
 
 
 int glfs_volfile_fetch (struct glfs *fs);
@@ -201,10 +202,6 @@ out:
 }
 
 
-/* XXX: move these into @ctx */
-static char oldvolfile[131072];
-static int oldvollen = 0;
-
 static int
 xlator_equal_rec (xlator_t *xl1, xlator_t *xl2)
 {
@@ -294,11 +291,11 @@ glusterfs_volfile_reconfigure (struct glfs *fs, FILE *newvolfile_fp)
 	if (!oldvolfile_fp)
 		goto out;
 
-	if (!oldvollen) {
+	if (!fs->oldvollen) {
 		ret = 1; // Has to call INIT for the whole graph
 		goto out;
 	}
-	fwrite (oldvolfile, oldvollen, 1, oldvolfile_fp);
+	fwrite (fs->oldvolfile, fs->oldvollen, 1, oldvolfile_fp);
 	fflush (oldvolfile_fp);
 	if (ferror (oldvolfile_fp)) {
 		goto out;
@@ -361,6 +358,30 @@ out:
 }
 
 
+static int
+glusterfs_oldvolfile_update (struct glfs *fs, char *volfile, ssize_t size)
+{
+	int ret = -1;
+
+	fs->oldvollen = size;
+	if (!fs->oldvolfile) {
+		fs->oldvolfile = GF_CALLOC (1, size+1, glfs_mt_volfile_t);
+	} else {
+		fs->oldvolfile = GF_REALLOC (fs->oldvolfile, size+1);
+	}
+
+	if (!fs->oldvolfile) {
+		fs->oldvollen = 0;
+	} else {
+		memcpy (fs->oldvolfile, volfile, size);
+		fs->oldvollen = size;
+		ret = 0;
+	}
+
+	return ret;
+}
+
+
 int
 mgmt_getspec_cbk (struct rpc_req *req, struct iovec *iov, int count,
 		  void *myframe)
@@ -399,7 +420,8 @@ mgmt_getspec_cbk (struct rpc_req *req, struct iovec *iov, int count,
 	ret = 0;
 	size = rsp.op_ret;
 
-	if (size == oldvollen && (memcmp (oldvolfile, rsp.spec, size) == 0)) {
+	if ((size == fs->oldvollen) &&
+	    (memcmp (fs->oldvolfile, rsp.spec, size) == 0)) {
 		gf_log (frame->this->name, GF_LOG_INFO,
 			"No change in volfile, continuing");
 		goto out;
@@ -430,8 +452,7 @@ mgmt_getspec_cbk (struct rpc_req *req, struct iovec *iov, int count,
 	if (ret == 0) {
 		gf_log ("glusterfsd-mgmt", GF_LOG_DEBUG,
 			"No need to re-load volfile, reconfigure done");
-		oldvollen = size;
-		memcpy (oldvolfile, rsp.spec, size);
+		ret = glusterfs_oldvolfile_update (fs, rsp.spec, size);
 		goto out;
 	}
 
@@ -447,9 +468,7 @@ mgmt_getspec_cbk (struct rpc_req *req, struct iovec *iov, int count,
 	if (ret)
 		goto out;
 
-	oldvollen = size;
-	memcpy (oldvolfile, rsp.spec, size);
-
+	ret = glusterfs_oldvolfile_update (fs, rsp.spec, size);
 out:
 	STACK_DESTROY (frame->root);