svn commit: r1202818 - in /cassandra/branches/cassandra-1.0: CHANGES.txt src/java/org/apache/cassandra/db/DataTracker.java

[jb...@apache.org]

Author: jbellis
Date: Wed Nov 16 18:07:39 2011
New Revision: 1202818

URL: http://svn.apache.org/viewvc?rev=1202818&view=rev
Log:
fix "liveSize" stat when sstables are removed
patch by Jackson Chung; reviewed by jbellis and slebresne for CASSANDRA-3496

Modified:
    cassandra/branches/cassandra-1.0/CHANGES.txt
    cassandra/branches/cassandra-1.0/src/java/org/apache/cassandra/db/DataTracker.java

Modified: cassandra/branches/cassandra-1.0/CHANGES.txt
URL: http://svn.apache.org/viewvc/cassandra/branches/cassandra-1.0/CHANGES.txt?rev=1202818&r1=1202817&r2=1202818&view=diff
==============================================================================
--- cassandra/branches/cassandra-1.0/CHANGES.txt (original)
+++ cassandra/branches/cassandra-1.0/CHANGES.txt Wed Nov 16 18:07:39 2011
@@ -1,3 +1,7 @@
+1.0.4
+ * fix "liveSize" stat when sstables are removed (CASSANDRA-3496)
+
+
 1.0.3
  * revert name-based query defragmentation aka CASSANDRA-2503 (CASSANDRA-3491)
  * fix invalidate-related test failures (CASSANDRA-3437)
@@ -27,6 +31,7 @@ Merged from 0.8:
  * `describe ring` command for CLI (CASSANDRA-3220)
  * (Hadoop) skip empty rows when entire row is requested, redux (CASSANDRA-2855)
 
+
 1.0.2
  * "defragment" rows for name-based queries under STCS (CASSANDRA-2503)
  * cleanup usage of StorageService.setMode() (CASANDRA-3388)

Modified: cassandra/branches/cassandra-1.0/src/java/org/apache/cassandra/db/DataTracker.java
URL: http://svn.apache.org/viewvc/cassandra/branches/cassandra-1.0/src/java/org/apache/cassandra/db/DataTracker.java?rev=1202818&r1=1202817&r2=1202818&view=diff
==============================================================================
--- cassandra/branches/cassandra-1.0/src/java/org/apache/cassandra/db/DataTracker.java (original)
+++ cassandra/branches/cassandra-1.0/src/java/org/apache/cassandra/db/DataTracker.java Wed Nov 16 18:07:39 2011
@@ -298,9 +298,9 @@ public class DataTracker
             if (logger.isDebugEnabled())
                 logger.debug(String.format("removing %s from list of files tracked for %s.%s",
                             sstable.descriptor, cfstore.table.name, cfstore.getColumnFamilyName()));
+            liveSize.addAndGet(-sstable.bytesOnDisk());
             sstable.markCompacted();
             sstable.releaseReference();
-            liveSize.addAndGet(-sstable.bytesOnDisk());
         }
     }