gitlab-com-seaweedfs/seaweedfs
1
0
Fork 0
mirror of https://github.com/seaweedfs/seaweedfs.git synced 2024-01-19 02:48:24 +00:00
Code Issues Projects Releases Wiki Activity

return the node during assigning free volume

Browse source
This commit is contained in:
Chris Lu 2012-09-01 02:43:43 -07:00
parent 7a30a48027
commit c48bda0232
2 changed files with 9 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
weed-fs/src/pkg/topology/node.go
View file

@ -28,11 +28,12 @@ func (n *Node) String() string {
return string(n.Id)
}
func (n *Node) ReserveOneVolume(r int, vid storage.VolumeId) bool {
ret := false
func (n *Node) ReserveOneVolume(r int, vid storage.VolumeId) (bool, *Node) {
if n.children == nil {
return true
return true, n
}
ret := false
var assignedNode *Node
for _, node := range n.children {
freeSpace := node.maxVolumeCount - node.activeVolumeCount - node.reservedVolumeCount
fmt.Println("r =", r, ", node =", node, ", freeSpace =", freeSpace)
@ -42,7 +43,7 @@ func (n *Node) ReserveOneVolume(r int, vid storage.VolumeId) bool {
if r >= freeSpace {
r -= freeSpace
} else {
ret = node.ReserveOneVolume(r, vid)
ret, assignedNode = node.ReserveOneVolume(r, vid)
if ret {
break
}
@ -51,7 +52,7 @@ func (n *Node) ReserveOneVolume(r int, vid storage.VolumeId) bool {
if ret {
n.reservedVolumeCount++
}
return ret
return ret, assignedNode
}
func (n *Node) AddVolume(v *storage.VolumeInfo) {

5
weed-fs/src/pkg/topology/topology.go
View file

@ -16,13 +16,14 @@ func NewTopology(id NodeId) *Topology{
return t
}
func (t *Topology) RandomlyReserveOneVolume() (bool,storage.VolumeId) {
func (t *Topology) RandomlyReserveOneVolume() (bool, *Node, storage.VolumeId) {
slots := t.Node.maxVolumeCount-t.Node.activeVolumeCount-t.Node.reservedVolumeCount
r := rand.Intn(slots)
r = rand.Intn(slots)
fmt.Println("slots:", slots, "random :", r)
vid := t.nextVolumeId()
return t.Node.ReserveOneVolume(r,vid), vid
ret, node := t.Node.ReserveOneVolume(r,vid)
return ret, node, vid
}
func (t *Topology) nextVolumeId() storage.VolumeId {