Extend HwInfo with disk size, if disk is shared and memory size and sample sizes if not specified in config.

2 files changed, 37 insertions, 8 deletions

diff --git a/searchcore/src/tests/proton/attribute/attributeflush_test.cpp b/searchcore/src/tests/proton/attribute/attributeflush_test.cpp
index ecb39af61bc..ce0a6bffc0d 100644
--- a/searchcore/src/tests/proton/attribute/attributeflush_test.cpp
+++ b/searchcore/src/tests/proton/attribute/attributeflush_test.cpp
@@ -577,7 +577,7 @@ Test::requireThatFlushedAttributeCanBeLoaded(const HwInfo &hwInfo)
 {
     constexpr uint32_t numDocs = 100;
     BaseFixture f(hwInfo);
-    vespalib::string attrName(hwInfo.slowDisk() ? "a11slow" : "a11fast");
+    vespalib::string attrName(hwInfo.disk().slow() ? "a11slow" : "a11fast");
     {
         AttributeManagerFixture amf(f);
         AttributeManager &am = amf._m;
@@ -606,8 +606,8 @@ Test::requireThatFlushedAttributeCanBeLoaded(const HwInfo &hwInfo)
 void
 Test::requireThatFlushedAttributeCanBeLoaded()
 {
-    TEST_DO(requireThatFlushedAttributeCanBeLoaded(HwInfo(false)));
-    TEST_DO(requireThatFlushedAttributeCanBeLoaded(HwInfo(true)));
+    TEST_DO(requireThatFlushedAttributeCanBeLoaded(HwInfo(HwInfo::Disk(0, false, false), HwInfo::Memory(0))));
+    TEST_DO(requireThatFlushedAttributeCanBeLoaded(HwInfo(HwInfo::Disk(0, true, false), HwInfo::Memory(0))));
 }
 
 int
diff --git a/searchcore/src/tests/proton/common/hw_info_sampler/hw_info_sampler_test.cpp b/searchcore/src/tests/proton/common/hw_info_sampler/hw_info_sampler_test.cpp
index f9745d7fd03..c39a8163e00 100644
--- a/searchcore/src/tests/proton/common/hw_info_sampler/hw_info_sampler_test.cpp
+++ b/searchcore/src/tests/proton/common/hw_info_sampler/hw_info_sampler_test.cpp
@@ -18,6 +18,7 @@ namespace {
 
 const vespalib::string test_dir = "temp";
 constexpr uint64_t sampleLen = 1024 * 1024 * 40;
+constexpr bool sharedDisk = false;
 
 long time_point_to_long(Clock::time_point tp)
 {
@@ -44,11 +45,11 @@ struct Fixture
 
 TEST_F("Test that hw_info_sampler uses override info", Fixture)
 {
-    Config samplerCfg(75.0, 100.0, sampleLen);
+    Config samplerCfg(0, 75.0, 100.0, sampleLen, sharedDisk, 0);
     HwInfoSampler sampler(test_dir, samplerCfg);
     EXPECT_EQUAL(75.0, sampler.diskWriteSpeed());
     EXPECT_NOT_EQUAL(0, time_point_to_long(sampler.sampleTime()));
-    EXPECT_TRUE(sampler.hwInfo().slowDisk());
+    EXPECT_TRUE(sampler.hwInfo().disk().slow());
 }
 
 TEST_F("Test that hw_info_sampler uses saved info", Fixture)
@@ -57,16 +58,16 @@ TEST_F("Test that hw_info_sampler uses saved info", Fixture)
     builder.disk.writespeed = 72.0;
     builder.disk.sampletime = time_point_to_long(Clock::now());
     f.writeConfig(builder);
-    Config samplerCfg(0.0, 70.0, sampleLen);
+    Config samplerCfg(0, 0.0, 70.0, sampleLen, sharedDisk, 0);
     HwInfoSampler sampler(test_dir, samplerCfg);
     EXPECT_EQUAL(builder.disk.writespeed, sampler.diskWriteSpeed());
     EXPECT_EQUAL(builder.disk.sampletime, time_point_to_long(sampler.sampleTime()));
-    EXPECT_FALSE(sampler.hwInfo().slowDisk());
+    EXPECT_FALSE(sampler.hwInfo().disk().slow());
 }
 
 TEST_F("Test that hw_info_sampler can sample disk write speed", Fixture)
 {
-    Config samplerCfg(0.0, 100.0, sampleLen);
+    Config samplerCfg(0, 0.0, 100.0, sampleLen, sharedDisk, 0);
     HwInfoSampler sampler(test_dir, samplerCfg);
     ASSERT_NOT_EQUAL(0.0, sampler.diskWriteSpeed());
     ASSERT_NOT_EQUAL(0, time_point_to_long(sampler.sampleTime()));
@@ -76,6 +77,34 @@ TEST_F("Test that hw_info_sampler can sample disk write speed", Fixture)
                  time_point_to_long(sampler2.sampleTime()));
 }
 
+TEST_F("require that disk size can be specified", Fixture)
+{
+    Config samplerCfg(1024, 1.0, 0.0, sampleLen, sharedDisk, 0);
+    HwInfoSampler sampler(test_dir, samplerCfg);
+    EXPECT_EQUAL(1024u, sampler.hwInfo().disk().sizeBytes());
+}
+
+TEST_F("require that disk size can be sampled", Fixture)
+{
+    Config samplerCfg(0, 1.0, 0.0, sampleLen, sharedDisk, 0);
+    HwInfoSampler sampler(test_dir, samplerCfg);
+    EXPECT_GREATER(sampler.hwInfo().disk().sizeBytes(), 0u);
+}
+
+TEST_F("require that memory size can be specified", Fixture)
+{
+    Config samplerCfg(0, 1.0, 0.0, sampleLen, sharedDisk, 1024);
+    HwInfoSampler sampler(test_dir, samplerCfg);
+    EXPECT_EQUAL(1024u, sampler.hwInfo().memory().sizeBytes());
+}
+
+TEST_F("require that memory size can be sampled", Fixture)
+{
+    Config samplerCfg(0, 1.0, 0.0, sampleLen, sharedDisk, 0);
+    HwInfoSampler sampler(test_dir, samplerCfg);
+    EXPECT_GREATER(sampler.hwInfo().memory().sizeBytes(), 0u);
+}
+
 TEST_MAIN()
 {
     vespalib::rmdir(test_dir, true);