diff --git a/0450-tests-basic-ctime-enable-ctime-before-testing.patch b/0450-tests-basic-ctime-enable-ctime-before-testing.patch new file mode 100644 index 0000000..96de5a1 --- /dev/null +++ b/0450-tests-basic-ctime-enable-ctime-before-testing.patch @@ -0,0 +1,35 @@ +From 09dce9ce8e946a86209b6f057bf14323036fa12a Mon Sep 17 00:00:00 2001 +From: Shwetha K Acharya +Date: Wed, 10 Jun 2020 11:44:56 +0530 +Subject: [PATCH 450/451] tests/basic/ctime: enable ctime before testing + +This is to ensure that this test successfully runs, even if +ctime is disabled by default (which is the case in downstream.) + +Label: DOWNSTREAM ONLY + +BUG: 1844359 +Change-Id: I91e80b3d8a56fc089aeb58b0254812111d394842 +Signed-off-by: Shwetha K Acharya +Reviewed-on: https://code.engineering.redhat.com/gerrit/202874 +Tested-by: RHGS Build Bot +Reviewed-by: Sunil Kumar Heggodu Gopala Acharya +--- + tests/basic/ctime/ctime-utimesat.t | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/tests/basic/ctime/ctime-utimesat.t b/tests/basic/ctime/ctime-utimesat.t +index 540e57a..da12fbe 100644 +--- a/tests/basic/ctime/ctime-utimesat.t ++++ b/tests/basic/ctime/ctime-utimesat.t +@@ -14,6 +14,7 @@ TEST $CLI volume set $V0 performance.read-after-open off + TEST $CLI volume set $V0 performance.open-behind off + TEST $CLI volume set $V0 performance.write-behind off + TEST $CLI volume set $V0 performance.io-cache off ++TEST $CLI volume set $V0 ctime on + + TEST $CLI volume start $V0 + +-- +1.8.3.1 + diff --git a/0451-extras-Modify-group-virt-to-include-network-related-.patch b/0451-extras-Modify-group-virt-to-include-network-related-.patch new file mode 100644 index 0000000..bba69e1 --- /dev/null +++ b/0451-extras-Modify-group-virt-to-include-network-related-.patch @@ -0,0 +1,44 @@ +From 96d9b659fd0367abe1666a5ac6203208e0dc056d Mon Sep 17 00:00:00 2001 +From: Krutika Dhananjay +Date: Mon, 4 May 2020 14:30:57 +0530 +Subject: [PATCH 451/451] extras: Modify group 'virt' to include + network-related options + +This is needed to work around an issue seen where vms running on +online hosts are getting killed when a different host is rebooted +in ovirt-gluster hyperconverged environments. Actual RCA is quite +lengthy and documented in the github issue. Please refer to it +for more details. + +Upstream patch: +> Upstream patch link: https://review.gluster.org/c/glusterfs/+/24400 +> Change-Id: Ic25b5f50144ad42458e5c847e1e7e191032396c1 +> Fixes: #1217 +> Signed-off-by: Krutika Dhananjay + +Change-Id: Ic25b5f50144ad42458e5c847e1e7e191032396c1 +BUG: 1845064 +Signed-off-by: Krutika Dhananjay +Reviewed-on: https://code.engineering.redhat.com/gerrit/203291 +Tested-by: RHGS Build Bot +Reviewed-by: Sunil Kumar Heggodu Gopala Acharya +--- + extras/group-virt.example | 5 +++++ + 1 file changed, 5 insertions(+) + +diff --git a/extras/group-virt.example b/extras/group-virt.example +index c2ce89d..3a441eb 100644 +--- a/extras/group-virt.example ++++ b/extras/group-virt.example +@@ -16,3 +16,8 @@ cluster.choose-local=off + client.event-threads=4 + server.event-threads=4 + performance.client-io-threads=on ++network.ping-timeout=20 ++server.tcp-user-timeout=20 ++server.keepalive-time=10 ++server.keepalive-interval=2 ++server.keepalive-count=5 +-- +1.8.3.1 + diff --git a/glusterfs.spec b/glusterfs.spec index ab97ec9..02fc5f0 100644 --- a/glusterfs.spec +++ b/glusterfs.spec @@ -237,7 +237,7 @@ Release: 0.1%{?prereltag:.%{prereltag}}%{?dist} %else Name: glusterfs Version: 6.0 -Release: 38%{?dist} +Release: 39%{?dist} ExcludeArch: i686 %endif License: GPLv2 or LGPLv3+ @@ -764,6 +764,8 @@ Patch0446: 0446-bitrot-Make-number-of-signer-threads-configurable.patch Patch0447: 0447-core-brick_mux-brick-crashed-when-creating-and-delet.patch Patch0448: 0448-Posix-Use-simple-approach-to-close-fd.patch Patch0449: 0449-test-Test-case-brick-mux-validation-in-cluster.t-is-.patch +Patch0450: 0450-tests-basic-ctime-enable-ctime-before-testing.patch +Patch0451: 0451-extras-Modify-group-virt-to-include-network-related-.patch %description GlusterFS is a distributed file-system capable of scaling to several @@ -1220,7 +1222,7 @@ do DEST_FILES=( $(egrep '^\+\+\+ b/' $p | cut -f 2- -d '/') ) EXCLUDE_DOCS=() for idx in ${!SOURCE_FILES[@]}; do - # skip the doc + # skip the doc source_file=${SOURCE_FILES[$idx]} dest_file=${DEST_FILES[$idx]} if [[ "$dest_file" =~ ^doc/.+ ]]; then @@ -2504,6 +2506,9 @@ fi %endif %changelog +* Wed Jun 17 2020 Deepshikha Khandelwal - 6.0-39 +- fixes bugs bz#1844359 bz#1845064 + * Wed Jun 10 2020 Rinku Kothiya - 6.0-38 - fixes bugs bz#1234220 bz#1286171 bz#1487177 bz#1524457 bz#1640573 bz#1663557 bz#1667954 bz#1683602 bz#1686897 bz#1721355 bz#1748865 bz#1750211