From 11f2b2fe34a5420b565b6ac3f2f33a0433f70b87 Mon Sep 17 00:00:00 2001 From: Milind Changire Date: Thu, 17 May 2018 08:07:11 -0400 Subject: [PATCH] autobuild v3.12.2-11 Resolves: bz#1558989 bz#1575555 bz#1578647 Signed-off-by: Milind Changire --- ...x-an-issue-with-parallel-readdir-and.patch | 48 +++++++++++++++++++ ...off-ownthreads-for-Glusterfs-program.patch | 43 +++++++++++++++++ ...fix-the-log-level-for-removexattr_cb.patch | 47 ++++++++++++++++++ glusterfs.spec | 8 +++- 4 files changed, 145 insertions(+), 1 deletion(-) create mode 100644 0272-readdir-ahead-Fix-an-issue-with-parallel-readdir-and.patch create mode 100644 0273-rpcsvc-Turn-off-ownthreads-for-Glusterfs-program.patch create mode 100644 0274-client-protocol-fix-the-log-level-for-removexattr_cb.patch diff --git a/0272-readdir-ahead-Fix-an-issue-with-parallel-readdir-and.patch b/0272-readdir-ahead-Fix-an-issue-with-parallel-readdir-and.patch new file mode 100644 index 0000000..295be8d --- /dev/null +++ b/0272-readdir-ahead-Fix-an-issue-with-parallel-readdir-and.patch @@ -0,0 +1,48 @@ +From d4a387d3e419f4b15a5fc98a9ee7af4644b05ffe Mon Sep 17 00:00:00 2001 +From: Poornima G +Date: Wed, 16 May 2018 11:00:32 +0530 +Subject: [PATCH 272/274] readdir-ahead: Fix an issue with parallel-readdir and + readdir-optimize + +Issue: When parallel-readdir is enabled, readdir-optimize automatically +stops working because of a bug in rda_opendir. + +RCA: In rda_opendir, the xattrs that indicate readdir-optimize or not +is sent in xdata. This xdata is sent to all the readdirp prefetch +calls. A dict_ref is taken on xdata and kept in rda_opendir to be +used by rda_fill_fd, but dht_opendir deletes some elements in xdata +after calling rda_opendir. Hence dict_ref is not a right choice here, +dict_copy needs to used. + +Backport of https://review.gluster.org/#/c/20026/ + +>Change-Id: Ie7cc7ceb03117dd4179ef7905647f2f123f94966 +>fixes: bz#1578650 +>Signed-off-by: Poornima G + +Bug: 1578647 +Change-Id: Ia710b39ad2fe9e71df17ae13c3281526f382004b +Signed-off-by: Poornima G +Reviewed-on: https://code.engineering.redhat.com/gerrit/139040 +Tested-by: RHGS Build Bot +Reviewed-by: Sunil Kumar Heggodu Gopala Acharya +--- + xlators/performance/readdir-ahead/src/readdir-ahead.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/xlators/performance/readdir-ahead/src/readdir-ahead.c b/xlators/performance/readdir-ahead/src/readdir-ahead.c +index 0d3bdbd..6501a6b 100644 +--- a/xlators/performance/readdir-ahead/src/readdir-ahead.c ++++ b/xlators/performance/readdir-ahead/src/readdir-ahead.c +@@ -525,7 +525,7 @@ rda_opendir(call_frame_t *frame, xlator_t *this, loc_t *loc, fd_t *fd, + * Retrieve list of keys set by md-cache xlator and store it + * in local to be consumed in rda_opendir_cbk + */ +- local->xattrs = dict_ref (xdata); ++ local->xattrs = dict_copy_with_ref (xdata, NULL); + frame->local = local; + } + +-- +1.8.3.1 + diff --git a/0273-rpcsvc-Turn-off-ownthreads-for-Glusterfs-program.patch b/0273-rpcsvc-Turn-off-ownthreads-for-Glusterfs-program.patch new file mode 100644 index 0000000..f5c1969 --- /dev/null +++ b/0273-rpcsvc-Turn-off-ownthreads-for-Glusterfs-program.patch @@ -0,0 +1,43 @@ +From 0336d2fa2e8ee0b80c5d5891883c2551f6dbe4db Mon Sep 17 00:00:00 2001 +From: Raghavendra G +Date: Thu, 17 May 2018 11:20:36 +0530 +Subject: [PATCH 273/274] rpcsvc: Turn off ownthreads for Glusterfs program + +With introduction of request-handler-threads and queue to hold +requests we are seeing performance regression. Hence revert the +functionality of, + +commit 2e72b24707f1886833db0b09e48b3f48b8d68d37 +Author: Raghavendra G +Date: Tue Apr 25 10:43:07 2017 +0530 + + program/GF-DUMP: Shield ping processing from traffic to Glusterfs + Program + +by setting ownthread=false + +Change-Id: Ic500ff593aecf8062b2929d5518523363dfbab4f +BUG: 1558989 +Signed-off-by: Raghavendra G +Reviewed-on: https://code.engineering.redhat.com/gerrit/139002 +Tested-by: RHGS Build Bot +Reviewed-by: Amar Tumballi +Reviewed-by: Sunil Kumar Heggodu Gopala Acharya +--- + xlators/protocol/server/src/server-rpc-fops.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/xlators/protocol/server/src/server-rpc-fops.c b/xlators/protocol/server/src/server-rpc-fops.c +index 91d5c03..ba6cc1f 100644 +--- a/xlators/protocol/server/src/server-rpc-fops.c ++++ b/xlators/protocol/server/src/server-rpc-fops.c +@@ -6160,5 +6160,5 @@ struct rpcsvc_program glusterfs3_3_fop_prog = { + .progver = GLUSTER_FOP_VERSION, + .numactors = GLUSTER_FOP_PROCCNT, + .actors = glusterfs3_3_fop_actors, +- .ownthread = _gf_true, ++ .ownthread = _gf_false, + }; +-- +1.8.3.1 + diff --git a/0274-client-protocol-fix-the-log-level-for-removexattr_cb.patch b/0274-client-protocol-fix-the-log-level-for-removexattr_cb.patch new file mode 100644 index 0000000..3990418 --- /dev/null +++ b/0274-client-protocol-fix-the-log-level-for-removexattr_cb.patch @@ -0,0 +1,47 @@ +From 6699edde4b8d82346dc06a2468434aa99ee53b53 Mon Sep 17 00:00:00 2001 +From: Amar Tumballi +Date: Wed, 9 May 2018 00:56:11 +0530 +Subject: [PATCH 274/274] client/protocol: fix the log level for + removexattr_cbk + +noticed that server protocol actually logs all the errors for +removexattr as INFO, instead of WARNING like client, and hence, +doesn't create a confusion in user. + +Upstream: +> Patch URL: https://review.gluster.org/19990/ +> Change-Id: Ia6681e9ee433fda3c77a4509906c78333396e339 +> Signed-off-by: Amar Tumballi + +BUG: 1575555 +Change-Id: I1540a6b77abc48eebf06072d781afadf371e982d +Signed-off-by: Amar Tumballi +Reviewed-on: https://code.engineering.redhat.com/gerrit/139053 +Tested-by: Sunil Kumar Heggodu Gopala Acharya +Tested-by: RHGS Build Bot +Reviewed-by: Sunil Kumar Heggodu Gopala Acharya +--- + xlators/protocol/client/src/client-rpc-fops.c | 7 ++++++- + 1 file changed, 6 insertions(+), 1 deletion(-) + +diff --git a/xlators/protocol/client/src/client-rpc-fops.c b/xlators/protocol/client/src/client-rpc-fops.c +index 973a795..e6a9b90 100644 +--- a/xlators/protocol/client/src/client-rpc-fops.c ++++ b/xlators/protocol/client/src/client-rpc-fops.c +@@ -1196,7 +1196,12 @@ client3_3_removexattr_cbk (struct rpc_req *req, struct iovec *iov, int count, + ret = client_post_removexattr (this, &rsp, &xdata); + out: + if (rsp.op_ret == -1) { +- if ((ENODATA == rsp.op_errno) || (ENOATTR == rsp.op_errno)) ++ /* EPERM/EACCESS is returned some times in case of selinux ++ attributes, or other system attributes which may not be ++ possible to remove from an user process is encountered. ++ we can't treat it as an error */ ++ if ((ENODATA == rsp.op_errno) || (ENOATTR == rsp.op_errno) || ++ (EPERM == rsp.op_errno) || (EACCES == rsp.op_errno)) + loglevel = GF_LOG_DEBUG; + else + loglevel = GF_LOG_WARNING; +-- +1.8.3.1 + diff --git a/glusterfs.spec b/glusterfs.spec index 966ae4c..b4c1c85 100644 --- a/glusterfs.spec +++ b/glusterfs.spec @@ -192,7 +192,7 @@ Release: 0.1%{?prereltag:.%{prereltag}}%{?dist} %else Name: glusterfs Version: 3.12.2 -Release: 10%{?dist} +Release: 11%{?dist} %endif License: GPLv2 or LGPLv3+ Group: System Environment/Base @@ -536,6 +536,9 @@ Patch0268: 0268-dht-Excessive-dict-is-null-logs-in-dht_discover_comp.patch Patch0269: 0269-extras-Disable-choose-local-in-groups-virt-and-glust.patch Patch0270: 0270-glusterfs-Resolve-brick-crashes-at-the-time-of-inode.patch Patch0271: 0271-cli-Fix-for-gluster-volume-info-xml.patch +Patch0272: 0272-readdir-ahead-Fix-an-issue-with-parallel-readdir-and.patch +Patch0273: 0273-rpcsvc-Turn-off-ownthreads-for-Glusterfs-program.patch +Patch0274: 0274-client-protocol-fix-the-log-level-for-removexattr_cb.patch %description GlusterFS is a distributed file-system capable of scaling to several @@ -2482,6 +2485,9 @@ fi %endif %changelog +* Thu May 17 2018 Milind Changire - 3.12.2-11 +- fixes bugs bz#1558989 bz#1575555 bz#1578647 + * Tue May 15 2018 Milind Changire - 3.12.2-10 - fixes bugs bz#1488120 bz#1565577 bz#1568297 bz#1570586 bz#1572043 bz#1572075 bz#1575840 bz#1575877