Archlinux-Jerry
/
buildbot
mirror of https://github.com/archlinux-jerry/buildbot
1
0
Fork 0
Code Issues Releases Wiki Activity

buildbot: fix upload bug

This commit is contained in:
JerryXiao 2019-09-07 11:56:52 +08:00
parent f2aa672ec4
commit a6f4f160b2
Signed by: Jerry
GPG Key ID: 9D9CE43650FF2BAA
2 changed files with 25 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
buildbot.py
View File

@ -267,6 +267,7 @@ class jobsManager:
f_to_upload.append(fpath) f_to_upload.append(fpath)
pkg_update_list.append(fpath) pkg_update_list.append(fpath)
sizes = [f.stat().st_size / 1000 / 1000 for f in f_to_upload] sizes = [f.stat().st_size / 1000 / 1000 for f in f_to_upload]
pkg_update_list_human = " ".join([f.name for f in pkg_update_list])
max_tries = 10 max_tries = 10
for tries in range(max_tries): for tries in range(max_tries):
timeouts = rrun('push_start', args=([f.name for f in f_to_upload], sizes)) timeouts = rrun('push_start', args=([f.name for f in f_to_upload], sizes))
@ -283,24 +284,26 @@ class jobsManager:
for f in f_to_upload: for f in f_to_upload:
max_tries = 5 max_tries = 5
for tries in range(max_tries): for tries in range(max_tries):
timeout = pkgs_timeouts.get(f)
try: try:
timeout = pkgs_timeouts.get(f) logger.info(f'Uploading {f.name}, timeout in {timeout}s')
logger.info(f'Uploading {f}, timeout in {timeout}s')
mon_bash(UPLOAD_CMD.format(src=f), seconds=int(timeout)) mon_bash(UPLOAD_CMD.format(src=f), seconds=int(timeout))
except Exception: except Exception:
time_to_sleep = (tries + 1) * 60 time_to_sleep = (tries + 1) * 60
logger.error(f'We are getting problem uploading {f}, wait {time_to_sleep} secs') logger.error(f'We are getting problem uploading {f.name}, wait {time_to_sleep} secs')
if not rrun('push_fail', args=(f.name,)): if not rrun('push_add_time', args=(f.name, time_to_sleep + timeout)):
logger.error('Unable to run push_fail') logger.error('Unable to run push_add_time')
print_exc_plus() print_exc_plus()
if tries + 1 < max_tries: if tries + 1 < max_tries:
sleep(time_to_sleep) sleep(time_to_sleep)
else: else:
break break
else: else:
logger.error(f'Upload {f} failed, abort.') logger.error(f'Upload {f.name} failed, running push_fail and abort.')
if not rrun('push_fail', args=(f.name,)):
logger.error('Unable to run push_fail')
raise RuntimeError('Unable to upload some files') raise RuntimeError('Unable to upload some files')
logger.info(f'Requesting repo update for {pkg_update_list}') logger.info(f'Requesting repo update for {pkg_update_list_human}')
res = "unexpected" res = "unexpected"
max_tries = 5 max_tries = 5
for tries in range(max_tries): for tries in range(max_tries):
@ -308,20 +311,20 @@ class jobsManager:
res = rrun('push_done', args=([f.name for f in f_to_upload],), kwargs={'overwrite': overwrite,}) res = rrun('push_done', args=([f.name for f in f_to_upload],), kwargs={'overwrite': overwrite,})
except Exception: except Exception:
time_to_sleep = (tries + 1) * 60 time_to_sleep = (tries + 1) * 60
logger.info(f'Error updating {pkg_update_list}, wait {time_to_sleep} secs') logger.info(f'Error updating {pkg_update_list_human}, wait {time_to_sleep} secs')
print_exc_plus() print_exc_plus()
if tries + 1 < max_tries: if tries + 1 < max_tries:
sleep(time_to_sleep) sleep(time_to_sleep)
else: else:
break break
else: else:
ret = f'Update failed for {pkg_update_list}: max reties exceeded' ret = f'Update failed for {pkg_update_list_human}: max reties exceeded'
logger.error(ret) logger.error(ret)
raise RuntimeError(ret) raise RuntimeError(ret)
if res is None: if res is None:
logger.info(f'Update success for {pkg_update_list}') logger.info(f'Update success for {pkg_update_list_human}')
else: else:
ret = f'Update failed for {pkg_update_list}, reason: {res}' ret = f'Update failed for {pkg_update_list_human}, reason: {res}'
logger.error(ret) logger.error(ret)
raise RuntimeError(ret) raise RuntimeError(ret)
return res is None return res is None

12
repod.py
View File

@ -92,6 +92,13 @@ class pushFm:
return None return None
else: else:
return "Wrong file" return "Wrong file"
def add_time(self, tfname, atime):
if tfname in self.fnames:
assert type(atime) in (int, float)
self.end_time += atime
return None
else:
return "Wrong file"
def done(self, fnames, overwrite=False): def done(self, fnames, overwrite=False):
''' '''
return None means success return None means success
@ -157,12 +164,15 @@ def push_done(filenames, overwrite=False):
def push_fail(filename): def push_fail(filename):
return pfm.fail(filename) return pfm.fail(filename)
def push_add_time(filename, atime):
return pfm.add_time(filename, atime)
# server part # server part
def run(funcname, args=list(), kwargs=dict()): def run(funcname, args=list(), kwargs=dict()):
if funcname in ('clean', 'regenerate', 'remove', if funcname in ('clean', 'regenerate', 'remove',
'update', 'push_start', 'push_done', 'update', 'push_start', 'push_done',
'push_fail'): 'push_fail', 'push_add_time'):
logger.info('running: %s %s %s', funcname, args, kwargs) logger.info('running: %s %s %s', funcname, args, kwargs)
ret = eval(funcname)(*args, **kwargs) ret = eval(funcname)(*args, **kwargs)
logger.info('done: %s %s',funcname, ret) logger.info('done: %s %s',funcname, ret)