From 8e7f28fa1ebc6d7efdc892856884a92191e47040 Mon Sep 17 00:00:00 2001 From: Kaushal M Date: Mon, 21 May 2012 11:59:34 +0530 Subject: glusterd: On-wire changes required for probe/detach errstr This patch changes the on-wire structures for 'peer probe' and 'peer detach' to include op_errstr. These changes have been backported from patches feb99ca (glusterd, cli: Enable errstr for peer probe) and 3213a4e (glusterd,cli: Enable errstr for peer detach). The remaining changes will be included later on. Change-Id: I6e8e917f5ad928b80862d301c364cd4df56bb4c0 BUG: 816840 Signed-off-by: Kaushal M Reviewed-on: http://review.gluster.com/3387 Tested-by: Gluster Build System Reviewed-by: Amar Tumballi --- xlators/mgmt/glusterd/src/glusterd-handler.c | 15 +++++++++++++++ 1 file changed, 15 insertions(+) (limited to 'xlators/mgmt/glusterd') diff --git a/xlators/mgmt/glusterd/src/glusterd-handler.c b/xlators/mgmt/glusterd/src/glusterd-handler.c index d7ac4fd4f2c..0e3c211b3f9 100644 --- a/xlators/mgmt/glusterd/src/glusterd-handler.c +++ b/xlators/mgmt/glusterd/src/glusterd-handler.c @@ -1779,6 +1779,11 @@ glusterd_handle_probe_query (rpcsvc_request_t *req) uuid_copy (rsp.uuid, conf->uuid); rsp.hostname = probe_req.hostname; + /* + *TODO: Fix this temporary assignment when the full probe errstr + * patch is added + */ + rsp.op_errstr = ""; ret = glusterd_submit_reply (req, &rsp, NULL, 0, NULL, (xdrproc_t)xdr_gd1_mgmt_probe_rsp); @@ -2383,6 +2388,11 @@ glusterd_xfer_cli_probe_resp (rpcsvc_request_t *req, int32_t op_ret, rsp.op_errno = op_errno; rsp.hostname = hostname; rsp.port = port; + /* + *TODO: Fix this temprary assignment when the full probe errstr + * patch is added + */ + rsp.op_errstr = ""; ret = glusterd_submit_reply (req, &rsp, NULL, 0, NULL, (xdrproc_t)xdr_gf1_cli_probe_rsp); @@ -2404,6 +2414,11 @@ glusterd_xfer_cli_deprobe_resp (rpcsvc_request_t *req, int32_t op_ret, rsp.op_ret = op_ret; rsp.op_errno = op_errno; rsp.hostname = hostname; + /* + *TODO: Fix this temporary assignment when the full deprobe errstr + * patch is added + */ + rsp.op_errstr = ""; ret = glusterd_submit_reply (req, &rsp, NULL, 0, NULL, (xdrproc_t)xdr_gf1_cli_deprobe_rsp); -- cgit