Update test to handle the change to enable_metadata_only_fetch_phase_for_inconsistent_updates=true as default.

3 files changed, 9 insertions, 3 deletions

diff --git a/storage/src/tests/distributor/distributor_stripe_test_util.cpp b/storage/src/tests/distributor/distributor_stripe_test_util.cpp
index b96b2dda1cb..58902e2eb94 100644
--- a/storage/src/tests/distributor/distributor_stripe_test_util.cpp
+++ b/storage/src/tests/distributor/distributor_stripe_test_util.cpp
@@ -32,12 +32,12 @@ DistributorStripeTestUtil::DistributorStripeTestUtil()
     _config = getStandardConfig(false);
 }
 
-DistributorStripeTestUtil::~DistributorStripeTestUtil() { }
+DistributorStripeTestUtil::~DistributorStripeTestUtil() = default;
 
 void
 DistributorStripeTestUtil::createLinks()
 {
-    _node.reset(new TestDistributorApp(_config.getConfigId()));
+    _node = std::make_unique<TestDistributorApp>(_config.getConfigId());
     _metrics = std::make_shared<DistributorMetricSet>();
     _ideal_state_metrics = std::make_shared<IdealStateMetricSet>();
     _stripe = std::make_unique<DistributorStripe>(_node->getComponentRegister(),
diff --git a/storage/src/tests/distributor/twophaseupdateoperationtest.cpp b/storage/src/tests/distributor/twophaseupdateoperationtest.cpp
index 0e3ce55856b..6eb15bf05e7 100644
--- a/storage/src/tests/distributor/twophaseupdateoperationtest.cpp
+++ b/storage/src/tests/distributor/twophaseupdateoperationtest.cpp
@@ -47,6 +47,10 @@ struct TwoPhaseUpdateOperationTest : Test, DistributorStripeTestUtil {
         createLinks();
         setTypeRepo(_repo);
         getClock().setAbsoluteTimeInSeconds(200);
+        // TODO, rewrite test to handle enable_metadata_only_fetch_phase_for_inconsistent_updates=true as default
+        auto cfg = make_config();
+        cfg->set_enable_metadata_only_fetch_phase_for_inconsistent_updates(false);
+        configure_stripe(cfg);
     }
 
     void TearDown() override {
diff --git a/storage/src/vespa/storage/common/distributorcomponent.cpp b/storage/src/vespa/storage/common/distributorcomponent.cpp
index 29138b5b718..13350d0dc9f 100644
--- a/storage/src/vespa/storage/common/distributorcomponent.cpp
+++ b/storage/src/vespa/storage/common/distributorcomponent.cpp
@@ -1,6 +1,6 @@
 // Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 
-#include <vespa/storage/common/distributorcomponent.h>
+#include "distributorcomponent.h"
 
 namespace storage {
 
@@ -8,6 +8,8 @@ DistributorComponent::DistributorComponent(DistributorComponentRegister& compReg
                                            vespalib::stringref name)
     : StorageComponent(compReg, name),
       _timeCalculator(0),
+      _distributorConfig(),
+      _visitorConfig(),
       _internal_config_generation(0),
       _config_snapshot(std::make_shared<DistributorConfiguration>(*this))
 {