diff options
author | Tor Brede Vekterli <vekterli@verizonmedia.com> | 2021-05-31 08:23:06 +0000 |
---|---|---|
committer | Tor Brede Vekterli <vekterli@verizonmedia.com> | 2021-05-31 13:21:12 +0000 |
commit | 92353f1675c426ae3c3961bd25e180c559d00fea (patch) | |
tree | 07278619fcf5711b1751a705ea8d8d1128411f58 | |
parent | 4f266a5a49658cc11518adeb0a6a9dabee1fde0e (diff) |
Minor code cleanup
-rw-r--r-- | storage/src/vespa/storage/distributor/operations/idealstate/idealstateoperation.cpp | 37 | ||||
-rw-r--r-- | storage/src/vespa/storage/distributor/operations/idealstate/idealstateoperation.h | 2 |
2 files changed, 5 insertions, 34 deletions
diff --git a/storage/src/vespa/storage/distributor/operations/idealstate/idealstateoperation.cpp b/storage/src/vespa/storage/distributor/operations/idealstate/idealstateoperation.cpp index 142ff72bc79..1a48df0fd7c 100644 --- a/storage/src/vespa/storage/distributor/operations/idealstate/idealstateoperation.cpp +++ b/storage/src/vespa/storage/distributor/operations/idealstate/idealstateoperation.cpp @@ -9,8 +9,8 @@ #include <vespa/log/log.h> LOG_SETUP(".distributor.operation"); -using namespace storage; -using namespace storage::distributor; +namespace storage::distributor { + using document::BucketSpace; const uint32_t IdealStateOperation::MAINTENANCE_MESSAGE_TYPES[] = @@ -85,7 +85,7 @@ IdealStateOperation::setIdealStateManager(IdealStateManager* manager) { void IdealStateOperation::done() { - if (_manager != NULL) { + if (_manager) { if (ok()) { _manager->getMetrics().operations[getType()]->ok.inc(1); } else { @@ -107,35 +107,6 @@ IdealStateOperation::setCommandMeta(api::MaintenanceCommand& cmd) const cmd.setReason(_detailedReason); } -std::string -IdealStateOperation::toXML(framework::Clock& clock) const -{ - std::ostringstream ost; - - ost << "<operation bucketid=\"" << getBucketId() - << "\" reason=\"" << _detailedReason << "\" operations=\""; - - ost << getName() << "["; - for (uint32_t j = 0; j < getNodes().size(); j++) { - if (j != 0) { - ost << ","; - } - ost << getNodes()[j]; - } - ost << "]"; - - if (getStartTime().isSet()) { - uint64_t timeSpent( - (clock.getTimeInMillis() - getStartTime()).getTime()); - ost << "\" runtime_secs=\"" << timeSpent << "\""; - } else { - ost << "\""; - } - - ost << "/>"; - return ost.str(); -} - namespace { class IdealStateOpChecker : public PendingMessageTracker::Checker @@ -277,3 +248,5 @@ IdealStateOperation::shouldBlockThisOperation(uint32_t messageType, return false; } + +} diff --git a/storage/src/vespa/storage/distributor/operations/idealstate/idealstateoperation.h b/storage/src/vespa/storage/distributor/operations/idealstate/idealstateoperation.h index 7906150d0cb..0e45d7f3b3a 100644 --- a/storage/src/vespa/storage/distributor/operations/idealstate/idealstateoperation.h +++ b/storage/src/vespa/storage/distributor/operations/idealstate/idealstateoperation.h @@ -208,8 +208,6 @@ public: */ void setCommandMeta(api::MaintenanceCommand& cmd) const; - std::string toXML(framework::Clock& clock) const; - std::string toString() const override; /** |