Skip to content

fix: Fix race in scheduler #25

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

Merged
merged 2 commits into from
Aug 1, 2023
Merged

fix: Fix race in scheduler #25

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
501fadc
Fix race in scheduler
hermanschaaf Aug 1, 2023
46e6446
Fmt
hermanschaaf Aug 1, 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
32 changes: 11 additions & 21 deletions cloudquery/sdk/scheduler/scheduler.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,12 +22,8 @@ def __init__(self, maxsize, *args, **kwargs):


class TableResolverStarted:
def __init__(self, count=1) -> None:
self._count = count

@property
def count(self):
return self._count
def __init__(self) -> None:
pass


class TableResolverFinished:
Expand Down Expand Up @@ -89,7 +85,6 @@ def resolve_table(
parent_item: Resource,
res: queue.Queue,
):
table_resolvers_started = 0
try:
if depth == 0:
self._logger.info(
Expand All @@ -115,6 +110,7 @@ def resolve_table(
continue
res.put(SyncInsertMessage(resource.to_arrow_record()))
for child_resolvers in resolver.child_resolvers:
res.put(TableResolverStarted())
self._pools[depth + 1].submit(
self.resolve_table,
child_resolvers,
Expand All @@ -123,7 +119,6 @@ def resolve_table(
resource,
res,
)
table_resolvers_started += 1
total_resources += 1
if depth == 0:
self._logger.info(
Expand All @@ -145,7 +140,6 @@ def resolve_table(
exc_info=True,
)
finally:
res.put(TableResolverStarted(count=table_resolvers_started))
Copy link
Member

@disq disq Aug 1, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I was always confused by this line

res.put(TableResolverFinished())

def _sync(
Expand All @@ -155,17 +149,13 @@ def _sync(
res: queue.Queue,
deterministic_cq_id=False,
):
total_table_resolvers = 0
try:
for resolver in resolvers:
clients = resolver.multiplex(client)
for client in clients:
self._pools[0].submit(
self.resolve_table, resolver, 0, client, None, res
)
total_table_resolvers += 1
finally:
res.put(TableResolverStarted(total_table_resolvers))
for resolver in resolvers:
clients = resolver.multiplex(client)
for client in clients:
res.put(TableResolverStarted())
self._pools[0].submit(
self.resolve_table, resolver, 0, client, None, res
)

def sync(
self, client, resolvers: List[TableResolver], deterministic_cq_id=False
Expand All @@ -180,7 +170,7 @@ def sync(
while True:
message = res.get()
if type(message) == TableResolverStarted:
total_table_resolvers += message.count
total_table_resolvers += 1
if total_table_resolvers == finished_table_resolvers:
break
continue
Expand Down