[jira] [Created] (CASSANDRA-7774) CqlRecordReader creates wrong cluster if the first replica of a split is down
Jacek Lewandowski created CASSANDRA-7774: Summary: CqlRecordReader creates wrong cluster if the first replica of a split is down Key: CASSANDRA-7774 URL: https://issues.apache.org/jira/browse/CASSANDRA-7774 Project: Cassandra Issue Type: Bug Components: Hadoop Reporter: Jacek Lewandowski Assignee: Jacek Lewandowski For a given split, {{CqlRecordReader}} gets a list of replicas of that split. Then, it tries to create a Cluster object with a ClusterBuilder for each replica separately in a loop, so that if the cluster creation fails for a certain replica, the next replica is tried. Unfortunately it does not work, because the cluster creation does not fail if the provided contact point is down. So, it always selects the first replica regardless of its state. The solution is quite simple - {{ClusterBuilder}} accepts a collection of contact points - at least one of them must be up. So instead of iterating over the replicas we can pass the whole set of them and the driver will select the working one. It will follow some changes in the load balancing policy - I'm going to switch to use the same balancing policy as we use in OSS Spark Connector. -- This message was sent by Atlassian JIRA (v6.2#6252)
[jira] [Updated] (CASSANDRA-7774) CqlRecordReader creates wrong cluster if the first replica of a split is down
[ https://issues.apache.org/jira/browse/CASSANDRA-7774?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] Jacek Lewandowski updated CASSANDRA-7774: - Remaining Estimate: (was: 24h) Original Estimate: (was: 24h) > CqlRecordReader creates wrong cluster if the first replica of a split is down > - > > Key: CASSANDRA-7774 > URL: https://issues.apache.org/jira/browse/CASSANDRA-7774 > Project: Cassandra > Issue Type: Bug > Components: Hadoop >Reporter: Jacek Lewandowski >Assignee: Jacek Lewandowski > > For a given split, {{CqlRecordReader}} gets a list of replicas of that split. > Then, it tries to create a Cluster object with a ClusterBuilder for each > replica separately in a loop, so that if the cluster creation fails for a > certain replica, the next replica is tried. Unfortunately it does not work, > because the cluster creation does not fail if the provided contact point is > down. So, it always selects the first replica regardless of its state. > The solution is quite simple - {{ClusterBuilder}} accepts a collection of > contact points - at least one of them must be up. So instead of iterating > over the replicas we can pass the whole set of them and the driver will > select the working one. It will follow some changes in the load balancing > policy - I'm going to switch to use the same balancing policy as we use in > OSS Spark Connector. -- This message was sent by Atlassian JIRA (v6.2#6252)
[jira] [Commented] (CASSANDRA-7659) cqlsh: DESCRIBE KEYSPACE should order types according to cross-type dependencies
[ https://issues.apache.org/jira/browse/CASSANDRA-7659?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=14098145#comment-14098145 ] Mikhail Stepura commented on CASSANDRA-7659: I would extend the scope of this ticket to "remove {{pylib.cqlshlib.cql3handling.UserTypesMeta}} in favor of {{cassandra.metadata.UserType}}", that would cover the original issue as well > cqlsh: DESCRIBE KEYSPACE should order types according to cross-type > dependencies > > > Key: CASSANDRA-7659 > URL: https://issues.apache.org/jira/browse/CASSANDRA-7659 > Project: Cassandra > Issue Type: Bug > Components: Tools >Reporter: Tyler Hobbs >Assignee: Tyler Hobbs >Priority: Minor > Labels: lhf > Fix For: 2.1.1 > > > Since UDTs may use other UDTs for fields, DESCRIBE KEYSPACE should list types > in an order that handles the dependencies. This was recently done in the > python driver here: https://github.com/datastax/python-driver/pull/165. We > can either update to the latest python driver, or copy that code for cqlsh. -- This message was sent by Atlassian JIRA (v6.2#6252)
[1/2] git commit: Validate IPv6 wildcard addresses properly
Repository: cassandra Updated Branches: refs/heads/trunk 9d05efafe -> 4dd1a15cc Validate IPv6 wildcard addresses properly patch by Robert Stupp; reviewed by Aleksey Yeschenko for CASSANDRA-7680 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/04a1fc6e Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/04a1fc6e Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/04a1fc6e Branch: refs/heads/trunk Commit: 04a1fc6e10ba6ffd774c3d5a67a650520a0ac896 Parents: ffb919e Author: Robert Stupp Authored: Fri Aug 15 03:59:29 2014 +0300 Committer: Aleksey Yeschenko Committed: Fri Aug 15 03:59:29 2014 +0300 -- CHANGES.txt | 1 + .../cassandra/config/DatabaseDescriptor.java| 37 +++- 2 files changed, 14 insertions(+), 24 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/04a1fc6e/CHANGES.txt -- diff --git a/CHANGES.txt b/CHANGES.txt index 99fb988..ea9e8aa 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -1,4 +1,5 @@ 2.1.1 + * Validate IPv6 wildcard addresses properly (CASSANDRA-7680) * (cqlsh) Error when tracing query (CASSANDRA-7613) * Avoid IOOBE when building SyntaxError message snippet (CASSANDRA-7569) * SSTableExport uses correct validator to create string representation of partition http://git-wip-us.apache.org/repos/asf/cassandra/blob/04a1fc6e/src/java/org/apache/cassandra/config/DatabaseDescriptor.java -- diff --git a/src/java/org/apache/cassandra/config/DatabaseDescriptor.java b/src/java/org/apache/cassandra/config/DatabaseDescriptor.java index f624ce5..e8c5372 100644 --- a/src/java/org/apache/cassandra/config/DatabaseDescriptor.java +++ b/src/java/org/apache/cassandra/config/DatabaseDescriptor.java @@ -298,8 +298,6 @@ public class DatabaseDescriptor } else if (conf.listen_address != null) { -if (conf.listen_address.equals("0.0.0.0")) -throw new ConfigurationException("listen_address cannot be 0.0.0.0!"); try { listenAddress = InetAddress.getByName(conf.listen_address); @@ -308,6 +306,9 @@ public class DatabaseDescriptor { throw new ConfigurationException("Unknown listen_address '" + conf.listen_address + "'"); } + +if (listenAddress.isAnyLocalAddress()) +throw new ConfigurationException("listen_address cannot be a wildcard address (" + conf.listen_address + ")!"); } else if (conf.listen_interface != null) { @@ -328,11 +329,6 @@ public class DatabaseDescriptor /* Gossip Address to broadcast */ if (conf.broadcast_address != null) { -if (conf.broadcast_address.equals("0.0.0.0")) -{ -throw new ConfigurationException("broadcast_address cannot be 0.0.0.0!"); -} - try { broadcastAddress = InetAddress.getByName(conf.broadcast_address); @@ -341,6 +337,9 @@ public class DatabaseDescriptor { throw new ConfigurationException("Unknown broadcast_address '" + conf.broadcast_address + "'"); } + +if (broadcastAddress.isAnyLocalAddress()) +throw new ConfigurationException("broadcast_address cannot be a wildcard address (" + conf.broadcast_address + ")!"); } /* Local IP, hostname or interface to bind RPC server to */ @@ -381,33 +380,23 @@ public class DatabaseDescriptor /* RPC address to broadcast */ if (conf.broadcast_rpc_address != null) { -if (conf.broadcast_rpc_address.equals("0.0.0.0")) -throw new ConfigurationException("broadcast_rpc_address cannot be 0.0.0.0"); - try { broadcastRpcAddress = InetAddress.getByName(conf.broadcast_rpc_address); } catch (UnknownHostException e) { -throw new ConfigurationException("Unkown broadcast_rpc_address '" + conf.broadcast_rpc_address + "'"); +throw new ConfigurationException("Unknown broadcast_rpc_address '" + conf.broadcast_rpc_address + "'"); } + +if (broadcastRpcAddress.isAnyLocalAddress()) +throw new ConfigurationException("broadcast_rpc_address cannot be a wildcard address (" + conf.broadcast_rpc_address + ")!"); } else { -InetAddress bindAll; -try -{ -bindAll = InetAddress.getByAddress(new byte[4]); -} -catch (
[2/2] git commit: Merge branch 'cassandra-2.1' into trunk
Merge branch 'cassandra-2.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/4dd1a15c Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/4dd1a15c Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/4dd1a15c Branch: refs/heads/trunk Commit: 4dd1a15ccc59ebe863c233d88b07dc269aee2cff Parents: 9d05efa 04a1fc6 Author: Aleksey Yeschenko Authored: Fri Aug 15 04:02:07 2014 +0300 Committer: Aleksey Yeschenko Committed: Fri Aug 15 04:02:07 2014 +0300 -- CHANGES.txt | 1 + .../cassandra/config/DatabaseDescriptor.java| 37 +++- 2 files changed, 14 insertions(+), 24 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/4dd1a15c/CHANGES.txt -- diff --cc CHANGES.txt index e2e37d6,ea9e8aa..2b38918 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,21 -1,5 +1,22 @@@ +3.0 + * Support pure user-defined functions (CASSANDRA-7395) + * Permit configurable timestamps with cassandra-stress (CASSANDRA-7416) + * Move sstable RandomAccessReader to nio2, which allows using the + FILE_SHARE_DELETE flag on Windows (CASSANDRA-4050) + * Remove CQL2 (CASSANDRA-5918) + * Add Thrift get_multi_slice call (CASSANDRA-6757) + * Optimize fetching multiple cells by name (CASSANDRA-6933) + * Allow compilation in java 8 (CASSANDRA-7028) + * Make incremental repair default (CASSANDRA-7250) + * Enable code coverage thru JaCoCo (CASSANDRA-7226) + * Switch external naming of 'column families' to 'tables' (CASSANDRA-4369) + * Shorten SSTable path (CASSANDRA-6962) + * Use unsafe mutations for most unit tests (CASSANDRA-6969) + * Fix race condition during calculation of pending ranges (CASSANDRA-7390) + + 2.1.1 + * Validate IPv6 wildcard addresses properly (CASSANDRA-7680) * (cqlsh) Error when tracing query (CASSANDRA-7613) * Avoid IOOBE when building SyntaxError message snippet (CASSANDRA-7569) * SSTableExport uses correct validator to create string representation of partition http://git-wip-us.apache.org/repos/asf/cassandra/blob/4dd1a15c/src/java/org/apache/cassandra/config/DatabaseDescriptor.java --
git commit: Validate IPv6 wildcard addresses properly
Repository: cassandra Updated Branches: refs/heads/cassandra-2.1 ffb919e78 -> 04a1fc6e1 Validate IPv6 wildcard addresses properly patch by Robert Stupp; reviewed by Aleksey Yeschenko for CASSANDRA-7680 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/04a1fc6e Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/04a1fc6e Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/04a1fc6e Branch: refs/heads/cassandra-2.1 Commit: 04a1fc6e10ba6ffd774c3d5a67a650520a0ac896 Parents: ffb919e Author: Robert Stupp Authored: Fri Aug 15 03:59:29 2014 +0300 Committer: Aleksey Yeschenko Committed: Fri Aug 15 03:59:29 2014 +0300 -- CHANGES.txt | 1 + .../cassandra/config/DatabaseDescriptor.java| 37 +++- 2 files changed, 14 insertions(+), 24 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/04a1fc6e/CHANGES.txt -- diff --git a/CHANGES.txt b/CHANGES.txt index 99fb988..ea9e8aa 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -1,4 +1,5 @@ 2.1.1 + * Validate IPv6 wildcard addresses properly (CASSANDRA-7680) * (cqlsh) Error when tracing query (CASSANDRA-7613) * Avoid IOOBE when building SyntaxError message snippet (CASSANDRA-7569) * SSTableExport uses correct validator to create string representation of partition http://git-wip-us.apache.org/repos/asf/cassandra/blob/04a1fc6e/src/java/org/apache/cassandra/config/DatabaseDescriptor.java -- diff --git a/src/java/org/apache/cassandra/config/DatabaseDescriptor.java b/src/java/org/apache/cassandra/config/DatabaseDescriptor.java index f624ce5..e8c5372 100644 --- a/src/java/org/apache/cassandra/config/DatabaseDescriptor.java +++ b/src/java/org/apache/cassandra/config/DatabaseDescriptor.java @@ -298,8 +298,6 @@ public class DatabaseDescriptor } else if (conf.listen_address != null) { -if (conf.listen_address.equals("0.0.0.0")) -throw new ConfigurationException("listen_address cannot be 0.0.0.0!"); try { listenAddress = InetAddress.getByName(conf.listen_address); @@ -308,6 +306,9 @@ public class DatabaseDescriptor { throw new ConfigurationException("Unknown listen_address '" + conf.listen_address + "'"); } + +if (listenAddress.isAnyLocalAddress()) +throw new ConfigurationException("listen_address cannot be a wildcard address (" + conf.listen_address + ")!"); } else if (conf.listen_interface != null) { @@ -328,11 +329,6 @@ public class DatabaseDescriptor /* Gossip Address to broadcast */ if (conf.broadcast_address != null) { -if (conf.broadcast_address.equals("0.0.0.0")) -{ -throw new ConfigurationException("broadcast_address cannot be 0.0.0.0!"); -} - try { broadcastAddress = InetAddress.getByName(conf.broadcast_address); @@ -341,6 +337,9 @@ public class DatabaseDescriptor { throw new ConfigurationException("Unknown broadcast_address '" + conf.broadcast_address + "'"); } + +if (broadcastAddress.isAnyLocalAddress()) +throw new ConfigurationException("broadcast_address cannot be a wildcard address (" + conf.broadcast_address + ")!"); } /* Local IP, hostname or interface to bind RPC server to */ @@ -381,33 +380,23 @@ public class DatabaseDescriptor /* RPC address to broadcast */ if (conf.broadcast_rpc_address != null) { -if (conf.broadcast_rpc_address.equals("0.0.0.0")) -throw new ConfigurationException("broadcast_rpc_address cannot be 0.0.0.0"); - try { broadcastRpcAddress = InetAddress.getByName(conf.broadcast_rpc_address); } catch (UnknownHostException e) { -throw new ConfigurationException("Unkown broadcast_rpc_address '" + conf.broadcast_rpc_address + "'"); +throw new ConfigurationException("Unknown broadcast_rpc_address '" + conf.broadcast_rpc_address + "'"); } + +if (broadcastRpcAddress.isAnyLocalAddress()) +throw new ConfigurationException("broadcast_rpc_address cannot be a wildcard address (" + conf.broadcast_rpc_address + ")!"); } else { -InetAddress bindAll; -try -{ -bindAll = InetAddress.getByAddress(new byte[4]); -} -
[jira] [Updated] (CASSANDRA-7477) JSON to SSTable import failing
[ https://issues.apache.org/jira/browse/CASSANDRA-7477?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] Jonathan Ellis updated CASSANDRA-7477: -- Reviewer: Tyler Hobbs (was: Jonathan Ellis) > JSON to SSTable import failing > -- > > Key: CASSANDRA-7477 > URL: https://issues.apache.org/jira/browse/CASSANDRA-7477 > Project: Cassandra > Issue Type: Bug > Environment: Linux Mint 17 64-bit | 16GiB | C* 2.1 >Reporter: Kishan Karunaratne >Assignee: Mikhail Stepura > Fix For: 2.1.0, 2.1.1 > > Attachments: CASSANDRA-2.1.0-7477.patch, log2.log, schema.json > > > Issue affects C* version >= 2.1. Commit found by using git bisect. The > previous commit to this one also fails, but due to other reasons (CCM server > won't start). This commit is the one that give the same error as 2.1 HEAD: > {noformat} > 02d1e7497a9930120fac367ce82a3b22940acafb is the first bad commit > commit 02d1e7497a9930120fac367ce82a3b22940acafb > Author: Brandon Williams > Date: Mon Apr 21 14:42:29 2014 -0500 > Default flush dir to data dir. > Patch by brandonwilliams, reviewed by yukim for CASSANDRA-7064 > :04 04 c50a123f305b73583ccbfa9c455efc4e4cee228f > 507a90290dccb8a929afadf1f833d926049c46ad Mconf > {noformat} > {noformat} > $ PRINT_DEBUG=true nosetests -x -s -v json_tools_test.py > json_tools_test (json_tools_test.TestJson) ... cluster ccm directory: > /tmp/dtest-8WVBq9 > Starting cluster... > Version: 2.1.0 > Getting CQLSH... > Inserting data... > Flushing and stopping cluster... > Exporting to JSON file... > -- test-users-ka-1-Data.db - > Deleting cluster and creating new... > Inserting data... > Importing JSON file... > Counting keys to import, please wait... (NOTE: to skip this use -n ) > Importing 2 keys... > java.lang.ClassCastException: > org.apache.cassandra.db.composites.Composites$EmptyComposite cannot be cast > to org.apache.cassandra.db.composites.CellName > at > org.apache.cassandra.db.composites.AbstractCellNameType.cellFromByteBuffer(AbstractCellNameType.java:168) > at > org.apache.cassandra.tools.SSTableImport$JsonColumn.(SSTableImport.java:165) > at > org.apache.cassandra.tools.SSTableImport.addColumnsToCF(SSTableImport.java:242) > at > org.apache.cassandra.tools.SSTableImport.addToStandardCF(SSTableImport.java:225) > at > org.apache.cassandra.tools.SSTableImport.importSorted(SSTableImport.java:464) > at > org.apache.cassandra.tools.SSTableImport.importJson(SSTableImport.java:351) > at org.apache.cassandra.tools.SSTableImport.main(SSTableImport.java:575) > ERROR: org.apache.cassandra.db.composites.Composites$EmptyComposite cannot be > cast to org.apache.cassandra.db.composites.CellName > Verifying import... > data: [[u'gandalf', 1955, u'male', u'p@$$', u'WA']] > FAIL > removing ccm cluster test at: /tmp/dtest-8WVBq9 > ERROR > == > ERROR: json_tools_test (json_tools_test.TestJson) > -- > Traceback (most recent call last): > File "/home/kishan/git/cstar/cassandra-dtest/dtest.py", line 214, in > tearDown > raise AssertionError('Unexpected error in %s node log: %s' % (node.name, > errors)) > AssertionError: Unexpected error in node1 node log: ['ERROR > [SSTableBatchOpen:1] 2014-06-30 13:56:01,032 CassandraDaemon.java:166 - > Exception in thread Thread[SSTableBatchOpen:1,5,main]\n'] > >> begin captured logging << > dtest: DEBUG: cluster ccm directory: /tmp/dtest-8WVBq9 > dtest: DEBUG: Starting cluster... > dtest: DEBUG: Version: 2.1.0 > dtest: DEBUG: Getting CQLSH... > dtest: DEBUG: Inserting data... > dtest: DEBUG: Flushing and stopping cluster... > dtest: DEBUG: Exporting to JSON file... > dtest: DEBUG: Deleting cluster and creating new... > dtest: DEBUG: Inserting data... > dtest: DEBUG: Importing JSON file... > dtest: DEBUG: Verifying import... > dtest: DEBUG: data: [[u'gandalf', 1955, u'male', u'p@$$', u'WA']] > dtest: DEBUG: removing ccm cluster test at: /tmp/dtest-8WVBq9 > - >> end captured logging << - > == > FAIL: json_tools_test (json_tools_test.TestJson) > -- > Traceback (most recent call last): > File "/home/kishan/git/cstar/cassandra-dtest/json_tools_test.py", line 91, > in json_tools_test > [u'gandalf', 1955, u'male', u'p@$$', u'WA'] ] ) > AssertionError: Element counts were not equal: > First has 0, Second has 1: [u'frodo', 1985, u'male', u'pass@', u'CA'] > First has 0, Second has 1: [u'sam', 1980, u'male', u'@pass', u'NY'] > >> begin captured loggi
[jira] [Updated] (CASSANDRA-7477) JSON to SSTable import failing
[ https://issues.apache.org/jira/browse/CASSANDRA-7477?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] Mikhail Stepura updated CASSANDRA-7477: --- Attachment: CASSANDRA-2.1.0-7477.patch Attaching a patch to hanlde CQL row markers in SSTableImport. > JSON to SSTable import failing > -- > > Key: CASSANDRA-7477 > URL: https://issues.apache.org/jira/browse/CASSANDRA-7477 > Project: Cassandra > Issue Type: Bug > Environment: Linux Mint 17 64-bit | 16GiB | C* 2.1 >Reporter: Kishan Karunaratne >Assignee: Mikhail Stepura > Fix For: 2.1.0, 2.1.1 > > Attachments: CASSANDRA-2.1.0-7477.patch, log2.log, schema.json > > > Issue affects C* version >= 2.1. Commit found by using git bisect. The > previous commit to this one also fails, but due to other reasons (CCM server > won't start). This commit is the one that give the same error as 2.1 HEAD: > {noformat} > 02d1e7497a9930120fac367ce82a3b22940acafb is the first bad commit > commit 02d1e7497a9930120fac367ce82a3b22940acafb > Author: Brandon Williams > Date: Mon Apr 21 14:42:29 2014 -0500 > Default flush dir to data dir. > Patch by brandonwilliams, reviewed by yukim for CASSANDRA-7064 > :04 04 c50a123f305b73583ccbfa9c455efc4e4cee228f > 507a90290dccb8a929afadf1f833d926049c46ad Mconf > {noformat} > {noformat} > $ PRINT_DEBUG=true nosetests -x -s -v json_tools_test.py > json_tools_test (json_tools_test.TestJson) ... cluster ccm directory: > /tmp/dtest-8WVBq9 > Starting cluster... > Version: 2.1.0 > Getting CQLSH... > Inserting data... > Flushing and stopping cluster... > Exporting to JSON file... > -- test-users-ka-1-Data.db - > Deleting cluster and creating new... > Inserting data... > Importing JSON file... > Counting keys to import, please wait... (NOTE: to skip this use -n ) > Importing 2 keys... > java.lang.ClassCastException: > org.apache.cassandra.db.composites.Composites$EmptyComposite cannot be cast > to org.apache.cassandra.db.composites.CellName > at > org.apache.cassandra.db.composites.AbstractCellNameType.cellFromByteBuffer(AbstractCellNameType.java:168) > at > org.apache.cassandra.tools.SSTableImport$JsonColumn.(SSTableImport.java:165) > at > org.apache.cassandra.tools.SSTableImport.addColumnsToCF(SSTableImport.java:242) > at > org.apache.cassandra.tools.SSTableImport.addToStandardCF(SSTableImport.java:225) > at > org.apache.cassandra.tools.SSTableImport.importSorted(SSTableImport.java:464) > at > org.apache.cassandra.tools.SSTableImport.importJson(SSTableImport.java:351) > at org.apache.cassandra.tools.SSTableImport.main(SSTableImport.java:575) > ERROR: org.apache.cassandra.db.composites.Composites$EmptyComposite cannot be > cast to org.apache.cassandra.db.composites.CellName > Verifying import... > data: [[u'gandalf', 1955, u'male', u'p@$$', u'WA']] > FAIL > removing ccm cluster test at: /tmp/dtest-8WVBq9 > ERROR > == > ERROR: json_tools_test (json_tools_test.TestJson) > -- > Traceback (most recent call last): > File "/home/kishan/git/cstar/cassandra-dtest/dtest.py", line 214, in > tearDown > raise AssertionError('Unexpected error in %s node log: %s' % (node.name, > errors)) > AssertionError: Unexpected error in node1 node log: ['ERROR > [SSTableBatchOpen:1] 2014-06-30 13:56:01,032 CassandraDaemon.java:166 - > Exception in thread Thread[SSTableBatchOpen:1,5,main]\n'] > >> begin captured logging << > dtest: DEBUG: cluster ccm directory: /tmp/dtest-8WVBq9 > dtest: DEBUG: Starting cluster... > dtest: DEBUG: Version: 2.1.0 > dtest: DEBUG: Getting CQLSH... > dtest: DEBUG: Inserting data... > dtest: DEBUG: Flushing and stopping cluster... > dtest: DEBUG: Exporting to JSON file... > dtest: DEBUG: Deleting cluster and creating new... > dtest: DEBUG: Inserting data... > dtest: DEBUG: Importing JSON file... > dtest: DEBUG: Verifying import... > dtest: DEBUG: data: [[u'gandalf', 1955, u'male', u'p@$$', u'WA']] > dtest: DEBUG: removing ccm cluster test at: /tmp/dtest-8WVBq9 > - >> end captured logging << - > == > FAIL: json_tools_test (json_tools_test.TestJson) > -- > Traceback (most recent call last): > File "/home/kishan/git/cstar/cassandra-dtest/json_tools_test.py", line 91, > in json_tools_test > [u'gandalf', 1955, u'male', u'p@$$', u'WA'] ] ) > AssertionError: Element counts were not equal: > First has 0, Second has 1: [u'frodo', 1985, u'male', u'pass@', u'CA'] > First has 0, Second has 1: [u'sam', 1980, u'male', u'@
[jira] [Updated] (CASSANDRA-7477) JSON to SSTable import failing
[ https://issues.apache.org/jira/browse/CASSANDRA-7477?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] Mikhail Stepura updated CASSANDRA-7477: --- Reproduced In: 2.1 rc5 Fix Version/s: 2.1.0 > JSON to SSTable import failing > -- > > Key: CASSANDRA-7477 > URL: https://issues.apache.org/jira/browse/CASSANDRA-7477 > Project: Cassandra > Issue Type: Bug > Environment: Linux Mint 17 64-bit | 16GiB | C* 2.1 >Reporter: Kishan Karunaratne >Assignee: Mikhail Stepura > Fix For: 2.1.0, 2.1.1 > > Attachments: log2.log, schema.json > > > Issue affects C* version >= 2.1. Commit found by using git bisect. The > previous commit to this one also fails, but due to other reasons (CCM server > won't start). This commit is the one that give the same error as 2.1 HEAD: > {noformat} > 02d1e7497a9930120fac367ce82a3b22940acafb is the first bad commit > commit 02d1e7497a9930120fac367ce82a3b22940acafb > Author: Brandon Williams > Date: Mon Apr 21 14:42:29 2014 -0500 > Default flush dir to data dir. > Patch by brandonwilliams, reviewed by yukim for CASSANDRA-7064 > :04 04 c50a123f305b73583ccbfa9c455efc4e4cee228f > 507a90290dccb8a929afadf1f833d926049c46ad Mconf > {noformat} > {noformat} > $ PRINT_DEBUG=true nosetests -x -s -v json_tools_test.py > json_tools_test (json_tools_test.TestJson) ... cluster ccm directory: > /tmp/dtest-8WVBq9 > Starting cluster... > Version: 2.1.0 > Getting CQLSH... > Inserting data... > Flushing and stopping cluster... > Exporting to JSON file... > -- test-users-ka-1-Data.db - > Deleting cluster and creating new... > Inserting data... > Importing JSON file... > Counting keys to import, please wait... (NOTE: to skip this use -n ) > Importing 2 keys... > java.lang.ClassCastException: > org.apache.cassandra.db.composites.Composites$EmptyComposite cannot be cast > to org.apache.cassandra.db.composites.CellName > at > org.apache.cassandra.db.composites.AbstractCellNameType.cellFromByteBuffer(AbstractCellNameType.java:168) > at > org.apache.cassandra.tools.SSTableImport$JsonColumn.(SSTableImport.java:165) > at > org.apache.cassandra.tools.SSTableImport.addColumnsToCF(SSTableImport.java:242) > at > org.apache.cassandra.tools.SSTableImport.addToStandardCF(SSTableImport.java:225) > at > org.apache.cassandra.tools.SSTableImport.importSorted(SSTableImport.java:464) > at > org.apache.cassandra.tools.SSTableImport.importJson(SSTableImport.java:351) > at org.apache.cassandra.tools.SSTableImport.main(SSTableImport.java:575) > ERROR: org.apache.cassandra.db.composites.Composites$EmptyComposite cannot be > cast to org.apache.cassandra.db.composites.CellName > Verifying import... > data: [[u'gandalf', 1955, u'male', u'p@$$', u'WA']] > FAIL > removing ccm cluster test at: /tmp/dtest-8WVBq9 > ERROR > == > ERROR: json_tools_test (json_tools_test.TestJson) > -- > Traceback (most recent call last): > File "/home/kishan/git/cstar/cassandra-dtest/dtest.py", line 214, in > tearDown > raise AssertionError('Unexpected error in %s node log: %s' % (node.name, > errors)) > AssertionError: Unexpected error in node1 node log: ['ERROR > [SSTableBatchOpen:1] 2014-06-30 13:56:01,032 CassandraDaemon.java:166 - > Exception in thread Thread[SSTableBatchOpen:1,5,main]\n'] > >> begin captured logging << > dtest: DEBUG: cluster ccm directory: /tmp/dtest-8WVBq9 > dtest: DEBUG: Starting cluster... > dtest: DEBUG: Version: 2.1.0 > dtest: DEBUG: Getting CQLSH... > dtest: DEBUG: Inserting data... > dtest: DEBUG: Flushing and stopping cluster... > dtest: DEBUG: Exporting to JSON file... > dtest: DEBUG: Deleting cluster and creating new... > dtest: DEBUG: Inserting data... > dtest: DEBUG: Importing JSON file... > dtest: DEBUG: Verifying import... > dtest: DEBUG: data: [[u'gandalf', 1955, u'male', u'p@$$', u'WA']] > dtest: DEBUG: removing ccm cluster test at: /tmp/dtest-8WVBq9 > - >> end captured logging << - > == > FAIL: json_tools_test (json_tools_test.TestJson) > -- > Traceback (most recent call last): > File "/home/kishan/git/cstar/cassandra-dtest/json_tools_test.py", line 91, > in json_tools_test > [u'gandalf', 1955, u'male', u'p@$$', u'WA'] ] ) > AssertionError: Element counts were not equal: > First has 0, Second has 1: [u'frodo', 1985, u'male', u'pass@', u'CA'] > First has 0, Second has 1: [u'sam', 1980, u'male', u'@pass', u'NY'] > >> begin captured logging << -
[jira] [Commented] (CASSANDRA-7477) JSON to SSTable import failing
[ https://issues.apache.org/jira/browse/CASSANDRA-7477?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=14097876#comment-14097876 ] Mikhail Stepura commented on CASSANDRA-7477: SSTableImport fails to handle CQL row marker, i.e the case when {{AbstractCellNameType.cellFromByteBuffer}} gets {{EmptyComposite }} as an input {code} java.lang.ClassCastException: org.apache.cassandra.db.composites.Composites$EmptyComposite cannot be cast to org.apache.cassandra.db.composites.CellName at org.apache.cassandra.db.composites.AbstractCellNameType.cellFromByteBuffer(AbstractCellNameType.java:187) at org.apache.cassandra.tools.SSTableImport$JsonColumn.(SSTableImport.java:143) at org.apache.cassandra.tools.SSTableImport.addColumnsToCF(SSTableImport.java:208) at org.apache.cassandra.tools.SSTableImport.importSorted(SSTableImport.java:387) at org.apache.cassandra.tools.SSTableImport.importJson(SSTableImport.java:280) at org.apache.cassandra.tools.SSTableImport.main(SSTableImport.java:507) ERROR: org.apache.cassandra.db.composites.Composites$EmptyComposite cannot be cast to org.apache.cassandra.db.composites.CellName {code{ > JSON to SSTable import failing > -- > > Key: CASSANDRA-7477 > URL: https://issues.apache.org/jira/browse/CASSANDRA-7477 > Project: Cassandra > Issue Type: Bug > Environment: Linux Mint 17 64-bit | 16GiB | C* 2.1 >Reporter: Kishan Karunaratne >Assignee: Mikhail Stepura > Fix For: 2.1.1 > > Attachments: log2.log, schema.json > > > Issue affects C* version >= 2.1. Commit found by using git bisect. The > previous commit to this one also fails, but due to other reasons (CCM server > won't start). This commit is the one that give the same error as 2.1 HEAD: > {noformat} > 02d1e7497a9930120fac367ce82a3b22940acafb is the first bad commit > commit 02d1e7497a9930120fac367ce82a3b22940acafb > Author: Brandon Williams > Date: Mon Apr 21 14:42:29 2014 -0500 > Default flush dir to data dir. > Patch by brandonwilliams, reviewed by yukim for CASSANDRA-7064 > :04 04 c50a123f305b73583ccbfa9c455efc4e4cee228f > 507a90290dccb8a929afadf1f833d926049c46ad Mconf > {noformat} > {noformat} > $ PRINT_DEBUG=true nosetests -x -s -v json_tools_test.py > json_tools_test (json_tools_test.TestJson) ... cluster ccm directory: > /tmp/dtest-8WVBq9 > Starting cluster... > Version: 2.1.0 > Getting CQLSH... > Inserting data... > Flushing and stopping cluster... > Exporting to JSON file... > -- test-users-ka-1-Data.db - > Deleting cluster and creating new... > Inserting data... > Importing JSON file... > Counting keys to import, please wait... (NOTE: to skip this use -n ) > Importing 2 keys... > java.lang.ClassCastException: > org.apache.cassandra.db.composites.Composites$EmptyComposite cannot be cast > to org.apache.cassandra.db.composites.CellName > at > org.apache.cassandra.db.composites.AbstractCellNameType.cellFromByteBuffer(AbstractCellNameType.java:168) > at > org.apache.cassandra.tools.SSTableImport$JsonColumn.(SSTableImport.java:165) > at > org.apache.cassandra.tools.SSTableImport.addColumnsToCF(SSTableImport.java:242) > at > org.apache.cassandra.tools.SSTableImport.addToStandardCF(SSTableImport.java:225) > at > org.apache.cassandra.tools.SSTableImport.importSorted(SSTableImport.java:464) > at > org.apache.cassandra.tools.SSTableImport.importJson(SSTableImport.java:351) > at org.apache.cassandra.tools.SSTableImport.main(SSTableImport.java:575) > ERROR: org.apache.cassandra.db.composites.Composites$EmptyComposite cannot be > cast to org.apache.cassandra.db.composites.CellName > Verifying import... > data: [[u'gandalf', 1955, u'male', u'p@$$', u'WA']] > FAIL > removing ccm cluster test at: /tmp/dtest-8WVBq9 > ERROR > == > ERROR: json_tools_test (json_tools_test.TestJson) > -- > Traceback (most recent call last): > File "/home/kishan/git/cstar/cassandra-dtest/dtest.py", line 214, in > tearDown > raise AssertionError('Unexpected error in %s node log: %s' % (node.name, > errors)) > AssertionError: Unexpected error in node1 node log: ['ERROR > [SSTableBatchOpen:1] 2014-06-30 13:56:01,032 CassandraDaemon.java:166 - > Exception in thread Thread[SSTableBatchOpen:1,5,main]\n'] > >> begin captured logging << > dtest: DEBUG: cluster ccm directory: /tmp/dtest-8WVBq9 > dtest: DEBUG: Starting cluster... > dtest: DEBUG: Version: 2.1.0 > dtest: DEBUG: Getting CQLSH... > dtest: DEBUG: Inserting data... > dtest: DEBUG: Flushing and stopping cluster... > dtest: DEBUG: Exporting to JSON file... > dtest: DEBUG:
[jira] [Comment Edited] (CASSANDRA-7477) JSON to SSTable import failing
[ https://issues.apache.org/jira/browse/CASSANDRA-7477?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=14097876#comment-14097876 ] Mikhail Stepura edited comment on CASSANDRA-7477 at 8/14/14 11:03 PM: -- SSTableImport fails to handle CQL row marker, i.e the case when {{AbstractCellNameType.cellFromByteBuffer}} gets {{EmptyComposite }} as an input {code} java.lang.ClassCastException: org.apache.cassandra.db.composites.Composites$EmptyComposite cannot be cast to org.apache.cassandra.db.composites.CellName at org.apache.cassandra.db.composites.AbstractCellNameType.cellFromByteBuffer(AbstractCellNameType.java:187) at org.apache.cassandra.tools.SSTableImport$JsonColumn.(SSTableImport.java:143) at org.apache.cassandra.tools.SSTableImport.addColumnsToCF(SSTableImport.java:208) at org.apache.cassandra.tools.SSTableImport.importSorted(SSTableImport.java:387) at org.apache.cassandra.tools.SSTableImport.importJson(SSTableImport.java:280) at org.apache.cassandra.tools.SSTableImport.main(SSTableImport.java:507) ERROR: org.apache.cassandra.db.composites.Composites$EmptyComposite cannot be cast to org.apache.cassandra.db.composites.CellName {code} was (Author: mishail): SSTableImport fails to handle CQL row marker, i.e the case when {{AbstractCellNameType.cellFromByteBuffer}} gets {{EmptyComposite }} as an input {code} java.lang.ClassCastException: org.apache.cassandra.db.composites.Composites$EmptyComposite cannot be cast to org.apache.cassandra.db.composites.CellName at org.apache.cassandra.db.composites.AbstractCellNameType.cellFromByteBuffer(AbstractCellNameType.java:187) at org.apache.cassandra.tools.SSTableImport$JsonColumn.(SSTableImport.java:143) at org.apache.cassandra.tools.SSTableImport.addColumnsToCF(SSTableImport.java:208) at org.apache.cassandra.tools.SSTableImport.importSorted(SSTableImport.java:387) at org.apache.cassandra.tools.SSTableImport.importJson(SSTableImport.java:280) at org.apache.cassandra.tools.SSTableImport.main(SSTableImport.java:507) ERROR: org.apache.cassandra.db.composites.Composites$EmptyComposite cannot be cast to org.apache.cassandra.db.composites.CellName {code{ > JSON to SSTable import failing > -- > > Key: CASSANDRA-7477 > URL: https://issues.apache.org/jira/browse/CASSANDRA-7477 > Project: Cassandra > Issue Type: Bug > Environment: Linux Mint 17 64-bit | 16GiB | C* 2.1 >Reporter: Kishan Karunaratne >Assignee: Mikhail Stepura > Fix For: 2.1.1 > > Attachments: log2.log, schema.json > > > Issue affects C* version >= 2.1. Commit found by using git bisect. The > previous commit to this one also fails, but due to other reasons (CCM server > won't start). This commit is the one that give the same error as 2.1 HEAD: > {noformat} > 02d1e7497a9930120fac367ce82a3b22940acafb is the first bad commit > commit 02d1e7497a9930120fac367ce82a3b22940acafb > Author: Brandon Williams > Date: Mon Apr 21 14:42:29 2014 -0500 > Default flush dir to data dir. > Patch by brandonwilliams, reviewed by yukim for CASSANDRA-7064 > :04 04 c50a123f305b73583ccbfa9c455efc4e4cee228f > 507a90290dccb8a929afadf1f833d926049c46ad Mconf > {noformat} > {noformat} > $ PRINT_DEBUG=true nosetests -x -s -v json_tools_test.py > json_tools_test (json_tools_test.TestJson) ... cluster ccm directory: > /tmp/dtest-8WVBq9 > Starting cluster... > Version: 2.1.0 > Getting CQLSH... > Inserting data... > Flushing and stopping cluster... > Exporting to JSON file... > -- test-users-ka-1-Data.db - > Deleting cluster and creating new... > Inserting data... > Importing JSON file... > Counting keys to import, please wait... (NOTE: to skip this use -n ) > Importing 2 keys... > java.lang.ClassCastException: > org.apache.cassandra.db.composites.Composites$EmptyComposite cannot be cast > to org.apache.cassandra.db.composites.CellName > at > org.apache.cassandra.db.composites.AbstractCellNameType.cellFromByteBuffer(AbstractCellNameType.java:168) > at > org.apache.cassandra.tools.SSTableImport$JsonColumn.(SSTableImport.java:165) > at > org.apache.cassandra.tools.SSTableImport.addColumnsToCF(SSTableImport.java:242) > at > org.apache.cassandra.tools.SSTableImport.addToStandardCF(SSTableImport.java:225) > at > org.apache.cassandra.tools.SSTableImport.importSorted(SSTableImport.java:464) > at > org.apache.cassandra.tools.SSTableImport.importJson(SSTableImport.java:351) > at org.apache.cassandra.tools.SSTableImport.main(SSTableImport.java:575) > ERROR: org.apache.cassandra.db.composites.Composites$EmptyComposite cannot be > cast to org.apache.cassandra.db.composites.CellName > Verifying import... > data: [[u'ganda
[jira] [Updated] (CASSANDRA-7477) JSON to SSTable import failing
[ https://issues.apache.org/jira/browse/CASSANDRA-7477?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] Mikhail Stepura updated CASSANDRA-7477: --- Attachment: schema.json > JSON to SSTable import failing > -- > > Key: CASSANDRA-7477 > URL: https://issues.apache.org/jira/browse/CASSANDRA-7477 > Project: Cassandra > Issue Type: Bug > Environment: Linux Mint 17 64-bit | 16GiB | C* 2.1 >Reporter: Kishan Karunaratne >Assignee: Mikhail Stepura > Fix For: 2.1.1 > > Attachments: log2.log, schema.json > > > Issue affects C* version >= 2.1. Commit found by using git bisect. The > previous commit to this one also fails, but due to other reasons (CCM server > won't start). This commit is the one that give the same error as 2.1 HEAD: > {noformat} > 02d1e7497a9930120fac367ce82a3b22940acafb is the first bad commit > commit 02d1e7497a9930120fac367ce82a3b22940acafb > Author: Brandon Williams > Date: Mon Apr 21 14:42:29 2014 -0500 > Default flush dir to data dir. > Patch by brandonwilliams, reviewed by yukim for CASSANDRA-7064 > :04 04 c50a123f305b73583ccbfa9c455efc4e4cee228f > 507a90290dccb8a929afadf1f833d926049c46ad Mconf > {noformat} > {noformat} > $ PRINT_DEBUG=true nosetests -x -s -v json_tools_test.py > json_tools_test (json_tools_test.TestJson) ... cluster ccm directory: > /tmp/dtest-8WVBq9 > Starting cluster... > Version: 2.1.0 > Getting CQLSH... > Inserting data... > Flushing and stopping cluster... > Exporting to JSON file... > -- test-users-ka-1-Data.db - > Deleting cluster and creating new... > Inserting data... > Importing JSON file... > Counting keys to import, please wait... (NOTE: to skip this use -n ) > Importing 2 keys... > java.lang.ClassCastException: > org.apache.cassandra.db.composites.Composites$EmptyComposite cannot be cast > to org.apache.cassandra.db.composites.CellName > at > org.apache.cassandra.db.composites.AbstractCellNameType.cellFromByteBuffer(AbstractCellNameType.java:168) > at > org.apache.cassandra.tools.SSTableImport$JsonColumn.(SSTableImport.java:165) > at > org.apache.cassandra.tools.SSTableImport.addColumnsToCF(SSTableImport.java:242) > at > org.apache.cassandra.tools.SSTableImport.addToStandardCF(SSTableImport.java:225) > at > org.apache.cassandra.tools.SSTableImport.importSorted(SSTableImport.java:464) > at > org.apache.cassandra.tools.SSTableImport.importJson(SSTableImport.java:351) > at org.apache.cassandra.tools.SSTableImport.main(SSTableImport.java:575) > ERROR: org.apache.cassandra.db.composites.Composites$EmptyComposite cannot be > cast to org.apache.cassandra.db.composites.CellName > Verifying import... > data: [[u'gandalf', 1955, u'male', u'p@$$', u'WA']] > FAIL > removing ccm cluster test at: /tmp/dtest-8WVBq9 > ERROR > == > ERROR: json_tools_test (json_tools_test.TestJson) > -- > Traceback (most recent call last): > File "/home/kishan/git/cstar/cassandra-dtest/dtest.py", line 214, in > tearDown > raise AssertionError('Unexpected error in %s node log: %s' % (node.name, > errors)) > AssertionError: Unexpected error in node1 node log: ['ERROR > [SSTableBatchOpen:1] 2014-06-30 13:56:01,032 CassandraDaemon.java:166 - > Exception in thread Thread[SSTableBatchOpen:1,5,main]\n'] > >> begin captured logging << > dtest: DEBUG: cluster ccm directory: /tmp/dtest-8WVBq9 > dtest: DEBUG: Starting cluster... > dtest: DEBUG: Version: 2.1.0 > dtest: DEBUG: Getting CQLSH... > dtest: DEBUG: Inserting data... > dtest: DEBUG: Flushing and stopping cluster... > dtest: DEBUG: Exporting to JSON file... > dtest: DEBUG: Deleting cluster and creating new... > dtest: DEBUG: Inserting data... > dtest: DEBUG: Importing JSON file... > dtest: DEBUG: Verifying import... > dtest: DEBUG: data: [[u'gandalf', 1955, u'male', u'p@$$', u'WA']] > dtest: DEBUG: removing ccm cluster test at: /tmp/dtest-8WVBq9 > - >> end captured logging << - > == > FAIL: json_tools_test (json_tools_test.TestJson) > -- > Traceback (most recent call last): > File "/home/kishan/git/cstar/cassandra-dtest/json_tools_test.py", line 91, > in json_tools_test > [u'gandalf', 1955, u'male', u'p@$$', u'WA'] ] ) > AssertionError: Element counts were not equal: > First has 0, Second has 1: [u'frodo', 1985, u'male', u'pass@', u'CA'] > First has 0, Second has 1: [u'sam', 1980, u'male', u'@pass', u'NY'] > >> begin captured logging << > dtest: DEBUG: cluster ccm
[jira] [Commented] (CASSANDRA-7704) FileNotFoundException during STREAM-OUT triggers 100% CPU usage
[ https://issues.apache.org/jira/browse/CASSANDRA-7704?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=14097856#comment-14097856 ] Yuki Morishita commented on CASSANDRA-7704: --- Test is to check stream session state change after timeout task, and the test depends on current behavior of timeout task. I'm fine with changing test to match the new behavior. > FileNotFoundException during STREAM-OUT triggers 100% CPU usage > --- > > Key: CASSANDRA-7704 > URL: https://issues.apache.org/jira/browse/CASSANDRA-7704 > Project: Cassandra > Issue Type: Bug >Reporter: Rick Branson >Assignee: Benedict > Fix For: 2.0.10, 2.1.0 > > Attachments: 7704.20.v2.txt, 7704.txt, backtrace.txt, other-errors.txt > > > See attached backtrace which was what triggered this. This stream failed and > then ~12 seconds later it emitted that exception. At that point, all CPUs > went to 100%. A thread dump shows all the ReadStage threads stuck inside > IntervalTree.searchInternal inside of CFS.markReferenced(). -- This message was sent by Atlassian JIRA (v6.2#6252)
[jira] [Updated] (CASSANDRA-7585) cassandra sstableloader connection refused with inter_node_encryption
[ https://issues.apache.org/jira/browse/CASSANDRA-7585?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] Yuki Morishita updated CASSANDRA-7585: -- Attachment: sstableloader-help.txt 7585-2.0-v2.txt Attaching updated patch with new usage doc. Added footer note describing config file. {{sstableloader -h}} output is also attached. > cassandra sstableloader connection refused with inter_node_encryption > - > > Key: CASSANDRA-7585 > URL: https://issues.apache.org/jira/browse/CASSANDRA-7585 > Project: Cassandra > Issue Type: Bug > Components: Core, Tools >Reporter: Samphel Norden >Assignee: Yuki Morishita > Fix For: 2.0.10, 2.1.1 > > Attachments: 7585-2.0-v2.txt, 7585-2.0.txt, sstableloader-help.txt > > > cassandra sstableloader connection refused with inter_node_encryption > When using sstableloader to import tables (cassandra 2.0.5) with inter-node > encryption and client encryption enabled, I get a connection refused error > I am using > sstableloader -d $myhost -p 9160 -u cassandra -pw cassandra -ciphers > TLS_RSA_WITH_AES_128_CBC_SHA,TLS_DHE_RSA_WITH_AES_128_CBC_SHA,TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA > -st JKS -tf org.apache.cassandra.thrift.SSLTransportFactory -ts > /path/to/truststore -tspw $fullpath/$table > Errors out with > Streaming session ID: 1bc395c0-fbb2-11e3-9812-73da15121373 > WARN 17:13:34,147 Failed attempt 1 to connect to > Similar problem reported in cassandra 2.0.8 by another user > http://stackoverflow.com/questions/24390604/cassandra-sstableloader-connection-refused-with-inter-node-encryption > == > Relevant cassandra.yaml snippet (with obfuscation) > server_encryption_options: > > internode_encryption: all > > keystore:/path/to/keystore > > keystore_password: > > truststore:/path/to/truststore > > truststore_password: > > # More advanced defaults below: > > protocol: TLS > > algorithm: SunX509 > > store_type: JKS > > cipher_suites: > [TLS_RSA_WITH_AES_128_CBC_SHA,TLS_DHE_RSA_WITH_AES_128_CBC_SHA,TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA] > > require_client_auth: true > > > > # enable or disable client/server encryption. > > client_encryption_options: > > enabled: true > > keystore: /path/to/keystore > > keystore_password: > > #require_client_auth: true > > # Set trustore and truststore_password if require_client_auth is true > > truststore:/path/to/truststore > > truststore_password: > > # More advanced defaults below: > > protocol: TLS > > algorithm: SunX509 > > store_type: JKS
[jira] [Commented] (CASSANDRA-6839) Support non equal conditions (for LWT)
[ https://issues.apache.org/jira/browse/CASSANDRA-6839?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=14097793#comment-14097793 ] Tyler Hobbs commented on CASSANDRA-6839: Sorry for the delay, the rebase for 2.1 is taking longer than I expected. While working on tests, I realized that the only reason we define {{equals()}} on bounds is for detecting "incompatible" conditions on the same column. However, with these changes, just because two conditions are not equal does not mean they are incompatible. For example, you might have {{IF a > 0 AND a IN (-100, 200)}}. You probably won't write that by hand, but it's easy to imagine scenarios where that's generated by code. I would like to remove the check for incompatible conditions along with {{equals()}} for the Bounds classes. If two conditions really are incompatible, the operation just won't apply. Even if we had a magically perfect check for incompatibility, I don't think it's proper to throw an IRE there. > Support non equal conditions (for LWT) > -- > > Key: CASSANDRA-6839 > URL: https://issues.apache.org/jira/browse/CASSANDRA-6839 > Project: Cassandra > Issue Type: Improvement >Reporter: Sylvain Lebresne >Assignee: Tyler Hobbs >Priority: Minor > Fix For: 2.0.10 > > Attachments: 6839-v2.txt, 6839-v3.txt, 6839.txt > > > We currently only support equal conditions in conditional updates, but it > would be relatively trivial to support non-equal ones as well. At the very > least we should support '>', '>=', '<' and '<=', though it would probably > also make sense to add a non-equal relation too ('!='). -- This message was sent by Atlassian JIRA (v6.2#6252)
[01/13] git commit: cqlsh should automatically disable tracing when selecting from system_traces
Repository: cassandra Updated Branches: refs/heads/cassandra-2.0 44764c03e -> e7566609e refs/heads/cassandra-2.1 7a0f496f2 -> ffb919e78 refs/heads/cassandra-2.1.0 d9eabb3f2 -> d7f7eec27 refs/heads/trunk 70d8ad119 -> 9d05efafe cqlsh should automatically disable tracing when selecting from system_traces patch by Philip Thompson and Mikhail Stepura; reviewed by Mikhail Stepura for CASSANDRA-7641 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/e7566609 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/e7566609 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/e7566609 Branch: refs/heads/cassandra-2.0 Commit: e7566609e232d2adee2e2879ad4811b7cce1f5d2 Parents: 44764c0 Author: Mikhail Stepura Authored: Thu Aug 14 13:11:34 2014 -0700 Committer: Mikhail Stepura Committed: Thu Aug 14 14:13:57 2014 -0700 -- CHANGES.txt | 2 ++ bin/cqlsh | 4 2 files changed, 6 insertions(+) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/e7566609/CHANGES.txt -- diff --git a/CHANGES.txt b/CHANGES.txt index 1ac22f9..04902ad 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -1,4 +1,6 @@ 2.0.10 + * (cqlsh) cqlsh should automatically disable tracing when selecting + from system_traces (CASSANDRA-7641) * (Hadoop) Add CqlOutputFormat (CASSANDRA-6927) * Don't depend on cassandra config for nodetool ring (CASSANDRA-7508) * (cqlsh) Fix failing cqlsh formatting tests (CASSANDRA-7703) http://git-wip-us.apache.org/repos/asf/cassandra/blob/e7566609/bin/cqlsh -- diff --git a/bin/cqlsh b/bin/cqlsh index 6a24753..6aa397e 100755 --- a/bin/cqlsh +++ b/bin/cqlsh @@ -893,6 +893,9 @@ class Shell(cmd.Cmd): if ksname is not None: ksname = self.cql_unprotect_name(ksname) cfname = self.cql_unprotect_name(parsed.get_binding('cfname')) +tracing_was_enabled = self.tracing_enabled +stop_tracing = ksname == 'system_traces' or (ksname is None and self.current_keyspace == 'system_traces') +self.tracing_enabled = self.tracing_enabled and not stop_tracing statement = parsed.extract_orig() with_default_limit = parsed.get_binding('limit') is None if with_default_limit: @@ -900,6 +903,7 @@ class Shell(cmd.Cmd): self.perform_statement(statement, decoder=ErrorHandlingSchemaDecoder, with_default_limit=with_default_limit) +self.tracing_enabled = tracing_was_enabled def perform_statement(self, statement, decoder=None, with_default_limit=False): if self.tracing_enabled:
[05/13] git commit: Merge branch 'cassandra-2.0' into cassandra-2.1
Merge branch 'cassandra-2.0' into cassandra-2.1 Conflicts: CHANGES.txt bin/cqlsh Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/7a1b6b40 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/7a1b6b40 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/7a1b6b40 Branch: refs/heads/trunk Commit: 7a1b6b40f704e06a7475898e8b857cd4587b08ec Parents: 7a0f496 e756660 Author: Mikhail Stepura Authored: Thu Aug 14 15:14:02 2014 -0700 Committer: Mikhail Stepura Committed: Thu Aug 14 15:14:02 2014 -0700 -- CHANGES.txt | 2 ++ bin/cqlsh | 5 + 2 files changed, 7 insertions(+) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/7a1b6b40/CHANGES.txt -- diff --cc CHANGES.txt index e48117a,04902ad..99fb988 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,18 -1,6 +1,20 @@@ -2.0.10 +2.1.1 + * (cqlsh) Error when tracing query (CASSANDRA-7613) + * Avoid IOOBE when building SyntaxError message snippet (CASSANDRA-7569) + * SSTableExport uses correct validator to create string representation of partition + keys (CASSANDRA-7498) + * Avoid NPEs when receiving type changes for an unknown keyspace (CASSANDRA-7689) + * Add support for custom 2i validation (CASSANDRA-7575) + * Pig support for hadoop CqlInputFormat (CASSANDRA-6454) + * Add listen_interface and rpc_interface options (CASSANDRA-7417) + * Improve schema merge performance (CASSANDRA-7444) + * Adjust MT depth based on # of partition validating (CASSANDRA-5263) + * Optimise NativeCell comparisons (CASSANDRA-6755) + * Configurable client timeout for cqlsh (CASSANDRA-7516) + * Include snippet of CQL query near syntax error in messages (CASSANDRA-7111) +Merged from 2.0: + * (cqlsh) cqlsh should automatically disable tracing when selecting +from system_traces (CASSANDRA-7641) * (Hadoop) Add CqlOutputFormat (CASSANDRA-6927) * Don't depend on cassandra config for nodetool ring (CASSANDRA-7508) * (cqlsh) Fix failing cqlsh formatting tests (CASSANDRA-7703) http://git-wip-us.apache.org/repos/asf/cassandra/blob/7a1b6b40/bin/cqlsh -- diff --cc bin/cqlsh index 1a2df86,6aa397e..622fd07 --- a/bin/cqlsh +++ b/bin/cqlsh @@@ -887,33 -889,53 +887,38 @@@ class Shell(cmd.Cmd) self.current_keyspace = ksname.lower() def do_select(self, parsed): -ksname = parsed.get_binding('ksname') -if ksname is not None: -ksname = self.cql_unprotect_name(ksname) -cfname = self.cql_unprotect_name(parsed.get_binding('cfname')) + tracing_was_enabled = self.tracing_enabled ++ksname = parsed.get_binding('ksname') + stop_tracing = ksname == 'system_traces' or (ksname is None and self.current_keyspace == 'system_traces') + self.tracing_enabled = self.tracing_enabled and not stop_tracing statement = parsed.extract_orig() with_default_limit = parsed.get_binding('limit') is None if with_default_limit: statement = "%s LIMIT %d;" % (statement[:-1], DEFAULT_SELECT_LIMIT) -self.perform_statement(statement, - decoder=ErrorHandlingSchemaDecoder, - with_default_limit=with_default_limit) +self.perform_statement(statement, with_default_limit=with_default_limit) + self.tracing_enabled = tracing_was_enabled -def perform_statement(self, statement, decoder=None, with_default_limit=False): +def perform_statement(self, statement, with_default_limit=False): +stmt = SimpleStatement(statement, consistency_level=self.consistency_level) +result = self.perform_simple_statement(stmt, + with_default_limit=with_default_limit) if self.tracing_enabled: -session_id = UUID(bytes=self.trace_next_query()) -result = self.perform_statement_untraced(statement, - decoder=decoder, - with_default_limit=with_default_limit) -time.sleep(0.5) # trace writes are async so we wait a little. -print_trace_session(self, self.cursor, session_id) -return result -else: -return self.perform_statement_untraced(statement, - decoder=decoder, - with_default_limit=with_default_limit) +if stmt.trace: +print_trace(self, stmt.trace) +else: +msg = "Statement trace did not complete within %
[03/13] git commit: cqlsh should automatically disable tracing when selecting from system_traces
cqlsh should automatically disable tracing when selecting from system_traces patch by Philip Thompson and Mikhail Stepura; reviewed by Mikhail Stepura for CASSANDRA-7641 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/e7566609 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/e7566609 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/e7566609 Branch: refs/heads/trunk Commit: e7566609e232d2adee2e2879ad4811b7cce1f5d2 Parents: 44764c0 Author: Mikhail Stepura Authored: Thu Aug 14 13:11:34 2014 -0700 Committer: Mikhail Stepura Committed: Thu Aug 14 14:13:57 2014 -0700 -- CHANGES.txt | 2 ++ bin/cqlsh | 4 2 files changed, 6 insertions(+) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/e7566609/CHANGES.txt -- diff --git a/CHANGES.txt b/CHANGES.txt index 1ac22f9..04902ad 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -1,4 +1,6 @@ 2.0.10 + * (cqlsh) cqlsh should automatically disable tracing when selecting + from system_traces (CASSANDRA-7641) * (Hadoop) Add CqlOutputFormat (CASSANDRA-6927) * Don't depend on cassandra config for nodetool ring (CASSANDRA-7508) * (cqlsh) Fix failing cqlsh formatting tests (CASSANDRA-7703) http://git-wip-us.apache.org/repos/asf/cassandra/blob/e7566609/bin/cqlsh -- diff --git a/bin/cqlsh b/bin/cqlsh index 6a24753..6aa397e 100755 --- a/bin/cqlsh +++ b/bin/cqlsh @@ -893,6 +893,9 @@ class Shell(cmd.Cmd): if ksname is not None: ksname = self.cql_unprotect_name(ksname) cfname = self.cql_unprotect_name(parsed.get_binding('cfname')) +tracing_was_enabled = self.tracing_enabled +stop_tracing = ksname == 'system_traces' or (ksname is None and self.current_keyspace == 'system_traces') +self.tracing_enabled = self.tracing_enabled and not stop_tracing statement = parsed.extract_orig() with_default_limit = parsed.get_binding('limit') is None if with_default_limit: @@ -900,6 +903,7 @@ class Shell(cmd.Cmd): self.perform_statement(statement, decoder=ErrorHandlingSchemaDecoder, with_default_limit=with_default_limit) +self.tracing_enabled = tracing_was_enabled def perform_statement(self, statement, decoder=None, with_default_limit=False): if self.tracing_enabled:
[07/13] git commit: Merge branch 'cassandra-2.1' into trunk
Merge branch 'cassandra-2.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/2d044e82 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/2d044e82 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/2d044e82 Branch: refs/heads/trunk Commit: 2d044e82a95b4825abc9f0697570c6cdf41b0c58 Parents: 70d8ad1 7a1b6b4 Author: Mikhail Stepura Authored: Thu Aug 14 15:14:12 2014 -0700 Committer: Mikhail Stepura Committed: Thu Aug 14 15:14:12 2014 -0700 -- CHANGES.txt | 2 ++ bin/cqlsh | 5 + 2 files changed, 7 insertions(+) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/2d044e82/CHANGES.txt --
[11/13] git commit: Merge branch 'cassandra-2.1.0' into cassandra-2.1
Merge branch 'cassandra-2.1.0' into cassandra-2.1 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/ffb919e7 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/ffb919e7 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/ffb919e7 Branch: refs/heads/trunk Commit: ffb919e7805bc2bd725a6d104affc34b83d37bd2 Parents: 7a1b6b4 d7f7eec Author: Mikhail Stepura Authored: Thu Aug 14 15:16:12 2014 -0700 Committer: Mikhail Stepura Committed: Thu Aug 14 15:16:12 2014 -0700 -- --
[02/13] git commit: cqlsh should automatically disable tracing when selecting from system_traces
cqlsh should automatically disable tracing when selecting from system_traces patch by Philip Thompson and Mikhail Stepura; reviewed by Mikhail Stepura for CASSANDRA-7641 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/e7566609 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/e7566609 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/e7566609 Branch: refs/heads/cassandra-2.1.0 Commit: e7566609e232d2adee2e2879ad4811b7cce1f5d2 Parents: 44764c0 Author: Mikhail Stepura Authored: Thu Aug 14 13:11:34 2014 -0700 Committer: Mikhail Stepura Committed: Thu Aug 14 14:13:57 2014 -0700 -- CHANGES.txt | 2 ++ bin/cqlsh | 4 2 files changed, 6 insertions(+) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/e7566609/CHANGES.txt -- diff --git a/CHANGES.txt b/CHANGES.txt index 1ac22f9..04902ad 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -1,4 +1,6 @@ 2.0.10 + * (cqlsh) cqlsh should automatically disable tracing when selecting + from system_traces (CASSANDRA-7641) * (Hadoop) Add CqlOutputFormat (CASSANDRA-6927) * Don't depend on cassandra config for nodetool ring (CASSANDRA-7508) * (cqlsh) Fix failing cqlsh formatting tests (CASSANDRA-7703) http://git-wip-us.apache.org/repos/asf/cassandra/blob/e7566609/bin/cqlsh -- diff --git a/bin/cqlsh b/bin/cqlsh index 6a24753..6aa397e 100755 --- a/bin/cqlsh +++ b/bin/cqlsh @@ -893,6 +893,9 @@ class Shell(cmd.Cmd): if ksname is not None: ksname = self.cql_unprotect_name(ksname) cfname = self.cql_unprotect_name(parsed.get_binding('cfname')) +tracing_was_enabled = self.tracing_enabled +stop_tracing = ksname == 'system_traces' or (ksname is None and self.current_keyspace == 'system_traces') +self.tracing_enabled = self.tracing_enabled and not stop_tracing statement = parsed.extract_orig() with_default_limit = parsed.get_binding('limit') is None if with_default_limit: @@ -900,6 +903,7 @@ class Shell(cmd.Cmd): self.perform_statement(statement, decoder=ErrorHandlingSchemaDecoder, with_default_limit=with_default_limit) +self.tracing_enabled = tracing_was_enabled def perform_statement(self, statement, decoder=None, with_default_limit=False): if self.tracing_enabled:
[04/13] git commit: cqlsh should automatically disable tracing when selecting from system_traces
cqlsh should automatically disable tracing when selecting from system_traces patch by Philip Thompson and Mikhail Stepura; reviewed by Mikhail Stepura for CASSANDRA-7641 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/e7566609 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/e7566609 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/e7566609 Branch: refs/heads/cassandra-2.1 Commit: e7566609e232d2adee2e2879ad4811b7cce1f5d2 Parents: 44764c0 Author: Mikhail Stepura Authored: Thu Aug 14 13:11:34 2014 -0700 Committer: Mikhail Stepura Committed: Thu Aug 14 14:13:57 2014 -0700 -- CHANGES.txt | 2 ++ bin/cqlsh | 4 2 files changed, 6 insertions(+) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/e7566609/CHANGES.txt -- diff --git a/CHANGES.txt b/CHANGES.txt index 1ac22f9..04902ad 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -1,4 +1,6 @@ 2.0.10 + * (cqlsh) cqlsh should automatically disable tracing when selecting + from system_traces (CASSANDRA-7641) * (Hadoop) Add CqlOutputFormat (CASSANDRA-6927) * Don't depend on cassandra config for nodetool ring (CASSANDRA-7508) * (cqlsh) Fix failing cqlsh formatting tests (CASSANDRA-7703) http://git-wip-us.apache.org/repos/asf/cassandra/blob/e7566609/bin/cqlsh -- diff --git a/bin/cqlsh b/bin/cqlsh index 6a24753..6aa397e 100755 --- a/bin/cqlsh +++ b/bin/cqlsh @@ -893,6 +893,9 @@ class Shell(cmd.Cmd): if ksname is not None: ksname = self.cql_unprotect_name(ksname) cfname = self.cql_unprotect_name(parsed.get_binding('cfname')) +tracing_was_enabled = self.tracing_enabled +stop_tracing = ksname == 'system_traces' or (ksname is None and self.current_keyspace == 'system_traces') +self.tracing_enabled = self.tracing_enabled and not stop_tracing statement = parsed.extract_orig() with_default_limit = parsed.get_binding('limit') is None if with_default_limit: @@ -900,6 +903,7 @@ class Shell(cmd.Cmd): self.perform_statement(statement, decoder=ErrorHandlingSchemaDecoder, with_default_limit=with_default_limit) +self.tracing_enabled = tracing_was_enabled def perform_statement(self, statement, decoder=None, with_default_limit=False): if self.tracing_enabled:
[08/13] git commit: Merge branch 'cassandra-2.0' into cassandra-2.1.0
Merge branch 'cassandra-2.0' into cassandra-2.1.0 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/d7f7eec2 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/d7f7eec2 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/d7f7eec2 Branch: refs/heads/cassandra-2.1 Commit: d7f7eec272fa18a9fa3bec5cd0a6c8e577b0d689 Parents: d9eabb3 e756660 Author: Mikhail Stepura Authored: Thu Aug 14 15:14:58 2014 -0700 Committer: Mikhail Stepura Committed: Thu Aug 14 15:14:58 2014 -0700 -- --
[06/13] git commit: Merge branch 'cassandra-2.0' into cassandra-2.1
Merge branch 'cassandra-2.0' into cassandra-2.1 Conflicts: CHANGES.txt bin/cqlsh Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/7a1b6b40 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/7a1b6b40 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/7a1b6b40 Branch: refs/heads/cassandra-2.1 Commit: 7a1b6b40f704e06a7475898e8b857cd4587b08ec Parents: 7a0f496 e756660 Author: Mikhail Stepura Authored: Thu Aug 14 15:14:02 2014 -0700 Committer: Mikhail Stepura Committed: Thu Aug 14 15:14:02 2014 -0700 -- CHANGES.txt | 2 ++ bin/cqlsh | 5 + 2 files changed, 7 insertions(+) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/7a1b6b40/CHANGES.txt -- diff --cc CHANGES.txt index e48117a,04902ad..99fb988 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,18 -1,6 +1,20 @@@ -2.0.10 +2.1.1 + * (cqlsh) Error when tracing query (CASSANDRA-7613) + * Avoid IOOBE when building SyntaxError message snippet (CASSANDRA-7569) + * SSTableExport uses correct validator to create string representation of partition + keys (CASSANDRA-7498) + * Avoid NPEs when receiving type changes for an unknown keyspace (CASSANDRA-7689) + * Add support for custom 2i validation (CASSANDRA-7575) + * Pig support for hadoop CqlInputFormat (CASSANDRA-6454) + * Add listen_interface and rpc_interface options (CASSANDRA-7417) + * Improve schema merge performance (CASSANDRA-7444) + * Adjust MT depth based on # of partition validating (CASSANDRA-5263) + * Optimise NativeCell comparisons (CASSANDRA-6755) + * Configurable client timeout for cqlsh (CASSANDRA-7516) + * Include snippet of CQL query near syntax error in messages (CASSANDRA-7111) +Merged from 2.0: + * (cqlsh) cqlsh should automatically disable tracing when selecting +from system_traces (CASSANDRA-7641) * (Hadoop) Add CqlOutputFormat (CASSANDRA-6927) * Don't depend on cassandra config for nodetool ring (CASSANDRA-7508) * (cqlsh) Fix failing cqlsh formatting tests (CASSANDRA-7703) http://git-wip-us.apache.org/repos/asf/cassandra/blob/7a1b6b40/bin/cqlsh -- diff --cc bin/cqlsh index 1a2df86,6aa397e..622fd07 --- a/bin/cqlsh +++ b/bin/cqlsh @@@ -887,33 -889,53 +887,38 @@@ class Shell(cmd.Cmd) self.current_keyspace = ksname.lower() def do_select(self, parsed): -ksname = parsed.get_binding('ksname') -if ksname is not None: -ksname = self.cql_unprotect_name(ksname) -cfname = self.cql_unprotect_name(parsed.get_binding('cfname')) + tracing_was_enabled = self.tracing_enabled ++ksname = parsed.get_binding('ksname') + stop_tracing = ksname == 'system_traces' or (ksname is None and self.current_keyspace == 'system_traces') + self.tracing_enabled = self.tracing_enabled and not stop_tracing statement = parsed.extract_orig() with_default_limit = parsed.get_binding('limit') is None if with_default_limit: statement = "%s LIMIT %d;" % (statement[:-1], DEFAULT_SELECT_LIMIT) -self.perform_statement(statement, - decoder=ErrorHandlingSchemaDecoder, - with_default_limit=with_default_limit) +self.perform_statement(statement, with_default_limit=with_default_limit) + self.tracing_enabled = tracing_was_enabled -def perform_statement(self, statement, decoder=None, with_default_limit=False): +def perform_statement(self, statement, with_default_limit=False): +stmt = SimpleStatement(statement, consistency_level=self.consistency_level) +result = self.perform_simple_statement(stmt, + with_default_limit=with_default_limit) if self.tracing_enabled: -session_id = UUID(bytes=self.trace_next_query()) -result = self.perform_statement_untraced(statement, - decoder=decoder, - with_default_limit=with_default_limit) -time.sleep(0.5) # trace writes are async so we wait a little. -print_trace_session(self, self.cursor, session_id) -return result -else: -return self.perform_statement_untraced(statement, - decoder=decoder, - with_default_limit=with_default_limit) +if stmt.trace: +print_trace(self, stmt.trace) +else: +msg = "Statement trace did not complete
[12/13] git commit: Merge branch 'cassandra-2.1.0' into cassandra-2.1
Merge branch 'cassandra-2.1.0' into cassandra-2.1 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/ffb919e7 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/ffb919e7 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/ffb919e7 Branch: refs/heads/cassandra-2.1 Commit: ffb919e7805bc2bd725a6d104affc34b83d37bd2 Parents: 7a1b6b4 d7f7eec Author: Mikhail Stepura Authored: Thu Aug 14 15:16:12 2014 -0700 Committer: Mikhail Stepura Committed: Thu Aug 14 15:16:12 2014 -0700 -- --
[10/13] git commit: Merge branch 'cassandra-2.0' into cassandra-2.1.0
Merge branch 'cassandra-2.0' into cassandra-2.1.0 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/d7f7eec2 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/d7f7eec2 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/d7f7eec2 Branch: refs/heads/trunk Commit: d7f7eec272fa18a9fa3bec5cd0a6c8e577b0d689 Parents: d9eabb3 e756660 Author: Mikhail Stepura Authored: Thu Aug 14 15:14:58 2014 -0700 Committer: Mikhail Stepura Committed: Thu Aug 14 15:14:58 2014 -0700 -- --
[13/13] git commit: Merge branch 'cassandra-2.1' into trunk
Merge branch 'cassandra-2.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/9d05efaf Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/9d05efaf Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/9d05efaf Branch: refs/heads/trunk Commit: 9d05efafe490b1f7f85c07d3403271ce9b765ccb Parents: 2d044e8 ffb919e Author: Mikhail Stepura Authored: Thu Aug 14 15:16:29 2014 -0700 Committer: Mikhail Stepura Committed: Thu Aug 14 15:16:29 2014 -0700 -- --
[09/13] git commit: Merge branch 'cassandra-2.0' into cassandra-2.1.0
Merge branch 'cassandra-2.0' into cassandra-2.1.0 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/d7f7eec2 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/d7f7eec2 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/d7f7eec2 Branch: refs/heads/cassandra-2.1.0 Commit: d7f7eec272fa18a9fa3bec5cd0a6c8e577b0d689 Parents: d9eabb3 e756660 Author: Mikhail Stepura Authored: Thu Aug 14 15:14:58 2014 -0700 Committer: Mikhail Stepura Committed: Thu Aug 14 15:14:58 2014 -0700 -- --
[jira] [Commented] (CASSANDRA-7773) Allow custom commitlog implementations
[ https://issues.apache.org/jira/browse/CASSANDRA-7773?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=14097771#comment-14097771 ] Jason Brown commented on CASSANDRA-7773: Hmm, looking further (into CommitLog.LogRecordAdder), I don't think the current patch will get me what I want. Will dig in a little more to see if there's a reasonably simple way to introduce right abstraction for what I want, else I'll close this ticket. Note: the v2 patch _does_ allow one to swap out periodic/batch services, but I'm not sure if there's much/any value in that. > Allow custom commitlog implementations > -- > > Key: CASSANDRA-7773 > URL: https://issues.apache.org/jira/browse/CASSANDRA-7773 > Project: Cassandra > Issue Type: Improvement > Components: Core >Reporter: Jason Brown >Assignee: Jason Brown >Priority: Minor > Labels: commit_log > Fix For: 2.0.10, 2.1.1 > > Attachments: 7773-v1.diff, 7773-v2.diff > > > Allow users to run with custom commitlog implementations. The need is that it > is probably too late to add CASSANDRA-6018 to 2.0, and as that will now > depend on CASSANDRA-6809, 6018 is probably in the 3.0 timeframe. In the > meantime we'd like to experiment with getting encrypted commit logs now > (internally). Thus, we need to add in a minor bit of flexibility to allow > custom implementations. -- This message was sent by Atlassian JIRA (v6.2#6252)
[jira] [Commented] (CASSANDRA-7542) Reduce CAS contention
[ https://issues.apache.org/jira/browse/CASSANDRA-7542?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=14097747#comment-14097747 ] sankalp kohli commented on CASSANDRA-7542: -- No we did not get time to use this. Also we have reduced the contention through other approaches so this is a less useful to us. However, it might be a good way to reduce contention in general. > Reduce CAS contention > - > > Key: CASSANDRA-7542 > URL: https://issues.apache.org/jira/browse/CASSANDRA-7542 > Project: Cassandra > Issue Type: Improvement >Reporter: sankalp kohli >Assignee: Benedict > Fix For: 2.0.10 > > > CAS updates on same CQL partition can lead to heavy contention inside C*. I > am looking for simple ways(no algorithmic changes) to reduce contention as > the penalty of it is high in terms of latency, specially for reads. > We can put some sort of synchronization on CQL partition at StorageProxy > level. This will reduce contention at least for all requests landing on one > box for same partition. > Here is an example of why it will help: > 1) Say 1 write and 2 read CAS requests for the same partition key is send to > C* in parallel. > 2) Since client is token-aware, it sends these 3 request to the same C* > instance A. (Lets assume that all 3 requests goto same instance A) > 3) In this C* instance A, all 3 CAS requests will contend with each other in > Paxos. (This is bad) > To improve contention in 3), what I am proposing is to add a lock on > partition key similar to what we do in PaxosState.java to serialize these 3 > requests. This will remove the contention and improve performance as these 3 > requests will not collide with each other. > Another improvement we can do in client is to pick a deterministic live > replica for a given partition doing CAS. -- This message was sent by Atlassian JIRA (v6.2#6252)
[jira] [Updated] (CASSANDRA-7773) Allow custom commitlog implementations
[ https://issues.apache.org/jira/browse/CASSANDRA-7773?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] Jason Brown updated CASSANDRA-7773: --- Attachment: 7773-v2.diff v2 makes CommitLog.LogRecordAdder publicly visible. > Allow custom commitlog implementations > -- > > Key: CASSANDRA-7773 > URL: https://issues.apache.org/jira/browse/CASSANDRA-7773 > Project: Cassandra > Issue Type: Improvement > Components: Core >Reporter: Jason Brown >Assignee: Jason Brown >Priority: Minor > Labels: commit_log > Fix For: 2.0.10, 2.1.1 > > Attachments: 7773-v1.diff, 7773-v2.diff > > > Allow users to run with custom commitlog implementations. The need is that it > is probably too late to add CASSANDRA-6018 to 2.0, and as that will now > depend on CASSANDRA-6809, 6018 is probably in the 3.0 timeframe. In the > meantime we'd like to experiment with getting encrypted commit logs now > (internally). Thus, we need to add in a minor bit of flexibility to allow > custom implementations. -- This message was sent by Atlassian JIRA (v6.2#6252)
[5/5] git commit: Merge branch 'cassandra-2.1' into trunk
Merge branch 'cassandra-2.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/70d8ad11 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/70d8ad11 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/70d8ad11 Branch: refs/heads/trunk Commit: 70d8ad1196d60fec06184873d570e17502800da8 Parents: edb5f08 7a0f496 Author: Brandon Williams Authored: Thu Aug 14 16:45:00 2014 -0500 Committer: Brandon Williams Committed: Thu Aug 14 16:45:00 2014 -0500 -- --
[4/5] git commit: Merge branch 'cassandra-2.1.0' into cassandra-2.1
Merge branch 'cassandra-2.1.0' into cassandra-2.1 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/7a0f496f Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/7a0f496f Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/7a0f496f Branch: refs/heads/cassandra-2.1 Commit: 7a0f496f2e25d22913b6fafa2338aae487ad8da4 Parents: 91e63d0 d9eabb3 Author: Brandon Williams Authored: Thu Aug 14 16:44:52 2014 -0500 Committer: Brandon Williams Committed: Thu Aug 14 16:44:52 2014 -0500 -- --
[1/5] git commit: Merge branch 'cassandra-2.0' into cassandra-2.1.0
Repository: cassandra Updated Branches: refs/heads/cassandra-2.1 91e63d054 -> 7a0f496f2 refs/heads/trunk edb5f0883 -> 70d8ad119 Merge branch 'cassandra-2.0' into cassandra-2.1.0 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/d9eabb3f Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/d9eabb3f Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/d9eabb3f Branch: refs/heads/cassandra-2.1 Commit: d9eabb3f22ed1772df2aea335b58ba1fd78d5904 Parents: 254df46 44764c0 Author: Brandon Williams Authored: Thu Aug 14 16:39:44 2014 -0500 Committer: Brandon Williams Committed: Thu Aug 14 16:39:44 2014 -0500 -- --
[2/5] git commit: Merge branch 'cassandra-2.0' into cassandra-2.1.0
Merge branch 'cassandra-2.0' into cassandra-2.1.0 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/d9eabb3f Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/d9eabb3f Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/d9eabb3f Branch: refs/heads/trunk Commit: d9eabb3f22ed1772df2aea335b58ba1fd78d5904 Parents: 254df46 44764c0 Author: Brandon Williams Authored: Thu Aug 14 16:39:44 2014 -0500 Committer: Brandon Williams Committed: Thu Aug 14 16:39:44 2014 -0500 -- --
[3/5] git commit: Merge branch 'cassandra-2.1.0' into cassandra-2.1
Merge branch 'cassandra-2.1.0' into cassandra-2.1 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/7a0f496f Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/7a0f496f Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/7a0f496f Branch: refs/heads/trunk Commit: 7a0f496f2e25d22913b6fafa2338aae487ad8da4 Parents: 91e63d0 d9eabb3 Author: Brandon Williams Authored: Thu Aug 14 16:44:52 2014 -0500 Committer: Brandon Williams Committed: Thu Aug 14 16:44:52 2014 -0500 -- --
[3/3] git commit: Merge branch 'cassandra-2.0' into cassandra-2.1.0
Merge branch 'cassandra-2.0' into cassandra-2.1.0 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/d9eabb3f Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/d9eabb3f Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/d9eabb3f Branch: refs/heads/cassandra-2.1.0 Commit: d9eabb3f22ed1772df2aea335b58ba1fd78d5904 Parents: 254df46 44764c0 Author: Brandon Williams Authored: Thu Aug 14 16:39:44 2014 -0500 Committer: Brandon Williams Committed: Thu Aug 14 16:39:44 2014 -0500 -- --
[2/3] git commit: backport CASSANDRA-6927 to 2.0
backport CASSANDRA-6927 to 2.0 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/44764c03 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/44764c03 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/44764c03 Branch: refs/heads/cassandra-2.1.0 Commit: 44764c03e892bfdb7294ad32d9ff703909186917 Parents: efde6ae Author: Brandon Williams Authored: Wed Aug 13 14:14:38 2014 -0500 Committer: Brandon Williams Committed: Wed Aug 13 14:14:38 2014 -0500 -- CHANGES.txt | 1 + .../hadoop/AbstractBulkOutputFormat.java| 73 ++ .../hadoop/AbstractBulkRecordWriter.java| 251 ++ .../cassandra/hadoop/BulkOutputFormat.java | 49 +--- .../cassandra/hadoop/BulkRecordWriter.java | 259 ++- .../hadoop/cql3/CqlBulkOutputFormat.java| 106 .../hadoop/cql3/CqlBulkRecordWriter.java| 199 ++ .../cassandra/hadoop/cql3/CqlConfigHelper.java | 2 +- .../cassandra/hadoop/cql3/CqlOutputFormat.java | 2 +- .../io/sstable/AbstractSSTableSimpleWriter.java | 10 +- .../cassandra/io/sstable/CQLSSTableWriter.java | 3 +- 11 files changed, 663 insertions(+), 292 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/44764c03/CHANGES.txt -- diff --git a/CHANGES.txt b/CHANGES.txt index 3d31948..1ac22f9 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -1,4 +1,5 @@ 2.0.10 + * (Hadoop) Add CqlOutputFormat (CASSANDRA-6927) * Don't depend on cassandra config for nodetool ring (CASSANDRA-7508) * (cqlsh) Fix failing cqlsh formatting tests (CASSANDRA-7703) * Fix MS expiring map timeout for Paxos messages (CASSANDRA-7752) http://git-wip-us.apache.org/repos/asf/cassandra/blob/44764c03/src/java/org/apache/cassandra/hadoop/AbstractBulkOutputFormat.java -- diff --git a/src/java/org/apache/cassandra/hadoop/AbstractBulkOutputFormat.java b/src/java/org/apache/cassandra/hadoop/AbstractBulkOutputFormat.java new file mode 100644 index 000..c0e91da --- /dev/null +++ b/src/java/org/apache/cassandra/hadoop/AbstractBulkOutputFormat.java @@ -0,0 +1,73 @@ +/* + * 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. + */ +package org.apache.cassandra.hadoop; + + +import java.io.IOException; + +import org.apache.hadoop.conf.Configuration; +import org.apache.hadoop.mapreduce.*; + +public abstract class AbstractBulkOutputFormat extends OutputFormat +implements org.apache.hadoop.mapred.OutputFormat +{ +@Override +public void checkOutputSpecs(JobContext context) +{ +checkOutputSpecs(HadoopCompat.getConfiguration(context)); +} + +private void checkOutputSpecs(Configuration conf) +{ +if (ConfigHelper.getOutputKeyspace(conf) == null) +{ +throw new UnsupportedOperationException("you must set the keyspace with setColumnFamily()"); +} +} + +@Override +public OutputCommitter getOutputCommitter(TaskAttemptContext context) throws IOException, InterruptedException +{ +return new NullOutputCommitter(); +} + +/** Fills the deprecated OutputFormat interface for streaming. */ +@Deprecated +public void checkOutputSpecs(org.apache.hadoop.fs.FileSystem filesystem, org.apache.hadoop.mapred.JobConf job) throws IOException +{ +checkOutputSpecs(job); +} + +public static class NullOutputCommitter extends OutputCommitter +{ +public void abortTask(TaskAttemptContext taskContext) { } + +public void cleanupJob(JobContext jobContext) { } + +public void commitTask(TaskAttemptContext taskContext) { } + +public boolean needsTaskCommit(TaskAttemptContext taskContext) +{ +return false; +} + +public void setupJob(JobContext jobContext) { } + +public void setupTask(TaskAttemptContext taskContext) { } +} +} http://git
[1/3] git commit: export MALLOC_ARENA_MAX corrrectly
Repository: cassandra Updated Branches: refs/heads/cassandra-2.1.0 254df46b1 -> d9eabb3f2 export MALLOC_ARENA_MAX corrrectly Patch by brandonwilliams, reviewed by jbellis for CASSANDRA-6126 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/efde6ae8 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/efde6ae8 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/efde6ae8 Branch: refs/heads/cassandra-2.1.0 Commit: efde6ae81be455eab31c7a0033d67b6df4e19391 Parents: 74f3204 Author: Brandon Williams Authored: Wed Aug 13 13:28:28 2014 -0500 Committer: Brandon Williams Committed: Wed Aug 13 13:28:28 2014 -0500 -- conf/cassandra-env.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/efde6ae8/conf/cassandra-env.sh -- diff --git a/conf/cassandra-env.sh b/conf/cassandra-env.sh index 5e2fb87..c4c8bd5 100644 --- a/conf/cassandra-env.sh +++ b/conf/cassandra-env.sh @@ -139,7 +139,7 @@ esac #HEAP_NEWSIZE="800M" # Set this to control the amount of arenas per-thread in glibc -#MALLOC_ARENA_MAX=4 +#export MALLOC_ARENA_MAX=4 if [ "x$MAX_HEAP_SIZE" = "x" ] && [ "x$HEAP_NEWSIZE" = "x" ]; then calculate_heap_sizes @@ -152,7 +152,7 @@ fi if [ "x$MALLOC_ARENA_MAX" = "x" ] then -MALLOC_ARENA_MAX=4 +export MALLOC_ARENA_MAX=4 fi # Specifies the default port over which Cassandra will be available for
[jira] [Commented] (CASSANDRA-7772) Windows - fsync-analog, flush data to disk
[ https://issues.apache.org/jira/browse/CASSANDRA-7772?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=14097704#comment-14097704 ] Joshua McKenzie commented on CASSANDRA-7772: Ah hah. We're already syncing the FD in syncDataOnlyInternal - I'll dig around as to whether we're safe w/just the FD flush w/regards to directory entries on NTFS. > Windows - fsync-analog, flush data to disk > -- > > Key: CASSANDRA-7772 > URL: https://issues.apache.org/jira/browse/CASSANDRA-7772 > Project: Cassandra > Issue Type: Improvement >Reporter: Joshua McKenzie >Assignee: Joshua McKenzie > Labels: Windows > Fix For: 3.0 > > > We currently use CLibrary fsync linux-native calls to flush to disk. Given > the role this plays in our SequentialWriter and data integrity in general we > need some analog to this function on Windows. -- This message was sent by Atlassian JIRA (v6.2#6252)
[2/3] git commit: Fixed the error when tracing query with cqlsh
Fixed the error when tracing query with cqlsh patch by Robert Stupp; reviewed by Mikhail Stepura for CASSANDRA-7613 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/91e63d05 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/91e63d05 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/91e63d05 Branch: refs/heads/trunk Commit: 91e63d05464b6dfbd1ebfa05449b017e2b8e493a Parents: a816e09 Author: Robert Stupp Authored: Thu Aug 14 14:24:54 2014 -0700 Committer: Mikhail Stepura Committed: Thu Aug 14 14:31:48 2014 -0700 -- CHANGES.txt | 1 + bin/cqlsh | 11 ++- 2 files changed, 7 insertions(+), 5 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/91e63d05/CHANGES.txt -- diff --git a/CHANGES.txt b/CHANGES.txt index fd1f5af..e48117a 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -1,4 +1,5 @@ 2.1.1 + * (cqlsh) Error when tracing query (CASSANDRA-7613) * Avoid IOOBE when building SyntaxError message snippet (CASSANDRA-7569) * SSTableExport uses correct validator to create string representation of partition keys (CASSANDRA-7498) http://git-wip-us.apache.org/repos/asf/cassandra/blob/91e63d05/bin/cqlsh -- diff --git a/bin/cqlsh b/bin/cqlsh index 5b63696..1a2df86 100755 --- a/bin/cqlsh +++ b/bin/cqlsh @@ -584,13 +584,14 @@ class Shell(cmd.Cmd): self.decoding_errors.append(err) return format_value(err, self.output_codec.name, addcolor=self.color) -def myformat_colname(self, name, cfMetaData): +def myformat_colname(self, name, cfMetaData = None): column_colors = COLUMN_NAME_COLORS.copy() # check column role and color appropriately -if name in [col.name for col in cfMetaData.partition_key]: -column_colors.default_factory = lambda : RED -elif name in [col.name for col in cfMetaData.clustering_key]: -column_colors.default_factory = lambda : CYAN +if cfMetaData: +if name in [col.name for col in cfMetaData.partition_key]: +column_colors.default_factory = lambda : RED +elif name in [col.name for col in cfMetaData.clustering_key]: +column_colors.default_factory = lambda : CYAN return self.myformat_value(name, colormap=column_colors) def report_connection(self):
[3/3] git commit: Merge branch 'cassandra-2.1' into trunk
Merge branch 'cassandra-2.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/edb5f088 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/edb5f088 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/edb5f088 Branch: refs/heads/trunk Commit: edb5f0883370a718816272e45695f31651751885 Parents: a712cd1 91e63d0 Author: Mikhail Stepura Authored: Thu Aug 14 14:33:17 2014 -0700 Committer: Mikhail Stepura Committed: Thu Aug 14 14:33:17 2014 -0700 -- CHANGES.txt | 1 + bin/cqlsh | 11 ++- 2 files changed, 7 insertions(+), 5 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/edb5f088/CHANGES.txt -- diff --cc CHANGES.txt index 2c6f8a4,e48117a..816640e --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,21 -1,5 +1,22 @@@ +3.0 + * Support pure user-defined functions (CASSANDRA-7395) + * Permit configurable timestamps with cassandra-stress (CASSANDRA-7416) + * Move sstable RandomAccessReader to nio2, which allows using the + FILE_SHARE_DELETE flag on Windows (CASSANDRA-4050) + * Remove CQL2 (CASSANDRA-5918) + * Add Thrift get_multi_slice call (CASSANDRA-6757) + * Optimize fetching multiple cells by name (CASSANDRA-6933) + * Allow compilation in java 8 (CASSANDRA-7028) + * Make incremental repair default (CASSANDRA-7250) + * Enable code coverage thru JaCoCo (CASSANDRA-7226) + * Switch external naming of 'column families' to 'tables' (CASSANDRA-4369) + * Shorten SSTable path (CASSANDRA-6962) + * Use unsafe mutations for most unit tests (CASSANDRA-6969) + * Fix race condition during calculation of pending ranges (CASSANDRA-7390) + + 2.1.1 + * (cqlsh) Error when tracing query (CASSANDRA-7613) * Avoid IOOBE when building SyntaxError message snippet (CASSANDRA-7569) * SSTableExport uses correct validator to create string representation of partition keys (CASSANDRA-7498)
[1/3] git commit: Fixed the error when tracing query with cqlsh
Repository: cassandra Updated Branches: refs/heads/cassandra-2.1 a816e09d8 -> 91e63d054 refs/heads/trunk a712cd15b -> edb5f0883 Fixed the error when tracing query with cqlsh patch by Robert Stupp; reviewed by Mikhail Stepura for CASSANDRA-7613 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/91e63d05 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/91e63d05 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/91e63d05 Branch: refs/heads/cassandra-2.1 Commit: 91e63d05464b6dfbd1ebfa05449b017e2b8e493a Parents: a816e09 Author: Robert Stupp Authored: Thu Aug 14 14:24:54 2014 -0700 Committer: Mikhail Stepura Committed: Thu Aug 14 14:31:48 2014 -0700 -- CHANGES.txt | 1 + bin/cqlsh | 11 ++- 2 files changed, 7 insertions(+), 5 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/91e63d05/CHANGES.txt -- diff --git a/CHANGES.txt b/CHANGES.txt index fd1f5af..e48117a 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -1,4 +1,5 @@ 2.1.1 + * (cqlsh) Error when tracing query (CASSANDRA-7613) * Avoid IOOBE when building SyntaxError message snippet (CASSANDRA-7569) * SSTableExport uses correct validator to create string representation of partition keys (CASSANDRA-7498) http://git-wip-us.apache.org/repos/asf/cassandra/blob/91e63d05/bin/cqlsh -- diff --git a/bin/cqlsh b/bin/cqlsh index 5b63696..1a2df86 100755 --- a/bin/cqlsh +++ b/bin/cqlsh @@ -584,13 +584,14 @@ class Shell(cmd.Cmd): self.decoding_errors.append(err) return format_value(err, self.output_codec.name, addcolor=self.color) -def myformat_colname(self, name, cfMetaData): +def myformat_colname(self, name, cfMetaData = None): column_colors = COLUMN_NAME_COLORS.copy() # check column role and color appropriately -if name in [col.name for col in cfMetaData.partition_key]: -column_colors.default_factory = lambda : RED -elif name in [col.name for col in cfMetaData.clustering_key]: -column_colors.default_factory = lambda : CYAN +if cfMetaData: +if name in [col.name for col in cfMetaData.partition_key]: +column_colors.default_factory = lambda : RED +elif name in [col.name for col in cfMetaData.clustering_key]: +column_colors.default_factory = lambda : CYAN return self.myformat_value(name, colormap=column_colors) def report_connection(self):
[jira] [Comment Edited] (CASSANDRA-7773) Allow custom commitlog implementations
[ https://issues.apache.org/jira/browse/CASSANDRA-7773?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=14097697#comment-14097697 ] Jason Brown edited comment on CASSANDRA-7773 at 8/14/14 9:31 PM: - Attached patch allows user to set the fully qualified java class name in commitlog_sync field in yaml to declare the commitlog service class. CommitLog's constructor will instantiate that class (vs. period or sync implementations - no change necessary to keep on using those). was (Author: jasobrown): Attached patch allows user to set fully qualified java class name in commitlog_sync field in yaml. CommitLog's constructor will instantiate the class. > Allow custom commitlog implementations > -- > > Key: CASSANDRA-7773 > URL: https://issues.apache.org/jira/browse/CASSANDRA-7773 > Project: Cassandra > Issue Type: Improvement > Components: Core >Reporter: Jason Brown >Assignee: Jason Brown >Priority: Minor > Labels: commit_log > Fix For: 2.0.10, 2.1.1 > > Attachments: 7773-v1.diff > > > Allow users to run with custom commitlog implementations. The need is that it > is probably too late to add CASSANDRA-6018 to 2.0, and as that will now > depend on CASSANDRA-6809, 6018 is probably in the 3.0 timeframe. In the > meantime we'd like to experiment with getting encrypted commit logs now > (internally). Thus, we need to add in a minor bit of flexibility to allow > custom implementations. -- This message was sent by Atlassian JIRA (v6.2#6252)
[jira] [Updated] (CASSANDRA-7773) Allow custom commitlog implementations
[ https://issues.apache.org/jira/browse/CASSANDRA-7773?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] Jason Brown updated CASSANDRA-7773: --- Attachment: 7773-v1.diff Attached patch allows user to set fully qualified java class name in commitlog_sync field in yaml. CommitLog's constructor will instantiate the class. > Allow custom commitlog implementations > -- > > Key: CASSANDRA-7773 > URL: https://issues.apache.org/jira/browse/CASSANDRA-7773 > Project: Cassandra > Issue Type: Improvement > Components: Core >Reporter: Jason Brown >Assignee: Jason Brown >Priority: Minor > Labels: commit_log > Fix For: 2.0.10, 2.1.1 > > Attachments: 7773-v1.diff > > > Allow users to run with custom commitlog implementations. The need is that it > is probably too late to add CASSANDRA-6018 to 2.0, and as that will now > depend on CASSANDRA-6809, 6018 is probably in the 3.0 timeframe. In the > meantime we'd like to experiment with getting encrypted commit logs now > (internally). Thus, we need to add in a minor bit of flexibility to allow > custom implementations. -- This message was sent by Atlassian JIRA (v6.2#6252)
[jira] [Commented] (CASSANDRA-7744) Dropping the last collection column turns CompoundSparseCellNameType$WithCollection into CompoundDenseCellNameType
[ https://issues.apache.org/jira/browse/CASSANDRA-7744?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=14097696#comment-14097696 ] Aleksey Yeschenko commented on CASSANDRA-7744: -- Oh well. I guess we still have an issue with Thrift, but it's older than 7744, so should be handled separately. The patch LGTM, with tiny nits: - should probably add isDense to CFM#equals() and CFM#toString() - "method does it's best" should read "method does its best" > Dropping the last collection column turns > CompoundSparseCellNameType$WithCollection into CompoundDenseCellNameType > -- > > Key: CASSANDRA-7744 > URL: https://issues.apache.org/jira/browse/CASSANDRA-7744 > Project: Cassandra > Issue Type: Bug >Reporter: Aleksey Yeschenko >Assignee: Sylvain Lebresne > Fix For: 2.0.10, 2.1.0 > > Attachments: 7744.txt > > > Dropping the last collection column turns > CompoundSparseCellNameType$WithCollection into CompoundDenseCellNameType > To reproduce > {code} > cqlsh:test> create table test (id int primary key, col map); > cqlsh:test> alter table test drop col; > cqlsh:test> alter table test add col list; > code=2200 [Invalid query] message="Cannot add new column to a COMPACT STORAGE > table" > {code} -- This message was sent by Atlassian JIRA (v6.2#6252)
[jira] [Created] (CASSANDRA-7773) Allow custom commitlog implementations
Jason Brown created CASSANDRA-7773: -- Summary: Allow custom commitlog implementations Key: CASSANDRA-7773 URL: https://issues.apache.org/jira/browse/CASSANDRA-7773 Project: Cassandra Issue Type: Improvement Components: Core Reporter: Jason Brown Assignee: Jason Brown Priority: Minor Fix For: 2.0.10, 2.1.1 Allow users to run with custom commitlog implementations. The need is that it is probably too late to add CASSANDRA-6018 to 2.0, and as that will now depend on CASSANDRA-6809, 6018 is probably in the 3.0 timeframe. In the meantime we'd like to experiment with getting encrypted commit logs now (internally). Thus, we need to add in a minor bit of flexibility to allow custom implementations. -- This message was sent by Atlassian JIRA (v6.2#6252)
[1/6] git commit: Fix NPE at compaction leftover cleanup for dropped table
Repository: cassandra Updated Branches: refs/heads/cassandra-2.1 27cbf5534 -> a816e09d8 refs/heads/cassandra-2.1.0 e4e56c2fd -> 254df46b1 refs/heads/trunk c4077ad66 -> a712cd15b Fix NPE at compaction leftover cleanup for dropped table patch by yukim; reviewed by jbellis for CASSANDRA-7770 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/254df46b Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/254df46b Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/254df46b Branch: refs/heads/cassandra-2.1 Commit: 254df46b19ea574084b9e5dd6810cdc403d16720 Parents: e4e56c2 Author: Yuki Morishita Authored: Thu Aug 14 16:20:52 2014 -0500 Committer: Yuki Morishita Committed: Thu Aug 14 16:20:52 2014 -0500 -- CHANGES.txt| 1 + src/java/org/apache/cassandra/service/CassandraDaemon.java | 4 +++- 2 files changed, 4 insertions(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/254df46b/CHANGES.txt -- diff --git a/CHANGES.txt b/CHANGES.txt index 058681a..7c54a9e 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -11,6 +11,7 @@ * Fix binding null values inside UDT (CASSANDRA-7685) * Fix UDT field selection with empty fields (CASSANDRA-7670) * Bogus deserialization of static cells from sstable (CASSANDRA-7684) + * Fix NPE on compaction leftover cleanup for dropped table (CASSANDRA-7770) Merged from 2.0: * Remove duplicates from StorageService.getJoiningNodes (CASSANDRA-7478) * Clone token map outside of hot gossip loops (CASSANDRA-7758) http://git-wip-us.apache.org/repos/asf/cassandra/blob/254df46b/src/java/org/apache/cassandra/service/CassandraDaemon.java -- diff --git a/src/java/org/apache/cassandra/service/CassandraDaemon.java b/src/java/org/apache/cassandra/service/CassandraDaemon.java index 7c85f81..a0dacee 100644 --- a/src/java/org/apache/cassandra/service/CassandraDaemon.java +++ b/src/java/org/apache/cassandra/service/CassandraDaemon.java @@ -242,7 +242,9 @@ public class CassandraDaemon for (Pair kscf : unfinishedCompactions.keySet()) { CFMetaData cfm = Schema.instance.getCFMetaData(kscf.left, kscf.right); -ColumnFamilyStore.removeUnfinishedCompactionLeftovers(cfm, unfinishedCompactions.get(kscf)); +// CFMetaData can be null if CF is already dropped +if (cfm != null) +ColumnFamilyStore.removeUnfinishedCompactionLeftovers(cfm, unfinishedCompactions.get(kscf)); } SystemKeyspace.discardCompactionsInProgress();
[3/6] git commit: Fix NPE at compaction leftover cleanup for dropped table
Fix NPE at compaction leftover cleanup for dropped table patch by yukim; reviewed by jbellis for CASSANDRA-7770 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/254df46b Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/254df46b Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/254df46b Branch: refs/heads/trunk Commit: 254df46b19ea574084b9e5dd6810cdc403d16720 Parents: e4e56c2 Author: Yuki Morishita Authored: Thu Aug 14 16:20:52 2014 -0500 Committer: Yuki Morishita Committed: Thu Aug 14 16:20:52 2014 -0500 -- CHANGES.txt| 1 + src/java/org/apache/cassandra/service/CassandraDaemon.java | 4 +++- 2 files changed, 4 insertions(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/254df46b/CHANGES.txt -- diff --git a/CHANGES.txt b/CHANGES.txt index 058681a..7c54a9e 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -11,6 +11,7 @@ * Fix binding null values inside UDT (CASSANDRA-7685) * Fix UDT field selection with empty fields (CASSANDRA-7670) * Bogus deserialization of static cells from sstable (CASSANDRA-7684) + * Fix NPE on compaction leftover cleanup for dropped table (CASSANDRA-7770) Merged from 2.0: * Remove duplicates from StorageService.getJoiningNodes (CASSANDRA-7478) * Clone token map outside of hot gossip loops (CASSANDRA-7758) http://git-wip-us.apache.org/repos/asf/cassandra/blob/254df46b/src/java/org/apache/cassandra/service/CassandraDaemon.java -- diff --git a/src/java/org/apache/cassandra/service/CassandraDaemon.java b/src/java/org/apache/cassandra/service/CassandraDaemon.java index 7c85f81..a0dacee 100644 --- a/src/java/org/apache/cassandra/service/CassandraDaemon.java +++ b/src/java/org/apache/cassandra/service/CassandraDaemon.java @@ -242,7 +242,9 @@ public class CassandraDaemon for (Pair kscf : unfinishedCompactions.keySet()) { CFMetaData cfm = Schema.instance.getCFMetaData(kscf.left, kscf.right); -ColumnFamilyStore.removeUnfinishedCompactionLeftovers(cfm, unfinishedCompactions.get(kscf)); +// CFMetaData can be null if CF is already dropped +if (cfm != null) +ColumnFamilyStore.removeUnfinishedCompactionLeftovers(cfm, unfinishedCompactions.get(kscf)); } SystemKeyspace.discardCompactionsInProgress();
[jira] [Commented] (CASSANDRA-5836) Seed nodes should be able to bootstrap without manual intervention
[ https://issues.apache.org/jira/browse/CASSANDRA-5836?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=14097683#comment-14097683 ] Robert Stupp commented on CASSANDRA-5836: - [~jtravis] It's basically documented here: http://www.datastax.com/documentation/cassandra/2.0/cassandra/operations/ops_replace_seed_node.html But you are right, that docs could be better in this point. I could not find a place in "initializing a cluster" that says: "do not use all nodes as seed nodes" - it just says "at least 1 per DC". Might you drop an email to docs at datastax dot com ? > Seed nodes should be able to bootstrap without manual intervention > -- > > Key: CASSANDRA-5836 > URL: https://issues.apache.org/jira/browse/CASSANDRA-5836 > Project: Cassandra > Issue Type: Bug > Components: Core >Reporter: Bill Hathaway >Priority: Minor > > The current logic doesn't allow a seed node to be bootstrapped. If a user > wants to bootstrap a node configured as a seed (for example to replace a seed > node via replace_token), they first need to remove the node's own IP from the > seed list, and then start the bootstrap process. This seems like an > unnecessary step since a node never uses itself as a seed. > I think it would be a better experience if the logic was changed to allow a > seed node to bootstrap without manual intervention when there are other seed > nodes up in a ring. -- This message was sent by Atlassian JIRA (v6.2#6252)
[5/6] git commit: Merge branch 'cassandra-2.1.0' into cassandra-2.1
Merge branch 'cassandra-2.1.0' into cassandra-2.1 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/a816e09d Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/a816e09d Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/a816e09d Branch: refs/heads/cassandra-2.1 Commit: a816e09d8b7b903d9998cfe8cb895caea54fcae3 Parents: 27cbf55 254df46 Author: Yuki Morishita Authored: Thu Aug 14 16:21:59 2014 -0500 Committer: Yuki Morishita Committed: Thu Aug 14 16:21:59 2014 -0500 -- CHANGES.txt| 1 + src/java/org/apache/cassandra/service/CassandraDaemon.java | 4 +++- 2 files changed, 4 insertions(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/a816e09d/CHANGES.txt --
[4/6] git commit: Merge branch 'cassandra-2.1.0' into cassandra-2.1
Merge branch 'cassandra-2.1.0' into cassandra-2.1 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/a816e09d Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/a816e09d Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/a816e09d Branch: refs/heads/trunk Commit: a816e09d8b7b903d9998cfe8cb895caea54fcae3 Parents: 27cbf55 254df46 Author: Yuki Morishita Authored: Thu Aug 14 16:21:59 2014 -0500 Committer: Yuki Morishita Committed: Thu Aug 14 16:21:59 2014 -0500 -- CHANGES.txt| 1 + src/java/org/apache/cassandra/service/CassandraDaemon.java | 4 +++- 2 files changed, 4 insertions(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/a816e09d/CHANGES.txt --
[6/6] git commit: Merge branch 'cassandra-2.1' into trunk
Merge branch 'cassandra-2.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/a712cd15 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/a712cd15 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/a712cd15 Branch: refs/heads/trunk Commit: a712cd15bcd3836ec5ea78cfaa5cf5e3afb306b1 Parents: c4077ad a816e09 Author: Yuki Morishita Authored: Thu Aug 14 16:22:05 2014 -0500 Committer: Yuki Morishita Committed: Thu Aug 14 16:22:05 2014 -0500 -- CHANGES.txt| 1 + src/java/org/apache/cassandra/service/CassandraDaemon.java | 4 +++- 2 files changed, 4 insertions(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/a712cd15/CHANGES.txt -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/a712cd15/src/java/org/apache/cassandra/service/CassandraDaemon.java --
[2/6] git commit: Fix NPE at compaction leftover cleanup for dropped table
Fix NPE at compaction leftover cleanup for dropped table patch by yukim; reviewed by jbellis for CASSANDRA-7770 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/254df46b Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/254df46b Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/254df46b Branch: refs/heads/cassandra-2.1.0 Commit: 254df46b19ea574084b9e5dd6810cdc403d16720 Parents: e4e56c2 Author: Yuki Morishita Authored: Thu Aug 14 16:20:52 2014 -0500 Committer: Yuki Morishita Committed: Thu Aug 14 16:20:52 2014 -0500 -- CHANGES.txt| 1 + src/java/org/apache/cassandra/service/CassandraDaemon.java | 4 +++- 2 files changed, 4 insertions(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/254df46b/CHANGES.txt -- diff --git a/CHANGES.txt b/CHANGES.txt index 058681a..7c54a9e 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -11,6 +11,7 @@ * Fix binding null values inside UDT (CASSANDRA-7685) * Fix UDT field selection with empty fields (CASSANDRA-7670) * Bogus deserialization of static cells from sstable (CASSANDRA-7684) + * Fix NPE on compaction leftover cleanup for dropped table (CASSANDRA-7770) Merged from 2.0: * Remove duplicates from StorageService.getJoiningNodes (CASSANDRA-7478) * Clone token map outside of hot gossip loops (CASSANDRA-7758) http://git-wip-us.apache.org/repos/asf/cassandra/blob/254df46b/src/java/org/apache/cassandra/service/CassandraDaemon.java -- diff --git a/src/java/org/apache/cassandra/service/CassandraDaemon.java b/src/java/org/apache/cassandra/service/CassandraDaemon.java index 7c85f81..a0dacee 100644 --- a/src/java/org/apache/cassandra/service/CassandraDaemon.java +++ b/src/java/org/apache/cassandra/service/CassandraDaemon.java @@ -242,7 +242,9 @@ public class CassandraDaemon for (Pair kscf : unfinishedCompactions.keySet()) { CFMetaData cfm = Schema.instance.getCFMetaData(kscf.left, kscf.right); -ColumnFamilyStore.removeUnfinishedCompactionLeftovers(cfm, unfinishedCompactions.get(kscf)); +// CFMetaData can be null if CF is already dropped +if (cfm != null) +ColumnFamilyStore.removeUnfinishedCompactionLeftovers(cfm, unfinishedCompactions.get(kscf)); } SystemKeyspace.discardCompactionsInProgress();
[jira] [Updated] (CASSANDRA-7613) Error when tracing query with 2.1 cqlsh
[ https://issues.apache.org/jira/browse/CASSANDRA-7613?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] Mikhail Stepura updated CASSANDRA-7613: --- Fix Version/s: (was: 2.1 rc6) 2.1.1 > Error when tracing query with 2.1 cqlsh > --- > > Key: CASSANDRA-7613 > URL: https://issues.apache.org/jira/browse/CASSANDRA-7613 > Project: Cassandra > Issue Type: Bug >Reporter: T Jake Luciani >Assignee: Robert Stupp > Fix For: 2.1.1 > > Attachments: 7613.txt > > > cqlsh isn't working for me in 2.1 > when executing a query with TRACING ON; I get the following error > myformat_colname() takes exactly 3 arguments (2 given) -- This message was sent by Atlassian JIRA (v6.2#6252)
[jira] [Commented] (CASSANDRA-6018) Add option to encrypt commitlog
[ https://issues.apache.org/jira/browse/CASSANDRA-6018?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=14097678#comment-14097678 ] Jason Brown commented on CASSANDRA-6018: Spoke with [~benedict] and this effort will piggy-back on CASSANDRA-6809. > Add option to encrypt commitlog > > > Key: CASSANDRA-6018 > URL: https://issues.apache.org/jira/browse/CASSANDRA-6018 > Project: Cassandra > Issue Type: New Feature > Components: Core >Reporter: Jason Brown >Assignee: Jason Brown > Labels: commit_log, encryption, security > Fix For: 2.1.1 > > > We are going to start using cassandra for a billing system, and while I can > encrypt sstables at rest (via Datastax Enterprise), commit logs are more or > less plain text. Thus, an attacker would be able to easily read, for example, > credit card numbers in the clear text commit log (if the calling app does not > encrypt the data itself before sending it to cassandra). > I want to allow the option of encrypting the commit logs, most likely > controlled by a property in the yaml. -- This message was sent by Atlassian JIRA (v6.2#6252)
[jira] [Updated] (CASSANDRA-7613) Error when tracing query with 2.1 cqlsh
[ https://issues.apache.org/jira/browse/CASSANDRA-7613?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] Mikhail Stepura updated CASSANDRA-7613: --- Reproduced In: 2.1.1 (was: 2.1 rc5) > Error when tracing query with 2.1 cqlsh > --- > > Key: CASSANDRA-7613 > URL: https://issues.apache.org/jira/browse/CASSANDRA-7613 > Project: Cassandra > Issue Type: Bug >Reporter: T Jake Luciani >Assignee: Robert Stupp > Fix For: 2.1.1 > > Attachments: 7613.txt > > > cqlsh isn't working for me in 2.1 > when executing a query with TRACING ON; I get the following error > myformat_colname() takes exactly 3 arguments (2 given) -- This message was sent by Atlassian JIRA (v6.2#6252)
[jira] [Commented] (CASSANDRA-7772) Windows - fsync-analog, flush data to disk
[ https://issues.apache.org/jira/browse/CASSANDRA-7772?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=14097679#comment-14097679 ] Jonathan Ellis commented on CASSANDRA-7772: --- We use CLibrary.trySync not because it performs better than FileDescriptor.sync, but because FD.sync doesn't sync the parent directory. (CASSANDRA-3250) > Windows - fsync-analog, flush data to disk > -- > > Key: CASSANDRA-7772 > URL: https://issues.apache.org/jira/browse/CASSANDRA-7772 > Project: Cassandra > Issue Type: Improvement >Reporter: Joshua McKenzie >Assignee: Joshua McKenzie > Labels: Windows > Fix For: 3.0 > > > We currently use CLibrary fsync linux-native calls to flush to disk. Given > the role this plays in our SequentialWriter and data integrity in general we > need some analog to this function on Windows. -- This message was sent by Atlassian JIRA (v6.2#6252)
[jira] [Commented] (CASSANDRA-7772) Windows - fsync-analog, flush data to disk
[ https://issues.apache.org/jira/browse/CASSANDRA-7772?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=14097667#comment-14097667 ] Joshua McKenzie commented on CASSANDRA-7772: It looks like FileDescriptor in nio has a [method to sync to disk|http://docs.oracle.com/javase/7/docs/api/java/io/FileDescriptor.html#sync()]. There's the possibility for some [discrepancy in performance|http://stas-blogspot.blogspot.com/2011/11/java-file-flushing-performance.html] on various platforms so it might be worth checking if we're gaining anything with the native fsync call over a FileDescriptor.sync call on linux at this point. Another option would be to start on a windows-specific CLibrary and pursue using [FlushFileBuffers|http://msdn.microsoft.com/en-us/library/aa364439(v=vs.85).aspx]. The remainder of our CLibrary routines don't have many analogs on win7 (page cache hinting specifically). In my opinion syncing alone doesn't warrant adding an abstraction on top of CLibrary to branch to os-specific native code unless the FileDescriptor sync performance is terrible on Windows. > Windows - fsync-analog, flush data to disk > -- > > Key: CASSANDRA-7772 > URL: https://issues.apache.org/jira/browse/CASSANDRA-7772 > Project: Cassandra > Issue Type: Improvement >Reporter: Joshua McKenzie >Assignee: Joshua McKenzie > Labels: Windows > Fix For: 3.0 > > > We currently use CLibrary fsync linux-native calls to flush to disk. Given > the role this plays in our SequentialWriter and data integrity in general we > need some analog to this function on Windows. -- This message was sent by Atlassian JIRA (v6.2#6252)
[jira] [Commented] (CASSANDRA-7769) Implement pg-style dollar syntax for string constants
[ https://issues.apache.org/jira/browse/CASSANDRA-7769?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=14097664#comment-14097664 ] Sylvain Lebresne commented on CASSANDRA-7769: - For the record, we should definitively not make this UDF specific (even if that's a primary motivation). > Implement pg-style dollar syntax for string constants > - > > Key: CASSANDRA-7769 > URL: https://issues.apache.org/jira/browse/CASSANDRA-7769 > Project: Cassandra > Issue Type: Improvement >Reporter: Robert Stupp >Assignee: Robert Stupp > Fix For: 3.0 > > > Follow-up of CASSANDRA-7740: > {{$function$...$function$}} in addition to string style variant. > See also > http://www.postgresql.org/docs/9.1/static/sql-syntax-lexical.html#SQL-SYNTAX-DOLLAR-QUOTING -- This message was sent by Atlassian JIRA (v6.2#6252)
[jira] [Updated] (CASSANDRA-7769) Implement pg-style dollar syntax for string constants
[ https://issues.apache.org/jira/browse/CASSANDRA-7769?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] Sylvain Lebresne updated CASSANDRA-7769: Summary: Implement pg-style dollar syntax for string constants (was: Implement pg-style UDF source declaration) > Implement pg-style dollar syntax for string constants > - > > Key: CASSANDRA-7769 > URL: https://issues.apache.org/jira/browse/CASSANDRA-7769 > Project: Cassandra > Issue Type: Improvement >Reporter: Robert Stupp >Assignee: Robert Stupp > Fix For: 3.0 > > > Follow-up of CASSANDRA-7740: > {{$function$...$function$}} in addition to string style variant. > See also > http://www.postgresql.org/docs/9.1/static/sql-syntax-lexical.html#SQL-SYNTAX-DOLLAR-QUOTING -- This message was sent by Atlassian JIRA (v6.2#6252)
[jira] [Commented] (CASSANDRA-7613) Error when tracing query with 2.1 cqlsh
[ https://issues.apache.org/jira/browse/CASSANDRA-7613?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=14097656#comment-14097656 ] Robert Stupp commented on CASSANDRA-7613: - colored-column-name patch lurked around :) > Error when tracing query with 2.1 cqlsh > --- > > Key: CASSANDRA-7613 > URL: https://issues.apache.org/jira/browse/CASSANDRA-7613 > Project: Cassandra > Issue Type: Bug >Reporter: T Jake Luciani >Assignee: Robert Stupp > Fix For: 2.1 rc6 > > Attachments: 7613.txt > > > cqlsh isn't working for me in 2.1 > when executing a query with TRACING ON; I get the following error > myformat_colname() takes exactly 3 arguments (2 given) -- This message was sent by Atlassian JIRA (v6.2#6252)
[jira] [Commented] (CASSANDRA-7770) NPE when clean up compaction leftover if table is already dropped
[ https://issues.apache.org/jira/browse/CASSANDRA-7770?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=14097655#comment-14097655 ] Jonathan Ellis commented on CASSANDRA-7770: --- +1 then > NPE when clean up compaction leftover if table is already dropped > - > > Key: CASSANDRA-7770 > URL: https://issues.apache.org/jira/browse/CASSANDRA-7770 > Project: Cassandra > Issue Type: Bug >Reporter: Yuki Morishita >Assignee: Yuki Morishita >Priority: Minor > Fix For: 2.1.0 > > Attachments: > 0001-add-check-before-cleaning-up-compaction-leftovers.patch > > > As reported in CASSANDRA-7759, Directories throws NPE when trying to remove > compaction leftovers on already dropped table. > Attaching patch to check if table exists in schema before clean up. -- This message was sent by Atlassian JIRA (v6.2#6252)
[jira] [Assigned] (CASSANDRA-7613) Error when tracing query with 2.1 cqlsh
[ https://issues.apache.org/jira/browse/CASSANDRA-7613?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] Robert Stupp reassigned CASSANDRA-7613: --- Assignee: Robert Stupp (was: Mikhail Stepura) > Error when tracing query with 2.1 cqlsh > --- > > Key: CASSANDRA-7613 > URL: https://issues.apache.org/jira/browse/CASSANDRA-7613 > Project: Cassandra > Issue Type: Bug >Reporter: T Jake Luciani >Assignee: Robert Stupp > Fix For: 2.1 rc5 > > Attachments: 7613.txt > > > cqlsh isn't working for me in 2.1 > when executing a query with TRACING ON; I get the following error > myformat_colname() takes exactly 3 arguments (2 given) -- This message was sent by Atlassian JIRA (v6.2#6252)
[jira] [Commented] (CASSANDRA-7770) NPE when clean up compaction leftover if table is already dropped
[ https://issues.apache.org/jira/browse/CASSANDRA-7770?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=14097650#comment-14097650 ] Yuki Morishita commented on CASSANDRA-7770: --- Do you mean deleting SSTables that dropped table had? It is already done by releasing all references to SSTables when dropping. > NPE when clean up compaction leftover if table is already dropped > - > > Key: CASSANDRA-7770 > URL: https://issues.apache.org/jira/browse/CASSANDRA-7770 > Project: Cassandra > Issue Type: Bug >Reporter: Yuki Morishita >Assignee: Yuki Morishita >Priority: Minor > Fix For: 2.1.0 > > Attachments: > 0001-add-check-before-cleaning-up-compaction-leftovers.patch > > > As reported in CASSANDRA-7759, Directories throws NPE when trying to remove > compaction leftovers on already dropped table. > Attaching patch to check if table exists in schema before clean up. -- This message was sent by Atlassian JIRA (v6.2#6252)
[jira] [Updated] (CASSANDRA-7613) Error when tracing query with 2.1 cqlsh
[ https://issues.apache.org/jira/browse/CASSANDRA-7613?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] Robert Stupp updated CASSANDRA-7613: Attachment: 7613.txt > Error when tracing query with 2.1 cqlsh > --- > > Key: CASSANDRA-7613 > URL: https://issues.apache.org/jira/browse/CASSANDRA-7613 > Project: Cassandra > Issue Type: Bug >Reporter: T Jake Luciani >Assignee: Robert Stupp > Fix For: 2.1 rc5 > > Attachments: 7613.txt > > > cqlsh isn't working for me in 2.1 > when executing a query with TRACING ON; I get the following error > myformat_colname() takes exactly 3 arguments (2 given) -- This message was sent by Atlassian JIRA (v6.2#6252)
[jira] [Created] (CASSANDRA-7772) Windows - fsync-analog, flush data to disk
Joshua McKenzie created CASSANDRA-7772: -- Summary: Windows - fsync-analog, flush data to disk Key: CASSANDRA-7772 URL: https://issues.apache.org/jira/browse/CASSANDRA-7772 Project: Cassandra Issue Type: Improvement Reporter: Joshua McKenzie Assignee: Joshua McKenzie Fix For: 3.0 We currently use CLibrary fsync linux-native calls to flush to disk. Given the role this plays in our SequentialWriter and data integrity in general we need some analog to this function on Windows. -- This message was sent by Atlassian JIRA (v6.2#6252)
[jira] [Commented] (CASSANDRA-5836) Seed nodes should be able to bootstrap without manual intervention
[ https://issues.apache.org/jira/browse/CASSANDRA-5836?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=14097647#comment-14097647 ] Jon Travis commented on CASSANDRA-5836: --- I was just bitten by this as well. Our ops uses ZooKeeper to store a list of all our infrastructure, so I wrote a SeedProvider that peeked into Zk for the list of Cassandra nodes and returned that as the seed list ... big mistake.. Our push-button deployment launched the node (it thought it was a seed), so it essentially stopped doing anything, reported errors of missing keyspaces and column families, then simply sat there. All the while, it claims it has a portion of the ring, yet no data. There is no good documentation about this and no warnings in the logs -- this is certainly something that will bite more people. It would be nice if the process could warn about the error or refuse to start under this scenario. > Seed nodes should be able to bootstrap without manual intervention > -- > > Key: CASSANDRA-5836 > URL: https://issues.apache.org/jira/browse/CASSANDRA-5836 > Project: Cassandra > Issue Type: Bug > Components: Core >Reporter: Bill Hathaway >Priority: Minor > > The current logic doesn't allow a seed node to be bootstrapped. If a user > wants to bootstrap a node configured as a seed (for example to replace a seed > node via replace_token), they first need to remove the node's own IP from the > seed list, and then start the bootstrap process. This seems like an > unnecessary step since a node never uses itself as a seed. > I think it would be a better experience if the logic was changed to allow a > seed node to bootstrap without manual intervention when there are other seed > nodes up in a ring. -- This message was sent by Atlassian JIRA (v6.2#6252)
[jira] [Created] (CASSANDRA-7771) Allow multiple 2ndary index on the same column
Sylvain Lebresne created CASSANDRA-7771: --- Summary: Allow multiple 2ndary index on the same column Key: CASSANDRA-7771 URL: https://issues.apache.org/jira/browse/CASSANDRA-7771 Project: Cassandra Issue Type: Improvement Reporter: Sylvain Lebresne Priority: Minor Fix For: 3.0 Currently, the code assumes that we'll only have one 2ndary index per column. This has been reasonable so far but stop being it with CASSANDRA-6382 (you might want to index multiple fields of the same UDT column) and CASSANDRA-7458 (you may want to have one "normal" index an multiple functional index for the same column). So we should consider removing that assumption in the code, which is mainly 2 places: # in the schema: each ColumnDefinition only has infos for one index. This part should probably be tackled in CASSANDRA-6717 so I'm marking this issue as a follow-up of CASSANDRA-6717. # in the 2ndary index API: this is the part I'm suggesting we fix in this issue. -- This message was sent by Atlassian JIRA (v6.2#6252)
[5/5] git commit: Merge branch 'cassandra-2.1' into trunk
Merge branch 'cassandra-2.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/c4077ad6 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/c4077ad6 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/c4077ad6 Branch: refs/heads/trunk Commit: c4077ad6615d6f96da1588a68c1805f160d6ad0d Parents: fd43c33 27cbf55 Author: Brandon Williams Authored: Thu Aug 14 15:51:09 2014 -0500 Committer: Brandon Williams Committed: Thu Aug 14 15:51:09 2014 -0500 -- CHANGES.txt | 1 + .../hadoop/cql3/CqlBulkOutputFormat.java| 106 ++ .../hadoop/cql3/CqlBulkRecordWriter.java| 199 +++ 3 files changed, 306 insertions(+) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/c4077ad6/CHANGES.txt --
[1/5] git commit: backport CASSANDRA-6927 to 2.0
Repository: cassandra Updated Branches: refs/heads/cassandra-2.1 4c510dc6c -> 27cbf5534 refs/heads/trunk fd43c33c6 -> c4077ad66 backport CASSANDRA-6927 to 2.0 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/44764c03 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/44764c03 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/44764c03 Branch: refs/heads/cassandra-2.1 Commit: 44764c03e892bfdb7294ad32d9ff703909186917 Parents: efde6ae Author: Brandon Williams Authored: Wed Aug 13 14:14:38 2014 -0500 Committer: Brandon Williams Committed: Wed Aug 13 14:14:38 2014 -0500 -- CHANGES.txt | 1 + .../hadoop/AbstractBulkOutputFormat.java| 73 ++ .../hadoop/AbstractBulkRecordWriter.java| 251 ++ .../cassandra/hadoop/BulkOutputFormat.java | 49 +--- .../cassandra/hadoop/BulkRecordWriter.java | 259 ++- .../hadoop/cql3/CqlBulkOutputFormat.java| 106 .../hadoop/cql3/CqlBulkRecordWriter.java| 199 ++ .../cassandra/hadoop/cql3/CqlConfigHelper.java | 2 +- .../cassandra/hadoop/cql3/CqlOutputFormat.java | 2 +- .../io/sstable/AbstractSSTableSimpleWriter.java | 10 +- .../cassandra/io/sstable/CQLSSTableWriter.java | 3 +- 11 files changed, 663 insertions(+), 292 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/44764c03/CHANGES.txt -- diff --git a/CHANGES.txt b/CHANGES.txt index 3d31948..1ac22f9 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -1,4 +1,5 @@ 2.0.10 + * (Hadoop) Add CqlOutputFormat (CASSANDRA-6927) * Don't depend on cassandra config for nodetool ring (CASSANDRA-7508) * (cqlsh) Fix failing cqlsh formatting tests (CASSANDRA-7703) * Fix MS expiring map timeout for Paxos messages (CASSANDRA-7752) http://git-wip-us.apache.org/repos/asf/cassandra/blob/44764c03/src/java/org/apache/cassandra/hadoop/AbstractBulkOutputFormat.java -- diff --git a/src/java/org/apache/cassandra/hadoop/AbstractBulkOutputFormat.java b/src/java/org/apache/cassandra/hadoop/AbstractBulkOutputFormat.java new file mode 100644 index 000..c0e91da --- /dev/null +++ b/src/java/org/apache/cassandra/hadoop/AbstractBulkOutputFormat.java @@ -0,0 +1,73 @@ +/* + * 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. + */ +package org.apache.cassandra.hadoop; + + +import java.io.IOException; + +import org.apache.hadoop.conf.Configuration; +import org.apache.hadoop.mapreduce.*; + +public abstract class AbstractBulkOutputFormat extends OutputFormat +implements org.apache.hadoop.mapred.OutputFormat +{ +@Override +public void checkOutputSpecs(JobContext context) +{ +checkOutputSpecs(HadoopCompat.getConfiguration(context)); +} + +private void checkOutputSpecs(Configuration conf) +{ +if (ConfigHelper.getOutputKeyspace(conf) == null) +{ +throw new UnsupportedOperationException("you must set the keyspace with setColumnFamily()"); +} +} + +@Override +public OutputCommitter getOutputCommitter(TaskAttemptContext context) throws IOException, InterruptedException +{ +return new NullOutputCommitter(); +} + +/** Fills the deprecated OutputFormat interface for streaming. */ +@Deprecated +public void checkOutputSpecs(org.apache.hadoop.fs.FileSystem filesystem, org.apache.hadoop.mapred.JobConf job) throws IOException +{ +checkOutputSpecs(job); +} + +public static class NullOutputCommitter extends OutputCommitter +{ +public void abortTask(TaskAttemptContext taskContext) { } + +public void cleanupJob(JobContext jobContext) { } + +public void commitTask(TaskAttemptContext taskContext) { } + +public boolean needsTaskCommit(TaskAttemptContext taskContext) +{ +return false; +} + +public
[3/5] git commit: merge
merge Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/27cbf553 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/27cbf553 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/27cbf553 Branch: refs/heads/trunk Commit: 27cbf55343fe59e9c8e98fd8857e57adc672b5a5 Parents: 4c510dc 44764c0 Author: Brandon Williams Authored: Thu Aug 14 15:51:01 2014 -0500 Committer: Brandon Williams Committed: Thu Aug 14 15:51:01 2014 -0500 -- CHANGES.txt | 1 + .../hadoop/cql3/CqlBulkOutputFormat.java| 106 ++ .../hadoop/cql3/CqlBulkRecordWriter.java| 199 +++ 3 files changed, 306 insertions(+) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/27cbf553/CHANGES.txt -- diff --cc CHANGES.txt index cf2f34a,1ac22f9..4e1c2b0 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,42 -1,7 +1,43 @@@ -2.0.10 +2.1.1 + * Avoid IOOBE when building SyntaxError message snippet (CASSANDRA-7569) + * SSTableExport uses correct validator to create string representation of partition + keys (CASSANDRA-7498) + * Avoid NPEs when receiving type changes for an unknown keyspace (CASSANDRA-7689) + * Add support for custom 2i validation (CASSANDRA-7575) + * Pig support for hadoop CqlInputFormat (CASSANDRA-6454) + * Add listen_interface and rpc_interface options (CASSANDRA-7417) + * Improve schema merge performance (CASSANDRA-7444) + * Adjust MT depth based on # of partition validating (CASSANDRA-5263) + * Optimise NativeCell comparisons (CASSANDRA-6755) + * Configurable client timeout for cqlsh (CASSANDRA-7516) + * Include snippet of CQL query near syntax error in messages (CASSANDRA-7111) +Merged from 2.0: * (Hadoop) Add CqlOutputFormat (CASSANDRA-6927) + * Don't depend on cassandra config for nodetool ring (CASSANDRA-7508) * (cqlsh) Fix failing cqlsh formatting tests (CASSANDRA-7703) + * Fix IncompatibleClassChangeError from hadoop2 (CASSANDRA-7229) + * Add 'nodetool sethintedhandoffthrottlekb' (CASSANDRA-7635) + * (cqlsh) Add tab-completion for CREATE/DROP USER IF [NOT] EXISTS (CASSANDRA-7611) + * Catch errors when the JVM pulls the rug out from GCInspector (CASSANDRA-5345) + * cqlsh fails when version number parts are not int (CASSANDRA-7524) + + +2.1.0-rc6 + * Skip strict endpoint selection for ranges if RF == nodes (CASSANRA-7765) + * Fix Thrift range filtering without 2ary index lookups (CASSANDRA-7741) + * Add tracing entries about concurrent range requests (CASSANDRA-7599) + * (cqlsh) Fix DESCRIBE for NTS keyspaces (CASSANDRA-7729) + * Remove netty buffer ref-counting (CASSANDRA-7735) + * Pass mutated cf to index updater for use by PRSI (CASSANDRA-7742) + * Include stress yaml example in release and deb (CASSANDRA-7717) + * workaround for netty issue causing corrupted data off the wire (CASSANDRA-7695) + * cqlsh DESC CLUSTER fails retrieving ring information (CASSANDRA-7687) + * Fix binding null values inside UDT (CASSANDRA-7685) + * Fix UDT field selection with empty fields (CASSANDRA-7670) + * Bogus deserialization of static cells from sstable (CASSANDRA-7684) +Merged from 2.0: + * Remove duplicates from StorageService.getJoiningNodes (CASSANDRA-7478) + * Clone token map outside of hot gossip loops (CASSANDRA-7758) * Fix MS expiring map timeout for Paxos messages (CASSANDRA-7752) * Do not flush on truncate if durable_writes is false (CASSANDRA-7750) * Give CRR a default input_cql Statement (CASSANDRA-7226)
[2/5] git commit: backport CASSANDRA-6927 to 2.0
backport CASSANDRA-6927 to 2.0 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/44764c03 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/44764c03 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/44764c03 Branch: refs/heads/trunk Commit: 44764c03e892bfdb7294ad32d9ff703909186917 Parents: efde6ae Author: Brandon Williams Authored: Wed Aug 13 14:14:38 2014 -0500 Committer: Brandon Williams Committed: Wed Aug 13 14:14:38 2014 -0500 -- CHANGES.txt | 1 + .../hadoop/AbstractBulkOutputFormat.java| 73 ++ .../hadoop/AbstractBulkRecordWriter.java| 251 ++ .../cassandra/hadoop/BulkOutputFormat.java | 49 +--- .../cassandra/hadoop/BulkRecordWriter.java | 259 ++- .../hadoop/cql3/CqlBulkOutputFormat.java| 106 .../hadoop/cql3/CqlBulkRecordWriter.java| 199 ++ .../cassandra/hadoop/cql3/CqlConfigHelper.java | 2 +- .../cassandra/hadoop/cql3/CqlOutputFormat.java | 2 +- .../io/sstable/AbstractSSTableSimpleWriter.java | 10 +- .../cassandra/io/sstable/CQLSSTableWriter.java | 3 +- 11 files changed, 663 insertions(+), 292 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/44764c03/CHANGES.txt -- diff --git a/CHANGES.txt b/CHANGES.txt index 3d31948..1ac22f9 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -1,4 +1,5 @@ 2.0.10 + * (Hadoop) Add CqlOutputFormat (CASSANDRA-6927) * Don't depend on cassandra config for nodetool ring (CASSANDRA-7508) * (cqlsh) Fix failing cqlsh formatting tests (CASSANDRA-7703) * Fix MS expiring map timeout for Paxos messages (CASSANDRA-7752) http://git-wip-us.apache.org/repos/asf/cassandra/blob/44764c03/src/java/org/apache/cassandra/hadoop/AbstractBulkOutputFormat.java -- diff --git a/src/java/org/apache/cassandra/hadoop/AbstractBulkOutputFormat.java b/src/java/org/apache/cassandra/hadoop/AbstractBulkOutputFormat.java new file mode 100644 index 000..c0e91da --- /dev/null +++ b/src/java/org/apache/cassandra/hadoop/AbstractBulkOutputFormat.java @@ -0,0 +1,73 @@ +/* + * 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. + */ +package org.apache.cassandra.hadoop; + + +import java.io.IOException; + +import org.apache.hadoop.conf.Configuration; +import org.apache.hadoop.mapreduce.*; + +public abstract class AbstractBulkOutputFormat extends OutputFormat +implements org.apache.hadoop.mapred.OutputFormat +{ +@Override +public void checkOutputSpecs(JobContext context) +{ +checkOutputSpecs(HadoopCompat.getConfiguration(context)); +} + +private void checkOutputSpecs(Configuration conf) +{ +if (ConfigHelper.getOutputKeyspace(conf) == null) +{ +throw new UnsupportedOperationException("you must set the keyspace with setColumnFamily()"); +} +} + +@Override +public OutputCommitter getOutputCommitter(TaskAttemptContext context) throws IOException, InterruptedException +{ +return new NullOutputCommitter(); +} + +/** Fills the deprecated OutputFormat interface for streaming. */ +@Deprecated +public void checkOutputSpecs(org.apache.hadoop.fs.FileSystem filesystem, org.apache.hadoop.mapred.JobConf job) throws IOException +{ +checkOutputSpecs(job); +} + +public static class NullOutputCommitter extends OutputCommitter +{ +public void abortTask(TaskAttemptContext taskContext) { } + +public void cleanupJob(JobContext jobContext) { } + +public void commitTask(TaskAttemptContext taskContext) { } + +public boolean needsTaskCommit(TaskAttemptContext taskContext) +{ +return false; +} + +public void setupJob(JobContext jobContext) { } + +public void setupTask(TaskAttemptContext taskContext) { } +} +} http://git-wip-us.ap
[4/5] git commit: merge
merge Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/27cbf553 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/27cbf553 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/27cbf553 Branch: refs/heads/cassandra-2.1 Commit: 27cbf55343fe59e9c8e98fd8857e57adc672b5a5 Parents: 4c510dc 44764c0 Author: Brandon Williams Authored: Thu Aug 14 15:51:01 2014 -0500 Committer: Brandon Williams Committed: Thu Aug 14 15:51:01 2014 -0500 -- CHANGES.txt | 1 + .../hadoop/cql3/CqlBulkOutputFormat.java| 106 ++ .../hadoop/cql3/CqlBulkRecordWriter.java| 199 +++ 3 files changed, 306 insertions(+) -- http://git-wip-us.apache.org/repos/asf/cassandra/blob/27cbf553/CHANGES.txt -- diff --cc CHANGES.txt index cf2f34a,1ac22f9..4e1c2b0 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,42 -1,7 +1,43 @@@ -2.0.10 +2.1.1 + * Avoid IOOBE when building SyntaxError message snippet (CASSANDRA-7569) + * SSTableExport uses correct validator to create string representation of partition + keys (CASSANDRA-7498) + * Avoid NPEs when receiving type changes for an unknown keyspace (CASSANDRA-7689) + * Add support for custom 2i validation (CASSANDRA-7575) + * Pig support for hadoop CqlInputFormat (CASSANDRA-6454) + * Add listen_interface and rpc_interface options (CASSANDRA-7417) + * Improve schema merge performance (CASSANDRA-7444) + * Adjust MT depth based on # of partition validating (CASSANDRA-5263) + * Optimise NativeCell comparisons (CASSANDRA-6755) + * Configurable client timeout for cqlsh (CASSANDRA-7516) + * Include snippet of CQL query near syntax error in messages (CASSANDRA-7111) +Merged from 2.0: * (Hadoop) Add CqlOutputFormat (CASSANDRA-6927) + * Don't depend on cassandra config for nodetool ring (CASSANDRA-7508) * (cqlsh) Fix failing cqlsh formatting tests (CASSANDRA-7703) + * Fix IncompatibleClassChangeError from hadoop2 (CASSANDRA-7229) + * Add 'nodetool sethintedhandoffthrottlekb' (CASSANDRA-7635) + * (cqlsh) Add tab-completion for CREATE/DROP USER IF [NOT] EXISTS (CASSANDRA-7611) + * Catch errors when the JVM pulls the rug out from GCInspector (CASSANDRA-5345) + * cqlsh fails when version number parts are not int (CASSANDRA-7524) + + +2.1.0-rc6 + * Skip strict endpoint selection for ranges if RF == nodes (CASSANRA-7765) + * Fix Thrift range filtering without 2ary index lookups (CASSANDRA-7741) + * Add tracing entries about concurrent range requests (CASSANDRA-7599) + * (cqlsh) Fix DESCRIBE for NTS keyspaces (CASSANDRA-7729) + * Remove netty buffer ref-counting (CASSANDRA-7735) + * Pass mutated cf to index updater for use by PRSI (CASSANDRA-7742) + * Include stress yaml example in release and deb (CASSANDRA-7717) + * workaround for netty issue causing corrupted data off the wire (CASSANDRA-7695) + * cqlsh DESC CLUSTER fails retrieving ring information (CASSANDRA-7687) + * Fix binding null values inside UDT (CASSANDRA-7685) + * Fix UDT field selection with empty fields (CASSANDRA-7670) + * Bogus deserialization of static cells from sstable (CASSANDRA-7684) +Merged from 2.0: + * Remove duplicates from StorageService.getJoiningNodes (CASSANDRA-7478) + * Clone token map outside of hot gossip loops (CASSANDRA-7758) * Fix MS expiring map timeout for Paxos messages (CASSANDRA-7752) * Do not flush on truncate if durable_writes is false (CASSANDRA-7750) * Give CRR a default input_cql Statement (CASSANDRA-7226)
[jira] [Commented] (CASSANDRA-7770) NPE when clean up compaction leftover if table is already dropped
[ https://issues.apache.org/jira/browse/CASSANDRA-7770?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=14097630#comment-14097630 ] Jonathan Ellis commented on CASSANDRA-7770: --- Shouldn't we also clean out the sstables involved, or do we already have code to clean out sstables that we don't have schema for? > NPE when clean up compaction leftover if table is already dropped > - > > Key: CASSANDRA-7770 > URL: https://issues.apache.org/jira/browse/CASSANDRA-7770 > Project: Cassandra > Issue Type: Bug >Reporter: Yuki Morishita >Assignee: Yuki Morishita >Priority: Minor > Fix For: 2.1.0 > > Attachments: > 0001-add-check-before-cleaning-up-compaction-leftovers.patch > > > As reported in CASSANDRA-7759, Directories throws NPE when trying to remove > compaction leftovers on already dropped table. > Attaching patch to check if table exists in schema before clean up. -- This message was sent by Atlassian JIRA (v6.2#6252)
[jira] [Commented] (CASSANDRA-7759) DROP TABLE makes C* unreachable
[ https://issues.apache.org/jira/browse/CASSANDRA-7759?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=14097620#comment-14097620 ] Yuki Morishita commented on CASSANDRA-7759: --- [~fabrice.larcher] I think NPE on the comment above is different problem from description. I filed CASSANDRA-7770 and attached fix there. > DROP TABLE makes C* unreachable > --- > > Key: CASSANDRA-7759 > URL: https://issues.apache.org/jira/browse/CASSANDRA-7759 > Project: Cassandra > Issue Type: Bug > Environment: CQLSH of C* 2.10.-rc5 with one or two node(s). >Reporter: Fabrice Larcher > > After a {{DROP KEYSPACE}} or {{DROP TABLE}} command from _CQLSH_ I often get > the output : > {code} > errors={}, last_host=127.0.0.1 > {code} > Then, the application can not access the node anymore (it uses the Java > Driver 2.1.0-rc1). And I get the following stacktraces from the > {{system.log}} file ; > {code} > ERROR [MemtableFlushWriter:5] 2014-08-13 11:26:07,577 > CassandraDaemon.java:166 - Exception in thread > Thread[MemtableFlushWriter:5,5,main] > java.lang.RuntimeException: Last written key > DecoratedKey(28149890686391545-8456361251720325, > 30313034353666392d666464362d343539362d393537372d653539336430333138396437) >= > current key DecoratedKey(108b5f3f-fc06-4a0d-99f1-3c6484b32e04, > 31303862356633662d666330362d346130642d393966312d336336343834623332653034) > writing into > ./../data/data/metrics/run-a3c1fe80216911e49fd1ab9c3338a2ff/metrics-run.run_probe-tmp-ka-2-Data.db > at > org.apache.cassandra.io.sstable.SSTableWriter.beforeAppend(SSTableWriter.java:172) > ~[apache-cassandra-2.1.0-rc5.jar:2.1.0-rc5] > at > org.apache.cassandra.io.sstable.SSTableWriter.append(SSTableWriter.java:215) > ~[apache-cassandra-2.1.0-rc5.jar:2.1.0-rc5] > at > org.apache.cassandra.db.Memtable$FlushRunnable.writeSortedContents(Memtable.java:351) > ~[apache-cassandra-2.1.0-rc5.jar:2.1.0-rc5] > at > org.apache.cassandra.db.Memtable$FlushRunnable.runWith(Memtable.java:314) > ~[apache-cassandra-2.1.0-rc5.jar:2.1.0-rc5] > at > org.apache.cassandra.io.util.DiskAwareRunnable.runMayThrow(DiskAwareRunnable.java:48) > ~[apache-cassandra-2.1.0-rc5.jar:2.1.0-rc5] > at > org.apache.cassandra.utils.WrappedRunnable.run(WrappedRunnable.java:28) > ~[apache-cassandra-2.1.0-rc5.jar:2.1.0-rc5] > at > com.google.common.util.concurrent.MoreExecutors$SameThreadExecutorService.execute(MoreExecutors.java:297) > ~[guava-16.0.jar:na] > at > org.apache.cassandra.db.ColumnFamilyStore$Flush.run(ColumnFamilyStore.java:1054) > ~[apache-cassandra-2.1.0-rc5.jar:2.1.0-rc5] > at > java.util.concurrent.ThreadPoolExecutor.runWorker(ThreadPoolExecutor.java:1145) > ~[na:1.7.0_45] > at > java.util.concurrent.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:615) > ~[na:1.7.0_45] > at java.lang.Thread.run(Thread.java:744) ~[na:1.7.0_45] > {code} > I also get the following (perhaps not related) > {code} > ERROR [MemtableFlushWriter:6] 2014-08-13 11:26:08,827 > CassandraDaemon.java:166 - Exception in thread > Thread[MemtableFlushWriter:6,5,main] > org.apache.cassandra.serializers.MarshalException: Invalid byte for ascii: -50 > at > org.apache.cassandra.serializers.AsciiSerializer.validate(AsciiSerializer.java:39) > ~[apache-cassandra-2.1.0-rc5.jar:2.1.0-rc5] > at > org.apache.cassandra.db.marshal.AbstractType.getString(AbstractType.java:78) > ~[apache-cassandra-2.1.0-rc5.jar:2.1.0-rc5] > at org.apache.cassandra.dht.LocalToken.toString(LocalToken.java:39) > ~[apache-cassandra-2.1.0-rc5.jar:2.1.0-rc5] > at java.lang.String.valueOf(String.java:2854) ~[na:1.7.0_45] > at java.lang.StringBuilder.append(StringBuilder.java:128) ~[na:1.7.0_45] > at org.apache.cassandra.db.DecoratedKey.toString(DecoratedKey.java:118) > ~[apache-cassandra-2.1.0-rc5.jar:2.1.0-rc5] > at java.lang.String.valueOf(String.java:2854) ~[na:1.7.0_45] > at java.lang.StringBuilder.append(StringBuilder.java:128) ~[na:1.7.0_45] > at > org.apache.cassandra.io.sstable.SSTableWriter.beforeAppend(SSTableWriter.java:172) > ~[apache-cassandra-2.1.0-rc5.jar:2.1.0-rc5] > at > org.apache.cassandra.io.sstable.SSTableWriter.append(SSTableWriter.java:215) > ~[apache-cassandra-2.1.0-rc5.jar:2.1.0-rc5] > at > org.apache.cassandra.db.Memtable$FlushRunnable.writeSortedContents(Memtable.java:351) > ~[apache-cassandra-2.1.0-rc5.jar:2.1.0-rc5] > at > org.apache.cassandra.db.Memtable$FlushRunnable.runWith(Memtable.java:314) > ~[apache-cassandra-2.1.0-rc5.jar:2.1.0-rc5] > at > org.apache.cassandra.io.util.DiskAwareRunnable.runMayThrow(DiskAwareRunnable.java:48) > ~[apache-cassandra-2.1.0-rc5.jar:2.1.0-rc5] > at > org.apache.cassandra.utils.WrappedRunnable.run(WrappedRunn
[jira] [Assigned] (CASSANDRA-7613) Error when tracing query with 2.1 cqlsh
[ https://issues.apache.org/jira/browse/CASSANDRA-7613?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] Mikhail Stepura reassigned CASSANDRA-7613: -- Assignee: Mikhail Stepura > Error when tracing query with 2.1 cqlsh > --- > > Key: CASSANDRA-7613 > URL: https://issues.apache.org/jira/browse/CASSANDRA-7613 > Project: Cassandra > Issue Type: Bug >Reporter: T Jake Luciani >Assignee: Mikhail Stepura > Fix For: 2.1 rc5 > > > cqlsh isn't working for me in 2.1 > when executing a query with TRACING ON; I get the following error > myformat_colname() takes exactly 3 arguments (2 given) -- This message was sent by Atlassian JIRA (v6.2#6252)
[jira] [Created] (CASSANDRA-7770) NPE when clean up compaction leftover if table is already dropped
Yuki Morishita created CASSANDRA-7770: - Summary: NPE when clean up compaction leftover if table is already dropped Key: CASSANDRA-7770 URL: https://issues.apache.org/jira/browse/CASSANDRA-7770 Project: Cassandra Issue Type: Bug Reporter: Yuki Morishita Assignee: Yuki Morishita Priority: Minor Fix For: 2.1.0 Attachments: 0001-add-check-before-cleaning-up-compaction-leftovers.patch As reported in CASSANDRA-7759, Directories throws NPE when trying to remove compaction leftovers on already dropped table. Attaching patch to check if table exists in schema before clean up. -- This message was sent by Atlassian JIRA (v6.2#6252)
[jira] [Commented] (CASSANDRA-7613) Error when tracing query with 2.1 cqlsh
[ https://issues.apache.org/jira/browse/CASSANDRA-7613?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=14097613#comment-14097613 ] Robert Stupp commented on CASSANDRA-7613: - bq. still able to reproduce me too > Error when tracing query with 2.1 cqlsh > --- > > Key: CASSANDRA-7613 > URL: https://issues.apache.org/jira/browse/CASSANDRA-7613 > Project: Cassandra > Issue Type: Bug >Reporter: T Jake Luciani > Fix For: 2.1 rc5 > > > cqlsh isn't working for me in 2.1 > when executing a query with TRACING ON; I get the following error > myformat_colname() takes exactly 3 arguments (2 given) -- This message was sent by Atlassian JIRA (v6.2#6252)
[jira] [Commented] (CASSANDRA-7613) Error when tracing query with 2.1 cqlsh
[ https://issues.apache.org/jira/browse/CASSANDRA-7613?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=14097609#comment-14097609 ] Philip Thompson commented on CASSANDRA-7613: I am still able to reproduce on 2.1-HEAD this even though CASSANDRA-7603 has been fixed and the patch is committed. > Error when tracing query with 2.1 cqlsh > --- > > Key: CASSANDRA-7613 > URL: https://issues.apache.org/jira/browse/CASSANDRA-7613 > Project: Cassandra > Issue Type: Bug >Reporter: T Jake Luciani > Fix For: 2.1 rc5 > > > cqlsh isn't working for me in 2.1 > when executing a query with TRACING ON; I get the following error > myformat_colname() takes exactly 3 arguments (2 given) -- This message was sent by Atlassian JIRA (v6.2#6252)
[jira] [Reopened] (CASSANDRA-7613) Error when tracing query with 2.1 cqlsh
[ https://issues.apache.org/jira/browse/CASSANDRA-7613?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] Philip Thompson reopened CASSANDRA-7613: Reproduced In: 2.1.1 > Error when tracing query with 2.1 cqlsh > --- > > Key: CASSANDRA-7613 > URL: https://issues.apache.org/jira/browse/CASSANDRA-7613 > Project: Cassandra > Issue Type: Bug >Reporter: T Jake Luciani > Fix For: 2.1 rc5 > > > cqlsh isn't working for me in 2.1 > when executing a query with TRACING ON; I get the following error > myformat_colname() takes exactly 3 arguments (2 given) -- This message was sent by Atlassian JIRA (v6.2#6252)
[jira] [Commented] (CASSANDRA-7641) cqlsh should automatically disable tracing when selecting from system_traces
[ https://issues.apache.org/jira/browse/CASSANDRA-7641?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=14097607#comment-14097607 ] Philip Thompson commented on CASSANDRA-7641: I've attached the 2.1 patch, and labeled it v3 to match the 2.0 patch for clarity's sake. I'm having trouble testing it because I'm seeing CASSANDRA-7613 even though it should be resolved. > cqlsh should automatically disable tracing when selecting from system_traces > > > Key: CASSANDRA-7641 > URL: https://issues.apache.org/jira/browse/CASSANDRA-7641 > Project: Cassandra > Issue Type: Improvement > Components: Tools >Reporter: Brandon Williams >Assignee: Philip Thompson >Priority: Minor > Labels: lhf > Fix For: 2.0.10, 2.1.1 > > Attachments: CASSANDRA-2.0-7641-v3.patch, cassandra-2.0-7641-2.txt, > cassandra-2.0-7641.txt, cassandra-2.1-7641-v3.txt, cassandra-2.1-7641.txt > > > Nobody needs to trace their traces while they're tracing. -- This message was sent by Atlassian JIRA (v6.2#6252)
[jira] [Updated] (CASSANDRA-7641) cqlsh should automatically disable tracing when selecting from system_traces
[ https://issues.apache.org/jira/browse/CASSANDRA-7641?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] Philip Thompson updated CASSANDRA-7641: --- Attachment: cassandra-2.1-7641-v3.txt > cqlsh should automatically disable tracing when selecting from system_traces > > > Key: CASSANDRA-7641 > URL: https://issues.apache.org/jira/browse/CASSANDRA-7641 > Project: Cassandra > Issue Type: Improvement > Components: Tools >Reporter: Brandon Williams >Assignee: Philip Thompson >Priority: Minor > Labels: lhf > Fix For: 2.0.10, 2.1.1 > > Attachments: CASSANDRA-2.0-7641-v3.patch, cassandra-2.0-7641-2.txt, > cassandra-2.0-7641.txt, cassandra-2.1-7641-v3.txt, cassandra-2.1-7641.txt > > > Nobody needs to trace their traces while they're tracing. -- This message was sent by Atlassian JIRA (v6.2#6252)
[jira] [Created] (CASSANDRA-7769) Implement pg-style UDF source declaration
Robert Stupp created CASSANDRA-7769: --- Summary: Implement pg-style UDF source declaration Key: CASSANDRA-7769 URL: https://issues.apache.org/jira/browse/CASSANDRA-7769 Project: Cassandra Issue Type: Improvement Reporter: Robert Stupp Assignee: Robert Stupp Fix For: 3.0 Follow-up of CASSANDRA-7740: {{$function$...$function$}} in addition to string style variant. See also http://www.postgresql.org/docs/9.1/static/sql-syntax-lexical.html#SQL-SYNTAX-DOLLAR-QUOTING -- This message was sent by Atlassian JIRA (v6.2#6252)
[jira] [Updated] (CASSANDRA-7708) UDF schema change events/results
[ https://issues.apache.org/jira/browse/CASSANDRA-7708?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] Sylvain Lebresne updated CASSANDRA-7708: Labels: protocolv4 (was: protocolV4) > UDF schema change events/results > > > Key: CASSANDRA-7708 > URL: https://issues.apache.org/jira/browse/CASSANDRA-7708 > Project: Cassandra > Issue Type: Improvement >Reporter: Robert Stupp >Assignee: Robert Stupp > Labels: protocolv4 > > Schema change notifications for UDF might be interesting for client. > This covers both - the result of {{CREATE}} + {{DROP}} statements and events. > Just adding {{FUNCTION}} as a new target for these events breaks previous > native protocol contract. > Proposal is to introduce a new target {{FUNCTION}} in native protocol v4. -- This message was sent by Atlassian JIRA (v6.2#6252)
[jira] [Commented] (CASSANDRA-7641) cqlsh should automatically disable tracing when selecting from system_traces
[ https://issues.apache.org/jira/browse/CASSANDRA-7641?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=14097574#comment-14097574 ] Philip Thompson commented on CASSANDRA-7641: [~mishail], I like your logic better yes. I'll make the same changes for 2.1 and attach. > cqlsh should automatically disable tracing when selecting from system_traces > > > Key: CASSANDRA-7641 > URL: https://issues.apache.org/jira/browse/CASSANDRA-7641 > Project: Cassandra > Issue Type: Improvement > Components: Tools >Reporter: Brandon Williams >Assignee: Philip Thompson >Priority: Minor > Labels: lhf > Fix For: 2.0.10, 2.1.1 > > Attachments: CASSANDRA-2.0-7641-v3.patch, cassandra-2.0-7641-2.txt, > cassandra-2.0-7641.txt, cassandra-2.1-7641.txt > > > Nobody needs to trace their traces while they're tracing. -- This message was sent by Atlassian JIRA (v6.2#6252)
[jira] [Updated] (CASSANDRA-7740) Parsing of UDF body is broken
[ https://issues.apache.org/jira/browse/CASSANDRA-7740?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] Robert Stupp updated CASSANDRA-7740: Attachment: 7740.txt Patch for first string-style variant. Will open a separate ticket for pg-style variant. > Parsing of UDF body is broken > - > > Key: CASSANDRA-7740 > URL: https://issues.apache.org/jira/browse/CASSANDRA-7740 > Project: Cassandra > Issue Type: Bug >Reporter: Sylvain Lebresne >Assignee: Robert Stupp > Fix For: 3.0 > > Attachments: 7740.txt > > > The parsing of function body introduced by CASSANDRA-7395 is somewhat broken. > It blindly parse everything up to {{END_BODY}}, which as 2 problems: > # it parse function body as if it was part of the CQL syntax, so anything > that don't happen to be a valid CQL token won't even parse. > # something like > {noformat} > CREATE FUNCTION foo() RETURNS text LANGUAGE JAVA BODY return "END_BODY"; > END_BODY; > {noformat} > will not parse correctly. > I don't think we can accept random syntax like that. A better solution (which > is the one Postgresql uses) is to pass the function body as a normal string. > And in fact I'd be in favor of reusing Postgresql syntax (because why not), > that is to have: > {noformat} > CREATE FUNCTION foo() RETURNS text LANGUAGE JAVA AS 'return "END_BODY"'; > {noformat} > One minor annoyance might be, for certain languages, the necessity to double > every quote inside the string. But in a separate ticket we could introduce > Postregsql solution of adding an [alternate syntax for string > constants|http://www.postgresql.org/docs/9.1/static/sql-syntax-lexical.html#SQL-SYNTAX-DOLLAR-QUOTING]. -- This message was sent by Atlassian JIRA (v6.2#6252)
[jira] [Commented] (CASSANDRA-7577) cqlsh: CTRL-R history search not working on OSX
[ https://issues.apache.org/jira/browse/CASSANDRA-7577?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=14097570#comment-14097570 ] Joshua McKenzie commented on CASSANDRA-7577: Windows portion of the patches lgtm. Good call on backporting it to 2.0 - no reason not to while we're here. > cqlsh: CTRL-R history search not working on OSX > --- > > Key: CASSANDRA-7577 > URL: https://issues.apache.org/jira/browse/CASSANDRA-7577 > Project: Cassandra > Issue Type: Bug > Environment: OSX - plain Terminal program > C* 2.0.x, 2.1, trunk >Reporter: Robert Stupp >Assignee: Robert Stupp >Priority: Minor > Fix For: 2.0.11, 2.1.1 > > Attachments: 7577-2.0.txt, 7577-2.1.txt > > > _recursive-history-search_ via ctrl-R does not work in cqlsh. The history > itself works via cursor up/down. > It works on Linux (and I guess on Windows with cygwin) but not on my Mac. -- This message was sent by Atlassian JIRA (v6.2#6252)
[jira] [Updated] (CASSANDRA-7641) cqlsh should automatically disable tracing when selecting from system_traces
[ https://issues.apache.org/jira/browse/CASSANDRA-7641?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] Mikhail Stepura updated CASSANDRA-7641: --- Attachment: CASSANDRA-2.0-7641-v3.patch [~philipthompson] your patch disables the tracing if a current keyspace is "system_traces" even if user selects from a different keyspace. I'm attaching v3 of the patch which address that has slightly simplified logic, please take a look > cqlsh should automatically disable tracing when selecting from system_traces > > > Key: CASSANDRA-7641 > URL: https://issues.apache.org/jira/browse/CASSANDRA-7641 > Project: Cassandra > Issue Type: Improvement > Components: Tools >Reporter: Brandon Williams >Assignee: Philip Thompson >Priority: Minor > Labels: lhf > Fix For: 2.0.10, 2.1.1 > > Attachments: CASSANDRA-2.0-7641-v3.patch, cassandra-2.0-7641-2.txt, > cassandra-2.0-7641.txt, cassandra-2.1-7641.txt > > > Nobody needs to trace their traces while they're tracing. -- This message was sent by Atlassian JIRA (v6.2#6252)
[jira] [Updated] (CASSANDRA-7577) cqlsh: CTRL-R history search not working on OSX
[ https://issues.apache.org/jira/browse/CASSANDRA-7577?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] Robert Stupp updated CASSANDRA-7577: Attachment: 7577-2.1.txt 7577-2.0.txt [~joshuaMcKenzie] good point. Added patches for 2.0 and 2.1. 2.0 patch also backports the Windows test. > cqlsh: CTRL-R history search not working on OSX > --- > > Key: CASSANDRA-7577 > URL: https://issues.apache.org/jira/browse/CASSANDRA-7577 > Project: Cassandra > Issue Type: Bug > Environment: OSX - plain Terminal program > C* 2.0.x, 2.1, trunk >Reporter: Robert Stupp >Assignee: Robert Stupp >Priority: Minor > Fix For: 2.0.11, 2.1.1 > > Attachments: 7577-2.0.txt, 7577-2.1.txt > > > _recursive-history-search_ via ctrl-R does not work in cqlsh. The history > itself works via cursor up/down. > It works on Linux (and I guess on Windows with cygwin) but not on my Mac. -- This message was sent by Atlassian JIRA (v6.2#6252)
[jira] [Updated] (CASSANDRA-7577) cqlsh: CTRL-R history search not working on OSX
[ https://issues.apache.org/jira/browse/CASSANDRA-7577?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] Robert Stupp updated CASSANDRA-7577: Fix Version/s: 2.1.1 2.0.11 > cqlsh: CTRL-R history search not working on OSX > --- > > Key: CASSANDRA-7577 > URL: https://issues.apache.org/jira/browse/CASSANDRA-7577 > Project: Cassandra > Issue Type: Bug > Environment: OSX - plain Terminal program > C* 2.0.x, 2.1, trunk >Reporter: Robert Stupp >Assignee: Robert Stupp >Priority: Minor > Fix For: 2.0.11, 2.1.1 > > Attachments: 7577-2.0.txt, 7577-2.1.txt > > > _recursive-history-search_ via ctrl-R does not work in cqlsh. The history > itself works via cursor up/down. > It works on Linux (and I guess on Windows with cygwin) but not on my Mac. -- This message was sent by Atlassian JIRA (v6.2#6252)
[jira] [Updated] (CASSANDRA-7561) On DROP we should invalidate CounterKeyCache as well as Key/Row cache
[ https://issues.apache.org/jira/browse/CASSANDRA-7561?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] Aleksey Yeschenko updated CASSANDRA-7561: - Attachment: 7561.txt > On DROP we should invalidate CounterKeyCache as well as Key/Row cache > - > > Key: CASSANDRA-7561 > URL: https://issues.apache.org/jira/browse/CASSANDRA-7561 > Project: Cassandra > Issue Type: Bug >Reporter: Benedict >Assignee: Aleksey Yeschenko >Priority: Minor > Fix For: 2.1.0 > > Attachments: 7561.txt > > > We should also probably ensure we don't attempt to auto save _any_ of the > caches while they are in an inconsistent state (i.e. there are keys present > to be saved that should not be restored, or that would throw exceptions when > we save (e.g. CounterCacheKey)) -- This message was sent by Atlassian JIRA (v6.2#6252)
[jira] [Reopened] (CASSANDRA-7577) cqlsh: CTRL-R history search not working on OSX
[ https://issues.apache.org/jira/browse/CASSANDRA-7577?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] Robert Stupp reopened CASSANDRA-7577: - > cqlsh: CTRL-R history search not working on OSX > --- > > Key: CASSANDRA-7577 > URL: https://issues.apache.org/jira/browse/CASSANDRA-7577 > Project: Cassandra > Issue Type: Bug > Environment: OSX - plain Terminal program > C* 2.0.x, 2.1, trunk >Reporter: Robert Stupp >Assignee: Robert Stupp >Priority: Minor > > _recursive-history-search_ via ctrl-R does not work in cqlsh. The history > itself works via cursor up/down. > It works on Linux (and I guess on Windows with cygwin) but not on my Mac. -- This message was sent by Atlassian JIRA (v6.2#6252)
[jira] [Commented] (CASSANDRA-7577) cqlsh: CTRL-R history search not working on OSX
[ https://issues.apache.org/jira/browse/CASSANDRA-7577?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=14097494#comment-14097494 ] Joshua McKenzie commented on CASSANDRA-7577: I added a warning to cqlsh on Windows if you run without the pyreadline dependency - might be worth considering on OSX as well. > cqlsh: CTRL-R history search not working on OSX > --- > > Key: CASSANDRA-7577 > URL: https://issues.apache.org/jira/browse/CASSANDRA-7577 > Project: Cassandra > Issue Type: Bug > Environment: OSX - plain Terminal program > C* 2.0.x, 2.1, trunk >Reporter: Robert Stupp >Assignee: Robert Stupp >Priority: Minor > > _recursive-history-search_ via ctrl-R does not work in cqlsh. The history > itself works via cursor up/down. > It works on Linux (and I guess on Windows with cygwin) but not on my Mac. -- This message was sent by Atlassian JIRA (v6.2#6252)
[jira] [Commented] (CASSANDRA-7286) Exception: NPE
[ https://issues.apache.org/jira/browse/CASSANDRA-7286?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=14097395#comment-14097395 ] Mikhail Stepura commented on CASSANDRA-7286: Looks suspiciously similar to CASSANDRA-7756 or CASSANDRA-7278 > Exception: NPE > --- > > Key: CASSANDRA-7286 > URL: https://issues.apache.org/jira/browse/CASSANDRA-7286 > Project: Cassandra > Issue Type: Bug >Reporter: Julien Anguenot > Attachments: npe_cassandra_2_0_8.txt, readstage_npe.txt > > > Sometimes Cassandra nodes (in a multi datacenter deployment) are throwing > NPE (see attached stack trace) > Let me know what additional information I could provide. > Thank you. -- This message was sent by Atlassian JIRA (v6.2#6252)
[jira] [Resolved] (CASSANDRA-7577) cqlsh: CTRL-R history search not working on OSX
[ https://issues.apache.org/jira/browse/CASSANDRA-7577?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] Robert Stupp resolved CASSANDRA-7577. - Resolution: Not a Problem According to http://pypi.python.org/pypi/readline: "Mac OS X, do not ship with GNU readline installed. The readline extension module in the standard library of Mac "system" Python uses NetBSD's editline (libedit) library instead, which is a readline replacement with a less restrictive software license." So, you can install it with the command: {noformat} sudo easy_install readline {noformat} (Found on https://stackoverflow.com/questions/8884001/python-2-7-with-mac-osx-lion-fn-delete-and-control-r) > cqlsh: CTRL-R history search not working on OSX > --- > > Key: CASSANDRA-7577 > URL: https://issues.apache.org/jira/browse/CASSANDRA-7577 > Project: Cassandra > Issue Type: Bug > Environment: OSX - plain Terminal program > C* 2.0.x, 2.1, trunk >Reporter: Robert Stupp >Assignee: Robert Stupp >Priority: Minor > > _recursive-history-search_ via ctrl-R does not work in cqlsh. The history > itself works via cursor up/down. > It works on Linux (and I guess on Windows with cygwin) but not on my Mac. -- This message was sent by Atlassian JIRA (v6.2#6252)
[jira] [Commented] (CASSANDRA-7759) DROP TABLE makes C* unreachable
[ https://issues.apache.org/jira/browse/CASSANDRA-7759?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=14097267#comment-14097267 ] T Jake Luciani commented on CASSANDRA-7759: --- The first error should be fixed by CASSANDRA-7735 which will go into rc6. Once released please retest once that's out and get back to us > DROP TABLE makes C* unreachable > --- > > Key: CASSANDRA-7759 > URL: https://issues.apache.org/jira/browse/CASSANDRA-7759 > Project: Cassandra > Issue Type: Bug > Environment: CQLSH of C* 2.10.-rc5 with one or two node(s). >Reporter: Fabrice Larcher > > After a {{DROP KEYSPACE}} or {{DROP TABLE}} command from _CQLSH_ I often get > the output : > {code} > errors={}, last_host=127.0.0.1 > {code} > Then, the application can not access the node anymore (it uses the Java > Driver 2.1.0-rc1). And I get the following stacktraces from the > {{system.log}} file ; > {code} > ERROR [MemtableFlushWriter:5] 2014-08-13 11:26:07,577 > CassandraDaemon.java:166 - Exception in thread > Thread[MemtableFlushWriter:5,5,main] > java.lang.RuntimeException: Last written key > DecoratedKey(28149890686391545-8456361251720325, > 30313034353666392d666464362d343539362d393537372d653539336430333138396437) >= > current key DecoratedKey(108b5f3f-fc06-4a0d-99f1-3c6484b32e04, > 31303862356633662d666330362d346130642d393966312d336336343834623332653034) > writing into > ./../data/data/metrics/run-a3c1fe80216911e49fd1ab9c3338a2ff/metrics-run.run_probe-tmp-ka-2-Data.db > at > org.apache.cassandra.io.sstable.SSTableWriter.beforeAppend(SSTableWriter.java:172) > ~[apache-cassandra-2.1.0-rc5.jar:2.1.0-rc5] > at > org.apache.cassandra.io.sstable.SSTableWriter.append(SSTableWriter.java:215) > ~[apache-cassandra-2.1.0-rc5.jar:2.1.0-rc5] > at > org.apache.cassandra.db.Memtable$FlushRunnable.writeSortedContents(Memtable.java:351) > ~[apache-cassandra-2.1.0-rc5.jar:2.1.0-rc5] > at > org.apache.cassandra.db.Memtable$FlushRunnable.runWith(Memtable.java:314) > ~[apache-cassandra-2.1.0-rc5.jar:2.1.0-rc5] > at > org.apache.cassandra.io.util.DiskAwareRunnable.runMayThrow(DiskAwareRunnable.java:48) > ~[apache-cassandra-2.1.0-rc5.jar:2.1.0-rc5] > at > org.apache.cassandra.utils.WrappedRunnable.run(WrappedRunnable.java:28) > ~[apache-cassandra-2.1.0-rc5.jar:2.1.0-rc5] > at > com.google.common.util.concurrent.MoreExecutors$SameThreadExecutorService.execute(MoreExecutors.java:297) > ~[guava-16.0.jar:na] > at > org.apache.cassandra.db.ColumnFamilyStore$Flush.run(ColumnFamilyStore.java:1054) > ~[apache-cassandra-2.1.0-rc5.jar:2.1.0-rc5] > at > java.util.concurrent.ThreadPoolExecutor.runWorker(ThreadPoolExecutor.java:1145) > ~[na:1.7.0_45] > at > java.util.concurrent.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:615) > ~[na:1.7.0_45] > at java.lang.Thread.run(Thread.java:744) ~[na:1.7.0_45] > {code} > I also get the following (perhaps not related) > {code} > ERROR [MemtableFlushWriter:6] 2014-08-13 11:26:08,827 > CassandraDaemon.java:166 - Exception in thread > Thread[MemtableFlushWriter:6,5,main] > org.apache.cassandra.serializers.MarshalException: Invalid byte for ascii: -50 > at > org.apache.cassandra.serializers.AsciiSerializer.validate(AsciiSerializer.java:39) > ~[apache-cassandra-2.1.0-rc5.jar:2.1.0-rc5] > at > org.apache.cassandra.db.marshal.AbstractType.getString(AbstractType.java:78) > ~[apache-cassandra-2.1.0-rc5.jar:2.1.0-rc5] > at org.apache.cassandra.dht.LocalToken.toString(LocalToken.java:39) > ~[apache-cassandra-2.1.0-rc5.jar:2.1.0-rc5] > at java.lang.String.valueOf(String.java:2854) ~[na:1.7.0_45] > at java.lang.StringBuilder.append(StringBuilder.java:128) ~[na:1.7.0_45] > at org.apache.cassandra.db.DecoratedKey.toString(DecoratedKey.java:118) > ~[apache-cassandra-2.1.0-rc5.jar:2.1.0-rc5] > at java.lang.String.valueOf(String.java:2854) ~[na:1.7.0_45] > at java.lang.StringBuilder.append(StringBuilder.java:128) ~[na:1.7.0_45] > at > org.apache.cassandra.io.sstable.SSTableWriter.beforeAppend(SSTableWriter.java:172) > ~[apache-cassandra-2.1.0-rc5.jar:2.1.0-rc5] > at > org.apache.cassandra.io.sstable.SSTableWriter.append(SSTableWriter.java:215) > ~[apache-cassandra-2.1.0-rc5.jar:2.1.0-rc5] > at > org.apache.cassandra.db.Memtable$FlushRunnable.writeSortedContents(Memtable.java:351) > ~[apache-cassandra-2.1.0-rc5.jar:2.1.0-rc5] > at > org.apache.cassandra.db.Memtable$FlushRunnable.runWith(Memtable.java:314) > ~[apache-cassandra-2.1.0-rc5.jar:2.1.0-rc5] > at > org.apache.cassandra.io.util.DiskAwareRunnable.runMayThrow(DiskAwareRunnable.java:48) > ~[apache-cassandra-2.1.0-rc5.jar:2.1.0-rc5] > at > org.apache.cassandra.utils.WrappedRunnable.run(WrappedRunn
buildbot failure in ASF Buildbot on cassandra-trunk
The Buildbot has detected a new failure on builder cassandra-trunk while building libcloud. Full details are available at: http://ci.apache.org/builders/cassandra-trunk/builds/651 Buildbot URL: http://ci.apache.org/ Buildslave for this Build: lares_ubuntu Build Reason: scheduler Build Source Stamp: [branch trunk] 988b1392a7aa061b220318f2fd85f727db2e9f61 Blamelist: Tomaz Muraus BUILD FAILED: failed sincerely, -The Buildbot
[jira] [Updated] (CASSANDRA-7748) Get Windows command-line flags in-line with linux
[ https://issues.apache.org/jira/browse/CASSANDRA-7748?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] Joshua McKenzie updated CASSANDRA-7748: --- Attachment: 7748_v1.txt I'm not in love with -s being 'show' for verbose command-line args but PowerShell isn't case-sensitive so I can't re-use upper-case V or a long version. Patch attached that gets -v in line w/linux and adds -s for show env. > Get Windows command-line flags in-line with linux > - > > Key: CASSANDRA-7748 > URL: https://issues.apache.org/jira/browse/CASSANDRA-7748 > Project: Cassandra > Issue Type: Improvement >Reporter: Joshua McKenzie >Assignee: Joshua McKenzie >Priority: Trivial > Labels: Windows > Fix For: 2.1.1, 3.0 > > Attachments: 7748_v1.txt > > > linux was here first. In the PowerShell launch scripts, -v is verbose right > now as I missed that it's used for 'version' on linux. Add version print > functionality to Windows launch using -v and find another sane flag to use > for verbose env output printing. -- This message was sent by Atlassian JIRA (v6.2#6252)
[jira] [Commented] (CASSANDRA-7767) Expose sizes of off-heap data structures via JMX and `nodetool info`
[ https://issues.apache.org/jira/browse/CASSANDRA-7767?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=14097166#comment-14097166 ] Jeremiah Jordan commented on CASSANDRA-7767: A total size could go in info. The individual sizes should go in cfstats since they are per cf, bloom filter size is already in there. > Expose sizes of off-heap data structures via JMX and `nodetool info` > > > Key: CASSANDRA-7767 > URL: https://issues.apache.org/jira/browse/CASSANDRA-7767 > Project: Cassandra > Issue Type: New Feature >Reporter: J.B. Langston > > It would be very helpful for troubleshooting memory consumption to know the > individual sizes of off-heap data structures such as bloom filters, index > summaries, compression metadata, etc. Can we expose this over JMX? Also, > since `nodetool info` already shows size of heap, key cache, etc. it seems > like a natural place to show this. -- This message was sent by Atlassian JIRA (v6.2#6252)