aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris Lu <chris.lu@gmail.com>2019-08-10 03:09:42 -0700
committerChris Lu <chris.lu@gmail.com>2019-08-10 03:10:03 -0700
commit6f75df8660a48a9f3cef8498208d2a070f868a94 (patch)
treeba31a3a34fdc7a76334ec79950095fad15ea4a92
parent74acaad0d13f2df608898647b574d43d66954b40 (diff)
downloadseaweedfs-6f75df8660a48a9f3cef8498208d2a070f868a94.tar.xz
seaweedfs-6f75df8660a48a9f3cef8498208d2a070f868a94.zip
server: fix starting default master list
-rw-r--r--weed/command/server.go8
1 files changed, 6 insertions, 2 deletions
diff --git a/weed/command/server.go b/weed/command/server.go
index 1c6439edc..87f404ed3 100644
--- a/weed/command/server.go
+++ b/weed/command/server.go
@@ -121,13 +121,17 @@ func runServer(cmd *Command, args []string) bool {
*isStartingFiler = true
}
+ _, peerList := checkPeers(*serverIp, *masterOptions.port, *masterOptions.peers)
+ peers := strings.Join(peerList, ",")
+ masterOptions.peers = &peers
+
masterOptions.ip = serverIp
masterOptions.ipBind = serverBindIp
- filerOptions.masters = masterOptions.peers
+ filerOptions.masters = &peers
filerOptions.ip = serverBindIp
serverOptions.v.ip = serverIp
serverOptions.v.bindIp = serverBindIp
- serverOptions.v.masters = masterOptions.peers
+ serverOptions.v.masters = &peers
serverOptions.v.idleConnectionTimeout = serverTimeout
serverOptions.v.dataCenter = serverDataCenter
serverOptions.v.rack = serverRack