"text/template"
"time"
- "git.curoverse.com/arvados.git/sdk/go/arvados"
- "git.curoverse.com/arvados.git/sdk/go/arvadostest"
+ "git.arvados.org/arvados.git/sdk/go/arvados"
+ "git.arvados.org/arvados.git/sdk/go/arvadostest"
check "gopkg.in/check.v1"
)
var _ = check.Suite(&KeepstoreMigrationSuite{})
func (s *KeepstoreMigrationSuite) SetUpSuite(c *check.C) {
+ os.Setenv("ARVADOS_API_HOST", os.Getenv("ARVADOS_TEST_API_HOST"))
+ os.Setenv("ARVADOS_API_HOST_INSECURE", "1")
+ os.Setenv("ARVADOS_API_TOKEN", arvadostest.AdminToken)
+
// We don't need the keepstore servers, but we do need
// keep_services listings that point to localhost, rather than
// the apiserver fixtures that point to fictional hosts
c.Assert(err, check.IsNil)
s.checkEquivalentWithKeepstoreConfig(c, `
-Listen: ":12345"
+Listen: ":25107"
Debug: true
LogFormat: text
MaxBuffers: 1234
MaxRequests: 2345
BlobSignatureTTL: 123m
BlobSigningKeyFile: `+keyfile.Name()+`
+Volumes:
+- Type: Directory
+ Root: /tmp
`, `
Clusters:
z1111:
- {}
+ SystemRootToken: `+arvadostest.AdminToken+`
+ TLS: {Insecure: true}
+ Services:
+ Controller:
+ ExternalURL: "https://`+os.Getenv("ARVADOS_API_HOST")+`/"
`, `
Clusters:
z1111:
+ SystemRootToken: `+arvadostest.AdminToken+`
+ TLS: {Insecure: true}
Services:
Keepstore:
InternalURLs:
- "http://`+hostname+`:12345": {}
+ "http://`+hostname+`:25107": {Rendezvous: `+s.ksByPort[25107].UUID[12:]+`}
+ Controller:
+ ExternalURL: "https://`+os.Getenv("ARVADOS_API_HOST")+`/"
SystemLogs:
Format: text
LogLevel: debug
API:
- MaxKeepBlockBuffers: 1234
+ MaxKeepBlobBuffers: 1234
MaxConcurrentRequests: 2345
Collections:
BlobSigningTTL: 123m
BlobSigningKey: blobsigningkey
+ Volumes:
+ z1111-nyw5e-`+s.ksByPort[25107].UUID[12:]+`:
+ AccessViaHosts:
+ "http://`+hostname+`:25107":
+ ReadOnly: false
+ Driver: Directory
+ DriverParameters:
+ Root: /tmp
+ Serialize: false
+ ReadOnly: false
+ Replication: 1
+ StorageClasses: {}
`)
}
Driver: "S3",
Replication: 4,
}, &arvados.S3VolumeDriverParameters{
- AccessKey: "accesskeydata",
- SecretKey: "secretkeydata",
+ AccessKeyID: "accesskeydata",
+ SecretAccessKey: "secretkeydata",
Endpoint: "https://storage.googleapis.com",
Region: "us-east-1z",
Bucket: "testbucket",
ReadOnly: true
StorageAccountName: storageacctname
StorageAccountKeyFile: `+secretkeyfile.Name()+`
- StorageBaseURL: https://example.example
+ StorageBaseURL: https://example.example/
ContainerName: testctr
LocationConstraint: true
AzureReplication: 4
}, &arvados.AzureVolumeDriverParameters{
StorageAccountName: "storageacctname",
StorageAccountKey: "secretkeydata",
- StorageBaseURL: "https://example.example",
+ StorageBaseURL: "https://example.example/",
ContainerName: "testctr",
RequestTimeout: arvados.Duration(time.Minute * 3),
ListBlobsRetryDelay: arvados.Duration(time.Minute * 4),
c.Check(v.Driver, check.Equals, expectvol.Driver)
c.Check(v.Replication, check.Equals, expectvol.Replication)
- avh, ok := v.AccessViaHosts[arvados.URL{Scheme: "http", Host: hostname + ":12345"}]
+ avh, ok := v.AccessViaHosts[arvados.URL{Scheme: "http", Host: hostname + ":12345", Path: "/"}]
c.Check(ok, check.Equals, true)
c.Check(avh.ReadOnly, check.Equals, expectvol.ReadOnly)
url := arvados.URL{
Scheme: "http",
Host: fmt.Sprintf("%s:%d", hostname, port),
+ Path: "/",
}
_, ok := before["zzzzz-nyw5e-readonlyonother"].AccessViaHosts[url]
c.Check(ok, check.Equals, false)
url := arvados.URL{
Scheme: "http",
Host: fmt.Sprintf("%s:%d", hostname, port),
+ Path: "/",
}
_, ok := before["zzzzz-nyw5e-writableonother"].AccessViaHosts[url]
c.Check(ok, check.Equals, false)
hostname, err := os.Hostname()
c.Assert(err, check.IsNil)
- _, ok := newvol.AccessViaHosts[arvados.URL{Scheme: "http", Host: fmt.Sprintf("%s:%d", hostname, port)}]
+ _, ok := newvol.AccessViaHosts[arvados.URL{Scheme: "http", Host: fmt.Sprintf("%s:%d", hostname, port), Path: "/"}]
c.Check(ok, check.Equals, true)
}
+// Ensure logs mention unmigrated servers.
+func (s *KeepstoreMigrationSuite) TestPendingKeepstoreMigrations(c *check.C) {
+ client := arvados.NewClientFromEnv()
+ for _, host := range []string{"keep0", "keep1"} {
+ err := client.RequestAndDecode(new(struct{}), "POST", "arvados/v1/keep_services", nil, map[string]interface{}{
+ "keep_service": map[string]interface{}{
+ "service_type": "disk",
+ "service_host": host + ".zzzzz.example.com",
+ "service_port": 25107,
+ },
+ })
+ c.Assert(err, check.IsNil)
+ }
+
+ port, _ := s.getTestKeepstorePortAndMatchingVolumeUUID(c)
+ logs := s.logsWithKeepstoreConfig(c, `
+Listen: :`+strconv.Itoa(port)+`
+Volumes:
+- Type: S3
+ Endpoint: https://storage.googleapis.com
+ Bucket: foo
+`)
+ c.Check(logs, check.Matches, `(?ms).*you should remove the legacy keepstore config file.*`)
+ c.Check(logs, check.Matches, `(?ms).*you should migrate the legacy keepstore configuration file on host keep1.zzzzz.example.com.*`)
+ c.Check(logs, check.Not(check.Matches), `(?ms).*should migrate.*keep0.zzzzz.example.com.*`)
+ c.Check(logs, check.Matches, `(?ms).*keepstore configured at http://keep2.zzzzz.example.com:25107/ does not have access to any volumes.*`)
+ c.Check(logs, check.Matches, `(?ms).*Volumes.zzzzz-nyw5e-possconfigerror.AccessViaHosts refers to nonexistent keepstore server http://keep00.zzzzz.example.com:25107.*`)
+}
+
const clusterConfigForKeepstoreMigrationTest = `
Clusters:
zzzzz:
Keepstore:
InternalURLs:
"http://{{.hostname}}:12345": {}
+ "http://keep0.zzzzz.example.com:25107": {}
+ "http://keep2.zzzzz.example.com:25107": {}
Controller:
ExternalURL: "https://{{.controller}}"
TLS:
zzzzz-nyw5e-readonlyonother:
AccessViaHosts:
- "http://other.host.example:12345": {ReadOnly: true}
+ "http://keep0.zzzzz.example.com:25107": {ReadOnly: true}
Driver: S3
DriverParameters:
Endpoint: https://storage.googleapis.com
zzzzz-nyw5e-writableonother:
AccessViaHosts:
- "http://other.host.example:12345": {}
+ "http://keep0.zzzzz.example.com:25107": {}
Driver: S3
DriverParameters:
Endpoint: https://storage.googleapis.com
Replication: 3
zzzzz-nyw5e-localfilesystem:
+ AccessViaHosts:
+ "http://keep0.zzzzz.example.com:25107": {}
Driver: Directory
DriverParameters:
Root: /data/sdd
DriverParameters:
Root: /data/sde
Replication: 1
+
+ zzzzz-nyw5e-possconfigerror:
+ AccessViaHosts:
+ "http://keep00.zzzzz.example.com:25107": {}
+ Driver: Directory
+ DriverParameters:
+ Root: /data/sdf
+ Replication: 1
`
// Determine the effect of combining the given legacy keepstore config
// YAML (just the "Volumes" entries of an old keepstore config file)
// with the example clusterConfigForKeepstoreMigrationTest config.
//
-// Return two Volumes configs -- one without loading
-// keepstoreconfigdata ("before") and one with ("after") -- for the
-// caller to compare.
-func (s *KeepstoreMigrationSuite) loadWithKeepstoreConfig(c *check.C, keepstoreVolumesYAML string) (before, after map[string]arvados.Volume) {
+// Return two Volumes configs -- one without loading keepstoreYAML
+// ("before") and one with ("after") -- for the caller to compare.
+func (s *KeepstoreMigrationSuite) loadWithKeepstoreConfig(c *check.C, keepstoreYAML string) (before, after map[string]arvados.Volume) {
ldr := testLoader(c, s.clusterConfigYAML(c), nil)
cBefore, err := ldr.Load()
c.Assert(err, check.IsNil)
keepstoreconfig, err := ioutil.TempFile("", "")
c.Assert(err, check.IsNil)
defer os.Remove(keepstoreconfig.Name())
- io.WriteString(keepstoreconfig, keepstoreVolumesYAML)
+ io.WriteString(keepstoreconfig, keepstoreYAML)
ldr = testLoader(c, s.clusterConfigYAML(c), nil)
ldr.KeepstorePath = keepstoreconfig.Name()
return cBefore.Clusters["zzzzz"].Volumes, cAfter.Clusters["zzzzz"].Volumes
}
+// Return the log messages emitted when loading keepstoreYAML along
+// with clusterConfigForKeepstoreMigrationTest.
+func (s *KeepstoreMigrationSuite) logsWithKeepstoreConfig(c *check.C, keepstoreYAML string) string {
+ var logs bytes.Buffer
+
+ keepstoreconfig, err := ioutil.TempFile("", "")
+ c.Assert(err, check.IsNil)
+ defer os.Remove(keepstoreconfig.Name())
+ io.WriteString(keepstoreconfig, keepstoreYAML)
+
+ ldr := testLoader(c, s.clusterConfigYAML(c), &logs)
+ ldr.KeepstorePath = keepstoreconfig.Name()
+ _, err = ldr.Load()
+ c.Assert(err, check.IsNil)
+
+ return logs.String()
+}
+
func (s *KeepstoreMigrationSuite) clusterConfigYAML(c *check.C) string {
hostname, err := os.Hostname()
c.Assert(err, check.IsNil)
projects / arvados.git / blobdiff