[ARVADOS] updated: 0d8b6bfdc73dfd95a8f116aed9826f6c75b39721

Git user git at public.curoverse.com
Thu Jun 2 13:37:53 EDT 2016


Summary of changes:
 backports/python-apache-libcloud/fpm-info.sh       |   9 +
 backports/python-ciso8601/fpm-info.sh              |   2 +-
 backports/python-gflags/fpm-info.sh                |   1 -
 backports/python-llfuse/fpm-info.sh                |   2 +-
 backports/python-pycrypto/fpm-info.sh              |   2 +-
 backports/python-pycurl/fpm-info.sh                |   2 +-
 build/package-build-dockerfiles/Makefile           |  14 +-
 build/package-build-dockerfiles/centos6/Dockerfile |   4 +-
 .../{centos6 => centos7}/Dockerfile                |  23 +-
 build/package-build-dockerfiles/debian7/Dockerfile |   2 +-
 build/package-build-dockerfiles/debian8/Dockerfile |   2 +-
 .../ubuntu1204/Dockerfile                          |   2 +-
 .../ubuntu1404/Dockerfile                          |   2 +-
 build/package-test-dockerfiles/centos6/Dockerfile  |   2 +-
 .../{centos6 => centos7}/Dockerfile                |  12 +-
 .../{centos6 => centos7}/localrepo.repo            |   2 +-
 build/package-testing/rpm-common-test-packages.sh  |  47 ++
 .../test-package-arvados-api-server.sh             |   2 +-
 .../test-package-arvados-sso-server.sh             |   9 +-
 .../test-package-arvados-workbench.sh              |   2 +-
 build/package-testing/test-packages-centos6.sh     |  45 +-
 build/package-testing/test-packages-centos7.sh     |   1 +
 build/run-build-packages-one-target.sh             |   7 +-
 build/run-build-packages-sso.sh                    |   2 +-
 build/run-build-packages.sh                        |  82 ++-
 build/run-library.sh                               |  37 +-
 build/run-tests.sh                                 |   8 +-
 doc/_includes/_note_python27_sc.liquid             |   2 +-
 sdk/{ruby => cwl}/LICENSE-2.0.txt                  |   0
 sdk/{python => cwl}/MANIFEST.in                    |   0
 sdk/cwl/setup.py                                   |   3 +
 sdk/go/arvados/client.go                           | 169 ++++++
 sdk/go/arvados/client_test.go                      |  83 +++
 sdk/go/arvados/collection.go                       |  62 ++
 sdk/go/arvados/doc.go                              |  12 +
 sdk/go/arvados/duration.go                         |  31 +
 sdk/go/arvados/keep_block.go                       |  15 +
 sdk/go/arvados/keep_service.go                     | 123 ++++
 sdk/go/arvados/resource_list.go                    |  25 +
 sdk/go/arvados/resource_list_test.go               |  21 +
 sdk/go/arvados/user.go                             |  17 +
 services/crunch-run/crunchrun.go                   |  33 +-
 services/crunch-run/crunchrun_test.go              |  33 +-
 services/crunch-run/logging_test.go                |  23 +-
 services/keep-balance/balance.go                   | 638 +++++++++++++++++++++
 services/keep-balance/balance_run_test.go          | 374 ++++++++++++
 services/keep-balance/balance_test.go              | 255 ++++++++
 services/keep-balance/block_state.go               |  95 +++
 services/keep-balance/change_set.go                |  75 +++
 services/keep-balance/change_set_test.go           |  35 ++
 services/keep-balance/collection.go                |  95 +++
 services/keep-balance/integration_test.go          |  92 +++
 services/keep-balance/keep_service.go              |  76 +++
 services/keep-balance/main.go                      | 156 +++++
 services/keep-balance/main_test.go                 |  43 ++
 services/keep-balance/time_me.go                   |  14 +
 services/keep-balance/usage.go                     |  83 +++
 services/keepstore/keepstore.go                    |   7 +-
 tools/arvbox/lib/arvbox/docker/Dockerfile.base     |   9 +-
 59 files changed, 2852 insertions(+), 172 deletions(-)
 create mode 100644 backports/python-apache-libcloud/fpm-info.sh
 delete mode 100644 backports/python-gflags/fpm-info.sh
 copy build/package-build-dockerfiles/{centos6 => centos7}/Dockerfile (52%)
 copy build/package-test-dockerfiles/{centos6 => centos7}/Dockerfile (53%)
 copy build/package-test-dockerfiles/{centos6 => centos7}/localrepo.repo (55%)
 create mode 100755 build/package-testing/rpm-common-test-packages.sh
 mode change 100755 => 120000 build/package-testing/test-packages-centos6.sh
 create mode 120000 build/package-testing/test-packages-centos7.sh
 copy sdk/{ruby => cwl}/LICENSE-2.0.txt (100%)
 copy sdk/{python => cwl}/MANIFEST.in (100%)
 create mode 100644 sdk/go/arvados/client.go
 create mode 100644 sdk/go/arvados/client_test.go
 create mode 100644 sdk/go/arvados/collection.go
 create mode 100644 sdk/go/arvados/doc.go
 create mode 100644 sdk/go/arvados/duration.go
 create mode 100644 sdk/go/arvados/keep_block.go
 create mode 100644 sdk/go/arvados/keep_service.go
 create mode 100644 sdk/go/arvados/resource_list.go
 create mode 100644 sdk/go/arvados/resource_list_test.go
 create mode 100644 sdk/go/arvados/user.go
 create mode 100644 services/keep-balance/balance.go
 create mode 100644 services/keep-balance/balance_run_test.go
 create mode 100644 services/keep-balance/balance_test.go
 create mode 100644 services/keep-balance/block_state.go
 create mode 100644 services/keep-balance/change_set.go
 create mode 100644 services/keep-balance/change_set_test.go
 create mode 100644 services/keep-balance/collection.go
 create mode 100644 services/keep-balance/integration_test.go
 create mode 100644 services/keep-balance/keep_service.go
 create mode 100644 services/keep-balance/main.go
 create mode 100644 services/keep-balance/main_test.go
 create mode 100644 services/keep-balance/time_me.go
 create mode 100644 services/keep-balance/usage.go

       via  0d8b6bfdc73dfd95a8f116aed9826f6c75b39721 (commit)
       via  1838757e0fae96481e37891c0fa772193e2aebe8 (commit)
       via  4a2495cdae38ecfa46e3165fb8114f20aeb83e8d (commit)
       via  79ad282774b6afb9a48445ac3d12d7bb5615e4eb (commit)
       via  7961ba6a5a14ab60fbbe181f9d5fcb7df9c4991f (commit)
       via  5030797bc2035f1feee5876e069c0282308270ef (commit)
       via  76549a60fde774c515121c42ace658dec1a1ebe8 (commit)
       via  3aae316c250e83e4c94d3c27359bd01980a99853 (commit)
       via  c900f416c36cd74675c5bf4c33ad1dbe5d1e78fa (commit)
       via  27f948d88bbdd5be848011871d2b592d7057ece1 (commit)
       via  b002129afda08bbb4fdbed6e629858a5c298c068 (commit)
       via  ae72b172c8bf8a52358a89f8a8d744ec5bf2d993 (commit)
       via  758d39fd7aee4d1989395eba2113f0f2538b30d1 (commit)
       via  65d88f48d190ca7a7bfa43215a32df0a622bbdad (commit)
       via  63e7b750c32f4450f3279558210025b905b5e183 (commit)
       via  6cb51851834989ff540c5e2a1fe6b88f1c26a089 (commit)
       via  94c78c8792df002805d05cf349094c7833716e65 (commit)
       via  44ceaa474a330f12dd9e00115af107d7258044f2 (commit)
       via  287c0b37e5ed6787c6b5f28c193b7295388e8c04 (commit)
       via  5d5375b28437c59f9625d8653ecef4afec1c2120 (commit)
       via  3297c7fb97510aeea14df586d81caf65fd6c4aa6 (commit)
       via  bde564d8ad6f00326c16d7b85ce6dbeec9d338d3 (commit)
       via  a5260a0bd87f83b17744445476aaf7f107ca24e4 (commit)
       via  5039497244e9cf973d40b377b62889a9356686d1 (commit)
      from  184c1148ab0cec100580cfdc7ac81ffd1deb5b58 (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 0d8b6bfdc73dfd95a8f116aed9826f6c75b39721
Author: Tom Clegg <tom at curoverse.com>
Date:   Thu Jun 2 13:37:09 2016 -0400

    9272: Use RuntimeConstraints type instead of map[string]interface{}.

diff --git a/services/crunch-run/crunchrun.go b/services/crunch-run/crunchrun.go
index bfe6bf5..f558345 100644
--- a/services/crunch-run/crunchrun.go
+++ b/services/crunch-run/crunchrun.go
@@ -55,19 +55,23 @@ type CollectionRecord struct {
 	PortableDataHash string `json:"portable_data_hash"`
 }
 
+type RuntimeConstraints struct {
+	API *bool
+}
+
 // ContainerRecord is the container record returned by the API server.
 type ContainerRecord struct {
-	UUID               string                 `json:"uuid"`
-	Command            []string               `json:"command"`
-	ContainerImage     string                 `json:"container_image"`
-	Cwd                string                 `json:"cwd"`
-	Environment        map[string]string      `json:"environment"`
-	Mounts             map[string]Mount       `json:"mounts"`
-	OutputPath         string                 `json:"output_path"`
-	Priority           int                    `json:"priority"`
-	RuntimeConstraints map[string]interface{} `json:"runtime_constraints"`
-	State              string                 `json:"state"`
-	Output             string                 `json:"output"`
+	UUID               string             `json:"uuid"`
+	Command            []string           `json:"command"`
+	ContainerImage     string             `json:"container_image"`
+	Cwd                string             `json:"cwd"`
+	Environment        map[string]string  `json:"environment"`
+	Mounts             map[string]Mount   `json:"mounts"`
+	OutputPath         string             `json:"output_path"`
+	Priority           int                `json:"priority"`
+	RuntimeConstraints RuntimeConstraints `json:"runtime_constraints"`
+	State              string             `json:"state"`
+	Output             string             `json:"output"`
 }
 
 // APIClientAuthorization is an arvados#api_client_authorization resource.
@@ -468,7 +472,7 @@ func (runner *ContainerRunner) CreateContainer() error {
 	for k, v := range runner.ContainerRecord.Environment {
 		runner.ContainerConfig.Env = append(runner.ContainerConfig.Env, k+"="+v)
 	}
-	if wantAPI, ok := runner.ContainerRecord.RuntimeConstraints["API"].(bool); ok && wantAPI {
+	if wantAPI := runner.ContainerRecord.RuntimeConstraints.API; wantAPI != nil && *wantAPI {
 		tok, err := runner.ContainerToken()
 		if err != nil {
 			return err

commit 1838757e0fae96481e37891c0fa772193e2aebe8
Merge: 4a2495c 79ad282
Author: Tom Clegg <tom at curoverse.com>
Date:   Thu Jun 2 13:33:49 2016 -0400

    Merge remote-tracking branch 'origin/master' into 9272-use-container-auth


commit 4a2495cdae38ecfa46e3165fb8114f20aeb83e8d
Author: Tom Clegg <tom at curoverse.com>
Date:   Thu Jun 2 13:26:04 2016 -0400

    9272: Set final state to Cancelled unless Start and Wait succeed.

diff --git a/services/crunch-run/crunchrun.go b/services/crunch-run/crunchrun.go
index c50433f..bfe6bf5 100644
--- a/services/crunch-run/crunchrun.go
+++ b/services/crunch-run/crunchrun.go
@@ -795,7 +795,7 @@ func (runner *ContainerRunner) Run() (err error) {
 	if err != nil {
 		return
 	}
-	runner.finalState = "Complete"
+	runner.finalState = "Cancelled"
 
 	err = runner.StartContainer()
 	if err != nil {
@@ -803,6 +803,9 @@ func (runner *ContainerRunner) Run() (err error) {
 	}
 
 	err = runner.WaitFinish()
+	if err == nil {
+		runner.finalState = "Complete"
+	}
 	return
 }
 

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


hooks/post-receive
-- 




More information about the arvados-commits mailing list