| |
@@ -277,7 +277,6 @@
|
| |
self.repos = {}
|
| |
self.external_repo_ts = {}
|
| |
self.tasks = {}
|
| |
- self.recent_tasks = {}
|
| |
self.other_tasks = {}
|
| |
self.needed_tags = {}
|
| |
self.tag_use_stats = {}
|
| |
@@ -712,11 +711,6 @@
|
| |
self.setTagScore(entry)
|
| |
|
| |
def updateRepos(self):
|
| |
- self.checkTasks()
|
| |
- self.logger.debug("Current tasks: %r" % self.tasks)
|
| |
- if self.other_tasks:
|
| |
- self.logger.debug("Found %i untracked newRepo tasks",
|
| |
- len(self.other_tasks))
|
| |
self.logger.debug("Updating repos")
|
| |
|
| |
self.readCurrentRepos()
|
| |
@@ -748,12 +742,6 @@
|
| |
- check for other newRepo tasks (not generated by us)
|
| |
"""
|
| |
|
| |
- # prune recent tasks
|
| |
- now = time.time()
|
| |
- for task_id in list(self.recent_tasks):
|
| |
- if now - self.recent_tasks[task_id] > self.options.recent_tasks_lifetime:
|
| |
- del self.recent_tasks[task_id]
|
| |
-
|
| |
# check on current tasks
|
| |
task_ids = list(self.tasks)
|
| |
self.session.multicall = True
|
| |
@@ -764,12 +752,15 @@
|
| |
tag_id = self.tasks[task_id]['tag_id']
|
| |
if tstate == 'CLOSED':
|
| |
self.logger.info("Finished: newRepo task %s for tag %s", task_id, tag_id)
|
| |
- self.recent_tasks[task_id] = time.time()
|
| |
del self.tasks[task_id]
|
| |
+ try:
|
| |
+ del self.needed_tags[tag_id]
|
| |
+ except KeyError:
|
| |
+ # it could be already removed by checkNeeded
|
| |
+ pass
|
| |
elif tstate in ('CANCELED', 'FAILED'):
|
| |
self.logger.info(
|
| |
"Problem: newRepo task %s for tag %s is %s", task_id, tag_id, tstate)
|
| |
- self.recent_tasks[task_id] = time.time()
|
| |
del self.tasks[task_id]
|
| |
else:
|
| |
self.tasks[task_id]['taskinfo'] = tinfo
|
| |
@@ -821,7 +812,11 @@
|
| |
# no longer needed
|
| |
self.logger.info("Tag %(name)s has a current or in "
|
| |
"progress repo", entry['taginfo'])
|
| |
- del self.needed_tags[tag_id]
|
| |
+ try:
|
| |
+ del self.needed_tags[tag_id]
|
| |
+ except KeyError:
|
| |
+ # it could be already deleted by checkTasks
|
| |
+ pass
|
| |
# if not covered, we already know
|
| |
continue
|
| |
if covered:
|
| |
@@ -875,6 +870,12 @@
|
| |
def regenRepos(self):
|
| |
"""Trigger newRepo tasks for needed tags"""
|
| |
|
| |
+ self.checkTasks()
|
| |
+ self.logger.debug("Current tasks: %r" % self.tasks)
|
| |
+ if self.other_tasks:
|
| |
+ self.logger.debug("Found %i untracked newRepo tasks",
|
| |
+ len(self.other_tasks))
|
| |
+
|
| |
# first note currently running tasks
|
| |
running_tasks = 0
|
| |
running_tasks_maven = 0
|
| |
@@ -909,9 +910,6 @@
|
| |
if task_id in self.tasks:
|
| |
# we already have a task
|
| |
continue
|
| |
- elif task_id in self.recent_tasks:
|
| |
- # avoiding a race, see https://pagure.io/koji/issue/942
|
| |
- continue
|
| |
else:
|
| |
# should not happen
|
| |
logger.warning('Needed tag refers to unknown task. '
|
| |
@@ -1134,7 +1132,6 @@
|
| |
# XXX should really be called expired_repo_lifetime
|
| |
'dist_repo_lifetime': 7 * 24 * 3600,
|
| |
'check_external_repos': False,
|
| |
- 'recent_tasks_lifetime': 600,
|
| |
'sleeptime': 15,
|
| |
'cert': None,
|
| |
'serverca': None,
|
| |
@@ -1144,13 +1141,13 @@
|
| |
int_opts = ('deleted_repo_lifetime', 'max_repo_tasks', 'repo_tasks_limit',
|
| |
'retry_interval', 'max_retries', 'offline_retry_interval',
|
| |
'max_delete_processes', 'max_repo_tasks_maven', 'dist_repo_lifetime',
|
| |
- 'sleeptime', 'recent_tasks_lifetime')
|
| |
+ 'sleeptime')
|
| |
str_opts = ('topdir', 'server', 'user', 'password', 'logfile', 'principal', 'keytab',
|
| |
'cert', 'serverca', 'debuginfo_tags', 'queue_file',
|
| |
'source_tags', 'separate_source_tags', 'ignore_tags')
|
| |
bool_opts = ('verbose', 'debug', 'ignore_stray_repos', 'offline_retry',
|
| |
'no_ssl_verify', 'check_external_repos')
|
| |
- legacy_opts = ('with_src', 'delete_batch_size')
|
| |
+ legacy_opts = ('with_src', 'delete_batch_size', 'recent_tasks_lifetime')
|
| |
for name in config.options(section):
|
| |
if name in int_opts:
|
| |
defaults[name] = config.getint(section, name)
|
| |
Related: https://pagure.io/koji/issue/2119