migrate from port 69* to 24007

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

12 files changed, 42 insertions, 48 deletions

diff --git a/doc/examples/protocol-client.vol b/doc/examples/protocol-client.vol
index 43108f2c2c1..43c43e02d54 100644
--- a/doc/examples/protocol-client.vol
+++ b/doc/examples/protocol-client.vol
@@ -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 
diff --git a/doc/examples/protocol-server.vol b/doc/examples/protocol-server.vol
index 88477511f55..e8e4a464383 100644
--- a/doc/examples/protocol-server.vol
+++ b/doc/examples/protocol-server.vol
@@ -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
diff --git a/doc/examples/replicate.vol b/doc/examples/replicate.vol
index 8c9541444f8..333ba7de1aa 100644
--- a/doc/examples/replicate.vol
+++ b/doc/examples/replicate.vol
@@ -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
 
diff --git a/doc/examples/stripe.vol b/doc/examples/stripe.vol
index ea24cf86038..6055b66b922 100644
--- a/doc/examples/stripe.vol
+++ b/doc/examples/stripe.vol
@@ -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
 
diff --git a/doc/examples/unify.vol b/doc/examples/unify.vol
index 4f7415a2369..3fb7e832086 100644
--- a/doc/examples/unify.vol
+++ b/doc/examples/unify.vol
@@ -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
 
diff --git a/doc/glusterd.vol b/doc/glusterd.vol
index b96cbe8eaaf..4e43fb0dad2 100644
--- a/doc/glusterd.vol
+++ b/doc/glusterd.vol
@@ -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
 
diff --git a/doc/glusterfs-volgen.8 b/doc/glusterfs-volgen.8
index f185e9aed4d..a47873783bd 100644
--- a/doc/glusterfs-volgen.8
+++ b/doc/glusterfs-volgen.8
@@ -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.
diff --git a/doc/glusterfs.vol.sample b/doc/glusterfs.vol.sample
index e126f66b3dc..3b1f1851722 100644
--- a/doc/glusterfs.vol.sample
+++ b/doc/glusterfs.vol.sample
@@ -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
diff --git a/doc/glusterfsd.vol.sample b/doc/glusterfsd.vol.sample
index b6d8a158072..e91df3290a9 100644
--- a/doc/glusterfsd.vol.sample
+++ b/doc/glusterfsd.vol.sample
@@ -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
diff --git a/doc/mount.glusterfs.8 b/doc/mount.glusterfs.8
index 7be1f0c786c..aced363f74f 100644
--- a/doc/mount.glusterfs.8
+++ b/doc/mount.glusterfs.8
@@ -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
diff --git a/doc/user-guide/user-guide.info b/doc/user-guide/user-guide.info
index 94a24c01dac..6ba883ea0dd 100644
--- a/doc/user-guide/user-guide.info
+++ b/doc/user-guide/user-guide.info
@@ -906,7 +906,7 @@ and the client.
 `non-blocking-connect [no|off|on|yes] (on)'
      Whether to make the connection attempt asynchronous.
 
-`remote-port <n> (6996)'
+`remote-port <n> (24007)'
      Server port to connect to.  
 
 `remote-host <hostname> *'
@@ -920,7 +920,7 @@ and the client.
      The local interface on which the server should listen to requests.
      Default is to listen on all interfaces.
 
-`listen-port <n> (6996)'
+`listen-port <n> (24007)'
      The local port to listen on.
 
 4.2.1.2 IB-SDP
@@ -951,7 +951,7 @@ always best to use `ib-verbs'. Use `ib-sdp' only if you cannot get
 `non-blocking-connect [no|off|on|yes] (on)'
      Whether to make the connection attempt asynchronous.
 
-`remote-port <n> (6996)'
+`remote-port <n> (24007)'
      Server port to connect to.  
 
 `remote-host <hostname> *'
@@ -965,7 +965,7 @@ always best to use `ib-verbs'. Use `ib-sdp' only if you cannot get
      The local interface on which the server should listen to requests.
      Default is to listen on all interfaces.
 
-`listen-port <n> (6996)'
+`listen-port <n> (24007)'
      The local port to listen on.
 
    The following options are common to both the client and server
@@ -2037,11 +2037,11 @@ it means the GlusterFS mount did not succeed. Try running GlusterFS in
 connections and firewall settings. To check if the server is reachable,
 try:
 
-     telnet IP-ADDRESS 6996
+     telnet IP-ADDRESS 24007
 
    If the server is accessible, your `telnet' command should connect and
 block. If not you will see an error message such as `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.
 
diff --git a/doc/user-guide/user-guide.texi b/doc/user-guide/user-guide.texi
index 9dce15be413..025a92d89fe 100644
--- a/doc/user-guide/user-guide.texi
+++ b/doc/user-guide/user-guide.texi
@@ -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.