From 4f0d6bc6bec400e148bdf1f15c363e10a3174eb1 Mon Sep 17 00:00:00 2001 From: Michael Stack Date: Mon, 20 Sep 2010 22:31:19 +0000 Subject: [PATCH] HBASE-3017 More log pruning git-svn-id: https://svn.apache.org/repos/asf/hbase/trunk@999150 13f79535-47bb-0310-9956-ffa450edef68 --- .../org/apache/hadoop/hbase/master/AssignmentManager.java | 8 ++++---- .../org/apache/hadoop/hbase/master/ServerManager.java | 6 ++---- .../hadoop/hbase/regionserver/SplitTransaction.java | 3 +++ src/main/resources/hbase-webapps/master/master.jsp | 3 ++- 4 files changed, 11 insertions(+), 9 deletions(-) diff --git a/src/main/java/org/apache/hadoop/hbase/master/AssignmentManager.java b/src/main/java/org/apache/hadoop/hbase/master/AssignmentManager.java index 8607267af62..28276b24b21 100644 --- a/src/main/java/org/apache/hadoop/hbase/master/AssignmentManager.java +++ b/src/main/java/org/apache/hadoop/hbase/master/AssignmentManager.java @@ -682,19 +682,19 @@ public class AssignmentManager extends ZooKeeperListener { // Get all available servers List servers = serverManager.getOnlineServersList(); - LOG.info("Assigning " + allRegions.size() + " across " + servers.size() + - " servers"); + LOG.info("Assigning " + allRegions.size() + " regions across " + servers.size() + + " servers"); // Generate a cluster startup region placement plan Map> bulkPlan = LoadBalancer.bulkAssignment(allRegions, servers); // For each server, create OFFLINE nodes and send OPEN RPCs - for(Map.Entry> entry : bulkPlan.entrySet()) { + for (Map.Entry> entry : bulkPlan.entrySet()) { HServerInfo server = entry.getKey(); List regions = entry.getValue(); LOG.debug("Assigning " + regions.size() + " regions to " + server); - for(HRegionInfo region : regions) { + for (HRegionInfo region : regions) { LOG.debug("Assigning " + region.getRegionNameAsString() + " to " + server); String regionName = region.getEncodedName(); RegionPlan plan = new RegionPlan(region, null,server); diff --git a/src/main/java/org/apache/hadoop/hbase/master/ServerManager.java b/src/main/java/org/apache/hadoop/hbase/master/ServerManager.java index 3c6b09cce29..60a159aa4a5 100644 --- a/src/main/java/org/apache/hadoop/hbase/master/ServerManager.java +++ b/src/main/java/org/apache/hadoop/hbase/master/ServerManager.java @@ -27,11 +27,11 @@ import java.util.List; import java.util.Map; import java.util.Set; import java.util.concurrent.ConcurrentHashMap; -import java.text.DecimalFormat; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.apache.hadoop.conf.Configuration; +import org.apache.hadoop.util.StringUtils; import org.apache.hadoop.hbase.Chore; import org.apache.hadoop.hbase.HMsg; import org.apache.hadoop.hbase.HRegionInfo; @@ -94,8 +94,6 @@ public class ServerManager { private final DeadServer deadservers = new DeadServer(); - private static final DecimalFormat DF = new DecimalFormat("#.##"); - /** * Dumps into log current stats on dead servers and number of servers * TODO: Make this a metric; dump metrics into log. @@ -112,7 +110,7 @@ public class ServerManager { double averageLoad = getAverageLoad(); String deadServersList = deadservers.toString(); LOG.info("regionservers=" + numServers + - ", averageload=" + DF.format(averageLoad) + + ", averageload=" + StringUtils.limitDecimalTo2(averageLoad) + ((numDeadServers > 0)? ("deadservers=" + deadServersList): "")); } } diff --git a/src/main/java/org/apache/hadoop/hbase/regionserver/SplitTransaction.java b/src/main/java/org/apache/hadoop/hbase/regionserver/SplitTransaction.java index bb3b382a5da..23365a50797 100644 --- a/src/main/java/org/apache/hadoop/hbase/regionserver/SplitTransaction.java +++ b/src/main/java/org/apache/hadoop/hbase/regionserver/SplitTransaction.java @@ -196,6 +196,9 @@ class SplitTransaction { services.removeFromOnlineRegions(this.parent.getRegionInfo().getEncodedName()); } this.journal.add(JournalEntry.OFFLINED_PARENT); + + // TODO: If the below were multithreaded would we complete steps in less + // elapsed time? St.Ack 20100920 splitStoreFiles(this.splitdir, hstoreFilesToSplit); // splitStoreFiles creates daughter region dirs under the parent splits dir diff --git a/src/main/resources/hbase-webapps/master/master.jsp b/src/main/resources/hbase-webapps/master/master.jsp index 474bed0d4ea..ed38ff23695 100644 --- a/src/main/resources/hbase-webapps/master/master.jsp +++ b/src/main/resources/hbase-webapps/master/master.jsp @@ -1,6 +1,7 @@ <%@ page contentType="text/html;charset=UTF-8" import="java.util.*" import="org.apache.hadoop.conf.Configuration" + import="org.apache.hadoop.util.StringUtils" import="org.apache.hadoop.hbase.util.Bytes" import="org.apache.hadoop.hbase.util.JvmVersion" import="org.apache.hadoop.hbase.util.FSUtils" @@ -66,7 +67,7 @@ Hadoop Version<%= org.apache.hadoop.util.VersionInfo.getVersion() %>, r<%= org.apache.hadoop.util.VersionInfo.getRevision() %>Hadoop version and svn revision Hadoop Compiled<%= org.apache.hadoop.util.VersionInfo.getDate() %>, <%= org.apache.hadoop.util.VersionInfo.getUser() %>When Hadoop version was compiled and by whom HBase Root Directory<%= FSUtils.getRootDir(master.getConfiguration()).toString() %>Location of HBase home directory -Load average<%= master.getServerManager().getAverageLoad() %>Average number of regions per regionserver. Naive computation. +Load average<%= StringUtils.limitDecimalTo2(master.getServerManager().getAverageLoad()) %>Average number of regions per regionserver. Naive computation. <% if (showFragmentation) { %> Fragmentation<%= frags.get("-TOTAL-") != null ? frags.get("-TOTAL-").intValue() + "%" : "n/a" %>Overall fragmentation of all tables, including .META. and -ROOT-. <% } %>