svn commit: r1555009 - /hbase/trunk/hbase-server/src/test/java/org/apache/hadoop/hbase/security/access/TestNamespaceCommands.java

[apurtell]

Author: apurtell
Date: Fri Jan  3 05:06:02 2014
New Revision: 1555009

URL: http://svn.apache.org/r1555009
Log:
HBASE-10267. TestNamespaceCommands occasionally fails

Modified:
    
hbase/trunk/hbase-server/src/test/java/org/apache/hadoop/hbase/security/access/TestNamespaceCommands.java

Modified: 
hbase/trunk/hbase-server/src/test/java/org/apache/hadoop/hbase/security/access/TestNamespaceCommands.java
URL: 
http://svn.apache.org/viewvc/hbase/trunk/hbase-server/src/test/java/org/apache/hadoop/hbase/security/access/TestNamespaceCommands.java?rev=1555009&r1=1555008&r2=1555009&view=diff
==============================================================================
--- 
hbase/trunk/hbase-server/src/test/java/org/apache/hadoop/hbase/security/access/TestNamespaceCommands.java
 (original)
+++ 
hbase/trunk/hbase-server/src/test/java/org/apache/hadoop/hbase/security/access/TestNamespaceCommands.java
 Fri Jan  3 05:06:02 2014
@@ -23,7 +23,6 @@ import static org.junit.Assert.assertTru
 import java.util.List;
 
 import org.apache.hadoop.conf.Configuration;
-import org.apache.hadoop.hbase.Coprocessor;
 import org.apache.hadoop.hbase.HBaseTestingUtility;
 import org.apache.hadoop.hbase.HConstants;
 import org.apache.hadoop.hbase.MediumTests;
@@ -31,10 +30,8 @@ import org.apache.hadoop.hbase.Namespace
 import org.apache.hadoop.hbase.client.Get;
 import org.apache.hadoop.hbase.client.HTable;
 import org.apache.hadoop.hbase.client.Result;
-import org.apache.hadoop.hbase.coprocessor.CoprocessorHost;
 import org.apache.hadoop.hbase.coprocessor.MasterCoprocessorEnvironment;
 import org.apache.hadoop.hbase.coprocessor.ObserverContext;
-import org.apache.hadoop.hbase.master.MasterCoprocessorHost;
 import org.apache.hadoop.hbase.protobuf.ProtobufUtil;
 import 
org.apache.hadoop.hbase.protobuf.generated.AccessControlProtos.AccessControlService;
 import org.apache.hadoop.hbase.security.User;
@@ -70,20 +67,21 @@ public class TestNamespaceCommands exten
   public static void beforeClass() throws Exception {
     conf = UTIL.getConfiguration();
     SecureTestUtil.enableSecurity(conf);
-    conf.set(CoprocessorHost.MASTER_COPROCESSOR_CONF_KEY, 
AccessController.class.getName());
-    UTIL.startMiniCluster();
+
     SUPERUSER = User.createUserForTesting(conf, "admin", new String[] { 
"supergroup" });
     USER_RW = User.createUserForTesting(conf, "rw_user", new String[0]);
     USER_CREATE = User.createUserForTesting(conf, "create_user", new 
String[0]);
     USER_NSP_WRITE = User.createUserForTesting(conf, "namespace_write", new 
String[0]);
-    
UTIL.getHBaseAdmin().createNamespace(NamespaceDescriptor.create(TestNamespace).build());
 
+    UTIL.startMiniCluster();
     // Wait for the ACL table to become available
     UTIL.waitTableAvailable(AccessControlLists.ACL_TABLE_NAME.getName(), 30 * 
1000);
 
-    MasterCoprocessorHost cpHost = 
UTIL.getMiniHBaseCluster().getMaster().getCoprocessorHost();
-    cpHost.load(AccessController.class, Coprocessor.PRIORITY_HIGHEST, conf);
-    ACCESS_CONTROLLER = (AccessController) 
cpHost.findCoprocessor(AccessController.class.getName());
+    ACCESS_CONTROLLER = (AccessController) 
UTIL.getMiniHBaseCluster().getMaster()
+      .getCoprocessorHost()
+        .findCoprocessor(AccessController.class.getName());
+
+    
UTIL.getHBaseAdmin().createNamespace(NamespaceDescriptor.create(TestNamespace).build());
 
     SecureTestUtil.grantOnNamespace(UTIL, USER_NSP_WRITE.getShortName(),
       TestNamespace, Permission.Action.WRITE);