Instantiate all member variables explicitly.

4 files changed, 10 insertions, 2 deletions

diff --git a/storage/src/vespa/storage/distributor/bucketdbupdater.cpp b/storage/src/vespa/storage/distributor/bucketdbupdater.cpp
index 9241024f24f..69f7d67c4d0 100644
--- a/storage/src/vespa/storage/distributor/bucketdbupdater.cpp
+++ b/storage/src/vespa/storage/distributor/bucketdbupdater.cpp
@@ -31,7 +31,13 @@ BucketDBUpdater::BucketDBUpdater(Distributor& owner,
                                  DistributorComponentRegister& compReg)
     : framework::StatusReporter("bucketdb", "Bucket DB Updater"),
       _distributorComponent(owner, bucketSpaceRepo, readOnlyBucketSpaceRepo, compReg, "Bucket DB Updater"),
+      _delayedRequests(),
+      _sentMessages(),
+      _pendingClusterState(),
+      _history(),
       _sender(sender),
+      _enqueuedRechecks(),
+      _outdatedNodesMap(),
       _transitionTimer(_distributorComponent.getClock()),
       _stale_reads_enabled(false),
       _active_distribution_contexts(),
diff --git a/storage/src/vespa/storage/distributor/bucketdbupdater.h b/storage/src/vespa/storage/distributor/bucketdbupdater.h
index 35ac70416f1..529bfef4104 100644
--- a/storage/src/vespa/storage/distributor/bucketdbupdater.h
+++ b/storage/src/vespa/storage/distributor/bucketdbupdater.h
@@ -78,7 +78,6 @@ public:
 
     OperationRoutingSnapshot read_snapshot_for_bucket(const document::Bucket&) const;
 private:
-    DistributorComponent _distributorComponent;
     class MergeReplyGuard {
     public:
         MergeReplyGuard(BucketDBUpdater& updater, const std::shared_ptr<api::MergeBucketReply>& reply) noexcept
@@ -239,6 +238,7 @@ private:
         mutable bool _cachedOwned;
     };
 
+    DistributorComponent _distributorComponent;
     std::deque<std::pair<framework::MilliSecTime, BucketRequest> > _delayedRequests;
     std::map<uint64_t, BucketRequest> _sentMessages;
     std::unique_ptr<PendingClusterState> _pendingClusterState;
diff --git a/storage/src/vespa/storage/distributor/pendingclusterstate.cpp b/storage/src/vespa/storage/distributor/pendingclusterstate.cpp
index ce5ac98c70a..a7fd5a5af53 100644
--- a/storage/src/vespa/storage/distributor/pendingclusterstate.cpp
+++ b/storage/src/vespa/storage/distributor/pendingclusterstate.cpp
@@ -32,7 +32,9 @@ PendingClusterState::PendingClusterState(
         const OutdatedNodesMap &outdatedNodesMap,
         api::Timestamp creationTimestamp)
     : _cmd(newStateCmd),
+      _sentMessages(),
       _requestedNodes(newStateCmd->getSystemState().getNodeCount(lib::NodeType::STORAGE)),
+      _delayedRequests(),
       _prevClusterStateBundle(clusterInfo->getClusterStateBundle()),
       _newClusterStateBundle(newStateCmd->getClusterStateBundle()),
       _clock(clock),
diff --git a/storage/src/vespa/storage/distributor/pendingclusterstate.h b/storage/src/vespa/storage/distributor/pendingclusterstate.h
index 6d558d05640..42b7bf0dcf2 100644
--- a/storage/src/vespa/storage/distributor/pendingclusterstate.h
+++ b/storage/src/vespa/storage/distributor/pendingclusterstate.h
@@ -160,7 +160,7 @@ private:
 
     /**
      * Creates a pending cluster state that represents
-     * a set system state command from the fleet controller.
+     * a set system state command from the cluster controller.
      */
     PendingClusterState(
             const framework::Clock&,