Author: jbellis
Date: Thu Aug 25 15:36:57 2011
New Revision: 1161607
URL: http://svn.apache.org/viewvc?rev=1161607&view=rev
Log:
r/m failing assert to match 1161167 in 0.8
Modified:
cassandra/branches/cassandra-0.7/CHANGES.txt
cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/service/GCInspector.java
Modified: cassandra/branches/cassandra-0.7/CHANGES.txt
URL:
http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.7/CHANGES.txt?rev=1161607&r1=1161606&r2=1161607&view=diff
==============================================================================
--- cassandra/branches/cassandra-0.7/CHANGES.txt (original)
+++ cassandra/branches/cassandra-0.7/CHANGES.txt Thu Aug 25 15:36:57 2011
@@ -9,7 +9,7 @@
CompactionManager.estimatedCompactions (CASSANDRA-2708)
* remove gossip state when a new IP takes over a token (CASSANDRA-3071)
* work around native memory leak in com.sun.management.GarbageCollectorMXBean
- (CASSANDRA-2868)
+ (CASSANDRA-2868, 3076)
0.7.8
Modified:
cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/service/GCInspector.java
URL:
http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/service/GCInspector.java?rev=1161607&r1=1161606&r2=1161607&view=diff
==============================================================================
---
cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/service/GCInspector.java
(original)
+++
cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/service/GCInspector.java
Thu Aug 25 15:36:57 2011
@@ -106,7 +106,6 @@ public class GCInspector
if (previousCount == null)
previousCount = 0L;
gccounts.put(gc.getName(), count);
- assert count > previousCount;
MemoryUsage mu = membean.getHeapMemoryUsage();
long memoryUsed = mu.getUsed();