[ARVADOS] updated: 1.3.0-980-g97d368d1f
Git user
git at public.curoverse.com
Fri May 31 17:55:23 UTC 2019
Summary of changes:
doc/install/install-controller.html.textile.liquid | 11 +-
.../install-dispatch-cloud.html.textile.liquid | 87 +++++-----
lib/config/config.default.yml | 153 ++++++++++++++++-
lib/config/deprecated.go | 24 ++-
lib/config/generated_config.go | 153 ++++++++++++++++-
lib/config/load.go | 23 ++-
lib/config/load_test.go | 58 +++++++
lib/controller/cmd.go | 4 +-
lib/controller/federation_test.go | 62 ++-----
lib/controller/handler.go | 42 +++--
lib/controller/handler_test.go | 14 +-
lib/controller/server_test.go | 15 +-
lib/dispatchcloud/cmd.go | 4 +-
lib/dispatchcloud/dispatcher.go | 10 +-
lib/dispatchcloud/dispatcher_test.go | 45 +++--
lib/dispatchcloud/driver.go | 8 +-
lib/dispatchcloud/worker/pool.go | 22 +--
lib/dispatchcloud/worker/pool_test.go | 14 +-
lib/service/cmd.go | 38 +++--
lib/service/cmd_test.go | 2 +-
lib/service/error.go | 2 +-
sdk/go/arvados/config.go | 181 +++++++--------------
sdk/go/arvados/duration.go | 2 +-
sdk/go/arvados/fs_collection_test.go | 3 +-
sdk/go/arvados/fs_project_test.go | 7 +-
sdk/go/arvados/fs_site_test.go | 36 ++--
sdk/go/arvadostest/fixtures.go | 1 -
sdk/go/arvadostest/stub.go | 22 +++
sdk/go/health/aggregator.go | 71 ++++----
sdk/go/health/aggregator_test.go | 144 ++++++++--------
sdk/python/tests/run_test_server.py | 40 ++---
services/api/config/arvados_config.rb | 7 +
services/crunch-run/copier_test.go | 6 +-
services/health/main.go | 69 ++------
services/keep-web/cache_test.go | 12 +-
services/keep-web/cadaver_test.go | 4 +-
services/keep-web/handler_test.go | 6 +-
services/keep-web/server_test.go | 6 +-
38 files changed, 824 insertions(+), 584 deletions(-)
via 97d368d1f14a17b0c4d847a22b51444b577f4bab (commit)
via 8fc29fafb91cf64ce4ededbdd85ef9507c51f216 (commit)
via 5c46278622fff6b7db0d605a0170674626aadc64 (commit)
via 60560d144b7abf7ff98eb12ca3a591211df19ce9 (commit)
via 74b22016e6213628510414c96a7b7cd04c432378 (commit)
via e3f324c979fe45803e2bd42aa8f6d715ea23edb5 (commit)
via 65836a37f88d103c2660c002beaa9e9faaa2ac8c (commit)
via d6358ef9fc0d8474827830a7ea0a451832e1fbec (commit)
via db1cbf4f40a83c4af347be9737d7bca7ccd772ab (commit)
via 15c688d1c4b41232536d0a275dd5c0fdb8879a00 (commit)
via 8ee2632316f61a63f5af52e84e1538e26850005e (commit)
via b3d57ff3ccf9c612a11fcf53a451a0f61a362da6 (commit)
via a26a249eed0299c56e6583a4fae2b9f6dc16bf7f (commit)
via 48a3b3a3c28a6590fdf3d2b750192706cb751fae (commit)
via 1167d410254ff8babfec9f2fdaae1958b368a1b9 (commit)
via c43d9e862d65065c05ee1ef4e6f2ba7d7ec28ed9 (commit)
from 6cd211af76807e01bdf0c7cd41cbd5002f32e822 (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 97d368d1f14a17b0c4d847a22b51444b577f4bab
Merge: 6cd211af7 8fc29fafb
Author: Tom Clegg <tclegg at veritasgenetics.com>
Date: Fri May 31 13:54:57 2019 -0400
Merge branch '15003-new-config-struct'
refs #15003
Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tclegg at veritasgenetics.com>
commit 8fc29fafb91cf64ce4ededbdd85ef9507c51f216
Merge: 5c4627862 6cd211af7
Author: Tom Clegg <tclegg at veritasgenetics.com>
Date: Fri May 31 13:54:10 2019 -0400
15003: Merge branch 'master'
Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tclegg at veritasgenetics.com>
commit 5c46278622fff6b7db0d605a0170674626aadc64
Author: Tom Clegg <tclegg at veritasgenetics.com>
Date: Fri May 31 13:28:03 2019 -0400
15003: Update doc comment on Map, and use it in lib/service.
Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tclegg at veritasgenetics.com>
diff --git a/lib/service/cmd.go b/lib/service/cmd.go
index 56ccd8883..94021163e 100644
--- a/lib/service/cmd.go
+++ b/lib/service/cmd.go
@@ -145,16 +145,7 @@ func (c *command) RunCommand(prog string, args []string, stdin io.Reader, stdout
const rfc3339NanoFixed = "2006-01-02T15:04:05.000000000Z07:00"
func getListenAddr(svcs arvados.Services, prog arvados.ServiceName) (string, error) {
- svc, ok := map[arvados.ServiceName]arvados.Service{
- arvados.ServiceNameController: svcs.Controller,
- arvados.ServiceNameDispatchCloud: svcs.DispatchCloud,
- arvados.ServiceNameHealth: svcs.Health,
- arvados.ServiceNameKeepbalance: svcs.Keepbalance,
- arvados.ServiceNameKeepproxy: svcs.Keepproxy,
- arvados.ServiceNameKeepstore: svcs.Keepstore,
- arvados.ServiceNameKeepweb: svcs.WebDAV,
- arvados.ServiceNameWebsocket: svcs.Websocket,
- }[prog]
+ svc, ok := svcs.Map()[prog]
if !ok {
return "", fmt.Errorf("unknown service name %q", prog)
}
diff --git a/sdk/go/arvados/config.go b/sdk/go/arvados/config.go
index 4936aa270..275eb9e19 100644
--- a/sdk/go/arvados/config.go
+++ b/sdk/go/arvados/config.go
@@ -249,8 +249,8 @@ const (
ServiceNameKeepstore ServiceName = "keepstore"
)
-// ServicePorts returns the configured listening address (or "" if
-// disabled) for each service on the node.
+// Map returns all services as a map, suitable for iterating over all
+// services or looking up a service by name.
func (svcs Services) Map() map[ServiceName]Service {
return map[ServiceName]Service{
ServiceNameRailsAPI: svcs.RailsAPI,
-----------------------------------------------------------------------
hooks/post-receive
--
More information about the arvados-commits
mailing list