X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/1e03ea4765bee6db9331a1265c8abf2c3e45caff..3c23a0a57bde2978402e5d46ca2b003becee6d58:/services/keep-balance/balance_test.go

diff --git a/services/keep-balance/balance_test.go b/services/keep-balance/balance_test.go
index 8650de141c..2e664bedfb 100644
--- a/services/keep-balance/balance_test.go
+++ b/services/keep-balance/balance_test.go
@@ -92,6 +92,7 @@ func (bal *balancerSuite) SetUpTest(c *check.C) {
 	}
 
 	bal.MinMtime = time.Now().UnixNano() - bal.signatureTTL*1e9
+	bal.cleanupMounts()
 }
 
 func (bal *balancerSuite) TestPerfect(c *check.C) {
@@ -247,12 +248,12 @@ func (bal *balancerSuite) TestDecreaseReplBlockTooNew(c *check.C) {
 		shouldTrash: slots{2}})
 }
 
-func (bal *balancerSuite) TestDedupDevices(c *check.C) {
+func (bal *balancerSuite) TestCleanupMounts(c *check.C) {
 	bal.srvs[3].mounts[0].KeepMount.ReadOnly = true
 	bal.srvs[3].mounts[0].KeepMount.DeviceID = "abcdef"
 	bal.srvs[14].mounts[0].KeepMount.DeviceID = "abcdef"
 	c.Check(len(bal.srvs[3].mounts), check.Equals, 1)
-	bal.dedupDevices()
+	bal.cleanupMounts()
 	c.Check(len(bal.srvs[3].mounts), check.Equals, 0)
 	bal.try(c, tester{
 		known:      0,
@@ -261,6 +262,115 @@ func (bal *balancerSuite) TestDedupDevices(c *check.C) {
 		shouldPull: slots{2}})
 }
 
+func (bal *balancerSuite) TestVolumeReplication(c *check.C) {
+	bal.srvs[0].mounts[0].KeepMount.Replication = 2  // srv 0
+	bal.srvs[14].mounts[0].KeepMount.Replication = 2 // srv e
+	bal.cleanupMounts()
+	// block 0 rendezvous is 3,e,a -- so slot 1 has repl=2
+	bal.try(c, tester{
+		known:      0,
+		desired:    map[string]int{"default": 2},
+		current:    slots{1},
+		shouldPull: slots{0}})
+	bal.try(c, tester{
+		known:      0,
+		desired:    map[string]int{"default": 2},
+		current:    slots{0, 1},
+		shouldPull: nil})
+	bal.try(c, tester{
+		known:       0,
+		desired:     map[string]int{"default": 2},
+		current:     slots{0, 1, 2},
+		shouldTrash: slots{2}})
+	bal.try(c, tester{
+		known:       0,
+		desired:     map[string]int{"default": 3},
+		current:     slots{0, 2, 3, 4},
+		shouldPull:  slots{1},
+		shouldTrash: slots{4},
+		expectResult: balanceResult{
+			have: 4,
+			want: 3,
+			classState: map[string]balancedBlockState{"default": {
+				desired:      3,
+				surplus:      1,
+				unachievable: false}}}})
+	bal.try(c, tester{
+		known:       0,
+		desired:     map[string]int{"default": 3},
+		current:     slots{0, 1, 2, 3, 4},
+		shouldTrash: slots{2, 3, 4}})
+	bal.try(c, tester{
+		known:       0,
+		desired:     map[string]int{"default": 4},
+		current:     slots{0, 1, 2, 3, 4},
+		shouldTrash: slots{3, 4},
+		expectResult: balanceResult{
+			have: 6,
+			want: 4,
+			classState: map[string]balancedBlockState{"default": {
+				desired:      4,
+				surplus:      2,
+				unachievable: false}}}})
+	// block 1 rendezvous is 0,9,7 -- so slot 0 has repl=2
+	bal.try(c, tester{
+		known:   1,
+		desired: map[string]int{"default": 2},
+		current: slots{0},
+		expectResult: balanceResult{
+			have: 2,
+			want: 2,
+			classState: map[string]balancedBlockState{"default": {
+				desired:      2,
+				surplus:      0,
+				unachievable: false}}}})
+	bal.try(c, tester{
+		known:      1,
+		desired:    map[string]int{"default": 3},
+		current:    slots{0},
+		shouldPull: slots{1}})
+	bal.try(c, tester{
+		known:      1,
+		desired:    map[string]int{"default": 4},
+		current:    slots{0},
+		shouldPull: slots{1, 2}})
+	bal.try(c, tester{
+		known:      1,
+		desired:    map[string]int{"default": 4},
+		current:    slots{2},
+		shouldPull: slots{0, 1}})
+	bal.try(c, tester{
+		known:      1,
+		desired:    map[string]int{"default": 4},
+		current:    slots{7},
+		shouldPull: slots{0, 1, 2},
+		expectResult: balanceResult{
+			have: 1,
+			want: 4,
+			classState: map[string]balancedBlockState{"default": {
+				desired:      4,
+				surplus:      -3,
+				unachievable: false}}}})
+	bal.try(c, tester{
+		known:       1,
+		desired:     map[string]int{"default": 2},
+		current:     slots{1, 2, 3, 4},
+		shouldPull:  slots{0},
+		shouldTrash: slots{3, 4}})
+	bal.try(c, tester{
+		known:       1,
+		desired:     map[string]int{"default": 2},
+		current:     slots{0, 1, 2},
+		shouldTrash: slots{1, 2},
+		expectResult: balanceResult{
+			have: 4,
+			want: 2,
+			classState: map[string]balancedBlockState{"default": {
+				desired:      2,
+				surplus:      2,
+				unachievable: false}}}})
+}
+
 func (bal *balancerSuite) TestDeviceRWMountedByMultipleServers(c *check.C) {
 	bal.srvs[0].mounts[0].KeepMount.DeviceID = "abcdef"
 	bal.srvs[9].mounts[0].KeepMount.DeviceID = "abcdef"
@@ -497,6 +607,9 @@ func (bal *balancerSuite) try(c *check.C, t tester) {
 	if t.expectResult.have > 0 {
 		c.Check(result.have, check.Equals, t.expectResult.have)
 	}
+	if t.expectResult.want > 0 {
+		c.Check(result.want, check.Equals, t.expectResult.want)
+	}
 	if t.expectResult.classState != nil {
 		c.Check(result.classState, check.DeepEquals, t.expectResult.classState)
 	}