Skip to content

Fix: serialize GraphRAG entity resolution merges to avoid graph mutation races #14237

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
yingfeng merged 2 commits into from
Apr 22, 2026
+4 −3
Merged

Fix: serialize GraphRAG entity resolution merges to avoid graph mutation races #14237

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7ac36fc
Graphrag entity resolution
spider-yamet Apr 20, 2026
75eadba
set graph value
spider-yamet Apr 21, 2026
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
7 changes: 4 additions & 3 deletions rag/graphrag/entity_resolution.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -159,15 +159,16 @@ async def limited_resolve_candidate(candidate_batch, result_set, result_lock):
connect_graph = nx.Graph()
connect_graph.add_edges_from(resolution_result)

merge_lock = asyncio.Lock()

async def limited_merge_nodes(graph, nodes, change):
async with semaphore:
async with merge_lock:
await self._merge_graph_nodes(graph, nodes, change, task_id)

tasks = []
for sub_connect_graph in nx.connected_components(connect_graph):
merging_nodes = list(sub_connect_graph)
tasks.append(asyncio.create_task(limited_merge_nodes(graph, merging_nodes, change))
)
tasks.append(asyncio.create_task(limited_merge_nodes(graph, merging_nodes, change)))
try:
await asyncio.gather(*tasks, return_exceptions=False)
except Exception as e:
Expand Down
Loading