path: root/tests/cluster.rc
diff options
authorKaushal M <>2013-07-03 16:31:22 +0530
committerVijay Bellur <>2013-10-17 11:26:45 -0700
commitfc637b14cfad4d08e72bee7064194c8007a388d0 (patch)
treebd74a24f8138f1b68ca6dfd18084e4d6fa7f079f /tests/cluster.rc
parent390221fcc4cc974074750be223e551bd9f4405d9 (diff)
cli,glusterd: Changes to cli-glusterd communication
Glusterd changes: With this patch, glusterd creates a socket file in DATADIR/run/glusterd.socket , and listen on it for cli requests. It listens for 2 rpc programs on the socket file, - The glusterd cli rpc program, for all cli commands - A reduced glusterd handshake program, just for the 'system:: getspec' command The location of the socket file can be changed with the glusterd option 'glusterd-sockfile'. To retain compatibility with the '--remote-host' cli option, glusterd also listens for the cli requests on port 24007. But, for the sake of security, it listens using a reduced cli rpc program on the port. The reduced rpc program only contains read-only procs used for 'volume (info|list|status)', 'peer status' and 'system:: getwd' cli commands. CLI changes: The gluster cli now uses the glusterd socket file for communicating with glusterd by default. A new option '--gluster-sock' has been added to allow specifying the sockfile used to connect. Using the '--remote-host' option will make cli connect to the given host & port. Tests changes: cluster.rc has been modified to make use of socket files and use different log files for each glusterd. Some of the tests using cluster.rc have been fixed. Change-Id: Iaf24bc22f42f8014a5fa300ce37c7fc9b1b92b53 BUG: 980754 Signed-off-by: Kaushal M <> Reviewed-on: Tested-by: Gluster Build System <> Reviewed-by: Krishnan Parthasarathi <> Reviewed-by: Vijay Bellur <>
Diffstat (limited to 'tests/cluster.rc')
1 files changed, 7 insertions, 5 deletions
diff --git a/tests/cluster.rc b/tests/cluster.rc
index 1c06bca..1e42426 100755
--- a/tests/cluster.rc
+++ b/tests/cluster.rc
@@ -45,8 +45,10 @@ function define_glusterds() {
- eval "glusterd_$i='glusterd --xlator-option $wopt --xlator-option $bopt $popt'";
- eval "glusterd$i='glusterd --xlator-option $wopt --xlator-option $bopt $popt'";
+ sopt="management.glusterd-sockfile=${!b}/glusterd/gd.sock"
+ lopt="--log-file=${!b}/glusterd.log"
+ eval "glusterd_$i='glusterd --xlator-option $wopt --xlator-option $bopt --xlator-option $sopt $lopt $popt'";
+ eval "glusterd$i='glusterd --xlator-option $wopt --xlator-option $bopt --xlator-option $sopt $lopt $popt'";
@@ -98,9 +100,9 @@ function define_clis() {
local h;
for i in `seq 1 $count`; do
- h="H$i";
- eval "CLI_$i='$CLI --remote-host=${!h}'";
- eval "CLI$i='$CLI --remote-host=${!h}'";
+ b="B$i";
+ eval "CLI_$i='$CLI --glusterd-sock=${!b}/glusterd/gd.sock'";
+ eval "CLI$i='$CLI --glusterd-sock=${!b}/glusterd/gd.sock'";