andy/glusterfs
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

migrate from port 69* to 24007

Browse Source 
Signed-off-by: Amar Tumballi <amar@gluster.com>
Signed-off-by: Vijay Bellur <vijay@dev.gluster.com>

BUG: 1870 (Change the port from 69* to some other ports.)
URL: http://bugs.gluster.com/cgi-bin/bugzilla3/show_bug.cgi?id=1870
This commit is contained in:
Amar Tumballi 2010-10-08 06:58:51 +00:00 committed by Vijay Bellur
parent 98e1ea0f17
commit 2e43696eb9
24 changed files with 53 additions and 63 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cli/src/cli.h
View File

@ -30,7 +30,7 @@
#include "protocol-common.h"
#define DEFAULT_EVENT_POOL_SIZE 16384
#define CLI_GLUSTERD_PORT 6969
#define CLI_GLUSTERD_PORT 24007
#define CLI_DEFAULT_CONN_TIMEOUT 120
#define CLI_DEFAULT_CMD_TIMEOUT 120

4
doc/examples/protocol-client.vol
View File

@ -3,14 +3,14 @@ volume client
option transport-type tcp # for TCP/IP transport
# option transport-type ib-sdp # for Infiniband transport
option remote-host 192.168.1.10 # IP address of the remote brick
# option transport.socket.remote-port 6996 # default server port is 6996
# option transport.socket.remote-port 24016
# option transport-type ib-verbs # for Infiniband verbs transport
# option transport.ib-verbs.work-request-send-size 1048576
# option transport.ib-verbs.work-request-send-count 16
# option transport.ib-verbs.work-request-recv-size 1048576
# option transport.ib-verbs.work-request-recv-count 16
# option transport.ib-verbs.remote-port 6996 # default server port is 6996
# option transport.ib-verbs.remote-port 24016
option remote-subvolume brick # name of the remote volume
# option transport-timeout 30 # default value is 120seconds

4
doc/examples/protocol-server.vol
View File

@ -9,14 +9,14 @@ end-volume
volume server
type protocol/server
option transport-type tcp # For TCP/IP transport
# option transport.socket.listen-port 6996 # Default is 6996
# option transport.socket.listen-port 24016
# option transport-type ib-verbs # For Infiniband Verbs transport
# option transport.ib-verbs.work-request-send-size 131072
# option transport.ib-verbs.work-request-send-count 64
# option transport.ib-verbs.work-request-recv-size 131072
# option transport.ib-verbs.work-request-recv-count 64
# option transport.ib-verbs.listen-port 6996 # Default is 6996
# option transport.ib-verbs.listen-port 24016
# option bind-address 192.168.1.10 # Default is to listen on all interfaces
# option client-volume-filename /etc/glusterfs/glusterfs-client.vol

12
doc/examples/replicate.vol
View File

@ -23,7 +23,7 @@ end-volume
volume server
type protocol/server
option transport-type tcp # For TCP/IP transport
option transport.socket.listen-port 6996 # Default is 6996
option transport.socket.listen-port 24016
# option client-volume-filename /etc/glusterfs/glusterfs-client.vol
subvolumes brick1
option auth.addr.brick1.allow * # access to "brick" volume
@ -49,7 +49,7 @@ end-volume
volume server
type protocol/server
option transport-type tcp # For TCP/IP transport
option transport.socket.listen-port 6997 # Default is 6996
option transport.socket.listen-port 24017
subvolumes brick2
option auth.addr.brick2.allow * # Allow access to "brick" volume
end-volume
@ -75,7 +75,7 @@ end-volume
volume server
type protocol/server
option transport-type tcp # For TCP/IP transport
option transport.socket.listen-port 6998 # Default is 6996
option transport.socket.listen-port 24018
subvolumes brick3
option auth.addr.brick3.allow * # access to "brick" volume
end-volume
@ -90,7 +90,7 @@ volume client1
type protocol/client
option transport-type tcp # for TCP/IP transport
option remote-host 127.0.0.1 # IP address of the remote brick
option transport.socket.remote-port 6996 # default server port is 6996
option transport.socket.remote-port 24016
option remote-subvolume brick1 # name of the remote volume
end-volume
@ -99,7 +99,7 @@ volume client2
type protocol/client
option transport-type tcp # for TCP/IP transport
option remote-host 127.0.0.1 # IP address of the remote brick
option transport.socket.remote-port 6997 # default server port is 6996
option transport.socket.remote-port 24017
option remote-subvolume brick2 # name of the remote volume
end-volume
@ -107,7 +107,7 @@ volume client3
type protocol/client
option transport-type tcp # for TCP/IP transport
option remote-host 127.0.0.1 # IP address of the remote brick
option transport.socket.remote-port 6998 # default server port is 6996
option transport.socket.remote-port 24018
option remote-subvolume brick3 # name of the remote volume
end-volume

12
doc/examples/stripe.vol
View File

@ -24,7 +24,7 @@ end-volume
volume server
type protocol/server
option transport-type tcp # For TCP/IP transport
option transport.socket.listen-port 6996 # Default is 6996
option transport.socket.listen-port 24016
# option client-volume-filename /etc/glusterfs/glusterfs-client.vol
subvolumes brick1
option auth.addr.brick1.allow * # access to "brick" volume
@ -50,7 +50,7 @@ end-volume
volume server
type protocol/server
option transport-type tcp # For TCP/IP transport
option transport.socket.listen-port 6997 # Default is 6996
option transport.socket.listen-port 24017
subvolumes brick2
option auth.addr.brick2.allow * # Allow access to "brick" volume
end-volume
@ -76,7 +76,7 @@ end-volume
volume server
type protocol/server
option transport-type tcp # For TCP/IP transport
option transport.socket.listen-port 6998 # Default is 6996
option transport.socket.listen-port 24018
subvolumes brick3
option auth.addr.brick3.allow * # access to "brick" volume
end-volume
@ -91,7 +91,7 @@ volume client1
type protocol/client
option transport-type tcp # for TCP/IP transport
option remote-host 127.0.0.1 # IP address of the remote brick
option transport.socket.remote-port 6996 # default server port is 6996
option transport.socket.remote-port 24016
option remote-subvolume brick1 # name of the remote volume
end-volume
@ -100,7 +100,7 @@ volume client2
type protocol/client
option transport-type tcp # for TCP/IP transport
option remote-host 127.0.0.1 # IP address of the remote brick
option transport.socket.remote-port 6997 # default server port is 6996
option transport.socket.remote-port 24017
option remote-subvolume brick2 # name of the remote volume
end-volume
@ -108,7 +108,7 @@ volume client3
type protocol/client
option transport-type tcp # for TCP/IP transport
option remote-host 127.0.0.1 # IP address of the remote brick
option transport.socket.remote-port 6998 # default server port is 6996
option transport.socket.remote-port 24018
option remote-subvolume brick3 # name of the remote volume
end-volume

16
doc/examples/unify.vol
View File

@ -24,7 +24,7 @@ end-volume
volume server
type protocol/server
option transport-type tcp # For TCP/IP transport
option transport.socket.listen-port 6996 # Default is 6996
option transport.socket.listen-port 24016
# option client-volume-filename /etc/glusterfs/glusterfs-client.vol
subvolumes brick1
option auth.addr.brick1.allow * # access to "brick" volume
@ -50,7 +50,7 @@ end-volume
volume server
type protocol/server
option transport-type tcp # For TCP/IP transport
option transport.socket.listen-port 6997 # Default is 6996
option transport.socket.listen-port 24017
subvolumes brick2
option auth.addr.brick2.allow * # Allow access to "brick" volume
end-volume
@ -76,7 +76,7 @@ end-volume
volume server
type protocol/server
option transport-type tcp # For TCP/IP transport
option transport.socket.listen-port 6998 # Default is 6996
option transport.socket.listen-port 24018
subvolumes brick3
option auth.addr.brick3.allow * # access to "brick" volume
end-volume
@ -93,7 +93,7 @@ end-volume
volume server
type protocol/server
option transport-type tcp # For TCP/IP transport
option transport.socket.listen-port 6999 # Default is 6996
option transport.socket.listen-port 24019
subvolumes brick-ns
option auth.addr.brick-ns.allow * # access to "brick" volume
end-volume
@ -109,7 +109,7 @@ volume client1
option transport-type tcp # for TCP/IP transport
# option transport-type ib-sdp # for Infiniband transport
option remote-host 127.0.0.1 # IP address of the remote brick
option transport.socket.remote-port 6996 # default server port is 6996
option transport.socket.remote-port 24016
option remote-subvolume brick1 # name of the remote volume
end-volume
@ -119,7 +119,7 @@ volume client2
option transport-type tcp # for TCP/IP transport
# option transport-type ib-sdp # for Infiniband transport
option remote-host 127.0.0.1 # IP address of the remote brick
option transport.socket.remote-port 6997 # default server port is 6996
option transport.socket.remote-port 24017
option remote-subvolume brick2 # name of the remote volume
end-volume
@ -128,7 +128,7 @@ volume client3
option transport-type tcp # for TCP/IP transport
# option transport-type ib-sdp # for Infiniband transport
option remote-host 127.0.0.1 # IP address of the remote brick
option transport.socket.remote-port 6998 # default server port is 6996
option transport.socket.remote-port 24018
option remote-subvolume brick3 # name of the remote volume
end-volume
@ -138,7 +138,7 @@ volume client-ns
option transport-type tcp # for TCP/IP transport
# option transport-type ib-sdp # for Infiniband transport
option remote-host 127.0.0.1 # IP address of the remote brick
option transport.socket.remote-port 6999 # default server port is 6996
option transport.socket.remote-port 24019
option remote-subvolume brick-ns # name of the remote volume
end-volume

3
doc/glusterd.vol
View File

@ -2,10 +2,7 @@ volume management
type mgmt/glusterd
option working-directory /etc/glusterd
option transport-type socket,rdma
option transport.socket.listen-port 6969
option transport.rdma.listen-port 6968
option transport.socket.keepalive-time 10
option transport.socket.keepalive-interval 2
# option listen-port 6969
end-volume

2
doc/glusterfs-volgen.8
View File

@ -55,7 +55,7 @@ together like 'tcp,ib-verbs'. [default is 'tcp']
.TP
\fB\-p \-\-port\fR=PORT
The port number to use in volume files.
[default is 6996 for tcp, 6997 for ib-verbs]
[default is 24007 for tcp, (24007 + 1) for ib-verbs]
.TP
\fB\-a \-\-auth\fR=AUTH_PARAMS
Authentication parameters (comma seperated) to use in server volume.

4
doc/glusterfs.vol.sample
View File

@ -21,10 +21,10 @@ volume client
# option transport-type unix
# option transport-type ib-sdp
option remote-host 127.0.0.1 # IP address of the remote brick
# option transport.socket.remote-port 6996 # default server port is 6996
# option transport.socket.remote-port 24016
# option transport-type ib-verbs
# option transport.ib-verbs.remote-port 6996 # default server port is 6996
# option transport.ib-verbs.remote-port 24016
# option transport.ib-verbs.work-request-send-size 1048576
# option transport.ib-verbs.work-request-send-count 16
# option transport.ib-verbs.work-request-recv-size 1048576

4
doc/glusterfsd.vol.sample
View File

@ -28,11 +28,11 @@ volume server
# option transport-type unix
# option transport-type ib-sdp
# option transport.socket.bind-address 192.168.1.10 # Default is to listen on all interfaces
# option transport.socket.listen-port 6996 # Default is 6996
# option transport.socket.listen-port 24016
# option transport-type ib-verbs
# option transport.ib-verbs.bind-address 192.168.1.10 # Default is to listen on all interfaces
# option transport.ib-verbs.listen-port 6996 # Default is 6996
# option transport.ib-verbs.listen-port 24016
# option transport.ib-verbs.work-request-send-size 131072
# option transport.ib-verbs.work-request-send-count 64
# option transport.ib-verbs.work-request-recv-size 131072

5
doc/mount.glusterfs.8
View File

@ -22,7 +22,7 @@
mount.glusterfs - script to mount native GlusterFS volume
.SH SYNOPSIS
.B mount -t glusterfs
.I [-o <options>] <volumeserver>:<volumeid/volumeport> <mountpoint>
.I [-o <options>] <volumeserver>:<volumeid> <mountpoint>
.TP
.B mount -t glusterfs
.I [-o <options>] <path/to/volumefile> <mountpoint>
@ -56,9 +56,6 @@ Mount the filesystem read-only
\fBvolfile\-id=\fRKEY
Volume key or name of the volume file to be fetched from server
.TP
\fBserver\-port=\fRPORT
Port number of volfile server [default: 6996]
.TP
\fBtransport=\fRTRANSPORT-TYPE
Transport type to get volume file from server [default: socket]
.TP

BIN
doc/user-guide/user-guide.info
View File

Binary file not shown.

12
doc/user-guide/user-guide.texi
View File

@ -924,7 +924,7 @@ The @acronym{TCP} client module accepts the following options:
@table @code
@item non-blocking-connect [no|off|on|yes] (on)
Whether to make the connection attempt asynchronous.
@item remote-port <n> (6996)
@item remote-port <n> (24007)
Server port to connect to.
@cindex DNS round robin
@item remote-host <hostname> *
@ -941,7 +941,7 @@ The @acronym{TCP} server module accepts the following options:
@item bind-address <address> (0.0.0.0)
The local interface on which the server should listen to requests. Default is to
listen on all interfaces.
@item listen-port <n> (6996)
@item listen-port <n> (24007)
The local port to listen on.
@end table
@end cartouche
@ -978,7 +978,7 @@ The @command{ib-verbs} client module accepts the following options:
@table @code
@item non-blocking-connect [no|off|on|yes] (on)
Whether to make the connection attempt asynchronous.
@item remote-port <n> (6996)
@item remote-port <n> (24007)
Server port to connect to.
@cindex DNS round robin
@item remote-host <hostname> *
@ -995,7 +995,7 @@ The @command{ib-verbs} server module accepts the following options:
@item bind-address <address> (0.0.0.0)
The local interface on which the server should listen to requests. Default is to
listen on all interfaces.
@item listen-port <n> (6996)
@item listen-port <n> (24007)
The local port to listen on.
@end table
@end cartouche
@ -2102,12 +2102,12 @@ connections and firewall settings. To check if the server is reachable,
try:
@example
telnet IP-ADDRESS 6996
telnet IP-ADDRESS 24007
@end example
If the server is accessible, your `telnet' command should connect and
block. If not you will see an error message such as @command{telnet: Unable to
connect to remote host: Connection refused}. 6996 is the default
connect to remote host: Connection refused}. 24007 is the default
GlusterFS port. If you have changed it, then use the corresponding
port instead.

4
extras/volgen/CreateVolfile.py
View File

@ -45,8 +45,8 @@ class CreateVolfile:
self.gfs_port = options.port
self.gfs_ib_port = options.port + 1
else:
self.gfs_port = 6969
self.gfs_ib_port = 6970
self.gfs_port = 24007
self.gfs_ib_port = 24008
def create_pmap_mount_volfile (self):

2
glusterfsd/src/glusterfsd-mgmt.c
View File

@ -474,7 +474,7 @@ glusterfs_mgmt_init (glusterfs_ctx_t *ctx)
struct rpc_clnt_config rpc_cfg = {0,};
dict_t *options = NULL;
int ret = -1;
int port = 6969;
int port = GF_DEFAULT_BASE_PORT;
char *host = NULL;
cmd_args = &ctx->cmd_args;

2
libglusterfs/src/globals.h
View File

@ -20,6 +20,8 @@
#ifndef _GLOBALS_H
#define _GLOBALS_H
#define GF_DEFAULT_BASE_PORT 24007
/* This corresponds to the max 16 number of group IDs that are sent through an
* RPC request. Since NFS is the only one going to set this, we can be safe
* in keeping this size hardcoded.

2
rpc/rpc-lib/src/rpcsvc.h
View File

@ -50,7 +50,7 @@
#define RPCSVC_THREAD_STACK_SIZE ((size_t)(1024 * GF_UNIT_KB))
#define RPCSVC_FRAGHDR_SIZE 4 /* 4-byte RPC fragment header size */
#define RPCSVC_DEFAULT_LISTEN_PORT 6996
#define RPCSVC_DEFAULT_LISTEN_PORT GF_DEFAULT_BASE_PORT
#define RPCSVC_DEFAULT_MEMFACTOR 15
#define RPCSVC_EVENTPOOL_SIZE_MULT 1024
#define RPCSVC_POOLCOUNT_MULT 35

4
rpc/rpc-transport/rdma/src/rdma.h
View File

@ -40,8 +40,8 @@
#include <infiniband/verbs.h>
/* FIXME: give appropriate values to these macros */
#define GF_DEFAULT_RDMA_LISTEN_PORT 6968
#define RDMA_MAX_SEGMENTS 8
#define GF_DEFAULT_RDMA_LISTEN_PORT (GF_DEFAULT_BASE_PORT + 1)
#define RDMA_MAX_SEGMENTS 8
#define RDMA_MAX_HEADER_SIZE (sizeof (rdma_header_t) \
+ RDMA_MAX_SEGMENTS \
* sizeof (rdma_read_chunk_t))

3
rpc/rpc-transport/socket/src/socket.h
View File

@ -31,12 +31,13 @@
#include "logging.h"
#include "dict.h"
#include "mem-pool.h"
#include "globals.h"
#ifndef MAX_IOVEC
#define MAX_IOVEC 16
#endif /* MAX_IOVEC */
#define GF_DEFAULT_SOCKET_LISTEN_PORT 6969
#define GF_DEFAULT_SOCKET_LISTEN_PORT GF_DEFAULT_BASE_PORT
#define RPC_MAX_FRAGMENT_SIZE 0x7fffffff

4
xlators/mgmt/glusterd/src/glusterd-handler.c
View File

@ -77,7 +77,7 @@ glusterd_handle_friend_req (rpcsvc_request_t *req, uuid_t uuid,
uuid_unparse (uuid, uuid_str);
uuid_parse (uuid_str, friend_uuid);
if (!port)
port = 6969; // TODO: use define values.
port = GF_DEFAULT_BASE_PORT;
ret = glusterd_remote_hostname_get (req, rhost, sizeof (rhost));
ret = glusterd_friend_find (uuid, rhost, &peerinfo);
@ -156,7 +156,7 @@ glusterd_handle_unfriend_req (rpcsvc_request_t *req, uuid_t uuid,
glusterd_friend_req_ctx_t *ctx = NULL;
if (!port)
port = 6969; //TODO: use define'd macro
port = GF_DEFAULT_BASE_PORT;
ret = glusterd_friend_find (uuid, hostname, &peerinfo);

4
xlators/mgmt/glusterd/src/glusterd-pmap.c
View File

@ -78,8 +78,8 @@ pmap_registry_new (void)
pmap->ports[i].type = GF_PMAP_PORT_FOREIGN;
}
pmap->base_port = 6971; /* 6969 default for tcp, 6970 for IB */
pmap->last_alloc = 6971;
pmap->base_port = GF_DEFAULT_BASE_PORT + 2;
pmap->last_alloc = GF_DEFAULT_BASE_PORT + 2;
return pmap;
}

2
xlators/mgmt/glusterd/src/glusterd.h
View File

@ -193,7 +193,7 @@ enum glusterd_vol_comp_status_ {
};
#define GLUSTERD_DEFAULT_WORKDIR "/etc/glusterd"
#define GLUSTERD_DEFAULT_PORT 6969
#define GLUSTERD_DEFAULT_PORT GF_DEFAULT_BASE_PORT
#define GLUSTERD_INFO_FILE "glusterd.info"
#define GLUSTERD_VOLUME_DIR_PREFIX "vols"
#define GLUSTERD_PEER_DIR_PREFIX "peers"

2
xlators/mgmt/glusterd/src/glusterd3_1-mops.c
View File

@ -757,7 +757,7 @@ glusterd3_1_probe (call_frame_t *frame, xlator_t *this,
goto out;
ret = dict_get_int32 (dict, "port", &port);
if (ret)
port = 6969;
port = GF_DEFAULT_BASE_PORT;
ret = glusterd_friend_find (NULL, hostname, &peerinfo);

7
xlators/mount/fuse/utils/mount_glusterfs.in
View File

@ -82,12 +82,10 @@ start_glusterfs ()
if [ -n "$transport" ]; then
cmd_line=$(echo "$cmd_line \
--volfile-server=$server_ip \
--volfile-server-port=$server_port \
--volfile-server-transport=$transport");
else
cmd_line=$(echo "$cmd_line \
--volfile-server=$server_ip \
--volfile-server-port=$server_port");
fi
else
cmd_line=$(echo "$cmd_line --volfile=$volfile_loc");
@ -175,11 +173,6 @@ main ()
[ -r "$volfile_loc" ] || {
server_ip=$(echo "$volfile_loc" | sed -n 's/\([^\:]*\).*/\1/p');
server_port=$(echo "$volfile_loc" | sed -n 's/.*:\([^ ]*\).*/\1/p');
[ -n "$server_port" ] || {
server_port="6996";
}
volfile_loc="";
}
# following line is product of love towards sed