Return-Path: Delivered-To: apmail-hbase-commits-archive@www.apache.org Received: (qmail 26870 invoked from network); 26 May 2010 07:54:45 -0000 Received: from unknown (HELO mail.apache.org) (140.211.11.3) by 140.211.11.9 with SMTP; 26 May 2010 07:54:45 -0000 Received: (qmail 50138 invoked by uid 500); 26 May 2010 07:54:45 -0000 Delivered-To: apmail-hbase-commits-archive@hbase.apache.org Received: (qmail 50059 invoked by uid 500); 26 May 2010 07:54:42 -0000 Mailing-List: contact commits-help@hbase.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@hbase.apache.org Delivered-To: mailing list commits@hbase.apache.org Received: (qmail 50052 invoked by uid 99); 26 May 2010 07:54:42 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 26 May 2010 07:54:42 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 26 May 2010 07:54:39 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 427022388980; Wed, 26 May 2010 07:54:18 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r948360 - in /hbase/branches/0.20: ./ src/java/org/apache/hadoop/hbase/master/metrics/ src/java/org/apache/hadoop/hbase/regionserver/ src/java/org/apache/hadoop/hbase/regionserver/metrics/ Date: Wed, 26 May 2010 07:54:18 -0000 To: commits@hbase.apache.org From: stack@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20100526075418.427022388980@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: stack Date: Wed May 26 07:54:17 2010 New Revision: 948360 URL: http://svn.apache.org/viewvc?rev=948360&view=rev Log: HBASE-2530 HBASE-2165 removed compactionQueueSize metric Modified: hbase/branches/0.20/CHANGES.txt hbase/branches/0.20/src/java/org/apache/hadoop/hbase/master/metrics/MasterMetrics.java hbase/branches/0.20/src/java/org/apache/hadoop/hbase/regionserver/CompactSplitThread.java hbase/branches/0.20/src/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java hbase/branches/0.20/src/java/org/apache/hadoop/hbase/regionserver/metrics/RegionServerMetrics.java Modified: hbase/branches/0.20/CHANGES.txt URL: http://svn.apache.org/viewvc/hbase/branches/0.20/CHANGES.txt?rev=948360&r1=948359&r2=948360&view=diff ============================================================================== --- hbase/branches/0.20/CHANGES.txt (original) +++ hbase/branches/0.20/CHANGES.txt Wed May 26 07:54:17 2010 @@ -12,7 +12,9 @@ Release 0.20.5 - Wed May 26 00:15:56 PDT HBASE-2428 NPE in ProcessRegionClose because meta is offline kills master and thus the cluster HBASE-1880 DeleteColumns are not recovered properly from the write-ahead-log - (via HBASE-2606) + (via HBASE-2606) + HBASE-2530 HBASE-2165 removed compactionQueueSize metric + (Ruifang Ge via Stack) IMPROVEMENTS HBASE-2567 [stargate] minimize differences between 0.20 branch and trunk Modified: hbase/branches/0.20/src/java/org/apache/hadoop/hbase/master/metrics/MasterMetrics.java URL: http://svn.apache.org/viewvc/hbase/branches/0.20/src/java/org/apache/hadoop/hbase/master/metrics/MasterMetrics.java?rev=948360&r1=948359&r2=948360&view=diff ============================================================================== --- hbase/branches/0.20/src/java/org/apache/hadoop/hbase/master/metrics/MasterMetrics.java (original) +++ hbase/branches/0.20/src/java/org/apache/hadoop/hbase/master/metrics/MasterMetrics.java Wed May 26 07:54:17 2010 @@ -40,6 +40,7 @@ public class MasterMetrics implements Up private final MetricsRecord metricsRecord; private final MetricsRegistry registry = new MetricsRegistry(); private final MasterStatistics masterStatistics; + /* * Count of requests to the cluster since last call to metrics update */ @@ -94,4 +95,4 @@ public class MasterMetrics implements Up public void incrementRequests(final int inc) { this.cluster_requests.inc(inc); } -} \ No newline at end of file +} Modified: hbase/branches/0.20/src/java/org/apache/hadoop/hbase/regionserver/CompactSplitThread.java URL: http://svn.apache.org/viewvc/hbase/branches/0.20/src/java/org/apache/hadoop/hbase/regionserver/CompactSplitThread.java?rev=948360&r1=948359&r2=948360&view=diff ============================================================================== --- hbase/branches/0.20/src/java/org/apache/hadoop/hbase/regionserver/CompactSplitThread.java (original) +++ hbase/branches/0.20/src/java/org/apache/hadoop/hbase/regionserver/CompactSplitThread.java Wed May 26 07:54:17 2010 @@ -234,4 +234,14 @@ class CompactSplitThread extends Thread this.interrupt(); } } + + /** + * Returns the current size of the queue containing regions that are + * processed. + * + * @return The current size of the regions queue. + */ + public int getCompactionQueueSize() { + return compactionQueue.size(); + } } \ No newline at end of file Modified: hbase/branches/0.20/src/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java URL: http://svn.apache.org/viewvc/hbase/branches/0.20/src/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java?rev=948360&r1=948359&r2=948360&view=diff ============================================================================== --- hbase/branches/0.20/src/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java (original) +++ hbase/branches/0.20/src/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java Wed May 26 07:54:17 2010 @@ -1106,7 +1106,9 @@ public class HRegionServer implements HC this.metrics.storefiles.set(storefiles); this.metrics.memstoreSizeMB.set((int)(memstoreSize/(1024*1024))); this.metrics.storefileIndexSizeMB.set((int)(storefileIndexSize/(1024*1024))); - + this.metrics.compactionQueueSize.set(compactSplitThread. + getCompactionQueueSize()); + LruBlockCache lruBlockCache = (LruBlockCache)StoreFile.getBlockCache(conf); if (lruBlockCache != null) { this.metrics.blockCacheCount.set(lruBlockCache.size()); Modified: hbase/branches/0.20/src/java/org/apache/hadoop/hbase/regionserver/metrics/RegionServerMetrics.java URL: http://svn.apache.org/viewvc/hbase/branches/0.20/src/java/org/apache/hadoop/hbase/regionserver/metrics/RegionServerMetrics.java?rev=948360&r1=948359&r2=948360&view=diff ============================================================================== --- hbase/branches/0.20/src/java/org/apache/hadoop/hbase/regionserver/metrics/RegionServerMetrics.java (original) +++ hbase/branches/0.20/src/java/org/apache/hadoop/hbase/regionserver/metrics/RegionServerMetrics.java Wed May 26 07:54:17 2010 @@ -108,6 +108,12 @@ public class RegionServerMetrics impleme new MetricsIntValue("memstoreSizeMB", registry); /** + * Size of the compaction queue. + */ + public final MetricsIntValue compactionQueueSize = + new MetricsIntValue("compactionQueueSize", registry); + + /** * filesystem read latency */ public final MetricsTimeVaryingRate fsReadLatency = @@ -158,7 +164,7 @@ public class RegionServerMetrics impleme this.memstoreSizeMB.pushMetric(this.metricsRecord); this.regions.pushMetric(this.metricsRecord); this.requests.pushMetric(this.metricsRecord); - + this.compactionQueueSize.pushMetric(this.metricsRecord); this.blockCacheSize.pushMetric(this.metricsRecord); this.blockCacheFree.pushMetric(this.metricsRecord); this.blockCacheCount.pushMetric(this.metricsRecord); @@ -231,6 +237,8 @@ public class RegionServerMetrics impleme Integer.valueOf(this.storefileIndexSizeMB.get())); sb = Strings.appendKeyValue(sb, "memstoreSize", Integer.valueOf(this.memstoreSizeMB.get())); + sb = Strings.appendKeyValue(sb, "compactionQueueSize", + Integer.valueOf(this.compactionQueueSize.get())); // Duplicate from jvmmetrics because metrics are private there so // inaccessible. MemoryUsage memory =