autobuild v6.0-17
Resolves: bz#1704562 bz#1758618 bz#1760261 Signed-off-by: Rinku Kothiya <rkothiya@redhat.com>
This commit is contained in:
Rinku Kothiya
parent
3a8f5fa512
commit
368ff21b12
@ -0,0 +1,56 @@
|
||||
From 90e52f3b44da0ed05e35ebd474e284d45794b0d6 Mon Sep 17 00:00:00 2001
|
||||
From: Sanju Rakonde <srakonde@redhat.com>
|
||||
Date: Thu, 10 Oct 2019 20:40:49 +0530
|
||||
Subject: [PATCH 305/307] glusterd: rebalance start should fail when quorum is
|
||||
not met
|
||||
|
||||
rebalance start should not succeed if quorum is not met.
|
||||
this patch adds a condition to check whether quorum is met
|
||||
in pre-validation stage.
|
||||
|
||||
> fixes: bz#1760467
|
||||
> Change-Id: Ic7d0d08f69e4bc6d5e7abae713ec1881531c8ad4
|
||||
> Signed-off-by: Sanju Rakonde <srakonde@redhat.com>
|
||||
|
||||
upstream patch: https://review.gluster.org/#/c/glusterfs/+/23536/
|
||||
BUG: 1760261
|
||||
Change-Id: Ic7d0d08f69e4bc6d5e7abae713ec1881531c8ad4
|
||||
Signed-off-by: Sanju Rakonde <srakonde@redhat.com>
|
||||
Reviewed-on: https://code.engineering.redhat.com/gerrit/183146
|
||||
Tested-by: RHGS Build Bot <nigelb@redhat.com>
|
||||
Reviewed-by: Sunil Kumar Heggodu Gopala Acharya <sheggodu@redhat.com>
|
||||
---
|
||||
tests/bugs/glusterd/quorum-validation.t | 2 ++
|
||||
xlators/mgmt/glusterd/src/glusterd-mgmt.c | 3 ++-
|
||||
2 files changed, 4 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/tests/bugs/glusterd/quorum-validation.t b/tests/bugs/glusterd/quorum-validation.t
|
||||
index ff46729..3cc3351 100644
|
||||
--- a/tests/bugs/glusterd/quorum-validation.t
|
||||
+++ b/tests/bugs/glusterd/quorum-validation.t
|
||||
@@ -34,6 +34,8 @@ TEST ! $CLI_1 volume add-brick $V0 $H1:$B1/${V0}2
|
||||
TEST ! $CLI_1 volume remove-brick $V0 $H1:$B1/${V0}0 start
|
||||
TEST ! $CLI_1 volume set $V0 barrier enable
|
||||
|
||||
+#quorum is not met, rebalance/profile start should fail
|
||||
+TEST ! $CLI_1 volume rebalance $V0 start
|
||||
TEST ! $CLI_1 volume profile $V0 start
|
||||
|
||||
#bug-1690753 - Volume stop when quorum not met is successful
|
||||
diff --git a/xlators/mgmt/glusterd/src/glusterd-mgmt.c b/xlators/mgmt/glusterd/src/glusterd-mgmt.c
|
||||
index ec78913..a4915f3 100644
|
||||
--- a/xlators/mgmt/glusterd/src/glusterd-mgmt.c
|
||||
+++ b/xlators/mgmt/glusterd/src/glusterd-mgmt.c
|
||||
@@ -1059,7 +1059,8 @@ glusterd_mgmt_v3_pre_validate(glusterd_op_t op, dict_t *req_dict,
|
||||
goto out;
|
||||
}
|
||||
|
||||
- if (op == GD_OP_PROFILE_VOLUME || op == GD_OP_STOP_VOLUME) {
|
||||
+ if (op == GD_OP_PROFILE_VOLUME || op == GD_OP_STOP_VOLUME ||
|
||||
+ op == GD_OP_REBALANCE) {
|
||||
ret = glusterd_validate_quorum(this, op, req_dict, op_errstr);
|
||||
if (ret) {
|
||||
gf_msg(this->name, GF_LOG_ERROR, 0, GD_MSG_SERVER_QUORUM_NOT_MET,
|
||||
--
|
||||
1.8.3.1
|
||||
|
||||
43
0306-cli-fix-distCount-value.patch
Normal file
43
0306-cli-fix-distCount-value.patch
Normal file
@ -0,0 +1,43 @@
|
||||
From 167980565e1ab56989b25fe6aa0203aeb7970c8b Mon Sep 17 00:00:00 2001
|
||||
From: Sanju Rakonde <srakonde@redhat.com>
|
||||
Date: Sun, 6 Oct 2019 19:05:28 +0530
|
||||
Subject: [PATCH 306/307] cli: fix distCount value
|
||||
|
||||
gluster volume info --xml id displaying wrong distCount
|
||||
value. This patch addresses it.
|
||||
|
||||
> fixes: bz#1758878
|
||||
> Change-Id: I64081597e06018361e6524587b433b0c4b2a0260
|
||||
> Signed-off-by: Sanju Rakonde <srakonde@redhat.com>
|
||||
|
||||
upstream patch: https://review.gluster.org/#/c/glusterfs/+/23521/
|
||||
|
||||
BUG: 1758618
|
||||
Change-Id: I64081597e06018361e6524587b433b0c4b2a0260
|
||||
Signed-off-by: Sanju Rakonde <srakonde@redhat.com>
|
||||
Reviewed-on: https://code.engineering.redhat.com/gerrit/183147
|
||||
Tested-by: RHGS Build Bot <nigelb@redhat.com>
|
||||
Reviewed-by: Sunil Kumar Heggodu Gopala Acharya <sheggodu@redhat.com>
|
||||
---
|
||||
cli/src/cli-xml-output.c | 5 +++--
|
||||
1 file changed, 3 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/cli/src/cli-xml-output.c b/cli/src/cli-xml-output.c
|
||||
index b417bb8..006e2fb 100644
|
||||
--- a/cli/src/cli-xml-output.c
|
||||
+++ b/cli/src/cli-xml-output.c
|
||||
@@ -2548,8 +2548,9 @@ cli_xml_output_vol_info(cli_local_t *local, dict_t *dict)
|
||||
ret = dict_get_int32(dict, key, &dist_count);
|
||||
if (ret)
|
||||
goto out;
|
||||
- ret = xmlTextWriterWriteFormatElement(
|
||||
- local->writer, (xmlChar *)"distCount", "%d", dist_count);
|
||||
+ ret = xmlTextWriterWriteFormatElement(local->writer,
|
||||
+ (xmlChar *)"distCount", "%d",
|
||||
+ (brick_count / dist_count));
|
||||
XML_RET_CHECK_AND_GOTO(ret, out);
|
||||
|
||||
snprintf(key, sizeof(key), "volume%d.stripe_count", i);
|
||||
--
|
||||
1.8.3.1
|
||||
|
||||
42
0307-ssl-fix-RHEL8-regression-failure.patch
Normal file
42
0307-ssl-fix-RHEL8-regression-failure.patch
Normal file
@ -0,0 +1,42 @@
|
||||
From be9695391f39fe6eb1d157f6bfd018116d1ee42b Mon Sep 17 00:00:00 2001
|
||||
From: Sanju Rakonde <srakonde@redhat.com>
|
||||
Date: Mon, 30 Sep 2019 13:14:06 +0530
|
||||
Subject: [PATCH 307/307] ssl: fix RHEL8 regression failure
|
||||
|
||||
This tests is failing with
|
||||
"SSL routines:SSL_CTX_use_certificate:ee key too small"
|
||||
in RHEL8. This change is made according to
|
||||
https://access.redhat.com/solutions/4157431
|
||||
|
||||
> updates: bz#1756900
|
||||
> Change-Id: Ib436372c3bd94bcf7324976337add7da4088b3d5
|
||||
> Signed-off-by: Sanju Rakonde <srakonde@redhat.com>
|
||||
|
||||
upstream patch: https://review.gluster.org/#/c/glusterfs/+/23501/
|
||||
|
||||
BUG: 1704562
|
||||
Change-Id: Ib436372c3bd94bcf7324976337add7da4088b3d5
|
||||
Signed-off-by: Sanju Rakonde <srakonde@redhat.com>
|
||||
Reviewed-on: https://code.engineering.redhat.com/gerrit/183148
|
||||
Tested-by: RHGS Build Bot <nigelb@redhat.com>
|
||||
Reviewed-by: Sunil Kumar Heggodu Gopala Acharya <sheggodu@redhat.com>
|
||||
---
|
||||
tests/bugs/cli/bug-1320388.t | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/tests/bugs/cli/bug-1320388.t b/tests/bugs/cli/bug-1320388.t
|
||||
index f5ffcbe..8e5d77b 100755
|
||||
--- a/tests/bugs/cli/bug-1320388.t
|
||||
+++ b/tests/bugs/cli/bug-1320388.t
|
||||
@@ -21,7 +21,7 @@ cleanup;
|
||||
rm -f $SSL_BASE/glusterfs.*
|
||||
touch "$GLUSTERD_WORKDIR"/secure-access
|
||||
|
||||
-TEST openssl genrsa -out $SSL_KEY 1024
|
||||
+TEST openssl genrsa -out $SSL_KEY 3072
|
||||
TEST openssl req -new -x509 -key $SSL_KEY -subj /CN=Anyone -out $SSL_CERT
|
||||
ln $SSL_CERT $SSL_CA
|
||||
|
||||
--
|
||||
1.8.3.1
|
||||
|
||||
@ -231,7 +231,7 @@ Release: 0.1%{?prereltag:.%{prereltag}}%{?dist}
|
||||
%else
|
||||
Name: glusterfs
|
||||
Version: 6.0
|
||||
Release: 16%{?dist}
|
||||
Release: 17%{?dist}
|
||||
ExcludeArch: i686
|
||||
%endif
|
||||
License: GPLv2 or LGPLv3+
|
||||
@ -613,6 +613,9 @@ Patch0301: 0301-posix-Brick-is-going-down-unexpectedly.patch
|
||||
Patch0302: 0302-cluster-ec-prevent-filling-shd-log-with-table-not-fo.patch
|
||||
Patch0303: 0303-posix-heketidbstorage-bricks-go-down-during-PVC-crea.patch
|
||||
Patch0304: 0304-cluster-dht-Correct-fd-processing-loop.patch
|
||||
Patch0305: 0305-glusterd-rebalance-start-should-fail-when-quorum-is-.patch
|
||||
Patch0306: 0306-cli-fix-distCount-value.patch
|
||||
Patch0307: 0307-ssl-fix-RHEL8-regression-failure.patch
|
||||
|
||||
%description
|
||||
GlusterFS is a distributed file-system capable of scaling to several
|
||||
@ -2326,6 +2329,9 @@ fi
|
||||
%endif
|
||||
|
||||
%changelog
|
||||
* Fri Oct 11 2019 Rinku Kothiya <rkothiya@redhat.com> - 6.0-17
|
||||
- fixes bugs bz#1704562 bz#1758618 bz#1760261
|
||||
|
||||
* Wed Oct 09 2019 Rinku Kothiya <rkothiya@redhat.com> - 6.0-16
|
||||
- fixes bugs bz#1752713 bz#1756325
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user