[ARVADOS] updated: 2.1.0-1385-gf05993e57

[Git user]

Summary of changes:
 lib/costanalyzer/aws-spot.go     | 1 -
 lib/costanalyzer/costanalyzer.go | 5 +++++
 2 files changed, 5 insertions(+), 1 deletion(-)

       via  f05993e57db3836a6aadea749520ef1b8654d8af (commit)
      from  34287594a9c07bd3f001a6cf22e05a22646249b8 (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 f05993e57db3836a6aadea749520ef1b8654d8af
Author: Ward Vandewege <ward at curii.com>
Date:   Thu Oct 21 19:35:36 2021 -0400

    17695: spot fixes.
    
    Arvados-DCO-1.1-Signed-off-by: Ward Vandewege <ward at curii.com>

diff --git a/lib/costanalyzer/aws-spot.go b/lib/costanalyzer/aws-spot.go
index bdacf67c7..ab280a61f 100644
--- a/lib/costanalyzer/aws-spot.go
+++ b/lib/costanalyzer/aws-spot.go
@@ -109,7 +109,6 @@ func findSpotPriceHistoryStart(container arvados.Container, history SpotPriceHis
 		if oldPos == pos {
 			break
 		}
-		fmt.Printf("pos: %d, oldPos: %d\n", pos, oldPos)
 	}
 
 	return history[pos:]
diff --git a/lib/costanalyzer/costanalyzer.go b/lib/costanalyzer/costanalyzer.go
index 26117e884..9eae1d78f 100644
--- a/lib/costanalyzer/costanalyzer.go
+++ b/lib/costanalyzer/costanalyzer.go
@@ -215,6 +215,11 @@ func addContainerLine(logger *logrus.Logger, node nodeInfo, cr arvados.Container
 	}
 
 	var delta time.Duration
+	if container.StartedAt == nil {
+		// The container was not started
+		csv += ",,,,,,\n"
+		return csv, containerConsumption, nil
+	}
 	if container.FinishedAt != nil {
 		csv += container.FinishedAt.String() + ","
 		delta = container.FinishedAt.Sub(*container.StartedAt)

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


hooks/post-receive
--