Skip to content

Fix: make query configure idempotent to support multiple drasi apply #318

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 2 commits into
base: main
Choose a base branch
from
+26 −14
Open

Fix: make query configure idempotent to support multiple drasi apply #318

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9adbd00
fix: make query configure idempotent to support multiple drasi apply …
whiz-Tuhin Oct 2, 2025
75f560b
Merge branch 'main' into fix/query-apply-idempotency
whiz-Tuhin Oct 2, 2025
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
40 changes: 26 additions & 14 deletions query-container/query-host/src/query_actor.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -223,9 +223,18 @@ impl QueryActor {
log::info!("Query configure - {}", self.query_id);
let config = self.config.get().await;

if config.is_some() {
log::error!("Query {} already configured", self.query_id);
return (StatusCode::CONFLICT, "Query already configured").into_response();
// Allow idempotent reconfiguration to support calling `drasi apply` multiple times
let is_reconfiguring = config.is_some();

if is_reconfiguring {
log::info!("Query {} reconfiguring", self.query_id);

// Shutdown existing worker to prevent resource leaks
if let Some(w) = &self.worker.get().await {
w.delete();
w.shutdown();
self.worker.clear().await;
}
}

//todo: validation
Expand All @@ -241,17 +250,20 @@ impl QueryActor {
}
};

match self.register_reminder().await {
Ok(_) => {}
Err(e) => {
log::error!("Query {} Error registering reminder: {}", self.query_id, e);
return (
StatusCode::INTERNAL_SERVER_ERROR,
"Error registering reminder",
)
.into_response();
}
};
// Skip reminder registration on reconfiguration since it already exists in Dapr
if !is_reconfiguring {
match self.register_reminder().await {
Ok(_) => {}
Err(e) => {
log::error!("Query {} Error registering reminder: {}", self.query_id, e);
return (
StatusCode::INTERNAL_SERVER_ERROR,
"Error registering reminder",
)
.into_response();
}
};
}

match self.init_worker().await {
Ok(_) => {}
Expand Down