[arvados] updated: 2.6.0-209-g0afb0b057

git repository hosting git at public.arvados.org
Thu Jun 1 18:00:32 UTC 2023


Summary of changes:
 lib/crunchrun/crunchrun.go | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

       via  0afb0b057d2572487cc00aa1dc2631cb99713ea7 (commit)
      from  f4a37bb12147851402fd585e6e5987f227591028 (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 0afb0b057d2572487cc00aa1dc2631cb99713ea7
Author: Tom Clegg <tom at curii.com>
Date:   Thu Jun 1 13:54:41 2023 -0400

    20540: Increase crunch-run API call timeouts to 10m.
    
    Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tom at curii.com>

diff --git a/lib/crunchrun/crunchrun.go b/lib/crunchrun/crunchrun.go
index cab09d11c..7d69fb0f9 100644
--- a/lib/crunchrun/crunchrun.go
+++ b/lib/crunchrun/crunchrun.go
@@ -1994,7 +1994,9 @@ func (command) RunCommand(prog string, args []string, stdin io.Reader, stdout, s
 		log.Printf("%s: %v", containerUUID, err)
 		return 1
 	}
-	api.Retries = 8
+	// arvadosclient now interprets Retries=10 to mean
+	// Timeout=10m, retrying with exponential backoff + jitter.
+	api.Retries = 10
 
 	kc, err := keepclient.MakeKeepClient(api)
 	if err != nil {
@@ -2171,7 +2173,9 @@ func hpcConfData(uuid string, configFile string, stderr io.Writer) ConfigData {
 		fmt.Fprintf(stderr, "error setting up arvadosclient: %s\n", err)
 		return conf
 	}
-	arv.Retries = 8
+	// arvadosclient now interprets Retries=10 to mean
+	// Timeout=10m, retrying with exponential backoff + jitter.
+	arv.Retries = 10
 	var ctr arvados.Container
 	err = arv.Call("GET", "containers", uuid, "", arvadosclient.Dict{"select": []string{"runtime_constraints"}}, &ctr)
 	if err != nil {

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


hooks/post-receive
-- 




More information about the arvados-commits mailing list