From 123db32a53f7e2f99c0d63b368ed8a8ee6b41f62 Mon Sep 17 00:00:00 2001 From: Raghavendra Bhat Date: Thu, 20 Mar 2014 14:46:02 +0530 Subject: mgmt/glusterd: do cleanup of snapshots in post-validate phase if half baked objects are there Change-Id: I372cac98ad054cdc1a6fbc7f6c77c25981063b2f Signed-off-by: Raghavendra Bhat Reviewed-on: http://review.gluster.org/7237 Reviewed-by: Rajesh Joseph Tested-by: Rajesh Joseph --- rpc/xdr/src/glusterd1-xdr.c | 2 ++ rpc/xdr/src/glusterd1-xdr.h | 1 + rpc/xdr/src/glusterd1-xdr.x | 1 + 3 files changed, 4 insertions(+) (limited to 'rpc') diff --git a/rpc/xdr/src/glusterd1-xdr.c b/rpc/xdr/src/glusterd1-xdr.c index 6e749e258..7fa98aaeb 100644 --- a/rpc/xdr/src/glusterd1-xdr.c +++ b/rpc/xdr/src/glusterd1-xdr.c @@ -804,6 +804,8 @@ xdr_gd1_mgmt_v3_post_val_req (XDR *xdrs, gd1_mgmt_v3_post_val_req *objp) return FALSE; if (!xdr_int (xdrs, &objp->op)) return FALSE; + if (!xdr_int (xdrs, &objp->op_ret)) + 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 5903104ed..b6be23d06 100644 --- a/rpc/xdr/src/glusterd1-xdr.h +++ b/rpc/xdr/src/glusterd1-xdr.h @@ -297,6 +297,7 @@ typedef struct gd1_mgmt_v3_commit_rsp gd1_mgmt_v3_commit_rsp; struct gd1_mgmt_v3_post_val_req { u_char uuid[16]; int op; + int op_ret; struct { u_int dict_len; char *dict_val; diff --git a/rpc/xdr/src/glusterd1-xdr.x b/rpc/xdr/src/glusterd1-xdr.x index fb0973af9..f5c45c9e4 100644 --- a/rpc/xdr/src/glusterd1-xdr.x +++ b/rpc/xdr/src/glusterd1-xdr.x @@ -189,6 +189,7 @@ struct gd1_mgmt_v3_commit_rsp { struct gd1_mgmt_v3_post_val_req { unsigned char uuid[16]; int op; + int op_ret; opaque dict<>; } ; -- cgit