[arvados] updated: 2.5.0-217-gc1cbaf79e

git repository hosting git at public.arvados.org
Thu Mar 2 19:33:29 UTC 2023


Summary of changes:
 .licenseignore                                     |   3 +-
 lib/crunchrun/crunchrun.go                         |  16 +-
 lib/crunchrun/crunchrun_test.go                    |  67 +++++++
 .../crunchrun/testdata/fakestat/cgroup.procs       |   0
 .../testdata/fakestat/cgroupid/cgroup.procs        |   0
 .../testdata/fakestat/cgroupid/memory.stat         |   5 +
 lib/crunchstat/crunchstat.go                       | 191 +++++++++++++++++--
 lib/crunchstat/crunchstat_test.go                  | 206 +++++++++++++++++++--
 .../crunchstat/testdata/fakestat/cgroup.procs      |   0
 lib/crunchstat/testdata/fakestat/memory.stat       |   6 +
 10 files changed, 457 insertions(+), 37 deletions(-)
 copy apps/workbench/app/mailers/.gitkeep => lib/crunchrun/testdata/fakestat/cgroup.procs (100%)
 copy apps/workbench/app/mailers/.gitkeep => lib/crunchrun/testdata/fakestat/cgroupid/cgroup.procs (100%)
 create mode 100644 lib/crunchrun/testdata/fakestat/cgroupid/memory.stat
 copy apps/workbench/app/mailers/.gitkeep => lib/crunchstat/testdata/fakestat/cgroup.procs (100%)
 create mode 100644 lib/crunchstat/testdata/fakestat/memory.stat

       via  c1cbaf79eff608304dd4e9b91142e799a3cb60d6 (commit)
       via  a41afb9ed7c5487568452a05b13168b9d243292a (commit)
       via  711185abcd86bed2a86e77ca24786d99323168a5 (commit)
       via  0559d0dfc8406eadfc1aa71465179eaea2754f12 (commit)
       via  4101dd717291bb449b5683a38d9df18f2fabf4eb (commit)
       via  1b92f8cec11d04b5f9464c6ad100f579660f70b9 (commit)
      from  907983bcaaf9cf2f058d150b2e91dcbfba465074 (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 c1cbaf79eff608304dd4e9b91142e799a3cb60d6
Merge: 907983bca a41afb9ed
Author: Brett Smith <brett.smith at curii.com>
Date:   Thu Mar 2 14:32:20 2023 -0500

    Merge branch '19986-crunchstat-max-reporting'
    
    Closes #19986.
    
    Arvados-DCO-1.1-Signed-off-by: Brett Smith <brett.smith at curii.com>


commit a41afb9ed7c5487568452a05b13168b9d243292a
Author: Brett Smith <brett.smith at curii.com>
Date:   Thu Mar 2 14:31:50 2023 -0500

    19986: Prevent division by zero when reporting max disk usage
    
    Arvados-DCO-1.1-Signed-off-by: Brett Smith <brett.smith at curii.com>

diff --git a/lib/crunchstat/crunchstat.go b/lib/crunchstat/crunchstat.go
index 4241f5fb5..ad1cc7a97 100644
--- a/lib/crunchstat/crunchstat.go
+++ b/lib/crunchstat/crunchstat.go
@@ -177,7 +177,7 @@ func (r *Reporter) LogMaxima(logger logPrinter, memLimits map[string]int64) {
 		logger.Printf("Total disk I/O on %s was %d bytes written and %d bytes read",
 			disk, sample.txBytes, sample.rxBytes)
 	}
-	if r.maxDiskSpaceSample.hasData {
+	if r.maxDiskSpaceSample.total > 0 {
 		percentage := 100 * r.maxDiskSpaceSample.used / r.maxDiskSpaceSample.total
 		logger.Printf("Maximum disk usage was %d%%, %d/%d bytes",
 			percentage, r.maxDiskSpaceSample.used, r.maxDiskSpaceSample.total)

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


hooks/post-receive
-- 




More information about the arvados-commits mailing list