diff options
| author | Pavan Sondur <pavan@gluster.com> | 2010-10-08 07:06:57 +0000 |
|---|---|---|
| committer | Vijay Bellur <vijay@dev.gluster.com> | 2010-10-08 06:05:10 -0700 |
| commit | cd5c9df4b67073089a5502d5e4c2e2e7d2141e4a (patch) | |
| tree | 9a4717a1916d41b540d4b5fb57a6b6ee0a3e316f /rpc | |
| parent | 09914c02f24b4cc74cb6aad9994ae590cf8b76bf (diff) | |
mgmt/glusterd: Fix replace brick to pass src-brick and dst-brick port nos properly.v3.1.0qa42
Fix also contains patch from shishir ng for maintaining replace-brick
states in glusterd.
Signed-off-by: Pavan Vilas Sondur <pavan@gluster.com>
Signed-off-by: Vijay Bellur <vijay@dev.gluster.com>
BUG: 1235 (Bug for all pump/migrate commits)
URL: http://bugs.gluster.com/cgi-bin/bugzilla3/show_bug.cgi?id=1235
Diffstat (limited to 'rpc')
| -rw-r--r-- | rpc/xdr/src/glusterd1-xdr.c | 6 | ||||
| -rw-r--r-- | rpc/xdr/src/glusterd1-xdr.h | 4 | ||||
| -rw-r--r-- | rpc/xdr/src/glusterd1.x | 1 |
3 files changed, 11 insertions, 0 deletions
diff --git a/rpc/xdr/src/glusterd1-xdr.c b/rpc/xdr/src/glusterd1-xdr.c index fce8b87cb63..189c1a56ee2 100644 --- a/rpc/xdr/src/glusterd1-xdr.c +++ b/rpc/xdr/src/glusterd1-xdr.c @@ -219,6 +219,8 @@ xdr_gd1_mgmt_stage_op_rsp (XDR *xdrs, gd1_mgmt_stage_op_rsp *objp) } 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; } else if (xdrs->x_op == XDR_DECODE) { if (!xdr_vector (xdrs, (char *)objp->uuid, 16, @@ -240,6 +242,8 @@ xdr_gd1_mgmt_stage_op_rsp (XDR *xdrs, gd1_mgmt_stage_op_rsp *objp) } 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; } @@ -254,6 +258,8 @@ xdr_gd1_mgmt_stage_op_rsp (XDR *xdrs, gd1_mgmt_stage_op_rsp *objp) 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/glusterd1-xdr.h b/rpc/xdr/src/glusterd1-xdr.h index 74e4d9d7656..ca57059d829 100644 --- a/rpc/xdr/src/glusterd1-xdr.h +++ b/rpc/xdr/src/glusterd1-xdr.h @@ -133,6 +133,10 @@ struct gd1_mgmt_stage_op_rsp { int op_ret; int op_errno; char *op_errstr; + struct { + u_int dict_len; + char *dict_val; + } dict; }; typedef struct gd1_mgmt_stage_op_rsp gd1_mgmt_stage_op_rsp; diff --git a/rpc/xdr/src/glusterd1.x b/rpc/xdr/src/glusterd1.x index ad6d32219e2..ff436729c28 100644 --- a/rpc/xdr/src/glusterd1.x +++ b/rpc/xdr/src/glusterd1.x @@ -80,6 +80,7 @@ struct gd1_mgmt_stage_op_rsp { int op_ret; int op_errno; string op_errstr<>; + opaque dict<>; } ; struct gd1_mgmt_commit_op_req { |