accumulo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From els...@apache.org
Subject [4/5] git commit: ACCUMULO-2440 Use the correctBufferSize method to (correctly) fix the bufferSize when not provided.
Date Mon, 24 Mar 2014 23:37:17 GMT
ACCUMULO-2440 Use the correctBufferSize method to (correctly) fix the bufferSize when not provided.


Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/62ce7524
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/62ce7524
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/62ce7524

Branch: refs/heads/1.6.0-SNAPSHOT
Commit: 62ce7524f4618e1b46166a6d8f4f65fbbda4c4ec
Parents: bc1f026
Author: Josh Elser <elserj@apache.org>
Authored: Mon Mar 24 16:32:10 2014 -0700
Committer: Josh Elser <elserj@apache.org>
Committed: Mon Mar 24 16:32:10 2014 -0700

----------------------------------------------------------------------
 .../org/apache/accumulo/server/fs/VolumeManagerImpl.java     | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/accumulo/blob/62ce7524/server/base/src/main/java/org/apache/accumulo/server/fs/VolumeManagerImpl.java
----------------------------------------------------------------------
diff --git a/server/base/src/main/java/org/apache/accumulo/server/fs/VolumeManagerImpl.java
b/server/base/src/main/java/org/apache/accumulo/server/fs/VolumeManagerImpl.java
index 6a3140b..8fe6579 100644
--- a/server/base/src/main/java/org/apache/accumulo/server/fs/VolumeManagerImpl.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/fs/VolumeManagerImpl.java
@@ -151,11 +151,9 @@ public class VolumeManagerImpl implements VolumeManager {
 
     Volume v = getVolumeByPath(path);
     FileSystem fs = v.getFileSystem();
-
-    if (bufferSize == 0) {
-      fs.getConf().getInt("io.file.buffer.size", 4096);
-    }
-    return fs.create(path, overwrite, bufferSize, replication, correctBlockSize(fs.getConf(),
blockSize));
+    blockSize = correctBlockSize(fs.getConf(), blockSize);
+    bufferSize = correctBufferSize(fs.getConf(), bufferSize);
+    return fs.create(path, overwrite, bufferSize, replication, blockSize);
   }
 
   @Override


Mime
View raw message