Stop fusion when closing flush engine.

2 files changed, 37 insertions, 0 deletions

diff --git a/searchcore/src/tests/proton/index/fusionrunner_test.cpp b/searchcore/src/tests/proton/index/fusionrunner_test.cpp
index acd5c86fd5d..80e6e8b3db8 100644
--- a/searchcore/src/tests/proton/index/fusionrunner_test.cpp
+++ b/searchcore/src/tests/proton/index/fusionrunner_test.cpp
@@ -80,6 +80,7 @@ class Test : public vespalib::TestApp {
     void requireThatFusionCanRunOnMultipleDiskIndexes();
     void requireThatOldFusionIndexCanBePartOfNewFusion();
     void requireThatSelectorsCanBeRebased();
+    void requireThatFusionCanBeStopped();
 
 public:
     Test()
@@ -111,6 +112,7 @@ Test::Main()
     TEST_CALL(requireThatFusionCanRunOnMultipleDiskIndexes());
     TEST_CALL(requireThatOldFusionIndexCanBePartOfNewFusion());
     TEST_CALL(requireThatSelectorsCanBeRebased());
+    TEST_CALL(requireThatFusionCanBeStopped());
 
     TEST_DONE();
 }
@@ -324,6 +326,17 @@ void Test::requireThatSelectorsCanBeRebased() {
     checkResults(fusion_id, disk_id, 3);
 }
 
+void
+Test::requireThatFusionCanBeStopped()
+{
+    createIndex(base_dir, disk_id[0]);
+    createIndex(base_dir, disk_id[1]);
+    auto flush_token = std::make_shared<search::FlushToken>();
+    flush_token->request_stop();
+    uint32_t fusion_id = _fusion_runner->fuse(_fusion_spec, 0u, _ops, flush_token);
+    EXPECT_EQUAL(0u, fusion_id);
+}
+
 }  // namespace
 
 TEST_APPHOOK(Test);
diff --git a/searchcore/src/tests/proton/index/indexmanager_test.cpp b/searchcore/src/tests/proton/index/indexmanager_test.cpp
index 67eb11cee3e..0589bdbda96 100644
--- a/searchcore/src/tests/proton/index/indexmanager_test.cpp
+++ b/searchcore/src/tests/proton/index/indexmanager_test.cpp
@@ -830,6 +830,30 @@ TEST_F(IndexManagerTest, field_length_info_is_loaded_from_disk_index_during_star
     expect_field_length_info(1, 2, *as_memory_index(*sources, 1));
 }
 
+TEST_F(IndexManagerTest, fusion_can_be_stopped)
+{
+    resetIndexManager();
+
+    addDocument(docid);
+    flushIndexManager();
+    addDocument(docid);
+    flushIndexManager();
+
+    IndexFusionTarget target(_index_manager->getMaintainer());
+    auto flush_token = std::make_shared<search::FlushToken>();
+    flush_token->request_stop();
+    vespalib::Executor::Task::UP fusionTask = target.initFlush(1, flush_token);
+    fusionTask->run();
+
+    FusionSpec spec = _index_manager->getMaintainer().getFusionSpec();
+    set<uint32_t> fusion_ids = readDiskIds(index_dir, "fusion");
+    EXPECT_TRUE(fusion_ids.empty());
+    EXPECT_EQ(0u, spec.last_fusion_id);
+    EXPECT_EQ(2u, spec.flush_ids.size());
+    EXPECT_EQ(1u, spec.flush_ids[0]);
+    EXPECT_EQ(2u, spec.flush_ids[1]);
+}
+
 }  // namespace
 
 int