|
 |
887953 |
From c06048a218b4a2e56f72b05b4f9f5842eec611e4 Mon Sep 17 00:00:00 2001
|
|
|
887953 |
From: Krutika Dhananjay <kdhananj@redhat.com>
|
|
|
887953 |
Date: Wed, 12 Sep 2018 21:41:35 +0530
|
|
|
887953 |
Subject: [PATCH 431/444] glusterd: Reset op-version for
|
|
|
887953 |
"features.shard-deletion-rate"
|
|
|
887953 |
|
|
|
887953 |
The op-version for the "features.shard-deletion-rate" option was set to
|
|
|
887953 |
4.2.0 in the upstream patch and backported at
|
|
|
887953 |
e75be952569eb69325d5f505f7ab94aace31be52.
|
|
|
887953 |
This commit reverts the op-version for this option to 3.13.3.
|
|
|
887953 |
|
|
|
887953 |
Label: DOWNSTREAM ONLY
|
|
|
887953 |
|
|
|
887953 |
Change-Id: Ie3d12f3119ad7a4b40d81bd8bd6ed591658e8371
|
|
|
887953 |
BUG: 1520882
|
|
|
887953 |
Signed-off-by: Krutika Dhananjay <kdhananj@redhat.com>
|
|
|
887953 |
Reviewed-on: https://code.engineering.redhat.com/gerrit/154865
|
|
|
887953 |
Tested-by: RHGS Build Bot <nigelb@redhat.com>
|
|
|
887953 |
Reviewed-by: Sunil Kumar Heggodu Gopala Acharya <sheggodu@redhat.com>
|
|
|
887953 |
---
|
|
|
887953 |
libglusterfs/src/globals.h | 3 ++-
|
|
|
887953 |
xlators/mgmt/glusterd/src/glusterd-volume-set.c | 2 +-
|
|
|
887953 |
2 files changed, 3 insertions(+), 2 deletions(-)
|
|
|
887953 |
|
|
|
887953 |
diff --git a/libglusterfs/src/globals.h b/libglusterfs/src/globals.h
|
|
|
887953 |
index 699e73e..97c4fad 100644
|
|
|
887953 |
--- a/libglusterfs/src/globals.h
|
|
|
887953 |
+++ b/libglusterfs/src/globals.h
|
|
|
887953 |
@@ -109,11 +109,12 @@
|
|
|
887953 |
|
|
|
887953 |
#define GD_OP_VERSION_3_13_2 31302 /* Op-version for GlusterFS 3.13.2 */
|
|
|
887953 |
|
|
|
887953 |
-#define GD_OP_VERSION_4_2_0 40200 /* Op-version for GlusterFs 4.2.0 */
|
|
|
887953 |
+#define GD_OP_VERSION_3_13_3 31303 /* Op-version for GlusterFS 3.13.3 */
|
|
|
887953 |
|
|
|
887953 |
/* Downstream only change */
|
|
|
887953 |
#define GD_OP_VERSION_3_11_2 31102 /* Op-version for RHGS 3.3.1-async */
|
|
|
887953 |
#define GD_OP_VERSION_3_13_3 31303 /* Op-version for RHGS-3.4-Batch Update-1*/
|
|
|
887953 |
+#define GD_OP_VERSION_3_13_4 31304 /* Op-version for RHGS-3.4-Batch Update-2*/
|
|
|
887953 |
|
|
|
887953 |
#include "xlator.h"
|
|
|
887953 |
|
|
|
887953 |
diff --git a/xlators/mgmt/glusterd/src/glusterd-volume-set.c b/xlators/mgmt/glusterd/src/glusterd-volume-set.c
|
|
|
887953 |
index 4357562..a825f52 100644
|
|
|
887953 |
--- a/xlators/mgmt/glusterd/src/glusterd-volume-set.c
|
|
|
887953 |
+++ b/xlators/mgmt/glusterd/src/glusterd-volume-set.c
|
|
|
887953 |
@@ -3300,7 +3300,7 @@ struct volopt_map_entry glusterd_volopt_map[] = {
|
|
|
887953 |
},
|
|
|
887953 |
{ .key = "features.shard-deletion-rate",
|
|
|
887953 |
.voltype = "features/shard",
|
|
|
887953 |
- .op_version = GD_OP_VERSION_4_2_0,
|
|
|
887953 |
+ .op_version = GD_OP_VERSION_3_13_4,
|
|
|
887953 |
.flags = OPT_FLAG_CLIENT_OPT
|
|
|
887953 |
},
|
|
|
887953 |
{ .key = "features.scrub-throttle",
|
|
|
887953 |
--
|
|
|
887953 |
1.8.3.1
|
|
|
887953 |
|