[ARVADOS] created: 1.3.0-1162-g3a126e4c7

[Git user]

        at  3a126e4c7e3ab4235a8d5f84f5addebb4691ac7a (commit)


commit 3a126e4c7e3ab4235a8d5f84f5addebb4691ac7a
Author: Tom Clegg <tclegg at veritasgenetics.com>
Date:   Wed Jun 26 11:59:24 2019 -0400

    14287: Enable experimental mode.
    
    Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tclegg at veritasgenetics.com>

diff --git a/build/run-tests.sh b/build/run-tests.sh
index 78c515377..edf9f3ab2 100755
--- a/build/run-tests.sh
+++ b/build/run-tests.sh
@@ -144,6 +144,8 @@ EOF
 # environment that could interfere with the tests.
 unset $(env | cut -d= -f1 | grep \^ARVADOS_)
 
+export ARVADOS_EXPERIMENTAL=14287
+
 # Reset other variables that could affect our [tests'] behavior by
 # accident.
 GITDIR=

commit 206c75c140d796d74e1672f3089861036596e0c0
Author: Tom Clegg <tclegg at veritasgenetics.com>
Date:   Tue Jun 25 14:10:19 2019 -0400

    14287: Support federated requests for /used_by and /provenance.
    
    Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tclegg at veritasgenetics.com>

diff --git a/lib/controller/federation/conn.go b/lib/controller/federation/conn.go
index 2d84db4df..e094953fc 100644
--- a/lib/controller/federation/conn.go
+++ b/lib/controller/federation/conn.go
@@ -88,8 +88,11 @@ func saltedTokenProvider(local backend, remoteID string) rpc.TokenProvider {
 // Return suitable backend for a query about the given cluster ID
 // ("aaaaa") or object UUID ("aaaaa-dz642-abcdefghijklmno").
 func (conn *Conn) chooseBackend(id string) backend {
-	if len(id) > 5 {
+	if len(id) == 27 {
 		id = id[:5]
+	} else if len(id) != 5 {
+		// PDH or bogus ID
+		return conn.local
 	}
 	if id == conn.cluster.ClusterID {
 		return conn.local
@@ -220,11 +223,11 @@ func (conn *Conn) CollectionList(ctx context.Context, options arvados.ListOption
 }
 
 func (conn *Conn) CollectionProvenance(ctx context.Context, options arvados.GetOptions) (map[string]interface{}, error) {
-	return conn.local.CollectionProvenance(ctx, options)
+	return conn.chooseBackend(options.UUID).CollectionProvenance(ctx, options)
 }
 
 func (conn *Conn) CollectionUsedBy(ctx context.Context, options arvados.GetOptions) (map[string]interface{}, error) {
-	return conn.local.CollectionUsedBy(ctx, options)
+	return conn.chooseBackend(options.UUID).CollectionUsedBy(ctx, options)
 }
 
 func (conn *Conn) CollectionDelete(ctx context.Context, options arvados.DeleteOptions) (arvados.Collection, error) {

-----------------------------------------------------------------------


hooks/post-receive
--