Return-Path: 
 <commits-return-10856-apmail-hbase-commits-archive=hbase.apache.org@hbase.apache.org>
X-Original-To: apmail-hbase-commits-archive@www.apache.org
Delivered-To: apmail-hbase-commits-archive@www.apache.org
Received: from mail.apache.org (hermes.apache.org [140.211.11.3])
	by minotaur.apache.org (Postfix) with SMTP id 363BBDE5E
	for <apmail-hbase-commits-archive@www.apache.org>;
 Thu, 27 Dec 2012 19:19:10 +0000 (UTC)
Received: (qmail 82773 invoked by uid 500); 27 Dec 2012 19:19:10 -0000
Delivered-To: apmail-hbase-commits-archive@hbase.apache.org
Received: (qmail 82692 invoked by uid 500); 27 Dec 2012 19:19:10 -0000
Mailing-List: contact commits-help@hbase.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:commits-help@hbase.apache.org>
List-Unsubscribe: <mailto:commits-unsubscribe@hbase.apache.org>
List-Post: <mailto:commits@hbase.apache.org>
List-Id: <commits.hbase.apache.org>
Reply-To: dev@hbase.apache.org
Delivered-To: mailing list commits@hbase.apache.org
Received: (qmail 82680 invoked by uid 99); 27 Dec 2012 19:19:09 -0000
Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136)
    by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 27 Dec 2012 19:19:09 +0000
X-ASF-Spam-Status: No, hits=-2000.0 required=5.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; Thu, 27 Dec 2012 19:19:08 +0000
Received: from eris.apache.org (localhost [127.0.0.1])
	by eris.apache.org (Postfix) with ESMTP id CF00B238896F;
	Thu, 27 Dec 2012 19:18:48 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r1426297 - in /hbase/branches/0.89-fb/src:
 main/java/org/apache/hadoop/hbase/regionserver/
 test/java/org/apache/hadoop/hbase/regionserver/
Date: Thu, 27 Dec 2012 19:18:48 -0000
To: commits@hbase.apache.org
From: liyin@apache.org
X-Mailer: svnmailer-1.0.8-patched
Message-Id: <20121227191848.CF00B238896F@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org

Author: liyin
Date: Thu Dec 27 19:18:48 2012
New Revision: 1426297

URL: http://svn.apache.org/viewvc?rev=1426297&view=rev
Log:
[HBASE-7276] Fix TestRegionServerMetrics.testNumReadsAndWrites to work with the recent changes in HRegion metrics.

Author: adela

Summary:
-removed read counter increase in close();
-changed increment of read operation during getScanner from HRegion to HRegionServer

Test Plan: unit test is passing now

Reviewers: liyintang, andrewl

Reviewed By: liyintang

CC: hbase-eng@, kannan

Differential Revision: https://phabricator.fb.com/D666035

Task ID: 1981461

Modified:
    hbase/branches/0.89-fb/src/main/java/org/apache/hadoop/hbase/regionserver/HRegion.java
    hbase/branches/0.89-fb/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java
    hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/regionserver/TestRegionServerMetrics.java

Modified: hbase/branches/0.89-fb/src/main/java/org/apache/hadoop/hbase/regionserver/HRegion.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.89-fb/src/main/java/org/apache/hadoop/hbase/regionserver/HRegion.java?rev=1426297&r1=1426296&r2=1426297&view=diff
==============================================================================
--- hbase/branches/0.89-fb/src/main/java/org/apache/hadoop/hbase/regionserver/HRegion.java (original)
+++ hbase/branches/0.89-fb/src/main/java/org/apache/hadoop/hbase/regionserver/HRegion.java Thu Dec 27 19:18:48 2012
@@ -1666,7 +1666,6 @@ public class HRegion implements HeapSize
   }
 
   protected InternalScanner getScanner(Scan scan, List<KeyValueScanner> additionalScanners) throws IOException {
-    readRequests.incrTotalRequestCount();
     newScannerLock.readLock().lock();
     try {
       if (this.closed.get()) {
@@ -3401,7 +3400,6 @@ public class HRegion implements HeapSize
 
     @Override
     public synchronized void close() {
-      readRequests.incrTotalRequestCount();
       if (storeHeap != null) {
         storeHeap.close();
         storeHeap = null;

Modified: hbase/branches/0.89-fb/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.89-fb/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java?rev=1426297&r1=1426296&r2=1426297&view=diff
==============================================================================
--- hbase/branches/0.89-fb/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java (original)
+++ hbase/branches/0.89-fb/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java Thu Dec 27 19:18:48 2012
@@ -2573,6 +2573,7 @@ public class HRegionServer implements HR
     }
     try {
       HRegion r = getRegion(regionName);
+      r.getReadRequest().incrTotalRequestCount();
       return addScanner(r.getScanner(scan));
     } catch (Throwable t) {
       throw convertThrowableToIOE(cleanup(t, "Failed openScanner"));

Modified: hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/regionserver/TestRegionServerMetrics.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/regionserver/TestRegionServerMetrics.java?rev=1426297&r1=1426296&r2=1426297&view=diff
==============================================================================
--- hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/regionserver/TestRegionServerMetrics.java (original)
+++ hbase/branches/0.89-fb/src/test/java/org/apache/hadoop/hbase/regionserver/TestRegionServerMetrics.java Thu Dec 27 19:18:48 2012
@@ -22,7 +22,9 @@ import static org.junit.Assert.assertEqu
 import static org.junit.Assert.assertTrue;
 
 import java.io.IOException;
+import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.List;
 import java.util.Map;
 
 import org.apache.commons.logging.Log;
@@ -31,6 +33,8 @@ import org.apache.hadoop.conf.Configurat
 import org.apache.hadoop.hbase.HBaseTestingUtility;
 import org.apache.hadoop.hbase.HColumnDescriptor;
 import org.apache.hadoop.hbase.HConstants;
+import org.apache.hadoop.hbase.HRegionInfo;
+import org.apache.hadoop.hbase.HServerAddress;
 import org.apache.hadoop.hbase.HTestConst;
 import org.apache.hadoop.hbase.KeyValue;
 import org.apache.hadoop.hbase.client.Delete;
@@ -222,17 +226,17 @@ public class TestRegionServerMetrics {
         NUM_COLS_PER_ROW, NUM_FLUSHES, NUM_REGIONS, 1000);
     final HRegionServer rs =
         testUtil.getMiniHBaseCluster().getRegionServer(0);
-
-    // This may not be necessary since we verify the number of reads and writes from atomic
-    // variables and not from collected metrics.
-    rs.doMetrics(); 
     
-    for (HRegion r : rs.getOnlineRegions()) {
-      Get g = new Get(new byte[]{});
-      rs.get(r.getRegionName(), g);
+    HRegion[] regions = rs.getOnlineRegionsAsArray();
+    int reads = rs.getNumReads().get();
+    int writes = rs.getNumWrites().get();
+    for (int i=0; i<regions.length;  i++) {
+      Get g = new Get(Bytes.toBytes("row" + i));
+      regions[i].get(g, null);
     }
-    Assert.assertEquals(rs.getOnlineRegions().size(), rs.getNumReads().get());
-    Assert.assertEquals(0, rs.getNumWrites().get());
+    rs.doMetrics();
+    assertEquals(regions.length, (rs.getNumReads().get() - reads));
+    assertEquals(0, (rs.getNumWrites().get() - writes));
   }
 
   @Test
@@ -310,7 +314,7 @@ public class TestRegionServerMetrics {
     long startValue = HRegion.getNumericPersistentMetric(storeMetricFullName);
 
     int compactionThreshold = conf.getInt("hbase.hstore.compaction.min", 
-    		HConstants.DEFAULT_MIN_FILES_TO_COMPACT);
+        HConstants.DEFAULT_MIN_FILES_TO_COMPACT);
     for (int i=0; i<=compactionThreshold; i++) {
       String rowName = "row" + i;
       byte[] ROW = Bytes.toBytes(rowName);
@@ -349,6 +353,6 @@ public class TestRegionServerMetrics {
     long compactionWriteSizeAfterCompactionAfterDelete = 
       HRegion.getNumericPersistentMetric(storeMetricFullName);
     Assert.assertTrue(compactionWriteSizeAfterCompactionAfterDelete 
-    	              == compactionWriteSizeAfterCompaction);
+                    == compactionWriteSizeAfterCompaction);
   }
-}
\ No newline at end of file
+}