configurable disk IO size for writes

quantcast · Nov 11, 2015 · 7d41118 · 7d41118
1 parent 30ce7d5
commit 7d41118
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 5 deletions.
diff --git a/src/cc/libclient/KfsClient.cc b/src/cc/libclient/KfsClient.cc
@@ -4518,7 +4518,7 @@ KfsClientImpl::StartProtocolWorker()
         params.mMaxReadSize = (maxReadSize + kChecksumBlockSize - 1) /
             kChecksumBlockSize * kChecksumBlockSize;
     } else {
-        params.mMaxReadSize = mTargetDiskIoSize;
+        params.mMaxReadSize = max(4 << 20, mTargetDiskIoSize);
     }
     params.mUseClientPoolFlag = mConfig.getValue(
         "client.connectionPool", params.mUseClientPoolFlag ? 1 : 0) != 0;

diff --git a/src/cc/libclient/KfsProtocolWorker.cc b/src/cc/libclient/KfsProtocolWorker.cc
@@ -1097,7 +1097,8 @@ class KfsProtocolWorker::Impl :
         FileWriter(
             Owner&            inOwner,
             Workers::iterator inWorkersIt,
-            const char*       inLogPrefixPtr)
+            const char*       inLogPrefixPtr,
+            int               inMaxWriteSize)
             : Worker(inOwner, inWorkersIt),
               Writer::Completion(),
               mWriter(
@@ -1109,7 +1110,8 @@ class KfsProtocolWorker::Impl :
                 inOwner.mTimeSecBetweenRetries,
                 inOwner.mOpTimeoutSec,
                 inOwner.mIdleTimeoutSec,
-                inOwner.mMaxWriteSize,
+                min(max(4 << 20, inOwner.mMaxWriteSize),
+                    max(inOwner.mMaxWriteSize, inMaxWriteSize)),
                 inLogPrefixPtr,
                 inOwner.mChunkServerInitialSeqNum
               ),
@@ -1709,7 +1711,8 @@ class KfsProtocolWorker::Impl :
                 *this, inWorkersIt, theLogPrefix.c_str())) :
             (IsWrite(inRequest) ?
                 static_cast<Worker*>(new FileWriter(
-                    *this, inWorkersIt, theLogPrefix.c_str())) :
+                    *this, inWorkersIt, theLogPrefix.c_str(),
+                    inRequest.mParamsPtr->mDiskIoSize)) :
             (IsRead(inRequest) ?
                 static_cast<Worker*>(new FileReader(
                     *this, inWorkersIt, theLogPrefix.c_str())) :

diff --git a/src/cc/libclient/KfsProtocolWorker.h b/src/cc/libclient/KfsProtocolWorker.h
@@ -121,6 +121,7 @@ class KfsProtocolWorker
             bool    mSkipHolesFlag;
             int     mMsgLogId;
             bool    mFailShortReadsFlag;
+            int     mDiskIoSize;
         };
         Request(
             RequestType   inOpType       = kRequestTypeUnknown,

diff --git a/src/cc/libclient/KfsWrite.cc b/src/cc/libclient/KfsWrite.cc
@@ -136,6 +136,16 @@ KfsClientImpl::Write(int fd, const char *buf, size_t numBytes,
     openParams.mRecoveryStripeCount = entry.fattr.numRecoveryStripes;
     openParams.mReplicaCount        = entry.fattr.numReplicas;
     openParams.mMsgLogId            = fd;
+    if(entry.fattr.striperType == KFS_STRIPED_FILE_TYPE_NONE) {
+        openParams.mDiskIoSize = entry.ioBufferSize;
+    }
+    else {
+        const int kChecksumBlockSize = (int) CHECKSUM_BLOCKSIZE;
+        const int totalStripeCount =
+           entry.fattr.numStripes + entry.fattr.numRecoveryStripes;
+        openParams.mDiskIoSize = (entry.ioBufferSize / totalStripeCount
+           + kChecksumBlockSize - 1) / kChecksumBlockSize * kChecksumBlockSize;
+    }
     entry.usedProtocolWorkerFlag = true;
     entry.pending += numBytes;
     const KfsProtocolWorker::FileId       fileId       = entry.fattr.fileId;

diff --git a/src/test-scripts/qfstest.sh b/src/test-scripts/qfstest.sh
@@ -404,7 +404,7 @@ chunkServer.abortOnChecksumMismatchFlag = 1
 chunkServer.msgLogWriter.logLevel = DEBUG
 chunkServer.recAppender.closeEmptyWidStateSec = 5
 chunkServer.ioBufferPool.partitionBufferCount = 8192
-chunkServer.bufferManager.maxClientQuota = 2097152
+chunkServer.bufferManager.maxClientQuota = 8388608
 chunkServer.requireChunkHeaderChecksum = 1
 chunkServer.storageTierPrefixes = kfschunk-tier0 2
 chunkServer.exitDebugCheck = 1