natas_hw
/
cassandra
mirror of https://github.com/apache/cassandra
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

merge from 0.6 

git-svn-id: https://svn.apache.org/repos/asf/cassandra/trunk@980796 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Gary Dusbabek 2010-07-30 14:02:56 +00:00
parent ab6b05f820
commit 3adc03e6e4
3 changed files with 123 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
CHANGES.txt
View File

@ -44,6 +44,12 @@ dev
* add IntegerType (CASSANDRA-1282)
* page within a single row during hinted handoff (CASSANDRA-1327)
0.6.5
* page within a single row during hinted handoff (CASSANDRA-1327)
* fix compilation on non-sun JKDs (CASSANDRA-1061)
0.6.4
* avoid queuing multiple hint deliveries for the same endpoint
(CASSANDRA-1229)

6
debian/changelog vendored
View File

@ -1,3 +1,9 @@
cassandra (0.6.4) unstable; urgency=low
* New stable point release.
-- Eric Evans <eevans@apache.org> Tue, 27 Jul 2010 15:47:09 -0500
cassandra (0.6.3) unstable; urgency=low
* New stable point release.

129
src/java/org/apache/cassandra/service/GCInspector.java
View File

@ -23,15 +23,12 @@ package org.apache.cassandra.service;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
import java.util.*;
import java.util.concurrent.ExecutorService;
import org.apache.cassandra.concurrent.JMXEnabledThreadPoolExecutor;
import org.apache.cassandra.utils.WrappedRunnable;
import org.apache.cassandra.concurrent.IExecutorMBean;
import org.apache.cassandra.db.CompactionManagerMBean;
import com.sun.management.GarbageCollectorMXBean;
import com.sun.management.GcInfo;
import java.lang.management.MemoryUsage;
import java.lang.management.ManagementFactory;
import javax.management.JMX;
@ -51,17 +48,30 @@ public class GCInspector
private HashMap<String, Long> gctimes = new HashMap<String, Long>();
private final MBeanServer server = ManagementFactory.getPlatformMBeanServer();
List<GarbageCollectorMXBean> beans = new ArrayList<GarbageCollectorMXBean>();
List<Object> beans = new ArrayList<Object>(); // these are instances of com.sun.management.GarbageCollectorMXBean
public GCInspector()
{
// we only want this class to do its thing on sun jdks, or when the sun classes are present.
Class gcBeanClass = null;
try
{
gcBeanClass = Class.forName("com.sun.management.GarbageCollectorMXBean");
Class.forName("com.sun.management.GcInfo");
}
catch (ClassNotFoundException ex)
{
// this happens when using a non-sun jdk.
logger.warn("Cannot load sun GC monitoring classes. GCInspector is disabled.");
}
MBeanServer server = ManagementFactory.getPlatformMBeanServer();
try
{
ObjectName gcName = new ObjectName(ManagementFactory.GARBAGE_COLLECTOR_MXBEAN_DOMAIN_TYPE + ",*");
for (ObjectName name : server.queryNames(gcName, null))
{
GarbageCollectorMXBean gc = ManagementFactory.newPlatformMXBeanProxy(server, name.getCanonicalName(), GarbageCollectorMXBean.class);
Object gc = ManagementFactory.newPlatformMXBeanProxy(server, name.getCanonicalName(), gcBeanClass);
beans.add(gc);
}
}
@ -73,6 +83,9 @@ public class GCInspector
public void start()
{
// don't bother starting a thread that will do nothing.
if (beans.size() == 0)
return;
TimerTask t = new TimerTask()
{
public void run()
@ -85,25 +98,25 @@ public class GCInspector
private void logIntervalGCStats()
{
for (GarbageCollectorMXBean gc : beans)
for (Object gc : beans)
{
GcInfo gci = gc.getLastGcInfo();
if (gci == null)
SunGcWrapper gcw = new SunGcWrapper(gc);
if (gcw.isLastGcInfoNull())
continue;
Long previous = gctimes.get(gc.getName());
if (previous != null && previous == gc.getCollectionTime())
Long previous = gctimes.get(gcw.getName());
if (previous != null && previous.longValue() == gcw.getCollectionTime().longValue())
continue;
gctimes.put(gc.getName(), gc.getCollectionTime());
gctimes.put(gcw.getName(), gcw.getCollectionTime());
long previousMemoryUsed = 0;
long memoryUsed = 0;
long memoryMax = 0;
for (Map.Entry<String, MemoryUsage> entry : gci.getMemoryUsageBeforeGc().entrySet())
for (Map.Entry<String, MemoryUsage> entry : gcw.getMemoryUsageBeforeGc().entrySet())
{
previousMemoryUsed += entry.getValue().getUsed();
}
for (Map.Entry<String, MemoryUsage> entry : gci.getMemoryUsageAfterGc().entrySet())
for (Map.Entry<String, MemoryUsage> entry : gcw.getMemoryUsageAfterGc().entrySet())
{
MemoryUsage mu = entry.getValue();
memoryUsed += mu.getUsed();
@ -111,12 +124,12 @@ public class GCInspector
}
String st = String.format("GC for %s: %s ms, %s reclaimed leaving %s used; max is %s",
gc.getName(), gci.getDuration(), previousMemoryUsed - memoryUsed, memoryUsed, memoryMax);
if (gci.getDuration() > MIN_DURATION)
gcw.getName(), gcw.getDuration(), previousMemoryUsed - memoryUsed, memoryUsed, memoryMax);
if (gcw.getDuration() > MIN_DURATION)
logger.info(st);
else if (logger.isDebugEnabled())
logger.debug(st);
if (gci.getDuration() > MIN_DURATION_TPSTATS)
if (gcw.getDuration() > MIN_DURATION_TPSTATS)
{
try
{
@ -147,4 +160,84 @@ public class GCInspector
CompactionManagerMBean cmProxy = JMX.newMBeanProxy(server, cm, CompactionManagerMBean.class);
logger.info(String.format("%-25s%10s%10s", "CompactionManager", "n/a", cmProxy.getPendingTasks()));
}
// wrapper for sun class. this enables other jdks to compile this class.
private final class SunGcWrapper
{
private Map<String, MemoryUsage> usageBeforeGc = null;
private Map<String, MemoryUsage> usageAfterGc = null;
private String name;
private Long collectionTime;
private Long duration;
SunGcWrapper(Object gcMxBean)
{
// if we've gotten this far, we've already verified that the right classes are in the CP. Now we just
// need to check for boneheadedness.
// grab everything we need here so that we don't have to deal with try/catch everywhere.
try
{
assert Class.forName("com.sun.management.GarbageCollectorMXBean").isAssignableFrom(gcMxBean.getClass());
Method getGcInfo = gcMxBean.getClass().getDeclaredMethod("getLastGcInfo");
Object lastGcInfo = getGcInfo.invoke(gcMxBean);
if (lastGcInfo != null)
{
usageBeforeGc = (Map<String, MemoryUsage>)lastGcInfo.getClass().getDeclaredMethod("getMemoryUsageBeforeGc").invoke(lastGcInfo);
usageAfterGc = (Map<String, MemoryUsage>)lastGcInfo.getClass().getDeclaredMethod("getMemoryUsageAfterGc").invoke(lastGcInfo);
duration = (Long)lastGcInfo.getClass().getDeclaredMethod("getDuration").invoke(lastGcInfo);
name = (String)gcMxBean.getClass().getDeclaredMethod("getName").invoke(gcMxBean);
collectionTime = (Long)gcMxBean.getClass().getDeclaredMethod("getCollectionTime").invoke(gcMxBean);
}
}
catch (ClassNotFoundException e)
{
throw new RuntimeException(e);
}
catch (NoSuchMethodException e)
{
throw new RuntimeException(e);
}
catch (IllegalAccessException e)
{
throw new RuntimeException(e);
}
catch (InvocationTargetException e)
{
throw new RuntimeException(e);
}
}
String getName()
{
return name;
}
Long getCollectionTime()
{
return collectionTime;
}
Long getDuration()
{
return duration;
}
Map<String, MemoryUsage> getMemoryUsageAfterGc()
{
return usageAfterGc;
}
Map<String, MemoryUsage> getMemoryUsageBeforeGc()
{
return usageBeforeGc;
}
boolean isLastGcInfoNull()
{
return usageBeforeGc == null;
}
}
}