Mirror
/
zulip
mirror of https://github.com/zulip/zulip.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

rabbitmq: Consolidate check_rabbitmq_queue to call rabbitmqctl once. 

`rabbitmqctl` tends to be slow; this shaves half a second off the time
to run `check-rabbitmq-consumers` in some cases.
This commit is contained in:
Alex Vandiver 2020-09-29 14:32:27 -07:00 committed by Alex Vandiver
parent 6c473ed75f
commit 4d65ea256a
1 changed files with 7 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
scripts/lib/check_rabbitmq_queue.py
View File

@ -126,32 +126,25 @@ def check_other_queues(queue_counts_dict: Dict[str, int]) -> List[Dict[str, Any]
return results return results
def check_rabbitmq_queues() -> None: def check_rabbitmq_queues() -> None:
pattern = re.compile(r'(\w+)\t(\d+)') pattern = re.compile(r'(\w+)\t(\d+)\t(\d+)')
if 'USER' in os.environ and not os.environ['USER'] in ['root', 'rabbitmq']: if 'USER' in os.environ and not os.environ['USER'] in ['root', 'rabbitmq']:
print("This script must be run as the root or rabbitmq user") print("This script must be run as the root or rabbitmq user")
list_queues_output = subprocess.check_output(['/usr/sbin/rabbitmqctl', 'list_queues'], list_queues_output = subprocess.check_output(['/usr/sbin/rabbitmqctl', 'list_queues',
'name', 'messages', 'consumers'],
universal_newlines=True) universal_newlines=True)
list_consumers_output = subprocess.check_output(['/usr/sbin/rabbitmqctl', 'list_consumers'],
universal_newlines=True)
queue_counts_rabbitmqctl = {} queue_counts_rabbitmqctl = {}
queues_with_consumers = []
for line in list_queues_output.split("\n"): for line in list_queues_output.split("\n"):
line = line.strip() line = line.strip()
m = pattern.match(line) m = pattern.match(line)
if m: if m:
queue = m.group(1) queue = m.group(1)
count = int(m.group(2)) count = int(m.group(2))
consumers = int(m.group(3))
queue_counts_rabbitmqctl[queue] = count queue_counts_rabbitmqctl[queue] = count
if consumers > 0 and not queue.startswith("notify_tornado"):
queues_with_consumers = [] queues_with_consumers.append(queue)
for line in list_consumers_output.split('\n'):
parts = line.split('\t')
if len(parts) >= 2:
queue_name = parts[0]
if queue_name.startswith("notify_tornado"):
continue
queues_with_consumers.append(queue_name)
queue_stats_dir = subprocess.check_output([os.path.join(ZULIP_PATH, 'scripts/get-django-setting'), queue_stats_dir = subprocess.check_output([os.path.join(ZULIP_PATH, 'scripts/get-django-setting'),
'QUEUE_STATS_DIR'], 'QUEUE_STATS_DIR'],