diff options
author | Vijay Bellur <vijay@gluster.com> | 2011-08-18 23:19:22 +0530 |
---|---|---|
committer | Anand Avati <avati@gluster.com> | 2011-08-19 01:29:18 -0700 |
commit | 0143a2ef653d0f7a337c8220f127655dadbca942 (patch) | |
tree | 61896872f41f8ccb39b692a521a62569516bab2d /rpc/xdr | |
parent | d2849bd349081b332540713cfeaa561f57356b2a (diff) |
mgmt/glusterd, cli: Introduce gluster volume status <volname>
Change-Id: Iea835b9e448e736016da2e44e3c9bfff93f2fa78
BUG: 3439
Reviewed-on: http://review.gluster.com/259
Tested-by: Gluster Build System <jenkins@build.gluster.com>
Reviewed-by: Anand Avati <avati@gluster.com>
Diffstat (limited to 'rpc/xdr')
-rw-r--r-- | rpc/xdr/src/cli1-xdr.c | 129 | ||||
-rw-r--r-- | rpc/xdr/src/cli1-xdr.h | 120 | ||||
-rw-r--r-- | rpc/xdr/src/cli1-xdr.x | 24 | ||||
-rw-r--r-- | rpc/xdr/src/cli1.c | 36 | ||||
-rw-r--r-- | rpc/xdr/src/cli1.h | 16 |
5 files changed, 217 insertions, 108 deletions
diff --git a/rpc/xdr/src/cli1-xdr.c b/rpc/xdr/src/cli1-xdr.c index d4523c359..a37e4cd21 100644 --- a/rpc/xdr/src/cli1-xdr.c +++ b/rpc/xdr/src/cli1-xdr.c @@ -17,7 +17,6 @@ <http://www.gnu.org/licenses/>. */ - /* * Please do not edit this file. * It was generated using rpcgen. @@ -112,9 +111,9 @@ bool_t xdr_gf1_cli_top_op (XDR *xdrs, gf1_cli_top_op *objp) { - if (!xdr_enum (xdrs, (enum_t *) objp)) - return FALSE; - return TRUE; + if (!xdr_enum (xdrs, (enum_t *) objp)) + return FALSE; + return TRUE; } bool_t @@ -131,6 +130,7 @@ xdr_gf1_cli_probe_req (XDR *xdrs, gf1_cli_probe_req *objp) bool_t xdr_gf1_cli_probe_rsp (XDR *xdrs, gf1_cli_probe_rsp *objp) { + register int32_t *buf; if (xdrs->x_op == XDR_ENCODE) { @@ -548,36 +548,6 @@ xdr_gf1_cli_reset_vol_rsp (XDR *xdrs, gf1_cli_reset_vol_rsp *objp) } bool_t -xdr_gf1_cli_quota_req (XDR *xdrs, gf1_cli_quota_req *objp) -{ - - if (!xdr_string (xdrs, &objp->volname, ~0)) - return FALSE; - if (!xdr_bytes (xdrs, (char **)&objp->dict.dict_val, (u_int *) &objp->dict.dict_len, ~0)) - return FALSE; - return TRUE; -} - -bool_t -xdr_gf1_cli_quota_rsp (XDR *xdrs, gf1_cli_quota_rsp *objp) -{ - - if (!xdr_int (xdrs, &objp->op_ret)) - return FALSE; - if (!xdr_int (xdrs, &objp->op_errno)) - return FALSE; - if (!xdr_string (xdrs, &objp->volname, ~0)) - return FALSE; - if (!xdr_string (xdrs, &objp->op_errstr, ~0)) - return FALSE; - if (!xdr_string (xdrs, &objp->limit_list, ~0)) - return FALSE; - if (!xdr_gf_quota_type (xdrs, &objp->type)) - return FALSE; - return TRUE; -} - -bool_t xdr_gf1_cli_set_vol_req (XDR *xdrs, gf1_cli_set_vol_req *objp) { @@ -750,10 +720,8 @@ xdr_gf1_cli_gsync_set_rsp (XDR *xdrs, gf1_cli_gsync_set_rsp *objp) return FALSE; if (!xdr_int (xdrs, &objp->type)) return FALSE; - if (!xdr_bytes (xdrs, (char **)&objp->dict.dict_val, - (u_int *) &objp->dict.dict_len, ~0)) - return FALSE; - + if (!xdr_bytes (xdrs, (char **)&objp->dict.dict_val, (u_int *) &objp->dict.dict_len, ~0)) + return FALSE; return TRUE; } @@ -767,7 +735,6 @@ xdr_gf1_cli_stats_volume_req (XDR *xdrs, gf1_cli_stats_volume_req *objp) return FALSE; if (!xdr_bytes (xdrs, (char **)&objp->dict_req.dict_req_val, (u_int *) &objp->dict_req.dict_req_len, ~0)) return FALSE; - return TRUE; } @@ -787,8 +754,39 @@ xdr_gf1_cli_stats_volume_rsp (XDR *xdrs, gf1_cli_stats_volume_rsp *objp) } bool_t +xdr_gf1_cli_quota_req (XDR *xdrs, gf1_cli_quota_req *objp) +{ + + if (!xdr_string (xdrs, &objp->volname, ~0)) + return FALSE; + if (!xdr_bytes (xdrs, (char **)&objp->dict.dict_val, (u_int *) &objp->dict.dict_len, ~0)) + return FALSE; + return TRUE; +} + +bool_t +xdr_gf1_cli_quota_rsp (XDR *xdrs, gf1_cli_quota_rsp *objp) +{ + + if (!xdr_int (xdrs, &objp->op_ret)) + return FALSE; + if (!xdr_int (xdrs, &objp->op_errno)) + return FALSE; + if (!xdr_string (xdrs, &objp->volname, ~0)) + return FALSE; + if (!xdr_string (xdrs, &objp->op_errstr, ~0)) + return FALSE; + if (!xdr_string (xdrs, &objp->limit_list, ~0)) + return FALSE; + if (!xdr_gf_quota_type (xdrs, &objp->type)) + return FALSE; + return TRUE; +} + +bool_t xdr_gf1_cli_getwd_req (XDR *xdrs, gf1_cli_getwd_req *objp) { + if (!xdr_int (xdrs, &objp->unused)) return FALSE; return TRUE; @@ -797,6 +795,7 @@ xdr_gf1_cli_getwd_req (XDR *xdrs, gf1_cli_getwd_req *objp) bool_t xdr_gf1_cli_getwd_rsp (XDR *xdrs, gf1_cli_getwd_rsp *objp) { + if (!xdr_int (xdrs, &objp->op_ret)) return FALSE; if (!xdr_int (xdrs, &objp->op_errno)) @@ -809,29 +808,51 @@ xdr_gf1_cli_getwd_rsp (XDR *xdrs, gf1_cli_getwd_rsp *objp) bool_t xdr_gf1_cli_log_level_req (XDR *xdrs, gf1_cli_log_level_req *objp) { - if (!xdr_string (xdrs, &objp->volname, ~0)) - return FALSE; - if (!xdr_string (xdrs, &objp->xlator, ~0)) - return FALSE; + if (!xdr_string (xdrs, &objp->volname, ~0)) + return FALSE; + if (!xdr_string (xdrs, &objp->xlator, ~0)) + return FALSE; + if (!xdr_string (xdrs, &objp->loglevel, ~0)) + return FALSE; + return TRUE; +} - if (!xdr_string (xdrs, &objp->loglevel, ~0)) - return FALSE; +bool_t +xdr_gf1_cli_log_level_rsp (XDR *xdrs, gf1_cli_log_level_rsp *objp) +{ - return TRUE; + if (!xdr_int (xdrs, &objp->op_ret)) + return FALSE; + if (!xdr_int (xdrs, &objp->op_errno)) + return FALSE; + if (!xdr_string (xdrs, &objp->op_errstr, ~0)) + return FALSE; + return TRUE; } bool_t -xdr_gf1_cli_log_level_rsp (XDR *xdrs, gf1_cli_log_level_rsp *objp) +xdr_gf1_cli_status_volume_req (XDR *xdrs, gf1_cli_status_volume_req *objp) { - if (!xdr_int (xdrs, &objp->op_ret)) - return FALSE; - if (!xdr_int (xdrs, &objp->op_errno)) - return FALSE; + if (!xdr_string (xdrs, &objp->volname, ~0)) + return FALSE; + if (!xdr_bytes (xdrs, (char **)&objp->dict.dict_val, (u_int *) &objp->dict.dict_len, ~0)) + return FALSE; + return TRUE; +} - if (!xdr_string (xdrs, &objp->op_errstr, ~0)) - return FALSE; +bool_t +xdr_gf1_cli_status_volume_rsp (XDR *xdrs, gf1_cli_status_volume_rsp *objp) +{ - return TRUE; + if (!xdr_int (xdrs, &objp->op_ret)) + return FALSE; + if (!xdr_int (xdrs, &objp->op_errno)) + return FALSE; + if (!xdr_string (xdrs, &objp->op_errstr, ~0)) + return FALSE; + if (!xdr_bytes (xdrs, (char **)&objp->dict.dict_val, (u_int *) &objp->dict.dict_len, ~0)) + return FALSE; + return TRUE; } diff --git a/rpc/xdr/src/cli1-xdr.h b/rpc/xdr/src/cli1-xdr.h index 81319c290..cce3ecbe8 100644 --- a/rpc/xdr/src/cli1-xdr.h +++ b/rpc/xdr/src/cli1-xdr.h @@ -26,7 +26,6 @@ #include <rpc/rpc.h> -#include "xdr-common.h" #ifdef __cplusplus extern "C" { @@ -90,8 +89,7 @@ enum gf1_cli_gsync_set { GF_GSYNC_OPTION_TYPE_START = 1, GF_GSYNC_OPTION_TYPE_STOP = 2, GF_GSYNC_OPTION_TYPE_CONFIG = 3, - GF_GSYNC_OPTION_TYPE_STATUS = 4, - + GF_GSYNC_OPTION_TYPE_STATUS = 4, }; typedef enum gf1_cli_gsync_set gf1_cli_gsync_set; @@ -100,19 +98,19 @@ enum gf1_cli_stats_op { GF_CLI_STATS_START = 1, GF_CLI_STATS_STOP = 2, GF_CLI_STATS_INFO = 3, - GF_CLI_STATS_TOP = 4, + GF_CLI_STATS_TOP = 4, }; typedef enum gf1_cli_stats_op gf1_cli_stats_op; enum gf1_cli_top_op { - GF_CLI_TOP_NONE = 0, - GF_CLI_TOP_OPEN = 0 + 1, - GF_CLI_TOP_READ = 0 + 2, - GF_CLI_TOP_WRITE = 0 + 3, - GF_CLI_TOP_OPENDIR = 0 + 4, - GF_CLI_TOP_READDIR = 0 + 5, - GF_CLI_TOP_READ_PERF = 0 + 6, - GF_CLI_TOP_WRITE_PERF = 0 + 7, + GF_CLI_TOP_NONE = 0, + GF_CLI_TOP_OPEN = 0 + 1, + GF_CLI_TOP_READ = 0 + 2, + GF_CLI_TOP_WRITE = 0 + 3, + GF_CLI_TOP_OPENDIR = 0 + 4, + GF_CLI_TOP_READDIR = 0 + 5, + GF_CLI_TOP_READ_PERF = 0 + 6, + GF_CLI_TOP_WRITE_PERF = 0 + 7, }; typedef enum gf1_cli_top_op gf1_cli_top_op; @@ -353,25 +351,6 @@ struct gf1_cli_reset_vol_rsp { }; typedef struct gf1_cli_reset_vol_rsp gf1_cli_reset_vol_rsp; -struct gf1_cli_quota_req { - char *volname; - struct { - u_int dict_len; - char *dict_val; - } dict; -}; -typedef struct gf1_cli_quota_req gf1_cli_quota_req; - -struct gf1_cli_quota_rsp { - int op_ret; - int op_errno; - char *volname; - char *op_errstr; - char *limit_list; - gf_quota_type type; -}; -typedef struct gf1_cli_quota_rsp gf1_cli_quota_rsp; - struct gf1_cli_set_vol_req { char *volname; struct { @@ -488,7 +467,7 @@ struct gf1_cli_stats_volume_req { gf1_cli_stats_op op; struct { u_int dict_req_len; - char* dict_req_val; + char *dict_req_val; } dict_req; }; typedef struct gf1_cli_stats_volume_req gf1_cli_stats_volume_req; @@ -504,6 +483,25 @@ struct gf1_cli_stats_volume_rsp { }; typedef struct gf1_cli_stats_volume_rsp gf1_cli_stats_volume_rsp; +struct gf1_cli_quota_req { + char *volname; + struct { + u_int dict_len; + char *dict_val; + } dict; +}; +typedef struct gf1_cli_quota_req gf1_cli_quota_req; + +struct gf1_cli_quota_rsp { + int op_ret; + int op_errno; + char *volname; + char *op_errstr; + char *limit_list; + gf_quota_type type; +}; +typedef struct gf1_cli_quota_rsp gf1_cli_quota_rsp; + struct gf1_cli_getwd_req { int unused; }; @@ -517,32 +515,52 @@ struct gf1_cli_getwd_rsp { typedef struct gf1_cli_getwd_rsp gf1_cli_getwd_rsp; struct gf1_cli_log_level_req { - char *volname; - char *xlator; - char *loglevel; + char *volname; + char *xlator; + char *loglevel; }; typedef struct gf1_cli_log_level_req gf1_cli_log_level_req; struct gf1_cli_log_level_rsp { - int op_ret; - int op_errno; - char *op_errstr; + int op_ret; + int op_errno; + char *op_errstr; }; typedef struct gf1_cli_log_level_rsp gf1_cli_log_level_rsp; +struct gf1_cli_status_volume_req { + char *volname; + struct { + u_int dict_len; + char *dict_val; + } dict; +}; +typedef struct gf1_cli_status_volume_req gf1_cli_status_volume_req; + +struct gf1_cli_status_volume_rsp { + int op_ret; + int op_errno; + char *op_errstr; + struct { + u_int dict_len; + char *dict_val; + } dict; +}; +typedef struct gf1_cli_status_volume_rsp gf1_cli_status_volume_rsp; + /* the xdr functions */ #if defined(__STDC__) || defined(__cplusplus) extern bool_t xdr_gf1_cluster_type (XDR *, gf1_cluster_type*); extern bool_t xdr_gf1_cli_replace_op (XDR *, gf1_cli_replace_op*); +extern bool_t xdr_gf_quota_type (XDR *, gf_quota_type*); extern bool_t xdr_gf1_cli_friends_list (XDR *, gf1_cli_friends_list*); extern bool_t xdr_gf1_cli_get_volume (XDR *, gf1_cli_get_volume*); extern bool_t xdr_gf1_cli_sync_volume (XDR *, gf1_cli_sync_volume*); extern bool_t xdr_gf1_cli_op_flags (XDR *, gf1_cli_op_flags*); extern bool_t xdr_gf1_cli_gsync_set (XDR *, gf1_cli_gsync_set*); -extern bool_t xdr_gf1_cli_top_op (XDR *, gf1_cli_top_op*); extern bool_t xdr_gf1_cli_stats_op (XDR *, gf1_cli_stats_op*); -extern bool_t xdr_gf_quota_type (XDR *, gf_quota_type*); +extern bool_t xdr_gf1_cli_top_op (XDR *, gf1_cli_top_op*); extern bool_t xdr_gf1_cli_probe_req (XDR *, gf1_cli_probe_req*); extern bool_t xdr_gf1_cli_probe_rsp (XDR *, gf1_cli_probe_rsp*); extern bool_t xdr_gf1_cli_deprobe_req (XDR *, gf1_cli_deprobe_req*); @@ -572,8 +590,6 @@ extern bool_t xdr_gf1_cli_replace_brick_req (XDR *, gf1_cli_replace_brick_req*) extern bool_t xdr_gf1_cli_replace_brick_rsp (XDR *, gf1_cli_replace_brick_rsp*); extern bool_t xdr_gf1_cli_reset_vol_req (XDR *, gf1_cli_reset_vol_req*); extern bool_t xdr_gf1_cli_reset_vol_rsp (XDR *, gf1_cli_reset_vol_rsp*); -extern bool_t xdr_gf1_cli_quota_req (XDR *, gf1_cli_quota_req*); -extern bool_t xdr_gf1_cli_quota_rsp (XDR *, gf1_cli_quota_rsp*); extern bool_t xdr_gf1_cli_set_vol_req (XDR *, gf1_cli_set_vol_req*); extern bool_t xdr_gf1_cli_set_vol_rsp (XDR *, gf1_cli_set_vol_rsp*); extern bool_t xdr_gf1_cli_log_filename_req (XDR *, gf1_cli_log_filename_req*); @@ -590,14 +606,19 @@ extern bool_t xdr_gf1_cli_gsync_set_req (XDR *, gf1_cli_gsync_set_req*); extern bool_t xdr_gf1_cli_gsync_set_rsp (XDR *, gf1_cli_gsync_set_rsp*); extern bool_t xdr_gf1_cli_stats_volume_req (XDR *, gf1_cli_stats_volume_req*); extern bool_t xdr_gf1_cli_stats_volume_rsp (XDR *, gf1_cli_stats_volume_rsp*); -extern bool_t xdr_gf1_cli_log_level_req (XDR *, gf1_cli_log_level_req *); -extern bool_t xdr_gf1_cli_log_level_rsp (XDR *, gf1_cli_log_level_rsp *); +extern bool_t xdr_gf1_cli_quota_req (XDR *, gf1_cli_quota_req*); +extern bool_t xdr_gf1_cli_quota_rsp (XDR *, gf1_cli_quota_rsp*); extern bool_t xdr_gf1_cli_getwd_req (XDR *, gf1_cli_getwd_req*); extern bool_t xdr_gf1_cli_getwd_rsp (XDR *, gf1_cli_getwd_rsp*); +extern bool_t xdr_gf1_cli_log_level_req (XDR *, gf1_cli_log_level_req*); +extern bool_t xdr_gf1_cli_log_level_rsp (XDR *, gf1_cli_log_level_rsp*); +extern bool_t xdr_gf1_cli_status_volume_req (XDR *, gf1_cli_status_volume_req*); +extern bool_t xdr_gf1_cli_status_volume_rsp (XDR *, gf1_cli_status_volume_rsp*); #else /* K&R C */ extern bool_t xdr_gf1_cluster_type (); extern bool_t xdr_gf1_cli_replace_op (); +extern bool_t xdr_gf_quota_type (); extern bool_t xdr_gf1_cli_friends_list (); extern bool_t xdr_gf1_cli_get_volume (); extern bool_t xdr_gf1_cli_sync_volume (); @@ -605,7 +626,6 @@ extern bool_t xdr_gf1_cli_op_flags (); extern bool_t xdr_gf1_cli_gsync_set (); extern bool_t xdr_gf1_cli_stats_op (); extern bool_t xdr_gf1_cli_top_op (); -extern bool_t xdr_gf_quota_type (); extern bool_t xdr_gf1_cli_probe_req (); extern bool_t xdr_gf1_cli_probe_rsp (); extern bool_t xdr_gf1_cli_deprobe_req (); @@ -635,8 +655,6 @@ extern bool_t xdr_gf1_cli_replace_brick_req (); extern bool_t xdr_gf1_cli_replace_brick_rsp (); extern bool_t xdr_gf1_cli_reset_vol_req (); extern bool_t xdr_gf1_cli_reset_vol_rsp (); -extern bool_t xdr_gf1_cli_quota_req (); -extern bool_t xdr_gf1_cli_quota_rsp (); extern bool_t xdr_gf1_cli_set_vol_req (); extern bool_t xdr_gf1_cli_set_vol_rsp (); extern bool_t xdr_gf1_cli_log_filename_req (); @@ -653,10 +671,14 @@ extern bool_t xdr_gf1_cli_gsync_set_req (); extern bool_t xdr_gf1_cli_gsync_set_rsp (); extern bool_t xdr_gf1_cli_stats_volume_req (); extern bool_t xdr_gf1_cli_stats_volume_rsp (); -extern bool_t xdr_gf1_cli_log_level_req (); -extern bool_t xdr_gf1_cli_log_level_rsp (); +extern bool_t xdr_gf1_cli_quota_req (); +extern bool_t xdr_gf1_cli_quota_rsp (); extern bool_t xdr_gf1_cli_getwd_req (); extern bool_t xdr_gf1_cli_getwd_rsp (); +extern bool_t xdr_gf1_cli_log_level_req (); +extern bool_t xdr_gf1_cli_log_level_rsp (); +extern bool_t xdr_gf1_cli_status_volume_req (); +extern bool_t xdr_gf1_cli_status_volume_rsp (); #endif /* K&R C */ diff --git a/rpc/xdr/src/cli1-xdr.x b/rpc/xdr/src/cli1-xdr.x index ee21d4bb3..db15b822a 100644 --- a/rpc/xdr/src/cli1-xdr.x +++ b/rpc/xdr/src/cli1-xdr.x @@ -1,7 +1,8 @@ enum gf1_cluster_type { GF_CLUSTER_TYPE_NONE = 0, GF_CLUSTER_TYPE_STRIPE, - GF_CLUSTER_TYPE_REPLICATE + GF_CLUSTER_TYPE_REPLICATE, + GF_CLUSTER_TYPE_STRIPE_REPLICATE } ; enum gf1_cli_replace_op { @@ -344,6 +345,7 @@ struct gf1_cli_gsync_set_rsp { struct gf1_cli_stats_volume_req { string volname<>; gf1_cli_stats_op op; + opaque dict_req<>; }; struct gf1_cli_stats_volume_rsp { @@ -378,13 +380,25 @@ struct gf1_cli_getwd_rsp { }; struct gf1_cli_log_level_req { - char *volname; - char *xlator; - char *loglevel; + string volname<>; + string xlator<>; + string loglevel<>; }; struct gf1_cli_log_level_rsp { int op_ret; int op_errno; - char *op_errstr; + string op_errstr<>; +}; + +struct gf1_cli_status_volume_req { + string volname<>; + opaque dict<>; +}; + +struct gf1_cli_status_volume_rsp { + int op_ret; + int op_errno; + string op_errstr<>; + opaque dict<>; }; diff --git a/rpc/xdr/src/cli1.c b/rpc/xdr/src/cli1.c index 56d59bea6..b69aa6120 100644 --- a/rpc/xdr/src/cli1.c +++ b/rpc/xdr/src/cli1.c @@ -776,3 +776,39 @@ gf_xdr_from_cli_log_level_rsp (struct iovec outmsg, void *args) return xdr_serialize_generic (outmsg, (void *)args, (xdrproc_t)xdr_gf1_cli_log_level_rsp); } + +ssize_t +gf_xdr_serialize_cli_status_volume_rsp (struct iovec outmsg, void *rsp) +{ + return xdr_serialize_generic (outmsg, (void *)rsp, + (xdrproc_t)xdr_gf1_cli_status_volume_rsp); + +} + +ssize_t +gf_xdr_to_cli_status_volume_req (struct iovec inmsg, void *args) +{ + return xdr_to_generic (inmsg, (void *)args, + (xdrproc_t)xdr_gf1_cli_status_volume_req); +} + +ssize_t +gf_xdr_from_cli_status_volume_req (struct iovec outmsg, void *args) +{ + return xdr_serialize_generic (outmsg, (void*)args, + (xdrproc_t)xdr_gf1_cli_status_volume_req); +} + +ssize_t +gf_xdr_to_cli_status_volume_rsp (struct iovec inmsg, void *args) +{ + return xdr_to_generic (inmsg, (void *)args, + (xdrproc_t)xdr_gf1_cli_status_volume_rsp); +} + +ssize_t +gf_xdr_from_cli_status_volume_rsp (struct iovec outmsg, void *args) +{ + return xdr_serialize_generic (outmsg, (void *)args, + (xdrproc_t)xdr_gf1_cli_status_volume_rsp); +} diff --git a/rpc/xdr/src/cli1.h b/rpc/xdr/src/cli1.h index 22c16862e..9da385cbb 100644 --- a/rpc/xdr/src/cli1.h +++ b/rpc/xdr/src/cli1.h @@ -343,4 +343,20 @@ gf_xdr_to_cli_getwd_rsp (struct iovec inmsg, void *args); ssize_t gf_xdr_from_cli_getwd_rsp (struct iovec outmsg, void *args); + +ssize_t +gf_xdr_serialize_cli_status_volume_rsp (struct iovec outmsg, void *rsp); + +ssize_t +gf_xdr_to_cli_status_volume_req (struct iovec inmsg, void *args); + +ssize_t +gf_xdr_to_cli_status_volume_rsp (struct iovec inmsg, void *args); + +ssize_t +gf_xdr_from_cli_status_volume_req (struct iovec outmsg, void *req); + +ssize_t +gf_xdr_serialize_cli_status_volume_rsp (struct iovec outmsg, void *rsp); + #endif /* !_CLI1_H */ |