From 7c14e082ffb324e97734b4361331965992d55ceb Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Sep 17 2020 00:08:53 +0000 Subject: import glusterfs-6.0-37.2.el8 --- diff --git a/SOURCES/0384-Update-rfc.sh-to-rhgs-3.5.3.patch b/SOURCES/0384-Update-rfc.sh-to-rhgs-3.5.3.patch deleted file mode 100644 index 4db2222..0000000 --- a/SOURCES/0384-Update-rfc.sh-to-rhgs-3.5.3.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 27dc773af276e33fcca10788fae17d131c8d9bce Mon Sep 17 00:00:00 2001 -From: Rinku Kothiya -Date: Sun, 31 May 2020 15:46:24 -0400 -Subject: [PATCH 384/449] Update rfc.sh to rhgs-3.5.3 - -Signed-off-by: Rinku Kothiya ---- - rfc.sh | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/rfc.sh b/rfc.sh -index 37d551f..1dca29f 100755 ---- a/rfc.sh -+++ b/rfc.sh -@@ -18,7 +18,7 @@ done - shift $((OPTIND-1)) - - --branch="rhgs-3.5.2"; -+branch="rhgs-3.5.3"; - - set_hooks_commit_msg() - { --- -1.8.3.1 - diff --git a/SOURCES/0384-extras-Modify-group-virt-to-include-network-related-.patch b/SOURCES/0384-extras-Modify-group-virt-to-include-network-related-.patch new file mode 100644 index 0000000..45684e1 --- /dev/null +++ b/SOURCES/0384-extras-Modify-group-virt-to-include-network-related-.patch @@ -0,0 +1,44 @@ +From 2948ee521316d40384130138233178ba940b175f Mon Sep 17 00:00:00 2001 +From: Krutika Dhananjay +Date: Mon, 4 May 2020 14:30:57 +0530 +Subject: [PATCH 384/392] 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: 1848899 +Signed-off-by: Krutika Dhananjay +Reviewed-on: https://code.engineering.redhat.com/gerrit/203685 +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/SOURCES/0385-cluster-afr-Prioritize-ENOSPC-over-other-errors.patch b/SOURCES/0385-cluster-afr-Prioritize-ENOSPC-over-other-errors.patch new file mode 100644 index 0000000..5572e7f --- /dev/null +++ b/SOURCES/0385-cluster-afr-Prioritize-ENOSPC-over-other-errors.patch @@ -0,0 +1,237 @@ +From cdd067dcc0cd70d4f57e173b4050d8e2eb79725a Mon Sep 17 00:00:00 2001 +From: karthik-us +Date: Fri, 5 Jun 2020 17:20:04 +0530 +Subject: [PATCH 385/392] cluster/afr: Prioritize ENOSPC over other errors + +Backport of: https://review.gluster.org/#/c/glusterfs/+/24477/ + +Problem: +In a replicate/arbiter volume if file creations or writes fails on +quorum number of bricks and on one brick it is due to ENOSPC and +on other brick it fails for a different reason, it may fail with +errors other than ENOSPC in some cases. + +Fix: +Prioritize ENOSPC over other lesser priority errors and do not set +op_errno in posix_gfid_set if op_ret is 0 to avoid receiving any +error_no which can be misinterpreted by __afr_dir_write_finalize(). + +Also removing the function afr_has_arbiter_fop_cbk_quorum() which +might consider a successful reply form a single brick as quorum +success in some cases, whereas we always need fop to be successful +on quorum number of bricks in arbiter configuration. + +Change-Id: I4dd2bff17e6812bc7c8372130976e365e2407d88 +Signed-off-by: karthik-us +BUG: 1848895 +(cherry picked from commit 8b11ac1575ef167af2a47a96f7b7ed0f32bb5897) +Reviewed-on: https://code.engineering.redhat.com/gerrit/203691 +Tested-by: RHGS Build Bot +Reviewed-by: Sunil Kumar Heggodu Gopala Acharya +--- + .../bugs/replicate/issue-1254-prioritize-enospc.t | 80 ++++++++++++++++++++++ + xlators/cluster/afr/src/afr-common.c | 4 +- + xlators/cluster/afr/src/afr-transaction.c | 48 +------------ + xlators/storage/posix/src/posix-helpers.c | 2 +- + 4 files changed, 86 insertions(+), 48 deletions(-) + create mode 100644 tests/bugs/replicate/issue-1254-prioritize-enospc.t + +diff --git a/tests/bugs/replicate/issue-1254-prioritize-enospc.t b/tests/bugs/replicate/issue-1254-prioritize-enospc.t +new file mode 100644 +index 0000000..fab94b7 +--- /dev/null ++++ b/tests/bugs/replicate/issue-1254-prioritize-enospc.t +@@ -0,0 +1,80 @@ ++#!/bin/bash ++ ++. $(dirname $0)/../../include.rc ++. $(dirname $0)/../../volume.rc ++ ++cleanup ++ ++function create_bricks { ++ TEST truncate -s 100M $B0/brick0 ++ TEST truncate -s 100M $B0/brick1 ++ TEST truncate -s 20M $B0/brick2 ++ LO1=`SETUP_LOOP $B0/brick0` ++ TEST [ $? -eq 0 ] ++ TEST MKFS_LOOP $LO1 ++ LO2=`SETUP_LOOP $B0/brick1` ++ TEST [ $? -eq 0 ] ++ TEST MKFS_LOOP $LO2 ++ LO3=`SETUP_LOOP $B0/brick2` ++ TEST [ $? -eq 0 ] ++ TEST MKFS_LOOP $LO3 ++ TEST mkdir -p $B0/${V0}0 $B0/${V0}1 $B0/${V0}2 ++ TEST MOUNT_LOOP $LO1 $B0/${V0}0 ++ TEST MOUNT_LOOP $LO2 $B0/${V0}1 ++ TEST MOUNT_LOOP $LO3 $B0/${V0}2 ++} ++ ++function create_files { ++ local i=1 ++ while (true) ++ do ++ touch $M0/file$i ++ if [ -e $B0/${V0}2/file$i ]; ++ then ++ ((i++)) ++ else ++ break ++ fi ++ done ++} ++ ++TESTS_EXPECTED_IN_LOOP=13 ++ ++#Arbiter volume: Check for ENOSPC when arbiter brick becomes full# ++TEST glusterd ++create_bricks ++TEST $CLI volume create $V0 replica 3 arbiter 1 $H0:$B0/${V0}{0,1,2} ++TEST $CLI volume start $V0 ++TEST $CLI volume set $V0 performance.write-behind off ++TEST $GFS --volfile-server=$H0 --volfile-id=$V0 $M0 ++ ++create_files ++TEST kill_brick $V0 $H0 $B0/${V0}1 ++error1=$(touch $M0/file-1 2>&1) ++EXPECT "No space left on device" echo $error1 ++error2=$(mkdir $M0/dir-1 2>&1) ++EXPECT "No space left on device" echo $error2 ++error3=$((echo "Test" > $M0/file-3) 2>&1) ++EXPECT "No space left on device" echo $error3 ++ ++cleanup ++ ++#Replica-3 volume: Check for ENOSPC when one of the brick becomes full# ++#Keeping the third brick of lower size to simulate disk full scenario# ++TEST glusterd ++create_bricks ++TEST $CLI volume create $V0 replica 3 $H0:$B0/${V0}{0,1,2} ++TEST $CLI volume start $V0 ++TEST $CLI volume set $V0 performance.write-behind off ++TEST $GFS --volfile-server=$H0 --volfile-id=$V0 $M0 ++ ++create_files ++TEST kill_brick $V0 $H0 $B0/${V0}1 ++error1=$(touch $M0/file-1 2>&1) ++EXPECT "No space left on device" echo $error1 ++error2=$(mkdir $M0/dir-1 2>&1) ++EXPECT "No space left on device" echo $error2 ++error3=$((cat /dev/zero > $M0/file1) 2>&1) ++EXPECT "No space left on device" echo $error3 ++ ++cleanup +diff --git a/xlators/cluster/afr/src/afr-common.c b/xlators/cluster/afr/src/afr-common.c +index 3690b84..d6b70e9 100644 +--- a/xlators/cluster/afr/src/afr-common.c ++++ b/xlators/cluster/afr/src/afr-common.c +@@ -2463,7 +2463,7 @@ error: + * others in that they must be given higher priority while + * returning to the user. + * +- * The hierarchy is ENODATA > ENOENT > ESTALE > others ++ * The hierarchy is ENODATA > ENOENT > ESTALE > ENOSPC others + */ + + int +@@ -2475,6 +2475,8 @@ afr_higher_errno(int32_t old_errno, int32_t new_errno) + return ENOENT; + if (old_errno == ESTALE || new_errno == ESTALE) + return ESTALE; ++ if (old_errno == ENOSPC || new_errno == ENOSPC) ++ return ENOSPC; + + return new_errno; + } +diff --git a/xlators/cluster/afr/src/afr-transaction.c b/xlators/cluster/afr/src/afr-transaction.c +index 15f3a7e..8e65ae2 100644 +--- a/xlators/cluster/afr/src/afr-transaction.c ++++ b/xlators/cluster/afr/src/afr-transaction.c +@@ -514,42 +514,6 @@ afr_compute_pre_op_sources(call_frame_t *frame, xlator_t *this) + local->transaction.pre_op_sources[j] = 0; + } + +-gf_boolean_t +-afr_has_arbiter_fop_cbk_quorum(call_frame_t *frame) +-{ +- afr_local_t *local = NULL; +- afr_private_t *priv = NULL; +- xlator_t *this = NULL; +- gf_boolean_t fop_failed = _gf_false; +- unsigned char *pre_op_sources = NULL; +- int i = 0; +- +- local = frame->local; +- this = frame->this; +- priv = this->private; +- pre_op_sources = local->transaction.pre_op_sources; +- +- /* If the fop failed on the brick, it is not a source. */ +- for (i = 0; i < priv->child_count; i++) +- if (local->transaction.failed_subvols[i]) +- pre_op_sources[i] = 0; +- +- switch (AFR_COUNT(pre_op_sources, priv->child_count)) { +- case 1: +- if (pre_op_sources[ARBITER_BRICK_INDEX]) +- fop_failed = _gf_true; +- break; +- case 0: +- fop_failed = _gf_true; +- break; +- } +- +- if (fop_failed) +- return _gf_false; +- +- return _gf_true; +-} +- + void + afr_txn_arbitrate_fop(call_frame_t *frame, xlator_t *this) + { +@@ -968,12 +932,8 @@ afr_need_dirty_marking(call_frame_t *frame, xlator_t *this) + priv->child_count) + return _gf_false; + +- if (priv->arbiter_count) { +- if (!afr_has_arbiter_fop_cbk_quorum(frame)) +- need_dirty = _gf_true; +- } else if (!afr_has_fop_cbk_quorum(frame)) { ++ if (!afr_has_fop_cbk_quorum(frame)) + need_dirty = _gf_true; +- } + + return need_dirty; + } +@@ -1023,12 +983,8 @@ afr_handle_quorum(call_frame_t *frame, xlator_t *this) + * no split-brain with the fix. The problem is eliminated completely. + */ + +- if (priv->arbiter_count) { +- if (afr_has_arbiter_fop_cbk_quorum(frame)) +- return; +- } else if (afr_has_fop_cbk_quorum(frame)) { ++ if (afr_has_fop_cbk_quorum(frame)) + return; +- } + + if (afr_need_dirty_marking(frame, this)) + goto set_response; +diff --git a/xlators/storage/posix/src/posix-helpers.c b/xlators/storage/posix/src/posix-helpers.c +index 35dd3b6..aca0df6 100644 +--- a/xlators/storage/posix/src/posix-helpers.c ++++ b/xlators/storage/posix/src/posix-helpers.c +@@ -1059,7 +1059,7 @@ verify_handle: + ret = posix_handle_soft(this, path, loc, uuid_curr, &stat); + + out: +- if (!(*op_errno)) ++ if (ret && !(*op_errno)) + *op_errno = errno; + return ret; + } +-- +1.8.3.1 + diff --git a/SOURCES/0385-glusterd-start-glusterd-automatically-on-abnormal-sh.patch b/SOURCES/0385-glusterd-start-glusterd-automatically-on-abnormal-sh.patch deleted file mode 100644 index 2b194d3..0000000 --- a/SOURCES/0385-glusterd-start-glusterd-automatically-on-abnormal-sh.patch +++ /dev/null @@ -1,50 +0,0 @@ -From 143f85f55ded7a9075408e97d05abd9568d56e7b Mon Sep 17 00:00:00 2001 -From: Sanju Rakonde -Date: Mon, 25 Nov 2019 16:35:42 +0530 -Subject: [PATCH 385/449] glusterd: start glusterd automatically on abnormal - shutdown - -If glusterd crashes or goes down abnormally, systemd should -automatically bring the glusterd up. - -With this change, systemd brings glusterd up for atmost 3 times -within time period of 1 hour. If the limit exceeds, we have to -start the glusterd manually and reset the failure count using -systemctl reset-failed. - -credits: John Strunk - -> upstream patch link: https://review.gluster.org/#/c/glusterfs/+/23751/ -> fixes: bz#1776264 -> Change-Id: I312d243652fb13ba028814a2ea615b67e3b10b6a -> Signed-off-by: Sanju Rakonde - -BUG: 1663557 -Change-Id: I312d243652fb13ba028814a2ea615b67e3b10b6a -Signed-off-by: Sanju Rakonde -Reviewed-on: https://code.engineering.redhat.com/gerrit/202251 -Tested-by: RHGS Build Bot -Reviewed-by: Sunil Kumar Heggodu Gopala Acharya ---- - extras/systemd/glusterd.service.in | 5 +++++ - 1 file changed, 5 insertions(+) - -diff --git a/extras/systemd/glusterd.service.in b/extras/systemd/glusterd.service.in -index f604160..b944762 100644 ---- a/extras/systemd/glusterd.service.in -+++ b/extras/systemd/glusterd.service.in -@@ -15,6 +15,11 @@ ExecStart=@prefix@/sbin/glusterd -p @localstatedir@/run/glusterd.pid --log-leve - KillMode=process - TimeoutSec=300 - SuccessExitStatus=15 -+Restart=on-abnormal -+RestartSec=60 -+StartLimitBurst=3 -+StartLimitIntervalSec=3600 -+StartLimitInterval=3600 - - [Install] - WantedBy=multi-user.target --- -1.8.3.1 - diff --git a/SOURCES/0386-afr-prevent-spurious-entry-heals-leading-to-gfid-spl.patch b/SOURCES/0386-afr-prevent-spurious-entry-heals-leading-to-gfid-spl.patch new file mode 100644 index 0000000..9ba5451 --- /dev/null +++ b/SOURCES/0386-afr-prevent-spurious-entry-heals-leading-to-gfid-spl.patch @@ -0,0 +1,251 @@ +From 7689fbb4be83f0e0657ec2729c4d66ed341b5751 Mon Sep 17 00:00:00 2001 +From: Ravishankar N +Date: Tue, 11 Feb 2020 14:34:48 +0530 +Subject: [PATCH 386/392] afr: prevent spurious entry heals leading to gfid + split-brain + +Problem: +In a hyperconverged setup with granular-entry-heal enabled, if a file is +recreated while one of the bricks is down, and an index heal is triggered +(with the brick still down), entry-self heal was doing a spurious heal +with just the 2 good bricks. It was doing a post-op leading to removal +of the filename from .glusterfs/indices/entry-changes as well as +erroneous setting of afr xattrs on the parent. When the brick came up, +the xattrs were cleared, resulting in the renamed file not getting +healed and leading to gfid split-brain and EIO on the mount. + +Fix: +Proceed with entry heal only when shd can connect to all bricks of the replica, +just like in data and metadata heal. + +BUG: 1848893 + +> Upstream patch:https://review.gluster.org/#/c/glusterfs/+/24109/ +> fixes: bz#1801624 +> Change-Id: I916ae26ad1fabf259bc6362da52d433b7223b17e +> Signed-off-by: Ravishankar N + +Change-Id: I23f57e543cff1e3f35eb8dbc60a2babfae6838c7 +Signed-off-by: Ravishankar N +(cherry picked from commit 2b2eb846c49caba13ab92ec66af20292e7780fc1) +Reviewed-on: https://code.engineering.redhat.com/gerrit/203692 +Tested-by: RHGS Build Bot +Tested-by: Karthik Subrahmanya +Reviewed-by: Sunil Kumar Heggodu Gopala Acharya +--- + .../bug-1433571-undo-pending-only-on-up-bricks.t | 18 ++----- + tests/bugs/replicate/bug-1801624-entry-heal.t | 58 ++++++++++++++++++++++ + xlators/cluster/afr/src/afr-common.c | 4 +- + xlators/cluster/afr/src/afr-self-heal-common.c | 8 +-- + xlators/cluster/afr/src/afr-self-heal-entry.c | 6 +-- + xlators/cluster/afr/src/afr-self-heal-name.c | 2 +- + xlators/cluster/afr/src/afr-self-heal.h | 2 - + 7 files changed, 69 insertions(+), 29 deletions(-) + create mode 100644 tests/bugs/replicate/bug-1801624-entry-heal.t + +diff --git a/tests/bugs/replicate/bug-1433571-undo-pending-only-on-up-bricks.t b/tests/bugs/replicate/bug-1433571-undo-pending-only-on-up-bricks.t +index 0767f47..10ce013 100644 +--- a/tests/bugs/replicate/bug-1433571-undo-pending-only-on-up-bricks.t ++++ b/tests/bugs/replicate/bug-1433571-undo-pending-only-on-up-bricks.t +@@ -49,25 +49,15 @@ TEST $CLI volume start $V0 force + EXPECT_WITHIN $CHILD_UP_TIMEOUT "1" afr_child_up_status $V0 0 + EXPECT_WITHIN $CHILD_UP_TIMEOUT "1" afr_child_up_status $V0 2 + +-#Kill brick 0 and turn on the client side heal and do ls to trigger the heal. +-#The pending xattrs on bricks 1 & 2 should have pending entry on brick 0. +-TEST kill_brick $V0 $H0 $B0/${V0}0 ++# We were killing one brick and checking that entry heal does not reset the ++# pending xattrs for the down brick. Now that we need all bricks to be up for ++# entry heal, I'm removing that test from the .t ++ + TEST $CLI volume set $V0 cluster.data-self-heal on + TEST $CLI volume set $V0 cluster.metadata-self-heal on + TEST $CLI volume set $V0 cluster.entry-self-heal on + + TEST ls $M0 +-EXPECT "000000000000000000000001" get_hex_xattr trusted.afr.$V0-client-0 $B0/${V0}1 +-EXPECT "000000000000000000000001" get_hex_xattr trusted.afr.$V0-client-0 $B0/${V0}2 +-EXPECT_WITHIN $HEAL_TIMEOUT "000000000000000000000000" get_hex_xattr trusted.afr.$V0-client-2 $B0/${V0}1 +-EXPECT_WITHIN $HEAL_TIMEOUT "000000000000000000000000" get_hex_xattr trusted.afr.$V0-client-1 $B0/${V0}2 +- +-#Bring back all the bricks and trigger the heal again by doing ls. Now the +-#pending xattrs on all the bricks should be 0. +-TEST $CLI volume start $V0 force +-EXPECT_WITHIN $CHILD_UP_TIMEOUT "1" afr_child_up_status $V0 0 +-TEST ls $M0 +- + TEST cat $M0/f1 + TEST cat $M0/f2 + TEST cat $M0/f3 +diff --git a/tests/bugs/replicate/bug-1801624-entry-heal.t b/tests/bugs/replicate/bug-1801624-entry-heal.t +new file mode 100644 +index 0000000..94b4651 +--- /dev/null ++++ b/tests/bugs/replicate/bug-1801624-entry-heal.t +@@ -0,0 +1,58 @@ ++#!/bin/bash ++ ++. $(dirname $0)/../../include.rc ++. $(dirname $0)/../../volume.rc ++cleanup; ++ ++TEST glusterd ++TEST pidof glusterd ++TEST $CLI volume create $V0 replica 3 $H0:$B0/brick{0,1,2} ++TEST $CLI volume set $V0 heal-timeout 5 ++TEST $CLI volume start $V0 ++EXPECT_WITHIN $CHILD_UP_TIMEOUT "1" afr_child_up_status_in_shd $V0 0 ++EXPECT_WITHIN $CHILD_UP_TIMEOUT "1" afr_child_up_status_in_shd $V0 1 ++EXPECT_WITHIN $CHILD_UP_TIMEOUT "1" afr_child_up_status_in_shd $V0 2 ++TEST $CLI volume heal $V0 granular-entry-heal enable ++ ++TEST glusterfs --volfile-id=/$V0 --volfile-server=$H0 $M0 --attribute-timeout=0 --entry-timeout=0 ++EXPECT_WITHIN $PROCESS_UP_TIMEOUT "1" afr_child_up_status $V0 0 ++EXPECT_WITHIN $PROCESS_UP_TIMEOUT "1" afr_child_up_status $V0 1 ++EXPECT_WITHIN $PROCESS_UP_TIMEOUT "1" afr_child_up_status $V0 2 ++echo "Data">$M0/FILE ++ret=$? ++TEST [ $ret -eq 0 ] ++ ++# Re-create the file when a brick is down. ++TEST kill_brick $V0 $H0 $B0/brick1 ++TEST rm $M0/FILE ++echo "New Data">$M0/FILE ++ret=$? ++TEST [ $ret -eq 0 ] ++EXPECT_WITHIN $HEAL_TIMEOUT "4" get_pending_heal_count $V0 ++ ++# Launching index heal must not reset parent dir afr xattrs or remove granular entry indices. ++$CLI volume heal $V0 # CLI will fail but heal is launched anyway. ++TEST sleep 5 # give index heal a chance to do one run. ++brick0_pending=$(get_hex_xattr trusted.afr.$V0-client-1 $B0/brick0/) ++brick2_pending=$(get_hex_xattr trusted.afr.$V0-client-1 $B0/brick2/) ++TEST [ $brick0_pending -eq "000000000000000000000002" ] ++TEST [ $brick2_pending -eq "000000000000000000000002" ] ++EXPECT "FILE" ls $B0/brick0/.glusterfs/indices/entry-changes/00000000-0000-0000-0000-000000000001/ ++EXPECT "FILE" ls $B0/brick2/.glusterfs/indices/entry-changes/00000000-0000-0000-0000-000000000001/ ++ ++TEST $CLI volume start $V0 force ++EXPECT_WITHIN $PROCESS_UP_TIMEOUT "1" brick_up_status $V0 $H0 $B0/brick1 ++EXPECT_WITHIN $CHILD_UP_TIMEOUT "1" afr_child_up_status_in_shd $V0 1 ++$CLI volume heal $V0 ++EXPECT_WITHIN $HEAL_TIMEOUT "0" get_pending_heal_count $V0 ++ ++# No gfid-split-brain (i.e. EIO) must be seen. Try on fresh mount to avoid cached values. ++EXPECT_WITHIN $UMOUNT_TIMEOUT "Y" force_umount $M0 ++TEST glusterfs --volfile-id=/$V0 --volfile-server=$H0 $M0 --attribute-timeout=0 --entry-timeout=0 ++EXPECT_WITHIN $PROCESS_UP_TIMEOUT "1" afr_child_up_status $V0 0 ++EXPECT_WITHIN $PROCESS_UP_TIMEOUT "1" afr_child_up_status $V0 1 ++EXPECT_WITHIN $PROCESS_UP_TIMEOUT "1" afr_child_up_status $V0 2 ++TEST cat $M0/FILE ++ ++EXPECT_WITHIN $UMOUNT_TIMEOUT "Y" force_umount $M0 ++cleanup; +diff --git a/xlators/cluster/afr/src/afr-common.c b/xlators/cluster/afr/src/afr-common.c +index d6b70e9..939246e 100644 +--- a/xlators/cluster/afr/src/afr-common.c ++++ b/xlators/cluster/afr/src/afr-common.c +@@ -6632,7 +6632,7 @@ afr_fav_child_reset_sink_xattrs(void *opaque) + ret = afr_selfheal_inodelk(heal_frame, this, inode, this->name, 0, 0, + locked_on); + { +- if (ret < AFR_SH_MIN_PARTICIPANTS) ++ if (ret < priv->child_count) + goto data_unlock; + ret = __afr_selfheal_data_prepare( + heal_frame, this, inode, locked_on, sources, sinks, +@@ -6649,7 +6649,7 @@ afr_fav_child_reset_sink_xattrs(void *opaque) + ret = afr_selfheal_inodelk(heal_frame, this, inode, this->name, + LLONG_MAX - 1, 0, locked_on); + { +- if (ret < AFR_SH_MIN_PARTICIPANTS) ++ if (ret < priv->child_count) + goto mdata_unlock; + ret = __afr_selfheal_metadata_prepare( + heal_frame, this, inode, locked_on, sources, sinks, +diff --git a/xlators/cluster/afr/src/afr-self-heal-common.c b/xlators/cluster/afr/src/afr-self-heal-common.c +index 81ef38a..ce1ea50 100644 +--- a/xlators/cluster/afr/src/afr-self-heal-common.c ++++ b/xlators/cluster/afr/src/afr-self-heal-common.c +@@ -1575,7 +1575,6 @@ afr_selfheal_find_direction(call_frame_t *frame, xlator_t *this, + char *accused = NULL; /* Accused others without any self-accusal */ + char *pending = NULL; /* Have pending operations on others */ + char *self_accused = NULL; /* Accused itself */ +- int min_participants = -1; + + priv = this->private; + +@@ -1599,12 +1598,7 @@ afr_selfheal_find_direction(call_frame_t *frame, xlator_t *this, + } + } + +- if (type == AFR_DATA_TRANSACTION || type == AFR_METADATA_TRANSACTION) { +- min_participants = priv->child_count; +- } else { +- min_participants = AFR_SH_MIN_PARTICIPANTS; +- } +- if (afr_success_count(replies, priv->child_count) < min_participants) { ++ if (afr_success_count(replies, priv->child_count) < priv->child_count) { + /* Treat this just like locks not being acquired */ + return -ENOTCONN; + } +diff --git a/xlators/cluster/afr/src/afr-self-heal-entry.c b/xlators/cluster/afr/src/afr-self-heal-entry.c +index 3ce882e..40be898 100644 +--- a/xlators/cluster/afr/src/afr-self-heal-entry.c ++++ b/xlators/cluster/afr/src/afr-self-heal-entry.c +@@ -597,7 +597,7 @@ afr_selfheal_entry_dirent(call_frame_t *frame, xlator_t *this, fd_t *fd, + ret = afr_selfheal_entrylk(frame, this, fd->inode, this->name, NULL, + locked_on); + { +- if (ret < AFR_SH_MIN_PARTICIPANTS) { ++ if (ret < priv->child_count) { + gf_msg_debug(this->name, 0, + "%s: Skipping " + "entry self-heal as only %d sub-volumes " +@@ -991,7 +991,7 @@ __afr_selfheal_entry(call_frame_t *frame, xlator_t *this, fd_t *fd, + ret = afr_selfheal_entrylk(frame, this, fd->inode, this->name, NULL, + data_lock); + { +- if (ret < AFR_SH_MIN_PARTICIPANTS) { ++ if (ret < priv->child_count) { + gf_msg_debug(this->name, 0, + "%s: Skipping " + "entry self-heal as only %d sub-volumes could " +@@ -1115,7 +1115,7 @@ afr_selfheal_entry(call_frame_t *frame, xlator_t *this, inode_t *inode) + ret = afr_selfheal_tie_breaker_entrylk(frame, this, inode, priv->sh_domain, + NULL, locked_on); + { +- if (ret < AFR_SH_MIN_PARTICIPANTS) { ++ if (ret < priv->child_count) { + gf_msg_debug(this->name, 0, + "%s: Skipping " + "entry self-heal as only %d sub-volumes could " +diff --git a/xlators/cluster/afr/src/afr-self-heal-name.c b/xlators/cluster/afr/src/afr-self-heal-name.c +index 36640b5..7d4f208 100644 +--- a/xlators/cluster/afr/src/afr-self-heal-name.c ++++ b/xlators/cluster/afr/src/afr-self-heal-name.c +@@ -514,7 +514,7 @@ afr_selfheal_name_do(call_frame_t *frame, xlator_t *this, inode_t *parent, + ret = afr_selfheal_entrylk(frame, this, parent, this->name, bname, + locked_on); + { +- if (ret < AFR_SH_MIN_PARTICIPANTS) { ++ if (ret < priv->child_count) { + ret = -ENOTCONN; + goto unlock; + } +diff --git a/xlators/cluster/afr/src/afr-self-heal.h b/xlators/cluster/afr/src/afr-self-heal.h +index 6555ec5..8234cec 100644 +--- a/xlators/cluster/afr/src/afr-self-heal.h ++++ b/xlators/cluster/afr/src/afr-self-heal.h +@@ -11,8 +11,6 @@ + #ifndef _AFR_SELFHEAL_H + #define _AFR_SELFHEAL_H + +-#define AFR_SH_MIN_PARTICIPANTS 2 +- + /* Perform fop on all UP subvolumes and wait for all callbacks to return */ + + #define AFR_ONALL(frame, rfn, fop, args...) \ +-- +1.8.3.1 + diff --git a/SOURCES/0386-glusterd-increase-the-StartLimitBurst.patch b/SOURCES/0386-glusterd-increase-the-StartLimitBurst.patch deleted file mode 100644 index ff6d0f9..0000000 --- a/SOURCES/0386-glusterd-increase-the-StartLimitBurst.patch +++ /dev/null @@ -1,39 +0,0 @@ -From 02e7afdfb740db7cfa1a2f0f79933172d172ff27 Mon Sep 17 00:00:00 2001 -From: Sanju Rakonde -Date: Tue, 7 Jan 2020 15:32:13 +0530 -Subject: [PATCH 386/449] glusterd: increase the StartLimitBurst - -Based on https://bugzilla.redhat.com/show_bug.cgi?id=1782200#c6 -increasing the limit. - -> upstream patch link: https://review.gluster.org/#/c/glusterfs/+/23970/ -> fixes: bz#1782200 -> Change-Id: Ia885c7bdb2a90f0946c5268da894f6a4da5a69b7 -> Signed-off-by: Sanju Rakonde - -BUG: 1663557 -Change-Id: Ia885c7bdb2a90f0946c5268da894f6a4da5a69b7 -Signed-off-by: Sanju Rakonde -Reviewed-on: https://code.engineering.redhat.com/gerrit/202252 -Tested-by: RHGS Build Bot -Reviewed-by: Sunil Kumar Heggodu Gopala Acharya ---- - extras/systemd/glusterd.service.in | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/extras/systemd/glusterd.service.in b/extras/systemd/glusterd.service.in -index b944762..699aea3 100644 ---- a/extras/systemd/glusterd.service.in -+++ b/extras/systemd/glusterd.service.in -@@ -17,7 +17,7 @@ TimeoutSec=300 - SuccessExitStatus=15 - Restart=on-abnormal - RestartSec=60 --StartLimitBurst=3 -+StartLimitBurst=6 - StartLimitIntervalSec=3600 - StartLimitInterval=3600 - --- -1.8.3.1 - diff --git a/SOURCES/0387-To-fix-readdir-ahead-memory-leak.patch b/SOURCES/0387-To-fix-readdir-ahead-memory-leak.patch deleted file mode 100644 index b685215..0000000 --- a/SOURCES/0387-To-fix-readdir-ahead-memory-leak.patch +++ /dev/null @@ -1,47 +0,0 @@ -From d54f087a2484695ff7ac214d39f2750fddcef2d5 Mon Sep 17 00:00:00 2001 -From: HuangShujun <549702281@qq.com> -Date: Thu, 5 Dec 2019 10:07:10 +0200 -Subject: [PATCH 387/449] To fix readdir-ahead memory leak - -Glusterfs client process has memory leak if create several files under -one folder, and delete the folder. According to statedump, the ref -counts of readdir-ahead is bigger than zero in the inode table. - -Readdir-ahead get parent inode by inode_parent in rda_mark_inode_dirty -when each rda_writev_cbk,the inode ref count of parent folder will be -increased in inode_parent, but readdir-ahead do not unref it later. - -The correction is unref the parent inode at the end of -rda_mark_inode_dirty. - -Upstream patch: -> Upstream patch link: https://review.gluster.org/c/glusterfs/+/23815 -> Fixes: bz#1779055 -> Signed-off-by: HuangShujun <549702281@qq.com> -> Change-Id: Iee68ab1089cbc2fbc4185b93720fb1f66ee89524 - -BUG: 1781550 -Change-Id: Iee68ab1089cbc2fbc4185b93720fb1f66ee89524 -Signed-off-by: Xavi Hernandez -Reviewed-on: https://code.engineering.redhat.com/gerrit/202312 -Tested-by: RHGS Build Bot -Reviewed-by: Sunil Kumar Heggodu Gopala Acharya ---- - xlators/performance/readdir-ahead/src/readdir-ahead.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/xlators/performance/readdir-ahead/src/readdir-ahead.c b/xlators/performance/readdir-ahead/src/readdir-ahead.c -index 7fd4f8d..933941d 100644 ---- a/xlators/performance/readdir-ahead/src/readdir-ahead.c -+++ b/xlators/performance/readdir-ahead/src/readdir-ahead.c -@@ -254,6 +254,7 @@ rda_mark_inode_dirty(xlator_t *this, inode_t *inode) - } - } - UNLOCK(&parent->lock); -+ inode_unref(parent); - } - - return; --- -1.8.3.1 - diff --git a/SOURCES/0387-cluster-afr-Delay-post-op-for-fsync.patch b/SOURCES/0387-cluster-afr-Delay-post-op-for-fsync.patch new file mode 100644 index 0000000..3913c14 --- /dev/null +++ b/SOURCES/0387-cluster-afr-Delay-post-op-for-fsync.patch @@ -0,0 +1,440 @@ +From 399fad1ac0f9273483270e8af06a5b2d28927533 Mon Sep 17 00:00:00 2001 +From: Pranith Kumar K +Date: Fri, 29 May 2020 14:24:53 +0530 +Subject: [PATCH 387/392] cluster/afr: Delay post-op for fsync + +Problem: +AFR doesn't delay post-op for fsync fop. For fsync heavy workloads +this leads to un-necessary fxattrop/finodelk for every fsync leading +to bad performance. + +Fix: +Have delayed post-op for fsync. Add special flag in xdata to indicate +that afr shouldn't delay post-op in cases where either the +process will terminate or graph-switch would happen. Otherwise it leads +to un-necessary heals when the graph-switch/process-termination +happens before delayed-post-op completes. + +> Upstream-patch: https://review.gluster.org/c/glusterfs/+/24473 +> Fixes: #1253 + +BUG: 1848896 +Change-Id: I531940d13269a111c49e0510d49514dc169f4577 +Signed-off-by: Pranith Kumar K +(cherry picked from commit 3ed98fc9dcb39223032e343fd5b0ad17fa3cae14) +Reviewed-on: https://code.engineering.redhat.com/gerrit/203694 +Tested-by: RHGS Build Bot +Tested-by: Karthik Subrahmanya +Reviewed-by: Sunil Kumar Heggodu Gopala Acharya +--- + api/src/glfs-resolve.c | 14 ++- + tests/basic/afr/durability-off.t | 2 + + tests/basic/gfapi/gfapi-graph-switch-open-fd.t | 44 +++++++++ + tests/basic/gfapi/gfapi-keep-writing.c | 129 +++++++++++++++++++++++++ + xlators/cluster/afr/src/afr-inode-write.c | 11 ++- + xlators/cluster/afr/src/afr-transaction.c | 9 +- + xlators/cluster/afr/src/afr.h | 2 +- + xlators/cluster/dht/src/dht-rebalance.c | 15 ++- + xlators/mount/fuse/src/fuse-bridge.c | 23 ++++- + 9 files changed, 239 insertions(+), 10 deletions(-) + create mode 100644 tests/basic/gfapi/gfapi-graph-switch-open-fd.t + create mode 100644 tests/basic/gfapi/gfapi-keep-writing.c + +diff --git a/api/src/glfs-resolve.c b/api/src/glfs-resolve.c +index a79f490..062b7dc 100644 +--- a/api/src/glfs-resolve.c ++++ b/api/src/glfs-resolve.c +@@ -722,6 +722,7 @@ glfs_migrate_fd_safe(struct glfs *fs, xlator_t *newsubvol, fd_t *oldfd) + 0, + }; + char uuid1[64]; ++ dict_t *xdata = NULL; + + oldinode = oldfd->inode; + oldsubvol = oldinode->table->xl; +@@ -730,7 +731,15 @@ glfs_migrate_fd_safe(struct glfs *fs, xlator_t *newsubvol, fd_t *oldfd) + return fd_ref(oldfd); + + if (!oldsubvol->switched) { +- ret = syncop_fsync(oldsubvol, oldfd, 0, NULL, NULL, NULL, NULL); ++ xdata = dict_new(); ++ if (!xdata || dict_set_int8(xdata, "last-fsync", 1)) { ++ gf_msg(fs->volname, GF_LOG_WARNING, ENOMEM, API_MSG_FSYNC_FAILED, ++ "last-fsync set failed on %s graph %s (%d)", ++ uuid_utoa_r(oldfd->inode->gfid, uuid1), ++ graphid_str(oldsubvol), oldsubvol->graph->id); ++ } ++ ++ ret = syncop_fsync(oldsubvol, oldfd, 0, NULL, NULL, xdata, NULL); + DECODE_SYNCOP_ERR(ret); + if (ret) { + gf_msg(fs->volname, GF_LOG_WARNING, errno, API_MSG_FSYNC_FAILED, +@@ -809,6 +818,9 @@ out: + newfd = NULL; + } + ++ if (xdata) ++ dict_unref(xdata); ++ + return newfd; + } + +diff --git a/tests/basic/afr/durability-off.t b/tests/basic/afr/durability-off.t +index 155ffa0..6e0f18b 100644 +--- a/tests/basic/afr/durability-off.t ++++ b/tests/basic/afr/durability-off.t +@@ -26,6 +26,8 @@ TEST $CLI volume heal $V0 + EXPECT_WITHIN $HEAL_TIMEOUT "0" get_pending_heal_count $V0 + EXPECT "^0$" echo $($CLI volume profile $V0 info | grep -w FSYNC | wc -l) + ++EXPECT_WITHIN $CHILD_UP_TIMEOUT "1" afr_child_up_status $V0 0 ++EXPECT_WITHIN $CHILD_UP_TIMEOUT "1" afr_child_up_status $V0 1 + #Test that fsyncs happen when durability is on + TEST $CLI volume set $V0 cluster.ensure-durability on + TEST $CLI volume set $V0 performance.strict-write-ordering on +diff --git a/tests/basic/gfapi/gfapi-graph-switch-open-fd.t b/tests/basic/gfapi/gfapi-graph-switch-open-fd.t +new file mode 100644 +index 0000000..2e666be +--- /dev/null ++++ b/tests/basic/gfapi/gfapi-graph-switch-open-fd.t +@@ -0,0 +1,44 @@ ++#!/bin/bash ++ ++. $(dirname $0)/../../include.rc ++. $(dirname $0)/../../volume.rc ++ ++cleanup; ++ ++TEST glusterd ++ ++TEST $CLI volume create $V0 replica 3 ${H0}:$B0/brick{0..2}; ++EXPECT 'Created' volinfo_field $V0 'Status'; ++ ++TEST $CLI volume start $V0; ++EXPECT 'Started' volinfo_field $V0 'Status'; ++ ++TEST $GFS --volfile-id=$V0 --volfile-server=$H0 $M0; ++TEST touch $M0/sync ++logdir=`gluster --print-logdir` ++ ++TEST build_tester $(dirname $0)/gfapi-keep-writing.c -lgfapi ++ ++ ++#Launch a program to keep doing writes on an fd ++./$(dirname $0)/gfapi-keep-writing ${H0} $V0 $logdir/gfapi-async-calls-test.log sync & ++p=$! ++sleep 1 #Let some writes go through ++#Check if graph switch will lead to any pending markers for ever ++TEST $CLI volume set $V0 performance.quick-read off ++TEST $CLI volume set $V0 performance.io-cache off ++TEST $CLI volume set $V0 performance.stat-prefetch off ++TEST $CLI volume set $V0 performance.read-ahead off ++ ++ ++TEST rm -f $M0/sync #Make sure the glfd is closed ++TEST wait #Wait for background process to die ++#Goal is to check if there is permanent FOOL changelog ++sleep 5 ++EXPECT "0x000000000000000000000000" afr_get_changelog_xattr $B0/brick0/glfs_test.txt trusted.afr.dirty ++EXPECT "0x000000000000000000000000" afr_get_changelog_xattr $B0/brick1/glfs_test.txt trusted.afr.dirty ++EXPECT "0x000000000000000000000000" afr_get_changelog_xattr $B0/brick2/glfs_test.txt trusted.afr.dirty ++ ++cleanup_tester $(dirname $0)/gfapi-async-calls-test ++ ++cleanup; +diff --git a/tests/basic/gfapi/gfapi-keep-writing.c b/tests/basic/gfapi/gfapi-keep-writing.c +new file mode 100644 +index 0000000..91b59ce +--- /dev/null ++++ b/tests/basic/gfapi/gfapi-keep-writing.c +@@ -0,0 +1,129 @@ ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++ ++#define LOG_ERR(msg) \ ++ do { \ ++ fprintf(stderr, "%s : Error (%s)\n", msg, strerror(errno)); \ ++ } while (0) ++ ++glfs_t * ++init_glfs(const char *hostname, const char *volname, const char *logfile) ++{ ++ int ret = -1; ++ glfs_t *fs = NULL; ++ ++ fs = glfs_new(volname); ++ if (!fs) { ++ LOG_ERR("glfs_new failed"); ++ return NULL; ++ } ++ ++ ret = glfs_set_volfile_server(fs, "tcp", hostname, 24007); ++ if (ret < 0) { ++ LOG_ERR("glfs_set_volfile_server failed"); ++ goto out; ++ } ++ ++ ret = glfs_set_logging(fs, logfile, 7); ++ if (ret < 0) { ++ LOG_ERR("glfs_set_logging failed"); ++ goto out; ++ } ++ ++ ret = glfs_init(fs); ++ if (ret < 0) { ++ LOG_ERR("glfs_init failed"); ++ goto out; ++ } ++ ++ ret = 0; ++out: ++ if (ret) { ++ glfs_fini(fs); ++ fs = NULL; ++ } ++ ++ return fs; ++} ++ ++int ++glfs_test_function(const char *hostname, const char *volname, ++ const char *logfile, const char *syncfile) ++{ ++ int ret = -1; ++ int flags = O_CREAT | O_RDWR; ++ glfs_t *fs = NULL; ++ glfs_fd_t *glfd = NULL; ++ const char *buff = "This is from my prog\n"; ++ const char *filename = "glfs_test.txt"; ++ struct stat buf = {0}; ++ ++ fs = init_glfs(hostname, volname, logfile); ++ if (fs == NULL) { ++ LOG_ERR("init_glfs failed"); ++ return -1; ++ } ++ ++ glfd = glfs_creat(fs, filename, flags, 0644); ++ if (glfd == NULL) { ++ LOG_ERR("glfs_creat failed"); ++ goto out; ++ } ++ ++ while (glfs_stat(fs, syncfile, &buf) == 0) { ++ ret = glfs_write(glfd, buff, strlen(buff), flags); ++ if (ret < 0) { ++ LOG_ERR("glfs_write failed"); ++ goto out; ++ } ++ } ++ ++ ret = glfs_close(glfd); ++ if (ret < 0) { ++ LOG_ERR("glfs_write failed"); ++ goto out; ++ } ++ ++out: ++ ret = glfs_fini(fs); ++ if (ret) { ++ LOG_ERR("glfs_fini failed"); ++ } ++ ++ return ret; ++} ++ ++int ++main(int argc, char *argv[]) ++{ ++ int ret = 0; ++ char *hostname = NULL; ++ char *volname = NULL; ++ char *logfile = NULL; ++ char *syncfile = NULL; ++ ++ if (argc != 5) { ++ fprintf(stderr, "Invalid argument\n"); ++ exit(1); ++ } ++ ++ hostname = argv[1]; ++ volname = argv[2]; ++ logfile = argv[3]; ++ syncfile = argv[4]; ++ ++ ret = glfs_test_function(hostname, volname, logfile, syncfile); ++ if (ret) { ++ LOG_ERR("glfs_test_function failed"); ++ } ++ ++ return ret; ++} +diff --git a/xlators/cluster/afr/src/afr-inode-write.c b/xlators/cluster/afr/src/afr-inode-write.c +index 7fcc9d4..df82b6e 100644 +--- a/xlators/cluster/afr/src/afr-inode-write.c ++++ b/xlators/cluster/afr/src/afr-inode-write.c +@@ -2492,6 +2492,7 @@ afr_fsync(call_frame_t *frame, xlator_t *this, fd_t *fd, int32_t datasync, + call_frame_t *transaction_frame = NULL; + int ret = -1; + int32_t op_errno = ENOMEM; ++ int8_t last_fsync = 0; + + transaction_frame = copy_frame(frame); + if (!transaction_frame) +@@ -2501,10 +2502,16 @@ afr_fsync(call_frame_t *frame, xlator_t *this, fd_t *fd, int32_t datasync, + if (!local) + goto out; + +- if (xdata) ++ if (xdata) { + local->xdata_req = dict_copy_with_ref(xdata, NULL); +- else ++ if (dict_get_int8(xdata, "last-fsync", &last_fsync) == 0) { ++ if (last_fsync) { ++ local->transaction.disable_delayed_post_op = _gf_true; ++ } ++ } ++ } else { + local->xdata_req = dict_new(); ++ } + + if (!local->xdata_req) + goto out; +diff --git a/xlators/cluster/afr/src/afr-transaction.c b/xlators/cluster/afr/src/afr-transaction.c +index 8e65ae2..ffd0ab8 100644 +--- a/xlators/cluster/afr/src/afr-transaction.c ++++ b/xlators/cluster/afr/src/afr-transaction.c +@@ -2385,8 +2385,13 @@ afr_is_delayed_changelog_post_op_needed(call_frame_t *frame, xlator_t *this, + goto out; + } + +- if ((local->op != GF_FOP_WRITE) && (local->op != GF_FOP_FXATTROP)) { +- /*Only allow writes but shard does [f]xattrops on writes, so ++ if (local->transaction.disable_delayed_post_op) { ++ goto out; ++ } ++ ++ if ((local->op != GF_FOP_WRITE) && (local->op != GF_FOP_FXATTROP) && ++ (local->op != GF_FOP_FSYNC)) { ++ /*Only allow writes/fsyncs but shard does [f]xattrops on writes, so + * they are fine too*/ + goto out; + } +diff --git a/xlators/cluster/afr/src/afr.h b/xlators/cluster/afr/src/afr.h +index e731cfa..6bc4721 100644 +--- a/xlators/cluster/afr/src/afr.h ++++ b/xlators/cluster/afr/src/afr.h +@@ -854,7 +854,7 @@ typedef struct _afr_local { + + int (*unwind)(call_frame_t *frame, xlator_t *this); + +- /* post-op hook */ ++ gf_boolean_t disable_delayed_post_op; + } transaction; + + syncbarrier_t barrier; +diff --git a/xlators/cluster/dht/src/dht-rebalance.c b/xlators/cluster/dht/src/dht-rebalance.c +index 8f31dca..145e616 100644 +--- a/xlators/cluster/dht/src/dht-rebalance.c ++++ b/xlators/cluster/dht/src/dht-rebalance.c +@@ -1564,6 +1564,7 @@ dht_migrate_file(xlator_t *this, loc_t *loc, xlator_t *from, xlator_t *to, + xlator_t *old_target = NULL; + xlator_t *hashed_subvol = NULL; + fd_t *linkto_fd = NULL; ++ dict_t *xdata = NULL; + + if (from == to) { + gf_msg_debug(this->name, 0, +@@ -1882,7 +1883,15 @@ dht_migrate_file(xlator_t *this, loc_t *loc, xlator_t *from, xlator_t *to, + + /* TODO: Sync the locks */ + +- ret = syncop_fsync(to, dst_fd, 0, NULL, NULL, NULL, NULL); ++ xdata = dict_new(); ++ if (!xdata || dict_set_int8(xdata, "last-fsync", 1)) { ++ gf_log(this->name, GF_LOG_ERROR, ++ "%s: failed to set last-fsync flag on " ++ "%s (%s)", ++ loc->path, to->name, strerror(ENOMEM)); ++ } ++ ++ ret = syncop_fsync(to, dst_fd, 0, NULL, NULL, xdata, NULL); + if (ret) { + gf_log(this->name, GF_LOG_WARNING, "%s: failed to fsync on %s (%s)", + loc->path, to->name, strerror(-ret)); +@@ -2356,11 +2365,15 @@ out: + + if (dst_fd) + syncop_close(dst_fd); ++ + if (src_fd) + syncop_close(src_fd); + if (linkto_fd) + syncop_close(linkto_fd); + ++ if (xdata) ++ dict_unref(xdata); ++ + loc_wipe(&tmp_loc); + loc_wipe(&parent_loc); + +diff --git a/xlators/mount/fuse/src/fuse-bridge.c b/xlators/mount/fuse/src/fuse-bridge.c +index 6e99053..1592067 100644 +--- a/xlators/mount/fuse/src/fuse-bridge.c ++++ b/xlators/mount/fuse/src/fuse-bridge.c +@@ -5551,6 +5551,7 @@ fuse_migrate_fd(xlator_t *this, fd_t *basefd, xlator_t *old_subvol, + char create_in_progress = 0; + fuse_fd_ctx_t *basefd_ctx = NULL; + fd_t *oldfd = NULL; ++ dict_t *xdata = NULL; + + basefd_ctx = fuse_fd_ctx_get(this, basefd); + GF_VALIDATE_OR_GOTO("glusterfs-fuse", basefd_ctx, out); +@@ -5587,10 +5588,23 @@ fuse_migrate_fd(xlator_t *this, fd_t *basefd, xlator_t *old_subvol, + } + + if (oldfd->inode->table->xl == old_subvol) { +- if (IA_ISDIR(oldfd->inode->ia_type)) ++ if (IA_ISDIR(oldfd->inode->ia_type)) { + ret = syncop_fsyncdir(old_subvol, oldfd, 0, NULL, NULL); +- else +- ret = syncop_fsync(old_subvol, oldfd, 0, NULL, NULL, NULL, NULL); ++ } else { ++ xdata = dict_new(); ++ if (!xdata || dict_set_int8(xdata, "last-fsync", 1)) { ++ gf_log("glusterfs-fuse", GF_LOG_WARNING, ++ "last-fsync set failed (%s) on fd (%p)" ++ "(basefd:%p basefd-inode.gfid:%s) " ++ "(old-subvolume:%s-%d new-subvolume:%s-%d)", ++ strerror(ENOMEM), oldfd, basefd, ++ uuid_utoa(basefd->inode->gfid), old_subvol->name, ++ old_subvol->graph->id, new_subvol->name, ++ new_subvol->graph->id); ++ } ++ ++ ret = syncop_fsync(old_subvol, oldfd, 0, NULL, NULL, xdata, NULL); ++ } + + if (ret < 0) { + gf_log("glusterfs-fuse", GF_LOG_WARNING, +@@ -5645,6 +5659,9 @@ out: + + fd_unref(oldfd); + ++ if (xdata) ++ dict_unref(xdata); ++ + return ret; + } + +-- +1.8.3.1 + diff --git a/SOURCES/0388-rpc-Cleanup-SSL-specific-data-at-the-time-of-freeing.patch b/SOURCES/0388-rpc-Cleanup-SSL-specific-data-at-the-time-of-freeing.patch index dc23ba8..094a484 100644 --- a/SOURCES/0388-rpc-Cleanup-SSL-specific-data-at-the-time-of-freeing.patch +++ b/SOURCES/0388-rpc-Cleanup-SSL-specific-data-at-the-time-of-freeing.patch @@ -1,7 +1,7 @@ -From fbda9baaf7231e3237277348cc7e873f3113fd14 Mon Sep 17 00:00:00 2001 +From be6fafebe1e391e9d9f14d9aed18adbfda8a262b Mon Sep 17 00:00:00 2001 From: l17zhou Date: Mon, 4 Nov 2019 08:45:52 +0200 -Subject: [PATCH 388/449] rpc: Cleanup SSL specific data at the time of freeing +Subject: [PATCH 388/392] rpc: Cleanup SSL specific data at the time of freeing rpc object Problem: At the time of cleanup rpc object ssl specific data @@ -17,9 +17,9 @@ Solution: To avoid the leak cleanup ssl specific data at the > (Reviewed on upstream link https://review.gluster.org/#/c/glusterfs/+/23650/) Change-Id: I37f598673ae2d7a33c75f39eb8843ccc6dffaaf0 -BUG: 1786516 +BUG: 1848891 Signed-off-by: Mohit Agrawal -Reviewed-on: https://code.engineering.redhat.com/gerrit/202308 +Reviewed-on: https://code.engineering.redhat.com/gerrit/203698 Tested-by: RHGS Build Bot Reviewed-by: Sunil Kumar Heggodu Gopala Acharya --- diff --git a/SOURCES/0389-posix-Avoid-diskpace-error-in-case-of-overwriting-th.patch b/SOURCES/0389-posix-Avoid-diskpace-error-in-case-of-overwriting-th.patch deleted file mode 100644 index 7f20fb2..0000000 --- a/SOURCES/0389-posix-Avoid-diskpace-error-in-case-of-overwriting-th.patch +++ /dev/null @@ -1,297 +0,0 @@ -From 50318713486e79d9258cf22e656caff402256dde Mon Sep 17 00:00:00 2001 -From: Mohit Agrawal -Date: Sun, 20 Oct 2019 22:01:01 +0530 -Subject: [PATCH 389/449] posix: Avoid diskpace error in case of overwriting - the data - -Problem: Sometime fops like posix_writev, posix_fallocate, posix_zerofile - failed and throw error ENOSPC if storage.reserve threshold limit - has reached even fops is overwriting the data - -Solution: Retry the fops in case of overwrite if diskspace check - is failed - -> Credits: kinsu -> Change-Id: I987d73bcf47ed1bb27878df40c39751296e95fe8 -> Updates: #745 -> Signed-off-by: Mohit Agrawal -> (Cherry pick from commit ca3e5905ac02fb9c373ac3de10b44f061d04cd6f) -> (Reviewed on upstream link https://review.gluster.org/#/c/glusterfs/+/23572/) - -Change-Id: I987d73bcf47ed1bb27878df40c39751296e95fe8 -BUG: 1787331 -Signed-off-by: Mohit Agrawal -Reviewed-on: https://code.engineering.redhat.com/gerrit/202307 -Tested-by: RHGS Build Bot -Reviewed-by: Sunil Kumar Heggodu Gopala Acharya ---- - tests/bugs/posix/bug-1651445.t | 1 + - xlators/storage/posix/src/posix-entry-ops.c | 1 - - xlators/storage/posix/src/posix-inode-fd-ops.c | 141 ++++++++++++++++++++++--- - 3 files changed, 126 insertions(+), 17 deletions(-) - -diff --git a/tests/bugs/posix/bug-1651445.t b/tests/bugs/posix/bug-1651445.t -index 5248d47..4d08b69 100644 ---- a/tests/bugs/posix/bug-1651445.t -+++ b/tests/bugs/posix/bug-1651445.t -@@ -33,6 +33,7 @@ sleep 5 - # setup_lvm create lvm partition of 150M and 40M are reserve so after - # consuming more than 110M next dd should fail - TEST ! dd if=/dev/zero of=$M0/c bs=5M count=1 -+TEST dd if=/dev/urandom of=$M0/a bs=1022 count=1 oflag=seek_bytes,sync seek=102 conv=notrunc - - rm -rf $M0/* - -diff --git a/xlators/storage/posix/src/posix-entry-ops.c b/xlators/storage/posix/src/posix-entry-ops.c -index 283b305..bea0bbf 100644 ---- a/xlators/storage/posix/src/posix-entry-ops.c -+++ b/xlators/storage/posix/src/posix-entry-ops.c -@@ -1634,7 +1634,6 @@ posix_rename(call_frame_t *frame, xlator_t *this, loc_t *oldloc, loc_t *newloc, - - priv = this->private; - VALIDATE_OR_GOTO(priv, out); -- DISK_SPACE_CHECK_AND_GOTO(frame, priv, xdata, op_ret, op_errno, out); - - SET_FS_ID(frame->root->uid, frame->root->gid); - MAKE_ENTRY_HANDLE(real_oldpath, par_oldpath, this, oldloc, NULL); -diff --git a/xlators/storage/posix/src/posix-inode-fd-ops.c b/xlators/storage/posix/src/posix-inode-fd-ops.c -index a2a518f..bcce06e 100644 ---- a/xlators/storage/posix/src/posix-inode-fd-ops.c -+++ b/xlators/storage/posix/src/posix-inode-fd-ops.c -@@ -692,6 +692,10 @@ posix_do_fallocate(call_frame_t *frame, xlator_t *this, fd_t *fd, int32_t flags, - gf_boolean_t locked = _gf_false; - posix_inode_ctx_t *ctx = NULL; - struct posix_private *priv = NULL; -+ gf_boolean_t check_space_error = _gf_false; -+ struct stat statbuf = { -+ 0, -+ }; - - DECLARE_OLD_FS_ID_VAR; - -@@ -711,7 +715,10 @@ posix_do_fallocate(call_frame_t *frame, xlator_t *this, fd_t *fd, int32_t flags, - if (priv->disk_reserve) - posix_disk_space_check(this); - -- DISK_SPACE_CHECK_AND_GOTO(frame, priv, xdata, ret, ret, out); -+ DISK_SPACE_CHECK_AND_GOTO(frame, priv, xdata, ret, ret, unlock); -+ -+overwrite: -+ check_space_error = _gf_true; - - ret = posix_fd_ctx_get(fd, this, &pfd, &op_errno); - if (ret < 0) { -@@ -735,7 +742,7 @@ posix_do_fallocate(call_frame_t *frame, xlator_t *this, fd_t *fd, int32_t flags, - ret = -errno; - gf_msg(this->name, GF_LOG_ERROR, errno, P_MSG_FSTAT_FAILED, - "fallocate (fstat) failed on fd=%p", fd); -- goto out; -+ goto unlock; - } - - if (xdata) { -@@ -745,7 +752,7 @@ posix_do_fallocate(call_frame_t *frame, xlator_t *this, fd_t *fd, int32_t flags, - gf_msg(this->name, GF_LOG_ERROR, 0, 0, - "file state check failed, fd %p", fd); - ret = -EIO; -- goto out; -+ goto unlock; - } - } - -@@ -756,7 +763,7 @@ posix_do_fallocate(call_frame_t *frame, xlator_t *this, fd_t *fd, int32_t flags, - "fallocate failed on %s offset: %jd, " - "len:%zu, flags: %d", - uuid_utoa(fd->inode->gfid), offset, len, flags); -- goto out; -+ goto unlock; - } - - ret = posix_fdstat(this, fd->inode, pfd->fd, statpost); -@@ -764,16 +771,47 @@ posix_do_fallocate(call_frame_t *frame, xlator_t *this, fd_t *fd, int32_t flags, - ret = -errno; - gf_msg(this->name, GF_LOG_ERROR, errno, P_MSG_FSTAT_FAILED, - "fallocate (fstat) failed on fd=%p", fd); -- goto out; -+ goto unlock; - } - - posix_set_ctime(frame, this, NULL, pfd->fd, fd->inode, statpost); - --out: -+unlock: - if (locked) { - pthread_mutex_unlock(&ctx->write_atomic_lock); - locked = _gf_false; - } -+ -+ if (op_errno == ENOSPC && priv->disk_space_full && !check_space_error) { -+#ifdef FALLOC_FL_KEEP_SIZE -+ if (flags & FALLOC_FL_KEEP_SIZE) { -+ goto overwrite; -+ } -+#endif -+ ret = posix_fd_ctx_get(fd, this, &pfd, &op_errno); -+ if (ret < 0) { -+ gf_msg(this->name, GF_LOG_WARNING, ret, P_MSG_PFD_NULL, -+ "pfd is NULL from fd=%p", fd); -+ goto out; -+ } -+ -+ if (sys_fstat(pfd->fd, &statbuf) < 0) { -+ gf_msg(this->name, GF_LOG_WARNING, op_errno, P_MSG_FILE_OP_FAILED, -+ "%d", pfd->fd); -+ goto out; -+ } -+ -+ if (offset + len <= statbuf.st_size) { -+ gf_msg_debug(this->name, 0, -+ "io vector size will not" -+ " change disk size so allow overwrite for" -+ " fd %d", -+ pfd->fd); -+ goto overwrite; -+ } -+ } -+ -+out: - SET_TO_OLD_FS_ID(); - if (ret == ENOSPC) - ret = -ENOSPC; -@@ -1083,25 +1121,57 @@ posix_zerofill(call_frame_t *frame, xlator_t *this, fd_t *fd, off_t offset, - int op_ret = -1; - int op_errno = EINVAL; - dict_t *rsp_xdata = NULL; -+ gf_boolean_t check_space_error = _gf_false; -+ struct posix_fd *pfd = NULL; -+ struct stat statbuf = { -+ 0, -+ }; - -- VALIDATE_OR_GOTO(frame, out); -- VALIDATE_OR_GOTO(this, out); -+ VALIDATE_OR_GOTO(frame, unwind); -+ VALIDATE_OR_GOTO(this, unwind); - - priv = this->private; - DISK_SPACE_CHECK_AND_GOTO(frame, priv, xdata, op_ret, op_errno, out); - -+overwrite: -+ check_space_error = _gf_true; - ret = posix_do_zerofill(frame, this, fd, offset, len, &statpre, &statpost, - xdata, &rsp_xdata); - if (ret < 0) { - op_ret = -1; - op_errno = -ret; -- goto out; -+ goto unwind; - } - - STACK_UNWIND_STRICT(zerofill, frame, 0, 0, &statpre, &statpost, rsp_xdata); - return 0; - - out: -+ if (op_errno == ENOSPC && priv->disk_space_full && !check_space_error) { -+ ret = posix_fd_ctx_get(fd, this, &pfd, &op_errno); -+ if (ret < 0) { -+ gf_msg(this->name, GF_LOG_WARNING, ret, P_MSG_PFD_NULL, -+ "pfd is NULL from fd=%p", fd); -+ goto out; -+ } -+ -+ if (sys_fstat(pfd->fd, &statbuf) < 0) { -+ gf_msg(this->name, GF_LOG_WARNING, op_errno, P_MSG_FILE_OP_FAILED, -+ "%d", pfd->fd); -+ goto out; -+ } -+ -+ if (offset + len <= statbuf.st_size) { -+ gf_msg_debug(this->name, 0, -+ "io vector size will not" -+ " change disk size so allow overwrite for" -+ " fd %d", -+ pfd->fd); -+ goto overwrite; -+ } -+ } -+ -+unwind: - STACK_UNWIND_STRICT(zerofill, frame, op_ret, op_errno, NULL, NULL, - rsp_xdata); - return 0; -@@ -1857,19 +1927,28 @@ posix_writev(call_frame_t *frame, xlator_t *this, fd_t *fd, - gf_boolean_t write_append = _gf_false; - gf_boolean_t update_atomic = _gf_false; - posix_inode_ctx_t *ctx = NULL; -+ gf_boolean_t check_space_error = _gf_false; -+ struct stat statbuf = { -+ 0, -+ }; -+ int totlen = 0; -+ int idx = 0; - -- VALIDATE_OR_GOTO(frame, out); -- VALIDATE_OR_GOTO(this, out); -- VALIDATE_OR_GOTO(fd, out); -- VALIDATE_OR_GOTO(fd->inode, out); -- VALIDATE_OR_GOTO(vector, out); -- VALIDATE_OR_GOTO(this->private, out); -+ VALIDATE_OR_GOTO(frame, unwind); -+ VALIDATE_OR_GOTO(this, unwind); -+ VALIDATE_OR_GOTO(fd, unwind); -+ VALIDATE_OR_GOTO(fd->inode, unwind); -+ VALIDATE_OR_GOTO(vector, unwind); -+ VALIDATE_OR_GOTO(this->private, unwind); - - priv = this->private; - -- VALIDATE_OR_GOTO(priv, out); -+ VALIDATE_OR_GOTO(priv, unwind); - DISK_SPACE_CHECK_AND_GOTO(frame, priv, xdata, op_ret, op_errno, out); - -+overwrite: -+ -+ check_space_error = _gf_true; - if ((fd->inode->ia_type == IA_IFBLK) || (fd->inode->ia_type == IA_IFCHR)) { - gf_msg(this->name, GF_LOG_ERROR, EINVAL, P_MSG_INVALID_ARGUMENT, - "writev received on a block/char file (%s)", -@@ -2011,6 +2090,36 @@ out: - locked = _gf_false; - } - -+ if (op_errno == ENOSPC && priv->disk_space_full && !check_space_error) { -+ ret = posix_fd_ctx_get(fd, this, &pfd, &op_errno); -+ if (ret < 0) { -+ gf_msg(this->name, GF_LOG_WARNING, ret, P_MSG_PFD_NULL, -+ "pfd is NULL from fd=%p", fd); -+ goto unwind; -+ } -+ -+ if (sys_fstat(pfd->fd, &statbuf) < 0) { -+ gf_msg(this->name, GF_LOG_WARNING, op_errno, P_MSG_FILE_OP_FAILED, -+ "%d", pfd->fd); -+ goto unwind; -+ } -+ -+ for (idx = 0; idx < count; idx++) { -+ totlen = vector[idx].iov_len; -+ } -+ -+ if ((offset + totlen <= statbuf.st_size) && -+ !(statbuf.st_blocks * statbuf.st_blksize < statbuf.st_size)) { -+ gf_msg_debug(this->name, 0, -+ "io vector size will not" -+ " change disk size so allow overwrite for" -+ " fd %d", -+ pfd->fd); -+ goto overwrite; -+ } -+ } -+ -+unwind: - STACK_UNWIND_STRICT(writev, frame, op_ret, op_errno, &preop, &postop, - rsp_xdata); - --- -1.8.3.1 - diff --git a/SOURCES/0389-socket-Resolve-ssl_ctx-leak-for-a-brick-while-only-m.patch b/SOURCES/0389-socket-Resolve-ssl_ctx-leak-for-a-brick-while-only-m.patch new file mode 100644 index 0000000..a4f9bf2 --- /dev/null +++ b/SOURCES/0389-socket-Resolve-ssl_ctx-leak-for-a-brick-while-only-m.patch @@ -0,0 +1,54 @@ +From d3558cfbded7e973fae45ce2196767611336e351 Mon Sep 17 00:00:00 2001 +From: Mohit Agrawal +Date: Mon, 8 Jun 2020 13:27:50 +0530 +Subject: [PATCH 389/392] socket: Resolve ssl_ctx leak for a brick while only + mgmt SSL is enabled + +Problem: While only mgmt SSL is enabled for a brick process use_ssl flag + is false for a brick process and socket api's cleanup ssl_ctx only + while use_ssl and ssl_ctx both are valid + +Solution: To avoid a leak check only ssl_ctx, if it is valid cleanup + ssl_ctx + +> Fixes: #1196 +> Change-Id: I2f4295478f4149dcb7d608ea78ee5104f28812c3 +> Signed-off-by: Mohit Agrawal +> (Cherry pick from commit 9873baee34afdf0c20f5fc98a7dbf2a9f07447e2) +> (Reviewed on upstream link https://review.gluster.org/#/c/glusterfs/+/24366/) + +BUG: 1848894 +Change-Id: I2f4295478f4149dcb7d608ea78ee5104f28812c3 +Signed-off-by: Mohit Agrawal +Reviewed-on: https://code.engineering.redhat.com/gerrit/203705 +Tested-by: RHGS Build Bot +Reviewed-by: Sunil Kumar Heggodu Gopala Acharya +--- + rpc/rpc-transport/socket/src/socket.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/rpc/rpc-transport/socket/src/socket.c b/rpc/rpc-transport/socket/src/socket.c +index 226b2e2..54cd5df 100644 +--- a/rpc/rpc-transport/socket/src/socket.c ++++ b/rpc/rpc-transport/socket/src/socket.c +@@ -1163,7 +1163,7 @@ __socket_reset(rpc_transport_t *this) + SSL_free(priv->ssl_ssl); + priv->ssl_ssl = NULL; + } +- if (priv->use_ssl && priv->ssl_ctx) { ++ if (priv->ssl_ctx) { + SSL_CTX_free(priv->ssl_ctx); + priv->ssl_ctx = NULL; + } +@@ -4685,7 +4685,7 @@ fini(rpc_transport_t *this) + SSL_free(priv->ssl_ssl); + priv->ssl_ssl = NULL; + } +- if (priv->use_ssl && priv->ssl_ctx) { ++ if (priv->ssl_ctx) { + SSL_CTX_free(priv->ssl_ctx); + priv->ssl_ctx = NULL; + } +-- +1.8.3.1 + diff --git a/SOURCES/0390-glusterd-deafult-options-after-volume-reset.patch b/SOURCES/0390-glusterd-deafult-options-after-volume-reset.patch deleted file mode 100644 index d95ce71..0000000 --- a/SOURCES/0390-glusterd-deafult-options-after-volume-reset.patch +++ /dev/null @@ -1,93 +0,0 @@ -From 86df0ced1cac0e3c48f6149bb2f5442f8548f89e Mon Sep 17 00:00:00 2001 -From: Sanju Rakonde -Date: Wed, 25 Dec 2019 21:56:32 +0530 -Subject: [PATCH 390/449] glusterd: deafult options after volume reset - -Problem: default option itransport.address-family is disappered -in volume info output after a volume reset. - -Cause: with 3.8.0 onwards volume option transport.address-family -has default value, any volume which is created will have this -option set. So, volume info will show this in its output. But, -with reset volume, this option is not handled. - -Solution: In glusterd_enable_default_options(), we should add this -option along with other default options. This function is called -by glusterd_options_reset() with volume reset command. - -> upstream patch link: https://review.gluster.org/#/c/glusterfs/+/23921/ -> fixes: bz#1786478 -> Change-Id: I58f7aa24cf01f308c4efe6cae748cc3bc8b99b1d -> Signed-off-by: Sanju Rakonde - -BUG: 1781710 -Change-Id: I58f7aa24cf01f308c4efe6cae748cc3bc8b99b1d -Signed-off-by: Sanju Rakonde -Reviewed-on: https://code.engineering.redhat.com/gerrit/202258 -Tested-by: RHGS Build Bot -Reviewed-by: Sunil Kumar Heggodu Gopala Acharya ---- - tests/bugs/glusterd/optimized-basic-testcases.t | 5 +++++ - xlators/mgmt/glusterd/src/glusterd-utils.c | 23 +++++++++++++++++++++++ - 2 files changed, 28 insertions(+) - -diff --git a/tests/bugs/glusterd/optimized-basic-testcases.t b/tests/bugs/glusterd/optimized-basic-testcases.t -index d700b5e..c7e8c32 100644 ---- a/tests/bugs/glusterd/optimized-basic-testcases.t -+++ b/tests/bugs/glusterd/optimized-basic-testcases.t -@@ -69,6 +69,11 @@ TEST pidof glusterd; - TEST $CLI volume create $V0 $H0:$B0/${V0}{1,2}; - EXPECT 'Created' volinfo_field $V0 'Status'; - -+#bug-1786478 - default volume option after volume reset -+addr_family=`volinfo_field $V0 'transport.address-family'` -+TEST $CLI volume reset $V0 -+EXPECT $addr_family volinfo_field $V0 'transport.address-family' -+ - #bug-955588 - uuid validation - - uuid=`grep UUID $GLUSTERD_WORKDIR/glusterd.info | cut -f2 -d=` -diff --git a/xlators/mgmt/glusterd/src/glusterd-utils.c b/xlators/mgmt/glusterd/src/glusterd-utils.c -index c92cdf3..6654741 100644 ---- a/xlators/mgmt/glusterd/src/glusterd-utils.c -+++ b/xlators/mgmt/glusterd/src/glusterd-utils.c -@@ -13032,6 +13032,11 @@ glusterd_enable_default_options(glusterd_volinfo_t *volinfo, char *option) - int ret = 0; - xlator_t *this = NULL; - glusterd_conf_t *conf = NULL; -+#ifdef IPV6_DEFAULT -+ char *addr_family = "inet6"; -+#else -+ char *addr_family = "inet"; -+#endif - - this = THIS; - GF_ASSERT(this); -@@ -13109,6 +13114,24 @@ glusterd_enable_default_options(glusterd_volinfo_t *volinfo, char *option) - } - } - } -+ -+ if (conf->op_version >= GD_OP_VERSION_3_9_0) { -+ if (!option || !strcmp("transport.address-family", option)) { -+ if (volinfo->transport_type == GF_TRANSPORT_TCP) { -+ ret = dict_set_dynstr_with_alloc( -+ volinfo->dict, "transport.address-family", addr_family); -+ if (ret) { -+ gf_msg(this->name, GF_LOG_ERROR, errno, -+ GD_MSG_DICT_SET_FAILED, -+ "failed to set transport." -+ "address-family on %s", -+ volinfo->volname); -+ goto out; -+ } -+ } -+ } -+ } -+ - if (conf->op_version >= GD_OP_VERSION_7_0) { - ret = dict_set_dynstr_with_alloc(volinfo->dict, - "storage.fips-mode-rchecksum", "on"); --- -1.8.3.1 - diff --git a/SOURCES/0390-tests-Avoid-ssl-authz.t-failure.patch b/SOURCES/0390-tests-Avoid-ssl-authz.t-failure.patch new file mode 100644 index 0000000..443cdb9 --- /dev/null +++ b/SOURCES/0390-tests-Avoid-ssl-authz.t-failure.patch @@ -0,0 +1,51 @@ +From b68fa363c5981441c20fbc78b6dc00437bd698a7 Mon Sep 17 00:00:00 2001 +From: Mohit Agrawal +Date: Mon, 22 Jun 2020 11:35:29 +0530 +Subject: [PATCH 390/392] tests: Avoid ssl-authz.t failure + +Problem: ssl-authz.t is failing at the time of checking memory + consumption if brick is consuming more than 5M + +Solution: Update the check to avoid a failure. + +> Change-Id: Iffb031f0695a7da83d5a2f6bac8863dad225317e +> Fixes: bz#1811631 +> Signed-off-by: Mohit Agrawal +> Reviewd on upstream link https://review.gluster.org/#/c/glusterfs/+/24221/) +> (Cherry pick from commit fb20713b380e1df8d7f9e9df96563be2f9144fd6) + +BUG: 1848894 +Change-Id: I4fc5d2e2597abfafc1e26d908c8c4184ab82afd5 +Signed-off-by: Mohit Agrawal +Reviewed-on: https://code.engineering.redhat.com/gerrit/203844 +Tested-by: RHGS Build Bot +Reviewed-by: Sunil Kumar Heggodu Gopala Acharya +--- + tests/features/ssl-authz.t | 6 ++++-- + 1 file changed, 4 insertions(+), 2 deletions(-) + +diff --git a/tests/features/ssl-authz.t b/tests/features/ssl-authz.t +index 132b598..ab05c49 100755 +--- a/tests/features/ssl-authz.t ++++ b/tests/features/ssl-authz.t +@@ -67,13 +67,15 @@ echo "Memory consumption for glusterfsd process" + for i in $(seq 1 100); do + gluster v heal $V0 info >/dev/null + done ++#Wait to cleanup memory ++sleep 10 + + end=`pmap -x $glusterfsd_pid | grep total | awk -F " " '{print $4}'` + diff=$((end-start)) + +-# If memory consumption is more than 5M some leak in SSL code path ++# If memory consumption is more than 15M some leak in SSL code path + +-TEST [ $diff -lt 5000 ] ++TEST [ $diff -lt 15000 ] + + + # Set ssl-allow to a wildcard that includes our identity. +-- +1.8.3.1 + diff --git a/SOURCES/0391-cluster-syncop-avoid-duplicate-unlock-of-inodelk-ent.patch b/SOURCES/0391-cluster-syncop-avoid-duplicate-unlock-of-inodelk-ent.patch new file mode 100644 index 0000000..414f259 --- /dev/null +++ b/SOURCES/0391-cluster-syncop-avoid-duplicate-unlock-of-inodelk-ent.patch @@ -0,0 +1,54 @@ +From e9cb714d66a7926a746b8cd5f9288d59aefee918 Mon Sep 17 00:00:00 2001 +From: Kinglong Mee +Date: Mon, 18 Mar 2019 20:47:54 +0800 +Subject: [PATCH 391/392] cluster-syncop: avoid duplicate unlock of + inodelk/entrylk + +When using ec, there are many messages at brick log as, + +[inodelk.c:514:__inode_unlock_lock] 0-test-locks: Matching lock not found for unlock 0-9223372036854775807, lo=68e040a84b7f0000 on 0x7f208c006f78 +[MSGID: 115053] [server-rpc-fops_v2.c:280:server4_inodelk_cbk] 0-test-server: 2557439: INODELK (df4e41be-723f-4289-b7af-b4272b3e880c), client: CTX_ID:67d4a7f3-605a-4965-89a5-31309d62d1fa-GRAPH_ID:0-PID:1659-HOST:openfs-node2-PC_NAME:test-client-1-RECON_NO:-28, error-xlator: test-locks [Invalid argument] + +> Change-Id: Ib164d29ebb071f620a4ca9679c4345ef7c88512a +> Updates: bz#1689920 +> Signed-off-by: Kinglong Mee +> Reviewed on upstream link https://review.gluster.org/#/c/glusterfs/+/22377/ + +BUG: 1848890 +Change-Id: Ib164d29ebb071f620a4ca9679c4345ef7c88512a +Signed-off-by: Sheetal Pamecha +Reviewed-on: https://code.engineering.redhat.com/gerrit/203852 +Tested-by: RHGS Build Bot +Reviewed-by: Sunil Kumar Heggodu Gopala Acharya +--- + libglusterfs/src/cluster-syncop.c | 6 ++++++ + 1 file changed, 6 insertions(+) + +diff --git a/libglusterfs/src/cluster-syncop.c b/libglusterfs/src/cluster-syncop.c +index 5a08f26..6ee89dd 100644 +--- a/libglusterfs/src/cluster-syncop.c ++++ b/libglusterfs/src/cluster-syncop.c +@@ -1203,6 +1203,10 @@ cluster_tiebreaker_inodelk(xlator_t **subvols, unsigned char *on, + if (num_success) { + FOP_SEQ(subvols, on, numsubvols, replies, locked_on, frame, + inodelk, dom, &loc, F_SETLKW, &flock, NULL); ++ } else { ++ loc_wipe(&loc); ++ memset(locked_on, 0, numsubvols); ++ return 0; + } + break; + } +@@ -1244,7 +1248,9 @@ cluster_tiebreaker_entrylk(xlator_t **subvols, unsigned char *on, + entrylk, dom, &loc, name, ENTRYLK_LOCK, ENTRYLK_WRLCK, + NULL); + } else { ++ loc_wipe(&loc); + memset(locked_on, 0, numsubvols); ++ return 0; + } + break; + } +-- +1.8.3.1 + diff --git a/SOURCES/0391-glusterd-unlink-the-file-after-killing-the-process.patch b/SOURCES/0391-glusterd-unlink-the-file-after-killing-the-process.patch deleted file mode 100644 index 2a88254..0000000 --- a/SOURCES/0391-glusterd-unlink-the-file-after-killing-the-process.patch +++ /dev/null @@ -1,39 +0,0 @@ -From d23859d5cbd5823b2587811aa57030436ce9e74c Mon Sep 17 00:00:00 2001 -From: Sanju Rakonde -Date: Tue, 17 Dec 2019 15:52:30 +0530 -Subject: [PATCH 391/449] glusterd: unlink the file after killing the process - -In glusterd_proc_stop(), after killing the pid -we should remove the pidfile. - -> upstream patch link: https://review.gluster.org/#/c/glusterfs/+/23890/ -> fixes: bz#1784375 -> Change-Id: Ib6367aed590932c884b0f6f892fc40542aa19686 -> Signed-off-by: Sanju Rakonde - -BUG: 1784211 -Change-Id: Ib6367aed590932c884b0f6f892fc40542aa19686 -Signed-off-by: Sanju Rakonde -Reviewed-on: https://code.engineering.redhat.com/gerrit/202257 -Tested-by: RHGS Build Bot -Reviewed-by: Sunil Kumar Heggodu Gopala Acharya ---- - xlators/mgmt/glusterd/src/glusterd-proc-mgmt.c | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/xlators/mgmt/glusterd/src/glusterd-proc-mgmt.c b/xlators/mgmt/glusterd/src/glusterd-proc-mgmt.c -index f55a5fd..a05c90d 100644 ---- a/xlators/mgmt/glusterd/src/glusterd-proc-mgmt.c -+++ b/xlators/mgmt/glusterd/src/glusterd-proc-mgmt.c -@@ -107,6 +107,8 @@ glusterd_proc_stop(glusterd_proc_t *proc, int sig, int flags) - "service, reason:%s", - proc->name, strerror(errno)); - } -+ } else { -+ (void)glusterd_unlink_file(proc->pidfile); - } - if (flags != PROC_STOP_FORCE) - goto out; --- -1.8.3.1 - diff --git a/SOURCES/0392-glusterd-Brick-process-fails-to-come-up-with-brickmu.patch b/SOURCES/0392-glusterd-Brick-process-fails-to-come-up-with-brickmu.patch deleted file mode 100644 index e295e4f..0000000 --- a/SOURCES/0392-glusterd-Brick-process-fails-to-come-up-with-brickmu.patch +++ /dev/null @@ -1,187 +0,0 @@ -From a30a5fdef2e252eba9f44a3c671de8f3aa4f17d7 Mon Sep 17 00:00:00 2001 -From: Vishal Pandey -Date: Tue, 19 Nov 2019 11:39:22 +0530 -Subject: [PATCH 392/449] glusterd: Brick process fails to come up with - brickmux on - -Issue: -1- In a cluster of 3 Nodes N1, N2, N3. Create 3 volumes vol1, -vol2, vol3 with 3 bricks (one from each node) -2- Set cluster.brick-multiplex on -3- Start all 3 volumes -4- Check if all bricks on a node are running on same port -5- Kill N1 -6- Set performance.readdir-ahead for volumes vol1, vol2, vol3 -7- Bring N1 up and check volume status -8- All bricks processes not running on N1. - -Root Cause - -Since, There is a diff in volfile versions in N1 as compared -to N2 and N3 therefore glusterd_import_friend_volume() is called. -glusterd_import_friend_volume() copies the new_volinfo and deletes -old_volinfo and then calls glusterd_start_bricks(). -glusterd_start_bricks() looks for the volfiles and sends an rpc -request to glusterfs_handle_attach(). Now, since the volinfo -has been deleted by glusterd_delete_stale_volume() -from priv->volumes list before glusterd_start_bricks() and -glusterd_create_volfiles_and_notify_services() and -glusterd_list_add_order is called after glusterd_start_bricks(), -therefore the attach RPC req gets an empty volfile path -and that causes the brick to crash. - -Fix- Call glusterd_list_add_order() and -glusterd_create_volfiles_and_notify_services before -glusterd_start_bricks() cal is made in glusterd_import_friend_volume - -> upstream patch link: https://review.gluster.org/#/c/glusterfs/+/23724/ -> Change-Id: Idfe0e8710f7eb77ca3ddfa1cabeb45b2987f41aa -> Fixes: bz#1773856 -> Signed-off-by: Mohammed Rafi KC - -BUG: 1683602 -Change-Id: Idfe0e8710f7eb77ca3ddfa1cabeb45b2987f41aa -Signed-off-by: Sanju Rakonde -Reviewed-on: https://code.engineering.redhat.com/gerrit/202255 -Tested-by: RHGS Build Bot -Reviewed-by: Mohit Agrawal -Reviewed-by: Sunil Kumar Heggodu Gopala Acharya ---- - .../glusterd/brick-mux-validation-in-cluster.t | 61 +++++++++++++++++++++- - xlators/mgmt/glusterd/src/glusterd-utils.c | 28 +++++----- - 2 files changed, 75 insertions(+), 14 deletions(-) - -diff --git a/tests/bugs/glusterd/brick-mux-validation-in-cluster.t b/tests/bugs/glusterd/brick-mux-validation-in-cluster.t -index 4e57038..f088dbb 100644 ---- a/tests/bugs/glusterd/brick-mux-validation-in-cluster.t -+++ b/tests/bugs/glusterd/brick-mux-validation-in-cluster.t -@@ -7,6 +7,20 @@ function count_brick_processes { - pgrep glusterfsd | wc -l - } - -+function count_brick_pids { -+ $CLI_1 --xml volume status all | sed -n '/.*\([^<]*\).*/s//\1/p' \ -+ | grep -v "N/A" | sort | uniq | wc -l -+} -+ -+function count_N/A_brick_pids { -+ $CLI_1 --xml volume status all | sed -n '/.*\([^<]*\).*/s//\1/p' \ -+ | grep -- '\-1' | sort | uniq | wc -l -+} -+ -+function check_peers { -+ $CLI_2 peer status | grep 'Peer in Cluster (Connected)' | wc -l -+} -+ - cleanup; - - TEST launch_cluster 3 -@@ -48,4 +62,49 @@ TEST $CLI_1 volume stop $V1 - - EXPECT 3 count_brick_processes - --cleanup -+TEST $CLI_1 volume stop $META_VOL -+ -+TEST $CLI_1 volume delete $META_VOL -+TEST $CLI_1 volume delete $V0 -+TEST $CLI_1 volume delete $V1 -+ -+#bug-1773856 - Brick process fails to come up with brickmux on -+ -+TEST $CLI_1 volume create $V0 $H1:$B1/${V0}1 $H2:$B2/${V0}1 $H3:$B3/${V0}1 force -+TEST $CLI_1 volume start $V0 -+ -+ -+EXPECT 3 count_brick_processes -+ -+#create and start a new volume -+TEST $CLI_1 volume create $V1 $H1:$B1/${V1}2 $H2:$B2/${V1}2 $H3:$B3/${V1}2 force -+TEST $CLI_1 volume start $V1 -+ -+EXPECT 3 count_brick_processes -+ -+V2=patchy2 -+TEST $CLI_1 volume create $V2 $H1:$B1/${V2}3 $H2:$B2/${V2}3 $H3:$B3/${V2}3 force -+TEST $CLI_1 volume start $V2 -+ -+EXPECT 3 count_brick_processes -+ -+EXPECT_WITHIN $PROCESS_UP_TIMEOUT 3 count_brick_pids -+ -+TEST kill_node 1 -+ -+sleep 10 -+ -+EXPECT_WITHIN $PROBE_TIMEOUT 1 check_peers; -+ -+$CLI_2 volume set $V0 performance.readdir-ahead on -+$CLI_2 volume set $V1 performance.readdir-ahead on -+ -+TEST $glusterd_1; -+ -+sleep 10 -+ -+EXPECT 4 count_brick_processes -+EXPECT_WITHIN $PROCESS_UP_TIMEOUT 4 count_brick_pids -+EXPECT_WITHIN $PROCESS_UP_TIMEOUT 0 count_N/A_brick_pids -+ -+cleanup; -diff --git a/xlators/mgmt/glusterd/src/glusterd-utils.c b/xlators/mgmt/glusterd/src/glusterd-utils.c -index 6654741..1b78812 100644 ---- a/xlators/mgmt/glusterd/src/glusterd-utils.c -+++ b/xlators/mgmt/glusterd/src/glusterd-utils.c -@@ -4988,16 +4988,6 @@ glusterd_import_friend_volume(dict_t *peer_data, int count) - glusterd_volinfo_unref(old_volinfo); - } - -- if (glusterd_is_volume_started(new_volinfo)) { -- (void)glusterd_start_bricks(new_volinfo); -- if (glusterd_is_snapd_enabled(new_volinfo)) { -- svc = &(new_volinfo->snapd.svc); -- if (svc->manager(svc, new_volinfo, PROC_START_NO_WAIT)) { -- gf_event(EVENT_SVC_MANAGER_FAILED, "svc_name=%s", svc->name); -- } -- } -- } -- - ret = glusterd_store_volinfo(new_volinfo, GLUSTERD_VOLINFO_VER_AC_NONE); - if (ret) { - gf_msg(this->name, GF_LOG_ERROR, 0, GD_MSG_VOLINFO_STORE_FAIL, -@@ -5007,19 +4997,31 @@ glusterd_import_friend_volume(dict_t *peer_data, int count) - goto out; - } - -- ret = glusterd_create_volfiles_and_notify_services(new_volinfo); -+ ret = glusterd_create_volfiles(new_volinfo); - if (ret) - goto out; - -+ glusterd_list_add_order(&new_volinfo->vol_list, &priv->volumes, -+ glusterd_compare_volume_name); -+ -+ if (glusterd_is_volume_started(new_volinfo)) { -+ (void)glusterd_start_bricks(new_volinfo); -+ if (glusterd_is_snapd_enabled(new_volinfo)) { -+ svc = &(new_volinfo->snapd.svc); -+ if (svc->manager(svc, new_volinfo, PROC_START_NO_WAIT)) { -+ gf_event(EVENT_SVC_MANAGER_FAILED, "svc_name=%s", svc->name); -+ } -+ } -+ } -+ - ret = glusterd_import_quota_conf(peer_data, count, new_volinfo, "volume"); - if (ret) { - gf_event(EVENT_IMPORT_QUOTA_CONF_FAILED, "volume=%s", - new_volinfo->volname); - goto out; - } -- glusterd_list_add_order(&new_volinfo->vol_list, &priv->volumes, -- glusterd_compare_volume_name); - -+ ret = glusterd_fetchspec_notify(this); - out: - gf_msg_debug("glusterd", 0, "Returning with ret: %d", ret); - return ret; --- -1.8.3.1 - diff --git a/SOURCES/0392-glusterd-unlink-the-file-after-killing-the-process.patch b/SOURCES/0392-glusterd-unlink-the-file-after-killing-the-process.patch new file mode 100644 index 0000000..03d67f8 --- /dev/null +++ b/SOURCES/0392-glusterd-unlink-the-file-after-killing-the-process.patch @@ -0,0 +1,39 @@ +From 6a2cef546457e6dc9a2268cc2f5cc11b850b7f5c Mon Sep 17 00:00:00 2001 +From: Sanju Rakonde +Date: Tue, 17 Dec 2019 15:52:30 +0530 +Subject: [PATCH 392/392] glusterd: unlink the file after killing the process + +In glusterd_proc_stop(), after killing the pid +we should remove the pidfile. + +> upstream patch: https://review.gluster.org/#/c/glusterfs/+/23890/ +> fixes: bz#1784375 +> Change-Id: Ib6367aed590932c884b0f6f892fc40542aa19686 +> Signed-off-by: Sanju Rakonde + +BUG: 1849533 +Change-Id: Ib6367aed590932c884b0f6f892fc40542aa19686 +Signed-off-by: Sanju Rakonde +Reviewed-on: https://code.engineering.redhat.com/gerrit/203871 +Tested-by: RHGS Build Bot +Reviewed-by: Sunil Kumar Heggodu Gopala Acharya +--- + xlators/mgmt/glusterd/src/glusterd-proc-mgmt.c | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/xlators/mgmt/glusterd/src/glusterd-proc-mgmt.c b/xlators/mgmt/glusterd/src/glusterd-proc-mgmt.c +index f55a5fd..a05c90d 100644 +--- a/xlators/mgmt/glusterd/src/glusterd-proc-mgmt.c ++++ b/xlators/mgmt/glusterd/src/glusterd-proc-mgmt.c +@@ -107,6 +107,8 @@ glusterd_proc_stop(glusterd_proc_t *proc, int sig, int flags) + "service, reason:%s", + proc->name, strerror(errno)); + } ++ } else { ++ (void)glusterd_unlink_file(proc->pidfile); + } + if (flags != PROC_STOP_FORCE) + goto out; +-- +1.8.3.1 + diff --git a/SOURCES/0393-afr-restore-timestamp-of-files-during-metadata-heal.patch b/SOURCES/0393-afr-restore-timestamp-of-files-during-metadata-heal.patch deleted file mode 100644 index bb93180..0000000 --- a/SOURCES/0393-afr-restore-timestamp-of-files-during-metadata-heal.patch +++ /dev/null @@ -1,129 +0,0 @@ -From b528c21e6fedc9ac841942828b82e0c808da5efb Mon Sep 17 00:00:00 2001 -From: Sheetal Pamecha -Date: Thu, 2 Jan 2020 12:05:12 +0530 -Subject: [PATCH 393/449] afr: restore timestamp of files during metadata heal - -For files: During metadata heal, we restore timestamps -only for non-regular (char, block etc.) files. -Extenting it for regular files as timestamp is updated -via touch command also - -> upstream patch link: https://review.gluster.org/#/c/glusterfs/+/23953/ -> fixes: bz#1787274 -> Change-Id: I26fe4fb6dff679422ba4698a7f828bf62ca7ca18 -> Signed-off-by: Sheetal Pamecha - -BUG: 1761531 -Change-Id: I26fe4fb6dff679422ba4698a7f828bf62ca7ca18 -Signed-off-by: Sheetal Pamecha -Reviewed-on: https://code.engineering.redhat.com/gerrit/202332 -Tested-by: RHGS Build Bot -Reviewed-by: Sunil Kumar Heggodu Gopala Acharya ---- - .../bug-1761531-metadata-heal-restore-time.t | 74 ++++++++++++++++++++++ - xlators/cluster/afr/src/afr-self-heal-metadata.c | 8 +-- - 2 files changed, 76 insertions(+), 6 deletions(-) - create mode 100644 tests/bugs/replicate/bug-1761531-metadata-heal-restore-time.t - -diff --git a/tests/bugs/replicate/bug-1761531-metadata-heal-restore-time.t b/tests/bugs/replicate/bug-1761531-metadata-heal-restore-time.t -new file mode 100644 -index 0000000..7e24eae ---- /dev/null -+++ b/tests/bugs/replicate/bug-1761531-metadata-heal-restore-time.t -@@ -0,0 +1,74 @@ -+#!/bin/bash -+ -+. $(dirname $0)/../../include.rc -+. $(dirname $0)/../../volume.rc -+. $(dirname $0)/../../afr.rc -+cleanup -+ -+GET_MDATA_PATH=$(dirname $0)/../../utils -+build_tester $GET_MDATA_PATH/get-mdata-xattr.c -+ -+TEST glusterd -+TEST pidof glusterd -+TEST $CLI volume create $V0 replica 3 $H0:$B0/brick{0..2} -+TEST $CLI volume start $V0 -+TEST $GFS --volfile-id=/$V0 --volfile-server=$H0 $M0 -+EXPECT_WITHIN $PROCESS_UP_TIMEOUT "1" afr_child_up_status $V0 0 -+EXPECT_WITHIN $PROCESS_UP_TIMEOUT "1" afr_child_up_status $V0 1 -+EXPECT_WITHIN $PROCESS_UP_TIMEOUT "1" afr_child_up_status $V0 2 -+ -+TEST touch $M0/a -+sleep 1 -+TEST kill_brick $V0 $H0 $B0/brick0 -+TEST touch $M0/a -+ -+EXPECT_WITHIN $HEAL_TIMEOUT "^2$" get_pending_heal_count $V0 -+ -+TEST $CLI volume start $V0 force -+EXPECT_WITHIN $CHILD_UP_TIMEOUT "1" afr_child_up_status $V0 1 -+EXPECT_WITHIN $PROCESS_UP_TIMEOUT "Y" glustershd_up_status -+EXPECT_WITHIN $CHILD_UP_TIMEOUT "1" afr_child_up_status_in_shd $V0 0 -+EXPECT_WITHIN $CHILD_UP_TIMEOUT "1" afr_child_up_status_in_shd $V0 1 -+EXPECT_WITHIN $CHILD_UP_TIMEOUT "1" afr_child_up_status_in_shd $V0 2 -+ -+EXPECT_WITHIN $HEAL_TIMEOUT "^0$" get_pending_heal_count $V0 -+ -+mtime0=$(get_mtime $B0/brick0/a) -+mtime1=$(get_mtime $B0/brick1/a) -+TEST [ $mtime0 -eq $mtime1 ] -+ -+ctime0=$(get_ctime $B0/brick0/a) -+ctime1=$(get_ctime $B0/brick1/a) -+TEST [ $ctime0 -eq $ctime1 ] -+ -+############################################################################### -+# Repeat the test with ctime feature disabled. -+TEST $CLI volume set $V0 features.ctime off -+ -+TEST touch $M0/b -+sleep 1 -+TEST kill_brick $V0 $H0 $B0/brick0 -+TEST touch $M0/b -+ -+EXPECT_WITHIN $HEAL_TIMEOUT "^2$" get_pending_heal_count $V0 -+ -+TEST $CLI volume start $V0 force -+EXPECT_WITHIN $CHILD_UP_TIMEOUT "1" afr_child_up_status $V0 1 -+EXPECT_WITHIN $PROCESS_UP_TIMEOUT "Y" glustershd_up_status -+EXPECT_WITHIN $CHILD_UP_TIMEOUT "1" afr_child_up_status_in_shd $V0 0 -+EXPECT_WITHIN $CHILD_UP_TIMEOUT "1" afr_child_up_status_in_shd $V0 1 -+EXPECT_WITHIN $CHILD_UP_TIMEOUT "1" afr_child_up_status_in_shd $V0 2 -+ -+EXPECT_WITHIN $HEAL_TIMEOUT "^0$" get_pending_heal_count $V0 -+ -+mtime2=$(get_mtime $B0/brick0/b) -+mtime3=$(get_mtime $B0/brick1/b) -+TEST [ $mtime2 -eq $mtime3 ] -+ -+TEST rm $GET_MDATA_PATH/get-mdata-xattr -+ -+TEST force_umount $M0 -+TEST $CLI volume stop $V0 -+TEST $CLI volume delete $V0 -+ -+cleanup -diff --git a/xlators/cluster/afr/src/afr-self-heal-metadata.c b/xlators/cluster/afr/src/afr-self-heal-metadata.c -index ecfa791..f4e31b6 100644 ---- a/xlators/cluster/afr/src/afr-self-heal-metadata.c -+++ b/xlators/cluster/afr/src/afr-self-heal-metadata.c -@@ -421,12 +421,8 @@ afr_selfheal_metadata(call_frame_t *frame, xlator_t *this, inode_t *inode) - if (ret) - goto unlock; - -- /* Restore atime/mtime for files that don't need data heal as -- * restoring timestamps happens only as a part of data-heal. -- */ -- if (!IA_ISREG(locked_replies[source].poststat.ia_type)) -- afr_selfheal_restore_time(frame, this, inode, source, healed_sinks, -- locked_replies); -+ afr_selfheal_restore_time(frame, this, inode, source, healed_sinks, -+ locked_replies); - - ret = afr_selfheal_undo_pending( - frame, this, inode, sources, sinks, healed_sinks, undid_pending, --- -1.8.3.1 - diff --git a/SOURCES/0394-man-gluster-Add-volume-top-command-to-gluster-man-pa.patch b/SOURCES/0394-man-gluster-Add-volume-top-command-to-gluster-man-pa.patch deleted file mode 100644 index 96a8f74..0000000 --- a/SOURCES/0394-man-gluster-Add-volume-top-command-to-gluster-man-pa.patch +++ /dev/null @@ -1,38 +0,0 @@ -From 768a6d9bca86c0a50128b8776c11ef2b6d36388d Mon Sep 17 00:00:00 2001 -From: Vishal Pandey -Date: Thu, 21 Nov 2019 12:56:34 +0530 -Subject: [PATCH 394/449] man/gluster: Add volume top command to gluster man - page - -> Upstream patch link: https://review.gluster.org/#/c/glusterfs/+/23735/ -> Change-Id: Ib74607d2b2e5a1a0316221f1176a7dcccea632d4 -> Fixes: bz#1774866 -> Signed-off-by: Vishal Pandey - -BUG: 1754391 -Change-Id: Ib74607d2b2e5a1a0316221f1176a7dcccea632d4 -Signed-off-by: Sanju Rakonde -Reviewed-on: https://code.engineering.redhat.com/gerrit/202333 -Tested-by: RHGS Build Bot -Reviewed-by: Sunil Kumar Heggodu Gopala Acharya ---- - doc/gluster.8 | 3 +++ - 1 file changed, 3 insertions(+) - -diff --git a/doc/gluster.8 b/doc/gluster.8 -index da6472d..88cbf44 100644 ---- a/doc/gluster.8 -+++ b/doc/gluster.8 -@@ -113,6 +113,9 @@ Rotate the log file for corresponding volume/brick. - \fB\ volume profile {start|info [peek|incremental [peek]|cumulative|clear]|stop} [nfs] \fR - Profile operations on the volume. Once started, volume profile info provides cumulative statistics of the FOPs performed. - .TP -+\fB\ volume top {open|read|write|opendir|readdir|clear} [nfs|brick ] [list-cnt ] | {read-perf|write-perf} [bs count ] [brick ] [list-cnt ] \fR -+Generates a profile of a volume representing the performance and bottlenecks/hotspots of each brick. -+.TP - \fB\ volume statedump [[nfs|quotad] [all|mem|iobuf|callpool|priv|fd|inode|history]... | [client ]] \fR - Dumps the in memory state of the specified process or the bricks of the volume. - .TP --- -1.8.3.1 - diff --git a/SOURCES/0395-Cli-Removing-old-log-rotate-command.patch b/SOURCES/0395-Cli-Removing-old-log-rotate-command.patch deleted file mode 100644 index 0918777..0000000 --- a/SOURCES/0395-Cli-Removing-old-log-rotate-command.patch +++ /dev/null @@ -1,111 +0,0 @@ -From 5b3fcc8db86b4dc7af1eb63315ca2ff41c60fdea Mon Sep 17 00:00:00 2001 -From: kshithijiyer -Date: Sat, 30 Nov 2019 15:25:11 +0530 -Subject: [PATCH 395/449] [Cli] Removing old log rotate command. - -The old command for log rotate is still present removing -it completely. Also adding testcase to test the -log rotate command with both the old as well as the new command -and fixing testcase which use the old syntax to use the new -one. - -Code to be removed: -1. In cli-cmd-volume.c from struct cli_cmd volume_cmds[]: -{"volume log rotate [BRICK]", cli_cmd_log_rotate_cbk, - "rotate the log file for corresponding volume/brick" - " NOTE: This is an old syntax, will be deprecated from next release."}, - -2. In cli-cmd-volume.c from cli_cmd_log_rotate_cbk(): - ||(strcmp("rotate", words[2]) == 0))) - -3. In cli-cmd-parser.c from cli_cmd_log_rotate_parse() -if (strcmp("rotate", words[2]) == 0) - volname = (char *)words[3]; -else - -> upstream patch link: https://review.gluster.org/#/c/glusterfs/+/23392/ -> fixes: bz#1750387 -> Change-Id: I56e4d295044e8d5fd1fc0d848bc87e135e9e32b4 -> Signed-off-by: kshithijiyer - -BUG: 1784415 -Change-Id: I56e4d295044e8d5fd1fc0d848bc87e135e9e32b4 -Signed-off-by: Sanju Rakonde -Reviewed-on: https://code.engineering.redhat.com/gerrit/202334 -Tested-by: RHGS Build Bot -Reviewed-by: Sunil Kumar Heggodu Gopala Acharya ---- - cli/src/cli-cmd-parser.c | 2 -- - cli/src/cli-cmd-volume.c | 7 +------ - tests/bugs/glusterd/optimized-basic-testcases.t | 3 ++- - tests/bugs/glusterfs-server/bug-852147.t | 2 +- - 4 files changed, 4 insertions(+), 10 deletions(-) - -diff --git a/cli/src/cli-cmd-parser.c b/cli/src/cli-cmd-parser.c -index 4456a7b..ac0a263 100644 ---- a/cli/src/cli-cmd-parser.c -+++ b/cli/src/cli-cmd-parser.c -@@ -2592,8 +2592,6 @@ cli_cmd_log_rotate_parse(const char **words, int wordcount, dict_t **options) - - if (strcmp("rotate", words[3]) == 0) - volname = (char *)words[2]; -- else if (strcmp("rotate", words[2]) == 0) -- volname = (char *)words[3]; - GF_ASSERT(volname); - - ret = dict_set_str(dict, "volname", volname); -diff --git a/cli/src/cli-cmd-volume.c b/cli/src/cli-cmd-volume.c -index 754d333..f33fc99 100644 ---- a/cli/src/cli-cmd-volume.c -+++ b/cli/src/cli-cmd-volume.c -@@ -2349,8 +2349,7 @@ cli_cmd_log_rotate_cbk(struct cli_state *state, struct cli_cmd_word *word, - goto out; - } - -- if (!((strcmp("rotate", words[2]) == 0) || -- (strcmp("rotate", words[3]) == 0))) { -+ if (!(strcmp("rotate", words[3]) == 0)) { - cli_usage_out(word->pattern); - parse_error = 1; - goto out; -@@ -3401,10 +3400,6 @@ struct cli_cmd volume_cmds[] = { - {"volume log rotate [BRICK]", cli_cmd_log_rotate_cbk, - "rotate the log file for corresponding volume/brick"}, - -- {"volume log rotate [BRICK]", cli_cmd_log_rotate_cbk, -- "rotate the log file for corresponding volume/brick" -- " NOTE: This is an old syntax, will be deprecated from next release."}, -- - {"volume sync [all|]", cli_cmd_sync_volume_cbk, - "sync the volume information from a peer"}, - -diff --git a/tests/bugs/glusterd/optimized-basic-testcases.t b/tests/bugs/glusterd/optimized-basic-testcases.t -index c7e8c32..862f329 100644 ---- a/tests/bugs/glusterd/optimized-basic-testcases.t -+++ b/tests/bugs/glusterd/optimized-basic-testcases.t -@@ -129,7 +129,8 @@ TEST ! $CLI volume set all $V0 cluster.op-version $OP_VERS_NEW - - #bug-1022055 - validate log rotate command - --TEST $CLI volume log rotate $V0; -+TEST ! $CLI volume log rotate $V0; -+TEST $CLI volume log $V0 rotate; - - #bug-1092841 - validating barrier enable/disable - -diff --git a/tests/bugs/glusterfs-server/bug-852147.t b/tests/bugs/glusterfs-server/bug-852147.t -index c644cfa..75db2a2 100755 ---- a/tests/bugs/glusterfs-server/bug-852147.t -+++ b/tests/bugs/glusterfs-server/bug-852147.t -@@ -66,7 +66,7 @@ ren_file=$log_file".*" - rm -rf $ren_file - - #Initiating log rotate --TEST $CLI volume log rotate $V0 -+TEST $CLI volume log $V0 rotate - - #Capturing new log file's size - new_file_size=`file-size $log_file` --- -1.8.3.1 - diff --git a/SOURCES/0396-Updating-gluster-manual.patch b/SOURCES/0396-Updating-gluster-manual.patch deleted file mode 100644 index bb33d10..0000000 --- a/SOURCES/0396-Updating-gluster-manual.patch +++ /dev/null @@ -1,56 +0,0 @@ -From 728aab1c1cfcf352d4ca1fde0b80044dc24bd9fa Mon Sep 17 00:00:00 2001 -From: Rishubh Jain -Date: Sun, 18 Aug 2019 18:02:57 +0530 -Subject: [PATCH 396/449] Updating gluster manual. - -Adding disperse-data to gluster manual under -volume create command - -> Upstream Patch Link: https://review.gluster.org/#/c/glusterfs/+/23258/ -> Change-Id: Ic9eb47c9e71a1d7a11af9394c615c8e90f8d1d69 -> Fixes: bz#1668239 -> Signed-off-by: Rishubh Jain -> Signed-off-by: Sheetal Pamecha - -BUG: 1667954 -Change-Id: Ic9eb47c9e71a1d7a11af9394c615c8e90f8d1d69 -Signed-off-by: Sheetal Pamecha -Reviewed-on: https://code.engineering.redhat.com/gerrit/202342 -Tested-by: RHGS Build Bot -Reviewed-by: Sunil Kumar Heggodu Gopala Acharya ---- - doc/gluster.8 | 2 +- - tests/basic/glusterd/disperse-create.t | 4 ++++ - 2 files changed, 5 insertions(+), 1 deletion(-) - -diff --git a/doc/gluster.8 b/doc/gluster.8 -index 88cbf44..66bdb48 100644 ---- a/doc/gluster.8 -+++ b/doc/gluster.8 -@@ -41,7 +41,7 @@ List all volumes in cluster - \fB\ volume status [all | [nfs|shd||quotad|tierd]] [detail|clients|mem|inode|fd|callpool|tasks|client-list] \fR - Display status of all or specified volume(s)/brick - .TP --\fB\ volume create [stripe ] [replica ] [disperse []] [redundancy ] [transport ] ... \fR -+\fB\ volume create [stripe ] [[replica [arbiter ]]|[replica 2 thin-arbiter 1]] [disperse []] [disperse-data ] [redundancy ] [transport ] ... \fR - Create a new volume of the specified type using the specified bricks and transport type (the default transport type is tcp). - To create a volume with both transports (tcp and rdma), give 'transport tcp,rdma' as an option. - .TP -diff --git a/tests/basic/glusterd/disperse-create.t b/tests/basic/glusterd/disperse-create.t -index 384c675..db8a621 100644 ---- a/tests/basic/glusterd/disperse-create.t -+++ b/tests/basic/glusterd/disperse-create.t -@@ -20,6 +20,10 @@ TEST $CLI volume create $V0 disperse 3 redundancy 1 $H0:$B0/b7 $H0:$B0/b8 $H0:$B - EXPECT "1 x \(2 \+ 1\) = 3" volinfo_field $V0 "Number of Bricks" - - TEST $CLI volume delete $V0 -+TEST $CLI volume create $V0 disperse-data 2 $H0:$B0/b10 $H0:$B0/b11 $H0:$B0/b12 -+EXPECT "1 x \(2 \+ 1\) = 3" volinfo_field $V0 "Number of Bricks" -+ -+TEST $CLI volume delete $V0 - TEST $CLI volume create $V0 redundancy 1 $H0:$B0/b10 $H0:$B0/b11 $H0:$B0/b12 - EXPECT "1 x \(2 \+ 1\) = 3" volinfo_field $V0 "Number of Bricks" - --- -1.8.3.1 - diff --git a/SOURCES/0397-mgmt-brick-mux-Avoid-sending-two-response-when-attac.patch b/SOURCES/0397-mgmt-brick-mux-Avoid-sending-two-response-when-attac.patch deleted file mode 100644 index 6694813..0000000 --- a/SOURCES/0397-mgmt-brick-mux-Avoid-sending-two-response-when-attac.patch +++ /dev/null @@ -1,52 +0,0 @@ -From 73cef29731c0d7b8b4f3b880c032dc232b8fcc31 Mon Sep 17 00:00:00 2001 -From: Mohit Agrawal -Date: Thu, 4 Jun 2020 16:06:44 +0530 -Subject: [PATCH 397/449] mgmt/brick-mux: Avoid sending two response when - attach is failed. - -We were sending two response back to glusterd when an attach is -failed. One from the handler function glusterfs_handle_attach and -another from rpcsvc_check_and_reply_error. It was causing problems -like ref leaks, transport disconnect etc. - -> Change-Id: I3bb5b59959530760b568d52becb519499b3dcd2b -> updates: bz#1785143 -> Signed-off-by: Mohammed Rafi KC -> (Cherry pick from commit 42f484dcecd9942611396d9bd2ad3a39019b0e1f) -> (Reviewed on upstream link https://review.gluster.org/#/c/glusterfs/+/23906/) - -Change-Id: I3bb5b59959530760b568d52becb519499b3dcd2b -BUG: 1776901 -Signed-off-by: Mohit Agrawal -Reviewed-on: https://code.engineering.redhat.com/gerrit/202346 -Reviewed-by: Sanju Rakonde -Tested-by: RHGS Build Bot -Reviewed-by: Sunil Kumar Heggodu Gopala Acharya ---- - glusterfsd/src/glusterfsd-mgmt.c | 10 +++++++++- - 1 file changed, 9 insertions(+), 1 deletion(-) - -diff --git a/glusterfsd/src/glusterfsd-mgmt.c b/glusterfsd/src/glusterfsd-mgmt.c -index 15acc10..61d1b21 100644 ---- a/glusterfsd/src/glusterfsd-mgmt.c -+++ b/glusterfsd/src/glusterfsd-mgmt.c -@@ -954,7 +954,15 @@ glusterfs_handle_attach(rpcsvc_request_t *req) - ret = -1; - } - -- glusterfs_translator_info_response_send(req, ret, NULL, NULL); -+ ret = glusterfs_translator_info_response_send(req, ret, NULL, NULL); -+ if (ret) { -+ /* Response sent back to glusterd, req is already destroyed. So -+ * resetting the ret to 0. Otherwise another response will be -+ * send from rpcsvc_check_and_reply_error. Which will lead to -+ * double resource leak. -+ */ -+ ret = 0; -+ } - - out: - UNLOCK(&ctx->volfile_lock); --- -1.8.3.1 - diff --git a/SOURCES/0398-ec-change-error-message-for-heal-commands-for-disper.patch b/SOURCES/0398-ec-change-error-message-for-heal-commands-for-disper.patch deleted file mode 100644 index 5779539..0000000 --- a/SOURCES/0398-ec-change-error-message-for-heal-commands-for-disper.patch +++ /dev/null @@ -1,75 +0,0 @@ -From 03d2c7b52da5efd6ad660315a0548c8b91e51439 Mon Sep 17 00:00:00 2001 -From: Sheetal Pamecha -Date: Sun, 22 Dec 2019 22:52:30 +0530 -Subject: [PATCH 398/449] ec: change error message for heal commands for - disperse volume - -Currently when we issue a heal statistics or similar commands -for disperse volume, it fails with message "Volume is not of -type replicate." Adding message "this command is supported for -volumes of type replicate" to reflect supportability and better -understanding of heal functionality for disperse volumes. - -> Upstream Patch Link: https://review.gluster.org/#/c/glusterfs/+/23916/ -> fixes: bz#1785998 -> Change-Id: I9688a9fdf427cb6f657cfd5b8db2f76a6c56f6e2 -> Signed-off-by: Sheetal Pamecha - -BUG: 1487177 -Change-Id: I9688a9fdf427cb6f657cfd5b8db2f76a6c56f6e2 -Signed-off-by: Sheetal Pamecha -Reviewed-on: https://code.engineering.redhat.com/gerrit/202344 -Tested-by: RHGS Build Bot -Reviewed-by: Sunil Kumar Heggodu Gopala Acharya ---- - heal/src/glfs-heal.c | 15 ++++++++++----- - xlators/mgmt/glusterd/src/glusterd-volume-ops.c | 4 +++- - 2 files changed, 13 insertions(+), 6 deletions(-) - -diff --git a/heal/src/glfs-heal.c b/heal/src/glfs-heal.c -index 7e37e47..125b12c 100644 ---- a/heal/src/glfs-heal.c -+++ b/heal/src/glfs-heal.c -@@ -1726,14 +1726,19 @@ main(int argc, char **argv) - goto out; - } - -+ char *var_str = (heal_op == GF_SHD_OP_INDEX_SUMMARY || -+ heal_op == GF_SHD_OP_HEAL_SUMMARY) -+ ? "replicate/disperse" -+ : "replicate"; -+ - ret = glfsh_validate_volume(top_subvol, heal_op); - if (ret < 0) { - ret = -EINVAL; -- gf_asprintf(&op_errstr, "Volume %s is not of type %s", volname, -- (heal_op == GF_SHD_OP_INDEX_SUMMARY || -- heal_op == GF_SHD_OP_HEAL_SUMMARY) -- ? "replicate/disperse" -- : "replicate"); -+ gf_asprintf(&op_errstr, -+ "This command is supported " -+ "for only volumes of %s type. Volume %s " -+ "is not of type %s", -+ var_str, volname, var_str); - goto out; - } - rootloc.inode = inode_ref(top_subvol->itable->root); -diff --git a/xlators/mgmt/glusterd/src/glusterd-volume-ops.c b/xlators/mgmt/glusterd/src/glusterd-volume-ops.c -index 076bc80..93042ab 100644 ---- a/xlators/mgmt/glusterd/src/glusterd-volume-ops.c -+++ b/xlators/mgmt/glusterd/src/glusterd-volume-ops.c -@@ -2008,7 +2008,9 @@ glusterd_handle_heal_cmd(xlator_t *this, glusterd_volinfo_t *volinfo, - if (!glusterd_is_volume_replicate(volinfo)) { - ret = -1; - snprintf(msg, sizeof(msg), -- "Volume %s is not of type " -+ "This command is supported " -+ "for only volume of replicated " -+ "type. Volume %s is not of type " - "replicate", - volinfo->volname); - *op_errstr = gf_strdup(msg); --- -1.8.3.1 - diff --git a/SOURCES/0399-glusterd-coverity-fixes.patch b/SOURCES/0399-glusterd-coverity-fixes.patch deleted file mode 100644 index 8052a46..0000000 --- a/SOURCES/0399-glusterd-coverity-fixes.patch +++ /dev/null @@ -1,79 +0,0 @@ -From 1ebd2a3227469b1775f19c8f78af7d3d19f749a3 Mon Sep 17 00:00:00 2001 -From: Atin Mukherjee -Date: Fri, 26 Apr 2019 08:47:12 +0530 -Subject: [PATCH 399/449] glusterd: coverity fixes - -1400775 - USE_AFTER_FREE -1400742 - Missing Unlock -1400736 - CHECKED_RETURN -1398470 - Missing Unlock - -Missing unlock is the tricky one, we have had annotation added, but -coverity still continued to complaint. Added pthread_mutex_unlock to -clean up the lock before destroying it to see if it makes coverity -happy. - -> upstream patch link: https://review.gluster.org/#/c/glusterfs/+/22634/ -> Updates: bz#789278 -> Change-Id: I1d892612a17f805144d96c1b15004a85a1639414 -> Signed-off-by: Atin Mukherjee - -BUG: 1787310 -Change-Id: I1d892612a17f805144d96c1b15004a85a1639414 -Signed-off-by: Sanju Rakonde -Reviewed-on: https://code.engineering.redhat.com/gerrit/202343 -Reviewed-by: Mohit Agrawal -Tested-by: RHGS Build Bot -Reviewed-by: Sunil Kumar Heggodu Gopala Acharya ---- - xlators/mgmt/glusterd/src/glusterd-peer-utils.c | 1 + - xlators/mgmt/glusterd/src/glusterd-sm.c | 1 - - xlators/mgmt/glusterd/src/glusterd-utils.c | 8 +++++++- - 3 files changed, 8 insertions(+), 2 deletions(-) - -diff --git a/xlators/mgmt/glusterd/src/glusterd-peer-utils.c b/xlators/mgmt/glusterd/src/glusterd-peer-utils.c -index f24c86e..8c1feeb 100644 ---- a/xlators/mgmt/glusterd/src/glusterd-peer-utils.c -+++ b/xlators/mgmt/glusterd/src/glusterd-peer-utils.c -@@ -48,6 +48,7 @@ glusterd_peerinfo_destroy(struct rcu_head *head) - } - - glusterd_sm_tr_log_delete(&peerinfo->sm_log); -+ pthread_mutex_unlock(&peerinfo->delete_lock); - pthread_mutex_destroy(&peerinfo->delete_lock); - GF_FREE(peerinfo); - -diff --git a/xlators/mgmt/glusterd/src/glusterd-sm.c b/xlators/mgmt/glusterd/src/glusterd-sm.c -index 54a7bd1..044da3d 100644 ---- a/xlators/mgmt/glusterd/src/glusterd-sm.c -+++ b/xlators/mgmt/glusterd/src/glusterd-sm.c -@@ -868,7 +868,6 @@ glusterd_ac_friend_remove(glusterd_friend_sm_event_t *event, void *ctx) - "Cleanup returned: %d", ret); - } - out: -- /* coverity[ LOCK] */ - return 0; - } - -diff --git a/xlators/mgmt/glusterd/src/glusterd-utils.c b/xlators/mgmt/glusterd/src/glusterd-utils.c -index 1b78812..a1299bc 100644 ---- a/xlators/mgmt/glusterd/src/glusterd-utils.c -+++ b/xlators/mgmt/glusterd/src/glusterd-utils.c -@@ -5840,7 +5840,13 @@ attach_brick_callback(struct rpc_req *req, struct iovec *iov, int count, - /* PID file is copied once brick has attached - successfully - */ -- glusterd_copy_file(pidfile1, pidfile2); -+ ret = glusterd_copy_file(pidfile1, pidfile2); -+ if (ret) { -+ gf_msg(this->name, GF_LOG_ERROR, ENOMEM, GD_MSG_NO_MEMORY, -+ "Could not copy file %s to %s", pidfile1, pidfile2); -+ goto out; -+ } -+ - brickinfo->status = GF_BRICK_STARTED; - brickinfo->rpc = rpc_clnt_ref(other_brick->rpc); - gf_log(THIS->name, GF_LOG_INFO, "brick %s is attached successfully", --- -1.8.3.1 - diff --git a/SOURCES/0400-cli-throw-a-warning-if-replica-count-greater-than-3.patch b/SOURCES/0400-cli-throw-a-warning-if-replica-count-greater-than-3.patch deleted file mode 100644 index dd1ea52..0000000 --- a/SOURCES/0400-cli-throw-a-warning-if-replica-count-greater-than-3.patch +++ /dev/null @@ -1,98 +0,0 @@ -From 12ed9226fa24d073ab2b89692194b454a194c379 Mon Sep 17 00:00:00 2001 -From: Sanju Rakonde -Date: Thu, 4 Jun 2020 15:14:29 +0530 -Subject: [PATCH 400/449] cli: throw a warning if replica count greater than 3 - -As volumes with replica count greater than 3 are not -supported, a warning message is be thrown to user -while creating the volume with replica count greater -than 3 or while converting a volume to replica > 3 -volume by add-brick/remove-brick operations. - -Label: DOWNSTREAM ONLY - -BUG: 1763129 -Change-Id: I5a32a5a2d99b5175fb692dfcab27396089f24b72 -Signed-off-by: Sanju Rakonde -Reviewed-on: https://code.engineering.redhat.com/gerrit/202338 -Tested-by: RHGS Build Bot -Reviewed-by: Mohit Agrawal -Reviewed-by: Ravishankar Narayanankutty -Reviewed-by: Sunil Kumar Heggodu Gopala Acharya ---- - cli/src/cli-cmd-parser.c | 45 +++++++++++++++++++++++++++++++++++++++++++++ - 1 file changed, 45 insertions(+) - -diff --git a/cli/src/cli-cmd-parser.c b/cli/src/cli-cmd-parser.c -index ac0a263..5e7ce53 100644 ---- a/cli/src/cli-cmd-parser.c -+++ b/cli/src/cli-cmd-parser.c -@@ -619,6 +619,23 @@ cli_cmd_volume_create_parse(struct cli_state *state, const char **words, - } - } - } -+ -+ if (replica_count > 3) { -+ if (strcmp(words[wordcount - 1], "force")) { -+ question = -+ "Volumes with replica count greater than 3 are" -+ "not supported. \nDo you still want to continue?\n"; -+ answer = cli_cmd_get_confirmation(state, question); -+ if (GF_ANSWER_NO == answer) { -+ gf_log("cli", GF_LOG_ERROR, -+ "Volume create " -+ "cancelled, exiting"); -+ ret = -1; -+ goto out; -+ } -+ } -+ } -+ - ret = dict_set_int32(dict, "replica-count", replica_count); - if (ret) - goto out; -@@ -1815,6 +1832,20 @@ cli_cmd_volume_add_brick_parse(struct cli_state *state, const char **words, - goto out; - } - } -+ } else if (count > 3) { -+ if (strcmp(words[wordcount - 1], "force")) { -+ question = -+ "Volumes with replica count greater than 3 are" -+ "not supported. \nDo you still want to continue?\n"; -+ answer = cli_cmd_get_confirmation(state, question); -+ if (GF_ANSWER_NO == answer) { -+ gf_log("cli", GF_LOG_ERROR, -+ "add-brick " -+ "cancelled, exiting"); -+ ret = -1; -+ goto out; -+ } -+ } - } - } else if ((strcmp(w, "stripe")) == 0) { - cli_err("stripe option not supported"); -@@ -2082,6 +2113,20 @@ cli_cmd_volume_remove_brick_parse(struct cli_state *state, const char **words, - goto out; - } - } -+ } else if (count > 3) { -+ if (strcmp(words[wordcount - 1], "force")) { -+ ques = -+ "Volumes with replica count greater than 3 are" -+ "not supported. \nDo you still want to continue?\n"; -+ answer = cli_cmd_get_confirmation(state, ques); -+ if (GF_ANSWER_NO == answer) { -+ gf_log("cli", GF_LOG_ERROR, -+ "Remove-brick " -+ "cancelled, exiting"); -+ ret = -1; -+ goto out; -+ } -+ } - } - - ret = dict_set_int32(dict, "replica-count", count); --- -1.8.3.1 - diff --git a/SOURCES/0401-cli-change-the-warning-message.patch b/SOURCES/0401-cli-change-the-warning-message.patch deleted file mode 100644 index 5c3e895..0000000 --- a/SOURCES/0401-cli-change-the-warning-message.patch +++ /dev/null @@ -1,70 +0,0 @@ -From 704bf84d432e1eea1534e35ee27d4116a7273146 Mon Sep 17 00:00:00 2001 -From: Sanju Rakonde -Date: Thu, 4 Jun 2020 16:15:35 +0530 -Subject: [PATCH 401/449] cli: change the warning message - -while creating the replica 2 volume or converting -a volume to replica 2 volume, we issue a warning -saying "replica 2 volumes are prone to split brain". -As the support for replica 2 volumes has been deprecated, -warning message should be changed accordingly to reflect -the same. - -Label: DOWNSTREAM ONLY - -BUG: 1763124 -Change-Id: If55e5412cda2e4a21a6359492d8d704dd702530d -Signed-off-by: Sanju Rakonde -Reviewed-on: https://code.engineering.redhat.com/gerrit/202348 -Tested-by: RHGS Build Bot -Reviewed-by: Mohit Agrawal -Reviewed-by: Ravishankar Narayanankutty -Reviewed-by: Sunil Kumar Heggodu Gopala Acharya ---- - cli/src/cli-cmd-parser.c | 16 ++++++++-------- - 1 file changed, 8 insertions(+), 8 deletions(-) - -diff --git a/cli/src/cli-cmd-parser.c b/cli/src/cli-cmd-parser.c -index 5e7ce53..7446b95 100644 ---- a/cli/src/cli-cmd-parser.c -+++ b/cli/src/cli-cmd-parser.c -@@ -603,8 +603,8 @@ cli_cmd_volume_create_parse(struct cli_state *state, const char **words, - if (replica_count == 2) { - if (strcmp(words[wordcount - 1], "force")) { - question = -- "Replica 2 volumes are prone" -- " to split-brain. Use " -+ "Support for replica 2 volumes stands deprecated as " -+ "they are prone to split-brain. Use " - "Arbiter or Replica 3 to " - "avoid this.\n" - "Do you still want to " -@@ -1817,9 +1817,9 @@ cli_cmd_volume_add_brick_parse(struct cli_state *state, const char **words, - if (count == 2) { - if (strcmp(words[wordcount - 1], "force")) { - question = -- "Replica 2 volumes are prone to " -- "split-brain. Use Arbiter or " -- "Replica 3 to avaoid this. See: " -+ "Support for replica 2 volumes stands deprecated as they " -+ "are prone to split-brain. Use Arbiter or " -+ "Replica 3 to avoid this. See: " - "http://docs.gluster.org/en/latest/Administrator%20Guide/" - "Split%20brain%20and%20ways%20to%20deal%20with%20it/." - "\nDo you still want to continue?\n"; -@@ -2098,9 +2098,9 @@ cli_cmd_volume_remove_brick_parse(struct cli_state *state, const char **words, - if (count == 2) { - if (strcmp(words[wordcount - 1], "force")) { - ques = -- "Replica 2 volumes are prone to " -- "split-brain. Use Arbiter or Replica 3 " -- "to avaoid this. See: " -+ "Support for replica 2 volumes stands deprecated as they " -+ "are prone to split-brain. Use Arbiter or Replica 3 " -+ "to avoid this. See: " - "http://docs.gluster.org/en/latest/Administrator%20Guide/" - "Split%20brain%20and%20ways%20to%20deal%20with%20it/." - "\nDo you still want to continue?\n"; --- -1.8.3.1 - diff --git a/SOURCES/0402-afr-wake-up-index-healer-threads.patch b/SOURCES/0402-afr-wake-up-index-healer-threads.patch deleted file mode 100644 index 34ca329..0000000 --- a/SOURCES/0402-afr-wake-up-index-healer-threads.patch +++ /dev/null @@ -1,198 +0,0 @@ -From ecaa0f10820f4b6e803021919ce59a43aedf356b Mon Sep 17 00:00:00 2001 -From: Ravishankar N -Date: Thu, 4 Jun 2020 16:15:35 +0530 -Subject: [PATCH 402/449] afr: wake up index healer threads - -...whenever shd is re-enabled after disabling or there is a change in -`cluster.heal-timeout`, without needing to restart shd or waiting for the -current `cluster.heal-timeout` seconds to expire. - -> Upstream patch link:https://review.gluster.org/#/c/glusterfs/+/23288/ -> Change-Id: Ia5ebd7c8e9f5b54cba3199c141fdd1af2f9b9bfe -> fixes: bz#1744548 -> Reported-by: Glen Kiessling -> Signed-off-by: Ravishankar N - -BUG: 1764091 -Change-Id: I42aa0807f09b5a09510fe9efb4a1697dad3410a3 -Signed-off-by: Ravishankar N -Reviewed-on: https://code.engineering.redhat.com/gerrit/202368 -Tested-by: RHGS Build Bot -Reviewed-by: Sunil Kumar Heggodu Gopala Acharya ---- - tests/bugs/replicate/bug-1744548-heal-timeout.t | 42 +++++++++++++++++++++++++ - xlators/cluster/afr/src/afr-common.c | 6 ++-- - xlators/cluster/afr/src/afr-self-heald.c | 14 ++++++--- - xlators/cluster/afr/src/afr-self-heald.h | 3 -- - xlators/cluster/afr/src/afr.c | 10 ++++++ - xlators/cluster/afr/src/afr.h | 2 ++ - 6 files changed, 66 insertions(+), 11 deletions(-) - create mode 100644 tests/bugs/replicate/bug-1744548-heal-timeout.t - -diff --git a/tests/bugs/replicate/bug-1744548-heal-timeout.t b/tests/bugs/replicate/bug-1744548-heal-timeout.t -new file mode 100644 -index 0000000..3cb73bc ---- /dev/null -+++ b/tests/bugs/replicate/bug-1744548-heal-timeout.t -@@ -0,0 +1,42 @@ -+#!/bin/bash -+ -+. $(dirname $0)/../../include.rc -+. $(dirname $0)/../../volume.rc -+. $(dirname $0)/../../afr.rc -+ -+cleanup; -+ -+TEST glusterd; -+TEST pidof glusterd; -+TEST $CLI volume create $V0 replica 3 $H0:$B0/${V0}{0,1,2} -+TEST $CLI volume heal $V0 disable -+TEST $CLI volume start $V0 -+EXPECT_WITHIN $PROCESS_UP_TIMEOUT "1" brick_up_status $V0 $H0 $B0/${V0}0 -+EXPECT_WITHIN $PROCESS_UP_TIMEOUT "1" brick_up_status $V0 $H0 $B0/${V0}1 -+EXPECT_WITHIN $PROCESS_UP_TIMEOUT "1" brick_up_status $V0 $H0 $B0/${V0}2 -+TEST ! $CLI volume heal $V0 -+ -+# Enable shd and verify that index crawl is triggered immediately. -+TEST $CLI volume profile $V0 start -+TEST $CLI volume profile $V0 info clear -+TEST $CLI volume heal $V0 enable -+TEST $CLI volume heal $V0 -+# Each brick does 3 opendirs, corresponding to dirty, xattrop and entry-changes -+COUNT=`$CLI volume profile $V0 info incremental |grep OPENDIR|awk '{print $8}'|tr -d '\n'` -+TEST [ "$COUNT" == "333" ] -+ -+# Check that a change in heal-timeout is honoured immediately. -+TEST $CLI volume set $V0 cluster.heal-timeout 5 -+sleep 10 -+COUNT=`$CLI volume profile $V0 info incremental |grep OPENDIR|awk '{print $8}'|tr -d '\n'` -+# Two crawls must have happened. -+TEST [ "$COUNT" == "666" ] -+ -+# shd must not heal if it is disabled and heal-timeout is changed. -+TEST $CLI volume heal $V0 disable -+TEST $CLI volume profile $V0 info clear -+TEST $CLI volume set $V0 cluster.heal-timeout 6 -+sleep 6 -+COUNT=`$CLI volume profile $V0 info incremental |grep OPENDIR|awk '{print $8}'|tr -d '\n'` -+TEST [ -z $COUNT ] -+cleanup; -diff --git a/xlators/cluster/afr/src/afr-common.c b/xlators/cluster/afr/src/afr-common.c -index 3690b84..eef7fd2 100644 ---- a/xlators/cluster/afr/src/afr-common.c -+++ b/xlators/cluster/afr/src/afr-common.c -@@ -5613,10 +5613,8 @@ afr_notify(xlator_t *this, int32_t event, void *data, void *data2) - * b) Already heard from everyone, but we now got a child-up - * event. - */ -- if (have_heard_from_all && priv->shd.iamshd) { -- for (i = 0; i < priv->child_count; i++) -- if (priv->child_up[i]) -- afr_selfheal_childup(this, i); -+ if (have_heard_from_all) { -+ afr_selfheal_childup(this, priv); - } - } - out: -diff --git a/xlators/cluster/afr/src/afr-self-heald.c b/xlators/cluster/afr/src/afr-self-heald.c -index 7eb1207..95ac5f2 100644 ---- a/xlators/cluster/afr/src/afr-self-heald.c -+++ b/xlators/cluster/afr/src/afr-self-heald.c -@@ -1258,12 +1258,18 @@ out: - return ret; - } - --int --afr_selfheal_childup(xlator_t *this, int subvol) -+void -+afr_selfheal_childup(xlator_t *this, afr_private_t *priv) - { -- afr_shd_index_healer_spawn(this, subvol); -+ int subvol = 0; - -- return 0; -+ if (!priv->shd.iamshd) -+ return; -+ for (subvol = 0; subvol < priv->child_count; subvol++) -+ if (priv->child_up[subvol]) -+ afr_shd_index_healer_spawn(this, subvol); -+ -+ return; - } - - int -diff --git a/xlators/cluster/afr/src/afr-self-heald.h b/xlators/cluster/afr/src/afr-self-heald.h -index 7de7c43..1990539 100644 ---- a/xlators/cluster/afr/src/afr-self-heald.h -+++ b/xlators/cluster/afr/src/afr-self-heald.h -@@ -60,9 +60,6 @@ typedef struct { - } afr_self_heald_t; - - int --afr_selfheal_childup(xlator_t *this, int subvol); -- --int - afr_selfheal_daemon_init(xlator_t *this); - - int -diff --git a/xlators/cluster/afr/src/afr.c b/xlators/cluster/afr/src/afr.c -index 33258a0..8f9e71f 100644 ---- a/xlators/cluster/afr/src/afr.c -+++ b/xlators/cluster/afr/src/afr.c -@@ -141,6 +141,7 @@ reconfigure(xlator_t *this, dict_t *options) - afr_private_t *priv = NULL; - xlator_t *read_subvol = NULL; - int read_subvol_index = -1; -+ int timeout_old = 0; - int ret = -1; - int index = -1; - char *qtype = NULL; -@@ -150,6 +151,7 @@ reconfigure(xlator_t *this, dict_t *options) - char *locking_scheme = NULL; - gf_boolean_t consistent_io = _gf_false; - gf_boolean_t choose_local_old = _gf_false; -+ gf_boolean_t enabled_old = _gf_false; - - priv = this->private; - -@@ -255,11 +257,13 @@ reconfigure(xlator_t *this, dict_t *options) - GF_OPTION_RECONF("ensure-durability", priv->ensure_durability, options, - bool, out); - -+ enabled_old = priv->shd.enabled; - GF_OPTION_RECONF("self-heal-daemon", priv->shd.enabled, options, bool, out); - - GF_OPTION_RECONF("iam-self-heal-daemon", priv->shd.iamshd, options, bool, - out); - -+ timeout_old = priv->shd.timeout; - GF_OPTION_RECONF("heal-timeout", priv->shd.timeout, options, int32, out); - - GF_OPTION_RECONF("consistent-metadata", priv->consistent_metadata, options, -@@ -283,6 +287,12 @@ reconfigure(xlator_t *this, dict_t *options) - consistent_io = _gf_false; - priv->consistent_io = consistent_io; - -+ if (priv->shd.enabled) { -+ if ((priv->shd.enabled != enabled_old) || -+ (timeout_old != priv->shd.timeout)) -+ afr_selfheal_childup(this, priv); -+ } -+ - ret = 0; - out: - return ret; -diff --git a/xlators/cluster/afr/src/afr.h b/xlators/cluster/afr/src/afr.h -index e731cfa..18f1a6a 100644 ---- a/xlators/cluster/afr/src/afr.h -+++ b/xlators/cluster/afr/src/afr.h -@@ -1332,4 +1332,6 @@ afr_lookup_has_quorum(call_frame_t *frame, xlator_t *this, - void - afr_mark_new_entry_changelog(call_frame_t *frame, xlator_t *this); - -+void -+afr_selfheal_childup(xlator_t *this, afr_private_t *priv); - #endif /* __AFR_H__ */ --- -1.8.3.1 - diff --git a/SOURCES/0403-Fix-spurious-failure-in-bug-1744548-heal-timeout.t.patch b/SOURCES/0403-Fix-spurious-failure-in-bug-1744548-heal-timeout.t.patch deleted file mode 100644 index 569bdc0..0000000 --- a/SOURCES/0403-Fix-spurious-failure-in-bug-1744548-heal-timeout.t.patch +++ /dev/null @@ -1,84 +0,0 @@ -From b311385a3c4bd56d69d1fa7e9bd3d9a2ae5c344e Mon Sep 17 00:00:00 2001 -From: Pranith Kumar K -Date: Mon, 7 Oct 2019 12:27:01 +0530 -Subject: [PATCH 403/449] Fix spurious failure in bug-1744548-heal-timeout.t - -Script was assuming that the heal would have triggered -by the time test was executed, which may not be the case. -It can lead to following failures when the race happens: - -... -18:29:45 not ok 14 [ 85/ 1] < 26> '[ 331 == 333 ]' -> '' -... -18:29:45 not ok 16 [ 10097/ 1] < 33> '[ 668 == 666 ]' -> '' - -Heal on 3rd brick didn't start completely first time the command was executed. -So the extra count got added to the next profile info. - -Fixed it by depending on cumulative stats and waiting until the count is -satisfied using EXPECT_WITHIN - -> Upstream patch link:https://review.gluster.org/23523 ->fixes: bz#1759002 ->Change-Id: I3b410671c902d6b1458a757fa245613cb29d967d ->Signed-off-by: Pranith Kumar K - -BUG: 1764091 -Change-Id: Ic4d16b6c8a1bbc35735567d60fd0383456b9f534 -Signed-off-by: Ravishankar N -Reviewed-on: https://code.engineering.redhat.com/gerrit/202369 -Tested-by: RHGS Build Bot -Reviewed-by: Sunil Kumar Heggodu Gopala Acharya ---- - tests/bugs/replicate/bug-1744548-heal-timeout.t | 17 +++++++++++------ - 1 file changed, 11 insertions(+), 6 deletions(-) - -diff --git a/tests/bugs/replicate/bug-1744548-heal-timeout.t b/tests/bugs/replicate/bug-1744548-heal-timeout.t -index 3cb73bc..0aaa3ea 100644 ---- a/tests/bugs/replicate/bug-1744548-heal-timeout.t -+++ b/tests/bugs/replicate/bug-1744548-heal-timeout.t -@@ -4,6 +4,11 @@ - . $(dirname $0)/../../volume.rc - . $(dirname $0)/../../afr.rc - -+function get_cumulative_opendir_count { -+#sed 'n:d' prints odd-numbered lines -+ $CLI volume profile $V0 info |grep OPENDIR|sed 'n;d' | awk '{print $8}'|tr -d '\n' -+} -+ - cleanup; - - TEST glusterd; -@@ -20,23 +25,23 @@ TEST ! $CLI volume heal $V0 - TEST $CLI volume profile $V0 start - TEST $CLI volume profile $V0 info clear - TEST $CLI volume heal $V0 enable --TEST $CLI volume heal $V0 - # Each brick does 3 opendirs, corresponding to dirty, xattrop and entry-changes --COUNT=`$CLI volume profile $V0 info incremental |grep OPENDIR|awk '{print $8}'|tr -d '\n'` --TEST [ "$COUNT" == "333" ] -+EXPECT_WITHIN $HEAL_TIMEOUT "^333$" get_cumulative_opendir_count - - # Check that a change in heal-timeout is honoured immediately. - TEST $CLI volume set $V0 cluster.heal-timeout 5 - sleep 10 --COUNT=`$CLI volume profile $V0 info incremental |grep OPENDIR|awk '{print $8}'|tr -d '\n'` - # Two crawls must have happened. --TEST [ "$COUNT" == "666" ] -+EXPECT_WITHIN $HEAL_TIMEOUT "^999$" get_cumulative_opendir_count - - # shd must not heal if it is disabled and heal-timeout is changed. - TEST $CLI volume heal $V0 disable -+#Wait for configuration update and any opendir fops to complete -+sleep 10 - TEST $CLI volume profile $V0 info clear - TEST $CLI volume set $V0 cluster.heal-timeout 6 --sleep 6 -+#Better to wait for more than 6 seconds to account for configuration updates -+sleep 10 - COUNT=`$CLI volume profile $V0 info incremental |grep OPENDIR|awk '{print $8}'|tr -d '\n'` - TEST [ -z $COUNT ] - cleanup; --- -1.8.3.1 - diff --git a/SOURCES/0404-tests-Fix-spurious-failure.patch b/SOURCES/0404-tests-Fix-spurious-failure.patch deleted file mode 100644 index 9cbb6ea..0000000 --- a/SOURCES/0404-tests-Fix-spurious-failure.patch +++ /dev/null @@ -1,38 +0,0 @@ -From b65ca1045910bc18c601681788eb322dbb8ec2fa Mon Sep 17 00:00:00 2001 -From: Pranith Kumar K -Date: Mon, 14 Oct 2019 10:29:31 +0530 -Subject: [PATCH 404/449] tests: Fix spurious failure - -> Upstream patch:https://review.gluster.org/23546 -> fixes: bz#1759002 -> Change-Id: I4d49e1c2ca9b3c1d74b9dd5a30f1c66983a76529 -> Signed-off-by: Pranith Kumar K - -BUG: 1764091 -Change-Id: I8b66f08cce7a87788867c6373aed71d6fc65155f -Signed-off-by: Ravishankar N -Reviewed-on: https://code.engineering.redhat.com/gerrit/202370 -Tested-by: RHGS Build Bot -Reviewed-by: Sunil Kumar Heggodu Gopala Acharya ---- - tests/bugs/replicate/bug-1744548-heal-timeout.t | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/tests/bugs/replicate/bug-1744548-heal-timeout.t b/tests/bugs/replicate/bug-1744548-heal-timeout.t -index 0aaa3ea..c208112 100644 ---- a/tests/bugs/replicate/bug-1744548-heal-timeout.t -+++ b/tests/bugs/replicate/bug-1744548-heal-timeout.t -@@ -5,8 +5,8 @@ - . $(dirname $0)/../../afr.rc - - function get_cumulative_opendir_count { --#sed 'n:d' prints odd-numbered lines -- $CLI volume profile $V0 info |grep OPENDIR|sed 'n;d' | awk '{print $8}'|tr -d '\n' -+#sed command prints content between Cumulative and Interval, this keeps content from Cumulative stats -+ $CLI volume profile $V0 info |sed -n '/^Cumulative/,/^Interval/p'|grep OPENDIR| awk '{print $8}'|tr -d '\n' - } - - cleanup; --- -1.8.3.1 - diff --git a/SOURCES/0405-core-fix-return-of-local-in-__nlc_inode_ctx_get.patch b/SOURCES/0405-core-fix-return-of-local-in-__nlc_inode_ctx_get.patch deleted file mode 100644 index 765c154..0000000 --- a/SOURCES/0405-core-fix-return-of-local-in-__nlc_inode_ctx_get.patch +++ /dev/null @@ -1,175 +0,0 @@ -From 9c5f5b4ffd49e8c8631defb7b6873248bbfdaf9c Mon Sep 17 00:00:00 2001 -From: Rinku Kothiya -Date: Tue, 23 Jul 2019 13:16:04 +0000 -Subject: [PATCH 405/449] [core] fix return of local in __nlc_inode_ctx_get - -__nlc_inode_ctx_get assigns a value to nlc_pe_p which is never used by -its parent function or any of the predecessor hence remove the -assignment and also that function argument as it is not being used -anywhere. - -> fixes: bz#1732496 -> Change-Id: I5b950e1e251bd50a646616da872a4efe9d2ff8c9 -> (Cherry pick from commit 84a55090123a7e3124100e5564da8c521c3c22ab ) -> (Reviewed on upstream link https://review.gluster.org/#/c/glusterfs/+/23093/) - -BUG: 1686897 - -Change-Id: I5b950e1e251bd50a646616da872a4efe9d2ff8c9 -Signed-off-by: Rinku Kothiya -Reviewed-on: https://code.engineering.redhat.com/gerrit/202372 -Tested-by: RHGS Build Bot -Reviewed-by: Sunil Kumar Heggodu Gopala Acharya ---- - xlators/performance/nl-cache/src/nl-cache-helper.c | 36 +++++++++------------- - 1 file changed, 14 insertions(+), 22 deletions(-) - -diff --git a/xlators/performance/nl-cache/src/nl-cache-helper.c b/xlators/performance/nl-cache/src/nl-cache-helper.c -index 009f33a..4314038 100644 ---- a/xlators/performance/nl-cache/src/nl-cache-helper.c -+++ b/xlators/performance/nl-cache/src/nl-cache-helper.c -@@ -145,12 +145,10 @@ nlc_disable_cache(xlator_t *this) - } - - static int --__nlc_inode_ctx_get(xlator_t *this, inode_t *inode, nlc_ctx_t **nlc_ctx_p, -- nlc_pe_t **nlc_pe_p) -+__nlc_inode_ctx_get(xlator_t *this, inode_t *inode, nlc_ctx_t **nlc_ctx_p) - { - int ret = 0; - nlc_ctx_t *nlc_ctx = NULL; -- nlc_pe_t *nlc_pe = NULL; - uint64_t nlc_ctx_int = 0; - uint64_t nlc_pe_int = 0; - -@@ -159,10 +157,6 @@ __nlc_inode_ctx_get(xlator_t *this, inode_t *inode, nlc_ctx_t **nlc_ctx_p, - nlc_ctx = (void *)(long)(nlc_ctx_int); - *nlc_ctx_p = nlc_ctx; - } -- if (ret == 0 && nlc_pe_p) { -- nlc_pe = (void *)(long)(nlc_pe_int); -- *nlc_pe_p = nlc_pe; -- } - return ret; - } - -@@ -186,14 +180,13 @@ nlc_inode_ctx_set(xlator_t *this, inode_t *inode, nlc_ctx_t *nlc_ctx, - } - - static void --nlc_inode_ctx_get(xlator_t *this, inode_t *inode, nlc_ctx_t **nlc_ctx_p, -- nlc_pe_t **nlc_pe_p) -+nlc_inode_ctx_get(xlator_t *this, inode_t *inode, nlc_ctx_t **nlc_ctx_p) - { - int ret = 0; - - LOCK(&inode->lock); - { -- ret = __nlc_inode_ctx_get(this, inode, nlc_ctx_p, nlc_pe_p); -+ ret = __nlc_inode_ctx_get(this, inode, nlc_ctx_p); - if (ret < 0) - gf_msg_debug(this->name, 0, - "inode ctx get failed for " -@@ -290,8 +283,7 @@ out: - } - - static nlc_ctx_t * --nlc_inode_ctx_get_set(xlator_t *this, inode_t *inode, nlc_ctx_t **nlc_ctx_p, -- nlc_pe_t **nlc_pe_p) -+nlc_inode_ctx_get_set(xlator_t *this, inode_t *inode, nlc_ctx_t **nlc_ctx_p) - { - int ret = 0; - nlc_ctx_t *nlc_ctx = NULL; -@@ -301,7 +293,7 @@ nlc_inode_ctx_get_set(xlator_t *this, inode_t *inode, nlc_ctx_t **nlc_ctx_p, - - LOCK(&inode->lock); - { -- ret = __nlc_inode_ctx_get(this, inode, &nlc_ctx, nlc_pe_p); -+ ret = __nlc_inode_ctx_get(this, inode, &nlc_ctx); - if (nlc_ctx) - goto unlock; - -@@ -410,7 +402,7 @@ nlc_set_dir_state(xlator_t *this, inode_t *inode, uint64_t state) - goto out; - } - -- nlc_inode_ctx_get_set(this, inode, &nlc_ctx, NULL); -+ nlc_inode_ctx_get_set(this, inode, &nlc_ctx); - if (!nlc_ctx) - goto out; - -@@ -430,7 +422,7 @@ nlc_cache_timeout_handler(struct gf_tw_timer_list *timer, void *data, - nlc_timer_data_t *tmp = data; - nlc_ctx_t *nlc_ctx = NULL; - -- nlc_inode_ctx_get(tmp->this, tmp->inode, &nlc_ctx, NULL); -+ nlc_inode_ctx_get(tmp->this, tmp->inode, &nlc_ctx); - if (!nlc_ctx) - goto out; - -@@ -696,7 +688,7 @@ nlc_inode_clear_cache(xlator_t *this, inode_t *inode, int reason) - { - nlc_ctx_t *nlc_ctx = NULL; - -- nlc_inode_ctx_get(this, inode, &nlc_ctx, NULL); -+ nlc_inode_ctx_get(this, inode, &nlc_ctx); - if (!nlc_ctx) - goto out; - -@@ -883,7 +875,7 @@ nlc_dir_add_ne(xlator_t *this, inode_t *inode, const char *name) - goto out; - } - -- nlc_inode_ctx_get_set(this, inode, &nlc_ctx, NULL); -+ nlc_inode_ctx_get_set(this, inode, &nlc_ctx); - if (!nlc_ctx) - goto out; - -@@ -914,7 +906,7 @@ nlc_dir_remove_pe(xlator_t *this, inode_t *parent, inode_t *entry_ino, - goto out; - } - -- nlc_inode_ctx_get(this, parent, &nlc_ctx, NULL); -+ nlc_inode_ctx_get(this, parent, &nlc_ctx); - if (!nlc_ctx) - goto out; - -@@ -945,7 +937,7 @@ nlc_dir_add_pe(xlator_t *this, inode_t *inode, inode_t *entry_ino, - goto out; - } - -- nlc_inode_ctx_get_set(this, inode, &nlc_ctx, NULL); -+ nlc_inode_ctx_get_set(this, inode, &nlc_ctx); - if (!nlc_ctx) - goto out; - -@@ -1051,7 +1043,7 @@ nlc_is_negative_lookup(xlator_t *this, loc_t *loc) - goto out; - } - -- nlc_inode_ctx_get(this, inode, &nlc_ctx, NULL); -+ nlc_inode_ctx_get(this, inode, &nlc_ctx); - if (!nlc_ctx) - goto out; - -@@ -1102,7 +1094,7 @@ nlc_get_real_file_name(xlator_t *this, loc_t *loc, const char *fname, - goto out; - } - -- nlc_inode_ctx_get(this, inode, &nlc_ctx, NULL); -+ nlc_inode_ctx_get(this, inode, &nlc_ctx); - if (!nlc_ctx) - goto out; - -@@ -1152,7 +1144,7 @@ nlc_dump_inodectx(xlator_t *this, inode_t *inode) - nlc_ne_t *ne = NULL; - nlc_ne_t *tmp1 = NULL; - -- nlc_inode_ctx_get(this, inode, &nlc_ctx, NULL); -+ nlc_inode_ctx_get(this, inode, &nlc_ctx); - - if (!nlc_ctx) - goto out; --- -1.8.3.1 - diff --git a/SOURCES/0406-afr-support-split-brain-CLI-for-replica-3.patch b/SOURCES/0406-afr-support-split-brain-CLI-for-replica-3.patch deleted file mode 100644 index 4b57e8a..0000000 --- a/SOURCES/0406-afr-support-split-brain-CLI-for-replica-3.patch +++ /dev/null @@ -1,185 +0,0 @@ -From a75bb15fbe64f14580c44b8a33314c8bbeffdede Mon Sep 17 00:00:00 2001 -From: Ravishankar N -Date: Thu, 4 Jun 2020 18:54:46 +0530 -Subject: [PATCH 406/449] afr: support split-brain CLI for replica 3 - -Patch in upstream master: https://review.gluster.org/#/c/glusterfs/+/23502/ - -Ever since we added quorum checks for lookups in afr via commit -bd44d59741bb8c0f5d7a62c5b1094179dd0ce8a4, the split-brain resolution -commands would not work for replica 3 because there would be no -readables for the lookup fop. - -The argument was that split-brains do not occur in replica 3 but we do -see (data/metadata) split-brain cases once in a while which indicate that there are -a few bugs/corner cases yet to be discovered and fixed. - -Fortunately, commit 8016d51a3bbd410b0b927ed66be50a09574b7982 added -GF_CLIENT_PID_GLFS_HEALD as the pid for all fops made by glfsheal. If we -leverage this and allow lookups in afr when pid is GF_CLIENT_PID_GLFS_HEALD, -split-brain resolution commands will work for replica 3 volumes too. - -Likewise, the check is added in shard_lookup as well to permit resolving -split-brains by specifying "/.shard/shard-file.xx" as the file name -(which previously used to fail with EPERM). - -BUG: 1759875 -Change-Id: I203735b909c7d30fc4faaf3ecd4f5b6b379ab266 -Signed-off-by: Ravishankar N -Reviewed-on: https://code.engineering.redhat.com/gerrit/202375 -Reviewed-by: Sunil Kumar Heggodu Gopala Acharya ---- - .../replicate/bug-1756938-replica-3-sbrain-cli.t | 111 +++++++++++++++++++++ - xlators/cluster/afr/src/afr-common.c | 3 +- - xlators/features/shard/src/shard.c | 3 +- - 3 files changed, 115 insertions(+), 2 deletions(-) - create mode 100644 tests/bugs/replicate/bug-1756938-replica-3-sbrain-cli.t - -diff --git a/tests/bugs/replicate/bug-1756938-replica-3-sbrain-cli.t b/tests/bugs/replicate/bug-1756938-replica-3-sbrain-cli.t -new file mode 100644 -index 0000000..c1bdf34 ---- /dev/null -+++ b/tests/bugs/replicate/bug-1756938-replica-3-sbrain-cli.t -@@ -0,0 +1,111 @@ -+#!/bin/bash -+ -+. $(dirname $0)/../../include.rc -+. $(dirname $0)/../../volume.rc -+. $(dirname $0)/../../afr.rc -+ -+cleanup; -+ -+TEST glusterd; -+TEST pidof glusterd; -+TEST $CLI volume create $V0 replica 3 $H0:$B0/${V0}{0,1,2} -+TEST $CLI volume set $V0 features.shard enable -+TEST $CLI volume set $V0 features.shard-block-size 4MB -+ -+TEST $CLI volume start $V0 -+EXPECT_WITHIN $PROCESS_UP_TIMEOUT "1" brick_up_status $V0 $H0 $B0/${V0}0 -+EXPECT_WITHIN $PROCESS_UP_TIMEOUT "1" brick_up_status $V0 $H0 $B0/${V0}1 -+EXPECT_WITHIN $PROCESS_UP_TIMEOUT "1" brick_up_status $V0 $H0 $B0/${V0}2 -+TEST glusterfs --volfile-server=$H0 --volfile-id=/$V0 $M0 -+EXPECT_WITHIN $CHILD_UP_TIMEOUT "1" afr_child_up_status $V0 0 -+EXPECT_WITHIN $CHILD_UP_TIMEOUT "1" afr_child_up_status $V0 1 -+EXPECT_WITHIN $CHILD_UP_TIMEOUT "1" afr_child_up_status $V0 2 -+ -+#Create split-brain by setting afr xattrs/gfids manually. -+#file1 is non-sharded and will be in data split-brain. -+#file2 will have one shard which will be in data split-brain. -+#file3 will have one shard which will be in gfid split-brain. -+#file4 will have one shard which will be in data & metadata split-brain. -+TEST dd if=/dev/zero of=$M0/file1 bs=1024 count=1024 oflag=direct -+TEST dd if=/dev/zero of=$M0/file2 bs=1M count=6 oflag=direct -+TEST dd if=/dev/zero of=$M0/file3 bs=1M count=6 oflag=direct -+TEST dd if=/dev/zero of=$M0/file4 bs=1M count=6 oflag=direct -+EXPECT_WITHIN $UMOUNT_TIMEOUT "Y" force_umount $M0 -+ -+#------------------------------------------------------------------------------- -+TEST setfattr -n trusted.afr.$V0-client-1 -v 0x000000010000000000000000 $B0/${V0}0/file1 -+TEST setfattr -n trusted.afr.$V0-client-2 -v 0x000000010000000000000000 $B0/${V0}0/file1 -+TEST setfattr -n trusted.afr.$V0-client-0 -v 0x000000010000000000000000 $B0/${V0}1/file1 -+TEST setfattr -n trusted.afr.$V0-client-2 -v 0x000000010000000000000000 $B0/${V0}1/file1 -+TEST setfattr -n trusted.afr.$V0-client-0 -v 0x000000010000000000000000 $B0/${V0}2/file1 -+TEST setfattr -n trusted.afr.$V0-client-1 -v 0x000000010000000000000000 $B0/${V0}2/file1 -+ -+#------------------------------------------------------------------------------- -+gfid_f2=$(gf_gfid_xattr_to_str $(gf_get_gfid_xattr $B0/${V0}0/file2)) -+TEST setfattr -n trusted.afr.$V0-client-1 -v 0x000000010000000000000000 $B0/${V0}0/.shard/$gfid_f2.1 -+TEST setfattr -n trusted.afr.$V0-client-2 -v 0x000000010000000000000000 $B0/${V0}0/.shard/$gfid_f2.1 -+TEST setfattr -n trusted.afr.$V0-client-0 -v 0x000000010000000000000000 $B0/${V0}1/.shard/$gfid_f2.1 -+TEST setfattr -n trusted.afr.$V0-client-2 -v 0x000000010000000000000000 $B0/${V0}1/.shard/$gfid_f2.1 -+TEST setfattr -n trusted.afr.$V0-client-0 -v 0x000000010000000000000000 $B0/${V0}2/.shard/$gfid_f2.1 -+TEST setfattr -n trusted.afr.$V0-client-1 -v 0x000000010000000000000000 $B0/${V0}2/.shard/$gfid_f2.1 -+ -+#------------------------------------------------------------------------------- -+TESTS_EXPECTED_IN_LOOP=5 -+function assign_new_gfid { -+ brickpath=$1 -+ filename=$2 -+ gfid=$(gf_gfid_xattr_to_str $(gf_get_gfid_xattr $brickpath/$filename)) -+ gfid_shard=$(gf_gfid_xattr_to_str $(gf_get_gfid_xattr $brickpath/.shard/$gfid.1)) -+ -+ TEST rm $brickpath/.glusterfs/${gfid_shard:0:2}/${gfid_shard:2:2}/$gfid_shard -+ TEST setfattr -x trusted.gfid $brickpath/.shard/$gfid.1 -+ new_gfid=$(get_random_gfid) -+ new_gfid_str=$(gf_gfid_xattr_to_str $new_gfid) -+ TEST setfattr -n trusted.gfid -v $new_gfid $brickpath/.shard/$gfid.1 -+ TEST mkdir -p $brickpath/.glusterfs/${new_gfid_str:0:2}/${new_gfid_str:2:2} -+ TEST ln $brickpath/.shard/$gfid.1 $brickpath/.glusterfs/${new_gfid_str:0:2}/${new_gfid_str:2:2}/$new_gfid_str -+} -+assign_new_gfid $B0/$V0"1" file3 -+assign_new_gfid $B0/$V0"2" file3 -+ -+#------------------------------------------------------------------------------- -+gfid_f4=$(gf_gfid_xattr_to_str $(gf_get_gfid_xattr $B0/${V0}0/file4)) -+TEST setfattr -n trusted.afr.$V0-client-1 -v 0x000000010000000100000000 $B0/${V0}0/.shard/$gfid_f4.1 -+TEST setfattr -n trusted.afr.$V0-client-2 -v 0x000000010000000100000000 $B0/${V0}0/.shard/$gfid_f4.1 -+TEST setfattr -n trusted.afr.$V0-client-0 -v 0x000000010000000100000000 $B0/${V0}1/.shard/$gfid_f4.1 -+TEST setfattr -n trusted.afr.$V0-client-2 -v 0x000000010000000100000000 $B0/${V0}1/.shard/$gfid_f4.1 -+TEST setfattr -n trusted.afr.$V0-client-0 -v 0x000000010000000100000000 $B0/${V0}2/.shard/$gfid_f4.1 -+TEST setfattr -n trusted.afr.$V0-client-1 -v 0x000000010000000100000000 $B0/${V0}2/.shard/$gfid_f4.1 -+ -+#------------------------------------------------------------------------------- -+#Add entry to xattrop dir on first brick and check for split-brain. -+xattrop_dir0=$(afr_get_index_path $B0/$V0"0") -+base_entry_b0=`ls $xattrop_dir0` -+ -+gfid_f1=$(gf_gfid_xattr_to_str $(gf_get_gfid_xattr $B0/$V0"0"/file1)) -+TEST ln $xattrop_dir0/$base_entry_b0 $xattrop_dir0/$gfid_f1 -+ -+gfid_f2_shard1=$(gf_gfid_xattr_to_str $(gf_get_gfid_xattr $B0/$V0"0"/.shard/$gfid_f2.1)) -+TEST ln $xattrop_dir0/$base_entry_b0 $xattrop_dir0/$gfid_f2_shard1 -+ -+gfid_f3=$(gf_gfid_xattr_to_str $(gf_get_gfid_xattr $B0/${V0}0/file3)) -+gfid_f3_shard1=$(gf_gfid_xattr_to_str $(gf_get_gfid_xattr $B0/$V0"0"/.shard/$gfid_f3.1)) -+TEST ln $xattrop_dir0/$base_entry_b0 $xattrop_dir0/$gfid_f3_shard1 -+ -+gfid_f4_shard1=$(gf_gfid_xattr_to_str $(gf_get_gfid_xattr $B0/$V0"0"/.shard/$gfid_f4.1)) -+TEST ln $xattrop_dir0/$base_entry_b0 $xattrop_dir0/$gfid_f4_shard1 -+ -+#------------------------------------------------------------------------------- -+#gfid split-brain won't show up in split-brain count. -+EXPECT "3" afr_get_split_brain_count $V0 -+EXPECT_NOT "^0$" get_pending_heal_count $V0 -+ -+#Resolve split-brains -+TEST $CLI volume heal $V0 split-brain source-brick $H0:$B0/${V0}1 /file1 -+GFIDSTR="gfid:$gfid_f2_shard1" -+TEST $CLI volume heal $V0 split-brain source-brick $H0:$B0/${V0}1 $GFIDSTR -+TEST $CLI volume heal $V0 split-brain source-brick $H0:$B0/${V0}1 /.shard/$gfid_f3.1 -+TEST $CLI volume heal $V0 split-brain source-brick $H0:$B0/${V0}1 /.shard/$gfid_f4.1 -+TEST $CLI volume heal $V0 -+EXPECT_WITHIN $HEAL_TIMEOUT "^0$" get_pending_heal_count $V0 -+cleanup; -diff --git a/xlators/cluster/afr/src/afr-common.c b/xlators/cluster/afr/src/afr-common.c -index eef7fd2..32127c6 100644 ---- a/xlators/cluster/afr/src/afr-common.c -+++ b/xlators/cluster/afr/src/afr-common.c -@@ -2250,7 +2250,8 @@ afr_attempt_readsubvol_set(call_frame_t *frame, xlator_t *this, - if ((spb_choice >= 0) && - (AFR_COUNT(success_replies, child_count) == child_count)) { - *read_subvol = spb_choice; -- } else if (!priv->quorum_count) { -+ } else if (!priv->quorum_count || -+ frame->root->pid == GF_CLIENT_PID_GLFS_HEAL) { - *read_subvol = afr_first_up_child(frame, this); - } else if (priv->quorum_count && - afr_has_quorum(data_readable, this, NULL)) { -diff --git a/xlators/features/shard/src/shard.c b/xlators/features/shard/src/shard.c -index 2e2ef5d..16d557b 100644 ---- a/xlators/features/shard/src/shard.c -+++ b/xlators/features/shard/src/shard.c -@@ -1472,7 +1472,8 @@ int shard_lookup(call_frame_t *frame, xlator_t *this, loc_t *loc, - shard_local_t *local = NULL; - - this->itable = loc->inode->table; -- if (frame->root->pid != GF_CLIENT_PID_GSYNCD) { -+ if ((frame->root->pid != GF_CLIENT_PID_GSYNCD) && -+ (frame->root->pid != GF_CLIENT_PID_GLFS_HEAL)) { - SHARD_ENTRY_FOP_CHECK(loc, op_errno, err); - } - --- -1.8.3.1 - diff --git a/SOURCES/0407-geo-rep-Improving-help-message-in-schedule_georep.py.patch b/SOURCES/0407-geo-rep-Improving-help-message-in-schedule_georep.py.patch deleted file mode 100644 index 459462d..0000000 --- a/SOURCES/0407-geo-rep-Improving-help-message-in-schedule_georep.py.patch +++ /dev/null @@ -1,60 +0,0 @@ -From de31f2b0cb09a59941892c9981cb8a8b3aced9ec Mon Sep 17 00:00:00 2001 -From: kshithijiyer -Date: Tue, 24 Dec 2019 13:02:21 +0530 -Subject: [PATCH 407/449] [geo-rep] Improving help message in - schedule_georep.py.in - -SLAVE positional argument doesn't provide a clear -picture of what it is when compared to mastervol and slavevol -in schedule_georep.py.in. It would be better if we change it to -something like "Slave hostame (@SLAVEHOST or SLAVEHOST)" - -Present: ----------- -positional arguments: - mastervol Master Volume Name - SLAVE SLAVEHOST or root@SLAVEHOST or user@SLAVEHOST - slavevol Slave Volume Name - -Suggested: ------------ -positional arguments: - mastervol Master Volume Name - SLAVE Slave hostname (@SLAVEHOST or SLAVEHOST) - slavevol Slave Volume Name - -Backport of: - >Upstream Patch: https://review.gluster.org/#/c/glusterfs/+/23919/ - >fixes: bz#1786276 - >Change-Id: I73d52247997d623f77d55e51cbb6eccc08eb95ff - >Signed-off-by: kshithijiyer - -BUG: 1787994 -Change-Id: I73d52247997d623f77d55e51cbb6eccc08eb95ff -Signed-off-by: kshithijiyer -Signed-off-by: Sunny Kumar -Reviewed-on: https://code.engineering.redhat.com/gerrit/202454 -Tested-by: RHGS Build Bot -Reviewed-by: Sunil Kumar Heggodu Gopala Acharya ---- - extras/geo-rep/schedule_georep.py.in | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/extras/geo-rep/schedule_georep.py.in b/extras/geo-rep/schedule_georep.py.in -index f29ae02..ac93716 100644 ---- a/extras/geo-rep/schedule_georep.py.in -+++ b/extras/geo-rep/schedule_georep.py.in -@@ -459,8 +459,8 @@ if __name__ == "__main__": - description=__doc__) - parser.add_argument("mastervol", help="Master Volume Name") - parser.add_argument("slave", -- help="SLAVEHOST or root@SLAVEHOST " -- "or user@SLAVEHOST", -+ help="Slave hostname " -+ "(@SLAVEHOST or SLAVEHOST)", - metavar="SLAVE") - parser.add_argument("slavevol", help="Slave Volume Name") - parser.add_argument("--interval", help="Interval in Seconds. " --- -1.8.3.1 - diff --git a/SOURCES/0408-geo-rep-Fix-ssh-port-validation.patch b/SOURCES/0408-geo-rep-Fix-ssh-port-validation.patch deleted file mode 100644 index 9fad8d1..0000000 --- a/SOURCES/0408-geo-rep-Fix-ssh-port-validation.patch +++ /dev/null @@ -1,107 +0,0 @@ -From 07ab5a460da007fc3809b1a943614d1c7f5fcfef Mon Sep 17 00:00:00 2001 -From: Sunny Kumar -Date: Fri, 17 Jan 2020 11:03:46 +0000 -Subject: [PATCH 408/449] geo-rep: Fix ssh-port validation - -If non-standard ssh-port is used, Geo-rep can be configured to use ssh port -by using config option, the value should be in allowed port range and non negative. - -At present it can accept negative value and outside allowed port range which is incorrect. - -Many Linux kernels use the port range 32768 to 61000. -IANA suggests it should be in the range 1 to 2^16 - 1, so keeping the same. - -$ gluster volume geo-replication master 127.0.0.1::slave config ssh-port -22 -geo-replication config updated successfully -$ gluster volume geo-replication master 127.0.0.1::slave config ssh-port 22222222 -geo-replication config updated successfully - -This patch fixes the above issue and have added few validations around this -in test cases. -Backport of: - >Upstream Patch: https://review.gluster.org/#/c/glusterfs/+/24035/ - >Change-Id: I9875ab3f00d7257370fbac6f5ed4356d2fed3f3c - >Fixes: bz#1792276 - >Signed-off-by: Sunny Kumar - -BUG: 1796814 -Change-Id: I9875ab3f00d7257370fbac6f5ed4356d2fed3f3c -Signed-off-by: Sunny Kumar -Reviewed-on: https://code.engineering.redhat.com/gerrit/202453 -Tested-by: RHGS Build Bot -Reviewed-by: Sunil Kumar Heggodu Gopala Acharya ---- - geo-replication/gsyncd.conf.in | 4 +++- - tests/00-geo-rep/00-georep-verify-non-root-setup.t | 16 ++++++++++++++++ - tests/00-geo-rep/georep-basic-dr-rsync.t | 13 +++++++++++++ - 3 files changed, 32 insertions(+), 1 deletion(-) - -diff --git a/geo-replication/gsyncd.conf.in b/geo-replication/gsyncd.conf.in -index 9155cd8..11e57fd 100644 ---- a/geo-replication/gsyncd.conf.in -+++ b/geo-replication/gsyncd.conf.in -@@ -266,7 +266,9 @@ allowed_values=ERROR,INFO,WARNING,DEBUG - - [ssh-port] - value=22 --validation=int -+validation=minmax -+min=1 -+max=65535 - help=Set SSH port - type=int - -diff --git a/tests/00-geo-rep/00-georep-verify-non-root-setup.t b/tests/00-geo-rep/00-georep-verify-non-root-setup.t -index c9fd8b2..12f0c01 100644 ---- a/tests/00-geo-rep/00-georep-verify-non-root-setup.t -+++ b/tests/00-geo-rep/00-georep-verify-non-root-setup.t -@@ -223,6 +223,22 @@ TEST $GEOREP_CLI $master $slave_url resume - #Validate failure of volume stop when geo-rep is running - TEST ! $CLI volume stop $GMV0 - -+#Negative test for ssh-port -+#Port should be integer and between 1-65535 range -+ -+TEST ! $GEOREP_CLI $master $slave_url config ssh-port -22 -+ -+TEST ! $GEOREP_CLI $master $slave_url config ssh-port abc -+ -+TEST ! $GEOREP_CLI $master $slave_url config ssh-port 6875943 -+ -+TEST ! $GEOREP_CLI $master $slave_url config ssh-port 4.5 -+ -+TEST ! $GEOREP_CLI $master $slave_url config ssh-port 22a -+ -+#Config Set ssh-port to validate int validation -+TEST $GEOREP_CLI $master $slave config ssh-port 22 -+ - #Hybrid directory rename test BZ#1763439 - TEST $GEOREP_CLI $master $slave_url config change_detector xsync - mkdir ${master_mnt}/dir1 -diff --git a/tests/00-geo-rep/georep-basic-dr-rsync.t b/tests/00-geo-rep/georep-basic-dr-rsync.t -index b6fbf18..d785aa5 100644 ---- a/tests/00-geo-rep/georep-basic-dr-rsync.t -+++ b/tests/00-geo-rep/georep-basic-dr-rsync.t -@@ -71,6 +71,19 @@ EXPECT_WITHIN $GEO_REP_TIMEOUT 4 check_status_num_rows "Created" - #Config gluster-command-dir - TEST $GEOREP_CLI $master $slave config gluster-command-dir ${GLUSTER_CMD_DIR} - -+#Negative test for ssh-port -+#Port should be integer and between 1-65535 range -+ -+TEST ! $GEOREP_CLI $master $slave config ssh-port -22 -+ -+TEST ! $GEOREP_CLI $master $slave config ssh-port abc -+ -+TEST ! $GEOREP_CLI $master $slave config ssh-port 6875943 -+ -+TEST ! $GEOREP_CLI $master $slave config ssh-port 4.5 -+ -+TEST ! $GEOREP_CLI $master $slave config ssh-port 22a -+ - #Config Set ssh-port to validate int validation - TEST $GEOREP_CLI $master $slave config ssh-port 22 - --- -1.8.3.1 - diff --git a/SOURCES/0409-system-posix-acl-update-ctx-only-if-iatt-is-non-NULL.patch b/SOURCES/0409-system-posix-acl-update-ctx-only-if-iatt-is-non-NULL.patch deleted file mode 100644 index ca1c25a..0000000 --- a/SOURCES/0409-system-posix-acl-update-ctx-only-if-iatt-is-non-NULL.patch +++ /dev/null @@ -1,52 +0,0 @@ -From a92b4f6373cb18544325436cf86abfebd6780d79 Mon Sep 17 00:00:00 2001 -From: Homma -Date: Fri, 5 Jul 2019 16:10:41 +0530 -Subject: [PATCH 409/449] system/posix-acl: update ctx only if iatt is non-NULL - -We need to safe-guard against possible zero'ing out of iatt -structure in acl ctx, which can cause many issues. - -> upstream patch: https://review.gluster.org/#/c/glusterfs/+/23003/ -> fixes: 1668286 -> Change-Id: Ie81a57d7453a6624078de3be8c0845bf4d432773 -> Signed-off-by: Amar Tumballi - -BUG: 1781649 -Change-Id: I655b61551d30215b9f23cafc3ef9a5c0d98a43d0 -Signed-off-by: Raghavendra M -Reviewed-on: https://code.engineering.redhat.com/gerrit/202446 -Tested-by: RHGS Build Bot -Reviewed-by: Sunil Kumar Heggodu Gopala Acharya ---- - xlators/system/posix-acl/src/posix-acl.c | 8 ++++++++ - 1 file changed, 8 insertions(+) - -diff --git a/xlators/system/posix-acl/src/posix-acl.c b/xlators/system/posix-acl/src/posix-acl.c -index 38e48b8..c6ba281 100644 ---- a/xlators/system/posix-acl/src/posix-acl.c -+++ b/xlators/system/posix-acl/src/posix-acl.c -@@ -875,6 +875,13 @@ posix_acl_ctx_update(inode_t *inode, xlator_t *this, struct iatt *buf, - int ret = 0; - int i = 0; - -+ if (!buf || !buf->ia_ctime) { -+ /* No need to update ctx if buf is empty */ -+ gf_log_callingfn(this->name, GF_LOG_DEBUG, "iatt struct is empty (%d)", -+ fop); -+ goto out; -+ } -+ - LOCK(&inode->lock); - { - ctx = __posix_acl_ctx_get(inode, this, _gf_true); -@@ -928,6 +935,7 @@ posix_acl_ctx_update(inode_t *inode, xlator_t *this, struct iatt *buf, - } - unlock: - UNLOCK(&inode->lock); -+out: - return ret; - } - --- -1.8.3.1 - diff --git a/SOURCES/0410-afr-prevent-spurious-entry-heals-leading-to-gfid-spl.patch b/SOURCES/0410-afr-prevent-spurious-entry-heals-leading-to-gfid-spl.patch deleted file mode 100644 index 97bdc78..0000000 --- a/SOURCES/0410-afr-prevent-spurious-entry-heals-leading-to-gfid-spl.patch +++ /dev/null @@ -1,249 +0,0 @@ -From 2b2eb846c49caba13ab92ec66af20292e7780fc1 Mon Sep 17 00:00:00 2001 -From: Ravishankar N -Date: Tue, 11 Feb 2020 14:34:48 +0530 -Subject: [PATCH 410/449] afr: prevent spurious entry heals leading to gfid - split-brain - -Problem: -In a hyperconverged setup with granular-entry-heal enabled, if a file is -recreated while one of the bricks is down, and an index heal is triggered -(with the brick still down), entry-self heal was doing a spurious heal -with just the 2 good bricks. It was doing a post-op leading to removal -of the filename from .glusterfs/indices/entry-changes as well as -erroneous setting of afr xattrs on the parent. When the brick came up, -the xattrs were cleared, resulting in the renamed file not getting -healed and leading to gfid split-brain and EIO on the mount. - -Fix: -Proceed with entry heal only when shd can connect to all bricks of the replica, -just like in data and metadata heal. - -BUG: 1804164 - -> Upstream patch:https://review.gluster.org/#/c/glusterfs/+/24109/ -> fixes: bz#1801624 -> Change-Id: I916ae26ad1fabf259bc6362da52d433b7223b17e -> Signed-off-by: Ravishankar N - -Change-Id: I23f57e543cff1e3f35eb8dbc60a2babfae6838c7 -Signed-off-by: Ravishankar N -Reviewed-on: https://code.engineering.redhat.com/gerrit/202395 -Tested-by: RHGS Build Bot -Reviewed-by: Sunil Kumar Heggodu Gopala Acharya ---- - .../bug-1433571-undo-pending-only-on-up-bricks.t | 18 ++----- - tests/bugs/replicate/bug-1801624-entry-heal.t | 58 ++++++++++++++++++++++ - xlators/cluster/afr/src/afr-common.c | 4 +- - xlators/cluster/afr/src/afr-self-heal-common.c | 8 +-- - xlators/cluster/afr/src/afr-self-heal-entry.c | 6 +-- - xlators/cluster/afr/src/afr-self-heal-name.c | 2 +- - xlators/cluster/afr/src/afr-self-heal.h | 2 - - 7 files changed, 69 insertions(+), 29 deletions(-) - create mode 100644 tests/bugs/replicate/bug-1801624-entry-heal.t - -diff --git a/tests/bugs/replicate/bug-1433571-undo-pending-only-on-up-bricks.t b/tests/bugs/replicate/bug-1433571-undo-pending-only-on-up-bricks.t -index 0767f47..10ce013 100644 ---- a/tests/bugs/replicate/bug-1433571-undo-pending-only-on-up-bricks.t -+++ b/tests/bugs/replicate/bug-1433571-undo-pending-only-on-up-bricks.t -@@ -49,25 +49,15 @@ TEST $CLI volume start $V0 force - EXPECT_WITHIN $CHILD_UP_TIMEOUT "1" afr_child_up_status $V0 0 - EXPECT_WITHIN $CHILD_UP_TIMEOUT "1" afr_child_up_status $V0 2 - --#Kill brick 0 and turn on the client side heal and do ls to trigger the heal. --#The pending xattrs on bricks 1 & 2 should have pending entry on brick 0. --TEST kill_brick $V0 $H0 $B0/${V0}0 -+# We were killing one brick and checking that entry heal does not reset the -+# pending xattrs for the down brick. Now that we need all bricks to be up for -+# entry heal, I'm removing that test from the .t -+ - TEST $CLI volume set $V0 cluster.data-self-heal on - TEST $CLI volume set $V0 cluster.metadata-self-heal on - TEST $CLI volume set $V0 cluster.entry-self-heal on - - TEST ls $M0 --EXPECT "000000000000000000000001" get_hex_xattr trusted.afr.$V0-client-0 $B0/${V0}1 --EXPECT "000000000000000000000001" get_hex_xattr trusted.afr.$V0-client-0 $B0/${V0}2 --EXPECT_WITHIN $HEAL_TIMEOUT "000000000000000000000000" get_hex_xattr trusted.afr.$V0-client-2 $B0/${V0}1 --EXPECT_WITHIN $HEAL_TIMEOUT "000000000000000000000000" get_hex_xattr trusted.afr.$V0-client-1 $B0/${V0}2 -- --#Bring back all the bricks and trigger the heal again by doing ls. Now the --#pending xattrs on all the bricks should be 0. --TEST $CLI volume start $V0 force --EXPECT_WITHIN $CHILD_UP_TIMEOUT "1" afr_child_up_status $V0 0 --TEST ls $M0 -- - TEST cat $M0/f1 - TEST cat $M0/f2 - TEST cat $M0/f3 -diff --git a/tests/bugs/replicate/bug-1801624-entry-heal.t b/tests/bugs/replicate/bug-1801624-entry-heal.t -new file mode 100644 -index 0000000..94b4651 ---- /dev/null -+++ b/tests/bugs/replicate/bug-1801624-entry-heal.t -@@ -0,0 +1,58 @@ -+#!/bin/bash -+ -+. $(dirname $0)/../../include.rc -+. $(dirname $0)/../../volume.rc -+cleanup; -+ -+TEST glusterd -+TEST pidof glusterd -+TEST $CLI volume create $V0 replica 3 $H0:$B0/brick{0,1,2} -+TEST $CLI volume set $V0 heal-timeout 5 -+TEST $CLI volume start $V0 -+EXPECT_WITHIN $CHILD_UP_TIMEOUT "1" afr_child_up_status_in_shd $V0 0 -+EXPECT_WITHIN $CHILD_UP_TIMEOUT "1" afr_child_up_status_in_shd $V0 1 -+EXPECT_WITHIN $CHILD_UP_TIMEOUT "1" afr_child_up_status_in_shd $V0 2 -+TEST $CLI volume heal $V0 granular-entry-heal enable -+ -+TEST glusterfs --volfile-id=/$V0 --volfile-server=$H0 $M0 --attribute-timeout=0 --entry-timeout=0 -+EXPECT_WITHIN $PROCESS_UP_TIMEOUT "1" afr_child_up_status $V0 0 -+EXPECT_WITHIN $PROCESS_UP_TIMEOUT "1" afr_child_up_status $V0 1 -+EXPECT_WITHIN $PROCESS_UP_TIMEOUT "1" afr_child_up_status $V0 2 -+echo "Data">$M0/FILE -+ret=$? -+TEST [ $ret -eq 0 ] -+ -+# Re-create the file when a brick is down. -+TEST kill_brick $V0 $H0 $B0/brick1 -+TEST rm $M0/FILE -+echo "New Data">$M0/FILE -+ret=$? -+TEST [ $ret -eq 0 ] -+EXPECT_WITHIN $HEAL_TIMEOUT "4" get_pending_heal_count $V0 -+ -+# Launching index heal must not reset parent dir afr xattrs or remove granular entry indices. -+$CLI volume heal $V0 # CLI will fail but heal is launched anyway. -+TEST sleep 5 # give index heal a chance to do one run. -+brick0_pending=$(get_hex_xattr trusted.afr.$V0-client-1 $B0/brick0/) -+brick2_pending=$(get_hex_xattr trusted.afr.$V0-client-1 $B0/brick2/) -+TEST [ $brick0_pending -eq "000000000000000000000002" ] -+TEST [ $brick2_pending -eq "000000000000000000000002" ] -+EXPECT "FILE" ls $B0/brick0/.glusterfs/indices/entry-changes/00000000-0000-0000-0000-000000000001/ -+EXPECT "FILE" ls $B0/brick2/.glusterfs/indices/entry-changes/00000000-0000-0000-0000-000000000001/ -+ -+TEST $CLI volume start $V0 force -+EXPECT_WITHIN $PROCESS_UP_TIMEOUT "1" brick_up_status $V0 $H0 $B0/brick1 -+EXPECT_WITHIN $CHILD_UP_TIMEOUT "1" afr_child_up_status_in_shd $V0 1 -+$CLI volume heal $V0 -+EXPECT_WITHIN $HEAL_TIMEOUT "0" get_pending_heal_count $V0 -+ -+# No gfid-split-brain (i.e. EIO) must be seen. Try on fresh mount to avoid cached values. -+EXPECT_WITHIN $UMOUNT_TIMEOUT "Y" force_umount $M0 -+TEST glusterfs --volfile-id=/$V0 --volfile-server=$H0 $M0 --attribute-timeout=0 --entry-timeout=0 -+EXPECT_WITHIN $PROCESS_UP_TIMEOUT "1" afr_child_up_status $V0 0 -+EXPECT_WITHIN $PROCESS_UP_TIMEOUT "1" afr_child_up_status $V0 1 -+EXPECT_WITHIN $PROCESS_UP_TIMEOUT "1" afr_child_up_status $V0 2 -+TEST cat $M0/FILE -+ -+EXPECT_WITHIN $UMOUNT_TIMEOUT "Y" force_umount $M0 -+cleanup; -diff --git a/xlators/cluster/afr/src/afr-common.c b/xlators/cluster/afr/src/afr-common.c -index 32127c6..5806556 100644 ---- a/xlators/cluster/afr/src/afr-common.c -+++ b/xlators/cluster/afr/src/afr-common.c -@@ -6629,7 +6629,7 @@ afr_fav_child_reset_sink_xattrs(void *opaque) - ret = afr_selfheal_inodelk(heal_frame, this, inode, this->name, 0, 0, - locked_on); - { -- if (ret < AFR_SH_MIN_PARTICIPANTS) -+ if (ret < priv->child_count) - goto data_unlock; - ret = __afr_selfheal_data_prepare( - heal_frame, this, inode, locked_on, sources, sinks, -@@ -6646,7 +6646,7 @@ afr_fav_child_reset_sink_xattrs(void *opaque) - ret = afr_selfheal_inodelk(heal_frame, this, inode, this->name, - LLONG_MAX - 1, 0, locked_on); - { -- if (ret < AFR_SH_MIN_PARTICIPANTS) -+ if (ret < priv->child_count) - goto mdata_unlock; - ret = __afr_selfheal_metadata_prepare( - heal_frame, this, inode, locked_on, sources, sinks, -diff --git a/xlators/cluster/afr/src/afr-self-heal-common.c b/xlators/cluster/afr/src/afr-self-heal-common.c -index 81ef38a..ce1ea50 100644 ---- a/xlators/cluster/afr/src/afr-self-heal-common.c -+++ b/xlators/cluster/afr/src/afr-self-heal-common.c -@@ -1575,7 +1575,6 @@ afr_selfheal_find_direction(call_frame_t *frame, xlator_t *this, - char *accused = NULL; /* Accused others without any self-accusal */ - char *pending = NULL; /* Have pending operations on others */ - char *self_accused = NULL; /* Accused itself */ -- int min_participants = -1; - - priv = this->private; - -@@ -1599,12 +1598,7 @@ afr_selfheal_find_direction(call_frame_t *frame, xlator_t *this, - } - } - -- if (type == AFR_DATA_TRANSACTION || type == AFR_METADATA_TRANSACTION) { -- min_participants = priv->child_count; -- } else { -- min_participants = AFR_SH_MIN_PARTICIPANTS; -- } -- if (afr_success_count(replies, priv->child_count) < min_participants) { -+ if (afr_success_count(replies, priv->child_count) < priv->child_count) { - /* Treat this just like locks not being acquired */ - return -ENOTCONN; - } -diff --git a/xlators/cluster/afr/src/afr-self-heal-entry.c b/xlators/cluster/afr/src/afr-self-heal-entry.c -index 3ce882e..40be898 100644 ---- a/xlators/cluster/afr/src/afr-self-heal-entry.c -+++ b/xlators/cluster/afr/src/afr-self-heal-entry.c -@@ -597,7 +597,7 @@ afr_selfheal_entry_dirent(call_frame_t *frame, xlator_t *this, fd_t *fd, - ret = afr_selfheal_entrylk(frame, this, fd->inode, this->name, NULL, - locked_on); - { -- if (ret < AFR_SH_MIN_PARTICIPANTS) { -+ if (ret < priv->child_count) { - gf_msg_debug(this->name, 0, - "%s: Skipping " - "entry self-heal as only %d sub-volumes " -@@ -991,7 +991,7 @@ __afr_selfheal_entry(call_frame_t *frame, xlator_t *this, fd_t *fd, - ret = afr_selfheal_entrylk(frame, this, fd->inode, this->name, NULL, - data_lock); - { -- if (ret < AFR_SH_MIN_PARTICIPANTS) { -+ if (ret < priv->child_count) { - gf_msg_debug(this->name, 0, - "%s: Skipping " - "entry self-heal as only %d sub-volumes could " -@@ -1115,7 +1115,7 @@ afr_selfheal_entry(call_frame_t *frame, xlator_t *this, inode_t *inode) - ret = afr_selfheal_tie_breaker_entrylk(frame, this, inode, priv->sh_domain, - NULL, locked_on); - { -- if (ret < AFR_SH_MIN_PARTICIPANTS) { -+ if (ret < priv->child_count) { - gf_msg_debug(this->name, 0, - "%s: Skipping " - "entry self-heal as only %d sub-volumes could " -diff --git a/xlators/cluster/afr/src/afr-self-heal-name.c b/xlators/cluster/afr/src/afr-self-heal-name.c -index 36640b5..7d4f208 100644 ---- a/xlators/cluster/afr/src/afr-self-heal-name.c -+++ b/xlators/cluster/afr/src/afr-self-heal-name.c -@@ -514,7 +514,7 @@ afr_selfheal_name_do(call_frame_t *frame, xlator_t *this, inode_t *parent, - ret = afr_selfheal_entrylk(frame, this, parent, this->name, bname, - locked_on); - { -- if (ret < AFR_SH_MIN_PARTICIPANTS) { -+ if (ret < priv->child_count) { - ret = -ENOTCONN; - goto unlock; - } -diff --git a/xlators/cluster/afr/src/afr-self-heal.h b/xlators/cluster/afr/src/afr-self-heal.h -index 6555ec5..8234cec 100644 ---- a/xlators/cluster/afr/src/afr-self-heal.h -+++ b/xlators/cluster/afr/src/afr-self-heal.h -@@ -11,8 +11,6 @@ - #ifndef _AFR_SELFHEAL_H - #define _AFR_SELFHEAL_H - --#define AFR_SH_MIN_PARTICIPANTS 2 -- - /* Perform fop on all UP subvolumes and wait for all callbacks to return */ - - #define AFR_ONALL(frame, rfn, fop, args...) \ --- -1.8.3.1 - diff --git a/SOURCES/0411-tools-glusterfind-validate-session-name.patch b/SOURCES/0411-tools-glusterfind-validate-session-name.patch deleted file mode 100644 index db633f2..0000000 --- a/SOURCES/0411-tools-glusterfind-validate-session-name.patch +++ /dev/null @@ -1,116 +0,0 @@ -From 854defb4ff5e0d53f51545d20796aff662f9850f Mon Sep 17 00:00:00 2001 -From: Saravanakumar Arumugam -Date: Thu, 9 Jul 2015 15:56:28 +0530 -Subject: [PATCH 411/449] tools/glusterfind : validate session name - -Validate a session name(during create) for the following: -1. minimum 2 character length. -2. Maximum 256 characters. -3. No special characters apart from underscore, hyphen allowed. - -Also, validate volume(expect, while using glusterfind list). - ->Change-Id: I1b1e64e218f93d0a531d3cf69fc2ce7e2ed11d01 ->BUG: 1241494 ->Signed-off-by: Saravanakumar Arumugam ->Signed-off-by: Shwetha K Acharya - -backport of https://review.gluster.org/#/c/glusterfs/+/11602/ - -BUG: 1234220 -Change-Id: I1b1e64e218f93d0a531d3cf69fc2ce7e2ed11d01 -Signed-off-by: Shwetha K Acharya -Reviewed-on: https://code.engineering.redhat.com/gerrit/202469 -Tested-by: RHGS Build Bot -Reviewed-by: Sunil Kumar Heggodu Gopala Acharya ---- - tools/glusterfind/src/main.py | 50 ++++++++++++++++++++++++++++++++++++------- - 1 file changed, 42 insertions(+), 8 deletions(-) - -diff --git a/tools/glusterfind/src/main.py b/tools/glusterfind/src/main.py -index 5ca1fec..4b5466d 100644 ---- a/tools/glusterfind/src/main.py -+++ b/tools/glusterfind/src/main.py -@@ -23,6 +23,7 @@ import tempfile - import signal - from datetime import datetime - import codecs -+import re - - from utils import execute, is_host_local, mkdirp, fail - from utils import setup_logger, human_time, handle_rm_error -@@ -520,11 +521,8 @@ def write_output(outfile, outfilemerger, field_separator): - else: - gfind_write(f, row[0], field_separator, p_rep) - --def mode_create(session_dir, args): -- logger.debug("Init is called - Session: %s, Volume: %s" -- % (args.session, args.volume)) -- -- cmd = ["gluster", 'volume', 'info', args.volume, "--xml"] -+def validate_volume(volume): -+ cmd = ["gluster", 'volume', 'info', volume, "--xml"] - _, data, _ = execute(cmd, - exit_msg="Failed to Run Gluster Volume Info", - logger=logger) -@@ -532,11 +530,42 @@ def mode_create(session_dir, args): - tree = etree.fromstring(data) - statusStr = tree.find('volInfo/volumes/volume/statusStr').text - except (ParseError, AttributeError) as e: -- fail("Invalid Volume: %s" % e, logger=logger) -- -+ fail("Invalid Volume: Check the Volume name! %s" % e) - if statusStr != "Started": -- fail("Volume %s is not online" % args.volume, logger=logger) -+ fail("Volume %s is not online" % volume) -+ -+# The rules for a valid session name. -+SESSION_NAME_RULES = { -+ 'min_length': 2, -+ 'max_length': 256, # same as maximum volume length -+ # Specifies all alphanumeric characters, underscore, hyphen. -+ 'valid_chars': r'0-9a-zA-Z_-', -+} -+ -+ -+# checks valid session name, fail otherwise -+def validate_session_name(session): -+ # Check for minimum length -+ if len(session) < SESSION_NAME_RULES['min_length']: -+ fail('session_name must be at least ' + -+ str(SESSION_NAME_RULES['min_length']) + ' characters long.') -+ # Check for maximum length -+ if len(session) > SESSION_NAME_RULES['max_length']: -+ fail('session_name must not exceed ' + -+ str(SESSION_NAME_RULES['max_length']) + ' characters length.') -+ -+ # Matches strings composed entirely of characters specified within -+ if not re.match(r'^[' + SESSION_NAME_RULES['valid_chars'] + -+ ']+$', session): -+ fail('Session name can only contain these characters: ' + -+ SESSION_NAME_RULES['valid_chars']) -+ -+ -+def mode_create(session_dir, args): -+ validate_session_name(args.session) - -+ logger.debug("Init is called - Session: %s, Volume: %s" -+ % (args.session, args.volume)) - mkdirp(session_dir, exit_on_err=True, logger=logger) - mkdirp(os.path.join(session_dir, args.volume), exit_on_err=True, - logger=logger) -@@ -850,6 +879,11 @@ def main(): - args.mode not in ["create", "list", "query"]: - fail("Invalid session %s" % args.session) - -+ # volume involved, validate the volume first -+ if args.mode not in ["list"]: -+ validate_volume(args.volume) -+ -+ - # "default" is a system defined session name - if args.mode in ["create", "post", "pre", "delete"] and \ - args.session == "default": --- -1.8.3.1 - diff --git a/SOURCES/0412-gluster-smb-add-smb-parameter-when-access-gluster-by.patch b/SOURCES/0412-gluster-smb-add-smb-parameter-when-access-gluster-by.patch deleted file mode 100644 index 865fddf..0000000 --- a/SOURCES/0412-gluster-smb-add-smb-parameter-when-access-gluster-by.patch +++ /dev/null @@ -1,46 +0,0 @@ -From 0769c5ddc78ea37b9a43ac35dd71ec8cea4b8da8 Mon Sep 17 00:00:00 2001 -From: yinkui <13965432176@163.com> -Date: Fri, 16 Aug 2019 10:15:07 +0800 -Subject: [PATCH 412/449] gluster-smb:add smb parameter when access gluster by - cifs - -Backport of https://review.gluster.org/23240 - -Change-Id: I9ff54f2ca6f86bb5b2f4740485a0159e1fd7785f -BUG: 1783232 -Signed-off-by: yinkui <13965432176@163.com> -Reviewed-on: https://code.engineering.redhat.com/gerrit/202472 -Tested-by: RHGS Build Bot -Reviewed-by: Sunil Kumar Heggodu Gopala Acharya ---- - extras/hook-scripts/set/post/S30samba-set.sh | 1 + - extras/hook-scripts/start/post/S30samba-start.sh | 1 + - 2 files changed, 2 insertions(+) - -diff --git a/extras/hook-scripts/set/post/S30samba-set.sh b/extras/hook-scripts/set/post/S30samba-set.sh -index d2a62d3..e73f00f 100755 ---- a/extras/hook-scripts/set/post/S30samba-set.sh -+++ b/extras/hook-scripts/set/post/S30samba-set.sh -@@ -90,6 +90,7 @@ function add_samba_share () { - STRING+="path = /\n" - STRING+="read only = no\n" - STRING+="guest ok = yes\n" -+ STRING+="kernel share modes = no\n" - printf "$STRING" >> ${CONFIGFILE} - } - -diff --git a/extras/hook-scripts/start/post/S30samba-start.sh b/extras/hook-scripts/start/post/S30samba-start.sh -index 2854bdd..0d5a5ed 100755 ---- a/extras/hook-scripts/start/post/S30samba-start.sh -+++ b/extras/hook-scripts/start/post/S30samba-start.sh -@@ -89,6 +89,7 @@ function add_samba_share () { - STRING+="path = /\n" - STRING+="read only = no\n" - STRING+="guest ok = yes\n" -+ STRING+="kernel share modes = no\n" - printf "$STRING" >> "${CONFIGFILE}" - } - --- -1.8.3.1 - diff --git a/SOURCES/0413-extras-hooks-Remove-smb.conf-parameter-allowing-gues.patch b/SOURCES/0413-extras-hooks-Remove-smb.conf-parameter-allowing-gues.patch deleted file mode 100644 index 1ff6348..0000000 --- a/SOURCES/0413-extras-hooks-Remove-smb.conf-parameter-allowing-gues.patch +++ /dev/null @@ -1,46 +0,0 @@ -From aec3dd00fa76547316fddd07e6ded428d945986c Mon Sep 17 00:00:00 2001 -From: Anoop C S -Date: Fri, 22 Nov 2019 17:36:55 +0530 -Subject: [PATCH 413/449] extras/hooks: Remove smb.conf parameter allowing - guest access - -Backport of https://review.gluster.org/23745 - -Change-Id: I88f494f16153d27ab6e2f2faf4d557e075671b10 -BUG: 1775637 -Signed-off-by: Anoop C S -Reviewed-on: https://code.engineering.redhat.com/gerrit/202473 -Tested-by: RHGS Build Bot -Reviewed-by: Sunil Kumar Heggodu Gopala Acharya ---- - extras/hook-scripts/set/post/S30samba-set.sh | 1 - - extras/hook-scripts/start/post/S30samba-start.sh | 1 - - 2 files changed, 2 deletions(-) - -diff --git a/extras/hook-scripts/set/post/S30samba-set.sh b/extras/hook-scripts/set/post/S30samba-set.sh -index e73f00f..854f131 100755 ---- a/extras/hook-scripts/set/post/S30samba-set.sh -+++ b/extras/hook-scripts/set/post/S30samba-set.sh -@@ -89,7 +89,6 @@ function add_samba_share () { - STRING+="glusterfs:loglevel = 7\n" - STRING+="path = /\n" - STRING+="read only = no\n" -- STRING+="guest ok = yes\n" - STRING+="kernel share modes = no\n" - printf "$STRING" >> ${CONFIGFILE} - } -diff --git a/extras/hook-scripts/start/post/S30samba-start.sh b/extras/hook-scripts/start/post/S30samba-start.sh -index 0d5a5ed..cac0cbf 100755 ---- a/extras/hook-scripts/start/post/S30samba-start.sh -+++ b/extras/hook-scripts/start/post/S30samba-start.sh -@@ -88,7 +88,6 @@ function add_samba_share () { - STRING+="glusterfs:loglevel = 7\n" - STRING+="path = /\n" - STRING+="read only = no\n" -- STRING+="guest ok = yes\n" - STRING+="kernel share modes = no\n" - printf "$STRING" >> "${CONFIGFILE}" - } --- -1.8.3.1 - diff --git a/SOURCES/0414-cluster-syncop-avoid-duplicate-unlock-of-inodelk-ent.patch b/SOURCES/0414-cluster-syncop-avoid-duplicate-unlock-of-inodelk-ent.patch deleted file mode 100644 index 67b71dd..0000000 --- a/SOURCES/0414-cluster-syncop-avoid-duplicate-unlock-of-inodelk-ent.patch +++ /dev/null @@ -1,62 +0,0 @@ -From 5b549cbf3f1873054c6d187b09aa9f9313971b1f Mon Sep 17 00:00:00 2001 -From: Kinglong Mee -Date: Mon, 18 Mar 2019 20:47:54 +0800 -Subject: [PATCH 414/449] cluster-syncop: avoid duplicate unlock of - inodelk/entrylk - -When using ec, there are many spam messages in brick and client -logs files. - -When shd does entry heal, it takes lock on a directory using -cluster_tiebreaker_inodelk(). If it does not get lock on all -the bricks because other clients has got lock on some bricks, -it will unlock the locks on those bricks which it got and then -will try blocking locks (If any one of the previous was successful). - -The problem come here. In case we do not get locks on all the -required bricks, we are sending unlock request twice on those -bricks where we got the locks. - -BUG: 1750211 -> Upstream patch: https://review.gluster.org/#/c/glusterfs/+/22377/ -> Change-Id: Ib164d29ebb071f620a4ca9679c4345ef7c88512a -> Updates: bz#1689920 -> Signed-off-by: Kinglong Mee - -Change-Id: I1647548ba75fdd27fd4e20dec08db67774f43375 -Reviewed-on: https://code.engineering.redhat.com/gerrit/202477 -Tested-by: Ashish Pandey -Tested-by: RHGS Build Bot -Reviewed-by: Sunil Kumar Heggodu Gopala Acharya ---- - libglusterfs/src/cluster-syncop.c | 6 ++++++ - 1 file changed, 6 insertions(+) - -diff --git a/libglusterfs/src/cluster-syncop.c b/libglusterfs/src/cluster-syncop.c -index 5a08f26..6ee89dd 100644 ---- a/libglusterfs/src/cluster-syncop.c -+++ b/libglusterfs/src/cluster-syncop.c -@@ -1203,6 +1203,10 @@ cluster_tiebreaker_inodelk(xlator_t **subvols, unsigned char *on, - if (num_success) { - FOP_SEQ(subvols, on, numsubvols, replies, locked_on, frame, - inodelk, dom, &loc, F_SETLKW, &flock, NULL); -+ } else { -+ loc_wipe(&loc); -+ memset(locked_on, 0, numsubvols); -+ return 0; - } - break; - } -@@ -1244,7 +1248,9 @@ cluster_tiebreaker_entrylk(xlator_t **subvols, unsigned char *on, - entrylk, dom, &loc, name, ENTRYLK_LOCK, ENTRYLK_WRLCK, - NULL); - } else { -+ loc_wipe(&loc); - memset(locked_on, 0, numsubvols); -+ return 0; - } - break; - } --- -1.8.3.1 - diff --git a/SOURCES/0415-dht-Fix-stale-layout-and-create-issue.patch b/SOURCES/0415-dht-Fix-stale-layout-and-create-issue.patch deleted file mode 100644 index 476a8cc..0000000 --- a/SOURCES/0415-dht-Fix-stale-layout-and-create-issue.patch +++ /dev/null @@ -1,523 +0,0 @@ -From ba23e6d8f4eff11a228816149a8a1ccd6df41146 Mon Sep 17 00:00:00 2001 -From: Susant Palai -Date: Fri, 27 Dec 2019 12:06:19 +0530 -Subject: [PATCH 415/449] dht: Fix stale-layout and create issue - -Problem: With lookup-optimize set to on by default, a client with -stale-layout can create a new file on a wrong subvol. This will lead to -possible duplicate files if two different clients attempt to create the -same file with two different layouts. - -Solution: Send in-memory layout to be cross checked at posix before -commiting a "create". In case of a mismatch, sync the client layout with -that of the server and attempt the create fop one more time. - -test: Manual, testcase(attached) - -(Backport of https://review.gluster.org/#/c/glusterfs/+/23927/) - -BUG: 1748865 -Change-Id: I6c82c97418654ae8eb3b81ab65f1247aa4002ceb -Signed-off-by: Susant Palai -Reviewed-on: https://code.engineering.redhat.com/gerrit/202465 -Tested-by: RHGS Build Bot -Reviewed-by: Mohit Agrawal -Reviewed-by: Sunil Kumar Heggodu Gopala Acharya ---- - tests/bugs/distribute/bug-1786679.t | 69 +++++++++++ - xlators/cluster/dht/src/dht-common.c | 147 ++++++++++++++++++++--- - xlators/cluster/dht/src/dht-common.h | 6 + - xlators/protocol/client/src/client-rpc-fops_v2.c | 9 +- - xlators/storage/posix/src/posix-entry-ops.c | 29 ++++- - xlators/storage/posix/src/posix-helpers.c | 76 ++++++++++++ - xlators/storage/posix/src/posix.h | 4 + - 7 files changed, 321 insertions(+), 19 deletions(-) - create mode 100755 tests/bugs/distribute/bug-1786679.t - -diff --git a/tests/bugs/distribute/bug-1786679.t b/tests/bugs/distribute/bug-1786679.t -new file mode 100755 -index 0000000..219ce51 ---- /dev/null -+++ b/tests/bugs/distribute/bug-1786679.t -@@ -0,0 +1,69 @@ -+#!/bin/bash -+ -+SCRIPT_TIMEOUT=250 -+ -+. $(dirname $0)/../../include.rc -+. $(dirname $0)/../../volume.rc -+. $(dirname $0)/../../dht.rc -+ -+ -+# create 2 subvols -+# create a dir -+# create a file -+# change layout -+# remove the file -+# execute create from a different mount -+# Without the patch, the file will be present on both of the bricks -+ -+cleanup -+ -+function get_layout () { -+ -+layout=`getfattr -n trusted.glusterfs.dht -e hex $1 2>&1 | grep dht | gawk -F"=" '{print $2}'` -+ -+echo $layout -+ -+} -+ -+function set_layout() -+{ -+ setfattr -n "trusted.glusterfs.dht" -v $1 $2 -+} -+ -+TEST glusterd -+TEST pidof glusterd -+ -+BRICK1=$B0/${V0}-0 -+BRICK2=$B0/${V0}-1 -+ -+TEST $CLI volume create $V0 $H0:$BRICK1 $H0:$BRICK2 -+TEST $CLI volume start $V0 -+ -+# Mount FUSE and create symlink -+TEST glusterfs -s $H0 --volfile-id $V0 $M0 -+TEST mkdir $M0/dir -+TEST touch $M0/dir/file -+TEST ! stat "$BRICK1/dir/file" -+TEST stat "$BRICK2/dir/file" -+ -+layout1="$(get_layout "$BRICK1/dir")" -+layout2="$(get_layout "$BRICK2/dir")" -+ -+TEST set_layout $layout1 "$BRICK2/dir" -+TEST set_layout $layout2 "$BRICK1/dir" -+ -+TEST rm $M0/dir/file -f -+TEST gluster v set $V0 client-log-level DEBUG -+ -+#Without the patch in place, this client will create the file in $BRICK2 -+#which will lead to two files being on both the bricks when a new client -+#create the file with the same name -+TEST touch $M0/dir/file -+ -+TEST glusterfs -s $H0 --volfile-id $V0 $M1 -+TEST touch $M1/dir/file -+ -+TEST stat "$BRICK1/dir/file" -+TEST ! stat "$BRICK2/dir/file" -+ -+cleanup -diff --git a/xlators/cluster/dht/src/dht-common.c b/xlators/cluster/dht/src/dht-common.c -index 7890e7a..6aa18f3 100644 ---- a/xlators/cluster/dht/src/dht-common.c -+++ b/xlators/cluster/dht/src/dht-common.c -@@ -8262,6 +8262,11 @@ dht_create_cbk(call_frame_t *frame, void *cookie, xlator_t *this, int op_ret, - xlator_t *prev = NULL; - int ret = -1; - dht_local_t *local = NULL; -+ gf_boolean_t parent_layout_changed = _gf_false; -+ char pgfid[GF_UUID_BUF_SIZE] = {0}; -+ xlator_t *subvol = NULL; -+ -+ local = frame->local; - - local = frame->local; - if (!local) { -@@ -8270,8 +8275,69 @@ dht_create_cbk(call_frame_t *frame, void *cookie, xlator_t *this, int op_ret, - goto out; - } - -- if (op_ret == -1) -+ if (op_ret == -1) { -+ local->op_errno = op_errno; -+ parent_layout_changed = (xdata && -+ dict_get(xdata, GF_PREOP_CHECK_FAILED)) -+ ? _gf_true -+ : _gf_false; -+ -+ if (parent_layout_changed) { -+ if (local && local->lock[0].layout.parent_layout.locks) { -+ /* Returning failure as the layout could not be fixed even under -+ * the lock */ -+ goto out; -+ } -+ -+ gf_uuid_unparse(local->loc.parent->gfid, pgfid); -+ gf_msg(this->name, GF_LOG_INFO, 0, DHT_MSG_PARENT_LAYOUT_CHANGED, -+ "create (%s/%s) (path: %s): parent layout " -+ "changed. Attempting a layout refresh and then a " -+ "retry", -+ pgfid, local->loc.name, local->loc.path); -+ -+ /* -+ dht_refresh_layout needs directory info in local->loc.Hence, -+ storing the parent_loc in local->loc and storing the create -+ context in local->loc2. We will restore this information in -+ dht_creation_do. -+ */ -+ -+ loc_wipe(&local->loc2); -+ -+ ret = loc_copy(&local->loc2, &local->loc); -+ if (ret) { -+ gf_msg(this->name, GF_LOG_ERROR, ENOMEM, DHT_MSG_NO_MEMORY, -+ "loc_copy failed %s", local->loc.path); -+ -+ goto out; -+ } -+ -+ loc_wipe(&local->loc); -+ -+ ret = dht_build_parent_loc(this, &local->loc, &local->loc2, -+ &op_errno); -+ -+ if (ret) { -+ gf_msg(this->name, GF_LOG_ERROR, ENOMEM, DHT_MSG_LOC_FAILED, -+ "parent loc build failed"); -+ goto out; -+ } -+ -+ subvol = dht_subvol_get_hashed(this, &local->loc2); -+ -+ ret = dht_create_lock(frame, subvol); -+ if (ret < 0) { -+ gf_msg(this->name, GF_LOG_ERROR, 0, DHT_MSG_INODE_LK_ERROR, -+ "locking parent failed"); -+ goto out; -+ } -+ -+ return 0; -+ } -+ - goto out; -+ } - - prev = cookie; - -@@ -8392,6 +8458,8 @@ dht_create_wind_to_avail_subvol(call_frame_t *frame, xlator_t *this, - gf_msg_debug(this->name, 0, "creating %s on %s", loc->path, - subvol->name); - -+ dht_set_parent_layout_in_dict(loc, this, local); -+ - STACK_WIND_COOKIE(frame, dht_create_cbk, subvol, subvol, - subvol->fops->create, loc, flags, mode, umask, fd, - params); -@@ -8400,10 +8468,6 @@ dht_create_wind_to_avail_subvol(call_frame_t *frame, xlator_t *this, - avail_subvol = dht_free_disk_available_subvol(this, subvol, local); - - if (avail_subvol != subvol) { -- local->params = dict_ref(params); -- local->flags = flags; -- local->mode = mode; -- local->umask = umask; - local->cached_subvol = avail_subvol; - local->hashed_subvol = subvol; - -@@ -8419,6 +8483,8 @@ dht_create_wind_to_avail_subvol(call_frame_t *frame, xlator_t *this, - gf_msg_debug(this->name, 0, "creating %s on %s", loc->path, - subvol->name); - -+ dht_set_parent_layout_in_dict(loc, this, local); -+ - STACK_WIND_COOKIE(frame, dht_create_cbk, subvol, subvol, - subvol->fops->create, loc, flags, mode, umask, fd, - params); -@@ -8680,6 +8746,60 @@ err: - } - - int -+dht_set_parent_layout_in_dict(loc_t *loc, xlator_t *this, dht_local_t *local) -+{ -+ dht_conf_t *conf = this->private; -+ dht_layout_t *parent_layout = NULL; -+ int *parent_disk_layout = NULL; -+ xlator_t *hashed_subvol = NULL; -+ char pgfid[GF_UUID_BUF_SIZE] = {0}; -+ int ret = 0; -+ -+ gf_uuid_unparse(loc->parent->gfid, pgfid); -+ -+ parent_layout = dht_layout_get(this, loc->parent); -+ hashed_subvol = dht_subvol_get_hashed(this, loc); -+ -+ ret = dht_disk_layout_extract_for_subvol(this, parent_layout, hashed_subvol, -+ &parent_disk_layout); -+ if (ret == -1) { -+ gf_msg(this->name, GF_LOG_WARNING, local->op_errno, -+ DHT_MSG_PARENT_LAYOUT_CHANGED, -+ "%s (%s/%s) (path: %s): " -+ "extracting in-memory layout of parent failed. ", -+ gf_fop_list[local->fop], pgfid, loc->name, loc->path); -+ goto err; -+ } -+ -+ ret = dict_set_str_sizen(local->params, GF_PREOP_PARENT_KEY, -+ conf->xattr_name); -+ if (ret < 0) { -+ gf_msg(this->name, GF_LOG_WARNING, local->op_errno, -+ DHT_MSG_PARENT_LAYOUT_CHANGED, -+ "%s (%s/%s) (path: %s): " -+ "setting %s key in params dictionary failed. ", -+ gf_fop_list[local->fop], pgfid, loc->name, loc->path, -+ GF_PREOP_PARENT_KEY); -+ goto err; -+ } -+ -+ ret = dict_set_bin(local->params, conf->xattr_name, parent_disk_layout, -+ 4 * 4); -+ if (ret < 0) { -+ gf_msg(this->name, GF_LOG_WARNING, local->op_errno, -+ DHT_MSG_PARENT_LAYOUT_CHANGED, -+ "%s (%s/%s) (path: %s): " -+ "setting parent-layout in params dictionary failed. ", -+ gf_fop_list[local->fop], pgfid, loc->name, loc->path); -+ goto err; -+ } -+ -+err: -+ dht_layout_unref(this, parent_layout); -+ return ret; -+} -+ -+int - dht_create(call_frame_t *frame, xlator_t *this, loc_t *loc, int32_t flags, - mode_t mode, mode_t umask, fd_t *fd, dict_t *params) - { -@@ -8705,6 +8825,11 @@ dht_create(call_frame_t *frame, xlator_t *this, loc_t *loc, int32_t flags, - goto err; - } - -+ local->params = dict_ref(params); -+ local->flags = flags; -+ local->mode = mode; -+ local->umask = umask; -+ - if (dht_filter_loc_subvol_key(this, loc, &local->loc, &subvol)) { - gf_msg(this->name, GF_LOG_INFO, 0, DHT_MSG_SUBVOL_INFO, - "creating %s on %s (got create on %s)", local->loc.path, -@@ -8720,10 +8845,6 @@ dht_create(call_frame_t *frame, xlator_t *this, loc_t *loc, int32_t flags, - - if (hashed_subvol && (hashed_subvol != subvol)) { - /* Create the linkto file and then the data file */ -- local->params = dict_ref(params); -- local->flags = flags; -- local->mode = mode; -- local->umask = umask; - local->cached_subvol = subvol; - local->hashed_subvol = hashed_subvol; - -@@ -8736,6 +8857,9 @@ dht_create(call_frame_t *frame, xlator_t *this, loc_t *loc, int32_t flags, - * file as we expect a lookup everywhere if there are problems - * with the parent layout - */ -+ -+ dht_set_parent_layout_in_dict(loc, this, local); -+ - STACK_WIND_COOKIE(frame, dht_create_cbk, subvol, subvol, - subvol->fops->create, &local->loc, flags, mode, umask, - fd, params); -@@ -8787,11 +8911,6 @@ dht_create(call_frame_t *frame, xlator_t *this, loc_t *loc, int32_t flags, - goto err; - } - -- local->params = dict_ref(params); -- local->flags = flags; -- local->mode = mode; -- local->umask = umask; -- - loc_wipe(&local->loc); - - ret = dht_build_parent_loc(this, &local->loc, loc, &op_errno); -diff --git a/xlators/cluster/dht/src/dht-common.h b/xlators/cluster/dht/src/dht-common.h -index 8e65111..1b3e826 100644 ---- a/xlators/cluster/dht/src/dht-common.h -+++ b/xlators/cluster/dht/src/dht-common.h -@@ -1549,4 +1549,10 @@ dht_check_remote_fd_failed_error(dht_local_t *local, int op_ret, int op_errno); - int - dht_dir_layout_error_check(xlator_t *this, inode_t *inode); - -+int32_t -+dht_create_lock(call_frame_t *frame, xlator_t *subvol); -+ -+int -+dht_set_parent_layout_in_dict(loc_t *loc, xlator_t *this, dht_local_t *local); -+ - #endif /* _DHT_H */ -diff --git a/xlators/protocol/client/src/client-rpc-fops_v2.c b/xlators/protocol/client/src/client-rpc-fops_v2.c -index 2673b6e..613dda8 100644 ---- a/xlators/protocol/client/src/client-rpc-fops_v2.c -+++ b/xlators/protocol/client/src/client-rpc-fops_v2.c -@@ -2094,11 +2094,12 @@ client4_0_create_cbk(struct rpc_req *req, struct iovec *iov, int count, - goto out; - } - -+ ret = client_post_create_v2(this, &rsp, &stbuf, &preparent, &postparent, -+ local, &xdata); -+ if (ret < 0) -+ goto out; -+ - if (-1 != rsp.op_ret) { -- ret = client_post_create_v2(this, &rsp, &stbuf, &preparent, &postparent, -- local, &xdata); -- if (ret < 0) -- goto out; - ret = client_add_fd_to_saved_fds(frame->this, fd, &local->loc, - local->flags, rsp.fd, 0); - if (ret) { -diff --git a/xlators/storage/posix/src/posix-entry-ops.c b/xlators/storage/posix/src/posix-entry-ops.c -index bea0bbf..65650b3 100644 ---- a/xlators/storage/posix/src/posix-entry-ops.c -+++ b/xlators/storage/posix/src/posix-entry-ops.c -@@ -2070,6 +2070,8 @@ posix_create(call_frame_t *frame, xlator_t *this, loc_t *loc, int32_t flags, - gf_boolean_t entry_created = _gf_false, gfid_set = _gf_false; - mode_t mode_bit = 0; - -+ dict_t *xdata_rsp = dict_ref(xdata); -+ - DECLARE_OLD_FS_ID_VAR; - - VALIDATE_OR_GOTO(frame, out); -@@ -2118,6 +2120,28 @@ posix_create(call_frame_t *frame, xlator_t *this, loc_t *loc, int32_t flags, - was_present = 0; - } - -+ if (!was_present) { -+ if (posix_is_layout_stale(xdata, par_path, this)) { -+ op_ret = -1; -+ op_errno = EIO; -+ if (!xdata_rsp) { -+ xdata_rsp = dict_new(); -+ if (!xdata_rsp) { -+ op_errno = ENOMEM; -+ goto out; -+ } -+ } -+ -+ if (dict_set_int32_sizen(xdata_rsp, GF_PREOP_CHECK_FAILED, 1) == -+ -1) { -+ gf_msg(this->name, GF_LOG_ERROR, errno, P_MSG_DICT_SET_FAILED, -+ "setting key %s in dict failed", GF_PREOP_CHECK_FAILED); -+ } -+ -+ goto out; -+ } -+ } -+ - if (priv->o_direct) - _flags |= O_DIRECT; - -@@ -2239,7 +2263,10 @@ out: - - STACK_UNWIND_STRICT(create, frame, op_ret, op_errno, fd, - (loc) ? loc->inode : NULL, &stbuf, &preparent, -- &postparent, xdata); -+ &postparent, xdata_rsp); -+ -+ if (xdata_rsp) -+ dict_unref(xdata_rsp); - - return 0; - } -diff --git a/xlators/storage/posix/src/posix-helpers.c b/xlators/storage/posix/src/posix-helpers.c -index 35dd3b6..2c27d22 100644 ---- a/xlators/storage/posix/src/posix-helpers.c -+++ b/xlators/storage/posix/src/posix-helpers.c -@@ -3559,3 +3559,79 @@ posix_update_iatt_buf(struct iatt *buf, int fd, char *loc, dict_t *xattr_req) - } - } - } -+ -+gf_boolean_t -+posix_is_layout_stale(dict_t *xdata, char *par_path, xlator_t *this) -+{ -+ int op_ret = 0; -+ ssize_t size = 0; -+ char value_buf[4096] = { -+ 0, -+ }; -+ gf_boolean_t have_val = _gf_false; -+ data_t *arg_data = NULL; -+ char *xattr_name = NULL; -+ gf_boolean_t is_stale = _gf_false; -+ -+ op_ret = dict_get_str_sizen(xdata, GF_PREOP_PARENT_KEY, &xattr_name); -+ if (xattr_name == NULL) { -+ op_ret = 0; -+ goto out; -+ } -+ -+ arg_data = dict_get(xdata, xattr_name); -+ if (!arg_data) { -+ op_ret = 0; -+ goto out; -+ } -+ -+ size = sys_lgetxattr(par_path, xattr_name, value_buf, -+ sizeof(value_buf) - 1); -+ -+ if (size >= 0) { -+ have_val = _gf_true; -+ } else { -+ if (errno == ERANGE) { -+ gf_msg(this->name, GF_LOG_INFO, errno, P_MSG_PREOP_CHECK_FAILED, -+ "getxattr on key (%s) path (%s) failed due to" -+ " buffer overflow", -+ xattr_name, par_path); -+ size = sys_lgetxattr(par_path, xattr_name, NULL, 0); -+ } -+ if (size < 0) { -+ op_ret = -1; -+ gf_msg(this->name, GF_LOG_ERROR, errno, P_MSG_PREOP_CHECK_FAILED, -+ "getxattr on key (%s) failed, path : %s", xattr_name, -+ par_path); -+ goto out; -+ } -+ } -+ -+ if (!have_val) { -+ size = sys_lgetxattr(par_path, xattr_name, value_buf, size); -+ if (size < 0) { -+ gf_msg(this->name, GF_LOG_ERROR, errno, P_MSG_PREOP_CHECK_FAILED, -+ "getxattr on key (%s) failed (%s)", xattr_name, -+ strerror(errno)); -+ goto out; -+ } -+ } -+ -+ if ((arg_data->len != size) || (memcmp(arg_data->data, value_buf, size))) { -+ gf_msg(this->name, GF_LOG_INFO, EIO, P_MSG_PREOP_CHECK_FAILED, -+ "failing preop as on-disk xattr value differs from argument " -+ "value for key %s", -+ xattr_name); -+ op_ret = -1; -+ } -+ -+out: -+ dict_del_sizen(xdata, xattr_name); -+ dict_del_sizen(xdata, GF_PREOP_PARENT_KEY); -+ -+ if (op_ret == -1) { -+ is_stale = _gf_true; -+ } -+ -+ return is_stale; -+} -diff --git a/xlators/storage/posix/src/posix.h b/xlators/storage/posix/src/posix.h -index dd51062..ac9d83c 100644 ---- a/xlators/storage/posix/src/posix.h -+++ b/xlators/storage/posix/src/posix.h -@@ -671,4 +671,8 @@ posix_spawn_ctx_janitor_thread(xlator_t *this); - - void - posix_update_iatt_buf(struct iatt *buf, int fd, char *loc, dict_t *xdata); -+ -+gf_boolean_t -+posix_is_layout_stale(dict_t *xdata, char *par_path, xlator_t *this); -+ - #endif /* _POSIX_H */ --- -1.8.3.1 - diff --git a/SOURCES/0416-tests-fix-spurious-failure-of-bug-1402841.t-mt-dir-s.patch b/SOURCES/0416-tests-fix-spurious-failure-of-bug-1402841.t-mt-dir-s.patch deleted file mode 100644 index 1954e6a..0000000 --- a/SOURCES/0416-tests-fix-spurious-failure-of-bug-1402841.t-mt-dir-s.patch +++ /dev/null @@ -1,72 +0,0 @@ -From 63cfdd987b1dfbf97486f0f884380faee0ae25d0 Mon Sep 17 00:00:00 2001 -From: Ravishankar N -Date: Wed, 4 Sep 2019 11:27:30 +0530 -Subject: [PATCH 416/449] tests: fix spurious failure of - bug-1402841.t-mt-dir-scan-race.t - -Upstream patch: https://review.gluster.org/23352 - -Problem: -Since commit 600ba94183333c4af9b4a09616690994fd528478, shd starts -healing as soon as it is toggled from disabled to enabled. This was -causing the following line in the .t to fail on a 'fast' machine (always -on my laptop and sometimes on the jenkins slaves). - -EXPECT_NOT "^0$" get_pending_heal_count $V0 - -because by the time shd was disabled, the heal was already completed. - -Fix: -Increase the no. of files to be healed and make it a variable called -FILE_COUNT, should we need to bump it up further because the machines -become even faster. Also created pending metadata heals to increase the -time taken to heal a file. - ->fixes: bz#1748744 ->Change-Id: I5a26b08e45b8c19bce3c01ce67bdcc28ed48198d -Signed-off-by: Ravishankar N - -BUG: 1844359 -Change-Id: Ie3676c6c2c27e7574b958d2eaac23801dfaed3a9 -Reviewed-on: https://code.engineering.redhat.com/gerrit/202481 -Tested-by: RHGS Build Bot -Reviewed-by: Sunil Kumar Heggodu Gopala Acharya ---- - tests/bugs/core/bug-1402841.t-mt-dir-scan-race.t | 9 +++++---- - 1 file changed, 5 insertions(+), 4 deletions(-) - -diff --git a/tests/bugs/core/bug-1402841.t-mt-dir-scan-race.t b/tests/bugs/core/bug-1402841.t-mt-dir-scan-race.t -index 6351ba2..a1b9a85 100755 ---- a/tests/bugs/core/bug-1402841.t-mt-dir-scan-race.t -+++ b/tests/bugs/core/bug-1402841.t-mt-dir-scan-race.t -@@ -3,6 +3,8 @@ - . $(dirname $0)/../../volume.rc - cleanup; - -+FILE_COUNT=500 -+ - TEST glusterd - TEST pidof glusterd - TEST $CLI volume create $V0 replica 2 $H0:$B0/${V0}{0,1} -@@ -11,15 +13,14 @@ TEST $CLI volume set $V0 cluster.shd-wait-qlength 100 - TEST $CLI volume start $V0 - - TEST glusterfs --volfile-id=$V0 --volfile-server=$H0 $M0; --touch $M0/file{1..200} -- -+for i in `seq 1 $FILE_COUNT`; do touch $M0/file$i; done - TEST kill_brick $V0 $H0 $B0/${V0}1 --for i in {1..200}; do echo hello>$M0/file$i; done -+for i in `seq 1 $FILE_COUNT`; do echo hello>$M0/file$i; chmod -x $M0/file$i; done - TEST $CLI volume start $V0 force - EXPECT_WITHIN $PROCESS_UP_TIMEOUT "1" brick_up_status $V0 $H0 $B0/${V0}1 - EXPECT_WITHIN $PROCESS_UP_TIMEOUT "1" afr_child_up_status $V0 1 - --EXPECT "200" get_pending_heal_count $V0 -+EXPECT "$FILE_COUNT" get_pending_heal_count $V0 - TEST $CLI volume set $V0 self-heal-daemon on - - EXPECT_WITHIN $PROCESS_UP_TIMEOUT "Y" glustershd_up_status --- -1.8.3.1 - diff --git a/SOURCES/0417-events-fix-IPv6-memory-corruption.patch b/SOURCES/0417-events-fix-IPv6-memory-corruption.patch deleted file mode 100644 index cefb5bf..0000000 --- a/SOURCES/0417-events-fix-IPv6-memory-corruption.patch +++ /dev/null @@ -1,153 +0,0 @@ -From 5e231ceb35bb763d6fafc7c3efe1c3c582929cc2 Mon Sep 17 00:00:00 2001 -From: Xavi Hernandez -Date: Tue, 14 Jan 2020 13:28:47 +0100 -Subject: [PATCH 417/449] events: fix IPv6 memory corruption - -When an event was generated and the target host was resolved to an IPv6 -address, there was a memory overflow when that address was copied to a -fixed IPv4 structure (IPv6 addresses are longer than IPv4 ones). - -This fix correctly handles IPv4 and IPv6 addresses returned by -getaddrinfo() - -Backport of: -> Upstream-patch-link: https://review.gluster.org/24014 -> Change-Id: I5864a0c6e6f1b405bd85988529570140cf23b250 -> Fixes: bz#1790870 -> Signed-off-by: Xavi Hernandez - -BUG: 1792873 -Change-Id: I5864a0c6e6f1b405bd85988529570140cf23b250 -Signed-off-by: Xavi Hernandez -Reviewed-on: https://code.engineering.redhat.com/gerrit/202486 -Tested-by: RHGS Build Bot -Reviewed-by: Sunil Kumar Heggodu Gopala Acharya ---- - libglusterfs/src/events.c | 56 +++++++++++++---------------------------------- - 1 file changed, 15 insertions(+), 41 deletions(-) - -diff --git a/libglusterfs/src/events.c b/libglusterfs/src/events.c -index 4e2f8f9..6d1e383 100644 ---- a/libglusterfs/src/events.c -+++ b/libglusterfs/src/events.c -@@ -34,7 +34,6 @@ _gf_event(eventtypes_t event, const char *fmt, ...) - int ret = 0; - int sock = -1; - char *eventstr = NULL; -- struct sockaddr_in server; - va_list arguments; - char *msg = NULL; - glusterfs_ctx_t *ctx = NULL; -@@ -42,11 +41,10 @@ _gf_event(eventtypes_t event, const char *fmt, ...) - struct addrinfo hints; - struct addrinfo *result = NULL; - xlator_t *this = THIS; -- int sin_family = AF_INET; - char *volfile_server_transport = NULL; - - /* Global context */ -- ctx = THIS->ctx; -+ ctx = this->ctx; - - if (event < 0 || event >= EVENT_LAST) { - ret = EVENT_ERROR_INVALID_INPUTS; -@@ -60,48 +58,31 @@ _gf_event(eventtypes_t event, const char *fmt, ...) - goto out; - } - -- memset(&hints, 0, sizeof(hints)); -- hints.ai_family = AF_UNSPEC; -- - if (ctx) { - volfile_server_transport = ctx->cmd_args.volfile_server_transport; - } -- - if (!volfile_server_transport) { - volfile_server_transport = "tcp"; - } -- /* Get Host name to send message */ -+ -+ /* host = NULL returns localhost */ -+ host = NULL; - if (ctx && ctx->cmd_args.volfile_server && - (strcmp(volfile_server_transport, "unix"))) { - /* If it is client code then volfile_server is set - use that information to push the events. */ -- if ((getaddrinfo(ctx->cmd_args.volfile_server, NULL, &hints, -- &result)) != 0) { -- ret = EVENT_ERROR_RESOLVE; -- goto out; -- } -- -- if (get_ip_from_addrinfo(result, &host) == NULL) { -- ret = EVENT_ERROR_RESOLVE; -- goto out; -- } -- -- sin_family = result->ai_family; -- } else { -- /* Localhost, Use the defined IP for localhost */ -- host = gf_strdup(EVENT_HOST); -+ host = ctx->cmd_args.volfile_server; - } - -- /* Socket Configurations */ -- server.sin_family = sin_family; -- server.sin_port = htons(EVENT_PORT); -- ret = inet_pton(server.sin_family, host, &server.sin_addr); -- if (ret <= 0) { -- gf_msg(this->name, GF_LOG_ERROR, EINVAL, LG_MSG_INVALID_ARG, -- "inet_pton failed with return code %d", ret); -+ memset(&hints, 0, sizeof(hints)); -+ hints.ai_family = AF_UNSPEC; -+ hints.ai_socktype = SOCK_DGRAM; -+ hints.ai_flags = AI_ADDRCONFIG; -+ -+ if ((getaddrinfo(host, TOSTRING(EVENT_PORT), &hints, &result)) != 0) { -+ ret = EVENT_ERROR_RESOLVE; - goto out; - } -- memset(&server.sin_zero, '\0', sizeof(server.sin_zero)); - - va_start(arguments, fmt); - ret = gf_vasprintf(&msg, fmt, arguments); -@@ -113,15 +94,15 @@ _gf_event(eventtypes_t event, const char *fmt, ...) - } - - ret = gf_asprintf(&eventstr, "%u %d %s", (unsigned)time(NULL), event, msg); -- -+ GF_FREE(msg); - if (ret <= 0) { - ret = EVENT_ERROR_MSG_FORMAT; - goto out; - } - - /* Send Message */ -- if (sendto(sock, eventstr, strlen(eventstr), 0, (struct sockaddr *)&server, -- sizeof(server)) <= 0) { -+ if (sendto(sock, eventstr, strlen(eventstr), 0, result->ai_addr, -+ result->ai_addrlen) <= 0) { - ret = EVENT_ERROR_SEND; - goto out; - } -@@ -133,17 +114,10 @@ out: - sys_close(sock); - } - -- /* Allocated by gf_vasprintf */ -- if (msg) -- GF_FREE(msg); -- - /* Allocated by gf_asprintf */ - if (eventstr) - GF_FREE(eventstr); - -- if (host) -- GF_FREE(host); -- - if (result) - freeaddrinfo(result); - --- -1.8.3.1 - diff --git a/SOURCES/0418-md-cache-avoid-clearing-cache-when-not-necessary.patch b/SOURCES/0418-md-cache-avoid-clearing-cache-when-not-necessary.patch deleted file mode 100644 index 45622d9..0000000 --- a/SOURCES/0418-md-cache-avoid-clearing-cache-when-not-necessary.patch +++ /dev/null @@ -1,439 +0,0 @@ -From 7ad8c03a28fca67150972cda964ebe9233766b54 Mon Sep 17 00:00:00 2001 -From: Xavi Hernandez -Date: Mon, 30 Mar 2020 11:09:39 +0200 -Subject: [PATCH 418/449] md-cache: avoid clearing cache when not necessary - -mdc_inode_xatt_set() blindly cleared current cache when dict was not -NULL, even if there was no xattr requested. - -This patch fixes this by only calling mdc_inode_xatt_set() when we have -explicitly requested something to cache. - -Backport of: -> Upstream-patch-link: https://review.gluster.org/24267 -> Change-Id: Idc91a4693f1ff39f7059acde26682ccc361b947d -> Fixes: #1140 -> Signed-off-by: Xavi Hernandez - -BUG: 1815434 -Change-Id: Idc91a4693f1ff39f7059acde26682ccc361b947d -Signed-off-by: Xavi Hernandez -Reviewed-on: https://code.engineering.redhat.com/gerrit/202487 -Tested-by: RHGS Build Bot -Reviewed-by: Sunil Kumar Heggodu Gopala Acharya ---- - xlators/performance/md-cache/src/md-cache.c | 165 ++++++++++++++++------------ - 1 file changed, 93 insertions(+), 72 deletions(-) - -diff --git a/xlators/performance/md-cache/src/md-cache.c b/xlators/performance/md-cache/src/md-cache.c -index a6b363f..bbbee3b 100644 ---- a/xlators/performance/md-cache/src/md-cache.c -+++ b/xlators/performance/md-cache/src/md-cache.c -@@ -133,6 +133,7 @@ struct mdc_local { - char *key; - dict_t *xattr; - uint64_t incident_time; -+ bool update_cache; - }; - - int -@@ -969,7 +970,7 @@ out: - return ret; - } - --void -+static bool - mdc_load_reqs(xlator_t *this, dict_t *dict) - { - struct mdc_conf *conf = this->private; -@@ -978,6 +979,7 @@ mdc_load_reqs(xlator_t *this, dict_t *dict) - char *tmp = NULL; - char *tmp1 = NULL; - int ret = 0; -+ bool loaded = false; - - tmp1 = conf->mdc_xattr_str; - if (!tmp1) -@@ -995,13 +997,17 @@ mdc_load_reqs(xlator_t *this, dict_t *dict) - conf->mdc_xattr_str = NULL; - gf_msg("md-cache", GF_LOG_ERROR, 0, MD_CACHE_MSG_NO_XATTR_CACHE, - "Disabled cache for xattrs, dict_set failed"); -+ goto out; - } - pattern = strtok_r(NULL, ",", &tmp); - } - -- GF_FREE(mdc_xattr_str); -+ loaded = true; -+ - out: -- return; -+ GF_FREE(mdc_xattr_str); -+ -+ return loaded; - } - - struct checkpair { -@@ -1092,6 +1098,25 @@ err: - return ret; - } - -+static dict_t * -+mdc_prepare_request(xlator_t *this, mdc_local_t *local, dict_t *xdata) -+{ -+ if (xdata == NULL) { -+ xdata = dict_new(); -+ if (xdata == NULL) { -+ local->update_cache = false; -+ -+ return NULL; -+ } -+ } else { -+ dict_ref(xdata); -+ } -+ -+ local->update_cache = mdc_load_reqs(this, xdata); -+ -+ return xdata; -+} -+ - int - mdc_statfs_cbk(call_frame_t *frame, void *cookie, xlator_t *this, - int32_t op_ret, int32_t op_errno, struct statvfs *buf, -@@ -1201,7 +1226,9 @@ mdc_lookup_cbk(call_frame_t *frame, void *cookie, xlator_t *this, - - if (local->loc.inode) { - mdc_inode_iatt_set(this, local->loc.inode, stbuf, local->incident_time); -- mdc_inode_xatt_set(this, local->loc.inode, dict); -+ if (local->update_cache) { -+ mdc_inode_xatt_set(this, local->loc.inode, dict); -+ } - } - out: - MDC_STACK_UNWIND(lookup, frame, op_ret, op_errno, inode, stbuf, dict, -@@ -1220,7 +1247,6 @@ mdc_lookup(call_frame_t *frame, xlator_t *this, loc_t *loc, dict_t *xdata) - 0, - }; - dict_t *xattr_rsp = NULL; -- dict_t *xattr_alloc = NULL; - mdc_local_t *local = NULL; - struct mdc_conf *conf = this->private; - -@@ -1271,18 +1297,18 @@ mdc_lookup(call_frame_t *frame, xlator_t *this, loc_t *loc, dict_t *xdata) - return 0; - - uncached: -- if (!xdata) -- xdata = xattr_alloc = dict_new(); -- if (xdata) -- mdc_load_reqs(this, xdata); -+ xdata = mdc_prepare_request(this, local, xdata); - - STACK_WIND(frame, mdc_lookup_cbk, FIRST_CHILD(this), - FIRST_CHILD(this)->fops->lookup, loc, xdata); - - if (xattr_rsp) - dict_unref(xattr_rsp); -- if (xattr_alloc) -- dict_unref(xattr_alloc); -+ -+ if (xdata != NULL) { -+ dict_unref(xdata); -+ } -+ - return 0; - } - -@@ -1305,7 +1331,9 @@ mdc_stat_cbk(call_frame_t *frame, void *cookie, xlator_t *this, int32_t op_ret, - } - - mdc_inode_iatt_set(this, local->loc.inode, buf, local->incident_time); -- mdc_inode_xatt_set(this, local->loc.inode, xdata); -+ if (local->update_cache) { -+ mdc_inode_xatt_set(this, local->loc.inode, xdata); -+ } - - out: - MDC_STACK_UNWIND(stat, frame, op_ret, op_errno, buf, xdata); -@@ -1319,7 +1347,6 @@ mdc_stat(call_frame_t *frame, xlator_t *this, loc_t *loc, dict_t *xdata) - int ret; - struct iatt stbuf; - mdc_local_t *local = NULL; -- dict_t *xattr_alloc = NULL; - struct mdc_conf *conf = this->private; - - local = mdc_local_get(frame, loc->inode); -@@ -1343,17 +1370,16 @@ mdc_stat(call_frame_t *frame, xlator_t *this, loc_t *loc, dict_t *xdata) - return 0; - - uncached: -- if (!xdata) -- xdata = xattr_alloc = dict_new(); -- if (xdata) -- mdc_load_reqs(this, xdata); -+ xdata = mdc_prepare_request(this, local, xdata); - - GF_ATOMIC_INC(conf->mdc_counter.stat_miss); - STACK_WIND(frame, mdc_stat_cbk, FIRST_CHILD(this), - FIRST_CHILD(this)->fops->stat, loc, xdata); - -- if (xattr_alloc) -- dict_unref(xattr_alloc); -+ if (xdata != NULL) { -+ dict_unref(xdata); -+ } -+ - return 0; - } - -@@ -1376,7 +1402,9 @@ mdc_fstat_cbk(call_frame_t *frame, void *cookie, xlator_t *this, int32_t op_ret, - } - - mdc_inode_iatt_set(this, local->fd->inode, buf, local->incident_time); -- mdc_inode_xatt_set(this, local->fd->inode, xdata); -+ if (local->update_cache) { -+ mdc_inode_xatt_set(this, local->fd->inode, xdata); -+ } - - out: - MDC_STACK_UNWIND(fstat, frame, op_ret, op_errno, buf, xdata); -@@ -1390,7 +1418,6 @@ mdc_fstat(call_frame_t *frame, xlator_t *this, fd_t *fd, dict_t *xdata) - int ret; - struct iatt stbuf; - mdc_local_t *local = NULL; -- dict_t *xattr_alloc = NULL; - struct mdc_conf *conf = this->private; - - local = mdc_local_get(frame, fd->inode); -@@ -1409,17 +1436,16 @@ mdc_fstat(call_frame_t *frame, xlator_t *this, fd_t *fd, dict_t *xdata) - return 0; - - uncached: -- if (!xdata) -- xdata = xattr_alloc = dict_new(); -- if (xdata) -- mdc_load_reqs(this, xdata); -+ xdata = mdc_prepare_request(this, local, xdata); - - GF_ATOMIC_INC(conf->mdc_counter.stat_miss); - STACK_WIND(frame, mdc_fstat_cbk, FIRST_CHILD(this), - FIRST_CHILD(this)->fops->fstat, fd, xdata); - -- if (xattr_alloc) -- dict_unref(xattr_alloc); -+ if (xdata != NULL) { -+ dict_unref(xdata); -+ } -+ - return 0; - } - -@@ -2393,7 +2419,9 @@ mdc_getxattr_cbk(call_frame_t *frame, void *cookie, xlator_t *this, - goto out; - } - -- mdc_inode_xatt_set(this, local->loc.inode, xdata); -+ if (local->update_cache) { -+ mdc_inode_xatt_set(this, local->loc.inode, xdata); -+ } - - out: - MDC_STACK_UNWIND(getxattr, frame, op_ret, op_errno, xattr, xdata); -@@ -2410,7 +2438,6 @@ mdc_getxattr(call_frame_t *frame, xlator_t *this, loc_t *loc, const char *key, - mdc_local_t *local = NULL; - dict_t *xattr = NULL; - struct mdc_conf *conf = this->private; -- dict_t *xattr_alloc = NULL; - gf_boolean_t key_satisfied = _gf_true; - - local = mdc_local_get(frame, loc->inode); -@@ -2443,18 +2470,17 @@ mdc_getxattr(call_frame_t *frame, xlator_t *this, loc_t *loc, const char *key, - - uncached: - if (key_satisfied) { -- if (!xdata) -- xdata = xattr_alloc = dict_new(); -- if (xdata) -- mdc_load_reqs(this, xdata); -+ xdata = mdc_prepare_request(this, local, xdata); - } - - GF_ATOMIC_INC(conf->mdc_counter.xattr_miss); - STACK_WIND(frame, mdc_getxattr_cbk, FIRST_CHILD(this), - FIRST_CHILD(this)->fops->getxattr, loc, key, xdata); - -- if (xattr_alloc) -- dict_unref(xattr_alloc); -+ if (key_satisfied && (xdata != NULL)) { -+ dict_unref(xdata); -+ } -+ - return 0; - } - -@@ -2481,7 +2507,9 @@ mdc_fgetxattr_cbk(call_frame_t *frame, void *cookie, xlator_t *this, - goto out; - } - -- mdc_inode_xatt_set(this, local->fd->inode, xdata); -+ if (local->update_cache) { -+ mdc_inode_xatt_set(this, local->fd->inode, xdata); -+ } - - out: - MDC_STACK_UNWIND(fgetxattr, frame, op_ret, op_errno, xattr, xdata); -@@ -2498,7 +2526,6 @@ mdc_fgetxattr(call_frame_t *frame, xlator_t *this, fd_t *fd, const char *key, - dict_t *xattr = NULL; - int op_errno = ENODATA; - struct mdc_conf *conf = this->private; -- dict_t *xattr_alloc = NULL; - gf_boolean_t key_satisfied = _gf_true; - - local = mdc_local_get(frame, fd->inode); -@@ -2531,18 +2558,17 @@ mdc_fgetxattr(call_frame_t *frame, xlator_t *this, fd_t *fd, const char *key, - - uncached: - if (key_satisfied) { -- if (!xdata) -- xdata = xattr_alloc = dict_new(); -- if (xdata) -- mdc_load_reqs(this, xdata); -+ xdata = mdc_prepare_request(this, local, xdata); - } - - GF_ATOMIC_INC(conf->mdc_counter.xattr_miss); - STACK_WIND(frame, mdc_fgetxattr_cbk, FIRST_CHILD(this), - FIRST_CHILD(this)->fops->fgetxattr, fd, key, xdata); - -- if (xattr_alloc) -- dict_unref(xattr_alloc); -+ if (key_satisfied && (xdata != NULL)) { -+ dict_unref(xdata); -+ } -+ - return 0; - } - -@@ -2752,27 +2778,22 @@ int - mdc_opendir(call_frame_t *frame, xlator_t *this, loc_t *loc, fd_t *fd, - dict_t *xdata) - { -- dict_t *xattr_alloc = NULL; - mdc_local_t *local = NULL; - - local = mdc_local_get(frame, loc->inode); - - loc_copy(&local->loc, loc); - -- if (!xdata) -- xdata = xattr_alloc = dict_new(); -- -- if (xdata) { -- /* Tell readdir-ahead to include these keys in xdata when it -- * internally issues readdirp() in it's opendir_cbk */ -- mdc_load_reqs(this, xdata); -- } -+ /* Tell readdir-ahead to include these keys in xdata when it -+ * internally issues readdirp() in it's opendir_cbk */ -+ xdata = mdc_prepare_request(this, local, xdata); - - STACK_WIND(frame, mdc_opendir_cbk, FIRST_CHILD(this), - FIRST_CHILD(this)->fops->opendir, loc, fd, xdata); - -- if (xattr_alloc) -- dict_unref(xattr_alloc); -+ if (xdata != NULL) { -+ dict_unref(xdata); -+ } - - return 0; - } -@@ -2800,7 +2821,9 @@ mdc_readdirp_cbk(call_frame_t *frame, void *cookie, xlator_t *this, int op_ret, - continue; - mdc_inode_iatt_set(this, entry->inode, &entry->d_stat, - local->incident_time); -- mdc_inode_xatt_set(this, entry->inode, entry->dict); -+ if (local->update_cache) { -+ mdc_inode_xatt_set(this, entry->inode, entry->dict); -+ } - } - - unwind: -@@ -2812,7 +2835,6 @@ int - mdc_readdirp(call_frame_t *frame, xlator_t *this, fd_t *fd, size_t size, - off_t offset, dict_t *xdata) - { -- dict_t *xattr_alloc = NULL; - mdc_local_t *local = NULL; - - local = mdc_local_get(frame, fd->inode); -@@ -2821,15 +2843,15 @@ mdc_readdirp(call_frame_t *frame, xlator_t *this, fd_t *fd, size_t size, - - local->fd = fd_ref(fd); - -- if (!xdata) -- xdata = xattr_alloc = dict_new(); -- if (xdata) -- mdc_load_reqs(this, xdata); -+ xdata = mdc_prepare_request(this, local, xdata); - - STACK_WIND(frame, mdc_readdirp_cbk, FIRST_CHILD(this), - FIRST_CHILD(this)->fops->readdirp, fd, size, offset, xdata); -- if (xattr_alloc) -- dict_unref(xattr_alloc); -+ -+ if (xdata != NULL) { -+ dict_unref(xdata); -+ } -+ - return 0; - out: - MDC_STACK_UNWIND(readdirp, frame, -1, ENOMEM, NULL, NULL); -@@ -2860,7 +2882,6 @@ int - mdc_readdir(call_frame_t *frame, xlator_t *this, fd_t *fd, size_t size, - off_t offset, dict_t *xdata) - { -- int need_unref = 0; - mdc_local_t *local = NULL; - struct mdc_conf *conf = this->private; - -@@ -2876,19 +2897,14 @@ mdc_readdir(call_frame_t *frame, xlator_t *this, fd_t *fd, size_t size, - return 0; - } - -- if (!xdata) { -- xdata = dict_new(); -- need_unref = 1; -- } -- -- if (xdata) -- mdc_load_reqs(this, xdata); -+ xdata = mdc_prepare_request(this, local, xdata); - - STACK_WIND(frame, mdc_readdirp_cbk, FIRST_CHILD(this), - FIRST_CHILD(this)->fops->readdirp, fd, size, offset, xdata); - -- if (need_unref && xdata) -+ if (xdata != NULL) { - dict_unref(xdata); -+ } - - return 0; - unwind: -@@ -3468,7 +3484,12 @@ mdc_register_xattr_inval(xlator_t *this) - goto out; - } - -- mdc_load_reqs(this, xattr); -+ if (!mdc_load_reqs(this, xattr)) { -+ gf_msg(this->name, GF_LOG_WARNING, ENOMEM, MD_CACHE_MSG_NO_MEMORY, -+ "failed to populate cache entries"); -+ ret = -1; -+ goto out; -+ } - - frame = create_frame(this, this->ctx->pool); - if (!frame) { --- -1.8.3.1 - diff --git a/SOURCES/0419-cluster-afr-fix-race-when-bricks-come-up.patch b/SOURCES/0419-cluster-afr-fix-race-when-bricks-come-up.patch deleted file mode 100644 index ea8c2ea..0000000 --- a/SOURCES/0419-cluster-afr-fix-race-when-bricks-come-up.patch +++ /dev/null @@ -1,104 +0,0 @@ -From b9b479de2a7fd1c5eefa7aa1142e0a39e0c96ca9 Mon Sep 17 00:00:00 2001 -From: Xavi Hernandez -Date: Sun, 1 Mar 2020 19:49:04 +0100 -Subject: [PATCH 419/449] cluster/afr: fix race when bricks come up - -The was a problem when self-heal was sending lookups at the same time -that one of the bricks was coming up. In this case there was a chance -that the number of 'up' bricks changes in the middle of sending the -requests to subvolumes which caused a discrepancy in the expected -number of replies and the actual number of sent requests. - -This discrepancy caused that AFR continued executing requests before -all requests were complete. Eventually, the frame of the pending -request was destroyed when the operation terminated, causing a use- -after-free issue when the answer was finally received. - -In theory the same thing could happen in the reverse way, i.e. AFR -tries to wait for more replies than sent requests, causing a hang. - -Backport of: -> Upstream-patch-link: https://review.gluster.org/24191 -> Change-Id: I7ed6108554ca379d532efb1a29b2de8085410b70 -> Signed-off-by: Xavi Hernandez -> Fixes: bz#1808875 - -BUG: 1794663 -Change-Id: I7ed6108554ca379d532efb1a29b2de8085410b70 -Signed-off-by: Xavi Hernandez -Reviewed-on: https://code.engineering.redhat.com/gerrit/202489 -Tested-by: RHGS Build Bot -Reviewed-by: Sunil Kumar Heggodu Gopala Acharya ---- - xlators/cluster/afr/src/afr-self-heal-common.c | 6 +++--- - xlators/cluster/afr/src/afr-self-heal-name.c | 4 +++- - xlators/cluster/afr/src/afr-self-heal.h | 7 +++++-- - 3 files changed, 11 insertions(+), 6 deletions(-) - -diff --git a/xlators/cluster/afr/src/afr-self-heal-common.c b/xlators/cluster/afr/src/afr-self-heal-common.c -index ce1ea50..d942ccf 100644 ---- a/xlators/cluster/afr/src/afr-self-heal-common.c -+++ b/xlators/cluster/afr/src/afr-self-heal-common.c -@@ -1869,12 +1869,12 @@ int - afr_selfheal_unlocked_discover(call_frame_t *frame, inode_t *inode, uuid_t gfid, - struct afr_reply *replies) - { -- afr_private_t *priv = NULL; -+ afr_local_t *local = NULL; - -- priv = frame->this->private; -+ local = frame->local; - - return afr_selfheal_unlocked_discover_on(frame, inode, gfid, replies, -- priv->child_up); -+ local->child_up); - } - - unsigned int -diff --git a/xlators/cluster/afr/src/afr-self-heal-name.c b/xlators/cluster/afr/src/afr-self-heal-name.c -index 7d4f208..dace071 100644 ---- a/xlators/cluster/afr/src/afr-self-heal-name.c -+++ b/xlators/cluster/afr/src/afr-self-heal-name.c -@@ -560,13 +560,15 @@ afr_selfheal_name_unlocked_inspect(call_frame_t *frame, xlator_t *this, - struct afr_reply *replies = NULL; - inode_t *inode = NULL; - int first_idx = -1; -+ afr_local_t *local = NULL; - - priv = this->private; -+ local = frame->local; - - replies = alloca0(sizeof(*replies) * priv->child_count); - - inode = afr_selfheal_unlocked_lookup_on(frame, parent, bname, replies, -- priv->child_up, NULL); -+ local->child_up, NULL); - if (!inode) - return -ENOMEM; - -diff --git a/xlators/cluster/afr/src/afr-self-heal.h b/xlators/cluster/afr/src/afr-self-heal.h -index 8234cec..f7ecf5d 100644 ---- a/xlators/cluster/afr/src/afr-self-heal.h -+++ b/xlators/cluster/afr/src/afr-self-heal.h -@@ -46,13 +46,16 @@ - afr_local_t *__local = frame->local; \ - afr_private_t *__priv = frame->this->private; \ - int __i = 0; \ -- int __count = AFR_COUNT(list, __priv->child_count); \ -+ int __count = 0; \ -+ unsigned char *__list = alloca(__priv->child_count); \ - \ -+ memcpy(__list, list, sizeof(*__list) * __priv->child_count); \ -+ __count = AFR_COUNT(__list, __priv->child_count); \ - __local->barrier.waitfor = __count; \ - afr_local_replies_wipe(__local, __priv); \ - \ - for (__i = 0; __i < __priv->child_count; __i++) { \ -- if (!list[__i]) \ -+ if (!__list[__i]) \ - continue; \ - STACK_WIND_COOKIE(frame, rfn, (void *)(long)__i, \ - __priv->children[__i], \ --- -1.8.3.1 - diff --git a/SOURCES/0420-scripts-quota_fsck-script-TypeError-d-format-not-dic.patch b/SOURCES/0420-scripts-quota_fsck-script-TypeError-d-format-not-dic.patch deleted file mode 100644 index cb27b33..0000000 --- a/SOURCES/0420-scripts-quota_fsck-script-TypeError-d-format-not-dic.patch +++ /dev/null @@ -1,46 +0,0 @@ -From 42a05c7f8464f529f53bced31a64ea373e16f58b Mon Sep 17 00:00:00 2001 -From: Hari Gowtham -Date: Thu, 24 Oct 2019 17:40:44 +0530 -Subject: [PATCH 420/449] scripts: quota_fsck script TypeError: %d format:not - dict - -Problem: One of the prints in the script have been using -%i as the format for printing which doesn't work. - -Fix: use %s as the format in the place of %i - ->Fixes: bz#1764129 ->Change-Id: I4480ede7bf62906ddedbe5f880a1e89c76946641 ->Signed-off-by: Hari Gowtham ->Upstream patch: https://review.gluster.org/#/c/glusterfs/+/23586/ - -BUG: 1786681 -Change-Id: I4480ede7bf62906ddedbe5f880a1e89c76946641 -Signed-off-by: hari gowtham -Reviewed-on: https://code.engineering.redhat.com/gerrit/202484 -Tested-by: RHGS Build Bot -Reviewed-by: Sunny Kumar ---- - extras/quota/quota_fsck.py | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/extras/quota/quota_fsck.py b/extras/quota/quota_fsck.py -index 485a37a..174f2a2 100755 ---- a/extras/quota/quota_fsck.py -+++ b/extras/quota/quota_fsck.py -@@ -58,10 +58,10 @@ def print_msg(log_type, path, xattr_dict = {}, stbuf = "", dir_size = None): - elif log_type == QUOTA_SIZE_MISMATCH: - print("mismatch") - if dir_size is not None: -- print('%24s %60s %12s %12s' % ("Size Mismatch", path, -+ print('%24s %60s %12s %12s' % ("Size Mismatch", path, - xattr_dict, dir_size)) - else: -- print('%-24s %-60s %-12i %-12i' % ("Size Mismatch", path, xattr_dict, -+ print('%-24s %-60s %-12s %-12s' % ("Size Mismatch", path, xattr_dict, - stbuf.st_size)) - - def size_differs_lot(s1, s2): --- -1.8.3.1 - diff --git a/SOURCES/0421-Improve-logging-in-EC-client-and-lock-translator.patch b/SOURCES/0421-Improve-logging-in-EC-client-and-lock-translator.patch deleted file mode 100644 index 06f0304..0000000 --- a/SOURCES/0421-Improve-logging-in-EC-client-and-lock-translator.patch +++ /dev/null @@ -1,93 +0,0 @@ -From 8267e5e97327633bf21fd02df8d52e3a97f0f9ea Mon Sep 17 00:00:00 2001 -From: Ashish Pandey -Date: Wed, 4 Dec 2019 17:06:18 +0530 -Subject: [PATCH 421/449] Improve logging in EC, client and lock translator - -BUG: 1787294 -> Upstream patch: https://review.gluster.org/#/c/glusterfs/+/23814/ -> Change-Id: I98af8672a25ff9fd9dba91a2e1384719f9155255 -> Fixes: bz#1779760 - -Change-Id: I5cb04993f12d6248f2349a0c5a9e2c0ceecaf528 -Reviewed-on: https://code.engineering.redhat.com/gerrit/202533 -Tested-by: Ashish Pandey -Tested-by: RHGS Build Bot -Reviewed-by: Sunil Kumar Heggodu Gopala Acharya ---- - xlators/cluster/ec/src/ec-combine.c | 5 +++-- - xlators/cluster/ec/src/ec-common.c | 2 +- - xlators/features/locks/src/inodelk.c | 12 ++++++++---- - 3 files changed, 12 insertions(+), 7 deletions(-) - -diff --git a/xlators/cluster/ec/src/ec-combine.c b/xlators/cluster/ec/src/ec-combine.c -index c5af2ab..99e5534 100644 ---- a/xlators/cluster/ec/src/ec-combine.c -+++ b/xlators/cluster/ec/src/ec-combine.c -@@ -179,13 +179,14 @@ ec_iatt_combine(ec_fop_data_t *fop, struct iatt *dst, struct iatt *src, - "links: %u-%u, uid: %u-%u, gid: %u-%u, " - "rdev: %" PRIu64 "-%" PRIu64 ", size: %" PRIu64 "-%" PRIu64 - ", " -- "mode: %o-%o)", -+ "mode: %o-%o), %s", - dst[i].ia_ino, src[i].ia_ino, dst[i].ia_nlink, - src[i].ia_nlink, dst[i].ia_uid, src[i].ia_uid, dst[i].ia_gid, - src[i].ia_gid, dst[i].ia_rdev, src[i].ia_rdev, - dst[i].ia_size, src[i].ia_size, - st_mode_from_ia(dst[i].ia_prot, dst[i].ia_type), -- st_mode_from_ia(src[i].ia_prot, dst[i].ia_type)); -+ st_mode_from_ia(src[i].ia_prot, dst[i].ia_type), -+ ec_msg_str(fop)); - - return 0; - } -diff --git a/xlators/cluster/ec/src/ec-common.c b/xlators/cluster/ec/src/ec-common.c -index 5cae37b..e580bfb 100644 ---- a/xlators/cluster/ec/src/ec-common.c -+++ b/xlators/cluster/ec/src/ec-common.c -@@ -2240,7 +2240,7 @@ ec_unlocked(call_frame_t *frame, void *cookie, xlator_t *this, int32_t op_ret, - - if (op_ret < 0) { - gf_msg(this->name, GF_LOG_WARNING, op_errno, EC_MSG_UNLOCK_FAILED, -- "entry/inode unlocking failed (%s)", ec_fop_name(link->fop->id)); -+ "entry/inode unlocking failed :(%s)", ec_msg_str(link->fop)); - } else { - ec_trace("UNLOCKED", link->fop, "lock=%p", link->lock); - } -diff --git a/xlators/features/locks/src/inodelk.c b/xlators/features/locks/src/inodelk.c -index df00ede..a9c42f1 100644 ---- a/xlators/features/locks/src/inodelk.c -+++ b/xlators/features/locks/src/inodelk.c -@@ -502,22 +502,26 @@ static pl_inode_lock_t * - __inode_unlock_lock(xlator_t *this, pl_inode_lock_t *lock, pl_dom_list_t *dom) - { - pl_inode_lock_t *conf = NULL; -+ inode_t *inode = NULL; -+ -+ inode = lock->pl_inode->inode; - - conf = find_matching_inodelk(lock, dom); - if (!conf) { - gf_log(this->name, GF_LOG_ERROR, - " Matching lock not found for unlock %llu-%llu, by %s " -- "on %p", -+ "on %p for gfid:%s", - (unsigned long long)lock->fl_start, - (unsigned long long)lock->fl_end, lkowner_utoa(&lock->owner), -- lock->client); -+ lock->client, inode ? uuid_utoa(inode->gfid) : "UNKNOWN"); - goto out; - } - __delete_inode_lock(conf); - gf_log(this->name, GF_LOG_DEBUG, -- " Matching lock found for unlock %llu-%llu, by %s on %p", -+ " Matching lock found for unlock %llu-%llu, by %s on %p for gfid:%s", - (unsigned long long)lock->fl_start, (unsigned long long)lock->fl_end, -- lkowner_utoa(&lock->owner), lock->client); -+ lkowner_utoa(&lock->owner), lock->client, -+ inode ? uuid_utoa(inode->gfid) : "UNKNOWN"); - - out: - return conf; --- -1.8.3.1 - diff --git a/SOURCES/0422-cluster-afr-Prioritize-ENOSPC-over-other-errors.patch b/SOURCES/0422-cluster-afr-Prioritize-ENOSPC-over-other-errors.patch deleted file mode 100644 index 400ba67..0000000 --- a/SOURCES/0422-cluster-afr-Prioritize-ENOSPC-over-other-errors.patch +++ /dev/null @@ -1,236 +0,0 @@ -From 8b11ac1575ef167af2a47a96f7b7ed0f32bb5897 Mon Sep 17 00:00:00 2001 -From: karthik-us -Date: Fri, 5 Jun 2020 17:20:04 +0530 -Subject: [PATCH 422/449] cluster/afr: Prioritize ENOSPC over other errors - -Backport of: https://review.gluster.org/#/c/glusterfs/+/24477/ - -Problem: -In a replicate/arbiter volume if file creations or writes fails on -quorum number of bricks and on one brick it is due to ENOSPC and -on other brick it fails for a different reason, it may fail with -errors other than ENOSPC in some cases. - -Fix: -Prioritize ENOSPC over other lesser priority errors and do not set -op_errno in posix_gfid_set if op_ret is 0 to avoid receiving any -error_no which can be misinterpreted by __afr_dir_write_finalize(). - -Also removing the function afr_has_arbiter_fop_cbk_quorum() which -might consider a successful reply form a single brick as quorum -success in some cases, whereas we always need fop to be successful -on quorum number of bricks in arbiter configuration. - -Change-Id: I4dd2bff17e6812bc7c8372130976e365e2407d88 -Signed-off-by: karthik-us -BUG: 1837467 -Reviewed-on: https://code.engineering.redhat.com/gerrit/202526 -Tested-by: RHGS Build Bot -Reviewed-by: Sunil Kumar Heggodu Gopala Acharya ---- - .../bugs/replicate/issue-1254-prioritize-enospc.t | 80 ++++++++++++++++++++++ - xlators/cluster/afr/src/afr-common.c | 4 +- - xlators/cluster/afr/src/afr-transaction.c | 48 +------------ - xlators/storage/posix/src/posix-helpers.c | 2 +- - 4 files changed, 86 insertions(+), 48 deletions(-) - create mode 100644 tests/bugs/replicate/issue-1254-prioritize-enospc.t - -diff --git a/tests/bugs/replicate/issue-1254-prioritize-enospc.t b/tests/bugs/replicate/issue-1254-prioritize-enospc.t -new file mode 100644 -index 0000000..fab94b7 ---- /dev/null -+++ b/tests/bugs/replicate/issue-1254-prioritize-enospc.t -@@ -0,0 +1,80 @@ -+#!/bin/bash -+ -+. $(dirname $0)/../../include.rc -+. $(dirname $0)/../../volume.rc -+ -+cleanup -+ -+function create_bricks { -+ TEST truncate -s 100M $B0/brick0 -+ TEST truncate -s 100M $B0/brick1 -+ TEST truncate -s 20M $B0/brick2 -+ LO1=`SETUP_LOOP $B0/brick0` -+ TEST [ $? -eq 0 ] -+ TEST MKFS_LOOP $LO1 -+ LO2=`SETUP_LOOP $B0/brick1` -+ TEST [ $? -eq 0 ] -+ TEST MKFS_LOOP $LO2 -+ LO3=`SETUP_LOOP $B0/brick2` -+ TEST [ $? -eq 0 ] -+ TEST MKFS_LOOP $LO3 -+ TEST mkdir -p $B0/${V0}0 $B0/${V0}1 $B0/${V0}2 -+ TEST MOUNT_LOOP $LO1 $B0/${V0}0 -+ TEST MOUNT_LOOP $LO2 $B0/${V0}1 -+ TEST MOUNT_LOOP $LO3 $B0/${V0}2 -+} -+ -+function create_files { -+ local i=1 -+ while (true) -+ do -+ touch $M0/file$i -+ if [ -e $B0/${V0}2/file$i ]; -+ then -+ ((i++)) -+ else -+ break -+ fi -+ done -+} -+ -+TESTS_EXPECTED_IN_LOOP=13 -+ -+#Arbiter volume: Check for ENOSPC when arbiter brick becomes full# -+TEST glusterd -+create_bricks -+TEST $CLI volume create $V0 replica 3 arbiter 1 $H0:$B0/${V0}{0,1,2} -+TEST $CLI volume start $V0 -+TEST $CLI volume set $V0 performance.write-behind off -+TEST $GFS --volfile-server=$H0 --volfile-id=$V0 $M0 -+ -+create_files -+TEST kill_brick $V0 $H0 $B0/${V0}1 -+error1=$(touch $M0/file-1 2>&1) -+EXPECT "No space left on device" echo $error1 -+error2=$(mkdir $M0/dir-1 2>&1) -+EXPECT "No space left on device" echo $error2 -+error3=$((echo "Test" > $M0/file-3) 2>&1) -+EXPECT "No space left on device" echo $error3 -+ -+cleanup -+ -+#Replica-3 volume: Check for ENOSPC when one of the brick becomes full# -+#Keeping the third brick of lower size to simulate disk full scenario# -+TEST glusterd -+create_bricks -+TEST $CLI volume create $V0 replica 3 $H0:$B0/${V0}{0,1,2} -+TEST $CLI volume start $V0 -+TEST $CLI volume set $V0 performance.write-behind off -+TEST $GFS --volfile-server=$H0 --volfile-id=$V0 $M0 -+ -+create_files -+TEST kill_brick $V0 $H0 $B0/${V0}1 -+error1=$(touch $M0/file-1 2>&1) -+EXPECT "No space left on device" echo $error1 -+error2=$(mkdir $M0/dir-1 2>&1) -+EXPECT "No space left on device" echo $error2 -+error3=$((cat /dev/zero > $M0/file1) 2>&1) -+EXPECT "No space left on device" echo $error3 -+ -+cleanup -diff --git a/xlators/cluster/afr/src/afr-common.c b/xlators/cluster/afr/src/afr-common.c -index 5806556..59710aa 100644 ---- a/xlators/cluster/afr/src/afr-common.c -+++ b/xlators/cluster/afr/src/afr-common.c -@@ -2464,7 +2464,7 @@ error: - * others in that they must be given higher priority while - * returning to the user. - * -- * The hierarchy is ENODATA > ENOENT > ESTALE > others -+ * The hierarchy is ENODATA > ENOENT > ESTALE > ENOSPC others - */ - - int -@@ -2476,6 +2476,8 @@ afr_higher_errno(int32_t old_errno, int32_t new_errno) - return ENOENT; - if (old_errno == ESTALE || new_errno == ESTALE) - return ESTALE; -+ if (old_errno == ENOSPC || new_errno == ENOSPC) -+ return ENOSPC; - - return new_errno; - } -diff --git a/xlators/cluster/afr/src/afr-transaction.c b/xlators/cluster/afr/src/afr-transaction.c -index 15f3a7e..8e65ae2 100644 ---- a/xlators/cluster/afr/src/afr-transaction.c -+++ b/xlators/cluster/afr/src/afr-transaction.c -@@ -514,42 +514,6 @@ afr_compute_pre_op_sources(call_frame_t *frame, xlator_t *this) - local->transaction.pre_op_sources[j] = 0; - } - --gf_boolean_t --afr_has_arbiter_fop_cbk_quorum(call_frame_t *frame) --{ -- afr_local_t *local = NULL; -- afr_private_t *priv = NULL; -- xlator_t *this = NULL; -- gf_boolean_t fop_failed = _gf_false; -- unsigned char *pre_op_sources = NULL; -- int i = 0; -- -- local = frame->local; -- this = frame->this; -- priv = this->private; -- pre_op_sources = local->transaction.pre_op_sources; -- -- /* If the fop failed on the brick, it is not a source. */ -- for (i = 0; i < priv->child_count; i++) -- if (local->transaction.failed_subvols[i]) -- pre_op_sources[i] = 0; -- -- switch (AFR_COUNT(pre_op_sources, priv->child_count)) { -- case 1: -- if (pre_op_sources[ARBITER_BRICK_INDEX]) -- fop_failed = _gf_true; -- break; -- case 0: -- fop_failed = _gf_true; -- break; -- } -- -- if (fop_failed) -- return _gf_false; -- -- return _gf_true; --} -- - void - afr_txn_arbitrate_fop(call_frame_t *frame, xlator_t *this) - { -@@ -968,12 +932,8 @@ afr_need_dirty_marking(call_frame_t *frame, xlator_t *this) - priv->child_count) - return _gf_false; - -- if (priv->arbiter_count) { -- if (!afr_has_arbiter_fop_cbk_quorum(frame)) -- need_dirty = _gf_true; -- } else if (!afr_has_fop_cbk_quorum(frame)) { -+ if (!afr_has_fop_cbk_quorum(frame)) - need_dirty = _gf_true; -- } - - return need_dirty; - } -@@ -1023,12 +983,8 @@ afr_handle_quorum(call_frame_t *frame, xlator_t *this) - * no split-brain with the fix. The problem is eliminated completely. - */ - -- if (priv->arbiter_count) { -- if (afr_has_arbiter_fop_cbk_quorum(frame)) -- return; -- } else if (afr_has_fop_cbk_quorum(frame)) { -+ if (afr_has_fop_cbk_quorum(frame)) - return; -- } - - if (afr_need_dirty_marking(frame, this)) - goto set_response; -diff --git a/xlators/storage/posix/src/posix-helpers.c b/xlators/storage/posix/src/posix-helpers.c -index 2c27d22..949c799 100644 ---- a/xlators/storage/posix/src/posix-helpers.c -+++ b/xlators/storage/posix/src/posix-helpers.c -@@ -1059,7 +1059,7 @@ verify_handle: - ret = posix_handle_soft(this, path, loc, uuid_curr, &stat); - - out: -- if (!(*op_errno)) -+ if (ret && !(*op_errno)) - *op_errno = errno; - return ret; - } --- -1.8.3.1 - diff --git a/SOURCES/0423-ctime-Fix-ctime-inconsisteny-with-utimensat.patch b/SOURCES/0423-ctime-Fix-ctime-inconsisteny-with-utimensat.patch deleted file mode 100644 index 6a547ea..0000000 --- a/SOURCES/0423-ctime-Fix-ctime-inconsisteny-with-utimensat.patch +++ /dev/null @@ -1,128 +0,0 @@ -From c140d30382306d08eaf2bc5c53e5be26d3e381e1 Mon Sep 17 00:00:00 2001 -From: Kotresh HR -Date: Mon, 18 Nov 2019 05:24:33 -0500 -Subject: [PATCH 423/449] ctime: Fix ctime inconsisteny with utimensat - -Problem: -When touch is used to create a file, the ctime is not matching -atime and mtime which ideally should match. There is a difference -in nano seconds. - -Cause: -When touch is used modify atime or mtime to current time (UTIME_NOW), -the current time is taken from kernel. The ctime gets updated to current -time when atime or mtime is updated. But the current time to update -ctime is taken from utime xlator. Hence the difference in nano seconds. - -Fix: -When utimesat uses UTIME_NOW, use the current time from kernel. - ->fixes: bz#1773530 ->Change-Id: I9ccfa47dcd39df23396852b4216f1773c49250ce ->Signed-off-by: Kotresh HR - -backport of: https://review.gluster.org/#/c/glusterfs/+/23719/ -BUG: 1761932 -Change-Id: I9ccfa47dcd39df23396852b4216f1773c49250ce -Signed-off-by: Kotresh HR -Reviewed-on: https://code.engineering.redhat.com/gerrit/202541 -Tested-by: RHGS Build Bot -Reviewed-by: Sunil Kumar Heggodu Gopala Acharya ---- - libglusterfs/src/glusterfs/xlator.h | 2 ++ - tests/basic/ctime/ctime-utimesat.t | 28 ++++++++++++++++++++++++++ - xlators/features/utime/src/utime-gen-fops-c.py | 10 +++++++++ - xlators/mount/fuse/src/fuse-bridge.c | 8 ++++++++ - 4 files changed, 48 insertions(+) - create mode 100644 tests/basic/ctime/ctime-utimesat.t - -diff --git a/libglusterfs/src/glusterfs/xlator.h b/libglusterfs/src/glusterfs/xlator.h -index da551e9..db04c4d 100644 ---- a/libglusterfs/src/glusterfs/xlator.h -+++ b/libglusterfs/src/glusterfs/xlator.h -@@ -35,6 +35,8 @@ - #define GF_SET_ATTR_ATIME 0x10 - #define GF_SET_ATTR_MTIME 0x20 - #define GF_SET_ATTR_CTIME 0x40 -+#define GF_ATTR_ATIME_NOW 0x80 -+#define GF_ATTR_MTIME_NOW 0x100 - - #define gf_attr_mode_set(mode) ((mode)&GF_SET_ATTR_MODE) - #define gf_attr_uid_set(mode) ((mode)&GF_SET_ATTR_UID) -diff --git a/tests/basic/ctime/ctime-utimesat.t b/tests/basic/ctime/ctime-utimesat.t -new file mode 100644 -index 0000000..540e57a ---- /dev/null -+++ b/tests/basic/ctime/ctime-utimesat.t -@@ -0,0 +1,28 @@ -+#!/bin/bash -+. $(dirname $0)/../../include.rc -+. $(dirname $0)/../../volume.rc -+. $(dirname $0)/../../afr.rc -+cleanup; -+ -+TEST glusterd -+TEST pidof glusterd -+TEST $CLI volume create $V0 replica 3 $H0:$B0/${V0}{0,1,2} -+TEST $CLI volume set $V0 performance.stat-prefetch off -+TEST $CLI volume set $V0 performance.read-ahead off -+TEST $CLI volume set $V0 performance.quick-read off -+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 start $V0 -+ -+TEST glusterfs --volfile-id=$V0 --volfile-server=$H0 --entry-timeout=0 $M0; -+ -+touch $M0/FILE -+ -+atime=$(stat -c "%.X" $M0/FILE) -+EXPECT $atime stat -c "%.Y" $M0/FILE -+EXPECT $atime stat -c "%.Z" $M0/FILE -+ -+cleanup -diff --git a/xlators/features/utime/src/utime-gen-fops-c.py b/xlators/features/utime/src/utime-gen-fops-c.py -index 8730a51..9fb3e1b 100755 ---- a/xlators/features/utime/src/utime-gen-fops-c.py -+++ b/xlators/features/utime/src/utime-gen-fops-c.py -@@ -95,6 +95,16 @@ gf_utime_@NAME@ (call_frame_t *frame, xlator_t *this, - frame->root->flags |= MDATA_CTIME; - } - -+ if (valid & (GF_SET_ATTR_ATIME | GF_SET_ATTR_MTIME)) { -+ if (valid & GF_ATTR_ATIME_NOW) { -+ frame->root->ctime.tv_sec = stbuf->ia_atime; -+ frame->root->ctime.tv_nsec = stbuf->ia_atime_nsec; -+ } else if (valid & GF_ATTR_MTIME_NOW) { -+ frame->root->ctime.tv_sec = stbuf->ia_mtime; -+ frame->root->ctime.tv_nsec = stbuf->ia_mtime_nsec; -+ } -+ } -+ - STACK_WIND (frame, gf_utime_@NAME@_cbk, FIRST_CHILD(this), - FIRST_CHILD(this)->fops->@NAME@, @SHORT_ARGS@); - return 0; -diff --git a/xlators/mount/fuse/src/fuse-bridge.c b/xlators/mount/fuse/src/fuse-bridge.c -index 6e99053..fdeec49 100644 ---- a/xlators/mount/fuse/src/fuse-bridge.c -+++ b/xlators/mount/fuse/src/fuse-bridge.c -@@ -1706,6 +1706,14 @@ fattr_to_gf_set_attr(int32_t valid) - gf_valid |= GF_SET_ATTR_CTIME; - #endif - -+#if FUSE_KERNEL_MINOR_VERSION >= 9 -+ if (valid & FATTR_ATIME_NOW) -+ gf_valid |= GF_ATTR_ATIME_NOW; -+ -+ if (valid & FATTR_MTIME_NOW) -+ gf_valid |= GF_ATTR_MTIME_NOW; -+#endif -+ - if (valid & FATTR_SIZE) - gf_valid |= GF_SET_ATTR_SIZE; - --- -1.8.3.1 - diff --git a/SOURCES/0424-afr-make-heal-info-lockless.patch b/SOURCES/0424-afr-make-heal-info-lockless.patch deleted file mode 100644 index 593fa34..0000000 --- a/SOURCES/0424-afr-make-heal-info-lockless.patch +++ /dev/null @@ -1,884 +0,0 @@ -From 54d4ea44fec96560aad9c41f7e4f5aad164ffb8b Mon Sep 17 00:00:00 2001 -From: Ravishankar N -Date: Fri, 5 Jun 2020 14:14:15 +0530 -Subject: [PATCH 424/449] afr: make heal info lockless - -Changes in locks xlator: -Added support for per-domain inodelk count requests. -Caller needs to set GLUSTERFS_MULTIPLE_DOM_LK_CNT_REQUESTS key in the -dict and then set each key with name -'GLUSTERFS_INODELK_DOM_PREFIX:'. -In the response dict, the xlator will send the per domain count as -values for each of these keys. - -Changes in AFR: -Replaced afr_selfheal_locked_inspect() with afr_lockless_inspect(). Logic has -been added to make the latter behave same as the former, thus not -breaking the current heal info output behaviour. - -> Upstream patch: https://review.gluster.org/#/c/glusterfs/+/23771/ -> fixes: bz#1774011 -> Change-Id: Ie9e83c162aa77f44a39c2ba7115de558120ada4d - -BUG: 1721355 -Change-Id: I8ed4b504880b19e00068312efd90cd0706787404 -Signed-off-by: Ravishankar N -Reviewed-on: https://code.engineering.redhat.com/gerrit/202490 -Tested-by: RHGS Build Bot -Reviewed-by: Karthik Subrahmanya -Reviewed-by: Sunil Kumar Heggodu Gopala Acharya ---- - heal/src/glfs-heal.c | 17 +- - libglusterfs/src/glusterfs/glusterfs.h | 2 + - xlators/cluster/afr/src/afr-common.c | 367 +++++++++++-------------- - xlators/cluster/afr/src/afr-self-heal-common.c | 43 ++- - xlators/cluster/afr/src/afr-self-heal.h | 3 +- - xlators/features/locks/src/common.h | 4 + - xlators/features/locks/src/locks.h | 8 + - xlators/features/locks/src/posix.c | 117 +++++++- - 8 files changed, 338 insertions(+), 223 deletions(-) - -diff --git a/heal/src/glfs-heal.c b/heal/src/glfs-heal.c -index 125b12c..5af9e31 100644 ---- a/heal/src/glfs-heal.c -+++ b/heal/src/glfs-heal.c -@@ -775,7 +775,8 @@ static int - glfsh_process_entries(xlator_t *xl, fd_t *fd, gf_dirent_t *entries, - uint64_t *offset, num_entries_t *num_entries, - print_status glfsh_print_status, -- gf_boolean_t ignore_dirty, glfsh_fail_mode_t mode) -+ gf_boolean_t ignore_dirty, glfsh_fail_mode_t mode, -+ dict_t *xattr_req) - { - gf_dirent_t *entry = NULL; - gf_dirent_t *tmp = NULL; -@@ -807,7 +808,7 @@ glfsh_process_entries(xlator_t *xl, fd_t *fd, gf_dirent_t *entries, - - gf_uuid_parse(entry->d_name, gfid); - gf_uuid_copy(loc.gfid, gfid); -- ret = syncop_getxattr(this, &loc, &dict, GF_HEAL_INFO, NULL, NULL); -+ ret = syncop_getxattr(this, &loc, &dict, GF_HEAL_INFO, xattr_req, NULL); - if (ret) { - if ((mode != GLFSH_MODE_CONTINUE_ON_ERROR) && (ret == -ENOTCONN)) - goto out; -@@ -876,19 +877,19 @@ glfsh_crawl_directory(glfs_t *fs, xlator_t *top_subvol, loc_t *rootloc, - if (heal_op == GF_SHD_OP_INDEX_SUMMARY) { - ret = glfsh_process_entries(readdir_xl, fd, &entries, &offset, - num_entries, glfsh_print_heal_status, -- ignore, mode); -+ ignore, mode, xattr_req); - if (ret < 0) - goto out; - } else if (heal_op == GF_SHD_OP_SPLIT_BRAIN_FILES) { - ret = glfsh_process_entries(readdir_xl, fd, &entries, &offset, - num_entries, glfsh_print_spb_status, -- ignore, mode); -+ ignore, mode, xattr_req); - if (ret < 0) - goto out; - } else if (heal_op == GF_SHD_OP_HEAL_SUMMARY) { - ret = glfsh_process_entries(readdir_xl, fd, &entries, &offset, - num_entries, glfsh_print_summary_status, -- ignore, mode); -+ ignore, mode, xattr_req); - if (ret < 0) - goto out; - } else if (heal_op == GF_SHD_OP_SBRAIN_HEAL_FROM_BRICK) { -@@ -897,7 +898,7 @@ glfsh_crawl_directory(glfs_t *fs, xlator_t *top_subvol, loc_t *rootloc, - } else if (heal_op == GF_SHD_OP_GRANULAR_ENTRY_HEAL_ENABLE) { - ret = glfsh_process_entries(readdir_xl, fd, &entries, &offset, - num_entries, glfsh_heal_status_boolean, -- ignore, mode); -+ ignore, mode, xattr_req); - if (ret < 0) - goto out; - } -@@ -951,6 +952,10 @@ glfsh_print_pending_heals_type(glfs_t *fs, xlator_t *top_subvol, loc_t *rootloc, - int32_t op_errno = 0; - gf_boolean_t ignore = _gf_false; - -+ ret = dict_set_str(xattr_req, "index-vgfid", vgfid); -+ if (ret) -+ return ret; -+ - if (!strcmp(vgfid, GF_XATTROP_DIRTY_GFID)) - ignore = _gf_true; - -diff --git a/libglusterfs/src/glusterfs/glusterfs.h b/libglusterfs/src/glusterfs/glusterfs.h -index 3b594c0..177a020 100644 ---- a/libglusterfs/src/glusterfs/glusterfs.h -+++ b/libglusterfs/src/glusterfs/glusterfs.h -@@ -217,6 +217,8 @@ enum gf_internal_fop_indicator { - #define GLUSTERFS_POSIXLK_COUNT "glusterfs.posixlk-count" - #define GLUSTERFS_PARENT_ENTRYLK "glusterfs.parent-entrylk" - #define GLUSTERFS_INODELK_DOM_COUNT "glusterfs.inodelk-dom-count" -+#define GLUSTERFS_INODELK_DOM_PREFIX "glusterfs.inodelk-dom-prefix" -+#define GLUSTERFS_MULTIPLE_DOM_LK_CNT_REQUESTS "glusterfs.multi-dom-lk-cnt-req" - #define GFID_TO_PATH_KEY "glusterfs.gfid2path" - #define GF_XATTR_STIME_PATTERN "trusted.glusterfs.*.stime" - #define GF_XATTR_XTIME_PATTERN "trusted.glusterfs.*.xtime" -diff --git a/xlators/cluster/afr/src/afr-common.c b/xlators/cluster/afr/src/afr-common.c -index 59710aa..c355ec5 100644 ---- a/xlators/cluster/afr/src/afr-common.c -+++ b/xlators/cluster/afr/src/afr-common.c -@@ -5908,259 +5908,218 @@ out: - return _gf_true; - } - --int --afr_selfheal_locked_metadata_inspect(call_frame_t *frame, xlator_t *this, -- inode_t *inode, gf_boolean_t *msh, -- unsigned char *pending) -+static dict_t * -+afr_set_heal_info(char *status) - { -+ dict_t *dict = NULL; - int ret = -1; -- unsigned char *locked_on = NULL; -- unsigned char *sources = NULL; -- unsigned char *sinks = NULL; -- unsigned char *healed_sinks = NULL; -- unsigned char *undid_pending = NULL; -- struct afr_reply *locked_replies = NULL; -- -- afr_private_t *priv = this->private; - -- locked_on = alloca0(priv->child_count); -- sources = alloca0(priv->child_count); -- sinks = alloca0(priv->child_count); -- healed_sinks = alloca0(priv->child_count); -- undid_pending = alloca0(priv->child_count); -+ dict = dict_new(); -+ if (!dict) { -+ ret = -ENOMEM; -+ goto out; -+ } - -- locked_replies = alloca0(sizeof(*locked_replies) * priv->child_count); -+ ret = dict_set_dynstr_sizen(dict, "heal-info", status); -+ if (ret) -+ gf_msg("", GF_LOG_WARNING, -ret, AFR_MSG_DICT_SET_FAILED, -+ "Failed to set heal-info key to " -+ "%s", -+ status); -+out: -+ /* Any error other than EINVAL, dict_set_dynstr frees status */ -+ if (ret == -ENOMEM || ret == -EINVAL) { -+ GF_FREE(status); -+ } - -- ret = afr_selfheal_inodelk(frame, this, inode, this->name, LLONG_MAX - 1, 0, -- locked_on); -- { -- if (ret == 0) { -- /* Not a single lock */ -- ret = -afr_final_errno(frame->local, priv); -- if (ret == 0) -- ret = -ENOTCONN; /* all invalid responses */ -- goto out; -- } -- ret = __afr_selfheal_metadata_prepare( -- frame, this, inode, locked_on, sources, sinks, healed_sinks, -- undid_pending, locked_replies, pending); -- *msh = afr_decide_heal_info(priv, sources, ret); -+ if (ret && dict) { -+ dict_unref(dict); -+ dict = NULL; - } -- afr_selfheal_uninodelk(frame, this, inode, this->name, LLONG_MAX - 1, 0, -- locked_on); --out: -- if (locked_replies) -- afr_replies_wipe(locked_replies, priv->child_count); -- return ret; -+ return dict; - } - --int --afr_selfheal_locked_data_inspect(call_frame_t *frame, xlator_t *this, fd_t *fd, -- gf_boolean_t *dsh, unsigned char *pflag) -+static gf_boolean_t -+afr_is_dirty_count_non_unary_for_txn(xlator_t *this, struct afr_reply *replies, -+ afr_transaction_type type) - { -- int ret = -1; -- unsigned char *data_lock = NULL; -- unsigned char *sources = NULL; -- unsigned char *sinks = NULL; -- unsigned char *healed_sinks = NULL; -- unsigned char *undid_pending = NULL; -- afr_private_t *priv = NULL; -- struct afr_reply *locked_replies = NULL; -- inode_t *inode = fd->inode; -+ afr_private_t *priv = this->private; -+ int *dirty = alloca0(priv->child_count * sizeof(int)); -+ int i = 0; - -- priv = this->private; -- data_lock = alloca0(priv->child_count); -- sources = alloca0(priv->child_count); -- sinks = alloca0(priv->child_count); -- healed_sinks = alloca0(priv->child_count); -- undid_pending = alloca0(priv->child_count); -+ afr_selfheal_extract_xattr(this, replies, type, dirty, NULL); -+ for (i = 0; i < priv->child_count; i++) { -+ if (dirty[i] > 1) -+ return _gf_true; -+ } - -- locked_replies = alloca0(sizeof(*locked_replies) * priv->child_count); -+ return _gf_false; -+} - -- ret = afr_selfheal_inodelk(frame, this, inode, this->name, 0, 0, data_lock); -- { -- if (ret == 0) { -- ret = -afr_final_errno(frame->local, priv); -- if (ret == 0) -- ret = -ENOTCONN; /* all invalid responses */ -- goto out; -- } -- ret = __afr_selfheal_data_prepare(frame, this, inode, data_lock, -- sources, sinks, healed_sinks, -- undid_pending, locked_replies, pflag); -- *dsh = afr_decide_heal_info(priv, sources, ret); -+static gf_boolean_t -+afr_is_dirty_count_non_unary(xlator_t *this, struct afr_reply *replies, -+ ia_type_t ia_type) -+{ -+ gf_boolean_t data_chk = _gf_false; -+ gf_boolean_t mdata_chk = _gf_false; -+ gf_boolean_t entry_chk = _gf_false; -+ -+ switch (ia_type) { -+ case IA_IFDIR: -+ mdata_chk = _gf_true; -+ entry_chk = _gf_true; -+ break; -+ case IA_IFREG: -+ mdata_chk = _gf_true; -+ data_chk = _gf_true; -+ break; -+ default: -+ /*IA_IFBLK, IA_IFCHR, IA_IFLNK, IA_IFIFO, IA_IFSOCK*/ -+ mdata_chk = _gf_true; -+ break; - } -- afr_selfheal_uninodelk(frame, this, inode, this->name, 0, 0, data_lock); --out: -- if (locked_replies) -- afr_replies_wipe(locked_replies, priv->child_count); -- return ret; -+ -+ if (data_chk && afr_is_dirty_count_non_unary_for_txn( -+ this, replies, AFR_DATA_TRANSACTION)) { -+ return _gf_true; -+ } else if (mdata_chk && afr_is_dirty_count_non_unary_for_txn( -+ this, replies, AFR_METADATA_TRANSACTION)) { -+ return _gf_true; -+ } else if (entry_chk && afr_is_dirty_count_non_unary_for_txn( -+ this, replies, AFR_ENTRY_TRANSACTION)) { -+ return _gf_true; -+ } -+ -+ return _gf_false; - } - --int --afr_selfheal_locked_entry_inspect(call_frame_t *frame, xlator_t *this, -- inode_t *inode, gf_boolean_t *esh, -- unsigned char *pflag) -+static int -+afr_update_heal_status(xlator_t *this, struct afr_reply *replies, -+ char *index_vgfid, ia_type_t ia_type, gf_boolean_t *esh, -+ gf_boolean_t *dsh, gf_boolean_t *msh) - { - int ret = -1; -- int source = -1; -+ GF_UNUSED int ret1 = 0; -+ int i = 0; -+ int io_domain_lk_count = 0; -+ int shd_domain_lk_count = 0; - afr_private_t *priv = NULL; -- unsigned char *locked_on = NULL; -- unsigned char *data_lock = NULL; -- unsigned char *sources = NULL; -- unsigned char *sinks = NULL; -- unsigned char *healed_sinks = NULL; -- struct afr_reply *locked_replies = NULL; -- gf_boolean_t granular_locks = _gf_false; -+ char *key1 = NULL; -+ char *key2 = NULL; - - priv = this->private; -- granular_locks = priv->granular_locks; /*Assign to local variable so that -- reconfigure doesn't change this -- value between locking and unlocking -- below*/ -- locked_on = alloca0(priv->child_count); -- data_lock = alloca0(priv->child_count); -- sources = alloca0(priv->child_count); -- sinks = alloca0(priv->child_count); -- healed_sinks = alloca0(priv->child_count); -- -- locked_replies = alloca0(sizeof(*locked_replies) * priv->child_count); -+ key1 = alloca0(strlen(GLUSTERFS_INODELK_DOM_PREFIX) + 2 + -+ strlen(this->name)); -+ key2 = alloca0(strlen(GLUSTERFS_INODELK_DOM_PREFIX) + 2 + -+ strlen(priv->sh_domain)); -+ sprintf(key1, "%s:%s", GLUSTERFS_INODELK_DOM_PREFIX, this->name); -+ sprintf(key2, "%s:%s", GLUSTERFS_INODELK_DOM_PREFIX, priv->sh_domain); - -- if (!granular_locks) { -- ret = afr_selfheal_tryentrylk(frame, this, inode, priv->sh_domain, NULL, -- locked_on); -- } -- { -- if (!granular_locks && ret == 0) { -- ret = -afr_final_errno(frame->local, priv); -- if (ret == 0) -- ret = -ENOTCONN; /* all invalid responses */ -- goto out; -+ for (i = 0; i < priv->child_count; i++) { -+ if ((replies[i].valid != 1) || (replies[i].op_ret != 0)) -+ continue; -+ if (!io_domain_lk_count) { -+ ret1 = dict_get_int32(replies[i].xdata, key1, &io_domain_lk_count); - } -+ if (!shd_domain_lk_count) { -+ ret1 = dict_get_int32(replies[i].xdata, key2, &shd_domain_lk_count); -+ } -+ } - -- ret = afr_selfheal_entrylk(frame, this, inode, this->name, NULL, -- data_lock); -- { -- if (ret == 0) { -- ret = -afr_final_errno(frame->local, priv); -- if (ret == 0) -- ret = -ENOTCONN; -- /* all invalid responses */ -- goto unlock; -- } -- ret = __afr_selfheal_entry_prepare(frame, this, inode, data_lock, -- sources, sinks, healed_sinks, -- locked_replies, &source, pflag); -- if ((ret == 0) && (*pflag & PFLAG_SBRAIN)) -- ret = -EIO; -- *esh = afr_decide_heal_info(priv, sources, ret); -+ if (!strcmp(index_vgfid, GF_XATTROP_INDEX_GFID)) { -+ if (shd_domain_lk_count) { -+ ret = -EAGAIN; /*For 'possibly-healing'. */ -+ } else { -+ ret = 0; /*needs heal. Just set a non -ve value so that it is -+ assumed as the source index.*/ -+ } -+ } else if (!strcmp(index_vgfid, GF_XATTROP_DIRTY_GFID)) { -+ if ((afr_is_dirty_count_non_unary(this, replies, ia_type)) || -+ (!io_domain_lk_count)) { -+ /* Needs heal. */ -+ ret = 0; -+ } else { -+ /* No heal needed. */ -+ *dsh = *esh = *msh = 0; - } -- afr_selfheal_unentrylk(frame, this, inode, this->name, NULL, data_lock, -- NULL); - } --unlock: -- if (!granular_locks) -- afr_selfheal_unentrylk(frame, this, inode, priv->sh_domain, NULL, -- locked_on, NULL); --out: -- if (locked_replies) -- afr_replies_wipe(locked_replies, priv->child_count); - return ret; - } - -+/*return EIO, EAGAIN or pending*/ - int --afr_selfheal_locked_inspect(call_frame_t *frame, xlator_t *this, uuid_t gfid, -- inode_t **inode, gf_boolean_t *entry_selfheal, -- gf_boolean_t *data_selfheal, -- gf_boolean_t *metadata_selfheal, -- unsigned char *pending) -- -+afr_lockless_inspect(call_frame_t *frame, xlator_t *this, uuid_t gfid, -+ inode_t **inode, char *index_vgfid, -+ gf_boolean_t *entry_selfheal, gf_boolean_t *data_selfheal, -+ gf_boolean_t *metadata_selfheal, unsigned char *pending) - { - int ret = -1; -- fd_t *fd = NULL; -+ int i = 0; -+ afr_private_t *priv = NULL; -+ struct afr_reply *replies = NULL; - gf_boolean_t dsh = _gf_false; - gf_boolean_t msh = _gf_false; - gf_boolean_t esh = _gf_false; -+ unsigned char *sources = NULL; -+ unsigned char *sinks = NULL; -+ unsigned char *valid_on = NULL; -+ uint64_t *witness = NULL; -+ -+ priv = this->private; -+ replies = alloca0(sizeof(*replies) * priv->child_count); -+ sources = alloca0(sizeof(*sources) * priv->child_count); -+ sinks = alloca0(sizeof(*sinks) * priv->child_count); -+ witness = alloca0(sizeof(*witness) * priv->child_count); -+ valid_on = alloca0(sizeof(*valid_on) * priv->child_count); - - ret = afr_selfheal_unlocked_inspect(frame, this, gfid, inode, &dsh, &msh, -- &esh); -+ &esh, replies); - if (ret) - goto out; -- -- /* For every heal type hold locks and check if it indeed needs heal */ -- -- /* Heal-info does an open() on the file being examined so that the -- * current eager-lock holding client, if present, at some point sees -- * open-fd count being > 1 and releases the eager-lock so that heal-info -- * doesn't remain blocked forever until IO completes. -- */ -- if ((*inode)->ia_type == IA_IFREG) { -- ret = afr_selfheal_data_open(this, *inode, &fd); -- if (ret < 0) { -- gf_msg_debug(this->name, -ret, "%s: Failed to open", -- uuid_utoa((*inode)->gfid)); -- goto out; -+ for (i = 0; i < priv->child_count; i++) { -+ if (replies[i].valid && replies[i].op_ret == 0) { -+ valid_on[i] = 1; - } - } -- - if (msh) { -- ret = afr_selfheal_locked_metadata_inspect(frame, this, *inode, &msh, -- pending); -- if (ret == -EIO) -+ ret = afr_selfheal_find_direction(frame, this, replies, -+ AFR_METADATA_TRANSACTION, valid_on, -+ sources, sinks, witness, pending); -+ if (*pending & PFLAG_SBRAIN) -+ ret = -EIO; -+ if (ret) - goto out; - } -- - if (dsh) { -- ret = afr_selfheal_locked_data_inspect(frame, this, fd, &dsh, pending); -- if (ret == -EIO || (ret == -EAGAIN)) -+ ret = afr_selfheal_find_direction(frame, this, replies, -+ AFR_DATA_TRANSACTION, valid_on, -+ sources, sinks, witness, pending); -+ if (*pending & PFLAG_SBRAIN) -+ ret = -EIO; -+ if (ret) - goto out; - } -- - if (esh) { -- ret = afr_selfheal_locked_entry_inspect(frame, this, *inode, &esh, -- pending); -+ ret = afr_selfheal_find_direction(frame, this, replies, -+ AFR_ENTRY_TRANSACTION, valid_on, -+ sources, sinks, witness, pending); -+ if (*pending & PFLAG_SBRAIN) -+ ret = -EIO; -+ if (ret) -+ goto out; - } - -+ ret = afr_update_heal_status(this, replies, index_vgfid, (*inode)->ia_type, -+ &esh, &dsh, &msh); - out: - *data_selfheal = dsh; - *entry_selfheal = esh; - *metadata_selfheal = msh; -- if (fd) -- fd_unref(fd); -+ if (replies) -+ afr_replies_wipe(replies, priv->child_count); - return ret; - } - --static dict_t * --afr_set_heal_info(char *status) --{ -- dict_t *dict = NULL; -- int ret = -1; -- -- dict = dict_new(); -- if (!dict) { -- ret = -ENOMEM; -- goto out; -- } -- -- ret = dict_set_dynstr_sizen(dict, "heal-info", status); -- if (ret) -- gf_msg("", GF_LOG_WARNING, -ret, AFR_MSG_DICT_SET_FAILED, -- "Failed to set heal-info key to " -- "%s", -- status); --out: -- /* Any error other than EINVAL, dict_set_dynstr frees status */ -- if (ret == -ENOMEM || ret == -EINVAL) { -- GF_FREE(status); -- } -- -- if (ret && dict) { -- dict_unref(dict); -- dict = NULL; -- } -- return dict; --} -- - int - afr_get_heal_info(call_frame_t *frame, xlator_t *this, loc_t *loc) - { -@@ -6174,10 +6133,18 @@ afr_get_heal_info(call_frame_t *frame, xlator_t *this, loc_t *loc) - inode_t *inode = NULL; - char *substr = NULL; - char *status = NULL; -+ afr_local_t *local = NULL; -+ char *index_vgfid = NULL; -+ -+ local = frame->local; -+ if (dict_get_str(local->xdata_req, "index-vgfid", &index_vgfid)) { -+ ret = -1; -+ goto out; -+ } - -- ret = afr_selfheal_locked_inspect(frame, this, loc->gfid, &inode, -- &entry_selfheal, &data_selfheal, -- &metadata_selfheal, &pending); -+ ret = afr_lockless_inspect(frame, this, loc->gfid, &inode, index_vgfid, -+ &entry_selfheal, &data_selfheal, -+ &metadata_selfheal, &pending); - - if (ret == -ENOMEM) { - ret = -1; -diff --git a/xlators/cluster/afr/src/afr-self-heal-common.c b/xlators/cluster/afr/src/afr-self-heal-common.c -index d942ccf..1608f75 100644 ---- a/xlators/cluster/afr/src/afr-self-heal-common.c -+++ b/xlators/cluster/afr/src/afr-self-heal-common.c -@@ -1827,6 +1827,37 @@ afr_selfheal_unlocked_lookup_on(call_frame_t *frame, inode_t *parent, - return inode; - } - -+static int -+afr_set_multi_dom_lock_count_request(xlator_t *this, dict_t *dict) -+{ -+ int ret = 0; -+ afr_private_t *priv = NULL; -+ char *key1 = NULL; -+ char *key2 = NULL; -+ -+ priv = this->private; -+ key1 = alloca0(strlen(GLUSTERFS_INODELK_DOM_PREFIX) + 2 + -+ strlen(this->name)); -+ key2 = alloca0(strlen(GLUSTERFS_INODELK_DOM_PREFIX) + 2 + -+ strlen(priv->sh_domain)); -+ -+ ret = dict_set_uint32(dict, GLUSTERFS_MULTIPLE_DOM_LK_CNT_REQUESTS, 1); -+ if (ret) -+ return ret; -+ -+ sprintf(key1, "%s:%s", GLUSTERFS_INODELK_DOM_PREFIX, this->name); -+ ret = dict_set_uint32(dict, key1, 1); -+ if (ret) -+ return ret; -+ -+ sprintf(key2, "%s:%s", GLUSTERFS_INODELK_DOM_PREFIX, priv->sh_domain); -+ ret = dict_set_uint32(dict, key2, 1); -+ if (ret) -+ return ret; -+ -+ return 0; -+} -+ - int - afr_selfheal_unlocked_discover_on(call_frame_t *frame, inode_t *inode, - uuid_t gfid, struct afr_reply *replies, -@@ -1851,6 +1882,11 @@ afr_selfheal_unlocked_discover_on(call_frame_t *frame, inode_t *inode, - return -ENOMEM; - } - -+ if (afr_set_multi_dom_lock_count_request(frame->this, xattr_req)) { -+ dict_unref(xattr_req); -+ return -1; -+ } -+ - loc.inode = inode_ref(inode); - gf_uuid_copy(loc.gfid, gfid); - -@@ -2241,7 +2277,8 @@ int - afr_selfheal_unlocked_inspect(call_frame_t *frame, xlator_t *this, uuid_t gfid, - inode_t **link_inode, gf_boolean_t *data_selfheal, - gf_boolean_t *metadata_selfheal, -- gf_boolean_t *entry_selfheal) -+ gf_boolean_t *entry_selfheal, -+ struct afr_reply *replies_dst) - { - afr_private_t *priv = NULL; - inode_t *inode = NULL; -@@ -2377,6 +2414,8 @@ afr_selfheal_unlocked_inspect(call_frame_t *frame, xlator_t *this, uuid_t gfid, - - ret = 0; - out: -+ if (replies && replies_dst) -+ afr_replies_copy(replies_dst, replies, priv->child_count); - if (inode) - inode_unref(inode); - if (replies) -@@ -2493,7 +2532,7 @@ afr_selfheal_do(call_frame_t *frame, xlator_t *this, uuid_t gfid) - - ret = afr_selfheal_unlocked_inspect(frame, this, gfid, &inode, - &data_selfheal, &metadata_selfheal, -- &entry_selfheal); -+ &entry_selfheal, NULL); - if (ret) - goto out; - -diff --git a/xlators/cluster/afr/src/afr-self-heal.h b/xlators/cluster/afr/src/afr-self-heal.h -index f7ecf5d..b39af02 100644 ---- a/xlators/cluster/afr/src/afr-self-heal.h -+++ b/xlators/cluster/afr/src/afr-self-heal.h -@@ -327,7 +327,8 @@ int - afr_selfheal_unlocked_inspect(call_frame_t *frame, xlator_t *this, uuid_t gfid, - inode_t **link_inode, gf_boolean_t *data_selfheal, - gf_boolean_t *metadata_selfheal, -- gf_boolean_t *entry_selfheal); -+ gf_boolean_t *entry_selfheal, -+ struct afr_reply *replies); - - int - afr_selfheal_do(call_frame_t *frame, xlator_t *this, uuid_t gfid); -diff --git a/xlators/features/locks/src/common.h b/xlators/features/locks/src/common.h -index 3a74967..ea86b96 100644 ---- a/xlators/features/locks/src/common.h -+++ b/xlators/features/locks/src/common.h -@@ -45,6 +45,10 @@ - fd_unref(__local->fd); \ - if (__local->inode) \ - inode_unref(__local->inode); \ -+ if (__local->xdata) { \ -+ dict_unref(__local->xdata); \ -+ __local->xdata = NULL; \ -+ } \ - mem_put(__local); \ - } \ - } while (0) -diff --git a/xlators/features/locks/src/locks.h b/xlators/features/locks/src/locks.h -index b817960..aa267de 100644 ---- a/xlators/features/locks/src/locks.h -+++ b/xlators/features/locks/src/locks.h -@@ -239,6 +239,7 @@ typedef struct { - gf_boolean_t inodelk_count_req; - gf_boolean_t posixlk_count_req; - gf_boolean_t parent_entrylk_req; -+ gf_boolean_t multiple_dom_lk_requests; - int update_mlock_enforced_flag; - } pl_local_t; - -@@ -260,6 +261,13 @@ typedef struct _locks_ctx { - struct list_head metalk_list; - } pl_ctx_t; - -+typedef struct _multi_dom_lk_data { -+ xlator_t *this; -+ inode_t *inode; -+ dict_t *xdata_rsp; -+ gf_boolean_t keep_max; -+} multi_dom_lk_data; -+ - typedef enum { DECREMENT, INCREMENT } pl_count_op_t; - - pl_ctx_t * -diff --git a/xlators/features/locks/src/posix.c b/xlators/features/locks/src/posix.c -index 4592240..9a14c64 100644 ---- a/xlators/features/locks/src/posix.c -+++ b/xlators/features/locks/src/posix.c -@@ -150,13 +150,20 @@ fetch_pathinfo(xlator_t *, inode_t *, int32_t *, char **); - gf_boolean_t - pl_has_xdata_requests(dict_t *xdata) - { -- static char *reqs[] = {GLUSTERFS_ENTRYLK_COUNT, GLUSTERFS_INODELK_COUNT, -- GLUSTERFS_INODELK_DOM_COUNT, GLUSTERFS_POSIXLK_COUNT, -- GLUSTERFS_PARENT_ENTRYLK, NULL}; -- static int reqs_size[] = { -- SLEN(GLUSTERFS_ENTRYLK_COUNT), SLEN(GLUSTERFS_INODELK_COUNT), -- SLEN(GLUSTERFS_INODELK_DOM_COUNT), SLEN(GLUSTERFS_POSIXLK_COUNT), -- SLEN(GLUSTERFS_PARENT_ENTRYLK), 0}; -+ static char *reqs[] = {GLUSTERFS_ENTRYLK_COUNT, -+ GLUSTERFS_INODELK_COUNT, -+ GLUSTERFS_INODELK_DOM_COUNT, -+ GLUSTERFS_POSIXLK_COUNT, -+ GLUSTERFS_PARENT_ENTRYLK, -+ GLUSTERFS_MULTIPLE_DOM_LK_CNT_REQUESTS, -+ NULL}; -+ static int reqs_size[] = {SLEN(GLUSTERFS_ENTRYLK_COUNT), -+ SLEN(GLUSTERFS_INODELK_COUNT), -+ SLEN(GLUSTERFS_INODELK_DOM_COUNT), -+ SLEN(GLUSTERFS_POSIXLK_COUNT), -+ SLEN(GLUSTERFS_PARENT_ENTRYLK), -+ SLEN(GLUSTERFS_MULTIPLE_DOM_LK_CNT_REQUESTS), -+ 0}; - int i = 0; - - if (!xdata) -@@ -169,12 +176,22 @@ pl_has_xdata_requests(dict_t *xdata) - return _gf_false; - } - -+static int -+dict_delete_domain_key(dict_t *dict, char *key, data_t *value, void *data) -+{ -+ dict_del(dict, key); -+ return 0; -+} -+ - void - pl_get_xdata_requests(pl_local_t *local, dict_t *xdata) - { - if (!local || !xdata) - return; - -+ GF_ASSERT(local->xdata == NULL); -+ local->xdata = dict_copy_with_ref(xdata, NULL); -+ - if (dict_get_sizen(xdata, GLUSTERFS_ENTRYLK_COUNT)) { - local->entrylk_count_req = 1; - dict_del_sizen(xdata, GLUSTERFS_ENTRYLK_COUNT); -@@ -183,6 +200,12 @@ pl_get_xdata_requests(pl_local_t *local, dict_t *xdata) - local->inodelk_count_req = 1; - dict_del_sizen(xdata, GLUSTERFS_INODELK_COUNT); - } -+ if (dict_get_sizen(xdata, GLUSTERFS_MULTIPLE_DOM_LK_CNT_REQUESTS)) { -+ local->multiple_dom_lk_requests = 1; -+ dict_del_sizen(xdata, GLUSTERFS_MULTIPLE_DOM_LK_CNT_REQUESTS); -+ dict_foreach_fnmatch(xdata, GLUSTERFS_INODELK_DOM_PREFIX "*", -+ dict_delete_domain_key, NULL); -+ } - - local->inodelk_dom_count_req = dict_get_sizen(xdata, - GLUSTERFS_INODELK_DOM_COUNT); -@@ -210,7 +233,7 @@ pl_needs_xdata_response(pl_local_t *local) - - if (local->parent_entrylk_req || local->entrylk_count_req || - local->inodelk_dom_count_req || local->inodelk_count_req || -- local->posixlk_count_req) -+ local->posixlk_count_req || local->multiple_dom_lk_requests) - return _gf_true; - - return _gf_false; -@@ -411,6 +434,75 @@ pl_posixlk_xattr_fill(xlator_t *this, inode_t *inode, dict_t *dict, - } - - void -+pl_inodelk_xattr_fill_each(xlator_t *this, inode_t *inode, dict_t *dict, -+ char *domname, gf_boolean_t keep_max, char *key) -+{ -+ int32_t count = 0; -+ int32_t maxcount = -1; -+ int ret = -1; -+ -+ if (keep_max) { -+ ret = dict_get_int32(dict, key, &maxcount); -+ if (ret < 0) -+ gf_msg_debug(this->name, 0, " Failed to fetch the value for key %s", -+ GLUSTERFS_INODELK_COUNT); -+ } -+ count = get_inodelk_count(this, inode, domname); -+ if (maxcount >= count) -+ return; -+ -+ ret = dict_set_int32(dict, key, count); -+ if (ret < 0) { -+ gf_msg_debug(this->name, 0, -+ "Failed to set count for " -+ "key %s", -+ key); -+ } -+ -+ return; -+} -+ -+static int -+pl_inodelk_xattr_fill_multiple(dict_t *this, char *key, data_t *value, -+ void *data) -+{ -+ multi_dom_lk_data *d = data; -+ char *tmp_key = NULL; -+ char *save_ptr = NULL; -+ -+ tmp_key = gf_strdup(key); -+ strtok_r(tmp_key, ":", &save_ptr); -+ if (!*save_ptr) { -+ gf_msg(THIS->name, GF_LOG_ERROR, 0, EINVAL, -+ "Could not tokenize domain string from key %s", key); -+ return -1; -+ } -+ -+ pl_inodelk_xattr_fill_each(d->this, d->inode, d->xdata_rsp, save_ptr, -+ d->keep_max, key); -+ if (tmp_key) -+ GF_FREE(tmp_key); -+ -+ return 0; -+} -+ -+void -+pl_fill_multiple_dom_lk_requests(xlator_t *this, pl_local_t *local, -+ inode_t *inode, dict_t *dict, -+ gf_boolean_t keep_max) -+{ -+ multi_dom_lk_data data; -+ -+ data.this = this; -+ data.inode = inode; -+ data.xdata_rsp = dict; -+ data.keep_max = keep_max; -+ -+ dict_foreach_fnmatch(local->xdata, GLUSTERFS_INODELK_DOM_PREFIX "*", -+ pl_inodelk_xattr_fill_multiple, &data); -+} -+ -+void - pl_set_xdata_response(xlator_t *this, pl_local_t *local, inode_t *parent, - inode_t *inode, char *name, dict_t *xdata, - gf_boolean_t max_lock) -@@ -437,6 +529,9 @@ pl_set_xdata_response(xlator_t *this, pl_local_t *local, inode_t *parent, - - if (local->posixlk_count_req) - pl_posixlk_xattr_fill(this, inode, xdata, max_lock); -+ -+ if (local->multiple_dom_lk_requests) -+ pl_fill_multiple_dom_lk_requests(this, local, inode, xdata, max_lock); - } - - /* Checks whether the region where fop is acting upon conflicts -@@ -773,9 +868,6 @@ pl_truncate_cbk(call_frame_t *frame, void *cookie, xlator_t *this, - { - pl_local_t *local = frame->local; - -- if (local->xdata) -- dict_unref(local->xdata); -- - pl_track_io_fop_count(local, this, DECREMENT); - - if (local->op == GF_FOP_TRUNCATE) -@@ -932,9 +1024,6 @@ unwind: - "ret: %d, error: %s", - op_ret, strerror(op_errno)); - -- if (local->xdata) -- dict_unref(local->xdata); -- - switch (local->op) { - case GF_FOP_TRUNCATE: - PL_STACK_UNWIND(truncate, xdata, frame, op_ret, op_errno, buf, --- -1.8.3.1 - diff --git a/SOURCES/0425-tests-Fix-spurious-self-heald.t-failure.patch b/SOURCES/0425-tests-Fix-spurious-self-heald.t-failure.patch deleted file mode 100644 index 7bfc04a..0000000 --- a/SOURCES/0425-tests-Fix-spurious-self-heald.t-failure.patch +++ /dev/null @@ -1,187 +0,0 @@ -From 2c582ea6c76031463501b31d9250e739d5aeda79 Mon Sep 17 00:00:00 2001 -From: Ravishankar N -Date: Fri, 5 Jun 2020 14:28:11 +0530 -Subject: [PATCH 425/449] tests: Fix spurious self-heald.t failure - -Problem: -heal-info code assumes that all indices in xattrop directory -definitely need heal. There is one corner case. -The very first xattrop on the file will lead to adding the -gfid to 'xattrop' index in fop path and in _cbk path it is -removed because the fop is zero-xattr xattrop in success case. -These gfids could be read by heal-info and shown as needing heal. - -Fix: -Check the pending flag to see if the file definitely needs or -not instead of which index is being crawled at the moment. - -> Upstream patch: https://review.gluster.org/#/c/glusterfs/+/24110/ -> fixes: bz#1801623 -> Change-Id: I79f00dc7366fedbbb25ec4bec838dba3b34c7ad5 -> Signed-off-by: Pranith Kumar K - -BUG: 1721355 -Change-Id: I7efdf45a5158fadfdbdd21c91837f193d80fa6c7 -Signed-off-by: Ravishankar N -Reviewed-on: https://code.engineering.redhat.com/gerrit/202491 -Tested-by: RHGS Build Bot -Reviewed-by: Pranith Kumar Karampuri ---- - heal/src/glfs-heal.c | 17 ++++++---------- - xlators/cluster/afr/src/afr-common.c | 38 ++++++++++++++---------------------- - 2 files changed, 21 insertions(+), 34 deletions(-) - -diff --git a/heal/src/glfs-heal.c b/heal/src/glfs-heal.c -index 5af9e31..125b12c 100644 ---- a/heal/src/glfs-heal.c -+++ b/heal/src/glfs-heal.c -@@ -775,8 +775,7 @@ static int - glfsh_process_entries(xlator_t *xl, fd_t *fd, gf_dirent_t *entries, - uint64_t *offset, num_entries_t *num_entries, - print_status glfsh_print_status, -- gf_boolean_t ignore_dirty, glfsh_fail_mode_t mode, -- dict_t *xattr_req) -+ gf_boolean_t ignore_dirty, glfsh_fail_mode_t mode) - { - gf_dirent_t *entry = NULL; - gf_dirent_t *tmp = NULL; -@@ -808,7 +807,7 @@ glfsh_process_entries(xlator_t *xl, fd_t *fd, gf_dirent_t *entries, - - gf_uuid_parse(entry->d_name, gfid); - gf_uuid_copy(loc.gfid, gfid); -- ret = syncop_getxattr(this, &loc, &dict, GF_HEAL_INFO, xattr_req, NULL); -+ ret = syncop_getxattr(this, &loc, &dict, GF_HEAL_INFO, NULL, NULL); - if (ret) { - if ((mode != GLFSH_MODE_CONTINUE_ON_ERROR) && (ret == -ENOTCONN)) - goto out; -@@ -877,19 +876,19 @@ glfsh_crawl_directory(glfs_t *fs, xlator_t *top_subvol, loc_t *rootloc, - if (heal_op == GF_SHD_OP_INDEX_SUMMARY) { - ret = glfsh_process_entries(readdir_xl, fd, &entries, &offset, - num_entries, glfsh_print_heal_status, -- ignore, mode, xattr_req); -+ ignore, mode); - if (ret < 0) - goto out; - } else if (heal_op == GF_SHD_OP_SPLIT_BRAIN_FILES) { - ret = glfsh_process_entries(readdir_xl, fd, &entries, &offset, - num_entries, glfsh_print_spb_status, -- ignore, mode, xattr_req); -+ ignore, mode); - if (ret < 0) - goto out; - } else if (heal_op == GF_SHD_OP_HEAL_SUMMARY) { - ret = glfsh_process_entries(readdir_xl, fd, &entries, &offset, - num_entries, glfsh_print_summary_status, -- ignore, mode, xattr_req); -+ ignore, mode); - if (ret < 0) - goto out; - } else if (heal_op == GF_SHD_OP_SBRAIN_HEAL_FROM_BRICK) { -@@ -898,7 +897,7 @@ glfsh_crawl_directory(glfs_t *fs, xlator_t *top_subvol, loc_t *rootloc, - } else if (heal_op == GF_SHD_OP_GRANULAR_ENTRY_HEAL_ENABLE) { - ret = glfsh_process_entries(readdir_xl, fd, &entries, &offset, - num_entries, glfsh_heal_status_boolean, -- ignore, mode, xattr_req); -+ ignore, mode); - if (ret < 0) - goto out; - } -@@ -952,10 +951,6 @@ glfsh_print_pending_heals_type(glfs_t *fs, xlator_t *top_subvol, loc_t *rootloc, - int32_t op_errno = 0; - gf_boolean_t ignore = _gf_false; - -- ret = dict_set_str(xattr_req, "index-vgfid", vgfid); -- if (ret) -- return ret; -- - if (!strcmp(vgfid, GF_XATTROP_DIRTY_GFID)) - ignore = _gf_true; - -diff --git a/xlators/cluster/afr/src/afr-common.c b/xlators/cluster/afr/src/afr-common.c -index c355ec5..89e2483 100644 ---- a/xlators/cluster/afr/src/afr-common.c -+++ b/xlators/cluster/afr/src/afr-common.c -@@ -5995,8 +5995,8 @@ afr_is_dirty_count_non_unary(xlator_t *this, struct afr_reply *replies, - - static int - afr_update_heal_status(xlator_t *this, struct afr_reply *replies, -- char *index_vgfid, ia_type_t ia_type, gf_boolean_t *esh, -- gf_boolean_t *dsh, gf_boolean_t *msh) -+ ia_type_t ia_type, gf_boolean_t *esh, gf_boolean_t *dsh, -+ gf_boolean_t *msh, unsigned char pending) - { - int ret = -1; - GF_UNUSED int ret1 = 0; -@@ -6026,14 +6026,7 @@ afr_update_heal_status(xlator_t *this, struct afr_reply *replies, - } - } - -- if (!strcmp(index_vgfid, GF_XATTROP_INDEX_GFID)) { -- if (shd_domain_lk_count) { -- ret = -EAGAIN; /*For 'possibly-healing'. */ -- } else { -- ret = 0; /*needs heal. Just set a non -ve value so that it is -- assumed as the source index.*/ -- } -- } else if (!strcmp(index_vgfid, GF_XATTROP_DIRTY_GFID)) { -+ if (!pending) { - if ((afr_is_dirty_count_non_unary(this, replies, ia_type)) || - (!io_domain_lk_count)) { - /* Needs heal. */ -@@ -6042,6 +6035,13 @@ afr_update_heal_status(xlator_t *this, struct afr_reply *replies, - /* No heal needed. */ - *dsh = *esh = *msh = 0; - } -+ } else { -+ if (shd_domain_lk_count) { -+ ret = -EAGAIN; /*For 'possibly-healing'. */ -+ } else { -+ ret = 0; /*needs heal. Just set a non -ve value so that it is -+ assumed as the source index.*/ -+ } - } - return ret; - } -@@ -6049,8 +6049,8 @@ afr_update_heal_status(xlator_t *this, struct afr_reply *replies, - /*return EIO, EAGAIN or pending*/ - int - afr_lockless_inspect(call_frame_t *frame, xlator_t *this, uuid_t gfid, -- inode_t **inode, char *index_vgfid, -- gf_boolean_t *entry_selfheal, gf_boolean_t *data_selfheal, -+ inode_t **inode, gf_boolean_t *entry_selfheal, -+ gf_boolean_t *data_selfheal, - gf_boolean_t *metadata_selfheal, unsigned char *pending) - { - int ret = -1; -@@ -6109,8 +6109,8 @@ afr_lockless_inspect(call_frame_t *frame, xlator_t *this, uuid_t gfid, - goto out; - } - -- ret = afr_update_heal_status(this, replies, index_vgfid, (*inode)->ia_type, -- &esh, &dsh, &msh); -+ ret = afr_update_heal_status(this, replies, (*inode)->ia_type, &esh, &dsh, -+ &msh, *pending); - out: - *data_selfheal = dsh; - *entry_selfheal = esh; -@@ -6133,16 +6133,8 @@ afr_get_heal_info(call_frame_t *frame, xlator_t *this, loc_t *loc) - inode_t *inode = NULL; - char *substr = NULL; - char *status = NULL; -- afr_local_t *local = NULL; -- char *index_vgfid = NULL; -- -- local = frame->local; -- if (dict_get_str(local->xdata_req, "index-vgfid", &index_vgfid)) { -- ret = -1; -- goto out; -- } - -- ret = afr_lockless_inspect(frame, this, loc->gfid, &inode, index_vgfid, -+ ret = afr_lockless_inspect(frame, this, loc->gfid, &inode, - &entry_selfheal, &data_selfheal, - &metadata_selfheal, &pending); - --- -1.8.3.1 - diff --git a/SOURCES/0426-geo-rep-Fix-for-Transport-End-Point-not-connected-is.patch b/SOURCES/0426-geo-rep-Fix-for-Transport-End-Point-not-connected-is.patch deleted file mode 100644 index a96b66e..0000000 --- a/SOURCES/0426-geo-rep-Fix-for-Transport-End-Point-not-connected-is.patch +++ /dev/null @@ -1,216 +0,0 @@ -From 91936fe5ef854bd9d2f91e643795d0e7791b97ba Mon Sep 17 00:00:00 2001 -From: Harpreet Kaur -Date: Mon, 7 Jan 2019 16:38:25 +0530 -Subject: [PATCH 426/449] geo-rep: Fix for "Transport End Point not connected" - issue - -problem: Geo-rep gsyncd process mounts the master and slave volume - on master nodes and slave nodes respectively and starts - the sync. But it doesn't wait for the mount to be in ready - state to accept I/O. The gluster mount is considered to be - ready when all the distribute sub-volumes is up. If the all - the distribute subvolumes are not up, it can cause ENOTCONN - error, when lookup on file comes and file is on the subvol - that is down. - -solution: Added a Virtual Xattr "dht.subvol.status" which returns "1" - if all subvols are up and "0" if all subvols are not up. - Geo-rep then uses this virtual xattr after a fresh mount, to - check whether all subvols are up or not and then starts the - I/O. - ->fixes: bz#1664335 ->Change-Id: If3ad01d728b1372da7c08ccbe75a45bdc1ab2a91 ->Signed-off-by: Harpreet Kaur ->Signed-off-by: Kotresh HR - -backport of https://review.gluster.org/#/c/glusterfs/+/22001/ -BUG: 1640573 -Change-Id: If3ad01d728b1372da7c08ccbe75a45bdc1ab2a91 -Signed-off-by: Shwetha K Acharya -Reviewed-on: https://code.engineering.redhat.com/gerrit/202554 -Tested-by: RHGS Build Bot -Reviewed-by: Sunil Kumar Heggodu Gopala Acharya ---- - geo-replication/syncdaemon/resource.py | 11 ++++++ - geo-replication/syncdaemon/syncdutils.py | 20 +++++++++-- - xlators/cluster/dht/src/dht-common.c | 59 ++++++++++++++++++++++++++++++++ - xlators/cluster/dht/src/dht-common.h | 4 +++ - 4 files changed, 91 insertions(+), 3 deletions(-) - -diff --git a/geo-replication/syncdaemon/resource.py b/geo-replication/syncdaemon/resource.py -index 189d8a1..0c61de9 100644 ---- a/geo-replication/syncdaemon/resource.py -+++ b/geo-replication/syncdaemon/resource.py -@@ -37,6 +37,7 @@ from syncdutils import ChangelogException, ChangelogHistoryNotAvailable - from syncdutils import get_changelog_log_level, get_rsync_version - from syncdutils import CHANGELOG_AGENT_CLIENT_VERSION - from syncdutils import GX_GFID_CANONICAL_LEN -+from syncdutils import gf_mount_ready - from gsyncdstatus import GeorepStatus - from syncdutils import lf, Popen, sup - from syncdutils import Xattr, matching_disk_gfid, get_gfid_from_mnt -@@ -950,6 +951,16 @@ class Mounter(object): - logging.exception('mount cleanup failure:') - rv = 200 - os._exit(rv) -+ -+ #Polling the dht.subvol.status value. -+ RETRIES = 10 -+ while not gf_mount_ready(): -+ if RETRIES < 0: -+ logging.error('Subvols are not up') -+ break -+ RETRIES -= 1 -+ time.sleep(0.2) -+ - logging.debug('auxiliary glusterfs mount prepared') - - -diff --git a/geo-replication/syncdaemon/syncdutils.py b/geo-replication/syncdaemon/syncdutils.py -index b08098e..7560fa1 100644 ---- a/geo-replication/syncdaemon/syncdutils.py -+++ b/geo-replication/syncdaemon/syncdutils.py -@@ -21,8 +21,8 @@ import subprocess - import socket - from subprocess import PIPE - from threading import Lock, Thread as baseThread --from errno import EACCES, EAGAIN, EPIPE, ENOTCONN, ECONNABORTED --from errno import EINTR, ENOENT, ESTALE, EBUSY, errorcode -+from errno import EACCES, EAGAIN, EPIPE, ENOTCONN, ENOMEM, ECONNABORTED -+from errno import EINTR, ENOENT, ESTALE, EBUSY, ENODATA, errorcode - from signal import signal, SIGTERM - import select as oselect - from os import waitpid as owaitpid -@@ -55,6 +55,8 @@ from rconf import rconf - - from hashlib import sha256 as sha256 - -+ENOTSUP = getattr(errno, 'ENOTSUP', 'EOPNOTSUPP') -+ - # auxiliary gfid based access prefix - _CL_AUX_GFID_PFX = ".gfid/" - ROOT_GFID = "00000000-0000-0000-0000-000000000001" -@@ -100,6 +102,19 @@ def unescape_space_newline(s): - .replace(NEWLINE_ESCAPE_CHAR, "\n")\ - .replace(PERCENTAGE_ESCAPE_CHAR, "%") - -+# gf_mount_ready() returns 1 if all subvols are up, else 0 -+def gf_mount_ready(): -+ ret = errno_wrap(Xattr.lgetxattr, -+ ['.', 'dht.subvol.status', 16], -+ [ENOENT, ENOTSUP, ENODATA], [ENOMEM]) -+ -+ if isinstance(ret, int): -+ logging.error("failed to get the xattr value") -+ return 1 -+ ret = ret.rstrip('\x00') -+ if ret == "1": -+ return 1 -+ return 0 - - def norm(s): - if s: -@@ -564,7 +579,6 @@ def errno_wrap(call, arg=[], errnos=[], retry_errnos=[]): - def lstat(e): - return errno_wrap(os.lstat, [e], [ENOENT], [ESTALE, EBUSY]) - -- - def get_gfid_from_mnt(gfidpath): - return errno_wrap(Xattr.lgetxattr, - [gfidpath, 'glusterfs.gfid.string', -diff --git a/xlators/cluster/dht/src/dht-common.c b/xlators/cluster/dht/src/dht-common.c -index 6aa18f3..23cc80c 100644 ---- a/xlators/cluster/dht/src/dht-common.c -+++ b/xlators/cluster/dht/src/dht-common.c -@@ -4858,6 +4858,60 @@ out: - return 0; - } - -+/* Virtual Xattr which returns 1 if all subvols are up, -+ else returns 0. Geo-rep then uses this virtual xattr -+ after a fresh mount and starts the I/O. -+*/ -+ -+enum dht_vxattr_subvol { -+ DHT_VXATTR_SUBVOLS_UP = 1, -+ DHT_VXATTR_SUBVOLS_DOWN = 0, -+}; -+ -+int -+dht_vgetxattr_subvol_status(call_frame_t *frame, xlator_t *this, -+ const char *key) -+{ -+ dht_local_t *local = NULL; -+ int ret = -1; -+ int op_errno = ENODATA; -+ int value = DHT_VXATTR_SUBVOLS_UP; -+ int i = 0; -+ dht_conf_t *conf = NULL; -+ -+ conf = this->private; -+ local = frame->local; -+ -+ if (!key) { -+ op_errno = EINVAL; -+ goto out; -+ } -+ local->xattr = dict_new(); -+ if (!local->xattr) { -+ op_errno = ENOMEM; -+ goto out; -+ } -+ for (i = 0; i < conf->subvolume_cnt; i++) { -+ if (!conf->subvolume_status[i]) { -+ value = DHT_VXATTR_SUBVOLS_DOWN; -+ gf_msg_debug(this->name, 0, "subvol %s is down ", -+ conf->subvolumes[i]->name); -+ break; -+ } -+ } -+ ret = dict_set_int8(local->xattr, (char *)key, value); -+ if (ret < 0) { -+ op_errno = -ret; -+ ret = -1; -+ goto out; -+ } -+ ret = 0; -+ -+out: -+ DHT_STACK_UNWIND(getxattr, frame, ret, op_errno, local->xattr, NULL); -+ return 0; -+} -+ - int - dht_getxattr(call_frame_t *frame, xlator_t *this, loc_t *loc, const char *key, - dict_t *xdata) -@@ -4915,6 +4969,11 @@ dht_getxattr(call_frame_t *frame, xlator_t *this, loc_t *loc, const char *key, - goto err; - } - -+ if (strncmp(key, DHT_SUBVOL_STATUS_KEY, SLEN(DHT_SUBVOL_STATUS_KEY)) == 0) { -+ dht_vgetxattr_subvol_status(frame, this, key); -+ return 0; -+ } -+ - /* skip over code which is irrelevant if !DHT_IS_DIR(layout) */ - if (!DHT_IS_DIR(layout)) - goto no_dht_is_dir; -diff --git a/xlators/cluster/dht/src/dht-common.h b/xlators/cluster/dht/src/dht-common.h -index 1b3e826..9ec5b51 100644 ---- a/xlators/cluster/dht/src/dht-common.h -+++ b/xlators/cluster/dht/src/dht-common.h -@@ -45,6 +45,10 @@ - #define DHT_DIR_STAT_BLOCKS 8 - #define DHT_DIR_STAT_SIZE 4096 - -+/* Virtual xattr for subvols status */ -+ -+#define DHT_SUBVOL_STATUS_KEY "dht.subvol.status" -+ - /* Virtual xattrs for debugging */ - - #define DHT_DBG_HASHED_SUBVOL_PATTERN "dht.file.hashed-subvol.*" --- -1.8.3.1 - diff --git a/SOURCES/0427-storage-posix-Fixing-a-coverity-issue.patch b/SOURCES/0427-storage-posix-Fixing-a-coverity-issue.patch deleted file mode 100644 index ebeb556..0000000 --- a/SOURCES/0427-storage-posix-Fixing-a-coverity-issue.patch +++ /dev/null @@ -1,38 +0,0 @@ -From 3943fce5818a353117fc1c492e6383434d742979 Mon Sep 17 00:00:00 2001 -From: Barak Sason -Date: Sun, 18 Aug 2019 17:52:04 +0300 -Subject: [PATCH 427/449] storage/posix - Fixing a coverity issue - -Fixed a resource leak of variable 'pfd' - -backport of https://review.gluster.org/#/c/glusterfs/+/23261/ ->CID: 1400673 ->Updates: bz#789278 ->Change-Id: I78e1e8a89e0604b56e35a75c25d436b35db096c3 ->Signed-off-by: Barak Sason - -BUG: 1787310 -Change-Id: I78e1e8a89e0604b56e35a75c25d436b35db096c3 -Signed-off-by: Barak Sason Rofman -Reviewed-on: https://code.engineering.redhat.com/gerrit/202563 -Tested-by: RHGS Build Bot -Reviewed-by: Sunil Kumar Heggodu Gopala Acharya ---- - xlators/storage/posix/src/posix-inode-fd-ops.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/xlators/storage/posix/src/posix-inode-fd-ops.c b/xlators/storage/posix/src/posix-inode-fd-ops.c -index bcce06e..5748b9f 100644 ---- a/xlators/storage/posix/src/posix-inode-fd-ops.c -+++ b/xlators/storage/posix/src/posix-inode-fd-ops.c -@@ -1603,6 +1603,7 @@ posix_open(call_frame_t *frame, xlator_t *this, loc_t *loc, int32_t flags, - if (op_ret == -1) { - gf_msg(this->name, GF_LOG_ERROR, errno, P_MSG_FSTAT_FAILED, - "pre-operation fstat failed on fd=%p", fd); -+ GF_FREE(pfd); - goto out; - } - --- -1.8.3.1 - diff --git a/SOURCES/0428-glusterd-ganesha-fixing-resource-leak-in-tear_down_c.patch b/SOURCES/0428-glusterd-ganesha-fixing-resource-leak-in-tear_down_c.patch deleted file mode 100644 index dba8f3c..0000000 --- a/SOURCES/0428-glusterd-ganesha-fixing-resource-leak-in-tear_down_c.patch +++ /dev/null @@ -1,48 +0,0 @@ -From 7e1bf1e338a6effe209f57b1b92a70d5d25a73bf Mon Sep 17 00:00:00 2001 -From: Jiffin Tony Thottan -Date: Mon, 26 Aug 2019 11:32:18 +0530 -Subject: [PATCH 428/449] glusterd/ganesha: fixing resource leak in - tear_down_cluster() - -backport of https://review.gluster.org/#/c/glusterfs/+/23295/ ->CID: 1370947 ->Updates: bz#789278 ->Change-Id: Ib694056430ff0536ed705a0e77e5ace22486891e ->Signed-off-by: Jiffin Tony Thottan - -BUG: 1787310 -Change-Id: Ib694056430ff0536ed705a0e77e5ace22486891e -Signed-off-by: Barak Sason Rofman -Reviewed-on: https://code.engineering.redhat.com/gerrit/202561 -Tested-by: RHGS Build Bot -Reviewed-by: Sunil Kumar Heggodu Gopala Acharya ---- - xlators/mgmt/glusterd/src/glusterd-ganesha.c | 8 ++++++++ - 1 file changed, 8 insertions(+) - -diff --git a/xlators/mgmt/glusterd/src/glusterd-ganesha.c b/xlators/mgmt/glusterd/src/glusterd-ganesha.c -index 0a16925..06f028f 100644 ---- a/xlators/mgmt/glusterd/src/glusterd-ganesha.c -+++ b/xlators/mgmt/glusterd/src/glusterd-ganesha.c -@@ -659,10 +659,18 @@ tear_down_cluster(gf_boolean_t run_teardown) - "Failed to close dir %s. Reason :" - " %s", - CONFDIR, strerror(errno)); -+ goto exit; - } - } - - out: -+ if (dir && sys_closedir(dir)) { -+ gf_msg_debug(THIS->name, 0, -+ "Failed to close dir %s. Reason :" -+ " %s", -+ CONFDIR, strerror(errno)); -+ } -+exit: - return ret; - } - --- -1.8.3.1 - diff --git a/SOURCES/0429-dht-rebalance-fixing-failure-occurace-due-to-rebalan.patch b/SOURCES/0429-dht-rebalance-fixing-failure-occurace-due-to-rebalan.patch deleted file mode 100644 index 8ac6529..0000000 --- a/SOURCES/0429-dht-rebalance-fixing-failure-occurace-due-to-rebalan.patch +++ /dev/null @@ -1,61 +0,0 @@ -From 1370db202a2a60810409f74c390448bf8fbd6998 Mon Sep 17 00:00:00 2001 -From: Barak Sason Rofman -Date: Sun, 9 Feb 2020 15:09:30 +0200 -Subject: [PATCH 429/449] dht/rebalance - fixing failure occurace due to - rebalance stop - -Probelm description: -When topping rebalance, the following error messages appear in the -rebalance log file: -[2020-01-28 14:31:42.452070] W [dht-rebalance.c:3447:gf_defrag_process_dir] 0-distrep-dht: Found error from gf_defrag_get_entry -[2020-01-28 14:31:42.452764] E [MSGID: 109111] [dht-rebalance.c:3971:gf_defrag_fix_layout] 0-distrep-dht: gf_defrag_process_dir failed for directory: /0/1/2/3/4/5/6/7/8/9/10/11/12/13/14/15/16/17/18/19/20/21/22/23/24/25/26/27/28/29/30/31 -[2020-01-28 14:31:42.453498] E [MSGID: 109016] [dht-rebalance.c:3906:gf_defrag_fix_layout] 0-distrep-dht: Fix layout failed for /0/1/2/3/4/5/6/7/8/9/10/11/12/13/14/15/16/17/18/19/20/21/22/23/24/25/26/27/28/29/30 - -In order to avoid seing these error messages, a modification to the -error handling mechanism has been made. -In addition, several log messages had been added in order to improve debugging efficiency - -backport of https://review.gluster.org/#/c/glusterfs/+/24103/ ->fixes: bz#1800956 ->Change-Id: Ifc82dae79ab3da9fe22ee25088a2a6b855afcfcf ->Signed-off-by: Barak Sason Rofman - -BUG: 1286171 -Change-Id: Ifc82dae79ab3da9fe22ee25088a2a6b855afcfcf -Signed-off-by: Barak Sason Rofman -Reviewed-on: https://code.engineering.redhat.com/gerrit/202562 -Tested-by: RHGS Build Bot -Reviewed-by: Sunil Kumar Heggodu Gopala Acharya ---- - xlators/cluster/dht/src/dht-rebalance.c | 8 ++++++++ - 1 file changed, 8 insertions(+) - -diff --git a/xlators/cluster/dht/src/dht-rebalance.c b/xlators/cluster/dht/src/dht-rebalance.c -index 8f31dca..88b6b54 100644 ---- a/xlators/cluster/dht/src/dht-rebalance.c -+++ b/xlators/cluster/dht/src/dht-rebalance.c -@@ -3479,6 +3479,10 @@ gf_defrag_process_dir(xlator_t *this, gf_defrag_info_t *defrag, loc_t *loc, - migrate_data, dir_dfmeta, xattr_req, - &should_commit_hash, perrno); - -+ if (defrag->defrag_status == GF_DEFRAG_STATUS_STOPPED) { -+ goto out; -+ } -+ - if (ret) { - gf_log(this->name, GF_LOG_WARNING, - "Found " -@@ -3935,6 +3939,10 @@ gf_defrag_fix_layout(xlator_t *this, gf_defrag_info_t *defrag, loc_t *loc, - ret = gf_defrag_fix_layout(this, defrag, &entry_loc, fix_layout, - migrate_data); - -+ if (defrag->defrag_status == GF_DEFRAG_STATUS_STOPPED) { -+ goto out; -+ } -+ - if (ret && ret != 2) { - gf_msg(this->name, GF_LOG_ERROR, 0, DHT_MSG_LAYOUT_FIX_FAILED, - "Fix layout failed for %s", entry_loc.path); --- -1.8.3.1 - diff --git a/SOURCES/0430-Fix-some-Null-pointer-dereference-coverity-issues.patch b/SOURCES/0430-Fix-some-Null-pointer-dereference-coverity-issues.patch deleted file mode 100644 index 6ff69e8..0000000 --- a/SOURCES/0430-Fix-some-Null-pointer-dereference-coverity-issues.patch +++ /dev/null @@ -1,291 +0,0 @@ -From 7fe500a03d42dba6082c28ef7284c950c44fbfa3 Mon Sep 17 00:00:00 2001 -From: Xavi Hernandez -Date: Wed, 22 May 2019 17:46:19 +0200 -Subject: [PATCH 430/449] Fix some "Null pointer dereference" coverity issues - -This patch fixes the following CID's: - - * 1124829 - * 1274075 - * 1274083 - * 1274128 - * 1274135 - * 1274141 - * 1274143 - * 1274197 - * 1274205 - * 1274210 - * 1274211 - * 1288801 - * 1398629 - -Backport of: -> Upstream-patch-link: https://review.gluster.org/22767 -> Change-Id: Ia7c86cfab3245b20777ffa296e1a59748040f558 -> Updates: bz#789278 -> Signed-off-by: Xavi Hernandez - -BUG: 1787310 -Change-Id: Ia7c86cfab3245b20777ffa296e1a59748040f558 -Signed-off-by: Xavi Hernandez -Reviewed-on: https://code.engineering.redhat.com/gerrit/202616 -Tested-by: RHGS Build Bot -Reviewed-by: Sunil Kumar Heggodu Gopala Acharya ---- - cli/src/cli-cmd-system.c | 2 +- - cli/src/cli-xml-output.c | 2 +- - glusterfsd/src/glusterfsd.c | 24 +++++++++++++----------- - libglusterfs/src/inode.c | 3 +++ - rpc/rpc-lib/src/rpcsvc.c | 4 ++++ - xlators/cluster/dht/src/dht-shared.c | 4 ++++ - xlators/cluster/dht/src/switch.c | 9 +++++++++ - xlators/features/trash/src/trash.c | 2 +- - xlators/mgmt/glusterd/src/glusterd-geo-rep.c | 7 +++++-- - xlators/nfs/server/src/mount3.c | 6 ++++++ - xlators/protocol/client/src/client.c | 7 ++++++- - xlators/storage/posix/src/posix-helpers.c | 3 +++ - 12 files changed, 56 insertions(+), 17 deletions(-) - -diff --git a/cli/src/cli-cmd-system.c b/cli/src/cli-cmd-system.c -index 8cd1542..cb3a9ea 100644 ---- a/cli/src/cli-cmd-system.c -+++ b/cli/src/cli-cmd-system.c -@@ -446,7 +446,7 @@ cli_cmd_sys_exec_cbk(struct cli_state *state, struct cli_cmd_word *word, - dict_t *dict = NULL; - cli_local_t *local = NULL; - -- if (wordcount < 3) { -+ if ((wordcount < 3) || (words[2] == NULL)) { - cli_usage_out(word->pattern); - goto out; - } -diff --git a/cli/src/cli-xml-output.c b/cli/src/cli-xml-output.c -index 006e2fb..903997c 100644 ---- a/cli/src/cli-xml-output.c -+++ b/cli/src/cli-xml-output.c -@@ -64,7 +64,7 @@ cli_begin_xml_output(xmlTextWriterPtr *writer, xmlDocPtr *doc) - int ret = -1; - - *writer = xmlNewTextWriterDoc(doc, 0); -- if (writer == NULL) { -+ if (*writer == NULL) { - ret = -1; - goto out; - } -diff --git a/glusterfsd/src/glusterfsd.c b/glusterfsd/src/glusterfsd.c -index 974fb88..9821180 100644 ---- a/glusterfsd/src/glusterfsd.c -+++ b/glusterfsd/src/glusterfsd.c -@@ -1235,19 +1235,21 @@ parse_opts(int key, char *arg, struct argp_state *state) - case ARGP_BRICK_PORT_KEY: - n = 0; - -- port_str = strtok_r(arg, ",", &tmp_str); -- if (gf_string2uint_base10(port_str, &n) == 0) { -- cmd_args->brick_port = n; -- port_str = strtok_r(NULL, ",", &tmp_str); -- if (port_str) { -- if (gf_string2uint_base10(port_str, &n) == 0) { -- cmd_args->brick_port2 = n; -- break; -+ if (arg != NULL) { -+ port_str = strtok_r(arg, ",", &tmp_str); -+ if (gf_string2uint_base10(port_str, &n) == 0) { -+ cmd_args->brick_port = n; -+ port_str = strtok_r(NULL, ",", &tmp_str); -+ if (port_str) { -+ if (gf_string2uint_base10(port_str, &n) == 0) { -+ cmd_args->brick_port2 = n; -+ break; -+ } -+ argp_failure(state, -1, 0, -+ "wrong brick (listen) port %s", arg); - } -- argp_failure(state, -1, 0, "wrong brick (listen) port %s", -- arg); -+ break; - } -- break; - } - - argp_failure(state, -1, 0, "unknown brick (listen) port %s", arg); -diff --git a/libglusterfs/src/inode.c b/libglusterfs/src/inode.c -index 9dbb25b..4c3c546 100644 ---- a/libglusterfs/src/inode.c -+++ b/libglusterfs/src/inode.c -@@ -899,6 +899,9 @@ inode_resolve(inode_table_t *table, char *path) - - parent = inode_ref(table->root); - str = tmp = gf_strdup(path); -+ if (str == NULL) { -+ goto out; -+ } - - while (1) { - bname = strtok_r(str, "/", &saveptr); -diff --git a/rpc/rpc-lib/src/rpcsvc.c b/rpc/rpc-lib/src/rpcsvc.c -index 5a35139..b058932 100644 ---- a/rpc/rpc-lib/src/rpcsvc.c -+++ b/rpc/rpc-lib/src/rpcsvc.c -@@ -2874,6 +2874,10 @@ rpcsvc_transport_peer_check_search(dict_t *options, char *pattern, char *ip, - } - - dup_addrstr = gf_strdup(addrstr); -+ if (dup_addrstr == NULL) { -+ ret = -1; -+ goto err; -+ } - addrtok = strtok_r(dup_addrstr, ",", &svptr); - while (addrtok) { - /* CASEFOLD not present on Solaris */ -diff --git a/xlators/cluster/dht/src/dht-shared.c b/xlators/cluster/dht/src/dht-shared.c -index ea4b7c6..58e3339 100644 ---- a/xlators/cluster/dht/src/dht-shared.c -+++ b/xlators/cluster/dht/src/dht-shared.c -@@ -278,6 +278,10 @@ dht_parse_decommissioned_bricks(xlator_t *this, dht_conf_t *conf, - goto out; - - dup_brick = gf_strdup(bricks); -+ if (dup_brick == NULL) { -+ goto out; -+ } -+ - node = strtok_r(dup_brick, ",", &tmpstr); - while (node) { - for (i = 0; i < conf->subvolume_cnt; i++) { -diff --git a/xlators/cluster/dht/src/switch.c b/xlators/cluster/dht/src/switch.c -index a782fcd..207d109 100644 ---- a/xlators/cluster/dht/src/switch.c -+++ b/xlators/cluster/dht/src/switch.c -@@ -610,9 +610,15 @@ set_switch_pattern(xlator_t *this, dht_conf_t *conf, const char *pattern_str) - /* Get the pattern for considering switch case. - "option block-size *avi:10MB" etc */ - option_string = gf_strdup(pattern_str); -+ if (option_string == NULL) { -+ goto err; -+ } - switch_str = strtok_r(option_string, ";", &tmp_str); - while (switch_str) { - dup_str = gf_strdup(switch_str); -+ if (dup_str == NULL) { -+ goto err; -+ } - switch_opt = GF_CALLOC(1, sizeof(struct switch_struct), - gf_switch_mt_switch_struct); - if (!switch_opt) { -@@ -647,6 +653,9 @@ set_switch_pattern(xlator_t *this, dht_conf_t *conf, const char *pattern_str) - - if (childs) { - dup_childs = gf_strdup(childs); -+ if (dup_childs == NULL) { -+ goto err; -+ } - child = strtok_r(dup_childs, ",", &tmp); - while (child) { - if (gf_switch_valid_child(this, child)) { -diff --git a/xlators/features/trash/src/trash.c b/xlators/features/trash/src/trash.c -index d668436..f96ed73 100644 ---- a/xlators/features/trash/src/trash.c -+++ b/xlators/features/trash/src/trash.c -@@ -170,7 +170,7 @@ store_eliminate_path(char *str, trash_elim_path **eliminate) - int ret = 0; - char *strtokptr = NULL; - -- if (eliminate == NULL) { -+ if ((str == NULL) || (eliminate == NULL)) { - ret = EINVAL; - goto out; - } -diff --git a/xlators/mgmt/glusterd/src/glusterd-geo-rep.c b/xlators/mgmt/glusterd/src/glusterd-geo-rep.c -index 0f40bea..85c06c1 100644 ---- a/xlators/mgmt/glusterd/src/glusterd-geo-rep.c -+++ b/xlators/mgmt/glusterd/src/glusterd-geo-rep.c -@@ -5981,7 +5981,7 @@ glusterd_get_slave_info(char *slave, char **slave_url, char **hostname, - GF_ASSERT(this); - - ret = glusterd_urltransform_single(slave, "normalize", &linearr); -- if (ret == -1) { -+ if ((ret == -1) || (linearr[0] == NULL)) { - ret = snprintf(errmsg, sizeof(errmsg) - 1, "Invalid Url: %s", slave); - errmsg[ret] = '\0'; - *op_errstr = gf_strdup(errmsg); -@@ -5992,7 +5992,10 @@ glusterd_get_slave_info(char *slave, char **slave_url, char **hostname, - - tmp = strtok_r(linearr[0], "/", &save_ptr); - tmp = strtok_r(NULL, "/", &save_ptr); -- slave = strtok_r(tmp, ":", &save_ptr); -+ slave = NULL; -+ if (tmp != NULL) { -+ slave = strtok_r(tmp, ":", &save_ptr); -+ } - if (slave) { - ret = glusterd_geo_rep_parse_slave(slave, hostname, op_errstr); - if (ret) { -diff --git a/xlators/nfs/server/src/mount3.c b/xlators/nfs/server/src/mount3.c -index 396809c..734453c 100644 ---- a/xlators/nfs/server/src/mount3.c -+++ b/xlators/nfs/server/src/mount3.c -@@ -3205,6 +3205,12 @@ mnt3_export_parse_auth_param(struct mnt3_export *exp, char *exportpath) - struct host_auth_spec *host = NULL; - int ret = 0; - -+ if (exportpath == NULL) { -+ gf_msg(GF_MNT, GF_LOG_ERROR, EINVAL, NFS_MSG_PARSE_HOSTSPEC_FAIL, -+ "Export path is NULL"); -+ return -1; -+ } -+ - /* Using exportpath directly in strtok_r because we want - * to strip off AUTH parameter from exportpath. */ - token = strtok_r(exportpath, "(", &savPtr); -diff --git a/xlators/protocol/client/src/client.c b/xlators/protocol/client/src/client.c -index e156d4d..ed855ca 100644 ---- a/xlators/protocol/client/src/client.c -+++ b/xlators/protocol/client/src/client.c -@@ -1222,9 +1222,12 @@ client_set_remote_options(char *value, xlator_t *this) - char *remote_port_str = NULL; - char *tmp = NULL; - int remote_port = 0; -- int ret = 0; -+ int ret = -1; - - dup_value = gf_strdup(value); -+ if (dup_value == NULL) { -+ goto out; -+ } - host = strtok_r(dup_value, ":", &tmp); - subvol = strtok_r(NULL, ":", &tmp); - remote_port_str = strtok_r(NULL, ":", &tmp); -@@ -1238,6 +1241,7 @@ client_set_remote_options(char *value, xlator_t *this) - if (ret) { - gf_msg(this->name, GF_LOG_WARNING, 0, PC_MSG_DICT_SET_FAILED, - "failed to set remote-host with %s", host); -+ GF_FREE(host_dup); - goto out; - } - } -@@ -1252,6 +1256,7 @@ client_set_remote_options(char *value, xlator_t *this) - if (ret) { - gf_msg(this->name, GF_LOG_WARNING, 0, PC_MSG_DICT_SET_FAILED, - "failed to set remote-host with %s", host); -+ GF_FREE(subvol_dup); - goto out; - } - } -diff --git a/xlators/storage/posix/src/posix-helpers.c b/xlators/storage/posix/src/posix-helpers.c -index 949c799..2336add 100644 ---- a/xlators/storage/posix/src/posix-helpers.c -+++ b/xlators/storage/posix/src/posix-helpers.c -@@ -390,6 +390,9 @@ _posix_get_marker_quota_contributions(posix_xattr_filler_t *filler, char *key) - int i = 0, ret = 0; - - tmp_key = ptr = gf_strdup(key); -+ if (tmp_key == NULL) { -+ return -1; -+ } - for (i = 0; i < 4; i++) { - token = strtok_r(tmp_key, ".", &saveptr); - tmp_key = NULL; --- -1.8.3.1 - diff --git a/SOURCES/0431-glusterd-check-for-same-node-while-adding-bricks-in-.patch b/SOURCES/0431-glusterd-check-for-same-node-while-adding-bricks-in-.patch deleted file mode 100644 index 341cfc1..0000000 --- a/SOURCES/0431-glusterd-check-for-same-node-while-adding-bricks-in-.patch +++ /dev/null @@ -1,638 +0,0 @@ -From d7c52ddd2cbadb1d9a55767c2f7fe6ba38d9a2ed Mon Sep 17 00:00:00 2001 -From: Sheetal Pamecha -Date: Wed, 20 Nov 2019 12:42:12 +0530 -Subject: [PATCH 431/449] glusterd: check for same node while adding bricks in - disperse volume - -The optimal way for configuring disperse and replicate volumes -is to have all bricks in different nodes. - -During create operation it fails saying it is not optimal, user -must use force to over-ride this behavior. Implementing same -during add-brick operation to avoid situation where all the added -bricks end up from same host. Operation will error out accordingly. -and this can be over-ridden by using force same as create. - -> Upstream Patch Link: https://review.gluster.org/#/c/glusterfs/+/23729 -> fixes: #1047 -> Change-Id: I3ee9c97c1a14b73f4532893bc00187ef9355238b -> Signed-off-by: Sheetal Pamecha - -BUG: 1524457 -Change-Id: I3ee9c97c1a14b73f4532893bc00187ef9355238b -Signed-off-by: Sheetal Pamecha -Reviewed-on: https://code.engineering.redhat.com/gerrit/202621 -Tested-by: RHGS Build Bot -Reviewed-by: Sanju Rakonde -Reviewed-by: Sunil Kumar Heggodu Gopala Acharya ---- - xlators/mgmt/glusterd/src/glusterd-brick-ops.c | 20 +- - xlators/mgmt/glusterd/src/glusterd-utils.c | 224 ++++++++++++++++++ - xlators/mgmt/glusterd/src/glusterd-utils.h | 4 + - xlators/mgmt/glusterd/src/glusterd-volume-ops.c | 293 +++--------------------- - 4 files changed, 276 insertions(+), 265 deletions(-) - -diff --git a/xlators/mgmt/glusterd/src/glusterd-brick-ops.c b/xlators/mgmt/glusterd/src/glusterd-brick-ops.c -index c5141de..d424f31 100644 ---- a/xlators/mgmt/glusterd/src/glusterd-brick-ops.c -+++ b/xlators/mgmt/glusterd/src/glusterd-brick-ops.c -@@ -21,7 +21,6 @@ - #include "glusterd-messages.h" - #include "glusterd-server-quorum.h" - #include --#include "glusterd-volgen.h" - #include - #include - -@@ -1575,6 +1574,25 @@ glusterd_op_stage_add_brick(dict_t *dict, char **op_errstr, dict_t *rsp_dict) - - is_force = dict_get_str_boolean(dict, "force", _gf_false); - -+ /* Check brick order if the volume type is replicate or disperse. If -+ * force at the end of command not given then check brick order. -+ */ -+ -+ if (!is_force) { -+ if ((volinfo->type == GF_CLUSTER_TYPE_REPLICATE) || -+ (volinfo->type == GF_CLUSTER_TYPE_DISPERSE)) { -+ ret = glusterd_check_brick_order(dict, msg, volinfo->type); -+ if (ret) { -+ gf_msg(this->name, GF_LOG_ERROR, 0, GD_MSG_BAD_BRKORDER, -+ "Not adding brick because of " -+ "bad brick order. %s", -+ msg); -+ *op_errstr = gf_strdup(msg); -+ goto out; -+ } -+ } -+ } -+ - if (volinfo->replica_count < replica_count && !is_force) { - cds_list_for_each_entry(brickinfo, &volinfo->bricks, brick_list) - { -diff --git a/xlators/mgmt/glusterd/src/glusterd-utils.c b/xlators/mgmt/glusterd/src/glusterd-utils.c -index a1299bc..14e23d1 100644 ---- a/xlators/mgmt/glusterd/src/glusterd-utils.c -+++ b/xlators/mgmt/glusterd/src/glusterd-utils.c -@@ -14759,3 +14759,227 @@ glusterd_is_profile_on(glusterd_volinfo_t *volinfo) - return _gf_true; - return _gf_false; - } -+ -+static gf_ai_compare_t -+glusterd_compare_addrinfo(struct addrinfo *first, struct addrinfo *next) -+{ -+ int ret = -1; -+ struct addrinfo *tmp1 = NULL; -+ struct addrinfo *tmp2 = NULL; -+ char firstip[NI_MAXHOST] = {0.}; -+ char nextip[NI_MAXHOST] = { -+ 0, -+ }; -+ -+ for (tmp1 = first; tmp1 != NULL; tmp1 = tmp1->ai_next) { -+ ret = getnameinfo(tmp1->ai_addr, tmp1->ai_addrlen, firstip, NI_MAXHOST, -+ NULL, 0, NI_NUMERICHOST); -+ if (ret) -+ return GF_AI_COMPARE_ERROR; -+ for (tmp2 = next; tmp2 != NULL; tmp2 = tmp2->ai_next) { -+ ret = getnameinfo(tmp2->ai_addr, tmp2->ai_addrlen, nextip, -+ NI_MAXHOST, NULL, 0, NI_NUMERICHOST); -+ if (ret) -+ return GF_AI_COMPARE_ERROR; -+ if (!strcmp(firstip, nextip)) { -+ return GF_AI_COMPARE_MATCH; -+ } -+ } -+ } -+ return GF_AI_COMPARE_NO_MATCH; -+} -+ -+/* Check for non optimal brick order for Replicate/Disperse : -+ * Checks if bricks belonging to a replicate or disperse -+ * volume are present on the same server -+ */ -+int32_t -+glusterd_check_brick_order(dict_t *dict, char *err_str, int32_t type) -+{ -+ int ret = -1; -+ int i = 0; -+ int j = 0; -+ int k = 0; -+ xlator_t *this = NULL; -+ addrinfo_list_t *ai_list = NULL; -+ addrinfo_list_t *ai_list_tmp1 = NULL; -+ addrinfo_list_t *ai_list_tmp2 = NULL; -+ char *brick = NULL; -+ char *brick_list = NULL; -+ char *brick_list_dup = NULL; -+ char *brick_list_ptr = NULL; -+ char *tmpptr = NULL; -+ char *volname = NULL; -+ int32_t brick_count = 0; -+ int32_t sub_count = 0; -+ struct addrinfo *ai_info = NULL; -+ char brick_addr[128] = { -+ 0, -+ }; -+ int addrlen = 0; -+ -+ const char failed_string[2048] = -+ "Failed to perform brick order " -+ "check. Use 'force' at the end of the command" -+ " if you want to override this behavior. "; -+ const char found_string[2048] = -+ "Multiple bricks of a %s " -+ "volume are present on the same server. This " -+ "setup is not optimal. Bricks should be on " -+ "different nodes to have best fault tolerant " -+ "configuration. Use 'force' at the end of the " -+ "command if you want to override this " -+ "behavior. "; -+ -+ this = THIS; -+ -+ GF_ASSERT(this); -+ -+ ai_list = MALLOC(sizeof(addrinfo_list_t)); -+ ai_list->info = NULL; -+ CDS_INIT_LIST_HEAD(&ai_list->list); -+ -+ ret = dict_get_strn(dict, "volname", SLEN("volname"), &volname); -+ if (ret) { -+ gf_msg(this->name, GF_LOG_ERROR, 0, GD_MSG_DICT_GET_FAILED, -+ "Unable to get volume name"); -+ goto out; -+ } -+ -+ ret = dict_get_strn(dict, "bricks", SLEN("bricks"), &brick_list); -+ if (ret) { -+ gf_msg(this->name, GF_LOG_ERROR, 0, GD_MSG_DICT_GET_FAILED, -+ "Bricks check : Could not " -+ "retrieve bricks list"); -+ goto out; -+ } -+ -+ ret = dict_get_int32n(dict, "count", SLEN("count"), &brick_count); -+ if (ret) { -+ gf_msg(this->name, GF_LOG_ERROR, 0, GD_MSG_DICT_GET_FAILED, -+ "Bricks check : Could not " -+ "retrieve brick count"); -+ goto out; -+ } -+ -+ if (type != GF_CLUSTER_TYPE_DISPERSE) { -+ ret = dict_get_int32n(dict, "replica-count", SLEN("replica-count"), -+ &sub_count); -+ if (ret) { -+ gf_msg(this->name, GF_LOG_ERROR, 0, GD_MSG_DICT_GET_FAILED, -+ "Bricks check : Could" -+ " not retrieve replica count"); -+ goto out; -+ } -+ gf_msg_debug(this->name, 0, -+ "Replicate cluster type " -+ "found. Checking brick order."); -+ } else { -+ ret = dict_get_int32n(dict, "disperse-count", SLEN("disperse-count"), -+ &sub_count); -+ if (ret) { -+ gf_msg(this->name, GF_LOG_ERROR, 0, GD_MSG_DICT_GET_FAILED, -+ "Bricks check : Could" -+ " not retrieve disperse count"); -+ goto out; -+ } -+ gf_msg(this->name, GF_LOG_INFO, 0, GD_MSG_DISPERSE_CLUSTER_FOUND, -+ "Disperse cluster type" -+ " found. Checking brick order."); -+ } -+ brick_list_dup = brick_list_ptr = gf_strdup(brick_list); -+ /* Resolve hostnames and get addrinfo */ -+ while (i < brick_count) { -+ ++i; -+ brick = strtok_r(brick_list_dup, " \n", &tmpptr); -+ brick_list_dup = tmpptr; -+ if (brick == NULL) -+ goto check_failed; -+ tmpptr = strrchr(brick, ':'); -+ if (tmpptr == NULL) -+ goto check_failed; -+ addrlen = strlen(brick) - strlen(tmpptr); -+ strncpy(brick_addr, brick, addrlen); -+ brick_addr[addrlen] = '\0'; -+ ret = getaddrinfo(brick_addr, NULL, NULL, &ai_info); -+ if (ret != 0) { -+ ret = 0; -+ gf_msg(this->name, GF_LOG_ERROR, 0, GD_MSG_HOSTNAME_RESOLVE_FAIL, -+ "unable to resolve host name for addr %s", brick_addr); -+ goto out; -+ } -+ ai_list_tmp1 = MALLOC(sizeof(addrinfo_list_t)); -+ if (ai_list_tmp1 == NULL) { -+ ret = 0; -+ gf_msg(this->name, GF_LOG_ERROR, ENOMEM, GD_MSG_NO_MEMORY, -+ "failed to allocate " -+ "memory"); -+ freeaddrinfo(ai_info); -+ goto out; -+ } -+ ai_list_tmp1->info = ai_info; -+ cds_list_add_tail(&ai_list_tmp1->list, &ai_list->list); -+ ai_list_tmp1 = NULL; -+ } -+ -+ i = 0; -+ ai_list_tmp1 = cds_list_entry(ai_list->list.next, addrinfo_list_t, list); -+ -+ /* Check for bad brick order */ -+ while (i < brick_count) { -+ ++i; -+ ai_info = ai_list_tmp1->info; -+ ai_list_tmp1 = cds_list_entry(ai_list_tmp1->list.next, addrinfo_list_t, -+ list); -+ if (0 == i % sub_count) { -+ j = 0; -+ continue; -+ } -+ ai_list_tmp2 = ai_list_tmp1; -+ k = j; -+ while (k < sub_count - 1) { -+ ++k; -+ ret = glusterd_compare_addrinfo(ai_info, ai_list_tmp2->info); -+ if (GF_AI_COMPARE_ERROR == ret) -+ goto check_failed; -+ if (GF_AI_COMPARE_MATCH == ret) -+ goto found_bad_brick_order; -+ ai_list_tmp2 = cds_list_entry(ai_list_tmp2->list.next, -+ addrinfo_list_t, list); -+ } -+ ++j; -+ } -+ gf_msg_debug(this->name, 0, "Brick order okay"); -+ ret = 0; -+ goto out; -+ -+check_failed: -+ gf_msg(this->name, GF_LOG_ERROR, 0, GD_MSG_BAD_BRKORDER_CHECK_FAIL, -+ "Failed bad brick order check"); -+ snprintf(err_str, sizeof(failed_string), failed_string); -+ ret = -1; -+ goto out; -+ -+found_bad_brick_order: -+ gf_msg(this->name, GF_LOG_INFO, 0, GD_MSG_BAD_BRKORDER, -+ "Bad brick order found"); -+ if (type == GF_CLUSTER_TYPE_DISPERSE) { -+ snprintf(err_str, sizeof(found_string), found_string, "disperse"); -+ } else { -+ snprintf(err_str, sizeof(found_string), found_string, "replicate"); -+ } -+ -+ ret = -1; -+out: -+ ai_list_tmp2 = NULL; -+ GF_FREE(brick_list_ptr); -+ cds_list_for_each_entry(ai_list_tmp1, &ai_list->list, list) -+ { -+ if (ai_list_tmp1->info) -+ freeaddrinfo(ai_list_tmp1->info); -+ free(ai_list_tmp2); -+ ai_list_tmp2 = ai_list_tmp1; -+ } -+ free(ai_list_tmp2); -+ return ret; -+} -diff --git a/xlators/mgmt/glusterd/src/glusterd-utils.h b/xlators/mgmt/glusterd/src/glusterd-utils.h -index ead16b2..e2e2454 100644 ---- a/xlators/mgmt/glusterd/src/glusterd-utils.h -+++ b/xlators/mgmt/glusterd/src/glusterd-utils.h -@@ -881,4 +881,8 @@ glusterd_is_profile_on(glusterd_volinfo_t *volinfo); - - char * - search_brick_path_from_proc(pid_t brick_pid, char *brickpath); -+ -+int32_t -+glusterd_check_brick_order(dict_t *dict, char *err_str, int32_t type); -+ - #endif -diff --git a/xlators/mgmt/glusterd/src/glusterd-volume-ops.c b/xlators/mgmt/glusterd/src/glusterd-volume-ops.c -index 93042ab..8da2ff3 100644 ---- a/xlators/mgmt/glusterd/src/glusterd-volume-ops.c -+++ b/xlators/mgmt/glusterd/src/glusterd-volume-ops.c -@@ -41,240 +41,6 @@ - #define glusterd_op_start_volume_args_get(dict, volname, flags) \ - glusterd_op_stop_volume_args_get(dict, volname, flags) - --gf_ai_compare_t --glusterd_compare_addrinfo(struct addrinfo *first, struct addrinfo *next) --{ -- int ret = -1; -- struct addrinfo *tmp1 = NULL; -- struct addrinfo *tmp2 = NULL; -- char firstip[NI_MAXHOST] = {0.}; -- char nextip[NI_MAXHOST] = { -- 0, -- }; -- -- for (tmp1 = first; tmp1 != NULL; tmp1 = tmp1->ai_next) { -- ret = getnameinfo(tmp1->ai_addr, tmp1->ai_addrlen, firstip, NI_MAXHOST, -- NULL, 0, NI_NUMERICHOST); -- if (ret) -- return GF_AI_COMPARE_ERROR; -- for (tmp2 = next; tmp2 != NULL; tmp2 = tmp2->ai_next) { -- ret = getnameinfo(tmp2->ai_addr, tmp2->ai_addrlen, nextip, -- NI_MAXHOST, NULL, 0, NI_NUMERICHOST); -- if (ret) -- return GF_AI_COMPARE_ERROR; -- if (!strcmp(firstip, nextip)) { -- return GF_AI_COMPARE_MATCH; -- } -- } -- } -- return GF_AI_COMPARE_NO_MATCH; --} -- --/* Check for non optimal brick order for replicate : -- * Checks if bricks belonging to a replicate volume -- * are present on the same server -- */ --int32_t --glusterd_check_brick_order(dict_t *dict, char *err_str) --{ -- int ret = -1; -- int i = 0; -- int j = 0; -- int k = 0; -- xlator_t *this = NULL; -- addrinfo_list_t *ai_list = NULL; -- addrinfo_list_t *ai_list_tmp1 = NULL; -- addrinfo_list_t *ai_list_tmp2 = NULL; -- char *brick = NULL; -- char *brick_list = NULL; -- char *brick_list_dup = NULL; -- char *brick_list_ptr = NULL; -- char *tmpptr = NULL; -- char *volname = NULL; -- int32_t brick_count = 0; -- int32_t type = GF_CLUSTER_TYPE_NONE; -- int32_t sub_count = 0; -- struct addrinfo *ai_info = NULL; -- char brick_addr[128] = { -- 0, -- }; -- int addrlen = 0; -- -- const char failed_string[2048] = -- "Failed to perform brick order " -- "check. Use 'force' at the end of the command" -- " if you want to override this behavior. "; -- const char found_string[2048] = -- "Multiple bricks of a %s " -- "volume are present on the same server. This " -- "setup is not optimal. Bricks should be on " -- "different nodes to have best fault tolerant " -- "configuration. Use 'force' at the end of the " -- "command if you want to override this " -- "behavior. "; -- -- this = THIS; -- -- GF_ASSERT(this); -- -- ai_list = MALLOC(sizeof(addrinfo_list_t)); -- ai_list->info = NULL; -- CDS_INIT_LIST_HEAD(&ai_list->list); -- -- ret = dict_get_strn(dict, "volname", SLEN("volname"), &volname); -- if (ret) { -- gf_msg(this->name, GF_LOG_ERROR, 0, GD_MSG_DICT_GET_FAILED, -- "Unable to get volume name"); -- goto out; -- } -- -- ret = dict_get_int32n(dict, "type", SLEN("type"), &type); -- if (ret) { -- snprintf(err_str, 512, "Unable to get type of volume %s", volname); -- gf_msg(this->name, GF_LOG_WARNING, 0, GD_MSG_DICT_GET_FAILED, "%s", -- err_str); -- goto out; -- } -- -- ret = dict_get_strn(dict, "bricks", SLEN("bricks"), &brick_list); -- if (ret) { -- gf_msg(this->name, GF_LOG_ERROR, 0, GD_MSG_DICT_GET_FAILED, -- "Bricks check : Could not " -- "retrieve bricks list"); -- goto out; -- } -- -- ret = dict_get_int32n(dict, "count", SLEN("count"), &brick_count); -- if (ret) { -- gf_msg(this->name, GF_LOG_ERROR, 0, GD_MSG_DICT_GET_FAILED, -- "Bricks check : Could not " -- "retrieve brick count"); -- goto out; -- } -- -- if (type != GF_CLUSTER_TYPE_DISPERSE) { -- ret = dict_get_int32n(dict, "replica-count", SLEN("replica-count"), -- &sub_count); -- if (ret) { -- gf_msg(this->name, GF_LOG_ERROR, 0, GD_MSG_DICT_GET_FAILED, -- "Bricks check : Could" -- " not retrieve replica count"); -- goto out; -- } -- gf_msg_debug(this->name, 0, -- "Replicate cluster type " -- "found. Checking brick order."); -- } else { -- ret = dict_get_int32n(dict, "disperse-count", SLEN("disperse-count"), -- &sub_count); -- if (ret) { -- gf_msg(this->name, GF_LOG_ERROR, 0, GD_MSG_DICT_GET_FAILED, -- "Bricks check : Could" -- " not retrieve disperse count"); -- goto out; -- } -- gf_msg(this->name, GF_LOG_INFO, 0, GD_MSG_DISPERSE_CLUSTER_FOUND, -- "Disperse cluster type" -- " found. Checking brick order."); -- } -- -- brick_list_dup = brick_list_ptr = gf_strdup(brick_list); -- /* Resolve hostnames and get addrinfo */ -- while (i < brick_count) { -- ++i; -- brick = strtok_r(brick_list_dup, " \n", &tmpptr); -- brick_list_dup = tmpptr; -- if (brick == NULL) -- goto check_failed; -- tmpptr = strrchr(brick, ':'); -- if (tmpptr == NULL) -- goto check_failed; -- addrlen = strlen(brick) - strlen(tmpptr); -- strncpy(brick_addr, brick, addrlen); -- brick_addr[addrlen] = '\0'; -- ret = getaddrinfo(brick_addr, NULL, NULL, &ai_info); -- if (ret != 0) { -- ret = 0; -- gf_msg(this->name, GF_LOG_ERROR, 0, GD_MSG_HOSTNAME_RESOLVE_FAIL, -- "unable to resolve host name for addr %s", brick_addr); -- goto out; -- } -- ai_list_tmp1 = MALLOC(sizeof(addrinfo_list_t)); -- if (ai_list_tmp1 == NULL) { -- ret = 0; -- gf_msg(this->name, GF_LOG_ERROR, ENOMEM, GD_MSG_NO_MEMORY, -- "failed to allocate " -- "memory"); -- freeaddrinfo(ai_info); -- goto out; -- } -- ai_list_tmp1->info = ai_info; -- cds_list_add_tail(&ai_list_tmp1->list, &ai_list->list); -- ai_list_tmp1 = NULL; -- } -- -- i = 0; -- ai_list_tmp1 = cds_list_entry(ai_list->list.next, addrinfo_list_t, list); -- -- /* Check for bad brick order */ -- while (i < brick_count) { -- ++i; -- ai_info = ai_list_tmp1->info; -- ai_list_tmp1 = cds_list_entry(ai_list_tmp1->list.next, addrinfo_list_t, -- list); -- if (0 == i % sub_count) { -- j = 0; -- continue; -- } -- ai_list_tmp2 = ai_list_tmp1; -- k = j; -- while (k < sub_count - 1) { -- ++k; -- ret = glusterd_compare_addrinfo(ai_info, ai_list_tmp2->info); -- if (GF_AI_COMPARE_ERROR == ret) -- goto check_failed; -- if (GF_AI_COMPARE_MATCH == ret) -- goto found_bad_brick_order; -- ai_list_tmp2 = cds_list_entry(ai_list_tmp2->list.next, -- addrinfo_list_t, list); -- } -- ++j; -- } -- gf_msg_debug(this->name, 0, "Brick order okay"); -- ret = 0; -- goto out; -- --check_failed: -- gf_msg(this->name, GF_LOG_ERROR, 0, GD_MSG_BAD_BRKORDER_CHECK_FAIL, -- "Failed bad brick order check"); -- snprintf(err_str, sizeof(failed_string), failed_string); -- ret = -1; -- goto out; -- --found_bad_brick_order: -- gf_msg(this->name, GF_LOG_INFO, 0, GD_MSG_BAD_BRKORDER, -- "Bad brick order found"); -- if (type == GF_CLUSTER_TYPE_DISPERSE) { -- snprintf(err_str, sizeof(found_string), found_string, "disperse"); -- } else { -- snprintf(err_str, sizeof(found_string), found_string, "replicate"); -- } -- -- ret = -1; --out: -- ai_list_tmp2 = NULL; -- GF_FREE(brick_list_ptr); -- cds_list_for_each_entry(ai_list_tmp1, &ai_list->list, list) -- { -- if (ai_list_tmp1->info) -- freeaddrinfo(ai_list_tmp1->info); -- free(ai_list_tmp2); -- ai_list_tmp2 = ai_list_tmp1; -- } -- free(ai_list_tmp2); -- return ret; --} -- - int - __glusterd_handle_create_volume(rpcsvc_request_t *req) - { -@@ -1337,6 +1103,35 @@ glusterd_op_stage_create_volume(dict_t *dict, char **op_errstr, - } - } - -+ /*Check brick order if the volume type is replicate or disperse. If -+ * force at the end of command not given then check brick order. -+ */ -+ if (is_origin_glusterd(dict)) { -+ ret = dict_get_int32n(dict, "type", SLEN("type"), &type); -+ if (ret) { -+ snprintf(msg, sizeof(msg), -+ "Unable to get type of " -+ "volume %s", -+ volname); -+ gf_msg(this->name, GF_LOG_WARNING, 0, GD_MSG_DICT_GET_FAILED, "%s", -+ msg); -+ goto out; -+ } -+ -+ if (!is_force) { -+ if ((type == GF_CLUSTER_TYPE_REPLICATE) || -+ (type == GF_CLUSTER_TYPE_DISPERSE)) { -+ ret = glusterd_check_brick_order(dict, msg, type); -+ if (ret) { -+ gf_msg(this->name, GF_LOG_ERROR, 0, GD_MSG_BAD_BRKORDER, -+ "Not creating volume because of " -+ "bad brick order"); -+ goto out; -+ } -+ } -+ } -+ } -+ - while (i < brick_count) { - i++; - brick = strtok_r(brick_list, " \n", &tmpptr); -@@ -1423,36 +1218,6 @@ glusterd_op_stage_create_volume(dict_t *dict, char **op_errstr, - brick_info = NULL; - } - -- /*Check brick order if the volume type is replicate or disperse. If -- * force at the end of command not given then check brick order. -- */ -- if (is_origin_glusterd(dict)) { -- ret = dict_get_int32n(dict, "type", SLEN("type"), &type); -- if (ret) { -- snprintf(msg, sizeof(msg), -- "Unable to get type of " -- "volume %s", -- volname); -- gf_msg(this->name, GF_LOG_WARNING, 0, GD_MSG_DICT_GET_FAILED, "%s", -- msg); -- goto out; -- } -- -- if (!is_force) { -- if ((type == GF_CLUSTER_TYPE_REPLICATE) || -- (type == GF_CLUSTER_TYPE_DISPERSE)) { -- ret = glusterd_check_brick_order(dict, msg); -- if (ret) { -- gf_msg(this->name, GF_LOG_ERROR, 0, GD_MSG_BAD_BRKORDER, -- "Not " -- "creating volume because of " -- "bad brick order"); -- goto out; -- } -- } -- } -- } -- - ret = dict_set_int32n(rsp_dict, "brick_count", SLEN("brick_count"), - local_brick_count); - if (ret) { --- -1.8.3.1 - diff --git a/SOURCES/0432-glusterd-Fix-coverity-defects-put-coverity-annotatio.patch b/SOURCES/0432-glusterd-Fix-coverity-defects-put-coverity-annotatio.patch deleted file mode 100644 index ef589de..0000000 --- a/SOURCES/0432-glusterd-Fix-coverity-defects-put-coverity-annotatio.patch +++ /dev/null @@ -1,503 +0,0 @@ -From aa215163cb7d806dc98bef2386a4e282a5e54a31 Mon Sep 17 00:00:00 2001 -From: Atin Mukherjee -Date: Thu, 25 Apr 2019 12:00:52 +0530 -Subject: [PATCH 432/449] glusterd: Fix coverity defects & put coverity - annotations - -Along with fixing few defect, put the required annotations for the defects which -are marked ignore/false positive/intentional as per the coverity defect sheet. -This should avoid the per component graph showing many defects as open in the -coverity glusterfs web page. - -> upstream patch link: https://review.gluster.org/#/c/glusterfs/+/22619/ -> Updates: bz#789278 -> Change-Id: I19461dc3603a3bd8f88866a1ab3db43d783af8e4 -> Signed-off-by: Atin Mukherjee - -BUG: 1787310 -Change-Id: I19461dc3603a3bd8f88866a1ab3db43d783af8e4 -Signed-off-by: Sanju Rakonde -Reviewed-on: https://code.engineering.redhat.com/gerrit/202631 -Tested-by: RHGS Build Bot -Reviewed-by: Sunil Kumar Heggodu Gopala Acharya ---- - xlators/mgmt/glusterd/src/glusterd-brick-ops.c | 7 +++-- - xlators/mgmt/glusterd/src/glusterd-geo-rep.c | 3 +- - .../glusterd/src/glusterd-gfproxyd-svc-helper.c | 2 +- - xlators/mgmt/glusterd/src/glusterd-handler.c | 8 ++++- - xlators/mgmt/glusterd/src/glusterd-mountbroker.c | 5 ++- - xlators/mgmt/glusterd/src/glusterd-op-sm.c | 8 +++++ - xlators/mgmt/glusterd/src/glusterd-peer-utils.c | 2 ++ - xlators/mgmt/glusterd/src/glusterd-server-quorum.c | 1 + - xlators/mgmt/glusterd/src/glusterd-store.c | 4 --- - xlators/mgmt/glusterd/src/glusterd-svc-helper.c | 4 +-- - xlators/mgmt/glusterd/src/glusterd-syncop.c | 1 + - .../mgmt/glusterd/src/glusterd-tierd-svc-helper.c | 4 +-- - xlators/mgmt/glusterd/src/glusterd-utils.c | 9 ++++-- - xlators/mgmt/glusterd/src/glusterd-volgen.c | 36 +++++++++++++--------- - 14 files changed, 63 insertions(+), 31 deletions(-) - -diff --git a/xlators/mgmt/glusterd/src/glusterd-brick-ops.c b/xlators/mgmt/glusterd/src/glusterd-brick-ops.c -index d424f31..121346c 100644 ---- a/xlators/mgmt/glusterd/src/glusterd-brick-ops.c -+++ b/xlators/mgmt/glusterd/src/glusterd-brick-ops.c -@@ -2032,7 +2032,6 @@ glusterd_op_stage_remove_brick(dict_t *dict, char **op_errstr) - case GF_OP_CMD_STATUS: - ret = 0; - goto out; -- - case GF_OP_CMD_DETACH_START: - if (volinfo->type != GF_CLUSTER_TYPE_TIER) { - snprintf(msg, sizeof(msg), -@@ -2044,7 +2043,7 @@ glusterd_op_stage_remove_brick(dict_t *dict, char **op_errstr) - errstr); - goto out; - } -- -+ /* Fall through */ - case GF_OP_CMD_START: { - if ((volinfo->type == GF_CLUSTER_TYPE_REPLICATE) && - dict_getn(dict, "replica-count", SLEN("replica-count"))) { -@@ -2259,7 +2258,8 @@ out: - if (op_errstr) - *op_errstr = errstr; - } -- -+ if (!op_errstr && errstr) -+ GF_FREE(errstr); - return ret; - } - -@@ -2687,6 +2687,7 @@ glusterd_op_remove_brick(dict_t *dict, char **op_errstr) - * Update defrag_cmd as well or it will only be done - * for nodes on which the brick to be removed exists. - */ -+ /* coverity[MIXED_ENUMS] */ - volinfo->rebal.defrag_cmd = cmd; - volinfo->rebal.defrag_status = GF_DEFRAG_STATUS_NOT_STARTED; - ret = dict_get_strn(dict, GF_REMOVE_BRICK_TID_KEY, -diff --git a/xlators/mgmt/glusterd/src/glusterd-geo-rep.c b/xlators/mgmt/glusterd/src/glusterd-geo-rep.c -index 85c06c1..5a91df4 100644 ---- a/xlators/mgmt/glusterd/src/glusterd-geo-rep.c -+++ b/xlators/mgmt/glusterd/src/glusterd-geo-rep.c -@@ -4107,6 +4107,7 @@ gd_pause_or_resume_gsync(dict_t *dict, char *master, char *slave, - - out: - sys_close(pfd); -+ /* coverity[INTEGER_OVERFLOW] */ - return ret; - } - -@@ -4183,7 +4184,7 @@ stop_gsync(char *master, char *slave, char **msg, char *conf_path, - - out: - sys_close(pfd); -- -+ /* coverity[INTEGER_OVERFLOW] */ - return ret; - } - -diff --git a/xlators/mgmt/glusterd/src/glusterd-gfproxyd-svc-helper.c b/xlators/mgmt/glusterd/src/glusterd-gfproxyd-svc-helper.c -index 67e3f41..e338bf4 100644 ---- a/xlators/mgmt/glusterd/src/glusterd-gfproxyd-svc-helper.c -+++ b/xlators/mgmt/glusterd/src/glusterd-gfproxyd-svc-helper.c -@@ -111,7 +111,7 @@ glusterd_svc_get_gfproxyd_volfile(glusterd_volinfo_t *volinfo, char *svc_name, - goto out; - } - -- /* coverity[secure_temp] mkstemp uses 0600 as the mode and is safe */ -+ /* coverity[SECURE_TEMP] mkstemp uses 0600 as the mode and is safe */ - tmp_fd = mkstemp(*tmpvol); - if (tmp_fd < 0) { - gf_msg("glusterd", GF_LOG_WARNING, errno, GD_MSG_FILE_OP_FAILED, -diff --git a/xlators/mgmt/glusterd/src/glusterd-handler.c b/xlators/mgmt/glusterd/src/glusterd-handler.c -index 2e73c98..1f31e72 100644 ---- a/xlators/mgmt/glusterd/src/glusterd-handler.c -+++ b/xlators/mgmt/glusterd/src/glusterd-handler.c -@@ -930,6 +930,7 @@ __glusterd_handle_cluster_lock(rpcsvc_request_t *req) - - op_ctx = dict_new(); - if (!op_ctx) { -+ ret = -1; - gf_msg(this->name, GF_LOG_ERROR, ENOMEM, GD_MSG_DICT_CREATE_FAIL, - "Unable to set new dict"); - goto out; -@@ -956,6 +957,9 @@ out: - glusterd_friend_sm(); - glusterd_op_sm(); - -+ if (ret) -+ GF_FREE(ctx); -+ - return ret; - } - -@@ -3470,6 +3474,7 @@ glusterd_rpc_create(struct rpc_clnt **rpc, dict_t *options, - GF_ASSERT(this); - - GF_ASSERT(options); -+ GF_VALIDATE_OR_GOTO(this->name, rpc, out); - - if (force && rpc && *rpc) { - (void)rpc_clnt_unref(*rpc); -@@ -3482,7 +3487,6 @@ glusterd_rpc_create(struct rpc_clnt **rpc, dict_t *options, - goto out; - - ret = rpc_clnt_register_notify(new_rpc, notify_fn, notify_data); -- *rpc = new_rpc; - if (ret) - goto out; - ret = rpc_clnt_start(new_rpc); -@@ -3491,6 +3495,8 @@ out: - if (new_rpc) { - (void)rpc_clnt_unref(new_rpc); - } -+ } else { -+ *rpc = new_rpc; - } - - gf_msg_debug(this->name, 0, "returning %d", ret); -diff --git a/xlators/mgmt/glusterd/src/glusterd-mountbroker.c b/xlators/mgmt/glusterd/src/glusterd-mountbroker.c -index 332ddef..c017ccb 100644 ---- a/xlators/mgmt/glusterd/src/glusterd-mountbroker.c -+++ b/xlators/mgmt/glusterd/src/glusterd-mountbroker.c -@@ -334,7 +334,10 @@ make_ghadoop_mountspec(gf_mount_spec_t *mspec, const char *volname, char *user, - if (ret == -1) - return ret; - -- return parse_mount_pattern_desc(mspec, hadoop_mnt_desc); -+ ret = parse_mount_pattern_desc(mspec, hadoop_mnt_desc); -+ GF_FREE(hadoop_mnt_desc); -+ -+ return ret; - } - - static gf_boolean_t -diff --git a/xlators/mgmt/glusterd/src/glusterd-op-sm.c b/xlators/mgmt/glusterd/src/glusterd-op-sm.c -index 6475611..46fc607 100644 ---- a/xlators/mgmt/glusterd/src/glusterd-op-sm.c -+++ b/xlators/mgmt/glusterd/src/glusterd-op-sm.c -@@ -2467,6 +2467,7 @@ glusterd_start_bricks(glusterd_volinfo_t *volinfo) - if (!brickinfo->start_triggered) { - pthread_mutex_lock(&brickinfo->restart_mutex); - { -+ /* coverity[SLEEP] */ - ret = glusterd_brick_start(volinfo, brickinfo, _gf_false, - _gf_false); - } -@@ -3466,6 +3467,7 @@ _add_task_to_dict(dict_t *dict, glusterd_volinfo_t *volinfo, int op, int index) - - switch (op) { - case GD_OP_REMOVE_TIER_BRICK: -+ /* Fall through */ - case GD_OP_REMOVE_BRICK: - snprintf(key, sizeof(key), "task%d", index); - ret = _add_remove_bricks_to_dict(dict, volinfo, key); -@@ -7550,6 +7552,7 @@ glusterd_op_ac_send_brick_op(glusterd_op_sm_event_t *event, void *ctx) - glusterd_op_t op = GD_OP_NONE; - glusterd_req_ctx_t *req_ctx = NULL; - char *op_errstr = NULL; -+ gf_boolean_t free_req_ctx = _gf_false; - - this = THIS; - priv = this->private; -@@ -7558,6 +7561,9 @@ glusterd_op_ac_send_brick_op(glusterd_op_sm_event_t *event, void *ctx) - req_ctx = ctx; - } else { - req_ctx = GF_CALLOC(1, sizeof(*req_ctx), gf_gld_mt_op_allack_ctx_t); -+ if (!req_ctx) -+ goto out; -+ free_req_ctx = _gf_true; - op = glusterd_op_get_op(); - req_ctx->op = op; - gf_uuid_copy(req_ctx->uuid, MY_UUID); -@@ -7588,6 +7594,8 @@ glusterd_op_ac_send_brick_op(glusterd_op_sm_event_t *event, void *ctx) - } - - out: -+ if (ret && req_ctx && free_req_ctx) -+ GF_FREE(req_ctx); - gf_msg_debug(this->name, 0, "Returning with %d", ret); - - return ret; -diff --git a/xlators/mgmt/glusterd/src/glusterd-peer-utils.c b/xlators/mgmt/glusterd/src/glusterd-peer-utils.c -index 8c1feeb..1a65359 100644 ---- a/xlators/mgmt/glusterd/src/glusterd-peer-utils.c -+++ b/xlators/mgmt/glusterd/src/glusterd-peer-utils.c -@@ -82,6 +82,7 @@ glusterd_peerinfo_cleanup(glusterd_peerinfo_t *peerinfo) - call_rcu(&peerinfo->rcu_head.head, glusterd_peerinfo_destroy); - - if (quorum_action) -+ /* coverity[SLEEP] */ - glusterd_do_quorum_action(); - return 0; - } -@@ -358,6 +359,7 @@ glusterd_uuid_to_hostname(uuid_t uuid) - - if (!gf_uuid_compare(MY_UUID, uuid)) { - hostname = gf_strdup("localhost"); -+ return hostname; - } - RCU_READ_LOCK; - if (!cds_list_empty(&priv->peers)) { -diff --git a/xlators/mgmt/glusterd/src/glusterd-server-quorum.c b/xlators/mgmt/glusterd/src/glusterd-server-quorum.c -index fd334e6..f378187 100644 ---- a/xlators/mgmt/glusterd/src/glusterd-server-quorum.c -+++ b/xlators/mgmt/glusterd/src/glusterd-server-quorum.c -@@ -372,6 +372,7 @@ glusterd_do_volume_quorum_action(xlator_t *this, glusterd_volinfo_t *volinfo, - if (!brickinfo->start_triggered) { - pthread_mutex_lock(&brickinfo->restart_mutex); - { -+ /* coverity[SLEEP] */ - ret = glusterd_brick_start(volinfo, brickinfo, _gf_false, - _gf_false); - } -diff --git a/xlators/mgmt/glusterd/src/glusterd-store.c b/xlators/mgmt/glusterd/src/glusterd-store.c -index b3b5ee9..4fa8116 100644 ---- a/xlators/mgmt/glusterd/src/glusterd-store.c -+++ b/xlators/mgmt/glusterd/src/glusterd-store.c -@@ -4764,10 +4764,6 @@ glusterd_store_retrieve_peers(xlator_t *this) - */ - address = cds_list_entry(peerinfo->hostnames.next, - glusterd_peer_hostname_t, hostname_list); -- if (!address) { -- ret = -1; -- goto next; -- } - peerinfo->hostname = gf_strdup(address->hostname); - - ret = glusterd_friend_add_from_peerinfo(peerinfo, 1, NULL); -diff --git a/xlators/mgmt/glusterd/src/glusterd-svc-helper.c b/xlators/mgmt/glusterd/src/glusterd-svc-helper.c -index ca19a75..1d1f42d 100644 ---- a/xlators/mgmt/glusterd/src/glusterd-svc-helper.c -+++ b/xlators/mgmt/glusterd/src/glusterd-svc-helper.c -@@ -179,7 +179,7 @@ glusterd_svc_check_volfile_identical(char *svc_name, - goto out; - } - -- /* coverity[secure_temp] mkstemp uses 0600 as the mode and is safe */ -+ /* coverity[SECURE_TEMP] mkstemp uses 0600 as the mode and is safe */ - tmp_fd = mkstemp(tmpvol); - if (tmp_fd < 0) { - gf_msg(this->name, GF_LOG_WARNING, errno, GD_MSG_FILE_OP_FAILED, -@@ -241,7 +241,7 @@ glusterd_svc_check_topology_identical(char *svc_name, - goto out; - } - -- /* coverity[secure_temp] mkstemp uses 0600 as the mode and is safe */ -+ /* coverity[SECURE_TEMP] mkstemp uses 0600 as the mode and is safe */ - tmpfd = mkstemp(tmpvol); - if (tmpfd < 0) { - gf_msg(this->name, GF_LOG_WARNING, errno, GD_MSG_FILE_OP_FAILED, -diff --git a/xlators/mgmt/glusterd/src/glusterd-syncop.c b/xlators/mgmt/glusterd/src/glusterd-syncop.c -index 618d8bc..9e47d14 100644 ---- a/xlators/mgmt/glusterd/src/glusterd-syncop.c -+++ b/xlators/mgmt/glusterd/src/glusterd-syncop.c -@@ -1752,6 +1752,7 @@ gd_brick_op_phase(glusterd_op_t op, dict_t *op_ctx, dict_t *req_dict, - if (dict_get(op_ctx, "client-count")) - break; - } -+ /* coverity[MIXED_ENUMS] */ - } else if (cmd == GF_OP_CMD_DETACH_START) { - op = GD_OP_REMOVE_BRICK; - dict_del(req_dict, "rebalance-command"); -diff --git a/xlators/mgmt/glusterd/src/glusterd-tierd-svc-helper.c b/xlators/mgmt/glusterd/src/glusterd-tierd-svc-helper.c -index 922eae7..59843a0 100644 ---- a/xlators/mgmt/glusterd/src/glusterd-tierd-svc-helper.c -+++ b/xlators/mgmt/glusterd/src/glusterd-tierd-svc-helper.c -@@ -116,7 +116,7 @@ glusterd_svc_check_tier_volfile_identical(char *svc_name, - goto out; - } - -- /* coverity[secure_temp] mkstemp uses 0600 as the mode and is safe */ -+ /* coverity[SECURE_TEMP] mkstemp uses 0600 as the mode and is safe */ - tmp_fd = mkstemp(tmpvol); - if (tmp_fd < 0) { - gf_msg(this->name, GF_LOG_WARNING, errno, GD_MSG_FILE_OP_FAILED, -@@ -177,7 +177,7 @@ glusterd_svc_check_tier_topology_identical(char *svc_name, - goto out; - } - -- /* coverity[secure_temp] mkstemp uses 0600 as the mode and is safe */ -+ /* coverity[SECURE_TEMP] mkstemp uses 0600 as the mode and is safe */ - tmpfd = mkstemp(tmpvol); - if (tmpfd < 0) { - gf_msg(this->name, GF_LOG_WARNING, errno, GD_MSG_FILE_OP_FAILED, -diff --git a/xlators/mgmt/glusterd/src/glusterd-utils.c b/xlators/mgmt/glusterd/src/glusterd-utils.c -index 14e23d1..8b0fc9a 100644 ---- a/xlators/mgmt/glusterd/src/glusterd-utils.c -+++ b/xlators/mgmt/glusterd/src/glusterd-utils.c -@@ -908,6 +908,7 @@ glusterd_create_sub_tier_volinfo(glusterd_volinfo_t *volinfo, - (*dup_volinfo)->brick_count = tier_info->cold_brick_count; - } - out: -+ /* coverity[REVERSE_NULL] */ - if (ret && *dup_volinfo) { - glusterd_volinfo_delete(*dup_volinfo); - *dup_volinfo = NULL; -@@ -2738,6 +2739,7 @@ glusterd_readin_file(const char *filepath, int *line_count) - /* Reduce allocation to minimal size. */ - p = GF_REALLOC(lines, (counter + 1) * sizeof(char *)); - if (!p) { -+ /* coverity[TAINTED_SCALAR] */ - free_lines(lines, counter); - lines = NULL; - goto out; -@@ -6782,6 +6784,7 @@ glusterd_restart_bricks(void *opaque) - if (!brickinfo->start_triggered) { - pthread_mutex_lock(&brickinfo->restart_mutex); - { -+ /* coverity[SLEEP] */ - glusterd_brick_start(volinfo, brickinfo, _gf_false, - _gf_false); - } -@@ -8886,7 +8889,7 @@ glusterd_nfs_statedump(char *options, int option_cnt, char **op_errstr) - kill(pid, SIGUSR1); - - sleep(1); -- -+ /* coverity[TAINTED_STRING] */ - sys_unlink(dumpoptions_path); - ret = 0; - out: -@@ -9012,6 +9015,7 @@ glusterd_quotad_statedump(char *options, int option_cnt, char **op_errstr) - - sleep(1); - -+ /* coverity[TAINTED_STRING] */ - sys_unlink(dumpoptions_path); - ret = 0; - out: -@@ -13423,7 +13427,7 @@ glusterd_get_global_options_for_all_vols(rpcsvc_request_t *req, dict_t *ctx, - if (key_fixed) - key = key_fixed; - } -- -+ /* coverity[CONSTANT_EXPRESSION_RESULT] */ - ALL_VOLUME_OPTION_CHECK("all", _gf_true, key, ret, op_errstr, out); - - for (i = 0; valid_all_vol_opts[i].option; i++) { -@@ -14153,6 +14157,7 @@ glusterd_disallow_op_for_tier(glusterd_volinfo_t *volinfo, glusterd_op_t op, - break; - case GD_OP_REMOVE_BRICK: - switch (cmd) { -+ /* coverity[MIXED_ENUMS] */ - case GF_DEFRAG_CMD_DETACH_START: - case GF_OP_CMD_DETACH_COMMIT_FORCE: - case GF_OP_CMD_DETACH_COMMIT: -diff --git a/xlators/mgmt/glusterd/src/glusterd-volgen.c b/xlators/mgmt/glusterd/src/glusterd-volgen.c -index 539e8a5..6852f8e 100644 ---- a/xlators/mgmt/glusterd/src/glusterd-volgen.c -+++ b/xlators/mgmt/glusterd/src/glusterd-volgen.c -@@ -322,7 +322,7 @@ volopt_trie_cbk(char *word, void *param) - } - - static int --process_nodevec(struct trienodevec *nodevec, char **hint) -+process_nodevec(struct trienodevec *nodevec, char **outputhint, char *inputhint) - { - int ret = 0; - char *hint1 = NULL; -@@ -331,14 +331,14 @@ process_nodevec(struct trienodevec *nodevec, char **hint) - trienode_t **nodes = nodevec->nodes; - - if (!nodes[0]) { -- *hint = NULL; -+ *outputhint = NULL; - return 0; - } - - #if 0 - /* Limit as in git */ - if (trienode_get_dist (nodes[0]) >= 6) { -- *hint = NULL; -+ *outputhint = NULL; - return 0; - } - #endif -@@ -347,23 +347,30 @@ process_nodevec(struct trienodevec *nodevec, char **hint) - return -1; - - if (nodevec->cnt < 2 || !nodes[1]) { -- *hint = hint1; -+ *outputhint = hint1; - return 0; - } - -- if (trienode_get_word(nodes[1], &hint2)) -+ if (trienode_get_word(nodes[1], &hint2)) { -+ GF_FREE(hint1); - return -1; -+ } - -- if (*hint) -- hintinfx = *hint; -- ret = gf_asprintf(hint, "%s or %s%s", hint1, hintinfx, hint2); -+ if (inputhint) -+ hintinfx = inputhint; -+ ret = gf_asprintf(outputhint, "%s or %s%s", hint1, hintinfx, hint2); - if (ret > 0) - ret = 0; -+ if (hint1) -+ GF_FREE(hint1); -+ if (hint2) -+ GF_FREE(hint2); - return ret; - } - - static int --volopt_trie_section(int lvl, char **patt, char *word, char **hint, int hints) -+volopt_trie_section(int lvl, char **patt, char *word, char **outputhint, -+ char *inputhint, int hints) - { - trienode_t *nodes[] = {NULL, NULL}; - struct trienodevec nodevec = {nodes, 2}; -@@ -384,7 +391,7 @@ volopt_trie_section(int lvl, char **patt, char *word, char **hint, int hints) - nodevec.cnt = hints; - ret = trie_measure_vec(trie, word, &nodevec); - if (!ret && nodevec.nodes[0]) -- ret = process_nodevec(&nodevec, hint); -+ ret = process_nodevec(&nodevec, outputhint, inputhint); - - trie_destroy(trie); - -@@ -396,6 +403,7 @@ volopt_trie(char *key, char **hint) - { - char *patt[] = {NULL}; - char *fullhint = NULL; -+ char *inputhint = NULL; - char *dot = NULL; - char *dom = NULL; - int len = 0; -@@ -405,7 +413,7 @@ volopt_trie(char *key, char **hint) - - dot = strchr(key, '.'); - if (!dot) -- return volopt_trie_section(1, patt, key, hint, 2); -+ return volopt_trie_section(1, patt, key, hint, inputhint, 2); - - len = dot - key; - dom = gf_strdup(key); -@@ -413,7 +421,7 @@ volopt_trie(char *key, char **hint) - return -1; - dom[len] = '\0'; - -- ret = volopt_trie_section(0, NULL, dom, patt, 1); -+ ret = volopt_trie_section(0, NULL, dom, patt, inputhint, 1); - GF_FREE(dom); - if (ret) { - patt[0] = NULL; -@@ -422,8 +430,8 @@ volopt_trie(char *key, char **hint) - if (!patt[0]) - goto out; - -- *hint = "..."; -- ret = volopt_trie_section(1, patt, dot + 1, hint, 2); -+ inputhint = "..."; -+ ret = volopt_trie_section(1, patt, dot + 1, hint, inputhint, 2); - if (ret) - goto out; - if (*hint) { --- -1.8.3.1 - diff --git a/SOURCES/0433-socket-Resolve-ssl_ctx-leak-for-a-brick-while-only-m.patch b/SOURCES/0433-socket-Resolve-ssl_ctx-leak-for-a-brick-while-only-m.patch deleted file mode 100644 index d980eb5..0000000 --- a/SOURCES/0433-socket-Resolve-ssl_ctx-leak-for-a-brick-while-only-m.patch +++ /dev/null @@ -1,54 +0,0 @@ -From 0e3871a57b7a621444dc5cfd49935a1e412f6436 Mon Sep 17 00:00:00 2001 -From: Mohit Agrawal -Date: Mon, 8 Jun 2020 13:27:50 +0530 -Subject: [PATCH 433/449] socket: Resolve ssl_ctx leak for a brick while only - mgmt SSL is enabled - -Problem: While only mgmt SSL is enabled for a brick process use_ssl flag - is false for a brick process and socket api's cleanup ssl_ctx only - while use_ssl and ssl_ctx both are valid - -Solution: To avoid a leak check only ssl_ctx, if it is valid cleanup - ssl_ctx - -> Fixes: #1196 -> Change-Id: I2f4295478f4149dcb7d608ea78ee5104f28812c3 -> Signed-off-by: Mohit Agrawal -> (Cherry pick from commit 9873baee34afdf0c20f5fc98a7dbf2a9f07447e2) -> (Reviewed on upstream link https://review.gluster.org/#/c/glusterfs/+/24366/) - -BUG: 1810924 -Change-Id: I2f4295478f4149dcb7d608ea78ee5104f28812c3 -Signed-off-by: Mohit Agrawal -Reviewed-on: https://code.engineering.redhat.com/gerrit/202625 -Tested-by: RHGS Build Bot -Reviewed-by: Sunil Kumar Heggodu Gopala Acharya ---- - rpc/rpc-transport/socket/src/socket.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/rpc/rpc-transport/socket/src/socket.c b/rpc/rpc-transport/socket/src/socket.c -index 226b2e2..54cd5df 100644 ---- a/rpc/rpc-transport/socket/src/socket.c -+++ b/rpc/rpc-transport/socket/src/socket.c -@@ -1163,7 +1163,7 @@ __socket_reset(rpc_transport_t *this) - SSL_free(priv->ssl_ssl); - priv->ssl_ssl = NULL; - } -- if (priv->use_ssl && priv->ssl_ctx) { -+ if (priv->ssl_ctx) { - SSL_CTX_free(priv->ssl_ctx); - priv->ssl_ctx = NULL; - } -@@ -4685,7 +4685,7 @@ fini(rpc_transport_t *this) - SSL_free(priv->ssl_ssl); - priv->ssl_ssl = NULL; - } -- if (priv->use_ssl && priv->ssl_ctx) { -+ if (priv->ssl_ctx) { - SSL_CTX_free(priv->ssl_ctx); - priv->ssl_ctx = NULL; - } --- -1.8.3.1 - diff --git a/SOURCES/0434-glusterd-ganesha-fix-Coverity-CID-1405785.patch b/SOURCES/0434-glusterd-ganesha-fix-Coverity-CID-1405785.patch deleted file mode 100644 index 3f038a3..0000000 --- a/SOURCES/0434-glusterd-ganesha-fix-Coverity-CID-1405785.patch +++ /dev/null @@ -1,39 +0,0 @@ -From 2ea3fc203671429d0aa9994e5bbd57f6a604523d Mon Sep 17 00:00:00 2001 -From: Xie Changlong -Date: Mon, 28 Oct 2019 17:43:28 +0800 -Subject: [PATCH 434/449] glusterd/ganesha: fix Coverity CID 1405785 - -To avoid double free - -> upstream patch link: https://review.gluster.org/#/c/glusterfs/+/23630/ -> updates: bz#789278 -> Change-Id: I15ae54ed696295d4cb015668722e77983b062ccb -> Signed-off-by: Xie Changlong - -BUG: 1787310 -Change-Id: I15ae54ed696295d4cb015668722e77983b062ccb -Signed-off-by: Sanju Rakonde -Reviewed-on: https://code.engineering.redhat.com/gerrit/202623 -Tested-by: RHGS Build Bot -Reviewed-by: Sunil Kumar Heggodu Gopala Acharya ---- - xlators/mgmt/glusterd/src/glusterd-ganesha.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/xlators/mgmt/glusterd/src/glusterd-ganesha.c b/xlators/mgmt/glusterd/src/glusterd-ganesha.c -index 06f028f..caba34f 100644 ---- a/xlators/mgmt/glusterd/src/glusterd-ganesha.c -+++ b/xlators/mgmt/glusterd/src/glusterd-ganesha.c -@@ -659,8 +659,8 @@ tear_down_cluster(gf_boolean_t run_teardown) - "Failed to close dir %s. Reason :" - " %s", - CONFDIR, strerror(errno)); -- goto exit; - } -+ goto exit; - } - - out: --- -1.8.3.1 - diff --git a/SOURCES/0435-glusterd-coverity-fix.patch b/SOURCES/0435-glusterd-coverity-fix.patch deleted file mode 100644 index f587107..0000000 --- a/SOURCES/0435-glusterd-coverity-fix.patch +++ /dev/null @@ -1,38 +0,0 @@ -From 9425fd5a49a17a8f91c13632ae055a6510b0b44c Mon Sep 17 00:00:00 2001 -From: Sanju Rakonde -Date: Fri, 17 May 2019 14:27:58 +0530 -Subject: [PATCH 435/449] glusterd: coverity fix - -CID: 1401345 - Unused value - -> upstream patch link: https://review.gluster.org/#/c/glusterfs/+/22737/ -> updates: bz#789278 -> Change-Id: I6b8f2611151ce0174042384b7632019c312ebae3 -> Signed-off-by: Sanju Rakonde - -BUG: 1787310 -Change-Id: I6b8f2611151ce0174042384b7632019c312ebae3 -Signed-off-by: Sanju Rakonde -Reviewed-on: https://code.engineering.redhat.com/gerrit/202622 -Tested-by: RHGS Build Bot -Reviewed-by: Sunil Kumar Heggodu Gopala Acharya ---- - xlators/mgmt/glusterd/src/glusterd-utils.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/xlators/mgmt/glusterd/src/glusterd-utils.c b/xlators/mgmt/glusterd/src/glusterd-utils.c -index 8b0fc9a..2eb2a76 100644 ---- a/xlators/mgmt/glusterd/src/glusterd-utils.c -+++ b/xlators/mgmt/glusterd/src/glusterd-utils.c -@@ -3740,7 +3740,7 @@ glusterd_compare_friend_volume(dict_t *peer_data, int32_t count, - * deleting a volume, so we shouldn't be trying to create a - * fresh volume here which would lead to a stale entry - */ -- if (stage_deleted == 0) -+ if (!ret && stage_deleted == 0) - *status = GLUSTERD_VOL_COMP_UPDATE_REQ; - ret = 0; - goto out; --- -1.8.3.1 - diff --git a/SOURCES/0436-glusterd-coverity-fixes.patch b/SOURCES/0436-glusterd-coverity-fixes.patch deleted file mode 100644 index 799681f..0000000 --- a/SOURCES/0436-glusterd-coverity-fixes.patch +++ /dev/null @@ -1,187 +0,0 @@ -From 179213798496448316547506da65dbd9fd741dfa Mon Sep 17 00:00:00 2001 -From: Atin Mukherjee -Date: Wed, 24 Apr 2019 22:02:51 +0530 -Subject: [PATCH 436/449] glusterd: coverity fixes - -Addresses the following: - -* CID 1124776: Resource leaks (RESOURCE_LEAK) - Variable "aa" going out -of scope leaks the storage it points to in glusterd-volgen.c - -* Bunch of CHECKED_RETURN defects in the callers of synctask_barrier_init - -* CID 1400742: Program hangs (LOCK) - adding annotation to fix this -false positive - -> upstream patch link: https://review.gluster.org/#/c/glusterfs/+/22615 -> Updates: bz#789278 -> Change-Id: I02f16e7eeb8c5cf72f7d0b29d00df4f03b3718b3 -> Signed-off-by: Atin Mukherjee - -BUG: 1787310 -Change-Id: I02f16e7eeb8c5cf72f7d0b29d00df4f03b3718b3 -Signed-off-by: Sanju Rakonde -Reviewed-on: https://code.engineering.redhat.com/gerrit/202626 -Tested-by: RHGS Build Bot -Reviewed-by: Sunil Kumar Heggodu Gopala Acharya ---- - xlators/mgmt/glusterd/src/glusterd-handler.c | 6 ++++++ - xlators/mgmt/glusterd/src/glusterd-mgmt.c | 24 +++++++++++++++++++----- - xlators/mgmt/glusterd/src/glusterd-syncop.c | 22 ++++++++++++++++++---- - xlators/mgmt/glusterd/src/glusterd-volgen.c | 5 +++-- - 4 files changed, 46 insertions(+), 11 deletions(-) - -diff --git a/xlators/mgmt/glusterd/src/glusterd-handler.c b/xlators/mgmt/glusterd/src/glusterd-handler.c -index 1f31e72..b8799ab 100644 ---- a/xlators/mgmt/glusterd/src/glusterd-handler.c -+++ b/xlators/mgmt/glusterd/src/glusterd-handler.c -@@ -3458,6 +3458,12 @@ glusterd_friend_remove(uuid_t uuid, char *hostname) - ret = glusterd_peerinfo_cleanup(peerinfo); - out: - gf_msg_debug(THIS->name, 0, "returning %d", ret); -+ /* We don't need to do a mutex unlock of peerinfo->delete_lock as the same -+ * will be anyway destroyed within glusterd_peerinfo_cleanup, coverity -+ * though cries about it -+ */ -+ /* coverity[LOCK] */ -+ - return ret; - } - -diff --git a/xlators/mgmt/glusterd/src/glusterd-mgmt.c b/xlators/mgmt/glusterd/src/glusterd-mgmt.c -index a4915f3..1e185d7 100644 ---- a/xlators/mgmt/glusterd/src/glusterd-mgmt.c -+++ b/xlators/mgmt/glusterd/src/glusterd-mgmt.c -@@ -757,7 +757,10 @@ glusterd_mgmt_v3_initiate_lockdown(glusterd_op_t op, dict_t *dict, - - /* Sending mgmt_v3 lock req to other nodes in the cluster */ - gd_syncargs_init(&args, NULL); -- synctask_barrier_init((&args)); -+ ret = synctask_barrier_init((&args)); -+ if (ret) -+ goto out; -+ - peer_cnt = 0; - - RCU_READ_LOCK; -@@ -1108,7 +1111,10 @@ glusterd_mgmt_v3_pre_validate(glusterd_op_t op, dict_t *req_dict, - - /* Sending Pre Validation req to other nodes in the cluster */ - gd_syncargs_init(&args, req_dict); -- synctask_barrier_init((&args)); -+ ret = synctask_barrier_init((&args)); -+ if (ret) -+ goto out; -+ - peer_cnt = 0; - - RCU_READ_LOCK; -@@ -1458,7 +1464,10 @@ glusterd_mgmt_v3_brick_op(glusterd_op_t op, dict_t *op_ctx, dict_t *req_dict, - - /* Sending brick op req to other nodes in the cluster */ - gd_syncargs_init(&args, op_ctx); -- synctask_barrier_init((&args)); -+ ret = synctask_barrier_init((&args)); -+ if (ret) -+ goto out; -+ - peer_cnt = 0; - - RCU_READ_LOCK; -@@ -1722,7 +1731,9 @@ glusterd_mgmt_v3_commit(glusterd_op_t op, dict_t *op_ctx, dict_t *req_dict, - - /* Sending commit req to other nodes in the cluster */ - gd_syncargs_init(&args, op_ctx); -- synctask_barrier_init((&args)); -+ ret = synctask_barrier_init((&args)); -+ if (ret) -+ goto out; - peer_cnt = 0; - - RCU_READ_LOCK; -@@ -1963,7 +1974,10 @@ glusterd_mgmt_v3_post_validate(glusterd_op_t op, int32_t op_ret, dict_t *dict, - - /* Sending Post Validation req to other nodes in the cluster */ - gd_syncargs_init(&args, req_dict); -- synctask_barrier_init((&args)); -+ ret = synctask_barrier_init((&args)); -+ if (ret) -+ goto out; -+ - peer_cnt = 0; - - RCU_READ_LOCK; -diff --git a/xlators/mgmt/glusterd/src/glusterd-syncop.c b/xlators/mgmt/glusterd/src/glusterd-syncop.c -index 9e47d14..c78983a 100644 ---- a/xlators/mgmt/glusterd/src/glusterd-syncop.c -+++ b/xlators/mgmt/glusterd/src/glusterd-syncop.c -@@ -1191,7 +1191,12 @@ gd_lock_op_phase(glusterd_conf_t *conf, glusterd_op_t op, dict_t *op_ctx, - struct syncargs args = {0}; - - this = THIS; -- synctask_barrier_init((&args)); -+ GF_VALIDATE_OR_GOTO("glusterd", this, out); -+ -+ ret = synctask_barrier_init((&args)); -+ if (ret) -+ goto out; -+ - peer_cnt = 0; - - RCU_READ_LOCK; -@@ -1321,7 +1326,10 @@ stage_done: - } - - gd_syncargs_init(&args, aggr_dict); -- synctask_barrier_init((&args)); -+ ret = synctask_barrier_init((&args)); -+ if (ret) -+ goto out; -+ - peer_cnt = 0; - - RCU_READ_LOCK; -@@ -1449,7 +1457,10 @@ commit_done: - } - - gd_syncargs_init(&args, op_ctx); -- synctask_barrier_init((&args)); -+ ret = synctask_barrier_init((&args)); -+ if (ret) -+ goto out; -+ - peer_cnt = 0; - origin_glusterd = is_origin_glusterd(req_dict); - -@@ -1541,7 +1552,10 @@ gd_unlock_op_phase(glusterd_conf_t *conf, glusterd_op_t op, int *op_ret, - goto out; - } - -- synctask_barrier_init((&args)); -+ ret = synctask_barrier_init((&args)); -+ if (ret) -+ goto out; -+ - peer_cnt = 0; - - if (cluster_lock) { -diff --git a/xlators/mgmt/glusterd/src/glusterd-volgen.c b/xlators/mgmt/glusterd/src/glusterd-volgen.c -index 6852f8e..16346e7 100644 ---- a/xlators/mgmt/glusterd/src/glusterd-volgen.c -+++ b/xlators/mgmt/glusterd/src/glusterd-volgen.c -@@ -4808,9 +4808,10 @@ nfs_option_handler(volgen_graph_t *graph, struct volopt_map_entry *vme, - - if (ret != -1) { - ret = gf_canonicalize_path(vme->value); -- if (ret) -+ if (ret) { -+ GF_FREE(aa); - return -1; -- -+ } - ret = xlator_set_option(xl, aa, ret, vme->value); - GF_FREE(aa); - } --- -1.8.3.1 - diff --git a/SOURCES/0437-glusterd-prevent-use-after-free-in-glusterd_op_ac_se.patch b/SOURCES/0437-glusterd-prevent-use-after-free-in-glusterd_op_ac_se.patch deleted file mode 100644 index 21fcd8a..0000000 --- a/SOURCES/0437-glusterd-prevent-use-after-free-in-glusterd_op_ac_se.patch +++ /dev/null @@ -1,48 +0,0 @@ -From ffd428d07036531b7ed98c7393b87490aaa223ec Mon Sep 17 00:00:00 2001 -From: Niels de Vos -Date: Fri, 3 May 2019 09:18:31 +0200 -Subject: [PATCH 437/449] glusterd: prevent use-after-free in - glusterd_op_ac_send_brick_op() - -Coverity reported that GF_FREE(req_ctx) could be called 2x on req_ctx. - -> upstream patch link: https://review.gluster.org/#/c/glusterfs/+/22656/ -> Change-Id: I9120686e5920de8c27688e10de0db6aa26292064 -> CID: 1401115 -> Updates: bz#789278 -> Signed-off-by: Niels de Vos - -BUG: 1787310 -Change-Id: I9120686e5920de8c27688e10de0db6aa26292064 -Signed-off-by: Sanju Rakonde -Reviewed-on: https://code.engineering.redhat.com/gerrit/202619 -Tested-by: RHGS Build Bot -Reviewed-by: Sunil Kumar Heggodu Gopala Acharya ---- - xlators/mgmt/glusterd/src/glusterd-op-sm.c | 3 +-- - 1 file changed, 1 insertion(+), 2 deletions(-) - -diff --git a/xlators/mgmt/glusterd/src/glusterd-op-sm.c b/xlators/mgmt/glusterd/src/glusterd-op-sm.c -index 46fc607..1e84f5f 100644 ---- a/xlators/mgmt/glusterd/src/glusterd-op-sm.c -+++ b/xlators/mgmt/glusterd/src/glusterd-op-sm.c -@@ -7575,7 +7575,6 @@ glusterd_op_ac_send_brick_op(glusterd_op_sm_event_t *event, void *ctx) - if (op_errstr == NULL) - gf_asprintf(&op_errstr, OPERRSTR_BUILD_PAYLOAD); - opinfo.op_errstr = op_errstr; -- GF_FREE(req_ctx); - goto out; - } - } -@@ -7594,7 +7593,7 @@ glusterd_op_ac_send_brick_op(glusterd_op_sm_event_t *event, void *ctx) - } - - out: -- if (ret && req_ctx && free_req_ctx) -+ if (ret && free_req_ctx) - GF_FREE(req_ctx); - gf_msg_debug(this->name, 0, "Returning with %d", ret); - --- -1.8.3.1 - diff --git a/SOURCES/0438-dht-sparse-files-rebalance-enhancements.patch b/SOURCES/0438-dht-sparse-files-rebalance-enhancements.patch deleted file mode 100644 index 6e10ce6..0000000 --- a/SOURCES/0438-dht-sparse-files-rebalance-enhancements.patch +++ /dev/null @@ -1,324 +0,0 @@ -From 7b2f1bd4e5a57ea3abd5f14a7d81b120735faecd Mon Sep 17 00:00:00 2001 -From: Barak Sason Rofman -Date: Wed, 6 May 2020 13:28:40 +0300 -Subject: [PATCH 438/449] dht - sparse files rebalance enhancements - -Currently data migration in rebalance reads sparse file sequentially, -disregarding which segments are holes and which are data. This can lead -to extremely long migration time for large sparse file. -Data migration mechanism needs to be enhanced so only data segments are -read and migrated. This can be achieved using lseek to seek for holes -and data in the file. -This enhancement is a consequence of -https://bugzilla.redhat.com/show_bug.cgi?id=1823703 - -> fixes: #1222 -> Change-Id: If5f448a0c532926464e1f34f504c5c94749b08c3 -> Signed-off-by: Barak Sason Rofman -> (Cherry pick from commit 7b7559733ca0c25c63f9d56cb7f4650dbd694c40) -> (Reviewed on upstream link https://review.gluster.org/#/c/glusterfs/+/24409/) - -BUG: 1836099 -Change-Id: If5f448a0c532926464e1f34f504c5c94749b08c3 -Signed-off-by: Mohit Agrawal -Reviewed-on: https://code.engineering.redhat.com/gerrit/202647 -Reviewed-by: Barak Sason Rofman -Reviewed-by: Sunil Kumar Heggodu Gopala Acharya ---- - tests/basic/distribute/spare_file_rebalance.t | 51 ++++++++ - xlators/cluster/dht/src/dht-rebalance.c | 172 ++++++++++++-------------- - 2 files changed, 130 insertions(+), 93 deletions(-) - create mode 100644 tests/basic/distribute/spare_file_rebalance.t - -diff --git a/tests/basic/distribute/spare_file_rebalance.t b/tests/basic/distribute/spare_file_rebalance.t -new file mode 100644 -index 0000000..061c02f ---- /dev/null -+++ b/tests/basic/distribute/spare_file_rebalance.t -@@ -0,0 +1,51 @@ -+#!/bin/bash -+ -+. $(dirname $0)/../../include.rc -+. $(dirname $0)/../../volume.rc -+. $(dirname $0)/../../dht.rc -+ -+# Initialize -+#------------------------------------------------------------ -+cleanup; -+ -+# Start glusterd -+TEST glusterd; -+TEST pidof glusterd; -+TEST $CLI volume info; -+ -+# Create a volume -+TEST $CLI volume create $V0 $H0:$B0/${V0}{1,2}; -+ -+# Verify volume creation -+EXPECT "$V0" volinfo_field $V0 'Volume Name'; -+EXPECT 'Created' volinfo_field $V0 'Status'; -+ -+# Start volume and verify successful start -+TEST $CLI volume start $V0; -+EXPECT 'Started' volinfo_field $V0 'Status'; -+TEST glusterfs --volfile-id=$V0 --volfile-server=$H0 --entry-timeout=0 $M0; -+ -+#------------------------------------------------------------ -+ -+# Test case - Create sparse files on MP and verify -+# file info after rebalance -+#------------------------------------------------------------ -+ -+# Create some sparse files and get their size -+TEST cd $M0; -+dd if=/dev/urandom of=sparse_file bs=10k count=1 seek=2M -+cp --sparse=always sparse_file sparse_file_3; -+ -+# Add a 3rd brick -+TEST $CLI volume add-brick $V0 $H0:$B0/${V0}3; -+ -+# Trigger rebalance -+TEST $CLI volume rebalance $V0 start force; -+EXPECT_WITHIN $REBALANCE_TIMEOUT "0" rebalance_completed; -+ -+# Compare original and rebalanced files -+TEST cd $B0/${V0}2 -+TEST cmp sparse_file $B0/${V0}3/sparse_file_3 -+EXPECT_WITHIN 30 ""; -+ -+cleanup; -diff --git a/xlators/cluster/dht/src/dht-rebalance.c b/xlators/cluster/dht/src/dht-rebalance.c -index 88b6b54..d0c21b4 100644 ---- a/xlators/cluster/dht/src/dht-rebalance.c -+++ b/xlators/cluster/dht/src/dht-rebalance.c -@@ -18,8 +18,8 @@ - #include - - #define GF_DISK_SECTOR_SIZE 512 --#define DHT_REBALANCE_PID 4242 /* Change it if required */ --#define DHT_REBALANCE_BLKSIZE (1024 * 1024) /* 1 MB */ -+#define DHT_REBALANCE_PID 4242 /* Change it if required */ -+#define DHT_REBALANCE_BLKSIZE 1048576 /* 1 MB */ - #define MAX_MIGRATE_QUEUE_COUNT 500 - #define MIN_MIGRATE_QUEUE_COUNT 200 - #define MAX_REBAL_TYPE_SIZE 16 -@@ -178,75 +178,6 @@ dht_strip_out_acls(dict_t *dict) - } - } - --static int --dht_write_with_holes(xlator_t *to, fd_t *fd, struct iovec *vec, int count, -- int32_t size, off_t offset, struct iobref *iobref, -- int *fop_errno) --{ -- int i = 0; -- int ret = -1; -- int start_idx = 0; -- int tmp_offset = 0; -- int write_needed = 0; -- int buf_len = 0; -- int size_pending = 0; -- char *buf = NULL; -- -- /* loop through each vector */ -- for (i = 0; i < count; i++) { -- buf = vec[i].iov_base; -- buf_len = vec[i].iov_len; -- -- for (start_idx = 0; (start_idx + GF_DISK_SECTOR_SIZE) <= buf_len; -- start_idx += GF_DISK_SECTOR_SIZE) { -- if (mem_0filled(buf + start_idx, GF_DISK_SECTOR_SIZE) != 0) { -- write_needed = 1; -- continue; -- } -- -- if (write_needed) { -- ret = syncop_write( -- to, fd, (buf + tmp_offset), (start_idx - tmp_offset), -- (offset + tmp_offset), iobref, 0, NULL, NULL); -- /* 'path' will be logged in calling function */ -- if (ret < 0) { -- gf_log(THIS->name, GF_LOG_WARNING, "failed to write (%s)", -- strerror(-ret)); -- *fop_errno = -ret; -- ret = -1; -- goto out; -- } -- -- write_needed = 0; -- } -- tmp_offset = start_idx + GF_DISK_SECTOR_SIZE; -- } -- -- if ((start_idx < buf_len) || write_needed) { -- /* This means, last chunk is not yet written.. write it */ -- ret = syncop_write(to, fd, (buf + tmp_offset), -- (buf_len - tmp_offset), (offset + tmp_offset), -- iobref, 0, NULL, NULL); -- if (ret < 0) { -- /* 'path' will be logged in calling function */ -- gf_log(THIS->name, GF_LOG_WARNING, "failed to write (%s)", -- strerror(-ret)); -- *fop_errno = -ret; -- ret = -1; -- goto out; -- } -- } -- -- size_pending = (size - buf_len); -- if (!size_pending) -- break; -- } -- -- ret = size; --out: -- return ret; --} -- - /* - return values: - -1 : failure -@@ -1101,32 +1032,97 @@ __dht_rebalance_migrate_data(xlator_t *this, gf_defrag_info_t *defrag, - int ret = 0; - int count = 0; - off_t offset = 0; -+ off_t data_offset = 0; -+ off_t hole_offset = 0; - struct iovec *vector = NULL; - struct iobref *iobref = NULL; - uint64_t total = 0; - size_t read_size = 0; -+ size_t data_block_size = 0; - dict_t *xdata = NULL; - dht_conf_t *conf = NULL; - - conf = this->private; -+ - /* if file size is '0', no need to enter this loop */ - while (total < ia_size) { -- read_size = (((ia_size - total) > DHT_REBALANCE_BLKSIZE) -- ? DHT_REBALANCE_BLKSIZE -- : (ia_size - total)); -+ /* This is a regular file - read it sequentially */ -+ if (!hole_exists) { -+ read_size = (((ia_size - total) > DHT_REBALANCE_BLKSIZE) -+ ? DHT_REBALANCE_BLKSIZE -+ : (ia_size - total)); -+ } else { -+ /* This is a sparse file - read only the data segments in the file -+ */ -+ -+ /* If the previous data block is fully copied, find the next data -+ * segment -+ * starting at the offset of the last read and written byte, */ -+ if (data_block_size <= 0) { -+ ret = syncop_seek(from, src, offset, GF_SEEK_DATA, NULL, -+ &data_offset); -+ if (ret) { -+ if (ret == -ENXIO) -+ ret = 0; /* No more data segments */ -+ else -+ *fop_errno = -ret; /* Error occurred */ -+ -+ break; -+ } -+ -+ /* If the position of the current data segment is greater than -+ * the position of the next hole, find the next hole in order to -+ * calculate the length of the new data segment */ -+ if (data_offset > hole_offset) { -+ /* Starting at the offset of the last data segment, find the -+ * next hole */ -+ ret = syncop_seek(from, src, data_offset, GF_SEEK_HOLE, -+ NULL, &hole_offset); -+ if (ret) { -+ /* If an error occurred here it's a real error because -+ * if the seek for a data segment was successful then -+ * necessarily another hole must exist (EOF is a hole) -+ */ -+ *fop_errno = -ret; -+ break; -+ } -+ -+ /* Calculate the total size of the current data block */ -+ data_block_size = hole_offset - data_offset; -+ } -+ } else { -+ /* There is still data in the current segment, move the -+ * data_offset to the position of the last written byte */ -+ data_offset = offset; -+ } -+ -+ /* Calculate how much data needs to be read and written. If the data -+ * segment's length is bigger than DHT_REBALANCE_BLKSIZE, read and -+ * write DHT_REBALANCE_BLKSIZE data length and the rest in the -+ * next iteration(s) */ -+ read_size = ((data_block_size > DHT_REBALANCE_BLKSIZE) -+ ? DHT_REBALANCE_BLKSIZE -+ : data_block_size); -+ -+ /* Calculate the remaining size of the data block - maybe there's no -+ * need to seek for data in the next iteration */ -+ data_block_size -= read_size; -+ -+ /* Set offset to the offset of the data segment so read and write -+ * will have the correct position */ -+ offset = data_offset; -+ } - - ret = syncop_readv(from, src, read_size, offset, 0, &vector, &count, - &iobref, NULL, NULL, NULL); -+ - if (!ret || (ret < 0)) { - *fop_errno = -ret; - break; - } - -- if (hole_exists) { -- ret = dht_write_with_holes(to, dst, vector, count, ret, offset, -- iobref, fop_errno); -- } else { -- if (!conf->force_migration && !dht_is_tier_xlator(this)) { -+ if (!conf->force_migration && !dht_is_tier_xlator(this)) { -+ if (!xdata) { - xdata = dict_new(); - if (!xdata) { - gf_msg("dht", GF_LOG_ERROR, 0, DHT_MSG_MIGRATE_FILE_FAILED, -@@ -1146,7 +1142,7 @@ __dht_rebalance_migrate_data(xlator_t *this, gf_defrag_info_t *defrag, - * https://github.com/gluster/glusterfs/issues/308 - * for more details. - */ -- ret = dict_set_int32(xdata, GF_AVOID_OVERWRITE, 1); -+ ret = dict_set_int32_sizen(xdata, GF_AVOID_OVERWRITE, 1); - if (ret) { - gf_msg("dht", GF_LOG_ERROR, 0, ENOMEM, - "failed to set dict"); -@@ -1155,22 +1151,12 @@ __dht_rebalance_migrate_data(xlator_t *this, gf_defrag_info_t *defrag, - break; - } - } -- -- ret = syncop_writev(to, dst, vector, count, offset, iobref, 0, NULL, -- NULL, xdata, NULL); -- if (ret < 0) { -- *fop_errno = -ret; -- } -- } -- -- if ((defrag && defrag->cmd == GF_DEFRAG_CMD_START_TIER) && -- (gf_defrag_get_pause_state(&defrag->tier_conf) != TIER_RUNNING)) { -- gf_msg("tier", GF_LOG_INFO, 0, DHT_MSG_TIER_PAUSED, -- "Migrate file paused"); -- ret = -1; - } - -+ ret = syncop_writev(to, dst, vector, count, offset, iobref, 0, NULL, -+ NULL, xdata, NULL); - if (ret < 0) { -+ *fop_errno = -ret; - break; - } - --- -1.8.3.1 - diff --git a/SOURCES/0439-cluster-afr-Delay-post-op-for-fsync.patch b/SOURCES/0439-cluster-afr-Delay-post-op-for-fsync.patch deleted file mode 100644 index dc1593b..0000000 --- a/SOURCES/0439-cluster-afr-Delay-post-op-for-fsync.patch +++ /dev/null @@ -1,438 +0,0 @@ -From 3ed98fc9dcb39223032e343fd5b0ad17fa3cae14 Mon Sep 17 00:00:00 2001 -From: Pranith Kumar K -Date: Fri, 29 May 2020 14:24:53 +0530 -Subject: [PATCH 439/449] cluster/afr: Delay post-op for fsync - -Problem: -AFR doesn't delay post-op for fsync fop. For fsync heavy workloads -this leads to un-necessary fxattrop/finodelk for every fsync leading -to bad performance. - -Fix: -Have delayed post-op for fsync. Add special flag in xdata to indicate -that afr shouldn't delay post-op in cases where either the -process will terminate or graph-switch would happen. Otherwise it leads -to un-necessary heals when the graph-switch/process-termination -happens before delayed-post-op completes. - -> Upstream-patch: https://review.gluster.org/c/glusterfs/+/24473 -> Fixes: #1253 - -BUG: 1838479 -Change-Id: I531940d13269a111c49e0510d49514dc169f4577 -Signed-off-by: Pranith Kumar K -Reviewed-on: https://code.engineering.redhat.com/gerrit/202676 -Tested-by: RHGS Build Bot -Reviewed-by: Sunil Kumar Heggodu Gopala Acharya ---- - api/src/glfs-resolve.c | 14 ++- - tests/basic/afr/durability-off.t | 2 + - tests/basic/gfapi/gfapi-graph-switch-open-fd.t | 44 +++++++++ - tests/basic/gfapi/gfapi-keep-writing.c | 129 +++++++++++++++++++++++++ - xlators/cluster/afr/src/afr-inode-write.c | 11 ++- - xlators/cluster/afr/src/afr-transaction.c | 9 +- - xlators/cluster/afr/src/afr.h | 2 +- - xlators/cluster/dht/src/dht-rebalance.c | 15 ++- - xlators/mount/fuse/src/fuse-bridge.c | 23 ++++- - 9 files changed, 239 insertions(+), 10 deletions(-) - create mode 100644 tests/basic/gfapi/gfapi-graph-switch-open-fd.t - create mode 100644 tests/basic/gfapi/gfapi-keep-writing.c - -diff --git a/api/src/glfs-resolve.c b/api/src/glfs-resolve.c -index a79f490..062b7dc 100644 ---- a/api/src/glfs-resolve.c -+++ b/api/src/glfs-resolve.c -@@ -722,6 +722,7 @@ glfs_migrate_fd_safe(struct glfs *fs, xlator_t *newsubvol, fd_t *oldfd) - 0, - }; - char uuid1[64]; -+ dict_t *xdata = NULL; - - oldinode = oldfd->inode; - oldsubvol = oldinode->table->xl; -@@ -730,7 +731,15 @@ glfs_migrate_fd_safe(struct glfs *fs, xlator_t *newsubvol, fd_t *oldfd) - return fd_ref(oldfd); - - if (!oldsubvol->switched) { -- ret = syncop_fsync(oldsubvol, oldfd, 0, NULL, NULL, NULL, NULL); -+ xdata = dict_new(); -+ if (!xdata || dict_set_int8(xdata, "last-fsync", 1)) { -+ gf_msg(fs->volname, GF_LOG_WARNING, ENOMEM, API_MSG_FSYNC_FAILED, -+ "last-fsync set failed on %s graph %s (%d)", -+ uuid_utoa_r(oldfd->inode->gfid, uuid1), -+ graphid_str(oldsubvol), oldsubvol->graph->id); -+ } -+ -+ ret = syncop_fsync(oldsubvol, oldfd, 0, NULL, NULL, xdata, NULL); - DECODE_SYNCOP_ERR(ret); - if (ret) { - gf_msg(fs->volname, GF_LOG_WARNING, errno, API_MSG_FSYNC_FAILED, -@@ -809,6 +818,9 @@ out: - newfd = NULL; - } - -+ if (xdata) -+ dict_unref(xdata); -+ - return newfd; - } - -diff --git a/tests/basic/afr/durability-off.t b/tests/basic/afr/durability-off.t -index 155ffa0..6e0f18b 100644 ---- a/tests/basic/afr/durability-off.t -+++ b/tests/basic/afr/durability-off.t -@@ -26,6 +26,8 @@ TEST $CLI volume heal $V0 - EXPECT_WITHIN $HEAL_TIMEOUT "0" get_pending_heal_count $V0 - EXPECT "^0$" echo $($CLI volume profile $V0 info | grep -w FSYNC | wc -l) - -+EXPECT_WITHIN $CHILD_UP_TIMEOUT "1" afr_child_up_status $V0 0 -+EXPECT_WITHIN $CHILD_UP_TIMEOUT "1" afr_child_up_status $V0 1 - #Test that fsyncs happen when durability is on - TEST $CLI volume set $V0 cluster.ensure-durability on - TEST $CLI volume set $V0 performance.strict-write-ordering on -diff --git a/tests/basic/gfapi/gfapi-graph-switch-open-fd.t b/tests/basic/gfapi/gfapi-graph-switch-open-fd.t -new file mode 100644 -index 0000000..2e666be ---- /dev/null -+++ b/tests/basic/gfapi/gfapi-graph-switch-open-fd.t -@@ -0,0 +1,44 @@ -+#!/bin/bash -+ -+. $(dirname $0)/../../include.rc -+. $(dirname $0)/../../volume.rc -+ -+cleanup; -+ -+TEST glusterd -+ -+TEST $CLI volume create $V0 replica 3 ${H0}:$B0/brick{0..2}; -+EXPECT 'Created' volinfo_field $V0 'Status'; -+ -+TEST $CLI volume start $V0; -+EXPECT 'Started' volinfo_field $V0 'Status'; -+ -+TEST $GFS --volfile-id=$V0 --volfile-server=$H0 $M0; -+TEST touch $M0/sync -+logdir=`gluster --print-logdir` -+ -+TEST build_tester $(dirname $0)/gfapi-keep-writing.c -lgfapi -+ -+ -+#Launch a program to keep doing writes on an fd -+./$(dirname $0)/gfapi-keep-writing ${H0} $V0 $logdir/gfapi-async-calls-test.log sync & -+p=$! -+sleep 1 #Let some writes go through -+#Check if graph switch will lead to any pending markers for ever -+TEST $CLI volume set $V0 performance.quick-read off -+TEST $CLI volume set $V0 performance.io-cache off -+TEST $CLI volume set $V0 performance.stat-prefetch off -+TEST $CLI volume set $V0 performance.read-ahead off -+ -+ -+TEST rm -f $M0/sync #Make sure the glfd is closed -+TEST wait #Wait for background process to die -+#Goal is to check if there is permanent FOOL changelog -+sleep 5 -+EXPECT "0x000000000000000000000000" afr_get_changelog_xattr $B0/brick0/glfs_test.txt trusted.afr.dirty -+EXPECT "0x000000000000000000000000" afr_get_changelog_xattr $B0/brick1/glfs_test.txt trusted.afr.dirty -+EXPECT "0x000000000000000000000000" afr_get_changelog_xattr $B0/brick2/glfs_test.txt trusted.afr.dirty -+ -+cleanup_tester $(dirname $0)/gfapi-async-calls-test -+ -+cleanup; -diff --git a/tests/basic/gfapi/gfapi-keep-writing.c b/tests/basic/gfapi/gfapi-keep-writing.c -new file mode 100644 -index 0000000..91b59ce ---- /dev/null -+++ b/tests/basic/gfapi/gfapi-keep-writing.c -@@ -0,0 +1,129 @@ -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+ -+#define LOG_ERR(msg) \ -+ do { \ -+ fprintf(stderr, "%s : Error (%s)\n", msg, strerror(errno)); \ -+ } while (0) -+ -+glfs_t * -+init_glfs(const char *hostname, const char *volname, const char *logfile) -+{ -+ int ret = -1; -+ glfs_t *fs = NULL; -+ -+ fs = glfs_new(volname); -+ if (!fs) { -+ LOG_ERR("glfs_new failed"); -+ return NULL; -+ } -+ -+ ret = glfs_set_volfile_server(fs, "tcp", hostname, 24007); -+ if (ret < 0) { -+ LOG_ERR("glfs_set_volfile_server failed"); -+ goto out; -+ } -+ -+ ret = glfs_set_logging(fs, logfile, 7); -+ if (ret < 0) { -+ LOG_ERR("glfs_set_logging failed"); -+ goto out; -+ } -+ -+ ret = glfs_init(fs); -+ if (ret < 0) { -+ LOG_ERR("glfs_init failed"); -+ goto out; -+ } -+ -+ ret = 0; -+out: -+ if (ret) { -+ glfs_fini(fs); -+ fs = NULL; -+ } -+ -+ return fs; -+} -+ -+int -+glfs_test_function(const char *hostname, const char *volname, -+ const char *logfile, const char *syncfile) -+{ -+ int ret = -1; -+ int flags = O_CREAT | O_RDWR; -+ glfs_t *fs = NULL; -+ glfs_fd_t *glfd = NULL; -+ const char *buff = "This is from my prog\n"; -+ const char *filename = "glfs_test.txt"; -+ struct stat buf = {0}; -+ -+ fs = init_glfs(hostname, volname, logfile); -+ if (fs == NULL) { -+ LOG_ERR("init_glfs failed"); -+ return -1; -+ } -+ -+ glfd = glfs_creat(fs, filename, flags, 0644); -+ if (glfd == NULL) { -+ LOG_ERR("glfs_creat failed"); -+ goto out; -+ } -+ -+ while (glfs_stat(fs, syncfile, &buf) == 0) { -+ ret = glfs_write(glfd, buff, strlen(buff), flags); -+ if (ret < 0) { -+ LOG_ERR("glfs_write failed"); -+ goto out; -+ } -+ } -+ -+ ret = glfs_close(glfd); -+ if (ret < 0) { -+ LOG_ERR("glfs_write failed"); -+ goto out; -+ } -+ -+out: -+ ret = glfs_fini(fs); -+ if (ret) { -+ LOG_ERR("glfs_fini failed"); -+ } -+ -+ return ret; -+} -+ -+int -+main(int argc, char *argv[]) -+{ -+ int ret = 0; -+ char *hostname = NULL; -+ char *volname = NULL; -+ char *logfile = NULL; -+ char *syncfile = NULL; -+ -+ if (argc != 5) { -+ fprintf(stderr, "Invalid argument\n"); -+ exit(1); -+ } -+ -+ hostname = argv[1]; -+ volname = argv[2]; -+ logfile = argv[3]; -+ syncfile = argv[4]; -+ -+ ret = glfs_test_function(hostname, volname, logfile, syncfile); -+ if (ret) { -+ LOG_ERR("glfs_test_function failed"); -+ } -+ -+ return ret; -+} -diff --git a/xlators/cluster/afr/src/afr-inode-write.c b/xlators/cluster/afr/src/afr-inode-write.c -index 7fcc9d4..df82b6e 100644 ---- a/xlators/cluster/afr/src/afr-inode-write.c -+++ b/xlators/cluster/afr/src/afr-inode-write.c -@@ -2492,6 +2492,7 @@ afr_fsync(call_frame_t *frame, xlator_t *this, fd_t *fd, int32_t datasync, - call_frame_t *transaction_frame = NULL; - int ret = -1; - int32_t op_errno = ENOMEM; -+ int8_t last_fsync = 0; - - transaction_frame = copy_frame(frame); - if (!transaction_frame) -@@ -2501,10 +2502,16 @@ afr_fsync(call_frame_t *frame, xlator_t *this, fd_t *fd, int32_t datasync, - if (!local) - goto out; - -- if (xdata) -+ if (xdata) { - local->xdata_req = dict_copy_with_ref(xdata, NULL); -- else -+ if (dict_get_int8(xdata, "last-fsync", &last_fsync) == 0) { -+ if (last_fsync) { -+ local->transaction.disable_delayed_post_op = _gf_true; -+ } -+ } -+ } else { - local->xdata_req = dict_new(); -+ } - - if (!local->xdata_req) - goto out; -diff --git a/xlators/cluster/afr/src/afr-transaction.c b/xlators/cluster/afr/src/afr-transaction.c -index 8e65ae2..ffd0ab8 100644 ---- a/xlators/cluster/afr/src/afr-transaction.c -+++ b/xlators/cluster/afr/src/afr-transaction.c -@@ -2385,8 +2385,13 @@ afr_is_delayed_changelog_post_op_needed(call_frame_t *frame, xlator_t *this, - goto out; - } - -- if ((local->op != GF_FOP_WRITE) && (local->op != GF_FOP_FXATTROP)) { -- /*Only allow writes but shard does [f]xattrops on writes, so -+ if (local->transaction.disable_delayed_post_op) { -+ goto out; -+ } -+ -+ if ((local->op != GF_FOP_WRITE) && (local->op != GF_FOP_FXATTROP) && -+ (local->op != GF_FOP_FSYNC)) { -+ /*Only allow writes/fsyncs but shard does [f]xattrops on writes, so - * they are fine too*/ - goto out; - } -diff --git a/xlators/cluster/afr/src/afr.h b/xlators/cluster/afr/src/afr.h -index 18f1a6a..ff96246 100644 ---- a/xlators/cluster/afr/src/afr.h -+++ b/xlators/cluster/afr/src/afr.h -@@ -854,7 +854,7 @@ typedef struct _afr_local { - - int (*unwind)(call_frame_t *frame, xlator_t *this); - -- /* post-op hook */ -+ gf_boolean_t disable_delayed_post_op; - } transaction; - - syncbarrier_t barrier; -diff --git a/xlators/cluster/dht/src/dht-rebalance.c b/xlators/cluster/dht/src/dht-rebalance.c -index d0c21b4..e9974cd 100644 ---- a/xlators/cluster/dht/src/dht-rebalance.c -+++ b/xlators/cluster/dht/src/dht-rebalance.c -@@ -1550,6 +1550,7 @@ dht_migrate_file(xlator_t *this, loc_t *loc, xlator_t *from, xlator_t *to, - xlator_t *old_target = NULL; - xlator_t *hashed_subvol = NULL; - fd_t *linkto_fd = NULL; -+ dict_t *xdata = NULL; - - if (from == to) { - gf_msg_debug(this->name, 0, -@@ -1868,7 +1869,15 @@ dht_migrate_file(xlator_t *this, loc_t *loc, xlator_t *from, xlator_t *to, - - /* TODO: Sync the locks */ - -- ret = syncop_fsync(to, dst_fd, 0, NULL, NULL, NULL, NULL); -+ xdata = dict_new(); -+ if (!xdata || dict_set_int8(xdata, "last-fsync", 1)) { -+ gf_log(this->name, GF_LOG_ERROR, -+ "%s: failed to set last-fsync flag on " -+ "%s (%s)", -+ loc->path, to->name, strerror(ENOMEM)); -+ } -+ -+ ret = syncop_fsync(to, dst_fd, 0, NULL, NULL, xdata, NULL); - if (ret) { - gf_log(this->name, GF_LOG_WARNING, "%s: failed to fsync on %s (%s)", - loc->path, to->name, strerror(-ret)); -@@ -2342,11 +2351,15 @@ out: - - if (dst_fd) - syncop_close(dst_fd); -+ - if (src_fd) - syncop_close(src_fd); - if (linkto_fd) - syncop_close(linkto_fd); - -+ if (xdata) -+ dict_unref(xdata); -+ - loc_wipe(&tmp_loc); - loc_wipe(&parent_loc); - -diff --git a/xlators/mount/fuse/src/fuse-bridge.c b/xlators/mount/fuse/src/fuse-bridge.c -index fdeec49..4264fad 100644 ---- a/xlators/mount/fuse/src/fuse-bridge.c -+++ b/xlators/mount/fuse/src/fuse-bridge.c -@@ -5559,6 +5559,7 @@ fuse_migrate_fd(xlator_t *this, fd_t *basefd, xlator_t *old_subvol, - char create_in_progress = 0; - fuse_fd_ctx_t *basefd_ctx = NULL; - fd_t *oldfd = NULL; -+ dict_t *xdata = NULL; - - basefd_ctx = fuse_fd_ctx_get(this, basefd); - GF_VALIDATE_OR_GOTO("glusterfs-fuse", basefd_ctx, out); -@@ -5595,10 +5596,23 @@ fuse_migrate_fd(xlator_t *this, fd_t *basefd, xlator_t *old_subvol, - } - - if (oldfd->inode->table->xl == old_subvol) { -- if (IA_ISDIR(oldfd->inode->ia_type)) -+ if (IA_ISDIR(oldfd->inode->ia_type)) { - ret = syncop_fsyncdir(old_subvol, oldfd, 0, NULL, NULL); -- else -- ret = syncop_fsync(old_subvol, oldfd, 0, NULL, NULL, NULL, NULL); -+ } else { -+ xdata = dict_new(); -+ if (!xdata || dict_set_int8(xdata, "last-fsync", 1)) { -+ gf_log("glusterfs-fuse", GF_LOG_WARNING, -+ "last-fsync set failed (%s) on fd (%p)" -+ "(basefd:%p basefd-inode.gfid:%s) " -+ "(old-subvolume:%s-%d new-subvolume:%s-%d)", -+ strerror(ENOMEM), oldfd, basefd, -+ uuid_utoa(basefd->inode->gfid), old_subvol->name, -+ old_subvol->graph->id, new_subvol->name, -+ new_subvol->graph->id); -+ } -+ -+ ret = syncop_fsync(old_subvol, oldfd, 0, NULL, NULL, xdata, NULL); -+ } - - if (ret < 0) { - gf_log("glusterfs-fuse", GF_LOG_WARNING, -@@ -5653,6 +5667,9 @@ out: - - fd_unref(oldfd); - -+ if (xdata) -+ dict_unref(xdata); -+ - return ret; - } - --- -1.8.3.1 - diff --git a/SOURCES/0440-glusterd-snapshot-Improve-log-message-during-snapsho.patch b/SOURCES/0440-glusterd-snapshot-Improve-log-message-during-snapsho.patch deleted file mode 100644 index a7c1869..0000000 --- a/SOURCES/0440-glusterd-snapshot-Improve-log-message-during-snapsho.patch +++ /dev/null @@ -1,62 +0,0 @@ -From 9cbab9110523cfafe23d6c6b3080d0d744062b85 Mon Sep 17 00:00:00 2001 -From: Mohammed Rafi KC -Date: Thu, 21 May 2020 16:04:33 +0530 -Subject: [PATCH 440/449] glusterd/snapshot: Improve log message during - snapshot clone - -While taking a snapshot clone, if the snapshot is not activated, -the cli was returning that the bricks are down. -This patch clearly print tha the error is due to the snapshot -state. - ->Change-Id: Ia840e6e071342e061ad38bf15e2e2ff2b0dacdfa ->Fixes: #1255 ->Signed-off-by: Mohammed Rafi KC -Upstream Patch: https://review.gluster.org/#/c/glusterfs/+/24478/ - -BUG: 1837926 -Change-Id: Ia840e6e071342e061ad38bf15e2e2ff2b0dacdfa -Signed-off-by: Srijan Sivakumar -Reviewed-on: https://code.engineering.redhat.com/gerrit/202707 -Tested-by: RHGS Build Bot -Reviewed-by: Sunil Kumar Heggodu Gopala Acharya ---- - xlators/mgmt/glusterd/src/glusterd-snapshot.c | 15 ++++++++++++--- - 1 file changed, 12 insertions(+), 3 deletions(-) - -diff --git a/xlators/mgmt/glusterd/src/glusterd-snapshot.c b/xlators/mgmt/glusterd/src/glusterd-snapshot.c -index c56be91..5b8ae97 100644 ---- a/xlators/mgmt/glusterd/src/glusterd-snapshot.c -+++ b/xlators/mgmt/glusterd/src/glusterd-snapshot.c -@@ -2238,7 +2238,6 @@ glusterd_snapshot_clone_prevalidate(dict_t *dict, char **op_errstr, - char *clonename = NULL; - char *snapname = NULL; - char device_name[64] = ""; -- char key[PATH_MAX] = ""; - glusterd_snap_t *snap = NULL; - char err_str[PATH_MAX] = ""; - int ret = -1; -@@ -2299,8 +2298,18 @@ glusterd_snapshot_clone_prevalidate(dict_t *dict, char **op_errstr, - goto out; - } - -- snprintf(key, sizeof(key) - 1, "vol1_volid"); -- ret = dict_get_bin(dict, key, (void **)&snap_volid); -+ -+ if (!glusterd_is_volume_started(snap_vol)) { -+ snprintf(err_str, sizeof(err_str), -+ "Snapshot %s is " -+ "not activated", -+ snap->snapname); -+ loglevel = GF_LOG_WARNING; -+ *op_errno = EG_VOLSTP; -+ goto out; -+ } -+ -+ ret = dict_get_bin(dict, "vol1_volid", (void **)&snap_volid); - if (ret) { - gf_msg(this->name, GF_LOG_ERROR, 0, GD_MSG_DICT_GET_FAILED, - "Unable to fetch snap_volid"); --- -1.8.3.1 - diff --git a/SOURCES/0441-fuse-occasional-logging-for-fuse-device-weird-write-.patch b/SOURCES/0441-fuse-occasional-logging-for-fuse-device-weird-write-.patch deleted file mode 100644 index 1e49684..0000000 --- a/SOURCES/0441-fuse-occasional-logging-for-fuse-device-weird-write-.patch +++ /dev/null @@ -1,195 +0,0 @@ -From 1bde083cbd1e06be66d00e4ca52075687cee0d60 Mon Sep 17 00:00:00 2001 -From: Csaba Henk -Date: Fri, 8 May 2020 23:01:04 +0200 -Subject: [PATCH 441/449] fuse: occasional logging for fuse device 'weird' - write errors - -This change is a followup to -I510158843e4b1d482bdc496c2e97b1860dc1ba93. - -In referred change we pushed log messages about 'weird' -write errors to fuse device out of sight, by reporting -them at Debug loglevel instead of Error (where -'weird' means errno is not POSIX compliant but having -meaningful semantics for FUSE protocol). - -This solved the issue of spurious error reporting. -And so far so good: these messages don't indicate -an error condition by themselves. However, when they -come in high repetitions, that indicates a suboptimal -condition which should be reported.[1] - -Therefore now we shall emit a Warning if a certain -errno occurs a certain number of times[2] as the -outcome of a write to the fuse device. - -___ -[1] typically ENOENTs and ENOTDIRs accumulate -when glusterfs' inode invalidation lags behind -the kernel's internal inode garbage collection -(in this case above errnos mean that the inode -which we requested to be invalidated is not found -in kernel). This can be mitigated with the -invalidate-limit command line / mount option, -cf. bz#1732717. - -[2] 256, as of the current implementation. - -Upstream on https://review.gluster.org/24415 -> Change-Id: I8cc7fe104da43a88875f93b0db49d5677cc16045 -> Updates: #1000 -> Signed-off-by: Csaba Henk - -BUG: 1839137 -Change-Id: I8448d6d328d47cb01d560cd99a2f43cd8dab312d -Signed-off-by: Csaba Henk -Reviewed-on: https://code.engineering.redhat.com/gerrit/202646 -Tested-by: RHGS Build Bot -Reviewed-by: Sunil Kumar Heggodu Gopala Acharya ---- - xlators/mount/fuse/src/fuse-bridge.c | 36 +++++++++++++++++++++++++++++++++++- - xlators/mount/fuse/src/fuse-bridge.h | 18 ++++++++++++++++++ - 2 files changed, 53 insertions(+), 1 deletion(-) - -diff --git a/xlators/mount/fuse/src/fuse-bridge.c b/xlators/mount/fuse/src/fuse-bridge.c -index 4264fad..2e7584c 100644 ---- a/xlators/mount/fuse/src/fuse-bridge.c -+++ b/xlators/mount/fuse/src/fuse-bridge.c -@@ -218,14 +218,30 @@ check_and_dump_fuse_W(fuse_private_t *priv, struct iovec *iov_out, int count, - if (res == -1) { - const char *errdesc = NULL; - gf_loglevel_t loglevel = GF_LOG_ERROR; -+ gf_boolean_t errno_degraded = _gf_false; -+ gf_boolean_t errno_promoted = _gf_false; -+ -+#define ACCOUNT_ERRNO(eno) \ -+ do { \ -+ if (errno_degraded) { \ -+ pthread_mutex_lock(&priv->fusedev_errno_cnt_mutex); \ -+ { \ -+ if (!++priv->fusedev_errno_cnt[FUSEDEV_##eno]) \ -+ errno_promoted = _gf_true; \ -+ } \ -+ pthread_mutex_unlock(&priv->fusedev_errno_cnt_mutex); \ -+ } \ -+ } while (0) - - /* If caller masked the errno, then it - * does not indicate an error at the application - * level, so we degrade the log severity to DEBUG. - */ - if (errnomask && errno < ERRNOMASK_MAX && -- GET_ERRNO_MASK(errnomask, errno)) -+ GET_ERRNO_MASK(errnomask, errno)) { - loglevel = GF_LOG_DEBUG; -+ errno_degraded = _gf_true; -+ } - - switch (errno) { - /* The listed errnos are FUSE status indicators, -@@ -235,33 +251,43 @@ check_and_dump_fuse_W(fuse_private_t *priv, struct iovec *iov_out, int count, - */ - case ENOENT: - errdesc = "ENOENT"; -+ ACCOUNT_ERRNO(ENOENT); - break; - case ENOTDIR: - errdesc = "ENOTDIR"; -+ ACCOUNT_ERRNO(ENOTDIR); - break; - case ENODEV: - errdesc = "ENODEV"; -+ ACCOUNT_ERRNO(ENODEV); - break; - case EPERM: - errdesc = "EPERM"; -+ ACCOUNT_ERRNO(EPERM); - break; - case ENOMEM: - errdesc = "ENOMEM"; -+ ACCOUNT_ERRNO(ENOMEM); - break; - case ENOTCONN: - errdesc = "ENOTCONN"; -+ ACCOUNT_ERRNO(ENOTCONN); - break; - case ECONNREFUSED: - errdesc = "ECONNREFUSED"; -+ ACCOUNT_ERRNO(ECONNREFUSED); - break; - case EOVERFLOW: - errdesc = "EOVERFLOW"; -+ ACCOUNT_ERRNO(EOVERFLOW); - break; - case EBUSY: - errdesc = "EBUSY"; -+ ACCOUNT_ERRNO(EBUSY); - break; - case ENOTEMPTY: - errdesc = "ENOTEMPTY"; -+ ACCOUNT_ERRNO(ENOTEMPTY); - break; - default: - errdesc = strerror(errno); -@@ -269,7 +295,13 @@ check_and_dump_fuse_W(fuse_private_t *priv, struct iovec *iov_out, int count, - - gf_log_callingfn("glusterfs-fuse", loglevel, - "writing to fuse device failed: %s", errdesc); -+ if (errno_promoted) -+ gf_log("glusterfs-fuse", GF_LOG_WARNING, -+ "writing to fuse device yielded %s %d times", errdesc, -+ UINT8_MAX + 1); - return errno; -+ -+#undef ACCOUNT_ERRNO - } - - fouh = iov_out[0].iov_base; -@@ -6584,6 +6616,8 @@ init(xlator_t *this_xl) - INIT_LIST_HEAD(&priv->interrupt_list); - pthread_mutex_init(&priv->interrupt_mutex, NULL); - -+ pthread_mutex_init(&priv->fusedev_errno_cnt_mutex, NULL); -+ - /* get options from option dictionary */ - ret = dict_get_str(options, ZR_MOUNTPOINT_OPT, &value_string); - if (ret == -1 || value_string == NULL) { -diff --git a/xlators/mount/fuse/src/fuse-bridge.h b/xlators/mount/fuse/src/fuse-bridge.h -index d2d462c..2fb15a6 100644 ---- a/xlators/mount/fuse/src/fuse-bridge.h -+++ b/xlators/mount/fuse/src/fuse-bridge.h -@@ -78,6 +78,20 @@ typedef struct fuse_in_header fuse_in_header_t; - typedef void(fuse_handler_t)(xlator_t *this, fuse_in_header_t *finh, void *msg, - struct iobuf *iobuf); - -+enum fusedev_errno { -+ FUSEDEV_ENOENT, -+ FUSEDEV_ENOTDIR, -+ FUSEDEV_ENODEV, -+ FUSEDEV_EPERM, -+ FUSEDEV_ENOMEM, -+ FUSEDEV_ENOTCONN, -+ FUSEDEV_ECONNREFUSED, -+ FUSEDEV_EOVERFLOW, -+ FUSEDEV_EBUSY, -+ FUSEDEV_ENOTEMPTY, -+ FUSEDEV_EMAXPLUS -+}; -+ - struct fuse_private { - int fd; - uint32_t proto_minor; -@@ -192,6 +206,10 @@ struct fuse_private { - /* LRU Limit, if not set, default is 64k for now */ - uint32_t lru_limit; - uint32_t invalidate_limit; -+ -+ /* counters for fusdev errnos */ -+ uint8_t fusedev_errno_cnt[FUSEDEV_EMAXPLUS]; -+ pthread_mutex_t fusedev_errno_cnt_mutex; - }; - typedef struct fuse_private fuse_private_t; - --- -1.8.3.1 - diff --git a/SOURCES/0442-fuse-correctly-handle-setxattr-values.patch b/SOURCES/0442-fuse-correctly-handle-setxattr-values.patch deleted file mode 100644 index 4be3b85..0000000 --- a/SOURCES/0442-fuse-correctly-handle-setxattr-values.patch +++ /dev/null @@ -1,139 +0,0 @@ -From 56c8ef4a64506c64aeb95d5a2c38d7107f90ac3a Mon Sep 17 00:00:00 2001 -From: Xavi Hernandez -Date: Tue, 5 Feb 2019 16:57:52 +0100 -Subject: [PATCH 442/449] fuse: correctly handle setxattr values - -The setxattr function receives a pointer to raw data, which may not be -null-terminated. When this data needs to be interpreted as a string, an -explicit null termination needs to be added before using the value. - -Upstream patch https://review.gluster.org/#/c/glusterfs/+/22157 -> Change-Id: Id110f9b215b22786da5782adec9449ce38d0d563 -> updates: bz#1193929 -> Signed-off-by: Xavi Hernandez - -Note: this change is not addressing the issue of bz 1787310, -indeed it is prerequisite for other changes that do. - -BUG: 1787310 -Change-Id: I56417b130eb2a1f388108456c905a577eb658793 -Signed-off-by: Csaba Henk -Reviewed-on: https://code.engineering.redhat.com/gerrit/202758 -Tested-by: RHGS Build Bot -Reviewed-by: Sunil Kumar Heggodu Gopala Acharya ---- - libglusterfs/src/glusterfs/xlator.h | 2 +- - libglusterfs/src/xlator.c | 28 +++++++++++++++++++++++++--- - xlators/mount/fuse/src/fuse-bridge.c | 20 ++++++++++++++++---- - 3 files changed, 42 insertions(+), 8 deletions(-) - -diff --git a/libglusterfs/src/glusterfs/xlator.h b/libglusterfs/src/glusterfs/xlator.h -index db04c4d..8650ccc 100644 ---- a/libglusterfs/src/glusterfs/xlator.h -+++ b/libglusterfs/src/glusterfs/xlator.h -@@ -1043,7 +1043,7 @@ xlator_mem_acct_init(xlator_t *xl, int num_types); - void - xlator_mem_acct_unref(struct mem_acct *mem_acct); - int --is_gf_log_command(xlator_t *trans, const char *name, char *value); -+is_gf_log_command(xlator_t *trans, const char *name, char *value, size_t size); - int - glusterd_check_log_level(const char *value); - int -diff --git a/libglusterfs/src/xlator.c b/libglusterfs/src/xlator.c -index 6bd4f09..108b96a 100644 ---- a/libglusterfs/src/xlator.c -+++ b/libglusterfs/src/xlator.c -@@ -1278,8 +1278,21 @@ xlator_destroy(xlator_t *xl) - return 0; - } - -+static int32_t -+gf_bin_to_string(char *dst, size_t size, void *src, size_t len) -+{ -+ if (len >= size) { -+ return EINVAL; -+ } -+ -+ memcpy(dst, src, len); -+ dst[len] = 0; -+ -+ return 0; -+} -+ - int --is_gf_log_command(xlator_t *this, const char *name, char *value) -+is_gf_log_command(xlator_t *this, const char *name, char *value, size_t size) - { - xlator_t *trav = NULL; - char key[1024] = { -@@ -1291,7 +1304,11 @@ is_gf_log_command(xlator_t *this, const char *name, char *value) - glusterfs_ctx_t *ctx = NULL; - - if (!strcmp("trusted.glusterfs.syslog", name)) { -- ret = gf_string2boolean(value, &syslog_flag); -+ ret = gf_bin_to_string(key, sizeof(key), value, size); -+ if (ret != 0) { -+ goto out; -+ } -+ ret = gf_string2boolean(key, &syslog_flag); - if (ret) { - ret = EOPNOTSUPP; - goto out; -@@ -1307,7 +1324,12 @@ is_gf_log_command(xlator_t *this, const char *name, char *value) - if (fnmatch("trusted.glusterfs*set-log-level", name, FNM_NOESCAPE)) - goto out; - -- log_level = glusterd_check_log_level(value); -+ ret = gf_bin_to_string(key, sizeof(key), value, size); -+ if (ret != 0) { -+ goto out; -+ } -+ -+ log_level = glusterd_check_log_level(key); - if (log_level == -1) { - ret = EOPNOTSUPP; - goto out; -diff --git a/xlators/mount/fuse/src/fuse-bridge.c b/xlators/mount/fuse/src/fuse-bridge.c -index 2e7584c..cfad2b4 100644 ---- a/xlators/mount/fuse/src/fuse-bridge.c -+++ b/xlators/mount/fuse/src/fuse-bridge.c -@@ -4112,7 +4112,7 @@ fuse_setxattr(xlator_t *this, fuse_in_header_t *finh, void *msg, - - /* Check if the command is for changing the log - level of process or specific xlator */ -- ret = is_gf_log_command(this, name, value); -+ ret = is_gf_log_command(this, name, value, fsi->size); - if (ret >= 0) { - op_errno = ret; - goto done; -@@ -4159,11 +4159,23 @@ fuse_setxattr(xlator_t *this, fuse_in_header_t *finh, void *msg, - * fixups to make sure that's the case. To avoid nasty - * surprises, allocate an extra byte and add a NUL here. - */ -- dict_value = memdup(value, fsi->size + 1); -+ dict_value = GF_MALLOC(fsi->size + 1, gf_common_mt_char); -+ if (dict_value == NULL) { -+ gf_log("glusterfs-fuse", GF_LOG_ERROR, -+ "%" PRIu64 ": SETXATTR value allocation failed", -+ finh->unique); -+ op_errno = ENOMEM; -+ goto done; -+ } -+ memcpy(dict_value, value, fsi->size); - dict_value[fsi->size] = '\0'; - } -- dict_set(state->xattr, newkey, -- data_from_dynptr((void *)dict_value, fsi->size)); -+ ret = dict_set_dynptr(state->xattr, newkey, dict_value, fsi->size); -+ if (ret < 0) { -+ op_errno = -ret; -+ GF_FREE(dict_value); -+ goto done; -+ } - - state->flags = fsi->flags; - state->name = newkey; --- -1.8.3.1 - diff --git a/SOURCES/0443-fuse-fix-high-sev-coverity-issue.patch b/SOURCES/0443-fuse-fix-high-sev-coverity-issue.patch deleted file mode 100644 index 7c5e9c0..0000000 --- a/SOURCES/0443-fuse-fix-high-sev-coverity-issue.patch +++ /dev/null @@ -1,55 +0,0 @@ -From 3ac3312d63b9dc3c15cd8765ab8b7c601b007500 Mon Sep 17 00:00:00 2001 -From: Sunny Kumar -Date: Tue, 19 Mar 2019 22:51:14 +0530 -Subject: [PATCH 443/449] fuse : fix high sev coverity issue - -This patch fixed coverity issue in fuse-bridge.c. - -CID : 1398630 : Resource leak -CID : 1399757 : Uninitialized pointer read - -Upstream patch https://review.gluster.org/c/glusterfs/+/22382 -> updates: bz#789278 -> -> Change-Id: I69f8591400ee56a5d215eeac443a8e3d7777db27 -> Signed-off-by: Sunny Kumar - -BUG: 1787310 -Change-Id: Ib2c9af25019ee57131b3d384fc4b557437e75d3e -Signed-off-by: Csaba Henk -Reviewed-on: https://code.engineering.redhat.com/gerrit/202759 -Tested-by: RHGS Build Bot -Reviewed-by: Sunil Kumar Heggodu Gopala Acharya ---- - xlators/mount/fuse/src/fuse-bridge.c | 8 +++++++- - 1 file changed, 7 insertions(+), 1 deletion(-) - -diff --git a/xlators/mount/fuse/src/fuse-bridge.c b/xlators/mount/fuse/src/fuse-bridge.c -index cfad2b4..d17320b 100644 ---- a/xlators/mount/fuse/src/fuse-bridge.c -+++ b/xlators/mount/fuse/src/fuse-bridge.c -@@ -4174,6 +4174,7 @@ fuse_setxattr(xlator_t *this, fuse_in_header_t *finh, void *msg, - if (ret < 0) { - op_errno = -ret; - GF_FREE(dict_value); -+ GF_FREE(newkey); - goto done; - } - -@@ -5963,7 +5964,12 @@ fuse_thread_proc(void *data) - ssize_t res = 0; - struct iobuf *iobuf = NULL; - fuse_in_header_t *finh = NULL; -- struct iovec iov_in[2]; -+ struct iovec iov_in[2] = { -+ { -+ 0, -+ }, -+ }; -+ - void *msg = NULL; - /* we need 512 extra buffer size for BATCH_FORGET fop. By tests, it is - found to be reduces 'REALLOC()' in the loop */ --- -1.8.3.1 - diff --git a/SOURCES/0444-mount-fuse-Fixing-a-coverity-issue.patch b/SOURCES/0444-mount-fuse-Fixing-a-coverity-issue.patch deleted file mode 100644 index c8e3e8c..0000000 --- a/SOURCES/0444-mount-fuse-Fixing-a-coverity-issue.patch +++ /dev/null @@ -1,40 +0,0 @@ -From 53a6aed98aad73ff51f884bf815bccfa337eb524 Mon Sep 17 00:00:00 2001 -From: Barak Sason -Date: Sun, 18 Aug 2019 17:38:09 +0300 -Subject: [PATCH 444/449] mount/fuse - Fixing a coverity issue - -Fixed resource leak of dict_value and newkey variables - -CID: 1398630 - -Upstream patch https://review.gluster.org/c/glusterfs/+/23260 -> Updates: bz#789278 -> -> Change-Id: I589fdc0aecaeb4f446cd29f95bad36ccd7a35beb -> Signed-off-by: Barak Sason - -BUG: 1787310 -Change-Id: Id191face7b082e2e8d6e62f60b56248688d396f6 -Signed-off-by: Csaba Henk -Reviewed-on: https://code.engineering.redhat.com/gerrit/202760 -Tested-by: RHGS Build Bot -Reviewed-by: Sunil Kumar Heggodu Gopala Acharya ---- - xlators/mount/fuse/src/fuse-bridge.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/xlators/mount/fuse/src/fuse-bridge.c b/xlators/mount/fuse/src/fuse-bridge.c -index d17320b..f61fa39 100644 ---- a/xlators/mount/fuse/src/fuse-bridge.c -+++ b/xlators/mount/fuse/src/fuse-bridge.c -@@ -4165,6 +4165,7 @@ fuse_setxattr(xlator_t *this, fuse_in_header_t *finh, void *msg, - "%" PRIu64 ": SETXATTR value allocation failed", - finh->unique); - op_errno = ENOMEM; -+ GF_FREE(newkey); - goto done; - } - memcpy(dict_value, value, fsi->size); --- -1.8.3.1 - diff --git a/SOURCES/0445-feature-changelog-Avoid-thread-creation-if-xlator-is.patch b/SOURCES/0445-feature-changelog-Avoid-thread-creation-if-xlator-is.patch deleted file mode 100644 index dea23f2..0000000 --- a/SOURCES/0445-feature-changelog-Avoid-thread-creation-if-xlator-is.patch +++ /dev/null @@ -1,481 +0,0 @@ -From dc03340654d921916ac3890d713fc84ef4bb1e28 Mon Sep 17 00:00:00 2001 -From: Mohit Agrawal -Date: Sat, 29 Sep 2018 13:15:35 +0530 -Subject: [PATCH 445/449] feature/changelog: Avoid thread creation if xlator is - not enabled - -Problem: -Changelog creates threads even if the changelog is not enabled - -Background: -Changelog xlator broadly does two things - 1. Journalling - Cosumers are geo-rep and glusterfind - 2. Event Notification for registered events like (open, release etc) - - Consumers are bitrot, geo-rep - -The existing option "changelog.changelog" controls journalling and -there is no option to control event notification and is enabled by -default. So when bitrot/geo-rep is not enabled on the volume, threads -and resources(rpc and rbuf) related to event notifications consumes -resources and cpu cycle which is unnecessary. - -Solution: -The solution is to have two different options as below. - 1. changelog-notification : Event notifications - 2. changelog : Journalling - -This patch introduces the option "changelog-notification" which is -not exposed to user. When either bitrot or changelog (journalling) -is enabled, it internally enbales 'changelog-notification'. But -once the 'changelog-notification' is enabled, it will not be disabled -for the life time of the brick process even after bitrot and changelog -is disabled. As of now, rpc resource cleanup has lot of races and is -difficult to cleanup cleanly. If allowed, it leads to memory leaks -and crashes on enable/disable of bitrot or changelog (journal) in a -loop. Hence to be safer, the event notification is not disabled within -lifetime of process once enabled. - -> Change-Id: Ifd00286e0966049e8eb9f21567fe407cf11bb02a -> Updates: #475 -> Signed-off-by: Mohit Agrawal -> (Cherry pick from commit 6de80bcd6366778ac34ce58ec496fa08cc02bd0b) -> (Reviewed on upstream link https://review.gluster.org/#/c/glusterfs/+/21896/) - -BUG: 1790336 -Change-Id: Ifd00286e0966049e8eb9f21567fe407cf11bb02a -Signed-off-by: Mohit Agrawal -Reviewed-on: https://code.engineering.redhat.com/gerrit/202778 -Tested-by: Mohit Agrawal -Tested-by: RHGS Build Bot -Reviewed-by: Sunil Kumar Heggodu Gopala Acharya ---- - rpc/rpc-lib/src/rpcsvc.c | 26 ++-- - tests/basic/changelog/changelog-history.t | 12 +- - tests/bugs/bitrot/bug-1227996.t | 1 - - tests/bugs/bitrot/bug-1245981.t | 4 +- - xlators/features/changelog/src/changelog-helpers.h | 4 + - .../features/changelog/src/changelog-rpc-common.c | 3 + - xlators/features/changelog/src/changelog.c | 149 +++++++++++++++------ - xlators/mgmt/glusterd/src/glusterd-volgen.c | 13 ++ - 8 files changed, 154 insertions(+), 58 deletions(-) - -diff --git a/rpc/rpc-lib/src/rpcsvc.c b/rpc/rpc-lib/src/rpcsvc.c -index b058932..3f184bf 100644 ---- a/rpc/rpc-lib/src/rpcsvc.c -+++ b/rpc/rpc-lib/src/rpcsvc.c -@@ -1865,6 +1865,18 @@ rpcsvc_program_unregister(rpcsvc_t *svc, rpcsvc_program_t *program) - goto out; - } - -+ pthread_rwlock_rdlock(&svc->rpclock); -+ { -+ list_for_each_entry(prog, &svc->programs, program) -+ { -+ if ((prog->prognum == program->prognum) && -+ (prog->progver == program->progver)) { -+ break; -+ } -+ } -+ } -+ pthread_rwlock_unlock(&svc->rpclock); -+ - ret = rpcsvc_program_unregister_portmap(program); - if (ret == -1) { - gf_log(GF_RPCSVC, GF_LOG_ERROR, -@@ -1881,17 +1893,6 @@ rpcsvc_program_unregister(rpcsvc_t *svc, rpcsvc_program_t *program) - goto out; - } - #endif -- pthread_rwlock_rdlock(&svc->rpclock); -- { -- list_for_each_entry(prog, &svc->programs, program) -- { -- if ((prog->prognum == program->prognum) && -- (prog->progver == program->progver)) { -- break; -- } -- } -- } -- pthread_rwlock_unlock(&svc->rpclock); - - gf_log(GF_RPCSVC, GF_LOG_DEBUG, - "Program unregistered: %s, Num: %d," -@@ -1912,6 +1913,9 @@ rpcsvc_program_unregister(rpcsvc_t *svc, rpcsvc_program_t *program) - - ret = 0; - out: -+ if (prog) -+ GF_FREE(prog); -+ - if (ret == -1) { - if (program) { - gf_log(GF_RPCSVC, GF_LOG_ERROR, -diff --git a/tests/basic/changelog/changelog-history.t b/tests/basic/changelog/changelog-history.t -index 3ce4098..b56e247 100644 ---- a/tests/basic/changelog/changelog-history.t -+++ b/tests/basic/changelog/changelog-history.t -@@ -5,6 +5,7 @@ - - cleanup; - -+SCRIPT_TIMEOUT=300 - HISTORY_BIN_PATH=$(dirname $0)/../../utils/changelog - build_tester $HISTORY_BIN_PATH/get-history.c -lgfchangelog - -@@ -68,18 +69,21 @@ TEST $CLI volume set $V0 changelog.changelog off - sleep 3 - time_after_disable=$(date '+%s') - -+TEST $CLI volume set $V0 changelog.changelog on -+sleep 5 -+ - #Passes, gives the changelogs till continuous changelogs are available - # but returns 1 --EXPECT "1" $HISTORY_BIN_PATH/get-history $time_after_enable1 $time_in_sec_htime2 -+EXPECT_WITHIN 10 "1" $HISTORY_BIN_PATH/get-history $time_after_enable1 $time_in_sec_htime2 - - #Fails as start falls between htime files --EXPECT "-3" $HISTORY_BIN_PATH/get-history $time_between_htime $time_in_sec_htime1 -+EXPECT_WITHIN 10 "-3" $HISTORY_BIN_PATH/get-history $time_between_htime $time_in_sec_htime1 - - #Passes as start and end falls in same htime file --EXPECT "0" $HISTORY_BIN_PATH/get-history $time_in_sec_htime1 $time_in_sec_htime2 -+EXPECT_WITHIN 10 "0" $HISTORY_BIN_PATH/get-history $time_in_sec_htime1 $time_in_sec_htime2 - - #Passes, gives the changelogs till continuous changelogs are available --EXPECT "0" $HISTORY_BIN_PATH/get-history $time_in_sec_htime2 $time_after_disable -+EXPECT_WITHIN 10 "0" $HISTORY_BIN_PATH/get-history $time_in_sec_htime2 $time_after_disable - - TEST rm $HISTORY_BIN_PATH/get-history - -diff --git a/tests/bugs/bitrot/bug-1227996.t b/tests/bugs/bitrot/bug-1227996.t -index 47ebc42..121c7b5 100644 ---- a/tests/bugs/bitrot/bug-1227996.t -+++ b/tests/bugs/bitrot/bug-1227996.t -@@ -17,7 +17,6 @@ TEST pidof glusterd; - ## Lets create and start the volume - TEST $CLI volume create $V0 $H0:$B0/${V0}0 $H0:$B0/${V0}1 - TEST $CLI volume start $V0 -- - ## Enable bitrot on volume $V0 - TEST $CLI volume bitrot $V0 enable - -diff --git a/tests/bugs/bitrot/bug-1245981.t b/tests/bugs/bitrot/bug-1245981.t -index 2bed4d9..f395525 100644 ---- a/tests/bugs/bitrot/bug-1245981.t -+++ b/tests/bugs/bitrot/bug-1245981.t -@@ -47,9 +47,9 @@ touch $M0/5 - sleep `expr $SLEEP_TIME \* 2` - - backpath=$(get_backend_paths $fname) --TEST getfattr -m . -n trusted.bit-rot.signature $backpath -+EXPECT_WITHIN $PROCESS_UP_TIMEOUT 'trusted.bit-rot.signature' check_for_xattr 'trusted.bit-rot.signature' $backpath - - backpath=$(get_backend_paths $M0/new_file) --TEST getfattr -m . -n trusted.bit-rot.signature $backpath -+EXPECT_WITHIN $PROCESS_UP_TIMEOUT 'trusted.bit-rot.signature' check_for_xattr 'trusted.bit-rot.signature' $backpath - - cleanup; -diff --git a/xlators/features/changelog/src/changelog-helpers.h b/xlators/features/changelog/src/changelog-helpers.h -index 517c4dc..3afacc9 100644 ---- a/xlators/features/changelog/src/changelog-helpers.h -+++ b/xlators/features/changelog/src/changelog-helpers.h -@@ -190,8 +190,12 @@ typedef struct changelog_ev_selector { - - /* changelog's private structure */ - struct changelog_priv { -+ /* changelog journalling */ - gf_boolean_t active; - -+ /* changelog live notifications */ -+ gf_boolean_t rpc_active; -+ - /* to generate unique socket file per brick */ - char *changelog_brick; - -diff --git a/xlators/features/changelog/src/changelog-rpc-common.c b/xlators/features/changelog/src/changelog-rpc-common.c -index dcdcfb1..f2d1853 100644 ---- a/xlators/features/changelog/src/changelog-rpc-common.c -+++ b/xlators/features/changelog/src/changelog-rpc-common.c -@@ -263,6 +263,9 @@ changelog_rpc_server_destroy(xlator_t *this, rpcsvc_t *rpc, char *sockfile, - struct rpcsvc_program *prog = NULL; - rpc_transport_t *trans = NULL; - -+ if (!rpc) -+ return; -+ - while (*progs) { - prog = *progs; - (void)rpcsvc_program_unregister(rpc, prog); -diff --git a/xlators/features/changelog/src/changelog.c b/xlators/features/changelog/src/changelog.c -index d9025f3..ff06c09 100644 ---- a/xlators/features/changelog/src/changelog.c -+++ b/xlators/features/changelog/src/changelog.c -@@ -34,6 +34,12 @@ static struct changelog_bootstrap cb_bootstrap[] = { - }, - }; - -+static int -+changelog_init_rpc(xlator_t *this, changelog_priv_t *priv); -+ -+static int -+changelog_init(xlator_t *this, changelog_priv_t *priv); -+ - /* Entry operations - TYPE III */ - - /** -@@ -2008,6 +2014,11 @@ notify(xlator_t *this, int event, void *data, ...) - uint64_t clntcnt = 0; - changelog_clnt_t *conn = NULL; - gf_boolean_t cleanup_notify = _gf_false; -+ char sockfile[UNIX_PATH_MAX] = { -+ 0, -+ }; -+ rpcsvc_listener_t *listener = NULL; -+ rpcsvc_listener_t *next = NULL; - - INIT_LIST_HEAD(&queue); - -@@ -2021,23 +2032,40 @@ notify(xlator_t *this, int event, void *data, ...) - "cleanup changelog rpc connection of brick %s", - priv->victim->name); - -- this->cleanup_starting = 1; -- changelog_destroy_rpc_listner(this, priv); -- conn = &priv->connections; -- if (conn) -- changelog_ev_cleanup_connections(this, conn); -- xprtcnt = GF_ATOMIC_GET(priv->xprtcnt); -- clntcnt = GF_ATOMIC_GET(priv->clntcnt); -- -- if (!xprtcnt && !clntcnt) { -- LOCK(&priv->lock); -- { -- cleanup_notify = priv->notify_down; -- priv->notify_down = _gf_true; -+ if (priv->rpc_active) { -+ this->cleanup_starting = 1; -+ changelog_destroy_rpc_listner(this, priv); -+ conn = &priv->connections; -+ if (conn) -+ changelog_ev_cleanup_connections(this, conn); -+ xprtcnt = GF_ATOMIC_GET(priv->xprtcnt); -+ clntcnt = GF_ATOMIC_GET(priv->clntcnt); -+ if (!xprtcnt && !clntcnt) { -+ LOCK(&priv->lock); -+ { -+ cleanup_notify = priv->notify_down; -+ priv->notify_down = _gf_true; -+ } -+ UNLOCK(&priv->lock); -+ list_for_each_entry_safe(listener, next, &priv->rpc->listeners, -+ list) -+ { -+ if (listener->trans) { -+ rpc_transport_unref(listener->trans); -+ } -+ } -+ CHANGELOG_MAKE_SOCKET_PATH(priv->changelog_brick, sockfile, -+ UNIX_PATH_MAX); -+ sys_unlink(sockfile); -+ if (priv->rpc) { -+ rpcsvc_destroy(priv->rpc); -+ priv->rpc = NULL; -+ } -+ if (!cleanup_notify) -+ default_notify(this, GF_EVENT_PARENT_DOWN, data); - } -- UNLOCK(&priv->lock); -- if (!cleanup_notify) -- default_notify(this, GF_EVENT_PARENT_DOWN, data); -+ } else { -+ default_notify(this, GF_EVENT_PARENT_DOWN, data); - } - goto out; - } -@@ -2425,6 +2453,22 @@ changelog_barrier_pthread_destroy(changelog_priv_t *priv) - LOCK_DESTROY(&priv->bflags.lock); - } - -+static void -+changelog_cleanup_rpc(xlator_t *this, changelog_priv_t *priv) -+{ -+ /* terminate rpc server */ -+ if (!this->cleanup_starting) -+ changelog_destroy_rpc_listner(this, priv); -+ -+ (void)changelog_cleanup_rpc_threads(this, priv); -+ /* cleanup rot buffs */ -+ rbuf_dtor(priv->rbuf); -+ -+ /* cleanup poller thread */ -+ if (priv->poller) -+ (void)changelog_thread_cleanup(this, priv->poller); -+} -+ - int - reconfigure(xlator_t *this, dict_t *options) - { -@@ -2433,6 +2477,9 @@ reconfigure(xlator_t *this, dict_t *options) - changelog_priv_t *priv = NULL; - gf_boolean_t active_earlier = _gf_true; - gf_boolean_t active_now = _gf_true; -+ gf_boolean_t rpc_active_earlier = _gf_true; -+ gf_boolean_t rpc_active_now = _gf_true; -+ gf_boolean_t iniate_rpc = _gf_false; - changelog_time_slice_t *slice = NULL; - changelog_log_data_t cld = { - 0, -@@ -2454,6 +2501,7 @@ reconfigure(xlator_t *this, dict_t *options) - - ret = -1; - active_earlier = priv->active; -+ rpc_active_earlier = priv->rpc_active; - - /* first stop the rollover and the fsync thread */ - changelog_cleanup_helper_threads(this, priv); -@@ -2487,6 +2535,29 @@ reconfigure(xlator_t *this, dict_t *options) - goto out; - - GF_OPTION_RECONF("changelog", active_now, options, bool, out); -+ GF_OPTION_RECONF("changelog-notification", rpc_active_now, options, bool, -+ out); -+ -+ /* If journalling is enabled, enable rpc notifications */ -+ if (active_now && !active_earlier) { -+ if (!rpc_active_earlier) -+ iniate_rpc = _gf_true; -+ } -+ -+ if (rpc_active_now && !rpc_active_earlier) { -+ iniate_rpc = _gf_true; -+ } -+ -+ /* TODO: Disable of changelog-notifications is not supported for now -+ * as there is no clean way of cleaning up of rpc resources -+ */ -+ -+ if (iniate_rpc) { -+ ret = changelog_init_rpc(this, priv); -+ if (ret) -+ goto out; -+ priv->rpc_active = _gf_true; -+ } - - /** - * changelog_handle_change() handles changes that could possibly -@@ -2618,6 +2689,7 @@ changelog_init_options(xlator_t *this, changelog_priv_t *priv) - goto dealloc_2; - - GF_OPTION_INIT("changelog", priv->active, bool, dealloc_2); -+ GF_OPTION_INIT("changelog-notification", priv->rpc_active, bool, dealloc_2); - GF_OPTION_INIT("capture-del-path", priv->capture_del_path, bool, dealloc_2); - - GF_OPTION_INIT("op-mode", tmp, str, dealloc_2); -@@ -2656,22 +2728,6 @@ error_return: - return -1; - } - --static void --changelog_cleanup_rpc(xlator_t *this, changelog_priv_t *priv) --{ -- /* terminate rpc server */ -- if (!this->cleanup_starting) -- changelog_destroy_rpc_listner(this, priv); -- -- (void)changelog_cleanup_rpc_threads(this, priv); -- /* cleanup rot buffs */ -- rbuf_dtor(priv->rbuf); -- -- /* cleanup poller thread */ -- if (priv->poller) -- (void)changelog_thread_cleanup(this, priv->poller); --} -- - static int - changelog_init_rpc(xlator_t *this, changelog_priv_t *priv) - { -@@ -2768,10 +2824,13 @@ init(xlator_t *this) - INIT_LIST_HEAD(&priv->queue); - priv->barrier_enabled = _gf_false; - -- /* RPC ball rolling.. */ -- ret = changelog_init_rpc(this, priv); -- if (ret) -- goto cleanup_barrier; -+ if (priv->rpc_active || priv->active) { -+ /* RPC ball rolling.. */ -+ ret = changelog_init_rpc(this, priv); -+ if (ret) -+ goto cleanup_barrier; -+ priv->rpc_active = _gf_true; -+ } - - ret = changelog_init(this, priv); - if (ret) -@@ -2783,7 +2842,9 @@ init(xlator_t *this) - return 0; - - cleanup_rpc: -- changelog_cleanup_rpc(this, priv); -+ if (priv->rpc_active) { -+ changelog_cleanup_rpc(this, priv); -+ } - cleanup_barrier: - changelog_barrier_pthread_destroy(priv); - cleanup_options: -@@ -2808,9 +2869,10 @@ fini(xlator_t *this) - priv = this->private; - - if (priv) { -- /* terminate RPC server/threads */ -- changelog_cleanup_rpc(this, priv); -- -+ if (priv->active || priv->rpc_active) { -+ /* terminate RPC server/threads */ -+ changelog_cleanup_rpc(this, priv); -+ } - /* call barrier_disable to cancel timer */ - if (priv->barrier_enabled) - __chlog_barrier_disable(this, &queue); -@@ -2879,6 +2941,13 @@ struct volume_options options[] = { - .flags = OPT_FLAG_SETTABLE, - .level = OPT_STATUS_BASIC, - .tags = {"journal", "georep", "glusterfind"}}, -+ {.key = {"changelog-notification"}, -+ .type = GF_OPTION_TYPE_BOOL, -+ .default_value = "off", -+ .description = "enable/disable changelog live notification", -+ .op_version = {3}, -+ .level = OPT_STATUS_BASIC, -+ .tags = {"bitrot", "georep"}}, - {.key = {"changelog-brick"}, - .type = GF_OPTION_TYPE_PATH, - .description = "brick path to generate unique socket file name." -diff --git a/xlators/mgmt/glusterd/src/glusterd-volgen.c b/xlators/mgmt/glusterd/src/glusterd-volgen.c -index 16346e7..13f84ea 100644 ---- a/xlators/mgmt/glusterd/src/glusterd-volgen.c -+++ b/xlators/mgmt/glusterd/src/glusterd-volgen.c -@@ -1876,6 +1876,19 @@ brick_graph_add_changelog(volgen_graph_t *graph, glusterd_volinfo_t *volinfo, - ret = xlator_set_fixed_option(xl, "changelog-dir", changelog_basepath); - if (ret) - goto out; -+ -+ ret = glusterd_is_bitrot_enabled(volinfo); -+ if (ret == -1) { -+ goto out; -+ } else if (ret) { -+ ret = xlator_set_fixed_option(xl, "changelog-notification", "on"); -+ if (ret) -+ goto out; -+ } else { -+ ret = xlator_set_fixed_option(xl, "changelog-notification", "off"); -+ if (ret) -+ goto out; -+ } - out: - return ret; - } --- -1.8.3.1 - diff --git a/SOURCES/0446-bitrot-Make-number-of-signer-threads-configurable.patch b/SOURCES/0446-bitrot-Make-number-of-signer-threads-configurable.patch deleted file mode 100644 index 8eb2089..0000000 --- a/SOURCES/0446-bitrot-Make-number-of-signer-threads-configurable.patch +++ /dev/null @@ -1,594 +0,0 @@ -From 866a4c49ad9c5a9125814a9f843d4c7fd967ab2b Mon Sep 17 00:00:00 2001 -From: Kotresh HR -Date: Mon, 3 Feb 2020 18:10:17 +0530 -Subject: [PATCH 446/449] bitrot: Make number of signer threads configurable - -The number of signing process threads (glfs_brpobj) -is set to 4 by default. The recommendation is to set -it to number of cores available. This patch makes it -configurable as follows - -gluster vol bitrot signer-threads - -> fixes: bz#1797869 -> Change-Id: Ia883b3e5e34e0bc8d095243508d320c9c9c58adc -> Signed-off-by: Kotresh HR -> (Cherry pick from commit 8fad76650bd85463708f59d2518f5b764ae4c702) -> (Reviewed on upstream link https://review.gluster.org/#/c/glusterfs/+/24091/) - -BUG: 1790336 -Change-Id: Ia883b3e5e34e0bc8d095243508d320c9c9c58adc -Signed-off-by: Mohit Agrawal -Reviewed-on: https://code.engineering.redhat.com/gerrit/202780 -Reviewed-by: Sunil Kumar Heggodu Gopala Acharya ---- - cli/src/cli-cmd-parser.c | 29 +++++++- - cli/src/cli-cmd-volume.c | 12 +++ - doc/gluster.8 | 6 ++ - libglusterfs/src/glusterfs/common-utils.h | 1 + - rpc/xdr/src/cli1-xdr.x | 1 + - tests/bitrot/br-signer-threads-config-1797869.t | 73 +++++++++++++++++++ - xlators/features/bit-rot/src/bitd/bit-rot.c | 45 +++++++++--- - xlators/features/bit-rot/src/bitd/bit-rot.h | 20 ++--- - .../bit-rot/src/stub/bit-rot-stub-mem-types.h | 1 + - xlators/mgmt/glusterd/src/glusterd-bitrot.c | 85 ++++++++++++++++++++++ - xlators/mgmt/glusterd/src/glusterd-volgen.c | 16 ++-- - xlators/mgmt/glusterd/src/glusterd-volume-set.c | 9 +++ - 12 files changed, 270 insertions(+), 28 deletions(-) - create mode 100644 tests/bitrot/br-signer-threads-config-1797869.t - -diff --git a/cli/src/cli-cmd-parser.c b/cli/src/cli-cmd-parser.c -index 7446b95..5fd05f4 100644 ---- a/cli/src/cli-cmd-parser.c -+++ b/cli/src/cli-cmd-parser.c -@@ -5661,7 +5661,7 @@ cli_cmd_bitrot_parse(const char **words, int wordcount, dict_t **options) - char *volname = NULL; - char *opwords[] = { - "enable", "disable", "scrub-throttle", "scrub-frequency", "scrub", -- "signing-time", NULL}; -+ "signing-time", "signer-threads", NULL}; - char *scrub_throt_values[] = {"lazy", "normal", "aggressive", NULL}; - char *scrub_freq_values[] = {"hourly", "daily", "weekly", "biweekly", - "monthly", "minute", NULL}; -@@ -5669,6 +5669,7 @@ cli_cmd_bitrot_parse(const char **words, int wordcount, dict_t **options) - dict_t *dict = NULL; - gf_bitrot_type type = GF_BITROT_OPTION_TYPE_NONE; - int32_t expiry_time = 0; -+ int32_t signer_th_count = 0; - - GF_ASSERT(words); - GF_ASSERT(options); -@@ -5849,6 +5850,31 @@ cli_cmd_bitrot_parse(const char **words, int wordcount, dict_t **options) - } - goto set_type; - } -+ } else if (!strcmp(words[3], "signer-threads")) { -+ if (!words[4]) { -+ cli_err( -+ "Missing signer-thread value for bitrot " -+ "option"); -+ ret = -1; -+ goto out; -+ } else { -+ type = GF_BITROT_OPTION_TYPE_SIGNER_THREADS; -+ -+ signer_th_count = strtol(words[4], NULL, 0); -+ if (signer_th_count < 1) { -+ cli_err("signer-thread count should not be less than 1"); -+ ret = -1; -+ goto out; -+ } -+ -+ ret = dict_set_uint32(dict, "signer-threads", -+ (unsigned int)signer_th_count); -+ if (ret) { -+ cli_out("Failed to set dict for bitrot"); -+ goto out; -+ } -+ goto set_type; -+ } - } else { - cli_err( - "Invalid option %s for bitrot. Please enter valid " -@@ -5857,7 +5883,6 @@ cli_cmd_bitrot_parse(const char **words, int wordcount, dict_t **options) - ret = -1; - goto out; - } -- - set_type: - ret = dict_set_int32(dict, "type", type); - if (ret < 0) -diff --git a/cli/src/cli-cmd-volume.c b/cli/src/cli-cmd-volume.c -index f33fc99..72504ca 100644 ---- a/cli/src/cli-cmd-volume.c -+++ b/cli/src/cli-cmd-volume.c -@@ -3236,6 +3236,16 @@ struct cli_cmd bitrot_cmds[] = { - {"volume bitrot {enable|disable}", NULL, /*cli_cmd_bitrot_cbk,*/ - "Enable/disable bitrot for volume "}, - -+ {"volume bitrot signing-time ", -+ NULL, /*cli_cmd_bitrot_cbk,*/ -+ "Waiting time for an object after last fd is closed to start signing " -+ "process"}, -+ -+ {"volume bitrot signer-threads ", -+ NULL, /*cli_cmd_bitrot_cbk,*/ -+ "Number of signing process threads. Usually set to number of available " -+ "cores"}, -+ - {"volume bitrot scrub-throttle {lazy|normal|aggressive}", - NULL, /*cli_cmd_bitrot_cbk,*/ - "Set the speed of the scrubber for volume "}, -@@ -3251,6 +3261,8 @@ struct cli_cmd bitrot_cmds[] = { - "the scrubber. ondemand starts the scrubber immediately."}, - - {"volume bitrot {enable|disable}\n" -+ "volume bitrot signing-time \n" -+ "volume bitrot signer-threads \n" - "volume bitrot scrub-throttle {lazy|normal|aggressive}\n" - "volume bitrot scrub-frequency {hourly|daily|weekly|biweekly" - "|monthly}\n" -diff --git a/doc/gluster.8 b/doc/gluster.8 -index 66bdb48..084346d 100644 ---- a/doc/gluster.8 -+++ b/doc/gluster.8 -@@ -244,6 +244,12 @@ Use "!