Skip to content

remote/coordinator: drop returns from finally clauses #1722

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
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

remote/coordinator: drop returns from finally clauses #1722

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
20 changes: 8 additions & 12 deletions labgrid/remote/coordinator.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -355,13 +355,11 @@ async def request_task():
finally:
try:
session = self.clients.pop(peer)
running_request_task.cancel()
await running_request_task
logging.debug("client aborted %s, cancelled: %s", session, context.cancelled())
except KeyError:
logging.info("Never received startup from peer %s that disconnected", peer)
return

running_request_task.cancel()
await running_request_task
logging.debug("client aborted %s, cancelled: %s", session, context.cancelled())

def _add_default_place(self, name):
if name in self.places:
Expand Down Expand Up @@ -462,15 +460,13 @@ async def request_task():

try:
session = self.exporters.pop(peer)
for groupname, group in session.groups.items():
for resourcename in group.copy():
session.set_resource(groupname, resourcename, None)

logging.debug("exporter aborted %s, cancelled: %s", context.peer(), context.cancelled())
except KeyError:
logging.info("Never received startup from peer %s that disconnected", peer)
return

for groupname, group in session.groups.items():
for resourcename in group.copy():
session.set_resource(groupname, resourcename, None)

logging.debug("exporter aborted %s, cancelled: %s", context.peer(), context.cancelled())

@locked
async def AddPlace(self, request, context):
Expand Down