vbatts/quay
Archived
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

replace prefix w/ canonical name list

Browse source
This commit is contained in:
Jimmy Zelinskie 2016-12-07 12:55:22 -05:00
parent c41de8ded6
commit ebbe58d311
3 changed files with 10 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
data/queue.py
View file

@ -77,13 +77,16 @@ class WorkQueue(object):
._available_jobs(now, name_match_query) ._available_jobs(now, name_match_query)
.where(~(QueueItem.queue_name << running_query))) .where(~(QueueItem.queue_name << running_query)))
def num_available_jobs_between(self, available_min_time, available_max_time, prefix): def num_available_jobs_between(self, available_min_time, available_max_time, canonical_name_list):
""" """
Returns the number of available queue items with a given prefix, between the two provided times. Returns the number of available queue items with a given prefix, between the two provided times.
""" """
prefix = prefix.lstrip('/') def strip_slash(name):
return name.lstrip('/')
canonical_name_list = map(strip_slash, canonical_name_list)
available = self._available_jobs(available_max_time, available = self._available_jobs(available_max_time,
'/'.join([self._queue_name, prefix]) + '%') '/'.join([self._queue_name] + canonical_name_list) + '%')
return available.where(QueueItem.available_after >= available_min_time).count() return available.where(QueueItem.available_after >= available_min_time).count()

4
endpoints/building.py
View file

@ -29,13 +29,13 @@ class MaximumBuildsQueuedException(Exception):
def start_build(repository, prepared_build, pull_robot_name=None): def start_build(repository, prepared_build, pull_robot_name=None):
queue_item_prefix = '%s/%s' % (repository.namespace_user.username, repository.name)
if MAX_BUILD_QUEUE_RATE_ITEMS > 0 and MAX_BUILD_QUEUE_RATE_SECS > 0: if MAX_BUILD_QUEUE_RATE_ITEMS > 0 and MAX_BUILD_QUEUE_RATE_SECS > 0:
queue_item_canonical_name = [repository.namespace_user.username, repository.name]
now = datetime.utcnow() now = datetime.utcnow()
available_min = now - timedelta(seconds=MAX_BUILD_QUEUE_RATE_SECS) available_min = now - timedelta(seconds=MAX_BUILD_QUEUE_RATE_SECS)
available_builds = dockerfile_build_queue.num_available_jobs_between(available_min, available_builds = dockerfile_build_queue.num_available_jobs_between(available_min,
now, now,
queue_item_prefix) queue_item_canonical_name)
if available_builds >= MAX_BUILD_QUEUE_RATE_ITEMS: if available_builds >= MAX_BUILD_QUEUE_RATE_ITEMS:
raise MaximumBuildsQueuedException() raise MaximumBuildsQueuedException()

4
test/test_queue.py
View file

@ -189,11 +189,11 @@ class TestQueue(QueueTestCase):
self.queue.put(['abc', 'ghi'], self.TEST_MESSAGE_2, available_after=-5) self.queue.put(['abc', 'ghi'], self.TEST_MESSAGE_2, available_after=-5)
# Partial results # Partial results
count = self.queue.num_available_jobs_between(now-timedelta(seconds=8), now, 'abc') count = self.queue.num_available_jobs_between(now-timedelta(seconds=8), now, ['abc'])
self.assertEqual(1, count) self.assertEqual(1, count)
# All results # All results
count = self.queue.num_available_jobs_between(now-timedelta(seconds=20), now, 'abc') count = self.queue.num_available_jobs_between(now-timedelta(seconds=20), now, ['/abc'])
self.assertEqual(2, count) self.assertEqual(2, count)
# No results # No results