X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/da83807d6bcef1c1f0bb78479c5ec17f150f5eda..9251549928dd5206d4a14e5f9811caa66aa64c65:/services/keep-balance/balance_run_test.go diff --git a/services/keep-balance/balance_run_test.go b/services/keep-balance/balance_run_test.go index 962bd40ade..fefd2c6c1b 100644 --- a/services/keep-balance/balance_run_test.go +++ b/services/keep-balance/balance_run_test.go @@ -15,6 +15,7 @@ import ( "os" "strings" "sync" + "syscall" "time" "git.arvados.org/arvados.git/lib/config" @@ -396,9 +397,7 @@ func (s *runSuite) TestRefuseZeroCollections(c *check.C) { _, err := s.db.Exec(`delete from collections`) c.Assert(err, check.IsNil) opts := RunOptions{ - CommitPulls: true, - CommitTrash: true, - Logger: ctxlog.TestLogger(c), + Logger: ctxlog.TestLogger(c), } s.stub.serveCurrentUserAdmin() s.stub.serveZeroCollections() @@ -416,8 +415,6 @@ func (s *runSuite) TestRefuseZeroCollections(c *check.C) { func (s *runSuite) TestRefuseBadIndex(c *check.C) { opts := RunOptions{ - CommitPulls: true, - CommitTrash: true, ChunkPrefix: "abc", Logger: ctxlog.TestLogger(c), } @@ -439,9 +436,7 @@ func (s *runSuite) TestRefuseBadIndex(c *check.C) { func (s *runSuite) TestRefuseNonAdmin(c *check.C) { opts := RunOptions{ - CommitPulls: true, - CommitTrash: true, - Logger: ctxlog.TestLogger(c), + Logger: ctxlog.TestLogger(c), } s.stub.serveCurrentUserNotAdmin() s.stub.serveZeroCollections() @@ -468,8 +463,6 @@ func (s *runSuite) TestInvalidChunkPrefix(c *check.C) { s.SetUpTest(c) c.Logf("trying invalid prefix %q", trial.prefix) opts := RunOptions{ - CommitPulls: true, - CommitTrash: true, ChunkPrefix: trial.prefix, Logger: ctxlog.TestLogger(c), } @@ -489,9 +482,7 @@ func (s *runSuite) TestInvalidChunkPrefix(c *check.C) { func (s *runSuite) TestRefuseSameDeviceDifferentVolumes(c *check.C) { opts := RunOptions{ - CommitPulls: true, - CommitTrash: true, - Logger: ctxlog.TestLogger(c), + Logger: ctxlog.TestLogger(c), } s.stub.serveCurrentUserAdmin() s.stub.serveZeroCollections() @@ -519,9 +510,7 @@ func (s *runSuite) TestWriteLostBlocks(c *check.C) { s.config.Collections.BlobMissingReport = lostf.Name() defer os.Remove(lostf.Name()) opts := RunOptions{ - CommitPulls: true, - CommitTrash: true, - Logger: ctxlog.TestLogger(c), + Logger: ctxlog.TestLogger(c), } s.stub.serveCurrentUserAdmin() s.stub.serveFooBarFileCollections() @@ -540,10 +529,10 @@ func (s *runSuite) TestWriteLostBlocks(c *check.C) { } func (s *runSuite) TestDryRun(c *check.C) { + s.config.Collections.BalanceTrashLimit = 0 + s.config.Collections.BalancePullLimit = 0 opts := RunOptions{ - CommitPulls: false, - CommitTrash: false, - Logger: ctxlog.TestLogger(c), + Logger: ctxlog.TestLogger(c), } s.stub.serveCurrentUserAdmin() collReqs := s.stub.serveFooBarFileCollections() @@ -561,7 +550,10 @@ func (s *runSuite) TestDryRun(c *check.C) { } c.Check(trashReqs.Count(), check.Equals, 0) c.Check(pullReqs.Count(), check.Equals, 0) - c.Check(bal.stats.pulls, check.Not(check.Equals), 0) + c.Check(bal.stats.pulls, check.Equals, 0) + c.Check(bal.stats.pullsDeferred, check.Not(check.Equals), 0) + c.Check(bal.stats.trashes, check.Equals, 0) + c.Check(bal.stats.trashesDeferred, check.Not(check.Equals), 0) c.Check(bal.stats.underrep.replicas, check.Not(check.Equals), 0) c.Check(bal.stats.overrep.replicas, check.Not(check.Equals), 0) } @@ -570,10 +562,8 @@ func (s *runSuite) TestCommit(c *check.C) { s.config.Collections.BlobMissingReport = c.MkDir() + "/keep-balance-lost-blocks-test-" s.config.ManagementToken = "xyzzy" opts := RunOptions{ - CommitPulls: true, - CommitTrash: true, - Logger: ctxlog.TestLogger(c), - Dumper: ctxlog.TestLogger(c), + Logger: ctxlog.TestLogger(c), + Dumper: ctxlog.TestLogger(c), } s.stub.serveCurrentUserAdmin() s.stub.serveFooBarFileCollections() @@ -608,8 +598,6 @@ func (s *runSuite) TestCommit(c *check.C) { func (s *runSuite) TestChunkPrefix(c *check.C) { s.config.Collections.BlobMissingReport = c.MkDir() + "/keep-balance-lost-blocks-test-" opts := RunOptions{ - CommitPulls: true, - CommitTrash: true, ChunkPrefix: "ac", // catch "foo" but not "bar" Logger: ctxlog.TestLogger(c), Dumper: ctxlog.TestLogger(c), @@ -639,10 +627,8 @@ func (s *runSuite) TestChunkPrefix(c *check.C) { func (s *runSuite) TestRunForever(c *check.C) { s.config.ManagementToken = "xyzzy" opts := RunOptions{ - CommitPulls: true, - CommitTrash: true, - Logger: ctxlog.TestLogger(c), - Dumper: ctxlog.TestLogger(c), + Logger: ctxlog.TestLogger(c), + Dumper: ctxlog.TestLogger(c), } s.stub.serveCurrentUserAdmin() s.stub.serveFooBarFileCollections() @@ -654,7 +640,7 @@ func (s *runSuite) TestRunForever(c *check.C) { ctx, cancel := context.WithCancel(context.Background()) defer cancel() - s.config.Collections.BalancePeriod = arvados.Duration(time.Millisecond) + s.config.Collections.BalancePeriod = arvados.Duration(100 * time.Millisecond) srv := s.newServer(&opts) done := make(chan bool) @@ -663,14 +649,34 @@ func (s *runSuite) TestRunForever(c *check.C) { close(done) }() + procself, err := os.FindProcess(os.Getpid()) + c.Assert(err, check.IsNil) + // Each run should send 4 pull lists + 4 trash lists. The // first run should also send 4 empty trash lists at // startup. We should complete all four runs in much less than // a second. + completedRuns := 0 for t0 := time.Now(); time.Since(t0) < 10*time.Second; { - if pullReqs.Count() >= 16 && trashReqs.Count() == pullReqs.Count()+4 { + pulls := pullReqs.Count() + if pulls >= 16 && trashReqs.Count() == pulls+4 { break } + if pulls > 4 { + // Once the 2nd run has started automatically + // (indicating that our BalancePeriod is + // working) we switch to a long wait time to + // effectively stop the timed runs, and + // instead start sending a single SIGUSR1 at + // the end of each (2nd or 3rd) run, to ensure + // we get exactly 4 runs in total. + srv.Cluster.Collections.BalancePeriod = arvados.Duration(time.Minute) + if pulls%4 == 0 && pulls <= 12 && pulls/4 > completedRuns { + completedRuns = pulls / 4 + c.Logf("completed run %d, sending SIGUSR1 to trigger next run", completedRuns) + procself.Signal(syscall.SIGUSR1) + } + } time.Sleep(time.Millisecond) } cancel()