[arvados] updated: 2.5.0-64-ge6da4efc4
git repository hosting
git at public.arvados.org
Wed Feb 1 19:20:05 UTC 2023
Summary of changes:
doc/api/methods/container_request_lifecycle.svg | 237 +++++++++++++++------
.../methods/container_requests.html.textile.liquid | 72 +++----
2 files changed, 199 insertions(+), 110 deletions(-)
via e6da4efc43f0b913964eb570c0f52336573abbe8 (commit)
via d2c770ed6eafa87f9b488a0e41ce250af57f1bd1 (commit)
via 45828d11792f00d732b7d8e667db8b45b7a0f8b4 (commit)
from 7da8a84dd3697b2a69fc9fd0671dbe0a996a993b (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 e6da4efc43f0b913964eb570c0f52336573abbe8
Author: Tom Clegg <tom at curii.com>
Date: Wed Feb 1 14:14:14 2023 -0500
19624: Layout graph L->R, say "update" instead of "assign".
Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tom at curii.com>
diff --git a/doc/api/methods/container_request_lifecycle.svg b/doc/api/methods/container_request_lifecycle.svg
index 82135da1e..285cebb53 100644
--- a/doc/api/methods/container_request_lifecycle.svg
+++ b/doc/api/methods/container_request_lifecycle.svg
@@ -1,185 +1,186 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><!-- Generated by graphviz version 2.40.1 (20161225.0304)
- --><!-- Title: %0 Pages: 1 --><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="649pt" height="1228pt" viewBox="0.00 0.00 649.15 1228.20">
-<g id="graph0" class="graph" transform="scale(1 1) rotate(0) translate(4 1224.2)">
+ --><!-- Title: %0 Pages: 1 --><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="671pt" height="971pt" viewBox="0.00 0.00 671.08 971.20">
+<g id="graph0" class="graph" transform="scale(1 1) rotate(0) translate(4 967.2)">
<title>%0</title>
-<polygon fill="#ffffff" stroke="transparent" points="-4,4 -4,-1224.2 645.1508,-1224.2 645.1508,4 -4,4"/>
+<polygon fill="#ffffff" stroke="transparent" points="-4,4 -4,-967.2 667.0838,-967.2 667.0838,4 -4,4"/>
<!-- invisiblestart -->
<g id="node1" class="node">
<title>invisiblestart</title>
-<ellipse fill="none" stroke="#ffffff" cx="409.9506" cy="-1202.2" rx="27" ry="18"/>
+<ellipse fill="none" stroke="#ffffff" cx="68.5192" cy="-945.2" rx="27" ry="18"/>
</g>
<!-- uncommitted -->
<g id="node2" class="node">
<title>uncommitted</title>
-<polygon fill="#d3d3d3" stroke="#000000" points="478.489,-1131.2019 341.4122,-1131.2019 341.4122,-1089.9981 478.489,-1089.9981 478.489,-1131.2019"/>
-<text text-anchor="start" x="349.4314" y="-1114.8" font-family="Times,serif" font-size="14.00" fill="#000000">container request:</text>
-<text text-anchor="start" x="349.4314" y="-1098" font-family="Times,serif" font-size="14.00" fill="#000000"> state=Uncommitted</text>
+<polygon fill="#d3d3d3" stroke="#000000" points="137.0576,-874.2019 -.0192,-874.2019 -.0192,-832.9981 137.0576,-832.9981 137.0576,-874.2019"/>
+<text text-anchor="start" x="8" y="-857.8" font-family="Times,serif" font-size="14.00" fill="#000000">container request:</text>
+<text text-anchor="start" x="8" y="-841" font-family="Times,serif" font-size="14.00" fill="#000000"> state=Uncommitted</text>
</g>
<!-- invisiblestart->uncommitted -->
<g id="edge1" class="edge">
<title>invisiblestart->uncommitted</title>
-<path fill="none" stroke="#000000" d="M409.9506,-1184.1028C409.9506,-1171.9708 409.9506,-1155.6846 409.9506,-1141.526"/>
-<polygon fill="#000000" stroke="#000000" points="413.4507,-1141.2174 409.9506,-1131.2175 406.4507,-1141.2175 413.4507,-1141.2174"/>
-<text text-anchor="middle" x="492.5429" y="-1153.6" font-family="Times,serif" font-size="14.00" fill="#000000">user creates container request</text>
+<path fill="none" stroke="#000080" d="M68.5192,-927.1028C68.5192,-914.9708 68.5192,-898.6846 68.5192,-884.526"/>
+<polygon fill="#000080" stroke="#000080" points="72.0193,-884.2174 68.5192,-874.2175 65.0193,-884.2175 72.0193,-884.2174"/>
+<text text-anchor="middle" x="151.1115" y="-896.6" font-family="Times,serif" font-size="14.00" fill="#000080">user creates container request</text>
</g>
<!-- committed -->
<g id="node3" class="node">
<title>committed</title>
-<polygon fill="#ffffff" stroke="#000000" points="471.5044,-1037.2014 348.3968,-1037.2014 348.3968,-978.3986 471.5044,-978.3986 471.5044,-1037.2014"/>
-<text text-anchor="start" x="356.4237" y="-1020.4" font-family="Times,serif" font-size="14.00" fill="#000000">container request:</text>
-<text text-anchor="start" x="356.4237" y="-1003.6" font-family="Times,serif" font-size="14.00" fill="#000000"> state=Committed</text>
-<text text-anchor="start" x="356.4237" y="-986.8" font-family="Times,serif" font-size="14.00" fill="#000000"> priority>0</text>
+<polygon fill="#ffffff" stroke="#000000" points="276.073,-763.4014 152.9654,-763.4014 152.9654,-704.5986 276.073,-704.5986 276.073,-763.4014"/>
+<text text-anchor="start" x="160.9923" y="-746.6" font-family="Times,serif" font-size="14.00" fill="#000000">container request:</text>
+<text text-anchor="start" x="160.9923" y="-729.8" font-family="Times,serif" font-size="14.00" fill="#000000"> state=Committed</text>
+<text text-anchor="start" x="160.9923" y="-713" font-family="Times,serif" font-size="14.00" fill="#000000"> priority>0</text>
</g>
<!-- uncommitted->committed -->
<g id="edge2" class="edge">
<title>uncommitted->committed</title>
-<path fill="none" stroke="#000000" d="M409.9506,-1089.7969C409.9506,-1077.6167 409.9506,-1061.8324 409.9506,-1047.3695"/>
-<polygon fill="#000000" stroke="#000000" points="413.4507,-1047.1422 409.9506,-1037.1423 406.4507,-1047.1423 413.4507,-1047.1422"/>
-<text text-anchor="start" x="409.9506" y="-1059.2" font-family="Times,serif" font-size="14.00" fill="#000000">user assigns state=Committed, priority>0</text>
+<path fill="none" stroke="#000080" d="M93.9505,-832.7673C115.1083,-815.4352 145.7089,-790.3679 170.7868,-769.8246"/>
+<polygon fill="#000080" stroke="#000080" points="173.1981,-772.3738 178.716,-763.3292 168.7622,-766.9587 173.1981,-772.3738"/>
+<text text-anchor="start" x="155.5192" y="-802.2" font-family="Times,serif" font-size="14.00" fill="#000080">user updates to</text>
+<text text-anchor="start" x="155.5192" y="-785.4" font-family="Times,serif" font-size="14.00" fill="#000080">state=Committed, priority>0</text>
</g>
+<!-- latecancelled -->
+<g id="node8" class="node">
+<title>latecancelled</title>
+<polygon fill="#add8e6" stroke="#000000" points="287.545,-83.7003 171.4934,-83.7003 171.4934,-8.2997 287.545,-8.2997 287.545,-83.7003"/>
+<text text-anchor="start" x="179.5063" y="-67" font-family="Times,serif" font-size="14.00" fill="#000000">container request:</text>
+<text text-anchor="start" x="179.5063" y="-50.2" font-family="Times,serif" font-size="14.00" fill="#000000"> state=Final</text>
+<text text-anchor="start" x="179.5063" y="-33.4" font-family="Times,serif" font-size="14.00" fill="#000000">container:</text>
+<text text-anchor="start" x="179.5063" y="-16.6" font-family="Times,serif" font-size="14.00" fill="#000000"> state=Cancelled</text>
+</g>
+<!-- uncommitted->latecancelled -->
<!-- queued -->
<g id="node4" class="node">
<title>queued</title>
-<polygon fill="#ffffff" stroke="#000000" points="415.5044,-909 292.3968,-909 292.3968,-817 415.5044,-817 415.5044,-909"/>
-<text text-anchor="start" x="300.4237" y="-892.4" font-family="Times,serif" font-size="14.00" fill="#000000">container request:</text>
-<text text-anchor="start" x="300.4237" y="-875.6" font-family="Times,serif" font-size="14.00" fill="#000000"> state=Committed</text>
-<text text-anchor="start" x="300.4237" y="-858.8" font-family="Times,serif" font-size="14.00" fill="#000000"> priority>0</text>
-<text text-anchor="start" x="300.4237" y="-842" font-family="Times,serif" font-size="14.00" fill="#000000">container:</text>
-<text text-anchor="start" x="300.4237" y="-825.2" font-family="Times,serif" font-size="14.00" fill="#000000"> state=Queued</text>
+<polygon fill="#ffffff" stroke="#000000" points="340.073,-635.2 216.9654,-635.2 216.9654,-543.2 340.073,-543.2 340.073,-635.2"/>
+<text text-anchor="start" x="224.9923" y="-618.6" font-family="Times,serif" font-size="14.00" fill="#000000">container request:</text>
+<text text-anchor="start" x="224.9923" y="-601.8" font-family="Times,serif" font-size="14.00" fill="#000000"> state=Committed</text>
+<text text-anchor="start" x="224.9923" y="-585" font-family="Times,serif" font-size="14.00" fill="#000000"> priority>0</text>
+<text text-anchor="start" x="224.9923" y="-568.2" font-family="Times,serif" font-size="14.00" fill="#000000">container:</text>
+<text text-anchor="start" x="224.9923" y="-551.4" font-family="Times,serif" font-size="14.00" fill="#000000"> state=Queued</text>
</g>
<!-- committed->queued -->
<g id="edge3" class="edge">
<title>committed->queued</title>
-<path fill="none" stroke="#000000" d="M367.5867,-978.3359C362.5845,-973.0239 358.1923,-967.0861 355.17,-960.6 349.2955,-947.9927 347.0626,-933.4368 346.7401,-919.4777"/>
-<polygon fill="#000000" stroke="#000000" points="350.24,-919.4822 346.8181,-909.4553 343.2402,-919.4277 350.24,-919.4822"/>
-<text text-anchor="start" x="355.9506" y="-948" font-family="Times,serif" font-size="14.00" fill="#000000">Arvados creates</text>
-<text text-anchor="start" x="355.9506" y="-931.2" font-family="Times,serif" font-size="14.00" fill="#000000">a new container</text>
+<path fill="none" stroke="#000000" d="M244.5448,-704.713C249.0836,-699.1171 253.3122,-693.0447 256.5192,-686.8 263.0322,-674.118 267.6303,-659.5353 270.8719,-645.5743"/>
+<polygon fill="#000000" stroke="#000000" points="274.346,-646.0636 273.0006,-635.5545 267.4988,-644.6089 274.346,-646.0636"/>
+<text text-anchor="start" x="269.5192" y="-674.2" font-family="Times,serif" font-size="14.00" fill="#000000">Arvados creates</text>
+<text text-anchor="start" x="269.5192" y="-657.4" font-family="Times,serif" font-size="14.00" fill="#000000">a new container</text>
</g>
<!-- reused -->
<g id="node7" class="node">
<title>reused</title>
-<polygon fill="#add8e6" stroke="#000000" points="549.723,-799 384.1782,-799 384.1782,-707 549.723,-707 549.723,-799"/>
-<text text-anchor="start" x="392.3145" y="-782.4" font-family="Times,serif" font-size="14.00" fill="#000000">container request:</text>
-<text text-anchor="start" x="392.3145" y="-765.6" font-family="Times,serif" font-size="14.00" fill="#000000"> state=Final</text>
-<text text-anchor="start" x="392.3145" y="-748.8" font-family="Times,serif" font-size="14.00" fill="#000000">container:</text>
-<text text-anchor="start" x="392.3145" y="-732" font-family="Times,serif" font-size="14.00" fill="#000000"> state=Complete</text>
-<text text-anchor="start" x="392.3145" y="-715.2" font-family="Times,serif" font-size="14.00" fill="#000000">(reused existing container)</text>
+<polygon fill="#add8e6" stroke="#000000" points="233.2916,-525.2 67.7468,-525.2 67.7468,-433.2 233.2916,-433.2 233.2916,-525.2"/>
+<text text-anchor="start" x="75.8831" y="-508.6" font-family="Times,serif" font-size="14.00" fill="#000000">container request:</text>
+<text text-anchor="start" x="75.8831" y="-491.8" font-family="Times,serif" font-size="14.00" fill="#000000"> state=Final</text>
+<text text-anchor="start" x="75.8831" y="-475" font-family="Times,serif" font-size="14.00" fill="#000000">container:</text>
+<text text-anchor="start" x="75.8831" y="-458.2" font-family="Times,serif" font-size="14.00" fill="#000000"> state=Complete</text>
+<text text-anchor="start" x="75.8831" y="-441.4" font-family="Times,serif" font-size="14.00" fill="#000000">(reused existing container)</text>
</g>
<!-- committed->reused -->
-<g id="edge9" class="edge">
+<g id="edge6" class="edge">
<title>committed->reused</title>
-<path fill="none" stroke="#000000" d="M435.3041,-978.5004C439.0994,-972.8615 442.5415,-966.7779 444.9506,-960.6 463.9273,-911.9361 468.5102,-852.2707 468.8912,-809.4133"/>
-<polygon fill="#000000" stroke="#000000" points="472.3915,-809.1755 468.9055,-799.1706 465.3915,-809.1656 472.3915,-809.1755"/>
-<text text-anchor="start" x="454.9506" y="-948" font-family="Times,serif" font-size="14.00" fill="#000000">Arvados selects an</text>
-<text text-anchor="start" x="454.9506" y="-931.2" font-family="Times,serif" font-size="14.00" fill="#000000">existing container</text>
+<path fill="none" stroke="#000000" d="M161.5309,-704.6546C155.9369,-699.4355 151.0339,-693.4916 147.564,-686.8 123.3185,-640.0437 127.7131,-579.0294 135.9526,-535.2657"/>
+<polygon fill="#000000" stroke="#000000" points="139.4029,-535.8606 137.9363,-525.3677 132.5394,-534.485 139.4029,-535.8606"/>
+<text text-anchor="start" x="148.5192" y="-674.2" font-family="Times,serif" font-size="14.00" fill="#000000">Arvados selects an</text>
+<text text-anchor="start" x="148.5192" y="-657.4" font-family="Times,serif" font-size="14.00" fill="#000000">existing container</text>
</g>
+<!-- containerfinished -->
+<g id="node9" class="node">
+<title>containerfinished</title>
+<polygon fill="#add8e6" stroke="#000000" points="506.4204,-92 390.618,-92 390.618,0 506.4204,0 506.4204,-92"/>
+<text text-anchor="start" x="398.5686" y="-75.4" font-family="Times,serif" font-size="14.00" fill="#000000">container request:</text>
+<text text-anchor="start" x="398.5686" y="-58.6" font-family="Times,serif" font-size="14.00" fill="#000000"> state=Final</text>
+<text text-anchor="start" x="398.5686" y="-41.8" font-family="Times,serif" font-size="14.00" fill="#000000">container:</text>
+<text text-anchor="start" x="398.5686" y="-25" font-family="Times,serif" font-size="14.00" fill="#000000"> state=Complete</text>
+<text text-anchor="start" x="398.5686" y="-8.2" font-family="Times,serif" font-size="14.00" fill="#000000"> exit_code=0</text>
+</g>
+<!-- committed->containerfinished -->
<!-- locked -->
<g id="node5" class="node">
<title>locked</title>
-<polygon fill="#ffffff" stroke="#000000" points="278.5044,-689 155.3968,-689 155.3968,-597 278.5044,-597 278.5044,-689"/>
-<text text-anchor="start" x="163.4237" y="-672.4" font-family="Times,serif" font-size="14.00" fill="#000000">container request:</text>
-<text text-anchor="start" x="163.4237" y="-655.6" font-family="Times,serif" font-size="14.00" fill="#000000"> state=Committed</text>
-<text text-anchor="start" x="163.4237" y="-638.8" font-family="Times,serif" font-size="14.00" fill="#000000"> priority>0</text>
-<text text-anchor="start" x="163.4237" y="-622" font-family="Times,serif" font-size="14.00" fill="#000000">container:</text>
-<text text-anchor="start" x="163.4237" y="-605.2" font-family="Times,serif" font-size="14.00" fill="#000000"> state=Locked</text>
+<polygon fill="#ffffff" stroke="#000000" points="390.073,-415.2 266.9654,-415.2 266.9654,-323.2 390.073,-323.2 390.073,-415.2"/>
+<text text-anchor="start" x="274.9923" y="-398.6" font-family="Times,serif" font-size="14.00" fill="#000000">container request:</text>
+<text text-anchor="start" x="274.9923" y="-381.8" font-family="Times,serif" font-size="14.00" fill="#000000"> state=Committed</text>
+<text text-anchor="start" x="274.9923" y="-365" font-family="Times,serif" font-size="14.00" fill="#000000"> priority>0</text>
+<text text-anchor="start" x="274.9923" y="-348.2" font-family="Times,serif" font-size="14.00" fill="#000000">container:</text>
+<text text-anchor="start" x="274.9923" y="-331.4" font-family="Times,serif" font-size="14.00" fill="#000000"> state=Locked</text>
</g>
<!-- queued->locked -->
<g id="edge4" class="edge">
<title>queued->locked</title>
-<path fill="none" stroke="#000000" d="M292.3327,-849.9144C264.5506,-840.6177 234.3089,-824.9896 217.7142,-799 199.104,-769.8539 198.8677,-730.9752 203.3066,-699.3225"/>
-<polygon fill="#000000" stroke="#000000" points="206.7831,-699.7463 204.8948,-689.3211 199.8697,-698.6485 206.7831,-699.7463"/>
-<text text-anchor="start" x="217.9506" y="-757.2" font-family="Times,serif" font-size="14.00" fill="#000000">Arvados is ready</text>
-<text text-anchor="start" x="217.9506" y="-740.4" font-family="Times,serif" font-size="14.00" fill="#000000">to dispatch the container</text>
-</g>
-<!-- latecancelled -->
-<g id="node8" class="node">
-<title>latecancelled</title>
-<polygon fill="#add8e6" stroke="#000000" points="390.9764,-365.9003 274.9248,-365.9003 274.9248,-290.4997 390.9764,-290.4997 390.9764,-365.9003"/>
-<text text-anchor="start" x="282.9377" y="-349.2" font-family="Times,serif" font-size="14.00" fill="#000000">container request:</text>
-<text text-anchor="start" x="282.9377" y="-332.4" font-family="Times,serif" font-size="14.00" fill="#000000"> state=Final</text>
-<text text-anchor="start" x="282.9377" y="-315.6" font-family="Times,serif" font-size="14.00" fill="#000000">container:</text>
-<text text-anchor="start" x="282.9377" y="-298.8" font-family="Times,serif" font-size="14.00" fill="#000000"> state=Cancelled</text>
+<path fill="none" stroke="#000000" d="M289.0008,-543.0808C296.801,-508.7601 307.4868,-461.7427 315.7801,-425.2522"/>
+<polygon fill="#000000" stroke="#000000" points="319.248,-425.7855 318.0514,-415.2585 312.4221,-424.2341 319.248,-425.7855"/>
+<text text-anchor="start" x="314.5192" y="-483.4" font-family="Times,serif" font-size="14.00" fill="#000000">Arvados is ready</text>
+<text text-anchor="start" x="314.5192" y="-466.6" font-family="Times,serif" font-size="14.00" fill="#000000">to dispatch the container</text>
</g>
<!-- queued->latecancelled -->
-<g id="edge10" class="edge">
+<g id="edge7" class="edge">
<title>queued->latecancelled</title>
-<path fill="none" stroke="#000000" d="M357.167,-816.9688C361.959,-738.4514 368.9951,-573.6962 354.9506,-435.4 352.9585,-415.7835 348.9659,-394.454 344.9223,-376.0244"/>
-<polygon fill="#000000" stroke="#000000" points="348.3009,-375.096 342.683,-366.1133 341.473,-376.6388 348.3009,-375.096"/>
-<text text-anchor="start" x="362.9506" y="-566.4" font-family="Times,serif" font-size="14.00" fill="#000000">user assigns</text>
-<text text-anchor="middle" x="396.58" y="-549.6" font-family="Times,serif" font-size="14.00" fill="#000000">priority=0</text>
+<path fill="none" stroke="#000080" d="M267.3574,-542.8197C254.5187,-486.8824 234.2232,-389.8132 226.5444,-305.2 225.1947,-290.3278 226.4459,-286.533 226.5444,-271.6 226.9481,-210.3694 227.968,-139.7969 228.701,-94.123"/>
+<polygon fill="#000080" stroke="#000080" points="232.2038,-93.9747 228.8667,-83.9192 225.2047,-93.861 232.2038,-93.9747"/>
+<text text-anchor="start" x="227.5192" y="-292.6" font-family="Times,serif" font-size="14.00" fill="#000080">user updates to</text>
+<text text-anchor="start" x="227.5192" y="-275.8" font-family="Times,serif" font-size="14.00" fill="#000080">priority=0</text>
</g>
<!-- running -->
<g id="node6" class="node">
<title>running</title>
-<polygon fill="#ffffff" stroke="#000000" points="219.5044,-527.4 96.3968,-527.4 96.3968,-435.4 219.5044,-435.4 219.5044,-527.4"/>
-<text text-anchor="start" x="104.4237" y="-510.8" font-family="Times,serif" font-size="14.00" fill="#000000">container request:</text>
-<text text-anchor="start" x="104.4237" y="-494" font-family="Times,serif" font-size="14.00" fill="#000000"> state=Committed</text>
-<text text-anchor="start" x="104.4237" y="-477.2" font-family="Times,serif" font-size="14.00" fill="#000000"> priority>0</text>
-<text text-anchor="start" x="104.4237" y="-460.4" font-family="Times,serif" font-size="14.00" fill="#000000">container:</text>
-<text text-anchor="start" x="104.4237" y="-443.6" font-family="Times,serif" font-size="14.00" fill="#000000"> state=Running</text>
+<polygon fill="#ffffff" stroke="#000000" points="527.073,-253.6 403.9654,-253.6 403.9654,-161.6 527.073,-161.6 527.073,-253.6"/>
+<text text-anchor="start" x="411.9923" y="-237" font-family="Times,serif" font-size="14.00" fill="#000000">container request:</text>
+<text text-anchor="start" x="411.9923" y="-220.2" font-family="Times,serif" font-size="14.00" fill="#000000"> state=Committed</text>
+<text text-anchor="start" x="411.9923" y="-203.4" font-family="Times,serif" font-size="14.00" fill="#000000"> priority>0</text>
+<text text-anchor="start" x="411.9923" y="-186.6" font-family="Times,serif" font-size="14.00" fill="#000000">container:</text>
+<text text-anchor="start" x="411.9923" y="-169.8" font-family="Times,serif" font-size="14.00" fill="#000000"> state=Running</text>
</g>
<!-- locked->running -->
<g id="edge5" class="edge">
<title>locked->running</title>
-<path fill="none" stroke="#000000" d="M168.3825,-596.6694C164.5755,-591.0722 161.2803,-585.1474 158.8734,-579 153.9011,-566.3005 151.9641,-551.9392 151.6453,-538.2163"/>
-<polygon fill="#000000" stroke="#000000" points="155.1467,-537.9011 151.6935,-527.8848 148.1468,-537.8684 155.1467,-537.9011"/>
-<text text-anchor="start" x="158.9506" y="-566.4" font-family="Times,serif" font-size="14.00" fill="#000000">Arvados starts the</text>
-<text text-anchor="start" x="158.9506" y="-549.6" font-family="Times,serif" font-size="14.00" fill="#000000">container process</text>
+<path fill="none" stroke="#000000" d="M367.7779,-322.8919C384.042,-303.7074 403.0136,-281.3293 419.8921,-261.42"/>
+<polygon fill="#000000" stroke="#000000" points="422.6949,-263.5264 426.4918,-253.6353 417.3554,-258.9997 422.6949,-263.5264"/>
+<text text-anchor="start" x="409.5192" y="-292.6" font-family="Times,serif" font-size="14.00" fill="#000000">Arvados starts the</text>
+<text text-anchor="start" x="409.5192" y="-275.8" font-family="Times,serif" font-size="14.00" fill="#000000">container process</text>
</g>
<!-- locked->latecancelled -->
-<g id="edge11" class="edge">
+<g id="edge8" class="edge">
<title>locked->latecancelled</title>
-<path fill="none" stroke="#000000" d="M251.1301,-596.67C254.4575,-590.9023 257.5005,-584.9399 259.9506,-579 284.7368,-518.9089 268.7831,-497.5912 287.6918,-435.4 293.797,-415.3198 302.4007,-393.8826 310.4696,-375.4969"/>
-<polygon fill="#000000" stroke="#000000" points="313.7464,-376.7423 314.6242,-366.1839 307.3537,-373.8904 313.7464,-376.7423"/>
-<text text-anchor="start" x="287.9506" y="-485.6" font-family="Times,serif" font-size="14.00" fill="#000000">user assigns</text>
-<text text-anchor="middle" x="321.58" y="-468.8" font-family="Times,serif" font-size="14.00" fill="#000000">priority=0</text>
+<path fill="none" stroke="#000080" d="M324.0027,-323.113C321.8451,-306.6992 318.7774,-288.1798 314.5192,-271.6 298.2378,-208.2067 270.1309,-138.0815 250.7207,-93.103"/>
+<polygon fill="#000080" stroke="#000080" points="253.9156,-91.673 246.7182,-83.8982 247.4962,-94.4644 253.9156,-91.673"/>
+<text text-anchor="start" x="309.5192" y="-211.8" font-family="Times,serif" font-size="14.00" fill="#000080">user updates to</text>
+<text text-anchor="start" x="309.5192" y="-195" font-family="Times,serif" font-size="14.00" fill="#000080">priority=0</text>
</g>
<!-- running->latecancelled -->
-<g id="edge12" class="edge">
+<g id="edge9" class="edge">
<title>running->latecancelled</title>
-<path fill="none" stroke="#000000" d="M164.8156,-435.1884C169.7405,-416.9111 178.1923,-397.1282 192.6918,-383.8 215.7902,-362.5676 231.6944,-377.1323 260.9506,-365.8 262.5327,-365.1872 264.1251,-364.5489 265.7234,-363.889"/>
-<polygon fill="#000000" stroke="#000000" points="267.1328,-367.0927 274.91,-359.8979 264.3435,-360.6724 267.1328,-367.0927"/>
-<text text-anchor="start" x="192.9506" y="-404.8" font-family="Times,serif" font-size="14.00" fill="#000000">user assigns</text>
-<text text-anchor="middle" x="226.58" y="-388" font-family="Times,serif" font-size="14.00" fill="#000000">priority=0</text>
-</g>
-<!-- containerfinished -->
-<g id="node9" class="node">
-<title>containerfinished</title>
-<polygon fill="#add8e6" stroke="#000000" points="115.8518,-92 .0494,-92 .0494,0 115.8518,0 115.8518,-92"/>
-<text text-anchor="start" x="8" y="-75.4" font-family="Times,serif" font-size="14.00" fill="#000000">container request:</text>
-<text text-anchor="start" x="8" y="-58.6" font-family="Times,serif" font-size="14.00" fill="#000000"> state=Final</text>
-<text text-anchor="start" x="8" y="-41.8" font-family="Times,serif" font-size="14.00" fill="#000000">container:</text>
-<text text-anchor="start" x="8" y="-25" font-family="Times,serif" font-size="14.00" fill="#000000"> state=Complete</text>
-<text text-anchor="start" x="8" y="-8.2" font-family="Times,serif" font-size="14.00" fill="#000000"> exit_code=0</text>
+<path fill="none" stroke="#000080" d="M403.9268,-169.8339C399.0748,-167.008 394.2309,-164.2342 389.5192,-161.6 374.2599,-153.0688 369.1603,-153.1918 354.5444,-143.6 334.8403,-130.669 332.0122,-124.6106 313.5192,-110 305.1484,-103.3866 296.2433,-96.4732 287.4791,-89.7377"/>
+<polygon fill="#000080" stroke="#000080" points="289.5559,-86.9197 279.4893,-83.6159 285.2984,-92.4762 289.5559,-86.9197"/>
+<text text-anchor="start" x="355.5192" y="-131" font-family="Times,serif" font-size="14.00" fill="#000080">user updates to</text>
+<text text-anchor="start" x="355.5192" y="-114.2" font-family="Times,serif" font-size="14.00" fill="#000080">priority=0</text>
</g>
<!-- running->containerfinished -->
-<g id="edge14" class="edge">
+<g id="edge11" class="edge">
<title>running->containerfinished</title>
-<path fill="none" stroke="#000000" d="M128.1412,-435.1351C103.681,-394.244 70.9515,-332.0279 57.386,-272.6 44.4037,-215.7269 46.6506,-148.7117 50.8397,-102.3858"/>
-<polygon fill="#000000" stroke="#000000" points="54.3417,-102.533 51.8178,-92.2432 47.374,-101.861 54.3417,-102.533"/>
-<text text-anchor="start" x="57.9506" y="-260" font-family="Times,serif" font-size="14.00" fill="#000000">container process</text>
-<text text-anchor="start" x="57.9506" y="-243.2" font-family="Times,serif" font-size="14.00" fill="#000000">succeeds</text>
+<path fill="none" stroke="#000000" d="M448.0423,-161.56C446.3599,-155.5907 444.922,-149.5009 443.9546,-143.6 441.7896,-130.3941 441.3924,-116.0587 441.8791,-102.5441"/>
+<polygon fill="#000000" stroke="#000000" points="445.3824,-102.5706 442.4089,-92.4016 438.3919,-102.2054 445.3824,-102.5706"/>
+<text text-anchor="start" x="444.5192" y="-131" font-family="Times,serif" font-size="14.00" fill="#000000">container process</text>
+<text text-anchor="start" x="444.5192" y="-114.2" font-family="Times,serif" font-size="14.00" fill="#000000">succeeds</text>
</g>
<!-- containerfailed -->
<g id="node10" class="node">
<title>containerfailed</title>
-<polygon fill="#add8e6" stroke="#000000" points="216.8518,-221 101.0494,-221 101.0494,-129 216.8518,-129 216.8518,-221"/>
-<text text-anchor="start" x="109" y="-204.4" font-family="Times,serif" font-size="14.00" fill="#000000">container request:</text>
-<text text-anchor="start" x="109" y="-187.6" font-family="Times,serif" font-size="14.00" fill="#000000"> state=Final</text>
-<text text-anchor="start" x="109" y="-170.8" font-family="Times,serif" font-size="14.00" fill="#000000">container:</text>
-<text text-anchor="start" x="109" y="-154" font-family="Times,serif" font-size="14.00" fill="#000000"> state=Complete</text>
-<text text-anchor="start" x="109" y="-137.2" font-family="Times,serif" font-size="14.00" fill="#000000"> exit_code≠0</text>
+<polygon fill="#add8e6" stroke="#000000" points="646.4204,-92 530.618,-92 530.618,0 646.4204,0 646.4204,-92"/>
+<text text-anchor="start" x="538.5686" y="-75.4" font-family="Times,serif" font-size="14.00" fill="#000000">container request:</text>
+<text text-anchor="start" x="538.5686" y="-58.6" font-family="Times,serif" font-size="14.00" fill="#000000"> state=Final</text>
+<text text-anchor="start" x="538.5686" y="-41.8" font-family="Times,serif" font-size="14.00" fill="#000000">container:</text>
+<text text-anchor="start" x="538.5686" y="-25" font-family="Times,serif" font-size="14.00" fill="#000000"> state=Complete</text>
+<text text-anchor="start" x="538.5686" y="-8.2" font-family="Times,serif" font-size="14.00" fill="#000000"> exit_code≠0</text>
</g>
<!-- running->containerfailed -->
-<g id="edge13" class="edge">
+<g id="edge10" class="edge">
<title>running->containerfailed</title>
-<path fill="none" stroke="#000000" d="M158.1014,-435.1971C158.2795,-380.6295 158.5756,-289.8888 158.7669,-231.273"/>
-<polygon fill="#000000" stroke="#000000" points="162.2675,-231.0885 158.8002,-221.0771 155.2675,-231.0656 162.2675,-231.0885"/>
-<text text-anchor="start" x="158.9506" y="-332.4" font-family="Times,serif" font-size="14.00" fill="#000000">container process</text>
-<text text-anchor="start" x="158.9506" y="-315.6" font-family="Times,serif" font-size="14.00" fill="#000000">fails</text>
+<path fill="none" stroke="#000000" d="M527.0464,-164.5372C534.1382,-158.0268 540.8477,-150.9952 546.5192,-143.6 556.0963,-131.1122 563.9546,-116.1085 570.1761,-101.6525"/>
+<polygon fill="#000000" stroke="#000000" points="573.4704,-102.8439 574.0298,-92.2639 566.9947,-100.1858 573.4704,-102.8439"/>
+<text text-anchor="start" x="565.5192" y="-131" font-family="Times,serif" font-size="14.00" fill="#000000">container process</text>
+<text text-anchor="start" x="565.5192" y="-114.2" font-family="Times,serif" font-size="14.00" fill="#000000">fails</text>
</g>
<!-- reused->latecancelled -->
-<!-- latecancelled->containerfailed -->
-<!-- containerfailed->containerfinished -->
</g>
</svg>
\ No newline at end of file
diff --git a/doc/api/methods/container_requests.html.textile.liquid b/doc/api/methods/container_requests.html.textile.liquid
index bbd1a8de9..869e22d85 100644
--- a/doc/api/methods/container_requests.html.textile.liquid
+++ b/doc/api/methods/container_requests.html.textile.liquid
@@ -82,8 +82,8 @@ digraph {
node [color=black] [fillcolor=white] [style=filled] [shape=box] [nojustify=true];
uncommitted [label = "container request:\l state=Uncommitted\l"] [fillcolor=lightgrey];
committed [label = "container request:\l state=Committed\l priority>0\l"];
- invisiblestart -> uncommitted [label = "user creates container request"];
- uncommitted -> committed [label = "user assigns state=Committed, priority>0\l"];
+ invisiblestart -> uncommitted [label = "user creates container request"] [color=navy] [fontcolor=navy];
+ uncommitted -> committed [label = "user updates to\lstate=Committed, priority>0\l"] [color=navy] [fontcolor=navy];
queued [label = "container request:\l state=Committed\l priority>0\lcontainer:\l state=Queued\l"];
committed -> queued [label = "Arvados creates\la new container\l"];
locked [label = "container request:\l state=Committed\l priority>0\lcontainer:\l state=Locked\l"];
@@ -96,14 +96,18 @@ digraph {
latecancelled [label = "container request:\l state=Final\lcontainer:\l state=Cancelled\l"];
containerfinished [label = "container request:\l state=Final\lcontainer:\l state=Complete\l exit_code=0\l"];
containerfailed [label = "container request:\l state=Final\lcontainer:\l state=Complete\l exit_code≠0\l"];
- reused -> latecancelled -> containerfailed -> containerfinished [style=invis];
committed -> reused [label = "Arvados selects an\lexisting container\l"];
- queued -> latecancelled [label = "user assigns\lpriority=0"];
- locked -> latecancelled [label = "user assigns\lpriority=0"];
- running -> latecancelled [label = "user assigns\lpriority=0"];
+ queued -> latecancelled [label = "user updates to\lpriority=0\l"] [color=navy] [fontcolor=navy];
+ locked -> latecancelled [label = "user updates to\lpriority=0\l"] [color=navy] [fontcolor=navy];
+ running -> latecancelled [label = "user updates to\lpriority=0\l"] [color=navy] [fontcolor=navy];
running -> containerfailed [label = "container process\lfails\l"];
running -> containerfinished [label = "container process\lsucceeds\l"];
+
+ # layout hacks
+ committed -> containerfinished [style=invis];
+ uncommitted -> latecancelled [style=invis];
+ reused -> latecancelled [style=invis];
}
{% endcomment %}
commit d2c770ed6eafa87f9b488a0e41ce250af57f1bd1
Author: Tom Clegg <tom at curii.com>
Date: Tue Jan 31 16:26:06 2023 -0500
19624: Redo diagram to show CR and container states.
Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tom at curii.com>
diff --git a/doc/api/methods/container_request_lifecycle.svg b/doc/api/methods/container_request_lifecycle.svg
index 71912b978..82135da1e 100644
--- a/doc/api/methods/container_request_lifecycle.svg
+++ b/doc/api/methods/container_request_lifecycle.svg
@@ -1,92 +1,185 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><!-- Generated by graphviz version 2.40.1 (20161225.0304)
- --><!-- Title: %0 Pages: 1 --><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="283pt" height="580pt" viewBox="0.00 0.00 282.67 579.60">
-<g id="graph0" class="graph" transform="scale(1 1) rotate(0) translate(4 575.6)">
+ --><!-- Title: %0 Pages: 1 --><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="649pt" height="1228pt" viewBox="0.00 0.00 649.15 1228.20">
+<g id="graph0" class="graph" transform="scale(1 1) rotate(0) translate(4 1224.2)">
<title>%0</title>
-<polygon fill="#ffffff" stroke="transparent" points="-4,4 -4,-575.6 278.6656,-575.6 278.6656,4 -4,4"/>
-<g id="clust1" class="cluster">
-<title>cluster_uncommitted</title>
-<polygon fill="#d3d3d3" stroke="#d3d3d3" points="40,-486.8 40,-563.6 150,-563.6 150,-486.8 40,-486.8"/>
-<text text-anchor="middle" x="95" y="-547" font-family="Times,serif" font-size="14.00" fill="#000000">Uncommitted</text>
-</g>
-<g id="clust2" class="cluster">
-<title>cluster_committed</title>
-<polygon fill="#d3d3d3" stroke="#d3d3d3" points="55,-136.4 55,-435.2 135,-435.2 135,-136.4 55,-136.4"/>
-<text text-anchor="middle" x="95" y="-418.6" font-family="Times,serif" font-size="14.00" fill="#000000">Committed</text>
-</g>
-<g id="clust3" class="cluster">
-<title>cluster_final</title>
-<polygon fill="#d3d3d3" stroke="#d3d3d3" points="8,-8 8,-84.8 184,-84.8 184,-8 8,-8"/>
-<text text-anchor="middle" x="96" y="-68.2" font-family="Times,serif" font-size="14.00" fill="#000000">Final</text>
-</g>
-<!-- nocontainer -->
+<polygon fill="#ffffff" stroke="transparent" points="-4,4 -4,-1224.2 645.1508,-1224.2 645.1508,4 -4,4"/>
+<!-- invisiblestart -->
<g id="node1" class="node">
-<title>nocontainer</title>
-<polygon fill="#d3d3d3" stroke="#000000" points="142.4068,-530.8 47.5932,-530.8 47.5932,-494.8 142.4068,-494.8 142.4068,-530.8"/>
-<text text-anchor="middle" x="95" y="-508.6" font-family="Times,serif" font-size="14.00" fill="#000000">(no container)</text>
+<title>invisiblestart</title>
+<ellipse fill="none" stroke="#ffffff" cx="409.9506" cy="-1202.2" rx="27" ry="18"/>
</g>
-<!-- queued -->
+<!-- uncommitted -->
<g id="node2" class="node">
-<title>queued</title>
-<polygon fill="#ffffff" stroke="#000000" points="124.5376,-402.4 65.4624,-402.4 65.4624,-366.4 124.5376,-366.4 124.5376,-402.4"/>
-<text text-anchor="middle" x="95" y="-380.2" font-family="Times,serif" font-size="14.00" fill="#000000">Queued</text>
+<title>uncommitted</title>
+<polygon fill="#d3d3d3" stroke="#000000" points="478.489,-1131.2019 341.4122,-1131.2019 341.4122,-1089.9981 478.489,-1089.9981 478.489,-1131.2019"/>
+<text text-anchor="start" x="349.4314" y="-1114.8" font-family="Times,serif" font-size="14.00" fill="#000000">container request:</text>
+<text text-anchor="start" x="349.4314" y="-1098" font-family="Times,serif" font-size="14.00" fill="#000000"> state=Uncommitted</text>
</g>
-<!-- nocontainer->queued -->
+<!-- invisiblestart->uncommitted -->
<g id="edge1" class="edge">
-<title>nocontainer->queued</title>
-<path fill="none" stroke="#000000" d="M95,-494.6757C95,-473.3589 95,-437.718 95,-412.7396"/>
-<polygon fill="#000000" stroke="#000000" points="98.5001,-412.432 95,-402.4321 91.5001,-412.4321 98.5001,-412.432"/>
-<text text-anchor="middle" x="178.7207" y="-464.2" font-family="Times,serif" font-size="14.00" fill="#000000"> start container by setting </text>
-<text text-anchor="middle" x="178.7207" y="-447.4" font-family="Times,serif" font-size="14.00" fill="#000000"> state=Committed, priority>0 </text>
+<title>invisiblestart->uncommitted</title>
+<path fill="none" stroke="#000000" d="M409.9506,-1184.1028C409.9506,-1171.9708 409.9506,-1155.6846 409.9506,-1141.526"/>
+<polygon fill="#000000" stroke="#000000" points="413.4507,-1141.2174 409.9506,-1131.2175 406.4507,-1141.2175 413.4507,-1141.2174"/>
+<text text-anchor="middle" x="492.5429" y="-1153.6" font-family="Times,serif" font-size="14.00" fill="#000000">user creates container request</text>
</g>
-<!-- locked -->
+<!-- committed -->
<g id="node3" class="node">
-<title>locked</title>
-<polygon fill="#ffffff" stroke="#000000" points="123.9818,-291.4 66.0182,-291.4 66.0182,-255.4 123.9818,-255.4 123.9818,-291.4"/>
-<text text-anchor="middle" x="95" y="-269.2" font-family="Times,serif" font-size="14.00" fill="#000000">Locked</text>
+<title>committed</title>
+<polygon fill="#ffffff" stroke="#000000" points="471.5044,-1037.2014 348.3968,-1037.2014 348.3968,-978.3986 471.5044,-978.3986 471.5044,-1037.2014"/>
+<text text-anchor="start" x="356.4237" y="-1020.4" font-family="Times,serif" font-size="14.00" fill="#000000">container request:</text>
+<text text-anchor="start" x="356.4237" y="-1003.6" font-family="Times,serif" font-size="14.00" fill="#000000"> state=Committed</text>
+<text text-anchor="start" x="356.4237" y="-986.8" font-family="Times,serif" font-size="14.00" fill="#000000"> priority>0</text>
</g>
-<!-- queued->locked -->
+<!-- uncommitted->committed -->
<g id="edge2" class="edge">
-<title>queued->locked</title>
-<path fill="none" stroke="#000000" d="M95,-366.0706C95,-348.6373 95,-322.1482 95,-301.9489"/>
-<polygon fill="#000000" stroke="#000000" points="98.5001,-301.7566 95,-291.7566 91.5001,-301.7567 98.5001,-301.7566"/>
+<title>uncommitted->committed</title>
+<path fill="none" stroke="#000000" d="M409.9506,-1089.7969C409.9506,-1077.6167 409.9506,-1061.8324 409.9506,-1047.3695"/>
+<polygon fill="#000000" stroke="#000000" points="413.4507,-1047.1422 409.9506,-1037.1423 406.4507,-1047.1423 413.4507,-1047.1422"/>
+<text text-anchor="start" x="409.9506" y="-1059.2" font-family="Times,serif" font-size="14.00" fill="#000000">user assigns state=Committed, priority>0</text>
</g>
-<!-- running -->
+<!-- queued -->
<g id="node4" class="node">
-<title>running</title>
-<polygon fill="#ffffff" stroke="#000000" points="127.2276,-180.4 62.7724,-180.4 62.7724,-144.4 127.2276,-144.4 127.2276,-180.4"/>
-<text text-anchor="middle" x="95" y="-158.2" font-family="Times,serif" font-size="14.00" fill="#000000">Running</text>
+<title>queued</title>
+<polygon fill="#ffffff" stroke="#000000" points="415.5044,-909 292.3968,-909 292.3968,-817 415.5044,-817 415.5044,-909"/>
+<text text-anchor="start" x="300.4237" y="-892.4" font-family="Times,serif" font-size="14.00" fill="#000000">container request:</text>
+<text text-anchor="start" x="300.4237" y="-875.6" font-family="Times,serif" font-size="14.00" fill="#000000"> state=Committed</text>
+<text text-anchor="start" x="300.4237" y="-858.8" font-family="Times,serif" font-size="14.00" fill="#000000"> priority>0</text>
+<text text-anchor="start" x="300.4237" y="-842" font-family="Times,serif" font-size="14.00" fill="#000000">container:</text>
+<text text-anchor="start" x="300.4237" y="-825.2" font-family="Times,serif" font-size="14.00" fill="#000000"> state=Queued</text>
</g>
-<!-- locked->running -->
+<!-- committed->queued -->
<g id="edge3" class="edge">
-<title>locked->running</title>
-<path fill="none" stroke="#000000" d="M95,-255.0706C95,-237.6373 95,-211.1482 95,-190.9489"/>
-<polygon fill="#000000" stroke="#000000" points="98.5001,-190.7566 95,-180.7566 91.5001,-190.7567 98.5001,-190.7566"/>
+<title>committed->queued</title>
+<path fill="none" stroke="#000000" d="M367.5867,-978.3359C362.5845,-973.0239 358.1923,-967.0861 355.17,-960.6 349.2955,-947.9927 347.0626,-933.4368 346.7401,-919.4777"/>
+<polygon fill="#000000" stroke="#000000" points="350.24,-919.4822 346.8181,-909.4553 343.2402,-919.4277 350.24,-919.4822"/>
+<text text-anchor="start" x="355.9506" y="-948" font-family="Times,serif" font-size="14.00" fill="#000000">Arvados creates</text>
+<text text-anchor="start" x="355.9506" y="-931.2" font-family="Times,serif" font-size="14.00" fill="#000000">a new container</text>
</g>
-<!-- complete -->
+<!-- reused -->
+<g id="node7" class="node">
+<title>reused</title>
+<polygon fill="#add8e6" stroke="#000000" points="549.723,-799 384.1782,-799 384.1782,-707 549.723,-707 549.723,-799"/>
+<text text-anchor="start" x="392.3145" y="-782.4" font-family="Times,serif" font-size="14.00" fill="#000000">container request:</text>
+<text text-anchor="start" x="392.3145" y="-765.6" font-family="Times,serif" font-size="14.00" fill="#000000"> state=Final</text>
+<text text-anchor="start" x="392.3145" y="-748.8" font-family="Times,serif" font-size="14.00" fill="#000000">container:</text>
+<text text-anchor="start" x="392.3145" y="-732" font-family="Times,serif" font-size="14.00" fill="#000000"> state=Complete</text>
+<text text-anchor="start" x="392.3145" y="-715.2" font-family="Times,serif" font-size="14.00" fill="#000000">(reused existing container)</text>
+</g>
+<!-- committed->reused -->
+<g id="edge9" class="edge">
+<title>committed->reused</title>
+<path fill="none" stroke="#000000" d="M435.3041,-978.5004C439.0994,-972.8615 442.5415,-966.7779 444.9506,-960.6 463.9273,-911.9361 468.5102,-852.2707 468.8912,-809.4133"/>
+<polygon fill="#000000" stroke="#000000" points="472.3915,-809.1755 468.9055,-799.1706 465.3915,-809.1656 472.3915,-809.1755"/>
+<text text-anchor="start" x="454.9506" y="-948" font-family="Times,serif" font-size="14.00" fill="#000000">Arvados selects an</text>
+<text text-anchor="start" x="454.9506" y="-931.2" font-family="Times,serif" font-size="14.00" fill="#000000">existing container</text>
+</g>
+<!-- locked -->
<g id="node5" class="node">
-<title>complete</title>
-<polygon fill="#ffffff" stroke="#000000" points="86.439,-52 15.561,-52 15.561,-16 86.439,-16 86.439,-52"/>
-<text text-anchor="middle" x="51" y="-29.8" font-family="Times,serif" font-size="14.00" fill="#000000">Complete</text>
+<title>locked</title>
+<polygon fill="#ffffff" stroke="#000000" points="278.5044,-689 155.3968,-689 155.3968,-597 278.5044,-597 278.5044,-689"/>
+<text text-anchor="start" x="163.4237" y="-672.4" font-family="Times,serif" font-size="14.00" fill="#000000">container request:</text>
+<text text-anchor="start" x="163.4237" y="-655.6" font-family="Times,serif" font-size="14.00" fill="#000000"> state=Committed</text>
+<text text-anchor="start" x="163.4237" y="-638.8" font-family="Times,serif" font-size="14.00" fill="#000000"> priority>0</text>
+<text text-anchor="start" x="163.4237" y="-622" font-family="Times,serif" font-size="14.00" fill="#000000">container:</text>
+<text text-anchor="start" x="163.4237" y="-605.2" font-family="Times,serif" font-size="14.00" fill="#000000"> state=Locked</text>
</g>
-<!-- running->complete -->
+<!-- queued->locked -->
<g id="edge4" class="edge">
-<title>running->complete</title>
-<path fill="none" stroke="#000000" d="M88.7892,-144.2757C81.4189,-122.7678 69.0515,-86.6775 60.482,-61.6702"/>
-<polygon fill="#000000" stroke="#000000" points="63.732,-60.3574 57.1792,-52.0321 57.11,-62.6267 63.732,-60.3574"/>
+<title>queued->locked</title>
+<path fill="none" stroke="#000000" d="M292.3327,-849.9144C264.5506,-840.6177 234.3089,-824.9896 217.7142,-799 199.104,-769.8539 198.8677,-730.9752 203.3066,-699.3225"/>
+<polygon fill="#000000" stroke="#000000" points="206.7831,-699.7463 204.8948,-689.3211 199.8697,-698.6485 206.7831,-699.7463"/>
+<text text-anchor="start" x="217.9506" y="-757.2" font-family="Times,serif" font-size="14.00" fill="#000000">Arvados is ready</text>
+<text text-anchor="start" x="217.9506" y="-740.4" font-family="Times,serif" font-size="14.00" fill="#000000">to dispatch the container</text>
+</g>
+<!-- latecancelled -->
+<g id="node8" class="node">
+<title>latecancelled</title>
+<polygon fill="#add8e6" stroke="#000000" points="390.9764,-365.9003 274.9248,-365.9003 274.9248,-290.4997 390.9764,-290.4997 390.9764,-365.9003"/>
+<text text-anchor="start" x="282.9377" y="-349.2" font-family="Times,serif" font-size="14.00" fill="#000000">container request:</text>
+<text text-anchor="start" x="282.9377" y="-332.4" font-family="Times,serif" font-size="14.00" fill="#000000"> state=Final</text>
+<text text-anchor="start" x="282.9377" y="-315.6" font-family="Times,serif" font-size="14.00" fill="#000000">container:</text>
+<text text-anchor="start" x="282.9377" y="-298.8" font-family="Times,serif" font-size="14.00" fill="#000000"> state=Cancelled</text>
</g>
-<!-- cancelled -->
+<!-- queued->latecancelled -->
+<g id="edge10" class="edge">
+<title>queued->latecancelled</title>
+<path fill="none" stroke="#000000" d="M357.167,-816.9688C361.959,-738.4514 368.9951,-573.6962 354.9506,-435.4 352.9585,-415.7835 348.9659,-394.454 344.9223,-376.0244"/>
+<polygon fill="#000000" stroke="#000000" points="348.3009,-375.096 342.683,-366.1133 341.473,-376.6388 348.3009,-375.096"/>
+<text text-anchor="start" x="362.9506" y="-566.4" font-family="Times,serif" font-size="14.00" fill="#000000">user assigns</text>
+<text text-anchor="middle" x="396.58" y="-549.6" font-family="Times,serif" font-size="14.00" fill="#000000">priority=0</text>
+</g>
+<!-- running -->
<g id="node6" class="node">
-<title>cancelled</title>
-<polygon fill="#ffffff" stroke="#000000" points="175.9762,-52 104.0238,-52 104.0238,-16 175.9762,-16 175.9762,-52"/>
-<text text-anchor="middle" x="140" y="-29.8" font-family="Times,serif" font-size="14.00" fill="#000000">Cancelled</text>
+<title>running</title>
+<polygon fill="#ffffff" stroke="#000000" points="219.5044,-527.4 96.3968,-527.4 96.3968,-435.4 219.5044,-435.4 219.5044,-527.4"/>
+<text text-anchor="start" x="104.4237" y="-510.8" font-family="Times,serif" font-size="14.00" fill="#000000">container request:</text>
+<text text-anchor="start" x="104.4237" y="-494" font-family="Times,serif" font-size="14.00" fill="#000000"> state=Committed</text>
+<text text-anchor="start" x="104.4237" y="-477.2" font-family="Times,serif" font-size="14.00" fill="#000000"> priority>0</text>
+<text text-anchor="start" x="104.4237" y="-460.4" font-family="Times,serif" font-size="14.00" fill="#000000">container:</text>
+<text text-anchor="start" x="104.4237" y="-443.6" font-family="Times,serif" font-size="14.00" fill="#000000"> state=Running</text>
</g>
-<!-- running->cancelled -->
+<!-- locked->running -->
<g id="edge5" class="edge">
-<title>running->cancelled</title>
-<path fill="none" stroke="#ff0000" d="M101.352,-144.2757C108.8898,-122.7678 121.5383,-86.6775 130.3025,-61.6702"/>
-<polygon fill="#ff0000" stroke="#ff0000" points="133.6759,-62.6269 133.6804,-52.0321 127.0698,-60.3116 133.6759,-62.6269"/>
-<text text-anchor="middle" x="196.3328" y="-113.8" font-family="Times,serif" font-size="14.00" fill="#000000"> cancel container by setting </text>
-<text text-anchor="middle" x="196.3328" y="-97" font-family="Times,serif" font-size="14.00" fill="#000000"> priority=0 </text>
+<title>locked->running</title>
+<path fill="none" stroke="#000000" d="M168.3825,-596.6694C164.5755,-591.0722 161.2803,-585.1474 158.8734,-579 153.9011,-566.3005 151.9641,-551.9392 151.6453,-538.2163"/>
+<polygon fill="#000000" stroke="#000000" points="155.1467,-537.9011 151.6935,-527.8848 148.1468,-537.8684 155.1467,-537.9011"/>
+<text text-anchor="start" x="158.9506" y="-566.4" font-family="Times,serif" font-size="14.00" fill="#000000">Arvados starts the</text>
+<text text-anchor="start" x="158.9506" y="-549.6" font-family="Times,serif" font-size="14.00" fill="#000000">container process</text>
+</g>
+<!-- locked->latecancelled -->
+<g id="edge11" class="edge">
+<title>locked->latecancelled</title>
+<path fill="none" stroke="#000000" d="M251.1301,-596.67C254.4575,-590.9023 257.5005,-584.9399 259.9506,-579 284.7368,-518.9089 268.7831,-497.5912 287.6918,-435.4 293.797,-415.3198 302.4007,-393.8826 310.4696,-375.4969"/>
+<polygon fill="#000000" stroke="#000000" points="313.7464,-376.7423 314.6242,-366.1839 307.3537,-373.8904 313.7464,-376.7423"/>
+<text text-anchor="start" x="287.9506" y="-485.6" font-family="Times,serif" font-size="14.00" fill="#000000">user assigns</text>
+<text text-anchor="middle" x="321.58" y="-468.8" font-family="Times,serif" font-size="14.00" fill="#000000">priority=0</text>
+</g>
+<!-- running->latecancelled -->
+<g id="edge12" class="edge">
+<title>running->latecancelled</title>
+<path fill="none" stroke="#000000" d="M164.8156,-435.1884C169.7405,-416.9111 178.1923,-397.1282 192.6918,-383.8 215.7902,-362.5676 231.6944,-377.1323 260.9506,-365.8 262.5327,-365.1872 264.1251,-364.5489 265.7234,-363.889"/>
+<polygon fill="#000000" stroke="#000000" points="267.1328,-367.0927 274.91,-359.8979 264.3435,-360.6724 267.1328,-367.0927"/>
+<text text-anchor="start" x="192.9506" y="-404.8" font-family="Times,serif" font-size="14.00" fill="#000000">user assigns</text>
+<text text-anchor="middle" x="226.58" y="-388" font-family="Times,serif" font-size="14.00" fill="#000000">priority=0</text>
+</g>
+<!-- containerfinished -->
+<g id="node9" class="node">
+<title>containerfinished</title>
+<polygon fill="#add8e6" stroke="#000000" points="115.8518,-92 .0494,-92 .0494,0 115.8518,0 115.8518,-92"/>
+<text text-anchor="start" x="8" y="-75.4" font-family="Times,serif" font-size="14.00" fill="#000000">container request:</text>
+<text text-anchor="start" x="8" y="-58.6" font-family="Times,serif" font-size="14.00" fill="#000000"> state=Final</text>
+<text text-anchor="start" x="8" y="-41.8" font-family="Times,serif" font-size="14.00" fill="#000000">container:</text>
+<text text-anchor="start" x="8" y="-25" font-family="Times,serif" font-size="14.00" fill="#000000"> state=Complete</text>
+<text text-anchor="start" x="8" y="-8.2" font-family="Times,serif" font-size="14.00" fill="#000000"> exit_code=0</text>
+</g>
+<!-- running->containerfinished -->
+<g id="edge14" class="edge">
+<title>running->containerfinished</title>
+<path fill="none" stroke="#000000" d="M128.1412,-435.1351C103.681,-394.244 70.9515,-332.0279 57.386,-272.6 44.4037,-215.7269 46.6506,-148.7117 50.8397,-102.3858"/>
+<polygon fill="#000000" stroke="#000000" points="54.3417,-102.533 51.8178,-92.2432 47.374,-101.861 54.3417,-102.533"/>
+<text text-anchor="start" x="57.9506" y="-260" font-family="Times,serif" font-size="14.00" fill="#000000">container process</text>
+<text text-anchor="start" x="57.9506" y="-243.2" font-family="Times,serif" font-size="14.00" fill="#000000">succeeds</text>
+</g>
+<!-- containerfailed -->
+<g id="node10" class="node">
+<title>containerfailed</title>
+<polygon fill="#add8e6" stroke="#000000" points="216.8518,-221 101.0494,-221 101.0494,-129 216.8518,-129 216.8518,-221"/>
+<text text-anchor="start" x="109" y="-204.4" font-family="Times,serif" font-size="14.00" fill="#000000">container request:</text>
+<text text-anchor="start" x="109" y="-187.6" font-family="Times,serif" font-size="14.00" fill="#000000"> state=Final</text>
+<text text-anchor="start" x="109" y="-170.8" font-family="Times,serif" font-size="14.00" fill="#000000">container:</text>
+<text text-anchor="start" x="109" y="-154" font-family="Times,serif" font-size="14.00" fill="#000000"> state=Complete</text>
+<text text-anchor="start" x="109" y="-137.2" font-family="Times,serif" font-size="14.00" fill="#000000"> exit_code≠0</text>
+</g>
+<!-- running->containerfailed -->
+<g id="edge13" class="edge">
+<title>running->containerfailed</title>
+<path fill="none" stroke="#000000" d="M158.1014,-435.1971C158.2795,-380.6295 158.5756,-289.8888 158.7669,-231.273"/>
+<polygon fill="#000000" stroke="#000000" points="162.2675,-231.0885 158.8002,-221.0771 155.2675,-231.0656 162.2675,-231.0885"/>
+<text text-anchor="start" x="158.9506" y="-332.4" font-family="Times,serif" font-size="14.00" fill="#000000">container process</text>
+<text text-anchor="start" x="158.9506" y="-315.6" font-family="Times,serif" font-size="14.00" fill="#000000">fails</text>
</g>
+<!-- reused->latecancelled -->
+<!-- latecancelled->containerfailed -->
+<!-- containerfailed->containerfinished -->
</g>
</svg>
\ No newline at end of file
diff --git a/doc/api/methods/container_requests.html.textile.liquid b/doc/api/methods/container_requests.html.textile.liquid
index 6bff49854..bbd1a8de9 100644
--- a/doc/api/methods/container_requests.html.textile.liquid
+++ b/doc/api/methods/container_requests.html.textile.liquid
@@ -72,40 +72,39 @@ Once a request is in the Committed state, Arvados locates a suitable existing co
A client may cancel a committed request early (before the assigned container finishes) by setting the request priority to zero.
-!{max-width:40em;max-height:40em}{{site.baseurl}}/api/methods/container_request_lifecycle.svg!
+!{max-width:40em;max-height:70em}{{site.baseurl}}/api/methods/container_request_lifecycle.svg!
{% comment %}
# svg generated using https://dreampuf.github.io/
digraph {
- subgraph cluster_uncommitted {
- label = "Uncommitted";
- style = filled;
- color = lightgrey;
- node [color=black] [fillcolor=white] [style=filled] [shape=box];
- nocontainer [label = "(no container)"] [fillcolor=lightgrey];
- }
- subgraph cluster_committed {
- label = "Committed";
- style = filled;
- color = lightgrey;
- node [color=black] [fillcolor=white] [style=filled] [shape=box];
- queued [label = "Queued"];
- locked [label = "Locked"];
- running [label = "Running"];
- node [fillcolor=lightgrey];
- }
- subgraph cluster_final {
- label = "Final";
- style = filled;
- color = lightgrey;
- node [color=black] [fillcolor=white] [style=filled] [shape=box];
- complete [label = "Complete"];
- cancelled [label = "Cancelled"];
- }
- nocontainer -> queued [label = " start container by setting \n state=Committed, priority>0 "];
- queued -> locked -> running -> complete;
- running -> cancelled [color = red] [label = " cancel container by setting \n priority=0 "];
+ graph [nojustify=true] [labeljust=l];
+
+ invisiblestart [label = ""] [color=white];
+ node [color=black] [fillcolor=white] [style=filled] [shape=box] [nojustify=true];
+ uncommitted [label = "container request:\l state=Uncommitted\l"] [fillcolor=lightgrey];
+ committed [label = "container request:\l state=Committed\l priority>0\l"];
+ invisiblestart -> uncommitted [label = "user creates container request"];
+ uncommitted -> committed [label = "user assigns state=Committed, priority>0\l"];
+ queued [label = "container request:\l state=Committed\l priority>0\lcontainer:\l state=Queued\l"];
+ committed -> queued [label = "Arvados creates\la new container\l"];
+ locked [label = "container request:\l state=Committed\l priority>0\lcontainer:\l state=Locked\l"];
+ queued -> locked [label = "Arvados is ready\lto dispatch the container\l"];
+ running [label = "container request:\l state=Committed\l priority>0\lcontainer:\l state=Running\l"];
+ locked -> running [label = "Arvados starts the\lcontainer process\l"];
+
+ node [color=black] [fillcolor=lightblue] [style=filled] [shape=box];
+ reused [label = "container request:\l state=Final\lcontainer:\l state=Complete\l(reused existing container)\l"];
+ latecancelled [label = "container request:\l state=Final\lcontainer:\l state=Cancelled\l"];
+ containerfinished [label = "container request:\l state=Final\lcontainer:\l state=Complete\l exit_code=0\l"];
+ containerfailed [label = "container request:\l state=Final\lcontainer:\l state=Complete\l exit_code≠0\l"];
+ reused -> latecancelled -> containerfailed -> containerfinished [style=invis];
+
+ committed -> reused [label = "Arvados selects an\lexisting container\l"];
+ queued -> latecancelled [label = "user assigns\lpriority=0"];
+ locked -> latecancelled [label = "user assigns\lpriority=0"];
+ running -> latecancelled [label = "user assigns\lpriority=0"];
+ running -> containerfailed [label = "container process\lfails\l"];
+ running -> containerfinished [label = "container process\lsucceeds\l"];
}
-
{% endcomment %}
h2(#priority). Priority
commit 45828d11792f00d732b7d8e667db8b45b7a0f8b4
Author: Tom Clegg <tom at curii.com>
Date: Tue Jan 31 10:57:07 2023 -0500
19624: Redo diagram to show container states.
Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tom at curii.com>
diff --git a/doc/api/methods/container_request_lifecycle.svg b/doc/api/methods/container_request_lifecycle.svg
index f9c4246c6..71912b978 100644
--- a/doc/api/methods/container_request_lifecycle.svg
+++ b/doc/api/methods/container_request_lifecycle.svg
@@ -1,91 +1,92 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><!-- Generated by graphviz version 2.40.1 (20161225.0304)
- --><!-- Title: %0 Pages: 1 --><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="208pt" height="394pt" viewBox="0.00 0.00 208.00 394.40">
-<g id="graph0" class="graph" transform="scale(1 1) rotate(0) translate(4 390.4)">
+ --><!-- Title: %0 Pages: 1 --><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="283pt" height="580pt" viewBox="0.00 0.00 282.67 579.60">
+<g id="graph0" class="graph" transform="scale(1 1) rotate(0) translate(4 575.6)">
<title>%0</title>
-<polygon fill="#ffffff" stroke="transparent" points="-4,4 -4,-390.4 204,-390.4 204,4 -4,4"/>
+<polygon fill="#ffffff" stroke="transparent" points="-4,4 -4,-575.6 278.6656,-575.6 278.6656,4 -4,4"/>
<g id="clust1" class="cluster">
-<title>cluster_draft</title>
-<polygon fill="#d3d3d3" stroke="#d3d3d3" points="24,-284.8 24,-378.4 170,-378.4 170,-284.8 24,-284.8"/>
-<text text-anchor="middle" x="97" y="-361.8" font-family="Times,serif" font-size="14.00" fill="#000000">Draft</text>
-<text text-anchor="middle" x="97" y="-345" font-family="Times,serif" font-size="14.00" fill="#000000">(no container assigned)</text>
+<title>cluster_uncommitted</title>
+<polygon fill="#d3d3d3" stroke="#d3d3d3" points="40,-486.8 40,-563.6 150,-563.6 150,-486.8 40,-486.8"/>
+<text text-anchor="middle" x="95" y="-547" font-family="Times,serif" font-size="14.00" fill="#000000">Uncommitted</text>
</g>
<g id="clust2" class="cluster">
-<title>cluster_active</title>
-<polygon fill="#d3d3d3" stroke="#d3d3d3" points="8,-177.6 8,-276.8 137,-276.8 137,-177.6 8,-177.6"/>
-<text text-anchor="middle" x="72.5" y="-260.2" font-family="Times,serif" font-size="14.00" fill="#000000">Active</text>
-<text text-anchor="middle" x="72.5" y="-243.4" font-family="Times,serif" font-size="14.00" fill="#000000">(container assigned)</text>
+<title>cluster_committed</title>
+<polygon fill="#d3d3d3" stroke="#d3d3d3" points="55,-136.4 55,-435.2 135,-435.2 135,-136.4 55,-136.4"/>
+<text text-anchor="middle" x="95" y="-418.6" font-family="Times,serif" font-size="14.00" fill="#000000">Committed</text>
</g>
<g id="clust3" class="cluster">
-<title>cluster_complete</title>
-<polygon fill="#d3d3d3" stroke="#d3d3d3" points="36,-92.8 36,-169.6 106,-169.6 106,-92.8 36,-92.8"/>
-<text text-anchor="middle" x="71" y="-153" font-family="Times,serif" font-size="14.00" fill="#000000">Complete</text>
+<title>cluster_final</title>
+<polygon fill="#d3d3d3" stroke="#d3d3d3" points="8,-8 8,-84.8 184,-84.8 184,-8 8,-8"/>
+<text text-anchor="middle" x="96" y="-68.2" font-family="Times,serif" font-size="14.00" fill="#000000">Final</text>
</g>
-<g id="clust4" class="cluster">
-<title>cluster_cancelled</title>
-<polygon fill="#d3d3d3" stroke="#d3d3d3" points="121,-8 121,-84.8 192,-84.8 192,-8 121,-8"/>
-<text text-anchor="middle" x="156.5" y="-68.2" font-family="Times,serif" font-size="14.00" fill="#000000">Cancelled</text>
-</g>
-<!-- uncommitted -->
+<!-- nocontainer -->
<g id="node1" class="node">
-<title>uncommitted</title>
-<polygon fill="#ffffff" stroke="#000000" points="140.4888,-328.8 47.5112,-328.8 47.5112,-292.8 140.4888,-292.8 140.4888,-328.8"/>
-<text text-anchor="middle" x="94" y="-306.6" font-family="Times,serif" font-size="14.00" fill="#000000">Uncommitted</text>
+<title>nocontainer</title>
+<polygon fill="#d3d3d3" stroke="#000000" points="142.4068,-530.8 47.5932,-530.8 47.5932,-494.8 142.4068,-494.8 142.4068,-530.8"/>
+<text text-anchor="middle" x="95" y="-508.6" font-family="Times,serif" font-size="14.00" fill="#000000">(no container)</text>
</g>
-<!-- runnable -->
+<!-- queued -->
<g id="node2" class="node">
-<title>runnable</title>
-<polygon fill="#ffffff" stroke="#000000" points="127.5042,-227.0019 48.4958,-227.0019 48.4958,-185.7981 127.5042,-185.7981 127.5042,-227.0019"/>
-<text text-anchor="middle" x="88" y="-210.6" font-family="Times,serif" font-size="14.00" fill="#000000">Committed</text>
-<text text-anchor="middle" x="88" y="-193.8" font-family="Times,serif" font-size="14.00" fill="#000000">priority>0</text>
+<title>queued</title>
+<polygon fill="#ffffff" stroke="#000000" points="124.5376,-402.4 65.4624,-402.4 65.4624,-366.4 124.5376,-366.4 124.5376,-402.4"/>
+<text text-anchor="middle" x="95" y="-380.2" font-family="Times,serif" font-size="14.00" fill="#000000">Queued</text>
+</g>
+<!-- nocontainer->queued -->
+<g id="edge1" class="edge">
+<title>nocontainer->queued</title>
+<path fill="none" stroke="#000000" d="M95,-494.6757C95,-473.3589 95,-437.718 95,-412.7396"/>
+<polygon fill="#000000" stroke="#000000" points="98.5001,-412.432 95,-402.4321 91.5001,-412.4321 98.5001,-412.432"/>
+<text text-anchor="middle" x="178.7207" y="-464.2" font-family="Times,serif" font-size="14.00" fill="#000000"> start container by setting </text>
+<text text-anchor="middle" x="178.7207" y="-447.4" font-family="Times,serif" font-size="14.00" fill="#000000"> state=Committed, priority>0 </text>
+</g>
+<!-- locked -->
+<g id="node3" class="node">
+<title>locked</title>
+<polygon fill="#ffffff" stroke="#000000" points="123.9818,-291.4 66.0182,-291.4 66.0182,-255.4 123.9818,-255.4 123.9818,-291.4"/>
+<text text-anchor="middle" x="95" y="-269.2" font-family="Times,serif" font-size="14.00" fill="#000000">Locked</text>
</g>
-<!-- uncommitted->runnable -->
+<!-- queued->locked -->
<g id="edge2" class="edge">
-<title>uncommitted->runnable</title>
-<path fill="none" stroke="#006400" d="M92.9549,-292.6149C92.0792,-277.3781 90.8099,-255.2928 89.7753,-237.2901"/>
-<polygon fill="#006400" stroke="#006400" points="93.2661,-237.0274 89.198,-227.2447 86.2776,-237.4291 93.2661,-237.0274"/>
+<title>queued->locked</title>
+<path fill="none" stroke="#000000" d="M95,-366.0706C95,-348.6373 95,-322.1482 95,-301.9489"/>
+<polygon fill="#000000" stroke="#000000" points="98.5001,-301.7566 95,-291.7566 91.5001,-301.7567 98.5001,-301.7566"/>
</g>
-<!-- cancelling -->
-<g id="node5" class="node">
-<title>cancelling</title>
-<polygon fill="none" stroke="#000000" points="195.5042,-139.4019 116.4958,-139.4019 116.4958,-98.1981 195.5042,-98.1981 195.5042,-139.4019"/>
-<text text-anchor="middle" x="156" y="-123" font-family="Times,serif" font-size="14.00" fill="#000000">Committed</text>
-<text text-anchor="middle" x="156" y="-106.2" font-family="Times,serif" font-size="14.00" fill="#000000">priority=0</text>
+<!-- running -->
+<g id="node4" class="node">
+<title>running</title>
+<polygon fill="#ffffff" stroke="#000000" points="127.2276,-180.4 62.7724,-180.4 62.7724,-144.4 127.2276,-144.4 127.2276,-180.4"/>
+<text text-anchor="middle" x="95" y="-158.2" font-family="Times,serif" font-size="14.00" fill="#000000">Running</text>
</g>
-<!-- uncommitted->cancelling -->
-<g id="edge5" class="edge">
-<title>uncommitted->cancelling</title>
-<path fill="none" stroke="#ff0000" d="M126.836,-292.7271C132.3995,-288.2342 137.4996,-282.9193 141,-276.8 163.53,-237.4134 163.2811,-183.3192 160.2365,-149.7374"/>
-<polygon fill="#ff0000" stroke="#ff0000" points="163.6975,-149.1808 159.1751,-139.5997 156.7355,-149.9098 163.6975,-149.1808"/>
+<!-- locked->running -->
+<g id="edge3" class="edge">
+<title>locked->running</title>
+<path fill="none" stroke="#000000" d="M95,-255.0706C95,-237.6373 95,-211.1482 95,-190.9489"/>
+<polygon fill="#000000" stroke="#000000" points="98.5001,-190.7566 95,-180.7566 91.5001,-190.7567 98.5001,-190.7566"/>
</g>
-<!-- reqcomplete -->
-<g id="node3" class="node">
-<title>reqcomplete</title>
-<polygon fill="#ffffff" stroke="#000000" points="98,-136.8 44,-136.8 44,-100.8 98,-100.8 98,-136.8"/>
-<text text-anchor="middle" x="71" y="-114.6" font-family="Times,serif" font-size="14.00" fill="#000000">Final</text>
+<!-- complete -->
+<g id="node5" class="node">
+<title>complete</title>
+<polygon fill="#ffffff" stroke="#000000" points="86.439,-52 15.561,-52 15.561,-16 86.439,-16 86.439,-52"/>
+<text text-anchor="middle" x="51" y="-29.8" font-family="Times,serif" font-size="14.00" fill="#000000">Complete</text>
</g>
-<!-- runnable->reqcomplete -->
+<!-- running->complete -->
<g id="edge4" class="edge">
-<title>runnable->reqcomplete</title>
-<path fill="none" stroke="#0000ff" d="M83.9712,-185.64C81.7314,-174.0981 78.9124,-159.5722 76.4751,-147.0127"/>
-<polygon fill="#0000ff" stroke="#0000ff" points="79.8796,-146.1839 74.5385,-137.0339 73.0078,-147.5176 79.8796,-146.1839"/>
-</g>
-<!-- runnable->cancelling -->
-<g id="edge1" class="edge">
-<title>runnable->cancelling</title>
-<path fill="none" stroke="#ff0000" d="M104.1151,-185.64C112.9223,-174.2942 123.9679,-160.0648 133.6016,-147.6544"/>
-<polygon fill="#ff0000" stroke="#ff0000" points="136.6335,-149.4565 140.0006,-139.411 131.1039,-145.1641 136.6335,-149.4565"/>
+<title>running->complete</title>
+<path fill="none" stroke="#000000" d="M88.7892,-144.2757C81.4189,-122.7678 69.0515,-86.6775 60.482,-61.6702"/>
+<polygon fill="#000000" stroke="#000000" points="63.732,-60.3574 57.1792,-52.0321 57.11,-62.6267 63.732,-60.3574"/>
</g>
-<!-- reqcancelled -->
-<g id="node4" class="node">
-<title>reqcancelled</title>
-<polygon fill="#ffffff" stroke="#000000" points="183,-52 129,-52 129,-16 183,-16 183,-52"/>
-<text text-anchor="middle" x="156" y="-29.8" font-family="Times,serif" font-size="14.00" fill="#000000">Final</text>
+<!-- cancelled -->
+<g id="node6" class="node">
+<title>cancelled</title>
+<polygon fill="#ffffff" stroke="#000000" points="175.9762,-52 104.0238,-52 104.0238,-16 175.9762,-16 175.9762,-52"/>
+<text text-anchor="middle" x="140" y="-29.8" font-family="Times,serif" font-size="14.00" fill="#000000">Cancelled</text>
</g>
-<!-- cancelling->reqcancelled -->
-<g id="edge3" class="edge">
-<title>cancelling->reqcancelled</title>
-<path fill="none" stroke="#0000ff" d="M156,-97.8382C156,-87.0986 156,-73.8688 156,-62.2431"/>
-<polygon fill="#0000ff" stroke="#0000ff" points="159.5001,-62.1348 156,-52.1348 152.5001,-62.1349 159.5001,-62.1348"/>
+<!-- running->cancelled -->
+<g id="edge5" class="edge">
+<title>running->cancelled</title>
+<path fill="none" stroke="#ff0000" d="M101.352,-144.2757C108.8898,-122.7678 121.5383,-86.6775 130.3025,-61.6702"/>
+<polygon fill="#ff0000" stroke="#ff0000" points="133.6759,-62.6269 133.6804,-52.0321 127.0698,-60.3116 133.6759,-62.6269"/>
+<text text-anchor="middle" x="196.3328" y="-113.8" font-family="Times,serif" font-size="14.00" fill="#000000"> cancel container by setting </text>
+<text text-anchor="middle" x="196.3328" y="-97" font-family="Times,serif" font-size="14.00" fill="#000000"> priority=0 </text>
</g>
</g>
</svg>
\ No newline at end of file
diff --git a/doc/api/methods/container_requests.html.textile.liquid b/doc/api/methods/container_requests.html.textile.liquid
index 9e4bd4eef..6bff49854 100644
--- a/doc/api/methods/container_requests.html.textile.liquid
+++ b/doc/api/methods/container_requests.html.textile.liquid
@@ -72,49 +72,40 @@ Once a request is in the Committed state, Arvados locates a suitable existing co
A client may cancel a committed request early (before the assigned container finishes) by setting the request priority to zero.
-In the following diagram, the green ("go") and red ("stop") arrows indicate client-initiated transitions, and the blue arrows indicate system-initiated transitions.
-
-!{max-width:40em}{{site.baseurl}}/api/methods/container_request_lifecycle.svg!
+!{max-width:40em;max-height:40em}{{site.baseurl}}/api/methods/container_request_lifecycle.svg!
{% comment %}
# svg generated using https://dreampuf.github.io/
digraph {
- subgraph cluster_draft {
- label = "Draft\n(no container assigned)";
- style = filled;
- color = lightgrey;
- node [color=black] [fillcolor=white] [style=filled] [shape=box];
- uncommitted [label = "Uncommitted"];
+ subgraph cluster_uncommitted {
+ label = "Uncommitted";
+ style = filled;
+ color = lightgrey;
+ node [color=black] [fillcolor=white] [style=filled] [shape=box];
+ nocontainer [label = "(no container)"] [fillcolor=lightgrey];
}
- subgraph cluster_active {
- label = "Active\n(container assigned)";
- style = filled;
- color = lightgrey;
- node [color=black] [fillcolor=white] [style=filled] [shape=box];
- runnable [label = "Committed\npriority>0"];
+ subgraph cluster_committed {
+ label = "Committed";
+ style = filled;
+ color = lightgrey;
+ node [color=black] [fillcolor=white] [style=filled] [shape=box];
+ queued [label = "Queued"];
+ locked [label = "Locked"];
+ running [label = "Running"];
node [fillcolor=lightgrey];
- queued -> locked -> running -> complete;
- }
- subgraph cluster_complete {
- label = "Complete";
- style = filled;
- color = lightgrey;
- node [color=black] [fillcolor=white] [style=filled] [shape=box];
- reqcomplete [label = "Final"];
}
- subgraph cluster_cancelled {
- label = "Cancelled";
- style = filled;
- color = lightgrey;
- node [color=black] [fillcolor=white] [style=filled] [shape=box];
- reqcancelled [label = "Final"];
+ subgraph cluster_final {
+ label = "Final";
+ style = filled;
+ color = lightgrey;
+ node [color=black] [fillcolor=white] [style=filled] [shape=box];
+ complete [label = "Complete"];
+ cancelled [label = "Cancelled"];
}
- cancelling [label = "Committed\npriority=0"] [shape=box];
- runnable -> cancelling [color = red];
- uncommitted -> runnable [color = darkgreen];
- cancelling -> reqcancelled [color = blue];
- runnable -> reqcomplete [color = blue];
- uncommitted -> cancelling [color = red];
+ nocontainer -> queued [label = " start container by setting \n state=Committed, priority>0 "];
+ queued -> locked -> running -> complete;
+ running -> cancelled [color = red] [label = " cancel container by setting \n priority=0 "];
}
+
{% endcomment %}
h2(#priority). Priority
-----------------------------------------------------------------------
hooks/post-receive
--
More information about the arvados-commits
mailing list