[ARVADOS] updated: 1.3.0-726-gd97f1f245
Git user
git at public.curoverse.com
Wed Apr 17 21:47:50 UTC 2019
Summary of changes:
build/run-tests.sh | 4 +-
doc/_config.yml | 1 +
.../logs-table-management.html.textile.liquid | 55 +++++++
doc/admin/manage-containers.html.textile.liquid | 2 +-
doc/install/arvbox.html.textile.liquid | 55 ++++---
services/api/app/models/container.rb | 13 +-
services/api/test/unit/container_test.rb | 67 ++++++---
tools/arvbox/bin/arvbox | 163 ++++++++++++---------
tools/arvbox/lib/arvbox/docker/Dockerfile.base | 8 +
tools/arvbox/lib/arvbox/docker/createusers.sh | 10 +-
tools/arvbox/lib/arvbox/docker/devenv.sh | 2 +-
11 files changed, 252 insertions(+), 128 deletions(-)
create mode 100644 doc/admin/logs-table-management.html.textile.liquid
via d97f1f245c15cc04f10757505d5b41a1133a766f (commit)
via 348756ad325b87a9305232e52f9be3f3001e36ec (commit)
via 0ab9897ec19e24b7964b2467984065327010d400 (commit)
via 5756eb031199c2ab015463292e7d24f3357c1852 (commit)
via 0e13b30f173cf03c856376bb534a20b9d07d643b (commit)
via 375ddb8a0f46854963d30792072e2bcf06648d17 (commit)
via 1476c801c430df6693d3e2e456ac5718d20f31cf (commit)
via 5e95c9b723e36cf80e0b9c1bf02206520503d4f1 (commit)
via eb6982790aca2975f9d6c01e40b9b9c5aab879ea (commit)
via 79c34c27034d447d3c7141b4f357a1e76e36f831 (commit)
via 9f9e263d16dbd934754fa42375084478f5c74464 (commit)
via aeff8498a0e64e2cbf842e09ac1ad26ca9b8e76c (commit)
from 0e640f9dae3500a280c60d0a7eeed3b39e55970f (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 d97f1f245c15cc04f10757505d5b41a1133a766f
Author: Eric Biagiotti <ebiagiotti at veritasgenetics.com>
Date: Wed Apr 17 17:47:41 2019 -0400
15002: Simplifies state transition to cancelled.
- Also fixes doc typo and removes redundant test after merging in master
Arvados-DCO-1.1-Signed-off-by: Eric Biagiotti <ebiagiotti at veritasgenetics.com>
diff --git a/doc/admin/manage-containers.html.textile.liquid b/doc/admin/manage-containers.html.textile.liquid
index fe8466677..7ff9807d1 100644
--- a/doc/admin/manage-containers.html.textile.liquid
+++ b/doc/admin/manage-containers.html.textile.liquid
@@ -10,7 +10,7 @@ Copyright (C) The Arvados Authors. All rights reserved.
SPDX-License-Identifier: CC-BY-SA-3.0
{% endcomment %}
-This page describes how to control container reuse using the @arv@ command. This can be utilized to avoid reusing a completed container without disabling reuse for the corresponding step in your workflow. For example, if a container exited successfully but produced bad output, it may not be feasible to update the workflow immediately. Meanwhile, changing the state of the container from @Completed@ to @Cancelled@ will disable reuse as the workflow continues to run.
+This page describes how to control container reuse using the @arv@ command. This can be utilized to avoid reusing a completed container without disabling reuse for the corresponding step in your workflow. For example, if a container exited successfully but produced bad output, it may not be feasible to update the workflow immediately. Meanwhile, changing the state of the container from @Complete@ to @Cancelled@ will disable reuse as the workflow continues to run.
If a container is in the @Complete@ state, the following @arv@ command will change its state to @Cancelled@, where @xxxxx-xxxxx-xxxxxxxxxxxxxxx@ is the @UUID@ of the container:
diff --git a/services/api/app/models/container.rb b/services/api/app/models/container.rb
index 9f60e7ff3..d251f8827 100644
--- a/services/api/app/models/container.rb
+++ b/services/api/app/models/container.rb
@@ -89,10 +89,7 @@ class Container < ArvadosModel
nil => [Queued],
Queued => [Locked, Cancelled],
Locked => [Queued, Running, Cancelled],
- Running => [Complete, Cancelled]
- }
-
- Admin_state_transitions = {
+ Running => [Complete, Cancelled],
Complete => [Cancelled]
}
@@ -113,9 +110,7 @@ class Container < ArvadosModel
end
def state_transitions
- valid_transitions = State_transitions.clone
- valid_transitions.merge!(Admin_state_transitions) if current_user.andand.is_admin
- valid_transitions
+ State_transitions
end
# Container priority is the highest "computed priority" of any
diff --git a/services/api/test/unit/container_test.rb b/services/api/test/unit/container_test.rb
index 51379caae..320774189 100644
--- a/services/api/test/unit/container_test.rb
+++ b/services/api/test/unit/container_test.rb
@@ -835,22 +835,6 @@ class ContainerTest < ActiveSupport::TestCase
assert c.update_attributes(exit_code: 1, state: Container::Complete)
end
- [:admin,:active_trustedclient].each do |auth|
- test "state transition from completed to canceled with #{auth}" do
- set_user_from_auth auth
- c, _ = minimal_new
- c.lock
- c.update_attributes(state: Container::Running)
- c.update_attributes(state: Container::Complete)
- if auth == :admin
- c.update_attributes(state: Container::Cancelled)
- assert c.valid?
- else
- check_illegal_updates(c, [{state: Container::Cancelled}])
- end
- end
- end
-
test "locked_by_uuid can update log when locked/running, and output when running" do
set_user_from_auth :active
logcoll = collections(:real_log_collection)
commit 348756ad325b87a9305232e52f9be3f3001e36ec
Merge: 0e640f9da 0ab9897ec
Author: Eric Biagiotti <ebiagiotti at veritasgenetics.com>
Date: Wed Apr 17 17:43:15 2019 -0400
Merge remote-tracking branch 'origin/master' into 15002-cancel-completed-container
refs #15002
Arvados-DCO-1.1-Signed-off-by: Eric Biagiotti <ebiagiotti at veritasgenetics.com>
diff --cc doc/_config.yml
index 0b93e5fab,2ac80f828..f7a6e0876
--- a/doc/_config.yml
+++ b/doc/_config.yml
@@@ -174,7 -174,7 +174,8 @@@ navbar
- Other:
- admin/collection-versioning.html.textile.liquid
- admin/federation.html.textile.liquid
+ - admin/manage-containers.html.textile.liquid
+ - admin/logs-table-management.html.textile.liquid
installguide:
- Overview:
- install/index.html.textile.liquid
-----------------------------------------------------------------------
hooks/post-receive
--
More information about the arvados-commits
mailing list