projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
21406: Declare python_requires~=3.8 in all packages
[arvados.git]
/
services
/
keep-balance
/
balance_test.go
diff --git
a/services/keep-balance/balance_test.go
b/services/keep-balance/balance_test.go
index e5bdf9c023d26fd5e631820488ea28f98c3ed65f..85d4ff8b5d9f484746463260eb589109cc06660c 100644
(file)
--- a/
services/keep-balance/balance_test.go
+++ b/
services/keep-balance/balance_test.go
@@
-12,6
+12,7
@@
import (
"testing"
"time"
"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"
"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
type balancerSuite struct {
Balancer
+ config *arvados.Cluster
srvs []*KeepService
blks map[string]tester
knownRendezvous [][]int
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)
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) {
}
func (bal *balancerSuite) SetUpTest(c *check.C) {
@@
-743,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) {
// 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,
blk := &BlockState{
Replicas: bal.replList(t.known, t.current),
Desired: t.desired,
@@
-751,9
+758,6
@@
func (bal *balancerSuite) try(c *check.C, t tester) {
for i, t := range t.timestamps {
blk.Replicas[i].Mtime = t
}
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
result := bal.balanceBlock(knownBlkid(t.known), blk)
var didPull, didTrash slots