Refactor port for raft-addr 9000->8500

BBVA · Feb 19, 2019 · 10aafcf · 10aafcf
1 parent fd08649
commit 10aafcf
Show file tree

Hide file tree

Showing 9 changed files with 12 additions and 12 deletions.
diff --git a/cmd/start.go b/cmd/start.go
@@ -92,7 +92,7 @@ func newStartCommand(ctx *cmdContext) *cobra.Command {
 	f.StringVar(&conf.SSLCertificateKey, "certificate-key", fmt.Sprintf("%s/%s", ctx.path, "server.key"), "Server key file")
 
 	f.StringVar(&conf.HTTPAddr, "http-addr", ":8800", "Endpoint for REST requests on (host:port)")
-	f.StringVar(&conf.RaftAddr, "raft-addr", ":9000", "Raft bind address (host:port)")
+	f.StringVar(&conf.RaftAddr, "raft-addr", ":8500", "Raft bind address (host:port)")
 	f.StringVar(&conf.MgmtAddr, "mgmt-addr", ":8700", "Management endpoint bind address (host:port)")
 	f.StringVar(&conf.MgmtAddr, "metrics-addr", ":8600", "Metrics export bind address (host:port)")
 	f.StringSliceVar(&conf.RaftJoinAddr, "join-addr", []string{}, "Raft: Comma-delimited list of nodes ([host]:port), through which a cluster can be joined")

diff --git a/config.example.yml b/config.example.yml
@@ -38,7 +38,7 @@ server:
     http: ":8800"  # Endpoint for REST requests on (host:port).
     mgmt: ":8700"  # Management endpoint bind address (host:port).
     metrics: ":8600"  # Metrics endpoint (host:port). where raft node can join the current cluster
-    raft: ":9000"  # Raft bind address (host:port). internal message passing
+    raft: ":8500"  # Raft bind address (host:port). internal message passing
     raft_join:  # Raft: list of nodes ([host]:port), where the node can join the cluster using the mgmt endpoint
      - "127.0.0.1:8700"
     gossip: ":9100"  # Gossip: management endpoint bind address (host:port).

diff --git a/deploy/aws/main.tf b/deploy/aws/main.tf
@@ -37,7 +37,7 @@ module "leader" {
     addr:
       http: ":8800"
       mgmt: ":8700"
-      raft: ":9000"
+      raft: ":8500"
       gossip: ":9100"
   CONFIG
 
@@ -62,7 +62,7 @@ module "follower-1" {
     addr:
       http: ":8800"
       mgmt: ":8700"
-      raft: ":9000"
+      raft: ":8500"
       gossip: ":9100"
       raft_join:
        - "${module.leader.private_ip}:8700"
@@ -91,7 +91,7 @@ module "follower-2" {
     addr:
       http: ":8800"
       mgmt: ":8700"
-      raft: ":9000"
+      raft: ":8500"
       gossip: ":9100"
       raft_join:
        - "${module.leader.private_ip}:8700"

diff --git a/docs/advanced_usage.md b/docs/advanced_usage.md
@@ -25,7 +25,7 @@ go run main.go start \
     --raftpath $(mktemp -d /var/tmp/demo.XXX) \
     -y ~/.ssh/id_ed25519-qed \
     --http-addr :8800 \
-    --raft-addr :9000 \
+    --raft-addr :8500 \
     --mgmt-addr :8700 \
     -l error
 ```

diff --git a/server/config.go b/server/config.go
@@ -89,7 +89,7 @@ func DefaultConfig() *Config {
 		APIKey:            "",
 		NodeID:            hostname,
 		HTTPAddr:          "127.0.0.1:8800",
-		RaftAddr:          "127.0.0.1:9000",
+		RaftAddr:          "127.0.0.1:8500",
 		MgmtAddr:          "127.0.0.1:8700",
 		MetricsAddr:       "127.0.0.1:8600",
 		RaftJoinAddr:      []string{},

diff --git a/tests/cloud/aws/templates/start_master b/tests/cloud/aws/templates/start_master
@@ -18,7 +18,7 @@ echo Create id_ed25519 key
 yes | ssh-keygen -t ed25519 -N '' -f /var/tmp/id_ed25519
 
 echo Starting server...
-nohup /tmp/to_upload/qed start -k pepe -p $(mktemp -d /var/tmp/demo.XXX) --raftpath $(mktemp -d /var/tmp/demo.XXX) -y /var/tmp/id_ed25519 -l error --http-addr ${master_address}:8800 --raft-addr ${master_address}:9000 --mgmt-addr ${master_address}:8700 &
+nohup /tmp/to_upload/qed start -k pepe -p $(mktemp -d /var/tmp/demo.XXX) --raftpath $(mktemp -d /var/tmp/demo.XXX) -y /var/tmp/id_ed25519 -l error --http-addr ${master_address}:8800 --raft-addr ${master_address}:8500 --mgmt-addr ${master_address}:8700 &
 echo done.
 
 sleep 10
diff --git a/tests/demo/start-leader b/tests/demo/start-leader
@@ -18,7 +18,7 @@ echo Create id_ed25519 key
 ssh-keygen -t ed25519 -N '' -f /var/tmp/id_ed25519
 
 echo 'Starting leader...'
-go run ../../main.go start -k pepe -p $(mktemp -d /var/tmp/demo.XXX) --raftpath $(mktemp -d /var/tmp/demo.XXX) -y /var/tmp/id_ed25519 -l debug --http-addr :8800 --raft-addr :9000 --mgmt-addr :8700
+go run ../../main.go start -k pepe -p $(mktemp -d /var/tmp/demo.XXX) --raftpath $(mktemp -d /var/tmp/demo.XXX) -y /var/tmp/id_ed25519 -l debug --http-addr :8800 --raft-addr :8500 --mgmt-addr :8700
 echo done.
 
 echo Cleanup...

diff --git a/tests/gossip/run_gossip.sh b/tests/gossip/run_gossip.sh
@@ -23,7 +23,7 @@ if [ ! -f "$keyFile" ]; then
 	echo -e 'y\n' | ssh-keygen -t ed25519 -N '' -f /var/tmp/id_ed25519
 fi
 
-$QED start -k key -l silent --node-id server0 --gossip-addr $qedGossipEndpoint --raft-addr 127.0.0.1:9000 -y $keyFile &
+$QED start -k key -l silent --node-id server0 --gossip-addr $qedGossipEndpoint --raft-addr 127.0.0.1:8500 -y $keyFile &
 pids[0]=$!
 sleep 2s
 

diff --git a/tests/start_server b/tests/start_server
@@ -32,12 +32,12 @@ fi
 if [ -z "$CLUSTER_SIZE" ]
 then
     echo Starting single server...
-    go run ../main.go start -k pepe -p /var/tmp/demo.dbpath --raftpath /var/tmp/demo.raftpath -y /var/tmp/id_ed25519 -l error --http-addr :8800 --raft-addr :9000 --mgmt-addr :8700 $PROFILING &
+    go run ../main.go start -k pepe -p /var/tmp/demo.dbpath --raftpath /var/tmp/demo.raftpath -y /var/tmp/id_ed25519 -l error --http-addr :8800 --raft-addr :8500 --mgmt-addr :8700 $PROFILING &
     sleep 10
     echo done.
 else
     echo Starting cluster mode...
-    go run ../main.go start -k pepe -p $(mktemp -d /var/tmp/demo.XXX) --raftpath $(mktemp -d /var/tmp/demo.XXX) -y /var/tmp/id_ed25519 -l error --http-addr :8800 --raft-addr :9000 --mgmt-addr :8700 $PROFILING &
+    go run ../main.go start -k pepe -p $(mktemp -d /var/tmp/demo.XXX) --raftpath $(mktemp -d /var/tmp/demo.XXX) -y /var/tmp/id_ed25519 -l error --http-addr :8800 --raft-addr :8500 --mgmt-addr :8700 $PROFILING &
     sleep 10
     echo Starting followers
     for i in $(seq 1 $CLUSTER_SIZE); do