summaryrefslogtreecommitdiffstats
path: root/cli
diff options
context:
space:
mode:
authorVarun Shastry <vshastry@redhat.com>2014-06-04 12:43:18 +0530
committerRaghavendra G <rgowdapp@redhat.com>2014-06-15 23:12:50 -0700
commit47230eb38d96e51d2d5e976eda7ff82c62f6eedd (patch)
tree0a559d3c0edef97a0473f3545e20c67d61c1553e /cli
parentec845d93e74644bbfe27e0b085a38dbd7c02480f (diff)
features/quota: No root squash for quota aux mount by default
With change 28209283a67f13802cc0c1d3df07c676926810a2, the root squash option is enabled by default even for the trusted clients. This disallowed quota auxiliary mount from setting the limit. This patch adds the quota aux mount process to list of 'special' clients which have the root squash disabled by default. Change-Id: Ie6583dd3deb170563daf001239c51bcff1ce078b BUG: 1104692 Signed-off-by: Varun Shastry <vshastry@redhat.com> Reviewed-on: http://review.gluster.org/7967 Reviewed-by: Krutika Dhananjay <kdhananj@redhat.com> Tested-by: Gluster Build System <jenkins@build.gluster.com> Reviewed-by: Raghavendra G <rgowdapp@redhat.com> Tested-by: Raghavendra G <rgowdapp@redhat.com>
Diffstat (limited to 'cli')
-rw-r--r--cli/src/cli-cmd-volume.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/cli/src/cli-cmd-volume.c b/cli/src/cli-cmd-volume.c
index 9798472..b1b6c82 100644
--- a/cli/src/cli-cmd-volume.c
+++ b/cli/src/cli-cmd-volume.c
@@ -29,6 +29,7 @@
#include "cli1-xdr.h"
#include "run.h"
#include "syscall.h"
+#include "common-utils.h"
extern struct rpc_clnt *global_rpc;
extern struct rpc_clnt *global_quotad_rpc;
@@ -1038,6 +1039,7 @@ gf_cli_create_auxiliary_mount (char *volname)
char mountdir[PATH_MAX] = {0,};
char pidfile_path[PATH_MAX] = {0,};
char logfile[PATH_MAX] = {0,};
+ char qpid [16] = {0,};
GLUSTERFS_GET_AUX_MOUNT_PIDFILE (pidfile_path, volname);
@@ -1059,14 +1061,16 @@ gf_cli_create_auxiliary_mount (char *volname)
snprintf (logfile, PATH_MAX-1, "%s/quota-mount-%s.log",
DEFAULT_LOG_FILE_DIRECTORY, volname);
+ snprintf(qpid, 15, "%d", GF_CLIENT_PID_QUOTA_MOUNT);
ret = runcmd (SBIN_DIR"/glusterfs",
"-s", "localhost",
"--volfile-id", volname,
"-l", logfile,
"-p", pidfile_path,
+ "--client-pid", qpid,
mountdir,
- "--client-pid", "-42", NULL);
+ NULL);
if (ret) {
gf_log ("cli", GF_LOG_WARNING, "failed to mount glusterfs "