You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@accumulo.apache.org by ec...@apache.org on 2013/10/18 00:11:20 UTC
[1/3] git commit: ACCUMULO-1784 fix minimum block size complaint for
hadoop-2.2.0
Updated Branches:
refs/heads/1.5.1-SNAPSHOT fc2ad858c -> 1b38c037a
refs/heads/master b539fa01a -> 8f6bc5baf
ACCUMULO-1784 fix minimum block size complaint for hadoop-2.2.0
Conflicts:
start/src/test/java/org/apache/accumulo/test/AccumuloDFSBase.java
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/1b38c037
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/1b38c037
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/1b38c037
Branch: refs/heads/1.5.1-SNAPSHOT
Commit: 1b38c037a6c509c64ace9b55f8fe7fc9fb7dac87
Parents: fc2ad85
Author: Eric Newton <er...@gmail.com>
Authored: Thu Oct 17 18:02:34 2013 -0400
Committer: Eric Newton <er...@gmail.com>
Committed: Thu Oct 17 18:08:39 2013 -0400
----------------------------------------------------------------------
start/src/test/java/org/apache/accumulo/test/AccumuloDFSBase.java | 2 +-
.../org/apache/accumulo/test/randomwalk/concurrent/Config.java | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/1b38c037/start/src/test/java/org/apache/accumulo/test/AccumuloDFSBase.java
----------------------------------------------------------------------
diff --git a/start/src/test/java/org/apache/accumulo/test/AccumuloDFSBase.java b/start/src/test/java/org/apache/accumulo/test/AccumuloDFSBase.java
index be33e00..a29bf7e 100644
--- a/start/src/test/java/org/apache/accumulo/test/AccumuloDFSBase.java
+++ b/start/src/test/java/org/apache/accumulo/test/AccumuloDFSBase.java
@@ -79,7 +79,7 @@ public class AccumuloDFSBase {
throw new RuntimeException("Error getting umask from O/S", e);
}
- conf.setLong(DFSConfigKeys.DFS_BLOCK_SIZE_KEY, 1024 * 100); // 100K blocksize
+ conf.setLong(DFSConfigKeys.DFS_BLOCK_SIZE_KEY, 1024 * 1024); // 1M blocksize
try {
cluster = new MiniDFSCluster(conf, 1, true, null);
http://git-wip-us.apache.org/repos/asf/accumulo/blob/1b38c037/test/src/main/java/org/apache/accumulo/test/randomwalk/concurrent/Config.java
----------------------------------------------------------------------
diff --git a/test/src/main/java/org/apache/accumulo/test/randomwalk/concurrent/Config.java b/test/src/main/java/org/apache/accumulo/test/randomwalk/concurrent/Config.java
index 6768530..b47f1a9 100644
--- a/test/src/main/java/org/apache/accumulo/test/randomwalk/concurrent/Config.java
+++ b/test/src/main/java/org/apache/accumulo/test/randomwalk/concurrent/Config.java
@@ -73,7 +73,7 @@ public class Config extends Test {
s(Property.TSERV_SESSION_MAXIDLE, 100, 5*60*1000),
s(Property.TSERV_SORT_BUFFER_SIZE, 1024*1024, 1024*1024*1024L),
s(Property.TSERV_TABLET_SPLIT_FINDMIDPOINT_MAXOPEN, 5, 100),
- s(Property.TSERV_WAL_BLOCKSIZE, 100*1024, 1024*1024*1024*10L),
+ s(Property.TSERV_WAL_BLOCKSIZE, 1024*1024, 1024*1024*1024*10L),
s(Property.TSERV_WORKQ_THREADS, 1, 10),
s(Property.MASTER_BULK_THREADPOOL_SIZE, 1, 10),
s(Property.MASTER_BULK_RETRIES, 1, 10),
[3/3] git commit: Merge branch '1.5.1-SNAPSHOT'
Posted by ec...@apache.org.
Merge branch '1.5.1-SNAPSHOT'
Conflicts:
start/src/test/java/org/apache/accumulo/test/AccumuloDFSBase.java
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/8f6bc5ba
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/8f6bc5ba
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/8f6bc5ba
Branch: refs/heads/master
Commit: 8f6bc5baf1272a9e1609f17c300559bc8de6df35
Parents: b539fa0 1b38c03
Author: Eric Newton <er...@gmail.com>
Authored: Thu Oct 17 18:11:23 2013 -0400
Committer: Eric Newton <er...@gmail.com>
Committed: Thu Oct 17 18:11:23 2013 -0400
----------------------------------------------------------------------
----------------------------------------------------------------------
[2/3] git commit: ACCUMULO-1784 fix minimum block size complaint for
hadoop-2.2.0
Posted by ec...@apache.org.
ACCUMULO-1784 fix minimum block size complaint for hadoop-2.2.0
Conflicts:
start/src/test/java/org/apache/accumulo/test/AccumuloDFSBase.java
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/1b38c037
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/1b38c037
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/1b38c037
Branch: refs/heads/master
Commit: 1b38c037a6c509c64ace9b55f8fe7fc9fb7dac87
Parents: fc2ad85
Author: Eric Newton <er...@gmail.com>
Authored: Thu Oct 17 18:02:34 2013 -0400
Committer: Eric Newton <er...@gmail.com>
Committed: Thu Oct 17 18:08:39 2013 -0400
----------------------------------------------------------------------
start/src/test/java/org/apache/accumulo/test/AccumuloDFSBase.java | 2 +-
.../org/apache/accumulo/test/randomwalk/concurrent/Config.java | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/1b38c037/start/src/test/java/org/apache/accumulo/test/AccumuloDFSBase.java
----------------------------------------------------------------------
diff --git a/start/src/test/java/org/apache/accumulo/test/AccumuloDFSBase.java b/start/src/test/java/org/apache/accumulo/test/AccumuloDFSBase.java
index be33e00..a29bf7e 100644
--- a/start/src/test/java/org/apache/accumulo/test/AccumuloDFSBase.java
+++ b/start/src/test/java/org/apache/accumulo/test/AccumuloDFSBase.java
@@ -79,7 +79,7 @@ public class AccumuloDFSBase {
throw new RuntimeException("Error getting umask from O/S", e);
}
- conf.setLong(DFSConfigKeys.DFS_BLOCK_SIZE_KEY, 1024 * 100); // 100K blocksize
+ conf.setLong(DFSConfigKeys.DFS_BLOCK_SIZE_KEY, 1024 * 1024); // 1M blocksize
try {
cluster = new MiniDFSCluster(conf, 1, true, null);
http://git-wip-us.apache.org/repos/asf/accumulo/blob/1b38c037/test/src/main/java/org/apache/accumulo/test/randomwalk/concurrent/Config.java
----------------------------------------------------------------------
diff --git a/test/src/main/java/org/apache/accumulo/test/randomwalk/concurrent/Config.java b/test/src/main/java/org/apache/accumulo/test/randomwalk/concurrent/Config.java
index 6768530..b47f1a9 100644
--- a/test/src/main/java/org/apache/accumulo/test/randomwalk/concurrent/Config.java
+++ b/test/src/main/java/org/apache/accumulo/test/randomwalk/concurrent/Config.java
@@ -73,7 +73,7 @@ public class Config extends Test {
s(Property.TSERV_SESSION_MAXIDLE, 100, 5*60*1000),
s(Property.TSERV_SORT_BUFFER_SIZE, 1024*1024, 1024*1024*1024L),
s(Property.TSERV_TABLET_SPLIT_FINDMIDPOINT_MAXOPEN, 5, 100),
- s(Property.TSERV_WAL_BLOCKSIZE, 100*1024, 1024*1024*1024*10L),
+ s(Property.TSERV_WAL_BLOCKSIZE, 1024*1024, 1024*1024*1024*10L),
s(Property.TSERV_WORKQ_THREADS, 1, 10),
s(Property.MASTER_BULK_THREADPOOL_SIZE, 1, 10),
s(Property.MASTER_BULK_RETRIES, 1, 10),