rpms/glusterfs
5
0
Fork 0
Code Issues Pull Requests Releases Activity

autobuild v6.0-45

Browse Source 
Resolves: bz#1785714
Signed-off-by: Deepshikha Khandelwal <dkhandel@redhat.com>
This commit is contained in:
Deepshikha Khandelwal 2020-09-09 11:01:41 +00:00
parent 4b366a2bd0
commit 859811e556
2 changed files with 38 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
0469-cluster-ec-Don-t-trigger-heal-for-stale-index.patch Normal file
View File

@ -0,0 +1,33 @@
From 6fed6cfcb26e6ed3c9640c5f889629315bbd83c2 Mon Sep 17 00:00:00 2001
From: Pranith Kumar K <pkarampu@redhat.com>
Date: Mon, 31 Aug 2020 12:22:05 +0530
Subject: [PATCH 469/469] cluster/ec: Don't trigger heal for stale index
> Fixes: #1385
> Upstream-patch: https://review.gluster.org/c/glusterfs/+/24930
BUG: 1785714
Change-Id: I3609dd2e1f63c4bd6a19d528b935bf5b05443824
Signed-off-by: Pranith Kumar K <pkarampu@redhat.com>
Reviewed-on: https://code.engineering.redhat.com/gerrit/210731
Tested-by: RHGS Build Bot <nigelb@redhat.com>
Reviewed-by: Sunil Kumar Heggodu Gopala Acharya <sheggodu@redhat.com>
---
xlators/cluster/ec/src/ec-heal.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/xlators/cluster/ec/src/ec-heal.c b/xlators/cluster/ec/src/ec-heal.c
index 06bafa5..f6376cd 100644
--- a/xlators/cluster/ec/src/ec-heal.c
+++ b/xlators/cluster/ec/src/ec-heal.c
@@ -2624,6 +2624,7 @@ ec_heal_do(xlator_t *this, void *data, loc_t *loc, int32_t partial)
* removed. We need not take lock on this entry to do so as
* xattrop on a brick is atomic. */
ec_heal_purge_stale_index(frame, ec, loc->inode);
+ goto out;
} else if (need_heal == EC_HEAL_NONEED) {
gf_msg(ec->xl->name, GF_LOG_DEBUG, 0, EC_MSG_HEAL_FAIL,
"Heal is not required for : %s ", uuid_utoa(loc->gfid));
--
1.8.3.1

6
glusterfs.spec
View File

@ -237,7 +237,7 @@ Release: 0.1%{?prereltag:.%{prereltag}}%{?dist}
%else
Name: glusterfs
Version: 6.0
Release: 44%{?dist}
Release: 45%{?dist}
ExcludeArch: i686
%endif
License: GPLv2 or LGPLv3+
@ -783,6 +783,7 @@ Patch0465: 0465-posix-Implement-a-janitor-thread-to-close-fd.patch
Patch0466: 0466-cluster-ec-Change-stale-index-handling.patch
Patch0467: 0467-build-Added-dependency-for-glusterfs-selinux.patch
Patch0468: 0468-build-Update-the-glusterfs-selinux-version.patch
Patch0469: 0469-cluster-ec-Don-t-trigger-heal-for-stale-index.patch
%description
GlusterFS is a distributed file-system capable of scaling to several
@ -2526,6 +2527,9 @@ fi
%endif
%changelog
* Wed Sep 09 2020 Deepshikha Khandelwal <dkhandel@redhat.com> - 6.0-45
- fixes bugs bz#1785714
* Thu Sep 03 2020 Deepshikha Khandelwal <dkhandel@redhat.com> - 6.0-44
- fixes bugs bz#1460657