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

autobuild v3.12.2-36

Browse Source 
Resolves: bz#1290124 bz#1655385 bz#1663232
Signed-off-by: Milind Changire <mchangir@redhat.com>
This commit is contained in:
Milind Changire 2019-01-04 01:29:53 -05:00
parent a902a1d5ca
commit 6611e93be3
4 changed files with 122 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
0499-cluster-dht-Fix-incorrect-backport.patch Normal file
View File

@ -0,0 +1,37 @@
From 2e3632750662956ec62ed3dc8c3c4b2deedc01af Mon Sep 17 00:00:00 2001
From: N Balachandran <nbalacha@redhat.com>
Date: Thu, 3 Jan 2019 13:35:47 +0530
Subject: [PATCH 499/501] cluster/dht: Fix incorrect backport
There was an error in the patch
https://code.engineering.redhat.com/gerrit/#/c/159569/
which is now fixed.
Change-Id: I187dd8f6e9f1ceb9495ee4f5c6e39ca837c9df15
BUG: 1290124
Signed-off-by: N Balachandran <nbalacha@redhat.com>
Reviewed-on: https://code.engineering.redhat.com/gerrit/159719
Tested-by: RHGS Build Bot <nigelb@redhat.com>
Reviewed-by: Raghavendra Gowdappa <rgowdapp@redhat.com>
Reviewed-by: Susant Palai <spalai@redhat.com>
Reviewed-by: Sunil Kumar Heggodu Gopala Acharya <sheggodu@redhat.com>
---
xlators/cluster/dht/src/dht-rebalance.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/xlators/cluster/dht/src/dht-rebalance.c b/xlators/cluster/dht/src/dht-rebalance.c
index 291b557..20ad7ef 100644
--- a/xlators/cluster/dht/src/dht-rebalance.c
+++ b/xlators/cluster/dht/src/dht-rebalance.c
@@ -998,7 +998,7 @@ check_avail_space:
if (conf->disk_unit == 'p' && dst_statfs.f_blocks) {
dst_post_availspacepercent =
- (dst_statfs_blocks) / dst_total_blocks;
+ (dst_statfs_blocks * 100) / dst_total_blocks;
gf_msg_debug (this->name, 0, "file : %s, post_availspacepercent : %lf "
"f_bavail : %lu min-free-disk: %lf", loc->path,
--
1.8.3.1

30
0500-extras-Add-readdir-ahead-to-samba-group-command.patch Normal file
View File

@ -0,0 +1,30 @@
From 9620aeb14c26fcaff7c3f8daf6bac01be150bb40 Mon Sep 17 00:00:00 2001
From: Anoop C S <anoopcs@redhat.com>
Date: Thu, 3 Jan 2019 10:52:22 +0530
Subject: [PATCH 500/501] extras: Add readdir-ahead to samba group command
upstream ref: https://review.gluster.org/c/glusterfs/+/21982
Change-Id: I310f014a9ab8416d9833f5711ff902da1457f415
BUG: 1655385
Signed-off-by: Anoop C S <anoopcs@redhat.com>
Reviewed-on: https://code.engineering.redhat.com/gerrit/159824
Tested-by: RHGS Build Bot <nigelb@redhat.com>
Reviewed-by: Sunil Kumar Heggodu Gopala Acharya <sheggodu@redhat.com>
---
extras/group-samba | 1 +
1 file changed, 1 insertion(+)
diff --git a/extras/group-samba b/extras/group-samba
index ee39202..eeee6e0 100644
--- a/extras/group-samba
+++ b/extras/group-samba
@@ -7,4 +7,5 @@ performance.md-cache-timeout=600
network.inode-lru-limit=200000
performance.nl-cache=on
performance.nl-cache-timeout=600
+performance.readdir-ahead=on
performance.parallel-readdir=on
--
1.8.3.1

48
0501-glusterd-aggregate-rsp-from-peers-for-profile-comman.patch Normal file
View File

@ -0,0 +1,48 @@
From b415160bcf51c682c919776287c4c9a2b5a8221f Mon Sep 17 00:00:00 2001
From: Sanju Rakonde <srakonde@redhat.com>
Date: Thu, 3 Jan 2019 19:09:36 +0530
Subject: [PATCH 501/501] glusterd: aggregate rsp from peers for profile
command
When we run profile info command, it should display statistics
of all the bricks of the volume. To display information of bricks
which are hosted on peers, we need to aggregate the response from
peers.
For profile info command, all the statistics will be added into
the dictionary in brick-op phase. To aggregate the information from
peers, we need to call glusterd_syncop_aggr_rsp_dict() in brick-op
call back function.
>upstream patch : https://review.gluster.org/#/c/glusterfs/+/21988
>fixes: bz#1663223
>Change-Id: I5f5890c3d01974747f829128ab74be6071f4aa30
>Signed-off-by: Sanju Rakonde <srakonde@redhat.com>
BUG: 1663232
Change-Id: I5f5890c3d01974747f829128ab74be6071f4aa30
Signed-off-by: Sanju Rakonde <srakonde@redhat.com>
Reviewed-on: https://code.engineering.redhat.com/gerrit/159818
Tested-by: RHGS Build Bot <nigelb@redhat.com>
Reviewed-by: Sunil Kumar Heggodu Gopala Acharya <sheggodu@redhat.com>
---
xlators/mgmt/glusterd/src/glusterd-mgmt.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/xlators/mgmt/glusterd/src/glusterd-mgmt.c b/xlators/mgmt/glusterd/src/glusterd-mgmt.c
index ef8a2d9..275059c 100644
--- a/xlators/mgmt/glusterd/src/glusterd-mgmt.c
+++ b/xlators/mgmt/glusterd/src/glusterd-mgmt.c
@@ -1349,7 +1349,8 @@ gd_mgmt_v3_brick_op_cbk_fn (struct rpc_req *req, struct iovec *iov,
gf_uuid_copy (args->uuid, rsp.uuid);
pthread_mutex_lock (&args->lock_dict);
{
- if (rsp.op == GD_OP_DEFRAG_BRICK_VOLUME)
+ if (rsp.op == GD_OP_DEFRAG_BRICK_VOLUME ||
+ rsp.op == GD_OP_PROFILE_VOLUME)
ret = glusterd_syncop_aggr_rsp_dict (rsp.op, args->dict,
rsp_dict);
}
--
1.8.3.1

8
glusterfs.spec
View File

@ -192,7 +192,7 @@ Release: 0.1%{?prereltag:.%{prereltag}}%{?dist}
%else
Name: glusterfs
Version: 3.12.2
Release: 35%{?dist}
Release: 36%{?dist}
%endif
License: GPLv2 or LGPLv3+
Group: System Environment/Base
@ -763,6 +763,9 @@ Patch0495: 0495-build-add-conditional-dependency-on-server-for-devel.patch
Patch0496: 0496-glusterd-kill-the-process-without-releasing-the-clea.patch
Patch0497: 0497-cluster-dht-Use-percentages-for-space-check.patch
Patch0498: 0498-mem-pool-Code-refactor-in-mem_pool.c.patch
Patch0499: 0499-cluster-dht-Fix-incorrect-backport.patch
Patch0500: 0500-extras-Add-readdir-ahead-to-samba-group-command.patch
Patch0501: 0501-glusterd-aggregate-rsp-from-peers-for-profile-comman.patch
%description
GlusterFS is a distributed file-system capable of scaling to several
@ -2723,6 +2726,9 @@ fi
%endif
%changelog
* Fri Jan 04 2019 Milind Changire <mchangir@redhat.com> - 3.12.2-36
- fixes bugs bz#1290124 bz#1655385 bz#1663232
* Wed Jan 02 2019 Milind Changire <mchangir@redhat.com> - 3.12.2-35
- fixes bugs bz#1654161