diff --git a/t/expected/sample_payloads/same_fairshare.json b/t/expected/sample_payloads/same_fairshare.json index aa08f069..6aea4140 100644 --- a/t/expected/sample_payloads/same_fairshare.json +++ b/t/expected/sample_payloads/same_fairshare.json @@ -7,6 +7,7 @@ "fairshare": 0.5, "max_running_jobs": 5, "max_active_jobs": 7, + "max_nodes": 1000000, "queues": "", "active": 1, "projects": "*", @@ -19,6 +20,7 @@ "fairshare": 0.5, "max_running_jobs": 5, "max_active_jobs": 7, + "max_nodes": 1000000, "queues": "", "active": 1, "projects": "*", @@ -32,6 +34,7 @@ "fairshare": 0.5, "max_running_jobs": 5, "max_active_jobs": 7, + "max_nodes": 1000000, "queues": "", "active": 1, "projects": "*", @@ -44,6 +47,7 @@ "fairshare": 0.5, "max_running_jobs": 5, "max_active_jobs": 7, + "max_nodes": 1000000, "queues": "", "active": 1, "projects": "*", @@ -56,6 +60,7 @@ "fairshare": 0.5, "max_running_jobs": 5, "max_active_jobs": 7, + "max_nodes": 1000000, "queues": "", "active": 1, "projects": "*", @@ -68,6 +73,7 @@ "fairshare": 0.5, "max_running_jobs": 5, "max_active_jobs": 7, + "max_nodes": 1000000, "queues": "", "active": 1, "projects": "*", @@ -80,6 +86,7 @@ "fairshare": 0.5, "max_running_jobs": 5, "max_active_jobs": 7, + "max_nodes": 1000000, "queues": "", "active": 1, "projects": "*", diff --git a/t/expected/sample_payloads/small_no_tie.json b/t/expected/sample_payloads/small_no_tie.json index a8ace2e3..abad8a1b 100644 --- a/t/expected/sample_payloads/small_no_tie.json +++ b/t/expected/sample_payloads/small_no_tie.json @@ -7,6 +7,7 @@ "fairshare": 0.285714, "max_running_jobs": 5, "max_active_jobs": 7, + "max_nodes": 1000000, "queues": "", "active": 1, "projects": "*", @@ -19,6 +20,7 @@ "fairshare": 0.142857, "max_running_jobs": 5, "max_active_jobs": 7, + "max_nodes": 1000000, "queues": "", "active": 1, "projects": "*", @@ -31,6 +33,7 @@ "fairshare": 0.428571, "max_running_jobs": 5, "max_active_jobs": 7, + "max_nodes": 1000000, "queues": "", "active": 1, "projects": "*", @@ -43,6 +46,7 @@ "fairshare": 0.714286, "max_running_jobs": 5, "max_active_jobs": 7, + "max_nodes": 1000000, "queues": "", "active": 1, "projects": "*", @@ -55,6 +59,7 @@ "fairshare": 0.571429, "max_running_jobs": 5, "max_active_jobs": 7, + "max_nodes": 1000000, "queues": "", "active": 1, "projects": "*", @@ -67,6 +72,7 @@ "fairshare": 1.0, "max_running_jobs": 5, "max_active_jobs": 7, + "max_nodes": 1000000, "queues": "", "active": 1, "projects": "*", @@ -79,6 +85,7 @@ "fairshare": 0.857143, "max_running_jobs": 5, "max_active_jobs": 7, + "max_nodes": 1000000, "queues": "", "active": 1, "projects": "*", diff --git a/t/expected/sample_payloads/small_tie.json b/t/expected/sample_payloads/small_tie.json index 3f44f68e..1437e541 100644 --- a/t/expected/sample_payloads/small_tie.json +++ b/t/expected/sample_payloads/small_tie.json @@ -7,6 +7,7 @@ "fairshare": 0.5, "max_running_jobs": 5, "max_active_jobs": 7, + "max_nodes": 1000000, "queues": "", "active": 1, "projects": "*", @@ -19,6 +20,7 @@ "fairshare": 0.5, "max_running_jobs": 5, "max_active_jobs": 7, + "max_nodes": 1000000, "queues": "", "active": 1, "projects": "*", @@ -31,6 +33,7 @@ "fairshare": 0.75, "max_running_jobs": 5, "max_active_jobs": 7, + "max_nodes": 1000000, "queues": "", "active": 1, "projects": "*", @@ -43,6 +46,7 @@ "fairshare": 0.5, "max_running_jobs": 5, "max_active_jobs": 7, + "max_nodes": 1000000, "queues": "", "active": 1, "projects": "*", @@ -55,6 +59,7 @@ "fairshare": 0.5, "max_running_jobs": 5, "max_active_jobs": 7, + "max_nodes": 1000000, "queues": "", "active": 1, "projects": "*", @@ -67,6 +72,7 @@ "fairshare": 0.75, "max_running_jobs": 5, "max_active_jobs": 7, + "max_nodes": 1000000, "queues": "", "active": 1, "projects": "*", @@ -79,6 +85,7 @@ "fairshare": 1.0, "max_running_jobs": 5, "max_active_jobs": 7, + "max_nodes": 1000000, "queues": "", "active": 1, "projects": "*", @@ -91,6 +98,7 @@ "fairshare": 0.875, "max_running_jobs": 5, "max_active_jobs": 7, + "max_nodes": 1000000, "queues": "", "active": 1, "projects": "*", diff --git a/t/expected/sample_payloads/small_tie_all.json b/t/expected/sample_payloads/small_tie_all.json index e2d638c5..63bdc48d 100644 --- a/t/expected/sample_payloads/small_tie_all.json +++ b/t/expected/sample_payloads/small_tie_all.json @@ -7,6 +7,7 @@ "fairshare": 0.666667, "max_running_jobs": 5, "max_active_jobs": 7, + "max_nodes": 1000000, "queues": "", "active": 1, "projects": "*", @@ -19,6 +20,7 @@ "fairshare": 0.666667, "max_running_jobs": 5, "max_active_jobs": 7, + "max_nodes": 1000000, "queues": "", "active": 1, "projects": "*", @@ -31,6 +33,7 @@ "fairshare": 1, "max_running_jobs": 5, "max_active_jobs": 7, + "max_nodes": 1000000, "queues": "", "active": 1, "projects": "*", @@ -43,6 +46,7 @@ "fairshare": 0.666667, "max_running_jobs": 5, "max_active_jobs": 7, + "max_nodes": 1000000, "queues": "", "active": 1, "projects": "*", @@ -55,6 +59,7 @@ "fairshare": 0.666667, "max_running_jobs": 5, "max_active_jobs": 7, + "max_nodes": 1000000, "queues": "", "active": 1, "projects": "*", @@ -67,6 +72,7 @@ "fairshare": 1, "max_running_jobs": 5, "max_active_jobs": 7, + "max_nodes": 1000000, "queues": "", "active": 1, "projects": "*", @@ -79,6 +85,7 @@ "fairshare": 0.666667, "max_running_jobs": 5, "max_active_jobs": 7, + "max_nodes": 1000000, "queues": "", "active": 1, "projects": "*", @@ -91,6 +98,7 @@ "fairshare": 0.666667, "max_running_jobs": 5, "max_active_jobs": 7, + "max_nodes": 1000000, "queues": "", "active": 1, "projects": "*", @@ -103,6 +111,7 @@ "fairshare": 1, "max_running_jobs": 5, "max_active_jobs": 7, + "max_nodes": 1000000, "queues": "", "active": 1, "projects": "*", diff --git a/t/t1001-mf-priority-basic.t b/t/t1001-mf-priority-basic.t index dcbfedd9..6551dec5 100755 --- a/t/t1001-mf-priority-basic.t +++ b/t/t1001-mf-priority-basic.t @@ -51,6 +51,7 @@ test_expect_success 'create fake_payload.py' ' "fairshare": 0.45321, "max_running_jobs": 10, "max_active_jobs": 12, + "max_nodes": 1000000, "queues": "standby,special", "active": 1, "projects": "*", @@ -63,6 +64,7 @@ test_expect_success 'create fake_payload.py' ' "fairshare": 0.11345, "max_running_jobs": 10, "max_active_jobs": 12, + "max_nodes": 1000000, "queues": "standby", "active": 1, "projects": "*", @@ -173,6 +175,7 @@ test_expect_success 'pass special key to user/bank struct to nullify information "fairshare": 0.45321, "max_running_jobs": -1, "max_active_jobs": 12, + "max_nodes": 1000000, "queues": "standby,special", "active": 1, "projects": "*", @@ -204,6 +207,7 @@ test_expect_success 'resend user/bank information with valid data and successful "fairshare": 0.45321, "max_running_jobs": 2, "max_active_jobs": 4, + "max_nodes": 1000000, "queues": "standby,special", "active": 1, "projects": "*", diff --git a/t/t1005-max-jobs-limits.t b/t/t1005-max-jobs-limits.t index 71c4e4b2..ac37e9bf 100755 --- a/t/t1005-max-jobs-limits.t +++ b/t/t1005-max-jobs-limits.t @@ -32,6 +32,7 @@ test_expect_success 'create fake_user.json' ' "fairshare": 0.45321, "max_running_jobs": 2, "max_active_jobs": 4, + "max_nodes": 1000000, "queues": "", "active": 1, "projects": "*", @@ -44,6 +45,7 @@ test_expect_success 'create fake_user.json' ' "fairshare": 0.11345, "max_running_jobs": 1, "max_active_jobs": 2, + "max_nodes": 1000000, "queues": "", "active": 1, "projects": "*", @@ -91,7 +93,9 @@ test_expect_success 'submit job while already having max number of running jobs' test_expect_success 'a job transitioning to job.state.inactive should release a held job (if any)' ' flux job cancel $jobid1 && - test $(flux jobs -no {state} ${jobid3}) = RUN && + flux job wait-event -vt 5 $jobid3 alloc && + flux job info $jobid3 eventlog > eventlog.out && + grep "alloc" eventlog.out && flux job cancel $jobid2 && flux job cancel $jobid3 ' @@ -129,6 +133,7 @@ test_expect_success 'increase the max jobs count of the user' ' "fairshare": 0.45321, "max_running_jobs": 3, "max_active_jobs": 4, + "max_nodes": 1000000, "queues": "", "active": 1, "projects": "*", @@ -181,6 +186,7 @@ test_expect_success 'update max_active_jobs limit' ' "fairshare": 0.45321, "max_running_jobs": 3, "max_active_jobs": 5, + "max_nodes": 1000000, "queues": "", "active": 1, "projects": "*", @@ -241,6 +247,7 @@ test_expect_success 'create another user with the same limits in multiple banks' "fairshare": 0.45321, "max_running_jobs": 1, "max_active_jobs": 2, + "max_nodes": 1000000, "queues": "", "active": 1, "projects": "*", @@ -253,6 +260,7 @@ test_expect_success 'create another user with the same limits in multiple banks' "fairshare": 0.11345, "max_running_jobs": 1, "max_active_jobs": 2, + "max_nodes": 1000000, "queues": "", "active": 1, "projects": "*", diff --git a/t/t1012-mf-priority-load.t b/t/t1012-mf-priority-load.t index 869ffc8a..bfd4b94a 100755 --- a/t/t1012-mf-priority-load.t +++ b/t/t1012-mf-priority-load.t @@ -39,6 +39,7 @@ test_expect_success 'create fake_payload.py' ' "fairshare": 0.45321, "max_running_jobs": 1, "max_active_jobs": 3, + "max_nodes": 1000000, "queues": "", "active": 1, "projects": "*", @@ -51,6 +52,7 @@ test_expect_success 'create fake_payload.py' ' "fairshare": 0.11345, "max_running_jobs": 1, "max_active_jobs": 3, + "max_nodes": 1000000, "queues": "", "active": 1, "projects": "*", diff --git a/t/t1014-mf-priority-dne.t b/t/t1014-mf-priority-dne.t index 978cb412..6deaa8a5 100755 --- a/t/t1014-mf-priority-dne.t +++ b/t/t1014-mf-priority-dne.t @@ -63,6 +63,7 @@ test_expect_success 'send the user/bank information to the plugin without reprio "fairshare": 0.45321, "max_running_jobs": 10, "max_active_jobs": 12, + "max_nodes": 1000000, "queues": "standby,special", "active": 1, "projects": "*",