Merge pull request #1132 from milroy/match-overflow

Fix overflow in `calc_factor`

Author: mergify[bot]

resource/policies/dfu_match_multilevel_id_impl.hpp

@@ -55,7 +55,7 @@ int64_t multilevel_id_t<FOLD>::score_factor_t::calc_factor (
         return -1;
     }
     mul = add * m_multiply_by;
-    tie =  break_tie % m_multiply_by - 1;
+    tie = abs (break_tie % static_cast<int64_t> (m_multiply_by) - 1);
 
     if (mul > (std::numeric_limits<int64_t>::max () - tie)) {
         errno = EOVERFLOW;

t/CMakeLists.txt

@@ -80,6 +80,7 @@ set(ALL_TESTS
   t4011-match-duration.t
   t4012-set-status.t
   t5000-valgrind.t
+  t5100-issues-test-driver.t
   t6000-graph-size.t
   t6001-match-formats.t
   t6002-graph-hwloc.t

t/issues/t1035-fluxion-reload.sh

@@ -16,8 +16,7 @@ fi
 test $(flux resource list -no {nnodes}) -eq 4 || die "test requires 4 nodes"
 
 log "Unloading modules..."
-flux module remove sched-fluxion-qmanager
-flux module remove sched-fluxion-resource
+flux module remove sched-simple
 flux module remove resource
 
 log "Amending instance resource set with properties: batch, debug..."

t/issues/t1129-match-overflow.sh

@@ -0,0 +1,43 @@
+#!/bin/bash
+#
+#  Ensure fluxion calc_factor executes without overflow
+#
+
+log() { printf "issue#1129: $@\n" >&2; }
+
+TEST_SIZE=${TEST_SIZE:-900}
+
+log "Unloading modules..."
+flux module remove sched-simple
+flux module remove resource
+
+flux config load <<EOF
+[sched-fluxion-qmanager]
+queue-policy = "easy"
+
+[resource]
+noverify = true
+norestrict = true
+
+[[resource.config]]
+hosts = "test[1-${TEST_SIZE}]"
+cores = "0-112"
+gpus = "0-8"
+EOF
+
+flux module load resource monitor-force-up
+flux module load sched-fluxion-resource
+flux module load sched-fluxion-qmanager
+flux queue start --all --quiet
+flux resource list
+flux resource status
+
+log "Running test job."
+flux run -vvv -N${TEST_SIZE} -n${TEST_SIZE} \
+	--setattr=exec.test.run_duration=1ms \
+	true
+
+log "reloading sched-simple..."
+flux module remove sched-fluxion-qmanager
+flux module remove sched-fluxion-resource
+flux module load sched-simple