summaryrefslogtreecommitdiffstats
path: root/xlators
diff options
context:
space:
mode:
authorKaleb S KEITHLEY <kkeithle@redhat.com>2016-04-28 08:05:29 -0400
committerJeff Darcy <jdarcy@redhat.com>2016-04-28 13:45:21 -0700
commit04d57237099fefa3a92a0cca4c65e43f39c13379 (patch)
treebbf51fe69be4f519021da0eca772bbb2edfdb68b /xlators
parent9423bdeed169076ebedd9af40b52aaac58c9839e (diff)
glusterd: default value of nfs.disable, change from false to true
revert gf_msg -> gf_msg_plain change, i.e. restore gf_msg() Change-Id: Ibdf9906c8a4bf92ba0969a08bb5a5c01dfd74680 BUG: 1092414 Signed-off-by: Kaleb S KEITHLEY <kkeithle@redhat.com> Reviewed-on: http://review.gluster.org/14105 Reviewed-by: Atin Mukherjee <amukherj@redhat.com> NetBSD-regression: NetBSD Build System <jenkins@build.gluster.org> Smoke: Gluster Build System <jenkins@build.gluster.com> CentOS-regression: Gluster Build System <jenkins@build.gluster.com>
Diffstat (limited to 'xlators')
-rw-r--r--xlators/mgmt/glusterd/src/glusterd-handler.c17
1 files changed, 11 insertions, 6 deletions
diff --git a/xlators/mgmt/glusterd/src/glusterd-handler.c b/xlators/mgmt/glusterd/src/glusterd-handler.c
index e2f3f5661cd..c7ffd818a44 100644
--- a/xlators/mgmt/glusterd/src/glusterd-handler.c
+++ b/xlators/mgmt/glusterd/src/glusterd-handler.c
@@ -1509,22 +1509,26 @@ __glusterd_handle_cli_get_volume (rpcsvc_request_t *req)
{
int32_t ret = -1;
gf_cli_req cli_req = {{0,}};
- dict_t *dict = NULL;
int32_t flags = 0;
+ dict_t *dict = NULL;
+ xlator_t *this = NULL;
GF_ASSERT (req);
+ this = THIS;
ret = xdr_to_generic (req->msg[0], &cli_req, (xdrproc_t)xdr_gf_cli_req);
if (ret < 0) {
//failed to decode msg;
- gf_msg ("glusterd", GF_LOG_ERROR, 0,
+ gf_msg (this->name, GF_LOG_ERROR, 0,
GD_MSG_REQ_DECODE_FAIL, "Failed to decode "
"request received from cli");
req->rpc_err = GARBAGE_ARGS;
goto out;
}
- gf_msg_plain (GF_LOG_INFO, "Received get vol req");
+ gf_msg (this->name, GF_LOG_INFO, 0,
+ GD_MSG_GET_VOL_REQ_RCVD,
+ "Received get vol req");
if (cli_req.dict.dict_len) {
/* Unserialize the dictionary */
@@ -1534,7 +1538,7 @@ __glusterd_handle_cli_get_volume (rpcsvc_request_t *req)
cli_req.dict.dict_len,
&dict);
if (ret < 0) {
- gf_msg ("glusterd", GF_LOG_ERROR, 0,
+ gf_msg (this->name, GF_LOG_ERROR, 0,
GD_MSG_DICT_UNSERIALIZE_FAIL,
"failed to "
"unserialize req-buffer to dictionary");
@@ -1546,7 +1550,7 @@ __glusterd_handle_cli_get_volume (rpcsvc_request_t *req)
ret = dict_get_int32 (dict, "flags", &flags);
if (ret) {
- gf_msg (THIS->name, GF_LOG_ERROR, 0,
+ gf_msg (this->name, GF_LOG_ERROR, 0,
GD_MSG_FLAGS_NOTFOUND_IN_DICT, "failed to get flags");
goto out;
}
@@ -1957,7 +1961,8 @@ __glusterd_handle_reset_volume (rpcsvc_request_t *req)
this = THIS;
GF_ASSERT (this);
- gf_msg_plain (GF_LOG_DEBUG, "Received reset vol req");
+ gf_msg (this->name, GF_LOG_INFO, 0, 0,
+ "Received reset vol req");
ret = xdr_to_generic (req->msg[0], &cli_req, (xdrproc_t)xdr_gf_cli_req);
if (ret < 0) {