cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From alek...@apache.org
Subject [1/5] git commit: revert #7275
Date Fri, 20 Jun 2014 22:23:53 GMT
Repository: cassandra
Updated Branches:
  refs/heads/trunk d2a3827a6 -> e88c83006


revert #7275


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

Branch: refs/heads/trunk
Commit: 93f54fc44461c995ff30d42f284c78d1a9a02723
Parents: cccdcb5
Author: Jonathan Ellis <jbellis@apache.org>
Authored: Fri Jun 20 15:31:52 2014 -0500
Committer: Jonathan Ellis <jbellis@apache.org>
Committed: Fri Jun 20 15:31:52 2014 -0500

----------------------------------------------------------------------
 CHANGES.txt                                    |  1 -
 src/java/org/apache/cassandra/db/Memtable.java | 14 ++++----------
 2 files changed, 4 insertions(+), 11 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/93f54fc4/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 186b4a1..d84f267 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -2,7 +2,6 @@
  * Handle possible integer overflow in FastByteArrayOutputStream (CASSANDRA-7373)
  * cqlsh: 'ascii' values weren't formatted as text (CASSANDRA-7407)
  * cqlsh: ignore .cassandra permission errors (CASSANDRA-7266)
- * Errors in FlushRunnable may leave threads hung (CASSANDRA-7275)
  * reduce failure detector initial value to 2s (CASSANDRA-7307)
  * Fix problem truncating on a node that was previously in a dead state (CASSANDRA-7318)
  * Don't insert tombstones that hide indexed values into 2i (CASSANDRA-7268)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/93f54fc4/src/java/org/apache/cassandra/db/Memtable.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/db/Memtable.java b/src/java/org/apache/cassandra/db/Memtable.java
index 90f0466..b6fceda 100644
--- a/src/java/org/apache/cassandra/db/Memtable.java
+++ b/src/java/org/apache/cassandra/db/Memtable.java
@@ -380,17 +380,11 @@ public class Memtable
 
         protected void runWith(File sstableDirectory) throws Exception
         {
-            try
-            {
-                assert sstableDirectory != null : "Flush task is not bound to any disk";
+            assert sstableDirectory != null : "Flush task is not bound to any disk";
 
-                SSTableReader sstable = writeSortedContents(context, sstableDirectory);
-                cfs.replaceFlushed(Memtable.this, sstable);
-            }
-            finally
-            {
-                latch.countDown();
-            }
+            SSTableReader sstable = writeSortedContents(context, sstableDirectory);
+            cfs.replaceFlushed(Memtable.this, sstable);
+            latch.countDown();
         }
 
         protected Directories getDirectories()


Mime
View raw message