|
 |
21ab4e |
From a1957a3e77203033ce7e4ef70bab85f45f5c4164 Mon Sep 17 00:00:00 2001
|
|
|
21ab4e |
From: Samikshan Bairagya <sbairagy@redhat.com>
|
|
|
21ab4e |
Date: Mon, 10 Jul 2017 11:54:52 +0530
|
|
|
21ab4e |
Subject: [PATCH 553/557] glusterd: Revert op-version for
|
|
|
21ab4e |
"cluster.max-brick-per-process"
|
|
|
21ab4e |
|
|
|
21ab4e |
The op-version for the "cluster.max-brick-per-process" option was
|
|
|
21ab4e |
set to 3.12.0 in the upstream patch and was backported here:
|
|
|
21ab4e |
https://code.engineering.redhat.com/gerrit/#/c/111799. This commit
|
|
|
21ab4e |
reverts the op-version for this option to 3.11.1 instead.
|
|
|
21ab4e |
|
|
|
21ab4e |
Label: DOWNSTREAM ONLY
|
|
|
21ab4e |
|
|
|
21ab4e |
Change-Id: I23639cef43d41915eea0394d019b1e0796a99d7b
|
|
|
21ab4e |
BUG: 1468950
|
|
|
21ab4e |
Signed-off-by: Samikshan Bairagya <sbairagy@redhat.com>
|
|
|
21ab4e |
Reviewed-on: https://code.engineering.redhat.com/gerrit/111804
|
|
|
21ab4e |
Reviewed-by: Atin Mukherjee <amukherj@redhat.com>
|
|
|
21ab4e |
---
|
|
|
21ab4e |
libglusterfs/src/globals.h | 4 +---
|
|
|
21ab4e |
xlators/mgmt/glusterd/src/glusterd-volume-set.c | 2 +-
|
|
|
21ab4e |
2 files changed, 2 insertions(+), 4 deletions(-)
|
|
|
21ab4e |
|
|
|
21ab4e |
diff --git a/libglusterfs/src/globals.h b/libglusterfs/src/globals.h
|
|
|
21ab4e |
index 01c52d3..caa7f64 100644
|
|
|
21ab4e |
--- a/libglusterfs/src/globals.h
|
|
|
21ab4e |
+++ b/libglusterfs/src/globals.h
|
|
|
21ab4e |
@@ -43,7 +43,7 @@
|
|
|
21ab4e |
*/
|
|
|
21ab4e |
#define GD_OP_VERSION_MIN 1 /* MIN is the fresh start op-version, mostly
|
|
|
21ab4e |
should not change */
|
|
|
21ab4e |
-#define GD_OP_VERSION_MAX GD_OP_VERSION_3_12_0 /* MAX VERSION is the maximum
|
|
|
21ab4e |
+#define GD_OP_VERSION_MAX GD_OP_VERSION_3_11_1 /* MAX VERSION is the maximum
|
|
|
21ab4e |
count in VME table, should
|
|
|
21ab4e |
keep changing with
|
|
|
21ab4e |
introduction of newer
|
|
|
21ab4e |
@@ -93,8 +93,6 @@
|
|
|
21ab4e |
|
|
|
21ab4e |
#define GD_OP_VERSION_3_11_1 31101 /* Op-version for GlusterFS 3.11.1 */
|
|
|
21ab4e |
|
|
|
21ab4e |
-#define GD_OP_VERSION_3_12_0 31200 /* Op-version for GlusterFS 3.12.0 */
|
|
|
21ab4e |
-
|
|
|
21ab4e |
#include "xlator.h"
|
|
|
21ab4e |
|
|
|
21ab4e |
/* THIS */
|
|
|
21ab4e |
diff --git a/xlators/mgmt/glusterd/src/glusterd-volume-set.c b/xlators/mgmt/glusterd/src/glusterd-volume-set.c
|
|
|
21ab4e |
index 03a220b..4b3c8df 100644
|
|
|
21ab4e |
--- a/xlators/mgmt/glusterd/src/glusterd-volume-set.c
|
|
|
21ab4e |
+++ b/xlators/mgmt/glusterd/src/glusterd-volume-set.c
|
|
|
21ab4e |
@@ -3271,7 +3271,7 @@ struct volopt_map_entry glusterd_volopt_map[] = {
|
|
|
21ab4e |
{ .key = GLUSTERD_BRICKMUX_LIMIT_KEY,
|
|
|
21ab4e |
.voltype = "mgmt/glusterd",
|
|
|
21ab4e |
.value = "1",
|
|
|
21ab4e |
- .op_version = GD_OP_VERSION_3_12_0,
|
|
|
21ab4e |
+ .op_version = GD_OP_VERSION_3_11_1,
|
|
|
21ab4e |
.validate_fn = validate_mux_limit
|
|
|
21ab4e |
},
|
|
|
21ab4e |
{ .key = NULL
|
|
|
21ab4e |
--
|
|
|
21ab4e |
1.8.3.1
|
|
|
21ab4e |
|