git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #66736 from markuskowa/upd-gluster

glusterfs: 4.0 -> 6.5

commit0cbeac4f661ed2e639611abf72240da1ba3a5d1d authorMichael Raskin <7c6f434c@mail.ru> dateTue 20 Aug 2019, 08:08 (7 years ago) parentb8fac946104ad0
7 files changed+85−363
nixos/tests/all-tests.nix+1 nixos/tests/glusterfs.nix+65 pkgs/tools/filesystems/glusterfs/default.nix+16−17 pkgs/tools/filesystems/glusterfs/glusterfs-fix-bug-1489610-glusterfind-var-data-under-prefix.patch+3−3 pkgs/tools/filesystems/glusterfs/glusterfs-glusterfind-log-remote-node_cmd-error.patch−49 pkgs/tools/filesystems/glusterfs/glusterfs-python-remove-find_library.patch−156 pkgs/tools/filesystems/glusterfs/glusterfs-use-PATH-instead-of-hardcodes.patch−138
nixos/tests/all-tests.nix+1
@@ -94,6 +94,7 @@ in
9494 gitlab = handleTest ./gitlab.nix {};
9595 gitolite = handleTest ./gitolite.nix {};
9696 gjs = handleTest ./gjs.nix {};
97+ glusterfs = handleTest ./glusterfs.nix {};
9798 gnome3-xorg = handleTest ./gnome3-xorg.nix {};
9899 gnome3 = handleTest ./gnome3.nix {};
99100 gocd-agent = handleTest ./gocd-agent.nix {};
nixos/tests/glusterfs.nixnew file+65
@@ -0,0 +1,65 @@
1+import ./make-test.nix ({ ... } :
2+
3+let
4+ client = { pkgs, ... } : {
5+ environment.systemPackages = [ pkgs.glusterfs ];
6+ fileSystems = pkgs.lib.mkVMOverride
7+ [ { mountPoint = "/gluster";
8+ fsType = "glusterfs";
9+ device = "server1:/gv0";
10+ } ];
11+ };
12+
13+ server = { pkgs, ... } : {
14+ networking.firewall.enable = false;
15+ services.glusterfs.enable = true;
16+
17+ # create a mount point for the volume
18+ boot.initrd.postDeviceCommands = ''
19+ ${pkgs.e2fsprogs}/bin/mkfs.ext4 -L data /dev/vdb
20+ '';
21+
22+ virtualisation.emptyDiskImages = [ 1024 ];
23+
24+ fileSystems = pkgs.lib.mkVMOverride
25+ [ { mountPoint = "/data";
26+ device = "/dev/disk/by-label/data";
27+ fsType = "ext4";
28+ }
29+ ];
30+ };
31+in {
32+ name = "glusterfs";
33+
34+ nodes = {
35+ server1 = server;
36+ server2 = server;
37+ client1 = client;
38+ client2 = client;
39+ };
40+
41+ testScript = ''
42+ $server1->waitForUnit("glusterd.service");
43+ $server2->waitForUnit("glusterd.service");
44+
45+ # establish initial contact
46+ $server1->succeed("sleep 2");
47+ $server1->succeed("gluster peer probe server2");
48+ $server1->succeed("gluster peer probe server1");
49+
50+ $server1->succeed("gluster peer status | grep Connected");
51+
52+ # create volumes
53+ $server1->succeed("mkdir -p /data/vg0");
54+ $server2->succeed("mkdir -p /data/vg0");
55+ $server1->succeed("gluster volume create gv0 server1:/data/vg0 server2:/data/vg0");
56+ $server1->succeed("gluster volume start gv0");
57+
58+ # test clients
59+ $client1->waitForUnit("gluster.mount");
60+ $client2->waitForUnit("gluster.mount");
61+
62+ $client1->succeed("echo test > /gluster/file1");
63+ $client2->succeed("grep test /gluster/file1");
64+ '';
65+})
pkgs/tools/filesystems/glusterfs/default.nix+16−17
@@ -1,4 +1,4 @@
1−{stdenv, fetchurl, fuse, bison, flex_2_5_35, openssl, python2, ncurses, readline,
1+{stdenv, fetchurl, fuse, bison, flex_2_5_35, openssl, python3, ncurses, readline,
22 autoconf, automake, libtool, pkgconfig, zlib, libaio, libxml2, acl, sqlite,
33 liburcu, attr, makeWrapper, coreutils, gnused, gnugrep, which,
44 openssh, gawk, findutils, utillinux, lvm2, btrfs-progs, e2fsprogs, xfsprogs, systemd,
@@ -15,25 +15,26 @@ let
1515 # The command
1616 # find /nix/store/...-glusterfs-.../ -name '*.py' -executable
1717 # can help with finding new Python scripts.
18− version = "4.0.0";
18+ version = "6.5";
1919 name="${baseName}-${version}";
2020 url="https://github.com/gluster/glusterfs/archive/v${version}.tar.gz";
21− sha256 = "0af3fwiixddds6gdwhkyq3l214mmjl2wpjc2qayp5rpz79lnclq3";
21+ sha256 = "17vdrw71ys1n5g9pdmzipmr706bslq0gbxxjhacxnrgsz8r4rl6a";
2222 };
23+
2324 buildInputs = [
2425 fuse bison flex_2_5_35 openssl ncurses readline
2526 autoconf automake libtool pkgconfig zlib libaio libxml2
26− acl sqlite liburcu attr makeWrapper
27− (python2.withPackages (pkgs: [
27+ acl sqlite liburcu attr makeWrapper utillinux
28+ (python3.withPackages (pkgs: [
2829 pkgs.flask
2930 pkgs.prettytable
3031 pkgs.requests
3132 pkgs.pyxattr
3233 ]))
33− # NOTE: `python2` has to be *AFTER* the above `python2.withPackages`,
34+ # NOTE: `python3` has to be *AFTER* the above `python3.withPackages`,
3435 # to ensure that the packages are available but the `toPythonPath`
3536 # shell function used in `postFixup` is also still available.
36− python2
37+ python3
3738 ];
3839 # Some of the headers reference acl
3940 propagatedBuildInputs = [
@@ -65,21 +66,15 @@ rec {
6566 inherit (s) name version;
6667 inherit buildInputs propagatedBuildInputs;
6768
68− postPatch = ''
69− sed -e '/chmod u+s/d' -i contrib/fuse-util/Makefile.am
70− '';
71−
7269 patches = [
73− # Remove when https://bugzilla.redhat.com/show_bug.cgi?id=1450546 is fixed
74− ./glusterfs-use-PATH-instead-of-hardcodes.patch
75− # Remove when https://bugzilla.redhat.com/show_bug.cgi?id=1450593 is fixed
76− ./glusterfs-python-remove-find_library.patch
7770 # Remove when https://bugzilla.redhat.com/show_bug.cgi?id=1489610 is fixed
7871 ./glusterfs-fix-bug-1489610-glusterfind-var-data-under-prefix.patch
79− # Remove when https://bugzilla.redhat.com/show_bug.cgi?id=1559130 is fixed
80− ./glusterfs-glusterfind-log-remote-node_cmd-error.patch
8172 ];
8273
74+ postPatch = ''
75+ sed -e '/chmod u+s/d' -i contrib/fuse-util/Makefile.am
76+ '';
77+
8378 # Note that the VERSION file is something that is present in release tarballs
8479 # but not in git tags (at least not as of writing in v3.10.1).
8580 # That's why we have to create it.
@@ -92,6 +87,7 @@ rec {
9287 preConfigure = ''
9388 echo "v${s.version}" > VERSION
9489 ./autogen.sh
90+ export PYTHON=${python3}/bin/python
9591 '';
9692
9793 configureFlags = [
@@ -178,6 +174,9 @@ rec {
178174 # on a real TTY for testing purposes.
179175 echo "" | (mkdir -p nix-test-dir-for-gfid_to_path && touch b && $out/libexec/glusterfs/gfind_missing_files/gfid_to_path.py nix-test-dir-for-gfid_to_path)
180176 $out/share/glusterfs/scripts/eventsdash.py --help
177+
178+ # this gets falsely loaded as module by glusterfind
179+ rm -r $out/bin/conf.py
181180 '';
182181
183182 src = fetchurl {
pkgs/tools/filesystems/glusterfs/glusterfs-fix-bug-1489610-glusterfind-var-data-under-prefix.patch+3−3
@@ -18,10 +18,10 @@ index f87d8a454..b4d3f5d10 100644
1818 fi
1919 GLUSTERFS_LIBEXECDIR="$(eval echo $libexecdir)/glusterfs"
2020-GLUSTERFSD_MISCDIR="$(eval echo $prefix)/var/lib/misc/glusterfsd"
21−+GLUSTERFSD_MISCDIR="$(eval echo $localstatedir)/var/lib/misc/glusterfsd"
21++GLUSTERFSD_MISCDIR="$(eval echo $localstatedir)/lib/misc/glusterfsd"
2222 prefix=$old_prefix
2323 exec_prefix=$old_exec_prefix
24−
25−--
24+
25+--
26262.12.0
2727
pkgs/tools/filesystems/glusterfs/glusterfs-glusterfind-log-remote-node_cmd-error.patchdeleted−49
@@ -1,49 +0,0 @@
1−From 92a6b84a37e7e2e0ec0655ca45cedb64ab72080e Mon Sep 17 00:00:00 2001
2−From: =?UTF-8?q?Niklas=20Hamb=C3=BCchen?= <mail@nh2.me>
3−Date: Fri, 8 Sep 2017 02:40:01 +0200
4−Subject: [PATCH] glusterfind: Log remote stderr on `node_cmd` error.
5−
6−The problem of lost stderr was introduced in
7−commit feea851fad4f89b48bfe89fe3b75250cc7bd6501.
8−
9−Change-Id: Ic98f9bc9682ae3bd9c3ebea3855667fc8ba2843d
10−---
11− tools/glusterfind/src/main.py | 17 ++++++++++++++++-
12− 1 file changed, 16 insertions(+), 1 deletion(-)
13−
14−diff --git a/tools/glusterfind/src/main.py b/tools/glusterfind/src/main.py
15−index c125f970a..6fffce4b3 100644
16−--- a/tools/glusterfind/src/main.py
17−+++ b/tools/glusterfind/src/main.py
18−@@ -75,12 +75,27 @@ def node_cmd(host, host_uuid, task, cmd, args, opts):
19− cmd = ["ssh",
20− "-oNumberOfPasswordPrompts=0",
21− "-oStrictHostKeyChecking=no",
22−+ # We force TTY allocation (-t -t) so that Ctrl+C is handed
23−+ # through; see:
24−+ # https://bugzilla.redhat.com/show_bug.cgi?id=1382236
25−+ # Note that this turns stderr of the remote `cmd`
26−+ # into stdout locally.
27− "-t",
28− "-t",
29− "-i", pem_key_path,
30− "root@%s" % host] + cmd
31−
32−- execute(cmd, exit_msg="%s - %s failed" % (host, task), logger=logger)
33−+ (returncode, err, out) = execute(cmd, logger=logger)
34−+ if returncode != 0:
35−+ # Because the `-t -t` above turns the remote stderr into
36−+ # local stdout, we need to log both stderr and stdout
37−+ # here to print all error messages.
38−+ fail("%s - %s failed; stdout (including remote stderr):\n"
39−+ "%s\n"
40−+ "stderr:\n"
41−+ "%s" % (host, task, out, err),
42−+ returncode,
43−+ logger=logger)
44−
45− if opts.get("copy_outfile", False) and not localdir:
46− cmd_copy = ["scp",
47−--
48−2.12.0
49−
pkgs/tools/filesystems/glusterfs/glusterfs-python-remove-find_library.patchdeleted−156
@@ -1,156 +0,0 @@
1−From e6293e367f56833457291e32a4df7b21a52365a7 Mon Sep 17 00:00:00 2001
2−From: =?UTF-8?q?Niklas=20Hamb=C3=BCchen?= <mail@nh2.me>
3−Date: Sat, 13 May 2017 18:54:36 +0200
4−Subject: [PATCH] python: Remove all uses of find_library. Fixes #1450593
5−
6−`find_library()` doesn't consider LD_LIBRARY_PATH on Python < 3.6.
7−
8−Change-Id: Iee26085cb5d14061001f19f032c2664d69a378a8
9−---
10− api/examples/getvolfile.py | 2 +-
11− geo-replication/syncdaemon/libcxattr.py | 3 +--
12− geo-replication/syncdaemon/libgfchangelog.py | 6 ++----
13− tests/features/ipctest.py | 10 ++--------
14− tests/utils/libcxattr.py | 5 ++---
15− tools/glusterfind/src/libgfchangelog.py | 3 +--
16− .../features/changelog/lib/examples/python/libgfchangelog.py | 3 +--
17− 7 files changed, 10 insertions(+), 22 deletions(-)
18−
19−diff --git a/api/examples/getvolfile.py b/api/examples/getvolfile.py
20−index 0c95213f0..32c2268b3 100755
21−--- a/api/examples/getvolfile.py
22−+++ b/api/examples/getvolfile.py
23−@@ -3,7 +3,7 @@
24− import ctypes
25− import ctypes.util
26−
27−-api = ctypes.CDLL(ctypes.util.find_library("gfapi"))
28−+api = ctypes.CDLL("libgfapi.so")
29− api.glfs_get_volfile.argtypes = [ctypes.c_void_p,
30− ctypes.c_void_p,
31− ctypes.c_ulong]
32−diff --git a/geo-replication/syncdaemon/libcxattr.py b/geo-replication/syncdaemon/libcxattr.py
33−index 3671e102c..f576648b7 100644
34−--- a/geo-replication/syncdaemon/libcxattr.py
35−+++ b/geo-replication/syncdaemon/libcxattr.py
36−@@ -10,7 +10,6 @@
37−
38− import os
39− from ctypes import CDLL, create_string_buffer, get_errno
40−-from ctypes.util import find_library
41−
42−
43− class Xattr(object):
44−@@ -25,7 +24,7 @@ class Xattr(object):
45− sizes we expect
46− """
47−
48−- libc = CDLL(find_library("c"), use_errno=True)
49−+ libc = CDLL("libc.so.6", use_errno=True)
50−
51− @classmethod
52− def geterrno(cls):
53−diff --git a/geo-replication/syncdaemon/libgfchangelog.py b/geo-replication/syncdaemon/libgfchangelog.py
54−index 334f5e9ea..093ae157a 100644
55−--- a/geo-replication/syncdaemon/libgfchangelog.py
56−+++ b/geo-replication/syncdaemon/libgfchangelog.py
57−@@ -9,14 +9,12 @@
58− #
59−
60− import os
61−-from ctypes import CDLL, RTLD_GLOBAL, create_string_buffer, \
62−- get_errno, byref, c_ulong
63−-from ctypes.util import find_library
64−+from ctypes import CDLL, RTLD_GLOBAL, create_string_buffer, get_errno, byref, c_ulong
65− from syncdutils import ChangelogException, ChangelogHistoryNotAvailable
66−
67−
68− class Changes(object):
69−- libgfc = CDLL(find_library("gfchangelog"), mode=RTLD_GLOBAL,
70−+ libgfc = CDLL("libgfchangelog.so", mode=RTLD_GLOBAL,
71− use_errno=True)
72−
73− @classmethod
74−diff --git a/tests/features/ipctest.py b/tests/features/ipctest.py
75−index 5aff319b8..933924861 100755
76−--- a/tests/features/ipctest.py
77−+++ b/tests/features/ipctest.py
78−@@ -1,14 +1,8 @@
79− #!/usr/bin/python
80−
81− import ctypes
82−-import ctypes.util
83−-
84−-# find_library does not lookup LD_LIBRARY_PATH and may miss the
85−-# function. In that case, retry with less portable but explicit name.
86−-libgfapi = ctypes.util.find_library("gfapi")
87−-if libgfapi == None:
88−- libgfapi = "libgfapi.so"
89−-api = ctypes.CDLL(libgfapi,mode=ctypes.RTLD_GLOBAL)
90−+
91−+api = ctypes.CDLL("libgfapi.so",mode=ctypes.RTLD_GLOBAL)
92−
93− api.glfs_ipc.argtypes = [ ctypes.c_void_p, ctypes.c_int, ctypes.c_void_p, ctypes.c_void_p ]
94− api.glfs_ipc.restype = ctypes.c_int
95−diff --git a/tests/utils/libcxattr.py b/tests/utils/libcxattr.py
96−index 149db72e6..4e6e6c46d 100644
97−--- a/tests/utils/libcxattr.py
98−+++ b/tests/utils/libcxattr.py
99−@@ -11,7 +11,6 @@
100− import os
101− import sys
102− from ctypes import CDLL, c_int, create_string_buffer
103−-from ctypes.util import find_library
104−
105−
106− class Xattr(object):
107−@@ -28,9 +27,9 @@ class Xattr(object):
108−
109− if sys.hexversion >= 0x02060000:
110− from ctypes import DEFAULT_MODE
111−- libc = CDLL(find_library("libc"), DEFAULT_MODE, None, True)
112−+ libc = CDLL("libc.so.6", DEFAULT_MODE, None, True)
113− else:
114−- libc = CDLL(find_library("libc"))
115−+ libc = CDLL("libc.so.6")
116−
117− @classmethod
118− def geterrno(cls):
119−diff --git a/tools/glusterfind/src/libgfchangelog.py b/tools/glusterfind/src/libgfchangelog.py
120−index 0f6b40d6c..9ca3f326b 100644
121−--- a/tools/glusterfind/src/libgfchangelog.py
122−+++ b/tools/glusterfind/src/libgfchangelog.py
123−@@ -11,14 +11,13 @@
124− import os
125− from ctypes import CDLL, get_errno, create_string_buffer, c_ulong, byref
126− from ctypes import RTLD_GLOBAL
127−-from ctypes.util import find_library
128−
129−
130− class ChangelogException(OSError):
131− pass
132−
133−
134−-libgfc = CDLL(find_library("gfchangelog"), use_errno=True, mode=RTLD_GLOBAL)
135−+libgfc = CDLL("libgfchangelog.so", use_errno=True, mode=RTLD_GLOBAL)
136−
137−
138− def raise_oserr():
139−diff --git a/xlators/features/changelog/lib/examples/python/libgfchangelog.py b/xlators/features/changelog/lib/examples/python/libgfchangelog.py
140−index 10e73c02b..2cdbf1152 100644
141−--- a/xlators/features/changelog/lib/examples/python/libgfchangelog.py
142−+++ b/xlators/features/changelog/lib/examples/python/libgfchangelog.py
143−@@ -1,9 +1,8 @@
144− import os
145− from ctypes import *
146−-from ctypes.util import find_library
147−
148− class Changes(object):
149−- libgfc = CDLL(find_library("gfchangelog"), mode=RTLD_GLOBAL, use_errno=True)
150−+ libgfc = CDLL("libgfchangelog.so", mode=RTLD_GLOBAL, use_errno=True)
151−
152− @classmethod
153− def geterrno(cls):
154−--
155−2.12.0
156−
pkgs/tools/filesystems/glusterfs/glusterfs-use-PATH-instead-of-hardcodes.patchdeleted−138
@@ -1,138 +0,0 @@
1−From 616381bc25b0e90198683fb049f994e82d467d96 Mon Sep 17 00:00:00 2001
2−From: =?UTF-8?q?Niklas=20Hamb=C3=BCchen?= <mail@nh2.me>
3−Date: Sat, 13 May 2017 02:45:49 +0200
4−Subject: [PATCH] Don't use hardcoded /sbin, /usr/bin etc. paths. Fixes
5− #1450546.
6−
7−Instead, rely on programs to be in PATH, as gluster already
8−does in many places across its code base.
9−
10−Change-Id: Id21152fe42f5b67205d8f1571b0656c4d5f74246
11−---
12− contrib/fuse-lib/mount-common.c | 8 ++++----
13− xlators/mgmt/glusterd/src/glusterd-ganesha.c | 6 +++---
14− xlators/mgmt/glusterd/src/glusterd-quota.c | 6 +++---
15− xlators/mgmt/glusterd/src/glusterd-snapshot.c | 4 ++--
16− xlators/mgmt/glusterd/src/glusterd-utils.c | 14 +-------------
17− 5 files changed, 13 insertions(+), 25 deletions(-)
18−
19−diff --git a/contrib/fuse-lib/mount-common.c b/contrib/fuse-lib/mount-common.c
20−index e9f80fe81..6380dd867 100644
21−--- a/contrib/fuse-lib/mount-common.c
22−+++ b/contrib/fuse-lib/mount-common.c
23−@@ -255,16 +255,16 @@ fuse_mnt_umount (const char *progname, const char *abs_mnt,
24− exit (1);
25− }
26− #ifdef GF_LINUX_HOST_OS
27−- execl ("/bin/umount", "/bin/umount", "-i", rel_mnt,
28−+ execl ("umount", "umount", "-i", rel_mnt,
29− lazy ? "-l" : NULL, NULL);
30−- GFFUSE_LOGERR ("%s: failed to execute /bin/umount: %s",
31−+ GFFUSE_LOGERR ("%s: failed to execute umount: %s",
32− progname, strerror (errno));
33− #elif __NetBSD__
34− /* exitting the filesystem causes the umount */
35− exit (0);
36− #else
37−- execl ("/sbin/umount", "/sbin/umount", "-f", rel_mnt, NULL);
38−- GFFUSE_LOGERR ("%s: failed to execute /sbin/umount: %s",
39−+ execl ("umount", "umount", "-f", rel_mnt, NULL);
40−+ GFFUSE_LOGERR ("%s: failed to execute umount: %s",
41− progname, strerror (errno));
42− #endif /* GF_LINUX_HOST_OS */
43− exit (1);
44−diff --git a/xlators/mgmt/glusterd/src/glusterd-quota.c b/xlators/mgmt/glusterd/src/glusterd-quota.c
45−index 0e6629cf0..fcb4738b7 100644
46−--- a/xlators/mgmt/glusterd/src/glusterd-quota.c
47−+++ b/xlators/mgmt/glusterd/src/glusterd-quota.c
48−@@ -30,7 +30,7 @@
49−
50− #ifndef _PATH_SETFATTR
51− # ifdef GF_LINUX_HOST_OS
52−-# define _PATH_SETFATTR "/usr/bin/setfattr"
53−+# define _PATH_SETFATTR "setfattr"
54− # endif
55− # ifdef __NetBSD__
56− # define _PATH_SETFATTR "/usr/pkg/bin/setfattr"
57−@@ -335,7 +335,7 @@ _glusterd_quota_initiate_fs_crawl (glusterd_conf_t *priv,
58−
59− if (type == GF_QUOTA_OPTION_TYPE_ENABLE ||
60− type == GF_QUOTA_OPTION_TYPE_ENABLE_OBJECTS)
61−- runner_add_args (&runner, "/usr/bin/find", ".", NULL);
62−+ runner_add_args (&runner, "find", ".", NULL);
63−
64− else if (type == GF_QUOTA_OPTION_TYPE_DISABLE) {
65−
66−@@ -351,7 +351,7 @@ _glusterd_quota_initiate_fs_crawl (glusterd_conf_t *priv,
67− VIRTUAL_QUOTA_XATTR_CLEANUP_KEY, "1",
68− "{}", "\\", ";", NULL);
69− #else
70−- runner_add_args (&runner, "/usr/bin/find", ".",
71−+ runner_add_args (&runner, "find", ".",
72− "-exec", _PATH_SETFATTR, "-n",
73− VIRTUAL_QUOTA_XATTR_CLEANUP_KEY, "-v",
74− "1", "{}", "\\", ";", NULL);
75−diff --git a/xlators/mgmt/glusterd/src/glusterd-snapshot.c b/xlators/mgmt/glusterd/src/glusterd-snapshot.c
76−index da0152366..f0d135350 100644
77−--- a/xlators/mgmt/glusterd/src/glusterd-snapshot.c
78−+++ b/xlators/mgmt/glusterd/src/glusterd-snapshot.c
79−@@ -121,7 +121,7 @@ glusterd_build_snap_device_path (char *device, char *snapname,
80− }
81−
82− runinit (&runner);
83−- runner_add_args (&runner, "/sbin/lvs", "--noheadings", "-o", "vg_name",
84−+ runner_add_args (&runner, "lvs", "--noheadings", "-o", "vg_name",
85− device, NULL);
86− runner_redir (&runner, STDOUT_FILENO, RUN_PIPE);
87− snprintf (msg, sizeof (msg), "Get volume group for device %s", device);
88−@@ -1982,7 +1982,7 @@ glusterd_is_thinp_brick (char *device, uint32_t *op_errno)
89−
90− runinit (&runner);
91−
92−- runner_add_args (&runner, "/sbin/lvs", "--noheadings", "-o", "pool_lv",
93−+ runner_add_args (&runner, "lvs", "--noheadings", "-o", "pool_lv",
94− device, NULL);
95− runner_redir (&runner, STDOUT_FILENO, RUN_PIPE);
96− runner_log (&runner, this->name, GF_LOG_DEBUG, msg);
97−diff --git a/xlators/mgmt/glusterd/src/glusterd-utils.c b/xlators/mgmt/glusterd/src/glusterd-utils.c
98−index 51db13df0..6fa7b92f9 100644
99−--- a/xlators/mgmt/glusterd/src/glusterd-utils.c
100−+++ b/xlators/mgmt/glusterd/src/glusterd-utils.c
101−@@ -6027,7 +6027,6 @@ static struct fs_info {
102− char *fs_tool_pattern;
103− char *fs_tool_pkg;
104− } glusterd_fs[] = {
105−- /* some linux have these in /usr/sbin/and others in /sbin/? */
106− { "xfs", "xfs_info", NULL, "isize=", "xfsprogs" },
107− { "ext3", "tune2fs", "-l", "Inode size:", "e2fsprogs" },
108− { "ext4", "tune2fs", "-l", "Inode size:", "e2fsprogs" },
109−@@ -6048,7 +6047,6 @@ glusterd_add_inode_size_to_dict (dict_t *dict, int count)
110− char *trail = NULL;
111− runner_t runner = {0, };
112− struct fs_info *fs = NULL;
113−- char fs_tool_name[256] = {0, };
114− static dict_t *cached_fs = NULL;
115−
116− memset (key, 0, sizeof (key));
117−@@ -6085,17 +6083,7 @@ glusterd_add_inode_size_to_dict (dict_t *dict, int count)
118− cur_word = "N/A";
119− goto cached;
120− }
121−-
122−- snprintf (fs_tool_name, sizeof (fs_tool_name),
123−- "/usr/sbin/%s", fs->fs_tool_name);
124−- if (sys_access (fs_tool_name, R_OK|X_OK) == 0)
125−- runner_add_arg (&runner, fs_tool_name);
126−- else {
127−- snprintf (fs_tool_name, sizeof (fs_tool_name),
128−- "/sbin/%s", fs->fs_tool_name);
129−- if (sys_access (fs_tool_name, R_OK|X_OK) == 0)
130−- runner_add_arg (&runner, fs_tool_name);
131−- }
132−+ runner_add_arg (&runner, fs->fs_tool_name);
133− break;
134− }
135− }
136−--
137−2.12.0
138−