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

HBASE-14051 Undo workarounds in IntegrationTestDDLMasterFailover for client double submit (Stephen Yuan jiang)

This commit is contained in:
Stephen Yuan Jiang 2015-09-25 14:39:40 -07:00
parent e5d47a976e
commit 085fd765aa
2 changed files with 23 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
hbase-it/src/test/java/org/apache/hadoop/hbase/IntegrationTestDDLMasterFailover.java
View File

@ -97,6 +97,7 @@ public class IntegrationTestDDLMasterFailover extends IntegrationTestBase {
protected static final int DEFAULT_NUM_REGIONS = 50; // number of regions in pre-split tables
private boolean keepTableAtTheEnd = false;
protected HBaseCluster cluster;
protected Connection connection;
@ -134,9 +135,11 @@ public class IntegrationTestDDLMasterFailover extends IntegrationTestBase {
@Override
public void cleanUpCluster() throws Exception {
if (!keepTableAtTheEnd) {
Admin admin = util.getHBaseAdmin();
admin.disableTables("ittable-\\d+");
admin.deleteTables("ittable-\\d+");
}
Connection connection = getConnection();
connection.close();
super.cleanUpCluster();
@ -239,16 +242,9 @@ public class IntegrationTestDDLMasterFailover extends IntegrationTestBase {
HTableDescriptor freshTableDesc = admin.getTableDescriptor(tableName);
enabledTables.put(tableName, freshTableDesc);
LOG.info("Created table:" + freshTableDesc);
} catch (Exception e){
} catch (Exception e) {
LOG.warn("Caught exception in action: " + this.getClass());
// TODO workaround
// when master failover happens during CREATE_TABLE, client will do RPC retry and get TableExistsException
// ignore for now till better resolution
if (e instanceof TableExistsException) {
LOG.warn("Caught TableExistsException in action: " + this.getClass(), e);
} else {
throw e;
}
} finally {
admin.close();
}
@ -379,17 +375,9 @@ public class IntegrationTestDDLMasterFailover extends IntegrationTestBase {
admin.tableExists(tableName));
deletedTables.put(tableName, selected);
LOG.info("Deleted table :" + selected);
} catch (Exception e){
} catch (Exception e) {
LOG.warn("Caught exception in action: " + this.getClass());
// TODO workaround
// when master failover happens during DELETE_TABLE, client will do RPC retry and get
// TableNotFoundException ignore for now till better resolution
if (e instanceof TableNotFoundException) {
LOG.warn("Caught TableNotFoundException in action: " + this.getClass());
e.printStackTrace();
} else {
throw e;
}
} finally {
admin.close();
}
@ -440,19 +428,9 @@ public class IntegrationTestDDLMasterFailover extends IntegrationTestBase {
freshTableDesc.hasFamily(cfd.getName()));
LOG.info("Added column family: " + cfd + " to table: " + tableName);
disabledTables.put(tableName, freshTableDesc);
} catch (Exception e){
} catch (Exception e) {
LOG.warn("Caught exception in action: " + this.getClass());
// TODO HBASE-13415
// loose restriction for InvalidFamilyOperationException thrown in async operations before
// HBASE-13415 completes when failover happens, multiple procids may be created from the
// same request when 1 procedure succeeds, the others would complain about family already
// exists
if (e instanceof InvalidFamilyOperationException) {
LOG.warn("Caught InvalidFamilyOperationException in action: " + this.getClass());
e.printStackTrace();
} else {
throw e;
}
} finally {
admin.close();
}
@ -576,17 +554,7 @@ public class IntegrationTestDDLMasterFailover extends IntegrationTestBase {
disabledTables.put(tableName, freshTableDesc);
} catch (Exception e) {
LOG.warn("Caught exception in action: " + this.getClass());
// TODO HBASE-13415
// loose restriction for InvalidFamilyOperationException thrown in async operations before
// HBASE-13415 completes when failover happens, multiple procids may be created from the
// same request when 1 procedure succeeds, the others would complain about family not
// exists
if (e instanceof InvalidFamilyOperationException) {
LOG.warn("Caught InvalidFamilyOperationException in action: " + this.getClass());
e.printStackTrace();
} else {
throw e;
}
} finally {
admin.close();
}
@ -782,6 +750,11 @@ public class IntegrationTestDDLMasterFailover extends IntegrationTestBase {
try {
LOG.info("Running hbck");
hbck = HbckTestingUtil.doFsck(util.getConfiguration(), false);
if (HbckTestingUtil.inconsistencyFound(hbck)) {
// Find the inconsistency during HBCK. Leave table undropped so that
// we can check outside the test.
keepTableAtTheEnd = true;
}
HbckTestingUtil.assertNoErrors(hbck);
LOG.info("Finished hbck");
} finally {

5
hbase-server/src/test/java/org/apache/hadoop/hbase/util/hbck/HbckTestingUtil.java
View File

@ -89,6 +89,11 @@ public class HbckTestingUtil {
return hbck;
}
public static boolean inconsistencyFound(HBaseFsck fsck) throws Exception {
List<ERROR_CODE> errs = fsck.getErrors().getErrorList();
return (errs != null && !errs.isEmpty());
}
public static void assertNoErrors(HBaseFsck fsck) throws Exception {
List<ERROR_CODE> errs = fsck.getErrors().getErrorList();
assertEquals(new ArrayList<ERROR_CODE>(), errs);