summaryrefslogtreecommitdiffstats
path: root/xlators/mgmt/glusterd/src/glusterd-handler.c
diff options
context:
space:
mode:
authorAnand Avati <avati@redhat.com>2012-12-04 16:00:36 -0800
committerAnand Avati <avati@redhat.com>2012-12-04 16:27:48 -0800
commit6d1607becc4fd84f7422730f37582164c86127d2 (patch)
tree53f5d99989e875dc68729046223c095c7a70ad5b /xlators/mgmt/glusterd/src/glusterd-handler.c
parent698deb33d731df6de84da8ae8ee4045e1543a168 (diff)
Revert "glusterd: add "volume label" command"
This reverts commit dad16a51ba7e6b1c57529423c57257dbce97ee93 Test script causing "silent" failures during execution. Change-Id: I26dbb8ed22256071cb415cc3aff572ef8372600e Reviewed-on: http://review.gluster.org/4268 Tested-by: Gluster Build System <jenkins@build.gluster.com> Reviewed-by: Anand Avati <avati@redhat.com>
Diffstat (limited to 'xlators/mgmt/glusterd/src/glusterd-handler.c')
-rw-r--r--xlators/mgmt/glusterd/src/glusterd-handler.c66
1 files changed, 0 insertions, 66 deletions
diff --git a/xlators/mgmt/glusterd/src/glusterd-handler.c b/xlators/mgmt/glusterd/src/glusterd-handler.c
index 9bbfdba..673bfae 100644
--- a/xlators/mgmt/glusterd/src/glusterd-handler.c
+++ b/xlators/mgmt/glusterd/src/glusterd-handler.c
@@ -2935,69 +2935,6 @@ out:
}
int
-glusterd_handle_cli_label_volume (rpcsvc_request_t *req)
-{
- int32_t ret = -1;
- gf_cli_req cli_req = {{0,}};
- glusterd_op_t cli_op = GD_OP_LABEL_VOLUME;
- char *volname = NULL;
- dict_t *dict = NULL;
-
- GF_ASSERT (req);
-
- ret = -1;
- if (!xdr_to_generic (req->msg[0], &cli_req,
- (xdrproc_t)xdr_gf_cli_req)) {
- req->rpc_err = GARBAGE_ARGS;
- goto out;
- }
-
- if (cli_req.dict.dict_len) {
- dict = dict_new ();
-
- ret = dict_unserialize (cli_req.dict.dict_val,
- cli_req.dict.dict_len,
- &dict);
- if (ret < 0) {
- gf_log (THIS->name, GF_LOG_ERROR,
- "failed to unserialize req-buffer to"
- " dictionary");
- goto out;
- }
-
- } else {
- ret = -1;
- gf_log (THIS->name, GF_LOG_ERROR, "Empty cli request.");
- goto out;
- }
-
- ret = dict_get_str (dict, "volname", &volname);
- if (ret) {
- gf_log (THIS->name, GF_LOG_ERROR, "failed to get volname");
- goto out;
- }
-
- gf_log (THIS->name, GF_LOG_INFO, "Received label volume req "
- "for volume %s", volname);
-
- ret = glusterd_op_begin (req, cli_op, dict);
-
-out:
- glusterd_friend_sm ();
- glusterd_op_sm ();
-
- if (ret) {
- ret = glusterd_op_send_cli_response (cli_op, ret, 0, req,
- dict, "operation failed");
- if (dict)
- dict_unref (dict);
- }
- free (cli_req.dict.dict_val);
-
- return ret;
-}
-
-int
glusterd_brick_rpc_notify (struct rpc_clnt *rpc, void *mydata,
rpc_clnt_event_t event,
void *data)
@@ -3302,9 +3239,6 @@ rpcsvc_actor_t gd_svc_cli_actors[] = {
#ifdef HAVE_BD_XLATOR
[GLUSTER_CLI_BD_OP] = {"BD_OP", GLUSTER_CLI_BD_OP, glusterd_handle_cli_bd_op, NULL, 0},
#endif
- [GLUSTER_CLI_LABEL_VOLUME] = {"LABEL_VOLUME", GLUSTER_CLI_LABEL_VOLUME,
- glusterd_handle_cli_label_volume, NULL,
- 0},
};
struct rpcsvc_program gd_svc_cli_prog = {