Skip to content

Fix re-subscription logic from pipeline services #1266

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

Draft
wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

Fix re-subscription logic from pipeline services #1266

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
16 changes: 9 additions & 7 deletions src/monitor.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,13 +59,15 @@ def _run(self, sub_id):
try:
event = self._api.receive_event(sub_id)
except Exception as e:
self.log.error(f"Error receiving event: {e}, re-subscribing in 10 seconds")
time.sleep(10)
sub_id = self._api.subscribe('node')
subscribe_retries += 1
if subscribe_retries > 3:
self.log.error("Failed to re-subscribe to node events")
return False
self.log.error(f"Error receiving event: {e}")
if "404 Client Error" in str(e):
self.log.error(f"Error receiving event: {e}. Re-subscribing...")
sub_id = self._setup(None)
subscribe_retries += 1
if subscribe_retries > 3:
self.log.error("Failed to re-subscribe to node events")
return False
continue
continue
subscribe_retries = 0
obj = event.data
Expand Down
16 changes: 9 additions & 7 deletions src/scheduler.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -382,13 +382,15 @@ def _run(self, sub_id):
try:
event = self._api_helper.receive_event_data(sub_id, block=False)
except Exception as e:
self.log.error(f"Error receiving event: {e}, re-subscribing in 10 seconds")
time.sleep(10)
sub_id = self._api.subscribe('node')
subscribe_retries += 1
if subscribe_retries > 3:
self.log.error("Failed to re-subscribe to node events")
return False
self.log.error(f"Error receiving event: {e}")
if "404 Client Error" in str(e):
self.log.error(f"Error receiving event: {e}. Re-subscribing...")
sub_id = self._setup(None)
subscribe_retries += 1
if subscribe_retries > 3:
self.log.error("Failed to re-subscribe to node events")
return False
continue
continue
if not event:
# If we received a keep-alive event, just continue
Expand Down
16 changes: 9 additions & 7 deletions src/send_kcidb.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -702,13 +702,15 @@ def _run(self, context):
try:
node, is_hierarchy = self._api_helper.receive_event_node(context['sub_id'])
except Exception as e:
self.log.error(f"Error receiving event: {e}, re-subscribing in 10 seconds")
time.sleep(10)
context['sub_id'] = self._api_helper.subscribe_filters(self._filters, promiscuous=True)
subscribe_retries += 1
if subscribe_retries > 3:
self.log.error("Failed to re-subscribe to node events")
return False
self.log.error(f"Error receiving event: {e}")
if "404 Client Error" in str(e):
self.log.error(f"Error receiving event: {e}. Re-subscribing...")
context['sub_id'] = self._api_helper.subscribe_filters(self._filters, promiscuous=True)
subscribe_retries += 1
if subscribe_retries > 3:
self.log.error("Failed to re-subscribe to node events")
return False
continue
continue
subscribe_retries = 0
self.log.info(f"Processing event node: {node['id']}")
Expand Down
19 changes: 10 additions & 9 deletions src/tarball.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -215,17 +215,18 @@ def _run(self, sub_id):
try:
checkout_node, _ = self._api_helper.receive_event_node(sub_id)
except Exception as e:
self.log.error(f"Error receiving event: {e}, re-subscribing in 10 seconds")
time.sleep(10)
# try to resubscribe
sub_id = self._api_helper.subscribe_filters(self._filters)
subscribe_retries += 1
if subscribe_retries > 3:
self.log.error("Failed to re-subscribe to checkout events")
return False
self.log.error(f"Error receiving event: {e}")
if "404 Client Error" in str(e):
self.log.error(f"Error receiving event: {e}. Re-subscribing...")
sub_id = self._setup(None)
subscribe_retries += 1
if subscribe_retries > 3:
self.log.error("Failed to re-subscribe to checkout events")
return False
continue
continue
subscribe_retries = 0

subscribe_retries = 0
build_config = self._find_build_config(checkout_node)
if build_config is None:
continue
Expand Down