aboutsummaryrefslogtreecommitdiffstats
path: root/storage
diff options
context:
space:
mode:
authorHenning Baldersheim <balder@oath.com>2018-04-09 15:26:26 +0200
committerHenning Baldersheim <balder@oath.com>2018-04-09 15:26:26 +0200
commit032af1917c429c49ba85e4ad00468621406944fa (patch)
tree634703012394bee237768b0ef5b3bc1a30915664 /storage
parenta18e269da86fd6d5943fb2d61f75d0acd903c055 (diff)
Rename member to reflect sematic meaning of stripId, not threadId
Diffstat (limited to 'storage')
-rw-r--r--storage/src/vespa/storage/persistence/persistencethread.cpp8
-rw-r--r--storage/src/vespa/storage/persistence/persistencethread.h2
2 files changed, 5 insertions, 5 deletions
diff --git a/storage/src/vespa/storage/persistence/persistencethread.cpp b/storage/src/vespa/storage/persistence/persistencethread.cpp
index f078add35a3..fe85b55fe2b 100644
--- a/storage/src/vespa/storage/persistence/persistencethread.cpp
+++ b/storage/src/vespa/storage/persistence/persistencethread.cpp
@@ -21,7 +21,7 @@ PersistenceThread::PersistenceThread(ServiceLayerComponentRegister& compReg,
FileStorHandler& filestorHandler,
FileStorThreadMetrics& metrics,
uint16_t deviceIndex)
- : _threadId(filestorHandler.getNextStripeId(deviceIndex)),
+ : _stripeId(filestorHandler.getNextStripeId(deviceIndex)),
_env(configUri, compReg, filestorHandler, metrics, deviceIndex, provider),
_warnOnSlowOperations(5000),
_spi(provider),
@@ -34,7 +34,7 @@ PersistenceThread::PersistenceThread(ServiceLayerComponentRegister& compReg,
_closed(false)
{
std::ostringstream threadName;
- threadName << "Disk " << _env._partition << " thread " << _threadId;
+ threadName << "Disk " << _env._partition << " thread " << _stripeId;
_component.reset(new ServiceLayerComponent(compReg, threadName.str()));
_bucketOwnershipNotifier.reset(new BucketOwnershipNotifier(*_component, filestorHandler));
framework::MilliSecTime maxProcessingTime(60 * 1000);
@@ -1062,7 +1062,7 @@ void PersistenceThread::processMessages(FileStorHandler::LockedMessage & lock)
trackers.push_back(std::move(tracker));
if (trackers.back()->getReply()->getResult().success()) {
- _env._fileStorHandler.getNextMessage(_env._partition, _threadId, lock);
+ _env._fileStorHandler.getNextMessage(_env._partition, _stripeId, lock);
} else {
break;
}
@@ -1086,7 +1086,7 @@ PersistenceThread::run(framework::ThreadHandle& thread)
while (!thread.interrupted() && !_env._fileStorHandler.closed(_env._partition)) {
thread.registerTick();
- FileStorHandler::LockedMessage lock(_env._fileStorHandler.getNextMessage(_env._partition, _threadId));
+ FileStorHandler::LockedMessage lock(_env._fileStorHandler.getNextMessage(_env._partition, _stripeId));
if (lock.first) {
processMessages(lock);
diff --git a/storage/src/vespa/storage/persistence/persistencethread.h b/storage/src/vespa/storage/persistence/persistencethread.h
index c001a52a6be..05ca34f623d 100644
--- a/storage/src/vespa/storage/persistence/persistencethread.h
+++ b/storage/src/vespa/storage/persistence/persistencethread.h
@@ -47,7 +47,7 @@ public:
MessageTracker::UP handleRecheckBucketInfo(RecheckBucketInfoCommand& cmd);
private:
- uint32_t _threadId;
+ uint32_t _stripeId;
PersistenceUtil _env;
uint32_t _warnOnSlowOperations;
spi::PersistenceProvider& _spi;