You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by ap...@apache.org on 2014/10/24 23:21:13 UTC
[2/2] git commit: HBASE-11964 Improve spreading replication load from
failed regionservers
HBASE-11964 Improve spreading replication load from failed regionservers
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/54fdd965
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/54fdd965
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/54fdd965
Branch: refs/heads/branch-1
Commit: 54fdd965168f671e981703e9069de485ec8b148e
Parents: b8ed37b
Author: Andrew Purtell <ap...@apache.org>
Authored: Fri Oct 24 14:17:46 2014 -0700
Committer: Andrew Purtell <ap...@apache.org>
Committed: Fri Oct 24 14:17:55 2014 -0700
----------------------------------------------------------------------
.../hbase/replication/regionserver/ReplicationSource.java | 7 ++++---
.../replication/regionserver/ReplicationSourceManager.java | 3 ++-
.../apache/hadoop/hbase/replication/TestReplicationBase.java | 2 ++
.../regionserver/TestReplicationSourceManager.java | 2 ++
4 files changed, 10 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hbase/blob/54fdd965/hbase-server/src/main/java/org/apache/hadoop/hbase/replication/regionserver/ReplicationSource.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/replication/regionserver/ReplicationSource.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/replication/regionserver/ReplicationSource.java
index 99c6b3d..1098de8 100644
--- a/hbase-server/src/main/java/org/apache/hadoop/hbase/replication/regionserver/ReplicationSource.java
+++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/replication/regionserver/ReplicationSource.java
@@ -161,7 +161,10 @@ public class ReplicationSource extends Thread
this.conf.getLong("replication.source.size.capacity", 1024*1024*64);
this.replicationQueueNbCapacity =
this.conf.getInt("replication.source.nb.capacity", 25000);
- this.maxRetriesMultiplier = this.conf.getInt("replication.source.maxretriesmultiplier", 10);
+ this.sleepForRetries =
+ this.conf.getLong("replication.source.sleepforretries", 1000); // 1 second
+ this.maxRetriesMultiplier =
+ this.conf.getInt("replication.source.maxretriesmultiplier", 300); // 5 minutes @ 1 sec per
this.queue =
new PriorityBlockingQueue<Path>(
this.conf.getInt("hbase.regionserver.maxlogs", 32),
@@ -171,8 +174,6 @@ public class ReplicationSource extends Thread
this.replicationQueues = replicationQueues;
this.replicationPeers = replicationPeers;
this.manager = manager;
- this.sleepForRetries =
- this.conf.getLong("replication.source.sleepforretries", 1000);
this.fs = fs;
this.metrics = metrics;
this.repLogReader = new ReplicationHLogReaderManager(this.fs, this.conf);
http://git-wip-us.apache.org/repos/asf/hbase/blob/54fdd965/hbase-server/src/main/java/org/apache/hadoop/hbase/replication/regionserver/ReplicationSourceManager.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/replication/regionserver/ReplicationSourceManager.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/replication/regionserver/ReplicationSourceManager.java
index cb0f6ce..9a09543 100644
--- a/hbase-server/src/main/java/org/apache/hadoop/hbase/replication/regionserver/ReplicationSourceManager.java
+++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/replication/regionserver/ReplicationSourceManager.java
@@ -137,7 +137,8 @@ public class ReplicationSourceManager implements ReplicationListener {
this.fs = fs;
this.logDir = logDir;
this.oldLogDir = oldLogDir;
- this.sleepBeforeFailover = conf.getLong("replication.sleep.before.failover", 2000);
+ this.sleepBeforeFailover =
+ conf.getLong("replication.sleep.before.failover", 30000); // 30 seconds
this.clusterId = clusterId;
this.replicationTracker.registerListener(this);
this.replicationPeers.getAllPeerIds();
http://git-wip-us.apache.org/repos/asf/hbase/blob/54fdd965/hbase-server/src/test/java/org/apache/hadoop/hbase/replication/TestReplicationBase.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/replication/TestReplicationBase.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/replication/TestReplicationBase.java
index 9fe2e0b..ea524a1 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/replication/TestReplicationBase.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/replication/TestReplicationBase.java
@@ -99,6 +99,8 @@ public class TestReplicationBase {
conf1.setLong(HConstants.THREAD_WAKE_FREQUENCY, 100);
conf1.setInt("replication.stats.thread.period.seconds", 5);
conf1.setBoolean("hbase.tests.use.shortcircuit.reads", false);
+ conf1.setLong("replication.sleep.before.failover", 2000);
+ conf1.setInt("replication.source.maxretriesmultiplier", 10);
utility1 = new HBaseTestingUtility(conf1);
utility1.startMiniZKCluster();
http://git-wip-us.apache.org/repos/asf/hbase/blob/54fdd965/hbase-server/src/test/java/org/apache/hadoop/hbase/replication/regionserver/TestReplicationSourceManager.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/replication/regionserver/TestReplicationSourceManager.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/replication/regionserver/TestReplicationSourceManager.java
index 99ad601..a85878c 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/replication/regionserver/TestReplicationSourceManager.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/replication/regionserver/TestReplicationSourceManager.java
@@ -128,6 +128,8 @@ public class TestReplicationSourceManager {
ReplicationSourceDummy.class.getCanonicalName());
conf.setBoolean(HConstants.REPLICATION_ENABLE_KEY,
HConstants.REPLICATION_ENABLE_DEFAULT);
+ conf.setLong("replication.sleep.before.failover", 2000);
+ conf.setInt("replication.source.maxretriesmultiplier", 10);
utility = new HBaseTestingUtility(conf);
utility.startMiniZKCluster();