Merge pull request #20782 from vespa-engine/toregge/calculate-transient-disk-space-due-to-fusion

Consider disk space used by fusion indexes beyond current fusion index or

1 files changed, 16 insertions, 16 deletions

diff --git a/searchcore/src/tests/proton/index/diskindexcleaner_test.cpp b/searchcore/src/tests/proton/index/diskindexcleaner_test.cpp
index 6eab2c5bf3d..c814bdf3f37 100644
--- a/searchcore/src/tests/proton/index/diskindexcleaner_test.cpp
+++ b/searchcore/src/tests/proton/index/diskindexcleaner_test.cpp
@@ -1,7 +1,7 @@
 // Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 // Unit tests for diskindexcleaner.
 
-#include <vespa/searchcorespi/index/activediskindexes.h>
+#include <vespa/searchcorespi/index/disk_indexes.h>
 #include <vespa/searchcorespi/index/diskindexcleaner.h>
 #include <vespa/vespalib/testkit/testapp.h>
 #include <vespa/fastos/file.h>
@@ -90,8 +90,8 @@ void createIndexes() {
 
 void Test::requireThatAllIndexesOlderThanLastFusionIsRemoved() {
     createIndexes();
-    ActiveDiskIndexes active_indexes;
-    DiskIndexCleaner::clean(index_dir, active_indexes);
+    DiskIndexes disk_indexes;
+    DiskIndexCleaner::clean(index_dir, disk_indexes);
     vector<string> indexes = readIndexes();
     EXPECT_EQUAL(3u, indexes.size());
     EXPECT_TRUE(contains(indexes, "index.fusion.2"));
@@ -101,17 +101,17 @@ void Test::requireThatAllIndexesOlderThanLastFusionIsRemoved() {
 
 void Test::requireThatIndexesInUseAreNotRemoved() {
     createIndexes();
-    ActiveDiskIndexes active_indexes;
-    active_indexes.setActive(index_dir + "/index.fusion.1");
-    active_indexes.setActive(index_dir + "/index.flush.2");
-    DiskIndexCleaner::clean(index_dir, active_indexes);
+    DiskIndexes disk_indexes;
+    disk_indexes.setActive(index_dir + "/index.fusion.1", 0);
+    disk_indexes.setActive(index_dir + "/index.flush.2", 0);
+    DiskIndexCleaner::clean(index_dir, disk_indexes);
     vector<string> indexes = readIndexes();
     EXPECT_TRUE(contains(indexes, "index.fusion.1"));
     EXPECT_TRUE(contains(indexes, "index.flush.2"));
 
-    active_indexes.notActive(index_dir + "/index.fusion.1");
-    active_indexes.notActive(index_dir + "/index.flush.2");
-    DiskIndexCleaner::clean(index_dir, active_indexes);
+    disk_indexes.notActive(index_dir + "/index.fusion.1");
+    disk_indexes.notActive(index_dir + "/index.flush.2");
+    DiskIndexCleaner::clean(index_dir, disk_indexes);
     indexes = readIndexes();
     EXPECT_TRUE(!contains(indexes, "index.fusion.1"));
     EXPECT_TRUE(!contains(indexes, "index.flush.2"));
@@ -120,8 +120,8 @@ void Test::requireThatIndexesInUseAreNotRemoved() {
 void Test::requireThatInvalidFlushIndexesAreRemoved() {
     createIndexes();
     FastOS_File((index_dir + "/index.flush.4/serial.dat").c_str()).Delete();
-    ActiveDiskIndexes active_indexes;
-    DiskIndexCleaner::clean(index_dir, active_indexes);
+    DiskIndexes disk_indexes;
+    DiskIndexCleaner::clean(index_dir, disk_indexes);
     vector<string> indexes = readIndexes();
     EXPECT_EQUAL(2u, indexes.size());
     EXPECT_TRUE(contains(indexes, "index.fusion.2"));
@@ -131,8 +131,8 @@ void Test::requireThatInvalidFlushIndexesAreRemoved() {
 void Test::requireThatInvalidFusionIndexesAreRemoved() {
     createIndexes();
     FastOS_File((index_dir + "/index.fusion.2/serial.dat").c_str()).Delete();
-    ActiveDiskIndexes active_indexes;
-    DiskIndexCleaner::clean(index_dir, active_indexes);
+    DiskIndexes disk_indexes;
+    DiskIndexCleaner::clean(index_dir, disk_indexes);
     vector<string> indexes = readIndexes();
     EXPECT_EQUAL(4u, indexes.size());
     EXPECT_TRUE(contains(indexes, "index.fusion.1"));
@@ -144,8 +144,8 @@ void Test::requireThatInvalidFusionIndexesAreRemoved() {
 void Test::requireThatRemoveDontTouchNewIndexes() {
     createIndexes();
     FastOS_File((index_dir + "/index.flush.4/serial.dat").c_str()).Delete();
-    ActiveDiskIndexes active_indexes;
-    DiskIndexCleaner::removeOldIndexes(index_dir, active_indexes);
+    DiskIndexes disk_indexes;
+    DiskIndexCleaner::removeOldIndexes(index_dir, disk_indexes);
     vector<string> indexes = readIndexes();
     EXPECT_EQUAL(3u, indexes.size());
     EXPECT_TRUE(contains(indexes, "index.fusion.2"));