diff options
Diffstat (limited to 'cli/src/cli.h')
| -rw-r--r-- | cli/src/cli.h | 66 |
1 files changed, 40 insertions, 26 deletions
diff --git a/cli/src/cli.h b/cli/src/cli.h index 773297e4be8..c0d933e8f8a 100644 --- a/cli/src/cli.h +++ b/cli/src/cli.h @@ -11,12 +11,13 @@ #define __CLI_H__ #include "rpc-clnt.h" -#include "glusterfs.h" +#include <glusterfs/glusterfs.h> #include "protocol-common.h" -#include "logging.h" -#include "quota-common-utils.h" +#include <glusterfs/logging.h> +#include <glusterfs/quota-common-utils.h> #include "cli1-xdr.h" +#include "gd-common-utils.h" #if (HAVE_LIB_XML) #include <libxml/encoding.h> @@ -39,8 +40,8 @@ enum argp_option_keys { ARGP_PORT_KEY = 'p', }; -int cli_default_conn_timeout; -int cli_ten_minutes_timeout; +extern int cli_default_conn_timeout; +extern int cli_ten_minutes_timeout; typedef enum { COLD_BRICK_COUNT, @@ -136,6 +137,7 @@ struct cli_state { gf_loglevel_t log_level; char *glusterd_sock; + char *address_family; }; struct cli_local { @@ -187,6 +189,12 @@ typedef ssize_t (*cli_serialize_t)(struct iovec outmsg, void *args); extern struct cli_state *global_state; /* use only in readline callback */ +extern struct rpc_clnt *global_quotad_rpc; + +extern struct rpc_clnt *global_rpc; + +extern rpc_clnt_prog_t *cli_rpc_prog; + typedef const char *(*cli_selector_t)(void *wcon); char * @@ -239,6 +247,19 @@ _cli_err(const char *fmt, ...); \ } while (0) +#define usage() \ + do { \ + cli_out( \ + " Usage: gluster [options] <help> <peer>" \ + " <pool> <volume>\n" \ + " Options:\n" \ + " --help Shows the help information\n" \ + " --version Shows the version\n" \ + " --print-logdir Shows the log directory\n" \ + " --print-statedumpdir Shows the state dump directory\n"); \ + \ + } while (0) + int cli_submit_request(struct rpc_clnt *rpc, void *req, call_frame_t *frame, rpc_clnt_prog_t *prog, int procnum, struct iobref *iobref, @@ -252,7 +273,8 @@ int32_t cli_cmd_volume_reset_parse(const char **words, int wordcount, dict_t **opt); int32_t -cli_cmd_gsync_set_parse(const char **words, int wordcount, dict_t **opt); +cli_cmd_gsync_set_parse(struct cli_state *state, const char **words, + int wordcount, dict_t **opt, char **errstr); int32_t cli_cmd_quota_parse(const char **words, int wordcount, dict_t **opt); @@ -268,6 +290,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); @@ -276,17 +302,6 @@ cli_cmd_volume_add_brick_parse(struct cli_state *state, const char **words, int wordcount, dict_t **options, int *type); int32_t -cli_cmd_volume_detach_tier_parse(const char **words, int wordcount, - dict_t **options, int *question); - -int32_t -cli_cmd_volume_tier_parse(const char **words, int wordcount, dict_t **options); - -int32_t -cli_cmd_volume_old_tier_parse(const char **words, int wordcount, - dict_t **options); - -int32_t cli_cmd_volume_remove_brick_parse(struct cli_state *state, const char **words, int wordcount, dict_t **options, int *question, int *brick_count, @@ -320,11 +335,14 @@ cli_local_get(); void cli_local_wipe(cli_local_t *local); +gf_boolean_t +cli_cmd_connected(); + int32_t -cli_cmd_await_connected(); +cli_cmd_await_connected(unsigned timeout); int32_t -cli_cmd_broadcast_connected(); +cli_cmd_broadcast_connected(gf_boolean_t status); int cli_rpc_notify(struct rpc_clnt *rpc, void *mydata, rpc_clnt_event_t event, @@ -431,10 +449,9 @@ cli_xml_output_vol_rebalance(gf_cli_defrag_type op, dict_t *dict, int op_ret, int op_errno, char *op_errstr); int -cli_xml_output_vol_remove_brick_detach_tier(gf_boolean_t status_op, - dict_t *dict, int op_ret, - int op_errno, char *op_errstr, - const char *op); +cli_xml_output_vol_remove_brick(gf_boolean_t status_op, dict_t *dict, + int op_ret, int op_errno, char *op_errstr, + const char *op); int cli_xml_output_vol_replace_brick(dict_t *dict, int op_ret, int op_errno, @@ -480,9 +497,6 @@ cli_xml_output_snapshot(int cmd_type, dict_t *dict, int op_ret, int op_errno, int cli_xml_snapshot_status_single_snap(cli_local_t *local, dict_t *dict, char *key); -char * -is_server_debug_xlator(void *myframe); - int32_t cli_cmd_snapshot_parse(const char **words, int wordcount, dict_t **options, struct cli_state *state); |