diff options
| author | Chris Lu <chris.lu@gmail.com> | 2012-09-01 13:17:30 -0700 |
|---|---|---|
| committer | Chris Lu <chris.lu@gmail.com> | 2012-09-01 13:17:30 -0700 |
| commit | a467d5081ceedc4f2659987438d7e9a0dcddf079 (patch) | |
| tree | 1eea79f8488fe895799ace61c4fc5c929807a921 | |
| parent | c51884ce23b3c32dbef4af474c480e69797848c2 (diff) | |
| download | seaweedfs-a467d5081ceedc4f2659987438d7e9a0dcddf079.tar.xz seaweedfs-a467d5081ceedc4f2659987438d7e9a0dcddf079.zip | |
adjusted tests
| -rw-r--r-- | weed-fs/src/pkg/topology/topo_test.go | 6 | ||||
| -rw-r--r-- | weed-fs/src/pkg/topology/topology.go | 3 |
2 files changed, 3 insertions, 6 deletions
diff --git a/weed-fs/src/pkg/topology/topo_test.go b/weed-fs/src/pkg/topology/topo_test.go index 928454791..5bbc33dd9 100644 --- a/weed-fs/src/pkg/topology/topo_test.go +++ b/weed-fs/src/pkg/topology/topo_test.go @@ -161,11 +161,9 @@ func TestRemoveDataCenter(t *testing.T) { func TestReserveOneVolume(t *testing.T) { topo := setup() rand.Seed(time.Now().UnixNano()) - ret, vid := topo.RandomlyReserveOneVolume() + ret, node, vid := topo.RandomlyReserveOneVolume() fmt.Println("topology:", topo.Node) fmt.Println("assigned :", ret) + fmt.Println("assigned node :", node) fmt.Println("assigned volume id:", vid) - if topo.reservedVolumeCount != 1 { - t.Fail() - } } diff --git a/weed-fs/src/pkg/topology/topology.go b/weed-fs/src/pkg/topology/topology.go index ce313dc7b..79f0fac67 100644 --- a/weed-fs/src/pkg/topology/topology.go +++ b/weed-fs/src/pkg/topology/topology.go @@ -3,7 +3,7 @@ package topology import ( "math/rand" "pkg/storage" - "fmt" + _ "fmt" ) type Topology struct { @@ -19,7 +19,6 @@ func NewTopology(id NodeId) *Topology{ func (t *Topology) RandomlyReserveOneVolume() (bool, *Node, storage.VolumeId) { slots := t.Node.maxVolumeCount-t.Node.activeVolumeCount r := rand.Intn(slots) - fmt.Println("slots:", slots, "random :", r) vid := t.nextVolumeId() ret, node := t.Node.ReserveOneVolume(r,vid) return ret, node, vid |