Index: src/test/java/org/apache/hadoop/hbase/TestRegionRebalancing.java
===================================================================
--- src/test/java/org/apache/hadoop/hbase/TestRegionRebalancing.java (revision 1038359)
+++ src/test/java/org/apache/hadoop/hbase/TestRegionRebalancing.java (working copy)
@@ -156,8 +156,10 @@
* rounded up.
*/
private void assertRegionsAreBalanced() {
+ // TODO: Fix this test. Old balancer used to run with 'slop'. New
+ // balancer does not.
boolean success = false;
- float slop = conf.getFloat("hbase.regions.slop", (float)0.1);
+ float slop = (float)0.1;
if (slop <= 0) slop = 1;
for (int i = 0; i < 5; i++) {
@@ -242,4 +244,4 @@
region.getLog().closeAndDelete();
return region;
}
-}
\ No newline at end of file
+}
Index: src/test/java/org/apache/hadoop/hbase/master/TestMasterTransitions.java
===================================================================
--- src/test/java/org/apache/hadoop/hbase/master/TestMasterTransitions.java (revision 1038359)
+++ src/test/java/org/apache/hadoop/hbase/master/TestMasterTransitions.java (working copy)
@@ -57,11 +57,6 @@
*/
@BeforeClass public static void beforeAllTests() throws Exception {
TEST_UTIL.getConfiguration().setBoolean("dfs.support.append", true);
- // Parcel out the regions, don't give them out in big lumps. We've only
- // a few in this test. Let a couple of cycles pass is more realistic and
- // gives stuff a chance to work.
- TEST_UTIL.getConfiguration().setInt("hbase.regions.percheckin", 2);
- // Start a cluster of two regionservers.
TEST_UTIL.startMiniCluster(2);
// Create a table of three families. This will assign a region.
TEST_UTIL.createTable(Bytes.toBytes(TABLENAME), FAMILIES);
Index: src/test/java/org/apache/hadoop/hbase/replication/TestReplication.java
===================================================================
--- src/test/java/org/apache/hadoop/hbase/replication/TestReplication.java (revision 1038359)
+++ src/test/java/org/apache/hadoop/hbase/replication/TestReplication.java (working copy)
@@ -94,7 +94,6 @@
conf1.setInt("hbase.regionserver.maxlogs", 10);
conf1.setLong("hbase.master.logcleaner.ttl", 10);
conf1.setLong("hbase.client.retries.number", 5);
- conf1.setLong("hbase.regions.percheckin", 1);
conf1.setBoolean(HConstants.REPLICATION_ENABLE_KEY, true);
conf1.setBoolean("dfs.support.append", true);
conf1.setLong(HConstants.THREAD_WAKE_FREQUENCY, 100);
@@ -111,7 +110,6 @@
conf2.setInt("hbase.client.retries.number", 6);
conf2.setBoolean(HConstants.REPLICATION_ENABLE_KEY, true);
conf2.setBoolean("dfs.support.append", true);
- conf2.setLong("hbase.regions.percheckin", 1);
utility2 = new HBaseTestingUtility(conf2);
utility2.setZkCluster(miniZK);
Index: src/main/java/org/apache/hadoop/hbase/HConstants.java
===================================================================
--- src/main/java/org/apache/hadoop/hbase/HConstants.java (revision 1038359)
+++ src/main/java/org/apache/hadoop/hbase/HConstants.java (working copy)
@@ -93,16 +93,6 @@
/** Name of ZooKeeper config file in conf/ directory. */
public static final String ZOOKEEPER_CONFIG_NAME = "zoo.cfg";
- /** Parameter name for number of times to retry writes to ZooKeeper. */
- public static final String ZOOKEEPER_RETRIES = "zookeeper.retries";
- /** Default number of times to retry writes to ZooKeeper. */
- public static final int DEFAULT_ZOOKEEPER_RETRIES = 5;
-
- /** Parameter name for ZooKeeper pause between retries. In milliseconds. */
- public static final String ZOOKEEPER_PAUSE = "zookeeper.pause";
- /** Default ZooKeeper pause value. In milliseconds. */
- public static final int DEFAULT_ZOOKEEPER_PAUSE = 2 * 1000;
-
/** default client port that the zookeeper listens on */
public static final int DEFAULT_ZOOKEPER_CLIENT_PORT = 2181;
@@ -138,12 +128,6 @@
/** Default value for thread wake frequency */
public static final int DEFAULT_THREAD_WAKE_FREQUENCY = 10 * 1000;
- /** Number of retries for the client */
- public static final String NUM_CLIENT_RETRIES = "hbase.client.retries.number";
-
- /** Default number of retries for the client */
- public static final int DEFAULT_NUM_CLIENT_RETRIES = 2;
-
/** Parameter name for how often a region should should perform a major compaction */
public static final String MAJOR_COMPACTION_PERIOD = "hbase.hregion.majorcompaction";
@@ -288,11 +272,6 @@
*/
public static final int WEEK_IN_SECONDS = 7 * 24 * 3600;
- //TODO: HBASE_CLIENT_RETRIES_NUMBER_KEY is only used by TestMigrate. Move it
- // there.
- public static final String HBASE_CLIENT_RETRIES_NUMBER_KEY =
- "hbase.client.retries.number";
-
//TODO: although the following are referenced widely to format strings for
// the shell. They really aren't a part of the public API. It would be
// nice if we could put them somewhere where they did not need to be
Index: src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java
===================================================================
--- src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java (revision 1038359)
+++ src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java (working copy)
@@ -285,10 +285,10 @@
}
// Config'ed params
- this.numRetries = conf.getInt("hbase.client.retries.number", 2);
+ this.numRetries = conf.getInt("hbase.client.retries.number", 10);
this.threadWakeFrequency = conf.getInt(HConstants.THREAD_WAKE_FREQUENCY,
10 * 1000);
- this.msgInterval = conf.getInt("hbase.regionserver.msginterval", 1 * 1000);
+ this.msgInterval = conf.getInt("hbase.regionserver.msginterval", 3 * 1000);
sleeper = new Sleeper(this.msgInterval, this);
@@ -318,7 +318,7 @@
new Class>[]{HRegionInterface.class, HBaseRPCErrorHandler.class,
OnlineRegions.class},
address.getBindAddress(),
- address.getPort(), conf.getInt("hbase.regionserver.handler.count", 10),
+ address.getPort(), conf.getInt("hbase.regionserver.handler.count", 25),
conf.getInt("hbase.regionserver.metahandler.count", 10),
false, conf, QOS_THRESHOLD);
this.server.setErrorHandler(this);
Index: src/main/java/org/apache/hadoop/hbase/regionserver/MemStoreFlusher.java
===================================================================
--- src/main/java/org/apache/hadoop/hbase/regionserver/MemStoreFlusher.java (revision 1038359)
+++ src/main/java/org/apache/hadoop/hbase/regionserver/MemStoreFlusher.java (working copy)
@@ -67,7 +67,7 @@
protected final long globalMemStoreLimitLowMark;
private static final float DEFAULT_UPPER = 0.4f;
- private static final float DEFAULT_LOWER = 0.25f;
+ private static final float DEFAULT_LOWER = 0.35f;
private static final String UPPER_KEY =
"hbase.regionserver.global.memstore.upperLimit";
private static final String LOWER_KEY =
@@ -96,7 +96,7 @@
}
this.globalMemStoreLimitLowMark = lower;
this.blockingStoreFilesNumber =
- conf.getInt("hbase.hstore.blockingStoreFiles", -1);
+ conf.getInt("hbase.hstore.blockingStoreFiles", 7);
if (this.blockingStoreFilesNumber == -1) {
this.blockingStoreFilesNumber = 1 +
conf.getInt("hbase.hstore.compactionThreshold", 3);
Index: src/main/java/org/apache/hadoop/hbase/regionserver/Store.java
===================================================================
--- src/main/java/org/apache/hadoop/hbase/regionserver/Store.java (revision 1038359)
+++ src/main/java/org/apache/hadoop/hbase/regionserver/Store.java (working copy)
@@ -192,7 +192,7 @@
}
this.desiredMaxFileSize = maxFileSize;
this.blockingStoreFileCount =
- conf.getInt("hbase.hstore.blockingStoreFiles", -1);
+ conf.getInt("hbase.hstore.blockingStoreFiles", 7);
this.majorCompactionTime = getNextMajorCompactTime();
Index: src/main/java/org/apache/hadoop/hbase/regionserver/StoreFile.java
===================================================================
--- src/main/java/org/apache/hadoop/hbase/regionserver/StoreFile.java (revision 1038359)
+++ src/main/java/org/apache/hadoop/hbase/regionserver/StoreFile.java (working copy)
@@ -337,7 +337,7 @@
public static synchronized BlockCache getBlockCache(Configuration conf) {
if (hfileBlockCache != null) return hfileBlockCache;
- float cachePercentage = conf.getFloat(HFILE_BLOCK_CACHE_SIZE_KEY, 0.0f);
+ float cachePercentage = conf.getFloat(HFILE_BLOCK_CACHE_SIZE_KEY, 0.2f);
// There should be a better way to optimize this. But oh well.
if (cachePercentage == 0L) return null;
if (cachePercentage > 1.0) {
Index: src/main/java/org/apache/hadoop/hbase/rest/Main.java
===================================================================
--- src/main/java/org/apache/hadoop/hbase/rest/Main.java (revision 1038359)
+++ src/main/java/org/apache/hadoop/hbase/rest/Main.java (working copy)
@@ -71,8 +71,7 @@
RESTServlet servlet = RESTServlet.getInstance(conf);
Options options = new Options();
- options.addOption("p", "port", true, "Port to bind to [default:" +
- DEFAULT_LISTEN_PORT + "]");
+ options.addOption("p", "port", true, "Port to bind to [default: 8080]");
options.addOption("ro", "readonly", false, "Respond only to GET HTTP " +
"method requests [default: false]");
@@ -124,8 +123,7 @@
// set up Jetty and run the embedded server
- int port = servlet.getConfiguration().getInt("hbase.rest.port",
- DEFAULT_LISTEN_PORT);
+ int port = servlet.getConfiguration().getInt("hbase.rest.port", 8080);
Server server = new Server(port);
server.setSendServerVersion(false);
Index: src/main/java/org/apache/hadoop/hbase/master/HMaster.java
===================================================================
--- src/main/java/org/apache/hadoop/hbase/master/HMaster.java (revision 1038359)
+++ src/main/java/org/apache/hadoop/hbase/master/HMaster.java (working copy)
@@ -189,7 +189,7 @@
* The RPC server ports can be ephemeral. Create a ZKW instance.
*/
HServerAddress a = new HServerAddress(getMyAddress(this.conf));
- int numHandlers = conf.getInt("hbase.regionserver.handler.count", 10);
+ int numHandlers = conf.getInt("hbase.regionserver.handler.count", 25);
this.rpcServer = HBaseRPC.getServer(this,
new Class>[]{HMasterInterface.class, HMasterRegionInterface.class},
a.getBindAddress(), a.getPort(),
Index: src/main/java/org/apache/hadoop/hbase/ipc/HBaseClient.java
===================================================================
--- src/main/java/org/apache/hadoop/hbase/ipc/HBaseClient.java (revision 1038359)
+++ src/main/java/org/apache/hadoop/hbase/ipc/HBaseClient.java (working copy)
@@ -659,7 +659,7 @@
this.maxIdleTime =
conf.getInt("hbase.ipc.client.connection.maxidletime", 10000); //10s
this.maxRetries = conf.getInt("hbase.ipc.client.connect.max.retries", 0);
- this.failureSleep = conf.getInt("hbase.client.pause", 2000);
+ this.failureSleep = conf.getInt("hbase.client.pause", 1000);
this.tcpNoDelay = conf.getBoolean("hbase.ipc.client.tcpnodelay", false);
this.tcpKeepAlive = conf.getBoolean("hbase.ipc.client.tcpkeepalive", true);
this.pingInterval = getPingInterval(conf);
Index: src/main/java/org/apache/hadoop/hbase/client/HBaseAdmin.java
===================================================================
--- src/main/java/org/apache/hadoop/hbase/client/HBaseAdmin.java (revision 1038359)
+++ src/main/java/org/apache/hadoop/hbase/client/HBaseAdmin.java (working copy)
@@ -80,8 +80,8 @@
throws MasterNotRunningException, ZooKeeperConnectionException {
this.connection = HConnectionManager.getConnection(conf);
this.conf = conf;
- this.pause = conf.getLong("hbase.client.pause", 30 * 1000);
- this.numRetries = conf.getInt("hbase.client.retries.number", 5);
+ this.pause = conf.getLong("hbase.client.pause", 1000);
+ this.numRetries = conf.getInt("hbase.client.retries.number", 10);
this.connection.getMaster();
}
Index: src/main/resources/hbase-default.xml
===================================================================
--- src/main/resources/hbase-default.xml (revision 1038359)
+++ src/main/resources/hbase-default.xml (working copy)
@@ -275,7 +275,7 @@
- hbase.master.balancer.period
+ hbase.balancer.period
300000
Period at which the region balancer runs in the Master.
@@ -461,22 +461,6 @@
- zookeeper.retries
- 5
- How many times to retry connections to ZooKeeper. Used for
- reading/writing root region location. Used together with ${zookeeper.pause}
- in an exponential backoff fashion when making queries to ZooKeeper.
-
-
-
- zookeeper.pause
- 2000
- Sleep time between retries to ZooKeeper. In milliseconds. Used
- together with ${zookeeper.retries} in an exponential backoff fashion when
- making queries to ZooKeeper.
-
-
-
zookeeper.znode.parent
/hbase
Root ZNode for HBase in ZooKeeper. All of HBase's ZooKeeper