You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@accumulo.apache.org by ct...@apache.org on 2015/02/13 00:39:34 UTC
[11/11] accumulo git commit: Merge branch '1.6'
Merge branch '1.6'
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/b8a1b310
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/b8a1b310
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/b8a1b310
Branch: refs/heads/master
Commit: b8a1b3106872dccaca7969cbab5e28a47bf3f4d0
Parents: b620567 94b12f1
Author: Christopher Tubbs <ct...@apache.org>
Authored: Thu Feb 12 18:13:54 2015 -0500
Committer: Christopher Tubbs <ct...@apache.org>
Committed: Thu Feb 12 18:13:54 2015 -0500
----------------------------------------------------------------------
.../server/master/state/TabletStateChangeIterator.java | 8 +++-----
.../java/org/apache/accumulo/master/TestMergeState.java | 9 +++------
.../test/java/org/apache/accumulo/test/ShellServerIT.java | 2 --
3 files changed, 6 insertions(+), 13 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/b8a1b310/server/base/src/main/java/org/apache/accumulo/server/master/state/TabletStateChangeIterator.java
----------------------------------------------------------------------
diff --cc server/base/src/main/java/org/apache/accumulo/server/master/state/TabletStateChangeIterator.java
index 1721be1,048884c..7903a26
--- a/server/base/src/main/java/org/apache/accumulo/server/master/state/TabletStateChangeIterator.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/master/state/TabletStateChangeIterator.java
@@@ -41,11 -42,8 +41,10 @@@ import org.apache.accumulo.server.maste
import org.apache.hadoop.io.DataInputBuffer;
import org.apache.hadoop.io.DataOutputBuffer;
import org.apache.hadoop.io.Text;
- import org.apache.log4j.Level;
import org.apache.log4j.Logger;
+import com.google.common.base.Joiner;
+
public class TabletStateChangeIterator extends SkippingIterator {
private static final String SERVERS_OPTION = "servers";
http://git-wip-us.apache.org/repos/asf/accumulo/blob/b8a1b310/server/master/src/test/java/org/apache/accumulo/master/TestMergeState.java
----------------------------------------------------------------------
diff --cc server/master/src/test/java/org/apache/accumulo/master/TestMergeState.java
index 0157afd,eddbe15..c08af55
--- a/server/master/src/test/java/org/apache/accumulo/master/TestMergeState.java
+++ b/server/master/src/test/java/org/apache/accumulo/master/TestMergeState.java
@@@ -119,15 -115,16 +116,15 @@@ public class TestMergeState
// Read out the TabletLocationStates
MockCurrentState state = new MockCurrentState(new MergeInfo(new KeyExtent(tableId, new Text("p"), new Text("e")), MergeInfo.Operation.MERGE));
- Credentials credentials = new Credentials("root", new PasswordToken(new byte[0]));
// Verify the tablet state: hosted, and count
- MetaDataStateStore metaDataStateStore = new MetaDataStateStore(instance, credentials, state);
+ MetaDataStateStore metaDataStateStore = new MetaDataStateStore(context, state);
int count = 0;
for (TabletLocationState tss : metaDataStateStore) {
- Assert.assertEquals(TabletState.HOSTED, tss.getState(state.onlineTabletServers()));
- count++;
+ if (tss != null)
+ count++;
}
- Assert.assertEquals(splits.length + 1, count);
+ Assert.assertEquals(0, count); // the normal case is to skip tablets in a good state
// Create the hole
// Split the tablet at one end of the range
http://git-wip-us.apache.org/repos/asf/accumulo/blob/b8a1b310/test/src/test/java/org/apache/accumulo/test/ShellServerIT.java
----------------------------------------------------------------------
diff --cc test/src/test/java/org/apache/accumulo/test/ShellServerIT.java
index 2d9166e,a29a4bb..9296548
--- a/test/src/test/java/org/apache/accumulo/test/ShellServerIT.java
+++ b/test/src/test/java/org/apache/accumulo/test/ShellServerIT.java
@@@ -71,10 -70,8 +71,9 @@@ import org.apache.hadoop.tools.DistCp
import org.apache.log4j.Logger;
import org.junit.After;
import org.junit.AfterClass;
+import org.junit.Assert;
import org.junit.Before;
import org.junit.BeforeClass;
- import org.junit.Ignore;
import org.junit.Rule;
import org.junit.Test;
import org.junit.rules.TestName;