|
|
@ -631,7 +631,7 @@ func (s *AdminServer) GetClusterMasters() (*ClusterMastersData, error) { |
|
|
// Add masters from topology
|
|
|
// Add masters from topology
|
|
|
for _, master := range topology.Masters { |
|
|
for _, master := range topology.Masters { |
|
|
masterInfo := &MasterInfo{ |
|
|
masterInfo := &MasterInfo{ |
|
|
Address: master.Address, |
|
|
|
|
|
|
|
|
Address: pb.ServerAddress(master.Address).ToHttpAddress(), |
|
|
IsLeader: master.IsLeader, |
|
|
IsLeader: master.IsLeader, |
|
|
Suffrage: "", |
|
|
Suffrage: "", |
|
|
} |
|
|
} |
|
|
@ -653,6 +653,7 @@ func (s *AdminServer) GetClusterMasters() (*ClusterMastersData, error) { |
|
|
// Process each raft server
|
|
|
// Process each raft server
|
|
|
for _, server := range resp.ClusterServers { |
|
|
for _, server := range resp.ClusterServers { |
|
|
address := server.Address |
|
|
address := server.Address |
|
|
|
|
|
httpAddress := pb.ServerAddress(address).ToHttpAddress() |
|
|
|
|
|
|
|
|
// Update existing master info or create new one
|
|
|
// Update existing master info or create new one
|
|
|
if masterInfo, exists := masterMap[address]; exists { |
|
|
if masterInfo, exists := masterMap[address]; exists { |
|
|
@ -662,7 +663,7 @@ func (s *AdminServer) GetClusterMasters() (*ClusterMastersData, error) { |
|
|
} else { |
|
|
} else { |
|
|
// Create new master info from raft data
|
|
|
// Create new master info from raft data
|
|
|
masterInfo := &MasterInfo{ |
|
|
masterInfo := &MasterInfo{ |
|
|
Address: address, |
|
|
|
|
|
|
|
|
Address: httpAddress, |
|
|
IsLeader: server.IsLeader, |
|
|
IsLeader: server.IsLeader, |
|
|
Suffrage: server.Suffrage, |
|
|
Suffrage: server.Suffrage, |
|
|
} |
|
|
} |
|
|
@ -699,7 +700,7 @@ func (s *AdminServer) GetClusterMasters() (*ClusterMastersData, error) { |
|
|
currentMaster := s.masterClient.GetMaster(context.Background()) |
|
|
currentMaster := s.masterClient.GetMaster(context.Background()) |
|
|
if currentMaster != "" { |
|
|
if currentMaster != "" { |
|
|
masters = append(masters, MasterInfo{ |
|
|
masters = append(masters, MasterInfo{ |
|
|
Address: string(currentMaster), |
|
|
|
|
|
|
|
|
Address: pb.ServerAddress(currentMaster).ToHttpAddress(), |
|
|
IsLeader: true, |
|
|
IsLeader: true, |
|
|
Suffrage: "Voter", |
|
|
Suffrage: "Voter", |
|
|
}) |
|
|
}) |
|
|
@ -733,7 +734,7 @@ func (s *AdminServer) GetClusterFilers() (*ClusterFilersData, error) { |
|
|
createdAt := time.Unix(0, node.CreatedAtNs) |
|
|
createdAt := time.Unix(0, node.CreatedAtNs) |
|
|
|
|
|
|
|
|
filerInfo := FilerInfo{ |
|
|
filerInfo := FilerInfo{ |
|
|
Address: node.Address, |
|
|
|
|
|
|
|
|
Address: pb.ServerAddress(node.Address).ToHttpAddress(), |
|
|
DataCenter: node.DataCenter, |
|
|
DataCenter: node.DataCenter, |
|
|
Rack: node.Rack, |
|
|
Rack: node.Rack, |
|
|
Version: node.Version, |
|
|
Version: node.Version, |
|
|
@ -780,7 +781,7 @@ func (s *AdminServer) GetClusterBrokers() (*ClusterBrokersData, error) { |
|
|
createdAt := time.Unix(0, node.CreatedAtNs) |
|
|
createdAt := time.Unix(0, node.CreatedAtNs) |
|
|
|
|
|
|
|
|
brokerInfo := MessageBrokerInfo{ |
|
|
brokerInfo := MessageBrokerInfo{ |
|
|
Address: node.Address, |
|
|
|
|
|
|
|
|
Address: pb.ServerAddress(node.Address).ToHttpAddress(), |
|
|
DataCenter: node.DataCenter, |
|
|
DataCenter: node.DataCenter, |
|
|
Rack: node.Rack, |
|
|
Rack: node.Rack, |
|
|
Version: node.Version, |
|
|
Version: node.Version, |
|
|
|