[ARVADOS] updated: 1.3.0-2838-g95fc7ff42
Git user
git at public.arvados.org
Tue Aug 4 17:42:30 UTC 2020
Summary of changes:
doc/_config.yml | 5 +-
doc/admin/cloudtest.html.textile.liquid | 2 +-
doc/admin/config-migration.html.textile.liquid | 2 +-
doc/admin/spot-instances.html.textile.liquid | 2 +-
doc/admin/upgrading.html.textile.liquid | 2 +-
.../install-compute-node.html.textile.liquid | 186 +++++++++++++
.../install-dispatch-cloud.html.textile.liquid | 106 ++++---
.../install-compute-node.html.textile.liquid | 11 +-
.../install-dispatch.html.textile.liquid | 34 +--
.../install-prerequisites.html.textile.liquid | 2 +-
.../install-slurm.html.textile.liquid | 16 +-
.../crunch2-slurm/install-test.html.textile.liquid | 10 +-
doc/install/install-keepstore.html.textile.liquid | 2 +
...nstall-manual-prerequisites.html.textile.liquid | 6 +-
.../install-nodemanager.html.textile.liquid | 12 +-
lib/cloud/azure/azure.go | 8 +-
lib/config/config.default.yml | 18 +-
lib/config/generated_config.go | 18 +-
lib/dispatchcloud/dispatcher_test.go | 14 +-
lib/dispatchcloud/test/stub_driver.go | 2 +
lib/dispatchcloud/worker/pool.go | 14 +
lib/dispatchcloud/worker/worker.go | 65 +++--
services/api/config/arvados_config.rb | 9 +-
{sdk/python => services/dockercleaner}/fpm-info.sh | 5 +-
tools/compute-images/.gitignore | 3 +
.../compute-images/.licenseignore | 5 +-
.../compute-images/1078ECD7.asc | 0
tools/compute-images/arvados-images-aws.json | 80 ++++++
tools/compute-images/arvados-images-azure.json | 75 +++++
tools/compute-images/build.sh | 277 +++++++++++++++++++
tools/compute-images/scripts/base.sh | 110 ++++++++
...oud.cfg.d-07_compute_arvados_dispatch_cloud.cfg | 9 +
.../usr-local-bin-ensure-encrypted-partitions.sh | 159 +++++++++++
tools/keep-exercise/keep-exercise.go | 303 ++++++++++++++++-----
34 files changed, 1374 insertions(+), 198 deletions(-)
create mode 100644 doc/install/crunch2-cloud/install-compute-node.html.textile.liquid
rename doc/install/{ => crunch2-cloud}/install-dispatch-cloud.html.textile.liquid (75%)
copy {sdk/python => services/dockercleaner}/fpm-info.sh (60%)
create mode 100644 tools/compute-images/.gitignore
copy sdk/cli/test/binstub_sanity_check/docker.io => tools/compute-images/.licenseignore (83%)
mode change 100755 => 100644
copy docker/jobs/1078ECD7.key => tools/compute-images/1078ECD7.asc (100%)
create mode 100644 tools/compute-images/arvados-images-aws.json
create mode 100644 tools/compute-images/arvados-images-azure.json
create mode 100755 tools/compute-images/build.sh
create mode 100644 tools/compute-images/scripts/base.sh
create mode 100644 tools/compute-images/scripts/etc-cloud-cloud.cfg.d-07_compute_arvados_dispatch_cloud.cfg
create mode 100644 tools/compute-images/scripts/usr-local-bin-ensure-encrypted-partitions.sh
via 95fc7ff423f643992f33f796ffd3cc195d6f680c (commit)
via 4da1edec9c50c7adef8ab9fa500d5f3c40fb296f (commit)
via 4d3b8b299deaa4fff45102a26768e26129b17f10 (commit)
via 3757bbc7155d2a9c83d307925956fa2d524c92a9 (commit)
via 3e269516a7500d49ad90f8590d7dd9e81f135ad6 (commit)
via 6036c55e1239281746152e85dfabbc9ed3cb6864 (commit)
via 414025952297852fff735664047ac14f6590522d (commit)
via daa50b3dc4488c705d2445fcadd2d35968787a68 (commit)
via 903d19948d3fd6c429ba99f68bb71fd989245f19 (commit)
via af106e9180ddc775de473c02a6269dbf3ae1b631 (commit)
via 7458c097e5ecdbb8836be941f03a5de4943f1eff (commit)
via aeb4a79c5f5eb2fd20603a16edffa0a1a0c9aef3 (commit)
via 43baa8f0cca640afc2934e6e65f51e5465e0ec88 (commit)
via 70c33e51905a84c3dcb61c88e5ec5c6479599c28 (commit)
via c9d7f6e5c734f58fa4b0574dfee40bbffbefdc8d (commit)
via dbd421c673da7199ceb3ed1d3398bd55d2707566 (commit)
via 2dd9827a1719f7deec9814e2aee89f4b17136925 (commit)
via 4d3ddc879fbc1dc39407c8b6e5b2f034d2d94e1e (commit)
via 8713dc0a0b40eb00228c229879183544e87be906 (commit)
via 715b5afbe744a85893eca159109658bb8cddc97f (commit)
via 6e5b24e817a0972ab30c9065cfc6a726821e7b66 (commit)
via 866decb73a9cf07b28e26c5028a1d42a5ef243a7 (commit)
via 1bc7e16eb168274baea108092184925b7172ce02 (commit)
via 34cb31d5191ce17c37ddd9d344f4d77125af64a8 (commit)
via d7b9e50e1ac6c3432f9e5c87bffd872b5f6fd572 (commit)
via 199d58a4df0dba1ee71c6816bc3a9d9d439cfd7e (commit)
from e5423707b3e05110b67de9c286b1fcfdcc65113f (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 95fc7ff423f643992f33f796ffd3cc195d6f680c
Author: Tom Clegg <tom at tomclegg.ca>
Date: Tue Aug 4 13:41:22 2020 -0400
16631: Check for containers dispatched reported broken VMs.
Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tom at tomclegg.ca>
diff --git a/lib/dispatchcloud/dispatcher_test.go b/lib/dispatchcloud/dispatcher_test.go
index aa5f22a50..111089c48 100644
--- a/lib/dispatchcloud/dispatcher_test.go
+++ b/lib/dispatchcloud/dispatcher_test.go
@@ -147,17 +147,17 @@ func (s *DispatcherSuite) TestDispatchToStubDriver(c *check.C) {
close(done)
}
}
- executeContainer := func(ctr arvados.Container) int {
- finishContainer(ctr)
- return int(rand.Uint32() & 0x3)
- }
n := 0
s.stubDriver.Queue = queue
s.stubDriver.SetupVM = func(stubvm *test.StubVM) {
n++
stubvm.Boot = time.Now().Add(time.Duration(rand.Int63n(int64(5 * time.Millisecond))))
stubvm.CrunchRunDetachDelay = time.Duration(rand.Int63n(int64(10 * time.Millisecond)))
- stubvm.ExecuteContainer = executeContainer
+ stubvm.ExecuteContainer = func(ctr arvados.Container) int {
+ c.Check(stubvm.ReportedBroken, check.Equals, false, check.Commentf("stub vm %s executing container after reported broken", stubvm))
+ finishContainer(ctr)
+ return int(rand.Uint32() & 0x3)
+ }
stubvm.CrashRunningContainer = finishContainer
switch n % 7 {
case 0:
diff --git a/lib/dispatchcloud/test/stub_driver.go b/lib/dispatchcloud/test/stub_driver.go
index 7a1f42301..30bf15003 100644
--- a/lib/dispatchcloud/test/stub_driver.go
+++ b/lib/dispatchcloud/test/stub_driver.go
@@ -187,6 +187,7 @@ type StubVM struct {
CrunchRunDetachDelay time.Duration
ExecuteContainer func(arvados.Container) int
CrashRunningContainer func(arvados.Container)
+ ReportedBroken bool
sis *StubInstanceSet
id cloud.InstanceID
@@ -317,6 +318,7 @@ func (svm *StubVM) Exec(env map[string]string, command string, stdin io.Reader,
}
if !svm.ReportBroken.IsZero() && svm.ReportBroken.Before(time.Now()) {
fmt.Fprintln(stdout, "broken")
+ svm.ReportedBroken = true
}
return 0
}
-----------------------------------------------------------------------
hooks/post-receive
--
More information about the arvados-commits
mailing list