HBASE-15989 Remove hbase.online.schema.update.enable
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/d9463bcc Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/d9463bcc Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/d9463bcc Branch: refs/heads/hbase-12439 Commit: d9463bcce0e36bfb67c82acd1d7483f63b2764b7 Parents: d5d9b7d Author: Matteo Bertozzi <matteo.berto...@cloudera.com> Authored: Wed Jun 8 13:09:31 2016 -0700 Committer: Matteo Bertozzi <matteo.berto...@cloudera.com> Committed: Wed Jun 8 13:09:31 2016 -0700 ---------------------------------------------------------------------- .../client/replication/ReplicationAdmin.java | 13 +----- .../src/main/resources/hbase-default.xml | 9 +---- .../procedure/MasterDDLOperationHelper.java | 15 ------- .../master/procedure/ModifyTableProcedure.java | 5 --- .../apache/hadoop/hbase/client/TestAdmin1.java | 42 -------------------- .../apache/hadoop/hbase/client/TestAdmin2.java | 1 - .../client/TestCloneSnapshotFromClient.java | 1 - .../hbase/client/TestFromClientSide3.java | 2 - .../client/TestRestoreSnapshotFromClient.java | 1 - .../hbase/io/encoding/TestChangingEncoding.java | 1 - .../hbase/master/TestTableLockManager.java | 1 - .../regionserver/TestEncryptionKeyRotation.java | 4 +- ...sibilityLabelReplicationWithExpAsString.java | 1 - .../TestVisibilityLabelsReplication.java | 1 - ...ibilityLabelsWithDefaultVisLabelService.java | 1 - .../TestRestoreFlushSnapshotFromClient.java | 1 - .../src/main/ruby/shell/commands/alter.rb | 16 ++++---- .../hadoop/hbase/client/AbstractTestShell.java | 1 - .../hbase/client/rsgroup/TestShellRSGroups.java | 1 - src/main/asciidoc/_chapters/hbase-default.adoc | 10 ----- 20 files changed, 12 insertions(+), 115 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hbase/blob/d9463bcc/hbase-client/src/main/java/org/apache/hadoop/hbase/client/replication/ReplicationAdmin.java ---------------------------------------------------------------------- diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/replication/ReplicationAdmin.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/replication/ReplicationAdmin.java index a2ad2e7..d062448 100644 --- a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/replication/ReplicationAdmin.java +++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/replication/ReplicationAdmin.java @@ -516,9 +516,9 @@ public class ReplicationAdmin implements Closeable { if (repPeers == null || repPeers.size() <= 0) { throw new IllegalArgumentException("Found no peer cluster for replication."); } - + final TableName onlyTableNameQualifier = TableName.valueOf(tableName.getQualifierAsString()); - + for (ReplicationPeer repPeer : repPeers) { Map<TableName, List<String>> tableCFMap = repPeer.getTableCFs(); // TODO Currently peer TableCFs will not include namespace so we need to check only for table @@ -595,20 +595,11 @@ public class ReplicationAdmin implements Closeable { admin = this.connection.getAdmin(); HTableDescriptor htd = admin.getTableDescriptor(tableName); if (isTableRepEnabled(htd) ^ isRepEnabled) { - boolean isOnlineSchemaUpdateEnabled = - this.connection.getConfiguration() - .getBoolean("hbase.online.schema.update.enable", true); - if (!isOnlineSchemaUpdateEnabled) { - admin.disableTable(tableName); - } for (HColumnDescriptor hcd : htd.getFamilies()) { hcd.setScope(isRepEnabled ? HConstants.REPLICATION_SCOPE_GLOBAL : HConstants.REPLICATION_SCOPE_LOCAL); } admin.modifyTable(tableName, htd); - if (!isOnlineSchemaUpdateEnabled) { - admin.enableTable(tableName); - } } } finally { if (admin != null) { http://git-wip-us.apache.org/repos/asf/hbase/blob/d9463bcc/hbase-common/src/main/resources/hbase-default.xml ---------------------------------------------------------------------- diff --git a/hbase-common/src/main/resources/hbase-default.xml b/hbase-common/src/main/resources/hbase-default.xml index 62a6b62..55ac497 100644 --- a/hbase-common/src/main/resources/hbase-default.xml +++ b/hbase-common/src/main/resources/hbase-default.xml @@ -562,7 +562,7 @@ possible configurations would overwhelm and obscure the important. <property> <name>hbase.regions.slop</name> <value>0.001</value> - <description>Rebalance if any regionserver has average + (average * slop) regions. + <description>Rebalance if any regionserver has average + (average * slop) regions. The default value of this parameter is 0.001 in StochasticLoadBalancer (the default load balancer), while the default is 0.2 in other load balancers (i.e., SimpleLoadBalancer).</description> </property> @@ -865,7 +865,7 @@ possible configurations would overwhelm and obscure the important. Must be a multiple of 1024 else you will run into 'java.io.IOException: Invalid HFile block magic' when you go to read from cache. If you specify no values here, then you pick up the default bucketsizes set - in code (See BucketAllocator#DEFAULT_BUCKET_SIZES). + in code (See BucketAllocator#DEFAULT_BUCKET_SIZES). </description> </property> <property> @@ -1132,11 +1132,6 @@ possible configurations would overwhelm and obscure the important. of servers, so this is most useful for debugging only.</description> </property> <property> - <name>hbase.online.schema.update.enable</name> - <value>true</value> - <description>Set true to enable online schema changes.</description> - </property> - <property> <name>hbase.table.lock.enable</name> <value>true</value> <description>Set to true to enable locking the table in zookeeper for schema change operations. http://git-wip-us.apache.org/repos/asf/hbase/blob/d9463bcc/hbase-server/src/main/java/org/apache/hadoop/hbase/master/procedure/MasterDDLOperationHelper.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/procedure/MasterDDLOperationHelper.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/procedure/MasterDDLOperationHelper.java index f2ee97f..1214268 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/procedure/MasterDDLOperationHelper.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/procedure/MasterDDLOperationHelper.java @@ -56,14 +56,6 @@ public final class MasterDDLOperationHelper { private MasterDDLOperationHelper() {} /** - * Check whether online schema change is allowed from config - **/ - public static boolean isOnlineSchemaChangeAllowed(final MasterProcedureEnv env) { - return env.getMasterServices().getConfiguration() - .getBoolean("hbase.online.schema.update.enable", false); - } - - /** * Check whether a table is modifiable - exists and either offline or online with config set * @param env MasterProcedureEnv * @param tableName name of the table @@ -75,13 +67,6 @@ public final class MasterDDLOperationHelper { if (!MetaTableAccessor.tableExists(env.getMasterServices().getConnection(), tableName)) { throw new TableNotFoundException(tableName); } - - // We only execute this procedure with table online if online schema change config is set. - if (!env.getMasterServices().getTableStateManager() - .isTableState(tableName, TableState.State.DISABLED) - && !MasterDDLOperationHelper.isOnlineSchemaChangeAllowed(env)) { - throw new TableNotDisabledException(tableName); - } } /** http://git-wip-us.apache.org/repos/asf/hbase/blob/d9463bcc/hbase-server/src/main/java/org/apache/hadoop/hbase/master/procedure/ModifyTableProcedure.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/procedure/ModifyTableProcedure.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/procedure/ModifyTableProcedure.java index 3f76df3..6c65718 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/procedure/ModifyTableProcedure.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/procedure/ModifyTableProcedure.java @@ -300,11 +300,6 @@ public class ModifyTableProcedure if (env.getMasterServices().getTableStateManager() .isTableState(getTableName(), TableState.State.ENABLED)) { - // We only execute this procedure with table online if online schema change config is set. - if (!MasterDDLOperationHelper.isOnlineSchemaChangeAllowed(env)) { - throw new TableNotDisabledException(getTableName()); - } - if (modifiedHTableDescriptor.getRegionReplication() != unmodifiedHTableDescriptor .getRegionReplication()) { throw new IOException("REGION_REPLICATION change is not supported for enabled tables"); http://git-wip-us.apache.org/repos/asf/hbase/blob/d9463bcc/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestAdmin1.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestAdmin1.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestAdmin1.java index 545fccd..fd55f66 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestAdmin1.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestAdmin1.java @@ -85,7 +85,6 @@ public class TestAdmin1 { @BeforeClass public static void setUpBeforeClass() throws Exception { - TEST_UTIL.getConfiguration().setBoolean("hbase.online.schema.update.enable", true); TEST_UTIL.getConfiguration().setInt("hbase.regionserver.msginterval", 100); TEST_UTIL.getConfiguration().setInt("hbase.client.pause", 250); TEST_UTIL.getConfiguration().setInt("hbase.client.retries.number", 6); @@ -503,8 +502,6 @@ public class TestAdmin1 { public void testOnlineChangeTableSchema() throws IOException, InterruptedException { final TableName tableName = TableName.valueOf("changeTableSchemaOnline"); - TEST_UTIL.getMiniHBaseCluster().getMaster().getConfiguration().setBoolean( - "hbase.online.schema.update.enable", true); HTableDescriptor [] tables = admin.listTables(); int numTables = tables.length; TEST_UTIL.createTable(tableName, HConstants.CATALOG_FAMILY).close(); @@ -588,45 +585,6 @@ public class TestAdmin1 { assertFalse(this.admin.tableExists(tableName)); } - @Test (timeout=300000) - public void testShouldFailOnlineSchemaUpdateIfOnlineSchemaIsNotEnabled() - throws Exception { - final TableName tableName = TableName.valueOf("changeTableSchemaOnlineFailure"); - TEST_UTIL.getMiniHBaseCluster().getMaster().getConfiguration().setBoolean( - "hbase.online.schema.update.enable", false); - HTableDescriptor[] tables = admin.listTables(); - int numTables = tables.length; - TEST_UTIL.createTable(tableName, HConstants.CATALOG_FAMILY).close(); - tables = this.admin.listTables(); - assertEquals(numTables + 1, tables.length); - - // FIRST, do htabledescriptor changes. - HTableDescriptor htd = this.admin.getTableDescriptor(tableName); - // Make a copy and assert copy is good. - HTableDescriptor copy = new HTableDescriptor(htd); - assertTrue(htd.equals(copy)); - // Now amend the copy. Introduce differences. - long newFlushSize = htd.getMemStoreFlushSize() / 2; - if (newFlushSize <=0) { - newFlushSize = HTableDescriptor.DEFAULT_MEMSTORE_FLUSH_SIZE / 2; - } - copy.setMemStoreFlushSize(newFlushSize); - final String key = "anyoldkey"; - assertTrue(htd.getValue(key) == null); - copy.setValue(key, key); - boolean expectedException = false; - try { - admin.modifyTable(tableName, copy); - } catch (TableNotDisabledException re) { - expectedException = true; - } - assertTrue("Online schema update should not happen.", expectedException); - - // Reset the value for the other tests - TEST_UTIL.getMiniHBaseCluster().getMaster().getConfiguration().setBoolean( - "hbase.online.schema.update.enable", true); - } - protected void verifyRoundRobinDistribution(ClusterConnection c, RegionLocator regionLocator, int expectedRegions) throws IOException { int numRS = c.getCurrentNrHRS(); http://git-wip-us.apache.org/repos/asf/hbase/blob/d9463bcc/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestAdmin2.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestAdmin2.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestAdmin2.java index ff53c49..d088fc4 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestAdmin2.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestAdmin2.java @@ -83,7 +83,6 @@ public class TestAdmin2 { @BeforeClass public static void setUpBeforeClass() throws Exception { - TEST_UTIL.getConfiguration().setBoolean("hbase.online.schema.update.enable", true); TEST_UTIL.getConfiguration().setInt("hbase.regionserver.msginterval", 100); TEST_UTIL.getConfiguration().setInt("hbase.client.pause", 250); TEST_UTIL.getConfiguration().setInt("hbase.client.retries.number", 6); http://git-wip-us.apache.org/repos/asf/hbase/blob/d9463bcc/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestCloneSnapshotFromClient.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestCloneSnapshotFromClient.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestCloneSnapshotFromClient.java index aeb82f4..65a67d0 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestCloneSnapshotFromClient.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestCloneSnapshotFromClient.java @@ -61,7 +61,6 @@ public class TestCloneSnapshotFromClient { protected static void setupConfiguration() { TEST_UTIL.getConfiguration().setBoolean(SnapshotManager.HBASE_SNAPSHOT_ENABLED, true); - TEST_UTIL.getConfiguration().setBoolean("hbase.online.schema.update.enable", true); TEST_UTIL.getConfiguration().setInt("hbase.hstore.compactionThreshold", 10); TEST_UTIL.getConfiguration().setInt("hbase.regionserver.msginterval", 100); TEST_UTIL.getConfiguration().setInt("hbase.client.pause", 250); http://git-wip-us.apache.org/repos/asf/hbase/blob/d9463bcc/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestFromClientSide3.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestFromClientSide3.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestFromClientSide3.java index a967d97..a918ce6 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestFromClientSide3.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestFromClientSide3.java @@ -70,8 +70,6 @@ public class TestFromClientSide3 { */ @BeforeClass public static void setUpBeforeClass() throws Exception { - TEST_UTIL.getConfiguration().setBoolean( - "hbase.online.schema.update.enable", true); TEST_UTIL.startMiniCluster(SLAVES); } http://git-wip-us.apache.org/repos/asf/hbase/blob/d9463bcc/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestRestoreSnapshotFromClient.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestRestoreSnapshotFromClient.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestRestoreSnapshotFromClient.java index d31df42..a3fc640 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestRestoreSnapshotFromClient.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestRestoreSnapshotFromClient.java @@ -83,7 +83,6 @@ public class TestRestoreSnapshotFromClient { protected static void setupConf(Configuration conf) { TEST_UTIL.getConfiguration().setBoolean(SnapshotManager.HBASE_SNAPSHOT_ENABLED, true); - TEST_UTIL.getConfiguration().setBoolean("hbase.online.schema.update.enable", true); TEST_UTIL.getConfiguration().setInt("hbase.hstore.compactionThreshold", 10); TEST_UTIL.getConfiguration().setInt("hbase.regionserver.msginterval", 100); TEST_UTIL.getConfiguration().setInt("hbase.client.pause", 250); http://git-wip-us.apache.org/repos/asf/hbase/blob/d9463bcc/hbase-server/src/test/java/org/apache/hadoop/hbase/io/encoding/TestChangingEncoding.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/io/encoding/TestChangingEncoding.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/io/encoding/TestChangingEncoding.java index 6359bef..6cf4d68 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/io/encoding/TestChangingEncoding.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/io/encoding/TestChangingEncoding.java @@ -103,7 +103,6 @@ public class TestChangingEncoding { conf.setInt(HConstants.HREGION_MEMSTORE_FLUSH_SIZE, 1024 * 1024); // ((Log4JLogger)RpcServerImplementation.LOG).getLogger().setLevel(Level.TRACE); // ((Log4JLogger)RpcClient.LOG).getLogger().setLevel(Level.TRACE); - conf.setBoolean("hbase.online.schema.update.enable", true); TEST_UTIL.startMiniCluster(); } http://git-wip-us.apache.org/repos/asf/hbase/blob/d9463bcc/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestTableLockManager.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestTableLockManager.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestTableLockManager.java index 573fdcb..36f505b 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestTableLockManager.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestTableLockManager.java @@ -88,7 +88,6 @@ public class TestTableLockManager { private static final CountDownLatch addColumn = new CountDownLatch(1); public void prepareMiniCluster() throws Exception { - TEST_UTIL.getConfiguration().setBoolean("hbase.online.schema.update.enable", true); TEST_UTIL.startMiniCluster(2); TEST_UTIL.createTable(TABLE_NAME, FAMILY); } http://git-wip-us.apache.org/repos/asf/hbase/blob/d9463bcc/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestEncryptionKeyRotation.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestEncryptionKeyRotation.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestEncryptionKeyRotation.java index 82be1db..cee64e0 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestEncryptionKeyRotation.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestEncryptionKeyRotation.java @@ -80,8 +80,6 @@ public class TestEncryptionKeyRotation { conf.setInt("hfile.format.version", 3); conf.set(HConstants.CRYPTO_KEYPROVIDER_CONF_KEY, KeyProviderForTesting.class.getName()); conf.set(HConstants.CRYPTO_MASTERKEY_NAME_CONF_KEY, "hbase"); - // Enable online schema updates - conf.setBoolean("hbase.online.schema.update.enable", true); // Start the minicluster TEST_UTIL.startMiniCluster(1); @@ -229,7 +227,7 @@ public class TestEncryptionKeyRotation { } } } - + private static List<Path> findStorefilePaths(TableName tableName) throws Exception { List<Path> paths = new ArrayList<Path>(); for (Region region: http://git-wip-us.apache.org/repos/asf/hbase/blob/d9463bcc/hbase-server/src/test/java/org/apache/hadoop/hbase/security/visibility/TestVisibilityLabelReplicationWithExpAsString.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/security/visibility/TestVisibilityLabelReplicationWithExpAsString.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/security/visibility/TestVisibilityLabelReplicationWithExpAsString.java index 18a1088..9483ac9 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/security/visibility/TestVisibilityLabelReplicationWithExpAsString.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/security/visibility/TestVisibilityLabelReplicationWithExpAsString.java @@ -80,7 +80,6 @@ public class TestVisibilityLabelReplicationWithExpAsString extends TestVisibilit // setup configuration conf = HBaseConfiguration.create(); conf.setBoolean(HConstants.DISTRIBUTED_LOG_REPLAY_KEY, false); - conf.setBoolean("hbase.online.schema.update.enable", true); conf.setInt("hfile.format.version", 3); conf.set(HConstants.ZOOKEEPER_ZNODE_PARENT, "/1"); conf.setInt("replication.source.size.capacity", 10240); http://git-wip-us.apache.org/repos/asf/hbase/blob/d9463bcc/hbase-server/src/test/java/org/apache/hadoop/hbase/security/visibility/TestVisibilityLabelsReplication.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/security/visibility/TestVisibilityLabelsReplication.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/security/visibility/TestVisibilityLabelsReplication.java index c9d9530..4ed47b0 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/security/visibility/TestVisibilityLabelsReplication.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/security/visibility/TestVisibilityLabelsReplication.java @@ -130,7 +130,6 @@ public class TestVisibilityLabelsReplication { // setup configuration conf = HBaseConfiguration.create(); conf.setBoolean(HConstants.DISTRIBUTED_LOG_REPLAY_KEY, false); - conf.setBoolean("hbase.online.schema.update.enable", true); conf.setInt("hfile.format.version", 3); conf.set(HConstants.ZOOKEEPER_ZNODE_PARENT, "/1"); conf.setInt("replication.source.size.capacity", 10240); http://git-wip-us.apache.org/repos/asf/hbase/blob/d9463bcc/hbase-server/src/test/java/org/apache/hadoop/hbase/security/visibility/TestVisibilityLabelsWithDefaultVisLabelService.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/security/visibility/TestVisibilityLabelsWithDefaultVisLabelService.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/security/visibility/TestVisibilityLabelsWithDefaultVisLabelService.java index a229bdb..63c08a2 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/security/visibility/TestVisibilityLabelsWithDefaultVisLabelService.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/security/visibility/TestVisibilityLabelsWithDefaultVisLabelService.java @@ -67,7 +67,6 @@ public class TestVisibilityLabelsWithDefaultVisLabelService extends TestVisibili // setup configuration conf = TEST_UTIL.getConfiguration(); conf.setBoolean(HConstants.DISTRIBUTED_LOG_REPLAY_KEY, false); - conf.setBoolean("hbase.online.schema.update.enable", true); VisibilityTestUtil.enableVisiblityLabels(conf); conf.setClass(VisibilityUtils.VISIBILITY_LABEL_GENERATOR_CLASS, SimpleScanLabelGenerator.class, ScanLabelGenerator.class); http://git-wip-us.apache.org/repos/asf/hbase/blob/d9463bcc/hbase-server/src/test/java/org/apache/hadoop/hbase/snapshot/TestRestoreFlushSnapshotFromClient.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/snapshot/TestRestoreFlushSnapshotFromClient.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/snapshot/TestRestoreFlushSnapshotFromClient.java index 04fce5c..bf26c69 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/snapshot/TestRestoreFlushSnapshotFromClient.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/snapshot/TestRestoreFlushSnapshotFromClient.java @@ -70,7 +70,6 @@ public class TestRestoreFlushSnapshotFromClient { } protected static void setupConf(Configuration conf) { - UTIL.getConfiguration().setBoolean("hbase.online.schema.update.enable", true); UTIL.getConfiguration().setInt("hbase.regionserver.msginterval", 100); UTIL.getConfiguration().setInt("hbase.client.pause", 250); UTIL.getConfiguration().setInt(HConstants.HBASE_CLIENT_RETRIES_NUMBER, 6); http://git-wip-us.apache.org/repos/asf/hbase/blob/d9463bcc/hbase-shell/src/main/ruby/shell/commands/alter.rb ---------------------------------------------------------------------- diff --git a/hbase-shell/src/main/ruby/shell/commands/alter.rb b/hbase-shell/src/main/ruby/shell/commands/alter.rb index 91b3e2e..8d6b6ca 100644 --- a/hbase-shell/src/main/ruby/shell/commands/alter.rb +++ b/hbase-shell/src/main/ruby/shell/commands/alter.rb @@ -22,19 +22,17 @@ module Shell class Alter < Command def help return <<-EOF -Alter a table. If the "hbase.online.schema.update.enable" property is set to -false, then the table must be disabled (see help 'disable'). If the -"hbase.online.schema.update.enable" property is set to true, tables can be -altered without disabling them first. Altering enabled tables has caused problems -in the past, so use caution and test it before using in production. +Alter a table. Tables can be altered without disabling them first. +Altering enabled tables has caused problems +in the past, so use caution and test it before using in production. -You can use the alter command to add, +You can use the alter command to add, modify or delete column families or change table configuration options. Column families work in a similar way as the 'create' command. The column family specification can either be a name string, or a dictionary with the NAME attribute. Dictionaries are described in the output of the 'help' command, with no arguments. -For example, to change or add the 'f1' column family in table 't1' from +For example, to change or add the 'f1' column family in table 't1' from current value to keep a maximum of 5 cell VERSIONS, do: hbase> alter 't1', NAME => 'f1', VERSIONS => 5 @@ -48,7 +46,7 @@ To delete the 'f1' column family in table 'ns1:t1', use one of: hbase> alter 'ns1:t1', NAME => 'f1', METHOD => 'delete' hbase> alter 'ns1:t1', 'delete' => 'f1' -You can also change table-scope attributes like MAX_FILESIZE, READONLY, +You can also change table-scope attributes like MAX_FILESIZE, READONLY, MEMSTORE_FLUSHSIZE, DURABILITY, etc. These can be put at the end; for example, to change the max size of a region to 128MB, do: @@ -85,7 +83,7 @@ You can also set REGION_REPLICATION: There could be more than one alteration in one command: - hbase> alter 't1', { NAME => 'f1', VERSIONS => 3 }, + hbase> alter 't1', { NAME => 'f1', VERSIONS => 3 }, { MAX_FILESIZE => '134217728' }, { METHOD => 'delete', NAME => 'f2' }, OWNER => 'johndoe', METADATA => { 'mykey' => 'myvalue' } EOF http://git-wip-us.apache.org/repos/asf/hbase/blob/d9463bcc/hbase-shell/src/test/java/org/apache/hadoop/hbase/client/AbstractTestShell.java ---------------------------------------------------------------------- diff --git a/hbase-shell/src/test/java/org/apache/hadoop/hbase/client/AbstractTestShell.java b/hbase-shell/src/test/java/org/apache/hadoop/hbase/client/AbstractTestShell.java index 87d14dd..074b9f7 100644 --- a/hbase-shell/src/test/java/org/apache/hadoop/hbase/client/AbstractTestShell.java +++ b/hbase-shell/src/test/java/org/apache/hadoop/hbase/client/AbstractTestShell.java @@ -37,7 +37,6 @@ public abstract class AbstractTestShell { @BeforeClass public static void setUpBeforeClass() throws Exception { // Start mini cluster - TEST_UTIL.getConfiguration().setBoolean("hbase.online.schema.update.enable", true); TEST_UTIL.getConfiguration().setInt("hbase.regionserver.msginterval", 100); TEST_UTIL.getConfiguration().setInt("hbase.client.pause", 250); TEST_UTIL.getConfiguration().setInt(HConstants.HBASE_CLIENT_RETRIES_NUMBER, 6); http://git-wip-us.apache.org/repos/asf/hbase/blob/d9463bcc/hbase-shell/src/test/rsgroup/org/apache/hadoop/hbase/client/rsgroup/TestShellRSGroups.java ---------------------------------------------------------------------- diff --git a/hbase-shell/src/test/rsgroup/org/apache/hadoop/hbase/client/rsgroup/TestShellRSGroups.java b/hbase-shell/src/test/rsgroup/org/apache/hadoop/hbase/client/rsgroup/TestShellRSGroups.java index 155bdb4..5f3720e 100644 --- a/hbase-shell/src/test/rsgroup/org/apache/hadoop/hbase/client/rsgroup/TestShellRSGroups.java +++ b/hbase-shell/src/test/rsgroup/org/apache/hadoop/hbase/client/rsgroup/TestShellRSGroups.java @@ -54,7 +54,6 @@ public class TestShellRSGroups { basePath = System.getProperty("basedir"); // Start mini cluster - TEST_UTIL.getConfiguration().setBoolean("hbase.online.schema.update.enable", true); TEST_UTIL.getConfiguration().setInt("hbase.regionserver.msginterval", 100); TEST_UTIL.getConfiguration().setInt("hbase.client.pause", 250); TEST_UTIL.getConfiguration().setInt(HConstants.HBASE_CLIENT_RETRIES_NUMBER, 6); http://git-wip-us.apache.org/repos/asf/hbase/blob/d9463bcc/src/main/asciidoc/_chapters/hbase-default.adoc ---------------------------------------------------------------------- diff --git a/src/main/asciidoc/_chapters/hbase-default.adoc b/src/main/asciidoc/_chapters/hbase-default.adoc index df750e0..7a65446 100644 --- a/src/main/asciidoc/_chapters/hbase-default.adoc +++ b/src/main/asciidoc/_chapters/hbase-default.adoc @@ -1585,16 +1585,6 @@ Set to true to cause the hosting server (master or regionserver) `true` -[[hbase.online.schema.update.enable]] -*`hbase.online.schema.update.enable`*:: -+ -.Description -Set true to enable online schema changes. -+ -.Default -`true` - - [[hbase.table.lock.enable]] *`hbase.table.lock.enable`*:: +