|
28 | 28 | import java.util.concurrent.TimeUnit; |
29 | 29 | import org.apache.hadoop.hbase.HBaseClassTestRule; |
30 | 30 | import org.apache.hadoop.hbase.HBaseTestingUtil; |
31 | | -import org.apache.hadoop.hbase.HConstants; |
32 | 31 | import org.apache.hadoop.hbase.NamespaceDescriptor; |
33 | 32 | import org.apache.hadoop.hbase.TableName; |
34 | 33 | import org.apache.hadoop.hbase.client.Admin; |
@@ -75,20 +74,23 @@ public static void setUpBeforeClass() throws Exception { |
75 | 74 | TEST_UTIL.getConfiguration().setInt("hbase.hstore.compactionThreshold", 10); |
76 | 75 | TEST_UTIL.getConfiguration().setInt("hbase.regionserver.msginterval", 100); |
77 | 76 | TEST_UTIL.getConfiguration().setInt("hbase.client.pause", 250); |
78 | | - TEST_UTIL.getConfiguration().setInt(HConstants.HBASE_CLIENT_RETRIES_NUMBER, 6); |
79 | 77 | TEST_UTIL.getConfiguration().setBoolean("hbase.master.enabletable.roundrobin", true); |
80 | 78 | TEST_UTIL.startMiniCluster(2); |
81 | 79 | TEST_UTIL.waitTableAvailable(QuotaTableUtil.QUOTA_TABLE_NAME); |
82 | 80 | QuotaCache.TEST_FORCE_REFRESH = true; |
83 | 81 |
|
84 | 82 | tables = new Table[TABLE_NAMES.length]; |
85 | 83 | for (int i = 0; i < TABLE_NAMES.length; ++i) { |
86 | | - tables[i] = TEST_UTIL.createTable(TABLE_NAMES[i], FAMILY); |
| 84 | + TEST_UTIL.createTable(TABLE_NAMES[i], FAMILY); |
87 | 85 | TEST_UTIL.waitTableAvailable(TABLE_NAMES[i]); |
| 86 | + tables[i] = TEST_UTIL.getConnection().getTableBuilder(TABLE_NAMES[i], null) |
| 87 | + .setOperationTimeout(10000).build(); |
88 | 88 | } |
89 | 89 | TEST_UTIL.getAdmin().createNamespace(NamespaceDescriptor.create(NAMESPACE).build()); |
90 | | - table = TEST_UTIL.createTable(TABLE_NAME, FAMILY, SPLITS); |
| 90 | + TEST_UTIL.createTable(TABLE_NAME, FAMILY, SPLITS); |
91 | 91 | TEST_UTIL.waitTableAvailable(TABLE_NAME); |
| 92 | + table = TEST_UTIL.getConnection().getTableBuilder(TABLE_NAME, null).setOperationTimeout(10000) |
| 93 | + .build(); |
92 | 94 | } |
93 | 95 |
|
94 | 96 | @AfterClass |
@@ -180,7 +182,6 @@ public void testUserClusterScopeQuota() throws Exception { |
180 | 182 | triggerUserCacheRefresh(TEST_UTIL, true, TABLE_NAMES); |
181 | 183 | } |
182 | 184 |
|
183 | | - @org.junit.Ignore |
184 | 185 | @Test // Spews the log w/ triggering of scheduler? HBASE-24035 |
185 | 186 | public void testUserNamespaceClusterScopeQuota() throws Exception { |
186 | 187 | final Admin admin = TEST_UTIL.getAdmin(); |
|
0 commit comments