aboutsummaryrefslogtreecommitdiff
path: root/weed/admin/dash/admin_data.go
diff options
context:
space:
mode:
authorchrislu <chris.lu@gmail.com>2025-07-15 10:51:00 -0700
committerchrislu <chris.lu@gmail.com>2025-07-15 10:51:07 -0700
commit64c5dde2f321dbdc24b3cdc00a17c7b6b2c8f0bd (patch)
treeea8ba039a913c7f7b08bf73d215b4fbdceccb31b /weed/admin/dash/admin_data.go
parentd78aa3d2de1a18c9802f72c926efa8e80ff2fa64 (diff)
downloadseaweedfs-64c5dde2f321dbdc24b3cdc00a17c7b6b2c8f0bd.tar.xz
seaweedfs-64c5dde2f321dbdc24b3cdc00a17c7b6b2c8f0bd.zip
support multiple masters
fix https://github.com/seaweedfs/seaweedfs/issues/6988
Diffstat (limited to 'weed/admin/dash/admin_data.go')
-rw-r--r--weed/admin/dash/admin_data.go17
1 files changed, 11 insertions, 6 deletions
diff --git a/weed/admin/dash/admin_data.go b/weed/admin/dash/admin_data.go
index 49bd224af..7571bdf6a 100644
--- a/weed/admin/dash/admin_data.go
+++ b/weed/admin/dash/admin_data.go
@@ -187,10 +187,13 @@ func (s *AdminServer) getMasterNodesStatus() []MasterNode {
isLeader = false
}
- masterNodes = append(masterNodes, MasterNode{
- Address: s.masterAddress,
- IsLeader: isLeader,
- })
+ currentMaster := s.masterClient.GetMaster(context.Background())
+ if currentMaster != "" {
+ masterNodes = append(masterNodes, MasterNode{
+ Address: string(currentMaster),
+ IsLeader: isLeader,
+ })
+ }
return masterNodes
}
@@ -222,7 +225,8 @@ func (s *AdminServer) getFilerNodesStatus() []FilerNode {
})
if err != nil {
- glog.Errorf("Failed to get filer nodes from master %s: %v", s.masterAddress, err)
+ currentMaster := s.masterClient.GetMaster(context.Background())
+ glog.Errorf("Failed to get filer nodes from master %s: %v", currentMaster, err)
// Return empty list if we can't get filer info from master
return []FilerNode{}
}
@@ -257,7 +261,8 @@ func (s *AdminServer) getMessageBrokerNodesStatus() []MessageBrokerNode {
})
if err != nil {
- glog.Errorf("Failed to get message broker nodes from master %s: %v", s.masterAddress, err)
+ currentMaster := s.masterClient.GetMaster(context.Background())
+ glog.Errorf("Failed to get message broker nodes from master %s: %v", currentMaster, err)
// Return empty list if we can't get broker info from master
return []MessageBrokerNode{}
}