[ARVADOS] updated: 1.1.1-123-gd7b909c
Git user
git at public.curoverse.com
Mon Dec 4 15:11:59 EST 2017
Summary of changes:
.../_container_scheduling_parameters.liquid | 14 ----------
.../methods/container_requests.html.textile.liquid | 14 ++++++++++
doc/api/methods/containers.html.textile.liquid | 2 +-
services/api/test/unit/container_request_test.rb | 2 +-
services/api/test/unit/container_test.rb | 32 +++++++++++-----------
5 files changed, 32 insertions(+), 32 deletions(-)
via d7b909ceb2646ef0637daaea70c768b799670c60 (commit)
via 5fae6a137301f1a127ef4cccfc6bce86a6a9506c (commit)
from eaf301421b5a71e8344688723c3852e7bd5154b8 (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 d7b909ceb2646ef0637daaea70c768b799670c60
Author: Peter Amstutz <pamstutz at veritasgenetics.com>
Date: Mon Dec 4 15:10:44 2017 -0500
12573: Test cleanup.
Arvados-DCO-1.1-Signed-off-by: Peter Amstutz <pamstutz at veritasgenetics.com>
diff --git a/services/api/test/unit/container_request_test.rb b/services/api/test/unit/container_request_test.rb
index e4c15ef..0edc0f4 100644
--- a/services/api/test/unit/container_request_test.rb
+++ b/services/api/test/unit/container_request_test.rb
@@ -108,7 +108,7 @@ class ContainerRequestTest < ActiveSupport::TestCase
test "Container request priority must be non-nil" do
set_user_from_auth :active
- cr = create_minimal_req!(priority: nil)
+ cr = create_minimal_req!
cr.priority = nil
cr.state = "Committed"
assert_raises(ActiveRecord::RecordInvalid) do
diff --git a/services/api/test/unit/container_test.rb b/services/api/test/unit/container_test.rb
index ab53240..eb4f35f 100644
--- a/services/api/test/unit/container_test.rb
+++ b/services/api/test/unit/container_test.rb
@@ -95,37 +95,37 @@ class ContainerTest < ActiveSupport::TestCase
end
end
- test "Container request valid priority" do
+ test "Container valid priority" do
act_as_system_user do
- cr, _ = minimal_new(environment: {},
+ c, _ = minimal_new(environment: {},
mounts: {"BAR" => "FOO"},
output_path: "/tmp",
priority: 1,
runtime_constraints: {"vcpus" => 1, "ram" => 1})
assert_raises(ActiveRecord::RecordInvalid) do
- cr.priority = -1
- cr.save!
+ c.priority = -1
+ c.save!
end
- cr.priority = 0
- cr.save!
+ c.priority = 0
+ c.save!
- cr.priority = 1
- cr.save!
+ c.priority = 1
+ c.save!
- cr.priority = 500
- cr.save!
+ c.priority = 500
+ c.save!
- cr.priority = 999
- cr.save!
+ c.priority = 999
+ c.save!
- cr.priority = 1000
- cr.save!
+ c.priority = 1000
+ c.save!
assert_raises(ActiveRecord::RecordInvalid) do
- cr.priority = 1001
- cr.save!
+ c.priority = 1001
+ c.save!
end
end
end
commit 5fae6a137301f1a127ef4cccfc6bce86a6a9506c
Author: Peter Amstutz <pamstutz at veritasgenetics.com>
Date: Mon Dec 4 14:55:19 2017 -0500
12573: Clarify docs.
Arvados-DCO-1.1-Signed-off-by: Peter Amstutz <pamstutz at veritasgenetics.com>
diff --git a/doc/_includes/_container_scheduling_parameters.liquid b/doc/_includes/_container_scheduling_parameters.liquid
index d8f4971..6eee4e0 100644
--- a/doc/_includes/_container_scheduling_parameters.liquid
+++ b/doc/_includes/_container_scheduling_parameters.liquid
@@ -11,17 +11,3 @@ Parameters to be passed to the container scheduler (e.g., SLURM) when running a
table(table table-bordered table-condensed).
|_. Key|_. Type|_. Description|_. Notes|
|partitions|array of strings|The names of one or more compute partitions that may run this container. If not provided, the system will choose where to run the container.|Optional.|
-
-h2(#priority). Priority
-
-The @priority@ field has a range of 0-1000.
-
-Priority 0 means no container should run on behalf of this request, and containers already running will be terminated (setting container priority to 0 is the cancel operation.)
-
-Priority 1 is the lowest priority.
-
-Priority 1000 is the highest priority.
-
-The actual order that containers execute is determined by the underlying scheduling software (e.g. SLURM) based on a combination of container priority, submission time and available resources.
-
-The magnitude of difference in priority between two containers affects the weight of priority vs age in determining scheduling order. If two containers have only a small difference in priority (for example, 500 and 501) and the lower priority container has a longer queue time, the lower priority container may be scheduled before the higher priority container. Use a greater magnitude difference (for example, 500 and 600) to give higher weight to priority over queue time.
diff --git a/doc/api/methods/container_requests.html.textile.liquid b/doc/api/methods/container_requests.html.textile.liquid
index 8b9a393..1c2550f 100644
--- a/doc/api/methods/container_requests.html.textile.liquid
+++ b/doc/api/methods/container_requests.html.textile.liquid
@@ -57,6 +57,20 @@ table(table table-bordered table-condensed).
|output_uuid|string|Output collection created when the container finished successfully.|Null if the container has failed or not yet completed.|
|filters|string|Additional constraints for satisfying the container_request, given in the same form as the filters parameter accepted by the container_requests.list API.|
+h2(#priority). Priority
+
+The @priority@ field has a range of 0-1000.
+
+Priority 0 means no container should run on behalf of this request, and containers already running will be terminated (setting container priority to 0 is the cancel operation.)
+
+Priority 1 is the lowest priority.
+
+Priority 1000 is the highest priority.
+
+The actual order that containers execute is determined by the underlying scheduling software (e.g. SLURM) and may be based on a combination of container priority, submission time, available resources, and other factors.
+
+In the current implementation, the magnitude of difference in priority between two containers affects the weight of priority vs age in determining scheduling order. If two containers have only a small difference in priority (for example, 500 and 501) and the lower priority container has a longer queue time, the lower priority container may be scheduled before the higher priority container. Use a greater magnitude difference (for example, 500 and 600) to give higher weight to priority over queue time.
+
h2(#mount_types). {% include 'mount_types' %}
h2(#runtime_constraints). {% include 'container_runtime_constraints' %}
diff --git a/doc/api/methods/containers.html.textile.liquid b/doc/api/methods/containers.html.textile.liquid
index e82016f..30ec055 100644
--- a/doc/api/methods/containers.html.textile.liquid
+++ b/doc/api/methods/containers.html.textile.liquid
@@ -47,7 +47,7 @@ Generally this will contain additional keys that are not present in any correspo
|output|string|Portable data hash of the output collection.|Null if the container is not yet finished.|
|container_image|string|Portable data hash of a collection containing the docker image used to run the container.||
|progress|number|A number between 0.0 and 1.0 describing the fraction of work done.||
-|priority|integer|Range 0-1000. Indicate scheduling order preference.|Assigned by the system as the max() of the priorities of all associated ContainerRequests. See "below for more details":#priority .|
+|priority|integer|Range 0-1000. Indicate scheduling order preference.|Currently assigned by the system as the max() of the priorities of all associated ContainerRequests. See "container request priority":container_requests.html#priority .|
|exit_code|integer|Process exit code.|Null if state!="Complete"|
|auth_uuid|string|UUID of a token to be passed into the container itself, used to access Keep-backed mounts, etc.|Null if state∉{"Locked","Running"}|
|locked_by_uuid|string|UUID of a token, indicating which dispatch process changed state to Locked. If null, any token can be used to lock. If not null, only the indicated token can modify this container.|Null if state∉{"Locked","Running"}|
-----------------------------------------------------------------------
hooks/post-receive
--
More information about the arvados-commits
mailing list