From e1a9914fb318cbdd2bb8f36881e8f5f0b45ce76c Mon Sep 17 00:00:00 2001 From: Mohamed Ashiq Date: Mon, 9 Nov 2015 22:09:34 +0530 Subject: quota: vol quota fails when transport.socket.bind-address is set in glusterd When glusterd is binded to specific IP quota fails, since the server is hardcoded to localhost. IP can be assigned in the glusterd part of quota, but IP is not populated in cli part. So Quota makes use of glusterfsd's unix domain socket transport type. Signed-off-by: Mohamed Ashiq Signed-off-by: Humble Devassy Chirammal >Change-Id: Ib03332cc203795456ee6087017cea08eed3d7417 >BUG: 1277105 >Signed-off-by: Mohamed Ashiq >Signed-off-by: Humble Devassy Chirammal >Reviewed-on: http://review.gluster.org/12489 >Reviewed-by: Manikandan Selvaganesh >Tested-by: NetBSD Build System >Tested-by: Gluster Build System >Reviewed-by: Vijaikumar Mallikarjuna Reviewed-by: Atin Mukherjee Change-Id: I0fb2b5aff664101135c4f40d47517c1b1759b0af BUG: 1286601 Reviewed-on: http://review.gluster.org/12819 Tested-by: NetBSD Build System Tested-by: Gluster Build System Reviewed-by: Vijaikumar Mallikarjuna Reviewed-by: Atin Mukherjee --- cli/src/cli-cmd-volume.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) (limited to 'cli') diff --git a/cli/src/cli-cmd-volume.c b/cli/src/cli-cmd-volume.c index a89d004adc4..92edc356705 100644 --- a/cli/src/cli-cmd-volume.c +++ b/cli/src/cli-cmd-volume.c @@ -1117,6 +1117,7 @@ gf_cli_create_auxiliary_mount (char *volname) char pidfile_path[PATH_MAX] = {0,}; char logfile[PATH_MAX] = {0,}; char qpid [16] = {0,}; + char *sockpath = NULL; GLUSTERFS_GET_AUX_MOUNT_PIDFILE (pidfile_path, volname); @@ -1140,8 +1141,15 @@ gf_cli_create_auxiliary_mount (char *volname) DEFAULT_LOG_FILE_DIRECTORY, volname); snprintf(qpid, 15, "%d", GF_CLIENT_PID_QUOTA_MOUNT); + if (global_state->glusterd_sock) { + sockpath = global_state->glusterd_sock; + } else { + sockpath = DEFAULT_GLUSTERD_SOCKFILE; + } + ret = runcmd (SBIN_DIR"/glusterfs", - "-s", "localhost", + "--volfile-server", sockpath, + "--volfile-server-transport", "unix", "--volfile-id", volname, "-l", logfile, "-p", pidfile_path, -- cgit