Also wait when the commit type is force

Author: rdettai

quickwit/quickwit-ingest/src/ingest_v2/router.rs

@@ -457,7 +457,7 @@ impl IngestRouter {
         max_num_attempts: usize,
     ) -> IngestResponseV2 {
         let commit_type = ingest_request.commit_type();
-        let mut workbench = if commit_type == CommitTypeV2::WaitFor {
+        let mut workbench = if matches!(commit_type, CommitTypeV2::Force | CommitTypeV2::WaitFor) {
             IngestWorkbench::new_with_publish_tracking(
                 ingest_request.subrequests,
                 max_num_attempts,

quickwit/quickwit-integration-tests/src/tests/ingest_tests.rs

@@ -330,7 +330,7 @@ async fn test_commit_force() {
             - name: body
               type: text
         indexing_settings:
-            commit_timeout_secs: 20
+            commit_timeout_secs: 60
         "#
     );
 
@@ -344,22 +344,21 @@ async fn test_commit_force() {
 
     sandbox.enable_ingest_v2();
 
-    ingest_with_retry(
-        &sandbox.indexer_rest_client,
-        index_id,
-        ingest_json!({"body": "force"}),
-        CommitType::Force,
+    // commit_timeout_secs is set to a large value, so this would timeout if
+    // the commit isn't forced
+    tokio::time::timeout(
+        Duration::from_secs(20),
+        ingest_with_retry(
+            &sandbox.indexer_rest_client,
+            index_id,
+            ingest_json!({"body": "force"}),
+            CommitType::Force,
+        ),
     )
     .await
+    .unwrap()
     .unwrap();
 
-    // commit_timeout_secs is set to a large value, so this would timeout if
-    // CommitType::Force is not working
-    sandbox
-        .wait_for_splits(index_id, Some(vec![SplitState::Published]), 1)
-        .await
-        .unwrap();
-
     sandbox.assert_hit_count(index_id, "body:force", 1).await;
 
     sandbox.shutdown().await.unwrap();
@@ -405,6 +404,7 @@ async fn test_commit_wait_for() {
         .await
         .unwrap();
 
+    // This test is not powerful enough to ensure that `wait_for` does not force the commit
     sandbox.assert_hit_count(index_id, "body:wait", 1).await;
 
     sandbox.shutdown().await.unwrap();