Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

add queues column to workers tab #1293

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

add queues column to workers tab #1293

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0b8fe3e
add queues column to workers tab
Jun 19, 2023
f04be3e
fix existing tests
Jun 19, 2023
43b5e44
use queue in one test
Jun 19, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 17 additions & 6 deletions flower/static/js/flower.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -468,6 +468,17 @@ var flower = (function () {
}
}, {
targets: 1,
data: 'active_queues',
className: "text-center",
render: function (data, type, full, meta) {
if (Array.isArray(data)) {
return data.map(x => x['name']).join(', ');
} else {
return '&nbsp';
}
}
}, {
targets: 2,
data: 'status',
className: "text-center",
width: "10%",
Expand All @@ -479,37 +490,37 @@ var flower = (function () {
}
}
}, {
targets: 2,
targets: 3,
data: 'active',
className: "text-center",
width: "10%",
defaultContent: 0
}, {
targets: 3,
targets: 4,
data: 'task-received',
className: "text-center",
width: "10%",
defaultContent: 0
}, {
targets: 4,
targets: 5,
data: 'task-failed',
className: "text-center",
width: "10%",
defaultContent: 0
}, {
targets: 5,
targets: 6,
data: 'task-succeeded',
className: "text-center",
width: "10%",
defaultContent: 0
}, {
targets: 6,
targets: 7,
data: 'task-retried',
className: "text-center",
width: "10%",
defaultContent: 0
}, {
targets: 7,
targets: 8,
data: 'loadavg',
width: "10%",
className: "text-center text-nowrap",
Expand Down
2 changes: 2 additions & 0 deletions flower/templates/workers.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
<thead>
<tr>
<th>Worker</th>
<th>Queues</th>
<th class="text-center">Status</th>
<th class="text-center">Active</th>
<th class="text-center">Processed</th>
Expand All @@ -24,6 +25,7 @@
{% for name, info in workers.items() %}
<tr id="{{ url_escape(name) }}">
<td>{{ name }}</td>
<td>{{ " ,".join(map(lambda queue: queue['name'], info.get('active_queues', []))) }}</td>
<td>{{ info.get('status', None) }}</td>
<td>{{ info.get('active', 0) or 0 }}</td>
<td>{{ info.get('task-received', 0) }}</td>
Expand Down
3 changes: 2 additions & 1 deletion flower/views/workers.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,9 +46,10 @@ async def get(self):
if name not in events.workers:
continue
worker = events.workers[name]
full_worker_info = self.application.workers.get(name, {})
info = dict(values)
info.update(self._as_dict(worker))
info.update(status=worker.alive)
info.update({'status': worker.alive, 'active_queues': full_worker_info.get('active_queues', [])})
workers[name] = info

if options.purge_offline_workers is not None:
Expand Down
64 changes: 48 additions & 16 deletions tests/unit/views/test_workers.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ def test_single_workers_offline(self):
self.assertEqual(200, r.code)
self.assertEqual(1, len(table.rows()))
self.assertTrue(table.get_row('worker1'))
self.assertEqual(['worker1', 'False', '0', '0', '0', '0', '0', None],
self.assertEqual(['worker1', None, 'False', '0', '0', '0', '0', '0', None],
table.get_row('worker1'))
self.assertFalse(table.get_row('worker2'))

Expand All @@ -81,8 +81,40 @@ def test_single_workers_online(self):
state = EventsState()
state.get_or_create_worker('worker1')
state.event(Event('worker-online', hostname='worker1',
local_received=time.time()))
local_received=time.time(),
))
self.app.events.state = state
self.app.inspector.workers['worker1'] = {'registeres': [],
'active_queues': [{
'name': 'default_queue',
'exchange': {
'name': 'default',
'type': 'direct',
'arguments': None,
'durable': True,
'passive': False,
'auto_delete': False,
'delivery_mode': None,
'no_declare': False
},
'routing_key': 'default',
'queue_arguments': None,
'binding_arguments': None,
'consumer_arguments': None,
'durable': True,
'exclusive': False,
'auto_delete': False,
'no_ack': False,
'alias': None,
'bindings': [],
'no_declare': None,
'expires': None,
'message_ttl': None,
'max_length': None,
'max_length_bytes': None,
'max_priority': None}],
'stats': {'total': {'tasks.add': 10, 'tasks.sleep': 1, 'tasks.error': 1},
'broker': {'hostname': 'redis', 'userid': None, 'virtual_host': '/', 'port': 6379}}}

r = self.get('/workers')

Expand All @@ -92,7 +124,7 @@ def test_single_workers_online(self):
self.assertEqual(200, r.code)
self.assertEqual(1, len(table.rows()))
self.assertTrue(table.get_row('worker1'))
self.assertEqual(['worker1', 'True', '0', '0', '0', '0', '0', None],
self.assertEqual(['worker1', 'default_queue', 'True', '0', '0', '0', '0', '0', None],
table.get_row('worker1'))
self.assertFalse(table.get_row('worker2'))

Expand Down Expand Up @@ -120,9 +152,9 @@ def test_task_received(self):
self.assertEqual(200, r.code)
self.assertEqual(2, len(table.rows()))

self.assertEqual(['worker1', 'True', '0', '1', '0', '0', '0', None],
self.assertEqual(['worker1', None, 'True', '0', '1', '0', '0', '0', None],
table.get_row('worker1'))
self.assertEqual(['worker2', 'True', '0', '0', '0', '0', '0', None],
self.assertEqual(['worker2', None, 'True', '0', '0', '0', '0', '0', None],
table.get_row('worker2'))

def test_task_started(self):
Expand Down Expand Up @@ -150,9 +182,9 @@ def test_task_started(self):
self.assertEqual(200, r.code)
self.assertEqual(2, len(table.rows()))

self.assertEqual(['worker1', 'True', '0', '1', '0', '0', '0', None],
self.assertEqual(['worker1', None, 'True', '0', '1', '0', '0', '0', None],
table.get_row('worker1'))
self.assertEqual(['worker2', 'True', '0', '0', '0', '0', '0', None],
self.assertEqual(['worker2', None, 'True', '0', '0', '0', '0', '0', None],
table.get_row('worker2'))

def test_task_succeeded(self):
Expand Down Expand Up @@ -182,9 +214,9 @@ def test_task_succeeded(self):
self.assertEqual(200, r.code)
self.assertEqual(2, len(table.rows()))

self.assertEqual(['worker1', 'True', '0', '1', '0', '1', '0', None],
self.assertEqual(['worker1', None, 'True', '0', '1', '0', '1', '0', None],
table.get_row('worker1'))
self.assertEqual(['worker2', 'True', '0', '0', '0', '0', '0', None],
self.assertEqual(['worker2', None, 'True', '0', '0', '0', '0', '0', None],
table.get_row('worker2'))

def test_task_failed(self):
Expand Down Expand Up @@ -214,9 +246,9 @@ def test_task_failed(self):
self.assertEqual(200, r.code)
self.assertEqual(2, len(table.rows()))

self.assertEqual(['worker1', 'True', '0', '1', '1', '0', '0', None],
self.assertEqual(['worker1', None, 'True', '0', '1', '1', '0', '0', None],
table.get_row('worker1'))
self.assertEqual(['worker2', 'True', '0', '0', '0', '0', '0', None],
self.assertEqual(['worker2', None, 'True', '0', '0', '0', '0', '0', None],
table.get_row('worker2'))

def test_task_retried(self):
Expand Down Expand Up @@ -248,9 +280,9 @@ def test_task_retried(self):
self.assertEqual(200, r.code)
self.assertEqual(2, len(table.rows()))

self.assertEqual(['worker1', 'True', '0', '1', '1', '0', '1', None],
self.assertEqual(['worker1', None, 'True', '0', '1', '1', '0', '1', None],
table.get_row('worker1'))
self.assertEqual(['worker2', 'True', '0', '0', '0', '0', '0', None],
self.assertEqual(['worker2', None, 'True', '0', '0', '0', '0', '0', None],
table.get_row('worker2'))

def test_tasks(self):
Expand Down Expand Up @@ -281,11 +313,11 @@ def test_tasks(self):
self.assertEqual(200, r.code)
self.assertEqual(3, len(table.rows()))

self.assertEqual(['worker1', 'True', '0', '100', '0', '100', '0', None],
self.assertEqual(['worker1', None, 'True', '0', '100', '0', '100', '0', None],
table.get_row('worker1'))
self.assertEqual(['worker2', 'True', '0', '0', '0', '0', '0', None],
self.assertEqual(['worker2', None, 'True', '0', '0', '0', '0', '0', None],
table.get_row('worker2'))
self.assertEqual(['worker3', 'True', '0', '23', '13', '10', '0', None],
self.assertEqual(['worker3', None, 'True', '0', '23', '13', '10', '0', None],
table.get_row('worker3'))

def test_workers_view_json(self):
Expand Down