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

Fix/646 websocket error handling #662

Merged
merged 2 commits into from
Jun 28, 2022
Merged

Fix/646 websocket error handling #662

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a9918f7
Test workaround from GH issues
sambles Jun 28, 2022
d42ca9a
Test worker-controller more updates
sambles Jun 28, 2022
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
2 changes: 1 addition & 1 deletion kubernetes/charts/oasis-platform/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -182,7 +182,7 @@ workerController:

# Debug option - Read the auto scaling configuration from the API on every update
# default is only to read it on for each model each time replicas is changed from 0 (first analysis running))
continueUpdateScaling: false
continueUpdateScaling: true

# Debug option - This prevents workers for a model set to FIXED_WORKERS to be scaled to 0. They will always be started.
neverShutdownFixedWorkers: false
Expand Down
21 changes: 20 additions & 1 deletion src/server/oasisapi/queues/consumers.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,25 @@
from src.server.oasisapi.queues.utils import QueueInfo


class GuardedAsyncJsonWebsocketConsumer(AsyncJsonWebsocketConsumer):
async def receive(self, text_data=None, bytes_data=None, **kwargs):
error_code = 4011
try:
await super().receive(text_data=text_data, bytes_data=bytes_data, **kwargs)
except Exception:
await self.disconnect({'code': error_code})
# # Or, if you need websocket_disconnect (eg. for autogroups), try this:
#
# try:
# await self.websocket_disconnect({'code': error_code})
# except StopConsumer:
# pass

# Try and close cleanly
await self.close(error_code)
raise


class ContentStatus(Enum):
ERROR = 'ERROR'
SUCCESS = 'SUCCESS'
Expand Down Expand Up @@ -95,7 +114,7 @@ def build_all_queue_status_message(analysis_filter=None, message_type='queue_sta
return build_task_status_message(status_message, message_type=message_type)


class QueueStatusConsumer(AsyncJsonWebsocketConsumer):
class QueueStatusConsumer(GuardedAsyncJsonWebsocketConsumer):
groups = ['queue_status']

async def connect(self):
Expand Down