aboutsummaryrefslogtreecommitdiff
path: root/weed/topology
diff options
context:
space:
mode:
Diffstat (limited to 'weed/topology')
-rw-r--r--weed/topology/data_center.go5
-rw-r--r--weed/topology/rack.go5
-rw-r--r--weed/topology/topology_info.go5
3 files changed, 6 insertions, 9 deletions
diff --git a/weed/topology/data_center.go b/weed/topology/data_center.go
index 55b17e911..26d2de7d3 100644
--- a/weed/topology/data_center.go
+++ b/weed/topology/data_center.go
@@ -3,7 +3,6 @@ package topology
import (
"github.com/seaweedfs/seaweedfs/weed/pb/master_pb"
"golang.org/x/exp/slices"
- "strings"
)
type DataCenter struct {
@@ -47,8 +46,8 @@ func (dc *DataCenter) ToInfo() (info DataCenterInfo) {
racks = append(racks, rack.ToInfo())
}
- slices.SortFunc(racks, func(a, b RackInfo) int {
- return strings.Compare(string(a.Id), string(b.Id))
+ slices.SortFunc(racks, func(a, b RackInfo) bool {
+ return a.Id < b.Id
})
info.Racks = racks
return
diff --git a/weed/topology/rack.go b/weed/topology/rack.go
index 6bf8b5b4e..c96bf421e 100644
--- a/weed/topology/rack.go
+++ b/weed/topology/rack.go
@@ -5,7 +5,6 @@ import (
"github.com/seaweedfs/seaweedfs/weed/storage/types"
"github.com/seaweedfs/seaweedfs/weed/util"
"golang.org/x/exp/slices"
- "strings"
"time"
)
@@ -70,8 +69,8 @@ func (r *Rack) ToInfo() (info RackInfo) {
dns = append(dns, dn.ToInfo())
}
- slices.SortFunc(dns, func(a, b DataNodeInfo) int {
- return strings.Compare(a.Url, b.Url)
+ slices.SortFunc(dns, func(a, b DataNodeInfo) bool {
+ return a.Url < b.Url
})
info.DataNodes = dns
diff --git a/weed/topology/topology_info.go b/weed/topology/topology_info.go
index afbeb4894..680a0528c 100644
--- a/weed/topology/topology_info.go
+++ b/weed/topology/topology_info.go
@@ -3,7 +3,6 @@ package topology
import (
"github.com/seaweedfs/seaweedfs/weed/pb/master_pb"
"golang.org/x/exp/slices"
- "strings"
)
type TopologyInfo struct {
@@ -22,8 +21,8 @@ func (t *Topology) ToInfo() (info TopologyInfo) {
dcs = append(dcs, dc.ToInfo())
}
- slices.SortFunc(dcs, func(a, b DataCenterInfo) int {
- return strings.Compare(string(a.Id), string(b.Id))
+ slices.SortFunc(dcs, func(a, b DataCenterInfo) bool {
+ return a.Id < b.Id
})
info.DataCenters = dcs