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

HBASE-17779 disable_table_replication returns misleading message and does not turn off replication (Janos Gub)

This commit is contained in:
tedyu 2017-03-14 12:34:04 -07:00
parent c97905a962
commit 318298047b
2 changed files with 45 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
hbase-client/src/main/java/org/apache/hadoop/hbase/client/replication/ReplicationAdmin.java
View File

@ -647,15 +647,17 @@ public class ReplicationAdmin implements Closeable {
/** /**
* Set the table's replication switch if the table's replication switch is already not set. * Set the table's replication switch if the table's replication switch is already not set.
* @param tableName name of the table * @param tableName name of the table
* @param isRepEnabled is replication switch enable or disable * @param enableRep is replication switch enable or disable
* @throws IOException if a remote or network exception occurs * @throws IOException if a remote or network exception occurs
*/ */
private void setTableRep(final TableName tableName, boolean isRepEnabled) throws IOException { private void setTableRep(final TableName tableName, boolean enableRep) throws IOException {
Admin admin = null; Admin admin = null;
try { try {
admin = this.connection.getAdmin(); admin = this.connection.getAdmin();
HTableDescriptor htd = admin.getTableDescriptor(tableName); HTableDescriptor htd = admin.getTableDescriptor(tableName);
if (isTableRepEnabled(htd) ^ isRepEnabled) { ReplicationState currentReplicationState = getTableReplicationState(htd);
if (enableRep && currentReplicationState != ReplicationState.ENABLED
|| !enableRep && currentReplicationState != ReplicationState.DISABLED) {
boolean isOnlineSchemaUpdateEnabled = boolean isOnlineSchemaUpdateEnabled =
this.connection.getConfiguration() this.connection.getConfiguration()
.getBoolean("hbase.online.schema.update.enable", true); .getBoolean("hbase.online.schema.update.enable", true);
@ -663,7 +665,7 @@ public class ReplicationAdmin implements Closeable {
admin.disableTable(tableName); admin.disableTable(tableName);
} }
for (HColumnDescriptor hcd : htd.getFamilies()) { for (HColumnDescriptor hcd : htd.getFamilies()) {
hcd.setScope(isRepEnabled ? HConstants.REPLICATION_SCOPE_GLOBAL hcd.setScope(enableRep ? HConstants.REPLICATION_SCOPE_GLOBAL
: HConstants.REPLICATION_SCOPE_LOCAL); : HConstants.REPLICATION_SCOPE_LOCAL);
} }
admin.modifyTable(tableName, htd); admin.modifyTable(tableName, htd);
@ -684,17 +686,34 @@ public class ReplicationAdmin implements Closeable {
} }
/** /**
* @param htd table descriptor details for the table to check * This enum indicates the current state of the replication for a given table.
* @return true if table's replication switch is enabled
*/ */
private boolean isTableRepEnabled(HTableDescriptor htd) { private enum ReplicationState {
ENABLED, // all column families enabled
MIXED, // some column families enabled, some disabled
DISABLED // all column families disabled
}
/**
* @param htd table descriptor details for the table to check
* @return ReplicationState the current state of the table.
*/
private ReplicationState getTableReplicationState(HTableDescriptor htd) {
boolean hasEnabled = false;
boolean hasDisabled = false;
for (HColumnDescriptor hcd : htd.getFamilies()) { for (HColumnDescriptor hcd : htd.getFamilies()) {
if (hcd.getScope() != HConstants.REPLICATION_SCOPE_GLOBAL if (hcd.getScope() != HConstants.REPLICATION_SCOPE_GLOBAL
&& hcd.getScope() != HConstants.REPLICATION_SCOPE_SERIAL) { && hcd.getScope() != HConstants.REPLICATION_SCOPE_SERIAL) {
return false; hasDisabled = true;
} else {
hasEnabled = true;
} }
} }
return true;
if (hasEnabled && hasDisabled) return ReplicationState.MIXED;
if (hasEnabled) return ReplicationState.ENABLED;
return ReplicationState.DISABLED;
} }
private void checkConfiguredWALEntryFilters(ReplicationPeerConfig peerConfig) private void checkConfiguredWALEntryFilters(ReplicationPeerConfig peerConfig)

17
hbase-server/src/test/java/org/apache/hadoop/hbase/client/replication/TestReplicationAdminWithClusters.java
View File

@ -69,6 +69,23 @@ public class TestReplicationAdminWithClusters extends TestReplicationBase {
TestReplicationBase.tearDownAfterClass(); TestReplicationBase.tearDownAfterClass();
} }
@Test(timeout = 300000)
public void disableNotFullReplication() throws Exception {
HTableDescriptor table = admin2.getTableDescriptor(tableName);
HColumnDescriptor f = new HColumnDescriptor("notReplicatedFamily");
table.addFamily(f);
admin1.disableTable(tableName);
admin1.modifyTable(tableName, table);
admin1.enableTable(tableName);
admin.disableTableRep(tableName);
table = admin1.getTableDescriptor(tableName);
for (HColumnDescriptor fam : table.getColumnFamilies()) {
assertEquals(fam.getScope(), HConstants.REPLICATION_SCOPE_LOCAL);
}
}
@Test(timeout = 300000) @Test(timeout = 300000)
public void testEnableReplicationWhenSlaveClusterDoesntHaveTable() throws Exception { public void testEnableReplicationWhenSlaveClusterDoesntHaveTable() throws Exception {
admin.disableTableRep(tableName); admin.disableTableRep(tableName);