summaryrefslogtreecommitdiffstats
path: root/rpc
diff options
context:
space:
mode:
authorCsaba Henk <csaba@gluster.com>2011-04-19 07:19:17 +0000
committerAnand Avati <avati@gluster.com>2011-04-21 00:39:50 -0700
commit0dd8c38d17e51c4b8bd1471854315e27c25cc615 (patch)
tree93a85fc17bf65ba58421afb30be2c9a73ed1c6b5 /rpc
parent29ac0febecbca0700bb4b1e2335b8dace5ff452c (diff)
geo-replication: revamp CONFIG command
Drop the config_type RPC req field, use just a "subop" key in the param dict. Signed-off-by: Csaba Henk <csaba@gluster.com> Signed-off-by: Anand Avati <avati@gluster.com> BUG: 2785 (gsyncd logs on slave side go to /dev/null) URL: http://bugs.gluster.com/cgi-bin/bugzilla3/show_bug.cgi?id=2785
Diffstat (limited to 'rpc')
-rw-r--r--rpc/xdr/src/cli1-xdr.c4
-rw-r--r--rpc/xdr/src/cli1-xdr.h10
-rw-r--r--rpc/xdr/src/cli1-xdr.x9
3 files changed, 8 insertions, 15 deletions
diff --git a/rpc/xdr/src/cli1-xdr.c b/rpc/xdr/src/cli1-xdr.c
index 0f5dc98..e0a1e10 100644
--- a/rpc/xdr/src/cli1-xdr.c
+++ b/rpc/xdr/src/cli1-xdr.c
@@ -749,10 +749,10 @@ 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_int (xdrs, &objp->config_type))
- return FALSE;
if (!xdr_string (xdrs, &objp->op_name, ~0))
return FALSE;
+ if (!xdr_string (xdrs, &objp->subop, ~0))
+ return FALSE;
if (!xdr_string (xdrs, &objp->master, ~0))
return FALSE;
if (!xdr_string (xdrs, &objp->slave, ~0))
diff --git a/rpc/xdr/src/cli1-xdr.h b/rpc/xdr/src/cli1-xdr.h
index 96f8def..5b6bfd8 100644
--- a/rpc/xdr/src/cli1-xdr.h
+++ b/rpc/xdr/src/cli1-xdr.h
@@ -87,12 +87,8 @@ enum gf1_cli_gsync_set {
GF_GSYNC_OPTION_TYPE_NONE = 0,
GF_GSYNC_OPTION_TYPE_START = 1,
GF_GSYNC_OPTION_TYPE_STOP = 2,
- GF_GSYNC_OPTION_TYPE_CONFIGURE = 3,
- GF_GSYNC_OPTION_TYPE_CONFIG_SET = 4,
- GF_GSYNC_OPTION_TYPE_CONFIG_DEL = 5,
- GF_GSYNC_OPTION_TYPE_CONFIG_GET = 6,
- GF_GSYNC_OPTION_TYPE_CONFIG_GET_ALL = 7,
- GF_GSYNC_OPTION_TYPE_STATUS = 8,
+ GF_GSYNC_OPTION_TYPE_CONFIG = 3,
+ GF_GSYNC_OPTION_TYPE_STATUS = 4,
};
typedef enum gf1_cli_gsync_set gf1_cli_gsync_set;
@@ -478,8 +474,8 @@ struct gf1_cli_gsync_set_rsp {
int op_errno;
char *op_errstr;
int type;
- int config_type;
char *op_name;
+ char *subop;
char *master;
char *slave;
char *gsync_prefix;
diff --git a/rpc/xdr/src/cli1-xdr.x b/rpc/xdr/src/cli1-xdr.x
index 99344a9..154a2c8 100644
--- a/rpc/xdr/src/cli1-xdr.x
+++ b/rpc/xdr/src/cli1-xdr.x
@@ -46,11 +46,8 @@ enum gf1_cli_gsync_set {
GF_GSYNC_OPTION_TYPE_NONE,
GF_GSYNC_OPTION_TYPE_START,
GF_GSYNC_OPTION_TYPE_STOP,
- GF_GSYNC_OPTION_TYPE_CONFIGURE,
- GF_GSYNC_OPTION_TYPE_CONFIG_SET,
- GF_GSYNC_OPTION_TYPE_CONFIG_DEL,
- GF_GSYNC_OPTION_TYPE_CONFIG_GET,
- GF_GSYNC_OPTION_TYPE_CONFIG_GET_ALL
+ GF_GSYNC_OPTION_TYPE_CONFIG,
+ GF_GSYNC_OPTION_TYPE_STATUS
};
enum gf1_cli_stats_op {
@@ -341,8 +338,8 @@ struct gf1_cli_gsync_set_rsp {
int op_errno;
string op_errstr<>;
int type;
- int config_type;
string op_name<>;
+ string subop<>;
string master<>;
string slave<>;
string gsync_prefix<>;