starred/windmill
1
0
Fork 0
mirror of https://github.com/windmill-labs/windmill.git synced 2026-09-08 00:03:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: do not quit indexer when receiving handoff during pull (#7659)

Browse Source 
* fix: do not quit indexer when receiving handoff during pull

* update

* Add correct return type

* update ee-repo-ref [CI only]

* chore: update ee-repo-ref to c05572e93739e2697ab310d87efe2744cd0e1aaf

This commit updates the EE repository reference after PR #394 was merged in windmill-ee-private.

Previous ee-repo-ref: 4358aa9c5b3b38ba74d7ea52cafd49899d338a07

New ee-repo-ref: c05572e93739e2697ab310d87efe2744cd0e1aaf

Automated by sync-ee-ref workflow.

---------

Co-authored-by: Ruben Fiszel <ruben@windmill.dev>
Co-authored-by: windmill-internal-app[bot] <windmill-internal-app[bot]@users.noreply.github.com>
This commit is contained in:
wendrul
2026-01-29 11:43:26 +00:00
committed by GitHub
co-authored by Ruben Fiszel windmill-internal-app[bot]
parent 0089ebd4fb
commit 8bb6b6331b
4 changed files with 13 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
backend/ee-repo-ref.txt
+1 -1
View File
@@ -1 +1 @@
5d841b358dd32130c9f34b54f59b96b5c322f213
c05572e93739e2697ab310d87efe2744cd0e1aaf
backend/src/main.rs
+10 -6
View File
@@ -909,9 +909,11 @@ Windmill Community Edition {GIT_VERSION}
tracing::info!("Received killpill, aborting index initialization");
},
res = windmill_indexer::completed_runs_oss::init_index(&db) => {
let res = res?;
reader = Some(res.0);
writer = Some(res.1);
let res = res?;
if let Some(r) = res {
reader = Some(r.0);
writer = Some(r.1);
}
}
}
@@ -953,9 +955,11 @@ Windmill Community Edition {GIT_VERSION}
tracing::info!("Received killpill, aborting index initialization");
},
res = windmill_indexer::service_logs_oss::init_index(&db, killpill_tx.clone()) => {
let res = res?;
reader = Some(res.0);
writer = Some(res.1);
let res = res?;
if let Some(r) = res {
reader = Some(r.0);
writer = Some(r.1);
}
}
}
backend/windmill-indexer/src/completed_runs_oss.rs
+1 -1
View File
@@ -18,7 +18,7 @@ pub struct IndexReader;
pub struct IndexWriter;
#[cfg(not(feature = "private"))]
pub async fn init_index(_db: &Pool<Postgres>) -> Result<(IndexReader, IndexWriter), Error> {
pub async fn init_index(_db: &Pool<Postgres>) -> Result<Option<(IndexReader, IndexWriter)>, Error> {
Err(anyhow!("Cannot initialize index: not in EE").into())
}
backend/windmill-indexer/src/service_logs_oss.rs
+1 -1
View File
@@ -22,7 +22,7 @@ pub struct ServiceLogIndexWriter;
pub async fn init_index(
_db: &Pool<Postgres>,
mut _killpill_tx: KillpillSender,
) -> Result<(ServiceLogIndexReader, ServiceLogIndexWriter), Error> {
) -> Result<Option<(ServiceLogIndexReader, ServiceLogIndexWriter)>, Error> {
Err(anyhow!("Cannot initialize index: not in EE").into())
}