[ARVADOS] updated: 2b20a0ec9a32abfd85c09474e044cfd4c09f4963
git at public.curoverse.com
git at public.curoverse.com
Fri Sep 25 08:28:15 EDT 2015
Summary of changes:
docker/jobs/Dockerfile | 2 +-
sdk/go/keepclient/keepclient.go | 6 +-
sdk/go/keepclient/support.go | 19 ++--
sdk/python/arvados/arvfile.py | 20 ++--
sdk/python/tests/test_arvfile.py | 15 +++
services/keepstore/collision.go | 2 +-
.../keepstore/handlers_with_generic_volume_test.go | 119 +++++++++++++++++++++
services/keepstore/keepstore.go | 6 +-
services/keepstore/keepstore_test.go | 4 +
services/keepstore/mock_mutex_for_test.go | 6 +-
services/keepstore/volume_generic_test.go | 81 ++++++++------
services/keepstore/volume_unix.go | 7 ++
services/keepstore/volume_unix_test.go | 16 +++
13 files changed, 241 insertions(+), 62 deletions(-)
create mode 100644 services/keepstore/handlers_with_generic_volume_test.go
via 2b20a0ec9a32abfd85c09474e044cfd4c09f4963 (commit)
via c21c6330cc8a3c8cc96d83ff9a315fe10dff7c8f (commit)
via 9db403a87830f7afec86dae5bb279cf87df8fd0e (commit)
via 67f730557e062608f842fa3abc612fb717fbce2f (commit)
via 33596fce13c3bd5c368f5efeb89d625f684a622d (commit)
via e668f9e2424cb1224b540865374b12fa9e1e3a8f (commit)
via 127c47f949fb71738186b2ae7b98adfd4bdef25e (commit)
via fdbf2ead3452bf7c8ba8f3f275cf486339b5406e (commit)
via 501325d396c1ac30637b5a48ecda17f77cd73206 (commit)
via a3e32a2f4a702c076d46a5b19305dd20a1ee3012 (commit)
via 009c08b43affdefa6f2825059a971c750b90e222 (commit)
via 43748be08c5d67171cb2f5565670dd0eef889b07 (commit)
via 87892d98eac028934480c378748cfb65a780d1cc (commit)
via d4f15342fcaabb0bec0165b2abdf040c88c08229 (commit)
via 16edd7c54ac58cda991d3e9f0a1b48cea3dd985c (commit)
via b16358fa5145d3d4bcd0ac37bd81d7605eac040f (commit)
via 0fc6e0671e822cd4c5671519c7e7c58cff06c91f (commit)
via 783a6278efb607b201df2781942a0b1c6a385929 (commit)
via 67c6f66d2b954f1f0f887011b7b6d5153b2d7bf1 (commit)
via 9bd1f604e8f5ad0dd33b4501c535d9915924e8bd (commit)
via c447d4a79f653bbf2c172a0a715d30db896a4a32 (commit)
from 7fdfbc3eae8de4fe7f6912c160e408ef57a89487 (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 2b20a0ec9a32abfd85c09474e044cfd4c09f4963
Author: radhika <radhika at curoverse.com>
Date: Fri Sep 25 08:28:04 2015 -0400
7162: updated comment
diff --git a/sdk/go/keepclient/support.go b/sdk/go/keepclient/support.go
index df02d22..ee308dd 100644
--- a/sdk/go/keepclient/support.go
+++ b/sdk/go/keepclient/support.go
@@ -98,7 +98,8 @@ func (this *KeepClient) DiscoverKeepServers() error {
gatewayRoots := make(map[string]string)
writableLocalRoots := make(map[string]string)
- this.replicasPerService = 1 // set to 1 until writable non-disk services are found
+ // replicasPerService is 1 for disks; unknown or unlimited otherwise
+ this.replicasPerService = 1
this.Using_proxy = false
for _, service := range m.Items {
commit c21c6330cc8a3c8cc96d83ff9a315fe10dff7c8f
Author: radhika <radhika at curoverse.com>
Date: Thu Sep 24 16:25:37 2015 -0400
7162: move replicasPerThread logic outside the for loop.
diff --git a/sdk/go/keepclient/support.go b/sdk/go/keepclient/support.go
index 0cedc5e..df02d22 100644
--- a/sdk/go/keepclient/support.go
+++ b/sdk/go/keepclient/support.go
@@ -236,13 +236,13 @@ func (this KeepClient) putReplicas(
// Desired number of replicas
remaining_replicas := this.Want_replicas
- for remaining_replicas > 0 {
- replicasPerThread := this.replicasPerService
- if replicasPerThread < 1 {
- // unlimited or unknown
- replicasPerThread = remaining_replicas
- }
+ replicasPerThread := this.replicasPerService
+ if replicasPerThread < 1 {
+ // unlimited or unknown
+ replicasPerThread = remaining_replicas
+ }
+ for remaining_replicas > 0 {
for active*replicasPerThread < remaining_replicas {
// Start some upload requests
if next_server < len(sv) {
commit 9db403a87830f7afec86dae5bb279cf87df8fd0e
Author: radhika <radhika at curoverse.com>
Date: Thu Sep 24 15:22:15 2015 -0400
7162: SetServiceRoots keepproxy hints only (revert my update).
diff --git a/sdk/go/keepclient/keepclient.go b/sdk/go/keepclient/keepclient.go
index 2d18ec9..70aa374 100644
--- a/sdk/go/keepclient/keepclient.go
+++ b/sdk/go/keepclient/keepclient.go
@@ -242,15 +242,15 @@ func (kc *KeepClient) SetServiceRoots(newLocals, newWritableLocals map[string]st
func (kc *KeepClient) getSortedRoots(locator string) []string {
var found []string
for _, hint := range strings.Split(locator, "+") {
- if len(hint) < 7 || hint[0:1] == "A" || (hint[0:1] >= "0" && hint[0:1] <= "9") {
+ if len(hint) < 7 || hint[0:2] != "K@" {
// Not a service hint.
continue
}
- if len(hint) == 7 && hint[0:2] == "K@" {
+ if len(hint) == 7 {
// +K at abcde means fetch from proxy at
// keep.abcde.arvadosapi.com
found = append(found, "https://keep."+hint[2:]+".arvadosapi.com")
- } else if len(hint) == 29 && arvadosclient.UUIDMatch(hint[2:]) {
+ } else if len(hint) == 29 {
// +K at abcde-abcde-abcdeabcdeabcde means fetch
// from gateway with given uuid
if gwURI, ok := kc.GatewayRoots()[hint[2:]]; ok {
diff --git a/sdk/go/keepclient/support.go b/sdk/go/keepclient/support.go
index 2a0b166..0cedc5e 100644
--- a/sdk/go/keepclient/support.go
+++ b/sdk/go/keepclient/support.go
@@ -14,7 +14,7 @@ import (
"time"
)
-type keepServices struct {
+type keepService struct {
Uuid string `json:"uuid"`
Hostname string `json:"service_host"`
Port int `json:"service_port"`
@@ -79,7 +79,7 @@ func (this *KeepClient) setClientSettingsDisk() {
// DiscoverKeepServers gets list of available keep services from api server
func (this *KeepClient) DiscoverKeepServers() error {
type svcList struct {
- Items []keepServices `json:"items"`
+ Items []keepService `json:"items"`
}
var m svcList
commit 67f730557e062608f842fa3abc612fb717fbce2f
Merge: 7fdfbc3 33596fc
Author: radhika <radhika at curoverse.com>
Date: Thu Sep 24 11:42:58 2015 -0400
Merge branch 'master' into 7162-support-service-types
-----------------------------------------------------------------------
hooks/post-receive
--
More information about the arvados-commits
mailing list