[ARVADOS] updated: 1.1.4-476-g911abf131

[Git user]

Summary of changes:
 apps/workbench/test/test_helper.rb                 |  30 +----
 build/run-build-packages.sh                        |   4 +
 build/run-library.sh                               |   5 +-
 build/run-tests.sh                                 |  25 +++-
 cmd/arvados-client/cmd.go                          |  25 +---
 .../arvados-server/arvados-controller.service      |   7 +-
 cmd/arvados-server/cmd.go                          |  27 ++++
 lib/cmd/cmd.go                                     |  27 +++-
 lib/cmd/cmd_test.go                                |  12 +-
 lib/controller/cmd.go                              |  17 +++
 lib/controller/handler.go                          | 141 +++++++++++++++++++++
 lib/controller/handler_test.go                     | 122 ++++++++++++++++++
 lib/service/cmd.go                                 | 120 ++++++++++++++++++
 sdk/go/arvados/config.go                           |  73 ++++++-----
 sdk/go/health/aggregator.go                        |  16 +--
 sdk/go/health/aggregator_test.go                   |  14 +-
 sdk/go/httpserver/error.go                         |  21 +++
 sdk/go/httpserver/logger.go                        |  30 ++++-
 sdk/go/httpserver/logger_test.go                   |  14 +-
 sdk/python/tests/nginx.conf                        |  38 ++++--
 sdk/python/tests/run_test_server.py                |  85 +++++++++++--
 services/health/main.go                            |   2 +-
 services/keep-web/server.go                        |   2 +-
 services/keepproxy/keepproxy.go                    |   2 +-
 services/keepstore/handlers.go                     |   2 +-
 25 files changed, 716 insertions(+), 145 deletions(-)
 copy services/health/arvados-health.service => cmd/arvados-server/arvados-controller.service (83%)
 create mode 100644 cmd/arvados-server/cmd.go
 create mode 100644 lib/controller/cmd.go
 create mode 100644 lib/controller/handler.go
 create mode 100644 lib/controller/handler_test.go
 create mode 100644 lib/service/cmd.go
 create mode 100644 sdk/go/httpserver/error.go

       via  911abf131639401b2ccfd23a6bc3ec983f7ed8f4 (commit)
       via  41e15e626cc301d867c48ebb1f945bbec6b7d555 (commit)
       via  43e349a8916b4e952dfafee2f88d4d2952be12c1 (commit)
       via  73ad2ee9af3b97c46293bdfc9e2925a67726b786 (commit)
       via  fe561d69b42d55191d6d1f01d4f3cdcf1fc9faaa (commit)
       via  23d57ba45b348b580fc584bbd77fe3960796622d (commit)
       via  f777c74882e6b0f52b15f62d1d6251cd180979e4 (commit)
       via  1b5156270c5cb8d7a4a1b095d981f1a84a98554f (commit)
       via  b58c06e93fc1392aea0347ea099376b41ec4b7c3 (commit)
       via  a1f0e517f6b37ea987c0146a4ca93f50715f00f2 (commit)
       via  21c5372c6b670820e842e01336eb6b191d6e10b7 (commit)
       via  4a98eba9ae08ffccb822842f74b1b805302a1ad1 (commit)
       via  e26dc8ebc182bec997624213c771f06e9b0179e8 (commit)
       via  46434cfe5a053097440bcccc35d0ce7d00bbcfee (commit)
       via  18d6239d25924545ba91825011d467861cd5513c (commit)
       via  48fd863c654325eefceb8dfd182c88a8149ca309 (commit)
       via  8666f138c10e2a201ee288770f29c5a20b9fc706 (commit)
       via  488bc59b2d90e0a9a23801b034c8a54525d83da4 (commit)
       via  e2f03263c7c2496ff3ee84e43eb133fe171905f9 (commit)
       via  db7330822cb7dbdd1b61a34737d1b24158d8068d (commit)
       via  2e0b7fcafcccc50602f8fd4df11b6312467e95fa (commit)
       via  fa8fd28e3ca22518a147cf34bf7146ef2a173257 (commit)
       via  36f8e449321e4fa02d88fee1fded14aa8ff81723 (commit)
       via  8f76037ba8a37c488612285ffe70d26d0d038124 (commit)
       via  72bd39971753efa7e951b945d07e8d9704a07221 (commit)
       via  ceb5ad39a5b94ba26d4a4a059f7801b758ddcec8 (commit)
       via  220778381f3a6aa6988c682f914fb9baeada85be (commit)
       via  25a80e9318880fbff91289ac8f70e1cae4c132a2 (commit)
       via  a788135c352c36d1a905c7630423ba57b2ae072a (commit)
      from  a8bfbac314335eb0bff3f4ff5e856d3c327de31d (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 911abf131639401b2ccfd23a6bc3ec983f7ed8f4
Merge: a8bfbac31 41e15e626
Author: Lucas Di Pentima <ldipentima at veritasgenetics.com>
Date:   Tue Jun 19 15:31:24 2018 -0300

    Merge branch 'master' into 7478-s-preemptable-preemptible
    
    Arvados-DCO-1.1-Signed-off-by: Lucas Di Pentima <ldipentima at veritasgenetics.com>

diff --cc sdk/go/arvados/config.go
index 9c684bbe3,841f95281..182cf8433
--- a/sdk/go/arvados/config.go
+++ b/sdk/go/arvados/config.go
@@@ -62,24 -63,22 +63,22 @@@ type InstanceType struct 
  	RAM          int64
  	Scratch      int64
  	Price        float64
 -	Preemptable  bool
 +	Preemptible  bool
  }
  
- // GetThisSystemNode returns a SystemNode for the node we're running
- // on right now.
- func (cc *Cluster) GetThisSystemNode() (*SystemNode, error) {
- 	hostname, err := os.Hostname()
- 	if err != nil {
- 		return nil, err
+ // GetNodeProfile returns a NodeProfile for the given hostname. An
+ // error is returned if the appropriate configuration can't be
+ // determined (e.g., this does not appear to be a system node). If
+ // node is empty, use the OS-reported hostname.
+ func (cc *Cluster) GetNodeProfile(node string) (*NodeProfile, error) {
+ 	if node == "" {
+ 		hostname, err := os.Hostname()
+ 		if err != nil {
+ 			return nil, err
+ 		}
+ 		node = hostname
  	}
- 	return cc.GetSystemNode(hostname)
- }
- 
- // GetSystemNode returns a SystemNode for the given hostname. An error
- // is returned if the appropriate configuration can't be determined
- // (e.g., this does not appear to be a system node).
- func (cc *Cluster) GetSystemNode(node string) (*SystemNode, error) {
- 	if cfg, ok := cc.SystemNodes[node]; ok {
+ 	if cfg, ok := cc.NodeProfiles[node]; ok {
  		return &cfg, nil
  	}
  	// If node is not listed, but "*" gives a default system node

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


hooks/post-receive
--