Apache
/
hbase
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

HBASE-7581 TestAccessController depends on the execution order 

git-svn-id: https://svn.apache.org/repos/asf/hbase/trunk@1434057 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
nkeywal 2013-01-16 17:27:42 +00:00
parent 5bc5ee613f
commit b892e48c7e
2 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
hbase-server/src/main/java/org/apache/hadoop/hbase/client/RetriesExhaustedException.java
View File

@ -78,7 +78,9 @@ public class RetriesExhaustedException extends IOException {
*/ */
public RetriesExhaustedException(final int numTries, public RetriesExhaustedException(final int numTries,
final List<ThrowableWithExtraContext> exceptions) { final List<ThrowableWithExtraContext> exceptions) {
super(getMessage(numTries, exceptions)); super(getMessage(numTries, exceptions),
(exceptions != null && !exceptions.isEmpty() ?
exceptions.get(exceptions.size() - 1).t : null));
} }
private static String getMessage(String callableVitals, int numTries, private static String getMessage(String callableVitals, int numTries,

7
hbase-server/src/test/java/org/apache/hadoop/hbase/security/access/TestAccessController.java
View File

@ -675,10 +675,9 @@ public class TestAccessController {
// action for checkAndPut() // action for checkAndPut()
PrivilegedExceptionAction checkAndPut = new PrivilegedExceptionAction() { PrivilegedExceptionAction checkAndPut = new PrivilegedExceptionAction() {
public Object run() throws Exception { public Object run() throws Exception {
HTable t = new HTable(conf, TEST_TABLE);
Put p = new Put(Bytes.toBytes("random_row")); Put p = new Put(Bytes.toBytes("random_row"));
p.add(TEST_FAMILY, Bytes.toBytes("Qualifier"), Bytes.toBytes(1)); p.add(TEST_FAMILY, Bytes.toBytes("Qualifier"), Bytes.toBytes(1));
HTable t = new HTable(conf, TEST_TABLE);
t.checkAndPut(Bytes.toBytes("random_row"), TEST_FAMILY, Bytes.toBytes("q"), t.checkAndPut(Bytes.toBytes("random_row"), TEST_FAMILY, Bytes.toBytes("q"),
Bytes.toBytes("test_value"), p); Bytes.toBytes("test_value"), p);
return null; return null;
@ -711,6 +710,10 @@ public class TestAccessController {
} }
}; };
verifyWrite(bulkLoadAction); verifyWrite(bulkLoadAction);
// Reinit after the bulk upload
TEST_UTIL.getHBaseAdmin().disableTable(TEST_TABLE);
TEST_UTIL.getHBaseAdmin().enableTable(TEST_TABLE);
} }
public class BulkLoadHelper { public class BulkLoadHelper {