Changeset 15678e

Timestamp:

Sep 13, 2025, 6:56:06 PM (6 weeks ago)

Author:

Frederik Heber <frederik.heber@…>

Branches:

Candidate_v1.7.0, stable

Children:

91c409

Parents:

c012a1

git-author:

Frederik Heber <frederik.heber@…> (09/13/25 15:42:52)

git-committer:

Frederik Heber <frederik.heber@…> (09/13/25 18:56:06)

Message:

TESTFIX: mpqc-jobs fixed with new k8s working mode.

• we forgot to adapt the mpqc-jobs JobMarket regression test.
• molecuilder_poolworker simply listens on an adress for work and no longer enrolls with the server. The molecuilder_server thus can no longer shut down all pool workers, the respective command has been removed.
• the test has again the same functionality as before.

File:

• tests/JobMarket/testsuite-jobmarket-mpqc-jobs.at (modified) (4 diffs)

tests/JobMarket/testsuite-jobmarket-mpqc-jobs.at

@@ -18 +18 @@
 ### test mpqc jobs 
 
-# perform test with PoolWorkers using stastand-inn mpqc
+# perform test with PoolWorkers using stand-in mpqc
 AT_SETUP([Fragmentation - Automation: mpqc jobs])
 AT_KEYWORDS([fragmentation automation server poolworker mpqc])
@@ -27 +27 @@
 WORKERLISTENPORT=11062
 
-# create job files for stand-in mpqc
+# create job files for mpqc
 i=0
 while test -e ${abs_top_srcdir}/tests/JobMarket/pre/BondFragment`printf %02d $i`.out; do
@@ -37 +37 @@
 
 # start service in background
-${AUTOTEST_PATH}/molecuilder_server --workerport $WORKERPORT --controllerport $CONTROLLERPORT &
+${AUTOTEST_PATH}/molecuilder_server --signal 2 --workeraddress 127.0.0.1:${WORKERLISTENPORT} --workerport $WORKERPORT --controllerport $CONTROLLERPORT &
 server_pid=$!
 AT_CHECK([sleep 1], 0, [ignore], [ignore], [kill $server_pid])
+
+# enlist a worker to work on jobs
+${AUTOTEST_PATH}/molecuilder_poolworker -v 5 --signal 2 --server 127.0.0.1:$WORKERPORT --hostname 127.0.0.1 --listen $WORKERLISTENPORT &
+worker_pid=$!
+AT_CHECK([sleep 5], 0, [ignore], [ignore], [kill $server_pid $worker_pid])
 
 # add jobs
 AT_CHECK([${AUTOTEST_PATH}/molecuilder_controller --server 127.0.0.1:$CONTROLLERPORT --command addjobs --executable "../../mpqc" --jobfiles Job??.in], 0, [ignore], [ignore], [kill $server_pid])
 
-# enlist a worker to work on jobs
-${AUTOTEST_PATH}/molecuilder_poolworker -v 5 --signal 2 --server 127.0.0.1:${WORKERPORT} --hostname 127.0.0.1 --listen $WORKERLISTENPORT &
-worker_pid=$!
-AT_CHECK([sleep 5], 0, [ignore], [ignore], [kill $server_pid $worker_pid])
+# wait long enough for computation to complete and check whether all results are done
+i=0
+while test $i -lt 30; do
+AT_CHECK([sleep 1], 0, [ignore], [ignore], [kill $worker_pid])
+AT_CHECK([${AUTOTEST_PATH}/molecuilder_controller --server 127.0.0.1:$CONTROLLERPORT --command checkresults], 0, [stdout], [ignore], [kill $server_pid $worker_pid])
+AT_CHECK([grep "#0 are waiting in the queue and #7 jobs are calculated so far." stdout], 0, [ignore], [ignore], [kill $server_pid worker_pid], [let i=30])
+let i=i+1
+done
 
-# send removeall to server such that all workers shutdown
-AT_CHECK([${AUTOTEST_PATH}/molecuilder_controller --server 127.0.0.1:$CONTROLLERPORT --command removeall], 0, [stdout], [ignore], [kill $server_pid $worker_pid])
+# remove all workers
+AT_CHECK([kill $worker_pid], 0, [ignore], [ignore])
 
 # check number of done jobs
@@ -63 +72 @@
 AT_CHECK([${AUTOTEST_PATH}/molecuilder_controller --server 127.0.0.1:$CONTROLLERPORT --command shutdown], 0, [stdout], [ignore], [kill $server_pid])
 
-# check that server is truely down
-AT_CHECK([sleep 1], 0, [ignore], [ignore], [kill $server_pid])
+# check that server is truly down
+AT_CHECK([sleep 3], 0, [ignore], [ignore], [kill $server_pid])
 AT_CHECK([kill $server_pid], 1, [ignore], [ignore])