diff options
| author | yourchanges <yourchanges@gmail.com> | 2015-02-02 15:21:55 +0800 |
|---|---|---|
| committer | yourchanges <yourchanges@gmail.com> | 2015-02-02 15:21:55 +0800 |
| commit | a2b1afce783dab0b281cf20c534e95178e62af63 (patch) | |
| tree | 57a2b1aac0bfb48b53c76f977f47203b20aae902 /go/topology/topology.go | |
| parent | a86042e413e4a702c09943e53fa06f358c179e06 (diff) | |
| parent | 0e23ee4dce0f700f1aa0651bcce551336f428c85 (diff) | |
| download | seaweedfs-a2b1afce783dab0b281cf20c534e95178e62af63.tar.xz seaweedfs-a2b1afce783dab0b281cf20c534e95178e62af63.zip | |
Merge pull request #4 from chrislusf/master
merge
Diffstat (limited to 'go/topology/topology.go')
| -rw-r--r-- | go/topology/topology.go | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/go/topology/topology.go b/go/topology/topology.go index 4cfd070db..e06df6227 100644 --- a/go/topology/topology.go +++ b/go/topology/topology.go @@ -157,7 +157,13 @@ func (t *Topology) ProcessJoinMessage(joinMessage *operation.JoinMessage) { if *joinMessage.IsInit && dn != nil { t.UnRegisterDataNode(dn) } - dn = rack.GetOrCreateDataNode(*joinMessage.Ip, int(*joinMessage.Port), *joinMessage.PublicUrl, int(*joinMessage.MaxVolumeCount)) + adminPort := *joinMessage.Port + if joinMessage.AdminPort != nil { + adminPort = *joinMessage.AdminPort + } + dn = rack.GetOrCreateDataNode(*joinMessage.Ip, + int(*joinMessage.Port), int(adminPort), *joinMessage.PublicUrl, + int(*joinMessage.MaxVolumeCount)) var volumeInfos []storage.VolumeInfo for _, v := range joinMessage.Volumes { if vi, err := storage.NewVolumeInfo(v); err == nil { |