diff options
| author | Vijay Bellur <vijay@gluster.com> | 2011-07-05 23:08:40 +0000 |
|---|---|---|
| committer | Anand Avati <avati@gluster.com> | 2011-07-11 04:07:53 -0700 |
| commit | a879613637f54a7a2016549b308b359b7577b5ad (patch) | |
| tree | aa9de34d1905634a3fcbfa1a3b8005268de86f29 /cli | |
| parent | 8f14d85777c93277403bcac727c0447dcba3cdc0 (diff) | |
cli: Exit if glusterd is not operational in non-prompt modes
Signed-off-by: Vijay Bellur <vijay@gluster.com>
Signed-off-by: Anand Avati <avati@gluster.com>
BUG: 3120 (Provide connection timeout between cli and glusterd)
URL: http://bugs.gluster.com/cgi-bin/bugzilla3/show_bug.cgi?id=3120
Diffstat (limited to 'cli')
| -rw-r--r-- | cli/src/cli-cmd.c | 4 | ||||
| -rw-r--r-- | cli/src/cli.c | 6 | ||||
| -rw-r--r-- | cli/src/cli.h | 1 |
3 files changed, 10 insertions, 1 deletions
diff --git a/cli/src/cli-cmd.c b/cli/src/cli-cmd.c index cb0199b0664..1d98ecc7a36 100644 --- a/cli/src/cli-cmd.c +++ b/cli/src/cli-cmd.c @@ -132,7 +132,9 @@ cli_cmd_process (struct cli_state *state, int argc, char **argv) if ( strcmp (word->word,"help")==0 ) goto callback; - ret = cli_cmd_await_connected (cli_cmd_needs_connection (word)); + state->await_connected = cli_cmd_needs_connection (word); + + ret = cli_cmd_await_connected (state->await_connected); if (ret) { cli_out ("Connection failed. Please check if gluster " "daemon is operational."); diff --git a/cli/src/cli.c b/cli/src/cli.c index 491c11b4434..d55781e23e9 100644 --- a/cli/src/cli.c +++ b/cli/src/cli.c @@ -352,6 +352,12 @@ cli_rpc_notify (struct rpc_clnt *rpc, void *mydata, rpc_clnt_event_t event, { gf_log (this->name, GF_LOG_TRACE, "got RPC_CLNT_DISCONNECT"); connected = 0; + if (!global_state->prompt && global_state->await_connected) { + ret = 1; + cli_out ("Connection failed. Please check if gluster " + "daemon is operational."); + exit (ret); + } break; } diff --git a/cli/src/cli.h b/cli/src/cli.h index 36e9e2134aa..0b94d6e36c2 100644 --- a/cli/src/cli.h +++ b/cli/src/cli.h @@ -105,6 +105,7 @@ struct cli_state { char *remote_host; int remote_port; int mode; + int await_connected; }; struct cli_local { |