hiro/jobmanager
1
0
Fork 0
mirror of https://github.com/vale981/jobmanager synced 2025-03-05 09:51:38 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

added speed to status infoline

Browse source
This commit is contained in:
Richard Hartmann 2019-06-03 22:58:50 +02:00
parent ad3a030eca
commit 82e53e9030
1 changed files with 12 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
jobmanager/jobmanager.py
View file

@ -394,7 +394,8 @@ class JobManager_Client(object):
host, host,
port, port,
authkey, authkey,
nthreads): nthreads,
nproc):
""" """
the wrapper spawned nproc times calling and handling self.func the wrapper spawned nproc times calling and handling self.func
""" """
@ -460,7 +461,7 @@ class JobManager_Client(object):
tg_0 = time.time() tg_0 = time.time()
try: try:
log.debug("wait until local result q is almost empty") log.debug("wait until local result q is almost empty")
while local_result_q.qsize() > 1: while local_result_q.qsize() > nproc:
time.sleep(0.1) time.sleep(0.1)
log.debug("done waiting, call job_q_get") log.debug("done waiting, call job_q_get")
@ -764,7 +765,8 @@ class JobManager_Client(object):
self.server, # host self.server, # host
self.port, # port self.port, # port
self.authkey, # authkey self.authkey, # authkey
self.nthreads)) self.nthreads,
self.nproc))
self.procs.append(p) self.procs.append(p)
@ -1787,7 +1789,7 @@ class JobManager_Server(object):
self.stat.stop() self.stat.stop()
log.warning("timeout ({}s) exceeded -> quit server".format(self.timeout)) log.warning("timeout ({}s) exceeded -> quit server".format(self.timeout))
break break
info_line.value = ("res_q size:{} {}/s {}, jobs: rem.:{}, "+ info_line.value = ("res_q #{} {}/s {}|rem.:{}, "+
"done:{}, failed:{}, prog.:{}, "+ "done:{}, failed:{}, prog.:{}, "+
"timeout in:{}s").format(self.result_q.qsize(), data_speed, humanize_size(bytes_recieved), "timeout in:{}s").format(self.result_q.qsize(), data_speed, humanize_size(bytes_recieved),
jobqsize, jobqsize,
@ -1796,12 +1798,12 @@ class JobManager_Server(object):
numjobs.value - numresults.value - jobqsize, numjobs.value - numresults.value - jobqsize,
time_left).encode('utf-8') time_left).encode('utf-8')
else: else:
info_line.value = ("result_q size:{} {}/s {}, jobs: remaining:{}, "+ info_line.value = ("res_q #{} {}/s {}|rem.:{}, "+
"done:{}, failed:{}, in progress:{}").format(self.result_q.qsize(), data_speed, humanize_size(bytes_recieved), "done:{}, failed:{}, prog.:{}").format(self.result_q.qsize(), data_speed, humanize_size(bytes_recieved),
jobqsize, jobqsize,
markeditems, markeditems,
failqsize, failqsize,
numjobs.value - numresults.value - jobqsize).encode('utf-8') numjobs.value - numresults.value - jobqsize).encode('utf-8')
log.info("infoline {}".format(info_line.value)) log.info("infoline {}".format(info_line.value))
# allows for update of the info line # allows for update of the info line
try: try: