From 5f88d4c1b036228ca4036e854d533f0b2fc3adc1 Mon Sep 17 00:00:00 2001 From: Avra Sengupta Date: Fri, 23 Nov 2012 14:26:10 +0530 Subject: libgfapi: "tcp" is documented as the valid transport type instead of "socket". Change-Id: I066e9be7755a535f385c102cdd1822adeda7f319 BUG: 860203 Signed-off-by: Avra Sengupta Reviewed-on: http://review.gluster.org/4226 Reviewed-by: Jeff Darcy Tested-by: Gluster Build System --- api/examples/gfapi.py | 2 +- api/examples/glfsxmp.c | 4 ++-- api/src/glfs.h | 4 ++-- doc/glusterfs.8 | 2 +- doc/glusterfsd.8 | 2 +- doc/mount.glusterfs.8 | 2 +- doc/user-guide/legacy/user-guide.info | 8 ++++---- doc/user-guide/legacy/user-guide.texi | 8 ++++---- 8 files changed, 16 insertions(+), 16 deletions(-) diff --git a/api/examples/gfapi.py b/api/examples/gfapi.py index e71a9866e65..8fc3bfa4c89 100644 --- a/api/examples/gfapi.py +++ b/api/examples/gfapi.py @@ -10,7 +10,7 @@ api = ctypes.CDLL("api/libgfapi.so",ctypes.RTLD_GLOBAL) fs = api.glfs_new(sys.argv[1]) api.glfs_set_logging(fs,"/dev/stderr",7) -api.glfs_set_volfile_server(fs,"socket","localhost",24007) +api.glfs_set_volfile_server(fs,"tcp","localhost",24007) api.glfs_init(fs) print "Initialized volume" diff --git a/api/examples/glfsxmp.c b/api/examples/glfsxmp.c index c72c828f598..b359cc7444c 100644 --- a/api/examples/glfsxmp.c +++ b/api/examples/glfsxmp.c @@ -81,7 +81,7 @@ main (int argc, char *argv[]) // ret = glfs_set_volfile (fs, "/tmp/posix.vol"); - ret = glfs_set_volfile_server (fs, "socket", "localhost", 24007); + ret = glfs_set_volfile_server (fs, "tcp", "localhost", 24007); // ret = glfs_set_volfile_server (fs, "unix", "/tmp/gluster.sock", 0); @@ -102,7 +102,7 @@ main (int argc, char *argv[]) // ret = glfs_set_volfile (fs2, "/tmp/posix.vol"); - ret = glfs_set_volfile_server (fs2, "socket", "localhost", 24007); + ret = glfs_set_volfile_server (fs2, "tcp", "localhost", 24007); ret = glfs_set_logging (fs2, "/dev/stderr", 7); diff --git a/api/src/glfs.h b/api/src/glfs.h index ded42febab5..e19c1cd2591 100644 --- a/api/src/glfs.h +++ b/api/src/glfs.h @@ -136,9 +136,9 @@ int glfs_set_volfile (glfs_t *fs, const char *volfile); @transport: String specifying the transport used to connect to the management daemon. Specifying NULL will result in the usage - of the default (socket) transport type. Permitted values + of the default (tcp) transport type. Permitted values are those what you specify as transport-type in a volume - specification file (e.g "socket", "rdma", "unix".) + specification file (e.g "tcp", "rdma", "unix".) @host: String specifying the address of where to find the management daemon. Depending on the transport type this would either be diff --git a/doc/glusterfs.8 b/doc/glusterfs.8 index 99a7015d75b..60ad5709b95 100644 --- a/doc/glusterfs.8 +++ b/doc/glusterfs.8 @@ -88,7 +88,7 @@ Key of the volume file to be fetched from the server. Port number of volfile server. .TP \fB\-\-volfile\-server\-transport=TRANSPORT\fR -Transport type to get volume file from server (the default is socket). +Transport type to get volume file from server (the default is tcp). .TP \fB\-\-volume\-name=VOLUME\-NAME\fR Volume name to be used for MOUNT-POINT (the default is top most volume in VOLUME-FILE). diff --git a/doc/glusterfsd.8 b/doc/glusterfsd.8 index dd7cb0d2d60..176d042367c 100644 --- a/doc/glusterfsd.8 +++ b/doc/glusterfsd.8 @@ -80,7 +80,7 @@ KEY of the volume file to be fetched from server Port number of volfile server .TP \fB\-\-volfile\-server\-transport=TRANSPORT\fR -Transport type to get volume file from server [default: socket] +Transport type to get volume file from server [default: tcp] .TP \fB\-\-volume\-name=VOLUME\-NAME\fR Volume name to be used for MOUNT-POINT [default: top most volume in diff --git a/doc/mount.glusterfs.8 b/doc/mount.glusterfs.8 index a298dc14bfb..01b7f75545e 100644 --- a/doc/mount.glusterfs.8 +++ b/doc/mount.glusterfs.8 @@ -48,7 +48,7 @@ Mount the filesystem read-only Volume key or name of the volume file to be fetched from server .TP \fBtransport=\fRTRANSPORT-TYPE -Transport type to get volume file from server [default: socket] +Transport type to get volume file from server [default: tcp] .TP \fBvolume\-name=\fRVOLUME-NAME Volume name to be used for MOUNT-POINT [default: top most volume in diff --git a/doc/user-guide/legacy/user-guide.info b/doc/user-guide/legacy/user-guide.info index 6a49d078d64..2bbadb35107 100644 --- a/doc/user-guide/legacy/user-guide.info +++ b/doc/user-guide/legacy/user-guide.info @@ -397,8 +397,8 @@ command-line options accepted by it. `--volfile-server-port=' Listening port number of volfile server. -`--volfile-server-transport=[socket|ib-verbs]' - Transport type to get volfile from server. [default: `socket'] +`--volfile-server-transport=[tcp|ib-verbs]' + Transport type to get volfile from server. [default: `tcp'] `--xlator-options=' Add/override a translator option for a volume with specified value. @@ -467,8 +467,8 @@ filesystem to appear. Example: `--volfile-server-port=' Listening port number of volfile server. -`--volfile-server-transport=[socket|ib-verbs]' - Transport type to get volfile from server. [default: `socket'] +`--volfile-server-transport=[tcp|ib-verbs]' + Transport type to get volfile from server. [default: `tcp'] `--xlator-options=' Add/override a translator option for a volume with specified value. diff --git a/doc/user-guide/legacy/user-guide.texi b/doc/user-guide/legacy/user-guide.texi index 2d51da022cf..8e429853ffd 100644 --- a/doc/user-guide/legacy/user-guide.texi +++ b/doc/user-guide/legacy/user-guide.texi @@ -416,8 +416,8 @@ Advanced Options @item --volfile-server-port= Listening port number of volfile server. -@item --volfile-server-transport=[socket|ib-verbs] - Transport type to get volfile from server. [default: @command{socket}] +@item --volfile-server-transport=[tcp|ib-verbs] + Transport type to get volfile from server. [default: @command{tcp}] @item --xlator-options= Add/override a translator option for a volume with specified value. @@ -494,8 +494,8 @@ Advanced Options @item --volfile-server-port= Listening port number of volfile server. -@item --volfile-server-transport=[socket|ib-verbs] - Transport type to get volfile from server. [default: @command{socket}] +@item --volfile-server-transport=[tcp|ib-verbs] + Transport type to get volfile from server. [default: @command{tcp}] @item --xlator-options= Add/override a translator option for a volume with specified value. -- cgit