Align resource usage metrics with what is tracked and reported to the cluster controller.

New disk and memory metrics are added with improved names.
The old metrics will be removed on Vespa 8.

2 files changed, 40 insertions, 20 deletions

diff --git a/searchcore/src/tests/proton/server/disk_mem_usage_filter/disk_mem_usage_filter_test.cpp b/searchcore/src/tests/proton/server/disk_mem_usage_filter/disk_mem_usage_filter_test.cpp
index ce85517ee09..db32c1e77c4 100644
--- a/searchcore/src/tests/proton/server/disk_mem_usage_filter/disk_mem_usage_filter_test.cpp
+++ b/searchcore/src/tests/proton/server/disk_mem_usage_filter/disk_mem_usage_filter_test.cpp
@@ -121,18 +121,22 @@ TEST_F(DiskMemUsageFilterTest, both_disk_limit_and_memory_limit_can_be_reached)
               "capacity: 100, used: 90, diskUsed: 0.9, diskLimit: 0.8}}");
 }
 
-TEST_F(DiskMemUsageFilterTest, transient_disk_usage_is_tracked_in_usage_state_and_metrics)
+TEST_F(DiskMemUsageFilterTest, transient_and_non_transient_disk_usage_tracked_in_usage_state_and_metrics)
 {
-    _filter.set_transient_resource_usage({40, 0});
-    EXPECT_EQ(0.4, _filter.usageState().transient_disk_usage());
-    EXPECT_EQ(0.4, _filter.get_metrics().get_transient_disk_usage());
+    _filter.set_transient_resource_usage({15, 0});
+    EXPECT_DOUBLE_EQ(0.15, _filter.usageState().transient_disk_usage());
+    EXPECT_DOUBLE_EQ(0.15, _filter.get_metrics().transient_disk_usage());
+    EXPECT_DOUBLE_EQ(0.05, _filter.usageState().non_transient_disk_usage());
+    EXPECT_DOUBLE_EQ(0.05, _filter.get_metrics().non_transient_disk_usage());
 }
 
-TEST_F(DiskMemUsageFilterTest, transient_memory_usage_is_tracked_in_usage_state_and_metrics)
+TEST_F(DiskMemUsageFilterTest, transient_and_non_transient_memory_usage_tracked_in_usage_state_and_metrics)
 {
-    _filter.set_transient_resource_usage({0, 200});
-    EXPECT_EQ(0.2, _filter.usageState().transient_memory_usage());
-    EXPECT_EQ(0.2, _filter.get_metrics().get_transient_memory_usage());
+    _filter.set_transient_resource_usage({0, 100});
+    EXPECT_DOUBLE_EQ(0.1, _filter.usageState().transient_memory_usage());
+    EXPECT_DOUBLE_EQ(0.1, _filter.get_metrics().transient_memory_usage());
+    EXPECT_DOUBLE_EQ(0.2, _filter.usageState().non_transient_memory_usage());
+    EXPECT_DOUBLE_EQ(0.2, _filter.get_metrics().non_transient_memory_usage());
 }
 
 GTEST_MAIN_RUN_ALL_TESTS()
diff --git a/searchcore/src/tests/proton/server/disk_mem_usage_metrics/disk_mem_usage_metrics_test.cpp b/searchcore/src/tests/proton/server/disk_mem_usage_metrics/disk_mem_usage_metrics_test.cpp
index 60240e06fc4..8ba02875dc0 100644
--- a/searchcore/src/tests/proton/server/disk_mem_usage_metrics/disk_mem_usage_metrics_test.cpp
+++ b/searchcore/src/tests/proton/server/disk_mem_usage_metrics/disk_mem_usage_metrics_test.cpp
@@ -10,30 +10,46 @@ using proton::DiskMemUsageState;
 using proton::ResourceUsageState;
 
 bool
-expect_metrics(double disk_usage, double disk_utilization, double memory_usage, double memory_utilization, const DiskMemUsageMetrics &dm_metrics)
+expect_metrics(double disk_usage, double disk_utilization, double transient_disk, double non_transient_disk,
+               double memory_usage, double memory_utilization, double transient_memory, double non_transient_memory,
+               const DiskMemUsageMetrics &dm_metrics)
 {
     bool result = true;
-    EXPECT_DOUBLE_EQ(disk_usage, dm_metrics.get_disk_usage()) << (result = false, "");
-    EXPECT_DOUBLE_EQ(disk_utilization, dm_metrics.get_disk_utilization()) << (result = false, "");
-    EXPECT_DOUBLE_EQ(memory_usage, dm_metrics.get_memory_usage()) << (result = false, "");
-    EXPECT_DOUBLE_EQ(memory_utilization, dm_metrics.get_memory_utilization()) << (result = false, "");
+    EXPECT_DOUBLE_EQ(disk_usage, dm_metrics.total_disk_usage()) << (result = false, "");
+    EXPECT_DOUBLE_EQ(disk_utilization, dm_metrics.total_disk_utilization()) << (result = false, "");
+    EXPECT_DOUBLE_EQ(transient_disk, dm_metrics.transient_disk_usage()) << (result = false, "");
+    EXPECT_DOUBLE_EQ(non_transient_disk, dm_metrics.non_transient_disk_usage()) << (result = false, "");
+    EXPECT_DOUBLE_EQ(memory_usage, dm_metrics.total_memory_usage()) << (result = false, "");
+    EXPECT_DOUBLE_EQ(memory_utilization, dm_metrics.total_memory_utilization()) << (result = false, "");
+    EXPECT_DOUBLE_EQ(transient_memory, dm_metrics.transient_memory_usage()) << (result = false, "");
+    EXPECT_DOUBLE_EQ(non_transient_memory, dm_metrics.non_transient_memory_usage()) << (result = false, "");
     return result;
 }
 
 TEST(DiskMemUsageMetricsTest, default_value_is_zero)
 {
     DiskMemUsageMetrics dm_metrics;
-    EXPECT_TRUE(expect_metrics(0.0, 0.0, 0.0, 0.0, dm_metrics));
+    EXPECT_TRUE(expect_metrics(0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, dm_metrics));
 }
 
 TEST(DiskMemUsageMetricsTest, merging_uses_max)
 {
-    DiskMemUsageMetrics dm_metrics({ResourceUsageState(0.5, 0.4), ResourceUsageState(0.5, 0.3)});
-    EXPECT_TRUE(expect_metrics(0.4, 0.8, 0.3, 0.6, dm_metrics));
-    dm_metrics.merge({ResourceUsageState(0.4, 0.4), ResourceUsageState(0.5, 0.4)});
-    EXPECT_TRUE(expect_metrics(0.4, 1.0, 0.4, 0.8, dm_metrics));
-    dm_metrics.merge({ResourceUsageState(0.5, 0.4), ResourceUsageState(0.5, 0.3)});
-    EXPECT_TRUE(expect_metrics(0.4, 1.0, 0.4, 0.8, dm_metrics));
+    DiskMemUsageMetrics dm_metrics({ResourceUsageState(0.5, 0.4),
+                                    ResourceUsageState(0.5, 0.3), 0.1, 0.05});
+    EXPECT_TRUE(expect_metrics(0.4, 0.8, 0.1, 0.3,
+                               0.3, 0.6, 0.05, 0.25, dm_metrics));
+    dm_metrics.merge({ResourceUsageState(0.4, 0.4),
+                      ResourceUsageState(0.3, 0.3), 0.1, 0.05});
+    EXPECT_TRUE(expect_metrics(0.4, 1.0, 0.1, 0.3,
+                               0.3, 1.0, 0.05, 0.25, dm_metrics));
+    dm_metrics.merge({ResourceUsageState(0.5, 0.45),
+                      ResourceUsageState(0.5, 0.35), 0.1, 0.05});
+    EXPECT_TRUE(expect_metrics(0.45, 1.0, 0.1, 0.35,
+                               0.35, 1.0, 0.05, 0.3, dm_metrics));
+    dm_metrics.merge({ResourceUsageState(0.5, 0.4),
+                      ResourceUsageState(0.5, 0.3), 0.15, 0.1});
+    EXPECT_TRUE(expect_metrics(0.45, 1.0, 0.15, 0.35,
+                               0.35, 1.0, 0.10, 0.3, dm_metrics));
 }
 
 GTEST_MAIN_RUN_ALL_TESTS()