[ARVADOS] updated: 1.3.0-728-g7d608493e

[Git user]

Summary of changes:
 doc/_config.yml                                                       | 2 +-
 ...textile.liquid => controlling-container-reuse.html.textile.liquid} | 2 +-
 doc/api/methods/containers.html.textile.liquid                        | 2 +-
 lib/dispatchcloud/container/queue_test.go                             | 4 +---
 4 files changed, 4 insertions(+), 6 deletions(-)
 rename doc/admin/{manage-containers.html.textile.liquid => controlling-container-reuse.html.textile.liquid} (61%)

       via  7d608493ec69c230c4cf95d949f15f4d455da5d8 (commit)
      from  7e0a38f70392822f362bd94f9d9093554c8f351a (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 7d608493ec69c230c4cf95d949f15f4d455da5d8
Author: Eric Biagiotti <ebiagiotti at veritasgenetics.com>
Date:   Thu Apr 18 11:10:04 2019 -0400

    15002: Improves documentation and error propagation test
    
    Arvados-DCO-1.1-Signed-off-by: Eric Biagiotti <ebiagiotti at veritasgenetics.com>

diff --git a/doc/_config.yml b/doc/_config.yml
index f7a6e0876..510fcc726 100644
--- a/doc/_config.yml
+++ b/doc/_config.yml
@@ -174,7 +174,7 @@ navbar:
     - Other:
       - admin/collection-versioning.html.textile.liquid
       - admin/federation.html.textile.liquid
-      - admin/manage-containers.html.textile.liquid
+      - admin/controlling-container-reuse.html.textile.liquid
       - admin/logs-table-management.html.textile.liquid
   installguide:
     - Overview:
diff --git a/doc/admin/manage-containers.html.textile.liquid b/doc/admin/controlling-container-reuse.html.textile.liquid
similarity index 61%
rename from doc/admin/manage-containers.html.textile.liquid
rename to doc/admin/controlling-container-reuse.html.textile.liquid
index 7ff9807d1..76f57f31a 100644
--- a/doc/admin/manage-containers.html.textile.liquid
+++ b/doc/admin/controlling-container-reuse.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 @Complete@ to @Cancelled@ will disable reuse as the workflow continues to run.
+This page describes how an admin can control container reuse using the @arv@ command. This can be utilized to avoid reusing a completed container without disabling reuse for the corresponding steps in affected workflows. 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 prevent it from being used in subsequent workflows.
 
 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/doc/api/methods/containers.html.textile.liquid b/doc/api/methods/containers.html.textile.liquid
index 2ddb00c68..d59c66edc 100644
--- a/doc/api/methods/containers.html.textile.liquid
+++ b/doc/api/methods/containers.html.textile.liquid
@@ -68,7 +68,7 @@ table(table table-bordered table-condensed).
 |Complete|Container was running, and the contained process/command has exited.|Cancelled|
 |Cancelled|The container did not run long enough to produce an exit code. This includes cases where the container didn't even start, cases where the container was interrupted/killed before it exited by itself (e.g., priority changed to 0), and cases where some problem prevented the system from capturing the contained process's exit status (exit code and output).|-|
 
-See "Managing container state":{{site.baseurl}}/admin/manage-containers.html for details about changing state from @Complete@ to @Cancelled@
+See "Controlling container reuse":{{site.baseurl}}/admin/controlling-container-reuse.html for details about changing state from @Complete@ to @Cancelled@
 
 h2(#mount_types). {% include 'mount_types' %}
 
diff --git a/lib/dispatchcloud/container/queue_test.go b/lib/dispatchcloud/container/queue_test.go
index cf8848c3a..daf7977ad 100644
--- a/lib/dispatchcloud/container/queue_test.go
+++ b/lib/dispatchcloud/container/queue_test.go
@@ -74,6 +74,7 @@ func (suite *IntegrationSuite) TestGetLockUnlockCancel(c *check.C) {
 			defer wg.Done()
 			err := cq.Unlock(uuid)
 			c.Check(err, check.NotNil)
+			c.Check(err, check.ErrorMatches, ".*cannot unlock when Queued*.")
 
 			err = cq.Lock(uuid)
 			c.Check(err, check.IsNil)
@@ -101,9 +102,6 @@ func (suite *IntegrationSuite) TestGetLockUnlockCancel(c *check.C) {
 		}()
 	}
 	wg.Wait()
-
-	err = cq.Cancel(arvadostest.CompletedContainerUUID)
-	c.Check(err, check.IsNil)
 }
 
 func (suite *IntegrationSuite) TestCancelIfNoInstanceType(c *check.C) {

-----------------------------------------------------------------------


hooks/post-receive
--