You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by ap...@apache.org on 2008/11/26 00:43:38 UTC
svn commit: r720670 - in /hadoop/hbase/trunk: ./
src/java/org/apache/hadoop/hbase/ src/java/org/apache/hadoop/hbase/ipc/
src/java/org/apache/hadoop/hbase/master/
src/java/org/apache/hadoop/hbase/regionserver/
src/test/org/apache/hadoop/hbase/
Author: apurtell
Date: Tue Nov 25 15:43:37 2008
New Revision: 720670
URL: http://svn.apache.org/viewvc?rev=720670&view=rev
Log:
HBASE-1018 Regionservers should report detailed health to master
Modified:
hadoop/hbase/trunk/CHANGES.txt
hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/HServerLoad.java
hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/ipc/HBaseRPCProtocolVersion.java
hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/master/ServerManager.java
hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java
hadoop/hbase/trunk/src/test/org/apache/hadoop/hbase/TestToString.java
Modified: hadoop/hbase/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/hbase/trunk/CHANGES.txt?rev=720670&r1=720669&r2=720670&view=diff
==============================================================================
--- hadoop/hbase/trunk/CHANGES.txt (original)
+++ hadoop/hbase/trunk/CHANGES.txt Tue Nov 25 15:43:37 2008
@@ -141,7 +141,8 @@
HBASE-1022 Add storefile index size to hbase metrics
HBASE-1026 Tests in mapred are failing
HBASE-1020 Regionserver OOME handler should dump vital stats
-
+ HBASE-1018 Regionservers should report detailed health to master
+
NEW FEATURES
HBASE-875 Use MurmurHash instead of JenkinsHash [in bloomfilters]
(Andrzej Bialecki via Stack)
Modified: hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/HServerLoad.java
URL: http://svn.apache.org/viewvc/hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/HServerLoad.java?rev=720670&r1=720669&r2=720670&view=diff
==============================================================================
--- hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/HServerLoad.java (original)
+++ hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/HServerLoad.java Tue Nov 25 15:43:37 2008
@@ -22,25 +22,171 @@
import java.io.DataInput;
import java.io.DataOutput;
import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.Iterator;
+import org.apache.hadoop.hbase.util.Bytes;
+import org.apache.hadoop.io.Writable;
import org.apache.hadoop.io.WritableComparable;
/**
* This class encapsulates metrics for determining the load on a HRegionServer
*/
public class HServerLoad implements WritableComparable {
- private int numberOfRequests; // number of requests since last report
- private int numberOfRegions; // number of regions being served
- /*
- * Number of storefiles on the regionserver
- */
- private int storefiles;
-
- /*
- * Size of the memcaches on this machine in MB.
- */
- private int memcacheSizeMB;
-
+ /** number of regions */
+ // could just use regionLoad.size() but master.RegionManager likes to play
+ // around with this value while passing HServerLoad objects around during
+ // balancer calculations
+ private int numberOfRegions;
+ /** number of requests since last report */
+ private int numberOfRequests;
+ /** the amount of used heap, in MB */
+ private int usedHeapMB;
+ /** the maximum allowable size of the heap, in MB */
+ private int maxHeapMB;
+ /** per-region load metrics */
+ private ArrayList<RegionLoad> regionLoad = new ArrayList<RegionLoad>();
+
+ /**
+ * Encapsulates per-region loading metrics.
+ */
+ class RegionLoad implements Writable {
+ /** the region name */
+ private byte[] name;
+ /** the number of stores for the region */
+ private int stores;
+ /** the number of storefiles for the region */
+ private int storefiles;
+ /** the current size of the memcache for the region, in MB */
+ private int memcacheSizeMB;
+ /** the current total size of storefile indexes for the region, in MB */
+ private int storefileIndexSizeMB;
+
+ /**
+ * Constructor, for Writable
+ */
+ public RegionLoad() {
+ super();
+ }
+
+ /**
+ * @param name
+ * @param stores
+ * @param storefiles
+ * @param memcacheSizeMB
+ * @param storefileIndexSizeMB
+ */
+ public RegionLoad(final byte[] name, final int stores,
+ final int storefiles, final int memcacheSizeMB,
+ final int storefileIndexSizeMB) {
+ this.name = name;
+ this.stores = stores;
+ this.storefiles = storefiles;
+ this.memcacheSizeMB = memcacheSizeMB;
+ this.storefileIndexSizeMB = storefileIndexSizeMB;
+ }
+
+ // Getters
+
+ /**
+ * @return the region name
+ */
+ public byte[] getName() {
+ return name;
+ }
+
+ /**
+ * @return the number of stores
+ */
+ public int getStores() {
+ return stores;
+ }
+
+ /**
+ * @return the number of storefiles
+ */
+ public int getStorefiles() {
+ return storefiles;
+ }
+
+ /**
+ * @return the memcache size, in MB
+ */
+ public int getMemcacheSizeMB() {
+ return memcacheSizeMB;
+ }
+
+ /**
+ * @return the approximate size of storefile indexes on the heap, in MB
+ */
+ public int getStorefileIndexSizeMB() {
+ return storefileIndexSizeMB;
+ }
+
+ // Setters
+
+ /**
+ * @param name the region name
+ */
+ public void setName(byte[] name) {
+ this.name = name;
+ }
+
+ /**
+ * @param storefiles the number of stores
+ */
+ public void setStores(int stores) {
+ this.stores = stores;
+ }
+
+ /**
+ * @param storefiles the number of storefiles
+ */
+ public void setStorefiles(int storefiles) {
+ this.storefiles = storefiles;
+ }
+
+ /**
+ * @param memcacheSizeMB the memcache size, in MB
+ */
+ public void setMemcacheSizeMB(int memcacheSizeMB) {
+ this.memcacheSizeMB = memcacheSizeMB;
+ }
+
+ /**
+ * @param storefileIndexSizeMB the approximate size of storefile indexes
+ * on the heap, in MB
+ */
+ public void setStorefileIndexSizeMB(int storefileIndexSizeMB) {
+ this.storefileIndexSizeMB = storefileIndexSizeMB;
+ }
+
+ // Writable
+
+ @Override
+ public void readFields(DataInput in) throws IOException {
+ int namelen = in.readInt();
+ this.name = new byte[namelen];
+ in.readFully(this.name);
+ this.stores = in.readInt();
+ this.storefiles = in.readInt();
+ this.memcacheSizeMB = in.readInt();
+ this.storefileIndexSizeMB = in.readInt();
+ }
+
+ @Override
+ public void write(DataOutput out) throws IOException {
+ out.writeInt(name.length);
+ out.write(name);
+ out.writeInt(stores);
+ out.writeInt(storefiles);
+ out.writeInt(memcacheSizeMB);
+ out.writeInt(storefileIndexSizeMB);
+ }
+ }
+
/*
* TODO: Other metrics that might be considered when the master is actually
* doing load balancing instead of merely trying to decide where to assign
@@ -54,7 +200,7 @@
* </ul>
*/
- /** default constructior (used by Writable) */
+ /** default constructor (used by Writable) */
public HServerLoad() {
super();
}
@@ -62,21 +208,25 @@
/**
* Constructor
* @param numberOfRequests
- * @param numberOfRegions
+ * @param usedHeapMB
+ * @param maxHeapMB
*/
- public HServerLoad(final int numberOfRequests, final int numberOfRegions,
- final int storefiles, final int memcacheSizeMB) {
+ public HServerLoad(final int numberOfRequests, final int usedHeapMB,
+ final int maxHeapMB) {
this.numberOfRequests = numberOfRequests;
- this.numberOfRegions = numberOfRegions;
- this.storefiles = storefiles;
- this.memcacheSizeMB = memcacheSizeMB;
+ this.usedHeapMB = usedHeapMB;
+ this.maxHeapMB = maxHeapMB;
}
-
+
+ /**
+ * Constructor
+ * @param hsl the template HServerLoad
+ */
public HServerLoad(final HServerLoad hsl) {
- this(hsl.numberOfRequests, hsl.numberOfRegions, hsl.storefiles,
- hsl.memcacheSizeMB);
+ this(hsl.numberOfRequests, hsl.usedHeapMB, hsl.maxHeapMB);
+ this.regionLoad.addAll(hsl.regionLoad);
}
-
+
/**
* Originally, this method factored in the effect of requests going to the
* server as well. However, this does not interact very well with the current
@@ -99,15 +249,43 @@
}
/**
- * Returns toString() with the number of requests divided by the message interval in seconds
+ * Returns toString() with the number of requests divided by the message
+ * interval in seconds
* @param msgInterval
* @return The load as a String
*/
public String toString(int msgInterval) {
- return "requests: " + numberOfRequests/msgInterval +
- " regions: " + numberOfRegions;
+ StringBuilder sb = new StringBuilder();
+ sb.append("requests: ");
+ sb.append(numberOfRequests/msgInterval);
+ sb.append(" usedHeapMB: ");
+ sb.append(usedHeapMB);
+ sb.append(" maxHeapMB: ");
+ sb.append(maxHeapMB);
+ sb.append(" regions: ");
+ sb.append(numberOfRegions);
+ Iterator<RegionLoad> i = regionLoad.iterator();
+ sb.append(" {");
+ while (i.hasNext()) {
+ RegionLoad rl = i.next();
+ sb.append(" { name: '");
+ sb.append(Bytes.toString(rl.name));
+ sb.append("' stores: ");
+ sb.append(rl.stores);
+ sb.append(" storefiles: ");
+ sb.append(rl.storefiles);
+ sb.append(" memcacheSizeMB: ");
+ sb.append(rl.memcacheSizeMB);
+ sb.append(" storefileIndexSizeMB: ");
+ sb.append(rl.storefileIndexSizeMB);
+ sb.append(" }");
+ if (i.hasNext())
+ sb.append(',');
+ }
+ sb.append(" }");
+ return sb.toString();
}
-
+
@Override
public boolean equals(Object o) {
return compareTo(o) == 0;
@@ -129,6 +307,10 @@
return numberOfRegions;
}
+ public Collection<RegionLoad> getRegionLoad() {
+ return Collections.unmodifiableCollection(regionLoad);
+ }
+
/**
* @return the numberOfRequests
*/
@@ -140,56 +322,101 @@
* @return Count of storefiles on this regionserver
*/
public int getStorefiles() {
- return this.storefiles;
+ int count = 0;
+ for (RegionLoad info: regionLoad)
+ count += info.storefiles;
+ return count;
}
/**
- * @return Size of memcaches in kb.
+ * @return Size of memcaches in MB
*/
- public int getMemcacheSizeInKB() {
- return this.memcacheSizeMB;
+ public int getMemcacheSizeInMB() {
+ int count = 0;
+ for (RegionLoad info: regionLoad)
+ count += info.memcacheSizeMB;
+ return count;
}
/**
- * @param storefiles Count of storefiles on this server.
+ * @return Size of store file indexes in MB
*/
- public void setStorefiles(int storefiles) {
- this.storefiles = storefiles;
+ public int getStorefileIndexSizeInMB() {
+ int count = 0;
+ for (RegionLoad info: regionLoad)
+ count += info.storefileIndexSizeMB;
+ return count;
}
- /**
- * @param memcacheSizeInKB Size of memcache in kb.
- */
- public void setMemcacheSizeInKB(int memcacheSizeInKB) {
- this.memcacheSizeMB = memcacheSizeInKB;
- }
+ // Setters
/**
- * @param numberOfRegions the numberOfRegions to set
+ * @param numberOfRegions the number of regions
*/
public void setNumberOfRegions(int numberOfRegions) {
this.numberOfRegions = numberOfRegions;
}
/**
- * @param numberOfRequests the numberOfRequests to set
+ * @param numberOfRequests the number of requests to set
*/
public void setNumberOfRequests(int numberOfRequests) {
this.numberOfRequests = numberOfRequests;
}
+ /**
+ * @param usedHeapMB the amount of heap in use, in MB
+ */
+ public void setUsedHeapMB(int usedHeapMB) {
+ this.usedHeapMB = usedHeapMB;
+ }
+
+ /**
+ * @param maxHeapMB the maximum allowable heap size, in MB
+ */
+ public void setMaxHeapMB(int maxHeapMB) {
+ this.maxHeapMB = maxHeapMB;
+ }
+
+ /**
+ * @param name
+ * @param stores
+ * @param storefiles
+ * @param memcacheSizeMB
+ * @param storefileIndexSizeMB
+ */
+ public void addRegionInfo(final byte[] name, final int stores,
+ final int storefiles, final int memcacheSizeMB,
+ final int storefileIndexSizeMB) {
+ this.numberOfRegions++;
+ this.regionLoad.add(
+ new RegionLoad(name, stores, storefiles, memcacheSizeMB,
+ storefileIndexSizeMB));
+ }
+
// Writable
public void readFields(DataInput in) throws IOException {
numberOfRequests = in.readInt();
+ usedHeapMB = in.readInt();
+ maxHeapMB = in.readInt();
numberOfRegions = in.readInt();
+ for (int i = 0; i < numberOfRegions; i++) {
+ RegionLoad rl = new RegionLoad();
+ rl.readFields(in);
+ regionLoad.add(rl);
+ }
}
public void write(DataOutput out) throws IOException {
out.writeInt(numberOfRequests);
+ out.writeInt(usedHeapMB);
+ out.writeInt(maxHeapMB);
out.writeInt(numberOfRegions);
+ for (int i = 0; i < numberOfRegions; i++)
+ regionLoad.get(i).write(out);
}
-
+
// Comparable
public int compareTo(Object o) {
Modified: hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/ipc/HBaseRPCProtocolVersion.java
URL: http://svn.apache.org/viewvc/hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/ipc/HBaseRPCProtocolVersion.java?rev=720670&r1=720669&r2=720670&view=diff
==============================================================================
--- hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/ipc/HBaseRPCProtocolVersion.java (original)
+++ hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/ipc/HBaseRPCProtocolVersion.java Tue Nov 25 15:43:37 2008
@@ -60,9 +60,10 @@
* <p>Unified RPC version number history:
* <ul>
* <li>Version 10: initial version (had to be > all other RPC versions</li>
- * <li>Version 11: Changed getClosestRowBefore signature.
+ * <li>Version 11: Changed getClosestRowBefore signature.</li>
+ * <li>Version 12: HServerLoad extensions (HBASE-1018).</li>
* </ul>
*/
- public static final long versionID = 11L;
+ public static final long versionID = 12L;
}
Modified: hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/master/ServerManager.java
URL: http://svn.apache.org/viewvc/hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/master/ServerManager.java?rev=720670&r1=720669&r2=720670&view=diff
==============================================================================
--- hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/master/ServerManager.java (original)
+++ hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/master/ServerManager.java Tue Nov 25 15:43:37 2008
@@ -293,6 +293,8 @@
serversToServerInfo.put(serverName, serverInfo);
HServerLoad load = serversToLoad.get(serverName);
+ if (LOG.isDebugEnabled())
+ LOG.debug(serverName + ": load: " + load);
this.master.getMetrics().incrementRequests(load.getNumberOfRequests());
if (load != null && !load.equals(serverInfo.getLoad())) {
// We have previous information about the load on this server
Modified: hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java
URL: http://svn.apache.org/viewvc/hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java?rev=720670&r1=720669&r2=720670&view=diff
==============================================================================
--- hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java (original)
+++ hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java Tue Nov 25 15:43:37 2008
@@ -21,6 +21,8 @@
import java.io.IOException;
import java.lang.Thread.UncaughtExceptionHandler;
+import java.lang.management.ManagementFactory;
+import java.lang.management.MemoryUsage;
import java.lang.reflect.Constructor;
import java.net.InetSocketAddress;
import java.util.ArrayList;
@@ -194,7 +196,7 @@
// flag set after we're done setting up server threads (used for testing)
protected volatile boolean isOnline;
-
+
/**
* Starts a HRegionServer at the default location
* @param conf
@@ -322,9 +324,31 @@
}
try {
doMetrics();
- this.serverInfo.setLoad(new HServerLoad(requestCount.get(),
- onlineRegions.size(), this.metrics.storefiles.get(),
- this.metrics.memcacheSizeMB.get()));
+ MemoryUsage memory =
+ ManagementFactory.getMemoryMXBean().getHeapMemoryUsage();
+ HServerLoad hsl = new HServerLoad(requestCount.get(),
+ (int)(memory.getUsed()/1024/1024),
+ (int)(memory.getMax()/1024/1024));
+ for (HRegion r: onlineRegions.values()) {
+ byte[] name = r.getRegionName();
+ int stores = 0;
+ int storefiles = 0;
+ int memcacheSizeMB = (int)(r.memcacheSize.get()/1024/1024);
+ int storefileIndexSizeMB = 0;
+ synchronized (r.stores) {
+ stores += r.stores.size();
+ for (HStore store: r.stores.values()) {
+ storefiles += store.getStorefilesCount();
+ storefileIndexSizeMB +=
+ (int)(store.getStorefilesIndexSize()/1024/1024);
+ }
+ }
+ hsl.addRegionInfo(name, stores, storefiles, memcacheSizeMB,
+ storefileIndexSizeMB);
+ }
+ this.serverInfo.setLoad(hsl);
+ if (LOG.isDebugEnabled())
+ LOG.debug("sending server load: " + hsl);
this.requestCount.set(0);
HMsg msgs[] = hbaseMaster.regionServerReport(
serverInfo, outboundArray, getMostLoadedRegions());
@@ -862,7 +886,13 @@
while(!stopRequested.get()) {
try {
this.requestCount.set(0);
- this.serverInfo.setLoad(new HServerLoad(0, onlineRegions.size(), 0, 0));
+ MemoryUsage memory =
+ ManagementFactory.getMemoryMXBean().getHeapMemoryUsage();
+ HServerLoad hsl = new HServerLoad(0, (int)memory.getUsed()/1024/1024,
+ (int)memory.getMax()/1024/1024);
+ this.serverInfo.setLoad(hsl);
+ if (LOG.isDebugEnabled())
+ LOG.debug("sending initial server load: " + hsl);
lastMsg = System.currentTimeMillis();
result = this.hbaseMaster.regionServerStartup(serverInfo);
break;
Modified: hadoop/hbase/trunk/src/test/org/apache/hadoop/hbase/TestToString.java
URL: http://svn.apache.org/viewvc/hadoop/hbase/trunk/src/test/org/apache/hadoop/hbase/TestToString.java?rev=720670&r1=720669&r2=720670&view=diff
==============================================================================
--- hadoop/hbase/trunk/src/test/org/apache/hadoop/hbase/TestToString.java (original)
+++ hadoop/hbase/trunk/src/test/org/apache/hadoop/hbase/TestToString.java Tue Nov 25 15:43:37 2008
@@ -32,8 +32,5 @@
final String hostport = "127.0.0.1:9999";
HServerAddress address = new HServerAddress(hostport);
assertEquals("HServerAddress toString", address.toString(), hostport);
- HServerInfo info = new HServerInfo(address, -1, 60030);
- assertEquals("HServerInfo", "address: " + hostport + ", startcode: -1" +
- ", load: (requests: 0 regions: 0)", info.toString());
}
}