Merge pull request #18923 from vespa-engine/geirst/distributor-tests-todos

Distributor tests todos

2 files changed, 10 insertions, 7 deletions

diff --git a/storage/src/tests/distributor/legacy_distributor_test.cpp b/storage/src/tests/distributor/legacy_distributor_test.cpp
index 1a27468b5e9..3d6b96e985d 100644
--- a/storage/src/tests/distributor/legacy_distributor_test.cpp
+++ b/storage/src/tests/distributor/legacy_distributor_test.cpp
@@ -302,7 +302,6 @@ TEST_F(LegacyDistributorTest, recovery_mode_on_cluster_state_change) {
 }
 
 // Migrated to DistributorStripeTest
-// TODO STRIPE how to throttle across stripes?
 TEST_F(LegacyDistributorTest, operations_are_throttled) {
     setupDistributor(Redundancy(1), NodeCount(1), "storage:1 distributor:1");
     getConfig().setMinPendingMaintenanceOps(1);
@@ -534,7 +533,6 @@ TEST_F(LegacyDistributorTest, bucket_db_memory_usage_metrics_only_updated_at_fix
 }
 
 // Migrated to DistributorStripeTest
-// TODO STRIPE need to impl/test cross-stripe config propagation
 TEST_F(LegacyDistributorTest, priority_config_is_propagated_to_distributor_configuration) {
     using namespace vespa::config::content::core;
 
@@ -986,7 +984,6 @@ TEST_F(LegacyDistributorTest, internal_messages_are_started_in_fifo_order_batch)
 }
 
 // Migrated to DistributorStripeTest
-// TODO STRIPE also test that closing distributor closes stripes
 TEST_F(LegacyDistributorTest, closing_aborts_priority_queued_client_requests) {
     setupDistributor(Redundancy(1), NodeCount(1), "storage:1 distributor:1");
     document::BucketId bucket(16, 1);
@@ -1049,7 +1046,7 @@ TEST_F(LegacyDistributorTest, entering_recovery_mode_resets_bucket_space_stats)
     assert_invalid_stats_for_all_spaces(stats, 2);
 }
 
-// TODO STRIPE figure out interaction between stripes and distributors on this one
+// TODO: migrate to TopLevelDistributorTest
 TEST_F(LegacyDistributorTest, leaving_recovery_mode_immediately_sends_getnodestate_replies) {
     setupDistributor(Redundancy(2), NodeCount(2), "version:1 distributor:1 storage:2");
     // Should not send explicit replies during init stage
@@ -1107,10 +1104,12 @@ void LegacyDistributorTest::do_test_pending_merge_getnodestate_reply_edge(Bucket
     EXPECT_EQ(2, explicit_node_state_reply_send_invocations());
 }
 
+// TODO: rewrite into DistributorStripeTest
 TEST_F(LegacyDistributorTest, pending_to_no_pending_default_merges_edge_immediately_sends_getnodestate_replies) {
     do_test_pending_merge_getnodestate_reply_edge(FixedBucketSpaces::default_space());
 }
 
+// TODO: rewrite into DistributorStripeTest
 TEST_F(LegacyDistributorTest, pending_to_no_pending_global_merges_edge_immediately_sends_getnodestate_replies) {
     do_test_pending_merge_getnodestate_reply_edge(FixedBucketSpaces::global_space());
 }
@@ -1263,6 +1262,7 @@ TEST_F(LegacyDistributorTest, wanted_split_bit_count_is_lower_bounded) {
     EXPECT_EQ(getConfig().getMinimalBucketSplit(), 8);
 }
 
+// TODO: migrate to TopLevelDistributorTest
 TEST_F(LegacyDistributorTest, host_info_sent_immediately_once_all_stripes_first_reported) {
     set_num_distributor_stripes(4);
     createLinks();
@@ -1291,7 +1291,7 @@ TEST_F(LegacyDistributorTest, host_info_sent_immediately_once_all_stripes_first_
     EXPECT_EQ(1, explicit_node_state_reply_send_invocations());
 }
 
-// TODO STRIPE make delay configurable instead of hardcoded
+// TODO: migrate to TopLevelDistributorTest
 TEST_F(LegacyDistributorTest, non_bootstrap_host_info_send_request_delays_sending) {
     set_num_distributor_stripes(4);
     createLinks();
diff --git a/storage/src/vespa/storage/distributor/distributor.cpp b/storage/src/vespa/storage/distributor/distributor.cpp
index a5ef9915704..36b12ed483f 100644
--- a/storage/src/vespa/storage/distributor/distributor.cpp
+++ b/storage/src/vespa/storage/distributor/distributor.cpp
@@ -795,8 +795,11 @@ Distributor::reportStatus(std::ostream& out,
         framework::PartlyHtmlStatusReporter htmlReporter(*this);
         htmlReporter.reportHtmlHeader(out, path);
         if (!path.hasAttribute("page")) {
-            out << "<a href=\"?page=pending\">Count of pending messages to storage nodes</a><br>\n"
-                << "<a href=\"?page=buckets\">List all buckets, highlight non-ideal state</a><br>\n";
+            out << "<p>Distributor stripes: " << _stripes.size() << "</p>\n"
+                << "<p>\n"
+                << "<a href=\"?page=pending\">Count of pending messages to storage nodes</a><br>\n"
+                << "<a href=\"?page=buckets\">List all buckets, highlight non-ideal state</a><br>\n"
+                << "</p>\n";
         } else {
             auto guard = _stripe_accessor->rendezvous_and_hold_all();
             const auto& op_ctx = _component;