From d3b021f8074e2d613eaf0e4e239ae557b43804f9 Mon Sep 17 00:00:00 2001 From: Arne Juul Date: Wed, 26 Sep 2018 13:02:59 +0000 Subject: avoid "clever" operator++ overload --- .../storage/bucketdb/storagebucketdbinitializer.cpp | 2 +- .../storage/distributor/externaloperationhandler.cpp | 10 +++++----- .../distributor/operations/external/getoperation.cpp | 12 ++++++------ .../distributor/persistence_operation_metric_set.cpp | 14 +++++++------- .../src/vespa/storage/persistence/mergehandler.cpp | 4 ++-- .../vespa/storage/persistence/persistencethread.cpp | 10 +++++----- .../vespa/storage/persistence/persistenceutil.cpp | 4 ++-- .../vespa/storage/storageserver/mergethrottler.cpp | 20 ++++++++++---------- 8 files changed, 38 insertions(+), 38 deletions(-) (limited to 'storage') diff --git a/storage/src/vespa/storage/bucketdb/storagebucketdbinitializer.cpp b/storage/src/vespa/storage/bucketdb/storagebucketdbinitializer.cpp index 0837b0d1463..d553b41de7c 100644 --- a/storage/src/vespa/storage/bucketdb/storagebucketdbinitializer.cpp +++ b/storage/src/vespa/storage/bucketdb/storagebucketdbinitializer.cpp @@ -438,7 +438,7 @@ StorageBucketDBInitializer::registerBucket(const document::Bucket &bucket, _system._nodeState, _system._nodeIndex, bucketId.stripUnused(), lib::Distribution::IDEAL_DISK_EVEN_IF_DOWN)); if (disk != partition) { - ++_metrics._wrongDisk; + _metrics._wrongDisk.inc(); } _metrics._insertedCount.inc(); diff --git a/storage/src/vespa/storage/distributor/externaloperationhandler.cpp b/storage/src/vespa/storage/distributor/externaloperationhandler.cpp index 2d27b91f3e3..b22592af327 100644 --- a/storage/src/vespa/storage/distributor/externaloperationhandler.cpp +++ b/storage/src/vespa/storage/distributor/externaloperationhandler.cpp @@ -78,11 +78,11 @@ ExternalOperationHandler::checkTimestampMutationPreconditions(api::StorageComman LOG(debug, "Distributor manager received %s, bucket %s with wrong distribution", cmd.toString().c_str(), bucket.toString().c_str()); - persistenceMetrics.failures.wrongdistributor++; + persistenceMetrics.failures.wrongdistributor.inc(); return false; } if (!checkSafeTimeReached(cmd)) { - persistenceMetrics.failures.safe_time_not_reached++; + persistenceMetrics.failures.safe_time_not_reached.inc(); return false; } return true; @@ -96,7 +96,7 @@ ExternalOperationHandler::makeConcurrentMutationRejectionReply(api::StorageComma auto err_msg = vespalib::make_string("A mutating operation for document '%s' is already in progress", docId.toString().c_str()); LOG(debug, "Aborting incoming %s operation: %s", cmd.getType().toString().c_str(), err_msg.c_str()); - persistenceMetrics.failures.concurrent_mutations++; + persistenceMetrics.failures.concurrent_mutations.inc(); api::StorageReply::UP reply(cmd.makeReply()); reply->setResult(api::ReturnCode(api::ReturnCode::BUSY, err_msg)); return std::shared_ptr(reply.release()); @@ -189,7 +189,7 @@ IMPL_MSG_COMMAND_H(ExternalOperationHandler, RemoveLocation) if (!checkDistribution(*cmd, bucket)) { LOG(debug, "Distributor manager received %s with wrong distribution", cmd->toString().c_str()); - getMetrics().removelocations[cmd->getLoadType()].failures.wrongdistributor++; + getMetrics().removelocations[cmd->getLoadType()].failures.wrongdistributor.inc(); return true; } @@ -205,7 +205,7 @@ IMPL_MSG_COMMAND_H(ExternalOperationHandler, Get) LOG(debug, "Distributor manager received get for %s, bucket %s with wrong distribution", cmd->getDocumentId().toString().c_str(), bucket.toString().c_str()); - getMetrics().gets[cmd->getLoadType()].failures.wrongdistributor++; + getMetrics().gets[cmd->getLoadType()].failures.wrongdistributor.inc(); return true; } diff --git a/storage/src/vespa/storage/distributor/operations/external/getoperation.cpp b/storage/src/vespa/storage/distributor/operations/external/getoperation.cpp index 5b1e585a6f8..04fcd4bd01c 100644 --- a/storage/src/vespa/storage/distributor/operations/external/getoperation.cpp +++ b/storage/src/vespa/storage/distributor/operations/external/getoperation.cpp @@ -193,19 +193,19 @@ GetOperation::sendReply(DistributorMessageSender& sender) repl->setResult(_returnCode); if (_returnCode.success()) { - ++_metric.ok; + _metric.ok.inc(); } else if (_returnCode.getResult() == api::ReturnCode::TIMEOUT) { - ++_metric.failures.timeout; + _metric.failures.timeout.inc(); } else if (_returnCode.isBusy()) { - ++_metric.failures.busy; + _metric.failures.busy.inc(); } else if (_returnCode.isNodeDownOrNetwork()) { - ++_metric.failures.notconnected; + _metric.failures.notconnected.inc(); } else { - ++_metric.failures.storagefailure; + _metric.failures.storagefailure.inc(); } if (!_doc.get()) { - ++_metric.failures.notfound; + _metric.failures.notfound.inc(); } _metric.latency.addValue(_operationTimer.getElapsedTimeAsDouble()); diff --git a/storage/src/vespa/storage/distributor/persistence_operation_metric_set.cpp b/storage/src/vespa/storage/distributor/persistence_operation_metric_set.cpp index 88b28941e65..d5f73a9e916 100644 --- a/storage/src/vespa/storage/distributor/persistence_operation_metric_set.cpp +++ b/storage/src/vespa/storage/distributor/persistence_operation_metric_set.cpp @@ -79,21 +79,21 @@ void PersistenceOperationMetricSet::updateFromResult(const api::ReturnCode& result) { if (result.success()) { - ++ok; + ok.inc(); } else if (result.getResult() == api::ReturnCode::WRONG_DISTRIBUTION) { - ++failures.wrongdistributor; + failures.wrongdistributor.inc(); } else if (result.getResult() == api::ReturnCode::TIMEOUT) { - ++failures.timeout; + failures.timeout.inc(); } else if (result.isBusy()) { - ++failures.busy; + failures.busy.inc(); } else if (result.isBucketDisappearance()) { // Bucket not found/deleted codes imply that replicas are transiently // inconsistent in our DB or across replica nodes. - ++failures.inconsistent_bucket; + failures.inconsistent_bucket.inc(); } else if (result.isNodeDownOrNetwork()) { - ++failures.notconnected; + failures.notconnected.inc(); } else { - ++failures.storagefailure; + failures.storagefailure.inc(); } } diff --git a/storage/src/vespa/storage/persistence/mergehandler.cpp b/storage/src/vespa/storage/persistence/mergehandler.cpp index c3dc7cba80a..26cfb0e6566 100644 --- a/storage/src/vespa/storage/persistence/mergehandler.cpp +++ b/storage/src/vespa/storage/persistence/mergehandler.cpp @@ -1301,7 +1301,7 @@ void MergeHandler::handleGetBucketDiffReply(api::GetBucketDiffReply& reply, MessageSender& sender) { - ++_env._metrics.getBucketDiffReply; + _env._metrics.getBucketDiffReply.inc(); spi::Bucket bucket(reply.getBucket(), spi::PartitionId(_env._partition)); LOG(debug, "GetBucketDiffReply(%s)", bucket.toString().c_str()); @@ -1479,7 +1479,7 @@ void MergeHandler::handleApplyBucketDiffReply(api::ApplyBucketDiffReply& reply, MessageSender& sender) { - ++_env._metrics.applyBucketDiffReply; + _env._metrics.applyBucketDiffReply.inc(); spi::Bucket bucket(reply.getBucket(), spi::PartitionId(_env._partition)); std::vector& diff(reply.getDiff()); LOG(debug, "%s", reply.toString().c_str()); diff --git a/storage/src/vespa/storage/persistence/persistencethread.cpp b/storage/src/vespa/storage/persistence/persistencethread.cpp index 0eeb4eeb84d..1b221ea0b7c 100644 --- a/storage/src/vespa/storage/persistence/persistencethread.cpp +++ b/storage/src/vespa/storage/persistence/persistencethread.cpp @@ -137,7 +137,7 @@ PersistenceThread::handleRemove(api::RemoveCommand& cmd) tracker->setReply(std::make_shared(cmd, response.wasFound() ? cmd.getTimestamp() : 0)); } if (!response.wasFound()) { - ++_env._metrics.remove[cmd.getLoadType()].notFound; + _env._metrics.remove[cmd.getLoadType()].notFound.inc(); } return tracker; } @@ -177,7 +177,7 @@ PersistenceThread::handleGet(api::GetCommand& cmd) if (checkForError(result, *tracker)) { if (!result.hasDocument()) { - ++_env._metrics.get[cmd.getLoadType()].notFound; + _env._metrics.get[cmd.getLoadType()].notFound.inc(); } tracker->setReply(std::make_shared(cmd, result.getDocumentPtr(), result.getTimestamp())); } @@ -202,7 +202,7 @@ PersistenceThread::handleRepairBucket(RepairBucketCommand& cmd) reply->setAltered(!(after == before)); if (reply->bucketAltered()) { notifyGuard.notifyAlways(cmd.getBucket(), after); - ++_env._metrics.repairFixed; + _env._metrics.repairFixed.inc(); } _env.updateBucketDatabase(cmd.getBucket(), after); @@ -810,7 +810,7 @@ PersistenceThread::processMessage(api::StorageMessage& msg) { MBUS_TRACE(msg.getTrace(), 5, "PersistenceThread: Processing message in persistence layer"); - ++_env._metrics.operations; + _env._metrics.operations.inc(); if (msg.getType().isReply()) { try{ LOG(debug, "Handling reply: %s", msg.toString().c_str()); @@ -837,7 +837,7 @@ PersistenceThread::processMessage(api::StorageMessage& msg) && tracker->getReply()->getResult().failed()) || tracker->getResult().failed()) { - ++_env._metrics.failedOperations; + _env._metrics.failedOperations.inc(); } } diff --git a/storage/src/vespa/storage/persistence/persistenceutil.cpp b/storage/src/vespa/storage/persistence/persistenceutil.cpp index 888dc93dd82..4bee5df4d04 100644 --- a/storage/src/vespa/storage/persistence/persistenceutil.cpp +++ b/storage/src/vespa/storage/persistence/persistenceutil.cpp @@ -23,7 +23,7 @@ MessageTracker::MessageTracker(FileStorThreadMetrics::Op& metric, _result(api::ReturnCode::OK), _timer(clock) { - ++_metric.count; + _metric.count.inc(); } MessageTracker::~MessageTracker() @@ -53,7 +53,7 @@ MessageTracker::generateReply(api::StorageCommand& cmd) } if (!_reply->getResult().success()) { - ++_metric.failed; + _metric.failed.inc(); LOGBP(debug, "Failed to handle command %s: %s", cmd.toString().c_str(), _result.toString().c_str()); diff --git a/storage/src/vespa/storage/storageserver/mergethrottler.cpp b/storage/src/vespa/storage/storageserver/mergethrottler.cpp index 22af1a73633..a9d54c196c9 100644 --- a/storage/src/vespa/storage/storageserver/mergethrottler.cpp +++ b/storage/src/vespa/storage/storageserver/mergethrottler.cpp @@ -471,33 +471,33 @@ MergeThrottler::updateOperationMetrics( { switch (result.getResult()) { case api::ReturnCode::OK: - ++metrics.ok; + metrics.ok.inc(); break; case api::ReturnCode::NOT_READY: - ++metrics.failures.notready; + metrics.failures.notready.inc(); break; case api::ReturnCode::TIMEOUT: - ++metrics.failures.timeout; + metrics.failures.timeout.inc(); break; case api::ReturnCode::ABORTED: - ++metrics.failures.aborted; + metrics.failures.aborted.inc(); break; case api::ReturnCode::WRONG_DISTRIBUTION: - ++metrics.failures.wrongdistribution; + metrics.failures.wrongdistribution.inc(); break; case api::ReturnCode::EXISTS: - ++metrics.failures.exists; + metrics.failures.exists.inc(); break; case api::ReturnCode::REJECTED: - ++metrics.failures.rejected; + metrics.failures.rejected.inc(); break; default: if (result.isBusy()) { - ++metrics.failures.busy; + metrics.failures.busy.inc(); } else if (result.isBucketDisappearance()) { - ++metrics.failures.bucketnotfound; + metrics.failures.bucketnotfound.inc(); } else { - ++metrics.failures.other; + metrics.failures.other.inc(); } } } -- cgit v1.2.3