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

autobuild v3.12.2-3

Browse Source 
Resolves: bz#1446125 bz#1463592 bz#1516249 bz#1517463 bz#1527309
Resolves: bz#1530325 bz#1531041 bz#1539699 bz#1540011
Signed-off-by: Milind Changire <mchangir@redhat.com>
This commit is contained in:
Milind Changire 2018-02-05 02:23:51 -05:00
parent cf62f1947f
commit a7814fc8e8
12 changed files with 1052 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

134
0129-posix-delete-stale-gfid-handles-in-nameless-lookup.patch Normal file
View File

@ -0,0 +1,134 @@
From 960ecba01a057ff8a2fc356624720904419e7f49 Mon Sep 17 00:00:00 2001
From: Ravishankar N <ravishankar@redhat.com>
Date: Tue, 16 Jan 2018 10:16:41 +0530
Subject: [PATCH 129/139] posix: delete stale gfid handles in nameless lookup
..in order for self-heal of symlinks to work properly (see BZ for
details).
Backport of https://review.gluster.org/#/c/19070/
Signed-off-by: Ravishankar N <ravishankar@redhat.com>
Change-Id: I9a011d00b07a690446f7fd3589e96f840e8b7501
BUG: 1527309
Reviewed-on: https://code.engineering.redhat.com/gerrit/127739
Tested-by: Ravishankar Narayanankutty <ravishankar@redhat.com>
Tested-by: RHGS Build Bot <nigelb@redhat.com>
Reviewed-by: Ashish Pandey <aspandey@redhat.com>
Reviewed-by: Ravishankar Narayanankutty <ravishankar@redhat.com>
---
tests/bugs/heal-symlinks.t | 65 +++++++++++++++++++++++++++++++++++++++
xlators/storage/posix/src/posix.c | 17 +++++++++-
2 files changed, 81 insertions(+), 1 deletion(-)
create mode 100644 tests/bugs/heal-symlinks.t
diff --git a/tests/bugs/heal-symlinks.t b/tests/bugs/heal-symlinks.t
new file mode 100644
index 0000000..ecd2b52
--- /dev/null
+++ b/tests/bugs/heal-symlinks.t
@@ -0,0 +1,65 @@
+#!/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 start $V0
+
+TEST glusterfs --volfile-id=$V0 --volfile-server=$H0 --entry-timeout=0 $M0;
+
+cd $M0
+TEST "echo hello_world > FILE"
+TEST ln -s FILE SOFTLINK
+
+# Remove symlink only (not the .glusterfs entry) and trigger named heal.
+TEST rm -f $B0/${V0}2/SOFTLINK
+TEST stat SOFTLINK
+
+# To heal and clear new-entry mark on source bricks.
+TEST $CLI volume heal $V0
+EXPECT_WITHIN $HEAL_TIMEOUT "^0$" get_pending_heal_count $V0
+
+EXPECT 2 stat -c %h $B0/${V0}2/SOFTLINK
+EXPECT "hello_world" cat $B0/${V0}2/SOFTLINK
+
+cd -
+cleanup
+###############################################################################
+
+TEST glusterd
+TEST pidof glusterd
+TEST $CLI volume create $V0 disperse 3 redundancy 1 $H0:$B0/${V0}{0,1,2}
+TEST $CLI volume set $V0 performance.stat-prefetch off
+TEST $CLI volume start $V0
+
+TEST glusterfs --volfile-id=$V0 --volfile-server=$H0 --entry-timeout=0 $M0;
+
+cd $M0
+TEST "echo hello_world > FILE"
+TEST ln -s FILE SOFTLINK
+
+# Remove symlink only (not the .glusterfs entry) and trigger named heal.
+TEST rm -f $B0/${V0}2/SOFTLINK
+TEST stat SOFTLINK
+
+# To heal and clear new-entry mark on source bricks.
+TEST $CLI volume heal $V0
+EXPECT_WITHIN $HEAL_TIMEOUT "^0$" get_pending_heal_count $V0
+
+EXPECT 2 stat -c %h $B0/${V0}2/SOFTLINK
+TEST kill_brick $V0 $H0 $B0/${V0}0
+cd -
+EXPECT_WITHIN $UMOUNT_TIMEOUT "Y" force_umount $M0
+TEST glusterfs --volfile-id=$V0 --volfile-server=$H0 --entry-timeout=0 $M0;
+cd $M0
+EXPECT "hello_world" cat SOFTLINK
+
+cd -
+cleanup
+###############################################################################
diff --git a/xlators/storage/posix/src/posix.c b/xlators/storage/posix/src/posix.c
index d0433ec..8aeca3b 100644
--- a/xlators/storage/posix/src/posix.c
+++ b/xlators/storage/posix/src/posix.c
@@ -213,7 +213,10 @@ posix_lookup (call_frame_t *frame, xlator_t *this,
dict_t * xattr = NULL;
char * real_path = NULL;
char * par_path = NULL;
+ char *gfid_path = NULL;
+ uuid_t gfid = {0};
struct iatt postparent = {0,};
+ struct stat statbuf = {0};
int32_t gfidless = 0;
char *pgfid_xattr_key = NULL;
int32_t nlink_samepgfid = 0;
@@ -267,7 +270,19 @@ posix_lookup (call_frame_t *frame, xlator_t *this,
"lstat on %s failed",
real_path ? real_path : "null");
}
-
+ if (loc_is_nameless(loc)) {
+ if (!op_errno)
+ op_errno = ESTALE;
+ loc_gfid (loc, gfid);
+ MAKE_HANDLE_ABSPATH (gfid_path, this, gfid);
+ op_ret = sys_lstat(gfid_path, &statbuf);
+ if (op_ret == 0 && statbuf.st_nlink == 1) {
+ gf_msg (this->name, GF_LOG_WARNING, ESTALE,
+ P_MSG_HANDLE_DELETE, "Found stale gfid "
+ "handle %s, removing it.", gfid_path);
+ posix_handle_unset (this, gfid, NULL);
+ }
+ }
entry_ret = -1;
goto parent;
}
--
1.8.3.1

93
0130-md-cache-avoid-checking-the-xattr-value-buffer-with-.patch Normal file
View File

@ -0,0 +1,93 @@
From cb681aeb67fbca52e8e0aab04a909e4bf8a62174 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?G=C3=BCnther=20Deschner?= <gd@samba.org>
Date: Mon, 9 Oct 2017 18:02:25 +0200
Subject: [PATCH 130/139] md-cache: avoid checking the xattr value buffer with
string functions.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
xattrs may very well contain binary, non-text data with leading 0
values. Using strcmp for checking empty values is not the appropriate
thing to do: In the best case, it might treat a binary xattr value
starting with 0 from being cached (and hence also from being reported
back with xattr). In the worst case, we might read beyond the end
of a data blob that does contain any zero byte.
We fix this by checking the length of the data blob and checking
the first byte against 0 if the length is one.
> Signed-off-by: Guenther Deschner <gd@samba.org>
> Pair-Programmed-With: Michael Adam <obnox@samba.org>
> Change-Id: If723c465a630b8a37b6be58782a2724df7ac6b11
> BUG: 1476324
> Reviewed-on: https://review.gluster.org/17910
> Reviewed-by: Michael Adam <obnox@samba.org>
> Smoke: Gluster Build System <jenkins@build.gluster.org>
> Reviewed-by: Poornima G <pgurusid@redhat.com>
> Tested-by: Poornima G <pgurusid@redhat.com>
> CentOS-regression: Gluster Build System <jenkins@build.gluster.org>
> (cherry picked from commit ab4ffdac9dec1867f2d9b33242179cf2b347319d)
Change-Id: If723c465a630b8a37b6be58782a2724df7ac6b11
BUG: 1446125
Signed-off-by: Günther Deschner <gd@samba.org>
Reviewed-on: https://code.engineering.redhat.com/gerrit/128478
Tested-by: Poornima Gurusiddaiah <pgurusid@redhat.com>
Tested-by: RHGS Build Bot <nigelb@redhat.com>
Reviewed-by: Sunil Kumar Heggodu Gopala Acharya <sheggodu@redhat.com>
---
tests/bugs/md-cache/bug-1476324.t | 27 +++++++++++++++++++++++++++
xlators/performance/md-cache/src/md-cache.c | 2 +-
2 files changed, 28 insertions(+), 1 deletion(-)
create mode 100644 tests/bugs/md-cache/bug-1476324.t
diff --git a/tests/bugs/md-cache/bug-1476324.t b/tests/bugs/md-cache/bug-1476324.t
new file mode 100644
index 0000000..c34f412
--- /dev/null
+++ b/tests/bugs/md-cache/bug-1476324.t
@@ -0,0 +1,27 @@
+#!/bin/bash
+
+. $(dirname $0)/../../include.rc
+. $(dirname $0)/../../volume.rc
+
+cleanup;
+
+TEST glusterd;
+
+TEST $CLI volume create $V0 $H0:$B0/${V0}{1,2,3};
+
+TEST $CLI volume start $V0
+
+TEST $CLI volume set $V0 performance.md-cache-timeout 600
+TEST $CLI volume set $V0 performance.cache-samba-metadata on
+
+TEST glusterfs --volfile-id=/$V0 --volfile-server=$H0 $M0
+
+TEST touch $M0/file1
+
+TEST "setfattr -n user.DOSATTRIB -v 0sAAOW $M0/file1"
+TEST "getfattr -n user.DOSATTRIB $M0/file1 -e base64 | grep -q 0sAAOW"
+
+TEST "setfattr -n user.DOSATTRIB -v 0x00ff $M0/file1"
+TEST "getfattr -n user.DOSATTRIB $M0/file1 -e hex | grep -q 0x00ff"
+
+cleanup;
diff --git a/xlators/performance/md-cache/src/md-cache.c b/xlators/performance/md-cache/src/md-cache.c
index d21a6a7..1ca7727 100644
--- a/xlators/performance/md-cache/src/md-cache.c
+++ b/xlators/performance/md-cache/src/md-cache.c
@@ -633,7 +633,7 @@ updatefn(dict_t *dict, char *key, data_t *value, void *data)
* not update their cache if the value of a xattr is a 0 byte
* data (i.e. "").
*/
- if (!strcmp (value->data, ""))
+ if (value->len == 1 && value->data[0] == '\0')
continue;
if (dict_set(u->dict, key, value) < 0) {
--
1.8.3.1

81
0131-readdir-ahead-Add-parallel-readdir-option-in-readdir.patch Normal file
View File

@ -0,0 +1,81 @@
From 20a92ebcfcf534390468fadca97e7fdc0207967c Mon Sep 17 00:00:00 2001
From: Poornima G <pgurusid@redhat.com>
Date: Wed, 25 Oct 2017 17:00:36 +0530
Subject: [PATCH 131/139] readdir-ahead: Add parallel-readdir option in
readdir-ahead
parallel-readdir option is defined as belonging to readdir-ahead
in glusterd-volume-set.c, but was not defined in options of
readdir-ahead, fixing the same.
> Reviewed on: https://review.gluster.org/#/c/18572/
> Change-Id: I97cc88b38ab99ade5f066519ca1cb9bfed03a7da
> BUG: 1506197
> Signed-off-by: Poornima G <pgurusid@redhat.com>
> (cherry picked from commit 80a6a2357c0c0351691c450c40de820efce7ff6f)
Change-Id: I97cc88b38ab99ade5f066519ca1cb9bfed03a7da
BUG: 1463592
Signed-off-by: Poornima G <pgurusid@redhat.com>
Reviewed-on: https://code.engineering.redhat.com/gerrit/128484
Tested-by: RHGS Build Bot <nigelb@redhat.com>
Reviewed-by: Sunil Kumar Heggodu Gopala Acharya <sheggodu@redhat.com>
Reviewed-by: Atin Mukherjee <amukherj@redhat.com>
---
xlators/performance/readdir-ahead/src/readdir-ahead.c | 13 +++++++++++++
xlators/performance/readdir-ahead/src/readdir-ahead.h | 1 +
2 files changed, 14 insertions(+)
diff --git a/xlators/performance/readdir-ahead/src/readdir-ahead.c b/xlators/performance/readdir-ahead/src/readdir-ahead.c
index 8827b8b..c2ceda4 100644
--- a/xlators/performance/readdir-ahead/src/readdir-ahead.c
+++ b/xlators/performance/readdir-ahead/src/readdir-ahead.c
@@ -635,6 +635,8 @@ reconfigure(xlator_t *this, dict_t *options)
size_uint64, err);
GF_OPTION_RECONF("rda-cache-limit", priv->rda_cache_limit, options,
size_uint64, err);
+ GF_OPTION_RECONF("parallel-readdir", priv->parallel_readdir, options,
+ bool, err);
return 0;
err:
@@ -678,6 +680,8 @@ init(xlator_t *this)
err);
GF_OPTION_INIT("rda-cache-limit", priv->rda_cache_limit, size_uint64,
err);
+ GF_OPTION_INIT("parallel-readdir", priv->parallel_readdir, bool,
+ err);
return 0;
@@ -745,6 +749,15 @@ struct volume_options options[] = {
"value, irrespective of the number/size of "
"directories cached",
},
+ { .key = {"parallel-readdir"},
+ .type = GF_OPTION_TYPE_BOOL,
+ .default_value = "off",
+ .description = "If this option is enabled, the readdir operation "
+ "is performed in parallel on all the bricks, thus "
+ "improving the performance of readdir. Note that "
+ "the performance improvement is higher in large "
+ "clusters"
+ },
{ .key = {NULL} },
};
diff --git a/xlators/performance/readdir-ahead/src/readdir-ahead.h b/xlators/performance/readdir-ahead/src/readdir-ahead.h
index 8c663e0..36d4df8 100644
--- a/xlators/performance/readdir-ahead/src/readdir-ahead.h
+++ b/xlators/performance/readdir-ahead/src/readdir-ahead.h
@@ -45,6 +45,7 @@ struct rda_priv {
uint64_t rda_high_wmark;
uint64_t rda_cache_limit;
uint64_t rda_cache_size;
+ gf_boolean_t parallel_readdir;
};
#endif /* __READDIR_AHEAD_H */
--
1.8.3.1

184
0132-posix-In-getxattr-honor-the-wildcard.patch Normal file
View File

@ -0,0 +1,184 @@
From 0499970747a7897bd9190484b5ab6868b19f393f Mon Sep 17 00:00:00 2001
From: Poornima G <pgurusid@redhat.com>
Date: Thu, 4 Jan 2018 19:38:05 +0530
Subject: [PATCH 132/139] posix: In getxattr, honor the wildcard '*'
Currently, the posix_xattr_fill performas a sys_getxattr
on all the keys requested, there are requirements where
the keys could contain a wildcard, in which case sys_getxattr
would return ENODATA, eg: if the xattr requested is user.*
all the xattrs with prefix user. should be returned, with their
values.
This patch, changes posix_xattr_fill, to honor wildcard in the keys
requested.
Updates #297
> Signed-off-by: Poornima G <pgurusid@redhat.com>
> Change-Id: I3d52da2957ac386fca3c156e26ff4cdf0b2c79a9
> Reviewed-on: https://review.gluster.org/19170
> Smoke: Gluster Build System <jenkins@build.gluster.org>
> Reviewed-by: Amar Tumballi
> Tested-by: Poornima G <pgurusid@redhat.com>
> CentOS-regression: Gluster Build System <jenkins@build.gluster.org>
> (cherry picked from commit 8fc9c6a8fc7c73b2b4c65a8ddbe988bca10e89b6)
BUG: 1446125
Change-Id: I3d52da2957ac386fca3c156e26ff4cdf0b2c79a9
Signed-off-by: Poornima G <pgurusid@redhat.com>
Reviewed-on: https://code.engineering.redhat.com/gerrit/128480
Tested-by: RHGS Build Bot <nigelb@redhat.com>
Reviewed-by: Sunil Kumar Heggodu Gopala Acharya <sheggodu@redhat.com>
---
xlators/storage/posix/src/posix-helpers.c | 64 ++++++++++++++++++++-----------
xlators/storage/posix/src/posix.h | 2 +
2 files changed, 43 insertions(+), 23 deletions(-)
diff --git a/xlators/storage/posix/src/posix-helpers.c b/xlators/storage/posix/src/posix-helpers.c
index 77affc4..f8d8fed 100644
--- a/xlators/storage/posix/src/posix-helpers.c
+++ b/xlators/storage/posix/src/posix-helpers.c
@@ -387,7 +387,9 @@ _posix_xattr_get_set (dict_t *xattr_req, char *key, data_t *data,
int _fd = -1;
loc_t *loc = NULL;
ssize_t req_size = 0;
-
+ int32_t list_offset = 0;
+ ssize_t remaining_size = 0;
+ char *xattr = NULL;
if (posix_xattr_ignorable (key))
goto out;
@@ -507,13 +509,20 @@ _posix_xattr_get_set (dict_t *xattr_req, char *key, data_t *data,
filler->stbuf->ia_size);
}
} else {
- ret = _posix_xattr_get_set_from_backend (filler, key);
+ remaining_size = filler->list_size;
+ while (remaining_size > 0) {
+ xattr = filler->list + list_offset;
+ if (fnmatch (key, xattr, 0) == 0)
+ ret = _posix_xattr_get_set_from_backend (filler,
+ xattr);
+ remaining_size -= strlen (xattr) + 1;
+ list_offset += strlen (xattr) + 1;
+ }
}
out:
return 0;
}
-
int
posix_fill_gfid_path (xlator_t *this, const char *path, struct iatt *iatt)
{
@@ -712,42 +721,50 @@ out:
return ret;
}
+
static void
-_handle_list_xattr (dict_t *xattr_req, const char *real_path, int fdnum,
- posix_xattr_filler_t *filler)
+_get_list_xattr (posix_xattr_filler_t *filler)
{
ssize_t size = 0;
- char *list = NULL;
- int32_t list_offset = 0;
- ssize_t remaining_size = 0;
- char *key = NULL;
- if ((!real_path) && (fdnum < 0))
+ if ((!filler) && (!filler->real_path) && (filler->fdnum < 0))
goto out;
- if (real_path)
- size = sys_llistxattr (real_path, NULL, 0);
+ if (filler->real_path)
+ size = sys_llistxattr (filler->real_path, NULL, 0);
else
- size = sys_flistxattr (fdnum, NULL, 0);
+ size = sys_flistxattr (filler->fdnum, NULL, 0);
if (size <= 0)
goto out;
- list = alloca (size);
- if (!list)
+ filler->list = GF_CALLOC (1, size, gf_posix_mt_char);
+ if (!filler->list)
goto out;
- if (real_path)
- remaining_size = sys_llistxattr (real_path, list, size);
+ if (filler->real_path)
+ size = sys_llistxattr (filler->real_path, filler->list, size);
else
- remaining_size = sys_flistxattr (fdnum, list, size);
+ size = sys_flistxattr (filler->fdnum, filler->list, size);
- if (remaining_size <= 0)
- goto out;
+ filler->list_size = size;
+out:
+ return;
+}
+
+
+static void
+_handle_list_xattr (dict_t *xattr_req, const char *real_path, int fdnum,
+ posix_xattr_filler_t *filler)
+{
+ int32_t list_offset = 0;
+ ssize_t remaining_size = 0;
+ char *key = NULL;
list_offset = 0;
+ remaining_size = filler->list_size;
while (remaining_size > 0) {
- key = list + list_offset;
+ key = filler->list + list_offset;
if (gf_get_index_by_elem (list_xattr_ignore_xattrs, key) >= 0)
goto next;
@@ -770,7 +787,6 @@ next:
list_offset += strlen (key) + 1;
} /* while (remaining_size > 0) */
-out:
return;
}
@@ -798,12 +814,14 @@ posix_xattr_fill (xlator_t *this, const char *real_path, loc_t *loc, fd_t *fd,
filler.stbuf = buf;
filler.loc = loc;
filler.fd = fd;
- filler.fdnum = fdnum;
+ filler.fdnum = fdnum;
+ _get_list_xattr (&filler);
dict_foreach (xattr_req, _posix_xattr_get_set, &filler);
if (list)
_handle_list_xattr (xattr_req, real_path, fdnum, &filler);
+ GF_FREE (filler.list);
out:
return xattr;
}
diff --git a/xlators/storage/posix/src/posix.h b/xlators/storage/posix/src/posix.h
index 777adac..ae9fb08 100644
--- a/xlators/storage/posix/src/posix.h
+++ b/xlators/storage/posix/src/posix.h
@@ -240,6 +240,8 @@ typedef struct {
int fdnum;
int flags;
int32_t op_errno;
+ char *list;
+ size_t list_size;
} posix_xattr_filler_t;
typedef struct {
--
1.8.3.1

88
0133-upcall-Allow-md-cache-to-specify-invalidations-on-xa.patch Normal file
View File

@ -0,0 +1,88 @@
From 897f0604f34760afe585a28d9787c6ff39d3addc Mon Sep 17 00:00:00 2001
From: Poornima G <pgurusid@redhat.com>
Date: Tue, 9 Jan 2018 10:32:16 +0530
Subject: [PATCH 133/139] upcall: Allow md-cache to specify invalidations on
xattr with wildcard
Currently, md-cache sends a list of xattrs, it is inttrested in recieving
invalidations for. But, it cannot specify any wildcard in the xattr names
Eg: user.* - invalidate on updating any xattr with user. prefix.
This patch, enable upcall to honor wildcard in the xattr key names
Updates: #297
> Signed-off-by: Poornima G <pgurusid@redhat.com>
> Change-Id: I98caf0ed72f11ef10770bf2067d4428880e0a03a
> Reviewed-on: https://review.gluster.org/19171
> Smoke: Gluster Build System <jenkins@build.gluster.org>
> Reviewed-by: Amar Tumballi
> Tested-by: Poornima G <pgurusid@redhat.com>
> CentOS-regression: Gluster Build System <jenkins@build.gluster.org>
> (cherry picked from commit efc30e60e233164bd4fe7fc903a7c5f718b0448b)
Change-Id: I98caf0ed72f11ef10770bf2067d4428880e0a03a
BUG: 1446125
Signed-off-by: Poornima G <pgurusid@redhat.com>
Reviewed-on: https://code.engineering.redhat.com/gerrit/128481
Tested-by: RHGS Build Bot <nigelb@redhat.com>
Reviewed-by: Sunil Kumar Heggodu Gopala Acharya <sheggodu@redhat.com>
---
tests/bugs/md-cache/bug-1211863.t | 0
xlators/features/upcall/src/upcall-internal.c | 25 +++++++++++++++++++++----
2 files changed, 21 insertions(+), 4 deletions(-)
mode change 100644 => 100755 tests/bugs/md-cache/bug-1211863.t
diff --git a/tests/bugs/md-cache/bug-1211863.t b/tests/bugs/md-cache/bug-1211863.t
old mode 100644
new mode 100755
diff --git a/xlators/features/upcall/src/upcall-internal.c b/xlators/features/upcall/src/upcall-internal.c
index 8b15dfc..7813940 100644
--- a/xlators/features/upcall/src/upcall-internal.c
+++ b/xlators/features/upcall/src/upcall-internal.c
@@ -466,11 +466,29 @@ up_filter_afr_xattr (dict_t *xattrs, char *xattr, data_t *v)
}
-static int
+static gf_boolean_t
+up_key_is_regd_xattr (dict_t *regd_xattrs, char *regd_xattr, data_t *v,
+ void *xattr)
+{
+ int ret = _gf_false;
+ char *key = xattr;
+
+ if (fnmatch (regd_xattr, key, 0) == 0)
+ ret = _gf_true;
+
+ return ret;
+}
+
+
+int
up_filter_unregd_xattr (dict_t *xattrs, char *xattr, data_t *v,
void *regd_xattrs)
{
- if (dict_get ((dict_t *)regd_xattrs, xattr) == NULL) {
+ int ret = 0;
+
+ ret = dict_foreach_match (regd_xattrs, up_key_is_regd_xattr, xattr,
+ dict_null_foreach_fn, NULL);
+ if (ret == 0) {
/* xattr was not found in the registered xattr, hence do not
* send notification for its change
*/
@@ -488,9 +506,8 @@ up_filter_xattr (dict_t *xattr, dict_t *regd_xattrs)
{
int ret = 0;
- /* Remove the xattrs from the dict, if they are not registered for
- * cache invalidation */
ret = dict_foreach (xattr, up_filter_unregd_xattr, regd_xattrs);
+
return ret;
}
--
1.8.3.1

46
0134-cli-Fixed-a-use_after_free.patch Normal file
View File

@ -0,0 +1,46 @@
From 8e353f6f4e919541f8830de835da13c805db66a0 Mon Sep 17 00:00:00 2001
From: N Balachandran <nbalacha@redhat.com>
Date: Fri, 5 Jan 2018 08:55:09 +0530
Subject: [PATCH 134/139] cli: Fixed a use_after_free
gf_event in cli_cmd_volume_create_cbk was accessing
memory that had already been freed.
>upstream mainline patch : https://review.gluster.org/#/c/19136/
> Change-Id: I447c939fa9b31e18819a62c3b356c14cca390787
> BUG: 1530910
> Signed-off-by: N Balachandran <nbalacha@redhat.com>
(cherry picked from commit fa903173540df5b82c295a8f7b24848098e49a41)
Change-Id: I1361b3bfecbd5771f5710b08466b913d807cb60c
BUG: 1531041
Signed-off-by: N Balachandran <nbalacha@redhat.com>
Reviewed-on: https://code.engineering.redhat.com/gerrit/126957
Reviewed-by: Atin Mukherjee <amukherj@redhat.com>
Tested-by: RHGS Build Bot <nigelb@redhat.com>
---
cli/src/cli-cmd-volume.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/cli/src/cli-cmd-volume.c b/cli/src/cli-cmd-volume.c
index 7110145..2639afa 100644
--- a/cli/src/cli-cmd-volume.c
+++ b/cli/src/cli-cmd-volume.c
@@ -253,11 +253,12 @@ out:
cli_out ("Volume create failed");
}
- CLI_STACK_DESTROY (frame);
if (ret == 0) {
gf_event (EVENT_VOLUME_CREATE, "name=%s;bricks=%s",
(char *)words[2], bricks);
}
+
+ CLI_STACK_DESTROY (frame);
return ret;
}
--
1.8.3.1

134
0135-cli-commands-are-missing-in-man-page.patch Normal file
View File

@ -0,0 +1,134 @@
From 793830be96b95daaa842ab63da66be8840e04315 Mon Sep 17 00:00:00 2001
From: Sanju Rakonde <srakonde@redhat.com>
Date: Mon, 27 Nov 2017 00:18:03 +0530
Subject: [PATCH 135/139] cli: commands are missing in man page
adding missed commands to gluster manual page.
>upstream mainline patch : https://review.gluster.org/#/c/18855
Change-Id: I2e5eb1b3929241275ee7a046c5e3d45a5aa5c4a2
BUG: 1516249
Signed-off-by: Sanju Rakonde <srakonde@redhat.com>
Reviewed-on: https://code.engineering.redhat.com/gerrit/128885
Reviewed-by: Atin Mukherjee <amukherj@redhat.com>
Tested-by: RHGS Build Bot <nigelb@redhat.com>
---
doc/gluster.8 | 49 +++++++++++++++++++++++++++++++++++++++++++++++--
1 file changed, 47 insertions(+), 2 deletions(-)
diff --git a/doc/gluster.8 b/doc/gluster.8
index 4c20307..c13a1c2 100644
--- a/doc/gluster.8
+++ b/doc/gluster.8
@@ -35,6 +35,12 @@ The Gluster Console Manager is a command line utility for elastic volume managem
\fB\ volume info [all|<VOLNAME>] \fR
Display information about all volumes, or the specified volume.
.TP
+\fB\ volume list \fR
+List all volumes in cluster
+.TP
+\fB\ volume status [all | <VOLNAME> [nfs|shd|<BRICK>|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 <NEW-VOLNAME> [stripe <COUNT>] [replica <COUNT>] [disperse [<COUNT>]] [redundancy <COUNT>] [transport <tcp|rdma|tcp,rdma>] <NEW-BRICK> ... \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.
@@ -51,8 +57,17 @@ Stop the specified volume.
\fB\ volume set <VOLNAME> <OPTION> <PARAMETER> [<OPTION> <PARAMETER>] ... \fR
Set the volume options.
.TP
-\fB\ volume get <VOLNAME> <OPTION/all>\fR
-Get the volume options.
+\fB\ volume get <VOLNAME/all> <OPTION/all> \fR
+Get the value of the all options or given option for volume <VOLNAME> or all option. gluster volume get all all is to get all global options
+.TP
+\fB\ volume reset <VOLNAME> [option] [force] \fR
+Reset all the reconfigured options
+.TP
+\fB\ volume barrier <VOLNAME> {enable|disable} \fR
+Barrier/unbarrier file operations on a volume
+.TP
+\fB\ volume clear-locks <VOLNAME> <path> kind {blocked|granted|all}{inode [range]|entry [basename]|posix [range]} \fR
+Clear locks held on path
.TP
\fB\ volume help \fR
Display help for the volume command.
@@ -70,6 +85,9 @@ If you remove the brick, the data stored in that brick will not be available. Yo
.B replace-brick
option.
.TP
+\fB\ volume reset-brick <VOLNAME> <SOURCE-BRICK> {{start} | {<NEW-BRICK> commit}} \fR
+Brings down or replaces the specified source brick with the new brick.
+.TP
\fB\ volume replace-brick <VOLNAME> <SOURCE-BRICK> <NEW-BRICK> commit force \fR
Replace the specified source brick with a new brick.
.TP
@@ -91,6 +109,15 @@ Locate the log file for corresponding volume/brick.
.TP
\fB\ volume log rotate <VOLNAME> [BRICK] \fB
Rotate the log file for corresponding volume/brick.
+.TP
+\fB\ volume profile <VOLNAME> {start|info [peek|incremental [peek]|cumulative|clear]|stop} [nfs] \fR
+Profile operations on the volume. Once started, volume profile <volname> info provides cumulative statistics of the FOPs performed.
+.TP
+\fB\ volume statedump <VOLNAME> [[nfs|quotad] [all|mem|iobuf|callpool|priv|fd|inode|history]... | [client <hostname:process-id>]] \fR
+Dumps the in memory state of the specified process or the bricks of the volume.
+.TP
+\fB\ volume sync <HOSTNAME> [all|<VOLNAME>] \fR
+Sync the volume information from a peer
.SS "Peer Commands"
.TP
\fB\ peer probe <HOSTNAME> \fR
@@ -102,6 +129,9 @@ Detach the specified peer.
\fB\ peer status \fR
Display the status of peers.
.TP
+\fB\ pool list \fR
+List all the nodes in the pool (including localhost)
+.TP
\fB\ peer help \fR
Display help for the peer command.
.SS "Tier Commands"
@@ -109,9 +139,15 @@ Display help for the peer command.
\fB\ volume tier <VOLNAME> attach [<replica COUNT>] <NEW-BRICK>... \fR
Attach to an existing volume a tier of specified type using the specified bricks.
.TP
+\fB\ volume tier <VOLNAME> start [force] \fR
+Start the tier service for <VOLNAME>
+.TP
\fB\ volume tier <VOLNAME> status \fR
Display statistics on data migration between the hot and cold tiers.
.TP
+\fB\ volume tier <VOLNAME> stop [force] \fR
+Stop the tier service for <VOLNAME>
+.TP
\fB\ volume tier <VOLNAME> detach start\fR
Begin detaching the hot tier from the volume. Data will be moved from the hot tier to the cold tier.
.TP
@@ -164,6 +200,12 @@ Set the hard timeout for the volume. The interval in which limits are retested a
\fB\ volume quota <VOLNAME> alert-time <TIME> \fR
Set the frequency in which warning messages need to be logged (in the brick logs) once soft limit is breached.
.TP
+\fB\ volume inode-quota <VOLNAME> enable/disable \fR
+Enable/disable inode-quota for <VOLNAME>
+.TP
+\fB\ volume quota help \fR
+Display help for volume quota commands
+.TP
NOTE: valid units of time and their symbols are : hours(h/hr), minutes(m/min), seconds(s/sec), weeks(w/wk), Days(d/days).
.SS "Geo-replication Commands"
.TP
@@ -206,6 +248,9 @@ Scrub frequency for volume <VOLNAME>
\fB\ volume bitrot <VOLNAME> scrub {pause|resume|status|ondemand} \fR
Pause/Resume scrub. Upon resume, scrubber continues where it left off. status option shows the statistics of scrubber. ondemand option starts the scrubbing immediately if the scrubber is not paused or already running.
.TP
+\fB\ volume bitrot help \fR
+Display help for volume bitrot commands
+.TP
.SS "Snapshot Commands"
.PP
.TP
--
1.8.3.1

38
0136-glusterd-Nullify-pmap-entry-for-bricks-belonging-to-.patch Normal file
View File

@ -0,0 +1,38 @@
From 084b4754afedff7b3f96f17c6ca19b818b0d5767 Mon Sep 17 00:00:00 2001
From: Atin Mukherjee <amukherj@redhat.com>
Date: Tue, 2 Jan 2018 20:26:31 +0530
Subject: [PATCH 136/139] glusterd: Nullify pmap entry for bricks belonging to
same port
Commit 30e0b86 tried to address all the stale port issues glusterd had
in case of a brick is abruptly killed. For brick multiplexing case
because of a bug the portmap entry was not getting removed. This patch
addresses the same.
>upstream mainline patch : https://review.gluster.org/#/c/19119
Change-Id: Ib020b967a9b92f1abae9cab9492f0cacec59aaa1
BUG: 1530325
Signed-off-by: Atin Mukherjee <amukherj@redhat.com>
Reviewed-on: https://code.engineering.redhat.com/gerrit/128884
Tested-by: RHGS Build Bot <nigelb@redhat.com>
---
xlators/mgmt/glusterd/src/glusterd-pmap.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/xlators/mgmt/glusterd/src/glusterd-pmap.c b/xlators/mgmt/glusterd/src/glusterd-pmap.c
index 4f045ab..c9e6c1b 100644
--- a/xlators/mgmt/glusterd/src/glusterd-pmap.c
+++ b/xlators/mgmt/glusterd/src/glusterd-pmap.c
@@ -392,7 +392,7 @@ remove:
* there's no xprt either, then we have nothing left worth saving and
* can delete the entire entry.
*/
- if (!pmap->ports[p].xprt) {
+ if (brick_disconnect || !pmap->ports[p].xprt) {
/* If the signout call is being triggered by brick disconnect
* then clean up all the bricks (in case of brick mux)
*/
--
1.8.3.1

110
0137-bitrot-improved-cli-report-after-bitrot-operatoin.patch Normal file
View File

@ -0,0 +1,110 @@
From 0141f90b41ecd102e52a7e605858e25bd084a044 Mon Sep 17 00:00:00 2001
From: Sunny Kumar <sunkumar@redhat.com>
Date: Thu, 1 Feb 2018 12:08:06 +0530
Subject: [PATCH 137/139] bitrot : improved cli report after bitrot operatoin
Improved cli report post bitrot opertaion as previously it was
showing output "volume bitrot: success" for all the sucessfull
bitrot operations (enable, disable or scrub options).
Upstream Patch : https://review.gluster.org/c/19344/
>BUG: 1539166
>Signed-off-by: Sunny Kumar <sunkumar@redhat.com>
BUG: 1517463
Change-Id: I0857e99f3956221a51cfd1b29a90e1038b90570f
Signed-off-by: Sunny Kumar <sunkumar@redhat.com>
Reviewed-on: https://code.engineering.redhat.com/gerrit/129218
Tested-by: RHGS Build Bot <nigelb@redhat.com>
Reviewed-by: Atin Mukherjee <amukherj@redhat.com>
---
cli/src/cli-rpc-ops.c | 57 +++++++++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 57 insertions(+)
diff --git a/cli/src/cli-rpc-ops.c b/cli/src/cli-rpc-ops.c
index b91400b..1bb01e8 100644
--- a/cli/src/cli-rpc-ops.c
+++ b/cli/src/cli-rpc-ops.c
@@ -11922,6 +11922,10 @@ gf_cli_bitrot_cbk (struct rpc_req *req, struct iovec *iov,
int type = 0;
gf_cli_rsp rsp = {0, };
dict_t *dict = NULL;
+ char *scrub_cmd = NULL;
+ char *volname = NULL;
+ char *cmd_str = NULL;
+ char *cmd_op = NULL;
GF_ASSERT (myframe);
@@ -11977,6 +11981,22 @@ gf_cli_bitrot_cbk (struct rpc_req *req, struct iovec *iov,
goto out;
}
+ /* Ignoring the error, as using dict val for cli output only */
+ ret = dict_get_str (dict, "scrub-value", &scrub_cmd);
+ if (ret)
+ gf_log ("cli", GF_LOG_TRACE, "Failed to get scrub command");
+
+ ret = dict_get_str (dict, "volname", &volname);
+ if (ret)
+ gf_log ("cli", GF_LOG_TRACE, "failed to get volume name");
+
+ ret = dict_get_str (dict, "cmd-str", &cmd_str);
+ if (ret)
+ gf_log ("cli", GF_LOG_TRACE, "failed to get command string");
+
+ if (cmd_str)
+ cmd_op = strrchr(cmd_str, ' ') + 1;
+
if ((type == GF_BITROT_CMD_SCRUB_STATUS) &&
!(global_state->mode & GLUSTER_MODE_XML)) {
ret = gf_cli_print_bitrot_scrub_status (dict);
@@ -11987,6 +12007,43 @@ gf_cli_bitrot_cbk (struct rpc_req *req, struct iovec *iov,
goto out;
}
+ switch (type) {
+ case GF_BITROT_OPTION_TYPE_ENABLE:
+ cli_out("volume bitrot: success bitrot enabled "
+ "for volume %s", volname);
+ ret = 0;
+ goto out;
+ case GF_BITROT_OPTION_TYPE_DISABLE:
+ cli_out("volume bitrot: success bitrot disabled "
+ "for volume %s", volname);
+ ret = 0;
+ goto out;
+ case GF_BITROT_CMD_SCRUB_ONDEMAND:
+ cli_out("volume bitrot: scrubber started ondemand "
+ "for volume %s", volname);
+ ret = 0;
+ goto out;
+ case GF_BITROT_OPTION_TYPE_SCRUB:
+ if (!strncmp ("pause", scrub_cmd, strlen("pause")))
+ cli_out("volume bitrot: scrubber paused "
+ "for volume %s", volname);
+ if (!strncmp ("resume", scrub_cmd, strlen("resume")))
+ cli_out("volume bitrot: scrubber resumed "
+ "for volume %s", volname);
+ ret = 0;
+ goto out;
+ case GF_BITROT_OPTION_TYPE_SCRUB_FREQ:
+ cli_out("volume bitrot: scrub-frequency is set to %s "
+ "successfully for volume %s", cmd_op, volname);
+ ret = 0;
+ goto out;
+ case GF_BITROT_OPTION_TYPE_SCRUB_THROTTLE:
+ cli_out("volume bitrot: scrub-throttle is set to %s "
+ "successfully for volume %s", cmd_op, volname);
+ ret = 0;
+ goto out;
+ }
+
xml_output:
if (global_state->mode & GLUSTER_MODE_XML) {
ret = cli_xml_output_vol_profile (dict, rsp.op_ret,
--
1.8.3.1

91
0138-glusterd-enable-brick-multiplexing-by-default.patch Normal file
View File

@ -0,0 +1,91 @@
From 2a80ccb39ea7f4ef5c801ad78b43e4bdc23a3c64 Mon Sep 17 00:00:00 2001
From: Atin Mukherjee <amukherj@redhat.com>
Date: Fri, 2 Feb 2018 15:38:58 +0530
Subject: [PATCH 138/139] glusterd: enable brick multiplexing by default
Label: DOWNSTREAM ONLY
Change-Id: I0d9a1d8ba2fd60576df9761b5faaa521e9228be0
BUG: 1540011
Signed-off-by: Atin Mukherjee <amukherj@redhat.com>
Reviewed-on: https://code.engineering.redhat.com/gerrit/129382
Tested-by: RHGS Build Bot <nigelb@redhat.com>
Reviewed-by: Mohit Agrawal <moagrawa@redhat.com>
---
cli/src/cli-cmd-parser.c | 18 ------------------
xlators/mgmt/glusterd/src/glusterd-op-sm.c | 2 +-
xlators/mgmt/glusterd/src/glusterd-utils.c | 2 +-
xlators/mgmt/glusterd/src/glusterd-volume-set.c | 2 +-
4 files changed, 3 insertions(+), 21 deletions(-)
diff --git a/cli/src/cli-cmd-parser.c b/cli/src/cli-cmd-parser.c
index 764f420..54bd57f 100644
--- a/cli/src/cli-cmd-parser.c
+++ b/cli/src/cli-cmd-parser.c
@@ -1740,24 +1740,6 @@ cli_cmd_volume_set_parse (struct cli_state *state, const char **words,
goto out;
}
}
-
- if ((strcmp (key, "cluster.brick-multiplex") == 0)) {
- question = "Brick-multiplexing is supported only for "
- "container workloads (CNS/CRS). Also it is "
- "advised to make sure that either all "
- "volumes are in stopped state or no bricks "
- "are running before this option is modified."
- "Do you still want to continue?";
-
- answer = cli_cmd_get_confirmation (state, question);
- if (GF_ANSWER_NO == answer) {
- gf_log ("cli", GF_LOG_ERROR, "Operation "
- "cancelled, exiting");
- *op_errstr = gf_strdup ("Aborted by user.");
- ret = -1;
- goto out;
- }
- }
}
ret = dict_set_int32 (dict, "count", wordcount-3);
diff --git a/xlators/mgmt/glusterd/src/glusterd-op-sm.c b/xlators/mgmt/glusterd/src/glusterd-op-sm.c
index b1a6e06..2fc2e3b 100644
--- a/xlators/mgmt/glusterd/src/glusterd-op-sm.c
+++ b/xlators/mgmt/glusterd/src/glusterd-op-sm.c
@@ -78,7 +78,7 @@ glusterd_all_vol_opts valid_all_vol_opts[] = {
* TBD: add a dynamic handler to set the appropriate value
*/
{ GLUSTERD_MAX_OP_VERSION_KEY, "BUG_NO_MAX_OP_VERSION"},
- { GLUSTERD_BRICK_MULTIPLEX_KEY, "disable"},
+ { GLUSTERD_BRICK_MULTIPLEX_KEY, "enable"},
/* Set this value to 0 by default implying brick-multiplexing
* behaviour with no limit set on the number of brick instances that
* can be attached per process.
diff --git a/xlators/mgmt/glusterd/src/glusterd-utils.c b/xlators/mgmt/glusterd/src/glusterd-utils.c
index f1b365f..4bb54db 100644
--- a/xlators/mgmt/glusterd/src/glusterd-utils.c
+++ b/xlators/mgmt/glusterd/src/glusterd-utils.c
@@ -114,7 +114,7 @@ is_brick_mx_enabled (void)
if (!ret)
ret = gf_string2boolean (value, &enabled);
- return ret ? _gf_false: enabled;
+ return ret ? _gf_true : enabled;
}
int
diff --git a/xlators/mgmt/glusterd/src/glusterd-volume-set.c b/xlators/mgmt/glusterd/src/glusterd-volume-set.c
index c255be0..693c917 100644
--- a/xlators/mgmt/glusterd/src/glusterd-volume-set.c
+++ b/xlators/mgmt/glusterd/src/glusterd-volume-set.c
@@ -3459,7 +3459,7 @@ struct volopt_map_entry glusterd_volopt_map[] = {
/* Brick multiplexing options */
{ .key = GLUSTERD_BRICK_MULTIPLEX_KEY,
.voltype = "mgmt/glusterd",
- .value = "off",
+ .value = "on",
.op_version = GD_OP_VERSION_3_10_0,
.validate_fn = validate_boolean,
.type = GLOBAL_DOC,
--
1.8.3.1

37
0139-libglusterfs-Reset-errno-before-call.patch Normal file
View File

@ -0,0 +1,37 @@
From e7ae5922eb334a155d7aba72509d74247c526970 Mon Sep 17 00:00:00 2001
From: Nigel Babu <nigelb@redhat.com>
Date: Mon, 22 Jan 2018 08:36:36 +0530
Subject: [PATCH 139/139] libglusterfs: Reset errno before call
This was causing Gluster to return a failure when testing on Centos7.
>upstream mainline patch : https://review.gluster.org/#/c/19262/
BUG: 1539699
Change-Id: Idb90baef05058123a7f69e94a51dd79abd371815
Signed-off-by: Nigel Babu <nigelb@redhat.com>
Reviewed-on: https://code.engineering.redhat.com/gerrit/129395
Reviewed-by: Nigel Babu <nbabu@redhat.com>
---
libglusterfs/src/common-utils.c | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/libglusterfs/src/common-utils.c b/libglusterfs/src/common-utils.c
index 772f4e0..378ed05 100644
--- a/libglusterfs/src/common-utils.c
+++ b/libglusterfs/src/common-utils.c
@@ -2453,7 +2453,10 @@ valid_ipv4_subnetwork (const char *address)
"Invalid IPv4 subnetwork address");
goto out;
}
-
+ /*
+ * Reset errno before checking it
+ */
+ errno = 0;
prefixlen = strtol (slash + 1, &endptr, 10);
if ((errno != 0) || (*endptr != '\0') ||
(prefixlen < 0) || (prefixlen > IPv4_ADDR_SIZE)) {
--
1.8.3.1

17
glusterfs.spec
View File

@ -192,7 +192,7 @@ Release: 0.1%{?prereltag:.%{prereltag}}%{?dist}
%else
Name: glusterfs
Version: 3.12.2
Release: 2%{?dist}
Release: 3%{?dist}
%endif
License: GPLv2 or LGPLv3+
Group: System Environment/Base
@ -393,6 +393,17 @@ Patch0125: 0125-cluster-afr-Fixing-the-flaws-in-arbiter-becoming-sou.patch
Patch0126: 0126-spec-unpackaged-files-found-for-RHEL-7-client-build.patch
Patch0127: 0127-spec-unpackaged-files-found-for-RHEL-7-client-build.patch
Patch0128: 0128-build-remove-pretrans-script-for-ganesha.patch
Patch0129: 0129-posix-delete-stale-gfid-handles-in-nameless-lookup.patch
Patch0130: 0130-md-cache-avoid-checking-the-xattr-value-buffer-with-.patch
Patch0131: 0131-readdir-ahead-Add-parallel-readdir-option-in-readdir.patch
Patch0132: 0132-posix-In-getxattr-honor-the-wildcard.patch
Patch0133: 0133-upcall-Allow-md-cache-to-specify-invalidations-on-xa.patch
Patch0134: 0134-cli-Fixed-a-use_after_free.patch
Patch0135: 0135-cli-commands-are-missing-in-man-page.patch
Patch0136: 0136-glusterd-Nullify-pmap-entry-for-bricks-belonging-to-.patch
Patch0137: 0137-bitrot-improved-cli-report-after-bitrot-operatoin.patch
Patch0138: 0138-glusterd-enable-brick-multiplexing-by-default.patch
Patch0139: 0139-libglusterfs-Reset-errno-before-call.patch
%description
GlusterFS is a distributed file-system capable of scaling to several
@ -2320,6 +2331,10 @@ fi
%endif
%changelog
* Mon Feb 05 2018 Milind Changire <mchangir@redhat.com> - 3.12.2-3
- fixes bugs bz#1446125 bz#1463592 bz#1516249 bz#1517463 bz#1527309
bz#1530325 bz#1531041 bz#1539699 bz#1540011
* Wed Jan 17 2018 Milind Changire <mchangir@redhat.com> - 3.12.2-2
- fixes bugs bz#1264911 bz#1277924 bz#1286820 bz#1360331 bz#1401969
bz#1410719 bz#1419438 bz#1426042 bz#1444820 bz#1459101 bz#1464150 bz#1464350