Return-Path: 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 51207D798 for ; Wed, 11 Jul 2012 14:06:42 +0000 (UTC) Received: (qmail 11490 invoked by uid 500); 11 Jul 2012 14:06:42 -0000 Delivered-To: apmail-hbase-commits-archive@hbase.apache.org Received: (qmail 11411 invoked by uid 500); 11 Jul 2012 14:06: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 11401 invoked by uid 99); 11 Jul 2012 14:06:41 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 11 Jul 2012 14:06:41 +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; Wed, 11 Jul 2012 14:06:40 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id E89D6238889B for ; Wed, 11 Jul 2012 14:06:20 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1360179 - in /hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver: CompactSplitThread.java HRegionServer.java MemStoreFlusher.java RSDumpServlet.java Date: Wed, 11 Jul 2012 14:06:20 -0000 To: commits@hbase.apache.org From: stack@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20120711140620.E89D6238889B@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: stack Date: Wed Jul 11 14:06:20 2012 New Revision: 1360179 URL: http://svn.apache.org/viewvc?rev=1360179&view=rev Log: HBASE-2730 Expose RS work queue contents on web UI Modified: hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/CompactSplitThread.java hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/MemStoreFlusher.java hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/RSDumpServlet.java Modified: hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/CompactSplitThread.java URL: http://svn.apache.org/viewvc/hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/CompactSplitThread.java?rev=1360179&r1=1360178&r2=1360179&view=diff ============================================================================== --- hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/CompactSplitThread.java (original) +++ hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/CompactSplitThread.java Wed Jul 11 14:06:20 2012 @@ -20,6 +20,8 @@ package org.apache.hadoop.hbase.regionserver; import java.io.IOException; +import java.util.Iterator; +import java.util.concurrent.BlockingQueue; import java.util.concurrent.Executors; import java.util.concurrent.PriorityBlockingQueue; import java.util.concurrent.RejectedExecutionException; @@ -119,6 +121,40 @@ public class CompactSplitThread implemen + smallCompactions.getQueue().size() + ")" + ", split_queue=" + splits.getQueue().size(); } + + public String dumpQueue() { + StringBuffer queueLists = new StringBuffer(); + queueLists.append("Compaction/Split Queue dump:\n"); + queueLists.append(" LargeCompation Queue:\n"); + BlockingQueue lq = largeCompactions.getQueue(); + Iterator it = lq.iterator(); + while(it.hasNext()){ + queueLists.append(" "+it.next().toString()); + queueLists.append("\n"); + } + + if( smallCompactions != null ){ + queueLists.append("\n"); + queueLists.append(" SmallCompation Queue:\n"); + lq = smallCompactions.getQueue(); + it = lq.iterator(); + while(it.hasNext()){ + queueLists.append(" "+it.next().toString()); + queueLists.append("\n"); + } + } + + queueLists.append("\n"); + queueLists.append(" Split Queue:\n"); + lq = splits.getQueue(); + it = lq.iterator(); + while(it.hasNext()){ + queueLists.append(" "+it.next().toString()); + queueLists.append("\n"); + } + + return queueLists.toString(); + } public synchronized boolean requestSplit(final HRegion r) { // don't split regions that are blocking Modified: hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java URL: http://svn.apache.org/viewvc/hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java?rev=1360179&r1=1360178&r2=1360179&view=diff ============================================================================== --- hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java (original) +++ hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java Wed Jul 11 14:06:20 2012 @@ -350,7 +350,10 @@ public class HRegionServer implements C /** region server process name */ public static final String REGIONSERVER = "regionserver"; - + + /** region server configuration name */ + public static final String REGIONSERVER_CONF = "regionserver_conf"; + /* * Space is reserved in HRS constructor and then released when aborting to * recover from an OOME. See HBASE-706. TODO: Make this percentage of the heap @@ -1575,6 +1578,7 @@ public class HRegionServer implements C this.infoServer.addServlet("status", "/rs-status", RSStatusServlet.class); this.infoServer.addServlet("dump", "/dump", RSDumpServlet.class); this.infoServer.setAttribute(REGIONSERVER, this); + this.infoServer.setAttribute(REGIONSERVER_CONF, conf); this.infoServer.start(); break; } catch (BindException e) { Modified: hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/MemStoreFlusher.java URL: http://svn.apache.org/viewvc/hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/MemStoreFlusher.java?rev=1360179&r1=1360178&r2=1360179&view=diff ============================================================================== --- hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/MemStoreFlusher.java (original) +++ hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/MemStoreFlusher.java Wed Jul 11 14:06:20 2012 @@ -472,7 +472,26 @@ class MemStoreFlusher extends HasThread wakeupFlushThread(); } } - + @Override + public String toString() { + return "flush_queue=" + + flushQueue.size(); + } + + public String dumpQueue() { + StringBuilder queueList = new StringBuilder(); + queueList.append("Flush Queue Queue dump:\n"); + queueList.append(" Flush Queue:\n"); + java.util.Iterator it = flushQueue.iterator(); + + while(it.hasNext()){ + queueList.append(" "+it.next().toString()); + queueList.append("\n"); + } + + return queueList.toString(); + } + interface FlushQueueEntry extends Delayed {} /** Modified: hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/RSDumpServlet.java URL: http://svn.apache.org/viewvc/hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/RSDumpServlet.java?rev=1360179&r1=1360178&r2=1360179&view=diff ============================================================================== --- hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/RSDumpServlet.java (original) +++ hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/RSDumpServlet.java Wed Jul 11 14:06:20 2012 @@ -46,6 +46,10 @@ public class RSDumpServlet extends State HRegionServer hrs = (HRegionServer)getServletContext().getAttribute( HRegionServer.REGIONSERVER); assert hrs != null : "No RS in context!"; + + Configuration hrsconf = (Configuration)getServletContext().getAttribute( + HRegionServer.REGIONSERVER_CONF); + assert hrsconf != null : "No RS conf in context"; response.setContentType("text/plain"); OutputStream os = response.getOutputStream(); @@ -82,6 +86,30 @@ public class RSDumpServlet extends State long tailKb = getTailKbParam(request); LogMonitoring.dumpTailOfLogs(out, tailKb); + out.println("\n\nRS Queue:"); + out.println(LINE); + if(isShowQueueDump(hrsconf)) { + dumpQueue(hrs, out); + } + out.flush(); - } + } + + private boolean isShowQueueDump(Configuration conf){ + return conf.getBoolean("hbase.regionserver.servlet.show.queuedump", true); + } + + private void dumpQueue(HRegionServer hrs, PrintWriter out) + throws IOException { + // 1. Print out Compaction/Split Queue + out.println("Compaction/Split Queue summary: " + + hrs.compactSplitThread.toString() ); + out.println(hrs.compactSplitThread.dumpQueue()); + + // 2. Print out flush Queue + out.println("\nFlush Queue summary: " + + hrs.cacheFlusher.toString()); + out.println(hrs.cacheFlusher.dumpQueue()); + } + }