HBASE-24205 Create metric to know the number of reads that happens fr… (#1552)
* HBASE-24205 Create metric to know the number of reads that happens from memstore * Fix checkstyles and whitespaces * Checkstyl, whitespace and javadoc * Fixed review comments * Fix unused imports * Rebase with latest commit * Adding the table vs store metric by consolidating * Combine get and scan metrics and make all relevant changes * Track for full row and then increment either memstore or file read metric * TestMetricsStore test fix * Only increment the memstore metric if all cells are from memstore, if not treat as mixed reads * Remove metricsstore and aggregate at region level * Addresses review comments-metric name updated everywhere * Metric name change * Review comment changes Co-authored-by: Ramkrishna <ramkrishna@apache.org> Signed-off by:Anoop Sam John<anoopsamjohn@gmail.com> Signed-off by:Viraj Jasani<virajjasani@apache.org>
This commit is contained in:
ramkrish86
GitHub
parent
3558ee0c3b
commit
510aad3125
|
|
@ -53,6 +53,10 @@ public interface MetricsRegionSource extends Comparable<MetricsRegionSource> {
|
|||
String COPROCESSOR_EXECUTION_STATISTICS_DESC = "Statistics for coprocessor execution times";
|
||||
String REPLICA_ID = "replicaid";
|
||||
String REPLICA_ID_DESC = "The replica ID of a region. 0 is primary, otherwise is secondary";
|
||||
String ROW_READS_ONLY_ON_MEMSTORE = "memstoreOnlyRowReadsCount";
|
||||
String ROW_READS_ONLY_ON_MEMSTORE_DESC = "Row reads happening completely out of memstore";
|
||||
String MIXED_ROW_READS = "mixedRowReadsCount";
|
||||
String MIXED_ROW_READS_ON_STORE_DESC = "Row reads happening out of files and memstore on store";
|
||||
|
||||
/**
|
||||
* Close the region's metrics as this region is closing.
|
||||
|
|
|
|||
|
|
@ -18,6 +18,8 @@
|
|||
|
||||
package org.apache.hadoop.hbase.regionserver;
|
||||
|
||||
import java.util.Map;
|
||||
import java.util.Map.Entry;
|
||||
import java.util.concurrent.atomic.AtomicBoolean;
|
||||
|
||||
import org.apache.hadoop.hbase.metrics.Interns;
|
||||
|
|
@ -33,6 +35,8 @@ public class MetricsRegionSourceImpl implements MetricsRegionSource {
|
|||
|
||||
private static final Logger LOG = LoggerFactory.getLogger(MetricsRegionSourceImpl.class);
|
||||
|
||||
private static final String _STORE = "_store_";
|
||||
|
||||
private AtomicBoolean closed = new AtomicBoolean(false);
|
||||
|
||||
// Non-final so that we can null out the wrapper
|
||||
|
|
@ -45,6 +49,8 @@ public class MetricsRegionSourceImpl implements MetricsRegionSource {
|
|||
private final DynamicMetricsRegistry registry;
|
||||
|
||||
private final String regionNamePrefix;
|
||||
private final String regionNamePrefix1;
|
||||
private final String regionNamePrefix2;
|
||||
private final String regionPutKey;
|
||||
private final String regionDeleteKey;
|
||||
private final String regionGetKey;
|
||||
|
|
@ -77,10 +83,10 @@ public class MetricsRegionSourceImpl implements MetricsRegionSource {
|
|||
|
||||
registry = agg.getMetricsRegistry();
|
||||
|
||||
regionNamePrefix = "Namespace_" + regionWrapper.getNamespace() +
|
||||
"_table_" + regionWrapper.getTableName() +
|
||||
"_region_" + regionWrapper.getRegionName() +
|
||||
"_metric_";
|
||||
regionNamePrefix1 = "Namespace_" + regionWrapper.getNamespace() + "_table_"
|
||||
+ regionWrapper.getTableName() + "_region_" + regionWrapper.getRegionName();
|
||||
regionNamePrefix2 = "_metric_";
|
||||
regionNamePrefix = regionNamePrefix1 + regionNamePrefix2;
|
||||
|
||||
String suffix = "Count";
|
||||
|
||||
|
|
@ -302,6 +308,24 @@ public class MetricsRegionSourceImpl implements MetricsRegionSource {
|
|||
regionNamePrefix + MetricsRegionSource.MAX_FLUSH_QUEUE_SIZE,
|
||||
MetricsRegionSource.MAX_FLUSH_QUEUE_DESC),
|
||||
this.regionWrapper.getMaxFlushQueueSize());
|
||||
addCounter(mrb, this.regionWrapper.getMemstoreOnlyRowReadsCount(),
|
||||
MetricsRegionSource.ROW_READS_ONLY_ON_MEMSTORE,
|
||||
MetricsRegionSource.ROW_READS_ONLY_ON_MEMSTORE_DESC);
|
||||
addCounter(mrb, this.regionWrapper.getMixedRowReadsCount(),
|
||||
MetricsRegionSource.MIXED_ROW_READS,
|
||||
MetricsRegionSource.MIXED_ROW_READS_ON_STORE_DESC);
|
||||
}
|
||||
}
|
||||
|
||||
private void addCounter(MetricsRecordBuilder mrb, Map<String, Long> metricMap, String metricName,
|
||||
String metricDesc) {
|
||||
if (metricMap != null) {
|
||||
for (Entry<String, Long> entry : metricMap.entrySet()) {
|
||||
// append 'store' and its name to the metric
|
||||
mrb.addCounter(Interns.info(
|
||||
this.regionNamePrefix1 + _STORE + entry.getKey() + this.regionNamePrefix2 + metricName,
|
||||
metricDesc), entry.getValue());
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -18,6 +18,8 @@
|
|||
|
||||
package org.apache.hadoop.hbase.regionserver;
|
||||
|
||||
import java.util.Map;
|
||||
|
||||
import org.apache.yetus.audience.InterfaceAudience;
|
||||
|
||||
/**
|
||||
|
|
@ -170,4 +172,15 @@ public interface MetricsRegionWrapper {
|
|||
* all compacted store files that belong to this region
|
||||
*/
|
||||
long getMaxCompactedStoreFileRefCount();
|
||||
|
||||
/**
|
||||
* @return the number of row reads completely on memstore per store
|
||||
*/
|
||||
Map<String, Long> getMemstoreOnlyRowReadsCount();
|
||||
|
||||
/**
|
||||
* @return the number of row reads on memstore and file per store
|
||||
*/
|
||||
Map<String, Long> getMixedRowReadsCount();
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -92,7 +92,6 @@ public class MetricsTableAggregateSourceImpl extends BaseSourceImpl
|
|||
@Override
|
||||
public void getMetrics(MetricsCollector collector, boolean all) {
|
||||
MetricsRecordBuilder mrb = collector.addRecord(metricsName);
|
||||
|
||||
if (tableSources != null) {
|
||||
for (MetricsTableSource tableMetricSource : tableSources.values()) {
|
||||
if (tableMetricSource instanceof MetricsTableSourceImpl) {
|
||||
|
|
|
|||
|
|
@ -61,7 +61,10 @@ import static org.apache.hadoop.hbase.regionserver.MetricsRegionServerSource.SPL
|
|||
import static org.apache.hadoop.hbase.regionserver.MetricsRegionServerSource.SPLIT_SUCCESS_DESC;
|
||||
import static org.apache.hadoop.hbase.regionserver.MetricsRegionServerSource.SPLIT_SUCCESS_KEY;
|
||||
|
||||
import java.util.Map;
|
||||
import java.util.Map.Entry;
|
||||
import java.util.concurrent.atomic.AtomicBoolean;
|
||||
|
||||
import org.apache.hadoop.hbase.TableName;
|
||||
import org.apache.hadoop.hbase.metrics.Interns;
|
||||
import org.apache.hadoop.metrics2.MetricHistogram;
|
||||
|
|
@ -75,6 +78,8 @@ import org.slf4j.LoggerFactory;
|
|||
@InterfaceAudience.Private
|
||||
public class MetricsTableSourceImpl implements MetricsTableSource {
|
||||
|
||||
private static final String _COLUMNFAMILY = "_columnfamily_";
|
||||
|
||||
private static final Logger LOG = LoggerFactory.getLogger(MetricsTableSourceImpl.class);
|
||||
|
||||
private AtomicBoolean closed = new AtomicBoolean(false);
|
||||
|
|
@ -87,6 +92,8 @@ public class MetricsTableSourceImpl implements MetricsTableSource {
|
|||
private final MetricsTableAggregateSourceImpl agg;
|
||||
private final DynamicMetricsRegistry registry;
|
||||
private final String tableNamePrefix;
|
||||
private final String tableNamePrefixPart1;
|
||||
private final String tableNamePrefixPart2;
|
||||
private final TableName tableName;
|
||||
private final int hashCode;
|
||||
|
||||
|
|
@ -127,8 +134,11 @@ public class MetricsTableSourceImpl implements MetricsTableSource {
|
|||
|
||||
this.tableWrapperAgg = tblWrapperAgg;
|
||||
this.registry = agg.getMetricsRegistry();
|
||||
this.tableNamePrefix = "Namespace_" + this.tableName.getNamespaceAsString() +
|
||||
"_table_" + this.tableName.getQualifierAsString() + "_metric_";
|
||||
this.tableNamePrefixPart1 = "Namespace_" + this.tableName.getNamespaceAsString() +
|
||||
"_table_" + this.tableName.getQualifierAsString();
|
||||
this.tableNamePrefixPart2 = "_metric_";
|
||||
this.tableNamePrefix = tableNamePrefixPart1 +
|
||||
tableNamePrefixPart2;
|
||||
this.hashCode = this.tableName.hashCode();
|
||||
}
|
||||
|
||||
|
|
@ -311,6 +321,25 @@ public class MetricsTableSourceImpl implements MetricsTableSource {
|
|||
mrb.addGauge(Interns.info(tableNamePrefix + MetricsRegionServerSource.NUM_REFERENCE_FILES,
|
||||
MetricsRegionServerSource.NUM_REFERENCE_FILES_DESC),
|
||||
tableWrapperAgg.getNumReferenceFiles(tableName.getNameAsString()));
|
||||
addGauge(mrb, tableWrapperAgg.getMemstoreOnlyRowReadsCount(tableName.getNameAsString()),
|
||||
MetricsRegionSource.ROW_READS_ONLY_ON_MEMSTORE,
|
||||
MetricsRegionSource.ROW_READS_ONLY_ON_MEMSTORE_DESC);
|
||||
addGauge(mrb, tableWrapperAgg.getMixedRowReadsCount(tableName.getNameAsString()),
|
||||
MetricsRegionSource.MIXED_ROW_READS,
|
||||
MetricsRegionSource.MIXED_ROW_READS_ON_STORE_DESC);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
private void addGauge(MetricsRecordBuilder mrb, Map<String, Long> metricMap, String metricName,
|
||||
String metricDesc) {
|
||||
if (metricMap != null) {
|
||||
for (Entry<String, Long> entry : metricMap.entrySet()) {
|
||||
// append 'store' and its name to the metric
|
||||
mrb.addGauge(Interns.info(this.tableNamePrefixPart1 + _COLUMNFAMILY
|
||||
+ entry.getKey().split(MetricsTableWrapperAggregate.UNDERSCORE)[1]
|
||||
+ this.tableNamePrefixPart2 + metricName,
|
||||
metricDesc), entry.getValue());
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -18,6 +18,8 @@
|
|||
|
||||
package org.apache.hadoop.hbase.regionserver;
|
||||
|
||||
import java.util.Map;
|
||||
|
||||
import org.apache.yetus.audience.InterfaceAudience;
|
||||
|
||||
/**
|
||||
|
|
@ -26,7 +28,7 @@ import org.apache.yetus.audience.InterfaceAudience;
|
|||
*/
|
||||
@InterfaceAudience.Private
|
||||
public interface MetricsTableWrapperAggregate {
|
||||
|
||||
public String UNDERSCORE = "_";
|
||||
/**
|
||||
* Get the number of read requests that have been issued against this table
|
||||
*/
|
||||
|
|
@ -107,6 +109,13 @@ public interface MetricsTableWrapperAggregate {
|
|||
*/
|
||||
long getNumReferenceFiles(String table);
|
||||
|
||||
/**
|
||||
* @return number of row reads completely from memstore per store for this table
|
||||
*/
|
||||
Map<String, Long> getMemstoreOnlyRowReadsCount(String table);
|
||||
|
||||
|
||||
/**
|
||||
* @return number of row reads from file and memstore per store for this table
|
||||
*/
|
||||
Map<String, Long> getMixedRowReadsCount(String table);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -18,6 +18,9 @@
|
|||
|
||||
package org.apache.hadoop.hbase.regionserver;
|
||||
|
||||
import java.util.HashMap;
|
||||
import java.util.Map;
|
||||
|
||||
public class MetricsTableWrapperStub implements MetricsTableWrapperAggregate {
|
||||
|
||||
private String tableName;
|
||||
|
|
@ -109,4 +112,18 @@ public class MetricsTableWrapperStub implements MetricsTableWrapperAggregate {
|
|||
public long getCpRequestsCount(String table) {
|
||||
return 99;
|
||||
}
|
||||
|
||||
@Override
|
||||
public Map<String, Long> getMemstoreOnlyRowReadsCount(String table) {
|
||||
Map<String, Long> map = new HashMap<String, Long>();
|
||||
map.put("table_info", 3L);
|
||||
return map;
|
||||
}
|
||||
|
||||
@Override
|
||||
public Map<String, Long> getMixedRowReadsCount(String table) {
|
||||
Map<String, Long> map = new HashMap<String, Long>();
|
||||
map.put("table_info", 3L);
|
||||
return map;
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -20,6 +20,9 @@ package org.apache.hadoop.hbase.regionserver;
|
|||
import static org.junit.Assert.assertEquals;
|
||||
import static org.junit.Assert.assertNotEquals;
|
||||
|
||||
import java.util.HashMap;
|
||||
import java.util.Map;
|
||||
|
||||
import org.apache.hadoop.hbase.CompatibilitySingletonFactory;
|
||||
import org.apache.hadoop.hbase.HBaseClassTestRule;
|
||||
import org.apache.hadoop.hbase.testclassification.MetricsTests;
|
||||
|
|
@ -216,5 +219,19 @@ public class TestMetricsRegionSourceImpl {
|
|||
public long getTotalRequestCount() {
|
||||
return 0;
|
||||
}
|
||||
|
||||
@Override
|
||||
public Map<String, Long> getMemstoreOnlyRowReadsCount() {
|
||||
Map<String, Long> map = new HashMap<String, Long>();
|
||||
map.put("info", 0L);
|
||||
return map;
|
||||
}
|
||||
|
||||
@Override
|
||||
public Map<String, Long> getMixedRowReadsCount() {
|
||||
Map<String, Long> map = new HashMap<String, Long>();
|
||||
map.put("info", 0L);
|
||||
return map;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -46,12 +46,14 @@ import java.util.concurrent.ThreadPoolExecutor;
|
|||
import java.util.concurrent.atomic.AtomicBoolean;
|
||||
import java.util.concurrent.atomic.AtomicInteger;
|
||||
import java.util.concurrent.atomic.AtomicLong;
|
||||
import java.util.concurrent.atomic.LongAdder;
|
||||
import java.util.concurrent.locks.ReentrantLock;
|
||||
import java.util.concurrent.locks.ReentrantReadWriteLock;
|
||||
import java.util.function.Predicate;
|
||||
import java.util.function.ToLongFunction;
|
||||
import java.util.stream.Collectors;
|
||||
import java.util.stream.LongStream;
|
||||
|
||||
import org.apache.hadoop.conf.Configuration;
|
||||
import org.apache.hadoop.fs.FileSystem;
|
||||
import org.apache.hadoop.fs.Path;
|
||||
|
|
@ -94,6 +96,8 @@ import org.apache.hadoop.hbase.regionserver.throttle.ThroughputController;
|
|||
import org.apache.hadoop.hbase.regionserver.wal.WALUtil;
|
||||
import org.apache.hadoop.hbase.security.EncryptionUtil;
|
||||
import org.apache.hadoop.hbase.security.User;
|
||||
import org.apache.hadoop.hbase.shaded.protobuf.ProtobufUtil;
|
||||
import org.apache.hadoop.hbase.shaded.protobuf.generated.WALProtos.CompactionDescriptor;
|
||||
import org.apache.hadoop.hbase.util.Bytes;
|
||||
import org.apache.hadoop.hbase.util.ChecksumType;
|
||||
import org.apache.hadoop.hbase.util.ClassSize;
|
||||
|
|
@ -114,9 +118,6 @@ import org.apache.hbase.thirdparty.com.google.common.collect.Maps;
|
|||
import org.apache.hbase.thirdparty.com.google.common.collect.Sets;
|
||||
import org.apache.hbase.thirdparty.org.apache.commons.collections4.CollectionUtils;
|
||||
import org.apache.hbase.thirdparty.org.apache.commons.collections4.IterableUtils;
|
||||
import org.apache.hadoop.hbase.shaded.protobuf.ProtobufUtil;
|
||||
import org.apache.hadoop.hbase.shaded.protobuf.generated.WALProtos.CompactionDescriptor;
|
||||
|
||||
/**
|
||||
* A Store holds a column family in a Region. Its a memstore and a set of zero
|
||||
* or more StoreFiles, which stretch backwards over time.
|
||||
|
|
@ -162,6 +163,9 @@ public class HStore implements Store, HeapSize, StoreConfigInformation,
|
|||
volatile boolean forceMajor = false;
|
||||
private AtomicLong storeSize = new AtomicLong();
|
||||
private AtomicLong totalUncompressedBytes = new AtomicLong();
|
||||
private LongAdder memstoreOnlyRowReadsCount = new LongAdder();
|
||||
// rows that has cells from both memstore and files (or only files)
|
||||
private LongAdder mixedRowReadsCount = new LongAdder();
|
||||
|
||||
private boolean cacheOnWriteLogged;
|
||||
|
||||
|
|
@ -331,7 +335,8 @@ public class HStore implements Store, HeapSize, StoreConfigInformation,
|
|||
confPrintThreshold = 10;
|
||||
}
|
||||
this.parallelPutCountPrintThreshold = confPrintThreshold;
|
||||
LOG.info("{} created, memstore type={}, storagePolicy={}, verifyBulkLoads={}, "
|
||||
|
||||
LOG.info("Store={}, memstore type={}, storagePolicy={}, verifyBulkLoads={}, "
|
||||
+ "parallelPutCountPrintThreshold={}, encoding={}, compression={}",
|
||||
this, memstore.getClass().getSimpleName(), policyName, verifyBulkLoads,
|
||||
parallelPutCountPrintThreshold, family.getDataBlockEncoding(),
|
||||
|
|
@ -2546,7 +2551,7 @@ public class HStore implements Store, HeapSize, StoreConfigInformation,
|
|||
}
|
||||
|
||||
public static final long FIXED_OVERHEAD =
|
||||
ClassSize.align(ClassSize.OBJECT + (27 * ClassSize.REFERENCE) + (2 * Bytes.SIZEOF_LONG)
|
||||
ClassSize.align(ClassSize.OBJECT + (29 * ClassSize.REFERENCE) + (2 * Bytes.SIZEOF_LONG)
|
||||
+ (6 * Bytes.SIZEOF_INT) + (2 * Bytes.SIZEOF_BOOLEAN));
|
||||
|
||||
public static final long DEEP_OVERHEAD = ClassSize.align(FIXED_OVERHEAD
|
||||
|
|
@ -2886,8 +2891,7 @@ public class HStore implements Store, HeapSize, StoreConfigInformation,
|
|||
}
|
||||
|
||||
/**
|
||||
* @return get maximum ref count of storeFile among all compacted HStore Files
|
||||
* for the HStore
|
||||
* @return get maximum ref count of storeFile among all compacted HStore Files for the HStore
|
||||
*/
|
||||
public int getMaxCompactedStoreFileRefCount() {
|
||||
OptionalInt maxCompactedStoreFileRefCount = this.storeEngine.getStoreFileManager()
|
||||
|
|
@ -2901,4 +2905,21 @@ public class HStore implements Store, HeapSize, StoreConfigInformation,
|
|||
? maxCompactedStoreFileRefCount.getAsInt() : 0;
|
||||
}
|
||||
|
||||
@Override
|
||||
public long getMemstoreOnlyRowReadsCount() {
|
||||
return memstoreOnlyRowReadsCount.sum();
|
||||
}
|
||||
|
||||
@Override
|
||||
public long getMixedRowReadsCount() {
|
||||
return mixedRowReadsCount.sum();
|
||||
}
|
||||
|
||||
void updateMetricsStore(boolean memstoreRead) {
|
||||
if (memstoreRead) {
|
||||
memstoreOnlyRowReadsCount.increment();
|
||||
} else {
|
||||
mixedRowReadsCount.increment();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -112,6 +112,10 @@ public class KeyValueHeap extends NonReversedNonLazyKeyValueScanner
|
|||
return this.current.peek();
|
||||
}
|
||||
|
||||
boolean isLatestCellFromMemstore() {
|
||||
return !this.current.isFileScanner();
|
||||
}
|
||||
|
||||
@Override
|
||||
public Cell next() throws IOException {
|
||||
if(this.current == null) {
|
||||
|
|
|
|||
|
|
@ -20,6 +20,7 @@ package org.apache.hadoop.hbase.regionserver;
|
|||
|
||||
import java.io.Closeable;
|
||||
import java.io.IOException;
|
||||
import java.util.HashMap;
|
||||
import java.util.Map;
|
||||
import java.util.OptionalDouble;
|
||||
import java.util.OptionalLong;
|
||||
|
|
@ -58,6 +59,8 @@ public class MetricsRegionWrapperImpl implements MetricsRegionWrapper, Closeable
|
|||
private long numReferenceFiles;
|
||||
private long maxFlushQueueSize;
|
||||
private long maxCompactionQueueSize;
|
||||
private Map<String, Long> readsOnlyFromMemstore;
|
||||
private Map<String, Long> mixedReadsOnStore;
|
||||
|
||||
private ScheduledFuture<?> regionMetricsUpdateTask;
|
||||
|
||||
|
|
@ -233,6 +236,16 @@ public class MetricsRegionWrapperImpl implements MetricsRegionWrapper, Closeable
|
|||
return this.region.hashCode();
|
||||
}
|
||||
|
||||
@Override
|
||||
public Map<String, Long> getMemstoreOnlyRowReadsCount() {
|
||||
return readsOnlyFromMemstore;
|
||||
}
|
||||
|
||||
@Override
|
||||
public Map<String, Long> getMixedRowReadsCount() {
|
||||
return mixedReadsOnStore;
|
||||
}
|
||||
|
||||
public class HRegionMetricsWrapperRunnable implements Runnable {
|
||||
|
||||
@Override
|
||||
|
|
@ -279,6 +292,26 @@ public class MetricsRegionWrapperImpl implements MetricsRegionWrapper, Closeable
|
|||
if (storeAvgStoreFileAge.isPresent()) {
|
||||
avgAgeNumerator += (long) storeAvgStoreFileAge.getAsDouble() * storeHFiles;
|
||||
}
|
||||
if(mixedReadsOnStore == null) {
|
||||
mixedReadsOnStore = new HashMap<String, Long>();
|
||||
}
|
||||
Long tempVal = mixedReadsOnStore.get(store.getColumnFamilyName());
|
||||
if (tempVal == null) {
|
||||
tempVal = 0L;
|
||||
} else {
|
||||
tempVal += store.getMixedRowReadsCount();
|
||||
}
|
||||
mixedReadsOnStore.put(store.getColumnFamilyName(), tempVal);
|
||||
if (readsOnlyFromMemstore == null) {
|
||||
readsOnlyFromMemstore = new HashMap<String, Long>();
|
||||
}
|
||||
tempVal = readsOnlyFromMemstore.get(store.getColumnFamilyName());
|
||||
if (tempVal == null) {
|
||||
tempVal = 0L;
|
||||
} else {
|
||||
tempVal += store.getMemstoreOnlyRowReadsCount();
|
||||
}
|
||||
readsOnlyFromMemstore.put(store.getColumnFamilyName(), tempVal);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -53,7 +53,7 @@ public class MetricsTableWrapperAggregateImpl implements MetricsTableWrapperAggr
|
|||
this.executor = CompatibilitySingletonFactory.getInstance(MetricsExecutor.class).getExecutor();
|
||||
this.runnable = new TableMetricsWrapperRunnable();
|
||||
this.tableMetricsUpdateTask = this.executor.scheduleWithFixedDelay(this.runnable, period,
|
||||
this.period, TimeUnit.MILLISECONDS);
|
||||
period, TimeUnit.MILLISECONDS);
|
||||
}
|
||||
|
||||
public class TableMetricsWrapperRunnable implements Runnable {
|
||||
|
|
@ -61,7 +61,6 @@ public class MetricsTableWrapperAggregateImpl implements MetricsTableWrapperAggr
|
|||
@Override
|
||||
public void run() {
|
||||
Map<TableName, MetricsTableValues> localMetricsTableMap = new HashMap<>();
|
||||
|
||||
for (Region r : regionServer.getOnlineRegionsLocalContext()) {
|
||||
TableName tbl = r.getTableDescriptor().getTableName();
|
||||
MetricsTableValues mt = localMetricsTableMap.get(tbl);
|
||||
|
|
@ -69,11 +68,17 @@ public class MetricsTableWrapperAggregateImpl implements MetricsTableWrapperAggr
|
|||
mt = new MetricsTableValues();
|
||||
localMetricsTableMap.put(tbl, mt);
|
||||
}
|
||||
long memstoreReadCount = 0L;
|
||||
long mixedReadCount = 0L;
|
||||
String tempKey = null;
|
||||
if (r.getStores() != null) {
|
||||
String familyName = null;
|
||||
for (Store store : r.getStores()) {
|
||||
familyName = store.getColumnFamilyName();
|
||||
|
||||
mt.storeFileCount += store.getStorefilesCount();
|
||||
mt.memstoreSize += (store.getMemStoreSize().getDataSize() +
|
||||
store.getMemStoreSize().getHeapSize() + store.getMemStoreSize().getOffHeapSize());
|
||||
mt.memstoreSize += (store.getMemStoreSize().getDataSize()
|
||||
+ store.getMemStoreSize().getHeapSize() + store.getMemStoreSize().getOffHeapSize());
|
||||
mt.storeFileSize += store.getStorefilesSize();
|
||||
mt.referenceFileCount += store.getNumReferenceFiles();
|
||||
if (store.getMaxStoreFileAge().isPresent()) {
|
||||
|
|
@ -89,13 +94,27 @@ public class MetricsTableWrapperAggregateImpl implements MetricsTableWrapperAggr
|
|||
(long) store.getAvgStoreFileAge().getAsDouble() * store.getStorefilesCount();
|
||||
}
|
||||
mt.storeCount += 1;
|
||||
tempKey = tbl.getNameAsString() + UNDERSCORE + familyName;
|
||||
Long tempVal = mt.perStoreMemstoreOnlyReadCount.get(tempKey);
|
||||
if (tempVal == null) {
|
||||
tempVal = 0L;
|
||||
}
|
||||
memstoreReadCount = store.getMemstoreOnlyRowReadsCount() + tempVal;
|
||||
tempVal = mt.perStoreMixedReadCount.get(tempKey);
|
||||
if (tempVal == null) {
|
||||
tempVal = 0L;
|
||||
}
|
||||
mixedReadCount = store.getMixedRowReadsCount() + tempVal;
|
||||
// accumulate the count
|
||||
mt.perStoreMemstoreOnlyReadCount.put(tempKey, memstoreReadCount);
|
||||
mt.perStoreMixedReadCount.put(tempKey, mixedReadCount);
|
||||
}
|
||||
|
||||
mt.regionCount += 1;
|
||||
|
||||
mt.readRequestCount += r.getReadRequestsCount();
|
||||
mt.filteredReadRequestCount += getFilteredReadRequestCount(tbl.getNameAsString());
|
||||
mt.filteredReadRequestCount += r.getFilteredReadRequestsCount();
|
||||
mt.writeRequestCount += r.getWriteRequestsCount();
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -133,6 +152,26 @@ public class MetricsTableWrapperAggregateImpl implements MetricsTableWrapperAggr
|
|||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public Map<String, Long> getMemstoreOnlyRowReadsCount(String table) {
|
||||
MetricsTableValues metricsTable = metricsTableMap.get(TableName.valueOf(table));
|
||||
if (metricsTable == null) {
|
||||
return null;
|
||||
} else {
|
||||
return metricsTable.perStoreMemstoreOnlyReadCount;
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public Map<String, Long> getMixedRowReadsCount(String table) {
|
||||
MetricsTableValues metricsTable = metricsTableMap.get(TableName.valueOf(table));
|
||||
if (metricsTable == null) {
|
||||
return null;
|
||||
} else {
|
||||
return metricsTable.perStoreMixedReadCount;
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public long getCpRequestsCount(String table) {
|
||||
MetricsTableValues metricsTable = metricsTableMap.get(TableName.valueOf(table));
|
||||
|
|
@ -304,6 +343,8 @@ public class MetricsTableWrapperAggregateImpl implements MetricsTableWrapperAggr
|
|||
long totalStoreFileAge;
|
||||
long referenceFileCount;
|
||||
long cpRequestCount;
|
||||
Map<String, Long> perStoreMemstoreOnlyReadCount = new HashMap<>();
|
||||
Map<String, Long> perStoreMixedReadCount = new HashMap<>();
|
||||
}
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -282,4 +282,14 @@ public interface Store {
|
|||
boolean isSloppyMemStore();
|
||||
|
||||
int getCurrentParallelPutCount();
|
||||
|
||||
/**
|
||||
* @return the number of read requests purely from the memstore.
|
||||
*/
|
||||
long getMemstoreOnlyRowReadsCount();
|
||||
|
||||
/**
|
||||
* @return the number of read requests from the files under this store.
|
||||
*/
|
||||
long getMixedRowReadsCount();
|
||||
}
|
||||
|
|
|
|||
|
|
@ -93,6 +93,10 @@ public class StoreScanner extends NonReversedNonLazyKeyValueScanner
|
|||
private final int minVersions;
|
||||
private final long maxRowSize;
|
||||
private final long cellsPerHeartbeatCheck;
|
||||
@VisibleForTesting
|
||||
long memstoreOnlyReads;
|
||||
@VisibleForTesting
|
||||
long mixedReads;
|
||||
|
||||
// 1) Collects all the KVHeap that are eagerly getting closed during the
|
||||
// course of a scan
|
||||
|
|
@ -565,13 +569,15 @@ public class StoreScanner extends NonReversedNonLazyKeyValueScanner
|
|||
|
||||
int count = 0;
|
||||
long totalBytesRead = 0;
|
||||
|
||||
boolean onlyFromMemstore = true;
|
||||
try {
|
||||
LOOP: do {
|
||||
// Update and check the time limit based on the configured value of cellsPerTimeoutCheck
|
||||
// Or if the preadMaxBytes is reached and we may want to return so we can switch to stream in
|
||||
// Or if the preadMaxBytes is reached and we may want to return so we can switch to stream
|
||||
// in
|
||||
// the shipped method below.
|
||||
if (kvsScanned % cellsPerHeartbeatCheck == 0 || (scanUsePread &&
|
||||
readType == Scan.ReadType.DEFAULT && bytesRead > preadMaxBytes)) {
|
||||
if (kvsScanned % cellsPerHeartbeatCheck == 0
|
||||
|| (scanUsePread && readType == Scan.ReadType.DEFAULT && bytesRead > preadMaxBytes)) {
|
||||
if (scannerContext.checkTimeLimit(LimitScope.BETWEEN_CELLS)) {
|
||||
return scannerContext.setScannerState(NextState.TIME_LIMIT_REACHED).hasMoreValues();
|
||||
}
|
||||
|
|
@ -583,14 +589,16 @@ public class StoreScanner extends NonReversedNonLazyKeyValueScanner
|
|||
checkScanOrder(prevCell, cell, comparator);
|
||||
int cellSize = PrivateCellUtil.estimatedSerializedSizeOf(cell);
|
||||
bytesRead += cellSize;
|
||||
if (scanUsePread && readType == Scan.ReadType.DEFAULT &&
|
||||
bytesRead > preadMaxBytes) {
|
||||
// return immediately if we want to switch from pread to stream. We need this because we can
|
||||
// only switch in the shipped method, if user use a filter to filter out everything and rpc
|
||||
if (scanUsePread && readType == Scan.ReadType.DEFAULT && bytesRead > preadMaxBytes) {
|
||||
// return immediately if we want to switch from pread to stream. We need this because we
|
||||
// can
|
||||
// only switch in the shipped method, if user use a filter to filter out everything and
|
||||
// rpc
|
||||
// timeout is very large then the shipped method will never be called until the whole scan
|
||||
// is finished, but at that time we have already scan all the data...
|
||||
// See HBASE-20457 for more details.
|
||||
// And there is still a scenario that can not be handled. If we have a very large row, which
|
||||
// And there is still a scenario that can not be handled. If we have a very large row,
|
||||
// which
|
||||
// have millions of qualifiers, and filter.filterRow is used, then even if we set the flag
|
||||
// here, we still need to scan all the qualifiers before returning...
|
||||
scannerContext.returnImmediately();
|
||||
|
|
@ -608,7 +616,6 @@ public class StoreScanner extends NonReversedNonLazyKeyValueScanner
|
|||
if (f != null) {
|
||||
cell = f.transformCell(cell);
|
||||
}
|
||||
|
||||
this.countPerRow++;
|
||||
if (storeLimit > -1 && this.countPerRow > (storeLimit + storeOffset)) {
|
||||
// do what SEEK_NEXT_ROW does.
|
||||
|
|
@ -630,16 +637,21 @@ public class StoreScanner extends NonReversedNonLazyKeyValueScanner
|
|||
count++;
|
||||
totalBytesRead += cellSize;
|
||||
|
||||
/**
|
||||
* Increment the metric if all the cells are from memstore.
|
||||
* If not we will account it for mixed reads
|
||||
*/
|
||||
onlyFromMemstore = onlyFromMemstore && heap.isLatestCellFromMemstore();
|
||||
// Update the progress of the scanner context
|
||||
scannerContext.incrementSizeProgress(cellSize, cell.heapSize());
|
||||
scannerContext.incrementBatchProgress(1);
|
||||
|
||||
if (matcher.isUserScan() && totalBytesRead > maxRowSize) {
|
||||
String message = "Max row size allowed: " + maxRowSize
|
||||
+ ", but the row is bigger than that, the row info: " + CellUtil
|
||||
.toString(cell, false) + ", already have process row cells = " + outResult.size()
|
||||
+ ", it belong to region = " + store.getHRegion().getRegionInfo()
|
||||
.getRegionNameAsString();
|
||||
+ ", but the row is bigger than that, the row info: "
|
||||
+ CellUtil.toString(cell, false) + ", already have process row cells = "
|
||||
+ outResult.size() + ", it belong to region = "
|
||||
+ store.getHRegion().getRegionInfo().getRegionNameAsString();
|
||||
LOG.warn(message);
|
||||
throw new RowTooBigException(message);
|
||||
}
|
||||
|
|
@ -671,6 +683,7 @@ public class StoreScanner extends NonReversedNonLazyKeyValueScanner
|
|||
if (get) {
|
||||
// Then no more to this row... exit.
|
||||
close(false);// Do all cleanup except heap.close()
|
||||
// update metric
|
||||
return scannerContext.setScannerState(NextState.NO_MORE_VALUES).hasMoreValues();
|
||||
}
|
||||
matcher.clearCurrentRow();
|
||||
|
|
@ -732,6 +745,26 @@ public class StoreScanner extends NonReversedNonLazyKeyValueScanner
|
|||
// No more keys
|
||||
close(false);// Do all cleanup except heap.close()
|
||||
return scannerContext.setScannerState(NextState.NO_MORE_VALUES).hasMoreValues();
|
||||
} finally {
|
||||
// increment only if we have some result
|
||||
if (count > 0) {
|
||||
// if true increment memstore metrics, if not the mixed one
|
||||
updateMetricsStore(onlyFromMemstore);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
private void updateMetricsStore(boolean memstoreRead) {
|
||||
if (store != null) {
|
||||
store.updateMetricsStore(memstoreRead);
|
||||
} else {
|
||||
// for testing.
|
||||
if (memstoreRead) {
|
||||
memstoreOnlyReads++;
|
||||
} else {
|
||||
mixedReads++;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
@ -1208,4 +1241,3 @@ public class StoreScanner extends NonReversedNonLazyKeyValueScanner
|
|||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -18,6 +18,9 @@
|
|||
|
||||
package org.apache.hadoop.hbase.regionserver;
|
||||
|
||||
import java.util.HashMap;
|
||||
import java.util.Map;
|
||||
|
||||
public class MetricsRegionWrapperStub implements MetricsRegionWrapper {
|
||||
int replicaid = 0;
|
||||
|
||||
|
|
@ -182,4 +185,18 @@ public class MetricsRegionWrapperStub implements MetricsRegionWrapper {
|
|||
public long getTotalRequestCount() {
|
||||
return 0;
|
||||
}
|
||||
|
||||
@Override
|
||||
public Map<String, Long> getMemstoreOnlyRowReadsCount() {
|
||||
Map<String, Long> map = new HashMap<>();
|
||||
map.put("info", 0L);
|
||||
return map;
|
||||
}
|
||||
|
||||
@Override
|
||||
public Map<String, Long> getMixedRowReadsCount() {
|
||||
Map<String, Long> map = new HashMap<>();
|
||||
map.put("info", 0L);
|
||||
return map;
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -23,6 +23,7 @@ import static org.junit.Assert.assertEquals;
|
|||
import static org.junit.Assert.assertFalse;
|
||||
import static org.junit.Assert.assertNull;
|
||||
import static org.junit.Assert.assertTrue;
|
||||
|
||||
import java.io.IOException;
|
||||
import java.util.ArrayList;
|
||||
import java.util.Arrays;
|
||||
|
|
@ -31,6 +32,7 @@ import java.util.List;
|
|||
import java.util.NavigableSet;
|
||||
import java.util.TreeSet;
|
||||
import java.util.concurrent.atomic.AtomicInteger;
|
||||
|
||||
import org.apache.hadoop.conf.Configuration;
|
||||
import org.apache.hadoop.hbase.Cell;
|
||||
import org.apache.hadoop.hbase.CellBuilderType;
|
||||
|
|
@ -405,6 +407,7 @@ public class TestStoreScanner {
|
|||
// We should have gone the optimize route 5 times totally... an INCLUDE for the four cells
|
||||
// in the row plus the DONE on the end.
|
||||
assertEquals(5, scanner.count.get());
|
||||
assertEquals(1, scanner.memstoreOnlyReads);
|
||||
// For a full row Get, there should be no opportunity for scanner optimization.
|
||||
assertEquals(0, scanner.optimization.get());
|
||||
}
|
||||
|
|
@ -479,6 +482,8 @@ public class TestStoreScanner {
|
|||
// And we should have gone through optimize twice only.
|
||||
assertEquals("First qcode is SEEK_NEXT_COL and second INCLUDE_AND_SEEK_NEXT_ROW", 3,
|
||||
scanner.count.get());
|
||||
assertEquals("Memstore Read count should be", 1,
|
||||
scanner.memstoreOnlyReads);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -578,6 +583,7 @@ public class TestStoreScanner {
|
|||
List<Cell> results = new ArrayList<>();
|
||||
assertEquals(true, scan.next(results));
|
||||
assertEquals(1, results.size());
|
||||
assertEquals(1, scan.memstoreOnlyReads);
|
||||
assertEquals(kvs[0], results.get(0));
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in New Issue