summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPranith Kumar K <pkarampu@redhat.com>2020-04-03 15:25:44 +0530
committerAmar Tumballi <amar@kadalu.io>2020-04-06 01:38:05 +0000
commit945b0a12b7a47039260330e02b89919c2cefb8d2 (patch)
tree1bb164e6eb530b17e1150e2a71fbb297d63a4688
parent208b6d7b1a4d98e62d4bfa3b342bb78ade078799 (diff)
fuse: Add error-logs to debug bug-1433815-auth-allow.t failures
Fixes: #1149 Change-Id: I38483fc7d76d7fe0ac9fb649669a46bdf9c82234 Signed-off-by: Pranith Kumar K <pkarampu@redhat.com>
-rw-r--r--contrib/fuse-lib/mount.c6
-rw-r--r--tests/bugs/protocol/bug-1433815-auth-allow.t1
2 files changed, 7 insertions, 0 deletions
diff --git a/contrib/fuse-lib/mount.c b/contrib/fuse-lib/mount.c
index ffa0a4b6316..351972ce3cf 100644
--- a/contrib/fuse-lib/mount.c
+++ b/contrib/fuse-lib/mount.c
@@ -52,12 +52,16 @@ gf_fuse_unmount (const char *mountpoint, int fd)
if (geteuid () == 0) {
fuse_mnt_umount ("fuse", mountpoint, mountpoint, 1);
return;
+ } else {
+ GFFUSE_LOGERR ("fuse: Effective-uid: %d", geteuid());
}
res = umount2 (mountpoint, 2);
if (res == 0)
return;
+ GFFUSE_LOGERR ("fuse: failed to unmount %s: %s",
+ mountpoint, strerror (errno));
pid = fork ();
if (pid == -1)
return;
@@ -67,6 +71,8 @@ gf_fuse_unmount (const char *mountpoint, int fd)
"--", mountpoint, NULL };
execvp (FUSERMOUNT_PROG, (char **)argv);
+ GFFUSE_LOGERR ("fuse: failed to execute fuserumount: %s",
+ strerror (errno));
_exit (1);
}
waitpid (pid, NULL, 0);
diff --git a/tests/bugs/protocol/bug-1433815-auth-allow.t b/tests/bugs/protocol/bug-1433815-auth-allow.t
index a78c0eb7111..7020a7d9485 100644
--- a/tests/bugs/protocol/bug-1433815-auth-allow.t
+++ b/tests/bugs/protocol/bug-1433815-auth-allow.t
@@ -30,6 +30,7 @@ TEST $GFS -f fubar.vol $M0
# If we had DONT_EXPECT_WITHIN we could use that, but we don't.
sleep 10
EXPECT 0 check_mounted $M0
+ps aux | grep gluster
# Set auth.allow to include us. This mount should therefore succeed.
TEST $CLI volume set $V0 auth.allow "$(get_addresses)"