Ignore:
Timestamp:
Aug 11, 2025, 5:45:37 PM (3 months ago)
Author:
Frederik Heber <frederik.heber@…>
Branches:
Candidate_v1.7.0, stable
Children:
ae9ad6
Parents:
aeec58
git-author:
Frederik Heber <frederik.heber@…> (07/16/25 19:05:29)
git-committer:
Frederik Heber <frederik.heber@…> (08/11/25 17:45:37)
Message:

Reduces JobMarket features for use in kubernetes clusters.

  • removes all functionality where we can enumerate the workers, enroll or remove them.
  • removes PoolGuard and CheckAlive functionality.
  • removes the shutdown thread: not needed as we don't wait for busy workers anymore.
  • removes WorkerPool. This is now handled by the kubernetes deployment.
  • TESTS: Removed respective unit and regression tests.
  • TESTS: Adapted regression tests as worker now needs to be present when first job is sent. Moreover, server needs to be equipped with worker host and port.
Location:
ThirdParty/JobMarket/tests/regression
Files:
4 deleted
9 edited

Legend:

Unmodified
Added
Removed

  • ThirdParty/JobMarket/tests/regression/Makefile.am

    raeec58 rab2e834  
    1717        $(srcdir)/testsuite-addingjobs.at \
    1818        $(srcdir)/testsuite-checkstate.at \
    19         $(srcdir)/testsuite-checkalive.at \
    2019        $(srcdir)/testsuite-completerun.at \
    21         $(srcdir)/testsuite-enrollinpool.at \
    22         $(srcdir)/testsuite-falsehost.at \
    2320        $(srcdir)/testsuite-getresults.at \
    24         $(srcdir)/testsuite-numberworkers.at \
    2521        $(srcdir)/testsuite-resubmitjobs.at \
    2622        $(srcdir)/testsuite-server-shutdown.at \

  • ThirdParty/JobMarket/tests/regression/testsuite-addingjobs.at

    raeec58 rab2e834  
    1010
    1111# start service in background
    12 ${AUTOTEST_PATH}/JobMarketServer --workerport $WORKERPORT --controllerport $CONTROLLERPORT &
     12${AUTOTEST_PATH}/JobMarketServer --workeraddress 127.0.0.1:$WORKERLISTENPORT --workerport $WORKERPORT --controllerport $CONTROLLERPORT &
    1313server_pid=$!
    1414AT_CHECK([sleep 1], 0, [ignore], [ignore], [kill $server_pid])
    … …  
    1818AT_CHECK([fgrep "Sending 1 jobs ..." stdout], 0, [ignore], [ignore], [kill $server_pid])
    1919
    20 # ann one NoOpJob
     20# add one NoOpJob
    2121AT_CHECK([${AUTOTEST_PATH}/JobMarketController --server 127.0.0.1:$CONTROLLERPORT --command createjobs], 0, [stdout], [ignore], [kill $server_pid])
    2222AT_CHECK([fgrep "Creating 1 new NoOpJob(s)." stdout], 0, [ignore], [ignore], [kill $server_pid])

  • ThirdParty/JobMarket/tests/regression/testsuite-checkstate.at

    raeec58 rab2e834  
    77WORKERPORT=11040
    88CONTROLLERPORT=11041
     9WORKERLISTENPORT=11042
    910
    1011# start service in background
    11 ${AUTOTEST_PATH}/JobMarketServer --workerport $WORKERPORT --controllerport $CONTROLLERPORT &
     12${AUTOTEST_PATH}/JobMarketServer --workeraddress 127.0.0.1:$WORKERLISTENPORT --workerport $WORKERPORT --controllerport $CONTROLLERPORT &
    1213server_pid=$!
    1314AT_CHECK([sleep 1], 0, [ignore], [ignore], [kill $server_pid])

  • ThirdParty/JobMarket/tests/regression/testsuite-completerun.at

    raeec58 rab2e834  
    1010
    1111# start service in background
    12 ${AUTOTEST_PATH}/JobMarketServer --workerport $WORKERPORT --controllerport $CONTROLLERPORT &
     12${AUTOTEST_PATH}/JobMarketServer --workeraddress 127.0.0.1:$WORKERLISTENPORT --workerport $WORKERPORT --controllerport $CONTROLLERPORT &
    1313server_pid=$!
    1414AT_CHECK([sleep 1], 0, [ignore], [ignore], [kill $server_pid])
    1515
    16 # add thre jobs via JobAdder
     16# add a worker to work on jobs
     17${AUTOTEST_PATH}/JobMarketPoolWorker -v 5 --signal 2 --server 127.0.0.1:${WORKERPORT} --hostname 127.0.0.1 --listen $WORKERLISTENPORT &
     18worker_pid=$!
     19
     20# add three jobs via JobAdder
    1721AT_CHECK([${AUTOTEST_PATH}/JobMarketController --server 127.0.0.1:$CONTROLLERPORT --command createjobs --executable "cat" --jobcommand "Nothing" --times 3], 0, [stdout], [ignore], [kill $server_pid])
    1822AT_CHECK([fgrep "Sending 3 jobs ..." stdout], 0, [ignore], [ignore], [kill $server_pid])
    19 
    20 # Checking results
    21 AT_CHECK([${AUTOTEST_PATH}/JobMarketController --server 127.0.0.1:$CONTROLLERPORT --command checkresults], 0, [stdout], [ignore], [kill $server_pid])
    22 AT_CHECK([fgrep "#3 are waiting in the queue and #0 jobs are calculated so far." stdout], 0, [ignore], [ignore], [kill $server_pid])
    23 
    24 # enlist a worker to work on jobs
    25 ${AUTOTEST_PATH}/JobMarketPoolWorker -v 5 --signal 2 --server 127.0.0.1:${WORKERPORT} --hostname 127.0.0.1 --listen $WORKERLISTENPORT &
    26 worker_pid=$!
    27 AT_CHECK([sleep 2], 0, [ignore], [ignore], [kill $server_pid $worker_pid])
     23AT_CHECK([sleep 5], 0, [ignore], [ignore], [kill $server_pid $worker_pid])
    2824
    2925# send kill signal to worker such that it shuts down

  • ThirdParty/JobMarket/tests/regression/testsuite-getresults.at

    raeec58 rab2e834  
    77WORKERPORT=11045
    88CONTROLLERPORT=11046
     9WORKERLISTENPORT=11047
    910
    1011# start service in background
    11 ${AUTOTEST_PATH}/JobMarketServer --workerport $WORKERPORT --controllerport $CONTROLLERPORT &
     12${AUTOTEST_PATH}/JobMarketServer --workeraddress 127.0.0.1:$WORKERLISTENPORT --workerport $WORKERPORT --controllerport $CONTROLLERPORT &
    1213server_pid=$!
    1314AT_CHECK([sleep 1], 0, [ignore], [ignore], [kill $server_pid])

  • ThirdParty/JobMarket/tests/regression/testsuite-resubmitjobs.at

    raeec58 rab2e834  
    1010
    1111# start service in background
    12 ${AUTOTEST_PATH}/JobMarketServer --workerport $WORKERPORT --controllerport $CONTROLLERPORT &
     12${AUTOTEST_PATH}/JobMarketServer --workeraddress 127.0.0.1:$WORKERLISTENPORT --workerport $WORKERPORT --controllerport $CONTROLLERPORT &
    1313server_pid=$!
    1414AT_CHECK([sleep 1], 0, [ignore], [ignore], [kill $server_pid])
     15
     16# add a worker to work on jobs
     17${AUTOTEST_PATH}/JobMarketPoolWorker -v 5 --signal 2 --server 127.0.0.1:${WORKERPORT} --hostname 127.0.0.1 --listen $WORKERLISTENPORT 2>workererr &
     18worker_pid=$!
    1519
    1620# add one always failing job via JobAdder
    1721AT_CHECK([${AUTOTEST_PATH}/JobMarketController --server 127.0.0.1:$CONTROLLERPORT --command createjobs --executable "/bin/false" --jobcommand "Nothing"], 0, [stdout], [ignore], [kill $server_pid])
    1822AT_CHECK([fgrep "Sending 1 jobs ..." stdout], 0, [ignore], [ignore], [kill $server_pid])
    19 
    20 # enlist a worker to work on jobs
    21 ${AUTOTEST_PATH}/JobMarketPoolWorker -v 5 --signal 2 --server 127.0.0.1:${WORKERPORT} --hostname 127.0.0.1 --listen $WORKERLISTENPORT 2>workererr &
    22 worker_pid=$!
    23 AT_CHECK([sleep 2], 0, [ignore], [ignore], [kill $server_pid $worker_pid])
     23AT_CHECK([sleep 3], 0, [ignore], [ignore], [kill $server_pid $worker_pid])
    2424
    2525# send kill signal to worker such that it shuts down

  • ThirdParty/JobMarket/tests/regression/testsuite-server-shutdown.at

    raeec58 rab2e834  
    77WORKERPORT=11030
    88CONTROLLERPORT=11031
     9WORKERLISTENPORT=11032
    910
    1011# start service in background
    11 ${AUTOTEST_PATH}/JobMarketServer --workerport $WORKERPORT --controllerport $CONTROLLERPORT &
     12${AUTOTEST_PATH}/JobMarketServer --workeraddress 127.0.0.1:$WORKERLISTENPORT --workerport $WORKERPORT --controllerport $CONTROLLERPORT &
    1213server_pid=$!
    1314AT_CHECK([sleep 1], 0, [ignore], [ignore], [kill $server_pid])

  • ThirdParty/JobMarket/tests/regression/testsuite-server-worker.at

    raeec58 rab2e834  
    1010
    1111# start service in background
    12 ${AUTOTEST_PATH}/JobMarketServer --workerport $WORKERPORT --controllerport $CONTROLLERPORT &
     12${AUTOTEST_PATH}/JobMarketServer --workeraddress 127.0.0.1:$WORKERLISTENPORT --workerport $WORKERPORT --controllerport $CONTROLLERPORT &
    1313server_pid=$!
    1414AT_CHECK([sleep 1], 0, [ignore], [ignore], [kill $server_pid])
    1515
     16# add a worker to work on jobs
     17${AUTOTEST_PATH}/JobMarketPoolWorker -v 5 --signal 2 --server 127.0.0.1:${WORKERPORT} --hostname 127.0.0.1 --listen $WORKERLISTENPORT &
     18worker_pid=$!
     19
    1620# add one jobs
    1721AT_CHECK([${AUTOTEST_PATH}/JobMarketController --server 127.0.0.1:$CONTROLLERPORT --command createjobs --executable "cat" --jobcommand "Nothing"], 0, [ignore], [ignore], [kill $server_pid])
    18 
    19 # enlist a worker to work on jobs
    20 ${AUTOTEST_PATH}/JobMarketPoolWorker -v 5 --signal 2 --server 127.0.0.1:${WORKERPORT} --hostname 127.0.0.1 --listen $WORKERLISTENPORT &
    21 worker_pid=$!
    22 AT_CHECK([sleep 2], 0, [ignore], [ignore], [kill $server_pid $worker_pid])
     22AT_CHECK([sleep 3], 0, [ignore], [ignore], [kill $server_pid $worker_pid])
    2323
    2424# send kill signal to worker such that it shuts down

  • ThirdParty/JobMarket/tests/regression/testsuite.at

    raeec58 rab2e834  
    1717m4_include([testsuite-server-shutdown.at])
    1818
    19 # check whether poolworker may succesfully enroll in pool
    20 m4_include([testsuite-enrollinpool.at])
    21 
    2219# check whether adding jobs works
    2320m4_include([testsuite-addingjobs.at])
    24 
    25 # check whether dead busy poolworker is automatically removed
    26 m4_include([testsuite-checkalive.at])
    2721
    2822# check whether checking state works
    … …  
    4034# check whether complete run works
    4135m4_include([testsuite-completerun.at])
    42 
    43 # check whether false hostname does not shutdown server
    44 m4_include([testsuite-falsehost.at])
    45 
    46 # check whether total number of workers is returned
    47 m4_include([testsuite-numberworkers.at])
Note: See TracChangeset for help on using the changeset viewer.