You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by st...@apache.org on 2013/03/04 01:53:30 UTC
svn commit: r1452161 - in /hbase/trunk:
hbase-client/src/main/java/org/apache/hadoop/hbase/client/HConnectionManager.java
hbase-server/src/test/java/org/apache/hadoop/hbase/security/access/TestAccessControlFilter.java
Author: stack
Date: Mon Mar 4 00:53:30 2013
New Revision: 1452161
URL: http://svn.apache.org/r1452161
Log:
HBASE-7966 ACL tests fail on trunk (flaky)
Modified:
hbase/trunk/hbase-client/src/main/java/org/apache/hadoop/hbase/client/HConnectionManager.java
hbase/trunk/hbase-server/src/test/java/org/apache/hadoop/hbase/security/access/TestAccessControlFilter.java
Modified: hbase/trunk/hbase-client/src/main/java/org/apache/hadoop/hbase/client/HConnectionManager.java
URL: http://svn.apache.org/viewvc/hbase/trunk/hbase-client/src/main/java/org/apache/hadoop/hbase/client/HConnectionManager.java?rev=1452161&r1=1452160&r2=1452161&view=diff
==============================================================================
--- hbase/trunk/hbase-client/src/main/java/org/apache/hadoop/hbase/client/HConnectionManager.java (original)
+++ hbase/trunk/hbase-client/src/main/java/org/apache/hadoop/hbase/client/HConnectionManager.java Mon Mar 4 00:53:30 2013
@@ -869,18 +869,18 @@ public class HConnectionManager {
}
/*
- * @param True if table is online
+ * @param enabled True if table is enabled
*/
- private boolean testTableOnlineState(byte [] tableName, boolean online)
+ private boolean testTableOnlineState(byte [] tableName, boolean enabled)
throws IOException {
if (Bytes.equals(tableName, HConstants.ROOT_TABLE_NAME)) {
// The root region is always enabled
- return online;
+ return enabled;
}
String tableNameStr = Bytes.toString(tableName);
ZooKeeperKeepAliveConnection zkw = getKeepAliveZooKeeperWatcher();
try {
- if (online) {
+ if (enabled) {
return ZKTableReadOnly.isEnabledTable(zkw, tableNameStr);
}
return ZKTableReadOnly.isDisabledTable(zkw, tableNameStr);
Modified: hbase/trunk/hbase-server/src/test/java/org/apache/hadoop/hbase/security/access/TestAccessControlFilter.java
URL: http://svn.apache.org/viewvc/hbase/trunk/hbase-server/src/test/java/org/apache/hadoop/hbase/security/access/TestAccessControlFilter.java?rev=1452161&r1=1452160&r2=1452161&view=diff
==============================================================================
--- hbase/trunk/hbase-server/src/test/java/org/apache/hadoop/hbase/security/access/TestAccessControlFilter.java (original)
+++ hbase/trunk/hbase-server/src/test/java/org/apache/hadoop/hbase/security/access/TestAccessControlFilter.java Mon Mar 4 00:53:30 2013
@@ -27,6 +27,7 @@ import java.security.PrivilegedException
import java.util.ArrayList;
import java.util.List;
import java.util.UUID;
+import java.io.IOException;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@@ -90,7 +91,14 @@ public class TestAccessControlFilter {
@Test
public void testQualifierAccess() throws Exception {
final HTable table = TEST_UTIL.createTable(TABLE, FAMILY);
+ try {
+ doQualifierAccess(table);
+ } finally {
+ table.close();
+ }
+ }
+ private void doQualifierAccess(final HTable table) throws IOException, InterruptedException {
// set permissions
ADMIN.runAs(new PrivilegedExceptionAction<Object>() {
@Override