Skip to content
Browse files

merge from 0.8

  • Loading branch information...
2 parents 505e196 + 359391f commit 2d8ef13cce98c166aa175508b6c127efb7f6e9ae @jbellis jbellis committed
Showing with 17 additions and 1 deletion.
  1. +15 −0 CHANGES.txt
  2. +2 −1 src/java/org/apache/cassandra/db/commitlog/CommitLog.java
View
15 CHANGES.txt
@@ -13,6 +13,8 @@
Merged from 0.8:
* (Pig) fix CassandraStorage to use correct comparator in Super ColumnFamily
case (CASSANDRA-3251)
+ * fix thread safety issues in commitlog replay, primarily affecting
+ systems with many (100s) of CF definitions (CASSANDRA-3751)
1.0.7
@@ -82,6 +84,19 @@ Merged from 0.8:
* add back partitioner to sstable metadata (CASSANDRA-3540)
* fix NPE in get_count for counters (CASSANDRA-3601)
Merged from 0.8:
+||||||| merged common ancestors
+
+
+0.8.9
+ * avoid logging (harmless) exception when GC takes < 1ms (CASSANDRA-3656)
+=======
+ * block on flush before compacting hints (may prevent OOM) (CASSANDRA-3733)
+ * (Pig) fix CassandraStorage to use correct comparator in Super ColumnFamily
+ case (CASSANDRA-3251)
+
+0.8.9
+ * avoid logging (harmless) exception when GC takes < 1ms (CASSANDRA-3656)
+>>>>>>> cassandra-0.8
* remove invalid assertion that table was opened before dropping it
(CASSANDRA-3580)
* range and index scans now only send requests to enough replicas to
View
3 src/java/org/apache/cassandra/db/commitlog/CommitLog.java
@@ -48,6 +48,7 @@
import org.apache.cassandra.utils.ByteBufferUtil;
import org.apache.cassandra.utils.FBUtilities;
import org.apache.cassandra.utils.WrappedRunnable;
+import org.cliffc.high_scale_lib.NonBlockingHashSet;
import javax.management.MBeanServer;
import javax.management.ObjectName;
@@ -182,7 +183,7 @@ public boolean accept(File dir, String name)
// returns the number of replayed mutation (useful for tests in particular)
public static int recover(File[] clogs) throws IOException
{
- final Set<Table> tablesRecovered = new HashSet<Table>();
+ final Set<Table> tablesRecovered = new NonBlockingHashSet<Table>();
List<Future<?>> futures = new ArrayList<Future<?>>();
byte[] bytes = new byte[4096];
Map<Integer, AtomicInteger> invalidMutations = new HashMap<Integer, AtomicInteger>();

0 comments on commit 2d8ef13

Please sign in to comment.
Something went wrong with that request. Please try again.