X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/f34a8d68bdd096cf1b019a9806bd1e6eba028d77..cbfdb1b66ab9c1b6e69d1c9cd589633386267177:/services/keep-balance/balance_test.go

diff --git a/services/keep-balance/balance_test.go b/services/keep-balance/balance_test.go
index f9fca1431b..85d4ff8b5d 100644
--- a/services/keep-balance/balance_test.go
+++ b/services/keep-balance/balance_test.go
@@ -12,6 +12,7 @@ import (
 	"testing"
 	"time"
 
+	"git.arvados.org/arvados.git/lib/config"
 	"git.arvados.org/arvados.git/sdk/go/arvados"
 	"git.arvados.org/arvados.git/sdk/go/ctxlog"
 	check "gopkg.in/check.v1"
@@ -26,6 +27,7 @@ var _ = check.Suite(&balancerSuite{})
 
 type balancerSuite struct {
 	Balancer
+	config          *arvados.Cluster
 	srvs            []*KeepService
 	blks            map[string]tester
 	knownRendezvous [][]int
@@ -72,6 +74,11 @@ func (bal *balancerSuite) SetUpSuite(c *check.C) {
 
 	bal.signatureTTL = 3600
 	bal.Logger = ctxlog.TestLogger(c)
+
+	cfg, err := config.NewLoader(nil, ctxlog.TestLogger(c)).Load()
+	c.Assert(err, check.Equals, nil)
+	bal.config, err = cfg.GetCluster("")
+	c.Assert(err, check.Equals, nil)
 }
 
 func (bal *balancerSuite) SetUpTest(c *check.C) {
@@ -87,6 +94,8 @@ func (bal *balancerSuite) SetUpTest(c *check.C) {
 			KeepMount: arvados.KeepMount{
 				UUID:           fmt.Sprintf("zzzzz-mount-%015x", i),
 				StorageClasses: map[string]bool{"default": true},
+				AllowWrite:     true,
+				AllowTrash:     true,
 			},
 			KeepService: srv,
 		}}
@@ -153,15 +162,53 @@ func (bal *balancerSuite) TestSkipReadonly(c *check.C) {
 		}})
 }
 
+func (bal *balancerSuite) TestAllowTrashWhenReadOnly(c *check.C) {
+	srvs := bal.srvList(0, slots{3})
+	srvs[0].mounts[0].KeepMount.AllowWrite = false
+	srvs[0].mounts[0].KeepMount.AllowTrash = true
+	// can't pull to slot 3, so pull to slot 4 instead
+	bal.try(c, tester{
+		desired:    map[string]int{"default": 4},
+		current:    slots{0, 1},
+		shouldPull: slots{2, 4},
+		expectBlockState: &balancedBlockState{
+			needed:  2,
+			pulling: 2,
+		}})
+	// expect to be able to trash slot 3 in future, so pull to
+	// slot 1
+	bal.try(c, tester{
+		desired:    map[string]int{"default": 2},
+		current:    slots{0, 3},
+		shouldPull: slots{1},
+		expectBlockState: &balancedBlockState{
+			needed:  2,
+			pulling: 1,
+		}})
+	// trash excess from slot 3
+	bal.try(c, tester{
+		desired:     map[string]int{"default": 2},
+		current:     slots{0, 1, 3},
+		shouldTrash: slots{3},
+		expectBlockState: &balancedBlockState{
+			needed:   2,
+			unneeded: 1,
+		}})
+}
+
 func (bal *balancerSuite) TestMultipleViewsReadOnly(c *check.C) {
-	bal.testMultipleViews(c, true)
+	bal.testMultipleViews(c, false, false)
+}
+
+func (bal *balancerSuite) TestMultipleViewsReadOnlyAllowTrash(c *check.C) {
+	bal.testMultipleViews(c, false, true)
 }
 
 func (bal *balancerSuite) TestMultipleViews(c *check.C) {
-	bal.testMultipleViews(c, false)
+	bal.testMultipleViews(c, true, true)
 }
 
-func (bal *balancerSuite) testMultipleViews(c *check.C, readonly bool) {
+func (bal *balancerSuite) testMultipleViews(c *check.C, allowWrite, allowTrash 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)
@@ -169,7 +216,8 @@ func (bal *balancerSuite) testMultipleViews(c *check.C, readonly bool) {
 			KeepMount: arvados.KeepMount{
 				DeviceID:       bal.srvs[(i+1)%len(bal.srvs)].mounts[0].KeepMount.DeviceID,
 				UUID:           bal.srvs[(i+1)%len(bal.srvs)].mounts[0].KeepMount.UUID,
-				ReadOnly:       readonly,
+				AllowWrite:     allowWrite,
+				AllowTrash:     allowTrash,
 				Replication:    1,
 				StorageClasses: map[string]bool{"default": true},
 			},
@@ -188,11 +236,12 @@ func (bal *balancerSuite) testMultipleViews(c *check.C, readonly bool) {
 				desired:     map[string]int{"default": 1},
 				current:     slots{0, i, i},
 				shouldTrash: slots{i}})
-		} else if readonly {
+		} else if !allowTrash {
 			// 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.
+			// read-only mount (with
+			// AllowTrashWhenReadOnly=false), so the first
+			// two replicas should be trashed.
 			bal.try(c, tester{
 				desired:     map[string]int{"default": 1},
 				current:     slots{0, i, i},
@@ -374,7 +423,7 @@ func (bal *balancerSuite) TestDecreaseReplBlockTooNew(c *check.C) {
 }
 
 func (bal *balancerSuite) TestCleanupMounts(c *check.C) {
-	bal.srvs[3].mounts[0].KeepMount.ReadOnly = true
+	bal.srvs[3].mounts[0].KeepMount.AllowWrite = false
 	bal.srvs[3].mounts[0].KeepMount.DeviceID = "abcdef"
 	bal.srvs[14].mounts[0].KeepMount.UUID = bal.srvs[3].mounts[0].KeepMount.UUID
 	bal.srvs[14].mounts[0].KeepMount.DeviceID = "abcdef"
@@ -583,6 +632,8 @@ func (bal *balancerSuite) TestChangeStorageClasses(c *check.C) {
 	// classes=[special,special2].
 	bal.srvs[9].mounts = []*KeepMount{{
 		KeepMount: arvados.KeepMount{
+			AllowWrite:     true,
+			AllowTrash:     true,
 			Replication:    1,
 			StorageClasses: map[string]bool{"special": true},
 			UUID:           "zzzzz-mount-special00000009",
@@ -591,6 +642,8 @@ func (bal *balancerSuite) TestChangeStorageClasses(c *check.C) {
 		KeepService: bal.srvs[9],
 	}, {
 		KeepMount: arvados.KeepMount{
+			AllowWrite:     true,
+			AllowTrash:     true,
 			Replication:    1,
 			StorageClasses: map[string]bool{"special": true, "special2": true},
 			UUID:           "zzzzz-mount-special20000009",
@@ -603,6 +656,8 @@ func (bal *balancerSuite) TestChangeStorageClasses(c *check.C) {
 	// classes=[special3], one with classes=[default].
 	bal.srvs[13].mounts = []*KeepMount{{
 		KeepMount: arvados.KeepMount{
+			AllowWrite:     true,
+			AllowTrash:     true,
 			Replication:    1,
 			StorageClasses: map[string]bool{"special2": true},
 			UUID:           "zzzzz-mount-special2000000d",
@@ -611,6 +666,8 @@ func (bal *balancerSuite) TestChangeStorageClasses(c *check.C) {
 		KeepService: bal.srvs[13],
 	}, {
 		KeepMount: arvados.KeepMount{
+			AllowWrite:     true,
+			AllowTrash:     true,
 			Replication:    1,
 			StorageClasses: map[string]bool{"default": true},
 			UUID:           "zzzzz-mount-00000000000000d",
@@ -693,7 +750,7 @@ func (bal *balancerSuite) TestChangeStorageClasses(c *check.C) {
 // the appropriate changes for that block have been added to the
 // changesets.
 func (bal *balancerSuite) try(c *check.C, t tester) {
-	bal.setupLookupTables()
+	bal.setupLookupTables(bal.config)
 	blk := &BlockState{
 		Replicas: bal.replList(t.known, t.current),
 		Desired:  t.desired,
@@ -701,9 +758,6 @@ func (bal *balancerSuite) try(c *check.C, t tester) {
 	for i, t := range t.timestamps {
 		blk.Replicas[i].Mtime = t
 	}
-	for _, srv := range bal.srvs {
-		srv.ChangeSet = &ChangeSet{}
-	}
 	result := bal.balanceBlock(knownBlkid(t.known), blk)
 
 	var didPull, didTrash slots