X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/39c17737ac69d7693684fe2f95bef0ec235a28bf..e99f026d040c6020dfcc51c6d988cf18d325a530:/services/keep-balance/balance_test.go diff --git a/services/keep-balance/balance_test.go b/services/keep-balance/balance_test.go index 2e664bedfb..c529ac150e 100644 --- a/services/keep-balance/balance_test.go +++ b/services/keep-balance/balance_test.go @@ -12,8 +12,8 @@ import ( "testing" "time" - "git.curoverse.com/arvados.git/sdk/go/arvados" - + "git.arvados.org/arvados.git/sdk/go/arvados" + "git.arvados.org/arvados.git/sdk/go/ctxlog" check "gopkg.in/check.v1" ) @@ -50,7 +50,8 @@ type tester struct { shouldPullMounts []string shouldTrashMounts []string - expectResult balanceResult + expectBlockState *balancedBlockState + expectClassState map[string]balancedBlockState } func (bal *balancerSuite) SetUpSuite(c *check.C) { @@ -70,6 +71,7 @@ func (bal *balancerSuite) SetUpSuite(c *check.C) { } bal.signatureTTL = 3600 + bal.Logger = ctxlog.TestLogger(c) } func (bal *balancerSuite) SetUpTest(c *check.C) { @@ -83,7 +85,8 @@ func (bal *balancerSuite) SetUpTest(c *check.C) { } srv.mounts = []*KeepMount{{ KeepMount: arvados.KeepMount{ - UUID: fmt.Sprintf("zzzzz-mount-%015x", i), + UUID: fmt.Sprintf("zzzzz-mount-%015x", i), + StorageClasses: map[string]bool{"default": true}, }, KeepService: srv, }} @@ -100,28 +103,42 @@ func (bal *balancerSuite) TestPerfect(c *check.C) { desired: map[string]int{"default": 2}, current: slots{0, 1}, shouldPull: nil, - shouldTrash: nil}) + shouldTrash: nil, + expectBlockState: &balancedBlockState{ + needed: 2, + }}) } func (bal *balancerSuite) TestDecreaseRepl(c *check.C) { bal.try(c, tester{ desired: map[string]int{"default": 2}, current: slots{0, 2, 1}, - shouldTrash: slots{2}}) + shouldTrash: slots{2}, + expectBlockState: &balancedBlockState{ + needed: 2, + unneeded: 1, + }}) } func (bal *balancerSuite) TestDecreaseReplToZero(c *check.C) { bal.try(c, tester{ desired: map[string]int{"default": 0}, current: slots{0, 1, 3}, - shouldTrash: slots{0, 1, 3}}) + shouldTrash: slots{0, 1, 3}, + expectBlockState: &balancedBlockState{ + unneeded: 3, + }}) } func (bal *balancerSuite) TestIncreaseRepl(c *check.C) { bal.try(c, tester{ desired: map[string]int{"default": 4}, current: slots{0, 1}, - shouldPull: slots{2, 3}}) + shouldPull: slots{2, 3}, + expectBlockState: &balancedBlockState{ + needed: 2, + pulling: 2, + }}) } func (bal *balancerSuite) TestSkipReadonly(c *check.C) { @@ -129,7 +146,81 @@ func (bal *balancerSuite) TestSkipReadonly(c *check.C) { bal.try(c, tester{ desired: map[string]int{"default": 4}, current: slots{0, 1}, - shouldPull: slots{2, 4}}) + shouldPull: slots{2, 4}, + expectBlockState: &balancedBlockState{ + needed: 2, + pulling: 2, + }}) +} + +func (bal *balancerSuite) TestMultipleViewsReadOnly(c *check.C) { + bal.testMultipleViews(c, true) +} + +func (bal *balancerSuite) TestMultipleViews(c *check.C) { + bal.testMultipleViews(c, false) +} + +func (bal *balancerSuite) testMultipleViews(c *check.C, readonly bool) { + for i, srv := range bal.srvs { + // Add a mount to each service + srv.mounts[0].KeepMount.DeviceID = fmt.Sprintf("writable-by-srv-%x", i) + srv.mounts = append(srv.mounts, &KeepMount{ + KeepMount: arvados.KeepMount{ + DeviceID: fmt.Sprintf("writable-by-srv-%x", (i+1)%len(bal.srvs)), + UUID: fmt.Sprintf("zzzzz-mount-%015x", i<<16), + ReadOnly: readonly, + Replication: 1, + StorageClasses: map[string]bool{"default": true}, + }, + KeepService: srv, + }) + } + for i := 1; i < len(bal.srvs); i++ { + c.Logf("i=%d", i) + if i == 4 { + // Timestamps are all different, but one of + // the mounts on srv[4] has the same device ID + // where the non-deletable replica is stored + // on srv[3], so only one replica is safe to + // trash. + bal.try(c, tester{ + desired: map[string]int{"default": 1}, + current: slots{0, i, i}, + shouldTrash: slots{i}}) + } else if readonly { + // Timestamps are all different, and the third + // replica can't be trashed because it's on a + // read-only mount, so the first two replicas + // should be trashed. + bal.try(c, tester{ + desired: map[string]int{"default": 1}, + current: slots{0, i, i}, + shouldTrash: slots{0, i}}) + } else { + // Timestamps are all different, so both + // replicas on the non-optimal server should + // be trashed. + bal.try(c, tester{ + desired: map[string]int{"default": 1}, + current: slots{0, i, i}, + shouldTrash: slots{i, i}}) + } + // If the three replicas have identical timestamps, + // none of them can be trashed safely. + bal.try(c, tester{ + desired: map[string]int{"default": 1}, + current: slots{0, i, i}, + timestamps: []int64{12345678, 12345678, 12345678}}) + // If the first and third replicas have identical + // timestamps, only the second replica should be + // trashed. + bal.try(c, tester{ + desired: map[string]int{"default": 1}, + current: slots{0, i, i}, + timestamps: []int64{12345678, 12345679, 12345678}, + shouldTrash: slots{i}}) + } } func (bal *balancerSuite) TestFixUnbalanced(c *check.C) { @@ -162,9 +253,10 @@ func (bal *balancerSuite) TestFixUnbalanced(c *check.C) { } func (bal *balancerSuite) TestMultipleReplicasPerService(c *check.C) { - for _, srv := range bal.srvs { + for s, srv := range bal.srvs { for i := 0; i < 3; i++ { m := *(srv.mounts[0]) + m.UUID = fmt.Sprintf("zzzzz-mount-%015x", (s<<10)+i) srv.mounts = append(srv.mounts, &m) } } @@ -238,7 +330,11 @@ func (bal *balancerSuite) TestDecreaseReplBlockTooNew(c *check.C) { bal.try(c, tester{ desired: map[string]int{"default": 2}, current: slots{0, 1, 2}, - timestamps: []int64{oldTime, newTime, newTime + 1}}) + timestamps: []int64{oldTime, newTime, newTime + 1}, + expectBlockState: &balancedBlockState{ + needed: 2, + unneeded: 1, + }}) // The best replicas are too new to delete, but the excess // replica is old enough. bal.try(c, tester{ @@ -271,104 +367,121 @@ func (bal *balancerSuite) TestVolumeReplication(c *check.C) { known: 0, desired: map[string]int{"default": 2}, current: slots{1}, - shouldPull: slots{0}}) + shouldPull: slots{0}, + expectBlockState: &balancedBlockState{ + needed: 1, + pulling: 1, + }}) bal.try(c, tester{ known: 0, desired: map[string]int{"default": 2}, current: slots{0, 1}, - shouldPull: nil}) + shouldPull: nil, + expectBlockState: &balancedBlockState{ + needed: 2, + }}) bal.try(c, tester{ known: 0, desired: map[string]int{"default": 2}, current: slots{0, 1, 2}, - shouldTrash: slots{2}}) + shouldTrash: slots{2}, + expectBlockState: &balancedBlockState{ + needed: 2, + unneeded: 1, + }}) 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}}}}) + expectBlockState: &balancedBlockState{ + needed: 3, + unneeded: 1, + pulling: 1, + }}) bal.try(c, tester{ known: 0, desired: map[string]int{"default": 3}, current: slots{0, 1, 2, 3, 4}, - shouldTrash: slots{2, 3, 4}}) + shouldTrash: slots{2, 3, 4}, + expectBlockState: &balancedBlockState{ + needed: 2, + unneeded: 3, + }}) 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}}}}) + expectBlockState: &balancedBlockState{ + needed: 3, + unneeded: 2, + }}) // 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}}}}) + expectBlockState: &balancedBlockState{ + needed: 1, + }}) bal.try(c, tester{ known: 1, desired: map[string]int{"default": 3}, current: slots{0}, - shouldPull: slots{1}}) + shouldPull: slots{1}, + expectBlockState: &balancedBlockState{ + needed: 1, + pulling: 1, + }}) bal.try(c, tester{ known: 1, desired: map[string]int{"default": 4}, current: slots{0}, - shouldPull: slots{1, 2}}) + shouldPull: slots{1, 2}, + expectBlockState: &balancedBlockState{ + needed: 1, + pulling: 2, + }}) bal.try(c, tester{ known: 1, desired: map[string]int{"default": 4}, current: slots{2}, - shouldPull: slots{0, 1}}) + shouldPull: slots{0, 1}, + expectBlockState: &balancedBlockState{ + needed: 1, + pulling: 2, + }}) 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}}}}) + expectBlockState: &balancedBlockState{ + needed: 1, + pulling: 3, + }}) 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}}) + shouldTrash: slots{3, 4}, + expectBlockState: &balancedBlockState{ + needed: 2, + unneeded: 2, + pulling: 1, + }}) 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}}}}) + expectBlockState: &balancedBlockState{ + needed: 1, + unneeded: 2, + }}) } func (bal *balancerSuite) TestDeviceRWMountedByMultipleServers(c *check.C) { @@ -405,12 +518,10 @@ func (bal *balancerSuite) TestDeviceRWMountedByMultipleServers(c *check.C) { desired: map[string]int{"default": 2}, current: slots{1, 9}, shouldPull: slots{0}, - expectResult: balanceResult{ - have: 1, - classState: map[string]balancedBlockState{"default": { - desired: 2, - surplus: -1, - unachievable: false}}}}) + expectBlockState: &balancedBlockState{ + needed: 1, + pulling: 1, + }}) // block 0 is overreplicated, but the second and third // replicas are the same replica according to DeviceID // (despite different Mtimes). Don't trash the third replica. @@ -418,12 +529,9 @@ func (bal *balancerSuite) TestDeviceRWMountedByMultipleServers(c *check.C) { known: 0, desired: map[string]int{"default": 2}, current: slots{0, 1, 9}, - expectResult: balanceResult{ - have: 2, - classState: map[string]balancedBlockState{"default": { - desired: 2, - surplus: 0, - unachievable: false}}}}) + expectBlockState: &balancedBlockState{ + needed: 2, + }}) // block 0 is overreplicated; the third and fifth replicas are // extra, but the fourth is another view of the second and // shouldn't be trashed. @@ -432,12 +540,10 @@ func (bal *balancerSuite) TestDeviceRWMountedByMultipleServers(c *check.C) { desired: map[string]int{"default": 2}, current: slots{0, 1, 5, 9, 12}, shouldTrash: slots{5, 12}, - expectResult: balanceResult{ - have: 4, - classState: map[string]balancedBlockState{"default": { - desired: 2, - surplus: 2, - unachievable: false}}}}) + expectBlockState: &balancedBlockState{ + needed: 2, + unneeded: 2, + }}) } func (bal *balancerSuite) TestChangeStorageClasses(c *check.C) { @@ -448,7 +554,7 @@ func (bal *balancerSuite) TestChangeStorageClasses(c *check.C) { bal.srvs[9].mounts = []*KeepMount{{ KeepMount: arvados.KeepMount{ Replication: 1, - StorageClasses: []string{"special"}, + StorageClasses: map[string]bool{"special": true}, UUID: "zzzzz-mount-special00000009", DeviceID: "9-special", }, @@ -456,7 +562,7 @@ func (bal *balancerSuite) TestChangeStorageClasses(c *check.C) { }, { KeepMount: arvados.KeepMount{ Replication: 1, - StorageClasses: []string{"special", "special2"}, + StorageClasses: map[string]bool{"special": true, "special2": true}, UUID: "zzzzz-mount-special20000009", DeviceID: "9-special-and-special2", }, @@ -468,7 +574,7 @@ func (bal *balancerSuite) TestChangeStorageClasses(c *check.C) { bal.srvs[13].mounts = []*KeepMount{{ KeepMount: arvados.KeepMount{ Replication: 1, - StorageClasses: []string{"special2"}, + StorageClasses: map[string]bool{"special2": true}, UUID: "zzzzz-mount-special2000000d", DeviceID: "13-special2", }, @@ -476,7 +582,7 @@ func (bal *balancerSuite) TestChangeStorageClasses(c *check.C) { }, { KeepMount: arvados.KeepMount{ Replication: 1, - StorageClasses: []string{"default"}, + StorageClasses: map[string]bool{"default": true}, UUID: "zzzzz-mount-00000000000000d", DeviceID: "13-default", }, @@ -604,20 +710,17 @@ func (bal *balancerSuite) try(c *check.C, t tester) { sort.Strings(didTrashMounts) c.Check(didTrashMounts, check.DeepEquals, t.shouldTrashMounts) } - 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.expectBlockState != nil { + c.Check(result.blockState, check.Equals, *t.expectBlockState) } - if t.expectResult.classState != nil { - c.Check(result.classState, check.DeepEquals, t.expectResult.classState) + if t.expectClassState != nil { + c.Check(result.classState, check.DeepEquals, t.expectClassState) } } // srvList returns the KeepServices, sorted in rendezvous order and // then selected by idx. For example, srvList(3, slots{0, 1, 4}) -// returns the the first-, second-, and fifth-best servers for storing +// returns the first-, second-, and fifth-best servers for storing // bal.knownBlkid(3). func (bal *balancerSuite) srvList(knownBlockID int, order slots) (srvs []*KeepService) { for _, i := range order {