cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jmcken...@apache.org
Subject [15/15] cassandra git commit: Merge branch 'cassandra-3.5' into trunk
Date Fri, 01 Apr 2016 15:55:52 GMT
Merge branch 'cassandra-3.5' into trunk


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/6d1254ac
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/6d1254ac
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/6d1254ac

Branch: refs/heads/trunk
Commit: 6d1254ac238604f5fe6c5660eb72d40959626651
Parents: bdae452 af9b9cd
Author: Josh McKenzie <josh.mckenzie@datastax.com>
Authored: Fri Apr 1 11:54:51 2016 -0400
Committer: Josh McKenzie <josh.mckenzie@datastax.com>
Committed: Fri Apr 1 11:54:51 2016 -0400

----------------------------------------------------------------------
 CHANGES.txt                                     |   1 +
 .../apache/cassandra/db/ColumnFamilyStore.java  | 134 ++++++++++------
 .../org/apache/cassandra/db/Directories.java    |  16 +-
 src/java/org/apache/cassandra/db/Memtable.java  |  29 +++-
 .../db/commitlog/CommitLogSegmentManager.java   |   4 +-
 .../cassandra/io/util/DiskAwareRunnable.java    |  56 -------
 .../apache/cassandra/cql3/OutOfSpaceTest.java   | 157 +++++++++++++++++++
 7 files changed, 276 insertions(+), 121 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/6d1254ac/CHANGES.txt
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/cassandra/blob/6d1254ac/src/java/org/apache/cassandra/db/ColumnFamilyStore.java
----------------------------------------------------------------------
diff --cc src/java/org/apache/cassandra/db/ColumnFamilyStore.java
index a6645b5,6e01b34..b47cf85
--- a/src/java/org/apache/cassandra/db/ColumnFamilyStore.java
+++ b/src/java/org/apache/cassandra/db/ColumnFamilyStore.java
@@@ -1128,17 -1149,10 +1160,15 @@@ public class ColumnFamilyStore implemen
                          }
                      }
                  }
-                 memtable.cfs.replaceFlushed(memtable, sstables);
-                 reclaim(memtable);
+             }
+             memtable.cfs.replaceFlushed(memtable, sstables);
+             reclaim(memtable);
 -            logger.debug("Flushed to {} ({} sstables, {} bytes), biggest {} bytes, smallest
{} bytes", sstables, sstables.size(), totalBytesOnDisk, maxBytesOnDisk, minBytesOnDisk);
 +                logger.debug("Flushed to {} ({} sstables, {}), biggest {}, smallest {}",
 +                             sstables,
 +                             sstables.size(),
 +                             FBUtilities.prettyPrintMemory(totalBytesOnDisk),
 +                             FBUtilities.prettyPrintMemory(maxBytesOnDisk),
 +                             FBUtilities.prettyPrintMemory(minBytesOnDisk));
-             }
-             // signal the post-flush we've done our work
-             postFlush.latch.countDown();
          }
  
          private void reclaim(final Memtable memtable)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/6d1254ac/src/java/org/apache/cassandra/db/Memtable.java
----------------------------------------------------------------------


Mime
View raw message