hbase git commit: HBASE-15424 Add bulk load hfile-refs for replication in ZK after the event is appended in the WAL (Ashish)
Repository: hbase Updated Branches: refs/heads/HBASE-7912 e2b40ddb4 -> da8840325 HBASE-15424 Add bulk load hfile-refs for replication in ZK after the event is appended in the WAL (Ashish) Project: http://git-wip-us.apache.org/repos/asf/hbase/repo Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/da884032 Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/da884032 Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/da884032 Branch: refs/heads/HBASE-7912 Commit: da8840325937d6147c042221f6211c81cc995058 Parents: e2b40dd Author: tedyu Authored: Mon Sep 12 09:52:24 2016 -0700 Committer: tedyu Committed: Mon Sep 12 09:52:24 2016 -0700 -- .../hadoop/hbase/regionserver/wal/FSHLog.java | 4 +- .../hbase/regionserver/wal/MetricsWAL.java | 7 ++- .../regionserver/wal/WALActionsListener.java| 10 +++- .../replication/regionserver/Replication.java | 50 .../hadoop/hbase/wal/DisabledWALProvider.java | 7 +-- .../hbase/regionserver/wal/TestMetricsWAL.java | 6 +-- .../hbase/wal/WALPerformanceEvaluation.java | 3 +- 7 files changed, 56 insertions(+), 31 deletions(-) -- http://git-wip-us.apache.org/repos/asf/hbase/blob/da884032/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/wal/FSHLog.java -- diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/wal/FSHLog.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/wal/FSHLog.java index 31f05c2..3c744d6 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/wal/FSHLog.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/wal/FSHLog.java @@ -1438,14 +1438,14 @@ public class FSHLog implements WAL { } } - private long postAppend(final Entry e, final long elapsedTime) { + private long postAppend(final Entry e, final long elapsedTime) throws IOException { long len = 0; if (!listeners.isEmpty()) { for (Cell cell : e.getEdit().getCells()) { len += CellUtil.estimatedSerializedSizeOf(cell); } for (WALActionsListener listener : listeners) { -listener.postAppend(len, elapsedTime); +listener.postAppend(len, elapsedTime, e.getKey(), e.getEdit()); } } return len; http://git-wip-us.apache.org/repos/asf/hbase/blob/da884032/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/wal/MetricsWAL.java -- diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/wal/MetricsWAL.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/wal/MetricsWAL.java index 24fd940..e0f4a61 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/wal/MetricsWAL.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/wal/MetricsWAL.java @@ -20,9 +20,13 @@ package org.apache.hadoop.hbase.regionserver.wal; import com.google.common.annotations.VisibleForTesting; + +import java.io.IOException; + import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.apache.hadoop.hbase.classification.InterfaceAudience; +import org.apache.hadoop.hbase.wal.WALKey; import org.apache.hadoop.hbase.CompatibilitySingletonFactory; import org.apache.hadoop.util.StringUtils; @@ -51,7 +55,8 @@ public class MetricsWAL extends WALActionsListener.Base { } @Override - public void postAppend(final long size, final long time) { + public void postAppend(final long size, final long time, final WALKey logkey, + final WALEdit logEdit) throws IOException { source.incrementAppendCount(); source.incrementAppendTime(time); source.incrementAppendSize(size); http://git-wip-us.apache.org/repos/asf/hbase/blob/da884032/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/wal/WALActionsListener.java -- diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/wal/WALActionsListener.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/wal/WALActionsListener.java index a6452e2..adcc6eb 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/wal/WALActionsListener.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/wal/WALActionsListener.java @@ -98,8 +98,12 @@ public interface WALActionsListener { * TODO: Combine this with above. * @param entryLen approx length of cells in this append. * @param elapsedTimeMillis elapsed time in milliseconds. + * @param logKey A WAL key + * @param logEdit A WAL edit containing list of cells. + * @throws IOException if any network or I/O error occurred */ -
[04/24] hbase git commit: HBASE-15424 Add bulk load hfile-refs for replication in ZK after the event is appended in the WAL
HBASE-15424 Add bulk load hfile-refs for replication in ZK after the event is appended in the WAL Project: http://git-wip-us.apache.org/repos/asf/hbase/repo Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/25419d8b Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/25419d8b Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/25419d8b Branch: refs/heads/hbase-12439 Commit: 25419d8b18dd8f35a102614cd31b274659f747ef Parents: 5d79790 Author: Ashish Singhi Authored: Fri Apr 1 15:40:36 2016 +0530 Committer: Ashish Singhi Committed: Fri Apr 1 15:40:36 2016 +0530 -- .../hbase/regionserver/wal/AbstractFSWAL.java | 4 +- .../hbase/regionserver/wal/MetricsWAL.java | 7 ++- .../regionserver/wal/WALActionsListener.java| 10 +++- .../replication/regionserver/Replication.java | 50 .../hadoop/hbase/wal/DisabledWALProvider.java | 7 +-- .../hbase/regionserver/wal/TestMetricsWAL.java | 10 ++-- .../hbase/wal/WALPerformanceEvaluation.java | 3 +- 7 files changed, 58 insertions(+), 33 deletions(-) -- http://git-wip-us.apache.org/repos/asf/hbase/blob/25419d8b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/wal/AbstractFSWAL.java -- diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/wal/AbstractFSWAL.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/wal/AbstractFSWAL.java index f189ff1..b89488a 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/wal/AbstractFSWAL.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/wal/AbstractFSWAL.java @@ -840,14 +840,14 @@ public abstract class AbstractFSWAL implements WAL { return true; } - private long postAppend(final Entry e, final long elapsedTime) { + private long postAppend(final Entry e, final long elapsedTime) throws IOException { long len = 0; if (!listeners.isEmpty()) { for (Cell cell : e.getEdit().getCells()) { len += CellUtil.estimatedSerializedSizeOf(cell); } for (WALActionsListener listener : listeners) { -listener.postAppend(len, elapsedTime); +listener.postAppend(len, elapsedTime, e.getKey(), e.getEdit()); } } return len; http://git-wip-us.apache.org/repos/asf/hbase/blob/25419d8b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/wal/MetricsWAL.java -- diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/wal/MetricsWAL.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/wal/MetricsWAL.java index 99792e5..69a31cd 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/wal/MetricsWAL.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/wal/MetricsWAL.java @@ -20,9 +20,13 @@ package org.apache.hadoop.hbase.regionserver.wal; import com.google.common.annotations.VisibleForTesting; + +import java.io.IOException; + import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.apache.hadoop.hbase.classification.InterfaceAudience; +import org.apache.hadoop.hbase.wal.WALKey; import org.apache.hadoop.hbase.CompatibilitySingletonFactory; import org.apache.hadoop.util.StringUtils; @@ -51,7 +55,8 @@ public class MetricsWAL extends WALActionsListener.Base { } @Override - public void postAppend(final long size, final long time) { + public void postAppend(final long size, final long time, final WALKey logkey, + final WALEdit logEdit) throws IOException { source.incrementAppendCount(); source.incrementAppendTime(time); source.incrementAppendSize(size); http://git-wip-us.apache.org/repos/asf/hbase/blob/25419d8b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/wal/WALActionsListener.java -- diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/wal/WALActionsListener.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/wal/WALActionsListener.java index a6452e2..adcc6eb 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/wal/WALActionsListener.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/wal/WALActionsListener.java @@ -98,8 +98,12 @@ public interface WALActionsListener { * TODO: Combine this with above. * @param entryLen approx length of cells in this append. * @param elapsedTimeMillis elapsed time in milliseconds. + * @param logKey A WAL key + * @param logEdit A WAL edit containing list of cells. + * @throws IOException if any network or I/O error occurred */ - void postAppend(
[29/52] [abbrv] hbase git commit: HBASE-15424 Add bulk load hfile-refs for replication in ZK after the event is appended in the WAL
HBASE-15424 Add bulk load hfile-refs for replication in ZK after the event is appended in the WAL Project: http://git-wip-us.apache.org/repos/asf/hbase/repo Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/25419d8b Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/25419d8b Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/25419d8b Branch: refs/heads/HBASE-14850 Commit: 25419d8b18dd8f35a102614cd31b274659f747ef Parents: 5d79790 Author: Ashish Singhi Authored: Fri Apr 1 15:40:36 2016 +0530 Committer: Ashish Singhi Committed: Fri Apr 1 15:40:36 2016 +0530 -- .../hbase/regionserver/wal/AbstractFSWAL.java | 4 +- .../hbase/regionserver/wal/MetricsWAL.java | 7 ++- .../regionserver/wal/WALActionsListener.java| 10 +++- .../replication/regionserver/Replication.java | 50 .../hadoop/hbase/wal/DisabledWALProvider.java | 7 +-- .../hbase/regionserver/wal/TestMetricsWAL.java | 10 ++-- .../hbase/wal/WALPerformanceEvaluation.java | 3 +- 7 files changed, 58 insertions(+), 33 deletions(-) -- http://git-wip-us.apache.org/repos/asf/hbase/blob/25419d8b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/wal/AbstractFSWAL.java -- diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/wal/AbstractFSWAL.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/wal/AbstractFSWAL.java index f189ff1..b89488a 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/wal/AbstractFSWAL.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/wal/AbstractFSWAL.java @@ -840,14 +840,14 @@ public abstract class AbstractFSWAL implements WAL { return true; } - private long postAppend(final Entry e, final long elapsedTime) { + private long postAppend(final Entry e, final long elapsedTime) throws IOException { long len = 0; if (!listeners.isEmpty()) { for (Cell cell : e.getEdit().getCells()) { len += CellUtil.estimatedSerializedSizeOf(cell); } for (WALActionsListener listener : listeners) { -listener.postAppend(len, elapsedTime); +listener.postAppend(len, elapsedTime, e.getKey(), e.getEdit()); } } return len; http://git-wip-us.apache.org/repos/asf/hbase/blob/25419d8b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/wal/MetricsWAL.java -- diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/wal/MetricsWAL.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/wal/MetricsWAL.java index 99792e5..69a31cd 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/wal/MetricsWAL.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/wal/MetricsWAL.java @@ -20,9 +20,13 @@ package org.apache.hadoop.hbase.regionserver.wal; import com.google.common.annotations.VisibleForTesting; + +import java.io.IOException; + import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.apache.hadoop.hbase.classification.InterfaceAudience; +import org.apache.hadoop.hbase.wal.WALKey; import org.apache.hadoop.hbase.CompatibilitySingletonFactory; import org.apache.hadoop.util.StringUtils; @@ -51,7 +55,8 @@ public class MetricsWAL extends WALActionsListener.Base { } @Override - public void postAppend(final long size, final long time) { + public void postAppend(final long size, final long time, final WALKey logkey, + final WALEdit logEdit) throws IOException { source.incrementAppendCount(); source.incrementAppendTime(time); source.incrementAppendSize(size); http://git-wip-us.apache.org/repos/asf/hbase/blob/25419d8b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/wal/WALActionsListener.java -- diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/wal/WALActionsListener.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/wal/WALActionsListener.java index a6452e2..adcc6eb 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/wal/WALActionsListener.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/wal/WALActionsListener.java @@ -98,8 +98,12 @@ public interface WALActionsListener { * TODO: Combine this with above. * @param entryLen approx length of cells in this append. * @param elapsedTimeMillis elapsed time in milliseconds. + * @param logKey A WAL key + * @param logEdit A WAL edit containing list of cells. + * @throws IOException if any network or I/O error occurred */ - void postAppend(
hbase git commit: HBASE-15424 Add bulk load hfile-refs for replication in ZK after the event is appended in the WAL
Repository: hbase Updated Branches: refs/heads/branch-1.3 8a572b92b -> ec2822c00 HBASE-15424 Add bulk load hfile-refs for replication in ZK after the event is appended in the WAL (cherry picked from commit bcbef7b401e211ad7cfcdcd176abafe7f30dbbe8) Project: http://git-wip-us.apache.org/repos/asf/hbase/repo Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/ec2822c0 Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/ec2822c0 Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/ec2822c0 Branch: refs/heads/branch-1.3 Commit: ec2822c002d30a081590c2431af2f0dd522452a9 Parents: 8a572b9 Author: Ashish Singhi Authored: Fri Apr 1 15:55:08 2016 +0530 Committer: Ashish Singhi Committed: Fri Apr 1 16:00:32 2016 +0530 -- .../hadoop/hbase/regionserver/wal/FSHLog.java | 4 +-- .../hbase/regionserver/wal/MetricsWAL.java | 7 +++- .../regionserver/wal/WALActionsListener.java| 10 -- .../replication/regionserver/Replication.java | 35 +--- .../hadoop/hbase/wal/DisabledWALProvider.java | 4 +-- .../hbase/regionserver/wal/TestMetricsWAL.java | 4 +-- .../hbase/wal/WALPerformanceEvaluation.java | 3 +- 7 files changed, 53 insertions(+), 14 deletions(-) -- http://git-wip-us.apache.org/repos/asf/hbase/blob/ec2822c0/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/wal/FSHLog.java -- diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/wal/FSHLog.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/wal/FSHLog.java index eb1cf57..c01cc1c 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/wal/FSHLog.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/wal/FSHLog.java @@ -1399,14 +1399,14 @@ public class FSHLog implements WAL { } } - private long postAppend(final Entry e, final long elapsedTime) { + private long postAppend(final Entry e, final long elapsedTime) throws IOException { long len = 0; if (!listeners.isEmpty()) { for (Cell cell : e.getEdit().getCells()) { len += CellUtil.estimatedSerializedSizeOf(cell); } for (WALActionsListener listener : listeners) { -listener.postAppend(len, elapsedTime); +listener.postAppend(len, elapsedTime, e.getKey(), e.getEdit()); } } return len; http://git-wip-us.apache.org/repos/asf/hbase/blob/ec2822c0/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/wal/MetricsWAL.java -- diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/wal/MetricsWAL.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/wal/MetricsWAL.java index 99792e5..69a31cd 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/wal/MetricsWAL.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/wal/MetricsWAL.java @@ -20,9 +20,13 @@ package org.apache.hadoop.hbase.regionserver.wal; import com.google.common.annotations.VisibleForTesting; + +import java.io.IOException; + import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.apache.hadoop.hbase.classification.InterfaceAudience; +import org.apache.hadoop.hbase.wal.WALKey; import org.apache.hadoop.hbase.CompatibilitySingletonFactory; import org.apache.hadoop.util.StringUtils; @@ -51,7 +55,8 @@ public class MetricsWAL extends WALActionsListener.Base { } @Override - public void postAppend(final long size, final long time) { + public void postAppend(final long size, final long time, final WALKey logkey, + final WALEdit logEdit) throws IOException { source.incrementAppendCount(); source.incrementAppendTime(time); source.incrementAppendSize(size); http://git-wip-us.apache.org/repos/asf/hbase/blob/ec2822c0/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/wal/WALActionsListener.java -- diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/wal/WALActionsListener.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/wal/WALActionsListener.java index db98083..60ab7b8 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/wal/WALActionsListener.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/wal/WALActionsListener.java @@ -101,8 +101,12 @@ public interface WALActionsListener { * TODO: Combine this with above. * @param entryLen approx length of cells in this append. * @param elapsedTimeMillis elapsed time in milliseconds. + * @param logKey A WAL key + * @param logEdit A WAL edit containing list
hbase git commit: HBASE-15424 Add bulk load hfile-refs for replication in ZK after the event is appended in the WAL
Repository: hbase Updated Branches: refs/heads/branch-1 d7d12aedd -> bcbef7b40 HBASE-15424 Add bulk load hfile-refs for replication in ZK after the event is appended in the WAL Project: http://git-wip-us.apache.org/repos/asf/hbase/repo Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/bcbef7b4 Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/bcbef7b4 Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/bcbef7b4 Branch: refs/heads/branch-1 Commit: bcbef7b401e211ad7cfcdcd176abafe7f30dbbe8 Parents: d7d12ae Author: Ashish Singhi Authored: Fri Apr 1 15:55:08 2016 +0530 Committer: Ashish Singhi Committed: Fri Apr 1 15:55:08 2016 +0530 -- .../hadoop/hbase/regionserver/wal/FSHLog.java | 4 +-- .../hbase/regionserver/wal/MetricsWAL.java | 7 +++- .../regionserver/wal/WALActionsListener.java| 10 -- .../replication/regionserver/Replication.java | 35 +--- .../hadoop/hbase/wal/DisabledWALProvider.java | 4 +-- .../hbase/regionserver/wal/TestMetricsWAL.java | 4 +-- .../hbase/wal/WALPerformanceEvaluation.java | 3 +- 7 files changed, 53 insertions(+), 14 deletions(-) -- http://git-wip-us.apache.org/repos/asf/hbase/blob/bcbef7b4/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/wal/FSHLog.java -- diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/wal/FSHLog.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/wal/FSHLog.java index eb1cf57..c01cc1c 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/wal/FSHLog.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/wal/FSHLog.java @@ -1399,14 +1399,14 @@ public class FSHLog implements WAL { } } - private long postAppend(final Entry e, final long elapsedTime) { + private long postAppend(final Entry e, final long elapsedTime) throws IOException { long len = 0; if (!listeners.isEmpty()) { for (Cell cell : e.getEdit().getCells()) { len += CellUtil.estimatedSerializedSizeOf(cell); } for (WALActionsListener listener : listeners) { -listener.postAppend(len, elapsedTime); +listener.postAppend(len, elapsedTime, e.getKey(), e.getEdit()); } } return len; http://git-wip-us.apache.org/repos/asf/hbase/blob/bcbef7b4/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/wal/MetricsWAL.java -- diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/wal/MetricsWAL.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/wal/MetricsWAL.java index 99792e5..69a31cd 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/wal/MetricsWAL.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/wal/MetricsWAL.java @@ -20,9 +20,13 @@ package org.apache.hadoop.hbase.regionserver.wal; import com.google.common.annotations.VisibleForTesting; + +import java.io.IOException; + import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.apache.hadoop.hbase.classification.InterfaceAudience; +import org.apache.hadoop.hbase.wal.WALKey; import org.apache.hadoop.hbase.CompatibilitySingletonFactory; import org.apache.hadoop.util.StringUtils; @@ -51,7 +55,8 @@ public class MetricsWAL extends WALActionsListener.Base { } @Override - public void postAppend(final long size, final long time) { + public void postAppend(final long size, final long time, final WALKey logkey, + final WALEdit logEdit) throws IOException { source.incrementAppendCount(); source.incrementAppendTime(time); source.incrementAppendSize(size); http://git-wip-us.apache.org/repos/asf/hbase/blob/bcbef7b4/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/wal/WALActionsListener.java -- diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/wal/WALActionsListener.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/wal/WALActionsListener.java index db98083..60ab7b8 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/wal/WALActionsListener.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/wal/WALActionsListener.java @@ -101,8 +101,12 @@ public interface WALActionsListener { * TODO: Combine this with above. * @param entryLen approx length of cells in this append. * @param elapsedTimeMillis elapsed time in milliseconds. + * @param logKey A WAL key + * @param logEdit A WAL edit containing list of cells. + * @throws IOException if any network or I/O occurred */
hbase git commit: HBASE-15424 Add bulk load hfile-refs for replication in ZK after the event is appended in the WAL
Repository: hbase Updated Branches: refs/heads/master 5d79790c5 -> 25419d8b1 HBASE-15424 Add bulk load hfile-refs for replication in ZK after the event is appended in the WAL Project: http://git-wip-us.apache.org/repos/asf/hbase/repo Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/25419d8b Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/25419d8b Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/25419d8b Branch: refs/heads/master Commit: 25419d8b18dd8f35a102614cd31b274659f747ef Parents: 5d79790 Author: Ashish Singhi Authored: Fri Apr 1 15:40:36 2016 +0530 Committer: Ashish Singhi Committed: Fri Apr 1 15:40:36 2016 +0530 -- .../hbase/regionserver/wal/AbstractFSWAL.java | 4 +- .../hbase/regionserver/wal/MetricsWAL.java | 7 ++- .../regionserver/wal/WALActionsListener.java| 10 +++- .../replication/regionserver/Replication.java | 50 .../hadoop/hbase/wal/DisabledWALProvider.java | 7 +-- .../hbase/regionserver/wal/TestMetricsWAL.java | 10 ++-- .../hbase/wal/WALPerformanceEvaluation.java | 3 +- 7 files changed, 58 insertions(+), 33 deletions(-) -- http://git-wip-us.apache.org/repos/asf/hbase/blob/25419d8b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/wal/AbstractFSWAL.java -- diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/wal/AbstractFSWAL.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/wal/AbstractFSWAL.java index f189ff1..b89488a 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/wal/AbstractFSWAL.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/wal/AbstractFSWAL.java @@ -840,14 +840,14 @@ public abstract class AbstractFSWAL implements WAL { return true; } - private long postAppend(final Entry e, final long elapsedTime) { + private long postAppend(final Entry e, final long elapsedTime) throws IOException { long len = 0; if (!listeners.isEmpty()) { for (Cell cell : e.getEdit().getCells()) { len += CellUtil.estimatedSerializedSizeOf(cell); } for (WALActionsListener listener : listeners) { -listener.postAppend(len, elapsedTime); +listener.postAppend(len, elapsedTime, e.getKey(), e.getEdit()); } } return len; http://git-wip-us.apache.org/repos/asf/hbase/blob/25419d8b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/wal/MetricsWAL.java -- diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/wal/MetricsWAL.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/wal/MetricsWAL.java index 99792e5..69a31cd 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/wal/MetricsWAL.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/wal/MetricsWAL.java @@ -20,9 +20,13 @@ package org.apache.hadoop.hbase.regionserver.wal; import com.google.common.annotations.VisibleForTesting; + +import java.io.IOException; + import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.apache.hadoop.hbase.classification.InterfaceAudience; +import org.apache.hadoop.hbase.wal.WALKey; import org.apache.hadoop.hbase.CompatibilitySingletonFactory; import org.apache.hadoop.util.StringUtils; @@ -51,7 +55,8 @@ public class MetricsWAL extends WALActionsListener.Base { } @Override - public void postAppend(final long size, final long time) { + public void postAppend(final long size, final long time, final WALKey logkey, + final WALEdit logEdit) throws IOException { source.incrementAppendCount(); source.incrementAppendTime(time); source.incrementAppendSize(size); http://git-wip-us.apache.org/repos/asf/hbase/blob/25419d8b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/wal/WALActionsListener.java -- diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/wal/WALActionsListener.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/wal/WALActionsListener.java index a6452e2..adcc6eb 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/wal/WALActionsListener.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/wal/WALActionsListener.java @@ -98,8 +98,12 @@ public interface WALActionsListener { * TODO: Combine this with above. * @param entryLen approx length of cells in this append. * @param elapsedTimeMillis elapsed time in milliseconds. + * @param logKey A WAL key + * @param logEdit A WAL edit containing list of cells. + * @throws