|
 |
d1681e |
From 8e616a6badedec070098c2bc324e566b1a5d34b1 Mon Sep 17 00:00:00 2001
|
|
|
d1681e |
From: Mohammed Rafi KC <rkavunga@redhat.com>
|
|
|
d1681e |
Date: Sat, 18 Aug 2018 19:40:46 +0530
|
|
|
d1681e |
Subject: [PATCH 354/359] snapshot:Fix wrong dictionary key in snapshot cleanup
|
|
|
d1681e |
code
|
|
|
d1681e |
|
|
|
d1681e |
Snapshot was designed to support multiple volume snapshot,
|
|
|
d1681e |
hence the volume name keys are labelled with volume count.
|
|
|
d1681e |
So the volume key should have a volume count appended with
|
|
|
d1681e |
key
|
|
|
d1681e |
|
|
|
d1681e |
>Change-Id: I044d73fc86db0e662dc914669aecfb82a6476fb5
|
|
|
d1681e |
>fixes: bz#1618004
|
|
|
d1681e |
>Signed-off-by: Mohammed Rafi KC <rkavunga@redhat.com>
|
|
|
d1681e |
|
|
|
d1681e |
upstream patch: https://review.gluster.org/#/c/glusterfs/+/20854/
|
|
|
d1681e |
|
|
|
d1681e |
Change-Id: I044d73fc86db0e662dc914669aecfb82a6476fb5
|
|
|
d1681e |
BUG: 1615578
|
|
|
d1681e |
Signed-off-by: Sanju Rakonde <srakonde@redhat.com>
|
|
|
d1681e |
Reviewed-on: https://code.engineering.redhat.com/gerrit/147524
|
|
|
d1681e |
Tested-by: RHGS Build Bot <nigelb@redhat.com>
|
|
|
d1681e |
Reviewed-by: Atin Mukherjee <amukherj@redhat.com>
|
|
|
d1681e |
---
|
|
|
d1681e |
xlators/mgmt/glusterd/src/glusterd-snapshot.c | 3 ++-
|
|
|
d1681e |
1 file changed, 2 insertions(+), 1 deletion(-)
|
|
|
d1681e |
|
|
|
d1681e |
diff --git a/xlators/mgmt/glusterd/src/glusterd-snapshot.c b/xlators/mgmt/glusterd/src/glusterd-snapshot.c
|
|
|
d1681e |
index fdd5012..830a67f 100644
|
|
|
d1681e |
--- a/xlators/mgmt/glusterd/src/glusterd-snapshot.c
|
|
|
d1681e |
+++ b/xlators/mgmt/glusterd/src/glusterd-snapshot.c
|
|
|
d1681e |
@@ -6529,7 +6529,8 @@ glusterd_do_snap_cleanup (dict_t *dict, char **op_errstr, dict_t *rsp_dict)
|
|
|
d1681e |
goto out;
|
|
|
d1681e |
}
|
|
|
d1681e |
|
|
|
d1681e |
- ret = dict_get_str (dict, "volname", &volname);
|
|
|
d1681e |
+ /* As of now snapshot of multiple volumes are not supported */
|
|
|
d1681e |
+ ret = dict_get_str (dict, "volname1", &volname);
|
|
|
d1681e |
if (ret) {
|
|
|
d1681e |
gf_msg ("glusterd", GF_LOG_ERROR, 0,
|
|
|
d1681e |
GD_MSG_DICT_GET_FAILED, "Unable to get"
|
|
|
d1681e |
--
|
|
|
d1681e |
1.8.3.1
|
|
|
d1681e |
|