Apache
/
hbase
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

HBASE-23590 : Update maxStoreFileRefCount to maxCompactedStoreFileRefCount for auto region recovery based on old reader references 

Signed-off-by: Anoop Sam John <anoopsamjohn@apache.org>
This commit is contained in:
Viraj Jasani 2020-01-01 23:49:21 +05:30
parent 27fc96e076
commit 1451063115
No known key found for this signature in database
GPG Key ID: E906DFF511D3E5DB
14 changed files with 167 additions and 149 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
hbase-client/src/main/java/org/apache/hadoop/hbase/RegionLoad.java
View File

@ -198,8 +198,8 @@ public class RegionLoad {
* @return the max reference count for any store file among all stores files * @return the max reference count for any store file among all stores files
* of this region * of this region
*/ */
public int getMaxStoreFileRefCount() { public int getMaxCompactedStoreFileRefCount() {
return regionLoadPB.getMaxStoreFileRefCount(); return regionLoadPB.getMaxCompactedStoreFileRefCount();
} }
/** /**
@ -212,7 +212,8 @@ public class RegionLoad {
sb = Strings.appendKeyValue(sb, "numberOfStorefiles", sb = Strings.appendKeyValue(sb, "numberOfStorefiles",
this.getStorefiles()); this.getStorefiles());
sb = Strings.appendKeyValue(sb, "storeRefCount", this.getStoreRefCount()); sb = Strings.appendKeyValue(sb, "storeRefCount", this.getStoreRefCount());
sb = Strings.appendKeyValue(sb, "maxStoreFileRefCount", this.getMaxStoreFileRefCount()); sb = Strings.appendKeyValue(sb, "maxCompactedStoreFileRefCount",
this.getMaxCompactedStoreFileRefCount());
sb = Strings.appendKeyValue(sb, "storefileUncompressedSizeMB", sb = Strings.appendKeyValue(sb, "storefileUncompressedSizeMB",
this.getStoreUncompressedSizeMB()); this.getStoreUncompressedSizeMB());
sb = Strings.appendKeyValue(sb, "lastMajorCompactionTimestamp", sb = Strings.appendKeyValue(sb, "lastMajorCompactionTimestamp",

32
hbase-common/src/main/resources/hbase-default.xml
View File

@ -1657,19 +1657,25 @@ possible configurations would overwhelm and obscure the important.
<name>hbase.regions.recovery.store.file.ref.count</name> <name>hbase.regions.recovery.store.file.ref.count</name>
<value>-1</value> <value>-1</value>
<description> <description>
Very large ref count on a file indicates Very large number of ref count on a compacted
that it is a ref leak on that object. Such files store file indicates that it is a ref leak
can not be removed even after it is invalidated on that object(compacted store file).
via compaction. Only way to recover in such Such files can not be removed after
scenario is to reopen the region which can it is invalidated via compaction.
release all resources, like the refcount, leases, etc. Only way to recover in such scenario is to
This config represents Store files Ref Count threshold reopen the region which can release
value considered for reopening regions. all resources, like the refcount,
Any region with store files ref count > this value leases, etc. This config represents Store files Ref
would be eligible for reopening by master. Count threshold value considered for reopening
Default value -1 indicates this feature is turned off. regions. Any region with compacted store files
Only positive integer value should be provided to enable ref count > this value would be eligible for
this feature. reopening by master. Here, we get the max
refCount among all refCounts on all
compacted away store files that belong to a
particular region. Default value -1 indicates
this feature is turned off. Only positive
integer value should be provided to
enable this feature.
</description> </description>
</property> </property>
</configuration> </configuration>

2
hbase-hadoop-compat/src/main/java/org/apache/hadoop/hbase/regionserver/MetricsRegionServerSource.java
View File

@ -231,7 +231,7 @@ public interface MetricsRegionServerSource extends BaseSource, JvmPauseMonitorSo
String STOREFILE_COUNT_DESC = "Number of Store Files"; String STOREFILE_COUNT_DESC = "Number of Store Files";
String STORE_REF_COUNT = "storeRefCount"; String STORE_REF_COUNT = "storeRefCount";
String STORE_REF_COUNT_DESC = "Store reference count"; String STORE_REF_COUNT_DESC = "Store reference count";
String MAX_STORE_FILE_REF_COUNT = "maxStoreFileRefCount"; String MAX_COMPACTED_STORE_FILE_REF_COUNT = "maxCompactedStoreFileRefCount";
String MEMSTORE_SIZE = "memStoreSize"; String MEMSTORE_SIZE = "memStoreSize";
String MEMSTORE_SIZE_DESC = "Size of the memstore"; String MEMSTORE_SIZE_DESC = "Size of the memstore";
String STOREFILE_SIZE = "storeFileSize"; String STOREFILE_SIZE = "storeFileSize";

6
hbase-hadoop-compat/src/main/java/org/apache/hadoop/hbase/regionserver/MetricsRegionWrapper.java
View File

@ -149,8 +149,8 @@ public interface MetricsRegionWrapper {
long getStoreRefCount(); long getStoreRefCount();
/** /**
* @return the max reference count for any store file among all stores files * @return the max number of references active on any store file among
* of this region * all compacted store files that belong to this region
*/ */
int getMaxStoreFileRefCount(); int getMaxCompactedStoreFileRefCount();
} }

7
hbase-hadoop2-compat/src/main/java/org/apache/hadoop/hbase/regionserver/MetricsRegionSourceImpl.java
View File

@ -218,9 +218,10 @@ public class MetricsRegionSourceImpl implements MetricsRegionSource {
MetricsRegionServerSource.STORE_REF_COUNT), MetricsRegionServerSource.STORE_REF_COUNT),
this.regionWrapper.getStoreRefCount()); this.regionWrapper.getStoreRefCount());
mrb.addGauge(Interns.info( mrb.addGauge(Interns.info(
regionNamePrefix + MetricsRegionServerSource.MAX_STORE_FILE_REF_COUNT, regionNamePrefix + MetricsRegionServerSource.MAX_COMPACTED_STORE_FILE_REF_COUNT,
MetricsRegionServerSource.MAX_STORE_FILE_REF_COUNT), MetricsRegionServerSource.MAX_COMPACTED_STORE_FILE_REF_COUNT),
this.regionWrapper.getMaxStoreFileRefCount()); this.regionWrapper.getMaxCompactedStoreFileRefCount()
);
mrb.addGauge(Interns.info( mrb.addGauge(Interns.info(
regionNamePrefix + MetricsRegionServerSource.MEMSTORE_SIZE, regionNamePrefix + MetricsRegionServerSource.MEMSTORE_SIZE,
MetricsRegionServerSource.MEMSTORE_SIZE_DESC), MetricsRegionServerSource.MEMSTORE_SIZE_DESC),

2
hbase-hadoop2-compat/src/test/java/org/apache/hadoop/hbase/regionserver/TestMetricsRegionSourceImpl.java
View File

@ -97,7 +97,7 @@ public class TestMetricsRegionSourceImpl {
} }
@Override @Override
public int getMaxStoreFileRefCount() { public int getMaxCompactedStoreFileRefCount() {
return 0; return 0;
} }

167
hbase-protocol/src/main/java/org/apache/hadoop/hbase/protobuf/generated/ClusterStatusProtos.java
View File

@ -3632,27 +3632,27 @@ public final class ClusterStatusProtos {
*/ */
int getStoreRefCount(); int getStoreRefCount();
// optional int32 max_store_file_ref_count = 22 [default = 0]; // optional int32 max_compacted_store_file_ref_count = 22 [default = 0];
/** /**
* <code>optional int32 max_store_file_ref_count = 22 [default = 0];</code> * <code>optional int32 max_compacted_store_file_ref_count = 22 [default = 0];</code>
* *
* <pre> * <pre>
** **
* The max number of references active on single store file among all store files * The max number of references active on single store file among all compacted store files
* that belong to given region * that belong to given region
* </pre> * </pre>
*/ */
boolean hasMaxStoreFileRefCount(); boolean hasMaxCompactedStoreFileRefCount();
/** /**
* <code>optional int32 max_store_file_ref_count = 22 [default = 0];</code> * <code>optional int32 max_compacted_store_file_ref_count = 22 [default = 0];</code>
* *
* <pre> * <pre>
** **
* The max number of references active on single store file among all store files * The max number of references active on single store file among all compacted store files
* that belong to given region * that belong to given region
* </pre> * </pre>
*/ */
int getMaxStoreFileRefCount(); int getMaxCompactedStoreFileRefCount();
} }
/** /**
* Protobuf type {@code hbase.pb.RegionLoad} * Protobuf type {@code hbase.pb.RegionLoad}
@ -3813,7 +3813,7 @@ public final class ClusterStatusProtos {
} }
case 176: { case 176: {
bitField0_ |= 0x00040000; bitField0_ |= 0x00040000;
maxStoreFileRefCount_ = input.readInt32(); maxCompactedStoreFileRefCount_ = input.readInt32();
break; break;
} }
} }
@ -4357,32 +4357,32 @@ public final class ClusterStatusProtos {
return storeRefCount_; return storeRefCount_;
} }
// optional int32 max_store_file_ref_count = 22 [default = 0]; // optional int32 max_compacted_store_file_ref_count = 22 [default = 0];
public static final int MAX_STORE_FILE_REF_COUNT_FIELD_NUMBER = 22; public static final int MAX_COMPACTED_STORE_FILE_REF_COUNT_FIELD_NUMBER = 22;
private int maxStoreFileRefCount_; private int maxCompactedStoreFileRefCount_;
/** /**
* <code>optional int32 max_store_file_ref_count = 22 [default = 0];</code> * <code>optional int32 max_compacted_store_file_ref_count = 22 [default = 0];</code>
* *
* <pre> * <pre>
** **
* The max number of references active on single store file among all store files * The max number of references active on single store file among all compacted store files
* that belong to given region * that belong to given region
* </pre> * </pre>
*/ */
public boolean hasMaxStoreFileRefCount() { public boolean hasMaxCompactedStoreFileRefCount() {
return ((bitField0_ & 0x00040000) == 0x00040000); return ((bitField0_ & 0x00040000) == 0x00040000);
} }
/** /**
* <code>optional int32 max_store_file_ref_count = 22 [default = 0];</code> * <code>optional int32 max_compacted_store_file_ref_count = 22 [default = 0];</code>
* *
* <pre> * <pre>
** **
* The max number of references active on single store file among all store files * The max number of references active on single store file among all compacted store files
* that belong to given region * that belong to given region
* </pre> * </pre>
*/ */
public int getMaxStoreFileRefCount() { public int getMaxCompactedStoreFileRefCount() {
return maxStoreFileRefCount_; return maxCompactedStoreFileRefCount_;
} }
private void initFields() { private void initFields() {
@ -4405,7 +4405,7 @@ public final class ClusterStatusProtos {
lastMajorCompactionTs_ = 0L; lastMajorCompactionTs_ = 0L;
storeCompleteSequenceId_ = java.util.Collections.emptyList(); storeCompleteSequenceId_ = java.util.Collections.emptyList();
storeRefCount_ = 0; storeRefCount_ = 0;
maxStoreFileRefCount_ = 0; maxCompactedStoreFileRefCount_ = 0;
} }
private byte memoizedIsInitialized = -1; private byte memoizedIsInitialized = -1;
public final boolean isInitialized() { public final boolean isInitialized() {
@ -4491,7 +4491,7 @@ public final class ClusterStatusProtos {
output.writeInt32(21, storeRefCount_); output.writeInt32(21, storeRefCount_);
} }
if (((bitField0_ & 0x00040000) == 0x00040000)) { if (((bitField0_ & 0x00040000) == 0x00040000)) {
output.writeInt32(22, maxStoreFileRefCount_); output.writeInt32(22, maxCompactedStoreFileRefCount_);
} }
getUnknownFields().writeTo(output); getUnknownFields().writeTo(output);
} }
@ -4580,7 +4580,7 @@ public final class ClusterStatusProtos {
} }
if (((bitField0_ & 0x00040000) == 0x00040000)) { if (((bitField0_ & 0x00040000) == 0x00040000)) {
size += com.google.protobuf.CodedOutputStream size += com.google.protobuf.CodedOutputStream
.computeInt32Size(22, maxStoreFileRefCount_); .computeInt32Size(22, maxCompactedStoreFileRefCount_);
} }
size += getUnknownFields().getSerializedSize(); size += getUnknownFields().getSerializedSize();
memoizedSerializedSize = size; memoizedSerializedSize = size;
@ -4696,10 +4696,10 @@ public final class ClusterStatusProtos {
result = result && (getStoreRefCount() result = result && (getStoreRefCount()
== other.getStoreRefCount()); == other.getStoreRefCount());
} }
result = result && (hasMaxStoreFileRefCount() == other.hasMaxStoreFileRefCount()); result = result && (hasMaxCompactedStoreFileRefCount() == other.hasMaxCompactedStoreFileRefCount());
if (hasMaxStoreFileRefCount()) { if (hasMaxCompactedStoreFileRefCount()) {
result = result && (getMaxStoreFileRefCount() result = result && (getMaxCompactedStoreFileRefCount()
== other.getMaxStoreFileRefCount()); == other.getMaxCompactedStoreFileRefCount());
} }
result = result && result = result &&
getUnknownFields().equals(other.getUnknownFields()); getUnknownFields().equals(other.getUnknownFields());
@ -4791,9 +4791,9 @@ public final class ClusterStatusProtos {
hash = (37 * hash) + STORE_REF_COUNT_FIELD_NUMBER; hash = (37 * hash) + STORE_REF_COUNT_FIELD_NUMBER;
hash = (53 * hash) + getStoreRefCount(); hash = (53 * hash) + getStoreRefCount();
} }
if (hasMaxStoreFileRefCount()) { if (hasMaxCompactedStoreFileRefCount()) {
hash = (37 * hash) + MAX_STORE_FILE_REF_COUNT_FIELD_NUMBER; hash = (37 * hash) + MAX_COMPACTED_STORE_FILE_REF_COUNT_FIELD_NUMBER;
hash = (53 * hash) + getMaxStoreFileRefCount(); hash = (53 * hash) + getMaxCompactedStoreFileRefCount();
} }
hash = (29 * hash) + getUnknownFields().hashCode(); hash = (29 * hash) + getUnknownFields().hashCode();
memoizedHashCode = hash; memoizedHashCode = hash;
@ -4952,7 +4952,7 @@ public final class ClusterStatusProtos {
} }
storeRefCount_ = 0; storeRefCount_ = 0;
bitField0_ = (bitField0_ & ~0x00040000); bitField0_ = (bitField0_ & ~0x00040000);
maxStoreFileRefCount_ = 0; maxCompactedStoreFileRefCount_ = 0;
bitField0_ = (bitField0_ & ~0x00080000); bitField0_ = (bitField0_ & ~0x00080000);
return this; return this;
} }
@ -5070,7 +5070,7 @@ public final class ClusterStatusProtos {
if (((from_bitField0_ & 0x00080000) == 0x00080000)) { if (((from_bitField0_ & 0x00080000) == 0x00080000)) {
to_bitField0_ |= 0x00040000; to_bitField0_ |= 0x00040000;
} }
result.maxStoreFileRefCount_ = maxStoreFileRefCount_; result.maxCompactedStoreFileRefCount_ = maxCompactedStoreFileRefCount_;
result.bitField0_ = to_bitField0_; result.bitField0_ = to_bitField0_;
onBuilt(); onBuilt();
return result; return result;
@ -5167,8 +5167,8 @@ public final class ClusterStatusProtos {
if (other.hasStoreRefCount()) { if (other.hasStoreRefCount()) {
setStoreRefCount(other.getStoreRefCount()); setStoreRefCount(other.getStoreRefCount());
} }
if (other.hasMaxStoreFileRefCount()) { if (other.hasMaxCompactedStoreFileRefCount()) {
setMaxStoreFileRefCount(other.getMaxStoreFileRefCount()); setMaxCompactedStoreFileRefCount(other.getMaxCompactedStoreFileRefCount());
} }
this.mergeUnknownFields(other.getUnknownFields()); this.mergeUnknownFields(other.getUnknownFields());
return this; return this;
@ -6509,59 +6509,59 @@ public final class ClusterStatusProtos {
return this; return this;
} }
// optional int32 max_store_file_ref_count = 22 [default = 0]; // optional int32 max_compacted_store_file_ref_count = 22 [default = 0];
private int maxStoreFileRefCount_ ; private int maxCompactedStoreFileRefCount_ ;
/** /**
* <code>optional int32 max_store_file_ref_count = 22 [default = 0];</code> * <code>optional int32 max_compacted_store_file_ref_count = 22 [default = 0];</code>
* *
* <pre> * <pre>
** **
* The max number of references active on single store file among all store files * The max number of references active on single store file among all compacted store files
* that belong to given region * that belong to given region
* </pre> * </pre>
*/ */
public boolean hasMaxStoreFileRefCount() { public boolean hasMaxCompactedStoreFileRefCount() {
return ((bitField0_ & 0x00080000) == 0x00080000); return ((bitField0_ & 0x00080000) == 0x00080000);
} }
/** /**
* <code>optional int32 max_store_file_ref_count = 22 [default = 0];</code> * <code>optional int32 max_compacted_store_file_ref_count = 22 [default = 0];</code>
* *
* <pre> * <pre>
** **
* The max number of references active on single store file among all store files * The max number of references active on single store file among all compacted store files
* that belong to given region * that belong to given region
* </pre> * </pre>
*/ */
public int getMaxStoreFileRefCount() { public int getMaxCompactedStoreFileRefCount() {
return maxStoreFileRefCount_; return maxCompactedStoreFileRefCount_;
} }
/** /**
* <code>optional int32 max_store_file_ref_count = 22 [default = 0];</code> * <code>optional int32 max_compacted_store_file_ref_count = 22 [default = 0];</code>
* *
* <pre> * <pre>
** **
* The max number of references active on single store file among all store files * The max number of references active on single store file among all compacted store files
* that belong to given region * that belong to given region
* </pre> * </pre>
*/ */
public Builder setMaxStoreFileRefCount(int value) { public Builder setMaxCompactedStoreFileRefCount(int value) {
bitField0_ |= 0x00080000; bitField0_ |= 0x00080000;
maxStoreFileRefCount_ = value; maxCompactedStoreFileRefCount_ = value;
onChanged(); onChanged();
return this; return this;
} }
/** /**
* <code>optional int32 max_store_file_ref_count = 22 [default = 0];</code> * <code>optional int32 max_compacted_store_file_ref_count = 22 [default = 0];</code>
* *
* <pre> * <pre>
** **
* The max number of references active on single store file among all store files * The max number of references active on single store file among all compacted store files
* that belong to given region * that belong to given region
* </pre> * </pre>
*/ */
public Builder clearMaxStoreFileRefCount() { public Builder clearMaxCompactedStoreFileRefCount() {
bitField0_ = (bitField0_ & ~0x00080000); bitField0_ = (bitField0_ & ~0x00080000);
maxStoreFileRefCount_ = 0; maxCompactedStoreFileRefCount_ = 0;
onChanged(); onChanged();
return this; return this;
} }
@ -14983,7 +14983,7 @@ public final class ClusterStatusProtos {
"e\030\001 \002(\014\022\023\n\013sequence_id\030\002 \002(\004\"p\n\026RegionSt" + "e\030\001 \002(\014\022\023\n\013sequence_id\030\002 \002(\004\"p\n\026RegionSt" +
"oreSequenceIds\022 \n\030last_flushed_sequence_" + "oreSequenceIds\022 \n\030last_flushed_sequence_" +
"id\030\001 \002(\004\0224\n\021store_sequence_id\030\002 \003(\0132\031.hb" + "id\030\001 \002(\004\0224\n\021store_sequence_id\030\002 \003(\0132\031.hb" +
"ase.pb.StoreSequenceId\"\225\005\n\nRegionLoad\0223\n" + "ase.pb.StoreSequenceId\"\237\005\n\nRegionLoad\0223\n" +
"\020region_specifier\030\001 \002(\0132\031.hbase.pb.Regio" + "\020region_specifier\030\001 \002(\0132\031.hbase.pb.Regio" +
"nSpecifier\022\016\n\006stores\030\002 \001(\r\022\022\n\nstorefiles", "nSpecifier\022\016\n\006stores\030\002 \001(\r\022\022\n\nstorefiles",
"\030\003 \001(\r\022\"\n\032store_uncompressed_size_MB\030\004 \001" + "\030\003 \001(\r\022\"\n\032store_uncompressed_size_MB\030\004 \001" +
@ -14999,38 +14999,39 @@ public final class ClusterStatusProtos {
"\002\022#\n\030last_major_compaction_ts\030\021 \001(\004:\0010\022=" + "\002\022#\n\030last_major_compaction_ts\030\021 \001(\004:\0010\022=" +
"\n\032store_complete_sequence_id\030\022 \003(\0132\031.hba" + "\n\032store_complete_sequence_id\030\022 \003(\0132\031.hba" +
"se.pb.StoreSequenceId\022\032\n\017store_ref_count" + "se.pb.StoreSequenceId\022\032\n\017store_ref_count" +
"\030\025 \001(\005:\0010\022#\n\030max_store_file_ref_count\030\026 " + "\030\025 \001(\005:\0010\022-\n\"max_compacted_store_file_re" +
"\001(\005:\0010\"T\n\023ReplicationLoadSink\022\032\n\022ageOfLa" + "f_count\030\026 \001(\005:\0010\"T\n\023ReplicationLoadSink\022" +
"stAppliedOp\030\001 \002(\004\022!\n\031timeStampsOfLastApp" + "\032\n\022ageOfLastAppliedOp\030\001 \002(\004\022!\n\031timeStamp" +
"liedOp\030\002 \002(\004\"\225\001\n\025ReplicationLoadSource\022\016" + "sOfLastAppliedOp\030\002 \002(\004\"\225\001\n\025ReplicationLo" +
"\n\006peerID\030\001 \002(\t\022\032\n\022ageOfLastShippedOp\030\002 \002" + "adSource\022\016\n\006peerID\030\001 \002(\t\022\032\n\022ageOfLastShi" +
"(\004\022\026\n\016sizeOfLogQueue\030\003 \002(\r\022 \n\030timeStampO" + "ppedOp\030\002 \002(\004\022\026\n\016sizeOfLogQueue\030\003 \002(\r\022 \n\030" +
"fLastShippedOp\030\004 \002(\004\022\026\n\016replicationLag\030\005", "timeStampOfLastShippedOp\030\004 \002(\004\022\026\n\016replic",
" \002(\004\"\212\003\n\nServerLoad\022\032\n\022number_of_request" + "ationLag\030\005 \002(\004\"\212\003\n\nServerLoad\022\032\n\022number_" +
"s\030\001 \001(\004\022 \n\030total_number_of_requests\030\002 \001(" + "of_requests\030\001 \001(\004\022 \n\030total_number_of_req" +
"\004\022\024\n\014used_heap_MB\030\003 \001(\r\022\023\n\013max_heap_MB\030\004" + "uests\030\002 \001(\004\022\024\n\014used_heap_MB\030\003 \001(\r\022\023\n\013max" +
" \001(\r\022*\n\014region_loads\030\005 \003(\0132\024.hbase.pb.Re" + "_heap_MB\030\004 \001(\r\022*\n\014region_loads\030\005 \003(\0132\024.h" +
"gionLoad\022+\n\014coprocessors\030\006 \003(\0132\025.hbase.p" + "base.pb.RegionLoad\022+\n\014coprocessors\030\006 \003(\013" +
"b.Coprocessor\022\031\n\021report_start_time\030\007 \001(\004" + "2\025.hbase.pb.Coprocessor\022\031\n\021report_start_" +
"\022\027\n\017report_end_time\030\010 \001(\004\022\030\n\020info_server" + "time\030\007 \001(\004\022\027\n\017report_end_time\030\010 \001(\004\022\030\n\020i" +
"_port\030\t \001(\r\0227\n\016replLoadSource\030\n \003(\0132\037.hb" + "nfo_server_port\030\t \001(\r\0227\n\016replLoadSource\030" +
"ase.pb.ReplicationLoadSource\0223\n\014replLoad" + "\n \003(\0132\037.hbase.pb.ReplicationLoadSource\0223" +
"Sink\030\013 \001(\0132\035.hbase.pb.ReplicationLoadSin", "\n\014replLoadSink\030\013 \001(\0132\035.hbase.pb.Replicat",
"k\"a\n\016LiveServerInfo\022$\n\006server\030\001 \002(\0132\024.hb" + "ionLoadSink\"a\n\016LiveServerInfo\022$\n\006server\030" +
"ase.pb.ServerName\022)\n\013server_load\030\002 \002(\0132\024" + "\001 \002(\0132\024.hbase.pb.ServerName\022)\n\013server_lo" +
".hbase.pb.ServerLoad\"\250\003\n\rClusterStatus\0228" + "ad\030\002 \002(\0132\024.hbase.pb.ServerLoad\"\250\003\n\rClust" +
"\n\rhbase_version\030\001 \001(\0132!.hbase.pb.HBaseVe" + "erStatus\0228\n\rhbase_version\030\001 \001(\0132!.hbase." +
"rsionFileContent\022.\n\014live_servers\030\002 \003(\0132\030" + "pb.HBaseVersionFileContent\022.\n\014live_serve" +
".hbase.pb.LiveServerInfo\022*\n\014dead_servers" + "rs\030\002 \003(\0132\030.hbase.pb.LiveServerInfo\022*\n\014de" +
"\030\003 \003(\0132\024.hbase.pb.ServerName\022;\n\025regions_" + "ad_servers\030\003 \003(\0132\024.hbase.pb.ServerName\022;" +
"in_transition\030\004 \003(\0132\034.hbase.pb.RegionInT" + "\n\025regions_in_transition\030\004 \003(\0132\034.hbase.pb" +
"ransition\022\'\n\ncluster_id\030\005 \001(\0132\023.hbase.pb" + ".RegionInTransition\022\'\n\ncluster_id\030\005 \001(\0132" +
".ClusterId\0222\n\023master_coprocessors\030\006 \003(\0132", "\023.hbase.pb.ClusterId\0222\n\023master_coprocess",
"\025.hbase.pb.Coprocessor\022$\n\006master\030\007 \001(\0132\024" + "ors\030\006 \003(\0132\025.hbase.pb.Coprocessor\022$\n\006mast" +
".hbase.pb.ServerName\022,\n\016backup_masters\030\010" + "er\030\007 \001(\0132\024.hbase.pb.ServerName\022,\n\016backup" +
" \003(\0132\024.hbase.pb.ServerName\022\023\n\013balancer_o" + "_masters\030\010 \003(\0132\024.hbase.pb.ServerName\022\023\n\013" +
"n\030\t \001(\010BF\n*org.apache.hadoop.hbase.proto" + "balancer_on\030\t \001(\010BF\n*org.apache.hadoop.h" +
"buf.generatedB\023ClusterStatusProtosH\001\240\001\001" "base.protobuf.generatedB\023ClusterStatusPr" +
"otosH\001\240\001\001"
}; };
com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner assigner = com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner assigner =
new com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner() { new com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner() {
@ -15066,7 +15067,7 @@ public final class ClusterStatusProtos {
internal_static_hbase_pb_RegionLoad_fieldAccessorTable = new internal_static_hbase_pb_RegionLoad_fieldAccessorTable = new
com.google.protobuf.GeneratedMessage.FieldAccessorTable( com.google.protobuf.GeneratedMessage.FieldAccessorTable(
internal_static_hbase_pb_RegionLoad_descriptor, internal_static_hbase_pb_RegionLoad_descriptor,
new java.lang.String[] { "RegionSpecifier", "Stores", "Storefiles", "StoreUncompressedSizeMB", "StorefileSizeMB", "MemstoreSizeMB", "StorefileIndexSizeMB", "ReadRequestsCount", "WriteRequestsCount", "TotalCompactingKVs", "CurrentCompactedKVs", "RootIndexSizeKB", "TotalStaticIndexSizeKB", "TotalStaticBloomSizeKB", "CompleteSequenceId", "DataLocality", "LastMajorCompactionTs", "StoreCompleteSequenceId", "StoreRefCount", "MaxStoreFileRefCount", }); new java.lang.String[] { "RegionSpecifier", "Stores", "Storefiles", "StoreUncompressedSizeMB", "StorefileSizeMB", "MemstoreSizeMB", "StorefileIndexSizeMB", "ReadRequestsCount", "WriteRequestsCount", "TotalCompactingKVs", "CurrentCompactedKVs", "RootIndexSizeKB", "TotalStaticIndexSizeKB", "TotalStaticBloomSizeKB", "CompleteSequenceId", "DataLocality", "LastMajorCompactionTs", "StoreCompleteSequenceId", "StoreRefCount", "MaxCompactedStoreFileRefCount", });
internal_static_hbase_pb_ReplicationLoadSink_descriptor = internal_static_hbase_pb_ReplicationLoadSink_descriptor =
getDescriptor().getMessageTypes().get(5); getDescriptor().getMessageTypes().get(5);
internal_static_hbase_pb_ReplicationLoadSink_fieldAccessorTable = new internal_static_hbase_pb_ReplicationLoadSink_fieldAccessorTable = new

4
hbase-protocol/src/main/protobuf/ClusterStatus.proto
View File

@ -147,10 +147,10 @@ message RegionLoad {
optional int32 store_ref_count = 21 [ default = 0 ]; optional int32 store_ref_count = 21 [ default = 0 ];
/** /**
* The max number of references active on single store file among all store files * The max number of references active on single store file among all compacted store files
* that belong to given region * that belong to given region
*/ */
optional int32 max_store_file_ref_count = 22 [default = 0]; optional int32 max_compacted_store_file_ref_count = 22 [default = 0];
} }
/* Server-level protobufs */ /* Server-level protobufs */

17
hbase-server/src/main/java/org/apache/hadoop/hbase/master/RegionsRecoveryChore.java
View File

@ -137,17 +137,18 @@ public class RegionsRecoveryChore extends ScheduledChore {
for (ServerLoad serverLoad : serverMetricsMap.values()) { for (ServerLoad serverLoad : serverMetricsMap.values()) {
Map<byte[], RegionLoad> regionLoadsMap = serverLoad.getRegionsLoad(); Map<byte[], RegionLoad> regionLoadsMap = serverLoad.getRegionsLoad();
for (RegionLoad regionLoad : regionLoadsMap.values()) { for (RegionLoad regionLoad : regionLoadsMap.values()) {
// For each region, each store file can have different ref counts // For each region, each compacted store file can have different ref counts
// We need to find maximum of all such ref counts and if that max count // We need to find maximum of all such ref counts and if that max count of compacted
// is beyond a threshold value, we should reopen the region. // store files is beyond a threshold value, we should reopen the region.
// Here, we take max ref count of all store files and not the cumulative // Here, we take max ref count of all compacted store files and not the cumulative
// count of all store files // count of all compacted store files
final int maxStoreFileRefCount = regionLoad.getMaxStoreFileRefCount(); final int maxCompactedStoreFileRefCount = regionLoad
.getMaxCompactedStoreFileRefCount();
if (maxStoreFileRefCount > storeFileRefCountThreshold) { if (maxCompactedStoreFileRefCount > storeFileRefCountThreshold) {
final byte[] regionName = regionLoad.getName(); final byte[] regionName = regionLoad.getName();
prepareTableToReopenRegionsMap(tableToReopenRegionsMap, regionName, prepareTableToReopenRegionsMap(tableToReopenRegionsMap, regionName,
maxStoreFileRefCount); maxCompactedStoreFileRefCount);
} }
} }
} }

9
hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java
View File

@ -1580,7 +1580,7 @@ public class HRegionServer extends HasThread implements
int stores = 0; int stores = 0;
int storefiles = 0; int storefiles = 0;
int storeRefCount = 0; int storeRefCount = 0;
int maxStoreFileRefCount = 0; int maxCompactedStoreFileRefCount = 0;
int storeUncompressedSizeMB = 0; int storeUncompressedSizeMB = 0;
int storefileSizeMB = 0; int storefileSizeMB = 0;
int memstoreSizeMB = (int) (r.getMemstoreSize() / 1024 / 1024); int memstoreSizeMB = (int) (r.getMemstoreSize() / 1024 / 1024);
@ -1598,8 +1598,9 @@ public class HRegionServer extends HasThread implements
HStore hStore = (HStore) store; HStore hStore = (HStore) store;
int currentStoreRefCount = hStore.getStoreRefCount(); int currentStoreRefCount = hStore.getStoreRefCount();
storeRefCount += currentStoreRefCount; storeRefCount += currentStoreRefCount;
int currentMaxStoreFileRefCount = hStore.getMaxStoreFileRefCount(); int currentMaxCompactedStoreFileRefCount = hStore.getMaxCompactedStoreFileRefCount();
maxStoreFileRefCount = Math.max(maxStoreFileRefCount, currentMaxStoreFileRefCount); maxCompactedStoreFileRefCount = Math.max(maxCompactedStoreFileRefCount,
currentMaxCompactedStoreFileRefCount);
} }
storeUncompressedSizeMB += (int) (store.getStoreSizeUncompressed() / 1024 / 1024); storeUncompressedSizeMB += (int) (store.getStoreSizeUncompressed() / 1024 / 1024);
storefileSizeMB += (int) (store.getStorefilesSize() / 1024 / 1024); storefileSizeMB += (int) (store.getStorefilesSize() / 1024 / 1024);
@ -1628,7 +1629,7 @@ public class HRegionServer extends HasThread implements
.setStores(stores) .setStores(stores)
.setStorefiles(storefiles) .setStorefiles(storefiles)
.setStoreRefCount(storeRefCount) .setStoreRefCount(storeRefCount)
.setMaxStoreFileRefCount(maxStoreFileRefCount) .setMaxCompactedStoreFileRefCount(maxCompactedStoreFileRefCount)
.setStoreUncompressedSizeMB(storeUncompressedSizeMB) .setStoreUncompressedSizeMB(storeUncompressedSizeMB)
.setStorefileSizeMB(storefileSizeMB) .setStorefileSizeMB(storefileSizeMB)
.setMemstoreSizeMB(memstoreSizeMB) .setMemstoreSizeMB(memstoreSizeMB)

13
hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HStore.java
View File

@ -2873,20 +2873,21 @@ public class HStore implements Store {
} }
/** /**
* @return get maximum ref count of storeFile among all HStore Files * @return get maximum ref count of storeFile among all compacted HStore Files
* for the HStore * for the HStore
*/ */
public int getMaxStoreFileRefCount() { public int getMaxCompactedStoreFileRefCount() {
int maxStoreFileRefCount = 0; int maxCompactedStoreFileRefCount = 0;
for (StoreFile store : storeEngine.getStoreFileManager().getStorefiles()) { for (StoreFile store : storeEngine.getStoreFileManager().getCompactedfiles()) {
if (store.isHFile()) { if (store.isHFile()) {
StoreFile.Reader storeReader = store.getReader(); StoreFile.Reader storeReader = store.getReader();
if (storeReader != null) { if (storeReader != null) {
maxStoreFileRefCount = Math.max(maxStoreFileRefCount, storeReader.getRefCount()); maxCompactedStoreFileRefCount = Math.max(maxCompactedStoreFileRefCount,
storeReader.getRefCount());
} }
} }
} }
return maxStoreFileRefCount; return maxCompactedStoreFileRefCount;
} }
} }

16
hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/MetricsRegionWrapperImpl.java
View File

@ -55,7 +55,7 @@ public class MetricsRegionWrapperImpl implements MetricsRegionWrapper, Closeable
private long numReferenceFiles; private long numReferenceFiles;
private long maxFlushQueueSize; private long maxFlushQueueSize;
private long maxCompactionQueueSize; private long maxCompactionQueueSize;
private int maxStoreFileRefCount; private int maxCompactedStoreFileRefCount;
private ScheduledFuture<?> regionMetricsUpdateTask; private ScheduledFuture<?> regionMetricsUpdateTask;
@ -125,8 +125,8 @@ public class MetricsRegionWrapperImpl implements MetricsRegionWrapper, Closeable
} }
@Override @Override
public int getMaxStoreFileRefCount() { public int getMaxCompactedStoreFileRefCount() {
return maxStoreFileRefCount; return maxCompactedStoreFileRefCount;
} }
@Override @Override
@ -222,7 +222,7 @@ public class MetricsRegionWrapperImpl implements MetricsRegionWrapper, Closeable
public void run() { public void run() {
long tempNumStoreFiles = 0; long tempNumStoreFiles = 0;
int tempStoreRefCount = 0; int tempStoreRefCount = 0;
int tempMaxStoreFileRefCount = 0; int tempMaxCompactedStoreFileRefCount = 0;
long tempMemstoreSize = 0; long tempMemstoreSize = 0;
long tempStoreFileSize = 0; long tempStoreFileSize = 0;
long tempMaxStoreFileAge = 0; long tempMaxStoreFileAge = 0;
@ -256,16 +256,16 @@ public class MetricsRegionWrapperImpl implements MetricsRegionWrapper, Closeable
// Cast here to avoid interface changes to Store // Cast here to avoid interface changes to Store
HStore hStore = ((HStore) store); HStore hStore = ((HStore) store);
tempStoreRefCount += hStore.getStoreRefCount(); tempStoreRefCount += hStore.getStoreRefCount();
int currentMaxStoreFileRefCount = hStore.getMaxStoreFileRefCount(); int currentMaxCompactedStoreFileRefCount = hStore.getMaxCompactedStoreFileRefCount();
tempMaxStoreFileRefCount = Math.max(tempMaxStoreFileRefCount, tempMaxCompactedStoreFileRefCount = Math.max(tempMaxCompactedStoreFileRefCount,
currentMaxStoreFileRefCount); currentMaxCompactedStoreFileRefCount);
} }
} }
} }
numStoreFiles = tempNumStoreFiles; numStoreFiles = tempNumStoreFiles;
storeRefCount = tempStoreRefCount; storeRefCount = tempStoreRefCount;
maxStoreFileRefCount = tempMaxStoreFileRefCount; maxCompactedStoreFileRefCount = tempMaxCompactedStoreFileRefCount;
memstoreSize = tempMemstoreSize; memstoreSize = tempMemstoreSize;
storeFileSize = tempStoreFileSize; storeFileSize = tempStoreFileSize;
maxStoreFileAge = tempMaxStoreFileAge; maxStoreFileAge = tempMaxStoreFileAge;

2
hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/MetricsRegionWrapperStub.java
View File

@ -66,7 +66,7 @@ public class MetricsRegionWrapperStub implements MetricsRegionWrapper {
} }
@Override @Override
public int getMaxStoreFileRefCount() { public int getMaxCompactedStoreFileRefCount() {
return 0; return 0;
} }

32
src/main/asciidoc/_chapters/hbase-default.adoc
View File

@ -2230,19 +2230,25 @@ The percent of region server RPC threads failed to abort RS.
+ +
.Description .Description
Very large ref count on a file indicates Very large number of ref count on a compacted
that it is a ref leak on that object. Such files store file indicates that it is a ref leak
can not be removed even after it is invalidated on that object(compacted store file).
via compaction. Only way to recover in such Such files can not be removed after
scenario is to reopen the region which can it is invalidated via compaction.
release all resources, like the refcount, leases, etc. Only way to recover in such scenario is to
This config represents Store files Ref Count threshold reopen the region which can release
value considered for reopening regions. all resources, like the refcount,
Any region with store files ref count > this value leases, etc. This config represents Store files Ref
would be eligible for reopening by master. Count threshold value considered for reopening
Default value -1 indicates this feature is turned off. regions. Any region with compacted store files
Only positive integer value should be provided to enable ref count > this value would be eligible for
this feature. reopening by master. Here, we get the max
refCount among all refCounts on all
compacted away store files that belong to a
particular region. Default value -1 indicates
this feature is turned off. Only positive
integer value should be provided to
enable this feature.
+ +
.Default .Default