Browse Source

refactor code for consts of node type

pull/843/head
bingoohuang 7 years ago
parent
commit
70c3773c18
  1. 2
      weed/topology/data_center.go
  2. 2
      weed/topology/data_node.go
  3. 6
      weed/topology/node.go
  4. 8
      weed/topology/node_type.go
  5. 2
      weed/topology/rack.go
  6. 2
      weed/topology/topology.go

2
weed/topology/data_center.go

@ -7,7 +7,7 @@ type DataCenter struct {
func NewDataCenter(id string) *DataCenter { func NewDataCenter(id string) *DataCenter {
dc := &DataCenter{} dc := &DataCenter{}
dc.id = NodeId(id) dc.id = NodeId(id)
dc.nodeType = "DataCenter"
dc.nodeType = NodeTypeDataCenter
dc.children = make(map[NodeId]Node) dc.children = make(map[NodeId]Node)
dc.NodeImpl.value = dc dc.NodeImpl.value = dc
return dc return dc

2
weed/topology/data_node.go

@ -20,7 +20,7 @@ type DataNode struct {
func NewDataNode(id string) *DataNode { func NewDataNode(id string) *DataNode {
s := &DataNode{} s := &DataNode{}
s.id = NodeId(id) s.id = NodeId(id)
s.nodeType = "DataNode"
s.nodeType = NodeTypeDataNode
s.volumes = make(map[storage.VolumeId]storage.VolumeInfo) s.volumes = make(map[storage.VolumeId]storage.VolumeInfo)
s.NodeImpl.value = s s.NodeImpl.value = s
return s return s

6
weed/topology/node.go

@ -109,13 +109,13 @@ func (n *NodeImpl) RandomlyPickNodes(numberOfNodes int, filterFirstNodeFn func(d
} }
func (n *NodeImpl) IsDataNode() bool { func (n *NodeImpl) IsDataNode() bool {
return n.nodeType == "DataNode"
return n.nodeType == NodeTypeDataNode
} }
func (n *NodeImpl) IsRack() bool { func (n *NodeImpl) IsRack() bool {
return n.nodeType == "Rack"
return n.nodeType == NodeTypeRack
} }
func (n *NodeImpl) IsDataCenter() bool { func (n *NodeImpl) IsDataCenter() bool {
return n.nodeType == "DataCenter"
return n.nodeType == NodeTypeDataCenter
} }
func (n *NodeImpl) String() string { func (n *NodeImpl) String() string {
if n.parent != nil { if n.parent != nil {

8
weed/topology/node_type.go

@ -0,0 +1,8 @@
package topology
const (
NodeTypeTopology = "Topology"
NodeTypeDataCenter = "DataCenter"
NodeTypeRack = "Rack"
NodeTypeDataNode = "DataNode"
)

2
weed/topology/rack.go

@ -12,7 +12,7 @@ type Rack struct {
func NewRack(id string) *Rack { func NewRack(id string) *Rack {
r := &Rack{} r := &Rack{}
r.id = NodeId(id) r.id = NodeId(id)
r.nodeType = "Rack"
r.nodeType = NodeTypeRack
r.children = make(map[NodeId]Node) r.children = make(map[NodeId]Node)
r.NodeImpl.value = r r.NodeImpl.value = r
return r return r

2
weed/topology/topology.go

@ -33,7 +33,7 @@ type Topology struct {
func NewTopology(id string, seq sequence.Sequencer, volumeSizeLimit uint64, pulse int) *Topology { func NewTopology(id string, seq sequence.Sequencer, volumeSizeLimit uint64, pulse int) *Topology {
t := &Topology{} t := &Topology{}
t.id = NodeId(id) t.id = NodeId(id)
t.nodeType = "Topology"
t.nodeType = NodeTypeTopology
t.NodeImpl.value = t t.NodeImpl.value = t
t.children = make(map[NodeId]Node) t.children = make(map[NodeId]Node)
t.collectionMap = util.NewConcurrentReadMap() t.collectionMap = util.NewConcurrentReadMap()

Loading…
Cancel
Save