Remove stale comments.

Reorder member variables.

2 files changed, 3 insertions, 5 deletions

diff --git a/storage/src/vespa/storage/distributor/distributor.cpp b/storage/src/vespa/storage/distributor/distributor.cpp
index e6353e769d8..cf7164d4b2f 100644
--- a/storage/src/vespa/storage/distributor/distributor.cpp
+++ b/storage/src/vespa/storage/distributor/distributor.cpp
@@ -59,10 +59,10 @@ Distributor::Distributor(DistributorComponentRegister& compReg,
     : StorageLink("distributor"),
       framework::StatusReporter("distributor", "Distributor"),
       _comp_reg(compReg),
+      _use_legacy_mode(num_distributor_stripes == 0),
       _metrics(std::make_shared<DistributorMetricSet>()),
-      _total_metrics((num_distributor_stripes == 0) ? std::shared_ptr<DistributorTotalMetrics>() : std::make_shared<DistributorTotalMetrics>(num_distributor_stripes)),
+      _total_metrics(_use_legacy_mode ? std::shared_ptr<DistributorTotalMetrics>() : std::make_shared<DistributorTotalMetrics>(num_distributor_stripes)),
       _messageSender(messageSender),
-      _use_legacy_mode(num_distributor_stripes == 0),
       _n_stripe_bits(0),
       _stripe(std::make_unique<DistributorStripe>(compReg, _use_legacy_mode ? *_metrics : _total_metrics->stripe(0), node_identity, threadPool,
                                                   doneInitHandler, *this, *this, _use_legacy_mode)),
@@ -569,8 +569,6 @@ Distributor::pending_maintenance_stats() const {
 void
 Distributor::propagateInternalScanMetricsToExternal()
 {
-    // TODO STRIPE propagate to all stripes
-    // TODO STRIPE reconsider metric wiring...
     if (_use_legacy_mode) {
         _stripe->propagateInternalScanMetricsToExternal();
     } else {
diff --git a/storage/src/vespa/storage/distributor/distributor.h b/storage/src/vespa/storage/distributor/distributor.h
index d9910383a93..48ad061859f 100644
--- a/storage/src/vespa/storage/distributor/distributor.h
+++ b/storage/src/vespa/storage/distributor/distributor.h
@@ -202,10 +202,10 @@ private:
     using MessageQueue = std::vector<std::shared_ptr<api::StorageMessage>>;
 
     DistributorComponentRegister&         _comp_reg;
+    const bool                            _use_legacy_mode;
     std::shared_ptr<DistributorMetricSet> _metrics;
     std::shared_ptr<DistributorTotalMetrics> _total_metrics;
     ChainedMessageSender*                 _messageSender;
-    const bool                            _use_legacy_mode;
     // TODO STRIPE multiple stripes...! This is for proof of concept of wiring.
     uint8_t                               _n_stripe_bits;
     std::unique_ptr<DistributorStripe>    _stripe;