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 2015/08/04 21:57:30 UTC
[1/3] hbase git commit: HBASE-14146 Fix Once replication sees an
error it slows down forever
Repository: hbase
Updated Branches:
refs/heads/0.98 34a1f81ed -> a53b8e0d4
refs/heads/branch-1.0 83ef751d6 -> e0fa13685
refs/heads/branch-1.1 58a6038cb -> 7dcd3c0bd
HBASE-14146 Fix Once replication sees an error it slows down forever
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/7dcd3c0b
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/7dcd3c0b
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/7dcd3c0b
Branch: refs/heads/branch-1.1
Commit: 7dcd3c0bdfa8246cb7ca04bd1e21bae37776130b
Parents: 58a6038
Author: Elliott Clark <ec...@apache.org>
Authored: Wed Jul 22 14:50:16 2015 -0700
Committer: Andrew Purtell <ap...@apache.org>
Committed: Tue Aug 4 12:36:25 2015 -0700
----------------------------------------------------------------------
.../hadoop/hbase/replication/regionserver/ReplicationSource.java | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hbase/blob/7dcd3c0b/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 833eae6..1db6251 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
@@ -659,7 +659,7 @@ public class ReplicationSource extends Thread
* written to when this method was called
*/
protected void shipEdits(boolean currentWALisBeingWrittenTo, List<WAL.Entry> entries) {
- int sleepMultiplier = 1;
+ int sleepMultiplier = 0;
if (entries.isEmpty()) {
LOG.warn("Was given 0 edits to ship");
return;
@@ -696,6 +696,8 @@ public class ReplicationSource extends Thread
if (!replicated) {
continue;
+ } else {
+ sleepMultiplier = Math.max(sleepMultiplier-1, 0);
}
if (this.lastLoggedPosition != this.repLogReader.getPosition()) {
[3/3] hbase git commit: HBASE-14146 Fix Once replication sees an
error it slows down forever
Posted by ap...@apache.org.
HBASE-14146 Fix Once replication sees an error it slows down forever
Conflicts:
hbase-server/src/main/java/org/apache/hadoop/hbase/replication/regionserver/ReplicationSource.java
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/a53b8e0d
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/a53b8e0d
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/a53b8e0d
Branch: refs/heads/0.98
Commit: a53b8e0d4c4c6f60ea3ad60ef34be96cc0810368
Parents: 34a1f81
Author: Elliott Clark <ec...@apache.org>
Authored: Wed Jul 22 14:50:16 2015 -0700
Committer: Andrew Purtell <ap...@apache.org>
Committed: Tue Aug 4 12:37:44 2015 -0700
----------------------------------------------------------------------
.../hadoop/hbase/replication/regionserver/ReplicationSource.java | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hbase/blob/a53b8e0d/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 d684dbb..02ddfbd 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
@@ -649,7 +649,7 @@ public class ReplicationSource extends Thread
* written to when this method was called
*/
protected void shipEdits(boolean currentWALisBeingWrittenTo, List<HLog.Entry> entries) {
- int sleepMultiplier = 1;
+ int sleepMultiplier = 0;
if (entries.isEmpty()) {
LOG.warn("Was given 0 edits to ship");
return;
@@ -684,6 +684,8 @@ public class ReplicationSource extends Thread
if (!replicated) {
continue;
+ } else {
+ sleepMultiplier = Math.max(sleepMultiplier-1, 0);
}
if (this.lastLoggedPosition != this.repLogReader.getPosition()) {
[2/3] hbase git commit: HBASE-14146 Fix Once replication sees an
error it slows down forever
Posted by ap...@apache.org.
HBASE-14146 Fix Once replication sees an error it slows down forever
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/e0fa1368
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/e0fa1368
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/e0fa1368
Branch: refs/heads/branch-1.0
Commit: e0fa13685ac78132dfb1a46b18d089b2f55b9b22
Parents: 83ef751
Author: Elliott Clark <ec...@apache.org>
Authored: Wed Jul 22 14:50:16 2015 -0700
Committer: Andrew Purtell <ap...@apache.org>
Committed: Tue Aug 4 12:36:40 2015 -0700
----------------------------------------------------------------------
.../hadoop/hbase/replication/regionserver/ReplicationSource.java | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hbase/blob/e0fa1368/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 d332279..482a4e7 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
@@ -659,7 +659,7 @@ public class ReplicationSource extends Thread
* written to when this method was called
*/
protected void shipEdits(boolean currentWALisBeingWrittenTo, List<WAL.Entry> entries) {
- int sleepMultiplier = 1;
+ int sleepMultiplier = 0;
if (entries.isEmpty()) {
LOG.warn("Was given 0 edits to ship");
return;
@@ -694,6 +694,8 @@ public class ReplicationSource extends Thread
if (!replicated) {
continue;
+ } else {
+ sleepMultiplier = Math.max(sleepMultiplier-1, 0);
}
if (this.lastLoggedPosition != this.repLogReader.getPosition()) {