[ARVADOS] updated: 1.1.4-191-gf691b3f

Git user git at public.curoverse.com
Thu May 3 10:21:45 EDT 2018


Summary of changes:
 .../app/controllers/work_units_controller.rb       |   7 +-
 .../workbench/test/integration/collections_test.rb |   2 +-
 build/build.list                                   |  68 +--
 build/package-build-dockerfiles/Makefile           |   2 +-
 build/package-build-dockerfiles/centos7/Dockerfile |   2 +-
 build/package-build-dockerfiles/debian8/Dockerfile |   2 +-
 build/package-build-dockerfiles/debian9/Dockerfile |   2 +-
 .../ubuntu1404/Dockerfile                          |   4 +-
 .../ubuntu1604/Dockerfile                          |   2 +-
 .../package-test-dockerfiles/ubuntu1404/Dockerfile |   4 +-
 build/package-testing/test-packages-ubuntu1204.sh  |   1 -
 build/run-build-packages-one-target.sh             |   9 +-
 build/run-build-packages.sh                        |  52 ---
 build/run-tests.sh                                 |   4 +-
 doc/Rakefile                                       |   2 +-
 doc/_config.yml                                    |  61 +--
 doc/_includes/_events_py.liquid                    |  18 -
 doc/_includes/_example_sdk_go_imports.liquid       |  10 -
 doc/_includes/_navbar_top.liquid                   |   2 +
 doc/_layouts/default.html.liquid                   |   1 +
 doc/admin/change-account-owner.html.textile.liquid |  41 --
 doc/admin/index.html.textile.liquid                |  13 +
 doc/admin/merge-remote-account.html.textile.liquid |   4 +-
 doc/admin/upgrading.html.textile.liquid            | 129 ++++++
 doc/api/execution.html.textile.liquid              |   6 +-
 doc/api/permission-model.html.textile.liquid       |   4 +-
 doc/api/storage.html.textile.liquid                |   8 +-
 doc/architecture/Arvados_arch.odg                  | Bin 0 -> 14997 bytes
 doc/architecture/index.html.textile.liquid         |  59 +++
 doc/css/images.css                                 |   3 +
 doc/images/Arvados_arch.svg                        | 514 +++++++++++++++++++++
 doc/index.html.liquid                              |  31 +-
 doc/install/cheat_sheet.html.textile.liquid        |   4 +-
 ...nstall-manual-prerequisites.html.textile.liquid |   4 +
 doc/install/install-postgresql.html.textile.liquid |  12 +-
 doc/install/migrate-docker19.html.textile.liquid   |   4 +-
 doc/sdk/go/index.html.textile.liquid               |   7 +-
 .../crunch-utility-libraries.html.textile.liquid   |   4 +-
 doc/sdk/python/events.html.textile.liquid          |  18 +-
 doc/user/index.html.textile.liquid                 |   3 -
 .../topics/arvados-sync-groups.html.textile.liquid |   6 +-
 .../tutorial-trait-search.html.textile.liquid      |  12 +-
 sdk/R/README.Rmd                                   | 342 +++++++-------
 sdk/cwl/tests/arvados-tests.yml                    |   1 +
 sdk/go/arvados/client.go                           |  13 +-
 sdk/go/arvados/collection.go                       |  31 +-
 sdk/go/arvados/fs_site.go                          |  13 +-
 sdk/go/arvados/fs_site_test.go                     |  21 +-
 sdk/go/arvadostest/fixtures.go                     |   1 +
 sdk/go/arvadostest/run_servers.go                  |  14 +-
 .../arvados/v1/collections_controller.rb           |  14 +-
 services/crunch-dispatch-slurm/squeue.go           |   3 +
 services/crunch-run/crunchrun_test.go              |   4 +
 services/keep-balance/balance.go                   | 422 +++++++++++------
 services/keep-balance/balance_run_test.go          |  12 +-
 services/keep-balance/balance_test.go              | 202 ++++++--
 services/keep-balance/block_state.go               |  38 +-
 services/keep-balance/change_set.go                |  20 +-
 services/keep-balance/change_set_test.go           |  11 +-
 services/keep-web/cadaver_test.go                  |   2 +
 services/keep-web/handler.go                       |  17 +-
 services/keep-web/handler_test.go                  |  36 +-
 services/keepstore/handlers.go                     |   2 +-
 services/login-sync/test/test_add_user.rb          |   7 +-
 services/nodemanager/tests/integration_test.py     |  14 +-
 .../tests/test_computenode_dispatch_slurm.py       |  12 +
 tools/arvbox/lib/arvbox/docker/Dockerfile.base     |   2 +-
 .../crunchstat_summary/reader.py                   |   5 +-
 68 files changed, 1718 insertions(+), 682 deletions(-)
 delete mode 120000 build/package-testing/test-packages-ubuntu1204.sh
 delete mode 100644 doc/_includes/_events_py.liquid
 delete mode 100644 doc/_includes/_example_sdk_go_imports.liquid
 delete mode 100644 doc/admin/change-account-owner.html.textile.liquid
 create mode 100644 doc/admin/index.html.textile.liquid
 create mode 100644 doc/admin/upgrading.html.textile.liquid
 create mode 100644 doc/architecture/Arvados_arch.odg
 create mode 100644 doc/architecture/index.html.textile.liquid
 create mode 100644 doc/css/images.css
 create mode 100644 doc/images/Arvados_arch.svg

       via  f691b3f7dfba6a337504211f1db44a980586afdd (commit)
       via  3e1c43866e5b523c3f1d273c25942ad56dc66d3f (commit)
       via  dc0dae1ac6d799841dffb828a468a062a4935cc4 (commit)
       via  808533d055f202609b2387307b6e2f97def39d2a (commit)
       via  643189a631922573eadc38bd80873cf9309bb2a4 (commit)
       via  35e38be698e44bbe8cbf036293edaf5dce029396 (commit)
       via  3167926a35521efb58550ef0e26fb8c9e3a8450b (commit)
       via  d862a83eb3367bb8118b06d9d0541ee5db3f46cd (commit)
       via  bf50a84e584554a0bef6443bc8c36212f3236dcd (commit)
       via  a221be676f0650993e76a9e402b93fa4ef7b5cf6 (commit)
       via  c4eeb3201ba14a55b403e1601e3c9c923d699b67 (commit)
       via  552c153523f55886867e54bad5db5eff166d0709 (commit)
       via  2ee4ee2bb666835c41019b475dd2e286604bdd35 (commit)
       via  932e3d6e9a899cc662ea3934b79057d39cd88fed (commit)
       via  f0aee65dfbd5db18d7c0636e7d09d0a38c3f4e53 (commit)
       via  2c437234e2b72d0249d45f0ed3498bf4f1fa8f99 (commit)
       via  a1d2114ec23f0acc2b7d61c0504f5fcf173c2dbc (commit)
       via  da8714584a1649fb128e0f13718c2507c518a210 (commit)
       via  2957b917aaaefc1485e1c5293d413f0931b3030a (commit)
       via  4d93904f55dbd8e85cf44b1ea80d1d0ec81ccfe1 (commit)
       via  400828b30aa206b172e0d0f7d42f965423829202 (commit)
       via  67c90c130dd8858df22914ea94e5ea2576669a34 (commit)
       via  3b585e2842d4ccb5bef499236cf0b8c5a389c063 (commit)
       via  6d6835b97684cc88ac2bf3e4b2e0a8117e8fcd82 (commit)
       via  32607b54f1fb17420b35616e3461ff5052f91194 (commit)
       via  6feade39eb6313c4958a8a94a28f7f1de1e6a8e9 (commit)
       via  fcfbbddf572db32008fcdc7d0750a13b8d6f3b1c (commit)
       via  e1ec2a9cd47d4ae32c544115c465b551366e56a3 (commit)
       via  e6facddc0fc7a362ca1050e4c1b9f436b30f9ae3 (commit)
       via  ba5c812b923ebab2ef6984a7c15623defd758e4f (commit)
       via  10a5441e60ef81e9f875e4b49f987dba14622bf2 (commit)
       via  fd3bafb176ff5c09742576e6f2e177cd6d5dc65e (commit)
       via  44e8b4b75c658a58ffb2cdf05c3a8f56992021a9 (commit)
       via  109b39a237bf6a4726af87cf5b24a8c0d3ac4d44 (commit)
       via  93fdfecd2dbdc9ba49f6890e9c4b3ef2a911ef28 (commit)
       via  6a52723d82456e8e7a8e728bc073a4a59e96581a (commit)
       via  d907e7feca26c3ee0b069124171a8cdee72186ba (commit)
       via  7f61e7cf4ae4661038092c6072bbeb437dc74146 (commit)
       via  3f758d629c5939d15580eb3aead44c95ce02f51f (commit)
       via  b74baf393c6abfbe10d057bf33bc1ab6904e9b0e (commit)
       via  e26e7f413351efae4a2ec679cc2e234dc1a5020c (commit)
       via  9e37d22cf961167df7ce5f7ac934059749363500 (commit)
       via  c5f8f81945117307b39d4e2217622573a9548362 (commit)
       via  4b5517dfc0f3126edf85a2701e1ee218ab4f0ab0 (commit)
       via  64c74f24fcdfbbef0e08b72c09d85c53390ca3b3 (commit)
       via  a619d0821142f9abffbd3584607a617bbb1ca72b (commit)
       via  a93f2efa516c72475dd6f13872c0698c4c499aa9 (commit)
       via  3ce3d9f884aed70cc84155554defe614a1bcfaaa (commit)
      from  7d96319e476c866f33f119dddd534fa6cbe482fb (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 f691b3f7dfba6a337504211f1db44a980586afdd
Author: Tom Clegg <tclegg at veritasgenetics.com>
Date:   Thu May 3 10:21:05 2018 -0400

    12167: Generate a new request ID if caller explicitly uses "".
    
    Skip invoking unique ID generator if ID is already set.
    
    Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tclegg at veritasgenetics.com>

diff --git a/sdk/go/arvados/client.go b/sdk/go/arvados/client.go
index ce2c5ae..cca9f9b 100644
--- a/sdk/go/arvados/client.go
+++ b/sdk/go/arvados/client.go
@@ -106,15 +106,16 @@ func (c *Client) Do(req *http.Request) (*http.Response, error) {
 		req.Header.Add("Authorization", "OAuth2 "+c.AuthToken)
 	}
 
-	reqid, ok := c.context().Value(contextKeyRequestID).(string)
-	if !ok {
-		reqid = reqIDGen.Next()
-	}
 	if req.Header.Get("X-Request-Id") == "" {
+		reqid, _ := c.context().Value(contextKeyRequestID).(string)
+		if reqid == "" {
+			reqid = reqIDGen.Next()
+		}
 		if req.Header == nil {
-			req.Header = http.Header{}
+			req.Header = http.Header{"X-Request-Id": {reqid}}
+		} else {
+			req.Header.Set("X-Request-Id", reqid)
 		}
-		req.Header.Set("X-Request-Id", reqid)
 	}
 	return c.httpClient().Do(req)
 }

commit 3e1c43866e5b523c3f1d273c25942ad56dc66d3f
Merge: 7d96319 dc0dae1
Author: Tom Clegg <tclegg at veritasgenetics.com>
Date:   Thu May 3 10:10:11 2018 -0400

    12167: Merge branch 'master'
    
    Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tclegg at veritasgenetics.com>


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


hooks/post-receive
-- 




More information about the arvados-commits mailing list