[ARVADOS] updated: 80c3b98907b68a9ca8b54fae84c1a6e96817c809
git at public.curoverse.com
git at public.curoverse.com
Wed Mar 11 10:26:33 EDT 2015
Summary of changes:
sdk/go/keepclient/keepclient.go | 2 +-
sdk/go/keepclient/support.go | 6 +-
services/keepstore/pull_worker_integration_test.go | 103 ++++-----------------
3 files changed, 23 insertions(+), 88 deletions(-)
via 80c3b98907b68a9ca8b54fae84c1a6e96817c809 (commit)
from 6a983720b3d1ee8e613bf3902e69fd14f505b995 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
commit 80c3b98907b68a9ca8b54fae84c1a6e96817c809
Author: Radhika Chippada <radhika at curoverse.com>
Date: Wed Mar 11 10:13:57 2015 -0400
3761: Expand DiscoverKeepServers method to return service_roots and use it in test
diff --git a/sdk/go/keepclient/keepclient.go b/sdk/go/keepclient/keepclient.go
index b81e070..0869d3d 100644
--- a/sdk/go/keepclient/keepclient.go
+++ b/sdk/go/keepclient/keepclient.go
@@ -50,7 +50,7 @@ func MakeKeepClient(arv *arvadosclient.ArvadosClient) (kc KeepClient, err error)
Using_proxy: false,
Client: &http.Client{},
}
- err = (&kc).DiscoverKeepServers()
+ _, err = (&kc).DiscoverKeepServers()
return kc, err
}
diff --git a/sdk/go/keepclient/support.go b/sdk/go/keepclient/support.go
index 9db6ebc..940a110 100644
--- a/sdk/go/keepclient/support.go
+++ b/sdk/go/keepclient/support.go
@@ -76,7 +76,7 @@ func (this *KeepClient) setClientSettingsStore() {
}
}
-func (this *KeepClient) DiscoverKeepServers() error {
+func (this *KeepClient) DiscoverKeepServers() (map[string]string, error) {
type svcList struct {
Items []keepDisk `json:"items"`
}
@@ -86,7 +86,7 @@ func (this *KeepClient) DiscoverKeepServers() error {
if err != nil {
if err := this.Arvados.List("keep_disks", nil, &m); err != nil {
- return err
+ return nil, err
}
}
@@ -121,7 +121,7 @@ func (this *KeepClient) DiscoverKeepServers() error {
this.SetServiceRoots(service_roots)
- return nil
+ return service_roots, nil
}
type uploadStatus struct {
diff --git a/services/keepstore/pull_worker_integration_test.go b/services/keepstore/pull_worker_integration_test.go
index 2c307e4..b293cf9 100644
--- a/services/keepstore/pull_worker_integration_test.go
+++ b/services/keepstore/pull_worker_integration_test.go
@@ -1,9 +1,6 @@
package main
import (
- "crypto/tls"
- "encoding/json"
- "fmt"
"git.curoverse.com/arvados.git/sdk/go/arvadosclient"
"git.curoverse.com/arvados.git/sdk/go/arvadostest"
"git.curoverse.com/arvados.git/sdk/go/keepclient"
@@ -25,34 +22,37 @@ type PullWorkIntegrationTestData struct {
func SetupPullWorkerIntegrationTest(t *testing.T, testData PullWorkIntegrationTestData, wantData bool) PullRequest {
os.Setenv("ARVADOS_API_HOST_INSECURE", "true")
+ // start api and keep servers
arvadostest.StartAPI()
arvadostest.StartKeep()
+ // make arvadosclient
arv, err := arvadosclient.MakeArvadosClient()
if err != nil {
t.Error("Error creating arv")
}
- servers := GetKeepServices(t)
+ // keep client
+ keepClient = keepclient.KeepClient{
+ Arvados: &arv,
+ Want_replicas: 1,
+ Using_proxy: true,
+ Client: &http.Client{},
+ }
- random_token := GenerateRandomApiToken()
+ // discover keep services
+ var servers []string
+ service_roots, err := keepClient.DiscoverKeepServers()
+ if err != nil {
+ t.Error("Error discovering keep services")
+ }
+ for _, host := range service_roots {
+ servers = append(servers, host)
+ }
// Put content if the test needs it
if wantData {
- keepClient = keepclient.KeepClient{
- Arvados: &arv,
- Want_replicas: 1,
- Using_proxy: true,
- Client: &http.Client{},
- }
- keepClient.Arvados.ApiToken = random_token
-
- service_roots := make(map[string]string)
- for _, addr := range servers {
- service_roots[addr] = addr
- }
keepClient.SetServiceRoots(service_roots)
-
locator, _, err := keepClient.PutB([]byte(testData.Content))
if err != nil {
t.Errorf("Error putting test data in setup for %s %s %v", testData.Content, locator, err)
@@ -63,14 +63,6 @@ func SetupPullWorkerIntegrationTest(t *testing.T, testData PullWorkIntegrationTe
}
// Create pullRequest for the test
- keepClient = keepclient.KeepClient{
- Arvados: &arv,
- Want_replicas: 1,
- Using_proxy: true,
- Client: &http.Client{},
- }
- keepClient.Arvados.ApiToken = random_token
-
pullRequest := PullRequest{
Locator: testData.Locator,
Servers: servers,
@@ -78,64 +70,6 @@ func SetupPullWorkerIntegrationTest(t *testing.T, testData PullWorkIntegrationTe
return pullRequest
}
-func GetKeepServices(t *testing.T) []string {
- client := &http.Client{Transport: &http.Transport{
- TLSClientConfig: &tls.Config{InsecureSkipVerify: true}}}
-
- req, err := http.NewRequest("GET", fmt.Sprintf("https://%s/arvados/v1/keep_services", os.Getenv("ARVADOS_API_HOST")), nil)
- if err != nil {
- t.Errorf("Error getting keep services: ", err)
- }
- req.Header.Set("Authorization", fmt.Sprintf("OAuth2 %s", os.Getenv("ARVADOS_API_TOKEN")))
-
- resp, err := client.Do(req)
- if err != nil {
- t.Errorf("Error getting keep services: ", err)
- }
- if resp.StatusCode != 200 {
- t.Errorf("Error status code getting keep services", resp.StatusCode)
- }
-
- defer resp.Body.Close()
- var servers []string
-
- decoder := json.NewDecoder(resp.Body)
-
- var respJSON map[string]interface{}
- err = decoder.Decode(&respJSON)
- if err != nil {
- t.Errorf("Error decoding response for keep services: ", err)
- }
-
- var service_names []string
- var service_ports []string
- for _, v1 := range respJSON {
- switch v1_type := v1.(type) {
- case []interface{}:
- for _, v2 := range v1_type {
- switch v2_type := v2.(type) {
- case map[string]interface{}:
- for name, value := range v2_type {
- if name == "service_host" {
- service_names = append(service_names, fmt.Sprintf("%s", value))
- } else if name == "service_port" {
- service_ports = append(service_ports, strings.Split(fmt.Sprintf("%f", value), ".")[0])
- }
- }
- default:
- }
- }
- default:
- }
- }
-
- for i, port := range service_ports {
- servers = append(servers, "http://"+service_names[i]+":"+port)
- }
-
- return servers
-}
-
// Do a get on a block that is not existing in any of the keep servers.
// Expect "block not found" error.
func TestPullWorkerIntegration_GetNonExistingLocator(t *testing.T) {
@@ -179,6 +113,7 @@ func performPullWorkerIntegrationTest(testData PullWorkIntegrationTestData, pull
return
}
+ keepClient.Arvados.ApiToken = GenerateRandomApiToken()
err := PullItemAndProcess(pullRequest, keepClient.Arvados.ApiToken, keepClient)
if len(testData.GetError) > 0 {
-----------------------------------------------------------------------
hooks/post-receive
--
More information about the arvados-commits
mailing list