[arvados] updated: 2.5.0-189-gf99665a07

[git repository hosting]

Summary of changes:
 doc/admin/spot-instances.html.textile.liquid   | 6 +++---
 doc/api/methods/containers.html.textile.liquid | 2 +-
 lib/crunchrun/crunchrun.go                     | 2 +-
 lib/crunchrun/crunchrun_test.go                | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

       via  f99665a0737831ba53b6512fd50f1c25e386a604 (commit)
       via  9c96f78a3c8f3455d53aa891b4a4e1a87c433b05 (commit)
      from  ae6fe3864ca6b254dfa3345985568c1cc94358fe (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 f99665a0737831ba53b6512fd50f1c25e386a604
Author: Tom Clegg <tom at curii.com>
Date:   Mon Feb 27 14:14:16 2023 -0500

    19961: Update preemptionNotice text.
    
    Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tom at curii.com>

diff --git a/doc/admin/spot-instances.html.textile.liquid b/doc/admin/spot-instances.html.textile.liquid
index b1c1ca41a..731bc979a 100644
--- a/doc/admin/spot-instances.html.textile.liquid
+++ b/doc/admin/spot-instances.html.textile.liquid
@@ -97,7 +97,7 @@ When running a container on a spot instance, Arvados monitors the EC2 metadata e
 Example excerpt from @crunch-run.txt@:
 
 <pre>
-2023-02-21T21:12:42.350719824Z Cloud provider indicates instance action "stop" scheduled for time "2023-02-21T21:14:42Z"
+2023-02-21T21:12:42.350719824Z Cloud provider scheduled instance stop at 2023-02-21T21:14:42Z
 </pre>
 
 Example @runtime_status@:
@@ -105,8 +105,8 @@ Example @runtime_status@:
 <pre>
 {
   "warning": "preemption notice",
-  "warningDetail": "Cloud provider indicates instance action \"stop\" scheduled for time \"2023-02-21T21:14:42Z\"",
-  "preemptionNotice": "Cloud provider indicates instance action \"stop\" scheduled for time \"2023-02-21T21:14:42Z\""
+  "warningDetail": "Cloud provider scheduled instance stop at 2023-02-21T21:14:42Z",
+  "preemptionNotice": "Cloud provider scheduled instance stop at 2023-02-21T21:14:42Z"
 }
 </pre>
 
diff --git a/lib/crunchrun/crunchrun.go b/lib/crunchrun/crunchrun.go
index 57eed84ba..79d7f3674 100644
--- a/lib/crunchrun/crunchrun.go
+++ b/lib/crunchrun/crunchrun.go
@@ -1291,7 +1291,7 @@ func (runner *ContainerRunner) checkSpotInterruptionNotices() {
 		failures = 0
 		if metadata != lastmetadata {
 			lastmetadata = metadata
-			text := fmt.Sprintf("Cloud provider indicates instance action %q scheduled for time %q", metadata.Action, metadata.Time.UTC().Format(time.RFC3339))
+			text := fmt.Sprintf("Cloud provider scheduled instance %s at %s", metadata.Action, metadata.Time.UTC().Format(time.RFC3339))
 			runner.CrunchLog.Printf("%s", text)
 			runner.updateRuntimeStatus(arvadosclient.Dict{
 				"warning":          "preemption notice",
diff --git a/lib/crunchrun/crunchrun_test.go b/lib/crunchrun/crunchrun_test.go
index 1f732c051..4d127f19c 100644
--- a/lib/crunchrun/crunchrun_test.go
+++ b/lib/crunchrun/crunchrun_test.go
@@ -848,7 +848,7 @@ func (s *TestSuite) testSpotInterruptionNotice(c *C, failureRate float64) {
 	if failureRate == 1 {
 		c.Check(s.api.Logs["crunch-run"].String(), Matches, `(?ms).*Giving up on checking spot interruptions after too many consecutive failures.*`)
 	} else {
-		text := `Cloud provider indicates instance action "stop" scheduled for time "` + stoptime.Load().(time.Time).Format(time.RFC3339) + `"`
+		text := `Cloud provider scheduled instance stop at ` + stoptime.Load().(time.Time).Format(time.RFC3339)
 		c.Check(s.api.Logs["crunch-run"].String(), Matches, `(?ms).*`+text+`.*`)
 		c.Check(s.api.CalledWith("container.runtime_status.warning", "preemption notice"), NotNil)
 		c.Check(s.api.CalledWith("container.runtime_status.warningDetail", text), NotNil)

commit 9c96f78a3c8f3455d53aa891b4a4e1a87c433b05
Author: Tom Clegg <tom at curii.com>
Date:   Mon Feb 27 14:10:56 2023 -0500

    19961: Clarify preemptionNotice significance.
    
    Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tom at curii.com>

diff --git a/doc/api/methods/containers.html.textile.liquid b/doc/api/methods/containers.html.textile.liquid
index c4fa73466..1d6c415a9 100644
--- a/doc/api/methods/containers.html.textile.liquid
+++ b/doc/api/methods/containers.html.textile.liquid
@@ -93,7 +93,7 @@ table(table table-bordered table-condensed).
 |activity|string|A message for the end user about what state the container is currently in.|Optional.|
 |errorDetail|string|Additional structured error details.|Optional.|
 |warningDetail|string|Additional structured warning details.|Optional.|
-|preemptionNotice|string|Indication that the preemptible instance where the container is running will be terminated soon.|Optional.|
+|preemptionNotice|string|Details about any cloud provider scheduled interruption to the instance running this container.|Existence of this key indicates the container likely was (or will soon be) @Cancelled@ due to an instance interruption.|
 
 h2(#scheduling_parameters). {% include 'container_scheduling_parameters' %}
 

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


hooks/post-receive
--