diff options
author | Geir Storli <geirst@verizonmedia.com> | 2021-05-06 14:03:57 +0000 |
---|---|---|
committer | Geir Storli <geirst@verizonmedia.com> | 2021-05-06 14:03:57 +0000 |
commit | e638feec6b05e3b83a7f2a6c49c51f6cac5b3023 (patch) | |
tree | 7b54fbb44eae10fb8ab60ea377a213211e4e0037 /storage | |
parent | 4557279ee63aa90817a898703c57237fe31d1b1b (diff) |
Remove IdealStateManager as an explicit status reporter.
This is wrongly implemented by not using a delegator to the right thread.
The system test framework is not using the "idealstateman" page.
The same information is present in the status page "distributor?page=buckets".
Diffstat (limited to 'storage')
-rw-r--r-- | storage/src/vespa/storage/distributor/idealstatemanager.cpp | 4 | ||||
-rw-r--r-- | storage/src/vespa/storage/distributor/idealstatemanager.h | 9 |
2 files changed, 2 insertions, 11 deletions
diff --git a/storage/src/vespa/storage/distributor/idealstatemanager.cpp b/storage/src/vespa/storage/distributor/idealstatemanager.cpp index 17f3911c6ee..867a8adf2ba 100644 --- a/storage/src/vespa/storage/distributor/idealstatemanager.cpp +++ b/storage/src/vespa/storage/distributor/idealstatemanager.cpp @@ -29,13 +29,11 @@ IdealStateManager::IdealStateManager( DistributorBucketSpaceRepo& bucketSpaceRepo, DistributorBucketSpaceRepo& readOnlyBucketSpaceRepo, DistributorComponentRegister& compReg) - : HtmlStatusReporter("idealstateman", "Ideal state manager"), - _metrics(new IdealStateMetricSet), + : _metrics(new IdealStateMetricSet), _distributorComponent(owner, bucketSpaceRepo, readOnlyBucketSpaceRepo, compReg, "Ideal state manager"), _bucketSpaceRepo(bucketSpaceRepo), _has_logged_phantom_replica_warning(false) { - _distributorComponent.registerStatusPage(*this); _distributorComponent.registerMetric(*_metrics); LOG(debug, "Adding BucketStateStateChecker to state checkers"); diff --git a/storage/src/vespa/storage/distributor/idealstatemanager.h b/storage/src/vespa/storage/distributor/idealstatemanager.h index 0bffed449ef..ab7a64142f6 100644 --- a/storage/src/vespa/storage/distributor/idealstatemanager.h +++ b/storage/src/vespa/storage/distributor/idealstatemanager.h @@ -28,8 +28,7 @@ class SplitBucketStateChecker; may generate Operations. Once one does so, the rest of the state checkers aren't run. */ -class IdealStateManager : public framework::HtmlStatusReporter, - public MaintenancePriorityGenerator, +class IdealStateManager : public MaintenancePriorityGenerator, public MaintenanceOperationGenerator { public: @@ -73,12 +72,6 @@ public: void getBucketStatus(std::ostream& out) const; - // HtmlStatusReporter - void reportHtmlStatus( - std::ostream& out, const framework::HttpUrlPath&) const override { - getBucketStatus(out); - } - const DistributorNodeContext& node_context() const { return _distributorComponent; } DistributorStripeOperationContext& operation_context() { return _distributorComponent; } const DistributorStripeOperationContext& operation_context() const { return _distributorComponent; } |