You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@accumulo.apache.org by bh...@apache.org on 2014/01/14 21:48:39 UTC
[01/17] git commit: ACCUMULO-2182 Backport of ACCUMULO-1123 to 1.4.x
Updated Branches:
refs/heads/1.4.5-SNAPSHOT 8e0e0e1f5 -> 5c50e42be
refs/heads/1.5.1-SNAPSHOT 0603edbbe -> ea41264a6
refs/heads/1.6.0-SNAPSHOT 9747cc767 -> 1496c5f32
refs/heads/master 398610d48 -> e1ed7a44a
ACCUMULO-2182 Backport of ACCUMULO-1123 to 1.4.x
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/ed4c2273
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/ed4c2273
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/ed4c2273
Branch: refs/heads/1.4.5-SNAPSHOT
Commit: ed4c2273f7fd34e27fbda1616321117b0561badf
Parents: 8e0e0e1
Author: Bill Havanki <bh...@cloudera.com>
Authored: Mon Jan 13 14:23:48 2014 -0500
Committer: Bill Havanki <bh...@cloudera.com>
Committed: Mon Jan 13 17:04:15 2014 -0500
----------------------------------------------------------------------
.../accumulo/server/test/randomwalk/State.java | 6 +++++-
.../test/randomwalk/security/ChangePass.java | 2 ++
.../test/randomwalk/security/CreateUser.java | 1 +
.../test/randomwalk/security/SecurityHelper.java | 10 ++++++++++
.../server/test/randomwalk/security/TableOp.java | 18 ++++++++++++++++--
5 files changed, 34 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/ed4c2273/src/server/src/main/java/org/apache/accumulo/server/test/randomwalk/State.java
----------------------------------------------------------------------
diff --git a/src/server/src/main/java/org/apache/accumulo/server/test/randomwalk/State.java b/src/server/src/main/java/org/apache/accumulo/server/test/randomwalk/State.java
index 1c73414..344f3b3 100644
--- a/src/server/src/main/java/org/apache/accumulo/server/test/randomwalk/State.java
+++ b/src/server/src/main/java/org/apache/accumulo/server/test/randomwalk/State.java
@@ -78,6 +78,10 @@ public class State {
public Integer getInteger(String key) {
return (Integer) stateMap.get(key);
}
+
+ public Long getLong(String key) {
+ return (Long) stateMap.get(key);
+ }
public String getProperty(String key) {
return props.getProperty(key);
@@ -150,4 +154,4 @@ public class State {
return retval;
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/accumulo/blob/ed4c2273/src/server/src/main/java/org/apache/accumulo/server/test/randomwalk/security/ChangePass.java
----------------------------------------------------------------------
diff --git a/src/server/src/main/java/org/apache/accumulo/server/test/randomwalk/security/ChangePass.java b/src/server/src/main/java/org/apache/accumulo/server/test/randomwalk/security/ChangePass.java
index 429c8cd..f9f0a7e 100644
--- a/src/server/src/main/java/org/apache/accumulo/server/test/randomwalk/security/ChangePass.java
+++ b/src/server/src/main/java/org/apache/accumulo/server/test/randomwalk/security/ChangePass.java
@@ -97,6 +97,8 @@ public class ChangePass extends Test {
SecurityHelper.setSysUserPass(state, newPass);
} else
SecurityHelper.setTabUserPass(state, newPass);
+ // Waiting 1 second for password to propogate through Zk
+ Thread.sleep(1000);
if (!hasPerm)
throw new AccumuloException("Password change succeeded when it should have failed.");
}
http://git-wip-us.apache.org/repos/asf/accumulo/blob/ed4c2273/src/server/src/main/java/org/apache/accumulo/server/test/randomwalk/security/CreateUser.java
----------------------------------------------------------------------
diff --git a/src/server/src/main/java/org/apache/accumulo/server/test/randomwalk/security/CreateUser.java b/src/server/src/main/java/org/apache/accumulo/server/test/randomwalk/security/CreateUser.java
index afefee8..fe6458f 100644
--- a/src/server/src/main/java/org/apache/accumulo/server/test/randomwalk/security/CreateUser.java
+++ b/src/server/src/main/java/org/apache/accumulo/server/test/randomwalk/security/CreateUser.java
@@ -67,6 +67,7 @@ public class CreateUser extends Test {
}
SecurityHelper.setTabUserPass(state, tabUserPass);
SecurityHelper.setTabUserExists(state, true);
+ Thread.sleep(1000);
if (!hasPermission)
throw new AccumuloException("Didn't get Security Exception when we should have");
}
http://git-wip-us.apache.org/repos/asf/accumulo/blob/ed4c2273/src/server/src/main/java/org/apache/accumulo/server/test/randomwalk/security/SecurityHelper.java
----------------------------------------------------------------------
diff --git a/src/server/src/main/java/org/apache/accumulo/server/test/randomwalk/security/SecurityHelper.java b/src/server/src/main/java/org/apache/accumulo/server/test/randomwalk/security/SecurityHelper.java
index 52a4672..c8d1ea0 100644
--- a/src/server/src/main/java/org/apache/accumulo/server/test/randomwalk/security/SecurityHelper.java
+++ b/src/server/src/main/java/org/apache/accumulo/server/test/randomwalk/security/SecurityHelper.java
@@ -140,8 +140,18 @@ public class SecurityHelper {
public static void setUserAuths(State state, String target, Authorizations auths) {
state.set(target + "_auths", auths);
+ state.set("Auths-" + target + '-' + "time", System.currentTimeMillis());
}
+ public static boolean ambiguousAuthorizations(State state, String target) {
+ Long setTime = state.getLong("Auths-" + target + '-' + "time");
+ if (setTime == null)
+ throw new RuntimeException("WTF? Auths-" + target + '-' + "time is null");
+ if (System.currentTimeMillis() < (setTime + 1000))
+ return true;
+ return false;
+ }
+
@SuppressWarnings("unchecked")
public static Map<String,Integer> getAuthsMap(State state) {
return (Map<String,Integer>) state.get(authsMap);
http://git-wip-us.apache.org/repos/asf/accumulo/blob/ed4c2273/src/server/src/main/java/org/apache/accumulo/server/test/randomwalk/security/TableOp.java
----------------------------------------------------------------------
diff --git a/src/server/src/main/java/org/apache/accumulo/server/test/randomwalk/security/TableOp.java b/src/server/src/main/java/org/apache/accumulo/server/test/randomwalk/security/TableOp.java
index e0b8deb..8d309b8 100644
--- a/src/server/src/main/java/org/apache/accumulo/server/test/randomwalk/security/TableOp.java
+++ b/src/server/src/main/java/org/apache/accumulo/server/test/randomwalk/security/TableOp.java
@@ -83,6 +83,7 @@ public class TableOp extends Test {
case READ:
Authorizations auths = SecurityHelper.getUserAuths(state, SecurityHelper.getTabUserName(state));
boolean canRead = SecurityHelper.getTabPerm(state, SecurityHelper.getTabUserName(state), TablePermission.READ);
+ boolean ambiguousAuths = SecurityHelper.ambiguousAuthorizations(state, SecurityHelper.getTabUserName(state));
try {
Scanner scan = conn.createScanner(tableName, conn.securityOperations().getUserAuthorizations(SecurityHelper.getTabUserName(state)));
int seen = 0;
@@ -91,7 +92,7 @@ public class TableOp extends Test {
Entry<Key,Value> entry = iter.next();
Key k = entry.getKey();
seen++;
- if (!auths.contains(k.getColumnVisibilityData()))
+ if (!auths.contains(k.getColumnVisibilityData()) && !ambiguousAuths)
throw new AccumuloException("Got data I should not be capable of seeing: " + k + " table " + tableName);
}
if (!canRead)
@@ -100,7 +101,7 @@ public class TableOp extends Test {
if (auths.contains(entry.getKey().getBytes()))
seen = seen - entry.getValue();
}
- if (seen != 0)
+ if (seen != 0 && !ambiguousAuths)
throw new AccumuloException("Got mismatched amounts of data");
} catch (TableNotFoundException tnfe) {
if (tableExists)
@@ -113,6 +114,12 @@ public class TableOp extends Test {
else
return;
}
+ if (ae.getErrorCode().equals(SecurityErrorCode.BAD_AUTHORIZATIONS)) {
+ if (ambiguousAuths)
+ return;
+ else
+ throw new AccumuloException("Mismatched authorizations! ", ae);
+ }
throw new AccumuloException("Unexpected exception!", ae);
} catch (RuntimeException re) {
if (re.getCause() instanceof AccumuloSecurityException
@@ -122,6 +129,13 @@ public class TableOp extends Test {
else
return;
}
+ if (re.getCause() instanceof AccumuloSecurityException
+ && ((AccumuloSecurityException) re.getCause()).getErrorCode().equals(SecurityErrorCode.BAD_AUTHORIZATIONS)) {
+ if (ambiguousAuths)
+ return;
+ else
+ throw new AccumuloException("Mismatched authorizations! ", re.getCause());
+ }
throw new AccumuloException("Unexpected exception!", re);
}
[16/17] git commit: Merge branch '1.5.1-SNAPSHOT' into 1.6.0-SNAPSHOT
Posted by bh...@apache.org.
Merge branch '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/1496c5f3
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/1496c5f3
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/1496c5f3
Branch: refs/heads/master
Commit: 1496c5f3279e10a7fb52a0d3933f2812ada5950b
Parents: 9747cc7 ea41264
Author: Bill Havanki <bh...@cloudera.com>
Authored: Tue Jan 14 15:47:38 2014 -0500
Committer: Bill Havanki <bh...@cloudera.com>
Committed: Tue Jan 14 15:47:38 2014 -0500
----------------------------------------------------------------------
----------------------------------------------------------------------
[03/17] git commit: ACCUMULO-2182 Backport of ACCUMULO-1123 to 1.4.x
Posted by bh...@apache.org.
ACCUMULO-2182 Backport of ACCUMULO-1123 to 1.4.x
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/ed4c2273
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/ed4c2273
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/ed4c2273
Branch: refs/heads/1.6.0-SNAPSHOT
Commit: ed4c2273f7fd34e27fbda1616321117b0561badf
Parents: 8e0e0e1
Author: Bill Havanki <bh...@cloudera.com>
Authored: Mon Jan 13 14:23:48 2014 -0500
Committer: Bill Havanki <bh...@cloudera.com>
Committed: Mon Jan 13 17:04:15 2014 -0500
----------------------------------------------------------------------
.../accumulo/server/test/randomwalk/State.java | 6 +++++-
.../test/randomwalk/security/ChangePass.java | 2 ++
.../test/randomwalk/security/CreateUser.java | 1 +
.../test/randomwalk/security/SecurityHelper.java | 10 ++++++++++
.../server/test/randomwalk/security/TableOp.java | 18 ++++++++++++++++--
5 files changed, 34 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/ed4c2273/src/server/src/main/java/org/apache/accumulo/server/test/randomwalk/State.java
----------------------------------------------------------------------
diff --git a/src/server/src/main/java/org/apache/accumulo/server/test/randomwalk/State.java b/src/server/src/main/java/org/apache/accumulo/server/test/randomwalk/State.java
index 1c73414..344f3b3 100644
--- a/src/server/src/main/java/org/apache/accumulo/server/test/randomwalk/State.java
+++ b/src/server/src/main/java/org/apache/accumulo/server/test/randomwalk/State.java
@@ -78,6 +78,10 @@ public class State {
public Integer getInteger(String key) {
return (Integer) stateMap.get(key);
}
+
+ public Long getLong(String key) {
+ return (Long) stateMap.get(key);
+ }
public String getProperty(String key) {
return props.getProperty(key);
@@ -150,4 +154,4 @@ public class State {
return retval;
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/accumulo/blob/ed4c2273/src/server/src/main/java/org/apache/accumulo/server/test/randomwalk/security/ChangePass.java
----------------------------------------------------------------------
diff --git a/src/server/src/main/java/org/apache/accumulo/server/test/randomwalk/security/ChangePass.java b/src/server/src/main/java/org/apache/accumulo/server/test/randomwalk/security/ChangePass.java
index 429c8cd..f9f0a7e 100644
--- a/src/server/src/main/java/org/apache/accumulo/server/test/randomwalk/security/ChangePass.java
+++ b/src/server/src/main/java/org/apache/accumulo/server/test/randomwalk/security/ChangePass.java
@@ -97,6 +97,8 @@ public class ChangePass extends Test {
SecurityHelper.setSysUserPass(state, newPass);
} else
SecurityHelper.setTabUserPass(state, newPass);
+ // Waiting 1 second for password to propogate through Zk
+ Thread.sleep(1000);
if (!hasPerm)
throw new AccumuloException("Password change succeeded when it should have failed.");
}
http://git-wip-us.apache.org/repos/asf/accumulo/blob/ed4c2273/src/server/src/main/java/org/apache/accumulo/server/test/randomwalk/security/CreateUser.java
----------------------------------------------------------------------
diff --git a/src/server/src/main/java/org/apache/accumulo/server/test/randomwalk/security/CreateUser.java b/src/server/src/main/java/org/apache/accumulo/server/test/randomwalk/security/CreateUser.java
index afefee8..fe6458f 100644
--- a/src/server/src/main/java/org/apache/accumulo/server/test/randomwalk/security/CreateUser.java
+++ b/src/server/src/main/java/org/apache/accumulo/server/test/randomwalk/security/CreateUser.java
@@ -67,6 +67,7 @@ public class CreateUser extends Test {
}
SecurityHelper.setTabUserPass(state, tabUserPass);
SecurityHelper.setTabUserExists(state, true);
+ Thread.sleep(1000);
if (!hasPermission)
throw new AccumuloException("Didn't get Security Exception when we should have");
}
http://git-wip-us.apache.org/repos/asf/accumulo/blob/ed4c2273/src/server/src/main/java/org/apache/accumulo/server/test/randomwalk/security/SecurityHelper.java
----------------------------------------------------------------------
diff --git a/src/server/src/main/java/org/apache/accumulo/server/test/randomwalk/security/SecurityHelper.java b/src/server/src/main/java/org/apache/accumulo/server/test/randomwalk/security/SecurityHelper.java
index 52a4672..c8d1ea0 100644
--- a/src/server/src/main/java/org/apache/accumulo/server/test/randomwalk/security/SecurityHelper.java
+++ b/src/server/src/main/java/org/apache/accumulo/server/test/randomwalk/security/SecurityHelper.java
@@ -140,8 +140,18 @@ public class SecurityHelper {
public static void setUserAuths(State state, String target, Authorizations auths) {
state.set(target + "_auths", auths);
+ state.set("Auths-" + target + '-' + "time", System.currentTimeMillis());
}
+ public static boolean ambiguousAuthorizations(State state, String target) {
+ Long setTime = state.getLong("Auths-" + target + '-' + "time");
+ if (setTime == null)
+ throw new RuntimeException("WTF? Auths-" + target + '-' + "time is null");
+ if (System.currentTimeMillis() < (setTime + 1000))
+ return true;
+ return false;
+ }
+
@SuppressWarnings("unchecked")
public static Map<String,Integer> getAuthsMap(State state) {
return (Map<String,Integer>) state.get(authsMap);
http://git-wip-us.apache.org/repos/asf/accumulo/blob/ed4c2273/src/server/src/main/java/org/apache/accumulo/server/test/randomwalk/security/TableOp.java
----------------------------------------------------------------------
diff --git a/src/server/src/main/java/org/apache/accumulo/server/test/randomwalk/security/TableOp.java b/src/server/src/main/java/org/apache/accumulo/server/test/randomwalk/security/TableOp.java
index e0b8deb..8d309b8 100644
--- a/src/server/src/main/java/org/apache/accumulo/server/test/randomwalk/security/TableOp.java
+++ b/src/server/src/main/java/org/apache/accumulo/server/test/randomwalk/security/TableOp.java
@@ -83,6 +83,7 @@ public class TableOp extends Test {
case READ:
Authorizations auths = SecurityHelper.getUserAuths(state, SecurityHelper.getTabUserName(state));
boolean canRead = SecurityHelper.getTabPerm(state, SecurityHelper.getTabUserName(state), TablePermission.READ);
+ boolean ambiguousAuths = SecurityHelper.ambiguousAuthorizations(state, SecurityHelper.getTabUserName(state));
try {
Scanner scan = conn.createScanner(tableName, conn.securityOperations().getUserAuthorizations(SecurityHelper.getTabUserName(state)));
int seen = 0;
@@ -91,7 +92,7 @@ public class TableOp extends Test {
Entry<Key,Value> entry = iter.next();
Key k = entry.getKey();
seen++;
- if (!auths.contains(k.getColumnVisibilityData()))
+ if (!auths.contains(k.getColumnVisibilityData()) && !ambiguousAuths)
throw new AccumuloException("Got data I should not be capable of seeing: " + k + " table " + tableName);
}
if (!canRead)
@@ -100,7 +101,7 @@ public class TableOp extends Test {
if (auths.contains(entry.getKey().getBytes()))
seen = seen - entry.getValue();
}
- if (seen != 0)
+ if (seen != 0 && !ambiguousAuths)
throw new AccumuloException("Got mismatched amounts of data");
} catch (TableNotFoundException tnfe) {
if (tableExists)
@@ -113,6 +114,12 @@ public class TableOp extends Test {
else
return;
}
+ if (ae.getErrorCode().equals(SecurityErrorCode.BAD_AUTHORIZATIONS)) {
+ if (ambiguousAuths)
+ return;
+ else
+ throw new AccumuloException("Mismatched authorizations! ", ae);
+ }
throw new AccumuloException("Unexpected exception!", ae);
} catch (RuntimeException re) {
if (re.getCause() instanceof AccumuloSecurityException
@@ -122,6 +129,13 @@ public class TableOp extends Test {
else
return;
}
+ if (re.getCause() instanceof AccumuloSecurityException
+ && ((AccumuloSecurityException) re.getCause()).getErrorCode().equals(SecurityErrorCode.BAD_AUTHORIZATIONS)) {
+ if (ambiguousAuths)
+ return;
+ else
+ throw new AccumuloException("Mismatched authorizations! ", re.getCause());
+ }
throw new AccumuloException("Unexpected exception!", re);
}
[07/17] git commit: ACCUMULO-2182 Backport of ACCUMULO-2104 and
ACCUMULO-2106 to 1.4.x
Posted by bh...@apache.org.
ACCUMULO-2182 Backport of ACCUMULO-2104 and ACCUMULO-2106 to 1.4.x
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/5c50e42b
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/5c50e42b
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/5c50e42b
Branch: refs/heads/1.6.0-SNAPSHOT
Commit: 5c50e42be24bf58d3aa44e29baf491e26dfd8994
Parents: ed4c227
Author: Bill Havanki <bh...@cloudera.com>
Authored: Mon Jan 13 15:54:36 2014 -0500
Committer: Bill Havanki <bh...@cloudera.com>
Committed: Mon Jan 13 17:04:46 2014 -0500
----------------------------------------------------------------------
.../accumulo/server/test/randomwalk/State.java | 13 +++++++++++++
.../server/test/randomwalk/image/ImageFixture.java | 17 ++++++++++++++++-
.../randomwalk/multitable/MultiTableFixture.java | 14 ++++++++++++++
.../randomwalk/sequential/SequentialFixture.java | 14 ++++++++++++++
.../server/test/randomwalk/shard/ShardFixture.java | 15 +++++++++++++++
5 files changed, 72 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/5c50e42b/src/server/src/main/java/org/apache/accumulo/server/test/randomwalk/State.java
----------------------------------------------------------------------
diff --git a/src/server/src/main/java/org/apache/accumulo/server/test/randomwalk/State.java b/src/server/src/main/java/org/apache/accumulo/server/test/randomwalk/State.java
index 344f3b3..f9bd84e 100644
--- a/src/server/src/main/java/org/apache/accumulo/server/test/randomwalk/State.java
+++ b/src/server/src/main/java/org/apache/accumulo/server/test/randomwalk/State.java
@@ -24,6 +24,7 @@ import java.util.Properties;
import org.apache.accumulo.core.client.Connector;
import org.apache.accumulo.core.client.Instance;
import org.apache.accumulo.core.client.MultiTableBatchWriter;
+import org.apache.accumulo.core.client.MutationsRejectedException;
import org.apache.accumulo.core.client.ZooKeeperInstance;
import org.apache.accumulo.server.client.HdfsZooInstance;
import org.apache.log4j.Logger;
@@ -115,6 +116,18 @@ public class State {
return mtbw;
}
+ public boolean isMultiTableBatchWriterInitialized() {
+ return mtbw != null;
+ }
+
+ public void resetMultiTableBatchWriter() {
+ if (!mtbw.isClosed()) {
+ log.warn("Setting non-closed MultiTableBatchWriter to null (leaking resources)");
+ }
+
+ mtbw = null;
+ }
+
public String getMapReduceJars() {
String acuHome = System.getenv("ACCUMULO_HOME");
http://git-wip-us.apache.org/repos/asf/accumulo/blob/5c50e42b/src/server/src/main/java/org/apache/accumulo/server/test/randomwalk/image/ImageFixture.java
----------------------------------------------------------------------
diff --git a/src/server/src/main/java/org/apache/accumulo/server/test/randomwalk/image/ImageFixture.java b/src/server/src/main/java/org/apache/accumulo/server/test/randomwalk/image/ImageFixture.java
index fe406e7..44741a2 100644
--- a/src/server/src/main/java/org/apache/accumulo/server/test/randomwalk/image/ImageFixture.java
+++ b/src/server/src/main/java/org/apache/accumulo/server/test/randomwalk/image/ImageFixture.java
@@ -27,6 +27,8 @@ import java.util.TreeSet;
import org.apache.accumulo.core.client.Connector;
import org.apache.accumulo.core.client.Instance;
+import org.apache.accumulo.core.client.MultiTableBatchWriter;
+import org.apache.accumulo.core.client.MutationsRejectedException;
import org.apache.accumulo.core.client.TableExistsException;
import org.apache.accumulo.core.client.impl.Tables;
import org.apache.accumulo.server.test.randomwalk.Fixture;
@@ -105,7 +107,20 @@ public class ImageFixture extends Fixture {
@Override
public void tearDown(State state) throws Exception {
-
+ // We have resources we need to clean up
+ if (state.isMultiTableBatchWriterInitialized()) {
+ MultiTableBatchWriter mtbw = state.getMultiTableBatchWriter();
+ try {
+ mtbw.close();
+ } catch (MutationsRejectedException e) {
+ log.error("Ignoring mutations that weren't flushed", e);
+ }
+
+ // Reset the MTBW on the state to null
+ state.resetMultiTableBatchWriter();
+ }
+
+ // Now we can safely delete the tables
log.debug("Dropping tables: " + imageTableName + " " + indexTableName);
Connector conn = state.getConnector();
http://git-wip-us.apache.org/repos/asf/accumulo/blob/5c50e42b/src/server/src/main/java/org/apache/accumulo/server/test/randomwalk/multitable/MultiTableFixture.java
----------------------------------------------------------------------
diff --git a/src/server/src/main/java/org/apache/accumulo/server/test/randomwalk/multitable/MultiTableFixture.java b/src/server/src/main/java/org/apache/accumulo/server/test/randomwalk/multitable/MultiTableFixture.java
index d7f65ae..55850f6 100644
--- a/src/server/src/main/java/org/apache/accumulo/server/test/randomwalk/multitable/MultiTableFixture.java
+++ b/src/server/src/main/java/org/apache/accumulo/server/test/randomwalk/multitable/MultiTableFixture.java
@@ -20,6 +20,8 @@ import java.net.InetAddress;
import java.util.ArrayList;
import org.apache.accumulo.core.client.Connector;
+import org.apache.accumulo.core.client.MultiTableBatchWriter;
+import org.apache.accumulo.core.client.MutationsRejectedException;
import org.apache.accumulo.core.client.TableNotFoundException;
import org.apache.accumulo.server.test.randomwalk.Fixture;
import org.apache.accumulo.server.test.randomwalk.State;
@@ -40,6 +42,18 @@ public class MultiTableFixture extends Fixture {
@Override
public void tearDown(State state) throws Exception {
+ // We have resources we need to clean up
+ if (state.isMultiTableBatchWriterInitialized()) {
+ MultiTableBatchWriter mtbw = state.getMultiTableBatchWriter();
+ try {
+ mtbw.close();
+ } catch (MutationsRejectedException e) {
+ log.error("Ignoring mutations that weren't flushed", e);
+ }
+
+ // Reset the MTBW on the state to null
+ state.resetMultiTableBatchWriter();
+ }
Connector conn = state.getConnector();
http://git-wip-us.apache.org/repos/asf/accumulo/blob/5c50e42b/src/server/src/main/java/org/apache/accumulo/server/test/randomwalk/sequential/SequentialFixture.java
----------------------------------------------------------------------
diff --git a/src/server/src/main/java/org/apache/accumulo/server/test/randomwalk/sequential/SequentialFixture.java b/src/server/src/main/java/org/apache/accumulo/server/test/randomwalk/sequential/SequentialFixture.java
index 5714893..dbc1aab 100644
--- a/src/server/src/main/java/org/apache/accumulo/server/test/randomwalk/sequential/SequentialFixture.java
+++ b/src/server/src/main/java/org/apache/accumulo/server/test/randomwalk/sequential/SequentialFixture.java
@@ -20,6 +20,8 @@ import java.net.InetAddress;
import org.apache.accumulo.core.client.Connector;
import org.apache.accumulo.core.client.Instance;
+import org.apache.accumulo.core.client.MultiTableBatchWriter;
+import org.apache.accumulo.core.client.MutationsRejectedException;
import org.apache.accumulo.core.client.TableExistsException;
import org.apache.accumulo.core.client.impl.Tables;
import org.apache.accumulo.server.test.randomwalk.Fixture;
@@ -55,6 +57,18 @@ public class SequentialFixture extends Fixture {
@Override
public void tearDown(State state) throws Exception {
+ // We have resources we need to clean up
+ if (state.isMultiTableBatchWriterInitialized()) {
+ MultiTableBatchWriter mtbw = state.getMultiTableBatchWriter();
+ try {
+ mtbw.close();
+ } catch (MutationsRejectedException e) {
+ log.error("Ignoring mutations that weren't flushed", e);
+ }
+
+ // Reset the MTBW on the state to null
+ state.resetMultiTableBatchWriter();
+ }
log.debug("Dropping tables: " + seqTableName);
http://git-wip-us.apache.org/repos/asf/accumulo/blob/5c50e42b/src/server/src/main/java/org/apache/accumulo/server/test/randomwalk/shard/ShardFixture.java
----------------------------------------------------------------------
diff --git a/src/server/src/main/java/org/apache/accumulo/server/test/randomwalk/shard/ShardFixture.java b/src/server/src/main/java/org/apache/accumulo/server/test/randomwalk/shard/ShardFixture.java
index b91c81c..a9f8ded 100644
--- a/src/server/src/main/java/org/apache/accumulo/server/test/randomwalk/shard/ShardFixture.java
+++ b/src/server/src/main/java/org/apache/accumulo/server/test/randomwalk/shard/ShardFixture.java
@@ -22,6 +22,8 @@ import java.util.SortedSet;
import java.util.TreeSet;
import org.apache.accumulo.core.client.Connector;
+import org.apache.accumulo.core.client.MultiTableBatchWriter;
+import org.apache.accumulo.core.client.MutationsRejectedException;
import org.apache.accumulo.core.conf.Property;
import org.apache.accumulo.server.test.randomwalk.Fixture;
import org.apache.accumulo.server.test.randomwalk.State;
@@ -94,6 +96,19 @@ public class ShardFixture extends Fixture {
@Override
public void tearDown(State state) throws Exception {
+ // We have resources we need to clean up
+ if (state.isMultiTableBatchWriterInitialized()) {
+ MultiTableBatchWriter mtbw = state.getMultiTableBatchWriter();
+ try {
+ mtbw.close();
+ } catch (MutationsRejectedException e) {
+ log.error("Ignoring mutations that weren't flushed", e);
+ }
+
+ // Reset the MTBW on the state to null
+ state.resetMultiTableBatchWriter();
+ }
+
Connector conn = state.getConnector();
conn.tableOperations().delete((String) state.get("indexTableName"));
[06/17] git commit: ACCUMULO-2182 Backport of ACCUMULO-2104 and
ACCUMULO-2106 to 1.4.x
Posted by bh...@apache.org.
ACCUMULO-2182 Backport of ACCUMULO-2104 and ACCUMULO-2106 to 1.4.x
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/5c50e42b
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/5c50e42b
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/5c50e42b
Branch: refs/heads/1.5.1-SNAPSHOT
Commit: 5c50e42be24bf58d3aa44e29baf491e26dfd8994
Parents: ed4c227
Author: Bill Havanki <bh...@cloudera.com>
Authored: Mon Jan 13 15:54:36 2014 -0500
Committer: Bill Havanki <bh...@cloudera.com>
Committed: Mon Jan 13 17:04:46 2014 -0500
----------------------------------------------------------------------
.../accumulo/server/test/randomwalk/State.java | 13 +++++++++++++
.../server/test/randomwalk/image/ImageFixture.java | 17 ++++++++++++++++-
.../randomwalk/multitable/MultiTableFixture.java | 14 ++++++++++++++
.../randomwalk/sequential/SequentialFixture.java | 14 ++++++++++++++
.../server/test/randomwalk/shard/ShardFixture.java | 15 +++++++++++++++
5 files changed, 72 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/5c50e42b/src/server/src/main/java/org/apache/accumulo/server/test/randomwalk/State.java
----------------------------------------------------------------------
diff --git a/src/server/src/main/java/org/apache/accumulo/server/test/randomwalk/State.java b/src/server/src/main/java/org/apache/accumulo/server/test/randomwalk/State.java
index 344f3b3..f9bd84e 100644
--- a/src/server/src/main/java/org/apache/accumulo/server/test/randomwalk/State.java
+++ b/src/server/src/main/java/org/apache/accumulo/server/test/randomwalk/State.java
@@ -24,6 +24,7 @@ import java.util.Properties;
import org.apache.accumulo.core.client.Connector;
import org.apache.accumulo.core.client.Instance;
import org.apache.accumulo.core.client.MultiTableBatchWriter;
+import org.apache.accumulo.core.client.MutationsRejectedException;
import org.apache.accumulo.core.client.ZooKeeperInstance;
import org.apache.accumulo.server.client.HdfsZooInstance;
import org.apache.log4j.Logger;
@@ -115,6 +116,18 @@ public class State {
return mtbw;
}
+ public boolean isMultiTableBatchWriterInitialized() {
+ return mtbw != null;
+ }
+
+ public void resetMultiTableBatchWriter() {
+ if (!mtbw.isClosed()) {
+ log.warn("Setting non-closed MultiTableBatchWriter to null (leaking resources)");
+ }
+
+ mtbw = null;
+ }
+
public String getMapReduceJars() {
String acuHome = System.getenv("ACCUMULO_HOME");
http://git-wip-us.apache.org/repos/asf/accumulo/blob/5c50e42b/src/server/src/main/java/org/apache/accumulo/server/test/randomwalk/image/ImageFixture.java
----------------------------------------------------------------------
diff --git a/src/server/src/main/java/org/apache/accumulo/server/test/randomwalk/image/ImageFixture.java b/src/server/src/main/java/org/apache/accumulo/server/test/randomwalk/image/ImageFixture.java
index fe406e7..44741a2 100644
--- a/src/server/src/main/java/org/apache/accumulo/server/test/randomwalk/image/ImageFixture.java
+++ b/src/server/src/main/java/org/apache/accumulo/server/test/randomwalk/image/ImageFixture.java
@@ -27,6 +27,8 @@ import java.util.TreeSet;
import org.apache.accumulo.core.client.Connector;
import org.apache.accumulo.core.client.Instance;
+import org.apache.accumulo.core.client.MultiTableBatchWriter;
+import org.apache.accumulo.core.client.MutationsRejectedException;
import org.apache.accumulo.core.client.TableExistsException;
import org.apache.accumulo.core.client.impl.Tables;
import org.apache.accumulo.server.test.randomwalk.Fixture;
@@ -105,7 +107,20 @@ public class ImageFixture extends Fixture {
@Override
public void tearDown(State state) throws Exception {
-
+ // We have resources we need to clean up
+ if (state.isMultiTableBatchWriterInitialized()) {
+ MultiTableBatchWriter mtbw = state.getMultiTableBatchWriter();
+ try {
+ mtbw.close();
+ } catch (MutationsRejectedException e) {
+ log.error("Ignoring mutations that weren't flushed", e);
+ }
+
+ // Reset the MTBW on the state to null
+ state.resetMultiTableBatchWriter();
+ }
+
+ // Now we can safely delete the tables
log.debug("Dropping tables: " + imageTableName + " " + indexTableName);
Connector conn = state.getConnector();
http://git-wip-us.apache.org/repos/asf/accumulo/blob/5c50e42b/src/server/src/main/java/org/apache/accumulo/server/test/randomwalk/multitable/MultiTableFixture.java
----------------------------------------------------------------------
diff --git a/src/server/src/main/java/org/apache/accumulo/server/test/randomwalk/multitable/MultiTableFixture.java b/src/server/src/main/java/org/apache/accumulo/server/test/randomwalk/multitable/MultiTableFixture.java
index d7f65ae..55850f6 100644
--- a/src/server/src/main/java/org/apache/accumulo/server/test/randomwalk/multitable/MultiTableFixture.java
+++ b/src/server/src/main/java/org/apache/accumulo/server/test/randomwalk/multitable/MultiTableFixture.java
@@ -20,6 +20,8 @@ import java.net.InetAddress;
import java.util.ArrayList;
import org.apache.accumulo.core.client.Connector;
+import org.apache.accumulo.core.client.MultiTableBatchWriter;
+import org.apache.accumulo.core.client.MutationsRejectedException;
import org.apache.accumulo.core.client.TableNotFoundException;
import org.apache.accumulo.server.test.randomwalk.Fixture;
import org.apache.accumulo.server.test.randomwalk.State;
@@ -40,6 +42,18 @@ public class MultiTableFixture extends Fixture {
@Override
public void tearDown(State state) throws Exception {
+ // We have resources we need to clean up
+ if (state.isMultiTableBatchWriterInitialized()) {
+ MultiTableBatchWriter mtbw = state.getMultiTableBatchWriter();
+ try {
+ mtbw.close();
+ } catch (MutationsRejectedException e) {
+ log.error("Ignoring mutations that weren't flushed", e);
+ }
+
+ // Reset the MTBW on the state to null
+ state.resetMultiTableBatchWriter();
+ }
Connector conn = state.getConnector();
http://git-wip-us.apache.org/repos/asf/accumulo/blob/5c50e42b/src/server/src/main/java/org/apache/accumulo/server/test/randomwalk/sequential/SequentialFixture.java
----------------------------------------------------------------------
diff --git a/src/server/src/main/java/org/apache/accumulo/server/test/randomwalk/sequential/SequentialFixture.java b/src/server/src/main/java/org/apache/accumulo/server/test/randomwalk/sequential/SequentialFixture.java
index 5714893..dbc1aab 100644
--- a/src/server/src/main/java/org/apache/accumulo/server/test/randomwalk/sequential/SequentialFixture.java
+++ b/src/server/src/main/java/org/apache/accumulo/server/test/randomwalk/sequential/SequentialFixture.java
@@ -20,6 +20,8 @@ import java.net.InetAddress;
import org.apache.accumulo.core.client.Connector;
import org.apache.accumulo.core.client.Instance;
+import org.apache.accumulo.core.client.MultiTableBatchWriter;
+import org.apache.accumulo.core.client.MutationsRejectedException;
import org.apache.accumulo.core.client.TableExistsException;
import org.apache.accumulo.core.client.impl.Tables;
import org.apache.accumulo.server.test.randomwalk.Fixture;
@@ -55,6 +57,18 @@ public class SequentialFixture extends Fixture {
@Override
public void tearDown(State state) throws Exception {
+ // We have resources we need to clean up
+ if (state.isMultiTableBatchWriterInitialized()) {
+ MultiTableBatchWriter mtbw = state.getMultiTableBatchWriter();
+ try {
+ mtbw.close();
+ } catch (MutationsRejectedException e) {
+ log.error("Ignoring mutations that weren't flushed", e);
+ }
+
+ // Reset the MTBW on the state to null
+ state.resetMultiTableBatchWriter();
+ }
log.debug("Dropping tables: " + seqTableName);
http://git-wip-us.apache.org/repos/asf/accumulo/blob/5c50e42b/src/server/src/main/java/org/apache/accumulo/server/test/randomwalk/shard/ShardFixture.java
----------------------------------------------------------------------
diff --git a/src/server/src/main/java/org/apache/accumulo/server/test/randomwalk/shard/ShardFixture.java b/src/server/src/main/java/org/apache/accumulo/server/test/randomwalk/shard/ShardFixture.java
index b91c81c..a9f8ded 100644
--- a/src/server/src/main/java/org/apache/accumulo/server/test/randomwalk/shard/ShardFixture.java
+++ b/src/server/src/main/java/org/apache/accumulo/server/test/randomwalk/shard/ShardFixture.java
@@ -22,6 +22,8 @@ import java.util.SortedSet;
import java.util.TreeSet;
import org.apache.accumulo.core.client.Connector;
+import org.apache.accumulo.core.client.MultiTableBatchWriter;
+import org.apache.accumulo.core.client.MutationsRejectedException;
import org.apache.accumulo.core.conf.Property;
import org.apache.accumulo.server.test.randomwalk.Fixture;
import org.apache.accumulo.server.test.randomwalk.State;
@@ -94,6 +96,19 @@ public class ShardFixture extends Fixture {
@Override
public void tearDown(State state) throws Exception {
+ // We have resources we need to clean up
+ if (state.isMultiTableBatchWriterInitialized()) {
+ MultiTableBatchWriter mtbw = state.getMultiTableBatchWriter();
+ try {
+ mtbw.close();
+ } catch (MutationsRejectedException e) {
+ log.error("Ignoring mutations that weren't flushed", e);
+ }
+
+ // Reset the MTBW on the state to null
+ state.resetMultiTableBatchWriter();
+ }
+
Connector conn = state.getConnector();
conn.tableOperations().delete((String) state.get("indexTableName"));
[04/17] git commit: ACCUMULO-2182 Backport of ACCUMULO-1123 to 1.4.x
Posted by bh...@apache.org.
ACCUMULO-2182 Backport of ACCUMULO-1123 to 1.4.x
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/ed4c2273
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/ed4c2273
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/ed4c2273
Branch: refs/heads/master
Commit: ed4c2273f7fd34e27fbda1616321117b0561badf
Parents: 8e0e0e1
Author: Bill Havanki <bh...@cloudera.com>
Authored: Mon Jan 13 14:23:48 2014 -0500
Committer: Bill Havanki <bh...@cloudera.com>
Committed: Mon Jan 13 17:04:15 2014 -0500
----------------------------------------------------------------------
.../accumulo/server/test/randomwalk/State.java | 6 +++++-
.../test/randomwalk/security/ChangePass.java | 2 ++
.../test/randomwalk/security/CreateUser.java | 1 +
.../test/randomwalk/security/SecurityHelper.java | 10 ++++++++++
.../server/test/randomwalk/security/TableOp.java | 18 ++++++++++++++++--
5 files changed, 34 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/ed4c2273/src/server/src/main/java/org/apache/accumulo/server/test/randomwalk/State.java
----------------------------------------------------------------------
diff --git a/src/server/src/main/java/org/apache/accumulo/server/test/randomwalk/State.java b/src/server/src/main/java/org/apache/accumulo/server/test/randomwalk/State.java
index 1c73414..344f3b3 100644
--- a/src/server/src/main/java/org/apache/accumulo/server/test/randomwalk/State.java
+++ b/src/server/src/main/java/org/apache/accumulo/server/test/randomwalk/State.java
@@ -78,6 +78,10 @@ public class State {
public Integer getInteger(String key) {
return (Integer) stateMap.get(key);
}
+
+ public Long getLong(String key) {
+ return (Long) stateMap.get(key);
+ }
public String getProperty(String key) {
return props.getProperty(key);
@@ -150,4 +154,4 @@ public class State {
return retval;
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/accumulo/blob/ed4c2273/src/server/src/main/java/org/apache/accumulo/server/test/randomwalk/security/ChangePass.java
----------------------------------------------------------------------
diff --git a/src/server/src/main/java/org/apache/accumulo/server/test/randomwalk/security/ChangePass.java b/src/server/src/main/java/org/apache/accumulo/server/test/randomwalk/security/ChangePass.java
index 429c8cd..f9f0a7e 100644
--- a/src/server/src/main/java/org/apache/accumulo/server/test/randomwalk/security/ChangePass.java
+++ b/src/server/src/main/java/org/apache/accumulo/server/test/randomwalk/security/ChangePass.java
@@ -97,6 +97,8 @@ public class ChangePass extends Test {
SecurityHelper.setSysUserPass(state, newPass);
} else
SecurityHelper.setTabUserPass(state, newPass);
+ // Waiting 1 second for password to propogate through Zk
+ Thread.sleep(1000);
if (!hasPerm)
throw new AccumuloException("Password change succeeded when it should have failed.");
}
http://git-wip-us.apache.org/repos/asf/accumulo/blob/ed4c2273/src/server/src/main/java/org/apache/accumulo/server/test/randomwalk/security/CreateUser.java
----------------------------------------------------------------------
diff --git a/src/server/src/main/java/org/apache/accumulo/server/test/randomwalk/security/CreateUser.java b/src/server/src/main/java/org/apache/accumulo/server/test/randomwalk/security/CreateUser.java
index afefee8..fe6458f 100644
--- a/src/server/src/main/java/org/apache/accumulo/server/test/randomwalk/security/CreateUser.java
+++ b/src/server/src/main/java/org/apache/accumulo/server/test/randomwalk/security/CreateUser.java
@@ -67,6 +67,7 @@ public class CreateUser extends Test {
}
SecurityHelper.setTabUserPass(state, tabUserPass);
SecurityHelper.setTabUserExists(state, true);
+ Thread.sleep(1000);
if (!hasPermission)
throw new AccumuloException("Didn't get Security Exception when we should have");
}
http://git-wip-us.apache.org/repos/asf/accumulo/blob/ed4c2273/src/server/src/main/java/org/apache/accumulo/server/test/randomwalk/security/SecurityHelper.java
----------------------------------------------------------------------
diff --git a/src/server/src/main/java/org/apache/accumulo/server/test/randomwalk/security/SecurityHelper.java b/src/server/src/main/java/org/apache/accumulo/server/test/randomwalk/security/SecurityHelper.java
index 52a4672..c8d1ea0 100644
--- a/src/server/src/main/java/org/apache/accumulo/server/test/randomwalk/security/SecurityHelper.java
+++ b/src/server/src/main/java/org/apache/accumulo/server/test/randomwalk/security/SecurityHelper.java
@@ -140,8 +140,18 @@ public class SecurityHelper {
public static void setUserAuths(State state, String target, Authorizations auths) {
state.set(target + "_auths", auths);
+ state.set("Auths-" + target + '-' + "time", System.currentTimeMillis());
}
+ public static boolean ambiguousAuthorizations(State state, String target) {
+ Long setTime = state.getLong("Auths-" + target + '-' + "time");
+ if (setTime == null)
+ throw new RuntimeException("WTF? Auths-" + target + '-' + "time is null");
+ if (System.currentTimeMillis() < (setTime + 1000))
+ return true;
+ return false;
+ }
+
@SuppressWarnings("unchecked")
public static Map<String,Integer> getAuthsMap(State state) {
return (Map<String,Integer>) state.get(authsMap);
http://git-wip-us.apache.org/repos/asf/accumulo/blob/ed4c2273/src/server/src/main/java/org/apache/accumulo/server/test/randomwalk/security/TableOp.java
----------------------------------------------------------------------
diff --git a/src/server/src/main/java/org/apache/accumulo/server/test/randomwalk/security/TableOp.java b/src/server/src/main/java/org/apache/accumulo/server/test/randomwalk/security/TableOp.java
index e0b8deb..8d309b8 100644
--- a/src/server/src/main/java/org/apache/accumulo/server/test/randomwalk/security/TableOp.java
+++ b/src/server/src/main/java/org/apache/accumulo/server/test/randomwalk/security/TableOp.java
@@ -83,6 +83,7 @@ public class TableOp extends Test {
case READ:
Authorizations auths = SecurityHelper.getUserAuths(state, SecurityHelper.getTabUserName(state));
boolean canRead = SecurityHelper.getTabPerm(state, SecurityHelper.getTabUserName(state), TablePermission.READ);
+ boolean ambiguousAuths = SecurityHelper.ambiguousAuthorizations(state, SecurityHelper.getTabUserName(state));
try {
Scanner scan = conn.createScanner(tableName, conn.securityOperations().getUserAuthorizations(SecurityHelper.getTabUserName(state)));
int seen = 0;
@@ -91,7 +92,7 @@ public class TableOp extends Test {
Entry<Key,Value> entry = iter.next();
Key k = entry.getKey();
seen++;
- if (!auths.contains(k.getColumnVisibilityData()))
+ if (!auths.contains(k.getColumnVisibilityData()) && !ambiguousAuths)
throw new AccumuloException("Got data I should not be capable of seeing: " + k + " table " + tableName);
}
if (!canRead)
@@ -100,7 +101,7 @@ public class TableOp extends Test {
if (auths.contains(entry.getKey().getBytes()))
seen = seen - entry.getValue();
}
- if (seen != 0)
+ if (seen != 0 && !ambiguousAuths)
throw new AccumuloException("Got mismatched amounts of data");
} catch (TableNotFoundException tnfe) {
if (tableExists)
@@ -113,6 +114,12 @@ public class TableOp extends Test {
else
return;
}
+ if (ae.getErrorCode().equals(SecurityErrorCode.BAD_AUTHORIZATIONS)) {
+ if (ambiguousAuths)
+ return;
+ else
+ throw new AccumuloException("Mismatched authorizations! ", ae);
+ }
throw new AccumuloException("Unexpected exception!", ae);
} catch (RuntimeException re) {
if (re.getCause() instanceof AccumuloSecurityException
@@ -122,6 +129,13 @@ public class TableOp extends Test {
else
return;
}
+ if (re.getCause() instanceof AccumuloSecurityException
+ && ((AccumuloSecurityException) re.getCause()).getErrorCode().equals(SecurityErrorCode.BAD_AUTHORIZATIONS)) {
+ if (ambiguousAuths)
+ return;
+ else
+ throw new AccumuloException("Mismatched authorizations! ", re.getCause());
+ }
throw new AccumuloException("Unexpected exception!", re);
}
[10/17] git commit: ACCUMULO-2182 Backport ACCUMULO-2104 and
ACCUMULO-2106 to 1.5.x
Posted by bh...@apache.org.
ACCUMULO-2182 Backport ACCUMULO-2104 and ACCUMULO-2106 to 1.5.x
This commit is an adaption of the backport to 1.4.x, adapted due to files moving
between the releases.
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/a3eae058
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/a3eae058
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/a3eae058
Branch: refs/heads/1.5.1-SNAPSHOT
Commit: a3eae058d8fff13c768aa7ae1828cee617426878
Parents: 0603edb
Author: Bill Havanki <bh...@cloudera.com>
Authored: Tue Jan 14 15:43:53 2014 -0500
Committer: Bill Havanki <bh...@cloudera.com>
Committed: Tue Jan 14 15:43:53 2014 -0500
----------------------------------------------------------------------
.../org/apache/accumulo/test/randomwalk/State.java | 13 +++++++++++++
.../test/randomwalk/image/ImageFixture.java | 17 ++++++++++++++++-
.../randomwalk/multitable/MultiTableFixture.java | 14 ++++++++++++++
.../randomwalk/sequential/SequentialFixture.java | 14 ++++++++++++++
.../test/randomwalk/shard/ShardFixture.java | 15 +++++++++++++++
5 files changed, 72 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/a3eae058/test/src/main/java/org/apache/accumulo/test/randomwalk/State.java
----------------------------------------------------------------------
diff --git a/test/src/main/java/org/apache/accumulo/test/randomwalk/State.java b/test/src/main/java/org/apache/accumulo/test/randomwalk/State.java
index d31d88b..65d26c6 100644
--- a/test/src/main/java/org/apache/accumulo/test/randomwalk/State.java
+++ b/test/src/main/java/org/apache/accumulo/test/randomwalk/State.java
@@ -28,6 +28,7 @@ import org.apache.accumulo.core.client.BatchWriterConfig;
import org.apache.accumulo.core.client.Connector;
import org.apache.accumulo.core.client.Instance;
import org.apache.accumulo.core.client.MultiTableBatchWriter;
+import org.apache.accumulo.core.client.MutationsRejectedException;
import org.apache.accumulo.core.client.ZooKeeperInstance;
import org.apache.accumulo.core.client.security.tokens.AuthenticationToken;
import org.apache.accumulo.core.client.security.tokens.PasswordToken;
@@ -143,6 +144,18 @@ public class State {
return mtbw;
}
+ public boolean isMultiTableBatchWriterInitialized() {
+ return mtbw != null;
+ }
+
+ public void resetMultiTableBatchWriter() {
+ if (!mtbw.isClosed()) {
+ log.warn("Setting non-closed MultiTableBatchWriter to null (leaking resources)");
+ }
+
+ mtbw = null;
+ }
+
public String getMapReduceJars() {
String acuHome = System.getenv("ACCUMULO_HOME");
http://git-wip-us.apache.org/repos/asf/accumulo/blob/a3eae058/test/src/main/java/org/apache/accumulo/test/randomwalk/image/ImageFixture.java
----------------------------------------------------------------------
diff --git a/test/src/main/java/org/apache/accumulo/test/randomwalk/image/ImageFixture.java b/test/src/main/java/org/apache/accumulo/test/randomwalk/image/ImageFixture.java
index 5dc8928..86df45d 100644
--- a/test/src/main/java/org/apache/accumulo/test/randomwalk/image/ImageFixture.java
+++ b/test/src/main/java/org/apache/accumulo/test/randomwalk/image/ImageFixture.java
@@ -27,6 +27,8 @@ import java.util.TreeSet;
import org.apache.accumulo.core.client.Connector;
import org.apache.accumulo.core.client.Instance;
+import org.apache.accumulo.core.client.MultiTableBatchWriter;
+import org.apache.accumulo.core.client.MutationsRejectedException;
import org.apache.accumulo.core.client.TableExistsException;
import org.apache.accumulo.core.client.impl.Tables;
import org.apache.accumulo.test.randomwalk.Fixture;
@@ -105,7 +107,20 @@ public class ImageFixture extends Fixture {
@Override
public void tearDown(State state) throws Exception {
-
+ // We have resources we need to clean up
+ if (state.isMultiTableBatchWriterInitialized()) {
+ MultiTableBatchWriter mtbw = state.getMultiTableBatchWriter();
+ try {
+ mtbw.close();
+ } catch (MutationsRejectedException e) {
+ log.error("Ignoring mutations that weren't flushed", e);
+ }
+
+ // Reset the MTBW on the state to null
+ state.resetMultiTableBatchWriter();
+ }
+
+ // Now we can safely delete the tables
log.debug("Dropping tables: " + imageTableName + " " + indexTableName);
Connector conn = state.getConnector();
http://git-wip-us.apache.org/repos/asf/accumulo/blob/a3eae058/test/src/main/java/org/apache/accumulo/test/randomwalk/multitable/MultiTableFixture.java
----------------------------------------------------------------------
diff --git a/test/src/main/java/org/apache/accumulo/test/randomwalk/multitable/MultiTableFixture.java b/test/src/main/java/org/apache/accumulo/test/randomwalk/multitable/MultiTableFixture.java
index 01ebdd7..ee0fff6 100644
--- a/test/src/main/java/org/apache/accumulo/test/randomwalk/multitable/MultiTableFixture.java
+++ b/test/src/main/java/org/apache/accumulo/test/randomwalk/multitable/MultiTableFixture.java
@@ -20,6 +20,8 @@ import java.net.InetAddress;
import java.util.ArrayList;
import org.apache.accumulo.core.client.Connector;
+import org.apache.accumulo.core.client.MultiTableBatchWriter;
+import org.apache.accumulo.core.client.MutationsRejectedException;
import org.apache.accumulo.core.client.TableNotFoundException;
import org.apache.accumulo.test.randomwalk.Fixture;
import org.apache.accumulo.test.randomwalk.State;
@@ -40,6 +42,18 @@ public class MultiTableFixture extends Fixture {
@Override
public void tearDown(State state) throws Exception {
+ // We have resources we need to clean up
+ if (state.isMultiTableBatchWriterInitialized()) {
+ MultiTableBatchWriter mtbw = state.getMultiTableBatchWriter();
+ try {
+ mtbw.close();
+ } catch (MutationsRejectedException e) {
+ log.error("Ignoring mutations that weren't flushed", e);
+ }
+
+ // Reset the MTBW on the state to null
+ state.resetMultiTableBatchWriter();
+ }
Connector conn = state.getConnector();
http://git-wip-us.apache.org/repos/asf/accumulo/blob/a3eae058/test/src/main/java/org/apache/accumulo/test/randomwalk/sequential/SequentialFixture.java
----------------------------------------------------------------------
diff --git a/test/src/main/java/org/apache/accumulo/test/randomwalk/sequential/SequentialFixture.java b/test/src/main/java/org/apache/accumulo/test/randomwalk/sequential/SequentialFixture.java
index 2b89264..b7377b7 100644
--- a/test/src/main/java/org/apache/accumulo/test/randomwalk/sequential/SequentialFixture.java
+++ b/test/src/main/java/org/apache/accumulo/test/randomwalk/sequential/SequentialFixture.java
@@ -20,6 +20,8 @@ import java.net.InetAddress;
import org.apache.accumulo.core.client.Connector;
import org.apache.accumulo.core.client.Instance;
+import org.apache.accumulo.core.client.MultiTableBatchWriter;
+import org.apache.accumulo.core.client.MutationsRejectedException;
import org.apache.accumulo.core.client.TableExistsException;
import org.apache.accumulo.core.client.impl.Tables;
import org.apache.accumulo.test.randomwalk.Fixture;
@@ -55,6 +57,18 @@ public class SequentialFixture extends Fixture {
@Override
public void tearDown(State state) throws Exception {
+ // We have resources we need to clean up
+ if (state.isMultiTableBatchWriterInitialized()) {
+ MultiTableBatchWriter mtbw = state.getMultiTableBatchWriter();
+ try {
+ mtbw.close();
+ } catch (MutationsRejectedException e) {
+ log.error("Ignoring mutations that weren't flushed", e);
+ }
+
+ // Reset the MTBW on the state to null
+ state.resetMultiTableBatchWriter();
+ }
log.debug("Dropping tables: " + seqTableName);
http://git-wip-us.apache.org/repos/asf/accumulo/blob/a3eae058/test/src/main/java/org/apache/accumulo/test/randomwalk/shard/ShardFixture.java
----------------------------------------------------------------------
diff --git a/test/src/main/java/org/apache/accumulo/test/randomwalk/shard/ShardFixture.java b/test/src/main/java/org/apache/accumulo/test/randomwalk/shard/ShardFixture.java
index 8de30ae..97e33b4 100644
--- a/test/src/main/java/org/apache/accumulo/test/randomwalk/shard/ShardFixture.java
+++ b/test/src/main/java/org/apache/accumulo/test/randomwalk/shard/ShardFixture.java
@@ -22,6 +22,8 @@ import java.util.SortedSet;
import java.util.TreeSet;
import org.apache.accumulo.core.client.Connector;
+import org.apache.accumulo.core.client.MultiTableBatchWriter;
+import org.apache.accumulo.core.client.MutationsRejectedException;
import org.apache.accumulo.core.conf.Property;
import org.apache.accumulo.test.randomwalk.Fixture;
import org.apache.accumulo.test.randomwalk.State;
@@ -94,6 +96,19 @@ public class ShardFixture extends Fixture {
@Override
public void tearDown(State state) throws Exception {
+ // We have resources we need to clean up
+ if (state.isMultiTableBatchWriterInitialized()) {
+ MultiTableBatchWriter mtbw = state.getMultiTableBatchWriter();
+ try {
+ mtbw.close();
+ } catch (MutationsRejectedException e) {
+ log.error("Ignoring mutations that weren't flushed", e);
+ }
+
+ // Reset the MTBW on the state to null
+ state.resetMultiTableBatchWriter();
+ }
+
Connector conn = state.getConnector();
conn.tableOperations().delete((String) state.get("indexTableName"));
[08/17] git commit: ACCUMULO-2182 Backport of ACCUMULO-2104 and
ACCUMULO-2106 to 1.4.x
Posted by bh...@apache.org.
ACCUMULO-2182 Backport of ACCUMULO-2104 and ACCUMULO-2106 to 1.4.x
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/5c50e42b
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/5c50e42b
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/5c50e42b
Branch: refs/heads/master
Commit: 5c50e42be24bf58d3aa44e29baf491e26dfd8994
Parents: ed4c227
Author: Bill Havanki <bh...@cloudera.com>
Authored: Mon Jan 13 15:54:36 2014 -0500
Committer: Bill Havanki <bh...@cloudera.com>
Committed: Mon Jan 13 17:04:46 2014 -0500
----------------------------------------------------------------------
.../accumulo/server/test/randomwalk/State.java | 13 +++++++++++++
.../server/test/randomwalk/image/ImageFixture.java | 17 ++++++++++++++++-
.../randomwalk/multitable/MultiTableFixture.java | 14 ++++++++++++++
.../randomwalk/sequential/SequentialFixture.java | 14 ++++++++++++++
.../server/test/randomwalk/shard/ShardFixture.java | 15 +++++++++++++++
5 files changed, 72 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/5c50e42b/src/server/src/main/java/org/apache/accumulo/server/test/randomwalk/State.java
----------------------------------------------------------------------
diff --git a/src/server/src/main/java/org/apache/accumulo/server/test/randomwalk/State.java b/src/server/src/main/java/org/apache/accumulo/server/test/randomwalk/State.java
index 344f3b3..f9bd84e 100644
--- a/src/server/src/main/java/org/apache/accumulo/server/test/randomwalk/State.java
+++ b/src/server/src/main/java/org/apache/accumulo/server/test/randomwalk/State.java
@@ -24,6 +24,7 @@ import java.util.Properties;
import org.apache.accumulo.core.client.Connector;
import org.apache.accumulo.core.client.Instance;
import org.apache.accumulo.core.client.MultiTableBatchWriter;
+import org.apache.accumulo.core.client.MutationsRejectedException;
import org.apache.accumulo.core.client.ZooKeeperInstance;
import org.apache.accumulo.server.client.HdfsZooInstance;
import org.apache.log4j.Logger;
@@ -115,6 +116,18 @@ public class State {
return mtbw;
}
+ public boolean isMultiTableBatchWriterInitialized() {
+ return mtbw != null;
+ }
+
+ public void resetMultiTableBatchWriter() {
+ if (!mtbw.isClosed()) {
+ log.warn("Setting non-closed MultiTableBatchWriter to null (leaking resources)");
+ }
+
+ mtbw = null;
+ }
+
public String getMapReduceJars() {
String acuHome = System.getenv("ACCUMULO_HOME");
http://git-wip-us.apache.org/repos/asf/accumulo/blob/5c50e42b/src/server/src/main/java/org/apache/accumulo/server/test/randomwalk/image/ImageFixture.java
----------------------------------------------------------------------
diff --git a/src/server/src/main/java/org/apache/accumulo/server/test/randomwalk/image/ImageFixture.java b/src/server/src/main/java/org/apache/accumulo/server/test/randomwalk/image/ImageFixture.java
index fe406e7..44741a2 100644
--- a/src/server/src/main/java/org/apache/accumulo/server/test/randomwalk/image/ImageFixture.java
+++ b/src/server/src/main/java/org/apache/accumulo/server/test/randomwalk/image/ImageFixture.java
@@ -27,6 +27,8 @@ import java.util.TreeSet;
import org.apache.accumulo.core.client.Connector;
import org.apache.accumulo.core.client.Instance;
+import org.apache.accumulo.core.client.MultiTableBatchWriter;
+import org.apache.accumulo.core.client.MutationsRejectedException;
import org.apache.accumulo.core.client.TableExistsException;
import org.apache.accumulo.core.client.impl.Tables;
import org.apache.accumulo.server.test.randomwalk.Fixture;
@@ -105,7 +107,20 @@ public class ImageFixture extends Fixture {
@Override
public void tearDown(State state) throws Exception {
-
+ // We have resources we need to clean up
+ if (state.isMultiTableBatchWriterInitialized()) {
+ MultiTableBatchWriter mtbw = state.getMultiTableBatchWriter();
+ try {
+ mtbw.close();
+ } catch (MutationsRejectedException e) {
+ log.error("Ignoring mutations that weren't flushed", e);
+ }
+
+ // Reset the MTBW on the state to null
+ state.resetMultiTableBatchWriter();
+ }
+
+ // Now we can safely delete the tables
log.debug("Dropping tables: " + imageTableName + " " + indexTableName);
Connector conn = state.getConnector();
http://git-wip-us.apache.org/repos/asf/accumulo/blob/5c50e42b/src/server/src/main/java/org/apache/accumulo/server/test/randomwalk/multitable/MultiTableFixture.java
----------------------------------------------------------------------
diff --git a/src/server/src/main/java/org/apache/accumulo/server/test/randomwalk/multitable/MultiTableFixture.java b/src/server/src/main/java/org/apache/accumulo/server/test/randomwalk/multitable/MultiTableFixture.java
index d7f65ae..55850f6 100644
--- a/src/server/src/main/java/org/apache/accumulo/server/test/randomwalk/multitable/MultiTableFixture.java
+++ b/src/server/src/main/java/org/apache/accumulo/server/test/randomwalk/multitable/MultiTableFixture.java
@@ -20,6 +20,8 @@ import java.net.InetAddress;
import java.util.ArrayList;
import org.apache.accumulo.core.client.Connector;
+import org.apache.accumulo.core.client.MultiTableBatchWriter;
+import org.apache.accumulo.core.client.MutationsRejectedException;
import org.apache.accumulo.core.client.TableNotFoundException;
import org.apache.accumulo.server.test.randomwalk.Fixture;
import org.apache.accumulo.server.test.randomwalk.State;
@@ -40,6 +42,18 @@ public class MultiTableFixture extends Fixture {
@Override
public void tearDown(State state) throws Exception {
+ // We have resources we need to clean up
+ if (state.isMultiTableBatchWriterInitialized()) {
+ MultiTableBatchWriter mtbw = state.getMultiTableBatchWriter();
+ try {
+ mtbw.close();
+ } catch (MutationsRejectedException e) {
+ log.error("Ignoring mutations that weren't flushed", e);
+ }
+
+ // Reset the MTBW on the state to null
+ state.resetMultiTableBatchWriter();
+ }
Connector conn = state.getConnector();
http://git-wip-us.apache.org/repos/asf/accumulo/blob/5c50e42b/src/server/src/main/java/org/apache/accumulo/server/test/randomwalk/sequential/SequentialFixture.java
----------------------------------------------------------------------
diff --git a/src/server/src/main/java/org/apache/accumulo/server/test/randomwalk/sequential/SequentialFixture.java b/src/server/src/main/java/org/apache/accumulo/server/test/randomwalk/sequential/SequentialFixture.java
index 5714893..dbc1aab 100644
--- a/src/server/src/main/java/org/apache/accumulo/server/test/randomwalk/sequential/SequentialFixture.java
+++ b/src/server/src/main/java/org/apache/accumulo/server/test/randomwalk/sequential/SequentialFixture.java
@@ -20,6 +20,8 @@ import java.net.InetAddress;
import org.apache.accumulo.core.client.Connector;
import org.apache.accumulo.core.client.Instance;
+import org.apache.accumulo.core.client.MultiTableBatchWriter;
+import org.apache.accumulo.core.client.MutationsRejectedException;
import org.apache.accumulo.core.client.TableExistsException;
import org.apache.accumulo.core.client.impl.Tables;
import org.apache.accumulo.server.test.randomwalk.Fixture;
@@ -55,6 +57,18 @@ public class SequentialFixture extends Fixture {
@Override
public void tearDown(State state) throws Exception {
+ // We have resources we need to clean up
+ if (state.isMultiTableBatchWriterInitialized()) {
+ MultiTableBatchWriter mtbw = state.getMultiTableBatchWriter();
+ try {
+ mtbw.close();
+ } catch (MutationsRejectedException e) {
+ log.error("Ignoring mutations that weren't flushed", e);
+ }
+
+ // Reset the MTBW on the state to null
+ state.resetMultiTableBatchWriter();
+ }
log.debug("Dropping tables: " + seqTableName);
http://git-wip-us.apache.org/repos/asf/accumulo/blob/5c50e42b/src/server/src/main/java/org/apache/accumulo/server/test/randomwalk/shard/ShardFixture.java
----------------------------------------------------------------------
diff --git a/src/server/src/main/java/org/apache/accumulo/server/test/randomwalk/shard/ShardFixture.java b/src/server/src/main/java/org/apache/accumulo/server/test/randomwalk/shard/ShardFixture.java
index b91c81c..a9f8ded 100644
--- a/src/server/src/main/java/org/apache/accumulo/server/test/randomwalk/shard/ShardFixture.java
+++ b/src/server/src/main/java/org/apache/accumulo/server/test/randomwalk/shard/ShardFixture.java
@@ -22,6 +22,8 @@ import java.util.SortedSet;
import java.util.TreeSet;
import org.apache.accumulo.core.client.Connector;
+import org.apache.accumulo.core.client.MultiTableBatchWriter;
+import org.apache.accumulo.core.client.MutationsRejectedException;
import org.apache.accumulo.core.conf.Property;
import org.apache.accumulo.server.test.randomwalk.Fixture;
import org.apache.accumulo.server.test.randomwalk.State;
@@ -94,6 +96,19 @@ public class ShardFixture extends Fixture {
@Override
public void tearDown(State state) throws Exception {
+ // We have resources we need to clean up
+ if (state.isMultiTableBatchWriterInitialized()) {
+ MultiTableBatchWriter mtbw = state.getMultiTableBatchWriter();
+ try {
+ mtbw.close();
+ } catch (MutationsRejectedException e) {
+ log.error("Ignoring mutations that weren't flushed", e);
+ }
+
+ // Reset the MTBW on the state to null
+ state.resetMultiTableBatchWriter();
+ }
+
Connector conn = state.getConnector();
conn.tableOperations().delete((String) state.get("indexTableName"));
[09/17] git commit: ACCUMULO-2182 Backport ACCUMULO-2104 and
ACCUMULO-2106 to 1.5.x
Posted by bh...@apache.org.
ACCUMULO-2182 Backport ACCUMULO-2104 and ACCUMULO-2106 to 1.5.x
This commit is an adaption of the backport to 1.4.x, adapted due to files moving
between the releases.
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/a3eae058
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/a3eae058
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/a3eae058
Branch: refs/heads/master
Commit: a3eae058d8fff13c768aa7ae1828cee617426878
Parents: 0603edb
Author: Bill Havanki <bh...@cloudera.com>
Authored: Tue Jan 14 15:43:53 2014 -0500
Committer: Bill Havanki <bh...@cloudera.com>
Committed: Tue Jan 14 15:43:53 2014 -0500
----------------------------------------------------------------------
.../org/apache/accumulo/test/randomwalk/State.java | 13 +++++++++++++
.../test/randomwalk/image/ImageFixture.java | 17 ++++++++++++++++-
.../randomwalk/multitable/MultiTableFixture.java | 14 ++++++++++++++
.../randomwalk/sequential/SequentialFixture.java | 14 ++++++++++++++
.../test/randomwalk/shard/ShardFixture.java | 15 +++++++++++++++
5 files changed, 72 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/a3eae058/test/src/main/java/org/apache/accumulo/test/randomwalk/State.java
----------------------------------------------------------------------
diff --git a/test/src/main/java/org/apache/accumulo/test/randomwalk/State.java b/test/src/main/java/org/apache/accumulo/test/randomwalk/State.java
index d31d88b..65d26c6 100644
--- a/test/src/main/java/org/apache/accumulo/test/randomwalk/State.java
+++ b/test/src/main/java/org/apache/accumulo/test/randomwalk/State.java
@@ -28,6 +28,7 @@ import org.apache.accumulo.core.client.BatchWriterConfig;
import org.apache.accumulo.core.client.Connector;
import org.apache.accumulo.core.client.Instance;
import org.apache.accumulo.core.client.MultiTableBatchWriter;
+import org.apache.accumulo.core.client.MutationsRejectedException;
import org.apache.accumulo.core.client.ZooKeeperInstance;
import org.apache.accumulo.core.client.security.tokens.AuthenticationToken;
import org.apache.accumulo.core.client.security.tokens.PasswordToken;
@@ -143,6 +144,18 @@ public class State {
return mtbw;
}
+ public boolean isMultiTableBatchWriterInitialized() {
+ return mtbw != null;
+ }
+
+ public void resetMultiTableBatchWriter() {
+ if (!mtbw.isClosed()) {
+ log.warn("Setting non-closed MultiTableBatchWriter to null (leaking resources)");
+ }
+
+ mtbw = null;
+ }
+
public String getMapReduceJars() {
String acuHome = System.getenv("ACCUMULO_HOME");
http://git-wip-us.apache.org/repos/asf/accumulo/blob/a3eae058/test/src/main/java/org/apache/accumulo/test/randomwalk/image/ImageFixture.java
----------------------------------------------------------------------
diff --git a/test/src/main/java/org/apache/accumulo/test/randomwalk/image/ImageFixture.java b/test/src/main/java/org/apache/accumulo/test/randomwalk/image/ImageFixture.java
index 5dc8928..86df45d 100644
--- a/test/src/main/java/org/apache/accumulo/test/randomwalk/image/ImageFixture.java
+++ b/test/src/main/java/org/apache/accumulo/test/randomwalk/image/ImageFixture.java
@@ -27,6 +27,8 @@ import java.util.TreeSet;
import org.apache.accumulo.core.client.Connector;
import org.apache.accumulo.core.client.Instance;
+import org.apache.accumulo.core.client.MultiTableBatchWriter;
+import org.apache.accumulo.core.client.MutationsRejectedException;
import org.apache.accumulo.core.client.TableExistsException;
import org.apache.accumulo.core.client.impl.Tables;
import org.apache.accumulo.test.randomwalk.Fixture;
@@ -105,7 +107,20 @@ public class ImageFixture extends Fixture {
@Override
public void tearDown(State state) throws Exception {
-
+ // We have resources we need to clean up
+ if (state.isMultiTableBatchWriterInitialized()) {
+ MultiTableBatchWriter mtbw = state.getMultiTableBatchWriter();
+ try {
+ mtbw.close();
+ } catch (MutationsRejectedException e) {
+ log.error("Ignoring mutations that weren't flushed", e);
+ }
+
+ // Reset the MTBW on the state to null
+ state.resetMultiTableBatchWriter();
+ }
+
+ // Now we can safely delete the tables
log.debug("Dropping tables: " + imageTableName + " " + indexTableName);
Connector conn = state.getConnector();
http://git-wip-us.apache.org/repos/asf/accumulo/blob/a3eae058/test/src/main/java/org/apache/accumulo/test/randomwalk/multitable/MultiTableFixture.java
----------------------------------------------------------------------
diff --git a/test/src/main/java/org/apache/accumulo/test/randomwalk/multitable/MultiTableFixture.java b/test/src/main/java/org/apache/accumulo/test/randomwalk/multitable/MultiTableFixture.java
index 01ebdd7..ee0fff6 100644
--- a/test/src/main/java/org/apache/accumulo/test/randomwalk/multitable/MultiTableFixture.java
+++ b/test/src/main/java/org/apache/accumulo/test/randomwalk/multitable/MultiTableFixture.java
@@ -20,6 +20,8 @@ import java.net.InetAddress;
import java.util.ArrayList;
import org.apache.accumulo.core.client.Connector;
+import org.apache.accumulo.core.client.MultiTableBatchWriter;
+import org.apache.accumulo.core.client.MutationsRejectedException;
import org.apache.accumulo.core.client.TableNotFoundException;
import org.apache.accumulo.test.randomwalk.Fixture;
import org.apache.accumulo.test.randomwalk.State;
@@ -40,6 +42,18 @@ public class MultiTableFixture extends Fixture {
@Override
public void tearDown(State state) throws Exception {
+ // We have resources we need to clean up
+ if (state.isMultiTableBatchWriterInitialized()) {
+ MultiTableBatchWriter mtbw = state.getMultiTableBatchWriter();
+ try {
+ mtbw.close();
+ } catch (MutationsRejectedException e) {
+ log.error("Ignoring mutations that weren't flushed", e);
+ }
+
+ // Reset the MTBW on the state to null
+ state.resetMultiTableBatchWriter();
+ }
Connector conn = state.getConnector();
http://git-wip-us.apache.org/repos/asf/accumulo/blob/a3eae058/test/src/main/java/org/apache/accumulo/test/randomwalk/sequential/SequentialFixture.java
----------------------------------------------------------------------
diff --git a/test/src/main/java/org/apache/accumulo/test/randomwalk/sequential/SequentialFixture.java b/test/src/main/java/org/apache/accumulo/test/randomwalk/sequential/SequentialFixture.java
index 2b89264..b7377b7 100644
--- a/test/src/main/java/org/apache/accumulo/test/randomwalk/sequential/SequentialFixture.java
+++ b/test/src/main/java/org/apache/accumulo/test/randomwalk/sequential/SequentialFixture.java
@@ -20,6 +20,8 @@ import java.net.InetAddress;
import org.apache.accumulo.core.client.Connector;
import org.apache.accumulo.core.client.Instance;
+import org.apache.accumulo.core.client.MultiTableBatchWriter;
+import org.apache.accumulo.core.client.MutationsRejectedException;
import org.apache.accumulo.core.client.TableExistsException;
import org.apache.accumulo.core.client.impl.Tables;
import org.apache.accumulo.test.randomwalk.Fixture;
@@ -55,6 +57,18 @@ public class SequentialFixture extends Fixture {
@Override
public void tearDown(State state) throws Exception {
+ // We have resources we need to clean up
+ if (state.isMultiTableBatchWriterInitialized()) {
+ MultiTableBatchWriter mtbw = state.getMultiTableBatchWriter();
+ try {
+ mtbw.close();
+ } catch (MutationsRejectedException e) {
+ log.error("Ignoring mutations that weren't flushed", e);
+ }
+
+ // Reset the MTBW on the state to null
+ state.resetMultiTableBatchWriter();
+ }
log.debug("Dropping tables: " + seqTableName);
http://git-wip-us.apache.org/repos/asf/accumulo/blob/a3eae058/test/src/main/java/org/apache/accumulo/test/randomwalk/shard/ShardFixture.java
----------------------------------------------------------------------
diff --git a/test/src/main/java/org/apache/accumulo/test/randomwalk/shard/ShardFixture.java b/test/src/main/java/org/apache/accumulo/test/randomwalk/shard/ShardFixture.java
index 8de30ae..97e33b4 100644
--- a/test/src/main/java/org/apache/accumulo/test/randomwalk/shard/ShardFixture.java
+++ b/test/src/main/java/org/apache/accumulo/test/randomwalk/shard/ShardFixture.java
@@ -22,6 +22,8 @@ import java.util.SortedSet;
import java.util.TreeSet;
import org.apache.accumulo.core.client.Connector;
+import org.apache.accumulo.core.client.MultiTableBatchWriter;
+import org.apache.accumulo.core.client.MutationsRejectedException;
import org.apache.accumulo.core.conf.Property;
import org.apache.accumulo.test.randomwalk.Fixture;
import org.apache.accumulo.test.randomwalk.State;
@@ -94,6 +96,19 @@ public class ShardFixture extends Fixture {
@Override
public void tearDown(State state) throws Exception {
+ // We have resources we need to clean up
+ if (state.isMultiTableBatchWriterInitialized()) {
+ MultiTableBatchWriter mtbw = state.getMultiTableBatchWriter();
+ try {
+ mtbw.close();
+ } catch (MutationsRejectedException e) {
+ log.error("Ignoring mutations that weren't flushed", e);
+ }
+
+ // Reset the MTBW on the state to null
+ state.resetMultiTableBatchWriter();
+ }
+
Connector conn = state.getConnector();
conn.tableOperations().delete((String) state.get("indexTableName"));
[14/17] git commit: Merge branch '1.4.5-SNAPSHOT' into 1.5.1-SNAPSHOT
Posted by bh...@apache.org.
Merge branch '1.4.5-SNAPSHOT' into 1.5.1-SNAPSHOT
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/ea41264a
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/ea41264a
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/ea41264a
Branch: refs/heads/1.6.0-SNAPSHOT
Commit: ea41264a6648933b265148d6b6032369c88e8627
Parents: a3eae05 5c50e42
Author: Bill Havanki <bh...@cloudera.com>
Authored: Tue Jan 14 15:46:08 2014 -0500
Committer: Bill Havanki <bh...@cloudera.com>
Committed: Tue Jan 14 15:46:08 2014 -0500
----------------------------------------------------------------------
----------------------------------------------------------------------
[11/17] git commit: ACCUMULO-2182 Backport ACCUMULO-2104 and
ACCUMULO-2106 to 1.5.x
Posted by bh...@apache.org.
ACCUMULO-2182 Backport ACCUMULO-2104 and ACCUMULO-2106 to 1.5.x
This commit is an adaption of the backport to 1.4.x, adapted due to files moving
between the releases.
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/a3eae058
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/a3eae058
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/a3eae058
Branch: refs/heads/1.6.0-SNAPSHOT
Commit: a3eae058d8fff13c768aa7ae1828cee617426878
Parents: 0603edb
Author: Bill Havanki <bh...@cloudera.com>
Authored: Tue Jan 14 15:43:53 2014 -0500
Committer: Bill Havanki <bh...@cloudera.com>
Committed: Tue Jan 14 15:43:53 2014 -0500
----------------------------------------------------------------------
.../org/apache/accumulo/test/randomwalk/State.java | 13 +++++++++++++
.../test/randomwalk/image/ImageFixture.java | 17 ++++++++++++++++-
.../randomwalk/multitable/MultiTableFixture.java | 14 ++++++++++++++
.../randomwalk/sequential/SequentialFixture.java | 14 ++++++++++++++
.../test/randomwalk/shard/ShardFixture.java | 15 +++++++++++++++
5 files changed, 72 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/a3eae058/test/src/main/java/org/apache/accumulo/test/randomwalk/State.java
----------------------------------------------------------------------
diff --git a/test/src/main/java/org/apache/accumulo/test/randomwalk/State.java b/test/src/main/java/org/apache/accumulo/test/randomwalk/State.java
index d31d88b..65d26c6 100644
--- a/test/src/main/java/org/apache/accumulo/test/randomwalk/State.java
+++ b/test/src/main/java/org/apache/accumulo/test/randomwalk/State.java
@@ -28,6 +28,7 @@ import org.apache.accumulo.core.client.BatchWriterConfig;
import org.apache.accumulo.core.client.Connector;
import org.apache.accumulo.core.client.Instance;
import org.apache.accumulo.core.client.MultiTableBatchWriter;
+import org.apache.accumulo.core.client.MutationsRejectedException;
import org.apache.accumulo.core.client.ZooKeeperInstance;
import org.apache.accumulo.core.client.security.tokens.AuthenticationToken;
import org.apache.accumulo.core.client.security.tokens.PasswordToken;
@@ -143,6 +144,18 @@ public class State {
return mtbw;
}
+ public boolean isMultiTableBatchWriterInitialized() {
+ return mtbw != null;
+ }
+
+ public void resetMultiTableBatchWriter() {
+ if (!mtbw.isClosed()) {
+ log.warn("Setting non-closed MultiTableBatchWriter to null (leaking resources)");
+ }
+
+ mtbw = null;
+ }
+
public String getMapReduceJars() {
String acuHome = System.getenv("ACCUMULO_HOME");
http://git-wip-us.apache.org/repos/asf/accumulo/blob/a3eae058/test/src/main/java/org/apache/accumulo/test/randomwalk/image/ImageFixture.java
----------------------------------------------------------------------
diff --git a/test/src/main/java/org/apache/accumulo/test/randomwalk/image/ImageFixture.java b/test/src/main/java/org/apache/accumulo/test/randomwalk/image/ImageFixture.java
index 5dc8928..86df45d 100644
--- a/test/src/main/java/org/apache/accumulo/test/randomwalk/image/ImageFixture.java
+++ b/test/src/main/java/org/apache/accumulo/test/randomwalk/image/ImageFixture.java
@@ -27,6 +27,8 @@ import java.util.TreeSet;
import org.apache.accumulo.core.client.Connector;
import org.apache.accumulo.core.client.Instance;
+import org.apache.accumulo.core.client.MultiTableBatchWriter;
+import org.apache.accumulo.core.client.MutationsRejectedException;
import org.apache.accumulo.core.client.TableExistsException;
import org.apache.accumulo.core.client.impl.Tables;
import org.apache.accumulo.test.randomwalk.Fixture;
@@ -105,7 +107,20 @@ public class ImageFixture extends Fixture {
@Override
public void tearDown(State state) throws Exception {
-
+ // We have resources we need to clean up
+ if (state.isMultiTableBatchWriterInitialized()) {
+ MultiTableBatchWriter mtbw = state.getMultiTableBatchWriter();
+ try {
+ mtbw.close();
+ } catch (MutationsRejectedException e) {
+ log.error("Ignoring mutations that weren't flushed", e);
+ }
+
+ // Reset the MTBW on the state to null
+ state.resetMultiTableBatchWriter();
+ }
+
+ // Now we can safely delete the tables
log.debug("Dropping tables: " + imageTableName + " " + indexTableName);
Connector conn = state.getConnector();
http://git-wip-us.apache.org/repos/asf/accumulo/blob/a3eae058/test/src/main/java/org/apache/accumulo/test/randomwalk/multitable/MultiTableFixture.java
----------------------------------------------------------------------
diff --git a/test/src/main/java/org/apache/accumulo/test/randomwalk/multitable/MultiTableFixture.java b/test/src/main/java/org/apache/accumulo/test/randomwalk/multitable/MultiTableFixture.java
index 01ebdd7..ee0fff6 100644
--- a/test/src/main/java/org/apache/accumulo/test/randomwalk/multitable/MultiTableFixture.java
+++ b/test/src/main/java/org/apache/accumulo/test/randomwalk/multitable/MultiTableFixture.java
@@ -20,6 +20,8 @@ import java.net.InetAddress;
import java.util.ArrayList;
import org.apache.accumulo.core.client.Connector;
+import org.apache.accumulo.core.client.MultiTableBatchWriter;
+import org.apache.accumulo.core.client.MutationsRejectedException;
import org.apache.accumulo.core.client.TableNotFoundException;
import org.apache.accumulo.test.randomwalk.Fixture;
import org.apache.accumulo.test.randomwalk.State;
@@ -40,6 +42,18 @@ public class MultiTableFixture extends Fixture {
@Override
public void tearDown(State state) throws Exception {
+ // We have resources we need to clean up
+ if (state.isMultiTableBatchWriterInitialized()) {
+ MultiTableBatchWriter mtbw = state.getMultiTableBatchWriter();
+ try {
+ mtbw.close();
+ } catch (MutationsRejectedException e) {
+ log.error("Ignoring mutations that weren't flushed", e);
+ }
+
+ // Reset the MTBW on the state to null
+ state.resetMultiTableBatchWriter();
+ }
Connector conn = state.getConnector();
http://git-wip-us.apache.org/repos/asf/accumulo/blob/a3eae058/test/src/main/java/org/apache/accumulo/test/randomwalk/sequential/SequentialFixture.java
----------------------------------------------------------------------
diff --git a/test/src/main/java/org/apache/accumulo/test/randomwalk/sequential/SequentialFixture.java b/test/src/main/java/org/apache/accumulo/test/randomwalk/sequential/SequentialFixture.java
index 2b89264..b7377b7 100644
--- a/test/src/main/java/org/apache/accumulo/test/randomwalk/sequential/SequentialFixture.java
+++ b/test/src/main/java/org/apache/accumulo/test/randomwalk/sequential/SequentialFixture.java
@@ -20,6 +20,8 @@ import java.net.InetAddress;
import org.apache.accumulo.core.client.Connector;
import org.apache.accumulo.core.client.Instance;
+import org.apache.accumulo.core.client.MultiTableBatchWriter;
+import org.apache.accumulo.core.client.MutationsRejectedException;
import org.apache.accumulo.core.client.TableExistsException;
import org.apache.accumulo.core.client.impl.Tables;
import org.apache.accumulo.test.randomwalk.Fixture;
@@ -55,6 +57,18 @@ public class SequentialFixture extends Fixture {
@Override
public void tearDown(State state) throws Exception {
+ // We have resources we need to clean up
+ if (state.isMultiTableBatchWriterInitialized()) {
+ MultiTableBatchWriter mtbw = state.getMultiTableBatchWriter();
+ try {
+ mtbw.close();
+ } catch (MutationsRejectedException e) {
+ log.error("Ignoring mutations that weren't flushed", e);
+ }
+
+ // Reset the MTBW on the state to null
+ state.resetMultiTableBatchWriter();
+ }
log.debug("Dropping tables: " + seqTableName);
http://git-wip-us.apache.org/repos/asf/accumulo/blob/a3eae058/test/src/main/java/org/apache/accumulo/test/randomwalk/shard/ShardFixture.java
----------------------------------------------------------------------
diff --git a/test/src/main/java/org/apache/accumulo/test/randomwalk/shard/ShardFixture.java b/test/src/main/java/org/apache/accumulo/test/randomwalk/shard/ShardFixture.java
index 8de30ae..97e33b4 100644
--- a/test/src/main/java/org/apache/accumulo/test/randomwalk/shard/ShardFixture.java
+++ b/test/src/main/java/org/apache/accumulo/test/randomwalk/shard/ShardFixture.java
@@ -22,6 +22,8 @@ import java.util.SortedSet;
import java.util.TreeSet;
import org.apache.accumulo.core.client.Connector;
+import org.apache.accumulo.core.client.MultiTableBatchWriter;
+import org.apache.accumulo.core.client.MutationsRejectedException;
import org.apache.accumulo.core.conf.Property;
import org.apache.accumulo.test.randomwalk.Fixture;
import org.apache.accumulo.test.randomwalk.State;
@@ -94,6 +96,19 @@ public class ShardFixture extends Fixture {
@Override
public void tearDown(State state) throws Exception {
+ // We have resources we need to clean up
+ if (state.isMultiTableBatchWriterInitialized()) {
+ MultiTableBatchWriter mtbw = state.getMultiTableBatchWriter();
+ try {
+ mtbw.close();
+ } catch (MutationsRejectedException e) {
+ log.error("Ignoring mutations that weren't flushed", e);
+ }
+
+ // Reset the MTBW on the state to null
+ state.resetMultiTableBatchWriter();
+ }
+
Connector conn = state.getConnector();
conn.tableOperations().delete((String) state.get("indexTableName"));
[17/17] git commit: Merge branch '1.6.0-SNAPSHOT'
Posted by bh...@apache.org.
Merge branch '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/e1ed7a44
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/e1ed7a44
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/e1ed7a44
Branch: refs/heads/master
Commit: e1ed7a44a74ab8e6dbd3eb7644ac61df520deec9
Parents: 398610d 1496c5f
Author: Bill Havanki <bh...@cloudera.com>
Authored: Tue Jan 14 15:47:53 2014 -0500
Committer: Bill Havanki <bh...@cloudera.com>
Committed: Tue Jan 14 15:47:53 2014 -0500
----------------------------------------------------------------------
----------------------------------------------------------------------
[05/17] git commit: ACCUMULO-2182 Backport of ACCUMULO-2104 and
ACCUMULO-2106 to 1.4.x
Posted by bh...@apache.org.
ACCUMULO-2182 Backport of ACCUMULO-2104 and ACCUMULO-2106 to 1.4.x
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/5c50e42b
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/5c50e42b
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/5c50e42b
Branch: refs/heads/1.4.5-SNAPSHOT
Commit: 5c50e42be24bf58d3aa44e29baf491e26dfd8994
Parents: ed4c227
Author: Bill Havanki <bh...@cloudera.com>
Authored: Mon Jan 13 15:54:36 2014 -0500
Committer: Bill Havanki <bh...@cloudera.com>
Committed: Mon Jan 13 17:04:46 2014 -0500
----------------------------------------------------------------------
.../accumulo/server/test/randomwalk/State.java | 13 +++++++++++++
.../server/test/randomwalk/image/ImageFixture.java | 17 ++++++++++++++++-
.../randomwalk/multitable/MultiTableFixture.java | 14 ++++++++++++++
.../randomwalk/sequential/SequentialFixture.java | 14 ++++++++++++++
.../server/test/randomwalk/shard/ShardFixture.java | 15 +++++++++++++++
5 files changed, 72 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/5c50e42b/src/server/src/main/java/org/apache/accumulo/server/test/randomwalk/State.java
----------------------------------------------------------------------
diff --git a/src/server/src/main/java/org/apache/accumulo/server/test/randomwalk/State.java b/src/server/src/main/java/org/apache/accumulo/server/test/randomwalk/State.java
index 344f3b3..f9bd84e 100644
--- a/src/server/src/main/java/org/apache/accumulo/server/test/randomwalk/State.java
+++ b/src/server/src/main/java/org/apache/accumulo/server/test/randomwalk/State.java
@@ -24,6 +24,7 @@ import java.util.Properties;
import org.apache.accumulo.core.client.Connector;
import org.apache.accumulo.core.client.Instance;
import org.apache.accumulo.core.client.MultiTableBatchWriter;
+import org.apache.accumulo.core.client.MutationsRejectedException;
import org.apache.accumulo.core.client.ZooKeeperInstance;
import org.apache.accumulo.server.client.HdfsZooInstance;
import org.apache.log4j.Logger;
@@ -115,6 +116,18 @@ public class State {
return mtbw;
}
+ public boolean isMultiTableBatchWriterInitialized() {
+ return mtbw != null;
+ }
+
+ public void resetMultiTableBatchWriter() {
+ if (!mtbw.isClosed()) {
+ log.warn("Setting non-closed MultiTableBatchWriter to null (leaking resources)");
+ }
+
+ mtbw = null;
+ }
+
public String getMapReduceJars() {
String acuHome = System.getenv("ACCUMULO_HOME");
http://git-wip-us.apache.org/repos/asf/accumulo/blob/5c50e42b/src/server/src/main/java/org/apache/accumulo/server/test/randomwalk/image/ImageFixture.java
----------------------------------------------------------------------
diff --git a/src/server/src/main/java/org/apache/accumulo/server/test/randomwalk/image/ImageFixture.java b/src/server/src/main/java/org/apache/accumulo/server/test/randomwalk/image/ImageFixture.java
index fe406e7..44741a2 100644
--- a/src/server/src/main/java/org/apache/accumulo/server/test/randomwalk/image/ImageFixture.java
+++ b/src/server/src/main/java/org/apache/accumulo/server/test/randomwalk/image/ImageFixture.java
@@ -27,6 +27,8 @@ import java.util.TreeSet;
import org.apache.accumulo.core.client.Connector;
import org.apache.accumulo.core.client.Instance;
+import org.apache.accumulo.core.client.MultiTableBatchWriter;
+import org.apache.accumulo.core.client.MutationsRejectedException;
import org.apache.accumulo.core.client.TableExistsException;
import org.apache.accumulo.core.client.impl.Tables;
import org.apache.accumulo.server.test.randomwalk.Fixture;
@@ -105,7 +107,20 @@ public class ImageFixture extends Fixture {
@Override
public void tearDown(State state) throws Exception {
-
+ // We have resources we need to clean up
+ if (state.isMultiTableBatchWriterInitialized()) {
+ MultiTableBatchWriter mtbw = state.getMultiTableBatchWriter();
+ try {
+ mtbw.close();
+ } catch (MutationsRejectedException e) {
+ log.error("Ignoring mutations that weren't flushed", e);
+ }
+
+ // Reset the MTBW on the state to null
+ state.resetMultiTableBatchWriter();
+ }
+
+ // Now we can safely delete the tables
log.debug("Dropping tables: " + imageTableName + " " + indexTableName);
Connector conn = state.getConnector();
http://git-wip-us.apache.org/repos/asf/accumulo/blob/5c50e42b/src/server/src/main/java/org/apache/accumulo/server/test/randomwalk/multitable/MultiTableFixture.java
----------------------------------------------------------------------
diff --git a/src/server/src/main/java/org/apache/accumulo/server/test/randomwalk/multitable/MultiTableFixture.java b/src/server/src/main/java/org/apache/accumulo/server/test/randomwalk/multitable/MultiTableFixture.java
index d7f65ae..55850f6 100644
--- a/src/server/src/main/java/org/apache/accumulo/server/test/randomwalk/multitable/MultiTableFixture.java
+++ b/src/server/src/main/java/org/apache/accumulo/server/test/randomwalk/multitable/MultiTableFixture.java
@@ -20,6 +20,8 @@ import java.net.InetAddress;
import java.util.ArrayList;
import org.apache.accumulo.core.client.Connector;
+import org.apache.accumulo.core.client.MultiTableBatchWriter;
+import org.apache.accumulo.core.client.MutationsRejectedException;
import org.apache.accumulo.core.client.TableNotFoundException;
import org.apache.accumulo.server.test.randomwalk.Fixture;
import org.apache.accumulo.server.test.randomwalk.State;
@@ -40,6 +42,18 @@ public class MultiTableFixture extends Fixture {
@Override
public void tearDown(State state) throws Exception {
+ // We have resources we need to clean up
+ if (state.isMultiTableBatchWriterInitialized()) {
+ MultiTableBatchWriter mtbw = state.getMultiTableBatchWriter();
+ try {
+ mtbw.close();
+ } catch (MutationsRejectedException e) {
+ log.error("Ignoring mutations that weren't flushed", e);
+ }
+
+ // Reset the MTBW on the state to null
+ state.resetMultiTableBatchWriter();
+ }
Connector conn = state.getConnector();
http://git-wip-us.apache.org/repos/asf/accumulo/blob/5c50e42b/src/server/src/main/java/org/apache/accumulo/server/test/randomwalk/sequential/SequentialFixture.java
----------------------------------------------------------------------
diff --git a/src/server/src/main/java/org/apache/accumulo/server/test/randomwalk/sequential/SequentialFixture.java b/src/server/src/main/java/org/apache/accumulo/server/test/randomwalk/sequential/SequentialFixture.java
index 5714893..dbc1aab 100644
--- a/src/server/src/main/java/org/apache/accumulo/server/test/randomwalk/sequential/SequentialFixture.java
+++ b/src/server/src/main/java/org/apache/accumulo/server/test/randomwalk/sequential/SequentialFixture.java
@@ -20,6 +20,8 @@ import java.net.InetAddress;
import org.apache.accumulo.core.client.Connector;
import org.apache.accumulo.core.client.Instance;
+import org.apache.accumulo.core.client.MultiTableBatchWriter;
+import org.apache.accumulo.core.client.MutationsRejectedException;
import org.apache.accumulo.core.client.TableExistsException;
import org.apache.accumulo.core.client.impl.Tables;
import org.apache.accumulo.server.test.randomwalk.Fixture;
@@ -55,6 +57,18 @@ public class SequentialFixture extends Fixture {
@Override
public void tearDown(State state) throws Exception {
+ // We have resources we need to clean up
+ if (state.isMultiTableBatchWriterInitialized()) {
+ MultiTableBatchWriter mtbw = state.getMultiTableBatchWriter();
+ try {
+ mtbw.close();
+ } catch (MutationsRejectedException e) {
+ log.error("Ignoring mutations that weren't flushed", e);
+ }
+
+ // Reset the MTBW on the state to null
+ state.resetMultiTableBatchWriter();
+ }
log.debug("Dropping tables: " + seqTableName);
http://git-wip-us.apache.org/repos/asf/accumulo/blob/5c50e42b/src/server/src/main/java/org/apache/accumulo/server/test/randomwalk/shard/ShardFixture.java
----------------------------------------------------------------------
diff --git a/src/server/src/main/java/org/apache/accumulo/server/test/randomwalk/shard/ShardFixture.java b/src/server/src/main/java/org/apache/accumulo/server/test/randomwalk/shard/ShardFixture.java
index b91c81c..a9f8ded 100644
--- a/src/server/src/main/java/org/apache/accumulo/server/test/randomwalk/shard/ShardFixture.java
+++ b/src/server/src/main/java/org/apache/accumulo/server/test/randomwalk/shard/ShardFixture.java
@@ -22,6 +22,8 @@ import java.util.SortedSet;
import java.util.TreeSet;
import org.apache.accumulo.core.client.Connector;
+import org.apache.accumulo.core.client.MultiTableBatchWriter;
+import org.apache.accumulo.core.client.MutationsRejectedException;
import org.apache.accumulo.core.conf.Property;
import org.apache.accumulo.server.test.randomwalk.Fixture;
import org.apache.accumulo.server.test.randomwalk.State;
@@ -94,6 +96,19 @@ public class ShardFixture extends Fixture {
@Override
public void tearDown(State state) throws Exception {
+ // We have resources we need to clean up
+ if (state.isMultiTableBatchWriterInitialized()) {
+ MultiTableBatchWriter mtbw = state.getMultiTableBatchWriter();
+ try {
+ mtbw.close();
+ } catch (MutationsRejectedException e) {
+ log.error("Ignoring mutations that weren't flushed", e);
+ }
+
+ // Reset the MTBW on the state to null
+ state.resetMultiTableBatchWriter();
+ }
+
Connector conn = state.getConnector();
conn.tableOperations().delete((String) state.get("indexTableName"));
[13/17] git commit: Merge branch '1.4.5-SNAPSHOT' into 1.5.1-SNAPSHOT
Posted by bh...@apache.org.
Merge branch '1.4.5-SNAPSHOT' into 1.5.1-SNAPSHOT
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/ea41264a
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/ea41264a
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/ea41264a
Branch: refs/heads/master
Commit: ea41264a6648933b265148d6b6032369c88e8627
Parents: a3eae05 5c50e42
Author: Bill Havanki <bh...@cloudera.com>
Authored: Tue Jan 14 15:46:08 2014 -0500
Committer: Bill Havanki <bh...@cloudera.com>
Committed: Tue Jan 14 15:46:08 2014 -0500
----------------------------------------------------------------------
----------------------------------------------------------------------
[12/17] git commit: Merge branch '1.4.5-SNAPSHOT' into 1.5.1-SNAPSHOT
Posted by bh...@apache.org.
Merge branch '1.4.5-SNAPSHOT' into 1.5.1-SNAPSHOT
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/ea41264a
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/ea41264a
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/ea41264a
Branch: refs/heads/1.5.1-SNAPSHOT
Commit: ea41264a6648933b265148d6b6032369c88e8627
Parents: a3eae05 5c50e42
Author: Bill Havanki <bh...@cloudera.com>
Authored: Tue Jan 14 15:46:08 2014 -0500
Committer: Bill Havanki <bh...@cloudera.com>
Committed: Tue Jan 14 15:46:08 2014 -0500
----------------------------------------------------------------------
----------------------------------------------------------------------
[02/17] git commit: ACCUMULO-2182 Backport of ACCUMULO-1123 to 1.4.x
Posted by bh...@apache.org.
ACCUMULO-2182 Backport of ACCUMULO-1123 to 1.4.x
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/ed4c2273
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/ed4c2273
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/ed4c2273
Branch: refs/heads/1.5.1-SNAPSHOT
Commit: ed4c2273f7fd34e27fbda1616321117b0561badf
Parents: 8e0e0e1
Author: Bill Havanki <bh...@cloudera.com>
Authored: Mon Jan 13 14:23:48 2014 -0500
Committer: Bill Havanki <bh...@cloudera.com>
Committed: Mon Jan 13 17:04:15 2014 -0500
----------------------------------------------------------------------
.../accumulo/server/test/randomwalk/State.java | 6 +++++-
.../test/randomwalk/security/ChangePass.java | 2 ++
.../test/randomwalk/security/CreateUser.java | 1 +
.../test/randomwalk/security/SecurityHelper.java | 10 ++++++++++
.../server/test/randomwalk/security/TableOp.java | 18 ++++++++++++++++--
5 files changed, 34 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/ed4c2273/src/server/src/main/java/org/apache/accumulo/server/test/randomwalk/State.java
----------------------------------------------------------------------
diff --git a/src/server/src/main/java/org/apache/accumulo/server/test/randomwalk/State.java b/src/server/src/main/java/org/apache/accumulo/server/test/randomwalk/State.java
index 1c73414..344f3b3 100644
--- a/src/server/src/main/java/org/apache/accumulo/server/test/randomwalk/State.java
+++ b/src/server/src/main/java/org/apache/accumulo/server/test/randomwalk/State.java
@@ -78,6 +78,10 @@ public class State {
public Integer getInteger(String key) {
return (Integer) stateMap.get(key);
}
+
+ public Long getLong(String key) {
+ return (Long) stateMap.get(key);
+ }
public String getProperty(String key) {
return props.getProperty(key);
@@ -150,4 +154,4 @@ public class State {
return retval;
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/accumulo/blob/ed4c2273/src/server/src/main/java/org/apache/accumulo/server/test/randomwalk/security/ChangePass.java
----------------------------------------------------------------------
diff --git a/src/server/src/main/java/org/apache/accumulo/server/test/randomwalk/security/ChangePass.java b/src/server/src/main/java/org/apache/accumulo/server/test/randomwalk/security/ChangePass.java
index 429c8cd..f9f0a7e 100644
--- a/src/server/src/main/java/org/apache/accumulo/server/test/randomwalk/security/ChangePass.java
+++ b/src/server/src/main/java/org/apache/accumulo/server/test/randomwalk/security/ChangePass.java
@@ -97,6 +97,8 @@ public class ChangePass extends Test {
SecurityHelper.setSysUserPass(state, newPass);
} else
SecurityHelper.setTabUserPass(state, newPass);
+ // Waiting 1 second for password to propogate through Zk
+ Thread.sleep(1000);
if (!hasPerm)
throw new AccumuloException("Password change succeeded when it should have failed.");
}
http://git-wip-us.apache.org/repos/asf/accumulo/blob/ed4c2273/src/server/src/main/java/org/apache/accumulo/server/test/randomwalk/security/CreateUser.java
----------------------------------------------------------------------
diff --git a/src/server/src/main/java/org/apache/accumulo/server/test/randomwalk/security/CreateUser.java b/src/server/src/main/java/org/apache/accumulo/server/test/randomwalk/security/CreateUser.java
index afefee8..fe6458f 100644
--- a/src/server/src/main/java/org/apache/accumulo/server/test/randomwalk/security/CreateUser.java
+++ b/src/server/src/main/java/org/apache/accumulo/server/test/randomwalk/security/CreateUser.java
@@ -67,6 +67,7 @@ public class CreateUser extends Test {
}
SecurityHelper.setTabUserPass(state, tabUserPass);
SecurityHelper.setTabUserExists(state, true);
+ Thread.sleep(1000);
if (!hasPermission)
throw new AccumuloException("Didn't get Security Exception when we should have");
}
http://git-wip-us.apache.org/repos/asf/accumulo/blob/ed4c2273/src/server/src/main/java/org/apache/accumulo/server/test/randomwalk/security/SecurityHelper.java
----------------------------------------------------------------------
diff --git a/src/server/src/main/java/org/apache/accumulo/server/test/randomwalk/security/SecurityHelper.java b/src/server/src/main/java/org/apache/accumulo/server/test/randomwalk/security/SecurityHelper.java
index 52a4672..c8d1ea0 100644
--- a/src/server/src/main/java/org/apache/accumulo/server/test/randomwalk/security/SecurityHelper.java
+++ b/src/server/src/main/java/org/apache/accumulo/server/test/randomwalk/security/SecurityHelper.java
@@ -140,8 +140,18 @@ public class SecurityHelper {
public static void setUserAuths(State state, String target, Authorizations auths) {
state.set(target + "_auths", auths);
+ state.set("Auths-" + target + '-' + "time", System.currentTimeMillis());
}
+ public static boolean ambiguousAuthorizations(State state, String target) {
+ Long setTime = state.getLong("Auths-" + target + '-' + "time");
+ if (setTime == null)
+ throw new RuntimeException("WTF? Auths-" + target + '-' + "time is null");
+ if (System.currentTimeMillis() < (setTime + 1000))
+ return true;
+ return false;
+ }
+
@SuppressWarnings("unchecked")
public static Map<String,Integer> getAuthsMap(State state) {
return (Map<String,Integer>) state.get(authsMap);
http://git-wip-us.apache.org/repos/asf/accumulo/blob/ed4c2273/src/server/src/main/java/org/apache/accumulo/server/test/randomwalk/security/TableOp.java
----------------------------------------------------------------------
diff --git a/src/server/src/main/java/org/apache/accumulo/server/test/randomwalk/security/TableOp.java b/src/server/src/main/java/org/apache/accumulo/server/test/randomwalk/security/TableOp.java
index e0b8deb..8d309b8 100644
--- a/src/server/src/main/java/org/apache/accumulo/server/test/randomwalk/security/TableOp.java
+++ b/src/server/src/main/java/org/apache/accumulo/server/test/randomwalk/security/TableOp.java
@@ -83,6 +83,7 @@ public class TableOp extends Test {
case READ:
Authorizations auths = SecurityHelper.getUserAuths(state, SecurityHelper.getTabUserName(state));
boolean canRead = SecurityHelper.getTabPerm(state, SecurityHelper.getTabUserName(state), TablePermission.READ);
+ boolean ambiguousAuths = SecurityHelper.ambiguousAuthorizations(state, SecurityHelper.getTabUserName(state));
try {
Scanner scan = conn.createScanner(tableName, conn.securityOperations().getUserAuthorizations(SecurityHelper.getTabUserName(state)));
int seen = 0;
@@ -91,7 +92,7 @@ public class TableOp extends Test {
Entry<Key,Value> entry = iter.next();
Key k = entry.getKey();
seen++;
- if (!auths.contains(k.getColumnVisibilityData()))
+ if (!auths.contains(k.getColumnVisibilityData()) && !ambiguousAuths)
throw new AccumuloException("Got data I should not be capable of seeing: " + k + " table " + tableName);
}
if (!canRead)
@@ -100,7 +101,7 @@ public class TableOp extends Test {
if (auths.contains(entry.getKey().getBytes()))
seen = seen - entry.getValue();
}
- if (seen != 0)
+ if (seen != 0 && !ambiguousAuths)
throw new AccumuloException("Got mismatched amounts of data");
} catch (TableNotFoundException tnfe) {
if (tableExists)
@@ -113,6 +114,12 @@ public class TableOp extends Test {
else
return;
}
+ if (ae.getErrorCode().equals(SecurityErrorCode.BAD_AUTHORIZATIONS)) {
+ if (ambiguousAuths)
+ return;
+ else
+ throw new AccumuloException("Mismatched authorizations! ", ae);
+ }
throw new AccumuloException("Unexpected exception!", ae);
} catch (RuntimeException re) {
if (re.getCause() instanceof AccumuloSecurityException
@@ -122,6 +129,13 @@ public class TableOp extends Test {
else
return;
}
+ if (re.getCause() instanceof AccumuloSecurityException
+ && ((AccumuloSecurityException) re.getCause()).getErrorCode().equals(SecurityErrorCode.BAD_AUTHORIZATIONS)) {
+ if (ambiguousAuths)
+ return;
+ else
+ throw new AccumuloException("Mismatched authorizations! ", re.getCause());
+ }
throw new AccumuloException("Unexpected exception!", re);
}
[15/17] git commit: Merge branch '1.5.1-SNAPSHOT' into 1.6.0-SNAPSHOT
Posted by bh...@apache.org.
Merge branch '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/1496c5f3
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/1496c5f3
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/1496c5f3
Branch: refs/heads/1.6.0-SNAPSHOT
Commit: 1496c5f3279e10a7fb52a0d3933f2812ada5950b
Parents: 9747cc7 ea41264
Author: Bill Havanki <bh...@cloudera.com>
Authored: Tue Jan 14 15:47:38 2014 -0500
Committer: Bill Havanki <bh...@cloudera.com>
Committed: Tue Jan 14 15:47:38 2014 -0500
----------------------------------------------------------------------
----------------------------------------------------------------------