Skip to content

fix: TaskTimout and TaskRateLimit should pass workername to error_reason #1506

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

Open
diaxoaine wants to merge 1 commit into
base: master
Choose a base branch
from
+24 −2
Open

fix: TaskTimout and TaskRateLimit should pass workername to error_reason #1506

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions flower/api/control.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -470,7 +470,7 @@ def post(self, taskname):
else:
logger.error(response)
self.set_status(403)
reason = self.error_reason(taskname, response)
reason = self.error_reason(workername, response)
self.write(f"Failed to set timeouts: '{reason}'")


Expand Down Expand Up @@ -527,5 +527,5 @@ def post(self, taskname):
else:
logger.error(response)
self.set_status(403)
reason = self.error_reason(taskname, response)
reason = self.error_reason(workername, response)
self.write(f"Failed to set rate limit: '{reason}'")
22 changes: 22 additions & 0 deletions tests/unit/api/test_control.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,6 +109,18 @@ def test_task_timeout(self):
'celery.map', hard=3.1, soft=1.2, destination=['foo'],
reply=True)

def test_task_timeout_failure_returns_worker_error_message(self):
celery = self._app.capp
celery.control.time_limit = MagicMock(
return_value=[{'foo': {'error': 'time limits not supported'}}])

r = self.post(
'/api/task/timeout/celery.map',
body={'workername': 'foo', 'hard': 3.1, 'soft': 1.2}
)
self.assertEqual(403, r.code)
self.assertEqual(b"Failed to set timeouts: 'time limits not supported'", r.body)

def test_task_ratelimit(self):
celery = self._app.capp
celery.control.rate_limit = MagicMock(
Expand All @@ -131,6 +143,16 @@ def test_task_ratelimit_non_integer(self):
celery.control.rate_limit.assert_called_once_with(
'celery.map', '11/m', destination=['foo'], reply=True)

def test_task_ratelimit_failure_returns_worker_error_message(self):
celery = self._app.capp
celery.control.rate_limit = MagicMock(
return_value=[{'foo': {'error': 'Invalid rate limit string'}}])

r = self.post('/api/task/rate-limit/celery.map',
body={'workername': 'foo', 'ratelimit': 'garbage'})
self.assertEqual(403, r.code)
self.assertEqual(b"Failed to set rate limit: 'Invalid rate limit string'", r.body)

def test_param_escape(self):
app = self._app.capp
app.control.broadcast = MagicMock(
Expand Down