[arvados] updated: 2.5.0-319-g63c57d1b8

git repository hosting git at public.arvados.org
Tue Apr 11 20:29:19 UTC 2023


Summary of changes:
 cmd/arvados-client/container_gateway.go | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

       via  63c57d1b8604f27f0224ed76a5b8f048f982a74f (commit)
      from  4c00393d9a7cd31bfa08bfbafa8d554c3b3d02dc (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 63c57d1b8604f27f0224ed76a5b8f048f982a74f
Author: Tom Clegg <tom at curii.com>
Date:   Mon Apr 10 15:19:21 2023 -0400

    18790: Improve status update messages.
    
    When container request UUID provided on command line, report initial
    container UUID after looking it up (but without saying "connecting").
    
    When first receiving acknowledgement from the API that it's possible
    to receive logs from a container, report "connected, polling".
    
    Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tom at curii.com>

diff --git a/cmd/arvados-client/container_gateway.go b/cmd/arvados-client/container_gateway.go
index b5f45199d..9436959af 100644
--- a/cmd/arvados-client/container_gateway.go
+++ b/cmd/arvados-client/container_gateway.go
@@ -70,11 +70,13 @@ func (lc *logsCommand) tailf(target string, stdout, stderr io.Writer, pollInterv
 	if err != nil {
 		return err
 	}
+	if ctrUUID != target {
+		fmt.Fprintln(stderr, "target container UUID is", ctrUUID)
+	}
 	err = lc.checkAPISupport(ctx, ctrUUID)
 	if err != nil {
 		return err
 	}
-	fmt.Fprintln(stderr, "connecting to container", ctrUUID)
 
 	var (
 		// files to display
@@ -87,6 +89,9 @@ func (lc *logsCommand) tailf(target string, stdout, stderr io.Writer, pollInterv
 		containerFinished = false
 		// has anything worked? (if so, retry after errors)
 		anySuccess = false
+		// container UUID that we most recently displayed in a
+		// "connected, polling" message (if any)
+		reportedConnection = ""
 	)
 
 poll:
@@ -105,6 +110,10 @@ poll:
 				delay = pollInterval
 				continue poll
 			}
+			if reportedConnection != ctrUUID {
+				reportedConnection = ctrUUID
+				fmt.Fprintln(stderr, "connected, polling for log data from container", ctrUUID)
+			}
 			size[fnm] = currentsize
 			if oldsize, seen := mark[fnm]; !seen && currentsize > 10000 {
 				mark[fnm] = currentsize - 10000

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


hooks/post-receive
-- 




More information about the arvados-commits mailing list