summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKrutika Dhananjay <kdhananj@redhat.com>2012-12-18 16:36:16 +0530
committerAnand Avati <avati@redhat.com>2012-12-18 14:18:31 -0800
commit116c1ce428238b56d48f80f78aea8e6b303bd89c (patch)
tree4dffb3960bd53a1e9d5be48d83c65a968c838f4f
parent00cdd4134a44098f39cf9caea2177573c985a4af (diff)
glusterd: Fix initialisation of this
Change-Id: I77f9b153d23ca5de1cb098cde5951e56f04d3a1c BUG: 873549 Signed-off-by: Krutika Dhananjay <kdhananj@redhat.com> Reviewed-on: http://review.gluster.org/4324 Reviewed-by: Amar Tumballi <amarts@redhat.com> Tested-by: Gluster Build System <jenkins@build.gluster.com> Reviewed-by: Anand Avati <avati@redhat.com>
-rw-r--r--tests/bugs/bug-873549.t17
-rw-r--r--xlators/mgmt/glusterd/src/glusterd-handler.c4
-rw-r--r--xlators/mgmt/glusterd/src/glusterd-volume-ops.c2
3 files changed, 23 insertions, 0 deletions
diff --git a/tests/bugs/bug-873549.t b/tests/bugs/bug-873549.t
new file mode 100644
index 00000000000..5b541de6c65
--- /dev/null
+++ b/tests/bugs/bug-873549.t
@@ -0,0 +1,17 @@
+#!/bin/bash
+
+. $(dirname $0)/../include.rc
+
+cleanup;
+
+TEST glusterd -LDEBUG;
+TEST pidof glusterd;
+TEST $CLI volume info;
+
+TEST $CLI volume create $V0 $H0:$B0/${V0}{1,2};
+
+TEST $CLI volume set $V0 performance.cache-size 512MB
+TEST $CLI volume start $V0
+TEST $CLI volume statedump $V0 all
+
+cleanup;
diff --git a/xlators/mgmt/glusterd/src/glusterd-handler.c b/xlators/mgmt/glusterd/src/glusterd-handler.c
index cecf2719744..9e5cae44963 100644
--- a/xlators/mgmt/glusterd/src/glusterd-handler.c
+++ b/xlators/mgmt/glusterd/src/glusterd-handler.c
@@ -1267,6 +1267,8 @@ glusterd_handle_set_volume (rpcsvc_request_t *req)
char err_str[2048] = {0,};
xlator_t *this = NULL;
+ this = THIS;
+
GF_ASSERT (req);
ret = xdr_to_generic (req->msg[0], &cli_req, (xdrproc_t)xdr_gf_cli_req);
@@ -1325,6 +1327,8 @@ glusterd_handle_set_volume (rpcsvc_request_t *req)
gf_log (this->name, GF_LOG_ERROR, "%s", err_str);
goto out;
}
+ gf_log (this->name, GF_LOG_DEBUG, "Received volume set request for "
+ "volume %s", volname);
ret = glusterd_op_begin (req, GD_OP_SET_VOLUME, dict,
err_str, sizeof (err_str));
diff --git a/xlators/mgmt/glusterd/src/glusterd-volume-ops.c b/xlators/mgmt/glusterd/src/glusterd-volume-ops.c
index 4b6fdc2197a..6ef50342e6c 100644
--- a/xlators/mgmt/glusterd/src/glusterd-volume-ops.c
+++ b/xlators/mgmt/glusterd/src/glusterd-volume-ops.c
@@ -537,6 +537,8 @@ glusterd_handle_cli_statedump_volume (rpcsvc_request_t *req)
char err_str[2048] = {0,};
xlator_t *this = NULL;
+ this = THIS;
+
GF_ASSERT (req);
ret = -1;