[ARVADOS] updated: 2.1.0-415-g60a72f913
Git user
git at public.arvados.org
Wed Feb 3 20:36:17 UTC 2021
Summary of changes:
build/run-tests.sh | 2 +-
cmd/arvados-client/container_gateway.go | 6 +
cmd/arvados-package/build.go | 155 +++++++++++
cmd/arvados-package/build_test.go | 68 +++++
cmd/arvados-package/cmd.go | 143 ++++++++++
cmd/arvados-package/fpm.go | 127 +++++++++
cmd/arvados-package/install.go | 134 ++++++++++
cmd/arvados-server/cmd.go | 1 +
doc/Rakefile | 9 +
doc/_config.yml | 6 +-
doc/admin/activation.html.textile.liquid | 1 -
doc/admin/federation.html.textile.liquid | 4 +-
doc/admin/troubleshooting.html.textile.liquid | 1 -
doc/admin/user-management-cli.html.textile.liquid | 8 +-
doc/admin/user-management.html.textile.liquid | 4 +-
doc/api/methods/users.html.textile.liquid | 6 +-
doc/api/permission-model.html.textile.liquid | 4 +-
doc/api/tokens.html.textile.liquid | 2 +-
doc/install/automatic.html.textile.liquid | 47 ++++
doc/install/cheat_sheet.html.textile.liquid | 1 -
doc/install/client.html.textile.liquid | 14 -
....liquid => configure-slurm.html.textile.liquid} | 26 +-
.../install-prerequisites.html.textile.liquid | 10 -
.../install-manual-overview.html.textile.liquid | 20 --
...nstall-manual-prerequisites.html.textile.liquid | 2 +-
doc/install/pre-built-docker.html.textile.liquid | 75 ------
doc/user/composer/c1.png | Bin 17420 -> 0 bytes
doc/user/composer/c10.png | Bin 33020 -> 0 bytes
doc/user/composer/c11.png | Bin 26144 -> 0 bytes
doc/user/composer/c12.png | Bin 175462 -> 0 bytes
doc/user/composer/c13.png | Bin 11645 -> 0 bytes
doc/user/composer/c14.png | Bin 13116 -> 0 bytes
doc/user/composer/c15.png | Bin 50066 -> 0 bytes
doc/user/composer/c16.png | Bin 32472 -> 0 bytes
doc/user/composer/c17.png | Bin 34259 -> 0 bytes
doc/user/composer/c18.png | Bin 59780 -> 0 bytes
doc/user/composer/c19.png | Bin 53580 -> 0 bytes
doc/user/composer/c2.png | Bin 41693 -> 0 bytes
doc/user/composer/c20.png | Bin 23625 -> 0 bytes
doc/user/composer/c21.png | Bin 11379 -> 0 bytes
doc/user/composer/c22.png | Bin 13713 -> 0 bytes
doc/user/composer/c23.png | Bin 12253 -> 0 bytes
doc/user/composer/c24.png | Bin 19931 -> 0 bytes
doc/user/composer/c2b.png | Bin 14285 -> 0 bytes
doc/user/composer/c2c.png | Bin 9123 -> 0 bytes
doc/user/composer/c3.png | Bin 38471 -> 0 bytes
doc/user/composer/c4.png | Bin 8811 -> 0 bytes
doc/user/composer/c5.png | Bin 24020 -> 0 bytes
doc/user/composer/c6.png | Bin 41978 -> 0 bytes
doc/user/composer/c7.png | Bin 26904 -> 0 bytes
doc/user/composer/c8.png | Bin 44358 -> 0 bytes
doc/user/composer/c9.png | Bin 18920 -> 0 bytes
doc/user/composer/composer.html.textile.liquid | 119 ---------
.../tutorials/intro-crunch.html.textile.liquid | 28 --
lib/boot/cert.go | 22 +-
lib/boot/cmd.go | 6 +
lib/boot/nginx.go | 45 +++-
lib/boot/passenger.go | 59 ++++-
lib/boot/postgresql.go | 31 ++-
lib/boot/seed.go | 7 +-
lib/boot/service.go | 10 +-
lib/boot/supervisor.go | 202 +++++++++-----
lib/controller/localdb/container_gateway.go | 6 +-
lib/crunchrun/crunchrun.go | 33 ++-
lib/dispatchcloud/dispatcher.go | 6 +
lib/install/deps.go | 289 +++++++++++++++++----
lib/install/init.go | 267 +++++++++++++++++++
sdk/go/arvados/container.go | 2 +-
sdk/go/health/aggregator.go | 3 +
sdk/python/tests/nginx.conf | 70 ++---
services/api/app/models/arvados_model.rb | 2 +-
services/api/test/unit/container_test.rb | 4 +-
services/keep-balance/main.go | 8 +-
tools/keep-block-check/keep-block-check.go | 2 +-
tools/keep-block-check/keep-block-check_test.go | 10 +-
75 files changed, 1577 insertions(+), 530 deletions(-)
create mode 100644 cmd/arvados-package/build.go
create mode 100644 cmd/arvados-package/build_test.go
create mode 100644 cmd/arvados-package/cmd.go
create mode 100644 cmd/arvados-package/fpm.go
create mode 100644 cmd/arvados-package/install.go
delete mode 120000 doc/admin/activation.html.textile.liquid
delete mode 120000 doc/admin/troubleshooting.html.textile.liquid
create mode 100644 doc/install/automatic.html.textile.liquid
delete mode 120000 doc/install/cheat_sheet.html.textile.liquid
delete mode 100644 doc/install/client.html.textile.liquid
rename doc/install/crunch2-slurm/{install-slurm.html.textile.liquid => configure-slurm.html.textile.liquid} (88%)
delete mode 100644 doc/install/crunch2-slurm/install-prerequisites.html.textile.liquid
delete mode 100644 doc/install/install-manual-overview.html.textile.liquid
delete mode 100644 doc/install/pre-built-docker.html.textile.liquid
delete mode 100644 doc/user/composer/c1.png
delete mode 100644 doc/user/composer/c10.png
delete mode 100644 doc/user/composer/c11.png
delete mode 100644 doc/user/composer/c12.png
delete mode 100644 doc/user/composer/c13.png
delete mode 100644 doc/user/composer/c14.png
delete mode 100644 doc/user/composer/c15.png
delete mode 100644 doc/user/composer/c16.png
delete mode 100644 doc/user/composer/c17.png
delete mode 100644 doc/user/composer/c18.png
delete mode 100644 doc/user/composer/c19.png
delete mode 100644 doc/user/composer/c2.png
delete mode 100644 doc/user/composer/c20.png
delete mode 100644 doc/user/composer/c21.png
delete mode 100644 doc/user/composer/c22.png
delete mode 100644 doc/user/composer/c23.png
delete mode 100644 doc/user/composer/c24.png
delete mode 100644 doc/user/composer/c2b.png
delete mode 100644 doc/user/composer/c2c.png
delete mode 100644 doc/user/composer/c3.png
delete mode 100644 doc/user/composer/c4.png
delete mode 100644 doc/user/composer/c5.png
delete mode 100644 doc/user/composer/c6.png
delete mode 100644 doc/user/composer/c7.png
delete mode 100644 doc/user/composer/c8.png
delete mode 100644 doc/user/composer/c9.png
delete mode 100644 doc/user/composer/composer.html.textile.liquid
delete mode 100644 doc/user/tutorials/intro-crunch.html.textile.liquid
create mode 100644 lib/install/init.go
via 60a72f91316ab1d878420adceb98e585c0e3b72f (commit)
via 38a0f5e77f2190487d03d6538337d3b7055fd1e8 (commit)
via 08c80b2ba6a8fc090d2e998dfcf2f280c8508019 (commit)
via c797b629ddb0cf2808123a1b86d31b0153f1aca0 (commit)
via 22fcc610c13c817c415cff26f2c94c17f271e4d3 (commit)
via 81d57969ee70d6118937b4f4f61f6e1cd235de44 (commit)
via 78762462bbea3d51223bdf0ed01668ac1bbbcedb (commit)
via 40e21ed3a79d7da89b9805a700ff3844c7d9a610 (commit)
via f6519a2ffd957ed31d8a8c92da2f1d4ffed71b04 (commit)
via b5c47e5ca546f893caa6189671966d98af6665ab (commit)
via eb0dd856470fe91ba4592ee24c05a5fed11af217 (commit)
via d515c8eb95b39065f74ea6d0b368d8ca3705fd4a (commit)
via 64f732dbb2c0fac4cd108f142f28d6d2efeae324 (commit)
via 020482b349bf285ed726dbf05521b686be7daa2b (commit)
via e28e5002e502a5c238e6c0ae5daede811af9aa55 (commit)
via 225adb2aa5ae0b3af3b799c9001a9edc65c7d3d0 (commit)
via a795a8801fecdcbe5418c5d631b5b1ba1b22f1d7 (commit)
via 331ebba87c6b1fa5d90a842ad0beee5d0f67155c (commit)
via ae3d77edc33d0c9e11af1a59478feaf7251d8ca1 (commit)
via 3e7ab60f94a6076383bf4aec41b6271310ab8823 (commit)
via 8646fae34fff9aa379a34388e90106f31d5206a4 (commit)
via a847c48edba67805cff0104386845be799d74073 (commit)
via 3d1a90b959e3035de4f3be1c511a721291507b5f (commit)
via c81ce0ff89ad019d982bdccb376a823894eea733 (commit)
via 3cb8be1e32a1b2e477501c38cefa4c48bbbb8c29 (commit)
via 2135f16dd8edc4c9b3cded88eb907dd24cc65293 (commit)
via e60380ca96dab6348b9b6ca40e5d09867b94ab85 (commit)
via c72e7388b50feaf79651719d6e3a7fbe8239c334 (commit)
via 4865911a605128adb454b3280b1cf9dcd38f499e (commit)
via 01e15db1f4a331508117bc841256acec8ca361de (commit)
via 18def2a271e02fd64749fe650034f50d1b659e45 (commit)
via 591922d85a4cbb6fc890bde7b5f4848f4c92468a (commit)
via 8cd08f2ce640e0b1967db489d29e3761ac63f0d7 (commit)
via a4a17913e299851f0b5979189d36997a62ff43e1 (commit)
via edc2687671a2fec74304c6e00092034d50c8f667 (commit)
via d20342c56db7e148f793a29fd79619ce2e3f0243 (commit)
via 4085665f87c82939961e55bf004ca47c03ca30ac (commit)
via 1297d71125f5a694996147406edf38bdc913396c (commit)
via 41305b5ac71cc9a306dc654c42c11ffcc4258a47 (commit)
via b979f80113c4f8a4c13c96b4679c28788c099333 (commit)
via 57c3fbfb0f75dc38be717d52f29abe5bcefea1bb (commit)
via 6cd0e19a277812f302f46693d824cc17d17ed6b1 (commit)
via d71d4273d1f3d0b6381efafa649b81c6b4107cf1 (commit)
via 2cfb41d14010e26d97df93c4cf8ad00f0ac01701 (commit)
via 985ece13dd7147f153c7a59c5b3665570c5943c8 (commit)
via e1756a76e8c7fed496f513909bd2c295e24cf8ee (commit)
via 9c139cc4e2f519e2deb3617918a9199b76c33f10 (commit)
via ae339cf6802741ea52fbe5cd8716306dcf99b021 (commit)
via 684b81a42cb9290bde284723603d6e4dbfd7ad35 (commit)
via d77f9e6f8a14e14f477dfbf944914c78d0805e9f (commit)
via 0137f9e3cd33fe676a862afd727563e2602e0984 (commit)
via 6c1fd146c0b22b374f00ef94c961df8e1e1913a7 (commit)
via 706c36ff5644bb675af36c15c5f30ef0adde9102 (commit)
via 3aaefcb3c76ff470b475d950398d01255e87712a (commit)
via c59af50bc2f7a366cd12a8dd6fc7d7e3b1c32480 (commit)
via f1bc1872a9ead4f3cb1c23c79507870c1b0f7b53 (commit)
via 3feaf72ad2a9a7b740bb3976f351f5020129eda4 (commit)
via 209403e32bdd6164404240af2959de86a3c46165 (commit)
via 54849feb0cf30bd3d78f14f1a41e6bc464fb80d6 (commit)
via d5c034b4e90d3fba74e5b0a879d8af424023d7b1 (commit)
via 20649f2d57f8e5c8bddfb672c164b7a96f75efab (commit)
via 821c7273388a56ad5ae9b89a0cf2f351388e8b61 (commit)
via da7a2e35f1c53a64a360c66db0c260a9ab2190f2 (commit)
via 0b6013ac5520b7508474705d654f1384994d10e5 (commit)
via ab5199f71c7eaf8bf8fe2b4477353cf432faf1a7 (commit)
via f8d13408e99839f52260f889a5089126761eecb1 (commit)
via e8d1a643cdbc3a5f4c0e5c745da58d9f7e1248d8 (commit)
via 426103b2d2f071ab0d57b3f9aaea58a3f8455c4f (commit)
via bb1054c0e6a9bed14e593004f380111b2e948047 (commit)
via f2da5f54256377e604c76b74805381b2acf38f50 (commit)
via f81d411d2becc23fe640366620d9568149d89bd6 (commit)
via 24987125b33655306c048ab64f0ffdfb2f6a6c5b (commit)
via 1c2f9259deeedaad103b80fda7f440b8e60caa3f (commit)
via 75d050ab135619fcefecbfa32aaad4dab33e7588 (commit)
via 8891660b68c10dd9d019f1caf8b7bc0b1eb493d8 (commit)
via 398ddf58f05416e0ce62ac8faef018a44bf8cc4c (commit)
via 7ac1ea4e9bc1b399368a95649647a55c8093d649 (commit)
via 60801a7c485c50e3c2f518f9b3ad6f86c8783fca (commit)
via ee7d60f02525760a2480157011659e7b2210f6b8 (commit)
via 12441486d7fb3b51d2fea9d9b1da0d8e4f3ef3e0 (commit)
via b4d6c92791088a0b6a39a71b2b8b6ddc4b13af41 (commit)
from 77c8223f5ddd64cff2b08d0857749644c474946f (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 60a72f91316ab1d878420adceb98e585c0e3b72f
Author: Tom Clegg <tom at curii.com>
Date: Wed Feb 3 15:35:33 2021 -0500
17170: Improve error messages and command help text.
Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tom at curii.com>
diff --git a/cmd/arvados-client/container_gateway.go b/cmd/arvados-client/container_gateway.go
index 6dbc241bc..e3b6b9332 100644
--- a/cmd/arvados-client/container_gateway.go
+++ b/cmd/arvados-client/container_gateway.go
@@ -13,6 +13,7 @@ import (
"net/url"
"os"
"os/exec"
+ "path/filepath"
"strings"
"syscall"
@@ -28,6 +29,7 @@ func (shellCommand) RunCommand(prog string, args []string, stdin io.Reader, stdo
f := flag.NewFlagSet(prog, flag.ContinueOnError)
f.SetOutput(stderr)
f.Usage = func() {
+ _, prog := filepath.Split(prog)
fmt.Fprint(stderr, prog+`: open an interactive shell on a running container.
Usage: `+prog+` [options] [username@]container-uuid [ssh-options] [remote-command [args...]]
@@ -105,8 +107,12 @@ func (connectSSHCommand) RunCommand(prog string, args []string, stdin io.Reader,
f := flag.NewFlagSet(prog, flag.ContinueOnError)
f.SetOutput(stderr)
f.Usage = func() {
+ _, prog := filepath.Split(prog)
fmt.Fprint(stderr, prog+`: connect to the gateway service for a running container.
+NOTE: You almost certainly don't want to use this command directly. It
+is meant to be used internally. Use "arvados-client shell" instead.
+
Usage: `+prog+` [options] [username@]container-uuid
Options:
diff --git a/lib/controller/localdb/container_gateway.go b/lib/controller/localdb/container_gateway.go
index e50927877..3b40eccaf 100644
--- a/lib/controller/localdb/container_gateway.go
+++ b/lib/controller/localdb/container_gateway.go
@@ -63,15 +63,15 @@ func (conn *Conn) ContainerSSH(ctx context.Context, opts arvados.ContainerSSHOpt
switch ctr.State {
case arvados.ContainerStateQueued, arvados.ContainerStateLocked:
- err = httpserver.ErrorWithStatus(fmt.Errorf("gateway is not available, container is %s", strings.ToLower(string(ctr.State))), http.StatusServiceUnavailable)
+ err = httpserver.ErrorWithStatus(fmt.Errorf("container is not running yet (state is %q)", ctr.State), http.StatusServiceUnavailable)
return
case arvados.ContainerStateRunning:
if ctr.GatewayAddress == "" {
- err = httpserver.ErrorWithStatus(errors.New("container is running but gateway is not available"), http.StatusServiceUnavailable)
+ err = httpserver.ErrorWithStatus(errors.New("container is running but gateway is not available -- installation problem or feature not supported"), http.StatusServiceUnavailable)
return
}
default:
- err = httpserver.ErrorWithStatus(fmt.Errorf("gateway is not available, container is %s", strings.ToLower(string(ctr.State))), http.StatusGone)
+ err = httpserver.ErrorWithStatus(fmt.Errorf("container has ended (state is %q)", ctr.State), http.StatusGone)
return
}
// crunch-run uses a self-signed / unverifiable TLS
commit 38a0f5e77f2190487d03d6538337d3b7055fd1e8
Merge: 77c8223f5 08c80b2ba
Author: Tom Clegg <tom at curii.com>
Date: Wed Feb 3 11:46:43 2021 -0500
17170: Merge branch 'master'
Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tom at curii.com>
-----------------------------------------------------------------------
hooks/post-receive
--
More information about the arvados-commits
mailing list