From c87c868f40f4c2f46892afebf9557cf3003dabe4 Mon Sep 17 00:00:00 2001 From: Amar Tumballi Date: Sat, 14 Aug 2010 05:10:49 +0000 Subject: 'gluster peer *' enhancement now 'gluster probe' will be 'gluster peer probe' and 'gluster detach' will be 'gluster peer detach'. Signed-off-by: Amar Tumballi Signed-off-by: Anand V. Avati BUG: 1291 () URL: http://bugs.gluster.com/cgi-bin/bugzilla3/show_bug.cgi?id=1291 --- cli/src/Makefile.am | 2 +- cli/src/cli-cmd-peer.c | 202 ++++++++++++++++++++++++++++++++++++++++++++++++ cli/src/cli-cmd-probe.c | 202 ------------------------------------------------ 3 files changed, 203 insertions(+), 203 deletions(-) create mode 100644 cli/src/cli-cmd-peer.c delete mode 100644 cli/src/cli-cmd-probe.c diff --git a/cli/src/Makefile.am b/cli/src/Makefile.am index 93372235e08..e8cabfb8c8b 100644 --- a/cli/src/Makefile.am +++ b/cli/src/Makefile.am @@ -1,7 +1,7 @@ sbin_PROGRAMS = gluster gluster_SOURCES = cli.c registry.c input.c cli-cmd.c cli-rl.c \ - cli-cmd-volume.c cli-cmd-probe.c cli3_1-cops.c cli-cmd-parser.c\ + cli-cmd-volume.c cli-cmd-peer.c cli3_1-cops.c cli-cmd-parser.c\ cli-cmd-misc.c cli-cmd-log.c gluster_LDADD = $(top_builddir)/libglusterfs/src/libglusterfs.la $(GF_LDADD)\ diff --git a/cli/src/cli-cmd-peer.c b/cli/src/cli-cmd-peer.c new file mode 100644 index 00000000000..2959444fe81 --- /dev/null +++ b/cli/src/cli-cmd-peer.c @@ -0,0 +1,202 @@ +/* + Copyright (c) 2010 Gluster, Inc. + This file is part of GlusterFS. + + GlusterFS is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published + by the Free Software Foundation; either version 3 of the License, + or (at your option) any later version. + + GlusterFS is distributed in the hope that it will be useful, but + WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see + . +*/ + +#include +#include +#include +#include +#include + +#ifndef _CONFIG_H +#define _CONFIG_H +#include "config.h" +#endif + +#include "cli.h" +#include "cli-cmd.h" +#include "cli-mem-types.h" +#include "protocol-common.h" + +extern struct rpc_clnt *global_rpc; + +extern rpc_clnt_prog_t *cli_rpc_prog; + +void +cli_cmd_probe_usage () +{ + cli_out ("Usage: probe [port]"); +} + +void +cli_cmd_deprobe_usage () +{ + cli_out ("Usage: detach [port]"); +} + +void +cli_cmd_peer_status_usage () +{ + cli_out ("Usage: peer status [port]"); +} + +int +cli_cmd_peer_probe_cbk (struct cli_state *state, struct cli_cmd_word *word, + const char **words, int wordcount) +{ + int ret = -1; + rpc_clnt_procedure_t *proc = NULL; + call_frame_t *frame = NULL; + dict_t *dict = NULL; + + if (!((wordcount == 4) || (wordcount == 3))) { + cli_cmd_probe_usage (); + goto out; + } + + proc = &cli_rpc_prog->proctable[GF1_CLI_PROBE]; + + frame = create_frame (THIS, THIS->ctx->pool); + if (!frame) + goto out; + + dict = dict_new (); + if (!dict) + goto out; + + ret = dict_set_str (dict, "hostname", (char *)words[2]); + if (ret) + goto out; + + if (words[3]) { + ret = dict_set_str (dict, "port", (char *)words[3]); + if (ret) + goto out; + } + + if (proc->fn) { + ret = proc->fn (frame, THIS, dict); + } + +out: + if (ret) + cli_out ("Probe failed"); + return ret; +} + + +int +cli_cmd_peer_deprobe_cbk (struct cli_state *state, struct cli_cmd_word *word, + const char **words, int wordcount) +{ + int ret = -1; + rpc_clnt_procedure_t *proc = NULL; + call_frame_t *frame = NULL; + dict_t *dict = NULL; + + if (!((wordcount == 3) || (wordcount == 4))) { + cli_cmd_deprobe_usage (); + goto out; + } + + proc = &cli_rpc_prog->proctable[GF1_CLI_DEPROBE]; + + frame = create_frame (THIS, THIS->ctx->pool); + if (!frame) + goto out; + + dict = dict_new (); + + ret = dict_set_str (dict, "hostname", (char *)words[2]); + if (ret) + goto out; + + if (words[3]) { + ret = dict_set_str (dict, "port", (char *)words[3]); + if (ret) + goto out; + } + + if (proc->fn) { + ret = proc->fn (frame, THIS, dict); + } + +out: + if (ret) + cli_out ("Detach failed"); + + return ret; +} + +int +cli_cmd_peer_status_cbk (struct cli_state *state, struct cli_cmd_word *word, + const char **words, int wordcount) +{ + int ret = -1; + rpc_clnt_procedure_t *proc = NULL; + call_frame_t *frame = NULL; + + if (wordcount != 2) { + cli_cmd_peer_status_usage (); + goto out; + } + + proc = &cli_rpc_prog->proctable[GF1_CLI_LIST_FRIENDS]; + + frame = create_frame (THIS, THIS->ctx->pool); + if (!frame) + goto out; + + if (proc->fn) { + ret = proc->fn (frame, THIS, (char *)words[1] ); + } + +out: + if (ret) + cli_out ("Command Execution failed"); + return ret; +} + +struct cli_cmd cli_probe_cmds[] = { + { "peer probe [PORT]", + cli_cmd_peer_probe_cbk }, + + { "peer detach ", + cli_cmd_peer_deprobe_cbk }, + + { "peer status", + cli_cmd_peer_status_cbk}, + + { NULL, NULL } +}; + + +int +cli_cmd_probe_register (struct cli_state *state) +{ + int ret = 0; + struct cli_cmd *cmd = NULL; + + for (cmd = cli_probe_cmds; cmd->pattern; cmd++) { + ret = cli_cmd_register (&state->tree, cmd->pattern, cmd->cbk); + if (ret) + goto out; + } +out: + return ret; +} diff --git a/cli/src/cli-cmd-probe.c b/cli/src/cli-cmd-probe.c deleted file mode 100644 index 7d1c6eee7da..00000000000 --- a/cli/src/cli-cmd-probe.c +++ /dev/null @@ -1,202 +0,0 @@ -/* - Copyright (c) 2010 Gluster, Inc. - This file is part of GlusterFS. - - GlusterFS is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3 of the License, - or (at your option) any later version. - - GlusterFS is distributed in the hope that it will be useful, but - WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program. If not, see - . -*/ - -#include -#include -#include -#include -#include - -#ifndef _CONFIG_H -#define _CONFIG_H -#include "config.h" -#endif - -#include "cli.h" -#include "cli-cmd.h" -#include "cli-mem-types.h" -#include "protocol-common.h" - -extern struct rpc_clnt *global_rpc; - -extern rpc_clnt_prog_t *cli_rpc_prog; - -void -cli_cmd_probe_usage () -{ - cli_out ("Usage: probe [port]"); -} - -void -cli_cmd_deprobe_usage () -{ - cli_out ("Usage: detach [port]"); -} - -void -cli_cmd_peer_status_usage () -{ - cli_out ("Usage: peer status [port]"); -} - -int -cli_cmd_probe_cbk (struct cli_state *state, struct cli_cmd_word *word, - const char **words, int wordcount) -{ - int ret = -1; - rpc_clnt_procedure_t *proc = NULL; - call_frame_t *frame = NULL; - dict_t *dict = NULL; - - if (!((wordcount == 3) || (wordcount == 2))) { - cli_cmd_probe_usage (); - goto out; - } - - proc = &cli_rpc_prog->proctable[GF1_CLI_PROBE]; - - frame = create_frame (THIS, THIS->ctx->pool); - if (!frame) - goto out; - - dict = dict_new (); - if (!dict) - goto out; - - ret = dict_set_str (dict, "hostname", (char *)words[1]); - if (ret) - goto out; - - if (words[2]) { - ret = dict_set_str (dict, "port", (char *)words[2]); - if (ret) - goto out; - } - - if (proc->fn) { - ret = proc->fn (frame, THIS, dict); - } - -out: - if (ret) - cli_out ("Probe failed"); - return ret; -} - - -int -cli_cmd_deprobe_cbk (struct cli_state *state, struct cli_cmd_word *word, - const char **words, int wordcount) -{ - int ret = -1; - rpc_clnt_procedure_t *proc = NULL; - call_frame_t *frame = NULL; - dict_t *dict = NULL; - - if (!((wordcount == 2) || (wordcount == 3))) { - cli_cmd_deprobe_usage (); - goto out; - } - - proc = &cli_rpc_prog->proctable[GF1_CLI_DEPROBE]; - - frame = create_frame (THIS, THIS->ctx->pool); - if (!frame) - goto out; - - dict = dict_new (); - - ret = dict_set_str (dict, "hostname", (char *)words[1]); - if (ret) - goto out; - - if (words[2]) { - ret = dict_set_str (dict, "port", (char *)words[2]); - if (ret) - goto out; - } - - if (proc->fn) { - ret = proc->fn (frame, THIS, dict); - } - -out: - if (ret) - cli_out ("Detach failed"); - - return ret; -} - -int -cli_cmd_peer_status_cbk (struct cli_state *state, struct cli_cmd_word *word, - const char **words, int wordcount) -{ - int ret = -1; - rpc_clnt_procedure_t *proc = NULL; - call_frame_t *frame = NULL; - - if (wordcount != 2) { - cli_cmd_peer_status_usage (); - goto out; - } - - proc = &cli_rpc_prog->proctable[GF1_CLI_LIST_FRIENDS]; - - frame = create_frame (THIS, THIS->ctx->pool); - if (!frame) - goto out; - - if (proc->fn) { - ret = proc->fn (frame, THIS, (char *)words[1] ); - } - -out: - if (ret) - cli_out ("Command Execution failed"); - return ret; -} - -struct cli_cmd cli_probe_cmds[] = { - { "probe [PORT]", - cli_cmd_probe_cbk }, - - { "detach ", - cli_cmd_deprobe_cbk }, - - { "peer status", - cli_cmd_peer_status_cbk}, - - { NULL, NULL } -}; - - -int -cli_cmd_probe_register (struct cli_state *state) -{ - int ret = 0; - struct cli_cmd *cmd = NULL; - - for (cmd = cli_probe_cmds; cmd->pattern; cmd++) { - ret = cli_cmd_register (&state->tree, cmd->pattern, cmd->cbk); - if (ret) - goto out; - } -out: - return ret; -} -- cgit