diff options
| author | Avra Sengupta <asengupt@redhat.com> | 2016-04-12 12:26:54 +0530 |
|---|---|---|
| committer | Rajesh Joseph <rjoseph@redhat.com> | 2016-08-23 00:11:54 -0700 |
| commit | efbae0fef5399a8826782b02140f44edaea0dac3 (patch) | |
| tree | 78c5fdc656ee64a024d79ccbd02941a47d2ee600 /rpc/xdr/src | |
| parent | 1df4a89de17e44c8c1f9b4794a7b8c2741f2bc2e (diff) | |
snapshot/cli: Fix snapshot status xml output
snap status --xml errors out if a brick is down and
doesn't have pid. It is handled in the cli of the snap
status where "N/A" is displayed in such a scenario.
Handled the same in xml
snap status <snapname> --xml fails as the writer is
not initialised for the same. Using GF_SNAP_STATUS_TYPE_ITER
instead of GF_SNAP_STATUS_TYPE_SNAP for all snap's
status to differentiate between the two scenarios.
Added testcase volume-snapshot-xml.t to check
all snapshot commands xml outputs
Change-Id: I99563e8f3e84f1aaeabd865326bb825c44f5c745
BUG: 1325831
Signed-off-by: Avra Sengupta <asengupt@redhat.com>
Reviewed-on: http://review.gluster.org/14018
Smoke: Gluster Build System <jenkins@build.gluster.org>
CentOS-regression: Gluster Build System <jenkins@build.gluster.org>
NetBSD-regression: NetBSD Build System <jenkins@build.gluster.org>
Reviewed-by: Rajesh Joseph <rjoseph@redhat.com>
Diffstat (limited to 'rpc/xdr/src')
| -rw-r--r-- | rpc/xdr/src/cli1-xdr.x | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/rpc/xdr/src/cli1-xdr.x b/rpc/xdr/src/cli1-xdr.x index f1d4ea93d6d..66d399bfaf8 100644 --- a/rpc/xdr/src/cli1-xdr.x +++ b/rpc/xdr/src/cli1-xdr.x @@ -197,10 +197,15 @@ enum gf1_cli_snapshot_status { GF_SNAP_STATUS_TYPE_ITER }; +/* Changing order of GF_SNAP_DELETE_TYPE_VOL * + * and GF_SNAP_DELETE_TYPE_SNAP so that they don't * + * overlap with the enums of GF_SNAP_STATUS_TYPE_SNAP, * + * and GF_SNAP_STATUS_TYPE_VOL * + */ enum gf1_cli_snapshot_delete { GF_SNAP_DELETE_TYPE_ALL = 0, - GF_SNAP_DELETE_TYPE_SNAP = 1, - GF_SNAP_DELETE_TYPE_VOL = 2, + GF_SNAP_DELETE_TYPE_VOL = 1, + GF_SNAP_DELETE_TYPE_SNAP = 2, GF_SNAP_DELETE_TYPE_ITER = 3 }; |