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 2018/05/31 21:22:28 UTC
[1/3] hbase git commit: HBASE-18116 fix replication source in-memory
calculation by excluding bulk load file
Repository: hbase
Updated Branches:
refs/heads/branch-1 4b6355768 -> dcb5b5a01
refs/heads/branch-2 fc9743c17 -> 050fae501
refs/heads/master d909ec55a -> 6f3f34227
HBASE-18116 fix replication source in-memory calculation by excluding bulk load file
Signed-off-by: Andrew Purtell <ap...@apache.org>
Amending-Author: Andrew Purtell <ap...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/dcb5b5a0
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/dcb5b5a0
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/dcb5b5a0
Branch: refs/heads/branch-1
Commit: dcb5b5a0124d4204c979d13b84c60f7de1ab4929
Parents: 4b63557
Author: Xu Cang <xc...@salesforce.com>
Authored: Fri May 25 16:46:42 2018 -0700
Committer: Andrew Purtell <ap...@apache.org>
Committed: Thu May 31 14:22:07 2018 -0700
----------------------------------------------------------------------
.../ReplicationSourceWALReaderThread.java | 22 +++++++++++++-------
1 file changed, 15 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hbase/blob/dcb5b5a0/hbase-server/src/main/java/org/apache/hadoop/hbase/replication/regionserver/ReplicationSourceWALReaderThread.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/replication/regionserver/ReplicationSourceWALReaderThread.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/replication/regionserver/ReplicationSourceWALReaderThread.java
index 306ba8f..ac70c33 100644
--- a/hbase-server/src/main/java/org/apache/hadoop/hbase/replication/regionserver/ReplicationSourceWALReaderThread.java
+++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/replication/regionserver/ReplicationSourceWALReaderThread.java
@@ -39,17 +39,16 @@ import org.apache.hadoop.hbase.CellUtil;
import org.apache.hadoop.hbase.HConstants;
import org.apache.hadoop.hbase.classification.InterfaceAudience;
import org.apache.hadoop.hbase.classification.InterfaceStability;
-import org.apache.hadoop.hbase.protobuf.generated.WALProtos;
import org.apache.hadoop.hbase.protobuf.generated.WALProtos.BulkLoadDescriptor;
import org.apache.hadoop.hbase.protobuf.generated.WALProtos.StoreDescriptor;
import org.apache.hadoop.hbase.regionserver.wal.WALEdit;
import org.apache.hadoop.hbase.replication.ReplicationQueueInfo;
import org.apache.hadoop.hbase.replication.WALEntryFilter;
import org.apache.hadoop.hbase.replication.regionserver.WALEntryStream.WALEntryStreamRuntimeException;
-import org.apache.hadoop.hbase.util.Bytes;
import org.apache.hadoop.hbase.util.Pair;
import org.apache.hadoop.hbase.util.Threads;
import org.apache.hadoop.hbase.wal.WAL.Entry;
+import org.apache.hadoop.hbase.wal.WALKey;
/**
* Reads and filters WAL entries, groups the filtered entries into batches, and puts the batches onto a queue
@@ -145,10 +144,11 @@ public class ReplicationSourceWALReaderThread extends Thread {
if (entry != null) {
WALEdit edit = entry.getEdit();
if (edit != null && !edit.isEmpty()) {
- long entrySize = getEntrySize(entry);
+ long entrySize = getEntrySizeIncludeBulkLoad(entry);
+ long entrySizeExlucdeBulkLoad = getEntrySizeExcludeBulkLoad(entry);
batch.addEntry(entry);
updateBatchStats(batch, entry, entryStream.getPosition(), entrySize);
- boolean totalBufferTooLarge = acquireBufferQuota(entrySize);
+ boolean totalBufferTooLarge = acquireBufferQuota(entrySizeExlucdeBulkLoad);
// Stop if too many entries or too big
if (totalBufferTooLarge || batch.getHeapSize() >= replicationBatchSizeCapacity
|| batch.getNbEntries() >= replicationBatchCountCapacity) {
@@ -251,9 +251,17 @@ public class ReplicationSourceWALReaderThread extends Thread {
return entryBatchQueue.take();
}
- private long getEntrySize(Entry entry) {
+ private long getEntrySizeIncludeBulkLoad(Entry entry) {
WALEdit edit = entry.getEdit();
- return edit.heapSize() + calculateTotalSizeOfStoreFiles(edit);
+ WALKey key = entry.getKey();
+ return edit.heapSize() + sizeOfStoreFilesIncludeBulkLoad(edit) +
+ key.estimatedSerializedSizeOf();
+ }
+
+ private long getEntrySizeExcludeBulkLoad(Entry entry) {
+ WALEdit edit = entry.getEdit();
+ WALKey key = entry.getKey();
+ return edit.heapSize() + key.estimatedSerializedSizeOf();
}
private void updateBatchStats(WALEntryBatch batch, Entry entry, long entryPosition, long entrySize) {
@@ -311,7 +319,7 @@ public class ReplicationSourceWALReaderThread extends Thread {
* @param edit edit to count row keys from
* @return the total size of the store files
*/
- private int calculateTotalSizeOfStoreFiles(WALEdit edit) {
+ private int sizeOfStoreFilesIncludeBulkLoad(WALEdit edit) {
List<Cell> cells = edit.getCells();
int totalStoreFilesSize = 0;
[3/3] hbase git commit: HBASE-18116 fix replication source in-memory
calculation by excluding bulk load file
Posted by ap...@apache.org.
HBASE-18116 fix replication source in-memory calculation by excluding bulk load file
Signed-off-by: Andrew Purtell <ap...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/6f3f3422
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/6f3f3422
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/6f3f3422
Branch: refs/heads/master
Commit: 6f3f34227e83dd1811a06066d1d2bb913299a297
Parents: d909ec5
Author: Xu Cang <xc...@salesforce.com>
Authored: Fri May 25 16:46:42 2018 -0700
Committer: Andrew Purtell <ap...@apache.org>
Committed: Thu May 31 14:22:12 2018 -0700
----------------------------------------------------------------------
.../ReplicationSourceWALReader.java | 22 +++++++++++++++-----
1 file changed, 17 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hbase/blob/6f3f3422/hbase-server/src/main/java/org/apache/hadoop/hbase/replication/regionserver/ReplicationSourceWALReader.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/replication/regionserver/ReplicationSourceWALReader.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/replication/regionserver/ReplicationSourceWALReader.java
index 64fd48d..ee54931 100644
--- a/hbase-server/src/main/java/org/apache/hadoop/hbase/replication/regionserver/ReplicationSourceWALReader.java
+++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/replication/regionserver/ReplicationSourceWALReader.java
@@ -36,6 +36,7 @@ import org.apache.hadoop.hbase.util.Pair;
import org.apache.hadoop.hbase.util.Threads;
import org.apache.hadoop.hbase.wal.WAL.Entry;
import org.apache.hadoop.hbase.wal.WALEdit;
+import org.apache.hadoop.hbase.wal.WALKey;
import org.apache.yetus.audience.InterfaceAudience;
import org.apache.yetus.audience.InterfaceStability;
import org.slf4j.Logger;
@@ -168,10 +169,12 @@ class ReplicationSourceWALReader extends Thread {
if (edit == null || edit.isEmpty()) {
return false;
}
- long entrySize = getEntrySize(entry);
+ long entrySize = getEntrySizeIncludeBulkLoad(entry);
+ long entrySizeExlucdeBulkLoad = getEntrySizeExcludeBulkLoad(entry);
batch.addEntry(entry);
updateBatchStats(batch, entry, entrySize);
- boolean totalBufferTooLarge = acquireBufferQuota(entrySize);
+ boolean totalBufferTooLarge = acquireBufferQuota(entrySizeExlucdeBulkLoad);
+
// Stop if too many entries or too big
return totalBufferTooLarge || batch.getHeapSize() >= replicationBatchSizeCapacity ||
batch.getNbEntries() >= replicationBatchCountCapacity;
@@ -296,11 +299,20 @@ class ReplicationSourceWALReader extends Thread {
return entryBatchQueue.take();
}
- private long getEntrySize(Entry entry) {
+ private long getEntrySizeIncludeBulkLoad(Entry entry) {
WALEdit edit = entry.getEdit();
- return edit.heapSize() + calculateTotalSizeOfStoreFiles(edit);
+ WALKey key = entry.getKey();
+ return edit.heapSize() + sizeOfStoreFilesIncludeBulkLoad(edit) +
+ key.estimatedSerializedSizeOf();
}
+ private long getEntrySizeExcludeBulkLoad(Entry entry) {
+ WALEdit edit = entry.getEdit();
+ WALKey key = entry.getKey();
+ return edit.heapSize() + key.estimatedSerializedSizeOf();
+ }
+
+
private void updateBatchStats(WALEntryBatch batch, Entry entry, long entrySize) {
WALEdit edit = entry.getEdit();
batch.incrementHeapSize(entrySize);
@@ -353,7 +365,7 @@ class ReplicationSourceWALReader extends Thread {
* @param edit edit to count row keys from
* @return the total size of the store files
*/
- private int calculateTotalSizeOfStoreFiles(WALEdit edit) {
+ private int sizeOfStoreFilesIncludeBulkLoad(WALEdit edit) {
List<Cell> cells = edit.getCells();
int totalStoreFilesSize = 0;
[2/3] hbase git commit: HBASE-18116 fix replication source in-memory
calculation by excluding bulk load file
Posted by ap...@apache.org.
HBASE-18116 fix replication source in-memory calculation by excluding bulk load file
Signed-off-by: Andrew Purtell <ap...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/050fae50
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/050fae50
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/050fae50
Branch: refs/heads/branch-2
Commit: 050fae501a6db95260356279e071c8577e87624f
Parents: fc9743c
Author: Xu Cang <xc...@salesforce.com>
Authored: Fri May 25 16:46:42 2018 -0700
Committer: Andrew Purtell <ap...@apache.org>
Committed: Thu May 31 14:22:12 2018 -0700
----------------------------------------------------------------------
.../ReplicationSourceWALReader.java | 22 +++++++++++++++-----
1 file changed, 17 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hbase/blob/050fae50/hbase-server/src/main/java/org/apache/hadoop/hbase/replication/regionserver/ReplicationSourceWALReader.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/replication/regionserver/ReplicationSourceWALReader.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/replication/regionserver/ReplicationSourceWALReader.java
index 64fd48d..ee54931 100644
--- a/hbase-server/src/main/java/org/apache/hadoop/hbase/replication/regionserver/ReplicationSourceWALReader.java
+++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/replication/regionserver/ReplicationSourceWALReader.java
@@ -36,6 +36,7 @@ import org.apache.hadoop.hbase.util.Pair;
import org.apache.hadoop.hbase.util.Threads;
import org.apache.hadoop.hbase.wal.WAL.Entry;
import org.apache.hadoop.hbase.wal.WALEdit;
+import org.apache.hadoop.hbase.wal.WALKey;
import org.apache.yetus.audience.InterfaceAudience;
import org.apache.yetus.audience.InterfaceStability;
import org.slf4j.Logger;
@@ -168,10 +169,12 @@ class ReplicationSourceWALReader extends Thread {
if (edit == null || edit.isEmpty()) {
return false;
}
- long entrySize = getEntrySize(entry);
+ long entrySize = getEntrySizeIncludeBulkLoad(entry);
+ long entrySizeExlucdeBulkLoad = getEntrySizeExcludeBulkLoad(entry);
batch.addEntry(entry);
updateBatchStats(batch, entry, entrySize);
- boolean totalBufferTooLarge = acquireBufferQuota(entrySize);
+ boolean totalBufferTooLarge = acquireBufferQuota(entrySizeExlucdeBulkLoad);
+
// Stop if too many entries or too big
return totalBufferTooLarge || batch.getHeapSize() >= replicationBatchSizeCapacity ||
batch.getNbEntries() >= replicationBatchCountCapacity;
@@ -296,11 +299,20 @@ class ReplicationSourceWALReader extends Thread {
return entryBatchQueue.take();
}
- private long getEntrySize(Entry entry) {
+ private long getEntrySizeIncludeBulkLoad(Entry entry) {
WALEdit edit = entry.getEdit();
- return edit.heapSize() + calculateTotalSizeOfStoreFiles(edit);
+ WALKey key = entry.getKey();
+ return edit.heapSize() + sizeOfStoreFilesIncludeBulkLoad(edit) +
+ key.estimatedSerializedSizeOf();
}
+ private long getEntrySizeExcludeBulkLoad(Entry entry) {
+ WALEdit edit = entry.getEdit();
+ WALKey key = entry.getKey();
+ return edit.heapSize() + key.estimatedSerializedSizeOf();
+ }
+
+
private void updateBatchStats(WALEntryBatch batch, Entry entry, long entrySize) {
WALEdit edit = entry.getEdit();
batch.incrementHeapSize(entrySize);
@@ -353,7 +365,7 @@ class ReplicationSourceWALReader extends Thread {
* @param edit edit to count row keys from
* @return the total size of the store files
*/
- private int calculateTotalSizeOfStoreFiles(WALEdit edit) {
+ private int sizeOfStoreFilesIncludeBulkLoad(WALEdit edit) {
List<Cell> cells = edit.getCells();
int totalStoreFilesSize = 0;