diff options
| author | Jiffin Tony Thottan <jthottan@redhat.com> | 2017-10-16 14:24:29 +0530 | 
|---|---|---|
| committer | Amar Tumballi <amarts@gmail.com> | 2019-08-24 02:08:57 +0000 | 
| commit | 673f2f90f35e5ea381bd22a43403278f89c957a5 (patch) | |
| tree | 297f645a4cc6dfbe48609b03da26a1e93607ab7d /cli/src | |
| parent | 3fe34c921146a8d11875dc3d904e3a5994eb1cb6 (diff) | |
Revert "glusterd: (storhaug) remove ganesha (843e1b0)"
please note as an additional change, macro GLUSTERD_GET_SNAP_DIR
moved from glusterd-store.c to glusterd-snapshot-utils.h
Change-Id: I811efefc148453fe32e4f0d322e80455447cec71
updates: #663
Signed-off-by: Jiffin Tony Thottan <jthottan@redhat.com>
Diffstat (limited to 'cli/src')
| -rw-r--r-- | cli/src/cli-cmd-global.c | 57 | ||||
| -rw-r--r-- | cli/src/cli-cmd-parser.c | 118 | ||||
| -rw-r--r-- | cli/src/cli-cmd.c | 3 | ||||
| -rw-r--r-- | cli/src/cli-rpc-ops.c | 82 | ||||
| -rw-r--r-- | cli/src/cli.h | 4 | 
5 files changed, 263 insertions, 1 deletions
diff --git a/cli/src/cli-cmd-global.c b/cli/src/cli-cmd-global.c index d7c4d97ad72..ba3c1ea6446 100644 --- a/cli/src/cli-cmd-global.c +++ b/cli/src/cli-cmd-global.c @@ -36,6 +36,10 @@ int  cli_cmd_get_state_cbk(struct cli_state *state, struct cli_cmd_word *word,                        const char **words, int wordcount); +int +cli_cmd_ganesha_cbk(struct cli_state *state, struct cli_cmd_word *word, +                    const char **words, int wordcount); +  struct cli_cmd global_cmds[] = {      {          "global help", @@ -48,6 +52,11 @@ struct cli_cmd global_cmds[] = {          cli_cmd_get_state_cbk,          "Get local state representation of mentioned daemon",      }, +    { +        "nfs-ganesha {enable| disable} ", +        cli_cmd_ganesha_cbk, +        "Enable/disable NFS-Ganesha support", +    },      {NULL, NULL, NULL}};  int @@ -89,6 +98,54 @@ out:  }  int +cli_cmd_ganesha_cbk(struct cli_state *state, struct cli_cmd_word *word, +                    const char **words, int wordcount) + +{ +    int sent = 0; +    int parse_error = 0; +    int ret = -1; +    rpc_clnt_procedure_t *proc = NULL; +    call_frame_t *frame = NULL; +    dict_t *options = NULL; +    cli_local_t *local = NULL; +    char *op_errstr = NULL; + +    proc = &cli_rpc_prog->proctable[GLUSTER_CLI_GANESHA]; + +    frame = create_frame(THIS, THIS->ctx->pool); +    if (!frame) +        goto out; + +    ret = cli_cmd_ganesha_parse(state, words, wordcount, &options, &op_errstr); +    if (ret) { +        if (op_errstr) { +            cli_err("%s", op_errstr); +            GF_FREE(op_errstr); +        } else +            cli_usage_out(word->pattern); +        parse_error = 1; +        goto out; +    } + +    CLI_LOCAL_INIT(local, words, frame, options); + +    if (proc->fn) { +        ret = proc->fn(frame, THIS, options); +    } + +out: +    if (ret) { +        cli_cmd_sent_status_get(&sent); +        if ((sent == 0) && (parse_error == 0)) +            cli_out("Setting global option failed"); +    } + +    CLI_STACK_DESTROY(frame); +    return ret; +} + +int  cli_cmd_get_state_cbk(struct cli_state *state, struct cli_cmd_word *word,                        const char **words, int wordcount)  { diff --git a/cli/src/cli-cmd-parser.c b/cli/src/cli-cmd-parser.c index decdd10cb50..18aef217a9a 100644 --- a/cli/src/cli-cmd-parser.c +++ b/cli/src/cli-cmd-parser.c @@ -5772,3 +5772,121 @@ out:      return ret;  } + +/* Parsing global option for NFS-Ganesha config + *  gluster nfs-ganesha enable/disable */ + +int32_t +cli_cmd_ganesha_parse(struct cli_state *state, const char **words, +                      int wordcount, dict_t **options, char **op_errstr) +{ +    dict_t *dict = NULL; +    int ret = -1; +    char *key = NULL; +    char *value = NULL; +    char *w = NULL; +    char *opwords[] = {"enable", "disable", NULL}; +    const char *question = NULL; +    gf_answer_t answer = GF_ANSWER_NO; + +    GF_ASSERT(words); +    GF_ASSERT(options); + +    dict = dict_new(); + +    if (!dict) +        goto out; + +    if (wordcount != 2) +        goto out; + +    key = (char *)words[0]; +    value = (char *)words[1]; + +    if (!key || !value) { +        cli_out("Usage : nfs-ganesha <enable/disable>"); +        ret = -1; +        goto out; +    } + +    ret = gf_strip_whitespace(value, strlen(value)); +    if (ret == -1) +        goto out; + +    if (strcmp(key, "nfs-ganesha")) { +        gf_asprintf(op_errstr, +                    "Global option: error: ' %s '" +                    "is not a valid global option.", +                    key); +        ret = -1; +        goto out; +    } + +    w = str_getunamb(value, opwords); +    if (!w) { +        cli_out( +            "Invalid global option \n" +            "Usage : nfs-ganesha <enable/disable>"); +        ret = -1; +        goto out; +    } + +    if (strcmp(value, "enable") == 0) { +        question = +            "Enabling NFS-Ganesha requires Gluster-NFS to be " +            "disabled across the trusted pool. Do you " +            "still want to continue?\n"; +    } else if (strcmp(value, "disable") == 0) { +        question = +            "Disabling NFS-Ganesha will tear down the entire " +            "ganesha cluster across the trusted pool. Do you " +            "still want to continue?\n"; +    } else { +        ret = -1; +        goto out; +    } +    answer = cli_cmd_get_confirmation(state, question); +    if (GF_ANSWER_NO == answer) { +        gf_log("cli", GF_LOG_ERROR, +               "Global operation " +               "cancelled, exiting"); +        ret = -1; +        goto out; +    } +    cli_out("This will take a few minutes to complete. Please wait .."); + +    ret = dict_set_str(dict, "key", key); +    if (ret) { +        gf_log(THIS->name, GF_LOG_ERROR, "dict set on key failed"); +        goto out; +    } + +    ret = dict_set_str(dict, "value", value); +    if (ret) { +        gf_log(THIS->name, GF_LOG_ERROR, "dict set on value failed"); +        goto out; +    } + +    ret = dict_set_str(dict, "globalname", "All"); +    if (ret) { +        gf_log(THIS->name, GF_LOG_ERROR, +               "dict set on global" +               " key failed."); +        goto out; +    } + +    ret = dict_set_int32(dict, "hold_global_locks", _gf_true); +    if (ret) { +        gf_log(THIS->name, GF_LOG_ERROR, +               "dict set on global key " +               "failed."); +        goto out; +    } + +    *options = dict; +out: +    if (ret) +        dict_unref(dict); + +    return ret; +} diff --git a/cli/src/cli-cmd.c b/cli/src/cli-cmd.c index 2ee8b1b4968..8c069055b64 100644 --- a/cli/src/cli-cmd.c +++ b/cli/src/cli-cmd.c @@ -366,7 +366,8 @@ cli_cmd_submit(struct rpc_clnt *rpc, void *req, call_frame_t *frame,      unsigned timeout = 0;      if ((GLUSTER_CLI_PROFILE_VOLUME == procnum) || -        (GLUSTER_CLI_HEAL_VOLUME == procnum)) +        (GLUSTER_CLI_HEAL_VOLUME == procnum) || +        (GLUSTER_CLI_GANESHA == procnum))          timeout = cli_ten_minutes_timeout;      else          timeout = cli_default_conn_timeout; diff --git a/cli/src/cli-rpc-ops.c b/cli/src/cli-rpc-ops.c index dcf714bd862..6cd31d200b1 100644 --- a/cli/src/cli-rpc-ops.c +++ b/cli/src/cli-rpc-ops.c @@ -1927,6 +1927,62 @@ out:      return ret;  } +int +gf_cli_ganesha_cbk(struct rpc_req *req, struct iovec *iov, int count, +                   void *myframe) +{ +    gf_cli_rsp rsp = { +        0, +    }; +    int ret = -1; +    dict_t *dict = NULL; + +    GF_ASSERT(myframe); + +    if (-1 == req->rpc_status) { +        goto out; +    } + +    ret = xdr_to_generic(*iov, &rsp, (xdrproc_t)xdr_gf_cli_rsp); +    if (ret < 0) { +        gf_log(((call_frame_t *)myframe)->this->name, GF_LOG_ERROR, +               "Failed to decode xdr response"); +        goto out; +    } + +    gf_log("cli", GF_LOG_DEBUG, "Received resp to ganesha"); + +    dict = dict_new(); + +    if (!dict) { +        ret = -1; +        goto out; +    } + +    ret = dict_unserialize(rsp.dict.dict_val, rsp.dict.dict_len, &dict); +    if (ret) +        goto out; + +    if (rsp.op_ret) { +        if (strcmp(rsp.op_errstr, "")) +            cli_err("nfs-ganesha: failed: %s", rsp.op_errstr); +        else +            cli_err("nfs-ganesha: failed"); +    } + +    else { +        cli_out("nfs-ganesha : success "); +    } + +    ret = rsp.op_ret; + +out: +    if (dict) +        dict_unref(dict); +    cli_cmd_broadcast_response(ret); +    return ret; +} +  char *  is_server_debug_xlator(void *myframe)  { @@ -4200,6 +4256,31 @@ out:  }  int32_t +gf_cli_ganesha(call_frame_t *frame, xlator_t *this, void *data) +{ +    gf_cli_req req = {{ +        0, +    }}; +    int ret = 0; +    dict_t *dict = NULL; + +    if (!frame || !this || !data) { +        ret = -1; +        goto out; +    } + +    dict = data; + +    ret = cli_to_glusterd(&req, frame, gf_cli_ganesha_cbk, +                          (xdrproc_t)xdr_gf_cli_req, dict, GLUSTER_CLI_GANESHA, +                          this, cli_rpc_prog, NULL); +out: +    gf_log("cli", GF_LOG_DEBUG, "Returning %d", ret); + +    return ret; +} + +int32_t  gf_cli_set_volume(call_frame_t *frame, xlator_t *this, void *data)  {      gf_cli_req req = {{ @@ -11345,6 +11426,7 @@ struct rpc_clnt_procedure gluster_cli_actors[GLUSTER_CLI_MAXVALUE] = {      [GLUSTER_CLI_BITROT] = {"BITROT", gf_cli_bitrot},      [GLUSTER_CLI_GET_STATE] = {"GET_STATE", gf_cli_get_state},      [GLUSTER_CLI_RESET_BRICK] = {"RESET_BRICK", gf_cli_reset_brick}, +    [GLUSTER_CLI_GANESHA] = {"GANESHA", gf_cli_ganesha},  };  struct rpc_clnt_program cli_prog = { diff --git a/cli/src/cli.h b/cli/src/cli.h index 4e008ffe878..d1fbc143ae9 100644 --- a/cli/src/cli.h +++ b/cli/src/cli.h @@ -284,6 +284,10 @@ cli_cmd_volume_set_parse(struct cli_state *state, const char **words,                           int wordcount, dict_t **options, char **op_errstr);  int32_t +cli_cmd_ganesha_parse(struct cli_state *state, const char **words, +                      int wordcount, dict_t **options, char **op_errstr); + +int32_t  cli_cmd_get_state_parse(struct cli_state *state, const char **words,                          int wordcount, dict_t **options, char **op_errstr);  | 
