diff options
| -rw-r--r-- | contrib/fuse-lib/mount.c | 6 | ||||
| -rw-r--r-- | tests/bugs/protocol/bug-1433815-auth-allow.t | 1 |
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)" |