You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@accumulo.apache.org by kt...@apache.org on 2013/11/25 15:04:03 UTC
[1/5] git commit: ACCUMULO-1921 fixed formatting
Updated Branches:
refs/heads/master e01de2f7f -> a735fb281
ACCUMULO-1921 fixed formatting
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/85559386
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/85559386
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/85559386
Branch: refs/heads/master
Commit: 855593862bec796035eb5dfd07100485c9965b80
Parents: de2168e
Author: Keith Turner <kt...@apache.org>
Authored: Mon Nov 25 08:25:53 2013 -0500
Committer: Keith Turner <kt...@apache.org>
Committed: Mon Nov 25 08:25:53 2013 -0500
----------------------------------------------------------------------
.../main/java/org/apache/accumulo/tserver/TabletServer.java | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/85559386/server/tserver/src/main/java/org/apache/accumulo/tserver/TabletServer.java
----------------------------------------------------------------------
diff --git a/server/tserver/src/main/java/org/apache/accumulo/tserver/TabletServer.java b/server/tserver/src/main/java/org/apache/accumulo/tserver/TabletServer.java
index cb8c83e..1b4ccaf 100644
--- a/server/tserver/src/main/java/org/apache/accumulo/tserver/TabletServer.java
+++ b/server/tserver/src/main/java/org/apache/accumulo/tserver/TabletServer.java
@@ -2851,9 +2851,9 @@ public class TabletServer extends AbstractMetricsImpl implements org.apache.accu
unopenedTablets.add(pair.getSecond());
}
// split was rolled back... try again
- new AssignmentHandler(pair.getSecond()).run();
- return;
- }
+ new AssignmentHandler(pair.getSecond()).run();
+ return;
+ }
}
} catch (Exception e) {
synchronized (openingTablets) {
[2/5] git commit: ACCUMULO-1893 keep tests from attempting to write
to the root of HDFS.
Posted by kt...@apache.org.
ACCUMULO-1893 keep tests from attempting to write to the root of HDFS.
Reapplication of part of ACCUMULO-1563 to current branch.
Author: Jon Hsieh <jm...@apache.org>
Signed-off-by: Keith Turner <kt...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/d0ceebbf
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/d0ceebbf
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/d0ceebbf
Branch: refs/heads/master
Commit: d0ceebbf0ae8198ec68f3d581c259013c73f4664
Parents: 6caa159
Author: Sean Busbey <bu...@clouderagovt.com>
Authored: Thu Nov 14 14:10:52 2013 -0600
Committer: Keith Turner <kt...@apache.org>
Committed: Mon Nov 25 08:43:37 2013 -0500
----------------------------------------------------------------------
.../java/org/apache/accumulo/server/test/CreateMapFiles.java | 2 +-
.../server/test/functional/BulkSplitOptimizationTest.java | 8 ++++----
2 files changed, 5 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/d0ceebbf/src/server/src/main/java/org/apache/accumulo/server/test/CreateMapFiles.java
----------------------------------------------------------------------
diff --git a/src/server/src/main/java/org/apache/accumulo/server/test/CreateMapFiles.java b/src/server/src/main/java/org/apache/accumulo/server/test/CreateMapFiles.java
index a571894..9ffea43 100644
--- a/src/server/src/main/java/org/apache/accumulo/server/test/CreateMapFiles.java
+++ b/src/server/src/main/java/org/apache/accumulo/server/test/CreateMapFiles.java
@@ -39,7 +39,7 @@ public class CreateMapFiles {
int count = 0;
while (currEnd <= end && currStart < currEnd) {
- final String tia = String.format("-mapFile /%s/mf%05d -timestamp 1 -size 50 -random 56 %d %d 1", dir, count, currEnd - currStart, currStart);
+ final String tia = String.format("-mapFile %s/mf%05d -timestamp 1 -size 50 -random 56 %d %d 1", dir, count, currEnd - currStart, currStart);
Runnable r = new Runnable() {
http://git-wip-us.apache.org/repos/asf/accumulo/blob/d0ceebbf/src/server/src/main/java/org/apache/accumulo/server/test/functional/BulkSplitOptimizationTest.java
----------------------------------------------------------------------
diff --git a/src/server/src/main/java/org/apache/accumulo/server/test/functional/BulkSplitOptimizationTest.java b/src/server/src/main/java/org/apache/accumulo/server/test/functional/BulkSplitOptimizationTest.java
index 3af4144..137239c2 100644
--- a/src/server/src/main/java/org/apache/accumulo/server/test/functional/BulkSplitOptimizationTest.java
+++ b/src/server/src/main/java/org/apache/accumulo/server/test/functional/BulkSplitOptimizationTest.java
@@ -42,8 +42,8 @@ public class BulkSplitOptimizationTest extends FunctionalTest {
@Override
public void cleanup() throws Exception {
FileSystem fs = FileSystem.get(CachedConfiguration.getInstance());
- fs.delete(new Path("/tmp/testmf"), true);
- fs.delete(new Path("/tmp/testmf_failures"), true);
+ fs.delete(new Path("tmp/testmf"), true);
+ fs.delete(new Path("tmp/testmf_failures"), true);
}
@Override
@@ -61,11 +61,11 @@ public class BulkSplitOptimizationTest extends FunctionalTest {
public void run() throws Exception {
FileSystem fs = FileSystem.get(CachedConfiguration.getInstance());
- fs.delete(new Path("/tmp/testmf"), true);
+ fs.delete(new Path("tmp/testmf"), true);
CreateMapFiles.main(new String[] {"tmp/testmf", "8", "0", "100000", "99"});
- bulkImport(fs, TABLE_NAME, "/tmp/testmf");
+ bulkImport(fs, TABLE_NAME, "tmp/testmf");
checkSplits(TABLE_NAME, 0, 0);
checkMapFiles(TABLE_NAME, 1, 1, 100, 100);
[5/5] git commit: Merge remote-tracking branch 'origin/1.6.0-SNAPSHOT'
Posted by kt...@apache.org.
Merge remote-tracking branch 'origin/1.6.0-SNAPSHOT'
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/a735fb28
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/a735fb28
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/a735fb28
Branch: refs/heads/master
Commit: a735fb2812d124b8afe01cd482b14306a7caf5fd
Parents: e01de2f 564885c
Author: Keith Turner <kt...@apache.org>
Authored: Mon Nov 25 09:01:39 2013 -0500
Committer: Keith Turner <kt...@apache.org>
Committed: Mon Nov 25 09:01:39 2013 -0500
----------------------------------------------------------------------
.../main/java/org/apache/accumulo/tserver/TabletServer.java | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
[4/5] git commit: Merge remote-tracking branch
'origin/1.5.1-SNAPSHOT' into 1.6.0-SNAPSHOT
Posted by kt...@apache.org.
Merge remote-tracking branch 'origin/1.5.1-SNAPSHOT' into 1.6.0-SNAPSHOT
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/564885cc
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/564885cc
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/564885cc
Branch: refs/heads/master
Commit: 564885cc0f55fd938ba71e3d29f16b3a0aac2eba
Parents: 8555938 17ac692
Author: Keith Turner <kt...@apache.org>
Authored: Mon Nov 25 08:59:26 2013 -0500
Committer: Keith Turner <kt...@apache.org>
Committed: Mon Nov 25 08:59:26 2013 -0500
----------------------------------------------------------------------
----------------------------------------------------------------------
[3/5] git commit: Merge remote-tracking branch
'origin/1.4.5-SNAPSHOT' into 1.5.1-SNAPSHOT
Posted by kt...@apache.org.
Merge remote-tracking branch 'origin/1.4.5-SNAPSHOT' into 1.5.1-SNAPSHOT
Conflicts:
test/src/main/java/org/apache/accumulo/test/CreateRFiles.java
test/src/main/java/org/apache/accumulo/test/functional/BulkSplitOptimizationTest.java
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/17ac6920
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/17ac6920
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/17ac6920
Branch: refs/heads/master
Commit: 17ac692035ebd5c9f05dcbde9adf85915b05bb7b
Parents: 100e75b d0ceebb
Author: Keith Turner <kt...@apache.org>
Authored: Mon Nov 25 08:52:36 2013 -0500
Committer: Keith Turner <kt...@apache.org>
Committed: Mon Nov 25 08:52:36 2013 -0500
----------------------------------------------------------------------
----------------------------------------------------------------------