(mutation, lock);
builder.addResult(result);
}
- requestCount.addAndGet(mutates.size());
+
+ requestCount.add(mutates.size());
if (!region.getRegionInfo().isMetaTable()) {
cacheFlusher.reclaimMemStoreMemory();
}
@@ -4031,6 +3802,13 @@ public class HRegionServer implements ClientProtocol,
builder.setResult(i, result);
}
}
+ long after = EnvironmentEdgeManager.currentTimeMillis();
+ if (batchContainsPuts) {
+ metricsRegionServer.updatePut(after - before);
+ }
+ if (batchContainsDelete) {
+ metricsRegionServer.updateDelete(after - before);
+ }
}
/**
diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HStore.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HStore.java
index 88288adeeb4..8f7aaf70e02 100644
--- a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HStore.java
+++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HStore.java
@@ -66,8 +66,6 @@ import org.apache.hadoop.hbase.monitoring.MonitoredTask;
import org.apache.hadoop.hbase.regionserver.compactions.CompactSelection;
import org.apache.hadoop.hbase.regionserver.compactions.CompactionProgress;
import org.apache.hadoop.hbase.regionserver.compactions.CompactionRequest;
-import org.apache.hadoop.hbase.regionserver.metrics.SchemaConfigured;
-import org.apache.hadoop.hbase.regionserver.metrics.SchemaMetrics;
import org.apache.hadoop.hbase.util.Bytes;
import org.apache.hadoop.hbase.util.ChecksumType;
import org.apache.hadoop.hbase.util.ClassSize;
@@ -106,7 +104,7 @@ import com.google.common.collect.Lists;
* not be called directly but by an HRegion manager.
*/
@InterfaceAudience.Private
-public class HStore extends SchemaConfigured implements Store {
+public class HStore implements Store {
static final Log LOG = LogFactory.getLog(HStore.class);
protected final MemStore memstore;
@@ -174,9 +172,7 @@ public class HStore extends SchemaConfigured implements Store {
protected HStore(Path basedir, HRegion region, HColumnDescriptor family,
FileSystem fs, Configuration confParam)
throws IOException {
- super(new CompoundConfiguration().add(confParam).add(
- family.getValues()), region.getRegionInfo().getTableNameAsString(),
- Bytes.toString(family.getName()));
+
HRegionInfo info = region.getRegionInfo();
this.fs = fs;
// Assemble the store's home directory.
@@ -260,6 +256,15 @@ public class HStore extends SchemaConfigured implements Store {
return ttl;
}
+ public String getColumnFamilyName() {
+ return this.family.getNameAsString();
+ }
+
+ @Override
+ public String getTableName() {
+ return this.region.getTableDesc().getNameAsString();
+ }
+
/**
* Create this store's homedir
* @param fs
@@ -414,7 +419,6 @@ public class HStore extends SchemaConfigured implements Store {
public StoreFile call() throws IOException {
StoreFile storeFile = new StoreFile(fs, p, conf, cacheConf,
family.getBloomFilterType(), dataBlockEncoder);
- passSchemaMetricsTo(storeFile);
storeFile.createReader();
return storeFile;
}
@@ -573,7 +577,6 @@ public class HStore extends SchemaConfigured implements Store {
StoreFile sf = new StoreFile(fs, dstPath, this.conf, this.cacheConf,
this.family.getBloomFilterType(), this.dataBlockEncoder);
- passSchemaMetricsTo(sf);
StoreFile.Reader r = sf.createReader();
this.storeSize += r.length();
@@ -817,19 +820,11 @@ public class HStore extends SchemaConfigured implements Store {
status.setStatus("Flushing " + this + ": reopening flushed file");
StoreFile sf = new StoreFile(this.fs, dstPath, this.conf, this.cacheConf,
this.family.getBloomFilterType(), this.dataBlockEncoder);
- passSchemaMetricsTo(sf);
StoreFile.Reader r = sf.createReader();
this.storeSize += r.length();
this.totalUncompressedBytes += r.getTotalUncompressedBytes();
- // This increments the metrics associated with total flushed bytes for this
- // family. The overall flush count is stored in the static metrics and
- // retrieved from HRegion.recentFlushes, which is set within
- // HRegion.internalFlushcache, which indirectly calls this to actually do
- // the flushing through the StoreFlusherImpl class
- getSchemaMetrics().updatePersistentStoreMetric(
- SchemaMetrics.StoreMetricType.FLUSH_SIZE, flushedSize.longValue());
if (LOG.isInfoEnabled()) {
LOG.info("Added " + sf + ", entries=" + r.getEntries() +
", sequenceid=" + logCacheFlushId +
@@ -875,11 +870,6 @@ public class HStore extends SchemaConfigured implements Store {
.withBytesPerChecksum(bytesPerChecksum)
.withCompression(compression)
.build();
- // The store file writer's path does not include the CF name, so we need
- // to configure the HFile writer directly.
- SchemaConfigured sc = (SchemaConfigured) w.writer;
- SchemaConfigured.resetSchemaMetricsConf(sc);
- passSchemaMetricsTo(sc);
return w;
}
@@ -1409,8 +1399,8 @@ public class HStore extends SchemaConfigured implements Store {
(forcemajor || isMajorCompaction(compactSelection.getFilesToCompact())) &&
(compactSelection.getFilesToCompact().size() < this.maxFilesToCompact
);
- LOG.debug(this.getHRegionInfo().getEncodedName() + " - " +
- this.getColumnFamilyName() + ": Initiating " +
+ LOG.debug(this.getHRegionInfo().getEncodedName() + " - "
+ + this.getColumnFamilyName() + ": Initiating " +
(majorcompaction ? "major" : "minor") + "compaction");
if (!majorcompaction &&
@@ -1523,7 +1513,6 @@ public class HStore extends SchemaConfigured implements Store {
storeFile = new StoreFile(this.fs, path, this.conf,
this.cacheConf, this.family.getBloomFilterType(),
NoOpDataBlockEncoder.INSTANCE);
- passSchemaMetricsTo(storeFile);
storeFile.createReader();
} catch (IOException e) {
LOG.error("Failed to open store file : " + path
@@ -1575,7 +1564,6 @@ public class HStore extends SchemaConfigured implements Store {
}
result = new StoreFile(this.fs, destPath, this.conf, this.cacheConf,
this.family.getBloomFilterType(), this.dataBlockEncoder);
- passSchemaMetricsTo(result);
result.createReader();
}
try {
@@ -1936,7 +1924,7 @@ public class HStore extends SchemaConfigured implements Store {
@Override
public String toString() {
- return getColumnFamilyName();
+ return this.getColumnFamilyName();
}
@Override
@@ -2125,9 +2113,8 @@ public class HStore extends SchemaConfigured implements Store {
}
public static final long FIXED_OVERHEAD =
- ClassSize.align(SchemaConfigured.SCHEMA_CONFIGURED_UNALIGNED_HEAP_SIZE +
- + (17 * ClassSize.REFERENCE) + (6 * Bytes.SIZEOF_LONG)
- + (5 * Bytes.SIZEOF_INT) + Bytes.SIZEOF_BOOLEAN);
+ ClassSize.align((19 * ClassSize.REFERENCE) + (6 * Bytes.SIZEOF_LONG)
+ + (5 * Bytes.SIZEOF_INT) + Bytes.SIZEOF_BOOLEAN);
public static final long DEEP_OVERHEAD = ClassSize.align(FIXED_OVERHEAD
+ ClassSize.OBJECT + ClassSize.REENTRANT_LOCK
diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/MemStoreFlusher.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/MemStoreFlusher.java
index 9300fc74fe4..2fcf4cd5c70 100644
--- a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/MemStoreFlusher.java
+++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/MemStoreFlusher.java
@@ -416,7 +416,6 @@ class MemStoreFlusher extends HasThread implements FlushRequester {
server.compactSplitThread.requestCompaction(region, getName());
}
- server.getMetrics().addFlush(region.getRecentFlushInfo());
} catch (DroppedSnapshotException ex) {
// Cache flush can fail in a few places. If it fails in a critical
// section, we get a DroppedSnapshotException and a replay of hlog
diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/MetricsRegion.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/MetricsRegion.java
new file mode 100644
index 00000000000..70795305cb8
--- /dev/null
+++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/MetricsRegion.java
@@ -0,0 +1,66 @@
+/*
+ * Copyright The Apache Software Foundation
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with this
+ * work for additional information regarding copyright ownership. The ASF
+ * licenses this file to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.hadoop.hbase.regionserver;
+
+import org.apache.hadoop.classification.InterfaceAudience;
+import org.apache.hadoop.hbase.CompatibilityFactory;
+
+
+/**
+ * This is the glue between the HRegion and whatever hadoop shim layer
+ * is loaded (hbase-hadoop1-compat or hbase-hadoop2-compat).
+ */
+@InterfaceAudience.Private
+public class MetricsRegion {
+
+ private MetricsRegionSource source;
+
+ public MetricsRegion(MetricsRegionWrapper wrapper) {
+ source = CompatibilityFactory.getInstance(MetricsRegionServerSourceFactory.class)
+ .createRegion(wrapper);
+ }
+
+ public void close() {
+ source.close();
+ }
+
+ public void updatePut() {
+ source.updatePut();
+ }
+
+ public void updateDelete() {
+ source.updateDelete();
+ }
+
+ public void updateGet() {
+ source.updateGet();
+ }
+
+ public void updateAppend() {
+ source.updateAppend();
+ }
+
+ public void updateIncrement() {
+ source.updateIncrement();
+ }
+
+ MetricsRegionSource getSource() {
+ return source;
+ }
+}
diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/MetricsRegionServer.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/MetricsRegionServer.java
new file mode 100644
index 00000000000..3c84213e3c8
--- /dev/null
+++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/MetricsRegionServer.java
@@ -0,0 +1,75 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.hadoop.hbase.regionserver;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.apache.hadoop.classification.InterfaceAudience;
+import org.apache.hadoop.classification.InterfaceStability;
+import org.apache.hadoop.hbase.CompatibilitySingletonFactory;
+
+/**
+ * This class is for maintaining the various regionserver statistics
+ * and publishing them through the metrics interfaces.
+ *
+ * This class has a number of metrics variables that are publicly accessible;
+ * these variables (objects) have methods to update their values.
+ */
+@InterfaceStability.Evolving
+@InterfaceAudience.Private
+public class MetricsRegionServer {
+ private final Log LOG = LogFactory.getLog(this.getClass());
+ private MetricsRegionServerSource serverSource;
+ private MetricsRegionServerWrapper regionServerWrapper;
+
+ public MetricsRegionServer(MetricsRegionServerWrapper regionServerWrapper) {
+ this.regionServerWrapper = regionServerWrapper;
+ serverSource =
+ CompatibilitySingletonFactory.getInstance(MetricsRegionServerSourceFactory.class)
+ .createServer(regionServerWrapper);
+ }
+
+ // for unit-test usage
+ public MetricsRegionServerSource getMetricsSource() {
+ return serverSource;
+ }
+
+ public MetricsRegionServerWrapper getRegionServerWrapper() {
+ return regionServerWrapper;
+ }
+
+ public void updatePut(long t){
+ serverSource.updatePut(t);
+ }
+
+ public void updateDelete(long t){
+ serverSource.updateDelete(t);
+ }
+
+ public void updateGet(long t){
+ serverSource.updateGet(t);
+ }
+
+ public void updateIncrement(long t){
+ serverSource.updateIncrement(t);
+ }
+
+ public void updateAppend(long t){
+ serverSource.updateAppend(t);
+ }
+}
diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/MetricsRegionServerWrapperImpl.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/MetricsRegionServerWrapperImpl.java
new file mode 100644
index 00000000000..22f7af7e2be
--- /dev/null
+++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/MetricsRegionServerWrapperImpl.java
@@ -0,0 +1,395 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.hadoop.hbase.regionserver;
+
+import org.apache.commons.lang.StringUtils;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.apache.hadoop.classification.InterfaceAudience;
+import org.apache.hadoop.hbase.CompatibilitySingletonFactory;
+import org.apache.hadoop.hbase.HDFSBlocksDistribution;
+import org.apache.hadoop.hbase.ServerName;
+import org.apache.hadoop.hbase.io.hfile.BlockCache;
+import org.apache.hadoop.hbase.io.hfile.CacheStats;
+import org.apache.hadoop.hbase.util.EnvironmentEdgeManager;
+import org.apache.hadoop.hbase.zookeeper.ZooKeeperWatcher;
+import org.apache.hadoop.metrics2.MetricsExecutor;
+
+import java.util.Collection;
+import java.util.concurrent.ScheduledExecutorService;
+import java.util.concurrent.TimeUnit;
+
+/**
+ * Impl for exposing HRegionServer Information through Hadoop's metrics 2 system.
+ */
+@InterfaceAudience.Private
+class MetricsRegionServerWrapperImpl
+ implements MetricsRegionServerWrapper {
+
+ public static final Log LOG = LogFactory.getLog(MetricsRegionServerWrapperImpl.class);
+
+ public static final int PERIOD = 15;
+
+ private final HRegionServer regionServer;
+ private final BlockCache blockCache;
+
+ private volatile long numStores = 0;
+ private volatile long numStoreFiles = 0;
+ private volatile long memstoreSize = 0;
+ private volatile long storeFileSize = 0;
+ private volatile double requestsPerSecond = 0.0;
+ private volatile long readRequestsCount = 0;
+ private volatile long writeRequestsCount = 0;
+ private volatile long checkAndMutateChecksFailed = 0;
+ private volatile long checkAndMutateChecksPassed = 0;
+ private volatile long storefileIndexSize = 0;
+ private volatile long totalStaticIndexSize = 0;
+ private volatile long totalStaticBloomSize = 0;
+ private volatile long numPutsWithoutWAL = 0;
+ private volatile long dataInMemoryWithoutWAL = 0;
+ private volatile int percentFileLocal = 0;
+
+ private CacheStats cacheStats;
+ private ScheduledExecutorService executor;
+ private Runnable runnable;
+
+ public MetricsRegionServerWrapperImpl(final HRegionServer regionServer) {
+ this.regionServer = regionServer;
+ this.blockCache = this.regionServer.cacheConfig.getBlockCache();
+ this.cacheStats = blockCache.getStats();
+ this.executor = CompatibilitySingletonFactory.getInstance(MetricsExecutor.class).getExecutor();
+ this.runnable = new RegionServerMetricsWrapperRunnable();
+ this.executor.scheduleWithFixedDelay(this.runnable, PERIOD, PERIOD, TimeUnit.SECONDS);
+ }
+
+ @Override
+ public String getClusterId() {
+ return regionServer.getClusterId();
+ }
+
+ @Override
+ public long getStartCode() {
+ return regionServer.getStartcode();
+ }
+
+ @Override
+ public String getZookeeperQuorum() {
+ ZooKeeperWatcher zk = regionServer.getZooKeeperWatcher();
+ if (zk == null) {
+ return "";
+ }
+ return zk.getQuorum();
+ }
+
+ @Override
+ public String getCoprocessors() {
+ String[] coprocessors = regionServer.getCoprocessors();
+ if (coprocessors == null || coprocessors.length == 0) {
+ return "";
+ }
+ return StringUtils.join(coprocessors, ", ");
+ }
+
+ @Override
+ public String getServerName() {
+ ServerName serverName = regionServer.getServerName();
+ if (serverName == null) {
+ return "";
+ }
+ return serverName.getServerName();
+ }
+
+ @Override
+ public long getNumOnlineRegions() {
+ Collection onlineRegionsLocalContext = regionServer.getOnlineRegionsLocalContext();
+ if (onlineRegionsLocalContext == null) {
+ return 0;
+ }
+ return onlineRegionsLocalContext.size();
+ }
+
+ @Override
+ public long getTotalRequestCount() {
+ return regionServer.requestCount.get();
+ }
+
+ @Override
+ public int getCompactionQueueSize() {
+ //The thread could be zero. if so assume there is no queue.
+ if (this.regionServer.compactSplitThread == null) {
+ return 0;
+ }
+ return this.regionServer.compactSplitThread.getCompactionQueueSize();
+ }
+
+ @Override
+ public int getFlushQueueSize() {
+ //If there is no flusher there should be no queue.
+ if (this.regionServer.cacheFlusher == null) {
+ return 0;
+ }
+ return this.regionServer.cacheFlusher.getFlushQueueSize();
+ }
+
+ @Override
+ public long getBlockCacheCount() {
+ if (this.blockCache == null) {
+ return 0;
+ }
+ return this.blockCache.size();
+ }
+
+ @Override
+ public long getBlockCacheSize() {
+ if (this.blockCache == null) {
+ return 0;
+ }
+ return this.blockCache.getCurrentSize();
+ }
+
+ @Override
+ public long getBlockCacheFreeSize() {
+ if (this.blockCache == null) {
+ return 0;
+ }
+ return this.blockCache.getFreeSize();
+ }
+
+ @Override
+ public long getBlockCacheHitCount() {
+ if (this.cacheStats == null) {
+ return 0;
+ }
+ return this.cacheStats.getHitCount();
+ }
+
+ @Override
+ public long getBlockCacheMissCount() {
+ if (this.cacheStats == null) {
+ return 0;
+ }
+ return this.cacheStats.getMissCount();
+ }
+
+ @Override
+ public long getBlockCacheEvictedCount() {
+ if (this.cacheStats == null) {
+ return 0;
+ }
+ return this.cacheStats.getEvictedCount();
+ }
+
+ @Override
+ public int getBlockCacheHitPercent() {
+ if (this.cacheStats == null) {
+ return 0;
+ }
+ return (int) (this.cacheStats.getHitRatio() * 100);
+ }
+
+ @Override
+ public int getBlockCacheHitCachingPercent() {
+ if (this.cacheStats == null) {
+ return 0;
+ }
+ return (int) (this.cacheStats.getHitCachingRatio() * 100);
+ }
+
+ @Override public void forceRecompute() {
+ this.runnable.run();
+ }
+
+ @Override
+ public long getNumStores() {
+ return numStores;
+ }
+
+ @Override
+ public long getNumStoreFiles() {
+ return numStoreFiles;
+ }
+
+ @Override
+ public long getMemstoreSize() {
+ return memstoreSize;
+ }
+
+ @Override
+ public long getStoreFileSize() {
+ return storeFileSize;
+ }
+
+ @Override public double getRequestsPerSecond() {
+ return requestsPerSecond;
+ }
+
+ @Override
+ public long getReadRequestsCount() {
+ return readRequestsCount;
+ }
+
+ @Override
+ public long getWriteRequestsCount() {
+ return writeRequestsCount;
+ }
+
+ @Override
+ public long getCheckAndMutateChecksFailed() {
+ return checkAndMutateChecksFailed;
+ }
+
+ @Override
+ public long getCheckAndMutateChecksPassed() {
+ return checkAndMutateChecksPassed;
+ }
+
+ @Override
+ public long getStoreFileIndexSize() {
+ return storefileIndexSize;
+ }
+
+ @Override
+ public long getTotalStaticIndexSize() {
+ return totalStaticIndexSize;
+ }
+
+ @Override
+ public long getTotalStaticBloomSize() {
+ return totalStaticBloomSize;
+ }
+
+ @Override
+ public long getNumPutsWithoutWAL() {
+ return numPutsWithoutWAL;
+ }
+
+ @Override
+ public long getDataInMemoryWithoutWAL() {
+ return dataInMemoryWithoutWAL;
+ }
+
+ @Override
+ public int getPercentFileLocal() {
+ return percentFileLocal;
+ }
+
+ @Override
+ public long getUpdatesBlockedTime() {
+ if (this.regionServer.cacheFlusher == null) {
+ return 0;
+ }
+ return this.regionServer.cacheFlusher.getUpdatesBlockedMsHighWater().get();
+ }
+
+
+ /**
+ * This is the runnable that will be executed on the executor every PERIOD number of seconds
+ * It will take metrics/numbers from all of the regions and use them to compute point in
+ * time metrics.
+ */
+ public class RegionServerMetricsWrapperRunnable implements Runnable {
+
+ private long lastRan = 0;
+ private long lastRequestCount = 0;
+
+ @Override
+ synchronized public void run() {
+
+ cacheStats = blockCache.getStats();
+
+ HDFSBlocksDistribution hdfsBlocksDistribution =
+ new HDFSBlocksDistribution();
+
+ long tempNumStores = 0;
+ long tempNumStoreFiles = 0;
+ long tempMemstoreSize = 0;
+ long tempStoreFileSize = 0;
+ long tempReadRequestsCount = 0;
+ long tempWriteRequestsCount = 0;
+ long tempCheckAndMutateChecksFailed = 0;
+ long tempCheckAndMutateChecksPassed = 0;
+ long tempStorefileIndexSize = 0;
+ long tempTotalStaticIndexSize = 0;
+ long tempTotalStaticBloomSize = 0;
+ long tempNumPutsWithoutWAL = 0;
+ long tempDataInMemoryWithoutWAL = 0;
+ int tempPercentFileLocal = 0;
+
+
+ for (HRegion r : regionServer.getOnlineRegionsLocalContext()) {
+ tempNumPutsWithoutWAL += r.numPutsWithoutWAL.get();
+ tempDataInMemoryWithoutWAL += r.dataInMemoryWithoutWAL.get();
+ tempReadRequestsCount += r.readRequestsCount.get();
+ tempWriteRequestsCount += r.writeRequestsCount.get();
+ tempCheckAndMutateChecksFailed += r.checkAndMutateChecksFailed.get();
+ tempCheckAndMutateChecksPassed += r.checkAndMutateChecksPassed.get();
+ tempNumStores += r.stores.size();
+ for (Store store : r.stores.values()) {
+ tempNumStoreFiles += store.getStorefilesCount();
+ tempMemstoreSize += store.getMemStoreSize();
+ tempStoreFileSize += store.getStorefilesSize();
+ tempStorefileIndexSize += store.getStorefilesIndexSize();
+ tempTotalStaticBloomSize += store.getTotalStaticBloomSize();
+ tempTotalStaticIndexSize += store.getTotalStaticIndexSize();
+ }
+
+ hdfsBlocksDistribution.add(r.getHDFSBlocksDistribution());
+ }
+
+ float localityIndex = hdfsBlocksDistribution.getBlockLocalityIndex(
+ regionServer.getServerName().getHostname());
+ tempPercentFileLocal = (int) (localityIndex * 100);
+
+
+ //Compute the number of requests per second
+ long currentTime = EnvironmentEdgeManager.currentTimeMillis();
+
+ // assume that it took PERIOD seconds to start the executor.
+ // this is a guess but it's a pretty good one.
+ if (lastRan == 0) {
+ lastRan = currentTime - (PERIOD*1000);
+ }
+
+
+ //If we've time traveled keep the last requests per second.
+ if ((currentTime - lastRan) > 10) {
+ long currentRequestCount = getTotalRequestCount();
+ requestsPerSecond = (currentRequestCount - lastRequestCount) / ((currentTime - lastRan) / 1000.0);
+ lastRequestCount = currentRequestCount;
+ }
+ lastRan = currentTime;
+
+ //Copy over computed values so that no thread sees half computed values.
+ numStores = tempNumStores;
+ numStoreFiles = tempNumStoreFiles;
+ memstoreSize = tempMemstoreSize;
+ storeFileSize = tempStoreFileSize;
+ readRequestsCount = tempReadRequestsCount;
+ writeRequestsCount = tempWriteRequestsCount;
+ checkAndMutateChecksFailed = tempCheckAndMutateChecksFailed;
+ checkAndMutateChecksPassed = tempCheckAndMutateChecksPassed;
+ storefileIndexSize = tempStorefileIndexSize;
+ totalStaticIndexSize = tempTotalStaticIndexSize;
+ totalStaticBloomSize = tempTotalStaticBloomSize;
+ numPutsWithoutWAL = tempNumPutsWithoutWAL;
+ dataInMemoryWithoutWAL = tempDataInMemoryWithoutWAL;
+ percentFileLocal = tempPercentFileLocal;
+ }
+ }
+
+}
diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/MetricsRegionWrapperImpl.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/MetricsRegionWrapperImpl.java
new file mode 100644
index 00000000000..64d570dcac4
--- /dev/null
+++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/MetricsRegionWrapperImpl.java
@@ -0,0 +1,105 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.hadoop.hbase.regionserver;
+
+import org.apache.hadoop.hbase.CompatibilitySingletonFactory;
+import org.apache.hadoop.metrics2.MetricsExecutor;
+
+import java.util.concurrent.ScheduledExecutorService;
+import java.util.concurrent.TimeUnit;
+
+public class MetricsRegionWrapperImpl implements MetricsRegionWrapper {
+
+ public static final int PERIOD = 45;
+
+ private final HRegion region;
+ private ScheduledExecutorService executor;
+ private Runnable runnable;
+ private long numStoreFiles;
+ private long memstoreSize;
+ private long storeFileSize;
+
+ public MetricsRegionWrapperImpl(HRegion region) {
+ this.region = region;
+ this.executor = CompatibilitySingletonFactory.getInstance(MetricsExecutor.class).getExecutor();
+ this.runnable = new HRegionMetricsWrapperRunnable();
+ this.executor.scheduleWithFixedDelay(this.runnable, PERIOD, PERIOD, TimeUnit.SECONDS);
+ }
+
+ @Override
+ public String getTableName() {
+ return this.region.getTableDesc().getNameAsString();
+ }
+
+ @Override
+ public String getRegionName() {
+ return this.region.getRegionInfo().getEncodedName();
+ }
+
+ @Override
+ public long getNumStores() {
+ return this.region.stores.size();
+ }
+
+ @Override
+ public long getNumStoreFiles() {
+ return numStoreFiles;
+ }
+
+ @Override
+ public long getMemstoreSize() {
+ return memstoreSize;
+ }
+
+ @Override
+ public long getStoreFileSize() {
+ return storeFileSize;
+ }
+
+ @Override
+ public long getReadRequestCount() {
+ return this.region.getReadRequestsCount();
+ }
+
+ @Override
+ public long getWriteRequestCount() {
+ return this.region.getWriteRequestsCount();
+ }
+
+ public class HRegionMetricsWrapperRunnable implements Runnable {
+
+ @Override
+ public void run() {
+ long tempNumStoreFiles = 0;
+ long tempMemstoreSize = 0;
+ long tempStoreFileSize = 0;
+
+ for (Store store : region.stores.values()) {
+ tempNumStoreFiles += store.getStorefilesCount();
+ tempMemstoreSize += store.getMemStoreSize();
+ tempStoreFileSize += store.getStorefilesSize();
+ }
+
+ numStoreFiles = tempNumStoreFiles;
+ memstoreSize = tempMemstoreSize;
+ storeFileSize = tempStoreFileSize;
+ }
+ }
+
+}
\ No newline at end of file
diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/SplitRequest.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/SplitRequest.java
index f945ffd277f..0b5a3162339 100644
--- a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/SplitRequest.java
+++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/SplitRequest.java
@@ -66,7 +66,6 @@ class SplitRequest implements Runnable {
if (!st.prepare()) return;
try {
st.execute(this.server, this.server);
- this.server.getMetrics().incrementSplitSuccessCount(System.currentTimeMillis() - startTime);
} catch (Exception e) {
if (this.server.isStopping() || this.server.isStopped()) {
LOG.info(
@@ -81,7 +80,6 @@ class SplitRequest implements Runnable {
if (st.rollback(this.server, this.server)) {
LOG.info("Successful rollback of failed split of " +
parent.getRegionNameAsString());
- this.server.getMetrics().incrementSplitFailureCount();
} else {
this.server.abort("Abort; we got an error after point-of-no-return");
}
@@ -102,7 +100,6 @@ class SplitRequest implements Runnable {
} catch (IOException ex) {
LOG.error("Split failed " + this, RemoteExceptionHandler
.checkIOException(ex));
- this.server.getMetrics().incrementSplitFailureCount();
server.checkFileSystem();
} finally {
if (this.parent.getCoprocessorHost() != null) {
diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/Store.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/Store.java
index d391a16df74..1841eebf323 100644
--- a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/Store.java
+++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/Store.java
@@ -32,7 +32,6 @@ import org.apache.hadoop.hbase.io.hfile.CacheConfig;
import org.apache.hadoop.hbase.io.hfile.HFileDataBlockEncoder;
import org.apache.hadoop.hbase.regionserver.compactions.CompactionProgress;
import org.apache.hadoop.hbase.regionserver.compactions.CompactionRequest;
-import org.apache.hadoop.hbase.regionserver.metrics.SchemaMetrics.SchemaAware;
import com.google.common.collect.ImmutableList;
@@ -42,7 +41,7 @@ import com.google.common.collect.ImmutableList;
*/
@InterfaceAudience.Private
@InterfaceStability.Evolving
-public interface Store extends SchemaAware, HeapSize {
+public interface Store extends HeapSize {
/* The default priority for user-specified compaction requests.
* The user gets top priority unless we have blocking compactions. (Pri <= 0)
@@ -287,4 +286,8 @@ public interface Store extends SchemaAware, HeapSize {
* @return the parent region hosting this store
*/
public HRegion getHRegion();
+
+ public String getColumnFamilyName();
+
+ public String getTableName();
}
diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/StoreFile.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/StoreFile.java
index 203aecf50d6..a240f94c9ac 100644
--- a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/StoreFile.java
+++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/StoreFile.java
@@ -58,8 +58,6 @@ import org.apache.hadoop.hbase.io.hfile.HFile;
import org.apache.hadoop.hbase.io.hfile.HFileScanner;
import org.apache.hadoop.hbase.io.hfile.HFileWriterV1;
import org.apache.hadoop.hbase.io.hfile.HFileWriterV2;
-import org.apache.hadoop.hbase.regionserver.metrics.SchemaMetrics;
-import org.apache.hadoop.hbase.regionserver.metrics.SchemaConfigured;
import org.apache.hadoop.hbase.io.hfile.HFileDataBlockEncoder;
import org.apache.hadoop.hbase.io.hfile.NoOpDataBlockEncoder;
import org.apache.hadoop.hbase.util.ChecksumType;
@@ -80,7 +78,7 @@ import com.google.common.collect.Ordering;
/**
* A Store data file. Stores usually have one or more of these files. They
* are produced by flushing the memstore to disk. To
- * create, instantiate a writer using {@link StoreFile#WriterBuilder}
+ * create, instantiate a writer using {@link StoreFile.WriterBuilder}
* and append data. Be sure to add any metadata before calling close on the
* Writer (Use the appendMetadata convenience methods). On close, a StoreFile
* is sitting in the Filesystem. To refer to it, create a StoreFile instance
@@ -91,7 +89,7 @@ import com.google.common.collect.Ordering;
* writer and a reader is that we write once but read a lot more.
*/
@InterfaceAudience.LimitedPrivate("Coprocessor")
-public class StoreFile extends SchemaConfigured {
+public class StoreFile {
static final Log LOG = LogFactory.getLog(StoreFile.class.getName());
public static enum BloomType {
@@ -277,7 +275,6 @@ public class StoreFile extends SchemaConfigured {
this.modificationTimeStamp = 0;
}
- SchemaMetrics.configureGlobally(conf);
}
/**
@@ -545,11 +542,6 @@ public class StoreFile extends SchemaConfigured {
dataBlockEncoder.getEncodingInCache());
}
- if (isSchemaConfigured()) {
- SchemaConfigured.resetSchemaMetricsConf(reader);
- passSchemaMetricsTo(reader);
- }
-
computeHDFSBlockDistribution();
// Load up indices and fileinfo. This also loads Bloom filter type.
@@ -1287,7 +1279,7 @@ public class StoreFile extends SchemaConfigured {
/**
* Reader for a StoreFile.
*/
- public static class Reader extends SchemaConfigured {
+ public static class Reader {
static final Log LOG = LogFactory.getLog(Reader.class.getName());
protected BloomFilter generalBloomFilter = null;
@@ -1301,7 +1293,6 @@ public class StoreFile extends SchemaConfigured {
public Reader(FileSystem fs, Path path, CacheConfig cacheConf,
DataBlockEncoding preferredEncodingInCache) throws IOException {
- super(path);
reader = HFile.createReaderWithEncoding(fs, path, cacheConf,
preferredEncodingInCache);
bloomFilterType = BloomType.NONE;
@@ -1310,7 +1301,6 @@ public class StoreFile extends SchemaConfigured {
public Reader(FileSystem fs, Path path, HFileLink hfileLink, long size,
CacheConfig cacheConf, DataBlockEncoding preferredEncodingInCache,
boolean closeIStream) throws IOException {
- super(path);
FSDataInputStream in = hfileLink.open(fs);
FSDataInputStream inNoChecksum = in;
@@ -1584,7 +1574,6 @@ public class StoreFile extends SchemaConfigured {
&& bloomFilter.contains(key, 0, key.length, bloom);
}
- getSchemaMetrics().updateBloomMetrics(exists);
return exists;
}
} catch (IOException e) {
@@ -1728,10 +1717,6 @@ public class StoreFile extends SchemaConfigured {
return reader.indexSize();
}
- public String getColumnFamilyName() {
- return reader.getColumnFamilyName();
- }
-
public BloomType getBloomFilterType() {
return this.bloomFilterType;
}
@@ -1774,11 +1759,6 @@ public class StoreFile extends SchemaConfigured {
public long getMaxTimestamp() {
return timeRangeTracker.maximumTimestamp;
}
-
- @Override
- public void schemaConfigurationChanged() {
- passSchemaMetricsTo((SchemaConfigured) reader);
- }
}
/**
diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/StoreScanner.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/StoreScanner.java
index b595c066bac..4ccdbccff36 100644
--- a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/StoreScanner.java
+++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/StoreScanner.java
@@ -33,8 +33,6 @@ import org.apache.hadoop.hbase.KeyValue;
import org.apache.hadoop.hbase.client.Scan;
import org.apache.hadoop.hbase.filter.Filter;
import org.apache.hadoop.hbase.regionserver.HStore.ScanInfo;
-import org.apache.hadoop.hbase.regionserver.metrics.RegionMetricsStorage;
-import org.apache.hadoop.hbase.regionserver.metrics.SchemaMetrics;
import org.apache.hadoop.hbase.util.Bytes;
import org.apache.hadoop.hbase.util.EnvironmentEdgeManager;
@@ -110,7 +108,6 @@ public class StoreScanner extends NonLazyKeyValueScanner
throws IOException {
this(store, scan.getCacheBlocks(), scan, columns, scanInfo.getTtl(),
scanInfo.getMinVersions());
- initializeMetricNames();
if (columns != null && scan.isRaw()) {
throw new DoNotRetryIOException(
"Cannot specify any column for a raw scan");
@@ -163,7 +160,6 @@ public class StoreScanner extends NonLazyKeyValueScanner
long smallestReadPoint, long earliestPutTs) throws IOException {
this(store, false, scan, null, scanInfo.getTtl(),
scanInfo.getMinVersions());
- initializeMetricNames();
matcher = new ScanQueryMatcher(scan, scanInfo, null, scanType,
smallestReadPoint, earliestPutTs, oldestUnexpiredTS);
@@ -194,7 +190,6 @@ public class StoreScanner extends NonLazyKeyValueScanner
throws IOException {
this(null, scan.getCacheBlocks(), scan, columns, scanInfo.getTtl(),
scanInfo.getMinVersions());
- this.initializeMetricNames();
this.matcher = new ScanQueryMatcher(scan, scanInfo, columns, scanType,
Long.MAX_VALUE, earliestPutTs, oldestUnexpiredTS);
@@ -205,23 +200,6 @@ public class StoreScanner extends NonLazyKeyValueScanner
heap = new KeyValueHeap(scanners, scanInfo.getComparator());
}
- /**
- * Method used internally to initialize metric names throughout the
- * constructors.
- *
- * To be called after the store variable has been initialized!
- */
- private void initializeMetricNames() {
- String tableName = SchemaMetrics.UNKNOWN;
- String family = SchemaMetrics.UNKNOWN;
- if (store != null) {
- tableName = store.getTableName();
- family = Bytes.toString(store.getFamily().getName());
- }
- this.metricNamePrefix =
- SchemaMetrics.generateSchemaMetricsPrefix(tableName, family);
- }
-
/**
* Get a filtered list of scanners. Assumes we are not in a compaction.
* @return list of scanners to seek
@@ -458,8 +436,7 @@ public class StoreScanner extends NonLazyKeyValueScanner
}
} finally {
if (cumulativeMetric > 0 && metric != null) {
- RegionMetricsStorage.incrNumericMetric(this.metricNamePrefix + metric,
- cumulativeMetric);
+
}
}
diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/compactions/CompactionRequest.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/compactions/CompactionRequest.java
index bee966800ca..80e4d5ee090 100644
--- a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/compactions/CompactionRequest.java
+++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/compactions/CompactionRequest.java
@@ -253,7 +253,6 @@ public class CompactionRequest implements Comparable,
LOG.info(((completed) ? "completed" : "aborted") + " compaction: " +
this + "; duration=" + StringUtils.formatTimeDiff(now, start));
if (completed) {
- server.getMetrics().addCompaction(now - start, this.totalSize);
// degenerate case: blocked regions require recursive enqueues
if (s.getCompactPriority() <= 0) {
server.compactSplitThread
diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/metrics/OperationMetrics.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/metrics/OperationMetrics.java
deleted file mode 100644
index bff18c33b13..00000000000
--- a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/metrics/OperationMetrics.java
+++ /dev/null
@@ -1,225 +0,0 @@
-/*
- * Copyright The Apache Software Foundation
- *
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with this
- * work for additional information regarding copyright ownership. The ASF
- * licenses this file to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.hadoop.hbase.regionserver.metrics;
-
-import java.util.Set;
-
-import org.apache.hadoop.classification.InterfaceAudience;
-import org.apache.hadoop.conf.Configuration;
-import org.apache.hadoop.hbase.HRegionInfo;
-import org.apache.hadoop.hbase.client.Append;
-import org.apache.hadoop.hbase.client.Delete;
-import org.apache.hadoop.hbase.client.Get;
-import org.apache.hadoop.hbase.client.HTable;
-import org.apache.hadoop.hbase.client.Increment;
-import org.apache.hadoop.hbase.client.Put;
-import org.apache.hadoop.hbase.util.Bytes;
-
-/**
- * This class provides a simplified interface to expose time varying metrics
- * about GET/DELETE/PUT/ICV operations on a region and on Column Families. All
- * metrics are stored in {@link RegionMetricsStorage} and exposed to hadoop
- * metrics through {@link RegionServerDynamicMetrics}.
- */
-@InterfaceAudience.Private
-public class OperationMetrics {
-
- private static final String DELETE_KEY = "delete_";
- private static final String PUT_KEY = "put_";
- private static final String GET_KEY = "get_";
- private static final String ICV_KEY = "incrementColumnValue_";
- private static final String INCREMENT_KEY = "increment_";
- private static final String MULTIPUT_KEY = "multiput_";
- private static final String MULTIDELETE_KEY = "multidelete_";
- private static final String APPEND_KEY = "append_";
-
- /** Conf key controlling whether we should expose metrics.*/
- private static final String CONF_KEY =
- "hbase.metrics.exposeOperationTimes";
-
- private String tableName = null;
- private String regionName = null;
- private String regionMetrixPrefix = null;
- private Configuration conf = null;
-
-
- /**
- * Create a new OperationMetrics
- * @param conf The Configuration of the HRegion reporting operations coming in.
- * @param regionInfo The region info
- */
- public OperationMetrics(Configuration conf, HRegionInfo regionInfo) {
- // Configure SchemaMetrics before trying to create a RegionOperationMetrics instance as
- // RegionOperationMetrics relies on SchemaMetrics to do naming.
- if (conf != null) {
- SchemaMetrics.configureGlobally(conf);
-
- this.conf = conf;
- if (regionInfo != null) {
- this.tableName = regionInfo.getTableNameAsString();
- this.regionName = regionInfo.getEncodedName();
- } else {
- this.tableName = SchemaMetrics.UNKNOWN;
- this.regionName = SchemaMetrics.UNKNOWN;
- }
- this.regionMetrixPrefix =
- SchemaMetrics.generateRegionMetricsPrefix(this.tableName, this.regionName);
- }
- }
-
- /**
- * This is used in creating a testing HRegion where the regionInfo is unknown
- * @param conf
- */
- public OperationMetrics() {
- this(null, null);
- }
-
-
- /**
- * Update the stats associated with {@link HTable#put(java.util.List)}.
- *
- * @param columnFamilies Set of CF's this multiput is associated with
- * @param value the time
- */
- public void updateMultiPutMetrics(Set columnFamilies, long value) {
- doUpdateTimeVarying(columnFamilies, MULTIPUT_KEY, value);
- }
-
- /**
- * Update the stats associated with {@link HTable#delete(java.util.List)}.
- *
- * @param columnFamilies Set of CF's this multidelete is associated with
- * @param value the time
- */
- public void updateMultiDeleteMetrics(Set columnFamilies, long value) {
- doUpdateTimeVarying(columnFamilies, MULTIDELETE_KEY, value);
- }
-
- /**
- * Update the metrics associated with a {@link Get}
- *
- * @param columnFamilies
- * Set of Column Families in this get.
- * @param value
- * the time
- */
- public void updateGetMetrics(Set columnFamilies, long value) {
- doUpdateTimeVarying(columnFamilies, GET_KEY, value);
- }
-
- /**
- * Update metrics associated with an {@link Increment}
- * @param columnFamilies
- * @param value
- */
- public void updateIncrementMetrics(Set columnFamilies, long value) {
- doUpdateTimeVarying(columnFamilies, INCREMENT_KEY, value);
- }
-
-
- /**
- * Update the metrics associated with an {@link Append}
- * @param columnFamilies
- * @param value
- */
- public void updateAppendMetrics(Set columnFamilies, long value) {
- doUpdateTimeVarying(columnFamilies, APPEND_KEY, value);
- }
-
-
- /**
- * Update the metrics associated with
- * {@link HTable#incrementColumnValue(byte[], byte[], byte[], long)}
- *
- * @param columnFamily
- * The single column family associated with an ICV
- * @param value
- * the time
- */
- public void updateIncrementColumnValueMetrics(byte[] columnFamily, long value) {
- String cfMetricPrefix =
- SchemaMetrics.generateSchemaMetricsPrefix(this.tableName, Bytes.toString(columnFamily));
- doSafeIncTimeVarying(cfMetricPrefix, ICV_KEY, value);
- doSafeIncTimeVarying(this.regionMetrixPrefix, ICV_KEY, value);
- }
-
- /**
- * update metrics associated with a {@link Put}
- *
- * @param columnFamilies
- * Set of column families involved.
- * @param value
- * the time.
- */
- public void updatePutMetrics(Set columnFamilies, long value) {
- doUpdateTimeVarying(columnFamilies, PUT_KEY, value);
- }
-
- /**
- * update metrics associated with a {@link Delete}
- *
- * @param columnFamilies
- * @param value
- * the time.
- */
- public void updateDeleteMetrics(Set columnFamilies, long value) {
- doUpdateTimeVarying(columnFamilies, DELETE_KEY, value);
- }
-
- /**
- * This deletes all old metrics this instance has ever created or updated.
- */
- public void closeMetrics() {
- RegionMetricsStorage.clear();
- }
-
- /**
- * Method to send updates for cf and region metrics. This is the normal method
- * used if the naming of stats and CF's are in line with put/delete/multiput.
- *
- * @param columnFamilies
- * the set of column families involved.
- * @param key
- * the metric name.
- * @param value
- * the time.
- */
- private void doUpdateTimeVarying(Set columnFamilies, String key, long value) {
- String cfPrefix = null;
- if (columnFamilies != null) {
- cfPrefix = SchemaMetrics.generateSchemaMetricsPrefix(tableName, columnFamilies);
- } else {
- cfPrefix = SchemaMetrics.generateSchemaMetricsPrefix(tableName, SchemaMetrics.UNKNOWN);
- }
-
- doSafeIncTimeVarying(cfPrefix, key, value);
- doSafeIncTimeVarying(this.regionMetrixPrefix, key, value);
- }
-
- private void doSafeIncTimeVarying(String prefix, String key, long value) {
- if (conf.getBoolean(CONF_KEY, true)) {
- if (prefix != null && !prefix.isEmpty() && key != null && !key.isEmpty()) {
- String m = prefix + key;
- RegionMetricsStorage.incrTimeVaryingMetric(m, value);
- }
- }
- }
-
-}
diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/metrics/RegionMetricsStorage.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/metrics/RegionMetricsStorage.java
deleted file mode 100644
index 5d4beffc2e2..00000000000
--- a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/metrics/RegionMetricsStorage.java
+++ /dev/null
@@ -1,138 +0,0 @@
-/*
- * Copyright The Apache Software Foundation
- *
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with this
- * work for additional information regarding copyright ownership. The ASF
- * licenses this file to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.hadoop.hbase.regionserver.metrics;
-
-import java.util.Map;
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.concurrent.ConcurrentMap;
-import java.util.concurrent.atomic.AtomicInteger;
-import java.util.concurrent.atomic.AtomicLong;
-
-import org.apache.hadoop.classification.InterfaceAudience;
-import org.apache.hadoop.hbase.util.Pair;
-
-/**
- * This class if for maintaining the maps used to power metrics for hfiles,
- * regions, and regionservers. It has methods to mutate and get state of metrics
- * numbers. These numbers are exposed to Hadoop metrics through
- * RegionServerDynamicMetrics.
- */
-@InterfaceAudience.Private
-public class RegionMetricsStorage {
-
- // for simple numeric metrics (# of blocks read from block cache)
- private static final ConcurrentMap numericMetrics =
- new ConcurrentHashMap();
-
- // for simple numeric metrics (current block cache size)
- // These ones are not reset to zero when queried, unlike the previous.
- private static final ConcurrentMap numericPersistentMetrics =
- new ConcurrentHashMap();
-
- /**
- * Used for metrics where we want track a metrics (such as latency) over a
- * number of operations.
- */
- private static final ConcurrentMap> timeVaryingMetrics =
- new ConcurrentHashMap>();
-
- public static Map getNumericMetrics() {
- return numericMetrics;
- }
-
- public static Map getNumericPersistentMetrics() {
- return numericPersistentMetrics;
- }
-
- public static Map> getTimeVaryingMetrics() {
- return timeVaryingMetrics;
- }
-
- public static void incrNumericMetric(String key, long amount) {
- AtomicLong oldVal = numericMetrics.get(key);
- if (oldVal == null) {
- oldVal = numericMetrics.putIfAbsent(key, new AtomicLong(amount));
- if (oldVal == null)
- return;
- }
- oldVal.addAndGet(amount);
- }
-
- public static void incrTimeVaryingMetric(String key, long amount) {
- Pair oldVal = timeVaryingMetrics.get(key);
- if (oldVal == null) {
- oldVal =
- timeVaryingMetrics.putIfAbsent(key,
- new Pair(
- new AtomicLong(amount),
- new AtomicInteger(1)));
- if (oldVal == null)
- return;
- }
- oldVal.getFirst().addAndGet(amount); // total time
- oldVal.getSecond().incrementAndGet(); // increment ops by 1
- }
-
- public static void incrNumericPersistentMetric(String key, long amount) {
- AtomicLong oldVal = numericPersistentMetrics.get(key);
- if (oldVal == null) {
- oldVal = numericPersistentMetrics.putIfAbsent(key, new AtomicLong(amount));
- if (oldVal == null)
- return;
- }
- oldVal.addAndGet(amount);
- }
-
- public static void setNumericMetric(String key, long amount) {
- numericMetrics.put(key, new AtomicLong(amount));
- }
-
- public static long getNumericMetric(String key) {
- AtomicLong m = numericMetrics.get(key);
- if (m == null)
- return 0;
- return m.get();
- }
-
- public static Pair getTimeVaryingMetric(String key) {
- Pair pair = timeVaryingMetrics.get(key);
- if (pair == null) {
- return new Pair(0L, 0);
- }
-
- return new Pair(pair.getFirst().get(), pair.getSecond().get());
- }
-
- public static long getNumericPersistentMetric(String key) {
- AtomicLong m = numericPersistentMetrics.get(key);
- if (m == null)
- return 0;
- return m.get();
- }
-
- /**
- * Clear all copies of the metrics this stores.
- */
- public static void clear() {
- timeVaryingMetrics.clear();
- numericMetrics.clear();
- numericPersistentMetrics.clear();
- }
-}
diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/metrics/RegionServerDynamicMetrics.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/metrics/RegionServerDynamicMetrics.java
deleted file mode 100644
index bb06a10d3f4..00000000000
--- a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/metrics/RegionServerDynamicMetrics.java
+++ /dev/null
@@ -1,230 +0,0 @@
-/**
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.hadoop.hbase.regionserver.metrics;
-
-import java.lang.reflect.Field;
-import java.lang.reflect.Method;
-import java.util.Map;
-import java.util.Map.Entry;
-import java.util.concurrent.atomic.AtomicLong;
-import java.util.concurrent.atomic.AtomicInteger;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.apache.hadoop.classification.InterfaceAudience;
-import org.apache.hadoop.hbase.regionserver.HRegion;
-import org.apache.hadoop.hbase.util.Pair;
-import org.apache.hadoop.metrics.MetricsContext;
-import org.apache.hadoop.metrics.MetricsRecord;
-import org.apache.hadoop.metrics.MetricsUtil;
-import org.apache.hadoop.metrics.Updater;
-import org.apache.hadoop.metrics.util.MetricsBase;
-import org.apache.hadoop.metrics.util.MetricsLongValue;
-import org.apache.hadoop.metrics.util.MetricsRegistry;
-import org.apache.hadoop.metrics.util.MetricsTimeVaryingRate;
-
-/**
- *
- * This class is for maintaining the various RPC statistics
- * and publishing them through the metrics interfaces.
- * This also registers the JMX MBean for RPC.
- *
- * This class has a number of metrics variables that are publicly accessible;
- * these variables (objects) have methods to update their values;
- * for example: rpcQueueTime.inc(time)
- *
- */
-@InterfaceAudience.Private
-public class RegionServerDynamicMetrics implements Updater {
- private static final String UNABLE_TO_CLEAR = "Unable to clear RegionServerDynamicMetrics";
-
- private MetricsRecord metricsRecord;
- private MetricsContext context;
- private final RegionServerDynamicStatistics rsDynamicStatistics;
- private Method updateMbeanInfoIfMetricsListChanged = null;
- private static final Log LOG =
- LogFactory.getLog(RegionServerDynamicStatistics.class);
-
- private boolean reflectionInitialized = false;
- private boolean needsUpdateMessage = false;
- private Field recordMetricMapField;
- private Field registryMetricMapField;
-
- /**
- * The metrics variables are public:
- * - they can be set directly by calling their set/inc methods
- * -they can also be read directly - e.g. JMX does this.
- */
- public final MetricsRegistry registry = new MetricsRegistry();
-
- private RegionServerDynamicMetrics() {
- this.context = MetricsUtil.getContext("hbase-dynamic");
- this.metricsRecord = MetricsUtil.createRecord(
- this.context,
- "RegionServerDynamicStatistics");
- context.registerUpdater(this);
- this.rsDynamicStatistics = new RegionServerDynamicStatistics(this.registry);
- try {
- updateMbeanInfoIfMetricsListChanged =
- this.rsDynamicStatistics.getClass().getSuperclass()
- .getDeclaredMethod("updateMbeanInfoIfMetricsListChanged",
- new Class[]{});
- updateMbeanInfoIfMetricsListChanged.setAccessible(true);
- } catch (Exception e) {
- LOG.error(e);
- }
- }
-
- public static RegionServerDynamicMetrics newInstance() {
- RegionServerDynamicMetrics metrics =
- new RegionServerDynamicMetrics();
- return metrics;
- }
-
- public synchronized void setNumericMetric(String name, long amt) {
- MetricsLongValue m = (MetricsLongValue)registry.get(name);
- if (m == null) {
- m = new MetricsLongValue(name, this.registry);
- this.needsUpdateMessage = true;
- }
- m.set(amt);
- }
-
- public synchronized void incrTimeVaryingMetric(
- String name,
- long amt,
- int numOps) {
- MetricsTimeVaryingRate m = (MetricsTimeVaryingRate)registry.get(name);
- if (m == null) {
- m = new MetricsTimeVaryingRate(name, this.registry);
- this.needsUpdateMessage = true;
- }
- if (numOps > 0) {
- m.inc(numOps, amt);
- }
- }
-
- /**
- * Clear all metrics this exposes.
- * Uses reflection to clear them from hadoop metrics side as well.
- */
- @SuppressWarnings("rawtypes")
- public void clear() {
- this.needsUpdateMessage = true;
- // If this is the first clear use reflection to get the two maps that hold copies of our
- // metrics on the hadoop metrics side. We have to use reflection because there is not
- // remove metrics on the hadoop side. If we can't get them then clearing old metrics
- // is not possible and bailing out early is our best option.
- if (!this.reflectionInitialized) {
- this.reflectionInitialized = true;
- try {
- this.recordMetricMapField = this.metricsRecord.getClass().getDeclaredField("metricTable");
- this.recordMetricMapField.setAccessible(true);
- } catch (SecurityException e) {
- LOG.debug(UNABLE_TO_CLEAR);
- return;
- } catch (NoSuchFieldException e) {
- LOG.debug(UNABLE_TO_CLEAR);
- return;
- }
-
- try {
- this.registryMetricMapField = this.registry.getClass().getDeclaredField("metricsList");
- this.registryMetricMapField.setAccessible(true);
- } catch (SecurityException e) {
- LOG.debug(UNABLE_TO_CLEAR);
- return;
- } catch (NoSuchFieldException e) {
- LOG.debug(UNABLE_TO_CLEAR);
- return;
- }
- }
-
-
- //If we found both fields then try and clear the maps.
- if (this.recordMetricMapField != null && this.registryMetricMapField != null) {
- try {
- Map recordMap = (Map) this.recordMetricMapField.get(this.metricsRecord);
- recordMap.clear();
- Map registryMap = (Map) this.registryMetricMapField.get(this.registry);
- registryMap.clear();
- } catch (IllegalArgumentException e) {
- LOG.debug(UNABLE_TO_CLEAR);
- } catch (IllegalAccessException e) {
- LOG.debug(UNABLE_TO_CLEAR);
- }
- } else {
- LOG.debug(UNABLE_TO_CLEAR);
- }
- }
-
- /**
- * Push the metrics to the monitoring subsystem on doUpdate() call.
- * @param context ctx
- */
- public void doUpdates(MetricsContext context) {
- /* get dynamically created numeric metrics, and push the metrics */
- for (Entry entry : RegionMetricsStorage.getNumericMetrics().entrySet()) {
- this.setNumericMetric(entry.getKey(), entry.getValue().getAndSet(0));
- }
- /* get dynamically created numeric metrics, and push the metrics.
- * These ones aren't to be reset; they are cumulative. */
- for (Entry entry : RegionMetricsStorage.getNumericPersistentMetrics().entrySet()) {
- this.setNumericMetric(entry.getKey(), entry.getValue().get());
- }
- /* get dynamically created time varying metrics, and push the metrics */
- for (Entry> entry :
- RegionMetricsStorage.getTimeVaryingMetrics().entrySet()) {
- Pair value = entry.getValue();
- this.incrTimeVaryingMetric(entry.getKey(),
- value.getFirst().getAndSet(0),
- value.getSecond().getAndSet(0));
- }
-
- // If there are new metrics sending this message to jmx tells it to update everything.
- // This is not ideal we should just move to metrics2 that has full support for dynamic metrics.
- if (needsUpdateMessage) {
- try {
- if (updateMbeanInfoIfMetricsListChanged != null) {
- updateMbeanInfoIfMetricsListChanged.invoke(this.rsDynamicStatistics,
- new Object[]{});
- }
- } catch (Exception e) {
- LOG.error(e);
- }
- needsUpdateMessage = false;
- }
-
-
- synchronized (registry) {
- // Iterate through the registry to propagate the different rpc metrics.
- for (String metricName : registry.getKeyList() ) {
- MetricsBase value = registry.get(metricName);
- value.pushMetric(metricsRecord);
- }
- }
- metricsRecord.update();
- }
-
- public void shutdown() {
- if (rsDynamicStatistics != null)
- rsDynamicStatistics.shutdown();
- }
-}
diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/metrics/RegionServerDynamicStatistics.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/metrics/RegionServerDynamicStatistics.java
deleted file mode 100644
index b4df6a76e63..00000000000
--- a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/metrics/RegionServerDynamicStatistics.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/**
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.hadoop.hbase.regionserver.metrics;
-
-import javax.management.ObjectName;
-
-import org.apache.hadoop.classification.InterfaceAudience;
-import org.apache.hadoop.hbase.metrics.MetricsMBeanBase;
-import org.apache.hadoop.metrics.util.MBeanUtil;
-import org.apache.hadoop.metrics.util.MetricsRegistry;
-
-/**
- * Exports dynamic region server metric recorded in
- * {@link RegionServerDynamicMetrics} as an MBean
- * for JMX monitoring.
- */
-@InterfaceAudience.Private
-public class RegionServerDynamicStatistics extends MetricsMBeanBase {
- private final ObjectName mbeanName;
-
- public RegionServerDynamicStatistics(MetricsRegistry registry) {
- super(registry, "RegionServerDynamicStatistics");
- mbeanName = MBeanUtil.registerMBean("RegionServer", "RegionServerDynamicStatistics", this);
- }
-
- public void shutdown() {
- if (mbeanName != null)
- MBeanUtil.unregisterMBean(mbeanName);
- }
-
-}
diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/metrics/RegionServerMetrics.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/metrics/RegionServerMetrics.java
deleted file mode 100644
index d8883e93062..00000000000
--- a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/metrics/RegionServerMetrics.java
+++ /dev/null
@@ -1,626 +0,0 @@
-/**
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.hadoop.hbase.regionserver.metrics;
-
-import java.io.IOException;
-import java.lang.management.ManagementFactory;
-import java.lang.management.MemoryUsage;
-import java.util.List;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.apache.hadoop.classification.InterfaceAudience;
-import org.apache.hadoop.hbase.io.hfile.HFile;
-import org.apache.hadoop.hbase.metrics.ExactCounterMetric;
-import org.apache.hadoop.hbase.metrics.HBaseInfo;
-import org.apache.hadoop.hbase.metrics.MetricsRate;
-import org.apache.hadoop.hbase.metrics.histogram.MetricsHistogram;
-import org.apache.hadoop.hbase.metrics.PersistentMetricsTimeVaryingRate;
-import com.yammer.metrics.stats.Snapshot;
-import org.apache.hadoop.hbase.regionserver.wal.HLogMetrics;
-import org.apache.hadoop.hbase.util.Pair;
-import org.apache.hadoop.hbase.util.Strings;
-import org.apache.hadoop.metrics.ContextFactory;
-import org.apache.hadoop.metrics.MetricsContext;
-import org.apache.hadoop.metrics.MetricsRecord;
-import org.apache.hadoop.metrics.MetricsUtil;
-import org.apache.hadoop.metrics.Updater;
-import org.apache.hadoop.metrics.jvm.JvmMetrics;
-import org.apache.hadoop.metrics.util.MetricsIntValue;
-import org.apache.hadoop.metrics.util.MetricsLongValue;
-import org.apache.hadoop.metrics.util.MetricsRegistry;
-import org.apache.hadoop.metrics.util.MetricsTimeVaryingRate;
-import org.apache.hadoop.metrics.util.MetricsTimeVaryingLong;
-import org.apache.hadoop.util.StringUtils;
-
-/**
- * This class is for maintaining the various regionserver statistics
- * and publishing them through the metrics interfaces.
- *
- * This class has a number of metrics variables that are publicly accessible;
- * these variables (objects) have methods to update their values.
- */
-@InterfaceAudience.Private
-public class RegionServerMetrics implements Updater {
- @SuppressWarnings({"FieldCanBeLocal"})
- private final Log LOG = LogFactory.getLog(this.getClass());
- private final MetricsRecord metricsRecord;
- private long lastUpdate = System.currentTimeMillis();
- private long lastExtUpdate = System.currentTimeMillis();
- private long extendedPeriod = 0;
- private static final int MB = 1024*1024;
- private MetricsRegistry registry = new MetricsRegistry();
- private final RegionServerStatistics statistics;
-
- public final MetricsTimeVaryingRate atomicIncrementTime =
- new MetricsTimeVaryingRate("atomicIncrementTime", registry);
-
- /**
- * Count of regions carried by this regionserver
- */
- public final MetricsIntValue regions =
- new MetricsIntValue("regions", registry);
-
- /**
- * Block cache size.
- */
- public final MetricsLongValue blockCacheSize =
- new MetricsLongValue("blockCacheSize", registry);
-
- /**
- * Block cache free size.
- */
- public final MetricsLongValue blockCacheFree =
- new MetricsLongValue("blockCacheFree", registry);
-
- /**
- * Block cache item count.
- */
- public final MetricsLongValue blockCacheCount =
- new MetricsLongValue("blockCacheCount", registry);
-
- /**
- * Block cache hit count.
- */
- public final MetricsLongValue blockCacheHitCount =
- new MetricsLongValue("blockCacheHitCount", registry);
-
- /**
- * Block cache miss count.
- */
- public final MetricsLongValue blockCacheMissCount =
- new MetricsLongValue("blockCacheMissCount", registry);
-
- /**
- * Block cache evict count.
- */
- public final MetricsLongValue blockCacheEvictedCount =
- new MetricsLongValue("blockCacheEvictedCount", registry);
-
- /**
- * Block hit ratio.
- */
- public final MetricsIntValue blockCacheHitRatio =
- new MetricsIntValue("blockCacheHitRatio", registry);
-
- /**
- * Block hit caching ratio. This only includes the requests to the block
- * cache where caching was turned on. See HBASE-2253.
- */
- public final MetricsIntValue blockCacheHitCachingRatio =
- new MetricsIntValue("blockCacheHitCachingRatio", registry);
-
- /** Block hit ratio for past N periods. */
- public final MetricsIntValue blockCacheHitRatioPastNPeriods = new MetricsIntValue("blockCacheHitRatioPastNPeriods", registry);
-
- /** Block hit caching ratio for past N periods */
- public final MetricsIntValue blockCacheHitCachingRatioPastNPeriods = new MetricsIntValue("blockCacheHitCachingRatioPastNPeriods", registry);
-
- /*
- * Count of requests to the regionservers since last call to metrics update
- */
- public final MetricsRate requests = new MetricsRate("requests", registry);
-
- /**
- * Count of stores open on the regionserver.
- */
- public final MetricsIntValue stores = new MetricsIntValue("stores", registry);
-
- /**
- * Count of storefiles open on the regionserver.
- */
- public final MetricsIntValue storefiles =
- new MetricsIntValue("storefiles", registry);
-
- /**
- * Count of read requests
- */
- public final MetricsLongValue readRequestsCount =
- new MetricsLongValue("readRequestsCount", registry);
-
- /**
- * Count of write requests
- */
- public final MetricsLongValue writeRequestsCount =
- new MetricsLongValue("writeRequestsCount", registry);
-
- /**
- * Count of checkAndMutates the failed the check
- */
- public final MetricsLongValue checkAndMutateChecksFailed =
- new MetricsLongValue("checkAndMutateChecksFailed", registry);
-
- /**
- * Count of checkAndMutates that passed the check
- */
- public final MetricsLongValue checkAndMutateChecksPassed =
- new MetricsLongValue("checkAndMutateChecksPassed", registry);
- /**
- */
- public final MetricsIntValue storefileIndexSizeMB =
- new MetricsIntValue("storefileIndexSizeMB", registry);
-
- /** The total size of block index root levels in this regionserver in KB. */
- public final MetricsIntValue rootIndexSizeKB =
- new MetricsIntValue("rootIndexSizeKB", registry);
-
- /** Total size of all block indexes (not necessarily loaded in memory) */
- public final MetricsIntValue totalStaticIndexSizeKB =
- new MetricsIntValue("totalStaticIndexSizeKB", registry);
-
- /** Total size of all Bloom filters (not necessarily loaded in memory) */
- public final MetricsIntValue totalStaticBloomSizeKB =
- new MetricsIntValue("totalStaticBloomSizeKB", registry);
-
- /**
- * HDFS blocks locality index
- */
- public final MetricsIntValue hdfsBlocksLocalityIndex =
- new MetricsIntValue("hdfsBlocksLocalityIndex", registry);
-
- /**
- * Sum of all the memstore sizes in this regionserver in MB
- */
- public final MetricsIntValue memstoreSizeMB =
- new MetricsIntValue("memstoreSizeMB", registry);
-
- /**
- * Number of put with WAL disabled in this regionserver in MB
- */
- public final MetricsLongValue numPutsWithoutWAL =
- new MetricsLongValue("numPutsWithoutWAL", registry);
-
- /**
- * Possible data loss sizes (due to put with WAL disabled) in this regionserver in MB
- */
- public final MetricsIntValue mbInMemoryWithoutWAL =
- new MetricsIntValue("mbInMemoryWithoutWAL", registry);
-
- /**
- * Size of the compaction queue.
- */
- public final MetricsIntValue compactionQueueSize =
- new MetricsIntValue("compactionQueueSize", registry);
-
- /**
- * Size of the flush queue.
- */
- public final MetricsIntValue flushQueueSize =
- new MetricsIntValue("flushQueueSize", registry);
-
- /**
- * filesystem sequential read latency distribution
- */
- public final MetricsHistogram fsReadLatencyHistogram =
- new MetricsHistogram("fsReadLatencyHistogram", registry);
-
- /**
- * filesystem pread latency distribution
- */
- public final MetricsHistogram fsPreadLatencyHistogram =
- new MetricsHistogram("fsPreadLatencyHistogram", registry);
-
- /**
- * Metrics on the distribution of filesystem write latencies (improved version of fsWriteLatency)
- */
- public final MetricsHistogram fsWriteLatencyHistogram =
- new MetricsHistogram("fsWriteLatencyHistogram", registry);
-
-
- /**
- * filesystem read latency
- */
- public final MetricsTimeVaryingRate fsReadLatency =
- new MetricsTimeVaryingRate("fsReadLatency", registry);
-
- /**
- * filesystem positional read latency
- */
- public final MetricsTimeVaryingRate fsPreadLatency =
- new MetricsTimeVaryingRate("fsPreadLatency", registry);
-
- /**
- * filesystem write latency
- */
- public final MetricsTimeVaryingRate fsWriteLatency =
- new MetricsTimeVaryingRate("fsWriteLatency", registry);
-
- /**
- * size (in bytes) of data in HLog append calls
- */
- public final MetricsTimeVaryingRate fsWriteSize =
- new MetricsTimeVaryingRate("fsWriteSize", registry);
-
- /**
- * filesystem sync latency
- */
- public final MetricsTimeVaryingRate fsSyncLatency =
- new MetricsTimeVaryingRate("fsSyncLatency", registry);
-
-
- /**
- * time each scheduled compaction takes
- */
- protected final MetricsHistogram compactionTime =
- new MetricsHistogram("compactionTime", registry);
-
- protected final MetricsHistogram compactionSize =
- new MetricsHistogram("compactionSize", registry);
-
- /**
- * time each scheduled flush takes
- */
- protected final MetricsHistogram flushTime =
- new MetricsHistogram("flushTime", registry);
-
- protected final MetricsHistogram flushSize =
- new MetricsHistogram("flushSize", registry);
-
- public final MetricsLongValue slowHLogAppendCount =
- new MetricsLongValue("slowHLogAppendCount", registry);
-
- public final MetricsTimeVaryingRate slowHLogAppendTime =
- new MetricsTimeVaryingRate("slowHLogAppendTime", registry);
-
- public final PersistentMetricsTimeVaryingRate regionSplitSuccessCount =
- new PersistentMetricsTimeVaryingRate("regionSplitSuccessCount", registry);
-
- public final MetricsLongValue regionSplitFailureCount =
- new MetricsLongValue("regionSplitFailureCount", registry);
-
- /**
- * Number of times checksum verification failed.
- */
- public final MetricsLongValue checksumFailuresCount =
- new MetricsLongValue("checksumFailuresCount", registry);
-
- /**
- * time blocked on lack of resources
- */
- public final MetricsHistogram updatesBlockedSeconds = new MetricsHistogram(
- "updatesBlockedSeconds", registry);
-
- /**
- * time blocked on memstoreHW
- */
- public final MetricsHistogram updatesBlockedSecondsHighWater = new MetricsHistogram(
- "updatesBlockedSecondsHighWater",registry);
-
- public RegionServerMetrics() {
- MetricsContext context = MetricsUtil.getContext("hbase");
- metricsRecord = MetricsUtil.createRecord(context, "regionserver");
- String name = Thread.currentThread().getName();
- metricsRecord.setTag("RegionServer", name);
- context.registerUpdater(this);
- // Add jvmmetrics.
- JvmMetrics.init("RegionServer", name);
- // Add Hbase Info metrics
- HBaseInfo.init();
-
- // export for JMX
- statistics = new RegionServerStatistics(this.registry, name);
-
- // get custom attributes
- try {
- Object m = ContextFactory.getFactory().getAttribute("hbase.extendedperiod");
- if (m instanceof String) {
- this.extendedPeriod = Long.parseLong((String) m)*1000;
- }
- } catch (IOException ioe) {
- LOG.info("Couldn't load ContextFactory for Metrics config info");
- }
-
- LOG.info("Initialized");
- }
-
- public void shutdown() {
- if (statistics != null)
- statistics.shutdown();
- }
-
- /**
- * Since this object is a registered updater, this method will be called
- * periodically, e.g. every 5 seconds.
- * @param caller the metrics context that this responsible for calling us
- */
- public void doUpdates(MetricsContext caller) {
- synchronized (this) {
- this.lastUpdate = System.currentTimeMillis();
-
- // has the extended period for long-living stats elapsed?
- if (this.extendedPeriod > 0 &&
- this.lastUpdate - this.lastExtUpdate >= this.extendedPeriod) {
- this.lastExtUpdate = this.lastUpdate;
- this.compactionTime.clear();
- this.compactionSize.clear();
- this.flushTime.clear();
- this.flushSize.clear();
- this.resetAllMinMax();
- }
-
- this.stores.pushMetric(this.metricsRecord);
- this.storefiles.pushMetric(this.metricsRecord);
- this.storefileIndexSizeMB.pushMetric(this.metricsRecord);
- this.rootIndexSizeKB.pushMetric(this.metricsRecord);
- this.totalStaticIndexSizeKB.pushMetric(this.metricsRecord);
- this.totalStaticBloomSizeKB.pushMetric(this.metricsRecord);
- this.memstoreSizeMB.pushMetric(this.metricsRecord);
- this.mbInMemoryWithoutWAL.pushMetric(this.metricsRecord);
- this.numPutsWithoutWAL.pushMetric(this.metricsRecord);
- this.readRequestsCount.pushMetric(this.metricsRecord);
- this.writeRequestsCount.pushMetric(this.metricsRecord);
- this.regions.pushMetric(this.metricsRecord);
- this.requests.pushMetric(this.metricsRecord);
- this.compactionQueueSize.pushMetric(this.metricsRecord);
- this.flushQueueSize.pushMetric(this.metricsRecord);
- this.blockCacheSize.pushMetric(this.metricsRecord);
- this.blockCacheFree.pushMetric(this.metricsRecord);
- this.blockCacheCount.pushMetric(this.metricsRecord);
- this.blockCacheHitCount.pushMetric(this.metricsRecord);
- this.blockCacheMissCount.pushMetric(this.metricsRecord);
- this.blockCacheEvictedCount.pushMetric(this.metricsRecord);
- this.blockCacheHitRatio.pushMetric(this.metricsRecord);
- this.blockCacheHitCachingRatio.pushMetric(this.metricsRecord);
- this.hdfsBlocksLocalityIndex.pushMetric(this.metricsRecord);
- this.blockCacheHitRatioPastNPeriods.pushMetric(this.metricsRecord);
- this.blockCacheHitCachingRatioPastNPeriods.pushMetric(this.metricsRecord);
-
- // Mix in HFile and HLog metrics
- // Be careful. Here is code for MTVR from up in hadoop:
- // public synchronized void inc(final int numOps, final long time) {
- // currentData.numOperations += numOps;
- // currentData.time += time;
- // long timePerOps = time/numOps;
- // minMax.update(timePerOps);
- // }
- // Means you can't pass a numOps of zero or get a ArithmeticException / by zero.
- // HLog metrics
- addHLogMetric(HLogMetrics.getWriteTime(), this.fsWriteLatency);
- addHLogMetric(HLogMetrics.getWriteSize(), this.fsWriteSize);
- addHLogMetric(HLogMetrics.getSyncTime(), this.fsSyncLatency);
- addHLogMetric(HLogMetrics.getSlowAppendTime(), this.slowHLogAppendTime);
- this.slowHLogAppendCount.set(HLogMetrics.getSlowAppendCount());
- // HFile metrics, sequential reads
- int ops = HFile.getReadOps();
- if (ops != 0) this.fsReadLatency.inc(ops, HFile.getReadTimeMs());
- // HFile metrics, positional reads
- ops = HFile.getPreadOps();
- if (ops != 0) this.fsPreadLatency.inc(ops, HFile.getPreadTimeMs());
- this.checksumFailuresCount.set(HFile.getChecksumFailuresCount());
-
- /* NOTE: removed HFile write latency. 2 reasons:
- * 1) Mixing HLog latencies are far higher priority since they're
- * on-demand and HFile is used in background (compact/flush)
- * 2) HFile metrics are being handled at a higher level
- * by compaction & flush metrics.
- */
-
- for(Long latency : HFile.getReadLatenciesNanos()) {
- this.fsReadLatencyHistogram.update(latency);
- }
- for(Long latency : HFile.getPreadLatenciesNanos()) {
- this.fsPreadLatencyHistogram.update(latency);
- }
- for(Long latency : HFile.getWriteLatenciesNanos()) {
- this.fsWriteLatencyHistogram.update(latency);
- }
-
-
- // push the result
- this.fsPreadLatency.pushMetric(this.metricsRecord);
- this.fsReadLatency.pushMetric(this.metricsRecord);
- this.fsWriteLatency.pushMetric(this.metricsRecord);
- this.fsWriteSize.pushMetric(this.metricsRecord);
-
- this.fsReadLatencyHistogram.pushMetric(this.metricsRecord);
- this.fsWriteLatencyHistogram.pushMetric(this.metricsRecord);
- this.fsPreadLatencyHistogram.pushMetric(this.metricsRecord);
-
- this.fsSyncLatency.pushMetric(this.metricsRecord);
- this.compactionTime.pushMetric(this.metricsRecord);
- this.compactionSize.pushMetric(this.metricsRecord);
- this.flushTime.pushMetric(this.metricsRecord);
- this.flushSize.pushMetric(this.metricsRecord);
- this.slowHLogAppendCount.pushMetric(this.metricsRecord);
- this.regionSplitSuccessCount.pushMetric(this.metricsRecord);
- this.regionSplitFailureCount.pushMetric(this.metricsRecord);
- this.checksumFailuresCount.pushMetric(this.metricsRecord);
- this.updatesBlockedSeconds.pushMetric(this.metricsRecord);
- this.updatesBlockedSecondsHighWater.pushMetric(this.metricsRecord);
- }
- this.metricsRecord.update();
- }
-
- private void addHLogMetric(HLogMetrics.Metric logMetric,
- MetricsTimeVaryingRate hadoopMetric) {
- if (logMetric.count > 0)
- hadoopMetric.inc(logMetric.min);
- if (logMetric.count > 1)
- hadoopMetric.inc(logMetric.max);
- if (logMetric.count > 2) {
- int ops = logMetric.count - 2;
- hadoopMetric.inc(ops, logMetric.total - logMetric.max - logMetric.min);
- }
- }
-
- public void resetAllMinMax() {
- this.atomicIncrementTime.resetMinMax();
- this.fsReadLatency.resetMinMax();
- this.fsWriteLatency.resetMinMax();
- this.fsWriteSize.resetMinMax();
- this.fsSyncLatency.resetMinMax();
- this.slowHLogAppendTime.resetMinMax();
- }
-
- /**
- * @return Count of requests.
- */
- public float getRequests() {
- return this.requests.getPreviousIntervalValue();
- }
-
- /**
- * @param time time that compaction took
- * @param size bytesize of storefiles in the compaction
- */
- public synchronized void addCompaction(long time, long size) {
- this.compactionTime.update(time);
- this.compactionSize.update(size);
- }
-
- /**
- * @param flushes history in
- */
- public synchronized void addFlush(final List> flushes) {
- for (Pair f : flushes) {
- this.flushTime.update(f.getFirst());
- this.flushSize.update(f.getSecond());
- }
- }
-
- /**
- * @param inc How much to add to requests.
- */
- public void incrementRequests(final int inc) {
- this.requests.inc(inc);
- }
-
- public void incrementSplitSuccessCount(long time) {
- this.regionSplitSuccessCount.inc(time);
- }
-
- public void incrementSplitFailureCount() {
- this.regionSplitFailureCount.set(this.regionSplitFailureCount.get() + 1);
- }
-
- @Override
- public String toString() {
- StringBuilder sb = new StringBuilder();
- sb = Strings.appendKeyValue(sb, "requestsPerSecond", Integer
- .valueOf((int) this.requests.getPreviousIntervalValue()));
- sb = Strings.appendKeyValue(sb, "numberOfOnlineRegions",
- Integer.valueOf(this.regions.get()));
- sb = Strings.appendKeyValue(sb, "numberOfStores",
- Integer.valueOf(this.stores.get()));
- sb = Strings.appendKeyValue(sb, "numberOfStorefiles",
- Integer.valueOf(this.storefiles.get()));
- sb = Strings.appendKeyValue(sb, this.storefileIndexSizeMB.getName(),
- Integer.valueOf(this.storefileIndexSizeMB.get()));
- sb = Strings.appendKeyValue(sb, "rootIndexSizeKB",
- Integer.valueOf(this.rootIndexSizeKB.get()));
- sb = Strings.appendKeyValue(sb, "totalStaticIndexSizeKB",
- Integer.valueOf(this.totalStaticIndexSizeKB.get()));
- sb = Strings.appendKeyValue(sb, "totalStaticBloomSizeKB",
- Integer.valueOf(this.totalStaticBloomSizeKB.get()));
- sb = Strings.appendKeyValue(sb, this.memstoreSizeMB.getName(),
- Integer.valueOf(this.memstoreSizeMB.get()));
- sb = Strings.appendKeyValue(sb, "mbInMemoryWithoutWAL",
- Integer.valueOf(this.mbInMemoryWithoutWAL.get()));
- sb = Strings.appendKeyValue(sb, "numberOfPutsWithoutWAL",
- Long.valueOf(this.numPutsWithoutWAL.get()));
- sb = Strings.appendKeyValue(sb, "readRequestsCount",
- Long.valueOf(this.readRequestsCount.get()));
- sb = Strings.appendKeyValue(sb, "writeRequestsCount",
- Long.valueOf(this.writeRequestsCount.get()));
- sb = Strings.appendKeyValue(sb, "compactionQueueSize",
- Integer.valueOf(this.compactionQueueSize.get()));
- sb = Strings.appendKeyValue(sb, "flushQueueSize",
- Integer.valueOf(this.flushQueueSize.get()));
- // Duplicate from jvmmetrics because metrics are private there so
- // inaccessible.
- MemoryUsage memory =
- ManagementFactory.getMemoryMXBean().getHeapMemoryUsage();
- sb = Strings.appendKeyValue(sb, "usedHeapMB",
- Long.valueOf(memory.getUsed()/MB));
- sb = Strings.appendKeyValue(sb, "maxHeapMB",
- Long.valueOf(memory.getMax()/MB));
- sb = Strings.appendKeyValue(sb, this.blockCacheSize.getName()+"MB",
- StringUtils.limitDecimalTo2((float)this.blockCacheSize.get()/MB));
- sb = Strings.appendKeyValue(sb, this.blockCacheFree.getName()+"MB",
- StringUtils.limitDecimalTo2((float)this.blockCacheFree.get()/MB));
- sb = Strings.appendKeyValue(sb, this.blockCacheCount.getName(),
- Long.valueOf(this.blockCacheCount.get()));
- sb = Strings.appendKeyValue(sb, this.blockCacheHitCount.getName(),
- Long.valueOf(this.blockCacheHitCount.get()));
- sb = Strings.appendKeyValue(sb, this.blockCacheMissCount.getName(),
- Long.valueOf(this.blockCacheMissCount.get()));
- sb = Strings.appendKeyValue(sb, this.blockCacheEvictedCount.getName(),
- Long.valueOf(this.blockCacheEvictedCount.get()));
- sb = Strings.appendKeyValue(sb, this.blockCacheHitRatio.getName(),
- Long.valueOf(this.blockCacheHitRatio.get())+"%");
- sb = Strings.appendKeyValue(sb, this.blockCacheHitCachingRatio.getName(),
- Long.valueOf(this.blockCacheHitCachingRatio.get())+"%");
- sb = Strings.appendKeyValue(sb, this.hdfsBlocksLocalityIndex.getName(),
- Long.valueOf(this.hdfsBlocksLocalityIndex.get()));
- sb = Strings.appendKeyValue(sb, "slowHLogAppendCount",
- Long.valueOf(this.slowHLogAppendCount.get()));
- sb = appendHistogram(sb, this.fsReadLatencyHistogram);
- sb = appendHistogram(sb, this.fsPreadLatencyHistogram);
- sb = appendHistogram(sb, this.fsWriteLatencyHistogram);
-
- return sb.toString();
- }
-
- private StringBuilder appendHistogram(StringBuilder sb,
- MetricsHistogram histogram) {
- sb = Strings.appendKeyValue(sb,
- histogram.getName() + "Mean",
- StringUtils.limitDecimalTo2(histogram.getMean()));
- sb = Strings.appendKeyValue(sb,
- histogram.getName() + "Count",
- StringUtils.limitDecimalTo2(histogram.getCount()));
- final Snapshot s = histogram.getSnapshot();
- sb = Strings.appendKeyValue(sb,
- histogram.getName() + "Median",
- StringUtils.limitDecimalTo2(s.getMedian()));
- sb = Strings.appendKeyValue(sb,
- histogram.getName() + "75th",
- StringUtils.limitDecimalTo2(s.get75thPercentile()));
- sb = Strings.appendKeyValue(sb,
- histogram.getName() + "95th",
- StringUtils.limitDecimalTo2(s.get95thPercentile()));
- sb = Strings.appendKeyValue(sb,
- histogram.getName() + "99th",
- StringUtils.limitDecimalTo2(s.get99thPercentile()));
- sb = Strings.appendKeyValue(sb,
- histogram.getName() + "999th",
- StringUtils.limitDecimalTo2(s.get999thPercentile()));
- return sb;
- }
-}
diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/metrics/RegionServerStatistics.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/metrics/RegionServerStatistics.java
deleted file mode 100644
index 37c978e825e..00000000000
--- a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/metrics/RegionServerStatistics.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/**
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.hadoop.hbase.regionserver.metrics;
-
-import org.apache.hadoop.classification.InterfaceAudience;
-import org.apache.hadoop.hbase.metrics.MetricsMBeanBase;
-import org.apache.hadoop.metrics.util.MBeanUtil;
-import org.apache.hadoop.metrics.util.MetricsRegistry;
-
-import javax.management.ObjectName;
-
-/**
- * Exports metrics recorded by {@link RegionServerMetrics} as an MBean
- * for JMX monitoring.
- */
-@InterfaceAudience.Private
-public class RegionServerStatistics extends MetricsMBeanBase {
-
- private final ObjectName mbeanName;
-
- public RegionServerStatistics(MetricsRegistry registry, String rsName) {
- super(registry, "RegionServerStatistics");
- mbeanName = MBeanUtil.registerMBean("RegionServer",
- "RegionServerStatistics", this);
- }
-
- public void shutdown() {
- if (mbeanName != null)
- MBeanUtil.unregisterMBean(mbeanName);
- }
-
-}
diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/metrics/SchemaConfigured.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/metrics/SchemaConfigured.java
deleted file mode 100644
index 525298468ef..00000000000
--- a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/metrics/SchemaConfigured.java
+++ /dev/null
@@ -1,275 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.hadoop.hbase.regionserver.metrics;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.apache.hadoop.classification.InterfaceAudience;
-import org.apache.hadoop.conf.Configuration;
-import org.apache.hadoop.fs.Path;
-import org.apache.hadoop.hbase.io.HeapSize;
-import org.apache.hadoop.hbase.io.hfile.HFile;
-import org.apache.hadoop.hbase.regionserver.HRegion;
-import org.apache.hadoop.hbase.regionserver.metrics.SchemaMetrics.SchemaAware;
-import org.apache.hadoop.hbase.util.ClassSize;
-
-/**
- * A base class for objects that are associated with a particular table and
- * column family. Provides a way to obtain the schema metrics object.
- *
- * Due to the variety of things that can be associated with a table/CF, there
- * are many ways to initialize this base class, either in the constructor, or
- * from another similar object. For example, an HFile reader configures HFile
- * blocks it reads with its own table/CF name.
- */
-@InterfaceAudience.Private
-public class SchemaConfigured implements HeapSize, SchemaAware {
- private static final Log LOG = LogFactory.getLog(SchemaConfigured.class);
-
- // These are not final because we set them at runtime e.g. for HFile blocks.
- private String cfName;
- private String tableName;
-
- /**
- * Schema metrics. Can only be initialized when we know our column family
- * name, table name, and have had a chance to take a look at the
- * configuration (in {@link SchemaMetrics#configureGlobally(Configuration))
- * so we know whether we are using per-table metrics. Therefore, initialized
- * lazily. We don't make this volatile because even if a thread sees a stale
- * value of null, it will be re-initialized to the same value that other
- * threads see.
- */
- private SchemaMetrics schemaMetrics;
-
- static {
- if (ClassSize.OBJECT <= 0 || ClassSize.REFERENCE <= 0) {
- throw new AssertionError("Class sizes are not initialized");
- }
- }
-
- /**
- * Estimated heap size of this object. We don't count table name and column
- * family name characters because these strings are shared among many
- * objects. We need unaligned size to reuse this in subclasses.
- */
- public static final int SCHEMA_CONFIGURED_UNALIGNED_HEAP_SIZE =
- ClassSize.OBJECT + 3 * ClassSize.REFERENCE;
-
- private static final int SCHEMA_CONFIGURED_ALIGNED_HEAP_SIZE =
- ClassSize.align(SCHEMA_CONFIGURED_UNALIGNED_HEAP_SIZE);
-
- /** A helper constructor that configures the "use table name" flag. */
- private SchemaConfigured(Configuration conf) {
- SchemaMetrics.configureGlobally(conf);
- // Even though we now know if table-level metrics are used, we can't
- // initialize schemaMetrics yet, because CF and table name are only known
- // to the calling constructor.
- }
-
- /**
- * Creates an instance corresponding to an unknown table and column family.
- * Used in unit tests.
- */
- public static SchemaConfigured createUnknown() {
- return new SchemaConfigured(null, SchemaMetrics.UNKNOWN,
- SchemaMetrics.UNKNOWN);
- }
-
- /**
- * Default constructor. Only use when column/family name are not known at
- * construction (i.e. for HFile blocks).
- */
- public SchemaConfigured() {
- }
-
- /**
- * Initialize table and column family name from an HFile path. If
- * configuration is null,
- * {@link SchemaMetrics#configureGlobally(Configuration)} should have been
- * called already.
- */
- public SchemaConfigured(Configuration conf, Path path) {
- this(conf);
-
- if (path != null) {
- String splits[] = path.toString().split("/");
- int numPathLevels = splits.length;
- if (numPathLevels > 0 && splits[0].isEmpty()) {
- // This path starts with an '/'.
- --numPathLevels;
- }
- if (numPathLevels < HFile.MIN_NUM_HFILE_PATH_LEVELS) {
- LOG.warn("Could not determine table and column family of the HFile "
- + "path " + path + ". Expecting at least "
- + HFile.MIN_NUM_HFILE_PATH_LEVELS + " path components.");
- path = null;
- } else {
- cfName = splits[splits.length - 2];
- if (cfName.equals(HRegion.REGION_TEMP_SUBDIR)) {
- // This is probably a compaction or flush output file. We will set
- // the real CF name later.
- cfName = null;
- } else {
- cfName = cfName.intern();
- }
- tableName = splits[splits.length - 4].intern();
- return;
- }
- }
-
- // This might also happen if we were passed an incorrect path.
- cfName = SchemaMetrics.UNKNOWN;
- tableName = SchemaMetrics.UNKNOWN;
- }
-
- /**
- * Used when we know an HFile path to deduce table and CF name from, but do
- * not have a configuration.
- * @param path an HFile path
- */
- public SchemaConfigured(Path path) {
- this(null, path);
- }
-
- /**
- * Used when we know table and column family name. If configuration is null,
- * {@link SchemaMetrics#configureGlobally(Configuration)} should have been
- * called already.
- */
- public SchemaConfigured(Configuration conf, String tableName, String cfName)
- {
- this(conf);
- if (tableName != null) {
- this.tableName = tableName.intern();
- }
- if (cfName != null) {
- this.cfName = cfName.intern();
- }
- }
-
- public SchemaConfigured(SchemaAware that) {
- tableName = that.getTableName().intern();
- cfName = that.getColumnFamilyName().intern();
- schemaMetrics = that.getSchemaMetrics();
- }
-
- @Override
- public String getTableName() {
- return tableName;
- }
-
- @Override
- public String getColumnFamilyName() {
- return cfName;
- }
-
- @Override
- public SchemaMetrics getSchemaMetrics() {
- if (schemaMetrics == null) {
- if (tableName == null || cfName == null) {
- throw new IllegalStateException("Schema metrics requested before " +
- "table/CF name initialization: " + schemaConfAsJSON());
- }
- schemaMetrics = SchemaMetrics.getInstance(tableName, cfName);
- }
- return schemaMetrics;
- }
-
- /**
- * Configures the given object (e.g. an HFile block) with the current table
- * and column family name, and the associated collection of metrics. Please
- * note that this method configures the other object, not this
- * object.
- */
- public void passSchemaMetricsTo(SchemaConfigured target) {
- if (isNull()) {
- resetSchemaMetricsConf(target);
- return;
- }
-
- if (!isSchemaConfigured()) {
- // Cannot configure another object if we are not configured ourselves.
- throw new IllegalStateException("Table name/CF not initialized: " +
- schemaConfAsJSON());
- }
-
- if (conflictingWith(target)) {
- // Make sure we don't try to change table or CF name.
- throw new IllegalArgumentException("Trying to change table name to \"" +
- tableName + "\", CF name to \"" + cfName + "\" from " +
- target.schemaConfAsJSON());
- }
-
- target.tableName = tableName.intern();
- target.cfName = cfName.intern();
- target.schemaMetrics = schemaMetrics;
- target.schemaConfigurationChanged();
- }
-
- /**
- * Reset schema metrics configuration in this particular instance. Used when
- * legitimately need to re-initialize the object with another table/CF.
- * This is a static method because its use is discouraged and reserved for
- * when it is really necessary (e.g. writing HFiles in a temp direcdtory
- * on compaction).
- */
- public static void resetSchemaMetricsConf(SchemaConfigured target) {
- target.tableName = null;
- target.cfName = null;
- target.schemaMetrics = null;
- target.schemaConfigurationChanged();
- }
-
- @Override
- public long heapSize() {
- return SCHEMA_CONFIGURED_ALIGNED_HEAP_SIZE;
- }
-
- public String schemaConfAsJSON() {
- return "{\"tableName\":\"" + tableName + "\",\"cfName\":\"" + cfName
- + "\"}";
- }
-
- protected boolean isSchemaConfigured() {
- return tableName != null && cfName != null;
- }
-
- private boolean isNull() {
- return tableName == null && cfName == null && schemaMetrics == null;
- }
-
- /**
- * Determines if the current object's table/CF settings are not in conflict
- * with the other object's table and CF. If the other object's table/CF are
- * undefined, they are not considered to be in conflict. Used to sanity-check
- * configuring the other object with this object's table/CF.
- */
- boolean conflictingWith(SchemaConfigured other) {
- return (other.tableName != null && !tableName.equals(other.tableName)) ||
- (other.cfName != null && !cfName.equals(other.cfName));
- }
-
- /**
- * A hook method called when schema configuration changes. Can be used to
- * update schema-aware member fields.
- */
- protected void schemaConfigurationChanged() {
- }
-
-}
diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/metrics/SchemaMetrics.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/metrics/SchemaMetrics.java
deleted file mode 100644
index 7a824ac2d40..00000000000
--- a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/metrics/SchemaMetrics.java
+++ /dev/null
@@ -1,926 +0,0 @@
-/*
- * Copyright The Apache Software Foundation
- *
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with this
- * work for additional information regarding copyright ownership. The ASF
- * licenses this file to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.hadoop.hbase.regionserver.metrics;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.TreeMap;
-import java.util.TreeSet;
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.concurrent.ConcurrentMap;
-import java.util.concurrent.atomic.AtomicInteger;
-import java.util.concurrent.atomic.AtomicLong;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
-import org.apache.commons.lang.mutable.MutableDouble;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.apache.hadoop.classification.InterfaceAudience;
-import org.apache.hadoop.conf.Configuration;
-import org.apache.hadoop.hbase.HConstants;
-import org.apache.hadoop.hbase.io.hfile.BlockType.BlockCategory;
-import org.apache.hadoop.hbase.util.Bytes;
-import org.apache.hadoop.hbase.util.Pair;
-
-/**
- * A names in a given column family or a (table, column
- * family) combination. The following "dimensions" are supported:
- *
- * - Table name (optional; enabled based on configuration)
- * - Per-column family vs. aggregated. The aggregated mode is only supported
- * when table name is not included.
- * - Block category (data, index, bloom filter, etc.)
- * - Whether the request is part of a compaction
- * - Metric type (read time, block read count, cache hits/misses, etc.)
- *
- *
- * An instance of this class does not store any metric values. It just allows
- * to determine the correct metric name for each combination of the above
- * dimensions.
- *
- *
- *
- * | Metric key |
- * Per-table metrics conf setting |
- * Description |
- *
- *
- * | On |
- * Off |
- *
- *
- * | tbl.T.cf.CF.M | Include | Skip |
- * A specific column family of a specific table |
- *
- *
- * | tbl.T.M | Skip | Skip |
- * All column families in the given table |
- *
- *
- * | cf.CF.M | Skip | Include |
- * A specific column family in all tables |
- *
- *
- * | M | Include | Include |
- * All column families in all tables |
- *
- *
- */
-@InterfaceAudience.Private
-public class SchemaMetrics {
-
- public interface SchemaAware {
- public String getTableName();
- public String getColumnFamilyName();
- public SchemaMetrics getSchemaMetrics();
- }
-
- private static final Log LOG = LogFactory.getLog(SchemaMetrics.class);
-
- public static enum BlockMetricType {
- // Metric configuration: compactionAware, timeVarying
- READ_TIME("Read", true, true),
- READ_COUNT("BlockReadCnt", true, false),
- CACHE_HIT("BlockReadCacheHitCnt", true, false),
- CACHE_MISS("BlockReadCacheMissCnt", true, false),
-
- CACHE_SIZE("blockCacheSize", false, false),
- CACHED("blockCacheNumCached", false, false),
- EVICTED("blockCacheNumEvicted", false, false);
-
- private final String metricStr;
- private final boolean compactionAware;
- private final boolean timeVarying;
-
- BlockMetricType(String metricStr, boolean compactionAware,
- boolean timeVarying) {
- this.metricStr = metricStr;
- this.compactionAware = compactionAware;
- this.timeVarying = timeVarying;
- }
-
- @Override
- public String toString() {
- return metricStr;
- }
-
- private static final String BLOCK_METRIC_TYPE_RE;
- static {
- StringBuilder sb = new StringBuilder();
- for (BlockMetricType bmt : values()) {
- if (sb.length() > 0)
- sb.append("|");
- sb.append(bmt);
- }
- BLOCK_METRIC_TYPE_RE = sb.toString();
- }
- };
-
- public static enum StoreMetricType {
- STORE_FILE_COUNT("storeFileCount"),
- STORE_FILE_INDEX_SIZE("storeFileIndexSizeMB"),
- STORE_FILE_SIZE_MB("storeFileSizeMB"),
- STATIC_BLOOM_SIZE_KB("staticBloomSizeKB"),
- MEMSTORE_SIZE_MB("memstoreSizeMB"),
- STATIC_INDEX_SIZE_KB("staticIndexSizeKB"),
- FLUSH_SIZE("flushSize");
-
- private final String metricStr;
-
- StoreMetricType(String metricStr) {
- this.metricStr = metricStr;
- }
-
- @Override
- public String toString() {
- return metricStr;
- }
- };
-
- // Constants
- /**
- * A string used when column family or table name is unknown, and in some
- * unit tests. This should not normally show up in metric names but if it
- * does it is better than creating a silent discrepancy in total vs.
- * per-CF/table metrics.
- */
- public static final String UNKNOWN = "__unknown";
-
- public static final String TABLE_PREFIX = "tbl.";
- public static final String CF_PREFIX = "cf.";
- public static final String BLOCK_TYPE_PREFIX = "bt.";
- public static final String REGION_PREFIX = "region.";
-
- public static final String CF_UNKNOWN_PREFIX = CF_PREFIX + UNKNOWN + ".";
- public static final String CF_BAD_FAMILY_PREFIX = CF_PREFIX + "__badfamily.";
-
- /** Use for readability when obtaining non-compaction counters */
- public static final boolean NO_COMPACTION = false;
-
- /**
- * A special schema metric value that means "all tables aggregated" or
- * "all column families aggregated" when used as a table name or a column
- * family name.
- */
- public static final String TOTAL_KEY = "";
-
- /**
- * Special handling for meta-block-specific metrics for
- * backwards-compatibility.
- */
- private static final String META_BLOCK_CATEGORY_STR = "Meta";
-
- private static final int NUM_BLOCK_CATEGORIES =
- BlockCategory.values().length;
-
- private static final int NUM_METRIC_TYPES =
- BlockMetricType.values().length;
-
- static final boolean[] BOOL_VALUES = new boolean[] { false, true };
-
- private static final int NUM_BLOCK_METRICS =
- NUM_BLOCK_CATEGORIES * // blockCategory
- BOOL_VALUES.length * // isCompaction
- NUM_METRIC_TYPES; // metricType
-
- private static final int NUM_STORE_METRIC_TYPES =
- StoreMetricType.values().length;
-
- /** Conf key controlling whether we include table name in metric names */
- private static final String SHOW_TABLE_NAME_CONF_KEY =
- "hbase.metrics.showTableName";
-
- /** We use this when too many column families are involved in a request. */
- private static final String MORE_CFS_OMITTED_STR = "__more";
-
- /**
- * Maximum length of a metric name prefix. Used when constructing metric
- * names from a set of column families participating in a request.
- */
- private static final int MAX_METRIC_PREFIX_LENGTH =
- 256 - MORE_CFS_OMITTED_STR.length();
-
- // Global variables
- /**
- * Maps a string key consisting of table name and column family name, with
- * table name optionally replaced with {@link #TOTAL_KEY} if per-table
- * metrics are disabled, to an instance of this class.
- */
- private static final ConcurrentHashMap
- tableAndFamilyToMetrics = new ConcurrentHashMap();
-
- /** Metrics for all tables and column families. */
- // This has to be initialized after cfToMetrics.
- public static final SchemaMetrics ALL_SCHEMA_METRICS =
- getInstance(TOTAL_KEY, TOTAL_KEY);
-
- /**
- * Whether to include table name in metric names. If this is null, it has not
- * been initialized. This is a global instance, but we also have a copy of it
- * per a {@link SchemaMetrics} object to avoid synchronization overhead.
- */
- private static volatile Boolean useTableNameGlobally;
-
- /** Whether we logged a message about configuration inconsistency */
- private static volatile boolean loggedConfInconsistency;
-
- // Instance variables
- private final String[] blockMetricNames = new String[NUM_BLOCK_METRICS];
- private final boolean[] blockMetricTimeVarying =
- new boolean[NUM_BLOCK_METRICS];
-
- private final String[] bloomMetricNames = new String[2];
- private final String[] storeMetricNames = new String[NUM_STORE_METRIC_TYPES];
- private final String[] storeMetricNamesMax = new String[NUM_STORE_METRIC_TYPES];
-
- private SchemaMetrics(final String tableName, final String cfName) {
- String metricPrefix = SchemaMetrics.generateSchemaMetricsPrefix(
- tableName, cfName);
-
- for (BlockCategory blockCategory : BlockCategory.values()) {
- for (boolean isCompaction : BOOL_VALUES) {
- for (BlockMetricType metricType : BlockMetricType.values()) {
- if (!metricType.compactionAware && isCompaction) {
- continue;
- }
-
- StringBuilder sb = new StringBuilder(metricPrefix);
- if (blockCategory != BlockCategory.ALL_CATEGORIES
- && blockCategory != BlockCategory.META) {
- String categoryStr = blockCategory.toString();
- categoryStr = categoryStr.charAt(0)
- + categoryStr.substring(1).toLowerCase();
- sb.append(BLOCK_TYPE_PREFIX + categoryStr + ".");
- }
-
- if (metricType.compactionAware) {
- sb.append(isCompaction ? "compaction" : "fs");
- }
-
- // A special-case for meta blocks for backwards-compatibility.
- if (blockCategory == BlockCategory.META) {
- sb.append(META_BLOCK_CATEGORY_STR);
- }
-
- sb.append(metricType);
-
- int i = getBlockMetricIndex(blockCategory, isCompaction, metricType);
- blockMetricNames[i] = sb.toString().intern();
- blockMetricTimeVarying[i] = metricType.timeVarying;
- }
- }
- }
-
- for (boolean isInBloom : BOOL_VALUES) {
- bloomMetricNames[isInBloom ? 1 : 0] = metricPrefix
- + (isInBloom ? "keyMaybeInBloomCnt" : "keyNotInBloomCnt");
- }
-
- for (StoreMetricType storeMetric : StoreMetricType.values()) {
- String coreName = metricPrefix + storeMetric.toString();
- storeMetricNames[storeMetric.ordinal()] = coreName;
- storeMetricNamesMax[storeMetric.ordinal()] = coreName + ".max";
- }
- }
-
-
-
- public static final String METRIC_GETSIZE = "getsize";
- public static final String METRIC_NEXTSIZE = "nextsize";
-
- /**
- * Returns a {@link SchemaMetrics} object for the given table and column
- * family, instantiating it if necessary.
- *
- * @param tableName table name (null is interpreted as "unknown"). This is
- * ignored
- * @param cfName column family name (null is interpreted as "unknown")
- */
- public static SchemaMetrics getInstance(String tableName, String cfName) {
- if (tableName == null) {
- tableName = UNKNOWN;
- }
-
- if (cfName == null) {
- cfName = UNKNOWN;
- }
-
- tableName = getEffectiveTableName(tableName);
-
- final String instanceKey = tableName + "\t" + cfName;
- SchemaMetrics schemaMetrics = tableAndFamilyToMetrics.get(instanceKey);
- if (schemaMetrics != null) {
- return schemaMetrics;
- }
-
- schemaMetrics = new SchemaMetrics(tableName, cfName);
- SchemaMetrics existingMetrics =
- tableAndFamilyToMetrics.putIfAbsent(instanceKey, schemaMetrics);
- return existingMetrics != null ? existingMetrics : schemaMetrics;
- }
-
- private static final int getBlockMetricIndex(BlockCategory blockCategory,
- boolean isCompaction, BlockMetricType metricType) {
- int i = 0;
- i = i * NUM_BLOCK_CATEGORIES + blockCategory.ordinal();
- i = i * BOOL_VALUES.length + (isCompaction ? 1 : 0);
- i = i * NUM_METRIC_TYPES + metricType.ordinal();
- return i;
- }
-
- public String getBlockMetricName(BlockCategory blockCategory,
- boolean isCompaction, BlockMetricType metricType) {
- if (isCompaction && !metricType.compactionAware) {
- throw new IllegalArgumentException("isCompaction cannot be true for "
- + metricType);
- }
- return blockMetricNames[getBlockMetricIndex(blockCategory, isCompaction,
- metricType)];
- }
-
- public String getBloomMetricName(boolean isInBloom) {
- return bloomMetricNames[isInBloom ? 1 : 0];
- }
-
- /**
- * Increments the given metric, both per-CF and aggregate, for both the given
- * category and all categories in aggregate (four counters total).
- */
- private void incrNumericMetric(BlockCategory blockCategory,
- boolean isCompaction, BlockMetricType metricType) {
- if (blockCategory == null) {
- blockCategory = BlockCategory.UNKNOWN; // So that we see this in stats.
- }
- RegionMetricsStorage.incrNumericMetric(getBlockMetricName(blockCategory,
- isCompaction, metricType), 1);
-
- if (blockCategory != BlockCategory.ALL_CATEGORIES) {
- incrNumericMetric(BlockCategory.ALL_CATEGORIES, isCompaction,
- metricType);
- }
- }
-
- private void addToReadTime(BlockCategory blockCategory,
- boolean isCompaction, long timeMs) {
- RegionMetricsStorage.incrTimeVaryingMetric(getBlockMetricName(blockCategory,
- isCompaction, BlockMetricType.READ_TIME), timeMs);
-
- // Also update the read time aggregated across all block categories
- if (blockCategory != BlockCategory.ALL_CATEGORIES) {
- addToReadTime(BlockCategory.ALL_CATEGORIES, isCompaction, timeMs);
- }
- }
-
- /**
- * Used to accumulate store metrics across multiple regions in a region
- * server. These metrics are not "persistent", i.e. we keep overriding them
- * on every update instead of incrementing, so we need to accumulate them in
- * a temporary map before pushing them to the global metric collection.
- * @param tmpMap a temporary map for accumulating store metrics
- * @param storeMetricType the store metric type to increment
- * @param val the value to add to the metric
- */
- public void accumulateStoreMetric(final Map tmpMap,
- StoreMetricType storeMetricType, double val) {
- final String key = getStoreMetricName(storeMetricType);
- if (tmpMap.get(key) == null) {
- tmpMap.put(key, new MutableDouble(val));
- } else {
- tmpMap.get(key).add(val);
- }
-
- if (this == ALL_SCHEMA_METRICS) {
- // also compute the max value across all Stores on this server
- final String maxKey = getStoreMetricNameMax(storeMetricType);
- MutableDouble cur = tmpMap.get(maxKey);
- if (cur == null) {
- tmpMap.put(maxKey, new MutableDouble(val));
- } else if (cur.doubleValue() < val) {
- cur.setValue(val);
- }
- } else {
- ALL_SCHEMA_METRICS.accumulateStoreMetric(tmpMap, storeMetricType, val);
- }
- }
-
- public String getStoreMetricName(StoreMetricType storeMetricType) {
- return storeMetricNames[storeMetricType.ordinal()];
- }
-
- public String getStoreMetricNameMax(StoreMetricType storeMetricType) {
- return storeMetricNamesMax[storeMetricType.ordinal()];
- }
-
- /**
- * Update a metric that does not get reset on every poll.
- * @param storeMetricType the store metric to update
- * @param value the value to update the metric to
- */
- public void updatePersistentStoreMetric(StoreMetricType storeMetricType,
- long value) {
- RegionMetricsStorage.incrNumericPersistentMetric(
- storeMetricNames[storeMetricType.ordinal()], value);
- }
-
- /**
- * Updates the number of hits and the total number of block reads on a block
- * cache hit.
- */
- public void updateOnCacheHit(BlockCategory blockCategory,
- boolean isCompaction) {
- blockCategory.expectSpecific();
- incrNumericMetric(blockCategory, isCompaction, BlockMetricType.CACHE_HIT);
- incrNumericMetric(blockCategory, isCompaction, BlockMetricType.READ_COUNT);
- if (this != ALL_SCHEMA_METRICS) {
- ALL_SCHEMA_METRICS.updateOnCacheHit(blockCategory, isCompaction);
- }
- }
-
- /**
- * Updates read time, the number of misses, and the total number of block
- * reads on a block cache miss.
- */
- public void updateOnCacheMiss(BlockCategory blockCategory,
- boolean isCompaction, long timeMs) {
- blockCategory.expectSpecific();
- addToReadTime(blockCategory, isCompaction, timeMs);
- incrNumericMetric(blockCategory, isCompaction, BlockMetricType.CACHE_MISS);
- incrNumericMetric(blockCategory, isCompaction, BlockMetricType.READ_COUNT);
- if (this != ALL_SCHEMA_METRICS) {
- ALL_SCHEMA_METRICS.updateOnCacheMiss(blockCategory, isCompaction,
- timeMs);
- }
- }
-
- /**
- * Adds the given delta to the cache size for the given block category and
- * the aggregate metric for all block categories. Updates both the per-CF
- * counter and the counter for all CFs (four metrics total). The cache size
- * metric is "persistent", i.e. it does not get reset when metrics are
- * collected.
- */
- public void addToCacheSize(BlockCategory category, long cacheSizeDelta) {
- if (category == null) {
- category = BlockCategory.ALL_CATEGORIES;
- }
- RegionMetricsStorage.incrNumericPersistentMetric(getBlockMetricName(category, false,
- BlockMetricType.CACHE_SIZE), cacheSizeDelta);
-
- if (category != BlockCategory.ALL_CATEGORIES) {
- addToCacheSize(BlockCategory.ALL_CATEGORIES, cacheSizeDelta);
- }
- }
-
- public void updateOnCachePutOrEvict(BlockCategory blockCategory,
- long cacheSizeDelta, boolean isEviction) {
- addToCacheSize(blockCategory, cacheSizeDelta);
- incrNumericMetric(blockCategory, false,
- isEviction ? BlockMetricType.EVICTED : BlockMetricType.CACHED);
- if (this != ALL_SCHEMA_METRICS) {
- ALL_SCHEMA_METRICS.updateOnCachePutOrEvict(blockCategory, cacheSizeDelta,
- isEviction);
- }
- }
-
- /**
- * Increments both the per-CF and the aggregate counter of bloom
- * positives/negatives as specified by the argument.
- */
- public void updateBloomMetrics(boolean isInBloom) {
- RegionMetricsStorage.incrNumericMetric(getBloomMetricName(isInBloom), 1);
- if (this != ALL_SCHEMA_METRICS) {
- ALL_SCHEMA_METRICS.updateBloomMetrics(isInBloom);
- }
- }
-
- /**
- * Sets the flag whether to use table name in metric names according to the
- * given configuration. This must be called at least once before
- * instantiating HFile readers/writers.
- */
- public static void configureGlobally(Configuration conf) {
- if (conf != null) {
- final boolean useTableNameNew =
- conf.getBoolean(SHOW_TABLE_NAME_CONF_KEY, false);
- setUseTableName(useTableNameNew);
- } else {
- setUseTableName(false);
- }
- }
-
- /**
- * Determine the table name to be included in metric keys. If the global
- * configuration says that we should not use table names in metrics,
- * we always return {@link #TOTAL_KEY} even if nontrivial table name is
- * provided.
- *
- * @param tableName a table name or {@link #TOTAL_KEY} when aggregating
- * across all tables
- * @return the table name to use in metric keys
- */
- private static String getEffectiveTableName(String tableName) {
- if (!tableName.equals(TOTAL_KEY)) {
- // We are provided with a non-trivial table name (including "unknown").
- // We need to know whether table name should be included into metrics.
- if (useTableNameGlobally == null) {
- throw new IllegalStateException("The value of the "
- + SHOW_TABLE_NAME_CONF_KEY + " conf option has not been specified "
- + "in SchemaMetrics");
- }
- final boolean useTableName = useTableNameGlobally;
- if (!useTableName) {
- // Don't include table name in metric keys.
- tableName = TOTAL_KEY;
- }
- }
- return tableName;
- }
-
- /**
- * Method to transform a combination of a table name and a column family name
- * into a metric key prefix. Tables/column family names equal to
- * {@link #TOTAL_KEY} are omitted from the prefix.
- *
- * @param tableName the table name or {@link #TOTAL_KEY} for all tables
- * @param cfName the column family name or {@link #TOTAL_KEY} for all CFs
- * @return the metric name prefix, ending with a dot.
- */
- public static String generateSchemaMetricsPrefix(String tableName,
- final String cfName) {
- tableName = getEffectiveTableName(tableName);
- String schemaMetricPrefix =
- tableName.equals(TOTAL_KEY) ? "" : TABLE_PREFIX + tableName + ".";
- schemaMetricPrefix +=
- cfName.equals(TOTAL_KEY) ? "" : CF_PREFIX + cfName + ".";
- return schemaMetricPrefix;
- }
-
- public static String generateSchemaMetricsPrefix(byte[] tableName,
- byte[] cfName) {
- return generateSchemaMetricsPrefix(Bytes.toString(tableName),
- Bytes.toString(cfName));
- }
-
- /**
- * Method to transform a set of column families in byte[] format with table
- * name into a metric key prefix.
- *
- * @param tableName the table name or {@link #TOTAL_KEY} for all tables
- * @param families the ordered set of column families
- * @return the metric name prefix, ending with a dot, or an empty string in
- * case of invalid arguments. This is OK since we always expect
- * some CFs to be included.
- */
- public static String generateSchemaMetricsPrefix(String tableName,
- Set families) {
- if (families == null || families.isEmpty() ||
- tableName == null || tableName.isEmpty()) {
- return "";
- }
-
- if (families.size() == 1) {
- return generateSchemaMetricsPrefix(tableName,
- Bytes.toString(families.iterator().next()));
- }
-
- tableName = getEffectiveTableName(tableName);
- List sortedFamilies = new ArrayList(families);
- Collections.sort(sortedFamilies, Bytes.BYTES_COMPARATOR);
-
- StringBuilder sb = new StringBuilder();
-
- int numCFsLeft = families.size();
- for (byte[] family : sortedFamilies) {
- if (sb.length() > MAX_METRIC_PREFIX_LENGTH) {
- sb.append(MORE_CFS_OMITTED_STR);
- break;
- }
- --numCFsLeft;
- sb.append(Bytes.toString(family));
- if (numCFsLeft > 0) {
- sb.append("~");
- }
- }
-
- return SchemaMetrics.generateSchemaMetricsPrefix(tableName, sb.toString());
- }
-
-
- /**
- * Get the prefix for metrics generated about a single region.
- * @param tableName the table name or {@link #TOTAL_KEY} for all tables
- * @param regionName regionName
- * @return the prefix for this table/region combination.
- */
- static String generateRegionMetricsPrefix(String tableName, String regionName) {
- tableName = getEffectiveTableName(tableName);
- String schemaMetricPrefix =
- tableName.equals(TOTAL_KEY) ? "" : TABLE_PREFIX + tableName + ".";
- schemaMetricPrefix +=
- regionName.equals(TOTAL_KEY) ? "" : REGION_PREFIX + regionName + ".";
-
- return schemaMetricPrefix;
- }
-
- /**
- * Sets the flag of whether to use table name in metric names. This flag
- * is specified in configuration and is not expected to change at runtime,
- * so we log an error message when it does change.
- */
- private static void setUseTableName(final boolean useTableNameNew) {
- if (useTableNameGlobally == null) {
- // This configuration option has not yet been set.
- useTableNameGlobally = useTableNameNew;
- } else if (useTableNameGlobally != useTableNameNew
- && !loggedConfInconsistency) {
- // The configuration is inconsistent and we have not reported it
- // previously. Once we report it, just keep ignoring the new setting.
- LOG.error("Inconsistent configuration. Previous configuration "
- + "for using table name in metrics: " + useTableNameGlobally + ", "
- + "new configuration: " + useTableNameNew);
- loggedConfInconsistency = true;
- }
- }
-
- // Methods used in testing
-
- private static final String regexEscape(String s) {
- return s.replace(".", "\\.");
- }
-
- /**
- * Assume that table names used in tests don't contain dots, except for the
- * META table.
- */
- private static final String WORD_AND_DOT_RE_STR = "([^.]+|" +
- regexEscape(Bytes.toString(HConstants.META_TABLE_NAME)) +
- ")\\.";
-
- /** "tbl.." */
- private static final String TABLE_NAME_RE_STR =
- "\\b" + regexEscape(TABLE_PREFIX) + WORD_AND_DOT_RE_STR;
-
- /** "cf.." */
- private static final String CF_NAME_RE_STR =
- "\\b" + regexEscape(CF_PREFIX) + WORD_AND_DOT_RE_STR;
- private static final Pattern CF_NAME_RE = Pattern.compile(CF_NAME_RE_STR);
-
- /** "tbl..cf.." */
- private static final Pattern TABLE_AND_CF_NAME_RE = Pattern.compile(
- TABLE_NAME_RE_STR + CF_NAME_RE_STR);
-
- private static final Pattern BLOCK_CATEGORY_RE = Pattern.compile(
- "\\b" + regexEscape(BLOCK_TYPE_PREFIX) + "[^.]+\\." +
- // Also remove the special-case block type marker for meta blocks
- "|" + META_BLOCK_CATEGORY_STR + "(?=" +
- BlockMetricType.BLOCK_METRIC_TYPE_RE + ")");
-
- /**
- * A suffix for the "number of operations" part of "time-varying metrics". We
- * only use this for metric verification in unit testing. Time-varying
- * metrics are handled by a different code path in production.
- */
- private static String NUM_OPS_SUFFIX = "numops";
-
- /**
- * A custom suffix that we use for verifying the second component of
- * a "time-varying metric".
- */
- private static String TOTAL_SUFFIX = "_total";
- private static final Pattern TIME_VARYING_SUFFIX_RE = Pattern.compile(
- "(" + NUM_OPS_SUFFIX + "|" + TOTAL_SUFFIX + ")$");
-
- void printMetricNames() {
- for (BlockCategory blockCategory : BlockCategory.values()) {
- for (boolean isCompaction : BOOL_VALUES) {
- for (BlockMetricType metricType : BlockMetricType.values()) {
- int i = getBlockMetricIndex(blockCategory, isCompaction, metricType);
- LOG.debug("blockCategory=" + blockCategory + ", "
- + "metricType=" + metricType + ", isCompaction=" + isCompaction
- + ", metricName=" + blockMetricNames[i]);
- }
- }
- }
- }
-
- private Collection getAllMetricNames() {
- List allMetricNames = new ArrayList();
- for (int i = 0; i < blockMetricNames.length; ++i) {
- final String blockMetricName = blockMetricNames[i];
- final boolean timeVarying = blockMetricTimeVarying[i];
- if (blockMetricName != null) {
- if (timeVarying) {
- allMetricNames.add(blockMetricName + NUM_OPS_SUFFIX);
- allMetricNames.add(blockMetricName + TOTAL_SUFFIX);
- } else {
- allMetricNames.add(blockMetricName);
- }
- }
- }
- allMetricNames.addAll(Arrays.asList(bloomMetricNames));
- return allMetricNames;
- }
-
- private static final boolean isTimeVaryingKey(String metricKey) {
- return metricKey.endsWith(NUM_OPS_SUFFIX)
- || metricKey.endsWith(TOTAL_SUFFIX);
- }
-
- private static final String stripTimeVaryingSuffix(String metricKey) {
- return TIME_VARYING_SUFFIX_RE.matcher(metricKey).replaceAll("");
- }
-
- public static Map getMetricsSnapshot() {
- Map metricsSnapshot = new TreeMap();
- for (SchemaMetrics cfm : tableAndFamilyToMetrics.values()) {
- for (String metricName : cfm.getAllMetricNames()) {
- long metricValue;
- if (isTimeVaryingKey(metricName)) {
- Pair totalAndCount =
- RegionMetricsStorage.getTimeVaryingMetric(stripTimeVaryingSuffix(metricName));
- metricValue = metricName.endsWith(TOTAL_SUFFIX) ?
- totalAndCount.getFirst() : totalAndCount.getSecond();
- } else {
- metricValue = RegionMetricsStorage.getNumericMetric(metricName);
- }
-
- metricsSnapshot.put(metricName, metricValue);
- }
- }
- return metricsSnapshot;
- }
-
- public static long getLong(Map m, String k) {
- Long l = m.get(k);
- return l != null ? l : 0;
- }
-
- private static void putLong(Map m, String k, long v) {
- if (v != 0) {
- m.put(k, v);
- } else {
- m.remove(k);
- }
- }
-
- /**
- * @return the difference between two sets of metrics (second minus first).
- * Only includes keys that have nonzero difference.
- */
- public static Map diffMetrics(Map a,
- Map b) {
- Set allKeys = new TreeSet(a.keySet());
- allKeys.addAll(b.keySet());
- Map diff = new TreeMap();
- for (String k : allKeys) {
- long aVal = getLong(a, k);
- long bVal = getLong(b, k);
- if (aVal != bVal) {
- diff.put(k, bVal - aVal);
- }
- }
- return diff;
- }
-
- public static void validateMetricChanges(Map oldMetrics) {
- final Map newMetrics = getMetricsSnapshot();
- final Map allCfDeltas = new TreeMap();
- final Map allBlockCategoryDeltas =
- new TreeMap();
- final Map deltas = diffMetrics(oldMetrics, newMetrics);
- final Pattern cfTableMetricRE =
- useTableNameGlobally ? TABLE_AND_CF_NAME_RE : CF_NAME_RE;
- final Set allKeys = new TreeSet(oldMetrics.keySet());
- allKeys.addAll(newMetrics.keySet());
-
- for (SchemaMetrics cfm : tableAndFamilyToMetrics.values()) {
- for (String metricName : cfm.getAllMetricNames()) {
- if (metricName.startsWith(CF_PREFIX + CF_PREFIX)) {
- throw new AssertionError("Column family prefix used twice: " +
- metricName);
- }
-
- final long oldValue = getLong(oldMetrics, metricName);
- final long newValue = getLong(newMetrics, metricName);
- final long delta = newValue - oldValue;
-
- // Re-calculate values of metrics with no column family (or CF/table)
- // specified based on all metrics with CF (or CF/table) specified.
- if (delta != 0) {
- if (cfm != ALL_SCHEMA_METRICS) {
- final String aggregateMetricName =
- cfTableMetricRE.matcher(metricName).replaceAll("");
- if (!aggregateMetricName.equals(metricName)) {
- LOG.debug("Counting " + delta + " units of " + metricName
- + " towards " + aggregateMetricName);
-
- putLong(allCfDeltas, aggregateMetricName,
- getLong(allCfDeltas, aggregateMetricName) + delta);
- }
- } else {
- LOG.debug("Metric=" + metricName + ", delta=" + delta);
- }
- }
-
- Matcher matcher = BLOCK_CATEGORY_RE.matcher(metricName);
- if (matcher.find()) {
- // Only process per-block-category metrics
- String metricNoBlockCategory = matcher.replaceAll("");
-
- putLong(allBlockCategoryDeltas, metricNoBlockCategory,
- getLong(allBlockCategoryDeltas, metricNoBlockCategory) + delta);
- }
- }
- }
-
- StringBuilder errors = new StringBuilder();
- for (String key : ALL_SCHEMA_METRICS.getAllMetricNames()) {
- long actual = getLong(deltas, key);
- long expected = getLong(allCfDeltas, key);
- if (actual != expected) {
- if (errors.length() > 0)
- errors.append("\n");
- errors.append("The all-CF metric " + key + " changed by "
- + actual + " but the aggregation of per-CF/table metrics "
- + "yields " + expected);
- }
- }
-
- // Verify metrics computed for all block types based on the aggregation
- // of per-block-type metrics.
- for (String key : allKeys) {
- if (BLOCK_CATEGORY_RE.matcher(key).find() ||
- key.contains(ALL_SCHEMA_METRICS.getBloomMetricName(false)) ||
- key.contains(ALL_SCHEMA_METRICS.getBloomMetricName(true))){
- // Skip per-block-category metrics. Also skip bloom filters, because
- // they are not aggregated per block type.
- continue;
- }
- long actual = getLong(deltas, key);
- long expected = getLong(allBlockCategoryDeltas, key);
- if (actual != expected) {
- if (errors.length() > 0)
- errors.append("\n");
- errors.append("The all-block-category metric " + key
- + " changed by " + actual + " but the aggregation of "
- + "per-block-category metrics yields " + expected);
- }
- }
-
- if (errors.length() > 0) {
- throw new AssertionError(errors.toString());
- }
- }
-
- /**
- * Creates an instance pretending both the table and column family are
- * unknown. Used in unit tests.
- */
- public static SchemaMetrics getUnknownInstanceForTest() {
- return getInstance(UNKNOWN, UNKNOWN);
- }
-
- /**
- * Set the flag to use or not use table name in metric names. Used in unit
- * tests, so the flag can be set arbitrarily.
- */
- public static void setUseTableNameInTest(final boolean useTableNameNew) {
- useTableNameGlobally = useTableNameNew;
- }
-
- /** Formats the given map of metrics in a human-readable way. */
- public static String formatMetrics(Map metrics) {
- StringBuilder sb = new StringBuilder();
- for (Map.Entry entry : metrics.entrySet()) {
- if (sb.length() > 0) {
- sb.append('\n');
- }
- sb.append(entry.getKey() + " : " + entry.getValue());
- }
- return sb.toString();
- }
-
-}
diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/replication/regionserver/metrics/ReplicationSinkMetrics.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/replication/regionserver/MetricsSink.java
similarity index 85%
rename from hbase-server/src/main/java/org/apache/hadoop/hbase/replication/regionserver/metrics/ReplicationSinkMetrics.java
rename to hbase-server/src/main/java/org/apache/hadoop/hbase/replication/regionserver/MetricsSink.java
index 1b57aee0062..676fe25066e 100644
--- a/hbase-server/src/main/java/org/apache/hadoop/hbase/replication/regionserver/metrics/ReplicationSinkMetrics.java
+++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/replication/regionserver/MetricsSink.java
@@ -16,26 +16,27 @@
* limitations under the License.
*/
-package org.apache.hadoop.hbase.replication.regionserver.metrics;
+package org.apache.hadoop.hbase.replication.regionserver;
import org.apache.hadoop.classification.InterfaceAudience;
import org.apache.hadoop.hbase.CompatibilitySingletonFactory;
+import org.apache.hadoop.hbase.replication.regionserver.MetricsReplicationSource;
/**
* This class is for maintaining the various replication statistics for a sink and publishing them
* through the metrics interfaces.
*/
@InterfaceAudience.Private
-public class ReplicationSinkMetrics {
+public class MetricsSink {
public static final String SINK_AGE_OF_LAST_APPLIED_OP = "sink.ageOfLastAppliedOp";
public static final String SINK_APPLIED_BATCHES = "sink.appliedBatches";
public static final String SINK_APPLIED_OPS = "sink.appliedOps";
- private ReplicationMetricsSource rms;
+ private MetricsReplicationSource rms;
- public ReplicationSinkMetrics() {
- rms = CompatibilitySingletonFactory.getInstance(ReplicationMetricsSource.class);
+ public MetricsSink() {
+ rms = CompatibilitySingletonFactory.getInstance(MetricsReplicationSource.class);
}
/**
diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/replication/regionserver/metrics/ReplicationSourceMetrics.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/replication/regionserver/MetricsSource.java
similarity index 88%
rename from hbase-server/src/main/java/org/apache/hadoop/hbase/replication/regionserver/metrics/ReplicationSourceMetrics.java
rename to hbase-server/src/main/java/org/apache/hadoop/hbase/replication/regionserver/MetricsSource.java
index fe24d396ba3..e632c473829 100644
--- a/hbase-server/src/main/java/org/apache/hadoop/hbase/replication/regionserver/metrics/ReplicationSourceMetrics.java
+++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/replication/regionserver/MetricsSource.java
@@ -16,19 +16,20 @@
* limitations under the License.
*/
-package org.apache.hadoop.hbase.replication.regionserver.metrics;
+package org.apache.hadoop.hbase.replication.regionserver;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.hadoop.classification.InterfaceAudience;
import org.apache.hadoop.hbase.CompatibilitySingletonFactory;
+import org.apache.hadoop.hbase.util.EnvironmentEdgeManager;
/**
* This class is for maintaining the various replication statistics for a source and publishing them
* through the metrics interfaces.
*/
@InterfaceAudience.Private
-public class ReplicationSourceMetrics {
+public class MetricsSource {
public static final String SOURCE_SIZE_OF_LOG_QUEUE = "source.sizeOfLogQueue";
public static final String SOURCE_AGE_OF_LAST_SHIPPED_OP = "source.ageOfLastShippedOp";
@@ -37,7 +38,7 @@ public class ReplicationSourceMetrics {
public static final String SOURCE_SHIPPED_BATCHES = "source.shippedBatches";
public static final String SOURCE_SHIPPED_OPS = "source.shippedOps";
- public static final Log LOG = LogFactory.getLog(ReplicationSourceMetrics.class);
+ public static final Log LOG = LogFactory.getLog(MetricsSource.class);
private String id;
private long lastTimestamp = 0;
@@ -50,14 +51,14 @@ public class ReplicationSourceMetrics {
private final String shippedBatchesKey;
private final String shippedOpsKey;
- private ReplicationMetricsSource rms;
+ private MetricsReplicationSource rms;
/**
* Constructor used to register the metrics
*
* @param id Name of the source this class is monitoring
*/
- public ReplicationSourceMetrics(String id) {
+ public MetricsSource(String id) {
this.id = id;
sizeOfLogQueKey = "source." + id + ".sizeOfLogQueue";
@@ -66,7 +67,7 @@ public class ReplicationSourceMetrics {
logEditsFilteredKey = "source." + id + ".logEditsFiltered";
shippedBatchesKey = "source." + this.id + ".shippedBatches";
shippedOpsKey = "source." + this.id + ".shippedOps";
- rms = CompatibilitySingletonFactory.getInstance(ReplicationMetricsSource.class);
+ rms = CompatibilitySingletonFactory.getInstance(MetricsReplicationSource.class);
}
/**
@@ -75,7 +76,7 @@ public class ReplicationSourceMetrics {
* @param timestamp write time of the edit
*/
public void setAgeOfLastShippedOp(long timestamp) {
- long age = System.currentTimeMillis() - timestamp;
+ long age = EnvironmentEdgeManager.currentTimeMillis() - timestamp;
rms.setGauge(ageOfLastShippedOpKey, age);
rms.setGauge(SOURCE_AGE_OF_LAST_SHIPPED_OP, age);
this.lastTimestamp = timestamp;
@@ -146,13 +147,13 @@ public class ReplicationSourceMetrics {
/** Removes all metrics about this Source. */
public void clear() {
- rms.removeGauge(sizeOfLogQueKey);
+ rms.removeMetric(sizeOfLogQueKey);
rms.decGauge(SOURCE_SIZE_OF_LOG_QUEUE, lastQueueSize);
lastQueueSize = 0;
- rms.removeGauge(ageOfLastShippedOpKey);
+ rms.removeMetric(ageOfLastShippedOpKey);
- rms.removeCounter(logEditsFilteredKey);
- rms.removeCounter(logEditsReadKey);
+ rms.removeMetric(logEditsFilteredKey);
+ rms.removeMetric(logEditsReadKey);
}
}
diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/replication/regionserver/ReplicationSink.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/replication/regionserver/ReplicationSink.java
index b5ebe74c629..34ba0204e80 100644
--- a/hbase-server/src/main/java/org/apache/hadoop/hbase/replication/regionserver/ReplicationSink.java
+++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/replication/regionserver/ReplicationSink.java
@@ -46,7 +46,6 @@ import org.apache.hadoop.hbase.client.Put;
import org.apache.hadoop.hbase.client.Row;
import org.apache.hadoop.hbase.regionserver.wal.HLog;
import org.apache.hadoop.hbase.regionserver.wal.WALEdit;
-import org.apache.hadoop.hbase.replication.regionserver.metrics.ReplicationSinkMetrics;
import org.apache.hadoop.hbase.util.Bytes;
import org.apache.hadoop.hbase.util.Threads;
@@ -73,7 +72,7 @@ public class ReplicationSink {
private final Configuration conf;
private final ExecutorService sharedThreadPool;
private final HConnection sharedHtableCon;
- private final ReplicationSinkMetrics metrics;
+ private final MetricsSink metrics;
/**
* Create a sink for replication
@@ -86,7 +85,7 @@ public class ReplicationSink {
throws IOException {
this.conf = HBaseConfiguration.create(conf);
decorateConf();
- this.metrics = new ReplicationSinkMetrics();
+ this.metrics = new MetricsSink();
this.sharedHtableCon = HConnectionManager.createConnection(this.conf);
this.sharedThreadPool = new ThreadPoolExecutor(1,
conf.getInt("hbase.htable.threads.max", Integer.MAX_VALUE),
diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/replication/regionserver/ReplicationSource.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/replication/regionserver/ReplicationSource.java
index f18b198a3d6..1312f7a4e81 100644
--- a/hbase-server/src/main/java/org/apache/hadoop/hbase/replication/regionserver/ReplicationSource.java
+++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/replication/regionserver/ReplicationSource.java
@@ -56,12 +56,8 @@ import org.apache.hadoop.hbase.regionserver.wal.HLogFactory;
import org.apache.hadoop.hbase.regionserver.wal.HLogKey;
import org.apache.hadoop.hbase.regionserver.wal.WALEdit;
import org.apache.hadoop.hbase.replication.ReplicationZookeeper;
-import org.apache.hadoop.hbase.replication.regionserver.metrics.ReplicationSourceMetrics;
-import org.apache.hadoop.hbase.regionserver.wal.HLog;
-import org.apache.hadoop.hbase.regionserver.wal.HLogUtil;
import org.apache.hadoop.hbase.util.Bytes;
import org.apache.hadoop.hbase.util.Threads;
-import org.apache.hadoop.hbase.zookeeper.ZKClusterId;
import org.apache.hadoop.ipc.RemoteException;
import org.apache.zookeeper.KeeperException;
@@ -141,7 +137,7 @@ public class ReplicationSource extends Thread
// Indicates if this particular source is running
private volatile boolean running = true;
// Metrics for this source
- private ReplicationSourceMetrics metrics;
+ private MetricsSource metrics;
/**
* Instantiation method used by region servers
@@ -188,7 +184,7 @@ public class ReplicationSource extends Thread
this.sleepForRetries =
this.conf.getLong("replication.source.sleepforretries", 1000);
this.fs = fs;
- this.metrics = new ReplicationSourceMetrics(peerClusterZnode);
+ this.metrics = new MetricsSource(peerClusterZnode);
try {
this.clusterId = zkHelper.getUUIDForCluster(zkHelper.getZookeeperWatcher());
diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/rest/metrics/RESTMetrics.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/rest/MetricsREST.java
similarity index 78%
rename from hbase-server/src/main/java/org/apache/hadoop/hbase/rest/metrics/RESTMetrics.java
rename to hbase-server/src/main/java/org/apache/hadoop/hbase/rest/MetricsREST.java
index b66881545fa..98f48a70180 100644
--- a/hbase-server/src/main/java/org/apache/hadoop/hbase/rest/metrics/RESTMetrics.java
+++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/rest/MetricsREST.java
@@ -17,30 +17,24 @@
* limitations under the License.
*/
-package org.apache.hadoop.hbase.rest.metrics;
+package org.apache.hadoop.hbase.rest;
import org.apache.hadoop.classification.InterfaceAudience;
import org.apache.hadoop.hbase.CompatibilitySingletonFactory;
-import org.apache.hadoop.hbase.metrics.MetricsRate;
-import org.apache.hadoop.metrics.MetricsContext;
-import org.apache.hadoop.metrics.MetricsRecord;
-import org.apache.hadoop.metrics.MetricsUtil;
-import org.apache.hadoop.metrics.Updater;
-import org.apache.hadoop.metrics.jvm.JvmMetrics;
-import org.apache.hadoop.metrics.util.MetricsRegistry;
+import org.apache.hadoop.hbase.rest.MetricsRESTSource;
@InterfaceAudience.Private
-public class RESTMetrics {
+public class MetricsREST {
- public RESTMetricsSource getSource() {
+ public MetricsRESTSource getSource() {
return source;
}
- private RESTMetricsSource source;
+ private MetricsRESTSource source;
- public RESTMetrics() {
- source = CompatibilitySingletonFactory.getInstance(RESTMetricsSource.class);
+ public MetricsREST() {
+ source = CompatibilitySingletonFactory.getInstance(MetricsRESTSource.class);
}
/**
diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/rest/RESTServlet.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/rest/RESTServlet.java
index 5cd1e383ddf..00309551c1e 100644
--- a/hbase-server/src/main/java/org/apache/hadoop/hbase/rest/RESTServlet.java
+++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/rest/RESTServlet.java
@@ -24,7 +24,6 @@ import java.io.IOException;
import org.apache.hadoop.classification.InterfaceAudience;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.hbase.client.HTablePool;
-import org.apache.hadoop.hbase.rest.metrics.RESTMetrics;
/**
* Singleton class encapsulating global REST servlet state and functions.
@@ -34,7 +33,7 @@ public class RESTServlet implements Constants {
private static RESTServlet INSTANCE;
private final Configuration conf;
private final HTablePool pool;
- private final RESTMetrics metrics = new RESTMetrics();
+ private final MetricsREST metrics = new MetricsREST();
/**
* @return the RESTServlet singleton instance
@@ -80,7 +79,7 @@ public class RESTServlet implements Constants {
return conf;
}
- RESTMetrics getMetrics() {
+ MetricsREST getMetrics() {
return metrics;
}
diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/thrift/ThriftMetrics.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/thrift/ThriftMetrics.java
index 1568b7edcd9..bc600a36397 100644
--- a/hbase-server/src/main/java/org/apache/hadoop/hbase/thrift/ThriftMetrics.java
+++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/thrift/ThriftMetrics.java
@@ -22,8 +22,6 @@ package org.apache.hadoop.hbase.thrift;
import org.apache.hadoop.classification.InterfaceAudience;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.hbase.CompatibilitySingletonFactory;
-import org.apache.hadoop.hbase.thrift.metrics.ThriftServerMetricsSource;
-import org.apache.hadoop.hbase.thrift.metrics.ThriftServerMetricsSourceFactory;
/**
* This class is for maintaining the various statistics of thrift server
@@ -38,15 +36,15 @@ public class ThriftMetrics {
TWO
}
- public ThriftServerMetricsSource getSource() {
+ public MetricsThriftServerSource getSource() {
return source;
}
- public void setSource(ThriftServerMetricsSource source) {
+ public void setSource(MetricsThriftServerSource source) {
this.source = source;
}
- private ThriftServerMetricsSource source;
+ private MetricsThriftServerSource source;
private final long slowResponseTime;
public static final String SLOW_RESPONSE_NANO_SEC =
"hbase.thrift.slow.response.nano.second";
@@ -57,9 +55,9 @@ public class ThriftMetrics {
slowResponseTime = conf.getLong( SLOW_RESPONSE_NANO_SEC, DEFAULT_SLOW_RESPONSE_NANO_SEC);
if (t == ThriftServerType.ONE) {
- source = CompatibilitySingletonFactory.getInstance(ThriftServerMetricsSourceFactory.class).createThriftOneSource();
+ source = CompatibilitySingletonFactory.getInstance(MetricsThriftServerSourceFactory.class).createThriftOneSource();
} else if (t == ThriftServerType.TWO) {
- source = CompatibilitySingletonFactory.getInstance(ThriftServerMetricsSourceFactory.class).createThriftTwoSource();
+ source = CompatibilitySingletonFactory.getInstance(MetricsThriftServerSourceFactory.class).createThriftTwoSource();
}
}
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/io/TestHeapSize.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/io/TestHeapSize.java
index b08f8f23294..9e94004ec8e 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/io/TestHeapSize.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/io/TestHeapSize.java
@@ -46,7 +46,6 @@ import org.apache.hadoop.hbase.io.hfile.LruBlockCache;
import org.apache.hadoop.hbase.regionserver.HRegion;
import org.apache.hadoop.hbase.regionserver.MemStore;
import org.apache.hadoop.hbase.regionserver.HStore;
-import org.apache.hadoop.hbase.regionserver.metrics.SchemaConfigured;
import org.apache.hadoop.hbase.util.Bytes;
import org.apache.hadoop.hbase.util.ClassSize;
import org.junit.experimental.categories.Category;
@@ -313,12 +312,6 @@ public class TestHeapSize extends TestCase {
assertEquals(expected, actual);
}
- // SchemaConfigured
- LOG.debug("Heap size for: " + SchemaConfigured.class.getName());
- SchemaConfigured sc = new SchemaConfigured(null, "myTable", "myCF");
- assertEquals(ClassSize.estimateBase(SchemaConfigured.class, true),
- sc.heapSize());
-
// Store Overhead
cl = HStore.class;
actual = HStore.FIXED_OVERHEAD;
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/io/hfile/CacheTestUtils.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/io/hfile/CacheTestUtils.java
index c73c49147c0..6eb26baecaf 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/io/hfile/CacheTestUtils.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/io/hfile/CacheTestUtils.java
@@ -37,7 +37,6 @@ import org.apache.hadoop.hbase.MultithreadedTestUtil;
import org.apache.hadoop.hbase.MultithreadedTestUtil.TestThread;
import org.apache.hadoop.hbase.io.HeapSize;
import org.apache.hadoop.hbase.util.ChecksumType;
-import org.apache.hadoop.hbase.regionserver.metrics.SchemaMetrics;
public class CacheTestUtils {
@@ -281,17 +280,6 @@ public class CacheTestUtils {
}
};
}
-
- @Override
- public BlockType getBlockType() {
- return BlockType.DATA;
- }
-
- @Override
- public SchemaMetrics getSchemaMetrics() {
- return SchemaMetrics.getUnknownInstanceForTest();
- }
-
}
private static HFileBlockPair[] generateHFileBlocks(int blockSize,
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/io/hfile/TestCacheOnWrite.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/io/hfile/TestCacheOnWrite.java
index da8ffd7fbd4..d4995deb386 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/io/hfile/TestCacheOnWrite.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/io/hfile/TestCacheOnWrite.java
@@ -47,7 +47,6 @@ import org.apache.hadoop.hbase.io.encoding.DataBlockEncoding;
import org.apache.hadoop.hbase.regionserver.HRegion;
import org.apache.hadoop.hbase.regionserver.StoreFile;
import org.apache.hadoop.hbase.regionserver.StoreFile.BloomType;
-import org.apache.hadoop.hbase.regionserver.metrics.SchemaMetrics;
import org.apache.hadoop.hbase.util.BloomFilterFactory;
import org.apache.hadoop.hbase.util.Bytes;
import org.apache.hadoop.hbase.util.ChecksumType;
@@ -361,13 +360,9 @@ public class TestCacheOnWrite {
(LruBlockCache) new CacheConfig(conf).getBlockCache();
blockCache.clearCache();
assertEquals(0, blockCache.getBlockTypeCountsForTest().size());
- Map metricsBefore = SchemaMetrics.getMetricsSnapshot();
region.compactStores();
LOG.debug("compactStores() returned");
- SchemaMetrics.validateMetricChanges(metricsBefore);
- Map compactionMetrics = SchemaMetrics.diffMetrics(
- metricsBefore, SchemaMetrics.getMetricsSnapshot());
- LOG.debug(SchemaMetrics.formatMetrics(compactionMetrics));
+
Map blockTypesInCache =
blockCache.getBlockTypeCountsForTest();
LOG.debug("Block types in cache: " + blockTypesInCache);
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/io/hfile/TestCachedBlockQueue.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/io/hfile/TestCachedBlockQueue.java
index 7a712b4a26e..d8e09fc3dbf 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/io/hfile/TestCachedBlockQueue.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/io/hfile/TestCachedBlockQueue.java
@@ -20,8 +20,6 @@ package org.apache.hadoop.hbase.io.hfile;
import java.nio.ByteBuffer;
-import org.apache.hadoop.hbase.regionserver.metrics.SchemaMetrics;
-
import junit.framework.TestCase;
import org.apache.hadoop.hbase.SmallTests;
import org.junit.experimental.categories.Category;
@@ -137,15 +135,6 @@ public class TestCachedBlockQueue extends TestCase {
return null;
}
- @Override
- public BlockType getBlockType() {
- return BlockType.DATA;
- }
-
- @Override
- public SchemaMetrics getSchemaMetrics() {
- return SchemaMetrics.ALL_SCHEMA_METRICS;
- }
}, accessTime, false);
}
}
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/io/hfile/TestForceCacheImportantBlocks.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/io/hfile/TestForceCacheImportantBlocks.java
index 258ded57428..59c48451003 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/io/hfile/TestForceCacheImportantBlocks.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/io/hfile/TestForceCacheImportantBlocks.java
@@ -36,8 +36,6 @@ import org.apache.hadoop.hbase.io.compress.Compression.Algorithm;
import org.apache.hadoop.hbase.io.hfile.BlockType.BlockCategory;
import org.apache.hadoop.hbase.regionserver.HRegion;
import org.apache.hadoop.hbase.regionserver.StoreFile.BloomType;
-import org.apache.hadoop.hbase.regionserver.metrics.SchemaMetrics;
-import org.apache.hadoop.hbase.regionserver.metrics.SchemaMetrics.BlockMetricType;
import org.apache.hadoop.hbase.util.Bytes;
import org.junit.Test;
import org.junit.experimental.categories.Category;
@@ -103,7 +101,7 @@ public class TestForceCacheImportantBlocks {
TEST_UTIL.getConfiguration().setInt(HFileBlockIndex.MAX_CHUNK_SIZE_KEY,
BLOCK_SIZE);
- SchemaMetrics.setUseTableNameInTest(false);
+
HColumnDescriptor hcd =
new HColumnDescriptor(Bytes.toBytes(CF))
.setMaxVersions(MAX_VERSIONS)
@@ -113,16 +111,12 @@ public class TestForceCacheImportantBlocks {
hcd.setBlockCacheEnabled(cfCacheEnabled);
HRegion region = TEST_UTIL.createTestRegion(TABLE, hcd);
writeTestData(region);
- Map metricsBefore = SchemaMetrics.getMetricsSnapshot();
+
for (int i = 0; i < NUM_ROWS; ++i) {
Get get = new Get(Bytes.toBytes("row" + i));
region.get(get, null);
}
- SchemaMetrics.validateMetricChanges(metricsBefore);
- Map metricsAfter = SchemaMetrics.getMetricsSnapshot();
- Map metricsDelta = SchemaMetrics.diffMetrics(metricsBefore,
- metricsAfter);
- SchemaMetrics metrics = SchemaMetrics.getInstance(TABLE, CF);
+
List importantBlockCategories =
new ArrayList();
importantBlockCategories.add(BlockCategory.BLOOM);
@@ -130,30 +124,8 @@ public class TestForceCacheImportantBlocks {
// We only have index blocks for HFile v2.
importantBlockCategories.add(BlockCategory.INDEX);
}
-
- for (BlockCategory category : importantBlockCategories) {
- String hitsMetricName = getMetricName(metrics, category);
- assertTrue("Metric " + hitsMetricName + " was not incremented",
- metricsDelta.containsKey(hitsMetricName));
- long hits = metricsDelta.get(hitsMetricName);
- assertTrue("Invalid value of " + hitsMetricName + ": " + hits, hits > 0);
- }
-
- if (!cfCacheEnabled) {
- // Caching is turned off for the CF, so make sure we are not caching data
- // blocks.
- String dataHitMetricName = getMetricName(metrics, BlockCategory.DATA);
- assertFalse("Nonzero value for metric " + dataHitMetricName,
- metricsDelta.containsKey(dataHitMetricName));
- }
}
- private String getMetricName(SchemaMetrics metrics, BlockCategory category) {
- String hitsMetricName =
- metrics.getBlockMetricName(category, SchemaMetrics.NO_COMPACTION,
- BlockMetricType.CACHE_HIT);
- return hitsMetricName;
- }
private void writeTestData(HRegion region) throws IOException {
for (int i = 0; i < NUM_ROWS; ++i) {
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/io/hfile/TestHFileDataBlockEncoder.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/io/hfile/TestHFileDataBlockEncoder.java
index 6d6ba796cb5..141ef10ca39 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/io/hfile/TestHFileDataBlockEncoder.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/io/hfile/TestHFileDataBlockEncoder.java
@@ -34,8 +34,6 @@ import org.apache.hadoop.hbase.io.encoding.DataBlockEncoding;
import org.apache.hadoop.hbase.io.encoding.HFileBlockDefaultEncodingContext;
import org.apache.hadoop.hbase.io.encoding.HFileBlockEncodingContext;
import org.apache.hadoop.hbase.io.encoding.RedundantKVGenerator;
-import org.apache.hadoop.hbase.regionserver.metrics.SchemaConfigured;
-import org.apache.hadoop.hbase.regionserver.metrics.SchemaMetrics;
import org.apache.hadoop.hbase.util.ChecksumType;
import org.junit.After;
import org.junit.Before;
@@ -53,8 +51,6 @@ public class TestHFileDataBlockEncoder {
new HBaseTestingUtility();
private HFileDataBlockEncoderImpl blockEncoder;
private RedundantKVGenerator generator = new RedundantKVGenerator();
- private SchemaConfigured UNKNOWN_TABLE_AND_CF =
- SchemaConfigured.createUnknown();
private boolean includesMemstoreTS;
/**
@@ -76,7 +72,6 @@ public class TestHFileDataBlockEncoder {
@Before
public void setUp() {
conf = TEST_UTIL.getConfiguration();
- SchemaMetrics.configureGlobally(conf);
}
/**
@@ -162,7 +157,6 @@ public class TestHFileDataBlockEncoder {
HFileBlock b = new HFileBlock(BlockType.DATA, size, size, -1, buf,
HFileBlock.FILL_HEADER, 0, includesMemstoreTS,
HFileReaderV2.MAX_MINOR_VERSION, 0, ChecksumType.NULL.getCode(), 0);
- UNKNOWN_TABLE_AND_CF.passSchemaMetricsTo(b);
return b;
}
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/io/hfile/TestHFileReaderV1.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/io/hfile/TestHFileReaderV1.java
index f91c83e394f..a36fb546bb7 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/io/hfile/TestHFileReaderV1.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/io/hfile/TestHFileReaderV1.java
@@ -29,7 +29,6 @@ import org.apache.hadoop.fs.Path;
import org.apache.hadoop.hbase.HBaseTestingUtility;
import org.apache.hadoop.hbase.SmallTests;
import org.apache.hadoop.hbase.io.compress.Compression;
-import org.apache.hadoop.hbase.regionserver.metrics.SchemaMetrics;
import org.apache.hadoop.hbase.util.Bytes;
import org.junit.After;
@@ -47,21 +46,13 @@ public class TestHFileReaderV1 {
private Configuration conf;
private FileSystem fs;
- private Map startingMetrics;
private static final int N = 1000;
@Before
public void setUp() throws IOException {
- startingMetrics = SchemaMetrics.getMetricsSnapshot();
conf = TEST_UTIL.getConfiguration();
fs = FileSystem.get(conf);
- SchemaMetrics.configureGlobally(conf);
- }
-
- @After
- public void tearDown() throws Exception {
- SchemaMetrics.validateMetricChanges(startingMetrics);
}
@Test
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/io/hfile/TestLruBlockCache.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/io/hfile/TestLruBlockCache.java
index ebb78bf4d2f..290ba4a994d 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/io/hfile/TestLruBlockCache.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/io/hfile/TestLruBlockCache.java
@@ -26,11 +26,10 @@ import java.util.Collection;
import java.util.Map;
import java.util.Random;
+import org.apache.hadoop.hbase.HBaseTestingUtility;
import org.apache.hadoop.hbase.SmallTests;
import org.apache.hadoop.hbase.io.HeapSize;
import org.apache.hadoop.hbase.io.hfile.LruBlockCache.EvictionThread;
-import org.apache.hadoop.hbase.regionserver.metrics.SchemaMetrics;
-import org.apache.hadoop.hbase.regionserver.metrics.TestSchemaMetrics;
import org.apache.hadoop.hbase.util.ClassSize;
import org.junit.After;
import org.junit.Before;
@@ -47,30 +46,9 @@ import org.junit.runners.Parameterized.Parameters;
* evictions run when they're supposed to and do what they should,
* and that cached blocks are accessible when expected to be.
*/
-@RunWith(Parameterized.class)
@Category(SmallTests.class)
public class TestLruBlockCache {
- private Map startingMetrics;
-
- public TestLruBlockCache(boolean useTableName) {
- SchemaMetrics.setUseTableNameInTest(useTableName);
- }
-
- @Parameters
- public static Collection parameters() {
- return TestSchemaMetrics.parameters();
- }
-
- @Before
- public void setUp() throws Exception {
- startingMetrics = SchemaMetrics.getMetricsSnapshot();
- }
-
- @After
- public void tearDown() throws Exception {
- SchemaMetrics.validateMetricChanges(startingMetrics);
- }
@Test
public void testBackgroundEvictionThread() throws Exception {
@@ -672,16 +650,6 @@ public class TestLruBlockCache {
+ ClassSize.align(size);
}
- @Override
- public BlockType getBlockType() {
- return BlockType.DATA;
- }
-
- @Override
- public SchemaMetrics getSchemaMetrics() {
- return SchemaMetrics.getUnknownInstanceForTest();
- }
-
@Override
public int getSerializedLength() {
return 0;
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/io/hfile/TestScannerSelectionUsingTTL.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/io/hfile/TestScannerSelectionUsingTTL.java
index 7fb7a7c057f..0179724193b 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/io/hfile/TestScannerSelectionUsingTTL.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/io/hfile/TestScannerSelectionUsingTTL.java
@@ -39,8 +39,6 @@ import org.apache.hadoop.hbase.client.Scan;
import org.apache.hadoop.hbase.io.hfile.BlockType.BlockCategory;
import org.apache.hadoop.hbase.regionserver.HRegion;
import org.apache.hadoop.hbase.regionserver.InternalScanner;
-import org.apache.hadoop.hbase.regionserver.metrics.SchemaMetrics;
-import org.apache.hadoop.hbase.regionserver.metrics.SchemaMetrics.BlockMetricType;
import org.apache.hadoop.hbase.util.Bytes;
import org.apache.hadoop.hbase.util.Threads;
import org.junit.Test;
@@ -146,9 +144,6 @@ public class TestScannerSelectionUsingTTL {
Set accessedFiles = cache.getCachedFileNamesForTest();
LOG.debug("Files accessed during scan: " + accessedFiles);
- Map metricsBeforeCompaction =
- SchemaMetrics.getMetricsSnapshot();
-
// Exercise both compaction codepaths.
if (explicitCompaction) {
region.getStore(FAMILY_BYTES).compactRecentForTesting(totalNumFiles);
@@ -156,18 +151,6 @@ public class TestScannerSelectionUsingTTL {
region.compactStores();
}
- SchemaMetrics.validateMetricChanges(metricsBeforeCompaction);
- Map compactionMetrics =
- SchemaMetrics.diffMetrics(metricsBeforeCompaction,
- SchemaMetrics.getMetricsSnapshot());
- long compactionDataBlocksRead = SchemaMetrics.getLong(
- compactionMetrics,
- SchemaMetrics.getInstance(TABLE, FAMILY).getBlockMetricName(
- BlockCategory.DATA, true, BlockMetricType.READ_COUNT));
- assertEquals("Invalid number of blocks accessed during compaction. " +
- "We only expect non-expired files to be accessed.",
- numFreshFiles, compactionDataBlocksRead);
region.close();
}
-
}
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestMasterMetrics.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestMasterMetrics.java
index 73294977062..7c93b8cba2a 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestMasterMetrics.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestMasterMetrics.java
@@ -19,25 +19,16 @@ package org.apache.hadoop.hbase.master;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.hbase.CompatibilityFactory;
-import org.apache.hadoop.hbase.HBaseConfiguration;
import org.apache.hadoop.hbase.HBaseTestingUtility;
-import org.apache.hadoop.hbase.HConstants;
import org.apache.hadoop.hbase.MediumTests;
import org.apache.hadoop.hbase.MiniHBaseCluster;
-import org.apache.hadoop.hbase.master.metrics.MasterMetricsSource;
import org.apache.hadoop.hbase.protobuf.ProtobufUtil;
import org.apache.hadoop.hbase.protobuf.generated.HBaseProtos;
import org.apache.hadoop.hbase.protobuf.generated.RegionServerStatusProtos;
import org.apache.hadoop.hbase.regionserver.HRegionServer;
import org.apache.hadoop.hbase.test.MetricsAssertHelper;
-import org.apache.hadoop.hbase.util.Threads;
-import org.apache.log4j.Level;
-import org.apache.log4j.Logger;
-import org.junit.After;
import org.junit.AfterClass;
-import org.junit.Before;
import org.junit.BeforeClass;
import org.junit.Test;
import org.junit.experimental.categories.Category;
@@ -95,18 +86,18 @@ public class TestMasterMetrics {
@Test
public void testDefaultMasterMetrics() throws Exception {
- MasterMetricsSource source = master.getMetrics().getMetricsSource();
- metricsHelper.assertGauge( "numRegionServers", 1, source);
- metricsHelper.assertGauge( "averageLoad", 2, source);
- metricsHelper.assertGauge( "numDeadRegionServers", 0, source);
+ MetricsMasterSource masterSource = master.getMetrics().getMetricsSource();
+ metricsHelper.assertGauge( "numRegionServers", 1, masterSource);
+ metricsHelper.assertGauge( "averageLoad", 2, masterSource);
+ metricsHelper.assertGauge( "numDeadRegionServers", 0, masterSource);
- metricsHelper.assertGauge("masterStartTime", master.getMasterStartTime(), source);
- metricsHelper.assertGauge("masterActiveTime", master.getMasterActiveTime(), source);
+ metricsHelper.assertGauge("masterStartTime", master.getMasterStartTime(), masterSource);
+ metricsHelper.assertGauge("masterActiveTime", master.getMasterActiveTime(), masterSource);
- metricsHelper.assertTag("isActiveMaster", "true", source);
- metricsHelper.assertTag("serverName", master.getServerName().toString(), source);
- metricsHelper.assertTag("clusterId", master.getClusterId(), source);
- metricsHelper.assertTag("zookeeperQuorum", master.getZooKeeper().getQuorum(), source);
+ metricsHelper.assertTag("isActiveMaster", "true", masterSource);
+ metricsHelper.assertTag("serverName", master.getServerName().toString(), masterSource);
+ metricsHelper.assertTag("clusterId", master.getClusterId(), masterSource);
+ metricsHelper.assertTag("zookeeperQuorum", master.getZooKeeper().getQuorum(), masterSource);
}
}
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/master/metrics/TestMasterMetricsWrapper.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestMasterMetricsWrapper.java
similarity index 90%
rename from hbase-server/src/test/java/org/apache/hadoop/hbase/master/metrics/TestMasterMetricsWrapper.java
rename to hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestMasterMetricsWrapper.java
index abbd329a133..52ab4bc4172 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/master/metrics/TestMasterMetricsWrapper.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestMasterMetricsWrapper.java
@@ -15,14 +15,14 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.hadoop.hbase.master.metrics;
+package org.apache.hadoop.hbase.master;
import junit.framework.Assert;
import org.apache.hadoop.hbase.HBaseTestingUtility;
import org.apache.hadoop.hbase.master.HMaster;
-import org.apache.hadoop.hbase.master.metrics.MasterMetricsWrapperImpl;
import org.apache.hadoop.hbase.MediumTests;
+import org.apache.hadoop.hbase.master.MetricsMasterWrapperImpl;
import org.junit.AfterClass;
import org.junit.BeforeClass;
import org.junit.Test;
@@ -47,13 +47,13 @@ public class TestMasterMetricsWrapper {
@Test
public void testInfo() {
HMaster master = TEST_UTIL.getHBaseCluster().getMaster();
- MasterMetricsWrapperImpl info = new MasterMetricsWrapperImpl(master);
+ MetricsMasterWrapperImpl info = new MetricsMasterWrapperImpl(master);
Assert.assertEquals(master.getAverageLoad(), info.getAverageLoad());
Assert.assertEquals(master.getClusterId(), info.getClusterId());
Assert.assertEquals(master.getMasterActiveTime(),
- info.getMasterActiveTime());
+ info.getActiveTime());
Assert.assertEquals(master.getMasterStartTime(),
- info.getMasterStartTime());
+ info.getStartTime());
Assert.assertEquals(master.getCoprocessors().length,
info.getCoprocessors().length);
Assert.assertEquals(master.getServerManager().getOnlineServersList().size(),
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/metrics/TestExactCounterMetric.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/metrics/TestExactCounterMetric.java
index edbb4b8bede..625f96c604b 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/metrics/TestExactCounterMetric.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/metrics/TestExactCounterMetric.java
@@ -27,6 +27,7 @@ import org.apache.hadoop.hbase.SmallTests;
import org.junit.Test;
import org.junit.experimental.categories.Category;
+@Deprecated
@Category(SmallTests.class)
public class TestExactCounterMetric {
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/metrics/TestExponentiallyDecayingSample.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/metrics/TestExponentiallyDecayingSample.java
index 010e4ac70b3..d997fe74737 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/metrics/TestExponentiallyDecayingSample.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/metrics/TestExponentiallyDecayingSample.java
@@ -26,6 +26,7 @@ import org.apache.hadoop.hbase.SmallTests;
import org.junit.Test;
import org.junit.experimental.categories.Category;
+@Deprecated
@Category(SmallTests.class)
public class TestExponentiallyDecayingSample {
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/metrics/TestMetricsHistogram.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/metrics/TestMetricsHistogram.java
index d992aaf944e..d06c989cec5 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/metrics/TestMetricsHistogram.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/metrics/TestMetricsHistogram.java
@@ -28,6 +28,7 @@ import org.junit.Assert;
import org.junit.Test;
import org.junit.experimental.categories.Category;
+@Deprecated
@Category(SmallTests.class)
public class TestMetricsHistogram {
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/metrics/TestMetricsMBeanBase.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/metrics/TestMetricsMBeanBase.java
index 481a09ea5d0..0812ab6054a 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/metrics/TestMetricsMBeanBase.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/metrics/TestMetricsMBeanBase.java
@@ -45,6 +45,7 @@ import org.junit.experimental.categories.Category;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
+@Deprecated
@Category(SmallTests.class)
public class TestMetricsMBeanBase extends TestCase {
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/MetricsRegionServerWrapperStub.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/MetricsRegionServerWrapperStub.java
new file mode 100644
index 00000000000..1c0883413f6
--- /dev/null
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/MetricsRegionServerWrapperStub.java
@@ -0,0 +1,194 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.hadoop.hbase.regionserver;
+
+public class MetricsRegionServerWrapperStub implements MetricsRegionServerWrapper {
+
+ @Override
+ public String getServerName() {
+ return "test";
+ }
+
+ @Override
+ public String getClusterId() {
+ return "tClusterId";
+ }
+
+ @Override
+ public String getZookeeperQuorum() {
+ return "zk";
+ }
+
+ @Override
+ public String getCoprocessors() {
+ return "co-process";
+ }
+
+ @Override
+ public long getStartCode() {
+ return 100;
+ }
+
+ @Override
+ public long getNumOnlineRegions() {
+ return 101;
+ }
+
+ @Override
+ public long getNumStores() {
+ return 2;
+ }
+
+ @Override
+ public long getNumStoreFiles() {
+ return 300;
+ }
+
+ @Override
+ public long getMemstoreSize() {
+ return 1025;
+ }
+
+ @Override
+ public long getStoreFileSize() {
+ return 1900;
+ }
+
+ @Override
+ public double getRequestsPerSecond() {
+ return 0;
+ }
+
+ @Override
+ public long getTotalRequestCount() {
+ return 899;
+ }
+
+ @Override
+ public long getReadRequestsCount() {
+ return 997;
+ }
+
+ @Override
+ public long getWriteRequestsCount() {
+ return 707;
+ }
+
+ @Override
+ public long getCheckAndMutateChecksFailed() {
+ return 401;
+ }
+
+ @Override
+ public long getCheckAndMutateChecksPassed() {
+ return 405;
+ }
+
+ @Override
+ public long getStoreFileIndexSize() {
+ return 406;
+ }
+
+ @Override
+ public long getTotalStaticIndexSize() {
+ return 407;
+ }
+
+ @Override
+ public long getTotalStaticBloomSize() {
+ return 408;
+ }
+
+ @Override
+ public long getNumPutsWithoutWAL() {
+ return 409;
+ }
+
+ @Override
+ public long getDataInMemoryWithoutWAL() {
+ return 410;
+ }
+
+ @Override
+ public int getPercentFileLocal() {
+ return 99;
+ }
+
+ @Override
+ public int getCompactionQueueSize() {
+ return 411;
+ }
+
+ @Override
+ public int getFlushQueueSize() {
+ return 412;
+ }
+
+ @Override
+ public long getBlockCacheFreeSize() {
+ return 413;
+ }
+
+ @Override
+ public long getBlockCacheCount() {
+ return 414;
+ }
+
+ @Override
+ public long getBlockCacheSize() {
+ return 415;
+ }
+
+ @Override
+ public long getBlockCacheHitCount() {
+ return 416;
+ }
+
+ @Override
+ public long getBlockCacheMissCount() {
+ return 417;
+ }
+
+ @Override
+ public long getBlockCacheEvictedCount() {
+ return 418;
+ }
+
+ @Override
+ public int getBlockCacheHitPercent() {
+ return 98;
+ }
+
+ @Override
+ public int getBlockCacheHitCachingPercent() {
+ return 97;
+ }
+
+
+ @Override
+ public long getUpdatesBlockedTime() {
+ return 419;
+ }
+
+ @Override
+ public void forceRecompute() {
+ //IGNORED.
+ }
+
+}
\ No newline at end of file
diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/MXBeanImpl.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/MetricsRegionWrapperStub.java
similarity index 56%
rename from hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/MXBeanImpl.java
rename to hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/MetricsRegionWrapperStub.java
index 78f3b6f1608..eebec6a8c49 100644
--- a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/MXBeanImpl.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/MetricsRegionWrapperStub.java
@@ -1,4 +1,4 @@
-/**
+/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -15,40 +15,48 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
+
package org.apache.hadoop.hbase.regionserver;
-/**
- * Impl for exposing Region Server Information through JMX
- */
-public class MXBeanImpl implements MXBean {
+public class MetricsRegionWrapperStub implements MetricsRegionWrapper {
- private final HRegionServer regionServer;
-
- private static MXBeanImpl instance = null;
- public synchronized static MXBeanImpl init(final HRegionServer rs){
- if (instance == null) {
- instance = new MXBeanImpl(rs);
- }
- return instance;
- }
-
- protected MXBeanImpl(final HRegionServer rs) {
- this.regionServer = rs;
+ @Override
+ public String getTableName() {
+ return "MetricsRegionWrapperStub";
}
@Override
- public String[] getCoprocessors() {
- return regionServer.getCoprocessors();
+ public String getRegionName() {
+ return "DEADBEEF001";
}
@Override
- public String getZookeeperQuorum() {
- return regionServer.getZooKeeper().getQuorum();
+ public long getNumStores() {
+ return 101;
}
@Override
- public String getServerName() {
- return regionServer.getServerName().getServerName();
+ public long getNumStoreFiles() {
+ return 102;
}
+ @Override
+ public long getMemstoreSize() {
+ return 103;
+ }
+
+ @Override
+ public long getStoreFileSize() {
+ return 104;
+ }
+
+ @Override
+ public long getReadRequestCount() {
+ return 105;
+ }
+
+ @Override
+ public long getWriteRequestCount() {
+ return 106;
+ }
}
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestBlocksScanned.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestBlocksScanned.java
index 562935988fd..4169b802c80 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestBlocksScanned.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestBlocksScanned.java
@@ -28,9 +28,6 @@ import org.apache.hadoop.hbase.KeyValue;
import org.apache.hadoop.hbase.SmallTests;
import org.apache.hadoop.hbase.client.Scan;
import org.apache.hadoop.hbase.io.compress.Compression;
-import org.apache.hadoop.hbase.io.hfile.BlockType.BlockCategory;
-import org.apache.hadoop.hbase.regionserver.metrics.SchemaMetrics;
-import org.apache.hadoop.hbase.regionserver.metrics.SchemaMetrics.BlockMetricType;
import org.apache.hadoop.hbase.util.Bytes;
import org.junit.Assert;
import org.junit.Test;
@@ -52,7 +49,7 @@ public class TestBlocksScanned extends HBaseTestCase {
@Override
public void setUp() throws Exception {
super.setUp();
- SchemaMetrics.setUseTableNameInTest(true);
+
TEST_UTIL = new HBaseTestingUtility();
TESTTABLEDESC = new HTableDescriptor(TABLE);
@@ -72,11 +69,6 @@ public class TestBlocksScanned extends HBaseTestCase {
addContent(r, FAMILY, COL);
r.flushcache();
- // Get the per-cf metrics
- SchemaMetrics schemaMetrics =
- SchemaMetrics.getInstance(Bytes.toString(TABLE), Bytes.toString(FAMILY));
- Map schemaMetricSnapshot = SchemaMetrics.getMetricsSnapshot();
-
// Do simple test of getting one row only first.
Scan scan = new Scan(Bytes.toBytes("aaa"), Bytes.toBytes("aaz"));
scan.addColumn(FAMILY, COL);
@@ -92,26 +84,6 @@ public class TestBlocksScanned extends HBaseTestCase {
int kvPerBlock = (int) Math.ceil(BLOCK_SIZE / (double) results.get(0).getLength());
Assert.assertEquals(2, kvPerBlock);
-
- long expectDataBlockRead = (long) Math.ceil(expectResultSize / (double) kvPerBlock);
- long expectIndexBlockRead = expectDataBlockRead;
-
- verifyDataAndIndexBlockRead(schemaMetricSnapshot, schemaMetrics,
- expectDataBlockRead, expectIndexBlockRead);
}
- private void verifyDataAndIndexBlockRead(Map previousMetricSnapshot,
- SchemaMetrics schemaMetrics, long expectDataBlockRead, long expectedIndexBlockRead){
- Map currentMetricsSnapshot = SchemaMetrics.getMetricsSnapshot();
- Map diffs =
- SchemaMetrics.diffMetrics(previousMetricSnapshot, currentMetricsSnapshot);
-
- long dataBlockRead = SchemaMetrics.getLong(diffs,
- schemaMetrics.getBlockMetricName(BlockCategory.DATA, false, BlockMetricType.READ_COUNT));
- long indexBlockRead = SchemaMetrics.getLong(diffs,
- schemaMetrics.getBlockMetricName(BlockCategory.INDEX, false, BlockMetricType.READ_COUNT));
-
- Assert.assertEquals(expectDataBlockRead, dataBlockRead);
- Assert.assertEquals(expectedIndexBlockRead, indexBlockRead);
- }
}
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestCacheOnWriteInSchema.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestCacheOnWriteInSchema.java
index 1fb16cdd564..17cd2d8ed68 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestCacheOnWriteInSchema.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestCacheOnWriteInSchema.java
@@ -194,7 +194,6 @@ public class TestCacheOnWriteInSchema {
BlockCache cache = cacheConf.getBlockCache();
StoreFile sf = new StoreFile(fs, path, conf, cacheConf,
BloomType.ROWCOL, null);
- store.passSchemaMetricsTo(sf);
HFileReaderV2 reader = (HFileReaderV2) sf.createReader().getHFileReader();
try {
// Open a scanner with (on read) caching disabled
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestHRegion.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestHRegion.java
index 022c777df83..d5a3149cde0 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestHRegion.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestHRegion.java
@@ -78,7 +78,6 @@ import org.apache.hadoop.hbase.monitoring.MonitoredTask;
import org.apache.hadoop.hbase.monitoring.TaskMonitor;
import org.apache.hadoop.hbase.regionserver.HRegion.RegionScannerImpl;
import org.apache.hadoop.hbase.regionserver.StoreFile.BloomType;
-import org.apache.hadoop.hbase.regionserver.metrics.SchemaMetrics;
import org.apache.hadoop.hbase.regionserver.wal.HLog;
import org.apache.hadoop.hbase.regionserver.wal.HLogFactory;
import org.apache.hadoop.hbase.regionserver.wal.HLogUtil;
@@ -132,14 +131,11 @@ public class TestHRegion extends HBaseTestCase {
protected final byte [] row2 = Bytes.toBytes("rowB");
- private Map startingMetrics;
-
/**
* @see org.apache.hadoop.hbase.HBaseTestCase#setUp()
*/
@Override
protected void setUp() throws Exception {
- startingMetrics = SchemaMetrics.getMetricsSnapshot();
super.setUp();
}
@@ -147,7 +143,6 @@ public class TestHRegion extends HBaseTestCase {
protected void tearDown() throws Exception {
super.tearDown();
EnvironmentEdgeManagerTestHelper.reset();
- SchemaMetrics.validateMetricChanges(startingMetrics);
}
//////////////////////////////////////////////////////////////////////////////
@@ -3331,9 +3326,6 @@ public class TestHRegion extends HBaseTestCase {
info = new HRegionInfo(htd.getName(), HConstants.EMPTY_BYTE_ARRAY,
HConstants.EMPTY_BYTE_ARRAY, false);
Path path = new Path(DIR + "testStatusSettingToAbortIfAnyExceptionDuringRegionInitilization");
- // no where we are instantiating HStore in this test case so useTableNameGlobally is null. To
- // avoid NullPointerException we are setting useTableNameGlobally to false.
- SchemaMetrics.setUseTableNameInTest(false);
region = HRegion.newHRegion(path, null, fs, conf, info, htd, null);
// region initialization throws IOException and set task state to ABORTED.
region.initialize();
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestMXBean.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestMXBean.java
deleted file mode 100644
index 9d5a531f0d6..00000000000
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestMXBean.java
+++ /dev/null
@@ -1,62 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.hadoop.hbase.regionserver;
-
-import junit.framework.Assert;
-
-import org.apache.hadoop.hbase.HBaseTestingUtility;
-import org.apache.hadoop.hbase.master.HMaster;
-import org.apache.hadoop.hbase.MediumTests;
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
-
-@Category(MediumTests.class)
-public class TestMXBean {
-
- private static final HBaseTestingUtility TEST_UTIL =
- new HBaseTestingUtility();
-
- @BeforeClass
- public static void setup() throws Exception {
- TEST_UTIL.startMiniCluster(1, 1);
- }
-
- @AfterClass
- public static void teardown() throws Exception {
- TEST_UTIL.shutdownMiniCluster();
- }
-
- @Test
- public void testInfo() {
- HRegionServer rs = TEST_UTIL.getMiniHBaseCluster().getRegionServer(0);
- HMaster master = TEST_UTIL.getHBaseCluster().getMaster();
- MXBeanImpl info = MXBeanImpl.init(rs);
-
- Assert.assertEquals(rs.getServerName().getServerName(),
- info.getServerName());
- Assert.assertEquals(rs.getCoprocessors().length,
- info.getCoprocessors().length);
- rs.getConfiguration().setInt("hbase.master.info.port",
- master.getServerName().getPort());
- Assert.assertEquals(rs.getZooKeeperWatcher().getQuorum(),
- info.getZookeeperQuorum());
- }
-
-}
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestMemStore.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestMemStore.java
index f1ab78870ef..96f90cf6aa7 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestMemStore.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestMemStore.java
@@ -35,7 +35,6 @@ import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.hbase.*;
import org.apache.hadoop.hbase.client.Scan;
import org.apache.hadoop.hbase.regionserver.HStore.ScanInfo;
-import org.apache.hadoop.hbase.regionserver.metrics.SchemaMetrics;
import org.apache.hadoop.hbase.util.Bytes;
import com.google.common.base.Joiner;
@@ -61,7 +60,6 @@ public class TestMemStore extends TestCase {
super.setUp();
this.mvcc = new MultiVersionConsistencyControl();
this.memstore = new MemStore();
- SchemaMetrics.setUseTableNameInTest(false);
}
public void testPutSameKey() {
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestMetricsRegion.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestMetricsRegion.java
new file mode 100644
index 00000000000..4869a8434d0
--- /dev/null
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestMetricsRegion.java
@@ -0,0 +1,25 @@
+package org.apache.hadoop.hbase.regionserver;
+
+import org.apache.hadoop.hbase.CompatibilityFactory;
+import org.apache.hadoop.hbase.SmallTests;
+import org.apache.hadoop.hbase.test.MetricsAssertHelper;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
+@Category(SmallTests.class)
+public class TestMetricsRegion {
+
+
+ public MetricsAssertHelper HELPER = CompatibilityFactory.getInstance(MetricsAssertHelper.class);
+
+ @Test
+ public void testRegionWrapperMetrics() {
+ MetricsRegion mr = new MetricsRegion(new MetricsRegionWrapperStub());
+ MetricsRegionAggregateSource agg = mr.getSource().getAggregateSource();
+
+ HELPER.assertGauge("table.MetricsRegionWrapperStub.region.DEADBEEF001.storeCount", 101, agg);
+ HELPER.assertGauge("table.MetricsRegionWrapperStub.region.DEADBEEF001.storeFileCount", 102, agg);
+ HELPER.assertGauge("table.MetricsRegionWrapperStub.region.DEADBEEF001.memstoreSize", 103, agg);
+ mr.close();
+ }
+}
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestMetricsRegionServer.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestMetricsRegionServer.java
new file mode 100644
index 00000000000..9562fa58f5c
--- /dev/null
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestMetricsRegionServer.java
@@ -0,0 +1,83 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.hadoop.hbase.regionserver;
+
+import org.apache.hadoop.hbase.CompatibilityFactory;
+import org.apache.hadoop.hbase.SmallTests;
+import org.apache.hadoop.hbase.regionserver.MetricsRegionServer;
+import org.apache.hadoop.hbase.regionserver.MetricsRegionServerWrapperStub;
+import org.apache.hadoop.hbase.regionserver.MetricsRegionServerSource;
+import org.apache.hadoop.hbase.test.MetricsAssertHelper;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
+import static org.junit.Assert.assertNotNull;
+
+/**
+ * Unit test version of rs metrics tests.
+ */
+@Category(SmallTests.class)
+public class TestMetricsRegionServer {
+
+ public MetricsAssertHelper HELPER = CompatibilityFactory.getInstance(MetricsAssertHelper.class);
+
+ @Test
+ public void testWrapperSource() {
+
+ MetricsRegionServer rsm = new MetricsRegionServer(new MetricsRegionServerWrapperStub());
+ MetricsRegionServerSource serverSource = rsm.getMetricsSource();
+ HELPER.assertTag("serverName", "test", serverSource);
+ HELPER.assertTag("clusterId", "tClusterId", serverSource);
+ HELPER.assertTag("zookeeperQuorum", "zk", serverSource);
+ HELPER.assertGauge("regionServerStartTime", 100, serverSource);
+ HELPER.assertGauge("regionCount", 101, serverSource);
+ HELPER.assertGauge("storeCount", 2, serverSource);
+ HELPER.assertGauge("storeFileCount", 300, serverSource);
+ HELPER.assertGauge("memstoreSize", 1025, serverSource);
+ HELPER.assertGauge("storeFileSize", 1900, serverSource);
+ HELPER.assertCounter("totalRequestCount", 899, serverSource);
+ HELPER.assertCounter("readRequestCount", 997, serverSource);
+ HELPER.assertCounter("writeRequestCount", 707, serverSource);
+ HELPER.assertCounter("checkMutateFailedCount", 401, serverSource);
+ HELPER.assertCounter("checkMutatePassedCount", 405, serverSource);
+ HELPER.assertGauge("storeFileIndexSize", 406, serverSource);
+ HELPER.assertGauge("staticIndexSize", 407, serverSource);
+ HELPER.assertGauge("staticBloomSize", 408, serverSource);
+ HELPER.assertGauge("putsWithoutWALCount", 409, serverSource);
+ HELPER.assertGauge("putsWithoutWALSize", 410, serverSource);
+ HELPER.assertGauge("percentFilesLocal", 99, serverSource);
+ HELPER.assertGauge("compactionQueueLength", 411, serverSource);
+ HELPER.assertGauge("flushQueueLength", 412, serverSource);
+ HELPER.assertGauge("blockCacheFreeSize", 413, serverSource);
+ HELPER.assertGauge("blockCacheCount", 414, serverSource);
+ HELPER.assertGauge("blockCacheSize", 415, serverSource);
+ HELPER.assertCounter("blockCacheHitCount", 416, serverSource);
+ HELPER.assertCounter("blockCacheMissCount", 417, serverSource);
+ HELPER.assertCounter("blockCacheEvictionCount", 418, serverSource);
+ HELPER.assertGauge("blockCountHitPercent", 98, serverSource);
+ HELPER.assertGauge("blockCacheExpressHitPercent", 97, serverSource);
+ HELPER.assertCounter("updatesBlockedTime", 419, serverSource);
+ }
+
+ @Test
+ public void testConstuctor() {
+ MetricsRegionServer rsm = new MetricsRegionServer(new MetricsRegionServerWrapperStub());
+ assertNotNull("There should be a hadoop1/hadoop2 metrics source", rsm.getMetricsSource() );
+ assertNotNull("The RegionServerMetricsWrapper should be accessable", rsm.getRegionServerWrapper());
+ }
+}
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestMultiColumnScanner.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestMultiColumnScanner.java
index b81c42f1fc6..12b86f26073 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestMultiColumnScanner.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestMultiColumnScanner.java
@@ -47,8 +47,6 @@ import org.apache.hadoop.hbase.client.Put;
import org.apache.hadoop.hbase.client.Scan;
import org.apache.hadoop.hbase.io.compress.Compression;
import org.apache.hadoop.hbase.io.encoding.DataBlockEncoding;
-import org.apache.hadoop.hbase.io.hfile.HFile;
-import org.apache.hadoop.hbase.regionserver.metrics.SchemaMetrics;
import org.apache.hadoop.hbase.util.Bytes;
import org.junit.Before;
import org.junit.Test;
@@ -121,12 +119,6 @@ public class TestMultiColumnScanner {
assertTrue(TIMESTAMPS[i] < TIMESTAMPS[i + 1]);
}
- @Before
- public void setUp() {
- SchemaMetrics.configureGlobally(TEST_UTIL.getConfiguration());
- }
-
-
@Parameters
public static final Collection parameters() {
List parameters = new ArrayList();
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestRSStatusServlet.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestRSStatusServlet.java
index a0ee77f938a..49a7da5c2ce 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestRSStatusServlet.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestRSStatusServlet.java
@@ -31,7 +31,6 @@ import org.apache.hadoop.hbase.protobuf.ResponseConverter;
import org.apache.hadoop.hbase.protobuf.generated.AdminProtos.GetOnlineRegionRequest;
import org.apache.hadoop.hbase.protobuf.generated.AdminProtos.GetServerInfoRequest;
import org.apache.hadoop.hbase.protobuf.generated.AdminProtos.GetServerInfoResponse;
-import org.apache.hadoop.hbase.regionserver.metrics.RegionServerMetrics;
import org.apache.hadoop.hbase.tmpl.regionserver.RSStatusTmpl;
import org.apache.hadoop.hbase.util.Bytes;
import org.apache.hadoop.hbase.zookeeper.MasterAddressTracker;
@@ -59,8 +58,7 @@ public class TestRSStatusServlet {
new ServerName("localhost", FAKE_IPC_PORT, 11111);
private final GetServerInfoResponse fakeResponse =
ResponseConverter.buildGetServerInfoResponse(fakeServerName, FAKE_WEB_PORT);
- private final RegionServerMetrics metrics =
- new RegionServerMetrics();
+
private final ServerName fakeMasterAddress =
new ServerName("localhost", 60010, 1212121212);
@@ -71,8 +69,6 @@ public class TestRSStatusServlet {
.when(rs).getConfiguration();
Mockito.doReturn(fakeResponse).when(rs).getServerInfo(
(RpcController)Mockito.any(), (GetServerInfoRequest)Mockito.any());
- Mockito.doReturn(metrics).when(rs).getMetrics();
-
// Fake ZKW
ZooKeeperWatcher zkw = Mockito.mock(ZooKeeperWatcher.class);
Mockito.doReturn("fakequorum").when(zkw).getQuorum();
@@ -82,6 +78,10 @@ public class TestRSStatusServlet {
MasterAddressTracker mat = Mockito.mock(MasterAddressTracker.class);
Mockito.doReturn(fakeMasterAddress).when(mat).getMasterAddress();
Mockito.doReturn(mat).when(rs).getMasterAddressManager();
+
+ MetricsRegionServer rms = Mockito.mock(MetricsRegionServer.class);
+ Mockito.doReturn(new MetricsRegionServerWrapperStub()).when(rms).getRegionServerWrapper();
+ Mockito.doReturn(rms).when(rs).getMetrics();
}
@Test
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestRegionServerMetrics.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestRegionServerMetrics.java
index 822f5b276f2..e5d33bdcade 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestRegionServerMetrics.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestRegionServerMetrics.java
@@ -1,393 +1,301 @@
-/*
- * Copyright The Apache Software Foundation
- *
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with this
- * work for additional information regarding copyright ownership. The ASF
- * licenses this file to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations
- * under the License.
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
*/
package org.apache.hadoop.hbase.regionserver;
-import static org.junit.Assert.assertEquals;
-
-import java.io.IOException;
-import java.util.Arrays;
-import java.util.Map;
-import java.util.Set;
-
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.hadoop.hbase.HBaseTestingUtility;
-import org.apache.hadoop.hbase.HRegionInfo;
-import org.apache.hadoop.hbase.KeyValue;
-import org.apache.hadoop.hbase.MediumTests;
-import org.apache.hadoop.hbase.client.Append;
-import org.apache.hadoop.hbase.client.Delete;
-import org.apache.hadoop.hbase.client.Get;
-import org.apache.hadoop.hbase.client.HBaseAdmin;
-import org.apache.hadoop.hbase.client.HTable;
-import org.apache.hadoop.hbase.client.Put;
-import org.apache.hadoop.hbase.client.Result;
-import org.apache.hadoop.hbase.protobuf.ProtobufUtil;
-import org.apache.hadoop.hbase.regionserver.metrics.RegionMetricsStorage;
-import org.apache.hadoop.hbase.regionserver.metrics.RegionServerMetrics;
-import org.apache.hadoop.hbase.regionserver.metrics.SchemaMetrics;
-import org.apache.hadoop.hbase.regionserver.metrics.SchemaMetrics.
- StoreMetricType;
+import org.apache.hadoop.conf.Configuration;
+import org.apache.hadoop.hbase.*;
+import org.apache.hadoop.hbase.client.*;
+import org.apache.hadoop.hbase.test.MetricsAssertHelper;
import org.apache.hadoop.hbase.util.Bytes;
-import org.apache.hadoop.hbase.util.Pair;
-import org.junit.After;
-import org.junit.Before;
+import org.apache.hadoop.hbase.util.Threads;
+import org.apache.log4j.Level;
+import org.apache.log4j.Logger;
+import org.junit.AfterClass;
+import org.junit.BeforeClass;
import org.junit.Test;
import org.junit.experimental.categories.Category;
+import java.io.IOException;
-/**
- * Test metrics incremented on region server operations.
- */
@Category(MediumTests.class)
public class TestRegionServerMetrics {
+ private static final Log LOG = LogFactory.getLog(TestRegionServerMetrics.class);
+ private static MetricsAssertHelper metricsHelper;
- private static final Log LOG =
- LogFactory.getLog(TestRegionServerMetrics.class.getName());
-
- private final static String TABLE_NAME =
- TestRegionServerMetrics.class.getSimpleName() + "Table";
- private String[] FAMILIES = new String[] { "cf1", "cf2", "anotherCF" };
- private static final int MAX_VERSIONS = 1;
- private static final int NUM_COLS_PER_ROW = 15;
- private static final int NUM_FLUSHES = 3;
- private static final int NUM_REGIONS = 4;
-
- private static final SchemaMetrics ALL_METRICS =
- SchemaMetrics.ALL_SCHEMA_METRICS;
-
- private final HBaseTestingUtility TEST_UTIL =
- new HBaseTestingUtility();
-
- private Map startingMetrics;
-
- private final int META_AND_ROOT = 2;
-
- @Before
- public void setUp() throws Exception {
- SchemaMetrics.setUseTableNameInTest(true);
- startingMetrics = SchemaMetrics.getMetricsSnapshot();
- TEST_UTIL.startMiniCluster();
+ static {
+ Logger.getLogger("org.apache.hadoop.hbase").setLevel(Level.DEBUG);
}
- @After
- public void tearDown() throws Exception {
- TEST_UTIL.shutdownMiniCluster();
- SchemaMetrics.validateMetricChanges(startingMetrics);
- }
+ private static MiniHBaseCluster cluster;
+ private static HRegionServer rs;
+ private static Configuration conf;
+ private static HBaseTestingUtility TEST_UTIL;
+ private static MetricsRegionServer metricsRegionServer;
+ private static MetricsRegionServerSource serverSource;
- private void assertTimeVaryingMetricCount(int expectedCount, String table, String cf,
- String regionName, String metricPrefix) {
+ @BeforeClass
+ public static void startCluster() throws Exception {
+ metricsHelper = CompatibilityFactory.getInstance(MetricsAssertHelper.class);
+ TEST_UTIL = new HBaseTestingUtility();
+ conf = TEST_UTIL.getConfiguration();
+ conf.getLong("hbase.splitlog.max.resubmit", 0);
+ // Make the failure test faster
+ conf.setInt("zookeeper.recovery.retry", 0);
+ conf.setInt(HConstants.REGIONSERVER_INFO_PORT, -1);
- Integer expectedCountInteger = new Integer(expectedCount);
+ TEST_UTIL.startMiniCluster(1, 1);
+ cluster = TEST_UTIL.getHBaseCluster();
- if (cf != null) {
- String cfKey =
- SchemaMetrics.TABLE_PREFIX + table + "." +
- SchemaMetrics.CF_PREFIX + cf + "." + metricPrefix;
- Pair cfPair = RegionMetricsStorage.getTimeVaryingMetric(cfKey);
- assertEquals(expectedCountInteger, cfPair.getSecond());
+ cluster.waitForActiveAndReadyMaster();
+
+ while (cluster.getLiveRegionServerThreads().size() < 1) {
+ Threads.sleep(100);
}
- if (regionName != null) {
- String rKey =
- SchemaMetrics.TABLE_PREFIX + table + "." +
- SchemaMetrics.REGION_PREFIX + regionName + "." + metricPrefix;
+ rs = cluster.getRegionServer(0);
+ metricsRegionServer = rs.getMetrics();
+ serverSource = metricsRegionServer.getMetricsSource();
+ }
- Pair regionPair = RegionMetricsStorage.getTimeVaryingMetric(rKey);
- assertEquals(expectedCountInteger, regionPair.getSecond());
+ @AfterClass
+ public static void after() throws Exception {
+ if (TEST_UTIL != null) {
+ TEST_UTIL.shutdownMiniCluster();
}
}
-
- private void assertStoreMetricEquals(long expected,
- SchemaMetrics schemaMetrics, StoreMetricType storeMetricType) {
- final String storeMetricName =
- schemaMetrics.getStoreMetricName(storeMetricType);
- Long startValue = startingMetrics.get(storeMetricName);
- assertEquals("Invalid value for store metric " + storeMetricName
- + " (type " + storeMetricType + ")", expected,
- RegionMetricsStorage.getNumericMetric(storeMetricName)
- - (startValue != null ? startValue : 0));
+
+ @Test(timeout = 300000)
+ public void testRegionCount() throws Exception {
+ String regionMetricsKey = "regionCount";
+ long regions = metricsHelper.getGaugeLong(regionMetricsKey, serverSource);
+ // Creating a table should add one region
+ TEST_UTIL.createTable(Bytes.toBytes("table"), Bytes.toBytes("cf"));
+ metricsHelper.assertGaugeGt(regionMetricsKey, regions, serverSource);
}
@Test
- public void testOperationMetrics() throws IOException {
- String cf = "OPCF";
- String otherCf = "otherCF";
- String rk = "testRK";
- String icvCol = "icvCol";
- String appendCol = "appendCol";
- String regionName = null;
- HTable hTable =
- TEST_UTIL.createTable(TABLE_NAME.getBytes(),
- new byte[][] { cf.getBytes(), otherCf.getBytes() });
- Set regionInfos = hTable.getRegionLocations().keySet();
-
- regionName = regionInfos.toArray(new HRegionInfo[regionInfos.size()])[0].getEncodedName();
-
- //Do a multi put that has one cf. Since they are in different rk's
- //The lock will still be obtained and everything will be applied in one multiput.
- Put pOne = new Put(rk.getBytes());
- pOne.add(cf.getBytes(), icvCol.getBytes(), Bytes.toBytes(0L));
- Put pTwo = new Put("ignored1RK".getBytes());
- pTwo.add(cf.getBytes(), "ignored".getBytes(), Bytes.toBytes(0L));
-
- hTable.put(Arrays.asList(new Put[] {pOne, pTwo}));
-
- // Do a multiput where the cf doesn't stay consistent.
- Put pThree = new Put("ignored2RK".getBytes());
- pThree.add(cf.getBytes(), "ignored".getBytes(), Bytes.toBytes("TEST1"));
- Put pFour = new Put("ignored3RK".getBytes());
- pFour.add(otherCf.getBytes(), "ignored".getBytes(), Bytes.toBytes(0L));
-
- hTable.put(Arrays.asList(new Put[] { pThree, pFour }));
-
- hTable.incrementColumnValue(rk.getBytes(), cf.getBytes(), icvCol.getBytes(), 1L);
-
- Get g = new Get(rk.getBytes());
- g.addColumn(cf.getBytes(), appendCol.getBytes());
- hTable.get(g);
-
- Append a = new Append(rk.getBytes());
- a.add(cf.getBytes(), appendCol.getBytes(), Bytes.toBytes("-APPEND"));
- hTable.append(a);
-
- Delete dOne = new Delete(rk.getBytes());
- dOne.deleteFamily(cf.getBytes());
- hTable.delete(dOne);
-
- Delete dTwo = new Delete(rk.getBytes());
- hTable.delete(dTwo);
-
- // There should be one multi put where the cf is consistent
- assertTimeVaryingMetricCount(1, TABLE_NAME, cf, null, "multiput_");
-
- // There were two multiputs to the cf.
- assertTimeVaryingMetricCount(2, TABLE_NAME, null, regionName, "multiput_");
-
- // There was one multiput where the cf was not consistent.
- assertTimeVaryingMetricCount(1, TABLE_NAME, "__unknown", null, "multiput_");
-
- // One increment and one append
- assertTimeVaryingMetricCount(1, TABLE_NAME, cf, regionName, "increment_");
- assertTimeVaryingMetricCount(1, TABLE_NAME, cf, regionName, "append_");
-
- // One delete where the cf is known
- assertTimeVaryingMetricCount(1, TABLE_NAME, cf, null, "multidelete_");
-
- // two deletes in the region.
- assertTimeVaryingMetricCount(2, TABLE_NAME, null, regionName, "multidelete_");
-
- // Three gets. one for gets. One for append. One for increment.
- assertTimeVaryingMetricCount(3, TABLE_NAME, cf, regionName, "get_");
-
- }
-
- private void assertCheckAndMutateMetrics(final HRegionServer rs,
- long expectedPassed, long expectedFailed) {
- rs.doMetrics();
- RegionServerMetrics metrics = rs.getMetrics();
- assertEquals("checkAndMutatePassed metrics incorrect",
- expectedPassed, metrics.checkAndMutateChecksPassed.get());
- assertEquals("checkAndMutateFailed metrics incorrect",
- expectedFailed, metrics.checkAndMutateChecksFailed.get());
+ public void testLocalFiles() throws Exception {
+ metricsHelper.assertGauge("percentFilesLocal", 0, serverSource);
}
@Test
- public void testCheckAndMutateMetrics() throws Exception {
- final HRegionServer rs =
- TEST_UTIL.getMiniHBaseCluster().getRegionServer(0);
- byte [] tableName = Bytes.toBytes("testCheckAndMutateMetrics");
- byte [] family = Bytes.toBytes("family");
- byte [] qualifier = Bytes.toBytes("qualifier");
- byte [] row = Bytes.toBytes("row1");
- HTable table = TEST_UTIL.createTable(tableName, family);
- long expectedPassed = 0;
- long expectedFailed = 0;
+ public void testRequestCount() throws Exception {
+ String tableNameString = "testRequestCount";
+ byte[] tName = Bytes.toBytes(tableNameString);
+ byte[] cfName = Bytes.toBytes("d");
+ byte[] row = Bytes.toBytes("rk");
+ byte[] qualifier = Bytes.toBytes("qual");
+ byte[] initValue = Bytes.toBytes("Value");
+ byte[] nextValue = Bytes.toBytes("NEXT VAL");
- // checkAndPut success
- Put put = new Put(row);
- byte [] val1 = Bytes.toBytes("val1");
- put.add(family, qualifier, val1);
- table.checkAndPut(row, family, qualifier, null, put);
- expectedPassed++;
- assertCheckAndMutateMetrics(rs, expectedPassed, expectedFailed);
- // checkAndPut failure
- byte [] val2 = Bytes.toBytes("val2");
- table.checkAndPut(row, family, qualifier, val2, put);
- expectedFailed++;
- assertCheckAndMutateMetrics(rs, expectedPassed, expectedFailed);
+ TEST_UTIL.createTable(tName, cfName);
- // checkAndDelete success
- Delete delete = new Delete(row);
- delete.deleteColumn(family, qualifier);
- table.checkAndDelete(row, family, qualifier, val1, delete);
- expectedPassed++;
- assertCheckAndMutateMetrics(rs, expectedPassed, expectedFailed);
+ new HTable(conf, tName).close(); //wait for the table to come up.
+ metricsRegionServer.getRegionServerWrapper().forceRecompute();
+ long requests = metricsHelper.getCounter("totalRequestCount", serverSource);
+ long readRequests = metricsHelper.getCounter("readRequestCount", serverSource);
+ long writeRequests = metricsHelper.getCounter("writeRequestCount", serverSource);
- // checkAndDelete failure
- table.checkAndDelete(row, family, qualifier, val1, delete);
- expectedFailed++;
- assertCheckAndMutateMetrics(rs, expectedPassed, expectedFailed);
+ HTable table = new HTable(conf, tName);
+
+ Put p = new Put(row);
+
+
+ p.add(cfName, qualifier, initValue);
+
+ for (int i=0; i< 30; i++) {
+ table.put(p);
+ }
+
+
+ table.flushCommits();
+
+ Get g = new Get(row);
+ for (int i=0; i< 10; i++) {
+ table.get(g);
+ }
+
+
+ for ( HRegionInfo i:table.getRegionLocations().keySet()) {
+ MetricsRegionAggregateSource agg = rs.getRegion(i.getRegionName())
+ .getMetrics()
+ .getSource()
+ .getAggregateSource();
+ String prefix = "table."+tableNameString + ".region." + i.getEncodedName();
+ metricsHelper.assertCounter(prefix + ".getCount", 10, agg);
+ metricsHelper.assertCounter(prefix + ".multiPutCount", 30, agg);
+ }
+
+
+ metricsRegionServer.getRegionServerWrapper().forceRecompute();
+ metricsHelper.assertCounterGt("totalRequestCount", requests + 39, serverSource);
+ metricsHelper.assertCounterGt("readRequestCount", readRequests + 9, serverSource);
+ metricsHelper.assertCounterGt("writeRequestCount", writeRequests + 29, serverSource);
}
@Test
- public void testRemoveRegionMetrics() throws IOException, InterruptedException {
- String cf = "REMOVECF";
- HTable hTable = TEST_UTIL.createTable(TABLE_NAME.getBytes(), cf.getBytes());
- HRegionInfo[] regionInfos =
- hTable.getRegionLocations().keySet()
- .toArray(new HRegionInfo[hTable.getRegionLocations().keySet().size()]);
+ public void testPutsWithoutWal() throws Exception {
+ byte[] tableName = Bytes.toBytes("testPutsWithoutWal");
+ byte[] cf = Bytes.toBytes("d");
+ byte[] row = Bytes.toBytes("rk");
+ byte[] qualifier = Bytes.toBytes("qual");
+ byte[] val = Bytes.toBytes("Value");
- String regionName = regionInfos[0].getEncodedName();
+ metricsRegionServer.getRegionServerWrapper().forceRecompute();
- // Do some operations so there are metrics.
- Put pOne = new Put("TEST".getBytes());
- pOne.add(cf.getBytes(), "test".getBytes(), "test".getBytes());
- hTable.put(pOne);
+ TEST_UTIL.createTable(tableName, cf);
- Get g = new Get("TEST".getBytes());
- g.addFamily(cf.getBytes());
- hTable.get(g);
- assertTimeVaryingMetricCount(1, TABLE_NAME, cf, regionName, "get_");
- HBaseAdmin admin = TEST_UTIL.getHBaseAdmin();
- admin.disableTable(TABLE_NAME.getBytes());
- admin.deleteTable(TABLE_NAME.getBytes());
+ HTable t = new HTable(conf, tableName);
- assertTimeVaryingMetricCount(0, TABLE_NAME, cf, regionName, "get_");
- }
-
- @Test
- public void testMultipleRegions() throws IOException, InterruptedException {
+ Put p = new Put(row);
+ p.add(cf, qualifier, val);
+ p.setWriteToWAL(false);
- TEST_UTIL.createRandomTable(
- TABLE_NAME,
- Arrays.asList(FAMILIES),
- MAX_VERSIONS, NUM_COLS_PER_ROW, NUM_FLUSHES, NUM_REGIONS, 1000);
+ t.put(p);
+ t.flushCommits();
- final HRegionServer rs =
- TEST_UTIL.getMiniHBaseCluster().getRegionServer(0);
-
- assertEquals(NUM_REGIONS + META_AND_ROOT, ProtobufUtil.getOnlineRegions(rs).size());
-
- rs.doMetrics();
- for (HRegion r : TEST_UTIL.getMiniHBaseCluster().getRegions(
- Bytes.toBytes(TABLE_NAME))) {
- for (Map.Entry storeEntry : r.getStores().entrySet()) {
- LOG.info("For region " + r.getRegionNameAsString() + ", CF " +
- Bytes.toStringBinary(storeEntry.getKey()) + " found store files " +
- ": " + storeEntry.getValue().getStorefiles());
- }
- }
-
- assertStoreMetricEquals(NUM_FLUSHES * NUM_REGIONS * FAMILIES.length
- + META_AND_ROOT, ALL_METRICS, StoreMetricType.STORE_FILE_COUNT);
-
- for (String cf : FAMILIES) {
- SchemaMetrics schemaMetrics = SchemaMetrics.getInstance(TABLE_NAME, cf);
- assertStoreMetricEquals(NUM_FLUSHES * NUM_REGIONS, schemaMetrics,
- StoreMetricType.STORE_FILE_COUNT);
- }
-
- // ensure that the max value is also maintained
- final String storeMetricName = ALL_METRICS
- .getStoreMetricNameMax(StoreMetricType.STORE_FILE_COUNT);
- assertEquals("Invalid value for store metric " + storeMetricName,
- NUM_FLUSHES, RegionMetricsStorage.getNumericMetric(storeMetricName));
- }
-
-
-
- private void assertSizeMetric(String table, String[] cfs, int[] metrics) {
- // we have getsize & nextsize for each column family
- assertEquals(cfs.length * 2, metrics.length);
-
- for (int i =0; i < cfs.length; ++i) {
- String prefix = SchemaMetrics.generateSchemaMetricsPrefix(table, cfs[i]);
- String getMetric = prefix + SchemaMetrics.METRIC_GETSIZE;
- String nextMetric = prefix + SchemaMetrics.METRIC_NEXTSIZE;
-
- // verify getsize and nextsize matches
- int getSize = RegionMetricsStorage.getNumericMetrics().containsKey(getMetric) ?
- RegionMetricsStorage.getNumericMetrics().get(getMetric).intValue() : 0;
- int nextSize = RegionMetricsStorage.getNumericMetrics().containsKey(nextMetric) ?
- RegionMetricsStorage.getNumericMetrics().get(nextMetric).intValue() : 0;
-
- assertEquals(metrics[i], getSize);
- assertEquals(metrics[cfs.length + i], nextSize);
- }
+ metricsRegionServer.getRegionServerWrapper().forceRecompute();
+ metricsHelper.assertGauge("putsWithoutWALCount", 1, serverSource);
+ long minLength = row.length + cf.length + qualifier.length + val.length;
+ metricsHelper.assertGaugeGt("putsWithoutWALSize", minLength, serverSource);
}
@Test
- public void testGetNextSize() throws IOException, InterruptedException {
- String rowName = "row1";
- byte[] ROW = Bytes.toBytes(rowName);
- String tableName = "SizeMetricTest";
- byte[] TABLE = Bytes.toBytes(tableName);
- String cf1Name = "cf1";
- String cf2Name = "cf2";
- String[] cfs = new String[] {cf1Name, cf2Name};
- byte[] CF1 = Bytes.toBytes(cf1Name);
- byte[] CF2 = Bytes.toBytes(cf2Name);
+ public void testStoreCount() throws Exception {
+ byte[] tableName = Bytes.toBytes("testStoreCount");
+ byte[] cf = Bytes.toBytes("d");
+ byte[] row = Bytes.toBytes("rk");
+ byte[] qualifier = Bytes.toBytes("qual");
+ byte[] val = Bytes.toBytes("Value");
- long ts = 1234;
- HTable hTable = TEST_UTIL.createTable(TABLE, new byte[][]{CF1, CF2});
- HBaseAdmin admin = new HBaseAdmin(TEST_UTIL.getConfiguration());
+ metricsRegionServer.getRegionServerWrapper().forceRecompute();
+ long stores = metricsHelper.getGaugeLong("storeCount", serverSource);
+ long storeFiles = metricsHelper.getGaugeLong("storeFileCount", serverSource);
- Put p = new Put(ROW);
- p.add(CF1, CF1, ts, CF1);
- p.add(CF2, CF2, ts, CF2);
- hTable.put(p);
+ TEST_UTIL.createTable(tableName, cf);
- KeyValue kv1 = new KeyValue(ROW, CF1, CF1, ts, CF1);
- KeyValue kv2 = new KeyValue(ROW, CF2, CF2, ts, CF2);
- int kvLength = kv1.getLength();
- assertEquals(kvLength, kv2.getLength());
+ //Force a hfile.
+ HTable t = new HTable(conf, tableName);
+ Put p = new Put(row);
+ p.add(cf, qualifier, val);
+ t.put(p);
+ t.flushCommits();
+ TEST_UTIL.getHBaseAdmin().flush(tableName);
- // only cf1.getsize is set on Get
- hTable.get(new Get(ROW).addFamily(CF1));
- assertSizeMetric(tableName, cfs, new int[] {kvLength, 0, 0, 0});
+ metricsRegionServer.getRegionServerWrapper().forceRecompute();
+ metricsHelper.assertGauge("storeCount", stores +1, serverSource);
+ metricsHelper.assertGauge("storeFileCount", storeFiles + 1, serverSource);
+ }
- // only cf2.getsize is set on Get
- hTable.get(new Get(ROW).addFamily(CF2));
- assertSizeMetric(tableName, cfs, new int[] {kvLength, kvLength, 0, 0});
+ @Test
+ public void testCheckAndPutCount() throws Exception {
+ String tableNameString = "testCheckAndPutCount";
+ byte[] tableName = Bytes.toBytes(tableNameString);
+ byte[] cf = Bytes.toBytes("d");
+ byte[] row = Bytes.toBytes("rk");
+ byte[] qualifier = Bytes.toBytes("qual");
+ byte[] valOne = Bytes.toBytes("Value");
+ byte[] valTwo = Bytes.toBytes("ValueTwo");
+ byte[] valThree = Bytes.toBytes("ValueThree");
- // only cf2.nextsize is set
- for (Result res : hTable.getScanner(CF2)) {
+ TEST_UTIL.createTable(tableName, cf);
+ HTable t = new HTable(conf, tableName);
+ Put p = new Put(row);
+ p.add(cf, qualifier, valOne);
+ t.put(p);
+ t.flushCommits();
+
+ Put pTwo = new Put(row);
+ pTwo.add(cf, qualifier, valTwo);
+ t.checkAndPut(row, cf, qualifier, valOne, pTwo);
+ t.flushCommits();
+
+ Put pThree = new Put(row);
+ pThree.add(cf, qualifier, valThree);
+ t.checkAndPut(row, cf, qualifier, valOne, pThree);
+ t.flushCommits();
+
+
+ metricsRegionServer.getRegionServerWrapper().forceRecompute();
+ metricsHelper.assertCounter("checkMutateFailedCount", 1, serverSource);
+ metricsHelper.assertCounter("checkMutatePassedCount", 1, serverSource);
+ }
+
+ @Test
+ public void testIncrement() throws Exception {
+ String tableNameString = "testIncrement";
+ byte[] tableName = Bytes.toBytes(tableNameString);
+ byte[] cf = Bytes.toBytes("d");
+ byte[] row = Bytes.toBytes("rk");
+ byte[] qualifier = Bytes.toBytes("qual");
+ byte[] val = Bytes.toBytes(0l);
+
+
+ TEST_UTIL.createTable(tableName, cf);
+ HTable t = new HTable(conf, tableName);
+
+ Put p = new Put(row);
+ p.add(cf, qualifier, val);
+ t.put(p);
+ t.flushCommits();
+
+ for(int count = 0; count< 13; count++) {
+ Increment inc = new Increment(row);
+ inc.addColumn(cf, qualifier, 100);
+ t.increment(inc);
}
- assertSizeMetric(tableName, cfs,
- new int[] {kvLength, kvLength, 0, kvLength});
- // only cf2.nextsize is set
- for (Result res : hTable.getScanner(CF1)) {
- }
- assertSizeMetric(tableName, cfs,
- new int[] {kvLength, kvLength, kvLength, kvLength});
+ t.flushCommits();
- // getsize/nextsize should not be set on flush or compaction
- for (HRegion hr : TEST_UTIL.getMiniHBaseCluster().getRegions(TABLE)) {
- hr.flushcache();
- hr.compactStores();
+ metricsRegionServer.getRegionServerWrapper().forceRecompute();
+ metricsHelper.assertCounter("incrementNumOps", 13, serverSource);
+ }
+
+ @Test
+ public void testAppend() throws Exception {
+ String tableNameString = "testAppend";
+ byte[] tableName = Bytes.toBytes(tableNameString);
+ byte[] cf = Bytes.toBytes("d");
+ byte[] row = Bytes.toBytes("rk");
+ byte[] qualifier = Bytes.toBytes("qual");
+ byte[] val = Bytes.toBytes("One");
+
+
+ TEST_UTIL.createTable(tableName, cf);
+ HTable t = new HTable(conf, tableName);
+
+ Put p = new Put(row);
+ p.add(cf, qualifier, val);
+ t.put(p);
+ t.flushCommits();
+
+ for(int count = 0; count< 73; count++) {
+ Append append = new Append(row);
+ append.add(cf, qualifier, Bytes.toBytes(",Test"));
+ t.append(append);
}
- assertSizeMetric(tableName, cfs,
- new int[] {kvLength, kvLength, kvLength, kvLength});
+
+ t.flushCommits();
+
+ metricsRegionServer.getRegionServerWrapper().forceRecompute();
+ metricsHelper.assertCounter("appendNumOps", 73, serverSource);
}
}
-
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestStoreFile.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestStoreFile.java
index 3f07e3273a0..e7481d363f1 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestStoreFile.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestStoreFile.java
@@ -50,7 +50,6 @@ import org.apache.hadoop.hbase.io.hfile.HFileDataBlockEncoderImpl;
import org.apache.hadoop.hbase.io.hfile.HFileScanner;
import org.apache.hadoop.hbase.io.hfile.NoOpDataBlockEncoder;
import org.apache.hadoop.hbase.regionserver.StoreFile.BloomType;
-import org.apache.hadoop.hbase.regionserver.metrics.SchemaMetrics;
import org.apache.hadoop.hbase.util.BloomFilterFactory;
import org.apache.hadoop.hbase.util.Bytes;
import org.apache.hadoop.hbase.util.ChecksumType;
@@ -72,22 +71,17 @@ public class TestStoreFile extends HBaseTestCase {
private CacheConfig cacheConf = new CacheConfig(TEST_UTIL.getConfiguration());
private static String ROOT_DIR =
TEST_UTIL.getDataTestDir("TestStoreFile").toString();
- private Map startingMetrics;
-
private static final ChecksumType CKTYPE = ChecksumType.CRC32;
private static final int CKBYTES = 512;
@Override
public void setUp() throws Exception {
super.setUp();
- this.startingMetrics = SchemaMetrics.getMetricsSnapshot();
}
@Override
public void tearDown() throws Exception {
super.tearDown();
- LOG.info("Verifying metrics for " + getName() + ": " + this.startingMetrics);
- SchemaMetrics.validateMetricChanges(this.startingMetrics);
}
/**
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestStoreScanner.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestStoreScanner.java
index 5e1e5d3a7ae..d7910a09321 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestStoreScanner.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestStoreScanner.java
@@ -37,7 +37,6 @@ import org.apache.hadoop.hbase.KeyValueTestUtil;
import org.apache.hadoop.hbase.MediumTests;
import org.apache.hadoop.hbase.client.Scan;
import org.apache.hadoop.hbase.regionserver.HStore.ScanInfo;
-import org.apache.hadoop.hbase.regionserver.metrics.SchemaMetrics;
import org.apache.hadoop.hbase.util.Bytes;
import org.apache.hadoop.hbase.util.EnvironmentEdge;
import org.apache.hadoop.hbase.util.EnvironmentEdgeManagerTestHelper;
@@ -54,7 +53,6 @@ public class TestStoreScanner extends TestCase {
public void setUp() throws Exception {
super.setUp();
- SchemaMetrics.setUseTableNameInTest(false);
}
/*
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/metrics/TestSchemaConfigured.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/metrics/TestSchemaConfigured.java
deleted file mode 100644
index 0ef07757a30..00000000000
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/metrics/TestSchemaConfigured.java
+++ /dev/null
@@ -1,243 +0,0 @@
-/*
- * Copyright The Apache Software Foundation
- *
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with this
- * work for additional information regarding copyright ownership. The ASF
- * licenses this file to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.hadoop.hbase.regionserver.metrics;
-
-import static org.junit.Assert.*;
-
-import java.util.regex.Pattern;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.apache.hadoop.conf.Configuration;
-import org.apache.hadoop.fs.Path;
-import org.apache.hadoop.hbase.HBaseConfiguration;
-import org.apache.hadoop.hbase.SmallTests;
-import org.apache.hadoop.hbase.regionserver.HRegion;
-import org.codehaus.jettison.json.JSONException;
-import org.codehaus.jettison.json.JSONStringer;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
-
-@Category(SmallTests.class)
-public class TestSchemaConfigured {
- private static final Log LOG = LogFactory.getLog(TestSchemaConfigured.class);
- private final String TABLE_NAME = "myTable";
- private final String CF_NAME = "myColumnFamily";
-
- private static final Path TMP_HFILE_PATH = new Path(
- "/hbase/myTable/myRegion/" + HRegion.REGION_TEMP_SUBDIR + "/hfilename");
-
- /** Test if toString generates real JSON */
- @Test
- public void testToString() throws JSONException {
- SchemaConfigured sc = new SchemaConfigured(null, TABLE_NAME, CF_NAME);
- JSONStringer json = new JSONStringer();
- json.object();
- json.key("tableName");
- json.value(TABLE_NAME);
- json.key("cfName");
- json.value(CF_NAME);
- json.endObject();
- assertEquals(json.toString(), sc.schemaConfAsJSON());
- }
-
- /** Don't allow requesting metrics before setting table/CF name */
- @Test
- public void testDelayedInitialization() {
- SchemaConfigured unconfigured = new SchemaConfigured();
- try {
- unconfigured.getSchemaMetrics();
- fail(IllegalStateException.class.getSimpleName() + " expected");
- } catch (IllegalStateException ex) {
- assertTrue("Unexpected exception message: " + ex.getMessage(),
- Pattern.matches(".* metrics requested before .* initialization.*",
- ex.getMessage()));
- LOG.debug("Expected exception: " + ex.getMessage());
- }
-
- SchemaMetrics.setUseTableNameInTest(false);
- SchemaConfigured other = new SchemaConfigured(null, TABLE_NAME, CF_NAME);
- other.passSchemaMetricsTo(unconfigured);
- unconfigured.getSchemaMetrics(); // now this should succeed
- }
-
- /** Don't allow setting table/CF name twice */
- @Test
- public void testInitializingTwice() {
- Configuration conf = HBaseConfiguration.create();
- for (int i = 0; i < 4; ++i) {
- SchemaConfigured sc = new SchemaConfigured(conf, TABLE_NAME, CF_NAME);
- SchemaConfigured target =
- new SchemaConfigured(conf, TABLE_NAME + (i % 2 == 1 ? "1" : ""),
- CF_NAME + ((i & 2) != 0 ? "1" : ""));
- if (i == 0) {
- sc.passSchemaMetricsTo(target); // No exception expected.
- continue;
- }
-
- String testDesc =
- "Trying to re-configure " + target.schemaConfAsJSON() + " with "
- + sc.schemaConfAsJSON();
- try {
- sc.passSchemaMetricsTo(target);
- fail(IllegalArgumentException.class.getSimpleName() + " expected");
- } catch (IllegalArgumentException ex) {
- final String errorMsg = testDesc + ". Unexpected exception message: " +
- ex.getMessage();
- final String exceptionRegex = "Trying to change table .* CF .*";
- assertTrue(errorMsg, Pattern.matches(exceptionRegex, ex.getMessage()));
- LOG.debug("Expected exception: " + ex.getMessage());
- }
- }
- }
-
- @Test(expected=IllegalStateException.class)
- public void testConfigureWithUnconfigured1() {
- SchemaConfigured unconfigured = new SchemaConfigured(null, "t1", null);
- SchemaConfigured target = new SchemaConfigured();
- unconfigured.passSchemaMetricsTo(target);
- }
-
- @Test(expected=IllegalStateException.class)
- public void testConfigureWithUnconfigured2() {
- SchemaConfigured unconfigured = new SchemaConfigured(null, null, "cf1");
- SchemaConfigured target = new SchemaConfigured();
- unconfigured.passSchemaMetricsTo(target);
- }
-
- /**
- * Configuring with an uninitialized object is equivalent to re-setting
- * schema metrics configuration.
- */
- public void testConfigureWithNull() {
- SchemaConfigured unconfigured = new SchemaConfigured();
- SchemaConfigured target = new SchemaConfigured(null, "t1", "cf1");
- unconfigured.passSchemaMetricsTo(target);
- assertTrue(target.getTableName() == null);
- assertTrue(target.getColumnFamilyName() == null);
- }
-
- public void testConfigurePartiallyDefined() {
- final SchemaConfigured sc = new SchemaConfigured(null, "t1", "cf1");
- final SchemaConfigured target1 = new SchemaConfigured(null, "t2", null);
- sc.passSchemaMetricsTo(target1);
- assertEquals("t2", target1.getColumnFamilyName());
- assertEquals("cf1", target1.getColumnFamilyName());
-
- final SchemaConfigured target2 = new SchemaConfigured(null, null, "cf2");
- sc.passSchemaMetricsTo(target2);
- assertEquals("t1", target2.getColumnFamilyName());
- assertEquals("cf2", target2.getColumnFamilyName());
-
- final SchemaConfigured target3 = new SchemaConfigured(null, null, null);
- sc.passSchemaMetricsTo(target3);
- assertEquals("t1", target2.getColumnFamilyName());
- assertEquals("cf1", target2.getColumnFamilyName());
- }
-
- @Test(expected=IllegalArgumentException.class)
- public void testConflictingConf() {
- SchemaConfigured sc = new SchemaConfigured(null, "t1", "cf1");
- SchemaConfigured target = new SchemaConfigured(null, "t2", "cf1");
- sc.passSchemaMetricsTo(target);
- }
-
- /** We allow setting CF to unknown and then reconfiguring it */
- public void testReconfigureUnknownCF() {
- SchemaConfigured sc = new SchemaConfigured(null, "t1", "cf1");
- SchemaConfigured target =
- new SchemaConfigured(null, "t1", SchemaMetrics.UNKNOWN);
- sc.passSchemaMetricsTo(target);
- }
-
- /**
- * When the "column family" deduced from the path is ".tmp" (this happens
- * for files written on compaction) we allow re-setting the CF to another
- * value.
- */
- @Test
- public void testTmpPath() {
- SchemaConfigured sc = new SchemaConfigured(null, "myTable", "myCF");
- SchemaConfigured target = new SchemaConfigured(TMP_HFILE_PATH);
- sc.passSchemaMetricsTo(target);
- }
-
- /**
- * Even if CF is initially undefined (".tmp"), we don't allow to change
- * table name.
- */
- @Test(expected=IllegalArgumentException.class)
- public void testTmpPathButInvalidTable() {
- SchemaConfigured sc = new SchemaConfigured(null, "anotherTable", "myCF");
- SchemaConfigured target = new SchemaConfigured(TMP_HFILE_PATH);
- sc.passSchemaMetricsTo(target);
- }
-
- @Test
- public void testSchemaConfigurationHook() {
- SchemaConfigured sc = new SchemaConfigured(null, "myTable", "myCF");
- final StringBuilder newCF = new StringBuilder();
- final StringBuilder newTable = new StringBuilder();
- SchemaConfigured target = new SchemaConfigured() {
- @Override
- protected void schemaConfigurationChanged() {
- newCF.append(getColumnFamilyName());
- newTable.append(getTableName());
- }
- };
- sc.passSchemaMetricsTo(target);
- assertEquals("myTable", newTable.toString());
- assertEquals("myCF", newCF.toString());
- }
-
- @Test
- public void testResetSchemaMetricsConf() {
- SchemaConfigured target = new SchemaConfigured(null, "t1", "cf1");
- SchemaConfigured.resetSchemaMetricsConf(target);
- new SchemaConfigured(null, "t2", "cf2").passSchemaMetricsTo(target);
- assertEquals("t2", target.getTableName());
- assertEquals("cf2", target.getColumnFamilyName());
- }
-
- @Test
- public void testPathTooShort() {
- // This has too few path components (four, the first one is empty).
- SchemaConfigured sc1 = new SchemaConfigured(new Path("/a/b/c/d"));
- assertEquals(SchemaMetrics.UNKNOWN, sc1.getTableName());
- assertEquals(SchemaMetrics.UNKNOWN, sc1.getColumnFamilyName());
-
- SchemaConfigured sc2 = new SchemaConfigured(new Path("a/b/c/d"));
- assertEquals(SchemaMetrics.UNKNOWN, sc2.getTableName());
- assertEquals(SchemaMetrics.UNKNOWN, sc2.getColumnFamilyName());
-
- SchemaConfigured sc3 = new SchemaConfigured(
- new Path("/hbase/tableName/regionId/cfName/hfileName"));
- assertEquals("tableName", sc3.getTableName());
- assertEquals("cfName", sc3.getColumnFamilyName());
-
- SchemaConfigured sc4 = new SchemaConfigured(
- new Path("hbase/tableName/regionId/cfName/hfileName"));
- assertEquals("tableName", sc4.getTableName());
- assertEquals("cfName", sc4.getColumnFamilyName());
- }
-
-
-}
-
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/metrics/TestSchemaMetrics.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/metrics/TestSchemaMetrics.java
deleted file mode 100644
index e89ac9ecbe5..00000000000
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/metrics/TestSchemaMetrics.java
+++ /dev/null
@@ -1,249 +0,0 @@
-/*
- * Copyright The Apache Software Foundation
- *
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with this
- * work for additional information regarding copyright ownership. The ASF
- * licenses this file to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.hadoop.hbase.regionserver.metrics;
-
-import static org.apache.hadoop.hbase.regionserver.metrics.SchemaMetrics.
- BOOL_VALUES;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.fail;
-
-import java.util.Collection;
-import java.util.HashSet;
-import java.util.Map;
-import java.util.Random;
-import java.util.Set;
-
-import org.apache.hadoop.hbase.HBaseTestingUtility;
-import org.apache.hadoop.hbase.MediumTests;
-import org.apache.hadoop.hbase.io.hfile.BlockType;
-import org.apache.hadoop.hbase.io.hfile.BlockType.BlockCategory;
-import org.apache.hadoop.hbase.regionserver.metrics.SchemaMetrics.
- BlockMetricType;
-import org.apache.hadoop.hbase.util.Bytes;
-import org.apache.hadoop.hbase.util.ClassSize;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-import org.junit.runners.Parameterized.Parameters;
-
-@Category(MediumTests.class)
-@RunWith(Parameterized.class)
-public class TestSchemaMetrics {
-
- private final String TABLE_NAME = "myTable";
- private final String CF_NAME = "myColumnFamily";
-
- private final boolean useTableName;
- private Map startingMetrics;
-
- @Parameters
- public static Collection parameters() {
- return HBaseTestingUtility.BOOLEAN_PARAMETERIZED;
- }
-
- public TestSchemaMetrics(boolean useTableName) {
- this.useTableName = useTableName;
- SchemaMetrics.setUseTableNameInTest(useTableName);
- }
-
- @Before
- public void setUp() {
- startingMetrics = SchemaMetrics.getMetricsSnapshot();
- };
-
- @Test
- public void testNaming() {
- final String metricPrefix = (useTableName ? "tbl." +
- TABLE_NAME + "." : "") + "cf." + CF_NAME + ".";
- SchemaMetrics schemaMetrics = SchemaMetrics.getInstance(TABLE_NAME,
- CF_NAME);
- SchemaMetrics ALL_CF_METRICS = SchemaMetrics.ALL_SCHEMA_METRICS;
-
- // fsReadTimeMetric
- assertEquals(metricPrefix + "fsRead", schemaMetrics.getBlockMetricName(
- BlockCategory.ALL_CATEGORIES, false, BlockMetricType.READ_TIME));
-
- // compactionReadTimeMetric
- assertEquals(metricPrefix + "compactionRead",
- schemaMetrics.getBlockMetricName(BlockCategory.ALL_CATEGORIES, true,
- BlockMetricType.READ_TIME));
-
- // fsBlockReadCntMetric
- assertEquals(metricPrefix + "fsBlockReadCnt",
- schemaMetrics.getBlockMetricName(BlockCategory.ALL_CATEGORIES, false,
- BlockMetricType.READ_COUNT));
-
- // fsBlockReadCacheHitCntMetric
- assertEquals(metricPrefix + "fsBlockReadCacheHitCnt",
- schemaMetrics.getBlockMetricName(BlockCategory.ALL_CATEGORIES, false,
- BlockMetricType.CACHE_HIT));
-
- // fsBlockReadCacheMissCntMetric
- assertEquals(metricPrefix + "fsBlockReadCacheMissCnt",
- schemaMetrics.getBlockMetricName(BlockCategory.ALL_CATEGORIES, false,
- BlockMetricType.CACHE_MISS));
-
- // compactionBlockReadCntMetric
- assertEquals(metricPrefix + "compactionBlockReadCnt",
- schemaMetrics.getBlockMetricName(BlockCategory.ALL_CATEGORIES, true,
- BlockMetricType.READ_COUNT));
-
- // compactionBlockReadCacheHitCntMetric
- assertEquals(metricPrefix + "compactionBlockReadCacheHitCnt",
- schemaMetrics.getBlockMetricName(BlockCategory.ALL_CATEGORIES, true,
- BlockMetricType.CACHE_HIT));
-
- // compactionBlockReadCacheMissCntMetric
- assertEquals(metricPrefix + "compactionBlockReadCacheMissCnt",
- schemaMetrics.getBlockMetricName(BlockCategory.ALL_CATEGORIES, true,
- BlockMetricType.CACHE_MISS));
-
- // fsMetaBlockReadCntMetric
- assertEquals("fsMetaBlockReadCnt", ALL_CF_METRICS.getBlockMetricName(
- BlockCategory.META, false, BlockMetricType.READ_COUNT));
-
- // fsMetaBlockReadCacheHitCntMetric
- assertEquals("fsMetaBlockReadCacheHitCnt",
- ALL_CF_METRICS.getBlockMetricName(BlockCategory.META, false,
- BlockMetricType.CACHE_HIT));
-
- // fsMetaBlockReadCacheMissCntMetric
- assertEquals("fsMetaBlockReadCacheMissCnt",
- ALL_CF_METRICS.getBlockMetricName(BlockCategory.META, false,
- BlockMetricType.CACHE_MISS));
-
- // Per-(column family, block type) statistics.
- assertEquals(metricPrefix + "bt.Index.fsBlockReadCnt",
- schemaMetrics.getBlockMetricName(BlockCategory.INDEX, false,
- BlockMetricType.READ_COUNT));
-
- assertEquals(metricPrefix + "bt.Data.compactionBlockReadCacheHitCnt",
- schemaMetrics.getBlockMetricName(BlockCategory.DATA, true,
- BlockMetricType.CACHE_HIT));
-
- // A special case for Meta blocks
- assertEquals(metricPrefix + "compactionMetaBlockReadCacheHitCnt",
- schemaMetrics.getBlockMetricName(BlockCategory.META, true,
- BlockMetricType.CACHE_HIT));
-
- // Cache metrics
- assertEquals(metricPrefix + "blockCacheSize",
- schemaMetrics.getBlockMetricName(BlockCategory.ALL_CATEGORIES, false,
- BlockMetricType.CACHE_SIZE));
-
- assertEquals(metricPrefix + "bt.Index.blockCacheNumEvicted",
- schemaMetrics.getBlockMetricName(BlockCategory.INDEX, false,
- BlockMetricType.EVICTED));
-
- assertEquals("bt.Data.blockCacheNumCached",
- ALL_CF_METRICS.getBlockMetricName(BlockCategory.DATA, false,
- BlockMetricType.CACHED));
-
- assertEquals("blockCacheNumCached", ALL_CF_METRICS.getBlockMetricName(
- BlockCategory.ALL_CATEGORIES, false, BlockMetricType.CACHED));
-
- // "Non-compaction aware" metrics
- try {
- ALL_CF_METRICS.getBlockMetricName(BlockCategory.ALL_CATEGORIES, true,
- BlockMetricType.CACHE_SIZE);
- fail("Exception expected");
- } catch (IllegalArgumentException ex) {
- }
-
- // Bloom metrics
- assertEquals("keyMaybeInBloomCnt", ALL_CF_METRICS.getBloomMetricName(true));
- assertEquals(metricPrefix + "keyNotInBloomCnt",
- schemaMetrics.getBloomMetricName(false));
-
- schemaMetrics.printMetricNames();
- }
-
- public void checkMetrics() {
- SchemaMetrics.validateMetricChanges(startingMetrics);
- }
-
- @Test
- public void testIncrements() {
- Random rand = new Random(23982737L);
- for (int i = 1; i <= 3; ++i) {
- final String tableName = "table" + i;
- for (int j = 1; j <= 3; ++j) {
- final String cfName = "cf" + j;
- SchemaMetrics sm = SchemaMetrics.getInstance(tableName, cfName);
- for (boolean isInBloom : BOOL_VALUES) {
- sm.updateBloomMetrics(isInBloom);
- checkMetrics();
- }
-
- for (BlockCategory blockCat : BlockType.BlockCategory.values()) {
- if (blockCat == BlockCategory.ALL_CATEGORIES) {
- continue;
- }
-
- for (boolean isCompaction : BOOL_VALUES) {
- sm.updateOnCacheHit(blockCat, isCompaction);
- checkMetrics();
- sm.updateOnCacheMiss(blockCat, isCompaction, rand.nextInt());
- checkMetrics();
- }
-
- for (boolean isEviction : BOOL_VALUES) {
- sm.updateOnCachePutOrEvict(blockCat, (isEviction ? -1 : 1)
- * rand.nextInt(1024 * 1024), isEviction);
- }
- }
- }
- }
- }
-
- @Test
- public void testGenerateSchemaMetricsPrefix() {
- String tableName = "table1";
- int numCF = 3;
-
- StringBuilder expected = new StringBuilder();
- if (useTableName) {
- expected.append("tbl.");
- expected.append(tableName);
- expected.append(".");
- }
- expected.append("cf.");
- Set families = new HashSet();
- for (int i = 1; i <= numCF; i++) {
- String cf = "cf" + i;
- families.add(Bytes.toBytes(cf));
- expected.append(cf);
- if (i == numCF) {
- expected.append(".");
- } else {
- expected.append("~");
- }
- }
-
- String result = SchemaMetrics.generateSchemaMetricsPrefix(tableName,
- families);
- assertEquals(expected.toString(), result);
- }
-
-
-}
-