[3/4] cassandra git commit: Merge branch 'cassandra-2.2' into cassandra-3.0
Merge branch 'cassandra-2.2' into cassandra-3.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/71bca780
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/71bca780
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/71bca780
Branch: refs/heads/cassandra-3.1
Commit: 71bca78006829221c92cc336878da36bb846d28e
Parents: 5fd6c54 96b7603
Author: Marcus Eriksson
Authored: Thu Nov 26 08:36:33 2015 +0100
Committer: Marcus Eriksson
Committed: Thu Nov 26 08:36:33 2015 +0100
--
CHANGES.txt | 1 +
.../db/compaction/CompactionManager.java| 6 +-
.../org/apache/cassandra/db/CleanupTest.java| 77
3 files changed, 82 insertions(+), 2 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cassandra/blob/71bca780/CHANGES.txt
--
diff --cc CHANGES.txt
index f95f079,a548c9f..db6c72f
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -13,8 -3,18 +13,9 @@@ Merged from 2.2
* Fix SimpleDateType type compatibility (CASSANDRA-10027)
* (Hadoop) fix splits calculation (CASSANDRA-10640)
* (Hadoop) ensure that Cluster instances are always closed (CASSANDRA-10058)
- * (cqlsh) show partial trace if incomplete after max_trace_wait
(CASSANDRA-7645)
- * Use most up-to-date version of schema for system tables (CASSANDRA-10652)
- * Deprecate memory_allocator in cassandra.yaml (CASSANDRA-10581,10628)
- * Expose phi values from failure detector via JMX and tweak debug
- and trace logging (CASSANDRA-9526)
- * Fix RangeNamesQueryPager (CASSANDRA-10509)
- * Deprecate Pig support (CASSANDRA-10542)
- * Reduce contention getting instances of CompositeType (CASSANDRA-10433)
Merged from 2.1:
+ * Fix the sstable-needs-cleanup check (CASSANDRA-10740)
* (cqlsh) Print column names before COPY operation (CASSANDRA-8935)
- * Make paging logic consistent between searcher impls (CASSANDRA-10683)
* Fix CompressedInputStream for proper cleanup (CASSANDRA-10012)
* (cqlsh) Support counters in COPY commands (CASSANDRA-9043)
* Try next replica if not possible to connect to primary replica on
http://git-wip-us.apache.org/repos/asf/cassandra/blob/71bca780/src/java/org/apache/cassandra/db/compaction/CompactionManager.java
--
http://git-wip-us.apache.org/repos/asf/cassandra/blob/71bca780/test/unit/org/apache/cassandra/db/CleanupTest.java
--
diff --cc test/unit/org/apache/cassandra/db/CleanupTest.java
index a4aca7f,0115ad9..167f3b0
--- a/test/unit/org/apache/cassandra/db/CleanupTest.java
+++ b/test/unit/org/apache/cassandra/db/CleanupTest.java
@@@ -32,15 -35,19 +35,17 @@@ import org.junit.Test
import org.apache.cassandra.SchemaLoader;
import org.apache.cassandra.Util;
-import org.apache.cassandra.config.KSMetaData;
+import org.apache.cassandra.config.ColumnDefinition;
import org.apache.cassandra.cql3.Operator;
-import org.apache.cassandra.db.filter.IDiskAtomFilter;
-import org.apache.cassandra.db.columniterator.IdentityQueryFilter;
import org.apache.cassandra.db.compaction.CompactionManager;
-import org.apache.cassandra.db.index.SecondaryIndex;
+import org.apache.cassandra.db.filter.RowFilter;
import org.apache.cassandra.dht.ByteOrderedPartitioner.BytesToken;
+ import org.apache.cassandra.dht.Range;
import org.apache.cassandra.exceptions.ConfigurationException;
import org.apache.cassandra.io.sstable.format.SSTableReader;
-import org.apache.cassandra.locator.SimpleStrategy;
+ import org.apache.cassandra.dht.Token;
import org.apache.cassandra.locator.TokenMetadata;
+import org.apache.cassandra.schema.KeyspaceParams;
import org.apache.cassandra.service.StorageService;
import org.apache.cassandra.utils.ByteBufferUtil;
@@@ -165,10 -182,83 +170,82 @@@ public class CleanupTes
tmd.updateNormalToken(new BytesToken(tk2),
InetAddress.getByName("127.0.0.2"));
CompactionManager.instance.performCleanup(cfs);
-rows = Util.getRangeSlice(cfs);
-assertEquals(0, rows.size());
+assertEquals(0, Util.getAll(Util.cmd(cfs).build()).size());
}
+ @Test
+ public void testNeedsCleanup() throws Exception
+ {
+ // setup
+ StorageService.instance.getTokenMetadata().clearUnsafe();
+ Keyspace keyspace = Keyspace.open(KEYSPACE1);
-ColumnFamilyStore cfs = keyspace.getColumnFamilyStore(CF1);
-fillCF(cfs, LOOPS);
++ColumnFamilyStore cfs = keyspace.getColumnFamilyStore(CF_STANDARD1);
++fillCF(cfs, "val", LOOPS);
+
+ // prepare SSTable and some useful tokens
-SSTableReader ssTable = cfs.getSSTables().
[1/5] cassandra git commit: Fix the sstable-needs-cleanup check
Repository: cassandra
Updated Branches:
refs/heads/trunk 07bc6884b -> 10eda8b57
Fix the sstable-needs-cleanup check
Patch by Jakub Janecek; reviewed by marcuse for CASSANDRA-10740
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/3d99418c
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/3d99418c
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/3d99418c
Branch: refs/heads/trunk
Commit: 3d99418cfd641b30b393c9e61cc2b4f5e864d14d
Parents: 9768e57
Author: Jakub Janecek
Authored: Wed Nov 25 13:51:14 2015 +0100
Committer: Marcus Eriksson
Committed: Thu Nov 26 08:25:31 2015 +0100
--
CHANGES.txt | 1 +
.../db/compaction/CompactionManager.java| 6 +-
.../org/apache/cassandra/db/CleanupTest.java| 75
3 files changed, 80 insertions(+), 2 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cassandra/blob/3d99418c/CHANGES.txt
--
diff --git a/CHANGES.txt b/CHANGES.txt
index 8548d71..3ede9b7 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
2.1.12
+ * Fix the sstable-needs-cleanup check (CASSANDRA-10740)
* (cqlsh) Print column names before COPY operation (CASSANDRA-8935)
* Add Native-Transport-Requests back to tpstats (CASSANDRA-10044)
* Make paging logic consistent between searcher impls (CASSANDRA-10683)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/3d99418c/src/java/org/apache/cassandra/db/compaction/CompactionManager.java
--
diff --git a/src/java/org/apache/cassandra/db/compaction/CompactionManager.java
b/src/java/org/apache/cassandra/db/compaction/CompactionManager.java
index b85eb51..b0ad244 100644
--- a/src/java/org/apache/cassandra/db/compaction/CompactionManager.java
+++ b/src/java/org/apache/cassandra/db/compaction/CompactionManager.java
@@ -44,6 +44,7 @@ import com.google.common.collect.Lists;
import com.google.common.collect.Multimap;
import com.google.common.collect.Multiset;
import com.google.common.collect.Sets;
+import com.google.common.annotations.VisibleForTesting;
import com.google.common.util.concurrent.*;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -690,7 +691,8 @@ public class CompactionManager implements
CompactionManagerMBean
* Determines if a cleanup would actually remove any data in this SSTable
based
* on a set of owned ranges.
*/
-static boolean needsCleanup(SSTableReader sstable,
Collection> ownedRanges)
+@VisibleForTesting
+public static boolean needsCleanup(SSTableReader sstable,
Collection> ownedRanges)
{
assert !ownedRanges.isEmpty(); // cleanup checks for this
@@ -729,7 +731,7 @@ public class CompactionManager implements
CompactionManagerMBean
}
Range nextRange = sortedRanges.get(i + 1);
-if (!nextRange.contains(firstBeyondRange.getToken()))
+if (firstBeyondRange.getToken().compareTo(nextRange.left) <= 0)
{
// we found a key in between the owned ranges
return true;
http://git-wip-us.apache.org/repos/asf/cassandra/blob/3d99418c/test/unit/org/apache/cassandra/db/CleanupTest.java
--
diff --git a/test/unit/org/apache/cassandra/db/CleanupTest.java
b/test/unit/org/apache/cassandra/db/CleanupTest.java
index 06f8997..1d04dfa 100644
--- a/test/unit/org/apache/cassandra/db/CleanupTest.java
+++ b/test/unit/org/apache/cassandra/db/CleanupTest.java
@@ -22,9 +22,11 @@ import java.io.IOException;
import java.net.InetAddress;
import java.net.UnknownHostException;
import java.nio.ByteBuffer;
+import java.util.AbstractMap;
import java.util.Arrays;
import java.util.LinkedList;
import java.util.List;
+import java.util.Map;
import java.util.concurrent.ExecutionException;
import java.util.concurrent.TimeUnit;
@@ -40,6 +42,7 @@ import org.apache.cassandra.db.index.SecondaryIndex;
import org.apache.cassandra.dht.BytesToken;
import org.apache.cassandra.dht.Range;
import org.apache.cassandra.io.sstable.SSTableReader;
+import org.apache.cassandra.dht.Token;
import org.apache.cassandra.locator.TokenMetadata;
import org.apache.cassandra.service.StorageService;
import org.apache.cassandra.utils.ByteBufferUtil;
@@ -168,6 +171,78 @@ public class CleanupTest extends SchemaLoader
assertEquals(0, rows.size());
}
+@Test
+public void testNeedsCleanup() throws Exception
+{
+// setup
+StorageService.instance.getTokenMetadata().clearUnsafe();
+Keyspace keyspace = Keyspace.open(KEYSPACE1);
+ColumnFamilyStore cfs = keyspace.getColumnFamilyStor
[5/5] cassandra git commit: Merge branch 'cassandra-3.1' into trunk
Merge branch 'cassandra-3.1' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/10eda8b5 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/10eda8b5 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/10eda8b5 Branch: refs/heads/trunk Commit: 10eda8b57d22672c34742891448e6cbab102559a Parents: 07bc688 c2ea8c4 Author: Marcus Eriksson Authored: Thu Nov 26 08:46:46 2015 +0100 Committer: Marcus Eriksson Committed: Thu Nov 26 08:46:46 2015 +0100 -- CHANGES.txt | 1 + .../db/compaction/CompactionManager.java| 6 +- .../org/apache/cassandra/db/CleanupTest.java| 77 3 files changed, 82 insertions(+), 2 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/10eda8b5/CHANGES.txt -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/10eda8b5/src/java/org/apache/cassandra/db/compaction/CompactionManager.java --
[2/4] cassandra git commit: Merge branch 'cassandra-2.1' into cassandra-2.2
Merge branch 'cassandra-2.1' into cassandra-2.2 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/96b7603d Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/96b7603d Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/96b7603d Branch: refs/heads/cassandra-3.1 Commit: 96b7603d9edfcbbc5cecd38bfe598056d8c564e1 Parents: cd75ecd 3d99418 Author: Marcus Eriksson Authored: Thu Nov 26 08:31:42 2015 +0100 Committer: Marcus Eriksson Committed: Thu Nov 26 08:31:42 2015 +0100 -- CHANGES.txt | 1 + .../db/compaction/CompactionManager.java| 6 +- .../org/apache/cassandra/db/CleanupTest.java| 75 3 files changed, 80 insertions(+), 2 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/96b7603d/CHANGES.txt -- diff --cc CHANGES.txt index 5ff53b6,3ede9b7..a548c9f --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,18 -1,7 +1,19 @@@ -2.1.12 +2.2.4 + * Don't do anticompaction after subrange repair (CASSANDRA-10422) + * Fix SimpleDateType type compatibility (CASSANDRA-10027) + * (Hadoop) fix splits calculation (CASSANDRA-10640) + * (Hadoop) ensure that Cluster instances are always closed (CASSANDRA-10058) + * (cqlsh) show partial trace if incomplete after max_trace_wait (CASSANDRA-7645) + * Use most up-to-date version of schema for system tables (CASSANDRA-10652) + * Deprecate memory_allocator in cassandra.yaml (CASSANDRA-10581,10628) + * Expose phi values from failure detector via JMX and tweak debug + and trace logging (CASSANDRA-9526) + * Fix RangeNamesQueryPager (CASSANDRA-10509) + * Deprecate Pig support (CASSANDRA-10542) + * Reduce contention getting instances of CompositeType (CASSANDRA-10433) +Merged from 2.1: + * Fix the sstable-needs-cleanup check (CASSANDRA-10740) * (cqlsh) Print column names before COPY operation (CASSANDRA-8935) - * Add Native-Transport-Requests back to tpstats (CASSANDRA-10044) * Make paging logic consistent between searcher impls (CASSANDRA-10683) * Fix CompressedInputStream for proper cleanup (CASSANDRA-10012) * (cqlsh) Support counters in COPY commands (CASSANDRA-9043) http://git-wip-us.apache.org/repos/asf/cassandra/blob/96b7603d/src/java/org/apache/cassandra/db/compaction/CompactionManager.java -- diff --cc src/java/org/apache/cassandra/db/compaction/CompactionManager.java index 0c6e24f,b0ad244..f3a69a6 --- a/src/java/org/apache/cassandra/db/compaction/CompactionManager.java +++ b/src/java/org/apache/cassandra/db/compaction/CompactionManager.java @@@ -27,7 -35,16 +27,8 @@@ import javax.management.ObjectName import javax.management.openmbean.OpenDataException; import javax.management.openmbean.TabularData; -import com.google.common.base.Predicate; -import com.google.common.base.Throwables; -import com.google.common.collect.ArrayListMultimap; -import com.google.common.collect.ConcurrentHashMultiset; -import com.google.common.collect.Iterables; -import com.google.common.collect.Lists; -import com.google.common.collect.Multimap; -import com.google.common.collect.Multiset; -import com.google.common.collect.Sets; + import com.google.common.annotations.VisibleForTesting; +import com.google.common.collect.*; import com.google.common.util.concurrent.*; import org.slf4j.Logger; import org.slf4j.LoggerFactory; http://git-wip-us.apache.org/repos/asf/cassandra/blob/96b7603d/test/unit/org/apache/cassandra/db/CleanupTest.java -- diff --cc test/unit/org/apache/cassandra/db/CleanupTest.java index 81f7d41,1d04dfa..0115ad9 --- a/test/unit/org/apache/cassandra/db/CleanupTest.java +++ b/test/unit/org/apache/cassandra/db/CleanupTest.java @@@ -33,17 -34,15 +35,18 @@@ import org.junit.Test import org.apache.cassandra.SchemaLoader; import org.apache.cassandra.Util; +import org.apache.cassandra.config.KSMetaData; import org.apache.cassandra.cql3.Operator; +import org.apache.cassandra.db.filter.IDiskAtomFilter; import org.apache.cassandra.db.columniterator.IdentityQueryFilter; import org.apache.cassandra.db.compaction.CompactionManager; -import org.apache.cassandra.db.filter.IDiskAtomFilter; import org.apache.cassandra.db.index.SecondaryIndex; -import org.apache.cassandra.dht.BytesToken; +import org.apache.cassandra.dht.ByteOrderedPartitioner.BytesToken; import org.apache.cassandra.dht.Range; -import org.apache.cassandra.io.sstable.SSTableReader; +import org.apache.cassandra.exceptions.ConfigurationException; +import org.apache.cassandra.io.sstable.format.SSTableReader; +import org.apache.cassandra.locator.SimpleStrategy; +
[3/3] cassandra git commit: Merge branch 'cassandra-2.2' into cassandra-3.0
Merge branch 'cassandra-2.2' into cassandra-3.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/71bca780
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/71bca780
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/71bca780
Branch: refs/heads/cassandra-3.0
Commit: 71bca78006829221c92cc336878da36bb846d28e
Parents: 5fd6c54 96b7603
Author: Marcus Eriksson
Authored: Thu Nov 26 08:36:33 2015 +0100
Committer: Marcus Eriksson
Committed: Thu Nov 26 08:36:33 2015 +0100
--
CHANGES.txt | 1 +
.../db/compaction/CompactionManager.java| 6 +-
.../org/apache/cassandra/db/CleanupTest.java| 77
3 files changed, 82 insertions(+), 2 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cassandra/blob/71bca780/CHANGES.txt
--
diff --cc CHANGES.txt
index f95f079,a548c9f..db6c72f
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -13,8 -3,18 +13,9 @@@ Merged from 2.2
* Fix SimpleDateType type compatibility (CASSANDRA-10027)
* (Hadoop) fix splits calculation (CASSANDRA-10640)
* (Hadoop) ensure that Cluster instances are always closed (CASSANDRA-10058)
- * (cqlsh) show partial trace if incomplete after max_trace_wait
(CASSANDRA-7645)
- * Use most up-to-date version of schema for system tables (CASSANDRA-10652)
- * Deprecate memory_allocator in cassandra.yaml (CASSANDRA-10581,10628)
- * Expose phi values from failure detector via JMX and tweak debug
- and trace logging (CASSANDRA-9526)
- * Fix RangeNamesQueryPager (CASSANDRA-10509)
- * Deprecate Pig support (CASSANDRA-10542)
- * Reduce contention getting instances of CompositeType (CASSANDRA-10433)
Merged from 2.1:
+ * Fix the sstable-needs-cleanup check (CASSANDRA-10740)
* (cqlsh) Print column names before COPY operation (CASSANDRA-8935)
- * Make paging logic consistent between searcher impls (CASSANDRA-10683)
* Fix CompressedInputStream for proper cleanup (CASSANDRA-10012)
* (cqlsh) Support counters in COPY commands (CASSANDRA-9043)
* Try next replica if not possible to connect to primary replica on
http://git-wip-us.apache.org/repos/asf/cassandra/blob/71bca780/src/java/org/apache/cassandra/db/compaction/CompactionManager.java
--
http://git-wip-us.apache.org/repos/asf/cassandra/blob/71bca780/test/unit/org/apache/cassandra/db/CleanupTest.java
--
diff --cc test/unit/org/apache/cassandra/db/CleanupTest.java
index a4aca7f,0115ad9..167f3b0
--- a/test/unit/org/apache/cassandra/db/CleanupTest.java
+++ b/test/unit/org/apache/cassandra/db/CleanupTest.java
@@@ -32,15 -35,19 +35,17 @@@ import org.junit.Test
import org.apache.cassandra.SchemaLoader;
import org.apache.cassandra.Util;
-import org.apache.cassandra.config.KSMetaData;
+import org.apache.cassandra.config.ColumnDefinition;
import org.apache.cassandra.cql3.Operator;
-import org.apache.cassandra.db.filter.IDiskAtomFilter;
-import org.apache.cassandra.db.columniterator.IdentityQueryFilter;
import org.apache.cassandra.db.compaction.CompactionManager;
-import org.apache.cassandra.db.index.SecondaryIndex;
+import org.apache.cassandra.db.filter.RowFilter;
import org.apache.cassandra.dht.ByteOrderedPartitioner.BytesToken;
+ import org.apache.cassandra.dht.Range;
import org.apache.cassandra.exceptions.ConfigurationException;
import org.apache.cassandra.io.sstable.format.SSTableReader;
-import org.apache.cassandra.locator.SimpleStrategy;
+ import org.apache.cassandra.dht.Token;
import org.apache.cassandra.locator.TokenMetadata;
+import org.apache.cassandra.schema.KeyspaceParams;
import org.apache.cassandra.service.StorageService;
import org.apache.cassandra.utils.ByteBufferUtil;
@@@ -165,10 -182,83 +170,82 @@@ public class CleanupTes
tmd.updateNormalToken(new BytesToken(tk2),
InetAddress.getByName("127.0.0.2"));
CompactionManager.instance.performCleanup(cfs);
-rows = Util.getRangeSlice(cfs);
-assertEquals(0, rows.size());
+assertEquals(0, Util.getAll(Util.cmd(cfs).build()).size());
}
+ @Test
+ public void testNeedsCleanup() throws Exception
+ {
+ // setup
+ StorageService.instance.getTokenMetadata().clearUnsafe();
+ Keyspace keyspace = Keyspace.open(KEYSPACE1);
-ColumnFamilyStore cfs = keyspace.getColumnFamilyStore(CF1);
-fillCF(cfs, LOOPS);
++ColumnFamilyStore cfs = keyspace.getColumnFamilyStore(CF_STANDARD1);
++fillCF(cfs, "val", LOOPS);
+
+ // prepare SSTable and some useful tokens
-SSTableReader ssTable = cfs.getSSTables().
[2/3] cassandra git commit: Merge branch 'cassandra-2.1' into cassandra-2.2
Merge branch 'cassandra-2.1' into cassandra-2.2 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/96b7603d Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/96b7603d Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/96b7603d Branch: refs/heads/cassandra-3.0 Commit: 96b7603d9edfcbbc5cecd38bfe598056d8c564e1 Parents: cd75ecd 3d99418 Author: Marcus Eriksson Authored: Thu Nov 26 08:31:42 2015 +0100 Committer: Marcus Eriksson Committed: Thu Nov 26 08:31:42 2015 +0100 -- CHANGES.txt | 1 + .../db/compaction/CompactionManager.java| 6 +- .../org/apache/cassandra/db/CleanupTest.java| 75 3 files changed, 80 insertions(+), 2 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/96b7603d/CHANGES.txt -- diff --cc CHANGES.txt index 5ff53b6,3ede9b7..a548c9f --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,18 -1,7 +1,19 @@@ -2.1.12 +2.2.4 + * Don't do anticompaction after subrange repair (CASSANDRA-10422) + * Fix SimpleDateType type compatibility (CASSANDRA-10027) + * (Hadoop) fix splits calculation (CASSANDRA-10640) + * (Hadoop) ensure that Cluster instances are always closed (CASSANDRA-10058) + * (cqlsh) show partial trace if incomplete after max_trace_wait (CASSANDRA-7645) + * Use most up-to-date version of schema for system tables (CASSANDRA-10652) + * Deprecate memory_allocator in cassandra.yaml (CASSANDRA-10581,10628) + * Expose phi values from failure detector via JMX and tweak debug + and trace logging (CASSANDRA-9526) + * Fix RangeNamesQueryPager (CASSANDRA-10509) + * Deprecate Pig support (CASSANDRA-10542) + * Reduce contention getting instances of CompositeType (CASSANDRA-10433) +Merged from 2.1: + * Fix the sstable-needs-cleanup check (CASSANDRA-10740) * (cqlsh) Print column names before COPY operation (CASSANDRA-8935) - * Add Native-Transport-Requests back to tpstats (CASSANDRA-10044) * Make paging logic consistent between searcher impls (CASSANDRA-10683) * Fix CompressedInputStream for proper cleanup (CASSANDRA-10012) * (cqlsh) Support counters in COPY commands (CASSANDRA-9043) http://git-wip-us.apache.org/repos/asf/cassandra/blob/96b7603d/src/java/org/apache/cassandra/db/compaction/CompactionManager.java -- diff --cc src/java/org/apache/cassandra/db/compaction/CompactionManager.java index 0c6e24f,b0ad244..f3a69a6 --- a/src/java/org/apache/cassandra/db/compaction/CompactionManager.java +++ b/src/java/org/apache/cassandra/db/compaction/CompactionManager.java @@@ -27,7 -35,16 +27,8 @@@ import javax.management.ObjectName import javax.management.openmbean.OpenDataException; import javax.management.openmbean.TabularData; -import com.google.common.base.Predicate; -import com.google.common.base.Throwables; -import com.google.common.collect.ArrayListMultimap; -import com.google.common.collect.ConcurrentHashMultiset; -import com.google.common.collect.Iterables; -import com.google.common.collect.Lists; -import com.google.common.collect.Multimap; -import com.google.common.collect.Multiset; -import com.google.common.collect.Sets; + import com.google.common.annotations.VisibleForTesting; +import com.google.common.collect.*; import com.google.common.util.concurrent.*; import org.slf4j.Logger; import org.slf4j.LoggerFactory; http://git-wip-us.apache.org/repos/asf/cassandra/blob/96b7603d/test/unit/org/apache/cassandra/db/CleanupTest.java -- diff --cc test/unit/org/apache/cassandra/db/CleanupTest.java index 81f7d41,1d04dfa..0115ad9 --- a/test/unit/org/apache/cassandra/db/CleanupTest.java +++ b/test/unit/org/apache/cassandra/db/CleanupTest.java @@@ -33,17 -34,15 +35,18 @@@ import org.junit.Test import org.apache.cassandra.SchemaLoader; import org.apache.cassandra.Util; +import org.apache.cassandra.config.KSMetaData; import org.apache.cassandra.cql3.Operator; +import org.apache.cassandra.db.filter.IDiskAtomFilter; import org.apache.cassandra.db.columniterator.IdentityQueryFilter; import org.apache.cassandra.db.compaction.CompactionManager; -import org.apache.cassandra.db.filter.IDiskAtomFilter; import org.apache.cassandra.db.index.SecondaryIndex; -import org.apache.cassandra.dht.BytesToken; +import org.apache.cassandra.dht.ByteOrderedPartitioner.BytesToken; import org.apache.cassandra.dht.Range; -import org.apache.cassandra.io.sstable.SSTableReader; +import org.apache.cassandra.exceptions.ConfigurationException; +import org.apache.cassandra.io.sstable.format.SSTableReader; +import org.apache.cassandra.locator.SimpleStrategy; +
[1/4] cassandra git commit: Fix the sstable-needs-cleanup check
Repository: cassandra
Updated Branches:
refs/heads/cassandra-3.1 138f8db85 -> c2ea8c4fc
Fix the sstable-needs-cleanup check
Patch by Jakub Janecek; reviewed by marcuse for CASSANDRA-10740
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/3d99418c
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/3d99418c
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/3d99418c
Branch: refs/heads/cassandra-3.1
Commit: 3d99418cfd641b30b393c9e61cc2b4f5e864d14d
Parents: 9768e57
Author: Jakub Janecek
Authored: Wed Nov 25 13:51:14 2015 +0100
Committer: Marcus Eriksson
Committed: Thu Nov 26 08:25:31 2015 +0100
--
CHANGES.txt | 1 +
.../db/compaction/CompactionManager.java| 6 +-
.../org/apache/cassandra/db/CleanupTest.java| 75
3 files changed, 80 insertions(+), 2 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cassandra/blob/3d99418c/CHANGES.txt
--
diff --git a/CHANGES.txt b/CHANGES.txt
index 8548d71..3ede9b7 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
2.1.12
+ * Fix the sstable-needs-cleanup check (CASSANDRA-10740)
* (cqlsh) Print column names before COPY operation (CASSANDRA-8935)
* Add Native-Transport-Requests back to tpstats (CASSANDRA-10044)
* Make paging logic consistent between searcher impls (CASSANDRA-10683)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/3d99418c/src/java/org/apache/cassandra/db/compaction/CompactionManager.java
--
diff --git a/src/java/org/apache/cassandra/db/compaction/CompactionManager.java
b/src/java/org/apache/cassandra/db/compaction/CompactionManager.java
index b85eb51..b0ad244 100644
--- a/src/java/org/apache/cassandra/db/compaction/CompactionManager.java
+++ b/src/java/org/apache/cassandra/db/compaction/CompactionManager.java
@@ -44,6 +44,7 @@ import com.google.common.collect.Lists;
import com.google.common.collect.Multimap;
import com.google.common.collect.Multiset;
import com.google.common.collect.Sets;
+import com.google.common.annotations.VisibleForTesting;
import com.google.common.util.concurrent.*;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -690,7 +691,8 @@ public class CompactionManager implements
CompactionManagerMBean
* Determines if a cleanup would actually remove any data in this SSTable
based
* on a set of owned ranges.
*/
-static boolean needsCleanup(SSTableReader sstable,
Collection> ownedRanges)
+@VisibleForTesting
+public static boolean needsCleanup(SSTableReader sstable,
Collection> ownedRanges)
{
assert !ownedRanges.isEmpty(); // cleanup checks for this
@@ -729,7 +731,7 @@ public class CompactionManager implements
CompactionManagerMBean
}
Range nextRange = sortedRanges.get(i + 1);
-if (!nextRange.contains(firstBeyondRange.getToken()))
+if (firstBeyondRange.getToken().compareTo(nextRange.left) <= 0)
{
// we found a key in between the owned ranges
return true;
http://git-wip-us.apache.org/repos/asf/cassandra/blob/3d99418c/test/unit/org/apache/cassandra/db/CleanupTest.java
--
diff --git a/test/unit/org/apache/cassandra/db/CleanupTest.java
b/test/unit/org/apache/cassandra/db/CleanupTest.java
index 06f8997..1d04dfa 100644
--- a/test/unit/org/apache/cassandra/db/CleanupTest.java
+++ b/test/unit/org/apache/cassandra/db/CleanupTest.java
@@ -22,9 +22,11 @@ import java.io.IOException;
import java.net.InetAddress;
import java.net.UnknownHostException;
import java.nio.ByteBuffer;
+import java.util.AbstractMap;
import java.util.Arrays;
import java.util.LinkedList;
import java.util.List;
+import java.util.Map;
import java.util.concurrent.ExecutionException;
import java.util.concurrent.TimeUnit;
@@ -40,6 +42,7 @@ import org.apache.cassandra.db.index.SecondaryIndex;
import org.apache.cassandra.dht.BytesToken;
import org.apache.cassandra.dht.Range;
import org.apache.cassandra.io.sstable.SSTableReader;
+import org.apache.cassandra.dht.Token;
import org.apache.cassandra.locator.TokenMetadata;
import org.apache.cassandra.service.StorageService;
import org.apache.cassandra.utils.ByteBufferUtil;
@@ -168,6 +171,78 @@ public class CleanupTest extends SchemaLoader
assertEquals(0, rows.size());
}
+@Test
+public void testNeedsCleanup() throws Exception
+{
+// setup
+StorageService.instance.getTokenMetadata().clearUnsafe();
+Keyspace keyspace = Keyspace.open(KEYSPACE1);
+ColumnFamilyStore cfs = keyspace.get
[4/5] cassandra git commit: Merge branch 'cassandra-3.0' into cassandra-3.1
Merge branch 'cassandra-3.0' into cassandra-3.1 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/c2ea8c4f Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/c2ea8c4f Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/c2ea8c4f Branch: refs/heads/trunk Commit: c2ea8c4fc82ec470710de51b41e6de429dfebc80 Parents: 138f8db 71bca78 Author: Marcus Eriksson Authored: Thu Nov 26 08:41:49 2015 +0100 Committer: Marcus Eriksson Committed: Thu Nov 26 08:41:49 2015 +0100 -- CHANGES.txt | 1 + .../db/compaction/CompactionManager.java| 6 +- .../org/apache/cassandra/db/CleanupTest.java| 77 3 files changed, 82 insertions(+), 2 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/c2ea8c4f/CHANGES.txt --
[1/3] cassandra git commit: Fix the sstable-needs-cleanup check
Repository: cassandra
Updated Branches:
refs/heads/cassandra-3.0 5fd6c545e -> 71bca7800
Fix the sstable-needs-cleanup check
Patch by Jakub Janecek; reviewed by marcuse for CASSANDRA-10740
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/3d99418c
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/3d99418c
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/3d99418c
Branch: refs/heads/cassandra-3.0
Commit: 3d99418cfd641b30b393c9e61cc2b4f5e864d14d
Parents: 9768e57
Author: Jakub Janecek
Authored: Wed Nov 25 13:51:14 2015 +0100
Committer: Marcus Eriksson
Committed: Thu Nov 26 08:25:31 2015 +0100
--
CHANGES.txt | 1 +
.../db/compaction/CompactionManager.java| 6 +-
.../org/apache/cassandra/db/CleanupTest.java| 75
3 files changed, 80 insertions(+), 2 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cassandra/blob/3d99418c/CHANGES.txt
--
diff --git a/CHANGES.txt b/CHANGES.txt
index 8548d71..3ede9b7 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
2.1.12
+ * Fix the sstable-needs-cleanup check (CASSANDRA-10740)
* (cqlsh) Print column names before COPY operation (CASSANDRA-8935)
* Add Native-Transport-Requests back to tpstats (CASSANDRA-10044)
* Make paging logic consistent between searcher impls (CASSANDRA-10683)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/3d99418c/src/java/org/apache/cassandra/db/compaction/CompactionManager.java
--
diff --git a/src/java/org/apache/cassandra/db/compaction/CompactionManager.java
b/src/java/org/apache/cassandra/db/compaction/CompactionManager.java
index b85eb51..b0ad244 100644
--- a/src/java/org/apache/cassandra/db/compaction/CompactionManager.java
+++ b/src/java/org/apache/cassandra/db/compaction/CompactionManager.java
@@ -44,6 +44,7 @@ import com.google.common.collect.Lists;
import com.google.common.collect.Multimap;
import com.google.common.collect.Multiset;
import com.google.common.collect.Sets;
+import com.google.common.annotations.VisibleForTesting;
import com.google.common.util.concurrent.*;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -690,7 +691,8 @@ public class CompactionManager implements
CompactionManagerMBean
* Determines if a cleanup would actually remove any data in this SSTable
based
* on a set of owned ranges.
*/
-static boolean needsCleanup(SSTableReader sstable,
Collection> ownedRanges)
+@VisibleForTesting
+public static boolean needsCleanup(SSTableReader sstable,
Collection> ownedRanges)
{
assert !ownedRanges.isEmpty(); // cleanup checks for this
@@ -729,7 +731,7 @@ public class CompactionManager implements
CompactionManagerMBean
}
Range nextRange = sortedRanges.get(i + 1);
-if (!nextRange.contains(firstBeyondRange.getToken()))
+if (firstBeyondRange.getToken().compareTo(nextRange.left) <= 0)
{
// we found a key in between the owned ranges
return true;
http://git-wip-us.apache.org/repos/asf/cassandra/blob/3d99418c/test/unit/org/apache/cassandra/db/CleanupTest.java
--
diff --git a/test/unit/org/apache/cassandra/db/CleanupTest.java
b/test/unit/org/apache/cassandra/db/CleanupTest.java
index 06f8997..1d04dfa 100644
--- a/test/unit/org/apache/cassandra/db/CleanupTest.java
+++ b/test/unit/org/apache/cassandra/db/CleanupTest.java
@@ -22,9 +22,11 @@ import java.io.IOException;
import java.net.InetAddress;
import java.net.UnknownHostException;
import java.nio.ByteBuffer;
+import java.util.AbstractMap;
import java.util.Arrays;
import java.util.LinkedList;
import java.util.List;
+import java.util.Map;
import java.util.concurrent.ExecutionException;
import java.util.concurrent.TimeUnit;
@@ -40,6 +42,7 @@ import org.apache.cassandra.db.index.SecondaryIndex;
import org.apache.cassandra.dht.BytesToken;
import org.apache.cassandra.dht.Range;
import org.apache.cassandra.io.sstable.SSTableReader;
+import org.apache.cassandra.dht.Token;
import org.apache.cassandra.locator.TokenMetadata;
import org.apache.cassandra.service.StorageService;
import org.apache.cassandra.utils.ByteBufferUtil;
@@ -168,6 +171,78 @@ public class CleanupTest extends SchemaLoader
assertEquals(0, rows.size());
}
+@Test
+public void testNeedsCleanup() throws Exception
+{
+// setup
+StorageService.instance.getTokenMetadata().clearUnsafe();
+Keyspace keyspace = Keyspace.open(KEYSPACE1);
+ColumnFamilyStore cfs = keyspace.get
[2/5] cassandra git commit: Merge branch 'cassandra-2.1' into cassandra-2.2
Merge branch 'cassandra-2.1' into cassandra-2.2 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/96b7603d Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/96b7603d Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/96b7603d Branch: refs/heads/trunk Commit: 96b7603d9edfcbbc5cecd38bfe598056d8c564e1 Parents: cd75ecd 3d99418 Author: Marcus Eriksson Authored: Thu Nov 26 08:31:42 2015 +0100 Committer: Marcus Eriksson Committed: Thu Nov 26 08:31:42 2015 +0100 -- CHANGES.txt | 1 + .../db/compaction/CompactionManager.java| 6 +- .../org/apache/cassandra/db/CleanupTest.java| 75 3 files changed, 80 insertions(+), 2 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/96b7603d/CHANGES.txt -- diff --cc CHANGES.txt index 5ff53b6,3ede9b7..a548c9f --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,18 -1,7 +1,19 @@@ -2.1.12 +2.2.4 + * Don't do anticompaction after subrange repair (CASSANDRA-10422) + * Fix SimpleDateType type compatibility (CASSANDRA-10027) + * (Hadoop) fix splits calculation (CASSANDRA-10640) + * (Hadoop) ensure that Cluster instances are always closed (CASSANDRA-10058) + * (cqlsh) show partial trace if incomplete after max_trace_wait (CASSANDRA-7645) + * Use most up-to-date version of schema for system tables (CASSANDRA-10652) + * Deprecate memory_allocator in cassandra.yaml (CASSANDRA-10581,10628) + * Expose phi values from failure detector via JMX and tweak debug + and trace logging (CASSANDRA-9526) + * Fix RangeNamesQueryPager (CASSANDRA-10509) + * Deprecate Pig support (CASSANDRA-10542) + * Reduce contention getting instances of CompositeType (CASSANDRA-10433) +Merged from 2.1: + * Fix the sstable-needs-cleanup check (CASSANDRA-10740) * (cqlsh) Print column names before COPY operation (CASSANDRA-8935) - * Add Native-Transport-Requests back to tpstats (CASSANDRA-10044) * Make paging logic consistent between searcher impls (CASSANDRA-10683) * Fix CompressedInputStream for proper cleanup (CASSANDRA-10012) * (cqlsh) Support counters in COPY commands (CASSANDRA-9043) http://git-wip-us.apache.org/repos/asf/cassandra/blob/96b7603d/src/java/org/apache/cassandra/db/compaction/CompactionManager.java -- diff --cc src/java/org/apache/cassandra/db/compaction/CompactionManager.java index 0c6e24f,b0ad244..f3a69a6 --- a/src/java/org/apache/cassandra/db/compaction/CompactionManager.java +++ b/src/java/org/apache/cassandra/db/compaction/CompactionManager.java @@@ -27,7 -35,16 +27,8 @@@ import javax.management.ObjectName import javax.management.openmbean.OpenDataException; import javax.management.openmbean.TabularData; -import com.google.common.base.Predicate; -import com.google.common.base.Throwables; -import com.google.common.collect.ArrayListMultimap; -import com.google.common.collect.ConcurrentHashMultiset; -import com.google.common.collect.Iterables; -import com.google.common.collect.Lists; -import com.google.common.collect.Multimap; -import com.google.common.collect.Multiset; -import com.google.common.collect.Sets; + import com.google.common.annotations.VisibleForTesting; +import com.google.common.collect.*; import com.google.common.util.concurrent.*; import org.slf4j.Logger; import org.slf4j.LoggerFactory; http://git-wip-us.apache.org/repos/asf/cassandra/blob/96b7603d/test/unit/org/apache/cassandra/db/CleanupTest.java -- diff --cc test/unit/org/apache/cassandra/db/CleanupTest.java index 81f7d41,1d04dfa..0115ad9 --- a/test/unit/org/apache/cassandra/db/CleanupTest.java +++ b/test/unit/org/apache/cassandra/db/CleanupTest.java @@@ -33,17 -34,15 +35,18 @@@ import org.junit.Test import org.apache.cassandra.SchemaLoader; import org.apache.cassandra.Util; +import org.apache.cassandra.config.KSMetaData; import org.apache.cassandra.cql3.Operator; +import org.apache.cassandra.db.filter.IDiskAtomFilter; import org.apache.cassandra.db.columniterator.IdentityQueryFilter; import org.apache.cassandra.db.compaction.CompactionManager; -import org.apache.cassandra.db.filter.IDiskAtomFilter; import org.apache.cassandra.db.index.SecondaryIndex; -import org.apache.cassandra.dht.BytesToken; +import org.apache.cassandra.dht.ByteOrderedPartitioner.BytesToken; import org.apache.cassandra.dht.Range; -import org.apache.cassandra.io.sstable.SSTableReader; +import org.apache.cassandra.exceptions.ConfigurationException; +import org.apache.cassandra.io.sstable.format.SSTableReader; +import org.apache.cassandra.locator.SimpleStrategy; + import o
[3/5] cassandra git commit: Merge branch 'cassandra-2.2' into cassandra-3.0
Merge branch 'cassandra-2.2' into cassandra-3.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/71bca780
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/71bca780
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/71bca780
Branch: refs/heads/trunk
Commit: 71bca78006829221c92cc336878da36bb846d28e
Parents: 5fd6c54 96b7603
Author: Marcus Eriksson
Authored: Thu Nov 26 08:36:33 2015 +0100
Committer: Marcus Eriksson
Committed: Thu Nov 26 08:36:33 2015 +0100
--
CHANGES.txt | 1 +
.../db/compaction/CompactionManager.java| 6 +-
.../org/apache/cassandra/db/CleanupTest.java| 77
3 files changed, 82 insertions(+), 2 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cassandra/blob/71bca780/CHANGES.txt
--
diff --cc CHANGES.txt
index f95f079,a548c9f..db6c72f
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -13,8 -3,18 +13,9 @@@ Merged from 2.2
* Fix SimpleDateType type compatibility (CASSANDRA-10027)
* (Hadoop) fix splits calculation (CASSANDRA-10640)
* (Hadoop) ensure that Cluster instances are always closed (CASSANDRA-10058)
- * (cqlsh) show partial trace if incomplete after max_trace_wait
(CASSANDRA-7645)
- * Use most up-to-date version of schema for system tables (CASSANDRA-10652)
- * Deprecate memory_allocator in cassandra.yaml (CASSANDRA-10581,10628)
- * Expose phi values from failure detector via JMX and tweak debug
- and trace logging (CASSANDRA-9526)
- * Fix RangeNamesQueryPager (CASSANDRA-10509)
- * Deprecate Pig support (CASSANDRA-10542)
- * Reduce contention getting instances of CompositeType (CASSANDRA-10433)
Merged from 2.1:
+ * Fix the sstable-needs-cleanup check (CASSANDRA-10740)
* (cqlsh) Print column names before COPY operation (CASSANDRA-8935)
- * Make paging logic consistent between searcher impls (CASSANDRA-10683)
* Fix CompressedInputStream for proper cleanup (CASSANDRA-10012)
* (cqlsh) Support counters in COPY commands (CASSANDRA-9043)
* Try next replica if not possible to connect to primary replica on
http://git-wip-us.apache.org/repos/asf/cassandra/blob/71bca780/src/java/org/apache/cassandra/db/compaction/CompactionManager.java
--
http://git-wip-us.apache.org/repos/asf/cassandra/blob/71bca780/test/unit/org/apache/cassandra/db/CleanupTest.java
--
diff --cc test/unit/org/apache/cassandra/db/CleanupTest.java
index a4aca7f,0115ad9..167f3b0
--- a/test/unit/org/apache/cassandra/db/CleanupTest.java
+++ b/test/unit/org/apache/cassandra/db/CleanupTest.java
@@@ -32,15 -35,19 +35,17 @@@ import org.junit.Test
import org.apache.cassandra.SchemaLoader;
import org.apache.cassandra.Util;
-import org.apache.cassandra.config.KSMetaData;
+import org.apache.cassandra.config.ColumnDefinition;
import org.apache.cassandra.cql3.Operator;
-import org.apache.cassandra.db.filter.IDiskAtomFilter;
-import org.apache.cassandra.db.columniterator.IdentityQueryFilter;
import org.apache.cassandra.db.compaction.CompactionManager;
-import org.apache.cassandra.db.index.SecondaryIndex;
+import org.apache.cassandra.db.filter.RowFilter;
import org.apache.cassandra.dht.ByteOrderedPartitioner.BytesToken;
+ import org.apache.cassandra.dht.Range;
import org.apache.cassandra.exceptions.ConfigurationException;
import org.apache.cassandra.io.sstable.format.SSTableReader;
-import org.apache.cassandra.locator.SimpleStrategy;
+ import org.apache.cassandra.dht.Token;
import org.apache.cassandra.locator.TokenMetadata;
+import org.apache.cassandra.schema.KeyspaceParams;
import org.apache.cassandra.service.StorageService;
import org.apache.cassandra.utils.ByteBufferUtil;
@@@ -165,10 -182,83 +170,82 @@@ public class CleanupTes
tmd.updateNormalToken(new BytesToken(tk2),
InetAddress.getByName("127.0.0.2"));
CompactionManager.instance.performCleanup(cfs);
-rows = Util.getRangeSlice(cfs);
-assertEquals(0, rows.size());
+assertEquals(0, Util.getAll(Util.cmd(cfs).build()).size());
}
+ @Test
+ public void testNeedsCleanup() throws Exception
+ {
+ // setup
+ StorageService.instance.getTokenMetadata().clearUnsafe();
+ Keyspace keyspace = Keyspace.open(KEYSPACE1);
-ColumnFamilyStore cfs = keyspace.getColumnFamilyStore(CF1);
-fillCF(cfs, LOOPS);
++ColumnFamilyStore cfs = keyspace.getColumnFamilyStore(CF_STANDARD1);
++fillCF(cfs, "val", LOOPS);
+
+ // prepare SSTable and some useful tokens
-SSTableReader ssTable = cfs.getSSTables().iterator
[4/4] cassandra git commit: Merge branch 'cassandra-3.0' into cassandra-3.1
Merge branch 'cassandra-3.0' into cassandra-3.1 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/c2ea8c4f Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/c2ea8c4f Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/c2ea8c4f Branch: refs/heads/cassandra-3.1 Commit: c2ea8c4fc82ec470710de51b41e6de429dfebc80 Parents: 138f8db 71bca78 Author: Marcus Eriksson Authored: Thu Nov 26 08:41:49 2015 +0100 Committer: Marcus Eriksson Committed: Thu Nov 26 08:41:49 2015 +0100 -- CHANGES.txt | 1 + .../db/compaction/CompactionManager.java| 6 +- .../org/apache/cassandra/db/CleanupTest.java| 77 3 files changed, 82 insertions(+), 2 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/c2ea8c4f/CHANGES.txt --
cassandra git commit: Fix the sstable-needs-cleanup check
Repository: cassandra
Updated Branches:
refs/heads/cassandra-2.1 9768e57e3 -> 3d99418cf
Fix the sstable-needs-cleanup check
Patch by Jakub Janecek; reviewed by marcuse for CASSANDRA-10740
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/3d99418c
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/3d99418c
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/3d99418c
Branch: refs/heads/cassandra-2.1
Commit: 3d99418cfd641b30b393c9e61cc2b4f5e864d14d
Parents: 9768e57
Author: Jakub Janecek
Authored: Wed Nov 25 13:51:14 2015 +0100
Committer: Marcus Eriksson
Committed: Thu Nov 26 08:25:31 2015 +0100
--
CHANGES.txt | 1 +
.../db/compaction/CompactionManager.java| 6 +-
.../org/apache/cassandra/db/CleanupTest.java| 75
3 files changed, 80 insertions(+), 2 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cassandra/blob/3d99418c/CHANGES.txt
--
diff --git a/CHANGES.txt b/CHANGES.txt
index 8548d71..3ede9b7 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
2.1.12
+ * Fix the sstable-needs-cleanup check (CASSANDRA-10740)
* (cqlsh) Print column names before COPY operation (CASSANDRA-8935)
* Add Native-Transport-Requests back to tpstats (CASSANDRA-10044)
* Make paging logic consistent between searcher impls (CASSANDRA-10683)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/3d99418c/src/java/org/apache/cassandra/db/compaction/CompactionManager.java
--
diff --git a/src/java/org/apache/cassandra/db/compaction/CompactionManager.java
b/src/java/org/apache/cassandra/db/compaction/CompactionManager.java
index b85eb51..b0ad244 100644
--- a/src/java/org/apache/cassandra/db/compaction/CompactionManager.java
+++ b/src/java/org/apache/cassandra/db/compaction/CompactionManager.java
@@ -44,6 +44,7 @@ import com.google.common.collect.Lists;
import com.google.common.collect.Multimap;
import com.google.common.collect.Multiset;
import com.google.common.collect.Sets;
+import com.google.common.annotations.VisibleForTesting;
import com.google.common.util.concurrent.*;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -690,7 +691,8 @@ public class CompactionManager implements
CompactionManagerMBean
* Determines if a cleanup would actually remove any data in this SSTable
based
* on a set of owned ranges.
*/
-static boolean needsCleanup(SSTableReader sstable,
Collection> ownedRanges)
+@VisibleForTesting
+public static boolean needsCleanup(SSTableReader sstable,
Collection> ownedRanges)
{
assert !ownedRanges.isEmpty(); // cleanup checks for this
@@ -729,7 +731,7 @@ public class CompactionManager implements
CompactionManagerMBean
}
Range nextRange = sortedRanges.get(i + 1);
-if (!nextRange.contains(firstBeyondRange.getToken()))
+if (firstBeyondRange.getToken().compareTo(nextRange.left) <= 0)
{
// we found a key in between the owned ranges
return true;
http://git-wip-us.apache.org/repos/asf/cassandra/blob/3d99418c/test/unit/org/apache/cassandra/db/CleanupTest.java
--
diff --git a/test/unit/org/apache/cassandra/db/CleanupTest.java
b/test/unit/org/apache/cassandra/db/CleanupTest.java
index 06f8997..1d04dfa 100644
--- a/test/unit/org/apache/cassandra/db/CleanupTest.java
+++ b/test/unit/org/apache/cassandra/db/CleanupTest.java
@@ -22,9 +22,11 @@ import java.io.IOException;
import java.net.InetAddress;
import java.net.UnknownHostException;
import java.nio.ByteBuffer;
+import java.util.AbstractMap;
import java.util.Arrays;
import java.util.LinkedList;
import java.util.List;
+import java.util.Map;
import java.util.concurrent.ExecutionException;
import java.util.concurrent.TimeUnit;
@@ -40,6 +42,7 @@ import org.apache.cassandra.db.index.SecondaryIndex;
import org.apache.cassandra.dht.BytesToken;
import org.apache.cassandra.dht.Range;
import org.apache.cassandra.io.sstable.SSTableReader;
+import org.apache.cassandra.dht.Token;
import org.apache.cassandra.locator.TokenMetadata;
import org.apache.cassandra.service.StorageService;
import org.apache.cassandra.utils.ByteBufferUtil;
@@ -168,6 +171,78 @@ public class CleanupTest extends SchemaLoader
assertEquals(0, rows.size());
}
+@Test
+public void testNeedsCleanup() throws Exception
+{
+// setup
+StorageService.instance.getTokenMetadata().clearUnsafe();
+Keyspace keyspace = Keyspace.open(KEYSPACE1);
+ColumnFamilyStore cfs = keyspace.get
[2/2] cassandra git commit: Merge branch 'cassandra-2.1' into cassandra-2.2
Merge branch 'cassandra-2.1' into cassandra-2.2 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/96b7603d Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/96b7603d Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/96b7603d Branch: refs/heads/cassandra-2.2 Commit: 96b7603d9edfcbbc5cecd38bfe598056d8c564e1 Parents: cd75ecd 3d99418 Author: Marcus Eriksson Authored: Thu Nov 26 08:31:42 2015 +0100 Committer: Marcus Eriksson Committed: Thu Nov 26 08:31:42 2015 +0100 -- CHANGES.txt | 1 + .../db/compaction/CompactionManager.java| 6 +- .../org/apache/cassandra/db/CleanupTest.java| 75 3 files changed, 80 insertions(+), 2 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/96b7603d/CHANGES.txt -- diff --cc CHANGES.txt index 5ff53b6,3ede9b7..a548c9f --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,18 -1,7 +1,19 @@@ -2.1.12 +2.2.4 + * Don't do anticompaction after subrange repair (CASSANDRA-10422) + * Fix SimpleDateType type compatibility (CASSANDRA-10027) + * (Hadoop) fix splits calculation (CASSANDRA-10640) + * (Hadoop) ensure that Cluster instances are always closed (CASSANDRA-10058) + * (cqlsh) show partial trace if incomplete after max_trace_wait (CASSANDRA-7645) + * Use most up-to-date version of schema for system tables (CASSANDRA-10652) + * Deprecate memory_allocator in cassandra.yaml (CASSANDRA-10581,10628) + * Expose phi values from failure detector via JMX and tweak debug + and trace logging (CASSANDRA-9526) + * Fix RangeNamesQueryPager (CASSANDRA-10509) + * Deprecate Pig support (CASSANDRA-10542) + * Reduce contention getting instances of CompositeType (CASSANDRA-10433) +Merged from 2.1: + * Fix the sstable-needs-cleanup check (CASSANDRA-10740) * (cqlsh) Print column names before COPY operation (CASSANDRA-8935) - * Add Native-Transport-Requests back to tpstats (CASSANDRA-10044) * Make paging logic consistent between searcher impls (CASSANDRA-10683) * Fix CompressedInputStream for proper cleanup (CASSANDRA-10012) * (cqlsh) Support counters in COPY commands (CASSANDRA-9043) http://git-wip-us.apache.org/repos/asf/cassandra/blob/96b7603d/src/java/org/apache/cassandra/db/compaction/CompactionManager.java -- diff --cc src/java/org/apache/cassandra/db/compaction/CompactionManager.java index 0c6e24f,b0ad244..f3a69a6 --- a/src/java/org/apache/cassandra/db/compaction/CompactionManager.java +++ b/src/java/org/apache/cassandra/db/compaction/CompactionManager.java @@@ -27,7 -35,16 +27,8 @@@ import javax.management.ObjectName import javax.management.openmbean.OpenDataException; import javax.management.openmbean.TabularData; -import com.google.common.base.Predicate; -import com.google.common.base.Throwables; -import com.google.common.collect.ArrayListMultimap; -import com.google.common.collect.ConcurrentHashMultiset; -import com.google.common.collect.Iterables; -import com.google.common.collect.Lists; -import com.google.common.collect.Multimap; -import com.google.common.collect.Multiset; -import com.google.common.collect.Sets; + import com.google.common.annotations.VisibleForTesting; +import com.google.common.collect.*; import com.google.common.util.concurrent.*; import org.slf4j.Logger; import org.slf4j.LoggerFactory; http://git-wip-us.apache.org/repos/asf/cassandra/blob/96b7603d/test/unit/org/apache/cassandra/db/CleanupTest.java -- diff --cc test/unit/org/apache/cassandra/db/CleanupTest.java index 81f7d41,1d04dfa..0115ad9 --- a/test/unit/org/apache/cassandra/db/CleanupTest.java +++ b/test/unit/org/apache/cassandra/db/CleanupTest.java @@@ -33,17 -34,15 +35,18 @@@ import org.junit.Test import org.apache.cassandra.SchemaLoader; import org.apache.cassandra.Util; +import org.apache.cassandra.config.KSMetaData; import org.apache.cassandra.cql3.Operator; +import org.apache.cassandra.db.filter.IDiskAtomFilter; import org.apache.cassandra.db.columniterator.IdentityQueryFilter; import org.apache.cassandra.db.compaction.CompactionManager; -import org.apache.cassandra.db.filter.IDiskAtomFilter; import org.apache.cassandra.db.index.SecondaryIndex; -import org.apache.cassandra.dht.BytesToken; +import org.apache.cassandra.dht.ByteOrderedPartitioner.BytesToken; import org.apache.cassandra.dht.Range; -import org.apache.cassandra.io.sstable.SSTableReader; +import org.apache.cassandra.exceptions.ConfigurationException; +import org.apache.cassandra.io.sstable.format.SSTableReader; +import org.apache.cassandra.locator.SimpleStrategy; +
[1/2] cassandra git commit: Fix the sstable-needs-cleanup check
Repository: cassandra
Updated Branches:
refs/heads/cassandra-2.2 cd75ecd90 -> 96b7603d9
Fix the sstable-needs-cleanup check
Patch by Jakub Janecek; reviewed by marcuse for CASSANDRA-10740
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/3d99418c
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/3d99418c
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/3d99418c
Branch: refs/heads/cassandra-2.2
Commit: 3d99418cfd641b30b393c9e61cc2b4f5e864d14d
Parents: 9768e57
Author: Jakub Janecek
Authored: Wed Nov 25 13:51:14 2015 +0100
Committer: Marcus Eriksson
Committed: Thu Nov 26 08:25:31 2015 +0100
--
CHANGES.txt | 1 +
.../db/compaction/CompactionManager.java| 6 +-
.../org/apache/cassandra/db/CleanupTest.java| 75
3 files changed, 80 insertions(+), 2 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cassandra/blob/3d99418c/CHANGES.txt
--
diff --git a/CHANGES.txt b/CHANGES.txt
index 8548d71..3ede9b7 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
2.1.12
+ * Fix the sstable-needs-cleanup check (CASSANDRA-10740)
* (cqlsh) Print column names before COPY operation (CASSANDRA-8935)
* Add Native-Transport-Requests back to tpstats (CASSANDRA-10044)
* Make paging logic consistent between searcher impls (CASSANDRA-10683)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/3d99418c/src/java/org/apache/cassandra/db/compaction/CompactionManager.java
--
diff --git a/src/java/org/apache/cassandra/db/compaction/CompactionManager.java
b/src/java/org/apache/cassandra/db/compaction/CompactionManager.java
index b85eb51..b0ad244 100644
--- a/src/java/org/apache/cassandra/db/compaction/CompactionManager.java
+++ b/src/java/org/apache/cassandra/db/compaction/CompactionManager.java
@@ -44,6 +44,7 @@ import com.google.common.collect.Lists;
import com.google.common.collect.Multimap;
import com.google.common.collect.Multiset;
import com.google.common.collect.Sets;
+import com.google.common.annotations.VisibleForTesting;
import com.google.common.util.concurrent.*;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -690,7 +691,8 @@ public class CompactionManager implements
CompactionManagerMBean
* Determines if a cleanup would actually remove any data in this SSTable
based
* on a set of owned ranges.
*/
-static boolean needsCleanup(SSTableReader sstable,
Collection> ownedRanges)
+@VisibleForTesting
+public static boolean needsCleanup(SSTableReader sstable,
Collection> ownedRanges)
{
assert !ownedRanges.isEmpty(); // cleanup checks for this
@@ -729,7 +731,7 @@ public class CompactionManager implements
CompactionManagerMBean
}
Range nextRange = sortedRanges.get(i + 1);
-if (!nextRange.contains(firstBeyondRange.getToken()))
+if (firstBeyondRange.getToken().compareTo(nextRange.left) <= 0)
{
// we found a key in between the owned ranges
return true;
http://git-wip-us.apache.org/repos/asf/cassandra/blob/3d99418c/test/unit/org/apache/cassandra/db/CleanupTest.java
--
diff --git a/test/unit/org/apache/cassandra/db/CleanupTest.java
b/test/unit/org/apache/cassandra/db/CleanupTest.java
index 06f8997..1d04dfa 100644
--- a/test/unit/org/apache/cassandra/db/CleanupTest.java
+++ b/test/unit/org/apache/cassandra/db/CleanupTest.java
@@ -22,9 +22,11 @@ import java.io.IOException;
import java.net.InetAddress;
import java.net.UnknownHostException;
import java.nio.ByteBuffer;
+import java.util.AbstractMap;
import java.util.Arrays;
import java.util.LinkedList;
import java.util.List;
+import java.util.Map;
import java.util.concurrent.ExecutionException;
import java.util.concurrent.TimeUnit;
@@ -40,6 +42,7 @@ import org.apache.cassandra.db.index.SecondaryIndex;
import org.apache.cassandra.dht.BytesToken;
import org.apache.cassandra.dht.Range;
import org.apache.cassandra.io.sstable.SSTableReader;
+import org.apache.cassandra.dht.Token;
import org.apache.cassandra.locator.TokenMetadata;
import org.apache.cassandra.service.StorageService;
import org.apache.cassandra.utils.ByteBufferUtil;
@@ -168,6 +171,78 @@ public class CleanupTest extends SchemaLoader
assertEquals(0, rows.size());
}
+@Test
+public void testNeedsCleanup() throws Exception
+{
+// setup
+StorageService.instance.getTokenMetadata().clearUnsafe();
+Keyspace keyspace = Keyspace.open(KEYSPACE1);
+ColumnFamilyStore cfs = keyspace.get
[jira] [Commented] (CASSANDRA-9258) Range movement causes CPU & performance impact
[
https://issues.apache.org/jira/browse/CASSANDRA-9258?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=15027998#comment-15027998
]
Dikang Gu commented on CASSANDRA-9258:
--
I'm fixing tests, will submit a patch soon.
> Range movement causes CPU & performance impact
> --
>
> Key: CASSANDRA-9258
> URL: https://issues.apache.org/jira/browse/CASSANDRA-9258
> Project: Cassandra
> Issue Type: Bug
> Environment: Cassandra 2.1.4
>Reporter: Rick Branson
>Assignee: Dikang Gu
> Fix For: 2.1.x
>
>
> Observing big CPU & latency regressions when doing range movements on
> clusters with many tens of thousands of vnodes. See CPU usage increase by
> ~80% when a single node is being replaced.
> Top methods are:
> 1) Ljava/math/BigInteger;.compareTo in
> Lorg/apache/cassandra/dht/ComparableObjectToken;.compareTo
> 2) Lcom/google/common/collect/AbstractMapBasedMultimap;.wrapCollection in
> Lcom/google/common/collect/AbstractMapBasedMultimap$AsMap$AsMapIterator;.next
> 3) Lorg/apache/cassandra/db/DecoratedKey;.compareTo in
> Lorg/apache/cassandra/dht/Range;.contains
> Here's a sample stack from a thread dump:
> {code}
> "Thrift:50673" daemon prio=10 tid=0x7f2f20164800 nid=0x3a04af runnable
> [0x7f2d878d]
>java.lang.Thread.State: RUNNABLE
> at org.apache.cassandra.dht.Range.isWrapAround(Range.java:260)
> at org.apache.cassandra.dht.Range.contains(Range.java:51)
> at org.apache.cassandra.dht.Range.contains(Range.java:110)
> at
> org.apache.cassandra.locator.TokenMetadata.pendingEndpointsFor(TokenMetadata.java:916)
> at
> org.apache.cassandra.service.StorageProxy.performWrite(StorageProxy.java:775)
> at
> org.apache.cassandra.service.StorageProxy.mutate(StorageProxy.java:541)
> at
> org.apache.cassandra.service.StorageProxy.mutateWithTriggers(StorageProxy.java:616)
> at
> org.apache.cassandra.thrift.CassandraServer.doInsert(CassandraServer.java:1101)
> at
> org.apache.cassandra.thrift.CassandraServer.doInsert(CassandraServer.java:1083)
> at
> org.apache.cassandra.thrift.CassandraServer.batch_mutate(CassandraServer.java:976)
> at
> org.apache.cassandra.thrift.Cassandra$Processor$batch_mutate.getResult(Cassandra.java:3996)
> at
> org.apache.cassandra.thrift.Cassandra$Processor$batch_mutate.getResult(Cassandra.java:3980)
> at org.apache.thrift.ProcessFunction.process(ProcessFunction.java:39)
> at org.apache.thrift.TBaseProcessor.process(TBaseProcessor.java:39)
> at
> org.apache.cassandra.thrift.CustomTThreadPoolServer$WorkerProcess.run(CustomTThreadPoolServer.java:205)
> at
> java.util.concurrent.ThreadPoolExecutor.runWorker(ThreadPoolExecutor.java:1145)
> at
> java.util.concurrent.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:615)
> at java.lang.Thread.run(Thread.java:745){code}
--
This message was sent by Atlassian JIRA
(v6.3.4#6332)
[jira] [Comment Edited] (CASSANDRA-10688) Stack overflow from SSTableReader$InstanceTidier.runOnClose in Leak Detector
[ https://issues.apache.org/jira/browse/CASSANDRA-10688?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=15027960#comment-15027960 ] Ariel Weisberg edited comment on CASSANDRA-10688 at 11/26/15 1:26 AM: -- Proposed change. [~benedict] when you are available you will probably want to review this. The search is iterative and you can set the maximum depth and # of visited objects via system properties. The search records a set of all visited objects so it's a good idea to bound the amount of space that can be used. Right now the maximum depth defaults to 128 and the maximum # of objects visited is 100k. |[3.0 code|https://github.com/apache/cassandra/compare/cassandra-3.0...aweisberg:CASSANDRA-10688-3.0?expand=1]|[utests|http://cassci.datastax.com/view/Dev/view/aweisberg/job/aweisberg-CASSANDRA-10688-3.0-testall/]|[dtests|http://cassci.datastax.com/view/Dev/view/aweisberg/job/aweisberg-CASSANDRA-10688-3.0-dtest/]| was (Author: aweisberg): Proposed change. [~benedict] when you are available you will probably want to review this at some point. The search is iterative and you can set the maximum depth and # of visited objects via system properties. The search records a set of all visited objects so it's a good idea to bound the amount of space that can be used. Right now the maximum depth defaults to 128 and the maximum # of objects visited is 100k. |[3.0 code|https://github.com/apache/cassandra/compare/cassandra-3.0...aweisberg:CASSANDRA-10688-3.0?expand=1]|[utests|http://cassci.datastax.com/view/Dev/view/aweisberg/job/aweisberg-CASSANDRA-10688-3.0-testall/]|[dtests|http://cassci.datastax.com/view/Dev/view/aweisberg/job/aweisberg-CASSANDRA-10688-3.0-dtest/]| > Stack overflow from SSTableReader$InstanceTidier.runOnClose in Leak Detector > > > Key: CASSANDRA-10688 > URL: https://issues.apache.org/jira/browse/CASSANDRA-10688 > Project: Cassandra > Issue Type: Bug >Reporter: Jeremiah Jordan >Assignee: Ariel Weisberg > Fix For: 3.0.1, 3.1 > > > Running some tests against cassandra-3.0 > 9fc957cf3097e54ccd72e51b2d0650dc3e83eae0 > The tests are just running cassandra-stress write and read while adding and > removing nodes from the cluster. After the test runs when I go back through > logs I find the following Stackoverflow fairly often: > ERROR [Strong-Reference-Leak-Detector:1] 2015-11-11 00:04:10,638 > Ref.java:413 - Stackoverflow [private java.lang.Runnable > org.apache.cassandra.io.sstable.format.SSTableReader$InstanceTidier.runOnClose, > final java.lang.Runnable > org.apache.cassandra.io.sstable.format.SSTableReader$DropPageCache.andThen, > final org.apache.cassandra.cache.InstrumentingCache > org.apache.cassandra.io.sstable.SSTableRewriter$InvalidateKeys.cache, private > final org.apache.cassandra.cache.ICache > org.apache.cassandra.cache.InstrumentingCache.map, private final > com.googlecode.concurrentlinkedhashmap.ConcurrentLinkedHashMap > org.apache.cassandra.cache.ConcurrentLinkedHashCache.map, final > com.googlecode.concurrentlinkedhashmap.LinkedDeque > com.googlecode.concurrentlinkedhashmap.ConcurrentLinkedHashMap.evictionDeque, > com.googlecode.concurrentlinkedhashmap.Linked > com.googlecode.concurrentlinkedhashmap.LinkedDeque.first, > com.googlecode.concurrentlinkedhashmap.ConcurrentLinkedHashMap$Node > com.googlecode.concurrentlinkedhashmap.ConcurrentLinkedHashMap$Node.next, > com.googlecode.concurrentlinkedhashmap.ConcurrentLinkedHashMap$Node > com.googlecode.concurrentlinkedhashmap.ConcurrentLinkedHashMap$Node.next, > com.googlecode.concurrentlinkedhashmap.ConcurrentLinkedHashMap$Node > com.googlecode.concurrentlinkedhashmap.ConcurrentLinkedHashMap$Node.next, > com.googlecode.concurrentlinkedhashmap.ConcurrentLinkedHashMap$Node > com.googlecode.concurrentlinkedhashmap.ConcurrentLinkedHashMap$Node.next, > com.googlecode.concurrentlinkedhashmap.ConcurrentLinkedHashMap$Node > com.googlecode.concurrentlinkedhashmap.ConcurrentLinkedHashMap$Node.next, > com.googlecode.concurrentlinkedhashmap.ConcurrentLinkedHashMap$Node > com.googlecode.concurrentlinkedhashmap.ConcurrentLinkedHashMap$Node.next, > com.googlecode.concurrentlinkedhashmap.ConcurrentLinkedHashMap$Node > com.googlecode.concurrentlinkedhashmap.ConcurrentLinkedHashMap$Node.next, > com.googlecode.concurrentlinkedhashmap.ConcurrentLinkedHashMap$Node > com.googlecode.concurrentlinkedhashmap.ConcurrentLinkedHashMap$Node.next, > com.googlecode.concurrentlinkedhashmap.ConcurrentLinkedHashMap$Node > com.googlecode.concurrentlinkedhashmap.ConcurrentLinkedHashMap$Node.next, > com.googlecode.concurrentlinkedhashmap.ConcurrentLinkedHashMap$Node > ... (repeated a whole bunch more) > com.googlecode.concurrentlinkedhashma
[jira] [Commented] (CASSANDRA-10688) Stack overflow from SSTableReader$InstanceTidier.runOnClose in Leak Detector
[ https://issues.apache.org/jira/browse/CASSANDRA-10688?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=15027960#comment-15027960 ] Ariel Weisberg commented on CASSANDRA-10688: Proposed change. [~benedict] when you are available you will probably want to review this at some point. The search is iterative and you can set the maximum depth and # of visited objects via system properties. The search records a set of all visited objects so it's a good idea to bound the amount of space that can be used. Right now the maximum depth defaults to 128 and the maximum # of objects visited is 100k. |[3.0 code|https://github.com/apache/cassandra/compare/cassandra-3.0...aweisberg:CASSANDRA-10688-3.0?expand=1]|[utests|http://cassci.datastax.com/view/Dev/view/aweisberg/job/aweisberg-CASSANDRA-10688-3.0-testall/]|[dtests|http://cassci.datastax.com/view/Dev/view/aweisberg/job/aweisberg-CASSANDRA-10688-3.0-dtest/]| > Stack overflow from SSTableReader$InstanceTidier.runOnClose in Leak Detector > > > Key: CASSANDRA-10688 > URL: https://issues.apache.org/jira/browse/CASSANDRA-10688 > Project: Cassandra > Issue Type: Bug >Reporter: Jeremiah Jordan >Assignee: Ariel Weisberg > Fix For: 3.0.1, 3.1 > > > Running some tests against cassandra-3.0 > 9fc957cf3097e54ccd72e51b2d0650dc3e83eae0 > The tests are just running cassandra-stress write and read while adding and > removing nodes from the cluster. After the test runs when I go back through > logs I find the following Stackoverflow fairly often: > ERROR [Strong-Reference-Leak-Detector:1] 2015-11-11 00:04:10,638 > Ref.java:413 - Stackoverflow [private java.lang.Runnable > org.apache.cassandra.io.sstable.format.SSTableReader$InstanceTidier.runOnClose, > final java.lang.Runnable > org.apache.cassandra.io.sstable.format.SSTableReader$DropPageCache.andThen, > final org.apache.cassandra.cache.InstrumentingCache > org.apache.cassandra.io.sstable.SSTableRewriter$InvalidateKeys.cache, private > final org.apache.cassandra.cache.ICache > org.apache.cassandra.cache.InstrumentingCache.map, private final > com.googlecode.concurrentlinkedhashmap.ConcurrentLinkedHashMap > org.apache.cassandra.cache.ConcurrentLinkedHashCache.map, final > com.googlecode.concurrentlinkedhashmap.LinkedDeque > com.googlecode.concurrentlinkedhashmap.ConcurrentLinkedHashMap.evictionDeque, > com.googlecode.concurrentlinkedhashmap.Linked > com.googlecode.concurrentlinkedhashmap.LinkedDeque.first, > com.googlecode.concurrentlinkedhashmap.ConcurrentLinkedHashMap$Node > com.googlecode.concurrentlinkedhashmap.ConcurrentLinkedHashMap$Node.next, > com.googlecode.concurrentlinkedhashmap.ConcurrentLinkedHashMap$Node > com.googlecode.concurrentlinkedhashmap.ConcurrentLinkedHashMap$Node.next, > com.googlecode.concurrentlinkedhashmap.ConcurrentLinkedHashMap$Node > com.googlecode.concurrentlinkedhashmap.ConcurrentLinkedHashMap$Node.next, > com.googlecode.concurrentlinkedhashmap.ConcurrentLinkedHashMap$Node > com.googlecode.concurrentlinkedhashmap.ConcurrentLinkedHashMap$Node.next, > com.googlecode.concurrentlinkedhashmap.ConcurrentLinkedHashMap$Node > com.googlecode.concurrentlinkedhashmap.ConcurrentLinkedHashMap$Node.next, > com.googlecode.concurrentlinkedhashmap.ConcurrentLinkedHashMap$Node > com.googlecode.concurrentlinkedhashmap.ConcurrentLinkedHashMap$Node.next, > com.googlecode.concurrentlinkedhashmap.ConcurrentLinkedHashMap$Node > com.googlecode.concurrentlinkedhashmap.ConcurrentLinkedHashMap$Node.next, > com.googlecode.concurrentlinkedhashmap.ConcurrentLinkedHashMap$Node > com.googlecode.concurrentlinkedhashmap.ConcurrentLinkedHashMap$Node.next, > com.googlecode.concurrentlinkedhashmap.ConcurrentLinkedHashMap$Node > com.googlecode.concurrentlinkedhashmap.ConcurrentLinkedHashMap$Node.next, > com.googlecode.concurrentlinkedhashmap.ConcurrentLinkedHashMap$Node > ... (repeated a whole bunch more) > com.googlecode.concurrentlinkedhashmap.ConcurrentLinkedHashMap$Node > com.googlecode.concurrentlinkedhashmap.ConcurrentLinkedHashMap$Node.next, > com.googlecode.concurrentlinkedhashmap.ConcurrentLinkedHashMap$Node > com.googlecode.concurrentlinkedhashmap.ConcurrentLinkedHashMap$Node.next, > com.googlecode.concurrentlinkedhashmap.ConcurrentLinkedHashMap$Node > com.googlecode.concurrentlinkedhashmap.ConcurrentLinkedHashMap$Node.next, > com.googlecode.concurrentlinkedhashmap.ConcurrentLinkedHashMap$Node > com.googlecode.concurrentlinkedhashmap.ConcurrentLinkedHashMap$Node.next, > com.googlecode.concurrentlinkedhashmap.ConcurrentLinkedHashMap$Node > com.googlecode.concurrentlinkedhashmap.ConcurrentLinkedHashMap$Node.next, > final java.lang.Object > com.googlecode.concurrentlinkedhashmap.ConcurrentLinkedHashMap$Node.key,
[jira] [Comment Edited] (CASSANDRA-9303) Match cassandra-loader options in COPY FROM
[ https://issues.apache.org/jira/browse/CASSANDRA-9303?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=15015299#comment-15015299 ] Stefania edited comment on CASSANDRA-9303 at 11/26/15 12:31 AM: Thanks for your feedback, here is the updated versions of the progress tables. I will try and see if we can add support for importing multiple files as well. h3. Importing ||cassandra-loader||COPY FROM||description||status|| |-configFile filename| |File with configuration options|TODO| |-delim delimiter|delimiter|Delimiter to use|already available| |-dateFormat dateFormatString|datetimeformat|Date format|done| |-nullString nullString|nullval|String that signifies NULL|already available| |-skipRows skipRows|skiprows|Number of rows to skip|done| |-skipCols columnsToSkip|skipcols|Comma-separated list of columsn to skip|done| |-maxRows maxRows|maxrows|Maximum number of rows to read (-1 means all)|done| |-maxErrors maxErrors| |Maximum parse errors to endure|TODO| |-badDir badDirectory| |Directory for where to place badly parsed rows.|TODO| |-port portNumber| |CQL Port Number|already available via cqlsh| |-user username| |Cassandra username|already available via cqlsh| |-pw password| |Password for user|already available via cqlsh| |-ssl-truststore-path path| |Path to SSL truststore|already available via cqlsh| |-ssl-truststore-pw pwd| |Password for SSL truststore|already available via cqlsh| |-ssl-keystore-path path| |Path to SSL keystore|already available via cqlsh| |-ssl-keystore-pw pwd| |Password for SSL keystore|already available via cqlsh| |-consistencyLevel CL| |Consistency level|already available via cqlsh| |-numFutures numFutures|jobs|Number of CQL futures to keep in flight|already available| |-batchSize batchSize|minbatchsize, maxbatchsize|Number of INSERTs to batch together|alredy available| |-decimalDelim decimalDelim|decimalsep|Decimal delimiter|done| | |thousandssep|Thousands delimiter|done| |-boolStyle boolStyleString|boolstyle|Style for booleans|done| |-numThreads numThreads|numProcesses|Number of concurrent threads (files) to load|done| |-queryTimeout # seconds|pageTimeout|Query timeout (in seconds)|already available| |-numRetries numRetries|maxattempts|Number of times to retry the INSERT|already available| |-maxInsertErrors # errors| |Maximum INSERT errors to endure|TODO| |-rate rows-per-second| |Maximum insert rate|TODO (unsure how)| |-progressRate num txns|reportfrequency|How often to report the insert rate|already available| |-rateFile filename| |Where to print the rate statistics|TODO| |-successDir dir| |Directory where to move successfully loaded files|will implement only if adding support for multi-file import| |-failureDir dir| |Directory where to move files that did not successfully load|will implement only if adding support for multi-file import| h3. Exporting ||cassandra-unloader||COPY TO||description||status|| |configFile filename| |File with configuration options|TODO| |-delim delimiter|delimiter|Delimiter to use|already available| |-dateFormat dateFormatString|datetimeformat|Date format|already available| |-nullString nullString|nullval|String that signifies NULL|already available| | |skipcols|Comma-separated list of columsn to skip|done| |-port portNumber| |CQL Port Number|already available via cqlsh| |-user username| |Cassandra username|already available via cqlsh| |-pw password| |Password for user|already available via cqlsh| |-ssl-truststore-path path| |Path to SSL truststore|already available via cqlsh| |-ssl-truststore-pw pwd| |Password for SSL truststore|already available via cqlsh| |-ssl-keystore-path path| |Path to SSL keystore|already available via cqlsh| |-ssl-keystore-pw pwd| |Password for SSL keystore|already available via cqlsh| |consistencyLevel CL| |Consistency level|already available via cqlsh| |decimalDelim decimalDelim|decimalsep|Decimal delimiter|done| | |thousandssep|Thousands delimiter|done| |boolStyle boolStyleString|boolstyle|Style for booleans|done| |numThreads numThreads|numprocesses|Number of concurrent threads to unload|done| |beginToken tokenString|begintoken|Begin token|done| |endToken tokenString|endtoken|End token|done| Where it says _done_, I'm actually still working on automated tests. was (Author: stefania): Thanks for your feedback, here is the updated versions of the progress tables. I will try and see if we can add support for importing multiple files as well. h3. Importing ||cassandra-loader||COPY FROM||description||status|| |-configFile filename| |File with configuration options|TODO (extend cqlsh config file)| |-delim delimiter|delimiter|Delimiter to use|already available| |-dateFormat dateFormatString|datetimeformat|Date format|done| |-nullString nullString|nullval|String that signifies NULL|already available| |-skipRows skipRows| |Number of rows to skip|TODO| |-skipCols columnsToSkip|column|Comma-separated list of
[jira] [Commented] (CASSANDRA-10688) Stack overflow from SSTableReader$InstanceTidier.runOnClose in Leak Detector
[ https://issues.apache.org/jira/browse/CASSANDRA-10688?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=15027886#comment-15027886 ] Jeremiah Jordan commented on CASSANDRA-10688: - Ah. Yes we do have that property set on our tests because we want to get the debug output if there is a leak detected, as these tests have had them happen in the past and just always having that set means we don't have to reproduce it... > Stack overflow from SSTableReader$InstanceTidier.runOnClose in Leak Detector > > > Key: CASSANDRA-10688 > URL: https://issues.apache.org/jira/browse/CASSANDRA-10688 > Project: Cassandra > Issue Type: Bug >Reporter: Jeremiah Jordan >Assignee: Ariel Weisberg > Fix For: 3.0.1, 3.1 > > > Running some tests against cassandra-3.0 > 9fc957cf3097e54ccd72e51b2d0650dc3e83eae0 > The tests are just running cassandra-stress write and read while adding and > removing nodes from the cluster. After the test runs when I go back through > logs I find the following Stackoverflow fairly often: > ERROR [Strong-Reference-Leak-Detector:1] 2015-11-11 00:04:10,638 > Ref.java:413 - Stackoverflow [private java.lang.Runnable > org.apache.cassandra.io.sstable.format.SSTableReader$InstanceTidier.runOnClose, > final java.lang.Runnable > org.apache.cassandra.io.sstable.format.SSTableReader$DropPageCache.andThen, > final org.apache.cassandra.cache.InstrumentingCache > org.apache.cassandra.io.sstable.SSTableRewriter$InvalidateKeys.cache, private > final org.apache.cassandra.cache.ICache > org.apache.cassandra.cache.InstrumentingCache.map, private final > com.googlecode.concurrentlinkedhashmap.ConcurrentLinkedHashMap > org.apache.cassandra.cache.ConcurrentLinkedHashCache.map, final > com.googlecode.concurrentlinkedhashmap.LinkedDeque > com.googlecode.concurrentlinkedhashmap.ConcurrentLinkedHashMap.evictionDeque, > com.googlecode.concurrentlinkedhashmap.Linked > com.googlecode.concurrentlinkedhashmap.LinkedDeque.first, > com.googlecode.concurrentlinkedhashmap.ConcurrentLinkedHashMap$Node > com.googlecode.concurrentlinkedhashmap.ConcurrentLinkedHashMap$Node.next, > com.googlecode.concurrentlinkedhashmap.ConcurrentLinkedHashMap$Node > com.googlecode.concurrentlinkedhashmap.ConcurrentLinkedHashMap$Node.next, > com.googlecode.concurrentlinkedhashmap.ConcurrentLinkedHashMap$Node > com.googlecode.concurrentlinkedhashmap.ConcurrentLinkedHashMap$Node.next, > com.googlecode.concurrentlinkedhashmap.ConcurrentLinkedHashMap$Node > com.googlecode.concurrentlinkedhashmap.ConcurrentLinkedHashMap$Node.next, > com.googlecode.concurrentlinkedhashmap.ConcurrentLinkedHashMap$Node > com.googlecode.concurrentlinkedhashmap.ConcurrentLinkedHashMap$Node.next, > com.googlecode.concurrentlinkedhashmap.ConcurrentLinkedHashMap$Node > com.googlecode.concurrentlinkedhashmap.ConcurrentLinkedHashMap$Node.next, > com.googlecode.concurrentlinkedhashmap.ConcurrentLinkedHashMap$Node > com.googlecode.concurrentlinkedhashmap.ConcurrentLinkedHashMap$Node.next, > com.googlecode.concurrentlinkedhashmap.ConcurrentLinkedHashMap$Node > com.googlecode.concurrentlinkedhashmap.ConcurrentLinkedHashMap$Node.next, > com.googlecode.concurrentlinkedhashmap.ConcurrentLinkedHashMap$Node > com.googlecode.concurrentlinkedhashmap.ConcurrentLinkedHashMap$Node.next, > com.googlecode.concurrentlinkedhashmap.ConcurrentLinkedHashMap$Node > ... (repeated a whole bunch more) > com.googlecode.concurrentlinkedhashmap.ConcurrentLinkedHashMap$Node > com.googlecode.concurrentlinkedhashmap.ConcurrentLinkedHashMap$Node.next, > com.googlecode.concurrentlinkedhashmap.ConcurrentLinkedHashMap$Node > com.googlecode.concurrentlinkedhashmap.ConcurrentLinkedHashMap$Node.next, > com.googlecode.concurrentlinkedhashmap.ConcurrentLinkedHashMap$Node > com.googlecode.concurrentlinkedhashmap.ConcurrentLinkedHashMap$Node.next, > com.googlecode.concurrentlinkedhashmap.ConcurrentLinkedHashMap$Node > com.googlecode.concurrentlinkedhashmap.ConcurrentLinkedHashMap$Node.next, > com.googlecode.concurrentlinkedhashmap.ConcurrentLinkedHashMap$Node > com.googlecode.concurrentlinkedhashmap.ConcurrentLinkedHashMap$Node.next, > final java.lang.Object > com.googlecode.concurrentlinkedhashmap.ConcurrentLinkedHashMap$Node.key, > public final byte[] org.apache.cassandra.cache.KeyCacheKey.key -- This message was sent by Atlassian JIRA (v6.3.4#6332)
[jira] [Commented] (CASSANDRA-10631) JSON Update not working with PreparedStatement
[
https://issues.apache.org/jira/browse/CASSANDRA-10631?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=15027847#comment-15027847
]
Tyler Hobbs commented on CASSANDRA-10631:
-
+1, with just a couple of minor typos to fix on commit:
* 'cannot be found bu "IF EXISTS" is' - in {{DropIndexStatement}}
* 'occured' - in {{SchemaAlteringStatement}}
> JSON Update not working with PreparedStatement
> --
>
> Key: CASSANDRA-10631
> URL: https://issues.apache.org/jira/browse/CASSANDRA-10631
> Project: Cassandra
> Issue Type: Bug
> Components: CQL
> Environment: Windows 7, Datastax Java Driver 2.2.0-rc2
>Reporter: Henrik Karlsson
>Assignee: Sylvain Lebresne
> Fix For: 2.2.x
>
> Attachments: test-json.zip
>
>
> When using PreparedStatement to insert and update a row with JSON the first
> "INSERT INTO {tablename} JSON ?" statement works OK. But when calling it a
> second time with a changed value on a field the field is not updated. If I
> use a SimpleStatement instead ("INSERT INTO {tablename} JSON '"+json+"'") the
> modified field is updated as expected.
> Attaching a test project that shows the problem.
--
This message was sent by Atlassian JIRA
(v6.3.4#6332)
[4/5] cassandra git commit: Merge branch 'cassandra-3.0' into cassandra-3.1
Merge branch 'cassandra-3.0' into cassandra-3.1 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/138f8db8 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/138f8db8 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/138f8db8 Branch: refs/heads/trunk Commit: 138f8db85b85ce2061894b42e4f6652c237bc4de Parents: c1b1aec 5fd6c54 Author: Tyler Hobbs Authored: Wed Nov 25 17:53:34 2015 -0600 Committer: Tyler Hobbs Committed: Wed Nov 25 17:53:34 2015 -0600 -- pylib/cqlshlib/formatting.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) --
[2/5] cassandra git commit: Merge branch 'cassandra-2.1' into cassandra-2.2
Merge branch 'cassandra-2.1' into cassandra-2.2 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/cd75ecd9 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/cd75ecd9 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/cd75ecd9 Branch: refs/heads/trunk Commit: cd75ecd90fe7c49c09dde8e454edd235b1a2 Parents: a90c3b2 9768e57 Author: Tyler Hobbs Authored: Wed Nov 25 17:52:58 2015 -0600 Committer: Tyler Hobbs Committed: Wed Nov 25 17:52:58 2015 -0600 -- pylib/cqlshlib/formatting.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/cd75ecd9/pylib/cqlshlib/formatting.py -- diff --cc pylib/cqlshlib/formatting.py index 8b66bce,b740bf9..62ecd10 --- a/pylib/cqlshlib/formatting.py +++ b/pylib/cqlshlib/formatting.py @@@ -15,15 -15,13 +15,15 @@@ # limitations under the License. import binascii -import sys -import re import calendar import math +import re +import sys +import platform - from collections import defaultdict + import wcwidth + - from . import wcwidth - from .displaying import colorme, get_str, FormattedValue, DEFAULT_VALUE_COLORS, NO_COLOR_MAP + from collections import defaultdict + from displaying import colorme, get_str, FormattedValue, DEFAULT_VALUE_COLORS, NO_COLOR_MAP from cassandra.cqltypes import EMPTY from cassandra.util import datetime_from_timestamp from util import UTC
[3/5] cassandra git commit: Merge branch 'cassandra-2.2' into cassandra-3.0
Merge branch 'cassandra-2.2' into cassandra-3.0 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/5fd6c545 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/5fd6c545 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/5fd6c545 Branch: refs/heads/trunk Commit: 5fd6c545e5e95b2e2a90b06d95177c57efb6f05b Parents: 9b3b3ca cd75ecd Author: Tyler Hobbs Authored: Wed Nov 25 17:53:15 2015 -0600 Committer: Tyler Hobbs Committed: Wed Nov 25 17:53:15 2015 -0600 -- pylib/cqlshlib/formatting.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) --
[1/5] cassandra git commit: CASSANDRA-9304 follow-up: fix cqlshlib tests
Repository: cassandra Updated Branches: refs/heads/trunk 49a5074c7 -> 07bc6884b CASSANDRA-9304 follow-up: fix cqlshlib tests Patch by Stefania Alborghetti; reviewed by Tyler Hobbs as a follow-up to CASSANDRA-9304 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/9768e57e Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/9768e57e Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/9768e57e Branch: refs/heads/trunk Commit: 9768e57e3e855c8049614342053199940a6c65f6 Parents: 68ea4ed Author: Stefania Alborghetti Authored: Mon Nov 23 08:55:37 2015 +0800 Committer: Tyler Hobbs Committed: Wed Nov 25 17:50:34 2015 -0600 -- pylib/cqlshlib/formatting.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/9768e57e/pylib/cqlshlib/formatting.py -- diff --git a/pylib/cqlshlib/formatting.py b/pylib/cqlshlib/formatting.py index 54dde0f..b740bf9 100644 --- a/pylib/cqlshlib/formatting.py +++ b/pylib/cqlshlib/formatting.py @@ -19,9 +19,9 @@ import sys import re import calendar import math +import wcwidth from collections import defaultdict -from . import wcwidth -from .displaying import colorme, get_str, FormattedValue, DEFAULT_VALUE_COLORS, NO_COLOR_MAP +from displaying import colorme, get_str, FormattedValue, DEFAULT_VALUE_COLORS, NO_COLOR_MAP from cassandra.cqltypes import EMPTY from cassandra.util import datetime_from_timestamp from util import UTC
[5/5] cassandra git commit: Merge branch 'cassandra-3.1' into trunk
Merge branch 'cassandra-3.1' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/07bc6884 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/07bc6884 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/07bc6884 Branch: refs/heads/trunk Commit: 07bc6884b5b7e80dd6357c432dd2a711ff83f442 Parents: 49a5074 138f8db Author: Tyler Hobbs Authored: Wed Nov 25 17:54:19 2015 -0600 Committer: Tyler Hobbs Committed: Wed Nov 25 17:54:19 2015 -0600 -- pylib/cqlshlib/formatting.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) --
[4/4] cassandra git commit: Merge branch 'cassandra-3.0' into cassandra-3.1
Merge branch 'cassandra-3.0' into cassandra-3.1 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/138f8db8 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/138f8db8 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/138f8db8 Branch: refs/heads/cassandra-3.1 Commit: 138f8db85b85ce2061894b42e4f6652c237bc4de Parents: c1b1aec 5fd6c54 Author: Tyler Hobbs Authored: Wed Nov 25 17:53:34 2015 -0600 Committer: Tyler Hobbs Committed: Wed Nov 25 17:53:34 2015 -0600 -- pylib/cqlshlib/formatting.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) --
[1/4] cassandra git commit: CASSANDRA-9304 follow-up: fix cqlshlib tests
Repository: cassandra Updated Branches: refs/heads/cassandra-3.1 c1b1aec19 -> 138f8db85 CASSANDRA-9304 follow-up: fix cqlshlib tests Patch by Stefania Alborghetti; reviewed by Tyler Hobbs as a follow-up to CASSANDRA-9304 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/9768e57e Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/9768e57e Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/9768e57e Branch: refs/heads/cassandra-3.1 Commit: 9768e57e3e855c8049614342053199940a6c65f6 Parents: 68ea4ed Author: Stefania Alborghetti Authored: Mon Nov 23 08:55:37 2015 +0800 Committer: Tyler Hobbs Committed: Wed Nov 25 17:50:34 2015 -0600 -- pylib/cqlshlib/formatting.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/9768e57e/pylib/cqlshlib/formatting.py -- diff --git a/pylib/cqlshlib/formatting.py b/pylib/cqlshlib/formatting.py index 54dde0f..b740bf9 100644 --- a/pylib/cqlshlib/formatting.py +++ b/pylib/cqlshlib/formatting.py @@ -19,9 +19,9 @@ import sys import re import calendar import math +import wcwidth from collections import defaultdict -from . import wcwidth -from .displaying import colorme, get_str, FormattedValue, DEFAULT_VALUE_COLORS, NO_COLOR_MAP +from displaying import colorme, get_str, FormattedValue, DEFAULT_VALUE_COLORS, NO_COLOR_MAP from cassandra.cqltypes import EMPTY from cassandra.util import datetime_from_timestamp from util import UTC
[2/4] cassandra git commit: Merge branch 'cassandra-2.1' into cassandra-2.2
Merge branch 'cassandra-2.1' into cassandra-2.2 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/cd75ecd9 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/cd75ecd9 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/cd75ecd9 Branch: refs/heads/cassandra-3.1 Commit: cd75ecd90fe7c49c09dde8e454edd235b1a2 Parents: a90c3b2 9768e57 Author: Tyler Hobbs Authored: Wed Nov 25 17:52:58 2015 -0600 Committer: Tyler Hobbs Committed: Wed Nov 25 17:52:58 2015 -0600 -- pylib/cqlshlib/formatting.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/cd75ecd9/pylib/cqlshlib/formatting.py -- diff --cc pylib/cqlshlib/formatting.py index 8b66bce,b740bf9..62ecd10 --- a/pylib/cqlshlib/formatting.py +++ b/pylib/cqlshlib/formatting.py @@@ -15,15 -15,13 +15,15 @@@ # limitations under the License. import binascii -import sys -import re import calendar import math +import re +import sys +import platform - from collections import defaultdict + import wcwidth + - from . import wcwidth - from .displaying import colorme, get_str, FormattedValue, DEFAULT_VALUE_COLORS, NO_COLOR_MAP + from collections import defaultdict + from displaying import colorme, get_str, FormattedValue, DEFAULT_VALUE_COLORS, NO_COLOR_MAP from cassandra.cqltypes import EMPTY from cassandra.util import datetime_from_timestamp from util import UTC
[3/4] cassandra git commit: Merge branch 'cassandra-2.2' into cassandra-3.0
Merge branch 'cassandra-2.2' into cassandra-3.0 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/5fd6c545 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/5fd6c545 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/5fd6c545 Branch: refs/heads/cassandra-3.1 Commit: 5fd6c545e5e95b2e2a90b06d95177c57efb6f05b Parents: 9b3b3ca cd75ecd Author: Tyler Hobbs Authored: Wed Nov 25 17:53:15 2015 -0600 Committer: Tyler Hobbs Committed: Wed Nov 25 17:53:15 2015 -0600 -- pylib/cqlshlib/formatting.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) --
[2/3] cassandra git commit: Merge branch 'cassandra-2.1' into cassandra-2.2
Merge branch 'cassandra-2.1' into cassandra-2.2 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/cd75ecd9 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/cd75ecd9 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/cd75ecd9 Branch: refs/heads/cassandra-3.0 Commit: cd75ecd90fe7c49c09dde8e454edd235b1a2 Parents: a90c3b2 9768e57 Author: Tyler Hobbs Authored: Wed Nov 25 17:52:58 2015 -0600 Committer: Tyler Hobbs Committed: Wed Nov 25 17:52:58 2015 -0600 -- pylib/cqlshlib/formatting.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/cd75ecd9/pylib/cqlshlib/formatting.py -- diff --cc pylib/cqlshlib/formatting.py index 8b66bce,b740bf9..62ecd10 --- a/pylib/cqlshlib/formatting.py +++ b/pylib/cqlshlib/formatting.py @@@ -15,15 -15,13 +15,15 @@@ # limitations under the License. import binascii -import sys -import re import calendar import math +import re +import sys +import platform - from collections import defaultdict + import wcwidth + - from . import wcwidth - from .displaying import colorme, get_str, FormattedValue, DEFAULT_VALUE_COLORS, NO_COLOR_MAP + from collections import defaultdict + from displaying import colorme, get_str, FormattedValue, DEFAULT_VALUE_COLORS, NO_COLOR_MAP from cassandra.cqltypes import EMPTY from cassandra.util import datetime_from_timestamp from util import UTC
[1/3] cassandra git commit: CASSANDRA-9304 follow-up: fix cqlshlib tests
Repository: cassandra Updated Branches: refs/heads/cassandra-3.0 9b3b3ca00 -> 5fd6c545e CASSANDRA-9304 follow-up: fix cqlshlib tests Patch by Stefania Alborghetti; reviewed by Tyler Hobbs as a follow-up to CASSANDRA-9304 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/9768e57e Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/9768e57e Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/9768e57e Branch: refs/heads/cassandra-3.0 Commit: 9768e57e3e855c8049614342053199940a6c65f6 Parents: 68ea4ed Author: Stefania Alborghetti Authored: Mon Nov 23 08:55:37 2015 +0800 Committer: Tyler Hobbs Committed: Wed Nov 25 17:50:34 2015 -0600 -- pylib/cqlshlib/formatting.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/9768e57e/pylib/cqlshlib/formatting.py -- diff --git a/pylib/cqlshlib/formatting.py b/pylib/cqlshlib/formatting.py index 54dde0f..b740bf9 100644 --- a/pylib/cqlshlib/formatting.py +++ b/pylib/cqlshlib/formatting.py @@ -19,9 +19,9 @@ import sys import re import calendar import math +import wcwidth from collections import defaultdict -from . import wcwidth -from .displaying import colorme, get_str, FormattedValue, DEFAULT_VALUE_COLORS, NO_COLOR_MAP +from displaying import colorme, get_str, FormattedValue, DEFAULT_VALUE_COLORS, NO_COLOR_MAP from cassandra.cqltypes import EMPTY from cassandra.util import datetime_from_timestamp from util import UTC
[2/2] cassandra git commit: Merge branch 'cassandra-2.1' into cassandra-2.2
Merge branch 'cassandra-2.1' into cassandra-2.2 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/cd75ecd9 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/cd75ecd9 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/cd75ecd9 Branch: refs/heads/cassandra-2.2 Commit: cd75ecd90fe7c49c09dde8e454edd235b1a2 Parents: a90c3b2 9768e57 Author: Tyler Hobbs Authored: Wed Nov 25 17:52:58 2015 -0600 Committer: Tyler Hobbs Committed: Wed Nov 25 17:52:58 2015 -0600 -- pylib/cqlshlib/formatting.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/cd75ecd9/pylib/cqlshlib/formatting.py -- diff --cc pylib/cqlshlib/formatting.py index 8b66bce,b740bf9..62ecd10 --- a/pylib/cqlshlib/formatting.py +++ b/pylib/cqlshlib/formatting.py @@@ -15,15 -15,13 +15,15 @@@ # limitations under the License. import binascii -import sys -import re import calendar import math +import re +import sys +import platform - from collections import defaultdict + import wcwidth + - from . import wcwidth - from .displaying import colorme, get_str, FormattedValue, DEFAULT_VALUE_COLORS, NO_COLOR_MAP + from collections import defaultdict + from displaying import colorme, get_str, FormattedValue, DEFAULT_VALUE_COLORS, NO_COLOR_MAP from cassandra.cqltypes import EMPTY from cassandra.util import datetime_from_timestamp from util import UTC
[3/3] cassandra git commit: Merge branch 'cassandra-2.2' into cassandra-3.0
Merge branch 'cassandra-2.2' into cassandra-3.0 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/5fd6c545 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/5fd6c545 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/5fd6c545 Branch: refs/heads/cassandra-3.0 Commit: 5fd6c545e5e95b2e2a90b06d95177c57efb6f05b Parents: 9b3b3ca cd75ecd Author: Tyler Hobbs Authored: Wed Nov 25 17:53:15 2015 -0600 Committer: Tyler Hobbs Committed: Wed Nov 25 17:53:15 2015 -0600 -- pylib/cqlshlib/formatting.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) --
[1/2] cassandra git commit: CASSANDRA-9304 follow-up: fix cqlshlib tests
Repository: cassandra Updated Branches: refs/heads/cassandra-2.2 a90c3b2b8 -> cd75ecd90 CASSANDRA-9304 follow-up: fix cqlshlib tests Patch by Stefania Alborghetti; reviewed by Tyler Hobbs as a follow-up to CASSANDRA-9304 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/9768e57e Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/9768e57e Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/9768e57e Branch: refs/heads/cassandra-2.2 Commit: 9768e57e3e855c8049614342053199940a6c65f6 Parents: 68ea4ed Author: Stefania Alborghetti Authored: Mon Nov 23 08:55:37 2015 +0800 Committer: Tyler Hobbs Committed: Wed Nov 25 17:50:34 2015 -0600 -- pylib/cqlshlib/formatting.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/9768e57e/pylib/cqlshlib/formatting.py -- diff --git a/pylib/cqlshlib/formatting.py b/pylib/cqlshlib/formatting.py index 54dde0f..b740bf9 100644 --- a/pylib/cqlshlib/formatting.py +++ b/pylib/cqlshlib/formatting.py @@ -19,9 +19,9 @@ import sys import re import calendar import math +import wcwidth from collections import defaultdict -from . import wcwidth -from .displaying import colorme, get_str, FormattedValue, DEFAULT_VALUE_COLORS, NO_COLOR_MAP +from displaying import colorme, get_str, FormattedValue, DEFAULT_VALUE_COLORS, NO_COLOR_MAP from cassandra.cqltypes import EMPTY from cassandra.util import datetime_from_timestamp from util import UTC
cassandra git commit: CASSANDRA-9304 follow-up: fix cqlshlib tests
Repository: cassandra Updated Branches: refs/heads/cassandra-2.1 68ea4edb3 -> 9768e57e3 CASSANDRA-9304 follow-up: fix cqlshlib tests Patch by Stefania Alborghetti; reviewed by Tyler Hobbs as a follow-up to CASSANDRA-9304 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/9768e57e Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/9768e57e Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/9768e57e Branch: refs/heads/cassandra-2.1 Commit: 9768e57e3e855c8049614342053199940a6c65f6 Parents: 68ea4ed Author: Stefania Alborghetti Authored: Mon Nov 23 08:55:37 2015 +0800 Committer: Tyler Hobbs Committed: Wed Nov 25 17:50:34 2015 -0600 -- pylib/cqlshlib/formatting.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/9768e57e/pylib/cqlshlib/formatting.py -- diff --git a/pylib/cqlshlib/formatting.py b/pylib/cqlshlib/formatting.py index 54dde0f..b740bf9 100644 --- a/pylib/cqlshlib/formatting.py +++ b/pylib/cqlshlib/formatting.py @@ -19,9 +19,9 @@ import sys import re import calendar import math +import wcwidth from collections import defaultdict -from . import wcwidth -from .displaying import colorme, get_str, FormattedValue, DEFAULT_VALUE_COLORS, NO_COLOR_MAP +from displaying import colorme, get_str, FormattedValue, DEFAULT_VALUE_COLORS, NO_COLOR_MAP from cassandra.cqltypes import EMPTY from cassandra.util import datetime_from_timestamp from util import UTC
[jira] [Commented] (CASSANDRA-10688) Stack overflow from SSTableReader$InstanceTidier.runOnClose in Leak Detector
[ https://issues.apache.org/jira/browse/CASSANDRA-10688?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=15027803#comment-15027803 ] Ariel Weisberg commented on CASSANDRA-10688: I don't think this is doing what you would hope. I want to rewrite this to be iterative with a fixed bound so that it can abort on depth properly without unexpected behavior. > Stack overflow from SSTableReader$InstanceTidier.runOnClose in Leak Detector > > > Key: CASSANDRA-10688 > URL: https://issues.apache.org/jira/browse/CASSANDRA-10688 > Project: Cassandra > Issue Type: Bug >Reporter: Jeremiah Jordan >Assignee: Ariel Weisberg > Fix For: 3.0.1, 3.1 > > > Running some tests against cassandra-3.0 > 9fc957cf3097e54ccd72e51b2d0650dc3e83eae0 > The tests are just running cassandra-stress write and read while adding and > removing nodes from the cluster. After the test runs when I go back through > logs I find the following Stackoverflow fairly often: > ERROR [Strong-Reference-Leak-Detector:1] 2015-11-11 00:04:10,638 > Ref.java:413 - Stackoverflow [private java.lang.Runnable > org.apache.cassandra.io.sstable.format.SSTableReader$InstanceTidier.runOnClose, > final java.lang.Runnable > org.apache.cassandra.io.sstable.format.SSTableReader$DropPageCache.andThen, > final org.apache.cassandra.cache.InstrumentingCache > org.apache.cassandra.io.sstable.SSTableRewriter$InvalidateKeys.cache, private > final org.apache.cassandra.cache.ICache > org.apache.cassandra.cache.InstrumentingCache.map, private final > com.googlecode.concurrentlinkedhashmap.ConcurrentLinkedHashMap > org.apache.cassandra.cache.ConcurrentLinkedHashCache.map, final > com.googlecode.concurrentlinkedhashmap.LinkedDeque > com.googlecode.concurrentlinkedhashmap.ConcurrentLinkedHashMap.evictionDeque, > com.googlecode.concurrentlinkedhashmap.Linked > com.googlecode.concurrentlinkedhashmap.LinkedDeque.first, > com.googlecode.concurrentlinkedhashmap.ConcurrentLinkedHashMap$Node > com.googlecode.concurrentlinkedhashmap.ConcurrentLinkedHashMap$Node.next, > com.googlecode.concurrentlinkedhashmap.ConcurrentLinkedHashMap$Node > com.googlecode.concurrentlinkedhashmap.ConcurrentLinkedHashMap$Node.next, > com.googlecode.concurrentlinkedhashmap.ConcurrentLinkedHashMap$Node > com.googlecode.concurrentlinkedhashmap.ConcurrentLinkedHashMap$Node.next, > com.googlecode.concurrentlinkedhashmap.ConcurrentLinkedHashMap$Node > com.googlecode.concurrentlinkedhashmap.ConcurrentLinkedHashMap$Node.next, > com.googlecode.concurrentlinkedhashmap.ConcurrentLinkedHashMap$Node > com.googlecode.concurrentlinkedhashmap.ConcurrentLinkedHashMap$Node.next, > com.googlecode.concurrentlinkedhashmap.ConcurrentLinkedHashMap$Node > com.googlecode.concurrentlinkedhashmap.ConcurrentLinkedHashMap$Node.next, > com.googlecode.concurrentlinkedhashmap.ConcurrentLinkedHashMap$Node > com.googlecode.concurrentlinkedhashmap.ConcurrentLinkedHashMap$Node.next, > com.googlecode.concurrentlinkedhashmap.ConcurrentLinkedHashMap$Node > com.googlecode.concurrentlinkedhashmap.ConcurrentLinkedHashMap$Node.next, > com.googlecode.concurrentlinkedhashmap.ConcurrentLinkedHashMap$Node > com.googlecode.concurrentlinkedhashmap.ConcurrentLinkedHashMap$Node.next, > com.googlecode.concurrentlinkedhashmap.ConcurrentLinkedHashMap$Node > ... (repeated a whole bunch more) > com.googlecode.concurrentlinkedhashmap.ConcurrentLinkedHashMap$Node > com.googlecode.concurrentlinkedhashmap.ConcurrentLinkedHashMap$Node.next, > com.googlecode.concurrentlinkedhashmap.ConcurrentLinkedHashMap$Node > com.googlecode.concurrentlinkedhashmap.ConcurrentLinkedHashMap$Node.next, > com.googlecode.concurrentlinkedhashmap.ConcurrentLinkedHashMap$Node > com.googlecode.concurrentlinkedhashmap.ConcurrentLinkedHashMap$Node.next, > com.googlecode.concurrentlinkedhashmap.ConcurrentLinkedHashMap$Node > com.googlecode.concurrentlinkedhashmap.ConcurrentLinkedHashMap$Node.next, > com.googlecode.concurrentlinkedhashmap.ConcurrentLinkedHashMap$Node > com.googlecode.concurrentlinkedhashmap.ConcurrentLinkedHashMap$Node.next, > final java.lang.Object > com.googlecode.concurrentlinkedhashmap.ConcurrentLinkedHashMap$Node.key, > public final byte[] org.apache.cassandra.cache.KeyCacheKey.key -- This message was sent by Atlassian JIRA (v6.3.4#6332)
[jira] [Commented] (CASSANDRA-10674) Materialized View SSTable streaming/leaving status race on decommission
[ https://issues.apache.org/jira/browse/CASSANDRA-10674?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=15027795#comment-15027795 ] Paulo Motta commented on CASSANDRA-10674: - I agree with [~tjake] that the simplest thing to do here is to force the mutation into the local batchlog when the node is not a base replica of the mutation, and log a warning if there are no pending ranges (since they might be being calculated or still haven't propagated fully by gossip). I implemented a patch based on this approach: ||3.0||trunk|| |[branch|https://github.com/apache/cassandra/compare/cassandra-3.0...pauloricardomg:3.0-10674]|[branch|https://github.com/apache/cassandra/compare/trunk...pauloricardomg:trunk-10674]| |[testall|http://cassci.datastax.com/view/Dev/view/paulomotta/job/pauloricardomg-3.0-10674-testall/lastCompletedBuild/testReport/]|[testall|http://cassci.datastax.com/view/Dev/view/paulomotta/job/pauloricardomg-trunk-10674-testall/lastCompletedBuild/testReport/]| |[dtest|http://cassci.datastax.com/view/Dev/view/paulomotta/job/pauloricardomg-3.0-10674-dtest/lastCompletedBuild/testReport/]|[dtest|http://cassci.datastax.com/view/Dev/view/paulomotta/job/pauloricardomg-trunk-10674-dtest/lastCompletedBuild/testReport/]| [~jkni] could you verify the jepsen tests with this approach and check if the warning is being printed? bq. Second and more importantly we should probably add an acknowledgement to the streaming operation that it was processed by the receiver correctly. It seems the stream receive task (and thus the stream sesssion) is only completed on [2.1|https://github.com/apache/cassandra/blob/cassandra-2.1/src/java/org/apache/cassandra/streaming/StreamReceiveTask.java#L175] and [2.2|https://github.com/apache/cassandra/blob/cassandra-2.2/src/java/org/apache/cassandra/streaming/StreamReceiveTask.java#L171] after the files are processed (otherwise it just hangs), but on [3.0|https://github.com/apache/cassandra/blob/cassandra-3.0/src/java/org/apache/cassandra/streaming/StreamReceiveTask.java#L231] it's always completed even if there was a failure, what seems more critical. In any case, we should probably fail the stream session if there is a problem while processing the received data. I created CASSANDRA-10774 to investigate and address that. > Materialized View SSTable streaming/leaving status race on decommission > --- > > Key: CASSANDRA-10674 > URL: https://issues.apache.org/jira/browse/CASSANDRA-10674 > Project: Cassandra > Issue Type: Bug > Components: Coordination, Distributed Metadata >Reporter: Joel Knighton >Assignee: Paulo Motta > Fix For: 3.0.1, 3.1 > > Attachments: leaving-node-debug.log, receiving-node-debug.log > > > On decommission of a node in a cluster with materialized views, it is > possible for the decommissioning node to begin streaming sstables for an MV > base table before the receiving node is aware of the leaving status. > The materialized view base/view replica pairing checks pending endpoints to > handle the case when an sstable is received from a leaving node; without the > leaving message, this check breaks and an exception is thrown. The streamed > sstable is never applied. > Logs from a decommissioning node and a node receiving such a stream are > attached. -- This message was sent by Atlassian JIRA (v6.3.4#6332)
[jira] [Created] (CASSANDRA-10774) Fail stream session if receiver cannot process data
Paulo Motta created CASSANDRA-10774:
---
Summary: Fail stream session if receiver cannot process data
Key: CASSANDRA-10774
URL: https://issues.apache.org/jira/browse/CASSANDRA-10774
Project: Cassandra
Issue Type: Bug
Components: Streaming and Messaging
Reporter: Paulo Motta
Assignee: Paulo Motta
Priority: Critical
[~tjake] on CASSANDRA-10674:
{quote}
I think the underlying issue here is streaming failures only account for
problems during the file send. Not any subsequent errors.
We should probably add an acknowledgement to the streaming operation that it
was processed by the receiver correctly.
{quote}
It seems the stream receive task (and thus the stream sesssion) is only
completed on
[2.1|https://github.com/apache/cassandra/blob/cassandra-2.1/src/java/org/apache/cassandra/streaming/StreamReceiveTask.java#L175]
and
[2.2|https://github.com/apache/cassandra/blob/cassandra-2.2/src/java/org/apache/cassandra/streaming/StreamReceiveTask.java#L171]
after the files are processed (otherwise it just hangs), but on
[3.0|https://github.com/apache/cassandra/blob/cassandra-3.0/src/java/org/apache/cassandra/streaming/StreamReceiveTask.java#L231]
it's always completed even if there was a failure, what seems more critical.
In any case, we should probably fail the stream session if there is a problem
while processing the received data.
--
This message was sent by Atlassian JIRA
(v6.3.4#6332)
[jira] [Comment Edited] (CASSANDRA-10688) Stack overflow from SSTableReader$InstanceTidier.runOnClose in Leak Detector
[ https://issues.apache.org/jira/browse/CASSANDRA-10688?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=15027758#comment-15027758 ] Ariel Weisberg edited comment on CASSANDRA-10688 at 11/25/15 11:07 PM: --- It is just occurring to me, but if we just hit stack overflow what are the odds that logging isn't also going to cause the stack to overflow? I mean in practice it doesn't seem to be happening, but it seems like it should! And even worse then that. What if stack overflow corrupts a data structure inside NoSpamLogger or somewhere else? was (Author: aweisberg): It is just occurring to me, but if we just hit stack overflow what are the odds that logging isn't also going to cause the stack to overflow? I mean in practice it doesn't seem to be happening, but it seems like it should! > Stack overflow from SSTableReader$InstanceTidier.runOnClose in Leak Detector > > > Key: CASSANDRA-10688 > URL: https://issues.apache.org/jira/browse/CASSANDRA-10688 > Project: Cassandra > Issue Type: Bug >Reporter: Jeremiah Jordan >Assignee: Ariel Weisberg > Fix For: 3.0.1, 3.1 > > > Running some tests against cassandra-3.0 > 9fc957cf3097e54ccd72e51b2d0650dc3e83eae0 > The tests are just running cassandra-stress write and read while adding and > removing nodes from the cluster. After the test runs when I go back through > logs I find the following Stackoverflow fairly often: > ERROR [Strong-Reference-Leak-Detector:1] 2015-11-11 00:04:10,638 > Ref.java:413 - Stackoverflow [private java.lang.Runnable > org.apache.cassandra.io.sstable.format.SSTableReader$InstanceTidier.runOnClose, > final java.lang.Runnable > org.apache.cassandra.io.sstable.format.SSTableReader$DropPageCache.andThen, > final org.apache.cassandra.cache.InstrumentingCache > org.apache.cassandra.io.sstable.SSTableRewriter$InvalidateKeys.cache, private > final org.apache.cassandra.cache.ICache > org.apache.cassandra.cache.InstrumentingCache.map, private final > com.googlecode.concurrentlinkedhashmap.ConcurrentLinkedHashMap > org.apache.cassandra.cache.ConcurrentLinkedHashCache.map, final > com.googlecode.concurrentlinkedhashmap.LinkedDeque > com.googlecode.concurrentlinkedhashmap.ConcurrentLinkedHashMap.evictionDeque, > com.googlecode.concurrentlinkedhashmap.Linked > com.googlecode.concurrentlinkedhashmap.LinkedDeque.first, > com.googlecode.concurrentlinkedhashmap.ConcurrentLinkedHashMap$Node > com.googlecode.concurrentlinkedhashmap.ConcurrentLinkedHashMap$Node.next, > com.googlecode.concurrentlinkedhashmap.ConcurrentLinkedHashMap$Node > com.googlecode.concurrentlinkedhashmap.ConcurrentLinkedHashMap$Node.next, > com.googlecode.concurrentlinkedhashmap.ConcurrentLinkedHashMap$Node > com.googlecode.concurrentlinkedhashmap.ConcurrentLinkedHashMap$Node.next, > com.googlecode.concurrentlinkedhashmap.ConcurrentLinkedHashMap$Node > com.googlecode.concurrentlinkedhashmap.ConcurrentLinkedHashMap$Node.next, > com.googlecode.concurrentlinkedhashmap.ConcurrentLinkedHashMap$Node > com.googlecode.concurrentlinkedhashmap.ConcurrentLinkedHashMap$Node.next, > com.googlecode.concurrentlinkedhashmap.ConcurrentLinkedHashMap$Node > com.googlecode.concurrentlinkedhashmap.ConcurrentLinkedHashMap$Node.next, > com.googlecode.concurrentlinkedhashmap.ConcurrentLinkedHashMap$Node > com.googlecode.concurrentlinkedhashmap.ConcurrentLinkedHashMap$Node.next, > com.googlecode.concurrentlinkedhashmap.ConcurrentLinkedHashMap$Node > com.googlecode.concurrentlinkedhashmap.ConcurrentLinkedHashMap$Node.next, > com.googlecode.concurrentlinkedhashmap.ConcurrentLinkedHashMap$Node > com.googlecode.concurrentlinkedhashmap.ConcurrentLinkedHashMap$Node.next, > com.googlecode.concurrentlinkedhashmap.ConcurrentLinkedHashMap$Node > ... (repeated a whole bunch more) > com.googlecode.concurrentlinkedhashmap.ConcurrentLinkedHashMap$Node > com.googlecode.concurrentlinkedhashmap.ConcurrentLinkedHashMap$Node.next, > com.googlecode.concurrentlinkedhashmap.ConcurrentLinkedHashMap$Node > com.googlecode.concurrentlinkedhashmap.ConcurrentLinkedHashMap$Node.next, > com.googlecode.concurrentlinkedhashmap.ConcurrentLinkedHashMap$Node > com.googlecode.concurrentlinkedhashmap.ConcurrentLinkedHashMap$Node.next, > com.googlecode.concurrentlinkedhashmap.ConcurrentLinkedHashMap$Node > com.googlecode.concurrentlinkedhashmap.ConcurrentLinkedHashMap$Node.next, > com.googlecode.concurrentlinkedhashmap.ConcurrentLinkedHashMap$Node > com.googlecode.concurrentlinkedhashmap.ConcurrentLinkedHashMap$Node.next, > final java.lang.Object > com.googlecode.concurrentlinkedhashmap.ConcurrentLinkedHashMap$Node.key, > public final byte[] org.apache.cassandra.cache.KeyCacheKey.key -- This message was sent
[jira] [Commented] (CASSANDRA-10688) Stack overflow from SSTableReader$InstanceTidier.runOnClose in Leak Detector
[ https://issues.apache.org/jira/browse/CASSANDRA-10688?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=15027758#comment-15027758 ] Ariel Weisberg commented on CASSANDRA-10688: It is just occurring to me, but if we just hit stack overflow what are the odds that logging isn't also going to cause the stack to overflow? I mean in practice it doesn't seem to be happening, but it seems like it should! > Stack overflow from SSTableReader$InstanceTidier.runOnClose in Leak Detector > > > Key: CASSANDRA-10688 > URL: https://issues.apache.org/jira/browse/CASSANDRA-10688 > Project: Cassandra > Issue Type: Bug >Reporter: Jeremiah Jordan >Assignee: Ariel Weisberg > Fix For: 3.0.1, 3.1 > > > Running some tests against cassandra-3.0 > 9fc957cf3097e54ccd72e51b2d0650dc3e83eae0 > The tests are just running cassandra-stress write and read while adding and > removing nodes from the cluster. After the test runs when I go back through > logs I find the following Stackoverflow fairly often: > ERROR [Strong-Reference-Leak-Detector:1] 2015-11-11 00:04:10,638 > Ref.java:413 - Stackoverflow [private java.lang.Runnable > org.apache.cassandra.io.sstable.format.SSTableReader$InstanceTidier.runOnClose, > final java.lang.Runnable > org.apache.cassandra.io.sstable.format.SSTableReader$DropPageCache.andThen, > final org.apache.cassandra.cache.InstrumentingCache > org.apache.cassandra.io.sstable.SSTableRewriter$InvalidateKeys.cache, private > final org.apache.cassandra.cache.ICache > org.apache.cassandra.cache.InstrumentingCache.map, private final > com.googlecode.concurrentlinkedhashmap.ConcurrentLinkedHashMap > org.apache.cassandra.cache.ConcurrentLinkedHashCache.map, final > com.googlecode.concurrentlinkedhashmap.LinkedDeque > com.googlecode.concurrentlinkedhashmap.ConcurrentLinkedHashMap.evictionDeque, > com.googlecode.concurrentlinkedhashmap.Linked > com.googlecode.concurrentlinkedhashmap.LinkedDeque.first, > com.googlecode.concurrentlinkedhashmap.ConcurrentLinkedHashMap$Node > com.googlecode.concurrentlinkedhashmap.ConcurrentLinkedHashMap$Node.next, > com.googlecode.concurrentlinkedhashmap.ConcurrentLinkedHashMap$Node > com.googlecode.concurrentlinkedhashmap.ConcurrentLinkedHashMap$Node.next, > com.googlecode.concurrentlinkedhashmap.ConcurrentLinkedHashMap$Node > com.googlecode.concurrentlinkedhashmap.ConcurrentLinkedHashMap$Node.next, > com.googlecode.concurrentlinkedhashmap.ConcurrentLinkedHashMap$Node > com.googlecode.concurrentlinkedhashmap.ConcurrentLinkedHashMap$Node.next, > com.googlecode.concurrentlinkedhashmap.ConcurrentLinkedHashMap$Node > com.googlecode.concurrentlinkedhashmap.ConcurrentLinkedHashMap$Node.next, > com.googlecode.concurrentlinkedhashmap.ConcurrentLinkedHashMap$Node > com.googlecode.concurrentlinkedhashmap.ConcurrentLinkedHashMap$Node.next, > com.googlecode.concurrentlinkedhashmap.ConcurrentLinkedHashMap$Node > com.googlecode.concurrentlinkedhashmap.ConcurrentLinkedHashMap$Node.next, > com.googlecode.concurrentlinkedhashmap.ConcurrentLinkedHashMap$Node > com.googlecode.concurrentlinkedhashmap.ConcurrentLinkedHashMap$Node.next, > com.googlecode.concurrentlinkedhashmap.ConcurrentLinkedHashMap$Node > com.googlecode.concurrentlinkedhashmap.ConcurrentLinkedHashMap$Node.next, > com.googlecode.concurrentlinkedhashmap.ConcurrentLinkedHashMap$Node > ... (repeated a whole bunch more) > com.googlecode.concurrentlinkedhashmap.ConcurrentLinkedHashMap$Node > com.googlecode.concurrentlinkedhashmap.ConcurrentLinkedHashMap$Node.next, > com.googlecode.concurrentlinkedhashmap.ConcurrentLinkedHashMap$Node > com.googlecode.concurrentlinkedhashmap.ConcurrentLinkedHashMap$Node.next, > com.googlecode.concurrentlinkedhashmap.ConcurrentLinkedHashMap$Node > com.googlecode.concurrentlinkedhashmap.ConcurrentLinkedHashMap$Node.next, > com.googlecode.concurrentlinkedhashmap.ConcurrentLinkedHashMap$Node > com.googlecode.concurrentlinkedhashmap.ConcurrentLinkedHashMap$Node.next, > com.googlecode.concurrentlinkedhashmap.ConcurrentLinkedHashMap$Node > com.googlecode.concurrentlinkedhashmap.ConcurrentLinkedHashMap$Node.next, > final java.lang.Object > com.googlecode.concurrentlinkedhashmap.ConcurrentLinkedHashMap$Node.key, > public final byte[] org.apache.cassandra.cache.KeyCacheKey.key -- This message was sent by Atlassian JIRA (v6.3.4#6332)
[jira] [Updated] (CASSANDRA-9991) Implement efficient btree removal
[ https://issues.apache.org/jira/browse/CASSANDRA-9991?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] Piotr Jastrzebski updated CASSANDRA-9991: - Attachment: trunk-9991-v3.txt > Implement efficient btree removal > - > > Key: CASSANDRA-9991 > URL: https://issues.apache.org/jira/browse/CASSANDRA-9991 > Project: Cassandra > Issue Type: Sub-task >Reporter: Benedict > Labels: patch > Fix For: 3.x > > Attachments: trunk-9991-v3.txt, trunk-9991.txt, trunk-9991.txt-v2 > > > Currently removal is implemented as a reconstruction by filtering and > iterator over the original btree. This could be much more efficient, editing > just the necessary nodes. -- This message was sent by Atlassian JIRA (v6.3.4#6332)
[jira] [Commented] (CASSANDRA-9991) Implement efficient btree removal
[ https://issues.apache.org/jira/browse/CASSANDRA-9991?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=15027756#comment-15027756 ] Piotr Jastrzebski commented on CASSANDRA-9991: -- I added the test, fixed the isWellFormed and used index BTree operations to avoid Comparator.compare calls. Please have another look. Thanks > Implement efficient btree removal > - > > Key: CASSANDRA-9991 > URL: https://issues.apache.org/jira/browse/CASSANDRA-9991 > Project: Cassandra > Issue Type: Sub-task >Reporter: Benedict > Labels: patch > Fix For: 3.x > > Attachments: trunk-9991.txt, trunk-9991.txt-v2 > > > Currently removal is implemented as a reconstruction by filtering and > iterator over the original btree. This could be much more efficient, editing > just the necessary nodes. -- This message was sent by Atlassian JIRA (v6.3.4#6332)
[jira] [Comment Edited] (CASSANDRA-10448) "Unknown type 0" Stream failure on Repair
[
https://issues.apache.org/jira/browse/CASSANDRA-10448?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=15027687#comment-15027687
]
David Thompson edited comment on CASSANDRA-10448 at 11/25/15 10:07 PM:
---
I'm seeing the same situation described by Piotr: a seed node attempts to send
7 files (4G) to bootstrap a new node, but the streaming always fails with a
'Broken pipe' despite no indication of any network trouble. 2.2.3 on RHEL7-64,
jdk 1.8.0_65, and there's a blob column with values up to 5M in size. I wanted
to ask if there's a workaround, or if it's known that moving up to 3.0 would
help?
was (Author: guinyardli...@yahoo.com):
I'm seeing the same situation described by Piotr: a seed node attempts to send
7 files (4G) to bootstrap a new node, but the streaming always fails with a
'Broken pipe' despite no indication of any network trouble. 2.2.3 on RHEL7-64,
jdk 1.8.0_65 I wanted to ask if there's a workaround, or if it's known that
moving up to 3.0 would help?
> "Unknown type 0" Stream failure on Repair
> -
>
> Key: CASSANDRA-10448
> URL: https://issues.apache.org/jira/browse/CASSANDRA-10448
> Project: Cassandra
> Issue Type: Bug
> Components: Streaming and Messaging
> Environment: Cassandra 2.2.2
> 5 Nodes in Google Compute Engine
> Java 1.8.0_60
>Reporter: Omri Iluz
>Assignee: Yuki Morishita
> Fix For: 2.2.x
>
> Attachments: casslogs.txt, receiversystem.log, sendersystem.log
>
>
> While running repair after upgrading to 2.2.2 I am getting many stream fail
> errors:
> {noformat}
> [2015-10-05 23:52:30,353] Repair session 4c181051-6bbb-11e5-acdb-d9a8bbd39330
> for range (59694553044959221,86389982480621619] failed with error [repair
> #4c181051-6bbb-11e5-acdb-d9a8bbd39330 on px/acti
> vities, (59694553044959221,86389982480621619]] Sync failed between
> /10.240.81.104 and /10.240.134.221 (progress: 4%)
> {noformat}
> Logs from both sides of the stream:
> Sides 1 -
> {noformat}
> INFO [STREAM-INIT-/10.240.81.104:52722] 2015-10-05 23:52:30,063
> StreamResultFuture.java:111 - [Stream #239d8e60-6bbc-11e5-93ac-31bdef2dc550
> ID#0] Creating new streaming plan for Repair
> INFO [STREAM-INIT-/10.240.81.104:52722] 2015-10-05 23:52:30,063
> StreamResultFuture.java:118 - [Stream #239d8e60-6bbc-11e5-93ac-31bdef2dc550,
> ID#0] Received streaming plan for Repair
> INFO [STREAM-INIT-/10.240.81.104:52723] 2015-10-05 23:52:30,063
> StreamResultFuture.java:118 - [Stream #239d8e60-6bbc-11e5-93ac-31bdef2dc550,
> ID#0] Received streaming plan for Repair
> INFO [STREAM-IN-/10.240.81.104] 2015-10-05 23:52:30,098
> StreamResultFuture.java:168 - [Stream #239d8e60-6bbc-11e5-93ac-31bdef2dc550
> ID#0] Prepare completed. Receiving 13 files(517391317 bytes), sending 10
> files(469491729 bytes)
> ERROR [STREAM-IN-/10.240.81.104] 2015-10-05 23:52:30,234
> StreamSession.java:524 - [Stream #239d8e60-6bbc-11e5-93ac-31bdef2dc550]
> Streaming error occurred
> java.lang.IllegalArgumentException: Unknown type 0
> at
> org.apache.cassandra.streaming.messages.StreamMessage$Type.get(StreamMessage.java:96)
> ~[apache-cassandra-2.2.2.jar:2.2.2]
> at
> org.apache.cassandra.streaming.messages.StreamMessage.deserialize(StreamMessage.java:57)
> ~[apache-cassandra-2.2.2.jar:2.2.2]
> at
> org.apache.cassandra.streaming.ConnectionHandler$IncomingMessageHandler.run(ConnectionHandler.java:261)
> ~[apache-cassandra-2.2.2.jar:2.2.2]
> at java.lang.Thread.run(Thread.java:745) [na:1.8.0_60]
> INFO [STREAM-IN-/10.240.81.104] 2015-10-05 23:52:30,302
> StreamResultFuture.java:182 - [Stream #239d8e60-6bbc-11e5-93ac-31bdef2dc550]
> Session with /10.240.81.104 is complete
> WARN [STREAM-IN-/10.240.81.104] 2015-10-05 23:52:30,302
> StreamResultFuture.java:209 - [Stream #239d8e60-6bbc-11e5-93ac-31bdef2dc550]
> Stream failed
> {noformat}
> Side 2 -
> {noformat}
> INFO [AntiEntropyStage:1] 2015-10-05 23:52:30,060 StreamResultFuture.java:86
> - [Stream #239d8e60-6bbc-11e5-93ac-31bdef2dc550] Executing streaming plan for
> Repair
> INFO [StreamConnectionEstablisher:6] 2015-10-05 23:52:30,061
> StreamSession.java:232 - [Stream #239d8e60-6bbc-11e5-93ac-31bdef2dc550]
> Starting streaming to /10.240.134.221
> INFO [StreamConnectionEstablisher:6] 2015-10-05 23:52:30,063
> StreamCoordinator.java:213 - [Stream #239d8e60-6bbc-11e5-93ac-31bdef2dc550,
> ID#0] Beginning stream session with /10.240.134.221
> INFO [STREAM-IN-/10.240.134.221] 2015-10-05 23:52:30,098
> StreamResultFuture.java:168 - [Stream #239d8e60-6bbc-11e5-93ac-31bdef2dc550
> ID#0] Prepare completed. Receiving 10 files(469491729 bytes), sending 13
> files(517391317 bytes)
> INFO [STREAM-IN-/10.240.134.221] 2015-10-05 23:52:30,349
> StreamResultFuture.java:182 - [St
[jira] [Commented] (CASSANDRA-10448) "Unknown type 0" Stream failure on Repair
[
https://issues.apache.org/jira/browse/CASSANDRA-10448?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=15027687#comment-15027687
]
David Thompson commented on CASSANDRA-10448:
I'm seeing the same situation described by Piotr: a seed node attempts to send
7 files (4G) to bootstrap a new node, but the streaming always fails with a
'Broken pipe' despite no indication of any network trouble. 2.2.3 on RHEL7-64,
jdk 1.8.0_65 I wanted to ask if there's a workaround, or if it's known that
moving up to 3.0 would help?
> "Unknown type 0" Stream failure on Repair
> -
>
> Key: CASSANDRA-10448
> URL: https://issues.apache.org/jira/browse/CASSANDRA-10448
> Project: Cassandra
> Issue Type: Bug
> Components: Streaming and Messaging
> Environment: Cassandra 2.2.2
> 5 Nodes in Google Compute Engine
> Java 1.8.0_60
>Reporter: Omri Iluz
>Assignee: Yuki Morishita
> Fix For: 2.2.x
>
> Attachments: casslogs.txt, receiversystem.log, sendersystem.log
>
>
> While running repair after upgrading to 2.2.2 I am getting many stream fail
> errors:
> {noformat}
> [2015-10-05 23:52:30,353] Repair session 4c181051-6bbb-11e5-acdb-d9a8bbd39330
> for range (59694553044959221,86389982480621619] failed with error [repair
> #4c181051-6bbb-11e5-acdb-d9a8bbd39330 on px/acti
> vities, (59694553044959221,86389982480621619]] Sync failed between
> /10.240.81.104 and /10.240.134.221 (progress: 4%)
> {noformat}
> Logs from both sides of the stream:
> Sides 1 -
> {noformat}
> INFO [STREAM-INIT-/10.240.81.104:52722] 2015-10-05 23:52:30,063
> StreamResultFuture.java:111 - [Stream #239d8e60-6bbc-11e5-93ac-31bdef2dc550
> ID#0] Creating new streaming plan for Repair
> INFO [STREAM-INIT-/10.240.81.104:52722] 2015-10-05 23:52:30,063
> StreamResultFuture.java:118 - [Stream #239d8e60-6bbc-11e5-93ac-31bdef2dc550,
> ID#0] Received streaming plan for Repair
> INFO [STREAM-INIT-/10.240.81.104:52723] 2015-10-05 23:52:30,063
> StreamResultFuture.java:118 - [Stream #239d8e60-6bbc-11e5-93ac-31bdef2dc550,
> ID#0] Received streaming plan for Repair
> INFO [STREAM-IN-/10.240.81.104] 2015-10-05 23:52:30,098
> StreamResultFuture.java:168 - [Stream #239d8e60-6bbc-11e5-93ac-31bdef2dc550
> ID#0] Prepare completed. Receiving 13 files(517391317 bytes), sending 10
> files(469491729 bytes)
> ERROR [STREAM-IN-/10.240.81.104] 2015-10-05 23:52:30,234
> StreamSession.java:524 - [Stream #239d8e60-6bbc-11e5-93ac-31bdef2dc550]
> Streaming error occurred
> java.lang.IllegalArgumentException: Unknown type 0
> at
> org.apache.cassandra.streaming.messages.StreamMessage$Type.get(StreamMessage.java:96)
> ~[apache-cassandra-2.2.2.jar:2.2.2]
> at
> org.apache.cassandra.streaming.messages.StreamMessage.deserialize(StreamMessage.java:57)
> ~[apache-cassandra-2.2.2.jar:2.2.2]
> at
> org.apache.cassandra.streaming.ConnectionHandler$IncomingMessageHandler.run(ConnectionHandler.java:261)
> ~[apache-cassandra-2.2.2.jar:2.2.2]
> at java.lang.Thread.run(Thread.java:745) [na:1.8.0_60]
> INFO [STREAM-IN-/10.240.81.104] 2015-10-05 23:52:30,302
> StreamResultFuture.java:182 - [Stream #239d8e60-6bbc-11e5-93ac-31bdef2dc550]
> Session with /10.240.81.104 is complete
> WARN [STREAM-IN-/10.240.81.104] 2015-10-05 23:52:30,302
> StreamResultFuture.java:209 - [Stream #239d8e60-6bbc-11e5-93ac-31bdef2dc550]
> Stream failed
> {noformat}
> Side 2 -
> {noformat}
> INFO [AntiEntropyStage:1] 2015-10-05 23:52:30,060 StreamResultFuture.java:86
> - [Stream #239d8e60-6bbc-11e5-93ac-31bdef2dc550] Executing streaming plan for
> Repair
> INFO [StreamConnectionEstablisher:6] 2015-10-05 23:52:30,061
> StreamSession.java:232 - [Stream #239d8e60-6bbc-11e5-93ac-31bdef2dc550]
> Starting streaming to /10.240.134.221
> INFO [StreamConnectionEstablisher:6] 2015-10-05 23:52:30,063
> StreamCoordinator.java:213 - [Stream #239d8e60-6bbc-11e5-93ac-31bdef2dc550,
> ID#0] Beginning stream session with /10.240.134.221
> INFO [STREAM-IN-/10.240.134.221] 2015-10-05 23:52:30,098
> StreamResultFuture.java:168 - [Stream #239d8e60-6bbc-11e5-93ac-31bdef2dc550
> ID#0] Prepare completed. Receiving 10 files(469491729 bytes), sending 13
> files(517391317 bytes)
> INFO [STREAM-IN-/10.240.134.221] 2015-10-05 23:52:30,349
> StreamResultFuture.java:182 - [Stream #239d8e60-6bbc-11e5-93ac-31bdef2dc550]
> Session with /10.240.134.221 is complete
> ERROR [STREAM-OUT-/10.240.134.221] 2015-10-05 23:52:30,349
> StreamSession.java:524 - [Stream #239d8e60-6bbc-11e5-93ac-31bdef2dc550]
> Streaming error occurred
> org.apache.cassandra.io.FSReadError: java.io.IOException: Broken pipe
> at
> org.apache.cassandra.io.util.ChannelProxy.transferTo(ChannelProxy.java:144)
> ~[apache-cassandra-2.2.2.jar:2.2.2]
> at
> org.apache.cassandra.streaming
[jira] [Commented] (CASSANDRA-10688) Stack overflow from SSTableReader$InstanceTidier.runOnClose in Leak Detector
[
https://issues.apache.org/jira/browse/CASSANDRA-10688?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=15027675#comment-15027675
]
Ariel Weisberg commented on CASSANDRA-10688:
Near as I can tell the stack overflow is being used as a bound for something
that is walking an object graph looking for a path from the outgoing references
of an object to itself doing a depth first search. That isn't a stack trace
it's the graph that it walked (up until it overflowed). I suspect the overflow
is due to the depth of the graph since it's depth first and an any moderately
large linked list is going to overflow pretty quickly.
It's also using Stack which extends Vector which we should probably replace
with ArrayDeque.
This is debug code that only runs if {{-Dcassandra.debugrefcount=true}} so this
isn't an issue in production deployments. [~jjordan] any idea why that would be
set in your experiment?
For debug purposes the code works as designed and it can recover from the stack
overflow and continue searching the graph. It prunes the graph at the point
where the stack overflows. The only real issue is if the error is too noisy.
I think we might want to rate limit it using the first N entries in the graph
as a key. I'll put that together.
> Stack overflow from SSTableReader$InstanceTidier.runOnClose in Leak Detector
>
>
> Key: CASSANDRA-10688
> URL: https://issues.apache.org/jira/browse/CASSANDRA-10688
> Project: Cassandra
> Issue Type: Bug
>Reporter: Jeremiah Jordan
>Assignee: Ariel Weisberg
> Fix For: 3.0.1, 3.1
>
>
> Running some tests against cassandra-3.0
> 9fc957cf3097e54ccd72e51b2d0650dc3e83eae0
> The tests are just running cassandra-stress write and read while adding and
> removing nodes from the cluster. After the test runs when I go back through
> logs I find the following Stackoverflow fairly often:
> ERROR [Strong-Reference-Leak-Detector:1] 2015-11-11 00:04:10,638
> Ref.java:413 - Stackoverflow [private java.lang.Runnable
> org.apache.cassandra.io.sstable.format.SSTableReader$InstanceTidier.runOnClose,
> final java.lang.Runnable
> org.apache.cassandra.io.sstable.format.SSTableReader$DropPageCache.andThen,
> final org.apache.cassandra.cache.InstrumentingCache
> org.apache.cassandra.io.sstable.SSTableRewriter$InvalidateKeys.cache, private
> final org.apache.cassandra.cache.ICache
> org.apache.cassandra.cache.InstrumentingCache.map, private final
> com.googlecode.concurrentlinkedhashmap.ConcurrentLinkedHashMap
> org.apache.cassandra.cache.ConcurrentLinkedHashCache.map, final
> com.googlecode.concurrentlinkedhashmap.LinkedDeque
> com.googlecode.concurrentlinkedhashmap.ConcurrentLinkedHashMap.evictionDeque,
> com.googlecode.concurrentlinkedhashmap.Linked
> com.googlecode.concurrentlinkedhashmap.LinkedDeque.first,
> com.googlecode.concurrentlinkedhashmap.ConcurrentLinkedHashMap$Node
> com.googlecode.concurrentlinkedhashmap.ConcurrentLinkedHashMap$Node.next,
> com.googlecode.concurrentlinkedhashmap.ConcurrentLinkedHashMap$Node
> com.googlecode.concurrentlinkedhashmap.ConcurrentLinkedHashMap$Node.next,
> com.googlecode.concurrentlinkedhashmap.ConcurrentLinkedHashMap$Node
> com.googlecode.concurrentlinkedhashmap.ConcurrentLinkedHashMap$Node.next,
> com.googlecode.concurrentlinkedhashmap.ConcurrentLinkedHashMap$Node
> com.googlecode.concurrentlinkedhashmap.ConcurrentLinkedHashMap$Node.next,
> com.googlecode.concurrentlinkedhashmap.ConcurrentLinkedHashMap$Node
> com.googlecode.concurrentlinkedhashmap.ConcurrentLinkedHashMap$Node.next,
> com.googlecode.concurrentlinkedhashmap.ConcurrentLinkedHashMap$Node
> com.googlecode.concurrentlinkedhashmap.ConcurrentLinkedHashMap$Node.next,
> com.googlecode.concurrentlinkedhashmap.ConcurrentLinkedHashMap$Node
> com.googlecode.concurrentlinkedhashmap.ConcurrentLinkedHashMap$Node.next,
> com.googlecode.concurrentlinkedhashmap.ConcurrentLinkedHashMap$Node
> com.googlecode.concurrentlinkedhashmap.ConcurrentLinkedHashMap$Node.next,
> com.googlecode.concurrentlinkedhashmap.ConcurrentLinkedHashMap$Node
> com.googlecode.concurrentlinkedhashmap.ConcurrentLinkedHashMap$Node.next,
> com.googlecode.concurrentlinkedhashmap.ConcurrentLinkedHashMap$Node
> ... (repeated a whole bunch more)
> com.googlecode.concurrentlinkedhashmap.ConcurrentLinkedHashMap$Node
> com.googlecode.concurrentlinkedhashmap.ConcurrentLinkedHashMap$Node.next,
> com.googlecode.concurrentlinkedhashmap.ConcurrentLinkedHashMap$Node
> com.googlecode.concurrentlinkedhashmap.ConcurrentLinkedHashMap$Node.next,
> com.googlecode.concurrentlinkedhashmap.ConcurrentLinkedHashMap$Node
> com.googlecode.concurrentlinkedhashmap.ConcurrentLinkedHashMap$Node.next,
> com.googlecode.concurrentlinkedhashmap.ConcurrentLink
[jira] [Commented] (CASSANDRA-10091) Align JMX authentication with internal authentication
[ https://issues.apache.org/jira/browse/CASSANDRA-10091?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=15027628#comment-15027628 ] Nick Bailey commented on CASSANDRA-10091: - I'm definitely a fan of making it possible to reduce the number of auth schemes users have to set up. We should avoid breaking existing jmx clients and tools like you mentioned in CASSANDRA-10551 though. [~beobal] you are proposing just getting authc done in this ticket and leaving authz controlled by the built in file based roles mechanism for now? That's probably fine, although we'll want to make sure we handle the edge cases appropriately. For example if a user turns on auth via cassandra but then doesn't specify a roles file on the filesystem as well. Or if there is a mismatch in the users defined in either. If those edge cases get hairy I might personally prefer to wait until we can deliver it all. > Align JMX authentication with internal authentication > - > > Key: CASSANDRA-10091 > URL: https://issues.apache.org/jira/browse/CASSANDRA-10091 > Project: Cassandra > Issue Type: New Feature >Reporter: Jan Karlsson >Assignee: Jan Karlsson >Priority: Minor > Fix For: 3.x > > > It would be useful to authenticate with JMX through Cassandra's internal > authentication. This would reduce the overhead of keeping passwords in files > on the machine and would consolidate passwords to one location. It would also > allow the possibility to handle JMX permissions in Cassandra. > It could be done by creating our own JMX server and setting custom classes > for the authenticator and authorizer. We could then add some parameters where > the user could specify what authenticator and authorizer to use in case they > want to make their own. > This could also be done by creating a premain method which creates a jmx > server. This would give us the feature without changing the Cassandra code > itself. However I believe this would be a good feature to have in Cassandra. > I am currently working on a solution which creates a JMX server and uses a > custom authenticator and authorizer. It is currently build as a premain, > however it would be great if we could put this in Cassandra instead. -- This message was sent by Atlassian JIRA (v6.3.4#6332)
[jira] [Assigned] (CASSANDRA-10688) Stack overflow from SSTableReader$InstanceTidier.runOnClose in Leak Detector
[ https://issues.apache.org/jira/browse/CASSANDRA-10688?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] Ariel Weisberg reassigned CASSANDRA-10688: -- Assignee: Ariel Weisberg > Stack overflow from SSTableReader$InstanceTidier.runOnClose in Leak Detector > > > Key: CASSANDRA-10688 > URL: https://issues.apache.org/jira/browse/CASSANDRA-10688 > Project: Cassandra > Issue Type: Bug >Reporter: Jeremiah Jordan >Assignee: Ariel Weisberg > Fix For: 3.0.1, 3.1 > > > Running some tests against cassandra-3.0 > 9fc957cf3097e54ccd72e51b2d0650dc3e83eae0 > The tests are just running cassandra-stress write and read while adding and > removing nodes from the cluster. After the test runs when I go back through > logs I find the following Stackoverflow fairly often: > ERROR [Strong-Reference-Leak-Detector:1] 2015-11-11 00:04:10,638 > Ref.java:413 - Stackoverflow [private java.lang.Runnable > org.apache.cassandra.io.sstable.format.SSTableReader$InstanceTidier.runOnClose, > final java.lang.Runnable > org.apache.cassandra.io.sstable.format.SSTableReader$DropPageCache.andThen, > final org.apache.cassandra.cache.InstrumentingCache > org.apache.cassandra.io.sstable.SSTableRewriter$InvalidateKeys.cache, private > final org.apache.cassandra.cache.ICache > org.apache.cassandra.cache.InstrumentingCache.map, private final > com.googlecode.concurrentlinkedhashmap.ConcurrentLinkedHashMap > org.apache.cassandra.cache.ConcurrentLinkedHashCache.map, final > com.googlecode.concurrentlinkedhashmap.LinkedDeque > com.googlecode.concurrentlinkedhashmap.ConcurrentLinkedHashMap.evictionDeque, > com.googlecode.concurrentlinkedhashmap.Linked > com.googlecode.concurrentlinkedhashmap.LinkedDeque.first, > com.googlecode.concurrentlinkedhashmap.ConcurrentLinkedHashMap$Node > com.googlecode.concurrentlinkedhashmap.ConcurrentLinkedHashMap$Node.next, > com.googlecode.concurrentlinkedhashmap.ConcurrentLinkedHashMap$Node > com.googlecode.concurrentlinkedhashmap.ConcurrentLinkedHashMap$Node.next, > com.googlecode.concurrentlinkedhashmap.ConcurrentLinkedHashMap$Node > com.googlecode.concurrentlinkedhashmap.ConcurrentLinkedHashMap$Node.next, > com.googlecode.concurrentlinkedhashmap.ConcurrentLinkedHashMap$Node > com.googlecode.concurrentlinkedhashmap.ConcurrentLinkedHashMap$Node.next, > com.googlecode.concurrentlinkedhashmap.ConcurrentLinkedHashMap$Node > com.googlecode.concurrentlinkedhashmap.ConcurrentLinkedHashMap$Node.next, > com.googlecode.concurrentlinkedhashmap.ConcurrentLinkedHashMap$Node > com.googlecode.concurrentlinkedhashmap.ConcurrentLinkedHashMap$Node.next, > com.googlecode.concurrentlinkedhashmap.ConcurrentLinkedHashMap$Node > com.googlecode.concurrentlinkedhashmap.ConcurrentLinkedHashMap$Node.next, > com.googlecode.concurrentlinkedhashmap.ConcurrentLinkedHashMap$Node > com.googlecode.concurrentlinkedhashmap.ConcurrentLinkedHashMap$Node.next, > com.googlecode.concurrentlinkedhashmap.ConcurrentLinkedHashMap$Node > com.googlecode.concurrentlinkedhashmap.ConcurrentLinkedHashMap$Node.next, > com.googlecode.concurrentlinkedhashmap.ConcurrentLinkedHashMap$Node > ... (repeated a whole bunch more) > com.googlecode.concurrentlinkedhashmap.ConcurrentLinkedHashMap$Node > com.googlecode.concurrentlinkedhashmap.ConcurrentLinkedHashMap$Node.next, > com.googlecode.concurrentlinkedhashmap.ConcurrentLinkedHashMap$Node > com.googlecode.concurrentlinkedhashmap.ConcurrentLinkedHashMap$Node.next, > com.googlecode.concurrentlinkedhashmap.ConcurrentLinkedHashMap$Node > com.googlecode.concurrentlinkedhashmap.ConcurrentLinkedHashMap$Node.next, > com.googlecode.concurrentlinkedhashmap.ConcurrentLinkedHashMap$Node > com.googlecode.concurrentlinkedhashmap.ConcurrentLinkedHashMap$Node.next, > com.googlecode.concurrentlinkedhashmap.ConcurrentLinkedHashMap$Node > com.googlecode.concurrentlinkedhashmap.ConcurrentLinkedHashMap$Node.next, > final java.lang.Object > com.googlecode.concurrentlinkedhashmap.ConcurrentLinkedHashMap$Node.key, > public final byte[] org.apache.cassandra.cache.KeyCacheKey.key -- This message was sent by Atlassian JIRA (v6.3.4#6332)
[jira] [Commented] (CASSANDRA-7276) Include keyspace and table names in logs where possible
[
https://issues.apache.org/jira/browse/CASSANDRA-7276?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=15027414#comment-15027414
]
Ariel Weisberg commented on CASSANDRA-7276:
---
I think that it's kind of a no win scenario from a complexity perspective.
There are two problem scenarios here. One is log statements and the other is
exceptions.
The problem with log statements is that it is error prone to populate the KS
and CF name in all of them and some of the things that log might not have
access to the KS and CF name. I suspect that most of them will have access to
the KS and CF name.
The problem with exceptions is that we don't throw all of them so we can't
ensure the message contains the KS and CF name and it has the same issue where
the code throwing the exception might not have access to the KS and CF name.
Exceptions are easier to deal with because any place doing the MDC shuffling
right now can be converted to a try/catch/rethrow with a wrapper exception
containing the KS and CF name or maybe modifying the message of the exception.
This is also error prone and a maintenance headache, but there are at least a
manageable number of paths to instrument. I don't see a free lunch. Maybe
someone else does.
The log statements are harder to automate, but my guess is that most of them do
know what KS and CF names they should have. If we did a pass to make sure log
statements were good about using KS and CF name, and then kept an eye out it
might be good enough.
> Include keyspace and table names in logs where possible
> ---
>
> Key: CASSANDRA-7276
> URL: https://issues.apache.org/jira/browse/CASSANDRA-7276
> Project: Cassandra
> Issue Type: Improvement
>Reporter: Tyler Hobbs
>Assignee: Nitzan Volman
>Priority: Minor
> Labels: bootcamp, lhf
> Fix For: 2.1.x
>
> Attachments: 2.1-CASSANDRA-7276-v1.txt,
> cassandra-2.1-7276-compaction.txt, cassandra-2.1-7276.txt,
> cassandra-2.1.9-7276-v2.txt, cassandra-2.1.9-7276.txt
>
>
> Most error messages and stacktraces give you no clue as to what keyspace or
> table was causing the problem. For example:
> {noformat}
> ERROR [MutationStage:61648] 2014-05-20 12:05:45,145 CassandraDaemon.java
> (line 198) Exception in thread Thread[MutationStage:61648,5,main]
> java.lang.IllegalArgumentException
> at java.nio.Buffer.limit(Unknown Source)
> at
> org.apache.cassandra.db.marshal.AbstractCompositeType.getBytes(AbstractCompositeType.java:63)
> at
> org.apache.cassandra.db.marshal.AbstractCompositeType.getWithShortLength(AbstractCompositeType.java:72)
> at
> org.apache.cassandra.db.marshal.AbstractCompositeType.compare(AbstractCompositeType.java:98)
> at
> org.apache.cassandra.db.marshal.AbstractCompositeType.compare(AbstractCompositeType.java:35)
> at
> edu.stanford.ppl.concurrent.SnapTreeMap$1.compareTo(SnapTreeMap.java:538)
> at
> edu.stanford.ppl.concurrent.SnapTreeMap.attemptUpdate(SnapTreeMap.java:1108)
> at
> edu.stanford.ppl.concurrent.SnapTreeMap.updateUnderRoot(SnapTreeMap.java:1059)
> at edu.stanford.ppl.concurrent.SnapTreeMap.update(SnapTreeMap.java:1023)
> at
> edu.stanford.ppl.concurrent.SnapTreeMap.putIfAbsent(SnapTreeMap.java:985)
> at
> org.apache.cassandra.db.AtomicSortedColumns$Holder.addColumn(AtomicSortedColumns.java:328)
> at
> org.apache.cassandra.db.AtomicSortedColumns.addAllWithSizeDelta(AtomicSortedColumns.java:200)
> at org.apache.cassandra.db.Memtable.resolve(Memtable.java:226)
> at org.apache.cassandra.db.Memtable.put(Memtable.java:173)
> at
> org.apache.cassandra.db.ColumnFamilyStore.apply(ColumnFamilyStore.java:893)
> at org.apache.cassandra.db.Keyspace.apply(Keyspace.java:368)
> at org.apache.cassandra.db.Keyspace.apply(Keyspace.java:333)
> at org.apache.cassandra.db.RowMutation.apply(RowMutation.java:206)
> at
> org.apache.cassandra.db.RowMutationVerbHandler.doVerb(RowMutationVerbHandler.java:56)
> at
> org.apache.cassandra.net.MessageDeliveryTask.run(MessageDeliveryTask.java:60)
> at java.util.concurrent.ThreadPoolExecutor.runWorker(Unknown Source)
> at java.util.concurrent.ThreadPoolExecutor$Worker.run(Unknown Source)
> at java.lang.Thread.run(Unknown Source)
> {noformat}
> We should try to include info on the keyspace and column family in the error
> messages or logs whenever possible. This includes reads, writes,
> compactions, flushes, repairs, and probably more.
--
This message was sent by Atlassian JIRA
(v6.3.4#6332)
[jira] [Commented] (CASSANDRA-10772) nodetool syntax should be consistent for keyspace and column family
[ https://issues.apache.org/jira/browse/CASSANDRA-10772?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=15027394#comment-15027394 ] Joel Knighton commented on CASSANDRA-10772: --- Thanks for this report - this is an issue we've seen and about which we've had some discussion. I've resolved this issue as a duplicate of the relevant open issue. > nodetool syntax should be consistent for keyspace and column family > --- > > Key: CASSANDRA-10772 > URL: https://issues.apache.org/jira/browse/CASSANDRA-10772 > Project: Cassandra > Issue Type: Improvement >Reporter: Anubhav Kale >Priority: Minor > > nodetool commands don't use consistent syntax for CF and KS. Let's stick to > either CF.KS or CF KS across all commands. > For example, > exoam@cassandra-wus0:~$ nodetool cfhistograms exchangecf.userdatasetraw > nodetool: cfhistograms requires ks and cf args > See 'nodetool help' or 'nodetool help '. > exoam@cassandra-wus0:~$ nodetool cfstats exchangecf.userdatasetraw > Keyspace: exchangecf > Read Count: 5297 > Read Latency: 0.5023435907117 -- This message was sent by Atlassian JIRA (v6.3.4#6332)
[jira] [Resolved] (CASSANDRA-10772) nodetool syntax should be consistent for keyspace and column family
[ https://issues.apache.org/jira/browse/CASSANDRA-10772?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] Joel Knighton resolved CASSANDRA-10772. --- Resolution: Duplicate > nodetool syntax should be consistent for keyspace and column family > --- > > Key: CASSANDRA-10772 > URL: https://issues.apache.org/jira/browse/CASSANDRA-10772 > Project: Cassandra > Issue Type: Improvement >Reporter: Anubhav Kale >Priority: Minor > > nodetool commands don't use consistent syntax for CF and KS. Let's stick to > either CF.KS or CF KS across all commands. > For example, > exoam@cassandra-wus0:~$ nodetool cfhistograms exchangecf.userdatasetraw > nodetool: cfhistograms requires ks and cf args > See 'nodetool help' or 'nodetool help '. > exoam@cassandra-wus0:~$ nodetool cfstats exchangecf.userdatasetraw > Keyspace: exchangecf > Read Count: 5297 > Read Latency: 0.5023435907117 -- This message was sent by Atlassian JIRA (v6.3.4#6332)
[jira] [Updated] (CASSANDRA-10738) upgrading to v3.0.0 nodes crashes with "org.apache.cassandra.serializers.MarshalException: Unexpected extraneous bytes after map value"
[ https://issues.apache.org/jira/browse/CASSANDRA-10738?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] Christian Sherwood updated CASSANDRA-10738: --- Attachment: system_traces.events.txt added further crash debug > upgrading to v3.0.0 nodes crashes with > "org.apache.cassandra.serializers.MarshalException: Unexpected extraneous > bytes after map value" > --- > > Key: CASSANDRA-10738 > URL: https://issues.apache.org/jira/browse/CASSANDRA-10738 > Project: Cassandra > Issue Type: Bug > Environment: ubuntu14, java8 >Reporter: Christian Sherwood >Assignee: Sam Tunnicliffe > Attachments: 1447894738468-upgrade-2.2.3-3.0.0.zip, cassv3.txt, > keyspaces-abac5682dea631c5b535b3d6cffd0fb6.zip, system_schemas.txt, > system_traces.events.txt > > > upgrading from v.2.2.3 to v3.0.0 > restarting after upgrade crashes with either > ERROR [main] 2015-11-19 20:21:26,511 CassandraDaemon.java:702 - Exception > encountered during startup > org.apache.cassandra.serializers.MarshalException: Unexpected extraneous > bytes after map value > OR > ERROR [main] 2015-11-19 20:01:13,945 CassandraDaemon.java:702 - Exception > encountered during startup > java.lang.IllegalArgumentException: null > see attached debug and schema -- This message was sent by Atlassian JIRA (v6.3.4#6332)
[jira] [Commented] (CASSANDRA-10738) upgrading to v3.0.0 nodes crashes with "org.apache.cassandra.serializers.MarshalException: Unexpected extraneous bytes after map value"
[
https://issues.apache.org/jira/browse/CASSANDRA-10738?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=15027362#comment-15027362
]
Sam Tunnicliffe commented on CASSANDRA-10738:
-
Ok, so the keyspaces data was converted ok, but unfortunately it looks like
there is some further corruption to the {{system_schema.tables}} files. You'll
need to repeat the process of re-running the conversion, but this time also
remove the files from
{{data/system_schema/tables-afddfb9dbc1e30688056eed6c302ba09/}} and restore the
pre-upgrade snapshots of
{{system/schema_columnfamilies-45f5b36024bc3f83a3631034ea4fa697/}} (that's in
addition the keyspaces tables from the previous comment).
> upgrading to v3.0.0 nodes crashes with
> "org.apache.cassandra.serializers.MarshalException: Unexpected extraneous
> bytes after map value"
> ---
>
> Key: CASSANDRA-10738
> URL: https://issues.apache.org/jira/browse/CASSANDRA-10738
> Project: Cassandra
> Issue Type: Bug
> Environment: ubuntu14, java8
>Reporter: Christian Sherwood
>Assignee: Sam Tunnicliffe
> Attachments: 1447894738468-upgrade-2.2.3-3.0.0.zip, cassv3.txt,
> keyspaces-abac5682dea631c5b535b3d6cffd0fb6.zip, system_schemas.txt
>
>
> upgrading from v.2.2.3 to v3.0.0
> restarting after upgrade crashes with either
> ERROR [main] 2015-11-19 20:21:26,511 CassandraDaemon.java:702 - Exception
> encountered during startup
> org.apache.cassandra.serializers.MarshalException: Unexpected extraneous
> bytes after map value
> OR
> ERROR [main] 2015-11-19 20:01:13,945 CassandraDaemon.java:702 - Exception
> encountered during startup
> java.lang.IllegalArgumentException: null
> see attached debug and schema
--
This message was sent by Atlassian JIRA
(v6.3.4#6332)
[jira] [Created] (CASSANDRA-10773) nodetool cfhistograms / cfstats should maintain hot keys
Anubhav Kale created CASSANDRA-10773: Summary: nodetool cfhistograms / cfstats should maintain hot keys Key: CASSANDRA-10773 URL: https://issues.apache.org/jira/browse/CASSANDRA-10773 Project: Cassandra Issue Type: Improvement Reporter: Anubhav Kale Priority: Minor It is possible using https://issues.apache.org/jira/browse/CASSANDRA-7974 to sample hot keys in a given time interval. Is it possible to maintain this data so that its easily available any time without having the need to sample explicitly ? It would be fantastic for ops. -- This message was sent by Atlassian JIRA (v6.3.4#6332)
[jira] [Created] (CASSANDRA-10772) nodetool syntax should be consistent for keyspace and column family
Anubhav Kale created CASSANDRA-10772: Summary: nodetool syntax should be consistent for keyspace and column family Key: CASSANDRA-10772 URL: https://issues.apache.org/jira/browse/CASSANDRA-10772 Project: Cassandra Issue Type: Improvement Reporter: Anubhav Kale Priority: Minor nodetool commands don't use consistent syntax for CF and KS. Let's stick to either CF.KS or CF KS across all commands. For example, exoam@cassandra-wus0:~$ nodetool cfhistograms exchangecf.userdatasetraw nodetool: cfhistograms requires ks and cf args See 'nodetool help' or 'nodetool help '. exoam@cassandra-wus0:~$ nodetool cfstats exchangecf.userdatasetraw Keyspace: exchangecf Read Count: 5297 Read Latency: 0.5023435907117 -- This message was sent by Atlassian JIRA (v6.3.4#6332)
[jira] [Commented] (CASSANDRA-10738) upgrading to v3.0.0 nodes crashes with "org.apache.cassandra.serializers.MarshalException: Unexpected extraneous bytes after map value"
[ https://issues.apache.org/jira/browse/CASSANDRA-10738?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=15027337#comment-15027337 ] Christian Sherwood commented on CASSANDRA-10738: ERROR [main] 2015-11-25 18:33:20,779 CassandraDaemon.java:702 - Exception encountered during startup org.apache.cassandra.serializers.MarshalException: Invalid UTF-8 bytes 756e64882600 at org.apache.cassandra.serializers.AbstractTextSerializer.deserialize(AbstractTextSerializer.java:43) ~[apache-cassandra-3.0.0.jar:3.0.0] at org.apache.cassandra.serializers.AbstractTextSerializer.deserialize(AbstractTextSerializer.java:26) ~[apache-cassandra-3.0.0.jar:3.0.0] at org.apache.cassandra.db.marshal.AbstractType.compose(AbstractType.java:114) ~[apache-cassandra-3.0.0.jar:3.0.0] at org.apache.cassandra.cql3.UntypedResultSet$Row.getString(UntypedResultSet.java:267) ~[apache-cassandra-3.0.0.jar:3.0.0] at org.apache.cassandra.schema.SchemaKeyspace.fetchTables(SchemaKeyspace.java:931) ~[apache-cassandra-3.0.0.jar:3.0.0] at org.apache.cassandra.schema.SchemaKeyspace.fetchKeyspace(SchemaKeyspace.java:894) ~[apache-cassandra-3.0.0.jar:3.0.0] at org.apache.cassandra.schema.SchemaKeyspace.fetchKeyspacesWithout(SchemaKeyspace.java:871) ~[apache-cassandra-3.0.0.jar:3.0.0] at org.apache.cassandra.schema.SchemaKeyspace.fetchNonSystemKeyspaces(SchemaKeyspace.java:859) ~[apache-cassandra-3.0.0.jar:3.0.0] at org.apache.cassandra.config.Schema.loadFromDisk(Schema.java:125) ~[apache-cassandra-3.0.0.jar:3.0.0] at org.apache.cassandra.config.Schema.loadFromDisk(Schema.java:115) ~[apache-cassandra-3.0.0.jar:3.0.0] at org.apache.cassandra.service.CassandraDaemon.setup(CassandraDaemon.java:229) [apache-cassandra-3.0.0.jar:3.0.0] at org.apache.cassandra.service.CassandraDaemon.activate(CassandraDaemon.java:561) [apache-cassandra-3.0.0.jar:3.0.0] at org.apache.cassandra.service.CassandraDaemon.main(CassandraDaemon.java:689) [apache-cassandra-3.0.0.jar:3.0.0] > upgrading to v3.0.0 nodes crashes with > "org.apache.cassandra.serializers.MarshalException: Unexpected extraneous > bytes after map value" > --- > > Key: CASSANDRA-10738 > URL: https://issues.apache.org/jira/browse/CASSANDRA-10738 > Project: Cassandra > Issue Type: Bug > Environment: ubuntu14, java8 >Reporter: Christian Sherwood >Assignee: Sam Tunnicliffe > Attachments: 1447894738468-upgrade-2.2.3-3.0.0.zip, cassv3.txt, > keyspaces-abac5682dea631c5b535b3d6cffd0fb6.zip, system_schemas.txt > > > upgrading from v.2.2.3 to v3.0.0 > restarting after upgrade crashes with either > ERROR [main] 2015-11-19 20:21:26,511 CassandraDaemon.java:702 - Exception > encountered during startup > org.apache.cassandra.serializers.MarshalException: Unexpected extraneous > bytes after map value > OR > ERROR [main] 2015-11-19 20:01:13,945 CassandraDaemon.java:702 - Exception > encountered during startup > java.lang.IllegalArgumentException: null > see attached debug and schema -- This message was sent by Atlassian JIRA (v6.3.4#6332)
[jira] [Assigned] (CASSANDRA-10674) Materialized View SSTable streaming/leaving status race on decommission
[ https://issues.apache.org/jira/browse/CASSANDRA-10674?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] Paulo Motta reassigned CASSANDRA-10674: --- Assignee: Paulo Motta > Materialized View SSTable streaming/leaving status race on decommission > --- > > Key: CASSANDRA-10674 > URL: https://issues.apache.org/jira/browse/CASSANDRA-10674 > Project: Cassandra > Issue Type: Bug > Components: Coordination, Distributed Metadata >Reporter: Joel Knighton >Assignee: Paulo Motta > Fix For: 3.0.1, 3.1 > > Attachments: leaving-node-debug.log, receiving-node-debug.log > > > On decommission of a node in a cluster with materialized views, it is > possible for the decommissioning node to begin streaming sstables for an MV > base table before the receiving node is aware of the leaving status. > The materialized view base/view replica pairing checks pending endpoints to > handle the case when an sstable is received from a leaving node; without the > leaving message, this check breaks and an exception is thrown. The streamed > sstable is never applied. > Logs from a decommissioning node and a node receiving such a stream are > attached. -- This message was sent by Atlassian JIRA (v6.3.4#6332)
[3/7] cassandra git commit: cqlsh: print column names before COPY operation
cqlsh: print column names before COPY operation
Patch by Michael Edge; reviewed by Tyler Hobbs for CASSANDRA-8935
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/68ea4edb
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/68ea4edb
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/68ea4edb
Branch: refs/heads/cassandra-3.1
Commit: 68ea4edb33a9907a1a2e1cde0374a52225b519b0
Parents: 5cafe86
Author: Michael Edge
Authored: Wed Nov 25 11:54:11 2015 -0600
Committer: Tyler Hobbs
Committed: Wed Nov 25 11:54:11 2015 -0600
--
CHANGES.txt | 1 +
bin/cqlsh | 2 ++
2 files changed, 3 insertions(+)
--
http://git-wip-us.apache.org/repos/asf/cassandra/blob/68ea4edb/CHANGES.txt
--
diff --git a/CHANGES.txt b/CHANGES.txt
index 6f69f03..8548d71 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
2.1.12
+ * (cqlsh) Print column names before COPY operation (CASSANDRA-8935)
* Add Native-Transport-Requests back to tpstats (CASSANDRA-10044)
* Make paging logic consistent between searcher impls (CASSANDRA-10683)
* Fix CompressedInputStream for proper cleanup (CASSANDRA-10012)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/68ea4edb/bin/cqlsh
--
diff --git a/bin/cqlsh b/bin/cqlsh
index f4bedcd..3e830b5 100755
--- a/bin/cqlsh
+++ b/bin/cqlsh
@@ -1551,6 +1551,8 @@ class Shell(cmd.Cmd):
cleancopyoptvals = [optval.decode('string-escape') for optval in
copyoptvals]
opts = dict(zip(copyoptnames, cleancopyoptvals))
+print "\nStarting copy of %s.%s with columns %s." % (ks, cf, columns)
+
timestart = time.time()
direction = parsed.get_binding('dir').upper()
[2/8] cassandra git commit: Merge branch 'cassandra-2.1' into cassandra-2.2
Merge branch 'cassandra-2.1' into cassandra-2.2 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/3841f9cb Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/3841f9cb Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/3841f9cb Branch: refs/heads/trunk Commit: 3841f9cb2041a7af43cbda3ff7c85e78216a6d22 Parents: a907533 5cafe86 Author: T Jake Luciani Authored: Wed Nov 25 09:21:41 2015 -0500 Committer: T Jake Luciani Committed: Wed Nov 25 09:21:41 2015 -0500 -- --
[6/7] cassandra git commit: Merge branch 'cassandra-2.2' into cassandra-3.0
Merge branch 'cassandra-2.2' into cassandra-3.0 Conflicts: CHANGES.txt Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/9b3b3ca0 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/9b3b3ca0 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/9b3b3ca0 Branch: refs/heads/cassandra-3.1 Commit: 9b3b3ca00f71a4ae38149194e3c8c7c448974275 Parents: a0076e7 a90c3b2 Author: Tyler Hobbs Authored: Wed Nov 25 11:57:24 2015 -0600 Committer: Tyler Hobbs Committed: Wed Nov 25 11:57:24 2015 -0600 -- CHANGES.txt | 1 + bin/cqlsh.py | 2 ++ 2 files changed, 3 insertions(+) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/9b3b3ca0/CHANGES.txt -- diff --cc CHANGES.txt index 513e682,5ff53b6..f95f079 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -13,7 -3,17 +13,8 @@@ Merged from 2.2 * Fix SimpleDateType type compatibility (CASSANDRA-10027) * (Hadoop) fix splits calculation (CASSANDRA-10640) * (Hadoop) ensure that Cluster instances are always closed (CASSANDRA-10058) - * (cqlsh) show partial trace if incomplete after max_trace_wait (CASSANDRA-7645) - * Use most up-to-date version of schema for system tables (CASSANDRA-10652) - * Deprecate memory_allocator in cassandra.yaml (CASSANDRA-10581,10628) - * Expose phi values from failure detector via JMX and tweak debug - and trace logging (CASSANDRA-9526) - * Fix RangeNamesQueryPager (CASSANDRA-10509) - * Deprecate Pig support (CASSANDRA-10542) - * Reduce contention getting instances of CompositeType (CASSANDRA-10433) Merged from 2.1: + * (cqlsh) Print column names before COPY operation (CASSANDRA-8935) - * Make paging logic consistent between searcher impls (CASSANDRA-10683) * Fix CompressedInputStream for proper cleanup (CASSANDRA-10012) * (cqlsh) Support counters in COPY commands (CASSANDRA-9043) * Try next replica if not possible to connect to primary replica on http://git-wip-us.apache.org/repos/asf/cassandra/blob/9b3b3ca0/bin/cqlsh.py --
[1/8] cassandra git commit: Add the missing Native-Transport-Requests in tpstats back
Repository: cassandra
Updated Branches:
refs/heads/trunk d58a50b8c -> 49a5074c7
Add the missing Native-Transport-Requests in tpstats back
Patch by Wei Deng; reviewed by tjake for CASSANDRA-10044
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/5cafe860
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/5cafe860
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/5cafe860
Branch: refs/heads/trunk
Commit: 5cafe8606fa1f28b535c69c57f78593c4e6ea85a
Parents: f5a09c1
Author: Wei Deng
Authored: Mon Aug 10 22:57:49 2015 -0600
Committer: T Jake Luciani
Committed: Wed Nov 25 09:19:21 2015 -0500
--
CHANGES.txt| 1 +
src/java/org/apache/cassandra/tools/NodeProbe.java | 3 ++-
2 files changed, 3 insertions(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/cassandra/blob/5cafe860/CHANGES.txt
--
diff --git a/CHANGES.txt b/CHANGES.txt
index 91f4577..6f69f03 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
2.1.12
+ * Add Native-Transport-Requests back to tpstats (CASSANDRA-10044)
* Make paging logic consistent between searcher impls (CASSANDRA-10683)
* Fix CompressedInputStream for proper cleanup (CASSANDRA-10012)
* (cqlsh) Support counters in COPY commands (CASSANDRA-9043)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/5cafe860/src/java/org/apache/cassandra/tools/NodeProbe.java
--
diff --git a/src/java/org/apache/cassandra/tools/NodeProbe.java
b/src/java/org/apache/cassandra/tools/NodeProbe.java
index 49c493d..5ba5a32 100644
--- a/src/java/org/apache/cassandra/tools/NodeProbe.java
+++ b/src/java/org/apache/cassandra/tools/NodeProbe.java
@@ -1380,7 +1380,8 @@ class ThreadPoolProxyMBeanIterator implements
Iterator requests = mbeanServerConn.queryNames(new
ObjectName("org.apache.cassandra.request:type=*"), null);
Set internal = mbeanServerConn.queryNames(new
ObjectName("org.apache.cassandra.internal:type=*"), null);
-resIter = Iterables.concat(requests, internal).iterator();
+Set transport = mbeanServerConn.queryNames(new
ObjectName("org.apache.cassandra.transport:type=*"), null);
+resIter = Iterables.concat(requests, internal, transport).iterator();
this.mbeanServerConn = mbeanServerConn;
}
[6/8] cassandra git commit: Merge branch 'cassandra-2.2' into cassandra-3.0
Merge branch 'cassandra-2.2' into cassandra-3.0 Conflicts: CHANGES.txt Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/9b3b3ca0 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/9b3b3ca0 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/9b3b3ca0 Branch: refs/heads/trunk Commit: 9b3b3ca00f71a4ae38149194e3c8c7c448974275 Parents: a0076e7 a90c3b2 Author: Tyler Hobbs Authored: Wed Nov 25 11:57:24 2015 -0600 Committer: Tyler Hobbs Committed: Wed Nov 25 11:57:24 2015 -0600 -- CHANGES.txt | 1 + bin/cqlsh.py | 2 ++ 2 files changed, 3 insertions(+) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/9b3b3ca0/CHANGES.txt -- diff --cc CHANGES.txt index 513e682,5ff53b6..f95f079 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -13,7 -3,17 +13,8 @@@ Merged from 2.2 * Fix SimpleDateType type compatibility (CASSANDRA-10027) * (Hadoop) fix splits calculation (CASSANDRA-10640) * (Hadoop) ensure that Cluster instances are always closed (CASSANDRA-10058) - * (cqlsh) show partial trace if incomplete after max_trace_wait (CASSANDRA-7645) - * Use most up-to-date version of schema for system tables (CASSANDRA-10652) - * Deprecate memory_allocator in cassandra.yaml (CASSANDRA-10581,10628) - * Expose phi values from failure detector via JMX and tweak debug - and trace logging (CASSANDRA-9526) - * Fix RangeNamesQueryPager (CASSANDRA-10509) - * Deprecate Pig support (CASSANDRA-10542) - * Reduce contention getting instances of CompositeType (CASSANDRA-10433) Merged from 2.1: + * (cqlsh) Print column names before COPY operation (CASSANDRA-8935) - * Make paging logic consistent between searcher impls (CASSANDRA-10683) * Fix CompressedInputStream for proper cleanup (CASSANDRA-10012) * (cqlsh) Support counters in COPY commands (CASSANDRA-9043) * Try next replica if not possible to connect to primary replica on http://git-wip-us.apache.org/repos/asf/cassandra/blob/9b3b3ca0/bin/cqlsh.py --
[4/8] cassandra git commit: Merge branch 'cassandra-2.1' into cassandra-2.2
http://git-wip-us.apache.org/repos/asf/cassandra/blob/a90c3b2b/bin/cqlsh.py
--
diff --cc bin/cqlsh.py
index ffcbcbd,000..28054ba
mode 100644,00..100644
--- a/bin/cqlsh.py
+++ b/bin/cqlsh.py
@@@ -1,2699 -1,0 +1,2701 @@@
+#!/bin/sh
+# -*- mode: Python -*-
+
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+""":"
+# bash code here; finds a suitable python interpreter and execs this file.
+# prefer unqualified "python" if suitable:
+python -c 'import sys; sys.exit(not (0x020500b0 < sys.hexversion <
0x0300))' 2>/dev/null \
+&& exec python "$0" "$@"
+for pyver in 2.6 2.7 2.5; do
+which python$pyver > /dev/null 2>&1 && exec python$pyver "$0" "$@"
+done
+echo "No appropriate python interpreter found." >&2
+exit 1
+":"""
+
+from __future__ import with_statement
+
+import cmd
+import codecs
+import ConfigParser
+import csv
+import getpass
+import locale
+import multiprocessing as mp
+import optparse
+import os
+import platform
+import sys
+import time
+import traceback
+import warnings
+from contextlib import contextmanager
+from functools import partial
+from glob import glob
+from StringIO import StringIO
+from uuid import UUID
+
+if sys.version_info[0] != 2 or sys.version_info[1] != 7:
+sys.exit("\nCQL Shell supports only Python 2.7\n")
+
+description = "CQL Shell for Apache Cassandra"
+version = "5.0.1"
+
+readline = None
+try:
+# check if tty first, cause readline doesn't check, and only cares
+# about $TERM. we don't want the funky escape code stuff to be
+# output if not a tty.
+if sys.stdin.isatty():
+import readline
+except ImportError:
+pass
+
+CQL_LIB_PREFIX = 'cassandra-driver-internal-only-'
+
+CASSANDRA_PATH = os.path.join(os.path.dirname(os.path.realpath(__file__)),
'..')
+
+# use bundled libs for python-cql and thrift, if available. if there
+# is a ../lib dir, use bundled libs there preferentially.
+ZIPLIB_DIRS = [os.path.join(CASSANDRA_PATH, 'lib')]
+myplatform = platform.system()
+if myplatform == 'Linux':
+ZIPLIB_DIRS.append('/usr/share/cassandra/lib')
+
+if os.environ.get('CQLSH_NO_BUNDLED', ''):
+ZIPLIB_DIRS = ()
+
+
+def find_zip(libprefix):
+for ziplibdir in ZIPLIB_DIRS:
+zips = glob(os.path.join(ziplibdir, libprefix + '*.zip'))
+if zips:
+return max(zips) # probably the highest version, if multiple
+
+cql_zip = find_zip(CQL_LIB_PREFIX)
+if cql_zip:
+ver = os.path.splitext(os.path.basename(cql_zip))[0][len(CQL_LIB_PREFIX):]
+sys.path.insert(0, os.path.join(cql_zip, 'cassandra-driver-' + ver))
+
+third_parties = ('futures-', 'six-')
+
+for lib in third_parties:
+lib_zip = find_zip(lib)
+if lib_zip:
+sys.path.insert(0, lib_zip)
+
+warnings.filterwarnings("ignore", r".*blist.*")
+try:
+import cassandra
+except ImportError, e:
+sys.exit("\nPython Cassandra driver not installed, or not on
PYTHONPATH.\n"
+ 'You might try "pip install cassandra-driver".\n\n'
+ 'Python: %s\n'
+ 'Module load path: %r\n\n'
+ 'Error: %s\n' % (sys.executable, sys.path, e))
+
+from cassandra.auth import PlainTextAuthProvider
+from cassandra.cluster import Cluster
+from cassandra.metadata import (ColumnMetadata, KeyspaceMetadata,
+TableMetadata, protect_name, protect_names,
+protect_value)
+from cassandra.policies import WhiteListRoundRobinPolicy
+from cassandra.protocol import QueryMessage, ResultMessage
+from cassandra.query import SimpleStatement, ordered_dict_factory,
TraceUnavailable
+
+# cqlsh should run correctly when run out of a Cassandra source tree,
+# out of an unpacked Cassandra tarball, and after a proper package install.
+cqlshlibdir = os.path.join(CASSANDRA_PATH, 'pylib')
+if os.path.isdir(cqlshlibdir):
+sys.path.insert(0, cqlshlibdir)
+
+from cqlshlib import cql3handling, cqlhandling, pylexotron, sslhandling, copy
+from cqlshlib.displaying import (ANSI_RESET, BLUE, COLUMN_NAME_COLORS, CYAN,
+ RED, Form
[4/7] cassandra git commit: Merge branch 'cassandra-2.1' into cassandra-2.2
http://git-wip-us.apache.org/repos/asf/cassandra/blob/a90c3b2b/bin/cqlsh.py
--
diff --cc bin/cqlsh.py
index ffcbcbd,000..28054ba
mode 100644,00..100644
--- a/bin/cqlsh.py
+++ b/bin/cqlsh.py
@@@ -1,2699 -1,0 +1,2701 @@@
+#!/bin/sh
+# -*- mode: Python -*-
+
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+""":"
+# bash code here; finds a suitable python interpreter and execs this file.
+# prefer unqualified "python" if suitable:
+python -c 'import sys; sys.exit(not (0x020500b0 < sys.hexversion <
0x0300))' 2>/dev/null \
+&& exec python "$0" "$@"
+for pyver in 2.6 2.7 2.5; do
+which python$pyver > /dev/null 2>&1 && exec python$pyver "$0" "$@"
+done
+echo "No appropriate python interpreter found." >&2
+exit 1
+":"""
+
+from __future__ import with_statement
+
+import cmd
+import codecs
+import ConfigParser
+import csv
+import getpass
+import locale
+import multiprocessing as mp
+import optparse
+import os
+import platform
+import sys
+import time
+import traceback
+import warnings
+from contextlib import contextmanager
+from functools import partial
+from glob import glob
+from StringIO import StringIO
+from uuid import UUID
+
+if sys.version_info[0] != 2 or sys.version_info[1] != 7:
+sys.exit("\nCQL Shell supports only Python 2.7\n")
+
+description = "CQL Shell for Apache Cassandra"
+version = "5.0.1"
+
+readline = None
+try:
+# check if tty first, cause readline doesn't check, and only cares
+# about $TERM. we don't want the funky escape code stuff to be
+# output if not a tty.
+if sys.stdin.isatty():
+import readline
+except ImportError:
+pass
+
+CQL_LIB_PREFIX = 'cassandra-driver-internal-only-'
+
+CASSANDRA_PATH = os.path.join(os.path.dirname(os.path.realpath(__file__)),
'..')
+
+# use bundled libs for python-cql and thrift, if available. if there
+# is a ../lib dir, use bundled libs there preferentially.
+ZIPLIB_DIRS = [os.path.join(CASSANDRA_PATH, 'lib')]
+myplatform = platform.system()
+if myplatform == 'Linux':
+ZIPLIB_DIRS.append('/usr/share/cassandra/lib')
+
+if os.environ.get('CQLSH_NO_BUNDLED', ''):
+ZIPLIB_DIRS = ()
+
+
+def find_zip(libprefix):
+for ziplibdir in ZIPLIB_DIRS:
+zips = glob(os.path.join(ziplibdir, libprefix + '*.zip'))
+if zips:
+return max(zips) # probably the highest version, if multiple
+
+cql_zip = find_zip(CQL_LIB_PREFIX)
+if cql_zip:
+ver = os.path.splitext(os.path.basename(cql_zip))[0][len(CQL_LIB_PREFIX):]
+sys.path.insert(0, os.path.join(cql_zip, 'cassandra-driver-' + ver))
+
+third_parties = ('futures-', 'six-')
+
+for lib in third_parties:
+lib_zip = find_zip(lib)
+if lib_zip:
+sys.path.insert(0, lib_zip)
+
+warnings.filterwarnings("ignore", r".*blist.*")
+try:
+import cassandra
+except ImportError, e:
+sys.exit("\nPython Cassandra driver not installed, or not on
PYTHONPATH.\n"
+ 'You might try "pip install cassandra-driver".\n\n'
+ 'Python: %s\n'
+ 'Module load path: %r\n\n'
+ 'Error: %s\n' % (sys.executable, sys.path, e))
+
+from cassandra.auth import PlainTextAuthProvider
+from cassandra.cluster import Cluster
+from cassandra.metadata import (ColumnMetadata, KeyspaceMetadata,
+TableMetadata, protect_name, protect_names,
+protect_value)
+from cassandra.policies import WhiteListRoundRobinPolicy
+from cassandra.protocol import QueryMessage, ResultMessage
+from cassandra.query import SimpleStatement, ordered_dict_factory,
TraceUnavailable
+
+# cqlsh should run correctly when run out of a Cassandra source tree,
+# out of an unpacked Cassandra tarball, and after a proper package install.
+cqlshlibdir = os.path.join(CASSANDRA_PATH, 'pylib')
+if os.path.isdir(cqlshlibdir):
+sys.path.insert(0, cqlshlibdir)
+
+from cqlshlib import cql3handling, cqlhandling, pylexotron, sslhandling, copy
+from cqlshlib.displaying import (ANSI_RESET, BLUE, COLUMN_NAME_COLORS, CYAN,
+ RED, Form
[3/8] cassandra git commit: cqlsh: print column names before COPY operation
cqlsh: print column names before COPY operation
Patch by Michael Edge; reviewed by Tyler Hobbs for CASSANDRA-8935
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/68ea4edb
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/68ea4edb
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/68ea4edb
Branch: refs/heads/trunk
Commit: 68ea4edb33a9907a1a2e1cde0374a52225b519b0
Parents: 5cafe86
Author: Michael Edge
Authored: Wed Nov 25 11:54:11 2015 -0600
Committer: Tyler Hobbs
Committed: Wed Nov 25 11:54:11 2015 -0600
--
CHANGES.txt | 1 +
bin/cqlsh | 2 ++
2 files changed, 3 insertions(+)
--
http://git-wip-us.apache.org/repos/asf/cassandra/blob/68ea4edb/CHANGES.txt
--
diff --git a/CHANGES.txt b/CHANGES.txt
index 6f69f03..8548d71 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
2.1.12
+ * (cqlsh) Print column names before COPY operation (CASSANDRA-8935)
* Add Native-Transport-Requests back to tpstats (CASSANDRA-10044)
* Make paging logic consistent between searcher impls (CASSANDRA-10683)
* Fix CompressedInputStream for proper cleanup (CASSANDRA-10012)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/68ea4edb/bin/cqlsh
--
diff --git a/bin/cqlsh b/bin/cqlsh
index f4bedcd..3e830b5 100755
--- a/bin/cqlsh
+++ b/bin/cqlsh
@@ -1551,6 +1551,8 @@ class Shell(cmd.Cmd):
cleancopyoptvals = [optval.decode('string-escape') for optval in
copyoptvals]
opts = dict(zip(copyoptnames, cleancopyoptvals))
+print "\nStarting copy of %s.%s with columns %s." % (ks, cf, columns)
+
timestart = time.time()
direction = parsed.get_binding('dir').upper()
[8/8] cassandra git commit: Merge branch 'cassandra-3.1' into trunk
Merge branch 'cassandra-3.1' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/49a5074c Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/49a5074c Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/49a5074c Branch: refs/heads/trunk Commit: 49a5074c7b9135bae105309a562849d5d474a78b Parents: d58a50b c1b1aec Author: Tyler Hobbs Authored: Wed Nov 25 11:58:09 2015 -0600 Committer: Tyler Hobbs Committed: Wed Nov 25 11:58:09 2015 -0600 -- CHANGES.txt | 1 + bin/cqlsh.py | 2 ++ 2 files changed, 3 insertions(+) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/49a5074c/CHANGES.txt --
[7/8] cassandra git commit: Merge branch 'cassandra-3.0' into cassandra-3.1
Merge branch 'cassandra-3.0' into cassandra-3.1 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/c1b1aec1 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/c1b1aec1 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/c1b1aec1 Branch: refs/heads/trunk Commit: c1b1aec19ca8a2038a5878334efe40a092ed1be0 Parents: af089f6 9b3b3ca Author: Tyler Hobbs Authored: Wed Nov 25 11:57:49 2015 -0600 Committer: Tyler Hobbs Committed: Wed Nov 25 11:57:49 2015 -0600 -- CHANGES.txt | 1 + bin/cqlsh.py | 2 ++ 2 files changed, 3 insertions(+) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/c1b1aec1/CHANGES.txt --
[2/6] cassandra git commit: Merge branch 'cassandra-2.1' into cassandra-2.2
Merge branch 'cassandra-2.1' into cassandra-2.2 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/3841f9cb Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/3841f9cb Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/3841f9cb Branch: refs/heads/cassandra-3.0 Commit: 3841f9cb2041a7af43cbda3ff7c85e78216a6d22 Parents: a907533 5cafe86 Author: T Jake Luciani Authored: Wed Nov 25 09:21:41 2015 -0500 Committer: T Jake Luciani Committed: Wed Nov 25 09:21:41 2015 -0500 -- --
[4/6] cassandra git commit: Merge branch 'cassandra-2.1' into cassandra-2.2
http://git-wip-us.apache.org/repos/asf/cassandra/blob/a90c3b2b/bin/cqlsh.py
--
diff --cc bin/cqlsh.py
index ffcbcbd,000..28054ba
mode 100644,00..100644
--- a/bin/cqlsh.py
+++ b/bin/cqlsh.py
@@@ -1,2699 -1,0 +1,2701 @@@
+#!/bin/sh
+# -*- mode: Python -*-
+
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+""":"
+# bash code here; finds a suitable python interpreter and execs this file.
+# prefer unqualified "python" if suitable:
+python -c 'import sys; sys.exit(not (0x020500b0 < sys.hexversion <
0x0300))' 2>/dev/null \
+&& exec python "$0" "$@"
+for pyver in 2.6 2.7 2.5; do
+which python$pyver > /dev/null 2>&1 && exec python$pyver "$0" "$@"
+done
+echo "No appropriate python interpreter found." >&2
+exit 1
+":"""
+
+from __future__ import with_statement
+
+import cmd
+import codecs
+import ConfigParser
+import csv
+import getpass
+import locale
+import multiprocessing as mp
+import optparse
+import os
+import platform
+import sys
+import time
+import traceback
+import warnings
+from contextlib import contextmanager
+from functools import partial
+from glob import glob
+from StringIO import StringIO
+from uuid import UUID
+
+if sys.version_info[0] != 2 or sys.version_info[1] != 7:
+sys.exit("\nCQL Shell supports only Python 2.7\n")
+
+description = "CQL Shell for Apache Cassandra"
+version = "5.0.1"
+
+readline = None
+try:
+# check if tty first, cause readline doesn't check, and only cares
+# about $TERM. we don't want the funky escape code stuff to be
+# output if not a tty.
+if sys.stdin.isatty():
+import readline
+except ImportError:
+pass
+
+CQL_LIB_PREFIX = 'cassandra-driver-internal-only-'
+
+CASSANDRA_PATH = os.path.join(os.path.dirname(os.path.realpath(__file__)),
'..')
+
+# use bundled libs for python-cql and thrift, if available. if there
+# is a ../lib dir, use bundled libs there preferentially.
+ZIPLIB_DIRS = [os.path.join(CASSANDRA_PATH, 'lib')]
+myplatform = platform.system()
+if myplatform == 'Linux':
+ZIPLIB_DIRS.append('/usr/share/cassandra/lib')
+
+if os.environ.get('CQLSH_NO_BUNDLED', ''):
+ZIPLIB_DIRS = ()
+
+
+def find_zip(libprefix):
+for ziplibdir in ZIPLIB_DIRS:
+zips = glob(os.path.join(ziplibdir, libprefix + '*.zip'))
+if zips:
+return max(zips) # probably the highest version, if multiple
+
+cql_zip = find_zip(CQL_LIB_PREFIX)
+if cql_zip:
+ver = os.path.splitext(os.path.basename(cql_zip))[0][len(CQL_LIB_PREFIX):]
+sys.path.insert(0, os.path.join(cql_zip, 'cassandra-driver-' + ver))
+
+third_parties = ('futures-', 'six-')
+
+for lib in third_parties:
+lib_zip = find_zip(lib)
+if lib_zip:
+sys.path.insert(0, lib_zip)
+
+warnings.filterwarnings("ignore", r".*blist.*")
+try:
+import cassandra
+except ImportError, e:
+sys.exit("\nPython Cassandra driver not installed, or not on
PYTHONPATH.\n"
+ 'You might try "pip install cassandra-driver".\n\n'
+ 'Python: %s\n'
+ 'Module load path: %r\n\n'
+ 'Error: %s\n' % (sys.executable, sys.path, e))
+
+from cassandra.auth import PlainTextAuthProvider
+from cassandra.cluster import Cluster
+from cassandra.metadata import (ColumnMetadata, KeyspaceMetadata,
+TableMetadata, protect_name, protect_names,
+protect_value)
+from cassandra.policies import WhiteListRoundRobinPolicy
+from cassandra.protocol import QueryMessage, ResultMessage
+from cassandra.query import SimpleStatement, ordered_dict_factory,
TraceUnavailable
+
+# cqlsh should run correctly when run out of a Cassandra source tree,
+# out of an unpacked Cassandra tarball, and after a proper package install.
+cqlshlibdir = os.path.join(CASSANDRA_PATH, 'pylib')
+if os.path.isdir(cqlshlibdir):
+sys.path.insert(0, cqlshlibdir)
+
+from cqlshlib import cql3handling, cqlhandling, pylexotron, sslhandling, copy
+from cqlshlib.displaying import (ANSI_RESET, BLUE, COLUMN_NAME_COLORS, CYAN,
+ RED, Form
[5/6] cassandra git commit: Merge branch 'cassandra-2.1' into cassandra-2.2
Merge branch 'cassandra-2.1' into cassandra-2.2 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/a90c3b2b Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/a90c3b2b Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/a90c3b2b Branch: refs/heads/cassandra-3.0 Commit: a90c3b2b85daa9cbc3fc41b823c08a4a87afd768 Parents: 3841f9c 68ea4ed Author: Tyler Hobbs Authored: Wed Nov 25 11:56:16 2015 -0600 Committer: Tyler Hobbs Committed: Wed Nov 25 11:56:16 2015 -0600 -- CHANGES.txt | 1 + bin/cqlsh.py | 2 ++ 2 files changed, 3 insertions(+) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/a90c3b2b/CHANGES.txt -- diff --cc CHANGES.txt index a274ea9,8548d71..5ff53b6 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,17 -1,6 +1,18 @@@ -2.1.12 +2.2.4 + * Don't do anticompaction after subrange repair (CASSANDRA-10422) + * Fix SimpleDateType type compatibility (CASSANDRA-10027) + * (Hadoop) fix splits calculation (CASSANDRA-10640) + * (Hadoop) ensure that Cluster instances are always closed (CASSANDRA-10058) + * (cqlsh) show partial trace if incomplete after max_trace_wait (CASSANDRA-7645) + * Use most up-to-date version of schema for system tables (CASSANDRA-10652) + * Deprecate memory_allocator in cassandra.yaml (CASSANDRA-10581,10628) + * Expose phi values from failure detector via JMX and tweak debug + and trace logging (CASSANDRA-9526) + * Fix RangeNamesQueryPager (CASSANDRA-10509) + * Deprecate Pig support (CASSANDRA-10542) + * Reduce contention getting instances of CompositeType (CASSANDRA-10433) +Merged from 2.1: + * (cqlsh) Print column names before COPY operation (CASSANDRA-8935) - * Add Native-Transport-Requests back to tpstats (CASSANDRA-10044) * Make paging logic consistent between searcher impls (CASSANDRA-10683) * Fix CompressedInputStream for proper cleanup (CASSANDRA-10012) * (cqlsh) Support counters in COPY commands (CASSANDRA-9043)
[2/3] cassandra git commit: Merge branch 'cassandra-2.1' into cassandra-2.2
http://git-wip-us.apache.org/repos/asf/cassandra/blob/a90c3b2b/bin/cqlsh.py
--
diff --cc bin/cqlsh.py
index ffcbcbd,000..28054ba
mode 100644,00..100644
--- a/bin/cqlsh.py
+++ b/bin/cqlsh.py
@@@ -1,2699 -1,0 +1,2701 @@@
+#!/bin/sh
+# -*- mode: Python -*-
+
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+""":"
+# bash code here; finds a suitable python interpreter and execs this file.
+# prefer unqualified "python" if suitable:
+python -c 'import sys; sys.exit(not (0x020500b0 < sys.hexversion <
0x0300))' 2>/dev/null \
+&& exec python "$0" "$@"
+for pyver in 2.6 2.7 2.5; do
+which python$pyver > /dev/null 2>&1 && exec python$pyver "$0" "$@"
+done
+echo "No appropriate python interpreter found." >&2
+exit 1
+":"""
+
+from __future__ import with_statement
+
+import cmd
+import codecs
+import ConfigParser
+import csv
+import getpass
+import locale
+import multiprocessing as mp
+import optparse
+import os
+import platform
+import sys
+import time
+import traceback
+import warnings
+from contextlib import contextmanager
+from functools import partial
+from glob import glob
+from StringIO import StringIO
+from uuid import UUID
+
+if sys.version_info[0] != 2 or sys.version_info[1] != 7:
+sys.exit("\nCQL Shell supports only Python 2.7\n")
+
+description = "CQL Shell for Apache Cassandra"
+version = "5.0.1"
+
+readline = None
+try:
+# check if tty first, cause readline doesn't check, and only cares
+# about $TERM. we don't want the funky escape code stuff to be
+# output if not a tty.
+if sys.stdin.isatty():
+import readline
+except ImportError:
+pass
+
+CQL_LIB_PREFIX = 'cassandra-driver-internal-only-'
+
+CASSANDRA_PATH = os.path.join(os.path.dirname(os.path.realpath(__file__)),
'..')
+
+# use bundled libs for python-cql and thrift, if available. if there
+# is a ../lib dir, use bundled libs there preferentially.
+ZIPLIB_DIRS = [os.path.join(CASSANDRA_PATH, 'lib')]
+myplatform = platform.system()
+if myplatform == 'Linux':
+ZIPLIB_DIRS.append('/usr/share/cassandra/lib')
+
+if os.environ.get('CQLSH_NO_BUNDLED', ''):
+ZIPLIB_DIRS = ()
+
+
+def find_zip(libprefix):
+for ziplibdir in ZIPLIB_DIRS:
+zips = glob(os.path.join(ziplibdir, libprefix + '*.zip'))
+if zips:
+return max(zips) # probably the highest version, if multiple
+
+cql_zip = find_zip(CQL_LIB_PREFIX)
+if cql_zip:
+ver = os.path.splitext(os.path.basename(cql_zip))[0][len(CQL_LIB_PREFIX):]
+sys.path.insert(0, os.path.join(cql_zip, 'cassandra-driver-' + ver))
+
+third_parties = ('futures-', 'six-')
+
+for lib in third_parties:
+lib_zip = find_zip(lib)
+if lib_zip:
+sys.path.insert(0, lib_zip)
+
+warnings.filterwarnings("ignore", r".*blist.*")
+try:
+import cassandra
+except ImportError, e:
+sys.exit("\nPython Cassandra driver not installed, or not on
PYTHONPATH.\n"
+ 'You might try "pip install cassandra-driver".\n\n'
+ 'Python: %s\n'
+ 'Module load path: %r\n\n'
+ 'Error: %s\n' % (sys.executable, sys.path, e))
+
+from cassandra.auth import PlainTextAuthProvider
+from cassandra.cluster import Cluster
+from cassandra.metadata import (ColumnMetadata, KeyspaceMetadata,
+TableMetadata, protect_name, protect_names,
+protect_value)
+from cassandra.policies import WhiteListRoundRobinPolicy
+from cassandra.protocol import QueryMessage, ResultMessage
+from cassandra.query import SimpleStatement, ordered_dict_factory,
TraceUnavailable
+
+# cqlsh should run correctly when run out of a Cassandra source tree,
+# out of an unpacked Cassandra tarball, and after a proper package install.
+cqlshlibdir = os.path.join(CASSANDRA_PATH, 'pylib')
+if os.path.isdir(cqlshlibdir):
+sys.path.insert(0, cqlshlibdir)
+
+from cqlshlib import cql3handling, cqlhandling, pylexotron, sslhandling, copy
+from cqlshlib.displaying import (ANSI_RESET, BLUE, COLUMN_NAME_COLORS, CYAN,
+ RED, Form
[1/3] cassandra git commit: cqlsh: print column names before COPY operation
Repository: cassandra
Updated Branches:
refs/heads/cassandra-2.2 3841f9cb2 -> a90c3b2b8
cqlsh: print column names before COPY operation
Patch by Michael Edge; reviewed by Tyler Hobbs for CASSANDRA-8935
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/68ea4edb
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/68ea4edb
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/68ea4edb
Branch: refs/heads/cassandra-2.2
Commit: 68ea4edb33a9907a1a2e1cde0374a52225b519b0
Parents: 5cafe86
Author: Michael Edge
Authored: Wed Nov 25 11:54:11 2015 -0600
Committer: Tyler Hobbs
Committed: Wed Nov 25 11:54:11 2015 -0600
--
CHANGES.txt | 1 +
bin/cqlsh | 2 ++
2 files changed, 3 insertions(+)
--
http://git-wip-us.apache.org/repos/asf/cassandra/blob/68ea4edb/CHANGES.txt
--
diff --git a/CHANGES.txt b/CHANGES.txt
index 6f69f03..8548d71 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
2.1.12
+ * (cqlsh) Print column names before COPY operation (CASSANDRA-8935)
* Add Native-Transport-Requests back to tpstats (CASSANDRA-10044)
* Make paging logic consistent between searcher impls (CASSANDRA-10683)
* Fix CompressedInputStream for proper cleanup (CASSANDRA-10012)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/68ea4edb/bin/cqlsh
--
diff --git a/bin/cqlsh b/bin/cqlsh
index f4bedcd..3e830b5 100755
--- a/bin/cqlsh
+++ b/bin/cqlsh
@@ -1551,6 +1551,8 @@ class Shell(cmd.Cmd):
cleancopyoptvals = [optval.decode('string-escape') for optval in
copyoptvals]
opts = dict(zip(copyoptnames, cleancopyoptvals))
+print "\nStarting copy of %s.%s with columns %s." % (ks, cf, columns)
+
timestart = time.time()
direction = parsed.get_binding('dir').upper()
[5/7] cassandra git commit: Merge branch 'cassandra-2.1' into cassandra-2.2
Merge branch 'cassandra-2.1' into cassandra-2.2 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/a90c3b2b Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/a90c3b2b Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/a90c3b2b Branch: refs/heads/cassandra-3.1 Commit: a90c3b2b85daa9cbc3fc41b823c08a4a87afd768 Parents: 3841f9c 68ea4ed Author: Tyler Hobbs Authored: Wed Nov 25 11:56:16 2015 -0600 Committer: Tyler Hobbs Committed: Wed Nov 25 11:56:16 2015 -0600 -- CHANGES.txt | 1 + bin/cqlsh.py | 2 ++ 2 files changed, 3 insertions(+) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/a90c3b2b/CHANGES.txt -- diff --cc CHANGES.txt index a274ea9,8548d71..5ff53b6 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,17 -1,6 +1,18 @@@ -2.1.12 +2.2.4 + * Don't do anticompaction after subrange repair (CASSANDRA-10422) + * Fix SimpleDateType type compatibility (CASSANDRA-10027) + * (Hadoop) fix splits calculation (CASSANDRA-10640) + * (Hadoop) ensure that Cluster instances are always closed (CASSANDRA-10058) + * (cqlsh) show partial trace if incomplete after max_trace_wait (CASSANDRA-7645) + * Use most up-to-date version of schema for system tables (CASSANDRA-10652) + * Deprecate memory_allocator in cassandra.yaml (CASSANDRA-10581,10628) + * Expose phi values from failure detector via JMX and tweak debug + and trace logging (CASSANDRA-9526) + * Fix RangeNamesQueryPager (CASSANDRA-10509) + * Deprecate Pig support (CASSANDRA-10542) + * Reduce contention getting instances of CompositeType (CASSANDRA-10433) +Merged from 2.1: + * (cqlsh) Print column names before COPY operation (CASSANDRA-8935) - * Add Native-Transport-Requests back to tpstats (CASSANDRA-10044) * Make paging logic consistent between searcher impls (CASSANDRA-10683) * Fix CompressedInputStream for proper cleanup (CASSANDRA-10012) * (cqlsh) Support counters in COPY commands (CASSANDRA-9043)
[5/8] cassandra git commit: Merge branch 'cassandra-2.1' into cassandra-2.2
Merge branch 'cassandra-2.1' into cassandra-2.2 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/a90c3b2b Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/a90c3b2b Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/a90c3b2b Branch: refs/heads/trunk Commit: a90c3b2b85daa9cbc3fc41b823c08a4a87afd768 Parents: 3841f9c 68ea4ed Author: Tyler Hobbs Authored: Wed Nov 25 11:56:16 2015 -0600 Committer: Tyler Hobbs Committed: Wed Nov 25 11:56:16 2015 -0600 -- CHANGES.txt | 1 + bin/cqlsh.py | 2 ++ 2 files changed, 3 insertions(+) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/a90c3b2b/CHANGES.txt -- diff --cc CHANGES.txt index a274ea9,8548d71..5ff53b6 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,17 -1,6 +1,18 @@@ -2.1.12 +2.2.4 + * Don't do anticompaction after subrange repair (CASSANDRA-10422) + * Fix SimpleDateType type compatibility (CASSANDRA-10027) + * (Hadoop) fix splits calculation (CASSANDRA-10640) + * (Hadoop) ensure that Cluster instances are always closed (CASSANDRA-10058) + * (cqlsh) show partial trace if incomplete after max_trace_wait (CASSANDRA-7645) + * Use most up-to-date version of schema for system tables (CASSANDRA-10652) + * Deprecate memory_allocator in cassandra.yaml (CASSANDRA-10581,10628) + * Expose phi values from failure detector via JMX and tweak debug + and trace logging (CASSANDRA-9526) + * Fix RangeNamesQueryPager (CASSANDRA-10509) + * Deprecate Pig support (CASSANDRA-10542) + * Reduce contention getting instances of CompositeType (CASSANDRA-10433) +Merged from 2.1: + * (cqlsh) Print column names before COPY operation (CASSANDRA-8935) - * Add Native-Transport-Requests back to tpstats (CASSANDRA-10044) * Make paging logic consistent between searcher impls (CASSANDRA-10683) * Fix CompressedInputStream for proper cleanup (CASSANDRA-10012) * (cqlsh) Support counters in COPY commands (CASSANDRA-9043)
[1/7] cassandra git commit: Add the missing Native-Transport-Requests in tpstats back
Repository: cassandra
Updated Branches:
refs/heads/cassandra-3.1 af089f6ff -> c1b1aec19
Add the missing Native-Transport-Requests in tpstats back
Patch by Wei Deng; reviewed by tjake for CASSANDRA-10044
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/5cafe860
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/5cafe860
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/5cafe860
Branch: refs/heads/cassandra-3.1
Commit: 5cafe8606fa1f28b535c69c57f78593c4e6ea85a
Parents: f5a09c1
Author: Wei Deng
Authored: Mon Aug 10 22:57:49 2015 -0600
Committer: T Jake Luciani
Committed: Wed Nov 25 09:19:21 2015 -0500
--
CHANGES.txt| 1 +
src/java/org/apache/cassandra/tools/NodeProbe.java | 3 ++-
2 files changed, 3 insertions(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/cassandra/blob/5cafe860/CHANGES.txt
--
diff --git a/CHANGES.txt b/CHANGES.txt
index 91f4577..6f69f03 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
2.1.12
+ * Add Native-Transport-Requests back to tpstats (CASSANDRA-10044)
* Make paging logic consistent between searcher impls (CASSANDRA-10683)
* Fix CompressedInputStream for proper cleanup (CASSANDRA-10012)
* (cqlsh) Support counters in COPY commands (CASSANDRA-9043)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/5cafe860/src/java/org/apache/cassandra/tools/NodeProbe.java
--
diff --git a/src/java/org/apache/cassandra/tools/NodeProbe.java
b/src/java/org/apache/cassandra/tools/NodeProbe.java
index 49c493d..5ba5a32 100644
--- a/src/java/org/apache/cassandra/tools/NodeProbe.java
+++ b/src/java/org/apache/cassandra/tools/NodeProbe.java
@@ -1380,7 +1380,8 @@ class ThreadPoolProxyMBeanIterator implements
Iterator requests = mbeanServerConn.queryNames(new
ObjectName("org.apache.cassandra.request:type=*"), null);
Set internal = mbeanServerConn.queryNames(new
ObjectName("org.apache.cassandra.internal:type=*"), null);
-resIter = Iterables.concat(requests, internal).iterator();
+Set transport = mbeanServerConn.queryNames(new
ObjectName("org.apache.cassandra.transport:type=*"), null);
+resIter = Iterables.concat(requests, internal, transport).iterator();
this.mbeanServerConn = mbeanServerConn;
}
[3/6] cassandra git commit: cqlsh: print column names before COPY operation
cqlsh: print column names before COPY operation
Patch by Michael Edge; reviewed by Tyler Hobbs for CASSANDRA-8935
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/68ea4edb
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/68ea4edb
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/68ea4edb
Branch: refs/heads/cassandra-3.0
Commit: 68ea4edb33a9907a1a2e1cde0374a52225b519b0
Parents: 5cafe86
Author: Michael Edge
Authored: Wed Nov 25 11:54:11 2015 -0600
Committer: Tyler Hobbs
Committed: Wed Nov 25 11:54:11 2015 -0600
--
CHANGES.txt | 1 +
bin/cqlsh | 2 ++
2 files changed, 3 insertions(+)
--
http://git-wip-us.apache.org/repos/asf/cassandra/blob/68ea4edb/CHANGES.txt
--
diff --git a/CHANGES.txt b/CHANGES.txt
index 6f69f03..8548d71 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
2.1.12
+ * (cqlsh) Print column names before COPY operation (CASSANDRA-8935)
* Add Native-Transport-Requests back to tpstats (CASSANDRA-10044)
* Make paging logic consistent between searcher impls (CASSANDRA-10683)
* Fix CompressedInputStream for proper cleanup (CASSANDRA-10012)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/68ea4edb/bin/cqlsh
--
diff --git a/bin/cqlsh b/bin/cqlsh
index f4bedcd..3e830b5 100755
--- a/bin/cqlsh
+++ b/bin/cqlsh
@@ -1551,6 +1551,8 @@ class Shell(cmd.Cmd):
cleancopyoptvals = [optval.decode('string-escape') for optval in
copyoptvals]
opts = dict(zip(copyoptnames, cleancopyoptvals))
+print "\nStarting copy of %s.%s with columns %s." % (ks, cf, columns)
+
timestart = time.time()
direction = parsed.get_binding('dir').upper()
[7/7] cassandra git commit: Merge branch 'cassandra-3.0' into cassandra-3.1
Merge branch 'cassandra-3.0' into cassandra-3.1 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/c1b1aec1 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/c1b1aec1 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/c1b1aec1 Branch: refs/heads/cassandra-3.1 Commit: c1b1aec19ca8a2038a5878334efe40a092ed1be0 Parents: af089f6 9b3b3ca Author: Tyler Hobbs Authored: Wed Nov 25 11:57:49 2015 -0600 Committer: Tyler Hobbs Committed: Wed Nov 25 11:57:49 2015 -0600 -- CHANGES.txt | 1 + bin/cqlsh.py | 2 ++ 2 files changed, 3 insertions(+) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/c1b1aec1/CHANGES.txt --
[6/6] cassandra git commit: Merge branch 'cassandra-2.2' into cassandra-3.0
Merge branch 'cassandra-2.2' into cassandra-3.0 Conflicts: CHANGES.txt Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/9b3b3ca0 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/9b3b3ca0 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/9b3b3ca0 Branch: refs/heads/cassandra-3.0 Commit: 9b3b3ca00f71a4ae38149194e3c8c7c448974275 Parents: a0076e7 a90c3b2 Author: Tyler Hobbs Authored: Wed Nov 25 11:57:24 2015 -0600 Committer: Tyler Hobbs Committed: Wed Nov 25 11:57:24 2015 -0600 -- CHANGES.txt | 1 + bin/cqlsh.py | 2 ++ 2 files changed, 3 insertions(+) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/9b3b3ca0/CHANGES.txt -- diff --cc CHANGES.txt index 513e682,5ff53b6..f95f079 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -13,7 -3,17 +13,8 @@@ Merged from 2.2 * Fix SimpleDateType type compatibility (CASSANDRA-10027) * (Hadoop) fix splits calculation (CASSANDRA-10640) * (Hadoop) ensure that Cluster instances are always closed (CASSANDRA-10058) - * (cqlsh) show partial trace if incomplete after max_trace_wait (CASSANDRA-7645) - * Use most up-to-date version of schema for system tables (CASSANDRA-10652) - * Deprecate memory_allocator in cassandra.yaml (CASSANDRA-10581,10628) - * Expose phi values from failure detector via JMX and tweak debug - and trace logging (CASSANDRA-9526) - * Fix RangeNamesQueryPager (CASSANDRA-10509) - * Deprecate Pig support (CASSANDRA-10542) - * Reduce contention getting instances of CompositeType (CASSANDRA-10433) Merged from 2.1: + * (cqlsh) Print column names before COPY operation (CASSANDRA-8935) - * Make paging logic consistent between searcher impls (CASSANDRA-10683) * Fix CompressedInputStream for proper cleanup (CASSANDRA-10012) * (cqlsh) Support counters in COPY commands (CASSANDRA-9043) * Try next replica if not possible to connect to primary replica on http://git-wip-us.apache.org/repos/asf/cassandra/blob/9b3b3ca0/bin/cqlsh.py --
[1/6] cassandra git commit: Add the missing Native-Transport-Requests in tpstats back
Repository: cassandra
Updated Branches:
refs/heads/cassandra-3.0 a0076e70e -> 9b3b3ca00
Add the missing Native-Transport-Requests in tpstats back
Patch by Wei Deng; reviewed by tjake for CASSANDRA-10044
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/5cafe860
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/5cafe860
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/5cafe860
Branch: refs/heads/cassandra-3.0
Commit: 5cafe8606fa1f28b535c69c57f78593c4e6ea85a
Parents: f5a09c1
Author: Wei Deng
Authored: Mon Aug 10 22:57:49 2015 -0600
Committer: T Jake Luciani
Committed: Wed Nov 25 09:19:21 2015 -0500
--
CHANGES.txt| 1 +
src/java/org/apache/cassandra/tools/NodeProbe.java | 3 ++-
2 files changed, 3 insertions(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/cassandra/blob/5cafe860/CHANGES.txt
--
diff --git a/CHANGES.txt b/CHANGES.txt
index 91f4577..6f69f03 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
2.1.12
+ * Add Native-Transport-Requests back to tpstats (CASSANDRA-10044)
* Make paging logic consistent between searcher impls (CASSANDRA-10683)
* Fix CompressedInputStream for proper cleanup (CASSANDRA-10012)
* (cqlsh) Support counters in COPY commands (CASSANDRA-9043)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/5cafe860/src/java/org/apache/cassandra/tools/NodeProbe.java
--
diff --git a/src/java/org/apache/cassandra/tools/NodeProbe.java
b/src/java/org/apache/cassandra/tools/NodeProbe.java
index 49c493d..5ba5a32 100644
--- a/src/java/org/apache/cassandra/tools/NodeProbe.java
+++ b/src/java/org/apache/cassandra/tools/NodeProbe.java
@@ -1380,7 +1380,8 @@ class ThreadPoolProxyMBeanIterator implements
Iterator requests = mbeanServerConn.queryNames(new
ObjectName("org.apache.cassandra.request:type=*"), null);
Set internal = mbeanServerConn.queryNames(new
ObjectName("org.apache.cassandra.internal:type=*"), null);
-resIter = Iterables.concat(requests, internal).iterator();
+Set transport = mbeanServerConn.queryNames(new
ObjectName("org.apache.cassandra.transport:type=*"), null);
+resIter = Iterables.concat(requests, internal, transport).iterator();
this.mbeanServerConn = mbeanServerConn;
}
[2/7] cassandra git commit: Merge branch 'cassandra-2.1' into cassandra-2.2
Merge branch 'cassandra-2.1' into cassandra-2.2 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/3841f9cb Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/3841f9cb Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/3841f9cb Branch: refs/heads/cassandra-3.1 Commit: 3841f9cb2041a7af43cbda3ff7c85e78216a6d22 Parents: a907533 5cafe86 Author: T Jake Luciani Authored: Wed Nov 25 09:21:41 2015 -0500 Committer: T Jake Luciani Committed: Wed Nov 25 09:21:41 2015 -0500 -- --
cassandra git commit: cqlsh: print column names before COPY operation
Repository: cassandra
Updated Branches:
refs/heads/cassandra-2.1 5cafe8606 -> 68ea4edb3
cqlsh: print column names before COPY operation
Patch by Michael Edge; reviewed by Tyler Hobbs for CASSANDRA-8935
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/68ea4edb
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/68ea4edb
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/68ea4edb
Branch: refs/heads/cassandra-2.1
Commit: 68ea4edb33a9907a1a2e1cde0374a52225b519b0
Parents: 5cafe86
Author: Michael Edge
Authored: Wed Nov 25 11:54:11 2015 -0600
Committer: Tyler Hobbs
Committed: Wed Nov 25 11:54:11 2015 -0600
--
CHANGES.txt | 1 +
bin/cqlsh | 2 ++
2 files changed, 3 insertions(+)
--
http://git-wip-us.apache.org/repos/asf/cassandra/blob/68ea4edb/CHANGES.txt
--
diff --git a/CHANGES.txt b/CHANGES.txt
index 6f69f03..8548d71 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
2.1.12
+ * (cqlsh) Print column names before COPY operation (CASSANDRA-8935)
* Add Native-Transport-Requests back to tpstats (CASSANDRA-10044)
* Make paging logic consistent between searcher impls (CASSANDRA-10683)
* Fix CompressedInputStream for proper cleanup (CASSANDRA-10012)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/68ea4edb/bin/cqlsh
--
diff --git a/bin/cqlsh b/bin/cqlsh
index f4bedcd..3e830b5 100755
--- a/bin/cqlsh
+++ b/bin/cqlsh
@@ -1551,6 +1551,8 @@ class Shell(cmd.Cmd):
cleancopyoptvals = [optval.decode('string-escape') for optval in
copyoptvals]
opts = dict(zip(copyoptnames, cleancopyoptvals))
+print "\nStarting copy of %s.%s with columns %s." % (ks, cf, columns)
+
timestart = time.time()
direction = parsed.get_binding('dir').upper()
[3/3] cassandra git commit: Merge branch 'cassandra-2.1' into cassandra-2.2
Merge branch 'cassandra-2.1' into cassandra-2.2 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/a90c3b2b Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/a90c3b2b Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/a90c3b2b Branch: refs/heads/cassandra-2.2 Commit: a90c3b2b85daa9cbc3fc41b823c08a4a87afd768 Parents: 3841f9c 68ea4ed Author: Tyler Hobbs Authored: Wed Nov 25 11:56:16 2015 -0600 Committer: Tyler Hobbs Committed: Wed Nov 25 11:56:16 2015 -0600 -- CHANGES.txt | 1 + bin/cqlsh.py | 2 ++ 2 files changed, 3 insertions(+) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/a90c3b2b/CHANGES.txt -- diff --cc CHANGES.txt index a274ea9,8548d71..5ff53b6 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,17 -1,6 +1,18 @@@ -2.1.12 +2.2.4 + * Don't do anticompaction after subrange repair (CASSANDRA-10422) + * Fix SimpleDateType type compatibility (CASSANDRA-10027) + * (Hadoop) fix splits calculation (CASSANDRA-10640) + * (Hadoop) ensure that Cluster instances are always closed (CASSANDRA-10058) + * (cqlsh) show partial trace if incomplete after max_trace_wait (CASSANDRA-7645) + * Use most up-to-date version of schema for system tables (CASSANDRA-10652) + * Deprecate memory_allocator in cassandra.yaml (CASSANDRA-10581,10628) + * Expose phi values from failure detector via JMX and tweak debug + and trace logging (CASSANDRA-9526) + * Fix RangeNamesQueryPager (CASSANDRA-10509) + * Deprecate Pig support (CASSANDRA-10542) + * Reduce contention getting instances of CompositeType (CASSANDRA-10433) +Merged from 2.1: + * (cqlsh) Print column names before COPY operation (CASSANDRA-8935) - * Add Native-Transport-Requests back to tpstats (CASSANDRA-10044) * Make paging logic consistent between searcher impls (CASSANDRA-10683) * Fix CompressedInputStream for proper cleanup (CASSANDRA-10012) * (cqlsh) Support counters in COPY commands (CASSANDRA-9043)
[jira] [Updated] (CASSANDRA-8639) Can OOM on CL replay with dense mutations
[ https://issues.apache.org/jira/browse/CASSANDRA-8639?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] Ariel Weisberg updated CASSANDRA-8639: -- Reviewer: T Jake Luciani > Can OOM on CL replay with dense mutations > - > > Key: CASSANDRA-8639 > URL: https://issues.apache.org/jira/browse/CASSANDRA-8639 > Project: Cassandra > Issue Type: Bug >Reporter: T Jake Luciani >Assignee: Ariel Weisberg >Priority: Minor > Fix For: 2.1.x > > > If you write dense mutations with many clustering keys, the replay of the CL > can quickly overwhelm a node on startup. This looks to be caused by the fact > we only ensure there are 1000 mutations in flight at a time. but those > mutations could have thousands of cells in them. > A better approach would be to limit the CL replay to the amount of memory in > flight using cell.unsharedHeapSize() -- This message was sent by Atlassian JIRA (v6.3.4#6332)
[jira] [Created] (CASSANDRA-10771) bootstrap_test.py:TestBootstrap.resumable_bootstrap_test is failing
Philip Thompson created CASSANDRA-10771:
---
Summary: bootstrap_test.py:TestBootstrap.resumable_bootstrap_test
is failing
Key: CASSANDRA-10771
URL: https://issues.apache.org/jira/browse/CASSANDRA-10771
Project: Cassandra
Issue Type: Sub-task
Components: Streaming and Messaging
Reporter: Philip Thompson
Fix For: 3.0.1, 3.1
When running {{bootstrap_test.py:TestBootstrap.resumable_bootstrap_test}}
locally, the test is failing on cassandra-3.0. When I bisect the failure, I
find that 87f5e2e39c100, the commit that merged CASSANDRA-10557 into 3.0 is the
first failing commit. I can reproduce this consistently locally, but cassci is
only having intermittent failures.
--
This message was sent by Atlassian JIRA
(v6.3.4#6332)
[jira] [Commented] (CASSANDRA-10771) bootstrap_test.py:TestBootstrap.resumable_bootstrap_test is failing
[
https://issues.apache.org/jira/browse/CASSANDRA-10771?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=15027201#comment-15027201
]
Philip Thompson commented on CASSANDRA-10771:
-
>From monitoring logs of failing tests, it appears that after node3 has
>finished streaming in the data from node1, it never begins listening for CQL
>clients, so the test never moves on to bringing node1 back up.
The test failure looks like:
{code}
Traceback (most recent call last):
File "/Users/philipthompson/cstar/cassandra-dtest/tools.py", line 253, in
wrapped
f(obj)
File "/Users/philipthompson/cstar/cassandra-dtest/bootstrap_test.py", line
138, in resumable_bootstrap_test
node3.watch_log_for("Starting listening for CQL clients", timeout=100)
File "/Users/philipthompson/cstar/ccm/ccmlib/node.py", line 409, in
watch_log_for
raise TimeoutError(time.strftime("%d %b %Y %H:%M:%S", time.gmtime()) + " ["
+ self.name + "] Missing: " + str([e.pattern for e in tofind]) + ":\n" +
reads[:50] + ".\nSee {} for remainder".format(filename))
TimeoutError: 25 Nov 2015 17:13:23 [node3] Missing: ['Starting listening for
CQL clients']:
INFO [main] 2015-11-25 12:11:04,679 YamlConfigura.
See system.log for remainder
{code}
And I see this in node3's log
{code}
java.lang.NullPointerException: Cannot suppress a null exception.
at java.lang.Throwable.addSuppressed(Throwable.java:1046) ~[na:1.8.0_51]
at
org.apache.cassandra.streaming.StreamReader.read(StreamReader.java:121)
~[main/:na]
at
org.apache.cassandra.streaming.messages.IncomingFileMessage$1.deserialize(IncomingFileMessage.java:50)
[main/:na]
at
org.apache.cassandra.streaming.messages.IncomingFileMessage$1.deserialize(IncomingFileMessage.java:39)
[main/:na]
at
org.apache.cassandra.streaming.messages.StreamMessage.deserialize(StreamMessage.java:59)
[main/:na]
at
org.apache.cassandra.streaming.ConnectionHandler$IncomingMessageHandler.run(ConnectionHandler.java:261)
[main/:na]
at java.lang.Thread.run(Thread.java:745) [na:1.8.0_51]
{code}
> bootstrap_test.py:TestBootstrap.resumable_bootstrap_test is failing
> ---
>
> Key: CASSANDRA-10771
> URL: https://issues.apache.org/jira/browse/CASSANDRA-10771
> Project: Cassandra
> Issue Type: Sub-task
> Components: Streaming and Messaging
>Reporter: Philip Thompson
> Fix For: 3.0.1, 3.1
>
>
> When running {{bootstrap_test.py:TestBootstrap.resumable_bootstrap_test}}
> locally, the test is failing on cassandra-3.0. When I bisect the failure, I
> find that 87f5e2e39c100, the commit that merged CASSANDRA-10557 into 3.0 is
> the first failing commit. I can reproduce this consistently locally, but
> cassci is only having intermittent failures.
--
This message was sent by Atlassian JIRA
(v6.3.4#6332)
[jira] [Commented] (CASSANDRA-9302) Optimize cqlsh COPY FROM, part 3
[ https://issues.apache.org/jira/browse/CASSANDRA-9302?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=15027191#comment-15027191 ] Adam Holmberg commented on CASSANDRA-9302: -- I see now that cassandra-2.2 branch has driver 3.0.0a3, which did not include the finalized 3.0 API. I recommend bundling the current driver if possible. > Optimize cqlsh COPY FROM, part 3 > > > Key: CASSANDRA-9302 > URL: https://issues.apache.org/jira/browse/CASSANDRA-9302 > Project: Cassandra > Issue Type: Improvement > Components: Tools >Reporter: Jonathan Ellis >Assignee: Stefania >Priority: Critical > Fix For: 2.1.x > > > We've had some discussion moving to Spark CSV import for bulk load in 3.x, > but people need a good bulk load tool now. One option is to add a separate > Java bulk load tool (CASSANDRA-9048), but if we can match that performance > from cqlsh I would prefer to leave COPY FROM as the preferred option to which > we point people, rather than adding more tools that need to be supported > indefinitely. > Previous work on COPY FROM optimization was done in CASSANDRA-7405 and > CASSANDRA-8225. -- This message was sent by Atlassian JIRA (v6.3.4#6332)
[jira] [Commented] (CASSANDRA-9302) Optimize cqlsh COPY FROM, part 3
[
https://issues.apache.org/jira/browse/CASSANDRA-9302?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=15027176#comment-15027176
]
Adam Holmberg commented on CASSANDRA-9302:
--
I'm a bit surprised by this note. If both branches are using 3.0.x variants of
the driver there should be no API discontinuity. I think we should be referring
to {{ColumnMeta.cql_type}} here.
> Optimize cqlsh COPY FROM, part 3
>
>
> Key: CASSANDRA-9302
> URL: https://issues.apache.org/jira/browse/CASSANDRA-9302
> Project: Cassandra
> Issue Type: Improvement
> Components: Tools
>Reporter: Jonathan Ellis
>Assignee: Stefania
>Priority: Critical
> Fix For: 2.1.x
>
>
> We've had some discussion moving to Spark CSV import for bulk load in 3.x,
> but people need a good bulk load tool now. One option is to add a separate
> Java bulk load tool (CASSANDRA-9048), but if we can match that performance
> from cqlsh I would prefer to leave COPY FROM as the preferred option to which
> we point people, rather than adding more tools that need to be supported
> indefinitely.
> Previous work on COPY FROM optimization was done in CASSANDRA-7405 and
> CASSANDRA-8225.
--
This message was sent by Atlassian JIRA
(v6.3.4#6332)
[jira] [Commented] (CASSANDRA-7281) SELECT on tuple relations are broken for mixed ASC/DESC clustering order
[
https://issues.apache.org/jira/browse/CASSANDRA-7281?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=15027102#comment-15027102
]
Benjamin Lerer commented on CASSANDRA-7281:
---
[~marcinszymaniuk] do you have any comments on my modified version?
Are you still interested in providing a patch for 2.1 and 3.0?
> SELECT on tuple relations are broken for mixed ASC/DESC clustering order
>
>
> Key: CASSANDRA-7281
> URL: https://issues.apache.org/jira/browse/CASSANDRA-7281
> Project: Cassandra
> Issue Type: Bug
>Reporter: Sylvain Lebresne
>Assignee: Marcin Szymaniuk
> Fix For: 2.1.x
>
> Attachments:
> 0001-CASSANDRA-7281-SELECT-on-tuple-relations-are-broken-.patch,
> 0001-CASSANDRA-7281-SELECT-on-tuple-relations-are-broken-v2.patch,
> 0001-CASSANDRA-7281-SELECT-on-tuple-relations-are-broken-v3.patch,
> 0001-CASSANDRA-7281-SELECT-on-tuple-relations-are-broken-v4.patch,
> 0001-CASSANDRA-7281-SELECT-on-tuple-relations-are-broken-v5.patch,
> 7281_unit_tests.txt
>
>
> As noted on
> [CASSANDRA-6875|https://issues.apache.org/jira/browse/CASSANDRA-6875?focusedCommentId=13992153&page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel#comment-13992153],
> the tuple notation is broken when the clustering order mixes ASC and DESC
> directives because the range of data they describe don't correspond to a
> single continuous slice internally. To copy the example from CASSANDRA-6875:
> {noformat}
> cqlsh:ks> create table foo (a int, b int, c int, PRIMARY KEY (a, b, c)) WITH
> CLUSTERING ORDER BY (b DESC, c ASC);
> cqlsh:ks> INSERT INTO foo (a, b, c) VALUES (0, 2, 0);
> cqlsh:ks> INSERT INTO foo (a, b, c) VALUES (0, 1, 0);
> cqlsh:ks> INSERT INTO foo (a, b, c) VALUES (0, 1, 1);
> cqlsh:ks> INSERT INTO foo (a, b, c) VALUES (0, 0, 0);
> cqlsh:ks> SELECT * FROM foo WHERE a=0;
> a | b | c
> ---+---+---
> 0 | 2 | 0
> 0 | 1 | 0
> 0 | 1 | 1
> 0 | 0 | 0
> (4 rows)
> cqlsh:ks> SELECT * FROM foo WHERE a=0 AND (b, c) > (1, 0);
> a | b | c
> ---+---+---
> 0 | 2 | 0
> (1 rows)
> {noformat}
> The last query should really return {{(0, 2, 0)}} and {{(0, 1, 1)}}.
> For that specific example we should generate 2 internal slices, but I believe
> that with more clustering columns we may have more slices.
--
This message was sent by Atlassian JIRA
(v6.3.4#6332)
[jira] [Commented] (CASSANDRA-9915) IndexError('list index out of range') when trying to connect to Cassandra cluster with cqlsh
[
https://issues.apache.org/jira/browse/CASSANDRA-9915?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=15027060#comment-15027060
]
Adam Holmberg commented on CASSANDRA-9915:
--
Still unclear what was leading to this metadata condition, but the updated
driver (now in both 2.2 and 3.0) handles this without blowing up. I think we
can close this.
> IndexError('list index out of range') when trying to connect to Cassandra
> cluster with cqlsh
>
>
> Key: CASSANDRA-9915
> URL: https://issues.apache.org/jira/browse/CASSANDRA-9915
> Project: Cassandra
> Issue Type: Bug
> Environment: Ubuntu, Cassandra 2.5.1, Python 2.7.3
>Reporter: Prabir Kr Sarkar
>Assignee: Adam Holmberg
>Priority: Minor
> Labels: cqlsh
> Fix For: 2.1.x
>
> Attachments: schema_columnfamilies.xls
>
>
> Cassandra by default uses a Python driver to connect
> {code}
> >>> cluster = Cluster(['IP'], protocol_version=3)
> >>> session = cluster.connect()
> Traceback (most recent call last):
> File "", line 1, in
> File "/usr/local/lib/python2.7/dist-packages/cassandra/cluster.py", line
> 839, in connect
> self.control_connection.connect()
> File "/usr/local/lib/python2.7/dist-packages/cassandra/cluster.py", line
> 2075, in connect
> self._set_new_connection(self._reconnect_internal())
> File "/usr/local/lib/python2.7/dist-packages/cassandra/cluster.py", line
> 2110, in _reconnect_internal
> raise NoHostAvailable("Unable to connect to any servers", errors)
> cassandra.cluster.NoHostAvailable: ('Unable to connect to any servers',
> {'IP': IndexError('list index out of range',)})
> {code}
--
This message was sent by Atlassian JIRA
(v6.3.4#6332)
[jira] [Assigned] (CASSANDRA-10761) Possible regression of CASSANDRA-9201
[
https://issues.apache.org/jira/browse/CASSANDRA-10761?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel
]
Sam Tunnicliffe reassigned CASSANDRA-10761:
---
Assignee: Sam Tunnicliffe
> Possible regression of CASSANDRA-9201
> -
>
> Key: CASSANDRA-10761
> URL: https://issues.apache.org/jira/browse/CASSANDRA-10761
> Project: Cassandra
> Issue Type: Sub-task
>Reporter: Philip Thompson
>Assignee: Sam Tunnicliffe
> Fix For: 3.0.1, 3.1, 2.2.x
>
> Attachments: 10761-logs.tar.gz
>
>
> Some dtests like
> {{consistency_test.TestAccuracy.test_network_topology_strategy_each_quorum_counters}}
> are failing with the follow auth related assertion exception
> {code}
> [node6 ERROR] java.lang.AssertionError:
> org.apache.cassandra.exceptions.InvalidRequestException: unconfigured table
> roles
> at
> org.apache.cassandra.auth.CassandraRoleManager.prepare(CassandraRoleManager.java:450)
> at
> org.apache.cassandra.auth.CassandraRoleManager.setup(CassandraRoleManager.java:144)
> at
> org.apache.cassandra.service.StorageService.doAuthSetup(StorageService.java:1036)
> at
> org.apache.cassandra.service.StorageService.joinTokenRing(StorageService.java:984)
> at
> org.apache.cassandra.service.StorageService.initServer(StorageService.java:708)
> at
> org.apache.cassandra.service.StorageService.initServer(StorageService.java:579)
> at
> org.apache.cassandra.service.CassandraDaemon.setup(CassandraDaemon.java:345)
> at
> org.apache.cassandra.service.CassandraDaemon.activate(CassandraDaemon.java:561)
> at
> org.apache.cassandra.service.CassandraDaemon.main(CassandraDaemon.java:689)
> Caused by: org.apache.cassandra.exceptions.InvalidRequestException:
> unconfigured table roles
> at
> org.apache.cassandra.thrift.ThriftValidation.validateColumnFamily(ThriftValidation.java:114)
> at
> org.apache.cassandra.cql3.statements.SelectStatement$RawStatement.prepare(SelectStatement.java:757)
> at
> org.apache.cassandra.cql3.statements.SelectStatement$RawStatement.prepare(SelectStatement.java:752)
> at
> org.apache.cassandra.auth.CassandraRoleManager.prepare(CassandraRoleManager.java:446)
> ... 8 more
> {code}
> This looks very similar to CASSANDRA-9201.
--
This message was sent by Atlassian JIRA
(v6.3.4#6332)
[jira] [Updated] (CASSANDRA-10721) Altering a UDT might break UDA deserialisation
[
https://issues.apache.org/jira/browse/CASSANDRA-10721?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel
]
Sylvain Lebresne updated CASSANDRA-10721:
-
Reviewer: Benjamin Lerer
> Altering a UDT might break UDA deserialisation
> --
>
> Key: CASSANDRA-10721
> URL: https://issues.apache.org/jira/browse/CASSANDRA-10721
> Project: Cassandra
> Issue Type: Bug
> Components: CQL, Distributed Metadata
>Reporter: Aleksey Yeschenko
>Assignee: Robert Stupp
> Fix For: 3.0.x
>
>
> CASSANDRA-10650 switched UDA's {{initcond}} serialisation in schema to its
> CQL literal. This means that if any particular field is renamed in the UDT,
> or of its type gets changes, we will not be able to parse initcond back.
> We should either:
> 1) Forbid renames and type switches in UDTs that are being used in UDAs, or
> 2) Make sure we alter the UDAs in schema alongside the new UDT at all times
--
This message was sent by Atlassian JIRA
(v6.3.4#6332)
[jira] [Updated] (CASSANDRA-10658) Some DROP ... IF EXISTS incorrectly result in exceptions on non-existing KS
[
https://issues.apache.org/jira/browse/CASSANDRA-10658?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel
]
Sylvain Lebresne updated CASSANDRA-10658:
-
Reviewer: Marcus Eriksson
> Some DROP ... IF EXISTS incorrectly result in exceptions on non-existing KS
> ---
>
> Key: CASSANDRA-10658
> URL: https://issues.apache.org/jira/browse/CASSANDRA-10658
> Project: Cassandra
> Issue Type: Bug
>Reporter: Robert Stupp
>Assignee: Robert Stupp
>Priority: Minor
> Fix For: 2.1.x, 2.2.x, 3.0.x
>
>
> 2.1, 2.2 and 3.0 incorrectly throws {{InvalidRequestException}} on
> non-existing keyspace for {{DROP TYPE IF EXISTS}}
> 3.0 incorrectly throws {{ConfigurationException}} for {{DROP AGGREGATE IF
> EXISTS}} with type arguments.
> 3.0 incorrectly throws {{ConfigurationException}} for {{DROP FUNCTION IF
> EXISTS}} with type arguments.
--
This message was sent by Atlassian JIRA
(v6.3.4#6332)
[jira] [Updated] (CASSANDRA-10760) Counters are erroneously allowed as map key type
[
https://issues.apache.org/jira/browse/CASSANDRA-10760?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel
]
Sylvain Lebresne updated CASSANDRA-10760:
-
Reviewer: Sylvain Lebresne
> Counters are erroneously allowed as map key type
>
>
> Key: CASSANDRA-10760
> URL: https://issues.apache.org/jira/browse/CASSANDRA-10760
> Project: Cassandra
> Issue Type: Bug
> Components: CQL
>Reporter: Aleksey Yeschenko
>Assignee: Michael Edge
>Priority: Minor
> Labels: cql, cqlsh
> Fix For: 2.1.x, 2.2.x, 3.0.x
>
> Attachments: CASSANDRA-3.0-10760-Counters-in-Maps.patch
>
>
> We do validate collection value types, but not collection key types, which
> allows counters to be used as map keys:
> {noformat}
> cqlsh> create keyspace test with replication = {'class': 'SimpleStrategy',
> 'replication_factor': 1};
> cqlsh> use test;
> cqlsh:test> create table test.test (id int primary key, amap map text>);
> cqlsh:test> insert into test.test (id, amap) values (0, {1: '2'});
> cqlsh:test> select * from test.test;
> id | amap
> +--
> 0 | {1: '2'}
> (1 rows)
> {noformat}
> This should obviously not be allowed and must be rejected.
> /cc [~slebresne]
--
This message was sent by Atlassian JIRA
(v6.3.4#6332)
[jira] [Commented] (CASSANDRA-10759) nodetool upgradesstables does not always complete synchronously
[ https://issues.apache.org/jira/browse/CASSANDRA-10759?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=15027022#comment-15027022 ] Joshua McKenzie commented on CASSANDRA-10759: - What's the environment (OS) you're running into this on? > nodetool upgradesstables does not always complete synchronously > --- > > Key: CASSANDRA-10759 > URL: https://issues.apache.org/jira/browse/CASSANDRA-10759 > Project: Cassandra > Issue Type: Bug > Components: Tools > Environment: Discovered on Apache Cassandra 2.1.8.689 >Reporter: Jamie > > The "nodetool upgradesstables" command does not always complete > synchronously. We notice that the command exits with an exit code 0, however, > there are still files left behind on an older version that disappear later. -- This message was sent by Atlassian JIRA (v6.3.4#6332)
[jira] [Updated] (CASSANDRA-10755) PreparedStatement is the same id for different Japanese katakana characters with same length
[ https://issues.apache.org/jira/browse/CASSANDRA-10755?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] Sylvain Lebresne updated CASSANDRA-10755: - Reviewer: Sylvain Lebresne > PreparedStatement is the same id for different Japanese katakana characters > with same length > > > Key: CASSANDRA-10755 > URL: https://issues.apache.org/jira/browse/CASSANDRA-10755 > Project: Cassandra > Issue Type: Bug > Environment: cassandra-2.1.8, java driver 2.1.5, ubuntu 14.04 >Reporter: ZhaoYang > > String q1 = "UPDATE table SET value='タニャア' WHERE key=? AND key2=?"; > String q2 = "UPDATE table SET value='ャアタニ' WHERE key=? AND key2=?"; > when using session.prepare(). > q1 and q2 will return the prepared-statement with the same prepared ID, but > the query in prepared-statement is correct. > So if I update using q1 first, all later q2 will not be able to update.( It's > means , it still updates q1) > Please note that the Japanese katakana is the same length in q1 and q2. > I know it's a bad use case for putting value into prepared-query itself. > Is it related to how Cassandra cache prepared statement? -- This message was sent by Atlassian JIRA (v6.3.4#6332)
[Cassandra Wiki] Update of "HowToContribute" by AdamHolmberg
Dear Wiki user,
You have subscribed to a wiki page or wiki category on "Cassandra Wiki" for
change notification.
The "HowToContribute" page has been changed by AdamHolmberg:
https://wiki.apache.org/cassandra/HowToContribute?action=diff&rev1=62&rev2=63
This workflow also makes it so git knows what commits have been made to
earlier branches but not to trunk: if you forget to merge a fix immediately,
the next time someone goes to merge from the branch, git will incorporate the
forgotten ones too.
+ == Bundled Drivers ==
+ A copy of the Python driver is included for use in `cqlsh`. For instructions
on how to package the bundled driver for the Cassandra project, see the
[[https://github.com/datastax/python-driver/blob/master/README-dev.rst#packaging-for-cassandra|instructions
here]].
+
{{https://c.statcounter.com/9397521/0/fe557aad/1/|stats}}
[jira] [Commented] (CASSANDRA-10749) DeletionTime.compareTo wrong ??
[
https://issues.apache.org/jira/browse/CASSANDRA-10749?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=15027009#comment-15027009
]
Sylvain Lebresne commented on CASSANDRA-10749:
--
+1
> DeletionTime.compareTo wrong ??
> ---
>
> Key: CASSANDRA-10749
> URL: https://issues.apache.org/jira/browse/CASSANDRA-10749
> Project: Cassandra
> Issue Type: Bug
>Reporter: Robert Stupp
>Assignee: Robert Stupp
>Priority: Minor
>
> {{org.apache.cassandra.db.DeletionTime#compareTo}} looks like this:
> {code}
> public int compareTo(DeletionTime dt)
> {
> if (markedForDeleteAt() < dt.markedForDeleteAt())
> return -1;
> else if (markedForDeleteAt() > dt.markedForDeleteAt())
> return 1;
> else if (localDeletionTime() < dt.localDeletionTime())
> return -1;
> else if (localDeletionTime() > dt.localDeletionTime())
> return -1;
> else
> return 0;
> }
> {code}
> I think that {{localDeletionTime() > dt.localDeletionTime()}} should return
> {{1}}, but I'm not sure. /cc [~slebresne]
--
This message was sent by Atlassian JIRA
(v6.3.4#6332)
[jira] [Updated] (CASSANDRA-10749) DeletionTime.compareTo wrong ??
[
https://issues.apache.org/jira/browse/CASSANDRA-10749?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel
]
Sylvain Lebresne updated CASSANDRA-10749:
-
Reviewer: Sylvain Lebresne
> DeletionTime.compareTo wrong ??
> ---
>
> Key: CASSANDRA-10749
> URL: https://issues.apache.org/jira/browse/CASSANDRA-10749
> Project: Cassandra
> Issue Type: Bug
>Reporter: Robert Stupp
>Assignee: Robert Stupp
>Priority: Minor
>
> {{org.apache.cassandra.db.DeletionTime#compareTo}} looks like this:
> {code}
> public int compareTo(DeletionTime dt)
> {
> if (markedForDeleteAt() < dt.markedForDeleteAt())
> return -1;
> else if (markedForDeleteAt() > dt.markedForDeleteAt())
> return 1;
> else if (localDeletionTime() < dt.localDeletionTime())
> return -1;
> else if (localDeletionTime() > dt.localDeletionTime())
> return -1;
> else
> return 0;
> }
> {code}
> I think that {{localDeletionTime() > dt.localDeletionTime()}} should return
> {{1}}, but I'm not sure. /cc [~slebresne]
--
This message was sent by Atlassian JIRA
(v6.3.4#6332)
[jira] [Updated] (CASSANDRA-10747) CQL.textile syntax incorrectly includes optional keyspace for aggregate SFUNC and FINALFUNC
[
https://issues.apache.org/jira/browse/CASSANDRA-10747?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel
]
Sylvain Lebresne updated CASSANDRA-10747:
-
Reviewer: Sylvain Lebresne
> CQL.textile syntax incorrectly includes optional keyspace for aggregate SFUNC
> and FINALFUNC
> ---
>
> Key: CASSANDRA-10747
> URL: https://issues.apache.org/jira/browse/CASSANDRA-10747
> Project: Cassandra
> Issue Type: Bug
> Components: Documentation and Website
>Reporter: dan jatnieks
>Assignee: Robert Stupp
>Priority: Trivial
> Fix For: 2.2.x
>
> Attachments: 10747.txt
>
>
> [CQL.textile|https://github.com/apache/cassandra/blob/trunk/doc/cql3/CQL.textile]
> incorrectly includes an optional keyspace for the {{SFUNC}} and
> {{FINALFUNC}} parts of a {{CREATE AGGREGATE}} statement.
> The grammar for 2.2 and 3.0 does not allow a keyspace to be specified here.
> From the CQL.textile:
> {noformat}
> ::= CREATE ( OR REPLACE )?
> AGGREGATE ( IF NOT EXISTS )?
> ( '.' )?
> '(' ( ',' )* ')'
> SFUNC ( '.' )?
> STYPE
> ( FINALFUNC ( '.' )?
> )?
> ( INITCOND )?
> {noformat}
--
This message was sent by Atlassian JIRA
(v6.3.4#6332)
[jira] [Commented] (CASSANDRA-8805) runWithCompactionsDisabled only cancels compactions, which is not the only source of markCompacted
[ https://issues.apache.org/jira/browse/CASSANDRA-8805?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=15026972#comment-15026972 ] Marcus Eriksson commented on CASSANDRA-8805: ok, +1 could you rebase the branches? > runWithCompactionsDisabled only cancels compactions, which is not the only > source of markCompacted > -- > > Key: CASSANDRA-8805 > URL: https://issues.apache.org/jira/browse/CASSANDRA-8805 > Project: Cassandra > Issue Type: Bug >Reporter: Benedict >Assignee: Carl Yeksigian > Fix For: 2.1.x > > Attachments: 8805-2.1.txt > > > Operations like repair that may operate over all sstables cancel compactions > before beginning, and fail if there are any files marked compacting after > doing so. Redistribution of index summaries is not a compaction, so is not > cancelled by this action, but does mark sstables as compacting, so such an > action will fail to initiate if there is an index summary redistribution in > progress. It seems that IndexSummaryManager needs to register itself as > interruptible along with compactions (AFAICT no other actions that may > markCompacting are not themselves compactions). -- This message was sent by Atlassian JIRA (v6.3.4#6332)
