[ARVADOS] updated: 311993cea038918798b1292c45b8b0c811aa6d70

[git at public.curoverse.com]

Summary of changes:
 doc/api/schema/Job.html.textile.liquid |  1 +
 sdk/cli/bin/crunch-job                 |  7 ++-
 sdk/python/arvados/api.py              | 67 ++++++++++++++++++--------
 sdk/python/tests/test_api.py           | 88 ++++++++++++++++++++++++++++------
 services/api/lib/crunch_dispatch.rb    | 26 ++++++----
 services/datamanager/keep/keep.go      | 24 +++++-----
 services/datamanager/keep/keep_test.go |  2 +-
 7 files changed, 158 insertions(+), 57 deletions(-)

       via  311993cea038918798b1292c45b8b0c811aa6d70 (commit)
       via  2986115e528e7f95d59e9504eb2288f05641cfb1 (commit)
       via  96a3d13e88c67f6beef17877f15d97a03c63b525 (commit)
       via  8a0eb69984a93852ec888cd3e02b778b0be758ed (commit)
       via  fc5257c18b24ab0e28b248655dcabfafe9665bf3 (commit)
       via  44995fc2895a304737e324ea05f7e75e87f1458c (commit)
       via  f808fc2c821781bee305fc4bbe81c6ff56655695 (commit)
       via  8788c145b860e19a1f04c4dc6abdcda14c859403 (commit)
       via  dcab7519db659e2487db893fda2c8237203c3294 (commit)
       via  86dfb4312bf8fa5c7a4a79f0de1d6f0b29848252 (commit)
       via  292b28f183d7537c58d0013211760464477fbd6a (commit)
      from  56ecb7b0e39dd3c84130bad3a4a585ab6c710037 (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 311993cea038918798b1292c45b8b0c811aa6d70
Author: radhika <radhika at curoverse.com>
Date:   Wed Dec 2 11:58:39 2015 -0500

    7710: text updates around the -service-type argument.

diff --git a/services/datamanager/keep/keep.go b/services/datamanager/keep/keep.go
index d52191c..ea28ffa 100644
--- a/services/datamanager/keep/keep.go
+++ b/services/datamanager/keep/keep.go
@@ -77,13 +77,13 @@ type ServiceList struct {
 	KeepServers    []ServerAddress `json:"items"`
 }
 
-var supportedServiceType string
+var serviceType string
 
 func init() {
-	flag.StringVar(&supportedServiceType,
+	flag.StringVar(&serviceType,
 		"service-type",
 		"disk",
-		"Supported keepservice type. Default is disk.")
+		"Operate only on keep_services with the specified service_type, ignoring all others.")
 }
 
 // String
@@ -131,19 +131,17 @@ func GetKeepServers(params GetKeepServersParams) (results ReadServers, err error
 		return
 	}
 
-	// Ignore any services that are of type other than the "supportedServiceType".
-	// If no services of the "supportedServiceType" are found, raise an error.
-	var indexableKeepServers []ServerAddress
+	var keepServers []ServerAddress
 	for _, server := range sdkResponse.KeepServers {
-		if server.ServiceType == supportedServiceType {
-			indexableKeepServers = append(indexableKeepServers, server)
+		if server.ServiceType == serviceType {
+			keepServers = append(keepServers, server)
 		} else {
-			log.Printf("Ignore unsupported service type: %v", server.ServiceType)
+			log.Printf("Skipping keep_service %q because its service_type %q does not match -service-type=%q", server, server.ServiceType, serviceType)
 		}
 	}
 
-	if len(indexableKeepServers) == 0 {
-		return results, fmt.Errorf("Found no keepservices with the supported type %v", supportedServiceType)
+	if len(keepServers) == 0 {
+		return results, fmt.Errorf("Found no keepservices with the service type %v", serviceType)
 	}
 
 	if params.Logger != nil {
@@ -152,7 +150,7 @@ func GetKeepServers(params GetKeepServersParams) (results ReadServers, err error
 			keepInfo["num_keep_servers_available"] = sdkResponse.ItemsAvailable
 			keepInfo["num_keep_servers_received"] = len(sdkResponse.KeepServers)
 			keepInfo["keep_servers"] = sdkResponse.KeepServers
-			keepInfo["indexable_keep_servers"] = indexableKeepServers
+			keepInfo["indexable_keep_servers"] = keepServers
 		})
 	}
 
@@ -162,7 +160,7 @@ func GetKeepServers(params GetKeepServersParams) (results ReadServers, err error
 		return results, fmt.Errorf("Did not receive all available keep servers: %+v", sdkResponse)
 	}
 
-	results.KeepServerIndexToAddress = indexableKeepServers
+	results.KeepServerIndexToAddress = keepServers
 	results.KeepServerAddressToIndex = make(map[ServerAddress]int)
 	for i, address := range results.KeepServerIndexToAddress {
 		results.KeepServerAddressToIndex[address] = i
diff --git a/services/datamanager/keep/keep_test.go b/services/datamanager/keep/keep_test.go
index 2286453..21a37f0 100644
--- a/services/datamanager/keep/keep_test.go
+++ b/services/datamanager/keep/keep_test.go
@@ -101,7 +101,7 @@ type APITestData struct {
 }
 
 func (s *KeepSuite) TestGetKeepServers_UnsupportedServiceType(c *C) {
-	testGetKeepServersFromAPI(c, APITestData{1, "notadisk", 200}, "Found no keepservices with the supported type disk")
+	testGetKeepServersFromAPI(c, APITestData{1, "notadisk", 200}, "Found no keepservices with the service type disk")
 }
 
 func (s *KeepSuite) TestGetKeepServers_ReceivedTooFewServers(c *C) {

commit 2986115e528e7f95d59e9504eb2288f05641cfb1
Merge: f808fc2 96a3d13
Author: radhika <radhika at curoverse.com>
Date:   Wed Dec 2 11:44:29 2015 -0500

    Merge branch 'master' into 7710-keepclient-all-service-types


commit f808fc2c821781bee305fc4bbe81c6ff56655695
Merge: 56ecb7b 8788c14
Author: radhika <radhika at curoverse.com>
Date:   Tue Dec 1 13:39:38 2015 -0500

    Merge branch 'master' into 7710-keepclient-all-service-types


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


hooks/post-receive
--