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 2014/03/14 17:55:48 UTC
[1/2] git commit: ACCUMULO-2475 recovery failed due to using the
wrong filesystem
Repository: accumulo
Updated Branches:
refs/heads/1.6.0-SNAPSHOT e68d748b0 -> 7c2a5526a
ACCUMULO-2475 recovery failed due to using the wrong filesystem
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/ae750622
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/ae750622
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/ae750622
Branch: refs/heads/1.6.0-SNAPSHOT
Commit: ae750622c2baf4761afd9354540383f3b01ab6e2
Parents: 6dd1bd3
Author: Eric Newton <er...@gmail.com>
Authored: Fri Mar 14 12:55:32 2014 -0400
Committer: Eric Newton <er...@gmail.com>
Committed: Fri Mar 14 12:55:32 2014 -0400
----------------------------------------------------------------------
.../org/apache/accumulo/test/MasterRepairsDualAssignmentIT.java | 3 +++
1 file changed, 3 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/ae750622/test/src/test/java/org/apache/accumulo/test/MasterRepairsDualAssignmentIT.java
----------------------------------------------------------------------
diff --git a/test/src/test/java/org/apache/accumulo/test/MasterRepairsDualAssignmentIT.java b/test/src/test/java/org/apache/accumulo/test/MasterRepairsDualAssignmentIT.java
index 86c5004..7cb1fe5 100644
--- a/test/src/test/java/org/apache/accumulo/test/MasterRepairsDualAssignmentIT.java
+++ b/test/src/test/java/org/apache/accumulo/test/MasterRepairsDualAssignmentIT.java
@@ -46,6 +46,7 @@ import org.apache.accumulo.server.master.state.TabletLocationState;
import org.apache.accumulo.test.functional.ConfigurableMacIT;
import org.apache.accumulo.test.functional.FunctionalTestUtils;
import org.apache.hadoop.conf.Configuration;
+import org.apache.hadoop.fs.RawLocalFileSystem;
import org.apache.hadoop.io.Text;
import org.junit.Test;
@@ -56,6 +57,8 @@ public class MasterRepairsDualAssignmentIT extends ConfigurableMacIT {
public void configure(MiniAccumuloConfigImpl cfg, Configuration hadoopCoreSite) {
cfg.setProperty(Property.INSTANCE_ZK_TIMEOUT, "5s");
cfg.setProperty(Property.MASTER_RECOVERY_DELAY, "5s");
+ // use raw local file system so walogs sync and flush will work
+ hadoopCoreSite.set("fs.file.impl", RawLocalFileSystem.class.getName());
}
@Test(timeout = 5 * 60 * 1000)
[2/2] git commit: Merge branch '1.6.0-SNAPSHOT' of
https://git-wip-us.apache.org/repos/asf/accumulo into 1.6.0-SNAPSHOT
Posted by ec...@apache.org.
Merge branch '1.6.0-SNAPSHOT' of https://git-wip-us.apache.org/repos/asf/accumulo 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/7c2a5526
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/7c2a5526
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/7c2a5526
Branch: refs/heads/1.6.0-SNAPSHOT
Commit: 7c2a5526a1ce9b729e8a14ce9a34b457959bfa5e
Parents: ae75062 e68d748
Author: Eric Newton <er...@gmail.com>
Authored: Fri Mar 14 12:55:59 2014 -0400
Committer: Eric Newton <er...@gmail.com>
Committed: Fri Mar 14 12:55:59 2014 -0400
----------------------------------------------------------------------
README | 5 +-
.../accumulo/core/data/ArrayByteSequence.java | 7 +-
.../apache/accumulo/core/data/KeyExtent.java | 3 +-
.../core/security/NamespacePermission.java | 1 +
.../core/data/ArrayByteSequenceTest.java | 107 +++++++++
.../accumulo/core/data/ByteSequenceTest.java | 41 ++++
.../apache/accumulo/core/data/ColumnTest.java | 70 ++++--
.../accumulo/core/data/KeyExtentTest.java | 240 ++++++++++++++-----
.../org/apache/accumulo/core/data/KeyTest.java | 33 +++
.../iterators/user/BigDecimalCombinerTest.java | 91 +++++--
.../core/iterators/user/CombinerTest.java | 2 +-
.../core/security/ColumnVisibilityTest.java | 34 ++-
.../core/security/NamespacePermissionsTest.java | 39 +++
.../core/security/VisibilityConstraintTest.java | 106 ++++++++
pom.xml | 7 +
.../tserver/TabletServerResourceManager.java | 19 +-
.../randomwalk/security/SecurityFixture.java | 2 +
17 files changed, 694 insertions(+), 113 deletions(-)
----------------------------------------------------------------------