[jira] [Commented] (CASSANDRA-3200) Repair: compare all trees together (for a given range/cf) instead of by pair in isolation

2011-09-14 Thread Sylvain Lebresne (JIRA)

[ 
https://issues.apache.org/jira/browse/CASSANDRA-3200?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanelfocusedCommentId=13104361#comment-13104361
 ] 

Sylvain Lebresne commented on CASSANDRA-3200:
-

Yes, having a not-bulky/continuous/incremental/ponies-powered repair would be 
nice. It's worth looking into it and I'm not even saying I won't help with that.

That being said, I've heard a number of ideas on that (including the discussion 
on CASSANDRA-2699) and I have yet to be fully convinced by one of those idea. I 
do think it's not a simple problem. So until proved otherwise, the ETA for 
CASSANDRA-2699 is unknown and unlikely in the very near future. In the 
meantime, repair is there and used by people.

Besides, while I understand that the past suckiness of the repair process may 
push one to think that we should throw everything away and use something 
completely new, I think it would be wise to first ask ourselves if we can't 
improve/built on what we have to make it good enough first. In particular, 
repair is already able to work on any token range. It would be relatively easy 
for instance to run more repair on smaller ranges. That plus the fact that both 
(validation) compaction and streaming can now be throttled, that could make 
repair much less bulky at a very little cost (in development time/new bug 
potentially added).

And to get back to the issue at hand, it's actually not a complicated patch 
(given how repair works nowadays) and a very isolated one in what it will 
touch, so I see no reason why it wouldn't make it during the 1.0 series, while 
any potential replacement solution is almost guaranteed to not make it before 
1.1 *at best*.

 Repair: compare all trees together (for a given range/cf) instead of by pair 
 in isolation
 -

 Key: CASSANDRA-3200
 URL: https://issues.apache.org/jira/browse/CASSANDRA-3200
 Project: Cassandra
  Issue Type: Improvement
  Components: Core
Reporter: Sylvain Lebresne
Assignee: Sylvain Lebresne
Priority: Minor
  Labels: repair
 Fix For: 1.0.1


 Currently, repair compare merkle trees by pair, in isolation of any other 
 tree. What that means concretely is that if I have three node A, B and C 
 (RF=3) with A and B in sync, but C having some range r inconsitent with both 
 A and B (since those are consistent), we will do the following transfer of r: 
 A - C, C - A, B - C, C - B.
 The fact that we do both A - C and C - A is fine, because we cannot know 
 which one is more to date from A or C. However, the transfer B - C is 
 useless provided we do A - C if A and B are in sync. Not doing that transfer 
 will be a 25% improvement in that case. With RF=5 and only one node 
 inconsistent with all the others, that almost a 40% improvement, etc...
 Given that this situation of one node not in sync while the others are is 
 probably fairly common (one node died so it is behind), this could be a fair 
 improvement over what is transferred. In the case where we use repair to 
 rebuild completely a node, this will be a dramatic improvement, because it 
 will avoid the rebuilded node to get RF times the data it should get.

--
This message is automatically generated by JIRA.
For more information on JIRA, see: http://www.atlassian.com/software/jira




svn commit: r1170487 - in /cassandra/branches/cassandra-1.0.0: CHANGES.txt build.xml debian/changelog

2011-09-14 Thread slebresne
Author: slebresne
Date: Wed Sep 14 09:13:26 2011
New Revision: 1170487

URL: http://svn.apache.org/viewvc?rev=1170487view=rev
Log:
Update versions in preparation of 1.0.0-beta1 release

Modified:
cassandra/branches/cassandra-1.0.0/CHANGES.txt
cassandra/branches/cassandra-1.0.0/build.xml
cassandra/branches/cassandra-1.0.0/debian/changelog

Modified: cassandra/branches/cassandra-1.0.0/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/cassandra/branches/cassandra-1.0.0/CHANGES.txt?rev=1170487r1=1170486r2=1170487view=diff
==
--- cassandra/branches/cassandra-1.0.0/CHANGES.txt (original)
+++ cassandra/branches/cassandra-1.0.0/CHANGES.txt Wed Sep 14 09:13:26 2011
@@ -1,4 +1,4 @@
-1.0
+1.0.0-beta1
  * removed binarymemtable (CASSANDRA-2692)
  * add commitlog_total_space_in_mb to prevent fragmented logs (CASSANDRA-2427)
  * removed commitlog_rotation_threshold_in_mb configuration (CASSANDRA-2771)

Modified: cassandra/branches/cassandra-1.0.0/build.xml
URL: 
http://svn.apache.org/viewvc/cassandra/branches/cassandra-1.0.0/build.xml?rev=1170487r1=1170486r2=1170487view=diff
==
--- cassandra/branches/cassandra-1.0.0/build.xml (original)
+++ cassandra/branches/cassandra-1.0.0/build.xml Wed Sep 14 09:13:26 2011
@@ -25,7 +25,7 @@
 property name=debuglevel value=source,lines,vars/
 
 !-- default version and SCM information (we need the default SCM info as 
people may checkout with git-svn) --
-property name=base.version value=1.0/
+property name=base.version value=1.0.0-beta1/
 property name=scm.default.path 
value=cassandra/branches/cassandra-1.0.0/
 property name=scm.default.connection 
value=scm:svn:http://svn.apache.org/repos/asf/${scm.default.path}/
 property name=scm.default.developerConnection 
value=scm:svn:https://svn.apache.org/repos/asf/${scm.default.path}/

Modified: cassandra/branches/cassandra-1.0.0/debian/changelog
URL: 
http://svn.apache.org/viewvc/cassandra/branches/cassandra-1.0.0/debian/changelog?rev=1170487r1=1170486r2=1170487view=diff
==
--- cassandra/branches/cassandra-1.0.0/debian/changelog (original)
+++ cassandra/branches/cassandra-1.0.0/debian/changelog Wed Sep 14 09:13:26 2011
@@ -1,3 +1,9 @@
+cassandra (1.0.0-beta1) unstable; urgency=low
+
+  * New beta release
+
+ -- Sylvain Lebresne slebre...@apache.org  Wed, 14 Sep 2011 11:07:47 +0200
+
 cassandra (0.8.1) unstable; urgency=low
 
   * New release 




svn commit: r1170490 - in /cassandra/branches/cassandra-1.0.0: src/java/org/apache/cassandra/cql/jdbc/ src/java/org/apache/cassandra/db/columniterator/ src/java/org/apache/cassandra/db/compaction/ src

2011-09-14 Thread slebresne
Author: slebresne
Date: Wed Sep 14 09:18:28 2011
New Revision: 1170490

URL: http://svn.apache.org/viewvc?rev=1170490view=rev
Log:
Add missing license headers

Modified:

cassandra/branches/cassandra-1.0.0/src/java/org/apache/cassandra/cql/jdbc/JdbcCounterColumn.java

cassandra/branches/cassandra-1.0.0/src/java/org/apache/cassandra/cql/jdbc/TypesMap.java

cassandra/branches/cassandra-1.0.0/src/java/org/apache/cassandra/db/columniterator/ICountableColumnIterator.java

cassandra/branches/cassandra-1.0.0/src/java/org/apache/cassandra/db/compaction/AbstractCompactionIterable.java

cassandra/branches/cassandra-1.0.0/src/java/org/apache/cassandra/db/compaction/LeveledCompactionStrategy.java

cassandra/branches/cassandra-1.0.0/src/java/org/apache/cassandra/db/compaction/LeveledCompactionTask.java

cassandra/branches/cassandra-1.0.0/src/java/org/apache/cassandra/db/compaction/LeveledManifest.java

cassandra/branches/cassandra-1.0.0/src/java/org/apache/cassandra/locator/Ec2MultiRegionSnitch.java

cassandra/branches/cassandra-1.0.0/src/java/org/apache/cassandra/notifications/INotification.java

cassandra/branches/cassandra-1.0.0/src/java/org/apache/cassandra/notifications/INotificationConsumer.java

cassandra/branches/cassandra-1.0.0/src/java/org/apache/cassandra/notifications/SSTableAddedNotification.java

cassandra/branches/cassandra-1.0.0/src/java/org/apache/cassandra/notifications/SSTableListChangedNotification.java

cassandra/branches/cassandra-1.0.0/src/java/org/apache/cassandra/utils/IntervalTree/Interval.java

cassandra/branches/cassandra-1.0.0/src/java/org/apache/cassandra/utils/IntervalTree/IntervalNode.java

cassandra/branches/cassandra-1.0.0/src/java/org/apache/cassandra/utils/IntervalTree/IntervalTree.java

cassandra/branches/cassandra-1.0.0/test/unit/org/apache/cassandra/db/ArrayBackedSortedColumnsTest.java

cassandra/branches/cassandra-1.0.0/test/unit/org/apache/cassandra/net/MessageSerializer.java

cassandra/branches/cassandra-1.0.0/test/unit/org/apache/cassandra/utils/IntervalTest.java

cassandra/branches/cassandra-1.0.0/test/unit/org/apache/cassandra/utils/IntervalTreeTest.java

Modified: 
cassandra/branches/cassandra-1.0.0/src/java/org/apache/cassandra/cql/jdbc/JdbcCounterColumn.java
URL: 
http://svn.apache.org/viewvc/cassandra/branches/cassandra-1.0.0/src/java/org/apache/cassandra/cql/jdbc/JdbcCounterColumn.java?rev=1170490r1=1170489r2=1170490view=diff
==
--- 
cassandra/branches/cassandra-1.0.0/src/java/org/apache/cassandra/cql/jdbc/JdbcCounterColumn.java
 (original)
+++ 
cassandra/branches/cassandra-1.0.0/src/java/org/apache/cassandra/cql/jdbc/JdbcCounterColumn.java
 Wed Sep 14 09:18:28 2011
@@ -1,4 +1,25 @@
 package org.apache.cassandra.cql.jdbc;
+/*
+ * 
+ * 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.
+ * 
+ */
+
 
 public class JdbcCounterColumn extends JdbcLong
 {

Modified: 
cassandra/branches/cassandra-1.0.0/src/java/org/apache/cassandra/cql/jdbc/TypesMap.java
URL: 
http://svn.apache.org/viewvc/cassandra/branches/cassandra-1.0.0/src/java/org/apache/cassandra/cql/jdbc/TypesMap.java?rev=1170490r1=1170489r2=1170490view=diff
==
--- 
cassandra/branches/cassandra-1.0.0/src/java/org/apache/cassandra/cql/jdbc/TypesMap.java
 (original)
+++ 
cassandra/branches/cassandra-1.0.0/src/java/org/apache/cassandra/cql/jdbc/TypesMap.java
 Wed Sep 14 09:18:28 2011
@@ -1,4 +1,25 @@
 package org.apache.cassandra.cql.jdbc;
+/*
+ * 
+ * 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
+ * 

svn commit: r1170498 - /cassandra/branches/cassandra-1.0.0/NOTICE.txt

2011-09-14 Thread slebresne
Author: slebresne
Date: Wed Sep 14 09:31:13 2011
New Revision: 1170498

URL: http://svn.apache.org/viewvc?rev=1170498view=rev
Log:
Update NOTICE files

Modified:
cassandra/branches/cassandra-1.0.0/NOTICE.txt

Modified: cassandra/branches/cassandra-1.0.0/NOTICE.txt
URL: 
http://svn.apache.org/viewvc/cassandra/branches/cassandra-1.0.0/NOTICE.txt?rev=1170498r1=1170497r2=1170498view=diff
==
--- cassandra/branches/cassandra-1.0.0/NOTICE.txt (original)
+++ cassandra/branches/cassandra-1.0.0/NOTICE.txt Wed Sep 14 09:31:13 2011
@@ -31,3 +31,8 @@ YAML support provided by snakeyaml (http
 Copyright (c) 2008-2010 Andrey Somov
 
 Compression support provided by snappy-java 
(http://code.google.com/p/snappy-java/)
+Written by Taro L. Saito.
+
+Streaming compression support provided by ning-compress
+(https://github.com/ning/compress)
+Copyright 2009-2010 Ning, Inc.




svn commit: r1170515 - in /cassandra/branches/cassandra-0.8: build.xml debian/changelog

2011-09-14 Thread slebresne
Author: slebresne
Date: Wed Sep 14 10:26:45 2011
New Revision: 1170515

URL: http://svn.apache.org/viewvc?rev=1170515view=rev
Log:
update versions to 0.8.6

Modified:
cassandra/branches/cassandra-0.8/build.xml
cassandra/branches/cassandra-0.8/debian/changelog

Modified: cassandra/branches/cassandra-0.8/build.xml
URL: 
http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.8/build.xml?rev=1170515r1=1170514r2=1170515view=diff
==
--- cassandra/branches/cassandra-0.8/build.xml (original)
+++ cassandra/branches/cassandra-0.8/build.xml Wed Sep 14 10:26:45 2011
@@ -25,7 +25,7 @@
 property name=debuglevel value=source,lines,vars/
 
 !-- default version and SCM information (we need the default SCM info as 
people may checkout with git-svn) --
-property name=base.version value=0.8.5/
+property name=base.version value=0.8.6/
 property name=scm.default.path 
value=cassandra/branches/cassandra-0.8/
 property name=scm.default.connection 
value=scm:svn:http://svn.apache.org/repos/asf/${scm.default.path}/
 property name=scm.default.developerConnection 
value=scm:svn:https://svn.apache.org/repos/asf/${scm.default.path}/

Modified: cassandra/branches/cassandra-0.8/debian/changelog
URL: 
http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.8/debian/changelog?rev=1170515r1=1170514r2=1170515view=diff
==
--- cassandra/branches/cassandra-0.8/debian/changelog (original)
+++ cassandra/branches/cassandra-0.8/debian/changelog Wed Sep 14 10:26:45 2011
@@ -1,3 +1,9 @@
+cassandra (0.8.6) unstable; urgency=low
+
+  * New release
+
+ -- Sylvain Lebresne slebre...@apache.org  Wed, 14 Sep 2011 12:25:49 +0200
+
 cassandra (0.8.5) unstable; urgency=low
 
   * New release




[jira] [Commented] (CASSANDRA-3177) replication strategy with stress test results in keyspace creation error

2011-09-14 Thread Pavel Yaskevich (JIRA)

[ 
https://issues.apache.org/jira/browse/CASSANDRA-3177?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanelfocusedCommentId=13104411#comment-13104411
 ] 

Pavel Yaskevich commented on CASSANDRA-3177:


you can't specify --replication-factor with NetworkTopologyStrategy, the error 
in your system.log says
{noformat}
Caused by: org.apache.cassandra.config.ConfigurationException: 
replication_factor is an option for SimpleStrategy, not NetworkTopologyStrategy
{noformat}

Try `-D nodes2 --consistency-level=EACH_QUORUM --threads=10 --column-size=32 
--keep-going --num-keys=5 -r --replication-strategy=NetworkTopologyStrategy 
--strategy-properties=DC1:1,DC2:1`

That works fine for me.



 replication strategy with stress test results in keyspace creation error 
 -

 Key: CASSANDRA-3177
 URL: https://issues.apache.org/jira/browse/CASSANDRA-3177
 Project: Cassandra
  Issue Type: Bug
  Components: Tests
Affects Versions: 0.8.5
 Environment: ubuntu 10.04 lts server x64
 Linux ip-10-108-87-188 2.6.32-312-ec2 #24-Ubuntu SMP Fri Jan 7 18:30:50 UTC 
 2011 x86_64 GNU/Linux
 Amazon EC2 Multi Region Setup 
Reporter: Gourav Shah
Assignee: Pavel Yaskevich
Priority: Trivial

 I am using java stress testing utility packaged with cassandra. I tried 
 specifying replication strategy which results in keyspace not being created 
 and throws Internal error processing system_add_keyspace
 ./stress -D nodes2  --consistency-level=EACH_QUORUM --threads=10 
 --replication-factor=3 --column-size=32 --keep-going --num-keys=5  -r 
 --replication-strategy=NetworkTopologyStrategy 
 --strategy-properties=DC1:1,DC2:1
 Internal error processing system_add_keyspace
 Exception in thread Thread-10 java.lang.RuntimeException: Keyspace 
 Keyspace1 does not exist
 at org.apache.cassandra.stress.Session.getClient(Unknown Source)
 at org.apache.cassandra.stress.Session.getClient(Unknown Source)
 at org.apache.cassandra.stress.StressAction$Consumer.run(Unknown 
 Source)

--
This message is automatically generated by JIRA.
For more information on JIRA, see: http://www.atlassian.com/software/jira




[jira] [Resolved] (CASSANDRA-3177) replication strategy with stress test results in keyspace creation error

2011-09-14 Thread Pavel Yaskevich (JIRA)

 [ 
https://issues.apache.org/jira/browse/CASSANDRA-3177?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel
 ]

Pavel Yaskevich resolved CASSANDRA-3177.


Resolution: Not A Problem

 replication strategy with stress test results in keyspace creation error 
 -

 Key: CASSANDRA-3177
 URL: https://issues.apache.org/jira/browse/CASSANDRA-3177
 Project: Cassandra
  Issue Type: Bug
  Components: Tests
Affects Versions: 0.8.5
 Environment: ubuntu 10.04 lts server x64
 Linux ip-10-108-87-188 2.6.32-312-ec2 #24-Ubuntu SMP Fri Jan 7 18:30:50 UTC 
 2011 x86_64 GNU/Linux
 Amazon EC2 Multi Region Setup 
Reporter: Gourav Shah
Assignee: Pavel Yaskevich
Priority: Trivial

 I am using java stress testing utility packaged with cassandra. I tried 
 specifying replication strategy which results in keyspace not being created 
 and throws Internal error processing system_add_keyspace
 ./stress -D nodes2  --consistency-level=EACH_QUORUM --threads=10 
 --replication-factor=3 --column-size=32 --keep-going --num-keys=5  -r 
 --replication-strategy=NetworkTopologyStrategy 
 --strategy-properties=DC1:1,DC2:1
 Internal error processing system_add_keyspace
 Exception in thread Thread-10 java.lang.RuntimeException: Keyspace 
 Keyspace1 does not exist
 at org.apache.cassandra.stress.Session.getClient(Unknown Source)
 at org.apache.cassandra.stress.Session.getClient(Unknown Source)
 at org.apache.cassandra.stress.StressAction$Consumer.run(Unknown 
 Source)

--
This message is automatically generated by JIRA.
For more information on JIRA, see: http://www.atlassian.com/software/jira




[jira] [Updated] (CASSANDRA-3195) Cassandra-CLI does not allow Config as column family name

2011-09-14 Thread Pavel Yaskevich (JIRA)

 [ 
https://issues.apache.org/jira/browse/CASSANDRA-3195?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel
 ]

Pavel Yaskevich updated CASSANDRA-3195:
---

Attachment: CASSANDRA-3195.patch

CLI supports only single-quotes. Patch to support quoting of the ColumnFamily 
name is attached (`update column family` statement already supports that) and 
test for that.

 Cassandra-CLI does not allow Config as column family name
 ---

 Key: CASSANDRA-3195
 URL: https://issues.apache.org/jira/browse/CASSANDRA-3195
 Project: Cassandra
  Issue Type: Bug
  Components: Tools
Affects Versions: 0.8.5
Reporter: Mauri Tikka
Assignee: Pavel Yaskevich
Priority: Minor
 Attachments: CASSANDRA-3195.patch


 create column family Config does not work, create column family Configg 
 does.
 I suppose the intent is that column families can be named freely, that they 
 have a namespace completely of their own, and separate from, say, 
 Cassandra-CLI commands.

--
This message is automatically generated by JIRA.
For more information on JIRA, see: http://www.atlassian.com/software/jira




[jira] [Commented] (CASSANDRA-3195) Cassandra-CLI does not allow Config as column family name

2011-09-14 Thread Jonathan Ellis (JIRA)

[ 
https://issues.apache.org/jira/browse/CASSANDRA-3195?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanelfocusedCommentId=13104438#comment-13104438
 ] 

Jonathan Ellis commented on CASSANDRA-3195:
---

+1

 Cassandra-CLI does not allow Config as column family name
 ---

 Key: CASSANDRA-3195
 URL: https://issues.apache.org/jira/browse/CASSANDRA-3195
 Project: Cassandra
  Issue Type: Bug
  Components: Tools
Affects Versions: 0.8.5
Reporter: Mauri Tikka
Assignee: Pavel Yaskevich
Priority: Minor
 Fix For: 0.8.6

 Attachments: CASSANDRA-3195.patch


 create column family Config does not work, create column family Configg 
 does.
 I suppose the intent is that column families can be named freely, that they 
 have a namespace completely of their own, and separate from, say, 
 Cassandra-CLI commands.

--
This message is automatically generated by JIRA.
For more information on JIRA, see: http://www.atlassian.com/software/jira




[jira] [Commented] (CASSANDRA-3200) Repair: compare all trees together (for a given range/cf) instead of by pair in isolation

2011-09-14 Thread Jonathan Ellis (JIRA)

[ 
https://issues.apache.org/jira/browse/CASSANDRA-3200?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanelfocusedCommentId=13104436#comment-13104436
 ] 

Jonathan Ellis commented on CASSANDRA-3200:
---

bq. it's actually not a complicated patch

Really?  Doesn't it require a lot more coordination between replicas?

 Repair: compare all trees together (for a given range/cf) instead of by pair 
 in isolation
 -

 Key: CASSANDRA-3200
 URL: https://issues.apache.org/jira/browse/CASSANDRA-3200
 Project: Cassandra
  Issue Type: Improvement
  Components: Core
Reporter: Sylvain Lebresne
Assignee: Sylvain Lebresne
Priority: Minor
  Labels: repair
 Fix For: 1.0.1


 Currently, repair compare merkle trees by pair, in isolation of any other 
 tree. What that means concretely is that if I have three node A, B and C 
 (RF=3) with A and B in sync, but C having some range r inconsitent with both 
 A and B (since those are consistent), we will do the following transfer of r: 
 A - C, C - A, B - C, C - B.
 The fact that we do both A - C and C - A is fine, because we cannot know 
 which one is more to date from A or C. However, the transfer B - C is 
 useless provided we do A - C if A and B are in sync. Not doing that transfer 
 will be a 25% improvement in that case. With RF=5 and only one node 
 inconsistent with all the others, that almost a 40% improvement, etc...
 Given that this situation of one node not in sync while the others are is 
 probably fairly common (one node died so it is behind), this could be a fair 
 improvement over what is transferred. In the case where we use repair to 
 rebuild completely a node, this will be a dramatic improvement, because it 
 will avoid the rebuilded node to get RF times the data it should get.

--
This message is automatically generated by JIRA.
For more information on JIRA, see: http://www.atlassian.com/software/jira




svn commit: r1170555 - in /cassandra/branches/cassandra-0.8: CHANGES.txt src/java/org/apache/cassandra/cli/CliClient.java test/unit/org/apache/cassandra/cli/CliTest.java

2011-09-14 Thread xedin
Author: xedin
Date: Wed Sep 14 12:06:39 2011
New Revision: 1170555

URL: http://svn.apache.org/viewvc?rev=1170555view=rev
Log:
Allow quoting of the ColumnFamily name in CLI `create column family` statement
patch by Pavel Yaskevich; reviewed by Jonathan Ellis for CASSANDRA-3195

Modified:
cassandra/branches/cassandra-0.8/CHANGES.txt

cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/cli/CliClient.java

cassandra/branches/cassandra-0.8/test/unit/org/apache/cassandra/cli/CliTest.java

Modified: cassandra/branches/cassandra-0.8/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.8/CHANGES.txt?rev=1170555r1=1170554r2=1170555view=diff
==
--- cassandra/branches/cassandra-0.8/CHANGES.txt (original)
+++ cassandra/branches/cassandra-0.8/CHANGES.txt Wed Sep 14 12:06:39 2011
@@ -17,7 +17,8 @@
decommission (CASSANDRA-3041)
  * Fix divide by zero error in GCInspector
  * revert CASSANDRA-2388
-
+ * allow quoting of the ColumnFamily name in CLI `create column family`
+   statement (CASSANDRA-3195)
 
 0.8.5
  * fix NPE when encryption_options is unspecified (CASSANDRA-3007)

Modified: 
cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/cli/CliClient.java
URL: 
http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/cli/CliClient.java?rev=1170555r1=1170554r2=1170555view=diff
==
--- 
cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/cli/CliClient.java
 (original)
+++ 
cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/cli/CliClient.java
 Wed Sep 14 12:06:39 2011
@@ -1023,7 +1023,7 @@ public class CliClient
 return;
 
 // first value is the column family name, after that it is all 
key=value
-CfDef cfDef = new CfDef(keySpace, statement.getChild(0).getText());
+CfDef cfDef = new CfDef(keySpace, 
CliUtils.unescapeSQLString(statement.getChild(0).getText()));
 
 try
 {

Modified: 
cassandra/branches/cassandra-0.8/test/unit/org/apache/cassandra/cli/CliTest.java
URL: 
http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.8/test/unit/org/apache/cassandra/cli/CliTest.java?rev=1170555r1=1170554r2=1170555view=diff
==
--- 
cassandra/branches/cassandra-0.8/test/unit/org/apache/cassandra/cli/CliTest.java
 (original)
+++ 
cassandra/branches/cassandra-0.8/test/unit/org/apache/cassandra/cli/CliTest.java
 Wed Sep 14 12:06:39 2011
@@ -109,7 +109,7 @@ public class CliTest extends CleanupHelp
 set sCf1['hello'][1][] = Long(1234);,
 del sCf1['hello'][];,
 get sCf1['hello'][1][];,
-create column family Counter1 with comparator=UTF8Type and 
default_validation_class=CounterColumnType;,
+create column family 'Counter1' with comparator=UTF8Type and 
default_validation_class=CounterColumnType;,
 assume Counter1 keys as utf8;,
 incr Counter1['hello']['cassandra'];,
 incr Counter1['hello']['cassandra'] by 3;,




[jira] [Commented] (CASSANDRA-3200) Repair: compare all trees together (for a given range/cf) instead of by pair in isolation

2011-09-14 Thread Sylvain Lebresne (JIRA)

[ 
https://issues.apache.org/jira/browse/CASSANDRA-3200?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanelfocusedCommentId=1310#comment-1310
 ] 

Sylvain Lebresne commented on CASSANDRA-3200:
-

bq. Doesn't it require a lot more coordination between replicas?

No. For a given range and cf, we already wait to have all the trees for that 
range and cf before scheduling the streaming repair.

 Repair: compare all trees together (for a given range/cf) instead of by pair 
 in isolation
 -

 Key: CASSANDRA-3200
 URL: https://issues.apache.org/jira/browse/CASSANDRA-3200
 Project: Cassandra
  Issue Type: Improvement
  Components: Core
Reporter: Sylvain Lebresne
Assignee: Sylvain Lebresne
Priority: Minor
  Labels: repair
 Fix For: 1.0.1


 Currently, repair compare merkle trees by pair, in isolation of any other 
 tree. What that means concretely is that if I have three node A, B and C 
 (RF=3) with A and B in sync, but C having some range r inconsitent with both 
 A and B (since those are consistent), we will do the following transfer of r: 
 A - C, C - A, B - C, C - B.
 The fact that we do both A - C and C - A is fine, because we cannot know 
 which one is more to date from A or C. However, the transfer B - C is 
 useless provided we do A - C if A and B are in sync. Not doing that transfer 
 will be a 25% improvement in that case. With RF=5 and only one node 
 inconsistent with all the others, that almost a 40% improvement, etc...
 Given that this situation of one node not in sync while the others are is 
 probably fairly common (one node died so it is behind), this could be a fair 
 improvement over what is transferred. In the case where we use repair to 
 rebuild completely a node, this will be a dramatic improvement, because it 
 will avoid the rebuilded node to get RF times the data it should get.

--
This message is automatically generated by JIRA.
For more information on JIRA, see: http://www.atlassian.com/software/jira




svn commit: r1170581 - in /cassandra/branches/cassandra-1.0: ./ contrib/ debian/ interface/thrift/gen-java/org/apache/cassandra/thrift/ src/java/org/apache/cassandra/cql/jdbc/ src/java/org/apache/cass

2011-09-14 Thread jbellis
Author: jbellis
Date: Wed Sep 14 12:53:47 2011
New Revision: 1170581

URL: http://svn.apache.org/viewvc?rev=1170581view=rev
Log:
merge from 1.0.0

Modified:
cassandra/branches/cassandra-1.0/   (props changed)
cassandra/branches/cassandra-1.0/CHANGES.txt
cassandra/branches/cassandra-1.0/NEWS.txt
cassandra/branches/cassandra-1.0/NOTICE.txt
cassandra/branches/cassandra-1.0/build.xml
cassandra/branches/cassandra-1.0/contrib/   (props changed)
cassandra/branches/cassandra-1.0/debian/changelog

cassandra/branches/cassandra-1.0/interface/thrift/gen-java/org/apache/cassandra/thrift/Cassandra.java
   (props changed)

cassandra/branches/cassandra-1.0/interface/thrift/gen-java/org/apache/cassandra/thrift/Column.java
   (props changed)

cassandra/branches/cassandra-1.0/interface/thrift/gen-java/org/apache/cassandra/thrift/InvalidRequestException.java
   (props changed)

cassandra/branches/cassandra-1.0/interface/thrift/gen-java/org/apache/cassandra/thrift/NotFoundException.java
   (props changed)

cassandra/branches/cassandra-1.0/interface/thrift/gen-java/org/apache/cassandra/thrift/SuperColumn.java
   (props changed)

cassandra/branches/cassandra-1.0/src/java/org/apache/cassandra/cql/jdbc/JdbcCounterColumn.java

cassandra/branches/cassandra-1.0/src/java/org/apache/cassandra/cql/jdbc/TypesMap.java

cassandra/branches/cassandra-1.0/src/java/org/apache/cassandra/db/columniterator/ICountableColumnIterator.java

cassandra/branches/cassandra-1.0/src/java/org/apache/cassandra/db/compaction/AbstractCompactionIterable.java

cassandra/branches/cassandra-1.0/src/java/org/apache/cassandra/db/compaction/AbstractCompactionStrategy.java

cassandra/branches/cassandra-1.0/src/java/org/apache/cassandra/db/compaction/LeveledCompactionStrategy.java

cassandra/branches/cassandra-1.0/src/java/org/apache/cassandra/db/compaction/LeveledCompactionTask.java

cassandra/branches/cassandra-1.0/src/java/org/apache/cassandra/db/compaction/LeveledManifest.java

cassandra/branches/cassandra-1.0/src/java/org/apache/cassandra/locator/Ec2MultiRegionSnitch.java

cassandra/branches/cassandra-1.0/src/java/org/apache/cassandra/notifications/INotification.java

cassandra/branches/cassandra-1.0/src/java/org/apache/cassandra/notifications/INotificationConsumer.java

cassandra/branches/cassandra-1.0/src/java/org/apache/cassandra/notifications/SSTableAddedNotification.java

cassandra/branches/cassandra-1.0/src/java/org/apache/cassandra/notifications/SSTableListChangedNotification.java

cassandra/branches/cassandra-1.0/src/java/org/apache/cassandra/utils/IntervalTree/Interval.java

cassandra/branches/cassandra-1.0/src/java/org/apache/cassandra/utils/IntervalTree/IntervalNode.java

cassandra/branches/cassandra-1.0/src/java/org/apache/cassandra/utils/IntervalTree/IntervalTree.java

cassandra/branches/cassandra-1.0/test/unit/org/apache/cassandra/db/ArrayBackedSortedColumnsTest.java

cassandra/branches/cassandra-1.0/test/unit/org/apache/cassandra/net/MessageSerializer.java

cassandra/branches/cassandra-1.0/test/unit/org/apache/cassandra/utils/IntervalTest.java

cassandra/branches/cassandra-1.0/test/unit/org/apache/cassandra/utils/IntervalTreeTest.java

Propchange: cassandra/branches/cassandra-1.0/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Sep 14 12:53:47 2011
@@ -5,7 +5,7 @@
 /cassandra/branches/cassandra-0.8.0:1125021-1130369
 /cassandra/branches/cassandra-0.8.1:1101014-1125018
 /cassandra/branches/cassandra-1.0:1167106,1167185
-/cassandra/branches/cassandra-1.0.0:1167104-1170360
+/cassandra/branches/cassandra-1.0.0:1167104-1170580
 /cassandra/tags/cassandra-0.7.0-rc3:1051699-1053689
 /cassandra/tags/cassandra-0.8.0-rc1:1102511-1125020
 /cassandra/trunk:1167085-1167102,1169870

Modified: cassandra/branches/cassandra-1.0/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/cassandra/branches/cassandra-1.0/CHANGES.txt?rev=1170581r1=1170580r2=1170581view=diff
==
--- cassandra/branches/cassandra-1.0/CHANGES.txt (original)
+++ cassandra/branches/cassandra-1.0/CHANGES.txt Wed Sep 14 12:53:47 2011
@@ -2,7 +2,7 @@
  * describe_ring should include datacenter/topology information 
(CASSANDRA-2882)
 
 
-1.0
+1.0.0-beta1
  * removed binarymemtable (CASSANDRA-2692)
  * add commitlog_total_space_in_mb to prevent fragmented logs (CASSANDRA-2427)
  * removed commitlog_rotation_threshold_in_mb configuration (CASSANDRA-2771)
@@ -76,6 +76,8 @@
  * Add RowLevel support to secondary index API (CASSANDRA-3147)
  * Make SerializingCacheProvider the default if JNA is available 
(CASSANDRA-3183)
  * Fix backwards compatibilty for CQL memtable properties (CASSANDRA-3190)
+ * Add five-minute delay before starting compactions on a restarted server
+   (CASSANDRA-3181)
 
 
 0.8.6

Modified: 

svn commit: r1170582 - in /cassandra/trunk: ./ contrib/ debian/ interface/thrift/gen-java/org/apache/cassandra/thrift/ src/java/org/apache/cassandra/cql/jdbc/ src/java/org/apache/cassandra/db/columnit

2011-09-14 Thread jbellis
Author: jbellis
Date: Wed Sep 14 12:55:02 2011
New Revision: 1170582

URL: http://svn.apache.org/viewvc?rev=1170582view=rev
Log:
merge from 1.0

Modified:
cassandra/trunk/   (props changed)
cassandra/trunk/CHANGES.txt
cassandra/trunk/NEWS.txt
cassandra/trunk/NOTICE.txt
cassandra/trunk/build.xml
cassandra/trunk/contrib/   (props changed)
cassandra/trunk/debian/changelog

cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/Cassandra.java
   (props changed)

cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/Column.java
   (props changed)

cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/InvalidRequestException.java
   (props changed)

cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/NotFoundException.java
   (props changed)

cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/SuperColumn.java
   (props changed)

cassandra/trunk/src/java/org/apache/cassandra/cql/jdbc/JdbcCounterColumn.java
cassandra/trunk/src/java/org/apache/cassandra/cql/jdbc/TypesMap.java

cassandra/trunk/src/java/org/apache/cassandra/db/columniterator/ICountableColumnIterator.java

cassandra/trunk/src/java/org/apache/cassandra/db/compaction/AbstractCompactionIterable.java

cassandra/trunk/src/java/org/apache/cassandra/db/compaction/AbstractCompactionStrategy.java

cassandra/trunk/src/java/org/apache/cassandra/db/compaction/LeveledCompactionStrategy.java

cassandra/trunk/src/java/org/apache/cassandra/db/compaction/LeveledCompactionTask.java

cassandra/trunk/src/java/org/apache/cassandra/db/compaction/LeveledManifest.java

cassandra/trunk/src/java/org/apache/cassandra/locator/Ec2MultiRegionSnitch.java

cassandra/trunk/src/java/org/apache/cassandra/notifications/INotification.java

cassandra/trunk/src/java/org/apache/cassandra/notifications/INotificationConsumer.java

cassandra/trunk/src/java/org/apache/cassandra/notifications/SSTableAddedNotification.java

cassandra/trunk/src/java/org/apache/cassandra/notifications/SSTableListChangedNotification.java

cassandra/trunk/src/java/org/apache/cassandra/utils/IntervalTree/Interval.java

cassandra/trunk/src/java/org/apache/cassandra/utils/IntervalTree/IntervalNode.java

cassandra/trunk/src/java/org/apache/cassandra/utils/IntervalTree/IntervalTree.java

cassandra/trunk/test/unit/org/apache/cassandra/db/ArrayBackedSortedColumnsTest.java
cassandra/trunk/test/unit/org/apache/cassandra/net/MessageSerializer.java
cassandra/trunk/test/unit/org/apache/cassandra/utils/IntervalTest.java
cassandra/trunk/test/unit/org/apache/cassandra/utils/IntervalTreeTest.java

Propchange: cassandra/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Sep 14 12:55:02 2011
@@ -4,8 +4,8 @@
 /cassandra/branches/cassandra-0.8:1090934-1125013,1125019-1170335
 /cassandra/branches/cassandra-0.8.0:1125021-1130369
 /cassandra/branches/cassandra-0.8.1:1101014-1125018
-/cassandra/branches/cassandra-1.0:1167085-1170361
-/cassandra/branches/cassandra-1.0.0:1167104-1167229,1167232-1170360
+/cassandra/branches/cassandra-1.0:1167085-1170581
+/cassandra/branches/cassandra-1.0.0:1167104-1167229,1167232-1170580
 /cassandra/tags/cassandra-0.7.0-rc3:1051699-1053689
 /cassandra/tags/cassandra-0.8.0-rc1:1102511-1125020
 /incubator/cassandra/branches/cassandra-0.3:774578-796573

Modified: cassandra/trunk/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/cassandra/trunk/CHANGES.txt?rev=1170582r1=1170581r2=1170582view=diff
==
--- cassandra/trunk/CHANGES.txt (original)
+++ cassandra/trunk/CHANGES.txt Wed Sep 14 12:55:02 2011
@@ -2,7 +2,7 @@
  * describe_ring should include datacenter/topology information 
(CASSANDRA-2882)
 
 
-1.0
+1.0.0-beta1
  * removed binarymemtable (CASSANDRA-2692)
  * add commitlog_total_space_in_mb to prevent fragmented logs (CASSANDRA-2427)
  * removed commitlog_rotation_threshold_in_mb configuration (CASSANDRA-2771)
@@ -76,6 +76,8 @@
  * Add RowLevel support to secondary index API (CASSANDRA-3147)
  * Make SerializingCacheProvider the default if JNA is available 
(CASSANDRA-3183)
  * Fix backwards compatibilty for CQL memtable properties (CASSANDRA-3190)
+ * Add five-minute delay before starting compactions on a restarted server
+   (CASSANDRA-3181)
 
 
 0.8.6

Modified: cassandra/trunk/NEWS.txt
URL: 
http://svn.apache.org/viewvc/cassandra/trunk/NEWS.txt?rev=1170582r1=1170581r2=1170582view=diff
==
--- cassandra/trunk/NEWS.txt (original)
+++ cassandra/trunk/NEWS.txt Wed Sep 14 12:55:02 2011
@@ -60,6 +60,10 @@ Other
   This does not affect client compatibility -- the old options are
   still allowed, but have no effect.  These options may be removed
   entirely in a 

buildbot failure in ASF Buildbot on cassandra-trunk

2011-09-14 Thread buildbot
The Buildbot has detected a new failure on builder cassandra-trunk while 
building ASF Buildbot.
Full details are available at:
 http://ci.apache.org/builders/cassandra-trunk/builds/1664

Buildbot URL: http://ci.apache.org/

Buildslave for this Build: isis_ubuntu

Build Reason: scheduler
Build Source Stamp: [branch cassandra/trunk] 1170582
Blamelist: jbellis

BUILD FAILED: failed compile

sincerely,
 -The Buildbot



[jira] [Updated] (CASSANDRA-3181) Compaction fails to occur

2011-09-14 Thread Jonathan Ellis (JIRA)

 [ 
https://issues.apache.org/jira/browse/CASSANDRA-3181?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel
 ]

Jonathan Ellis updated CASSANDRA-3181:
--

Attachment: 3181-2.txt

patch to keep shutdown from waiting for the compaction kickoff

 Compaction fails to occur
 -

 Key: CASSANDRA-3181
 URL: https://issues.apache.org/jira/browse/CASSANDRA-3181
 Project: Cassandra
  Issue Type: Bug
  Components: Core
Affects Versions: 1.0.0
Reporter: Brandon Williams
Assignee: Jonathan Ellis
  Labels: compaction
 Fix For: 1.0.0

 Attachments: 3181-2.txt, 3181.txt


 Compaction just stops running at some point.  To repro, insert like 20M rows 
 with a 1G heap and you'll get around 1k sstables.  Restarting doesn't help, 
 you have to invoke a major to get anything to happen.

--
This message is automatically generated by JIRA.
For more information on JIRA, see: http://www.atlassian.com/software/jira




[jira] [Commented] (CASSANDRA-3181) Compaction fails to occur

2011-09-14 Thread Sylvain Lebresne (JIRA)

[ 
https://issues.apache.org/jira/browse/CASSANDRA-3181?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanelfocusedCommentId=13104481#comment-13104481
 ] 

Sylvain Lebresne commented on CASSANDRA-3181:
-

+1

 Compaction fails to occur
 -

 Key: CASSANDRA-3181
 URL: https://issues.apache.org/jira/browse/CASSANDRA-3181
 Project: Cassandra
  Issue Type: Bug
  Components: Core
Affects Versions: 1.0.0
Reporter: Brandon Williams
Assignee: Jonathan Ellis
  Labels: compaction
 Fix For: 1.0.0

 Attachments: 3181-2.txt, 3181.txt


 Compaction just stops running at some point.  To repro, insert like 20M rows 
 with a 1G heap and you'll get around 1k sstables.  Restarting doesn't help, 
 you have to invoke a major to get anything to happen.

--
This message is automatically generated by JIRA.
For more information on JIRA, see: http://www.atlassian.com/software/jira




svn commit: r1170608 - in /cassandra/branches/cassandra-1.0.0/src/java/org/apache/cassandra: cache/AutoSavingCache.java db/ColumnFamilyStore.java db/HintedHandOffManager.java db/compaction/AbstractCom

2011-09-14 Thread jbellis
Author: jbellis
Date: Wed Sep 14 13:31:47 2011
New Revision: 1170608

URL: http://svn.apache.org/viewvc?rev=1170608view=rev
Log:
keep shutdown from waiting for the compaction kickoff
patch by jbellis; reviewed by slebresne for CASSANDRA-3181

Modified:

cassandra/branches/cassandra-1.0.0/src/java/org/apache/cassandra/cache/AutoSavingCache.java

cassandra/branches/cassandra-1.0.0/src/java/org/apache/cassandra/db/ColumnFamilyStore.java

cassandra/branches/cassandra-1.0.0/src/java/org/apache/cassandra/db/HintedHandOffManager.java

cassandra/branches/cassandra-1.0.0/src/java/org/apache/cassandra/db/compaction/AbstractCompactionStrategy.java

cassandra/branches/cassandra-1.0.0/src/java/org/apache/cassandra/service/StorageService.java

Modified: 
cassandra/branches/cassandra-1.0.0/src/java/org/apache/cassandra/cache/AutoSavingCache.java
URL: 
http://svn.apache.org/viewvc/cassandra/branches/cassandra-1.0.0/src/java/org/apache/cassandra/cache/AutoSavingCache.java?rev=1170608r1=1170607r2=1170608view=diff
==
--- 
cassandra/branches/cassandra-1.0.0/src/java/org/apache/cassandra/cache/AutoSavingCache.java
 (original)
+++ 
cassandra/branches/cassandra-1.0.0/src/java/org/apache/cassandra/cache/AutoSavingCache.java
 Wed Sep 14 13:31:47 2011
@@ -22,23 +22,24 @@ import java.io.*;
 import java.nio.ByteBuffer;
 import java.util.Set;
 import java.util.TreeSet;
-import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.concurrent.Future;
 import java.util.concurrent.ScheduledFuture;
 import java.util.concurrent.TimeUnit;
+import java.util.concurrent.atomic.AtomicBoolean;
 
-import org.apache.cassandra.config.Schema;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import org.apache.cassandra.config.CFMetaData;
 import org.apache.cassandra.config.DatabaseDescriptor;
+import org.apache.cassandra.config.Schema;
 import org.apache.cassandra.db.ColumnFamilyStore;
+import org.apache.cassandra.db.DecoratedKey;
 import org.apache.cassandra.db.compaction.CompactionInfo;
 import org.apache.cassandra.db.compaction.CompactionManager;
-import org.apache.cassandra.db.DecoratedKey;
 import org.apache.cassandra.db.compaction.OperationType;
-import org.apache.cassandra.io.util.*;
+import org.apache.cassandra.io.util.FileUtils;
+import org.apache.cassandra.io.util.SequentialWriter;
 import org.apache.cassandra.service.StorageService;
 import org.apache.cassandra.utils.ByteBufferUtil;
 import org.apache.cassandra.utils.FBUtilities;
@@ -99,10 +100,10 @@ public abstract class AutoSavingCacheK,
 submitWrite(keysToSave);
 }
 };
-saveTask = StorageService.tasks.scheduleWithFixedDelay(runnable,
-   
savePeriodInSeconds,
-   
savePeriodInSeconds,
-   
TimeUnit.SECONDS);
+saveTask = 
StorageService.optionalTasks.scheduleWithFixedDelay(runnable,
+   
savePeriodInSeconds,
+   
savePeriodInSeconds,
+   
TimeUnit.SECONDS);
 }
 }
 

Modified: 
cassandra/branches/cassandra-1.0.0/src/java/org/apache/cassandra/db/ColumnFamilyStore.java
URL: 
http://svn.apache.org/viewvc/cassandra/branches/cassandra-1.0.0/src/java/org/apache/cassandra/db/ColumnFamilyStore.java?rev=1170608r1=1170607r2=1170608view=diff
==
--- 
cassandra/branches/cassandra-1.0.0/src/java/org/apache/cassandra/db/ColumnFamilyStore.java
 (original)
+++ 
cassandra/branches/cassandra-1.0.0/src/java/org/apache/cassandra/db/ColumnFamilyStore.java
 Wed Sep 14 13:31:47 2011
@@ -90,7 +90,7 @@ public class ColumnFamilyStore implement
 static
 {
 // (can block if flush queue fills up, so don't put on scheduledTasks)
-StorageService.tasks.scheduleWithFixedDelay(new MeteredFlusher(), 
1000, 1000, TimeUnit.MILLISECONDS);
+StorageService.optionalTasks.scheduleWithFixedDelay(new 
MeteredFlusher(), 1000, 1000, TimeUnit.MILLISECONDS);
 }
 
 public final Table table;

Modified: 
cassandra/branches/cassandra-1.0.0/src/java/org/apache/cassandra/db/HintedHandOffManager.java
URL: 
http://svn.apache.org/viewvc/cassandra/branches/cassandra-1.0.0/src/java/org/apache/cassandra/db/HintedHandOffManager.java?rev=1170608r1=1170607r2=1170608view=diff
==
--- 
cassandra/branches/cassandra-1.0.0/src/java/org/apache/cassandra/db/HintedHandOffManager.java
 (original)
+++ 

svn commit: r1170610 - in /cassandra/trunk: ./ contrib/ interface/thrift/gen-java/org/apache/cassandra/thrift/ src/java/org/apache/cassandra/cache/ src/java/org/apache/cassandra/db/ src/java/org/apach

2011-09-14 Thread jbellis
Author: jbellis
Date: Wed Sep 14 13:34:02 2011
New Revision: 1170610

URL: http://svn.apache.org/viewvc?rev=1170610view=rev
Log:
merge from 1.0

Modified:
cassandra/trunk/   (props changed)
cassandra/trunk/contrib/   (props changed)

cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/Cassandra.java
   (props changed)

cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/Column.java
   (props changed)

cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/InvalidRequestException.java
   (props changed)

cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/NotFoundException.java
   (props changed)

cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/SuperColumn.java
   (props changed)
cassandra/trunk/src/java/org/apache/cassandra/cache/AutoSavingCache.java
cassandra/trunk/src/java/org/apache/cassandra/db/ColumnFamilyStore.java
cassandra/trunk/src/java/org/apache/cassandra/db/HintedHandOffManager.java

cassandra/trunk/src/java/org/apache/cassandra/db/compaction/AbstractCompactionStrategy.java
cassandra/trunk/src/java/org/apache/cassandra/service/StorageService.java

Propchange: cassandra/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Sep 14 13:34:02 2011
@@ -4,8 +4,8 @@
 /cassandra/branches/cassandra-0.8:1090934-1125013,1125019-1170335
 /cassandra/branches/cassandra-0.8.0:1125021-1130369
 /cassandra/branches/cassandra-0.8.1:1101014-1125018
-/cassandra/branches/cassandra-1.0:1167085-1170581
-/cassandra/branches/cassandra-1.0.0:1167104-1167229,1167232-1170580
+/cassandra/branches/cassandra-1.0:1167085-1170609
+/cassandra/branches/cassandra-1.0.0:1167104-1167229,1167232-1170608
 /cassandra/tags/cassandra-0.7.0-rc3:1051699-1053689
 /cassandra/tags/cassandra-0.8.0-rc1:1102511-1125020
 /incubator/cassandra/branches/cassandra-0.3:774578-796573

Propchange: cassandra/trunk/contrib/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Sep 14 13:34:02 2011
@@ -4,8 +4,8 @@
 /cassandra/branches/cassandra-0.8/contrib:1090934-1125013,1125019-1170335
 /cassandra/branches/cassandra-0.8.0/contrib:1125021-1130369
 /cassandra/branches/cassandra-0.8.1/contrib:1101014-1125018
-/cassandra/branches/cassandra-1.0/contrib:1167085-1170581
-/cassandra/branches/cassandra-1.0.0/contrib:1167104-1167229,1167232-1170580
+/cassandra/branches/cassandra-1.0/contrib:1167085-1170609
+/cassandra/branches/cassandra-1.0.0/contrib:1167104-1167229,1167232-1170608
 /cassandra/tags/cassandra-0.7.0-rc3/contrib:1051699-1053689
 /cassandra/tags/cassandra-0.8.0-rc1/contrib:1102511-1125020
 /incubator/cassandra/branches/cassandra-0.3/contrib:774578-796573

Propchange: 
cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/Cassandra.java
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Sep 14 13:34:02 2011
@@ -4,8 +4,8 @@
 
/cassandra/branches/cassandra-0.8/interface/thrift/gen-java/org/apache/cassandra/thrift/Cassandra.java:1090934-1125013,1125019-1170335
 
/cassandra/branches/cassandra-0.8.0/interface/thrift/gen-java/org/apache/cassandra/thrift/Cassandra.java:1125021-1130369
 
/cassandra/branches/cassandra-0.8.1/interface/thrift/gen-java/org/apache/cassandra/thrift/Cassandra.java:1101014-1125018
-/cassandra/branches/cassandra-1.0/interface/thrift/gen-java/org/apache/cassandra/thrift/Cassandra.java:1167085-1170581
-/cassandra/branches/cassandra-1.0.0/interface/thrift/gen-java/org/apache/cassandra/thrift/Cassandra.java:1167104-1167229,1167232-1170580
+/cassandra/branches/cassandra-1.0/interface/thrift/gen-java/org/apache/cassandra/thrift/Cassandra.java:1167085-1170609
+/cassandra/branches/cassandra-1.0.0/interface/thrift/gen-java/org/apache/cassandra/thrift/Cassandra.java:1167104-1167229,1167232-1170608
 
/cassandra/tags/cassandra-0.7.0-rc3/interface/thrift/gen-java/org/apache/cassandra/thrift/Cassandra.java:1051699-1053689
 
/cassandra/tags/cassandra-0.8.0-rc1/interface/thrift/gen-java/org/apache/cassandra/thrift/Cassandra.java:1102511-1125020
 
/incubator/cassandra/branches/cassandra-0.3/interface/gen-java/org/apache/cassandra/service/Cassandra.java:774578-796573

Propchange: 
cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/Column.java
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Sep 14 13:34:02 2011
@@ -4,8 +4,8 @@
 
/cassandra/branches/cassandra-0.8/interface/thrift/gen-java/org/apache/cassandra/thrift/Column.java:1090934-1125013,1125019-1170335
 
/cassandra/branches/cassandra-0.8.0/interface/thrift/gen-java/org/apache/cassandra/thrift/Column.java:1125021-1130369
 

buildbot success in ASF Buildbot on cassandra-trunk

2011-09-14 Thread buildbot
The Buildbot has detected a restored build on builder cassandra-trunk while 
building ASF Buildbot.
Full details are available at:
 http://ci.apache.org/builders/cassandra-trunk/builds/1665

Buildbot URL: http://ci.apache.org/

Buildslave for this Build: isis_ubuntu

Build Reason: scheduler
Build Source Stamp: [branch cassandra/trunk] 1170610
Blamelist: jbellis

Build succeeded!

sincerely,
 -The Buildbot



[jira] [Commented] (CASSANDRA-3198) debian packaging installation problem when installing for the first time

2011-09-14 Thread Sylvain Lebresne (JIRA)

[ 
https://issues.apache.org/jira/browse/CASSANDRA-3198?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanelfocusedCommentId=13104501#comment-13104501
 ] 

Sylvain Lebresne commented on CASSANDRA-3198:
-

That second patch looks good, but maybe we should change that 0.6.4-2 to 0.8.6. 
Eric, since you initially added that test, an opinion ?

 debian packaging installation problem when installing for the first time
 

 Key: CASSANDRA-3198
 URL: https://issues.apache.org/jira/browse/CASSANDRA-3198
 Project: Cassandra
  Issue Type: Bug
  Components: Packaging
Affects Versions: 0.8.5
Reporter: Jérémy Sevellec
Assignee: Jérémy Sevellec
 Fix For: 0.8.6

 Attachments: debian-postinst-fixperms.patch, trunk-3198-v1.patch


 when installing cassandra through the debian packaging for the first time, 
 there is permission problem when starting Cassandra.
 Normally, the postinst script change owner of /var/log/cassandra and 
 /var/lib/cassandra from root to cassandra user.
 there is a problem with the test which verify if threre is a need to change 
 the owner of these directory or not.
 On a new install, the $2 parameter is not set and the the test is false and 
 the owner is not changed.
 (simply, i think replace  with || might work)

--
This message is automatically generated by JIRA.
For more information on JIRA, see: http://www.atlassian.com/software/jira




svn commit: r1170637 - /cassandra/branches/cassandra-0.8/NEWS.txt

2011-09-14 Thread jbellis
Author: jbellis
Date: Wed Sep 14 14:16:06 2011
New Revision: 1170637

URL: http://svn.apache.org/viewvc?rev=1170637view=rev
Log:
add scrub note to NEWS

Modified:
cassandra/branches/cassandra-0.8/NEWS.txt

Modified: cassandra/branches/cassandra-0.8/NEWS.txt
URL: 
http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.8/NEWS.txt?rev=1170637r1=1170636r2=1170637view=diff
==
--- cassandra/branches/cassandra-0.8/NEWS.txt (original)
+++ cassandra/branches/cassandra-0.8/NEWS.txt Wed Sep 14 14:16:06 2011
@@ -115,7 +115,9 @@ Upgrading
 -
 - Upgrading from version 0.7.1 or later can be done with a rolling
   restart, one node at a time.  You do not need to bring down the
-  whole cluster at once.
+  whole cluster at once. 
+- After upgrading, run nodetool scrub against each node before running
+  repair, moving nodes, or adding new ones.
 - Running nodetool drain before shutting down the 0.7 node is
   recommended but not required. (Skipping this will result in
   replay of entire commitlog, so it will take longer to restart but




[jira] [Created] (CASSANDRA-3205) ColumnFamily.cloneMeShallow doesn't respect the insertionOrdered flag (for ArrayBackedSortedColumns)

2011-09-14 Thread Sylvain Lebresne (JIRA)
ColumnFamily.cloneMeShallow doesn't respect the insertionOrdered flag (for 
ArrayBackedSortedColumns)


 Key: CASSANDRA-3205
 URL: https://issues.apache.org/jira/browse/CASSANDRA-3205
 Project: Cassandra
  Issue Type: Bug
  Components: Core
Affects Versions: 1.0.0
Reporter: Sylvain Lebresne
Assignee: Sylvain Lebresne
Priority: Minor
 Fix For: 1.0.0




--
This message is automatically generated by JIRA.
For more information on JIRA, see: http://www.atlassian.com/software/jira




[jira] [Updated] (CASSANDRA-3205) ColumnFamily.cloneMeShallow doesn't respect the insertionOrdered flag (for ArrayBackedSortedColumns)

2011-09-14 Thread Sylvain Lebresne (JIRA)

 [ 
https://issues.apache.org/jira/browse/CASSANDRA-3205?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel
 ]

Sylvain Lebresne updated CASSANDRA-3205:


Attachment: 3205.patch

 ColumnFamily.cloneMeShallow doesn't respect the insertionOrdered flag (for 
 ArrayBackedSortedColumns)
 

 Key: CASSANDRA-3205
 URL: https://issues.apache.org/jira/browse/CASSANDRA-3205
 Project: Cassandra
  Issue Type: Bug
  Components: Core
Affects Versions: 1.0.0
Reporter: Sylvain Lebresne
Assignee: Sylvain Lebresne
Priority: Minor
 Fix For: 1.0.0

 Attachments: 3205.patch




--
This message is automatically generated by JIRA.
For more information on JIRA, see: http://www.atlassian.com/software/jira




[jira] [Commented] (CASSANDRA-3205) ColumnFamily.cloneMeShallow doesn't respect the insertionOrdered flag (for ArrayBackedSortedColumns)

2011-09-14 Thread Jonathan Ellis (JIRA)

[ 
https://issues.apache.org/jira/browse/CASSANDRA-3205?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanelfocusedCommentId=13104521#comment-13104521
 ] 

Jonathan Ellis commented on CASSANDRA-3205:
---

+1

 ColumnFamily.cloneMeShallow doesn't respect the insertionOrdered flag (for 
 ArrayBackedSortedColumns)
 

 Key: CASSANDRA-3205
 URL: https://issues.apache.org/jira/browse/CASSANDRA-3205
 Project: Cassandra
  Issue Type: Bug
  Components: Core
Affects Versions: 1.0.0
Reporter: Sylvain Lebresne
Assignee: Sylvain Lebresne
Priority: Minor
 Fix For: 1.0.0

 Attachments: 3205.patch




--
This message is automatically generated by JIRA.
For more information on JIRA, see: http://www.atlassian.com/software/jira




svn commit: r1170641 - in /cassandra/branches/cassandra-1.0.0: ./ src/java/org/apache/cassandra/db/

2011-09-14 Thread slebresne
Author: slebresne
Date: Wed Sep 14 14:29:28 2011
New Revision: 1170641

URL: http://svn.apache.org/viewvc?rev=1170641view=rev
Log:
Make ColumnFamily.cloneMeShallow doesn't respect the insertionOrdered flag
patch by slebresne; reviewed by jbellis for CASSANDRA-3205

Modified:
cassandra/branches/cassandra-1.0.0/CHANGES.txt

cassandra/branches/cassandra-1.0.0/src/java/org/apache/cassandra/db/ArrayBackedSortedColumns.java

cassandra/branches/cassandra-1.0.0/src/java/org/apache/cassandra/db/ColumnFamily.java

cassandra/branches/cassandra-1.0.0/src/java/org/apache/cassandra/db/ColumnFamilyStore.java

cassandra/branches/cassandra-1.0.0/src/java/org/apache/cassandra/db/ISortedColumns.java

cassandra/branches/cassandra-1.0.0/src/java/org/apache/cassandra/db/ThreadSafeSortedColumns.java

cassandra/branches/cassandra-1.0.0/src/java/org/apache/cassandra/db/TreeMapBackedSortedColumns.java

Modified: cassandra/branches/cassandra-1.0.0/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/cassandra/branches/cassandra-1.0.0/CHANGES.txt?rev=1170641r1=1170640r2=1170641view=diff
==
--- cassandra/branches/cassandra-1.0.0/CHANGES.txt (original)
+++ cassandra/branches/cassandra-1.0.0/CHANGES.txt Wed Sep 14 14:29:28 2011
@@ -29,7 +29,7 @@
  * add scheduler JMX metrics (CASSANDRA-2962)
  * add block level checksum for compressed data (CASSANDRA-1717)
  * make column family backed column map pluggable and introduce unsynchronized
-   ArrayList backed one to speedup reads (CASSANDRA-2843, 3165)
+   ArrayList backed one to speedup reads (CASSANDRA-2843, 3165, 3205)
  * refactoring of the secondary index api (CASSANDRA-2982)
  * make CL  ONE reads wait for digest reconciliation before returning
(CASSANDRA-2494)

Modified: 
cassandra/branches/cassandra-1.0.0/src/java/org/apache/cassandra/db/ArrayBackedSortedColumns.java
URL: 
http://svn.apache.org/viewvc/cassandra/branches/cassandra-1.0.0/src/java/org/apache/cassandra/db/ArrayBackedSortedColumns.java?rev=1170641r1=1170640r2=1170641view=diff
==
--- 
cassandra/branches/cassandra-1.0.0/src/java/org/apache/cassandra/db/ArrayBackedSortedColumns.java
 (original)
+++ 
cassandra/branches/cassandra-1.0.0/src/java/org/apache/cassandra/db/ArrayBackedSortedColumns.java
 Wed Sep 14 14:29:28 2011
@@ -82,6 +82,11 @@ public class ArrayBackedSortedColumns ex
 return new ArrayBackedSortedColumns(this, comparator, reversed);
 }
 
+public boolean isInsertReversed()
+{
+return reversed;
+}
+
 private int compare(ByteBuffer name1, ByteBuffer name2)
 {
 if (reversed)

Modified: 
cassandra/branches/cassandra-1.0.0/src/java/org/apache/cassandra/db/ColumnFamily.java
URL: 
http://svn.apache.org/viewvc/cassandra/branches/cassandra-1.0.0/src/java/org/apache/cassandra/db/ColumnFamily.java?rev=1170641r1=1170640r2=1170641view=diff
==
--- 
cassandra/branches/cassandra-1.0.0/src/java/org/apache/cassandra/db/ColumnFamily.java
 (original)
+++ 
cassandra/branches/cassandra-1.0.0/src/java/org/apache/cassandra/db/ColumnFamily.java
 Wed Sep 14 14:29:28 2011
@@ -81,9 +81,9 @@ public class ColumnFamily extends Abstra
 this.cfm = cfm;
 }
 
-public ColumnFamily cloneMeShallow(ISortedColumns.Factory factory)
+public ColumnFamily cloneMeShallow(ISortedColumns.Factory factory, boolean 
reversedInsertOrder)
 {
-ColumnFamily cf = ColumnFamily.create(cfm, factory);
+ColumnFamily cf = ColumnFamily.create(cfm, factory, 
reversedInsertOrder);
 // since deletion info is immutable, aliasing it is fine
 cf.deletionInfo.set(deletionInfo.get());
 return cf;
@@ -91,7 +91,7 @@ public class ColumnFamily extends Abstra
 
 public ColumnFamily cloneMeShallow()
 {
-return cloneMeShallow(columns.getFactory());
+return cloneMeShallow(columns.getFactory(), 
columns.isInsertReversed());
 }
 
 public AbstractType getSubComparator()

Modified: 
cassandra/branches/cassandra-1.0.0/src/java/org/apache/cassandra/db/ColumnFamilyStore.java
URL: 
http://svn.apache.org/viewvc/cassandra/branches/cassandra-1.0.0/src/java/org/apache/cassandra/db/ColumnFamilyStore.java?rev=1170641r1=1170640r2=1170641view=diff
==
--- 
cassandra/branches/cassandra-1.0.0/src/java/org/apache/cassandra/db/ColumnFamilyStore.java
 (original)
+++ 
cassandra/branches/cassandra-1.0.0/src/java/org/apache/cassandra/db/ColumnFamilyStore.java
 Wed Sep 14 14:29:28 2011
@@ -1194,7 +1194,7 @@ public class ColumnFamilyStore implement
 IColumn sc = cached.getColumn(filter.path.superColumnName);
 if (sc == null || sliceFilter.count = 
sc.getSubColumns().size())
 {
-  

svn commit: r1170645 - in /cassandra/branches/cassandra-1.0: ./ contrib/ interface/thrift/gen-java/org/apache/cassandra/thrift/ src/java/org/apache/cassandra/db/

2011-09-14 Thread slebresne
Author: slebresne
Date: Wed Sep 14 14:34:47 2011
New Revision: 1170645

URL: http://svn.apache.org/viewvc?rev=1170645view=rev
Log:
merge from 1.0.0

Modified:
cassandra/branches/cassandra-1.0/   (props changed)
cassandra/branches/cassandra-1.0/CHANGES.txt
cassandra/branches/cassandra-1.0/contrib/   (props changed)

cassandra/branches/cassandra-1.0/interface/thrift/gen-java/org/apache/cassandra/thrift/Cassandra.java
   (props changed)

cassandra/branches/cassandra-1.0/interface/thrift/gen-java/org/apache/cassandra/thrift/Column.java
   (props changed)

cassandra/branches/cassandra-1.0/interface/thrift/gen-java/org/apache/cassandra/thrift/InvalidRequestException.java
   (props changed)

cassandra/branches/cassandra-1.0/interface/thrift/gen-java/org/apache/cassandra/thrift/NotFoundException.java
   (props changed)

cassandra/branches/cassandra-1.0/interface/thrift/gen-java/org/apache/cassandra/thrift/SuperColumn.java
   (props changed)

cassandra/branches/cassandra-1.0/src/java/org/apache/cassandra/db/ArrayBackedSortedColumns.java

cassandra/branches/cassandra-1.0/src/java/org/apache/cassandra/db/ColumnFamily.java

cassandra/branches/cassandra-1.0/src/java/org/apache/cassandra/db/ColumnFamilyStore.java

cassandra/branches/cassandra-1.0/src/java/org/apache/cassandra/db/ISortedColumns.java

cassandra/branches/cassandra-1.0/src/java/org/apache/cassandra/db/ThreadSafeSortedColumns.java

cassandra/branches/cassandra-1.0/src/java/org/apache/cassandra/db/TreeMapBackedSortedColumns.java

Propchange: cassandra/branches/cassandra-1.0/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Sep 14 14:34:47 2011
@@ -5,7 +5,7 @@
 /cassandra/branches/cassandra-0.8.0:1125021-1130369
 /cassandra/branches/cassandra-0.8.1:1101014-1125018
 /cassandra/branches/cassandra-1.0:1167106,1167185
-/cassandra/branches/cassandra-1.0.0:1167104-1170608
+/cassandra/branches/cassandra-1.0.0:1167104-1170608,1170641
 /cassandra/tags/cassandra-0.7.0-rc3:1051699-1053689
 /cassandra/tags/cassandra-0.8.0-rc1:1102511-1125020
 /cassandra/trunk:1167085-1167102,1169870

Modified: cassandra/branches/cassandra-1.0/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/cassandra/branches/cassandra-1.0/CHANGES.txt?rev=1170645r1=1170644r2=1170645view=diff
==
--- cassandra/branches/cassandra-1.0/CHANGES.txt (original)
+++ cassandra/branches/cassandra-1.0/CHANGES.txt Wed Sep 14 14:34:47 2011
@@ -33,7 +33,7 @@
  * add scheduler JMX metrics (CASSANDRA-2962)
  * add block level checksum for compressed data (CASSANDRA-1717)
  * make column family backed column map pluggable and introduce unsynchronized
-   ArrayList backed one to speedup reads (CASSANDRA-2843, 3165)
+   ArrayList backed one to speedup reads (CASSANDRA-2843, 3165, 3205)
  * refactoring of the secondary index api (CASSANDRA-2982)
  * make CL  ONE reads wait for digest reconciliation before returning
(CASSANDRA-2494)

Propchange: cassandra/branches/cassandra-1.0/contrib/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Sep 14 14:34:47 2011
@@ -5,7 +5,7 @@
 /cassandra/branches/cassandra-0.8.0/contrib:1125021-1130369
 /cassandra/branches/cassandra-0.8.1/contrib:1101014-1125018
 /cassandra/branches/cassandra-1.0/contrib:1167106,1167185
-/cassandra/branches/cassandra-1.0.0/contrib:1167104-1170608
+/cassandra/branches/cassandra-1.0.0/contrib:1167104-1170608,1170641
 /cassandra/tags/cassandra-0.7.0-rc3/contrib:1051699-1053689
 /cassandra/tags/cassandra-0.8.0-rc1/contrib:1102511-1125020
 /cassandra/trunk/contrib:1167085-1167102,1169870

Propchange: 
cassandra/branches/cassandra-1.0/interface/thrift/gen-java/org/apache/cassandra/thrift/Cassandra.java
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Sep 14 14:34:47 2011
@@ -5,7 +5,7 @@
 
/cassandra/branches/cassandra-0.8.0/interface/thrift/gen-java/org/apache/cassandra/thrift/Cassandra.java:1125021-1130369
 
/cassandra/branches/cassandra-0.8.1/interface/thrift/gen-java/org/apache/cassandra/thrift/Cassandra.java:1101014-1125018
 
/cassandra/branches/cassandra-1.0/interface/thrift/gen-java/org/apache/cassandra/thrift/Cassandra.java:1167106,1167185
-/cassandra/branches/cassandra-1.0.0/interface/thrift/gen-java/org/apache/cassandra/thrift/Cassandra.java:1167104-1170608
+/cassandra/branches/cassandra-1.0.0/interface/thrift/gen-java/org/apache/cassandra/thrift/Cassandra.java:1167104-1170608,1170641
 
/cassandra/tags/cassandra-0.7.0-rc3/interface/thrift/gen-java/org/apache/cassandra/thrift/Cassandra.java:1051699-1053689
 
/cassandra/tags/cassandra-0.8.0-rc1/interface/thrift/gen-java/org/apache/cassandra/thrift/Cassandra.java:1102511-1125020
 

svn commit: r1170646 - in /cassandra/trunk: ./ contrib/ interface/thrift/gen-java/org/apache/cassandra/thrift/ src/java/org/apache/cassandra/db/

2011-09-14 Thread slebresne
Author: slebresne
Date: Wed Sep 14 14:36:12 2011
New Revision: 1170646

URL: http://svn.apache.org/viewvc?rev=1170646view=rev
Log:
merge from 1.0

Modified:
cassandra/trunk/   (props changed)
cassandra/trunk/CHANGES.txt
cassandra/trunk/contrib/   (props changed)

cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/Cassandra.java
   (props changed)

cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/Column.java
   (props changed)

cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/InvalidRequestException.java
   (props changed)

cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/NotFoundException.java
   (props changed)

cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/SuperColumn.java
   (props changed)

cassandra/trunk/src/java/org/apache/cassandra/db/ArrayBackedSortedColumns.java
cassandra/trunk/src/java/org/apache/cassandra/db/ColumnFamily.java
cassandra/trunk/src/java/org/apache/cassandra/db/ColumnFamilyStore.java
cassandra/trunk/src/java/org/apache/cassandra/db/ISortedColumns.java

cassandra/trunk/src/java/org/apache/cassandra/db/ThreadSafeSortedColumns.java

cassandra/trunk/src/java/org/apache/cassandra/db/TreeMapBackedSortedColumns.java

Propchange: cassandra/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Sep 14 14:36:12 2011
@@ -4,8 +4,8 @@
 /cassandra/branches/cassandra-0.8:1090934-1125013,1125019-1170335
 /cassandra/branches/cassandra-0.8.0:1125021-1130369
 /cassandra/branches/cassandra-0.8.1:1101014-1125018
-/cassandra/branches/cassandra-1.0:1167085-1170609
-/cassandra/branches/cassandra-1.0.0:1167104-1167229,1167232-1170608
+/cassandra/branches/cassandra-1.0:1167085-1170609,1170645
+/cassandra/branches/cassandra-1.0.0:1167104-1167229,1167232-1170608,1170641
 /cassandra/tags/cassandra-0.7.0-rc3:1051699-1053689
 /cassandra/tags/cassandra-0.8.0-rc1:1102511-1125020
 /incubator/cassandra/branches/cassandra-0.3:774578-796573

Modified: cassandra/trunk/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/cassandra/trunk/CHANGES.txt?rev=1170646r1=1170645r2=1170646view=diff
==
--- cassandra/trunk/CHANGES.txt (original)
+++ cassandra/trunk/CHANGES.txt Wed Sep 14 14:36:12 2011
@@ -33,7 +33,7 @@
  * add scheduler JMX metrics (CASSANDRA-2962)
  * add block level checksum for compressed data (CASSANDRA-1717)
  * make column family backed column map pluggable and introduce unsynchronized
-   ArrayList backed one to speedup reads (CASSANDRA-2843, 3165)
+   ArrayList backed one to speedup reads (CASSANDRA-2843, 3165, 3205)
  * refactoring of the secondary index api (CASSANDRA-2982)
  * make CL  ONE reads wait for digest reconciliation before returning
(CASSANDRA-2494)

Propchange: cassandra/trunk/contrib/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Sep 14 14:36:12 2011
@@ -4,8 +4,8 @@
 /cassandra/branches/cassandra-0.8/contrib:1090934-1125013,1125019-1170335
 /cassandra/branches/cassandra-0.8.0/contrib:1125021-1130369
 /cassandra/branches/cassandra-0.8.1/contrib:1101014-1125018
-/cassandra/branches/cassandra-1.0/contrib:1167085-1170609
-/cassandra/branches/cassandra-1.0.0/contrib:1167104-1167229,1167232-1170608
+/cassandra/branches/cassandra-1.0/contrib:1167085-1170609,1170645
+/cassandra/branches/cassandra-1.0.0/contrib:1167104-1167229,1167232-1170608,1170641
 /cassandra/tags/cassandra-0.7.0-rc3/contrib:1051699-1053689
 /cassandra/tags/cassandra-0.8.0-rc1/contrib:1102511-1125020
 /incubator/cassandra/branches/cassandra-0.3/contrib:774578-796573

Propchange: 
cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/Cassandra.java
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Sep 14 14:36:12 2011
@@ -4,8 +4,8 @@
 
/cassandra/branches/cassandra-0.8/interface/thrift/gen-java/org/apache/cassandra/thrift/Cassandra.java:1090934-1125013,1125019-1170335
 
/cassandra/branches/cassandra-0.8.0/interface/thrift/gen-java/org/apache/cassandra/thrift/Cassandra.java:1125021-1130369
 
/cassandra/branches/cassandra-0.8.1/interface/thrift/gen-java/org/apache/cassandra/thrift/Cassandra.java:1101014-1125018
-/cassandra/branches/cassandra-1.0/interface/thrift/gen-java/org/apache/cassandra/thrift/Cassandra.java:1167085-1170609
-/cassandra/branches/cassandra-1.0.0/interface/thrift/gen-java/org/apache/cassandra/thrift/Cassandra.java:1167104-1167229,1167232-1170608
+/cassandra/branches/cassandra-1.0/interface/thrift/gen-java/org/apache/cassandra/thrift/Cassandra.java:1167085-1170609,1170645
+/cassandra/branches/cassandra-1.0.0/interface/thrift/gen-java/org/apache/cassandra/thrift/Cassandra.java:1167104-1167229,1167232-1170608,1170641
 

[jira] [Updated] (CASSANDRA-3180) relocate Python CQL driver

2011-09-14 Thread Eric Evans (JIRA)

 [ 
https://issues.apache.org/jira/browse/CASSANDRA-3180?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel
 ]

Eric Evans updated CASSANDRA-3180:
--

Attachment: v1-0001-CASSANDRA-3180-remove-Python-driver-artifact.txt

 relocate Python CQL driver
 --

 Key: CASSANDRA-3180
 URL: https://issues.apache.org/jira/browse/CASSANDRA-3180
 Project: Cassandra
  Issue Type: Task
  Components: Drivers
Reporter: Eric Evans
Assignee: Eric Evans
Priority: Minor
  Labels: cql
 Fix For: 1.0.0

 Attachments: v1-0001-CASSANDRA-3180-remove-Python-driver-artifact.txt


 A new project as been created at 
 http://code.google.com/a/apache-extras.org/p/cassandra-dbapi2, a current 
 snapshot of the code from trunk has been imported, and the tests updated.
 I've configured commit notifications to be sent to 
 client-...@cassandra.apache.org, though this can be changed if people object.
 To the best of my knowledge, the only thing remaining is to configure the 
 initial set of committers and admins.  My thought was to setup all current 
 Cassandra committers (that want access), and Tyler Hobbs.

--
This message is automatically generated by JIRA.
For more information on JIRA, see: http://www.atlassian.com/software/jira




svn commit: r1170655 - /cassandra/branches/cassandra-1.0.0/debian/changelog

2011-09-14 Thread slebresne
Author: slebresne
Date: Wed Sep 14 14:42:49 2011
New Revision: 1170655

URL: http://svn.apache.org/viewvc?rev=1170655view=rev
Log:
use tilde for beta1 debian package instead of hyphen

Modified:
cassandra/branches/cassandra-1.0.0/debian/changelog

Modified: cassandra/branches/cassandra-1.0.0/debian/changelog
URL: 
http://svn.apache.org/viewvc/cassandra/branches/cassandra-1.0.0/debian/changelog?rev=1170655r1=1170654r2=1170655view=diff
==
--- cassandra/branches/cassandra-1.0.0/debian/changelog (original)
+++ cassandra/branches/cassandra-1.0.0/debian/changelog Wed Sep 14 14:42:49 2011
@@ -1,4 +1,4 @@
-cassandra (1.0.0-beta1) unstable; urgency=low
+cassandra (1.0.0~beta1) unstable; urgency=low
 
   * New beta release
 




[jira] [Updated] (CASSANDRA-3180) relocate Python CQL driver

2011-09-14 Thread Jonathan Ellis (JIRA)

 [ 
https://issues.apache.org/jira/browse/CASSANDRA-3180?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel
 ]

Jonathan Ellis updated CASSANDRA-3180:
--

Reviewer: thepaul

 relocate Python CQL driver
 --

 Key: CASSANDRA-3180
 URL: https://issues.apache.org/jira/browse/CASSANDRA-3180
 Project: Cassandra
  Issue Type: Task
  Components: Drivers
Reporter: Eric Evans
Assignee: Eric Evans
Priority: Minor
  Labels: cql
 Fix For: 1.0.0

 Attachments: v1-0001-CASSANDRA-3180-remove-Python-driver-artifact.txt


 A new project as been created at 
 http://code.google.com/a/apache-extras.org/p/cassandra-dbapi2, a current 
 snapshot of the code from trunk has been imported, and the tests updated.
 I've configured commit notifications to be sent to 
 client-...@cassandra.apache.org, though this can be changed if people object.
 To the best of my knowledge, the only thing remaining is to configure the 
 initial set of committers and admins.  My thought was to setup all current 
 Cassandra committers (that want access), and Tyler Hobbs.

--
This message is automatically generated by JIRA.
For more information on JIRA, see: http://www.atlassian.com/software/jira




[jira] [Commented] (CASSANDRA-2388) ColumnFamilyRecordReader fails for a given split because a host is down, even if records could reasonably be read from other replica.

2011-09-14 Thread Hudson (JIRA)

[ 
https://issues.apache.org/jira/browse/CASSANDRA-2388?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanelfocusedCommentId=13104537#comment-13104537
 ] 

Hudson commented on CASSANDRA-2388:
---

Integrated in Cassandra-0.7 #552 (See 
[https://builds.apache.org/job/Cassandra-0.7/552/])
revert CASSANDRA-2388 (again)

jbellis : 
http://svn.apache.org/viewcvs.cgi/?root=Apache-SVNview=revrev=1170333
Files : 
* /cassandra/branches/cassandra-0.7/CHANGES.txt
* 
/cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/hadoop/ColumnFamilyRecordReader.java


 ColumnFamilyRecordReader fails for a given split because a host is down, even 
 if records could reasonably be read from other replica.
 -

 Key: CASSANDRA-2388
 URL: https://issues.apache.org/jira/browse/CASSANDRA-2388
 Project: Cassandra
  Issue Type: Bug
  Components: Hadoop
Affects Versions: 0.6
Reporter: Eldon Stegall
Assignee: Mck SembWever
  Labels: hadoop, inputformat
 Fix For: 0.8.6

 Attachments: 0002_On_TException_try_next_split.patch, 
 CASSANDRA-2388-addition1.patch, CASSANDRA-2388-extended.patch, 
 CASSANDRA-2388.patch, CASSANDRA-2388.patch, CASSANDRA-2388.patch, 
 CASSANDRA-2388.patch


 ColumnFamilyRecordReader only tries the first location for a given split. We 
 should try multiple locations for a given split.

--
This message is automatically generated by JIRA.
For more information on JIRA, see: http://www.atlassian.com/software/jira




[jira] [Commented] (CASSANDRA-3164) GCInspector still not avoiding divide by zero

2011-09-14 Thread Hudson (JIRA)

[ 
https://issues.apache.org/jira/browse/CASSANDRA-3164?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanelfocusedCommentId=13104536#comment-13104536
 ] 

Hudson commented on CASSANDRA-3164:
---

Integrated in Cassandra-0.7 #552 (See 
[https://builds.apache.org/job/Cassandra-0.7/552/])
Fix divide by zero error in GCInspector
patch by jbellis; reviewed by slebresne for CASSANDRA-3164

jbellis : 
http://svn.apache.org/viewcvs.cgi/?root=Apache-SVNview=revrev=1170308
Files : 
* 
/cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/service/GCInspector.java


 GCInspector still not avoiding divide by zero
 -

 Key: CASSANDRA-3164
 URL: https://issues.apache.org/jira/browse/CASSANDRA-3164
 Project: Cassandra
  Issue Type: Bug
Affects Versions: 0.7.9
Reporter: Jonathan Ellis
Assignee: Jonathan Ellis
Priority: Minor
  Labels: thistimeforsure
 Fix For: 0.7.10, 0.8.6

 Attachments: 3164.txt


 This is because Long objects need to be compared with .equals, not ==.
 CASSANDRA-3076 is the original issue but we should use a new ticket for this 
 since 0.7.9 and 0.8.5 are both released already.

--
This message is automatically generated by JIRA.
For more information on JIRA, see: http://www.atlassian.com/software/jira




[jira] [Commented] (CASSANDRA-3041) Move streams data to too many nodes.

2011-09-14 Thread Hudson (JIRA)

[ 
https://issues.apache.org/jira/browse/CASSANDRA-3041?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanelfocusedCommentId=13104560#comment-13104560
 ] 

Hudson commented on CASSANDRA-3041:
---

Integrated in Cassandra-0.8 #327 (See 
[https://builds.apache.org/job/Cassandra-0.8/327/])
Avoid streaming data to nodes that already have it, on move as well as 
decommission
patch by Nick Bailey and jbellis for CASSANDRA-3041

jbellis : 
http://svn.apache.org/viewcvs.cgi/?root=Apache-SVNview=revrev=1170306
Files : 
* /cassandra/branches/cassandra-0.8/CHANGES.txt
* 
/cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/service/StorageService.java


 Move streams data to too many nodes.
 

 Key: CASSANDRA-3041
 URL: https://issues.apache.org/jira/browse/CASSANDRA-3041
 Project: Cassandra
  Issue Type: Improvement
  Components: Core
Affects Versions: 0.8.4
Reporter: Nick Bailey
Assignee: Nick Bailey
Priority: Minor
 Fix For: 0.8.6

 Attachments: 
 0001-Don-t-stream-to-replicas-that-already-have-the-data.patch, 3041-v2.txt


 When you decommission a node, it only streams data to the node that is just 
 now gaining responsibility for the node's primary range.
 When you move a node it streams data to every node that is responsible for 
 the node's primary range. This is way more than it needs to, and could be bad 
 in multi-dc setups. We should absolutely use this bug as a chance/reason to 
 better unify that code, since move should be doing the same thing decom does.
 This might be worth backporting to 0.8 as well.

--
This message is automatically generated by JIRA.
For more information on JIRA, see: http://www.atlassian.com/software/jira




[jira] [Commented] (CASSANDRA-3187) Return both listen_address and rpc_address through describe_ring

2011-09-14 Thread Hudson (JIRA)

[ 
https://issues.apache.org/jira/browse/CASSANDRA-3187?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanelfocusedCommentId=13104561#comment-13104561
 ] 

Hudson commented on CASSANDRA-3187:
---

Integrated in Cassandra-0.8 #327 (See 
[https://builds.apache.org/job/Cassandra-0.8/327/])
Return both listen_address and rpc_address through describe_ring.
Patch by Nick Bailey, reviewed by brandonwilliams for CASSANDRA-3187

brandonwilliams : 
http://svn.apache.org/viewcvs.cgi/?root=Apache-SVNview=revrev=1170284
Files : 
* /cassandra/branches/cassandra-0.8/NEWS.txt
* /cassandra/branches/cassandra-0.8/interface/cassandra.thrift
* 
/cassandra/branches/cassandra-0.8/interface/thrift/gen-java/org/apache/cassandra/thrift/AuthenticationException.java
* 
/cassandra/branches/cassandra-0.8/interface/thrift/gen-java/org/apache/cassandra/thrift/AuthenticationRequest.java
* 
/cassandra/branches/cassandra-0.8/interface/thrift/gen-java/org/apache/cassandra/thrift/AuthorizationException.java
* 
/cassandra/branches/cassandra-0.8/interface/thrift/gen-java/org/apache/cassandra/thrift/Cassandra.java
* 
/cassandra/branches/cassandra-0.8/interface/thrift/gen-java/org/apache/cassandra/thrift/CfDef.java
* 
/cassandra/branches/cassandra-0.8/interface/thrift/gen-java/org/apache/cassandra/thrift/Column.java
* 
/cassandra/branches/cassandra-0.8/interface/thrift/gen-java/org/apache/cassandra/thrift/ColumnDef.java
* 
/cassandra/branches/cassandra-0.8/interface/thrift/gen-java/org/apache/cassandra/thrift/ColumnOrSuperColumn.java
* 
/cassandra/branches/cassandra-0.8/interface/thrift/gen-java/org/apache/cassandra/thrift/ColumnParent.java
* 
/cassandra/branches/cassandra-0.8/interface/thrift/gen-java/org/apache/cassandra/thrift/ColumnPath.java
* 
/cassandra/branches/cassandra-0.8/interface/thrift/gen-java/org/apache/cassandra/thrift/CounterColumn.java
* 
/cassandra/branches/cassandra-0.8/interface/thrift/gen-java/org/apache/cassandra/thrift/CounterSuperColumn.java
* 
/cassandra/branches/cassandra-0.8/interface/thrift/gen-java/org/apache/cassandra/thrift/CqlResult.java
* 
/cassandra/branches/cassandra-0.8/interface/thrift/gen-java/org/apache/cassandra/thrift/CqlRow.java
* 
/cassandra/branches/cassandra-0.8/interface/thrift/gen-java/org/apache/cassandra/thrift/Deletion.java
* 
/cassandra/branches/cassandra-0.8/interface/thrift/gen-java/org/apache/cassandra/thrift/IndexClause.java
* 
/cassandra/branches/cassandra-0.8/interface/thrift/gen-java/org/apache/cassandra/thrift/IndexExpression.java
* 
/cassandra/branches/cassandra-0.8/interface/thrift/gen-java/org/apache/cassandra/thrift/InvalidRequestException.java
* 
/cassandra/branches/cassandra-0.8/interface/thrift/gen-java/org/apache/cassandra/thrift/KeyCount.java
* 
/cassandra/branches/cassandra-0.8/interface/thrift/gen-java/org/apache/cassandra/thrift/KeyRange.java
* 
/cassandra/branches/cassandra-0.8/interface/thrift/gen-java/org/apache/cassandra/thrift/KeySlice.java
* 
/cassandra/branches/cassandra-0.8/interface/thrift/gen-java/org/apache/cassandra/thrift/KsDef.java
* 
/cassandra/branches/cassandra-0.8/interface/thrift/gen-java/org/apache/cassandra/thrift/Mutation.java
* 
/cassandra/branches/cassandra-0.8/interface/thrift/gen-java/org/apache/cassandra/thrift/NotFoundException.java
* 
/cassandra/branches/cassandra-0.8/interface/thrift/gen-java/org/apache/cassandra/thrift/SchemaDisagreementException.java
* 
/cassandra/branches/cassandra-0.8/interface/thrift/gen-java/org/apache/cassandra/thrift/SlicePredicate.java
* 
/cassandra/branches/cassandra-0.8/interface/thrift/gen-java/org/apache/cassandra/thrift/SliceRange.java
* 
/cassandra/branches/cassandra-0.8/interface/thrift/gen-java/org/apache/cassandra/thrift/SuperColumn.java
* 
/cassandra/branches/cassandra-0.8/interface/thrift/gen-java/org/apache/cassandra/thrift/TimedOutException.java
* 
/cassandra/branches/cassandra-0.8/interface/thrift/gen-java/org/apache/cassandra/thrift/TokenRange.java
* 
/cassandra/branches/cassandra-0.8/interface/thrift/gen-java/org/apache/cassandra/thrift/UnavailableException.java
* 
/cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/service/StorageService.java
* 
/cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/thrift/CassandraServer.java


 Return both listen_address and rpc_address through describe_ring
 

 Key: CASSANDRA-3187
 URL: https://issues.apache.org/jira/browse/CASSANDRA-3187
 Project: Cassandra
  Issue Type: Bug
  Components: Core
Affects Versions: 1.0.0
Reporter: Nick Bailey
Assignee: Nick Bailey
Priority: Minor
 Fix For: 0.8.6, 1.0.0

 Attachments: 
 0001-0.8-Return-both-rpc-address-and-listen-address-with-the-.patch, 
 0001-0.8-Return-both-rpc-address-and-listen-address-with-v2.patch, 
 

[jira] [Commented] (CASSANDRA-3195) Cassandra-CLI does not allow Config as column family name

2011-09-14 Thread Hudson (JIRA)

[ 
https://issues.apache.org/jira/browse/CASSANDRA-3195?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanelfocusedCommentId=13104559#comment-13104559
 ] 

Hudson commented on CASSANDRA-3195:
---

Integrated in Cassandra-0.8 #327 (See 
[https://builds.apache.org/job/Cassandra-0.8/327/])
Allow quoting of the ColumnFamily name in CLI `create column family` 
statement
patch by Pavel Yaskevich; reviewed by Jonathan Ellis for CASSANDRA-3195

xedin : http://svn.apache.org/viewcvs.cgi/?root=Apache-SVNview=revrev=1170555
Files : 
* /cassandra/branches/cassandra-0.8/CHANGES.txt
* 
/cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/cli/CliClient.java
* 
/cassandra/branches/cassandra-0.8/test/unit/org/apache/cassandra/cli/CliTest.java


 Cassandra-CLI does not allow Config as column family name
 ---

 Key: CASSANDRA-3195
 URL: https://issues.apache.org/jira/browse/CASSANDRA-3195
 Project: Cassandra
  Issue Type: Bug
  Components: Tools
Affects Versions: 0.8.5
Reporter: Mauri Tikka
Assignee: Pavel Yaskevich
Priority: Minor
 Fix For: 0.8.6

 Attachments: CASSANDRA-3195.patch


 create column family Config does not work, create column family Configg 
 does.
 I suppose the intent is that column families can be named freely, that they 
 have a namespace completely of their own, and separate from, say, 
 Cassandra-CLI commands.

--
This message is automatically generated by JIRA.
For more information on JIRA, see: http://www.atlassian.com/software/jira




svn commit: r1170682 - /cassandra/branches/cassandra-1.0.0/build.xml

2011-09-14 Thread slebresne
Author: slebresne
Date: Wed Sep 14 15:23:35 2011
New Revision: 1170682

URL: http://svn.apache.org/viewvc?rev=1170682view=rev
Log:
Fix release process

Modified:
cassandra/branches/cassandra-1.0.0/build.xml

Modified: cassandra/branches/cassandra-1.0.0/build.xml
URL: 
http://svn.apache.org/viewvc/cassandra/branches/cassandra-1.0.0/build.xml?rev=1170682r1=1170681r2=1170682view=diff
==
--- cassandra/branches/cassandra-1.0.0/build.xml (original)
+++ cassandra/branches/cassandra-1.0.0/build.xml Wed Sep 14 15:23:35 2011
@@ -315,7 +315,7 @@ url=${svn.entry.url}?pathrev=${svn.entry
 sequential
   artifact:mvn mavenVersion=${maven.version} fork=true 
failonerror=true
 jvmarg value=-Xmx512m/
-arg 
value=org.apache.maven.plugins:maven-gpg-plugin:1.3:sign-and-deploy-file /
+arg 
value=org.apache.maven.plugins:maven-gpg-plugin:1.4:sign-and-deploy-file /
 arg value=-DretryFailedDeploymentCount=5 /
 arg value=-Durl=${maven-repository-url} /
 arg value=-DrepositoryId=${maven-repository-id} /




svn commit: r1170685 - in /cassandra/branches/cassandra-1.0: ./ contrib/ interface/thrift/gen-java/org/apache/cassandra/thrift/

2011-09-14 Thread slebresne
Author: slebresne
Date: Wed Sep 14 15:27:41 2011
New Revision: 1170685

URL: http://svn.apache.org/viewvc?rev=1170685view=rev
Log:
merge from 1.0.0

Modified:
cassandra/branches/cassandra-1.0/   (props changed)
cassandra/branches/cassandra-1.0/build.xml
cassandra/branches/cassandra-1.0/contrib/   (props changed)

cassandra/branches/cassandra-1.0/interface/thrift/gen-java/org/apache/cassandra/thrift/Cassandra.java
   (props changed)

cassandra/branches/cassandra-1.0/interface/thrift/gen-java/org/apache/cassandra/thrift/Column.java
   (props changed)

cassandra/branches/cassandra-1.0/interface/thrift/gen-java/org/apache/cassandra/thrift/InvalidRequestException.java
   (props changed)

cassandra/branches/cassandra-1.0/interface/thrift/gen-java/org/apache/cassandra/thrift/NotFoundException.java
   (props changed)

cassandra/branches/cassandra-1.0/interface/thrift/gen-java/org/apache/cassandra/thrift/SuperColumn.java
   (props changed)

Propchange: cassandra/branches/cassandra-1.0/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Sep 14 15:27:41 2011
@@ -5,7 +5,7 @@
 /cassandra/branches/cassandra-0.8.0:1125021-1130369
 /cassandra/branches/cassandra-0.8.1:1101014-1125018
 /cassandra/branches/cassandra-1.0:1167106,1167185
-/cassandra/branches/cassandra-1.0.0:1167104-1170608,1170641
+/cassandra/branches/cassandra-1.0.0:1167104-1170608,1170641,1170682
 /cassandra/tags/cassandra-0.7.0-rc3:1051699-1053689
 /cassandra/tags/cassandra-0.8.0-rc1:1102511-1125020
 /cassandra/trunk:1167085-1167102,1169870

Modified: cassandra/branches/cassandra-1.0/build.xml
URL: 
http://svn.apache.org/viewvc/cassandra/branches/cassandra-1.0/build.xml?rev=1170685r1=1170684r2=1170685view=diff
==
--- cassandra/branches/cassandra-1.0/build.xml (original)
+++ cassandra/branches/cassandra-1.0/build.xml Wed Sep 14 15:27:41 2011
@@ -315,7 +315,7 @@ url=${svn.entry.url}?pathrev=${svn.entry
 sequential
   artifact:mvn mavenVersion=${maven.version} fork=true 
failonerror=true
 jvmarg value=-Xmx512m/
-arg 
value=org.apache.maven.plugins:maven-gpg-plugin:1.3:sign-and-deploy-file /
+arg 
value=org.apache.maven.plugins:maven-gpg-plugin:1.4:sign-and-deploy-file /
 arg value=-DretryFailedDeploymentCount=5 /
 arg value=-Durl=${maven-repository-url} /
 arg value=-DrepositoryId=${maven-repository-id} /

Propchange: cassandra/branches/cassandra-1.0/contrib/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Sep 14 15:27:41 2011
@@ -5,7 +5,7 @@
 /cassandra/branches/cassandra-0.8.0/contrib:1125021-1130369
 /cassandra/branches/cassandra-0.8.1/contrib:1101014-1125018
 /cassandra/branches/cassandra-1.0/contrib:1167106,1167185
-/cassandra/branches/cassandra-1.0.0/contrib:1167104-1170608,1170641
+/cassandra/branches/cassandra-1.0.0/contrib:1167104-1170608,1170641,1170682
 /cassandra/tags/cassandra-0.7.0-rc3/contrib:1051699-1053689
 /cassandra/tags/cassandra-0.8.0-rc1/contrib:1102511-1125020
 /cassandra/trunk/contrib:1167085-1167102,1169870

Propchange: 
cassandra/branches/cassandra-1.0/interface/thrift/gen-java/org/apache/cassandra/thrift/Cassandra.java
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Sep 14 15:27:41 2011
@@ -5,7 +5,7 @@
 
/cassandra/branches/cassandra-0.8.0/interface/thrift/gen-java/org/apache/cassandra/thrift/Cassandra.java:1125021-1130369
 
/cassandra/branches/cassandra-0.8.1/interface/thrift/gen-java/org/apache/cassandra/thrift/Cassandra.java:1101014-1125018
 
/cassandra/branches/cassandra-1.0/interface/thrift/gen-java/org/apache/cassandra/thrift/Cassandra.java:1167106,1167185
-/cassandra/branches/cassandra-1.0.0/interface/thrift/gen-java/org/apache/cassandra/thrift/Cassandra.java:1167104-1170608,1170641
+/cassandra/branches/cassandra-1.0.0/interface/thrift/gen-java/org/apache/cassandra/thrift/Cassandra.java:1167104-1170608,1170641,1170682
 
/cassandra/tags/cassandra-0.7.0-rc3/interface/thrift/gen-java/org/apache/cassandra/thrift/Cassandra.java:1051699-1053689
 
/cassandra/tags/cassandra-0.8.0-rc1/interface/thrift/gen-java/org/apache/cassandra/thrift/Cassandra.java:1102511-1125020
 
/cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/Cassandra.java:1167085-1167102,1169870

Propchange: 
cassandra/branches/cassandra-1.0/interface/thrift/gen-java/org/apache/cassandra/thrift/Column.java
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Sep 14 15:27:41 2011
@@ -5,7 +5,7 @@
 
/cassandra/branches/cassandra-0.8.0/interface/thrift/gen-java/org/apache/cassandra/thrift/Column.java:1125021-1130369
 

[jira] [Commented] (CASSANDRA-2434) node bootstrapping can violate consistency

2011-09-14 Thread Jonathan Ellis (JIRA)

[ 
https://issues.apache.org/jira/browse/CASSANDRA-2434?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanelfocusedCommentId=13104573#comment-13104573
 ] 

Jonathan Ellis commented on CASSANDRA-2434:
---

Do we need to do anything special for move/decommission as well?

 node bootstrapping can violate consistency
 --

 Key: CASSANDRA-2434
 URL: https://issues.apache.org/jira/browse/CASSANDRA-2434
 Project: Cassandra
  Issue Type: Bug
Reporter: Peter Schuller
Assignee: paul cannon
 Fix For: 1.0.1

 Attachments: 2434-3.patch.txt, 2434-testery.patch.txt


 My reading (a while ago) of the code indicates that there is no logic 
 involved during bootstrapping that avoids consistency level violations. If I 
 recall correctly it just grabs neighbors that are currently up.
 There are at least two issues I have with this behavior:
 * If I have a cluster where I have applications relying on QUORUM with RF=3, 
 and bootstrapping complete based on only one node, I have just violated the 
 supposedly guaranteed consistency semantics of the cluster.
 * Nodes can flap up and down at any time, so even if a human takes care to 
 look at which nodes are up and things about it carefully before 
 bootstrapping, there's no guarantee.
 A complication is that not only does it depend on use-case where this is an 
 issue (if all you ever do you do at CL.ONE, it's fine); even in a cluster 
 which is otherwise used for QUORUM operations you may wish to accept 
 less-than-quorum nodes during bootstrap in various emergency situations.
 A potential easy fix is to have bootstrap take an argument which is the 
 number of hosts to bootstrap from, or to assume QUORUM if none is given.
 (A related concern is bootstrapping across data centers. You may *want* to 
 bootstrap to a local node and then do a repair to avoid sending loads of data 
 across DC:s while still achieving consistency. Or even if you don't care 
 about the consistency issues, I don't think there is currently a way to 
 bootstrap from local nodes only.)
 Thoughts?

--
This message is automatically generated by JIRA.
For more information on JIRA, see: http://www.atlassian.com/software/jira




[jira] [Commented] (CASSANDRA-3198) debian packaging installation problem when installing for the first time

2011-09-14 Thread Eric Evans (JIRA)

[ 
https://issues.apache.org/jira/browse/CASSANDRA-3198?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanelfocusedCommentId=13104583#comment-13104583
 ] 

Eric Evans commented on CASSANDRA-3198:
---

The comparison to 0.6.4-2 can be safely removed now, so it should look 
something like:

{noformat}
if [ -z $2 ]; then
chown -R cassandra: /var/lib/cassandra
chown -R cassandra: /var/log/cassandra
fi
{noformat}

 debian packaging installation problem when installing for the first time
 

 Key: CASSANDRA-3198
 URL: https://issues.apache.org/jira/browse/CASSANDRA-3198
 Project: Cassandra
  Issue Type: Bug
  Components: Packaging
Affects Versions: 0.8.5
Reporter: Jérémy Sevellec
Assignee: Jérémy Sevellec
 Fix For: 0.8.6

 Attachments: debian-postinst-fixperms.patch, trunk-3198-v1.patch


 when installing cassandra through the debian packaging for the first time, 
 there is permission problem when starting Cassandra.
 Normally, the postinst script change owner of /var/log/cassandra and 
 /var/lib/cassandra from root to cassandra user.
 there is a problem with the test which verify if threre is a need to change 
 the owner of these directory or not.
 On a new install, the $2 parameter is not set and the the test is false and 
 the owner is not changed.
 (simply, i think replace  with || might work)

--
This message is automatically generated by JIRA.
For more information on JIRA, see: http://www.atlassian.com/software/jira




[jira] [Commented] (CASSANDRA-3204) stress cannot set the compaction strategy

2011-09-14 Thread Brandon Williams (JIRA)

[ 
https://issues.apache.org/jira/browse/CASSANDRA-3204?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanelfocusedCommentId=13104588#comment-13104588
 ] 

Brandon Williams commented on CASSANDRA-3204:
-

+1

 stress cannot set the compaction strategy
 -

 Key: CASSANDRA-3204
 URL: https://issues.apache.org/jira/browse/CASSANDRA-3204
 Project: Cassandra
  Issue Type: Bug
  Components: Tools
Affects Versions: 1.0.0
Reporter: Brandon Williams
Assignee: Pavel Yaskevich
 Fix For: 1.0.0

 Attachments: CASSANDRA-3204.patch


 stress can't set the compaction strategy, so testing leveldb-style compaction 
 is more difficult than it should be, especially with lots of cluster 
 setup/teardown.

--
This message is automatically generated by JIRA.
For more information on JIRA, see: http://www.atlassian.com/software/jira




[jira] [Commented] (CASSANDRA-3201) When a mmap fails, Cassandra should exit.

2011-09-14 Thread Jonathan Ellis (JIRA)

[ 
https://issues.apache.org/jira/browse/CASSANDRA-3201?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanelfocusedCommentId=13104602#comment-13104602
 ] 

Jonathan Ellis commented on CASSANDRA-3201:
---

Caused by: java.lang.OutOfMemoryError makes it sounds like you hit your 
address space limit, is that right?

 When a mmap fails, Cassandra should exit.
 -

 Key: CASSANDRA-3201
 URL: https://issues.apache.org/jira/browse/CASSANDRA-3201
 Project: Cassandra
  Issue Type: Improvement
 Environment: Ubuntu 10.04.2/sun-java6-jdk 6.24-1build0.10.04.1
Reporter: Eldon Stegall
Priority: Minor

 When a mmap fails, Cassandra should exit. See 
 https://wiki.apache.org/cassandra/ArchitectureInternals#line-60
 Here is an example stack trace:
 ERROR 17:11:36,258 Fatal exception in thread Thread[FlushWriter:2003,5,main]
 java.io.IOError: java.io.IOException: Map failed
 at 
 org.apache.cassandra.io.util.MmappedSegmentedFile$Builder.createSegments(MmappedSegmentedFile.java:170)
 at 
 org.apache.cassandra.io.util.MmappedSegmentedFile$Builder.complete(MmappedSegmentedFile.java:147)
 at 
 org.apache.cassandra.io.sstable.SSTableWriter.closeAndOpenReader(SSTableWriter.java:194)
 at 
 org.apache.cassandra.io.sstable.SSTableWriter.closeAndOpenReader(SSTableWriter.java:173)
 at 
 org.apache.cassandra.db.Memtable.writeSortedContents(Memtable.java:253)
 at org.apache.cassandra.db.Memtable.access$400(Memtable.java:49)
 at org.apache.cassandra.db.Memtable$3.runMayThrow(Memtable.java:270)
 at 
 org.apache.cassandra.utils.WrappedRunnable.run(WrappedRunnable.java:30)
 at 
 java.util.concurrent.ThreadPoolExecutor$Worker.runTask(ThreadPoolExecutor.java:886)
 at 
 java.util.concurrent.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:908)
 at java.lang.Thread.run(Thread.java:662)
 Caused by: java.io.IOException: Map failed
 at sun.nio.ch.FileChannelImpl.map(FileChannelImpl.java:748)
 at 
 org.apache.cassandra.io.util.MmappedSegmentedFile$Builder.createSegments(MmappedSegmentedFile.java:162)
 ... 10 more
 Caused by: java.lang.OutOfMemoryError: Map failed
 at sun.nio.ch.FileChannelImpl.map0(Native Method)
 at sun.nio.ch.FileChannelImpl.map(FileChannelImpl.java:745)
 ... 11 more

--
This message is automatically generated by JIRA.
For more information on JIRA, see: http://www.atlassian.com/software/jira




svn commit: r1170700 - in /cassandra/branches/cassandra-1.0.0: CHANGES.txt src/java/org/apache/cassandra/config/CFMetaData.java tools/stress/src/org/apache/cassandra/stress/Session.java

2011-09-14 Thread xedin
Author: xedin
Date: Wed Sep 14 16:02:18 2011
New Revision: 1170700

URL: http://svn.apache.org/viewvc?rev=1170700view=rev
Log:
Support of compaction strategy option for stress.java
patch by Pavel Yaskevich; reviewed by Brandon Williams for CASSANDRA-3204

Modified:
cassandra/branches/cassandra-1.0.0/CHANGES.txt

cassandra/branches/cassandra-1.0.0/src/java/org/apache/cassandra/config/CFMetaData.java

cassandra/branches/cassandra-1.0.0/tools/stress/src/org/apache/cassandra/stress/Session.java

Modified: cassandra/branches/cassandra-1.0.0/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/cassandra/branches/cassandra-1.0.0/CHANGES.txt?rev=1170700r1=1170699r2=1170700view=diff
==
--- cassandra/branches/cassandra-1.0.0/CHANGES.txt (original)
+++ cassandra/branches/cassandra-1.0.0/CHANGES.txt Wed Sep 14 16:02:18 2011
@@ -74,7 +74,7 @@
  * Fix backwards compatibilty for CQL memtable properties (CASSANDRA-3190)
  * Add five-minute delay before starting compactions on a restarted server
(CASSANDRA-3181)
-
+ * support of compaction strategy option for stress.java (CASSANDRA-3204)
 
 0.8.6
  * avoid trying to watch cassandra-topology.properties when loaded from jar

Modified: 
cassandra/branches/cassandra-1.0.0/src/java/org/apache/cassandra/config/CFMetaData.java
URL: 
http://svn.apache.org/viewvc/cassandra/branches/cassandra-1.0.0/src/java/org/apache/cassandra/config/CFMetaData.java?rev=1170700r1=1170699r2=1170700view=diff
==
--- 
cassandra/branches/cassandra-1.0.0/src/java/org/apache/cassandra/config/CFMetaData.java
 (original)
+++ 
cassandra/branches/cassandra-1.0.0/src/java/org/apache/cassandra/config/CFMetaData.java
 Wed Sep 14 16:02:18 2011
@@ -776,7 +776,7 @@ public final class CFMetaData
 logger.debug(application result is {}, this);
 }
 
-private static Class? extends AbstractCompactionStrategy 
createCompactionSrategy(String className) throws ConfigurationException
+public static Class? extends AbstractCompactionStrategy 
createCompactionSrategy(String className) throws ConfigurationException
 {
 className = className.contains(.) ? className : 
org.apache.cassandra.db.compaction. + className;
 try

Modified: 
cassandra/branches/cassandra-1.0.0/tools/stress/src/org/apache/cassandra/stress/Session.java
URL: 
http://svn.apache.org/viewvc/cassandra/branches/cassandra-1.0.0/tools/stress/src/org/apache/cassandra/stress/Session.java?rev=1170700r1=1170699r2=1170700view=diff
==
--- 
cassandra/branches/cassandra-1.0.0/tools/stress/src/org/apache/cassandra/stress/Session.java
 (original)
+++ 
cassandra/branches/cassandra-1.0.0/tools/stress/src/org/apache/cassandra/stress/Session.java
 Wed Sep 14 16:02:18 2011
@@ -25,7 +25,9 @@ import java.util.*;
 import java.util.concurrent.atomic.AtomicInteger;
 import java.util.concurrent.atomic.AtomicLong;
 
+import org.apache.cassandra.config.CFMetaData;
 import org.apache.cassandra.config.ConfigurationException;
+import org.apache.cassandra.db.compaction.AbstractCompactionStrategy;
 import org.apache.cassandra.db.marshal.AbstractType;
 import org.apache.cassandra.db.marshal.TypeParser;
 import org.apache.commons.cli.*;
@@ -86,6 +88,7 @@ public class Session implements Serializ
 availableOptions.addOption(T,  send-to,  true,   Send 
this as a request to the stress daemon at specified address.);
 availableOptions.addOption(I,  compression,  true,   
Specify the compression to use for sstable, default:no compression);
 availableOptions.addOption(Q,  query-names,  true,   
Comma-separated list of column names to retrieve from each row.);
+availableOptions.addOption(Z,  compaction-strategy,  true,   
CompactionStrategy to use.);
 }
 
 private int numKeys  = 1000 * 1000;
@@ -102,6 +105,7 @@ public class Session implements Serializ
 private int port = 9160;
 private int superColumns = 1;
 private String compression   = null;
+private String compactionStrategy = null;
 
 private int progressInterval  = 10;
 private int keysPerCall   = 1000;
@@ -301,6 +305,22 @@ public class Session implements Serializ
 {
 columnNames = null;
 }
+
+if (cmd.hasOption(Z))
+{
+compactionStrategy = cmd.getOptionValue(Z);
+
+try
+{
+// validate compaction strategy class
+CFMetaData.createCompactionSrategy(compactionStrategy);
+}
+catch (ConfigurationException e)
+{
+System.err.println(e.getMessage());
+System.exit(1);
+}
+}
 }
 catch 

[jira] [Commented] (CASSANDRA-3198) debian packaging installation problem when installing for the first time

2011-09-14 Thread Sylvain Lebresne (JIRA)

[ 
https://issues.apache.org/jira/browse/CASSANDRA-3198?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanelfocusedCommentId=13104604#comment-13104604
 ] 

Sylvain Lebresne commented on CASSANDRA-3198:
-

bq. The comparison to 0.6.4-2 can be safely removed now

Hum, the goal of this ticket is that anyone that have started using the deb 
package after 0.6.4-2 have /var/{lib,log}/cassandra owned by root.root, which 
was not intended. So we can decide that we want to leave all those people with 
those wrong permissions, but it's not safer to remove the comparison now that 
it was when the patch was initially committed.

 debian packaging installation problem when installing for the first time
 

 Key: CASSANDRA-3198
 URL: https://issues.apache.org/jira/browse/CASSANDRA-3198
 Project: Cassandra
  Issue Type: Bug
  Components: Packaging
Affects Versions: 0.8.5
Reporter: Jérémy Sevellec
Assignee: Jérémy Sevellec
 Fix For: 0.8.6

 Attachments: debian-postinst-fixperms.patch, trunk-3198-v1.patch


 when installing cassandra through the debian packaging for the first time, 
 there is permission problem when starting Cassandra.
 Normally, the postinst script change owner of /var/log/cassandra and 
 /var/lib/cassandra from root to cassandra user.
 there is a problem with the test which verify if threre is a need to change 
 the owner of these directory or not.
 On a new install, the $2 parameter is not set and the the test is false and 
 the owner is not changed.
 (simply, i think replace  with || might work)

--
This message is automatically generated by JIRA.
For more information on JIRA, see: http://www.atlassian.com/software/jira




[jira] [Created] (CASSANDRA-3206) increase file descriptor limit in deb, rpm packages

2011-09-14 Thread Jonathan Ellis (JIRA)
increase file descriptor limit in deb, rpm packages
---

 Key: CASSANDRA-3206
 URL: https://issues.apache.org/jira/browse/CASSANDRA-3206
 Project: Cassandra
  Issue Type: Bug
  Components: Packaging
Reporter: Jonathan Ellis
Assignee: paul cannon
Priority: Minor
 Fix For: 0.8.6


We can use a lot of file descriptors (one per socket, 5? per sstable).  People 
hit this regularly on the user list and it will get worse with Leveled 
compaction, which limits sstable size to a relatively low size (currently 5MB).

--
This message is automatically generated by JIRA.
For more information on JIRA, see: http://www.atlassian.com/software/jira




[jira] [Commented] (CASSANDRA-3206) increase file descriptor limit in deb, rpm packages

2011-09-14 Thread Jonathan Ellis (JIRA)

[ 
https://issues.apache.org/jira/browse/CASSANDRA-3206?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanelfocusedCommentId=13104609#comment-13104609
 ] 

Jonathan Ellis commented on CASSANDRA-3206:
---

I'd suggest sizing this based on the number of sstables we need to support a 
sane amount of storage.  1TB?  2?

 increase file descriptor limit in deb, rpm packages
 ---

 Key: CASSANDRA-3206
 URL: https://issues.apache.org/jira/browse/CASSANDRA-3206
 Project: Cassandra
  Issue Type: Bug
  Components: Packaging
Reporter: Jonathan Ellis
Assignee: paul cannon
Priority: Minor
 Fix For: 0.8.6


 We can use a lot of file descriptors (one per socket, 5? per sstable).  
 People hit this regularly on the user list and it will get worse with Leveled 
 compaction, which limits sstable size to a relatively low size (currently 
 5MB).

--
This message is automatically generated by JIRA.
For more information on JIRA, see: http://www.atlassian.com/software/jira




[jira] [Commented] (CASSANDRA-2434) node bootstrapping can violate consistency

2011-09-14 Thread Nick Bailey (JIRA)

[ 
https://issues.apache.org/jira/browse/CASSANDRA-2434?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanelfocusedCommentId=13104618#comment-13104618
 ] 

Nick Bailey commented on CASSANDRA-2434:


I had a note to remember to create a ticket for that, but if we want to do it 
here that works as well.

In any case, yes the same concerns exist when giving away ranges as when 
gaining ranges.

 node bootstrapping can violate consistency
 --

 Key: CASSANDRA-2434
 URL: https://issues.apache.org/jira/browse/CASSANDRA-2434
 Project: Cassandra
  Issue Type: Bug
Reporter: Peter Schuller
Assignee: paul cannon
 Fix For: 1.0.1

 Attachments: 2434-3.patch.txt, 2434-testery.patch.txt


 My reading (a while ago) of the code indicates that there is no logic 
 involved during bootstrapping that avoids consistency level violations. If I 
 recall correctly it just grabs neighbors that are currently up.
 There are at least two issues I have with this behavior:
 * If I have a cluster where I have applications relying on QUORUM with RF=3, 
 and bootstrapping complete based on only one node, I have just violated the 
 supposedly guaranteed consistency semantics of the cluster.
 * Nodes can flap up and down at any time, so even if a human takes care to 
 look at which nodes are up and things about it carefully before 
 bootstrapping, there's no guarantee.
 A complication is that not only does it depend on use-case where this is an 
 issue (if all you ever do you do at CL.ONE, it's fine); even in a cluster 
 which is otherwise used for QUORUM operations you may wish to accept 
 less-than-quorum nodes during bootstrap in various emergency situations.
 A potential easy fix is to have bootstrap take an argument which is the 
 number of hosts to bootstrap from, or to assume QUORUM if none is given.
 (A related concern is bootstrapping across data centers. You may *want* to 
 bootstrap to a local node and then do a repair to avoid sending loads of data 
 across DC:s while still achieving consistency. Or even if you don't care 
 about the consistency issues, I don't think there is currently a way to 
 bootstrap from local nodes only.)
 Thoughts?

--
This message is automatically generated by JIRA.
For more information on JIRA, see: http://www.atlassian.com/software/jira




[jira] [Commented] (CASSANDRA-3206) increase file descriptor limit in deb, rpm packages

2011-09-14 Thread Jonathan Ellis (JIRA)

[ 
https://issues.apache.org/jira/browse/CASSANDRA-3206?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanelfocusedCommentId=13104632#comment-13104632
 ] 

Jonathan Ellis commented on CASSANDRA-3206:
---

bq. 5? per sstable

This is incorrect -- when using mmap'd I/O, we don't consume FD-per-sstable (we 
use one temporarily when setting up the mmap, then release it).  And even in 
buffered I/O mode we use one FD per sstable being read, per reading thread.  
(Which will be much less than one FD per sstable in most cases, although range 
scans under LevelDB do not yet do a very good job of cutting back the number of 
SSTables consulted.)

So it sounds like we mostly need to make sure we have it high enough that we 
tolerate high numbers of unpooled connections (common in PHP environments, I'm 
told).

 increase file descriptor limit in deb, rpm packages
 ---

 Key: CASSANDRA-3206
 URL: https://issues.apache.org/jira/browse/CASSANDRA-3206
 Project: Cassandra
  Issue Type: Bug
  Components: Packaging
Reporter: Jonathan Ellis
Assignee: paul cannon
Priority: Minor
 Fix For: 0.8.6


 We can use a lot of file descriptors (one per socket, 5? per sstable).  
 People hit this regularly on the user list and it will get worse with Leveled 
 compaction, which limits sstable size to a relatively low size (currently 
 5MB).

--
This message is automatically generated by JIRA.
For more information on JIRA, see: http://www.atlassian.com/software/jira




[jira] [Commented] (CASSANDRA-3179) JVM segfaults

2011-09-14 Thread Yang Yang (JIRA)

[ 
https://issues.apache.org/jira/browse/CASSANDRA-3179?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanelfocusedCommentId=13104637#comment-13104637
 ] 

Yang Yang commented on CASSANDRA-3179:
--

with 1.0.0 HEAD, no more SEGV after a night of stress tests.

thanks

 JVM segfaults
 -

 Key: CASSANDRA-3179
 URL: https://issues.apache.org/jira/browse/CASSANDRA-3179
 Project: Cassandra
  Issue Type: Bug
  Components: Core
Affects Versions: 1.0.0
 Environment: java version 1.6.0_26
 Java(TM) SE Runtime Environment (build 1.6.0_26-b03)
 Java HotSpot(TM) 64-Bit Server VM (build 20.1-b02, mixed mode)
Reporter: Brandon Williams
Assignee: Jonathan Ellis
 Fix For: 1.0.0

 Attachments: 3179-performance-test.txt, 3179-v2.txt, 3179.txt, 
 hs_err_pid12074.log, hs_err_pid28971.log, hs_err_pid6461.log, 
 hs_err_pid7031.log


 Both with and without compressed OOPs enabled.  Seems to mostly happen during 
 compaction+reads.  I'll attach some hs_err files shortly.

--
This message is automatically generated by JIRA.
For more information on JIRA, see: http://www.atlassian.com/software/jira




[jira] [Commented] (CASSANDRA-3206) increase file descriptor limit in deb, rpm packages

2011-09-14 Thread Jonathan Ellis (JIRA)

[ 
https://issues.apache.org/jira/browse/CASSANDRA-3206?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanelfocusedCommentId=13104648#comment-13104648
 ] 

Jonathan Ellis commented on CASSANDRA-3206:
---

Jeremy pointed out that we can also use a large number of FDs during 
compaction: either major compaction for tiered strategy, or a L0 compaction 
under Leveled, can open an effectively arbitrary number of sstables if 
compaction is behind.

 increase file descriptor limit in deb, rpm packages
 ---

 Key: CASSANDRA-3206
 URL: https://issues.apache.org/jira/browse/CASSANDRA-3206
 Project: Cassandra
  Issue Type: Bug
  Components: Packaging
Reporter: Jonathan Ellis
Assignee: paul cannon
Priority: Minor
 Fix For: 0.8.6


 We can use a lot of file descriptors (one per socket, 5? per sstable).  
 People hit this regularly on the user list and it will get worse with Leveled 
 compaction, which limits sstable size to a relatively low size (currently 
 5MB).

--
This message is automatically generated by JIRA.
For more information on JIRA, see: http://www.atlassian.com/software/jira




[jira] [Commented] (CASSANDRA-3206) increase file descriptor limit in deb, rpm packages

2011-09-14 Thread Jonathan Ellis (JIRA)

[ 
https://issues.apache.org/jira/browse/CASSANDRA-3206?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanelfocusedCommentId=13104649#comment-13104649
 ] 

Jonathan Ellis commented on CASSANDRA-3206:
---

So...  64K?

 increase file descriptor limit in deb, rpm packages
 ---

 Key: CASSANDRA-3206
 URL: https://issues.apache.org/jira/browse/CASSANDRA-3206
 Project: Cassandra
  Issue Type: Bug
  Components: Packaging
Reporter: Jonathan Ellis
Assignee: paul cannon
Priority: Minor
 Fix For: 0.8.6


 We can use a lot of file descriptors (one per socket, 5? per sstable).  
 People hit this regularly on the user list and it will get worse with Leveled 
 compaction, which limits sstable size to a relatively low size (currently 
 5MB).

--
This message is automatically generated by JIRA.
For more information on JIRA, see: http://www.atlassian.com/software/jira




[jira] [Updated] (CASSANDRA-3201) When a mmap fails, Cassandra should exit.

2011-09-14 Thread Jonathan Ellis (JIRA)

 [ 
https://issues.apache.org/jira/browse/CASSANDRA-3201?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel
 ]

Jonathan Ellis updated CASSANDRA-3201:
--

Attachment: 3201.txt

Patch to unwrap the OOME so the main OOME-catcher in AbstractCassandraDaemon 
will shut down the server.

 When a mmap fails, Cassandra should exit.
 -

 Key: CASSANDRA-3201
 URL: https://issues.apache.org/jira/browse/CASSANDRA-3201
 Project: Cassandra
  Issue Type: Improvement
 Environment: Ubuntu 10.04.2/sun-java6-jdk 6.24-1build0.10.04.1
Reporter: Eldon Stegall
Priority: Minor
 Attachments: 3201.txt


 When a mmap fails, Cassandra should exit. See 
 https://wiki.apache.org/cassandra/ArchitectureInternals#line-60
 Here is an example stack trace:
 ERROR 17:11:36,258 Fatal exception in thread Thread[FlushWriter:2003,5,main]
 java.io.IOError: java.io.IOException: Map failed
 at 
 org.apache.cassandra.io.util.MmappedSegmentedFile$Builder.createSegments(MmappedSegmentedFile.java:170)
 at 
 org.apache.cassandra.io.util.MmappedSegmentedFile$Builder.complete(MmappedSegmentedFile.java:147)
 at 
 org.apache.cassandra.io.sstable.SSTableWriter.closeAndOpenReader(SSTableWriter.java:194)
 at 
 org.apache.cassandra.io.sstable.SSTableWriter.closeAndOpenReader(SSTableWriter.java:173)
 at 
 org.apache.cassandra.db.Memtable.writeSortedContents(Memtable.java:253)
 at org.apache.cassandra.db.Memtable.access$400(Memtable.java:49)
 at org.apache.cassandra.db.Memtable$3.runMayThrow(Memtable.java:270)
 at 
 org.apache.cassandra.utils.WrappedRunnable.run(WrappedRunnable.java:30)
 at 
 java.util.concurrent.ThreadPoolExecutor$Worker.runTask(ThreadPoolExecutor.java:886)
 at 
 java.util.concurrent.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:908)
 at java.lang.Thread.run(Thread.java:662)
 Caused by: java.io.IOException: Map failed
 at sun.nio.ch.FileChannelImpl.map(FileChannelImpl.java:748)
 at 
 org.apache.cassandra.io.util.MmappedSegmentedFile$Builder.createSegments(MmappedSegmentedFile.java:162)
 ... 10 more
 Caused by: java.lang.OutOfMemoryError: Map failed
 at sun.nio.ch.FileChannelImpl.map0(Native Method)
 at sun.nio.ch.FileChannelImpl.map(FileChannelImpl.java:745)
 ... 11 more

--
This message is automatically generated by JIRA.
For more information on JIRA, see: http://www.atlassian.com/software/jira




[jira] [Commented] (CASSANDRA-2434) node bootstrapping can violate consistency

2011-09-14 Thread paul cannon (JIRA)

[ 
https://issues.apache.org/jira/browse/CASSANDRA-2434?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanelfocusedCommentId=13104685#comment-13104685
 ] 

paul cannon commented on CASSANDRA-2434:


bq. Do we need to do anything special for move/decommission as well?

Yes, it looks like we do need to add similar logic for move. Expand the scope 
of this ticket accordingly?

I don't see any way decommission could be affected by this sort of problem.

 node bootstrapping can violate consistency
 --

 Key: CASSANDRA-2434
 URL: https://issues.apache.org/jira/browse/CASSANDRA-2434
 Project: Cassandra
  Issue Type: Bug
Reporter: Peter Schuller
Assignee: paul cannon
 Fix For: 1.0.1

 Attachments: 2434-3.patch.txt, 2434-testery.patch.txt


 My reading (a while ago) of the code indicates that there is no logic 
 involved during bootstrapping that avoids consistency level violations. If I 
 recall correctly it just grabs neighbors that are currently up.
 There are at least two issues I have with this behavior:
 * If I have a cluster where I have applications relying on QUORUM with RF=3, 
 and bootstrapping complete based on only one node, I have just violated the 
 supposedly guaranteed consistency semantics of the cluster.
 * Nodes can flap up and down at any time, so even if a human takes care to 
 look at which nodes are up and things about it carefully before 
 bootstrapping, there's no guarantee.
 A complication is that not only does it depend on use-case where this is an 
 issue (if all you ever do you do at CL.ONE, it's fine); even in a cluster 
 which is otherwise used for QUORUM operations you may wish to accept 
 less-than-quorum nodes during bootstrap in various emergency situations.
 A potential easy fix is to have bootstrap take an argument which is the 
 number of hosts to bootstrap from, or to assume QUORUM if none is given.
 (A related concern is bootstrapping across data centers. You may *want* to 
 bootstrap to a local node and then do a repair to avoid sending loads of data 
 across DC:s while still achieving consistency. Or even if you don't care 
 about the consistency issues, I don't think there is currently a way to 
 bootstrap from local nodes only.)
 Thoughts?

--
This message is automatically generated by JIRA.
For more information on JIRA, see: http://www.atlassian.com/software/jira




[jira] [Commented] (CASSANDRA-2434) node bootstrapping can violate consistency

2011-09-14 Thread Jonathan Ellis (JIRA)

[ 
https://issues.apache.org/jira/browse/CASSANDRA-2434?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanelfocusedCommentId=13104694#comment-13104694
 ] 

Jonathan Ellis commented on CASSANDRA-2434:
---

bq. Expand the scope of this ticket accordingly?

Yes, let's solve them both here.

 node bootstrapping can violate consistency
 --

 Key: CASSANDRA-2434
 URL: https://issues.apache.org/jira/browse/CASSANDRA-2434
 Project: Cassandra
  Issue Type: Bug
Reporter: Peter Schuller
Assignee: paul cannon
 Fix For: 1.0.1

 Attachments: 2434-3.patch.txt, 2434-testery.patch.txt


 My reading (a while ago) of the code indicates that there is no logic 
 involved during bootstrapping that avoids consistency level violations. If I 
 recall correctly it just grabs neighbors that are currently up.
 There are at least two issues I have with this behavior:
 * If I have a cluster where I have applications relying on QUORUM with RF=3, 
 and bootstrapping complete based on only one node, I have just violated the 
 supposedly guaranteed consistency semantics of the cluster.
 * Nodes can flap up and down at any time, so even if a human takes care to 
 look at which nodes are up and things about it carefully before 
 bootstrapping, there's no guarantee.
 A complication is that not only does it depend on use-case where this is an 
 issue (if all you ever do you do at CL.ONE, it's fine); even in a cluster 
 which is otherwise used for QUORUM operations you may wish to accept 
 less-than-quorum nodes during bootstrap in various emergency situations.
 A potential easy fix is to have bootstrap take an argument which is the 
 number of hosts to bootstrap from, or to assume QUORUM if none is given.
 (A related concern is bootstrapping across data centers. You may *want* to 
 bootstrap to a local node and then do a repair to avoid sending loads of data 
 across DC:s while still achieving consistency. Or even if you don't care 
 about the consistency issues, I don't think there is currently a way to 
 bootstrap from local nodes only.)
 Thoughts?

--
This message is automatically generated by JIRA.
For more information on JIRA, see: http://www.atlassian.com/software/jira




[jira] [Updated] (CASSANDRA-2434) range movements can violate consistency

2011-09-14 Thread paul cannon (JIRA)

 [ 
https://issues.apache.org/jira/browse/CASSANDRA-2434?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel
 ]

paul cannon updated CASSANDRA-2434:
---

Summary: range movements can violate consistency  (was: node bootstrapping 
can violate consistency)

 range movements can violate consistency
 ---

 Key: CASSANDRA-2434
 URL: https://issues.apache.org/jira/browse/CASSANDRA-2434
 Project: Cassandra
  Issue Type: Bug
Reporter: Peter Schuller
Assignee: paul cannon
 Fix For: 1.0.1

 Attachments: 2434-3.patch.txt, 2434-testery.patch.txt


 My reading (a while ago) of the code indicates that there is no logic 
 involved during bootstrapping that avoids consistency level violations. If I 
 recall correctly it just grabs neighbors that are currently up.
 There are at least two issues I have with this behavior:
 * If I have a cluster where I have applications relying on QUORUM with RF=3, 
 and bootstrapping complete based on only one node, I have just violated the 
 supposedly guaranteed consistency semantics of the cluster.
 * Nodes can flap up and down at any time, so even if a human takes care to 
 look at which nodes are up and things about it carefully before 
 bootstrapping, there's no guarantee.
 A complication is that not only does it depend on use-case where this is an 
 issue (if all you ever do you do at CL.ONE, it's fine); even in a cluster 
 which is otherwise used for QUORUM operations you may wish to accept 
 less-than-quorum nodes during bootstrap in various emergency situations.
 A potential easy fix is to have bootstrap take an argument which is the 
 number of hosts to bootstrap from, or to assume QUORUM if none is given.
 (A related concern is bootstrapping across data centers. You may *want* to 
 bootstrap to a local node and then do a repair to avoid sending loads of data 
 across DC:s while still achieving consistency. Or even if you don't care 
 about the consistency issues, I don't think there is currently a way to 
 bootstrap from local nodes only.)
 Thoughts?

--
This message is automatically generated by JIRA.
For more information on JIRA, see: http://www.atlassian.com/software/jira




[jira] [Commented] (CASSANDRA-2434) range movements can violate consistency

2011-09-14 Thread Nick Bailey (JIRA)

[ 
https://issues.apache.org/jira/browse/CASSANDRA-2434?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanelfocusedCommentId=13104701#comment-13104701
 ] 

Nick Bailey commented on CASSANDRA-2434:


My comment wasn't very clear. Both decom and move currently, attempt to do the 
right thing. When a node is leaving, there should be one new replica for all 
the ranges it is responsible for. If it can't stream data to that replica there 
is a consistency problem.

Both operations currently try to do stream to that replica, but we should use 
the 'strict' logic in those cases as well and fail if we can't guarantee 
consistency and the user hasn't disabled strict.

 range movements can violate consistency
 ---

 Key: CASSANDRA-2434
 URL: https://issues.apache.org/jira/browse/CASSANDRA-2434
 Project: Cassandra
  Issue Type: Bug
Reporter: Peter Schuller
Assignee: paul cannon
 Fix For: 1.0.1

 Attachments: 2434-3.patch.txt, 2434-testery.patch.txt


 My reading (a while ago) of the code indicates that there is no logic 
 involved during bootstrapping that avoids consistency level violations. If I 
 recall correctly it just grabs neighbors that are currently up.
 There are at least two issues I have with this behavior:
 * If I have a cluster where I have applications relying on QUORUM with RF=3, 
 and bootstrapping complete based on only one node, I have just violated the 
 supposedly guaranteed consistency semantics of the cluster.
 * Nodes can flap up and down at any time, so even if a human takes care to 
 look at which nodes are up and things about it carefully before 
 bootstrapping, there's no guarantee.
 A complication is that not only does it depend on use-case where this is an 
 issue (if all you ever do you do at CL.ONE, it's fine); even in a cluster 
 which is otherwise used for QUORUM operations you may wish to accept 
 less-than-quorum nodes during bootstrap in various emergency situations.
 A potential easy fix is to have bootstrap take an argument which is the 
 number of hosts to bootstrap from, or to assume QUORUM if none is given.
 (A related concern is bootstrapping across data centers. You may *want* to 
 bootstrap to a local node and then do a repair to avoid sending loads of data 
 across DC:s while still achieving consistency. Or even if you don't care 
 about the consistency issues, I don't think there is currently a way to 
 bootstrap from local nodes only.)
 Thoughts?

--
This message is automatically generated by JIRA.
For more information on JIRA, see: http://www.atlassian.com/software/jira




[jira] [Commented] (CASSANDRA-2434) range movements can violate consistency

2011-09-14 Thread paul cannon (JIRA)

[ 
https://issues.apache.org/jira/browse/CASSANDRA-2434?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanelfocusedCommentId=13104709#comment-13104709
 ] 

paul cannon commented on CASSANDRA-2434:


If decom can't stream data to the appropriate replica, then it should just 
fail, right? Do we support decom in cases where a consistency violation would 
result? Seems like it has to be the user's responsibility to bring up or decom 
the other node first.

move could introduce a violation when it gains a new range, though, in the same 
cases as the bootstrap issue explained above.

 range movements can violate consistency
 ---

 Key: CASSANDRA-2434
 URL: https://issues.apache.org/jira/browse/CASSANDRA-2434
 Project: Cassandra
  Issue Type: Bug
Reporter: Peter Schuller
Assignee: paul cannon
 Fix For: 1.0.1

 Attachments: 2434-3.patch.txt, 2434-testery.patch.txt


 My reading (a while ago) of the code indicates that there is no logic 
 involved during bootstrapping that avoids consistency level violations. If I 
 recall correctly it just grabs neighbors that are currently up.
 There are at least two issues I have with this behavior:
 * If I have a cluster where I have applications relying on QUORUM with RF=3, 
 and bootstrapping complete based on only one node, I have just violated the 
 supposedly guaranteed consistency semantics of the cluster.
 * Nodes can flap up and down at any time, so even if a human takes care to 
 look at which nodes are up and things about it carefully before 
 bootstrapping, there's no guarantee.
 A complication is that not only does it depend on use-case where this is an 
 issue (if all you ever do you do at CL.ONE, it's fine); even in a cluster 
 which is otherwise used for QUORUM operations you may wish to accept 
 less-than-quorum nodes during bootstrap in various emergency situations.
 A potential easy fix is to have bootstrap take an argument which is the 
 number of hosts to bootstrap from, or to assume QUORUM if none is given.
 (A related concern is bootstrapping across data centers. You may *want* to 
 bootstrap to a local node and then do a repair to avoid sending loads of data 
 across DC:s while still achieving consistency. Or even if you don't care 
 about the consistency issues, I don't think there is currently a way to 
 bootstrap from local nodes only.)
 Thoughts?

--
This message is automatically generated by JIRA.
For more information on JIRA, see: http://www.atlassian.com/software/jira




[jira] [Commented] (CASSANDRA-2434) range movements can violate consistency

2011-09-14 Thread Nick Bailey (JIRA)

[ 
https://issues.apache.org/jira/browse/CASSANDRA-2434?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanelfocusedCommentId=13104715#comment-13104715
 ] 

Nick Bailey commented on CASSANDRA-2434:


If we support it for bootstrapping I don't see why we shouldn't support it for 
decom. Right, move has the problem in both cases (giving away ranges, gaining 
ranges).

 range movements can violate consistency
 ---

 Key: CASSANDRA-2434
 URL: https://issues.apache.org/jira/browse/CASSANDRA-2434
 Project: Cassandra
  Issue Type: Bug
Reporter: Peter Schuller
Assignee: paul cannon
 Fix For: 1.0.1

 Attachments: 2434-3.patch.txt, 2434-testery.patch.txt


 My reading (a while ago) of the code indicates that there is no logic 
 involved during bootstrapping that avoids consistency level violations. If I 
 recall correctly it just grabs neighbors that are currently up.
 There are at least two issues I have with this behavior:
 * If I have a cluster where I have applications relying on QUORUM with RF=3, 
 and bootstrapping complete based on only one node, I have just violated the 
 supposedly guaranteed consistency semantics of the cluster.
 * Nodes can flap up and down at any time, so even if a human takes care to 
 look at which nodes are up and things about it carefully before 
 bootstrapping, there's no guarantee.
 A complication is that not only does it depend on use-case where this is an 
 issue (if all you ever do you do at CL.ONE, it's fine); even in a cluster 
 which is otherwise used for QUORUM operations you may wish to accept 
 less-than-quorum nodes during bootstrap in various emergency situations.
 A potential easy fix is to have bootstrap take an argument which is the 
 number of hosts to bootstrap from, or to assume QUORUM if none is given.
 (A related concern is bootstrapping across data centers. You may *want* to 
 bootstrap to a local node and then do a repair to avoid sending loads of data 
 across DC:s while still achieving consistency. Or even if you don't care 
 about the consistency issues, I don't think there is currently a way to 
 bootstrap from local nodes only.)
 Thoughts?

--
This message is automatically generated by JIRA.
For more information on JIRA, see: http://www.atlassian.com/software/jira




[jira] [Commented] (CASSANDRA-2434) range movements can violate consistency

2011-09-14 Thread paul cannon (JIRA)

[ 
https://issues.apache.org/jira/browse/CASSANDRA-2434?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanelfocusedCommentId=13104718#comment-13104718
 ] 

paul cannon commented on CASSANDRA-2434:


I think we're talking about different things. Requiring the user to have the 
right nodes available for operation X is not the same as cassandra can 'lose' 
writes when it happens to stream from the wrong node, even if the user did 
everything right.

This ticket is about the latter, I think.

 range movements can violate consistency
 ---

 Key: CASSANDRA-2434
 URL: https://issues.apache.org/jira/browse/CASSANDRA-2434
 Project: Cassandra
  Issue Type: Bug
Reporter: Peter Schuller
Assignee: paul cannon
 Fix For: 1.0.1

 Attachments: 2434-3.patch.txt, 2434-testery.patch.txt


 My reading (a while ago) of the code indicates that there is no logic 
 involved during bootstrapping that avoids consistency level violations. If I 
 recall correctly it just grabs neighbors that are currently up.
 There are at least two issues I have with this behavior:
 * If I have a cluster where I have applications relying on QUORUM with RF=3, 
 and bootstrapping complete based on only one node, I have just violated the 
 supposedly guaranteed consistency semantics of the cluster.
 * Nodes can flap up and down at any time, so even if a human takes care to 
 look at which nodes are up and things about it carefully before 
 bootstrapping, there's no guarantee.
 A complication is that not only does it depend on use-case where this is an 
 issue (if all you ever do you do at CL.ONE, it's fine); even in a cluster 
 which is otherwise used for QUORUM operations you may wish to accept 
 less-than-quorum nodes during bootstrap in various emergency situations.
 A potential easy fix is to have bootstrap take an argument which is the 
 number of hosts to bootstrap from, or to assume QUORUM if none is given.
 (A related concern is bootstrapping across data centers. You may *want* to 
 bootstrap to a local node and then do a repair to avoid sending loads of data 
 across DC:s while still achieving consistency. Or even if you don't care 
 about the consistency issues, I don't think there is currently a way to 
 bootstrap from local nodes only.)
 Thoughts?

--
This message is automatically generated by JIRA.
For more information on JIRA, see: http://www.atlassian.com/software/jira




[jira] [Created] (CASSANDRA-3207) Log message at INFO when a global or keyspace level repair operation completes

2011-09-14 Thread Benjamin Coverston (JIRA)
Log message at INFO when a global or keyspace level repair operation completes
--

 Key: CASSANDRA-3207
 URL: https://issues.apache.org/jira/browse/CASSANDRA-3207
 Project: Cassandra
  Issue Type: Bug
Affects Versions: 0.8.5
Reporter: Benjamin Coverston


If JMX times out it's difficult to tell when repair completes.Right now we log 
at DEBUG for each column family but we need a way to tell when the repair 
operation completes as a whole.


--
This message is automatically generated by JIRA.
For more information on JIRA, see: http://www.atlassian.com/software/jira




svn commit: r1170757 - /cassandra/branches/cassandra-0.8/CHANGES.txt

2011-09-14 Thread jbellis
Author: jbellis
Date: Wed Sep 14 18:19:39 2011
New Revision: 1170757

URL: http://svn.apache.org/viewvc?rev=1170757view=rev
Log:
update CHANGES

Modified:
cassandra/branches/cassandra-0.8/CHANGES.txt

Modified: cassandra/branches/cassandra-0.8/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.8/CHANGES.txt?rev=1170757r1=1170756r2=1170757view=diff
==
--- cassandra/branches/cassandra-0.8/CHANGES.txt (original)
+++ cassandra/branches/cassandra-0.8/CHANGES.txt Wed Sep 14 18:19:39 2011
@@ -172,7 +172,7 @@
  * fix re-using index CF sstable names after drop/recreate (CASSANDRA-2872)
  * prepend CF to default index names (CASSANDRA-2903)
  * fix hint replay (CASSANDRA-2928)
- * Properly synchronize merkle tree computation (CASSANDRA-2816)
+ * Properly synchronize repair's merkle tree computation (CASSANDRA-2816)
  * escape quotes in sstable2json (CASSANDRA-2780)
  * allows using cli functions in cli del statement (CASSANDRA-2821)
  * allows quoted classes in CLI (CASSANDRA-2899)




[jira] [Commented] (CASSANDRA-2434) range movements can violate consistency

2011-09-14 Thread paul cannon (JIRA)

[ 
https://issues.apache.org/jira/browse/CASSANDRA-2434?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanelfocusedCommentId=13104756#comment-13104756
 ] 

paul cannon commented on CASSANDRA-2434:


Conversation on #cassandra-dev resulted in the conclusion that we'll fix this 
bug for range acquisition (bootstrap and move) now, and plan to allow the same 
looseness (non-strict mode, or whatever) for range egress (move and decom) in 
the future.

I think.

 range movements can violate consistency
 ---

 Key: CASSANDRA-2434
 URL: https://issues.apache.org/jira/browse/CASSANDRA-2434
 Project: Cassandra
  Issue Type: Bug
Reporter: Peter Schuller
Assignee: paul cannon
 Fix For: 1.0.1

 Attachments: 2434-3.patch.txt, 2434-testery.patch.txt


 My reading (a while ago) of the code indicates that there is no logic 
 involved during bootstrapping that avoids consistency level violations. If I 
 recall correctly it just grabs neighbors that are currently up.
 There are at least two issues I have with this behavior:
 * If I have a cluster where I have applications relying on QUORUM with RF=3, 
 and bootstrapping complete based on only one node, I have just violated the 
 supposedly guaranteed consistency semantics of the cluster.
 * Nodes can flap up and down at any time, so even if a human takes care to 
 look at which nodes are up and things about it carefully before 
 bootstrapping, there's no guarantee.
 A complication is that not only does it depend on use-case where this is an 
 issue (if all you ever do you do at CL.ONE, it's fine); even in a cluster 
 which is otherwise used for QUORUM operations you may wish to accept 
 less-than-quorum nodes during bootstrap in various emergency situations.
 A potential easy fix is to have bootstrap take an argument which is the 
 number of hosts to bootstrap from, or to assume QUORUM if none is given.
 (A related concern is bootstrapping across data centers. You may *want* to 
 bootstrap to a local node and then do a repair to avoid sending loads of data 
 across DC:s while still achieving consistency. Or even if you don't care 
 about the consistency issues, I don't think there is currently a way to 
 bootstrap from local nodes only.)
 Thoughts?

--
This message is automatically generated by JIRA.
For more information on JIRA, see: http://www.atlassian.com/software/jira




[jira] [Commented] (CASSANDRA-3180) relocate Python CQL driver

2011-09-14 Thread paul cannon (JIRA)

[ 
https://issues.apache.org/jira/browse/CASSANDRA-3180?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanelfocusedCommentId=13104774#comment-13104774
 ] 

paul cannon commented on CASSANDRA-3180:


I would like access.

 relocate Python CQL driver
 --

 Key: CASSANDRA-3180
 URL: https://issues.apache.org/jira/browse/CASSANDRA-3180
 Project: Cassandra
  Issue Type: Task
  Components: Drivers
Reporter: Eric Evans
Assignee: Eric Evans
Priority: Minor
  Labels: cql
 Fix For: 1.0.0

 Attachments: v1-0001-CASSANDRA-3180-remove-Python-driver-artifact.txt


 A new project as been created at 
 http://code.google.com/a/apache-extras.org/p/cassandra-dbapi2, a current 
 snapshot of the code from trunk has been imported, and the tests updated.
 I've configured commit notifications to be sent to 
 client-...@cassandra.apache.org, though this can be changed if people object.
 To the best of my knowledge, the only thing remaining is to configure the 
 initial set of committers and admins.  My thought was to setup all current 
 Cassandra committers (that want access), and Tyler Hobbs.

--
This message is automatically generated by JIRA.
For more information on JIRA, see: http://www.atlassian.com/software/jira




[jira] [Commented] (CASSANDRA-3198) debian packaging installation problem when installing for the first time

2011-09-14 Thread Eric Evans (JIRA)

[ 
https://issues.apache.org/jira/browse/CASSANDRA-3198?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanelfocusedCommentId=13104787#comment-13104787
 ] 

Eric Evans commented on CASSANDRA-3198:
---

{quote}
Hum, the goal of this ticket is that anyone that have started using the deb 
package after 0.6.4-2 have /var/{lib,log}/cassandra owned by root.root, which 
was not intended. So we can decide that we want to leave all those people with 
those wrong permissions, but it's not safer to remove the comparison now that 
it was when the patch was initially committed.
{quote}

I think that statement was always bugged.  What it _should_ do is to ensure 
that /var/{lib,log}/cassandra are owned by user cassandra on new installs only, 
not upgrades (allowing the user to override that ownership).

At this point, I'm not sure what the comparison to 0.6.4-2 was supposed to 
accomplish, I assume it was a (misguided )attempt at applying this policy to 
versions greater than or equal to 0.6.4-2 (we didn't always create the 
cassandra user and chown in postinst).  Either way, the current packaging will 
never be used to upgrade from an 0.6.x release directly, so there is no danger 
in removing it.

So, looking at that (untested )snippet again:

{noformat}
if [ -z $2 ]; then
chown -R cassandra: /var/lib/cassandra
chown -R cassandra: /var/log/cassandra
fi
{noformat}

would only apply ownership changes if argument #2 is empty, that is to say, 
there is no previously configured version (i.e. not an upgrade).

 debian packaging installation problem when installing for the first time
 

 Key: CASSANDRA-3198
 URL: https://issues.apache.org/jira/browse/CASSANDRA-3198
 Project: Cassandra
  Issue Type: Bug
  Components: Packaging
Affects Versions: 0.8.5
Reporter: Jérémy Sevellec
Assignee: Jérémy Sevellec
 Fix For: 0.8.6

 Attachments: debian-postinst-fixperms.patch, trunk-3198-v1.patch


 when installing cassandra through the debian packaging for the first time, 
 there is permission problem when starting Cassandra.
 Normally, the postinst script change owner of /var/log/cassandra and 
 /var/lib/cassandra from root to cassandra user.
 there is a problem with the test which verify if threre is a need to change 
 the owner of these directory or not.
 On a new install, the $2 parameter is not set and the the test is false and 
 the owner is not changed.
 (simply, i think replace  with || might work)

--
This message is automatically generated by JIRA.
For more information on JIRA, see: http://www.atlassian.com/software/jira




[jira] [Commented] (CASSANDRA-3198) debian packaging installation problem when installing for the first time

2011-09-14 Thread JIRA

[ 
https://issues.apache.org/jira/browse/CASSANDRA-3198?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanelfocusedCommentId=13104791#comment-13104791
 ] 

Jérémy Sevellec commented on CASSANDRA-3198:


I agree with that too

 debian packaging installation problem when installing for the first time
 

 Key: CASSANDRA-3198
 URL: https://issues.apache.org/jira/browse/CASSANDRA-3198
 Project: Cassandra
  Issue Type: Bug
  Components: Packaging
Affects Versions: 0.8.5
Reporter: Jérémy Sevellec
Assignee: Jérémy Sevellec
 Fix For: 0.8.6

 Attachments: debian-postinst-fixperms.patch, trunk-3198-v1.patch


 when installing cassandra through the debian packaging for the first time, 
 there is permission problem when starting Cassandra.
 Normally, the postinst script change owner of /var/log/cassandra and 
 /var/lib/cassandra from root to cassandra user.
 there is a problem with the test which verify if threre is a need to change 
 the owner of these directory or not.
 On a new install, the $2 parameter is not set and the the test is false and 
 the owner is not changed.
 (simply, i think replace  with || might work)

--
This message is automatically generated by JIRA.
For more information on JIRA, see: http://www.atlassian.com/software/jira




[jira] [Updated] (CASSANDRA-2506) Push read repair setting down to the DC-level

2011-09-14 Thread Vijay (JIRA)

 [ 
https://issues.apache.org/jira/browse/CASSANDRA-2506?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel
 ]

Vijay updated CASSANDRA-2506:
-

Attachment: 0001-changes-to-interfaces.patch
0002-changes-for-dc-readrepair.patch
0003-changes-for-cql.patch

The idea is to make read_repair_chance=x to be a global setting which will 
allow us to specify the inter DC repair chance. 

Users can add use read_repair_chance_options={DC:x, DC2:x} to tune the amount 
of RR needed within  a DC.

If we dont specify RRCO then global will take into effect. For a single DC 
installation users can just rely on RRC

 Push read repair setting down to the DC-level
 -

 Key: CASSANDRA-2506
 URL: https://issues.apache.org/jira/browse/CASSANDRA-2506
 Project: Cassandra
  Issue Type: New Feature
  Components: Core
Reporter: Brandon Williams
Assignee: Vijay
Priority: Minor
 Attachments: 0001-changes-to-interfaces.patch, 
 0002-changes-for-dc-readrepair.patch, 0003-changes-for-cql.patch


 Currently, read repair is a global setting.  However, when you have two DCs 
 and use one for analytics, it would be nice to turn it off only for that DC 
 so the live DC serving the application can still benefit from it.

--
This message is automatically generated by JIRA.
For more information on JIRA, see: http://www.atlassian.com/software/jira




[jira] [Updated] (CASSANDRA-3203) Odd flush behavior

2011-09-14 Thread Jonathan Ellis (JIRA)

 [ 
https://issues.apache.org/jira/browse/CASSANDRA-3203?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel
 ]

Jonathan Ellis updated CASSANDRA-3203:
--

Attachment: 3203-v2.txt

v2 attached:

- fixed-better version of jamm 0.2.5 (now just includes buffer.remaining() + 
shallow overhead)
- pre-adds the CFMetadata object to the seen set for MemoryMeter so we don't 
re-count it for each row [this is the big one]

I'm getting liveRatio of 4-6 now which makes me wonder if we need to add a 
higher fudge factor to make it not OOM again. :)

 Odd flush behavior
 --

 Key: CASSANDRA-3203
 URL: https://issues.apache.org/jira/browse/CASSANDRA-3203
 Project: Cassandra
  Issue Type: Bug
  Components: Core
Affects Versions: 1.0.0
Reporter: Brandon Williams
Priority: Critical
 Fix For: 1.0.0

 Attachments: 3203-prelim.txt


 Given the same workload against 0.8, trunk is creating more than twice the 
 amount of sstables.  Even though a uniform stress workload is being 
 generated, flush size degrades quickly:
 {noformat}
  INFO [NonPeriodicTasks:1] 2011-09-09 18:24:22,878 ColumnFamilyStore.java 
 (line 658) Enqueuing flush of Memtable-Standard1@2058235391(7741
 035/110172631 serialized/live bytes, 151785 ops)
  INFO [NonPeriodicTasks:1] 2011-09-09 18:24:24,888 ColumnFamilyStore.java 
 (line 658) Enqueuing flush of Memtable-Standard1@1520390052(3887
 220/72403158 serialized/live bytes, 76220 ops)
  INFO [NonPeriodicTasks:1] 2011-09-09 18:24:26,890 ColumnFamilyStore.java 
 (line 658) Enqueuing flush of Memtable-Standard1@1868496516(4097
 085/76255481 serialized/live bytes, 80335 ops)
  INFO [NonPeriodicTasks:1] 2011-09-09 18:24:28,893 ColumnFamilyStore.java 
 (line 658) Enqueuing flush of Memtable-Standard1@498232521(43513
 20/80922269 serialized/live bytes, 85320 ops)
  INFO [NonPeriodicTasks:1] 2011-09-09 18:24:29,895 ColumnFamilyStore.java 
 (line 658) Enqueuing flush of Memtable-Standard1@1592308290(2310
 810/44514839 serialized/live bytes, 45310 ops)
  INFO [NonPeriodicTasks:1] 2011-09-09 18:24:30,897 ColumnFamilyStore.java 
 (line 658) Enqueuing flush of Memtable-Standard1@775439677(22684
 80/64984390 serialized/live bytes, 44480 ops)
  INFO [NonPeriodicTasks:1] 2011-09-09 18:24:31,899 ColumnFamilyStore.java 
 (line 658) Enqueuing flush of Memtable-Standard1@928217914(26741
 85/76231422 serialized/live bytes, 52435 ops)
  INFO [NonPeriodicTasks:1] 2011-09-09 18:24:32,901 ColumnFamilyStore.java 
 (line 658) Enqueuing flush of Memtable-Standard1@158103119(27511
 95/77317732 serialized/live bytes, 53945 ops)
  INFO [NonPeriodicTasks:1] 2011-09-09 18:24:33,903 ColumnFamilyStore.java 
 (line 658) Enqueuing flush of Memtable-Standard1@2035169258(3132
 420/88934701 serialized/live bytes, 61420 ops)
  INFO [NonPeriodicTasks:1] 2011-09-09 18:24:34,905 ColumnFamilyStore.java 
 (line 658) Enqueuing flush of Memtable-Standard1@1097314626(2979
 675/83651699 serialized/live bytes, 58425 ops)
 {noformat}
 The serialized to live size ratio appears completely out of whack.

--
This message is automatically generated by JIRA.
For more information on JIRA, see: http://www.atlassian.com/software/jira




[jira] [Updated] (CASSANDRA-3203) Odd flush behavior

2011-09-14 Thread Jonathan Ellis (JIRA)

 [ 
https://issues.apache.org/jira/browse/CASSANDRA-3203?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel
 ]

Jonathan Ellis updated CASSANDRA-3203:
--

Attachment: (was: 3203-v2.txt)

 Odd flush behavior
 --

 Key: CASSANDRA-3203
 URL: https://issues.apache.org/jira/browse/CASSANDRA-3203
 Project: Cassandra
  Issue Type: Bug
  Components: Core
Affects Versions: 1.0.0
Reporter: Brandon Williams
Priority: Critical
 Fix For: 1.0.0

 Attachments: 3203-prelim.txt


 Given the same workload against 0.8, trunk is creating more than twice the 
 amount of sstables.  Even though a uniform stress workload is being 
 generated, flush size degrades quickly:
 {noformat}
  INFO [NonPeriodicTasks:1] 2011-09-09 18:24:22,878 ColumnFamilyStore.java 
 (line 658) Enqueuing flush of Memtable-Standard1@2058235391(7741
 035/110172631 serialized/live bytes, 151785 ops)
  INFO [NonPeriodicTasks:1] 2011-09-09 18:24:24,888 ColumnFamilyStore.java 
 (line 658) Enqueuing flush of Memtable-Standard1@1520390052(3887
 220/72403158 serialized/live bytes, 76220 ops)
  INFO [NonPeriodicTasks:1] 2011-09-09 18:24:26,890 ColumnFamilyStore.java 
 (line 658) Enqueuing flush of Memtable-Standard1@1868496516(4097
 085/76255481 serialized/live bytes, 80335 ops)
  INFO [NonPeriodicTasks:1] 2011-09-09 18:24:28,893 ColumnFamilyStore.java 
 (line 658) Enqueuing flush of Memtable-Standard1@498232521(43513
 20/80922269 serialized/live bytes, 85320 ops)
  INFO [NonPeriodicTasks:1] 2011-09-09 18:24:29,895 ColumnFamilyStore.java 
 (line 658) Enqueuing flush of Memtable-Standard1@1592308290(2310
 810/44514839 serialized/live bytes, 45310 ops)
  INFO [NonPeriodicTasks:1] 2011-09-09 18:24:30,897 ColumnFamilyStore.java 
 (line 658) Enqueuing flush of Memtable-Standard1@775439677(22684
 80/64984390 serialized/live bytes, 44480 ops)
  INFO [NonPeriodicTasks:1] 2011-09-09 18:24:31,899 ColumnFamilyStore.java 
 (line 658) Enqueuing flush of Memtable-Standard1@928217914(26741
 85/76231422 serialized/live bytes, 52435 ops)
  INFO [NonPeriodicTasks:1] 2011-09-09 18:24:32,901 ColumnFamilyStore.java 
 (line 658) Enqueuing flush of Memtable-Standard1@158103119(27511
 95/77317732 serialized/live bytes, 53945 ops)
  INFO [NonPeriodicTasks:1] 2011-09-09 18:24:33,903 ColumnFamilyStore.java 
 (line 658) Enqueuing flush of Memtable-Standard1@2035169258(3132
 420/88934701 serialized/live bytes, 61420 ops)
  INFO [NonPeriodicTasks:1] 2011-09-09 18:24:34,905 ColumnFamilyStore.java 
 (line 658) Enqueuing flush of Memtable-Standard1@1097314626(2979
 675/83651699 serialized/live bytes, 58425 ops)
 {noformat}
 The serialized to live size ratio appears completely out of whack.

--
This message is automatically generated by JIRA.
For more information on JIRA, see: http://www.atlassian.com/software/jira




[jira] [Updated] (CASSANDRA-3203) Odd flush behavior

2011-09-14 Thread Jonathan Ellis (JIRA)

 [ 
https://issues.apache.org/jira/browse/CASSANDRA-3203?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel
 ]

Jonathan Ellis updated CASSANDRA-3203:
--

Attachment: 3203-prelim.txt

 Odd flush behavior
 --

 Key: CASSANDRA-3203
 URL: https://issues.apache.org/jira/browse/CASSANDRA-3203
 Project: Cassandra
  Issue Type: Bug
  Components: Core
Affects Versions: 1.0.0
Reporter: Brandon Williams
Priority: Critical
 Fix For: 1.0.0

 Attachments: 3203-prelim.txt, 3203-prelim.txt


 Given the same workload against 0.8, trunk is creating more than twice the 
 amount of sstables.  Even though a uniform stress workload is being 
 generated, flush size degrades quickly:
 {noformat}
  INFO [NonPeriodicTasks:1] 2011-09-09 18:24:22,878 ColumnFamilyStore.java 
 (line 658) Enqueuing flush of Memtable-Standard1@2058235391(7741
 035/110172631 serialized/live bytes, 151785 ops)
  INFO [NonPeriodicTasks:1] 2011-09-09 18:24:24,888 ColumnFamilyStore.java 
 (line 658) Enqueuing flush of Memtable-Standard1@1520390052(3887
 220/72403158 serialized/live bytes, 76220 ops)
  INFO [NonPeriodicTasks:1] 2011-09-09 18:24:26,890 ColumnFamilyStore.java 
 (line 658) Enqueuing flush of Memtable-Standard1@1868496516(4097
 085/76255481 serialized/live bytes, 80335 ops)
  INFO [NonPeriodicTasks:1] 2011-09-09 18:24:28,893 ColumnFamilyStore.java 
 (line 658) Enqueuing flush of Memtable-Standard1@498232521(43513
 20/80922269 serialized/live bytes, 85320 ops)
  INFO [NonPeriodicTasks:1] 2011-09-09 18:24:29,895 ColumnFamilyStore.java 
 (line 658) Enqueuing flush of Memtable-Standard1@1592308290(2310
 810/44514839 serialized/live bytes, 45310 ops)
  INFO [NonPeriodicTasks:1] 2011-09-09 18:24:30,897 ColumnFamilyStore.java 
 (line 658) Enqueuing flush of Memtable-Standard1@775439677(22684
 80/64984390 serialized/live bytes, 44480 ops)
  INFO [NonPeriodicTasks:1] 2011-09-09 18:24:31,899 ColumnFamilyStore.java 
 (line 658) Enqueuing flush of Memtable-Standard1@928217914(26741
 85/76231422 serialized/live bytes, 52435 ops)
  INFO [NonPeriodicTasks:1] 2011-09-09 18:24:32,901 ColumnFamilyStore.java 
 (line 658) Enqueuing flush of Memtable-Standard1@158103119(27511
 95/77317732 serialized/live bytes, 53945 ops)
  INFO [NonPeriodicTasks:1] 2011-09-09 18:24:33,903 ColumnFamilyStore.java 
 (line 658) Enqueuing flush of Memtable-Standard1@2035169258(3132
 420/88934701 serialized/live bytes, 61420 ops)
  INFO [NonPeriodicTasks:1] 2011-09-09 18:24:34,905 ColumnFamilyStore.java 
 (line 658) Enqueuing flush of Memtable-Standard1@1097314626(2979
 675/83651699 serialized/live bytes, 58425 ops)
 {noformat}
 The serialized to live size ratio appears completely out of whack.

--
This message is automatically generated by JIRA.
For more information on JIRA, see: http://www.atlassian.com/software/jira




[jira] [Updated] (CASSANDRA-3203) Odd flush behavior

2011-09-14 Thread Jonathan Ellis (JIRA)

 [ 
https://issues.apache.org/jira/browse/CASSANDRA-3203?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel
 ]

Jonathan Ellis updated CASSANDRA-3203:
--

Attachment: 3203-v2.txt

 Odd flush behavior
 --

 Key: CASSANDRA-3203
 URL: https://issues.apache.org/jira/browse/CASSANDRA-3203
 Project: Cassandra
  Issue Type: Bug
  Components: Core
Affects Versions: 1.0.0
Reporter: Brandon Williams
Priority: Critical
 Fix For: 1.0.0

 Attachments: 3203-prelim.txt, 3203-v2.txt


 Given the same workload against 0.8, trunk is creating more than twice the 
 amount of sstables.  Even though a uniform stress workload is being 
 generated, flush size degrades quickly:
 {noformat}
  INFO [NonPeriodicTasks:1] 2011-09-09 18:24:22,878 ColumnFamilyStore.java 
 (line 658) Enqueuing flush of Memtable-Standard1@2058235391(7741
 035/110172631 serialized/live bytes, 151785 ops)
  INFO [NonPeriodicTasks:1] 2011-09-09 18:24:24,888 ColumnFamilyStore.java 
 (line 658) Enqueuing flush of Memtable-Standard1@1520390052(3887
 220/72403158 serialized/live bytes, 76220 ops)
  INFO [NonPeriodicTasks:1] 2011-09-09 18:24:26,890 ColumnFamilyStore.java 
 (line 658) Enqueuing flush of Memtable-Standard1@1868496516(4097
 085/76255481 serialized/live bytes, 80335 ops)
  INFO [NonPeriodicTasks:1] 2011-09-09 18:24:28,893 ColumnFamilyStore.java 
 (line 658) Enqueuing flush of Memtable-Standard1@498232521(43513
 20/80922269 serialized/live bytes, 85320 ops)
  INFO [NonPeriodicTasks:1] 2011-09-09 18:24:29,895 ColumnFamilyStore.java 
 (line 658) Enqueuing flush of Memtable-Standard1@1592308290(2310
 810/44514839 serialized/live bytes, 45310 ops)
  INFO [NonPeriodicTasks:1] 2011-09-09 18:24:30,897 ColumnFamilyStore.java 
 (line 658) Enqueuing flush of Memtable-Standard1@775439677(22684
 80/64984390 serialized/live bytes, 44480 ops)
  INFO [NonPeriodicTasks:1] 2011-09-09 18:24:31,899 ColumnFamilyStore.java 
 (line 658) Enqueuing flush of Memtable-Standard1@928217914(26741
 85/76231422 serialized/live bytes, 52435 ops)
  INFO [NonPeriodicTasks:1] 2011-09-09 18:24:32,901 ColumnFamilyStore.java 
 (line 658) Enqueuing flush of Memtable-Standard1@158103119(27511
 95/77317732 serialized/live bytes, 53945 ops)
  INFO [NonPeriodicTasks:1] 2011-09-09 18:24:33,903 ColumnFamilyStore.java 
 (line 658) Enqueuing flush of Memtable-Standard1@2035169258(3132
 420/88934701 serialized/live bytes, 61420 ops)
  INFO [NonPeriodicTasks:1] 2011-09-09 18:24:34,905 ColumnFamilyStore.java 
 (line 658) Enqueuing flush of Memtable-Standard1@1097314626(2979
 675/83651699 serialized/live bytes, 58425 ops)
 {noformat}
 The serialized to live size ratio appears completely out of whack.

--
This message is automatically generated by JIRA.
For more information on JIRA, see: http://www.atlassian.com/software/jira




[jira] [Updated] (CASSANDRA-3203) Odd flush behavior

2011-09-14 Thread Jonathan Ellis (JIRA)

 [ 
https://issues.apache.org/jira/browse/CASSANDRA-3203?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel
 ]

Jonathan Ellis updated CASSANDRA-3203:
--

Attachment: (was: 3203-prelim.txt)

 Odd flush behavior
 --

 Key: CASSANDRA-3203
 URL: https://issues.apache.org/jira/browse/CASSANDRA-3203
 Project: Cassandra
  Issue Type: Bug
  Components: Core
Affects Versions: 1.0.0
Reporter: Brandon Williams
Priority: Critical
 Fix For: 1.0.0

 Attachments: 3203-prelim.txt, 3203-v2.txt


 Given the same workload against 0.8, trunk is creating more than twice the 
 amount of sstables.  Even though a uniform stress workload is being 
 generated, flush size degrades quickly:
 {noformat}
  INFO [NonPeriodicTasks:1] 2011-09-09 18:24:22,878 ColumnFamilyStore.java 
 (line 658) Enqueuing flush of Memtable-Standard1@2058235391(7741
 035/110172631 serialized/live bytes, 151785 ops)
  INFO [NonPeriodicTasks:1] 2011-09-09 18:24:24,888 ColumnFamilyStore.java 
 (line 658) Enqueuing flush of Memtable-Standard1@1520390052(3887
 220/72403158 serialized/live bytes, 76220 ops)
  INFO [NonPeriodicTasks:1] 2011-09-09 18:24:26,890 ColumnFamilyStore.java 
 (line 658) Enqueuing flush of Memtable-Standard1@1868496516(4097
 085/76255481 serialized/live bytes, 80335 ops)
  INFO [NonPeriodicTasks:1] 2011-09-09 18:24:28,893 ColumnFamilyStore.java 
 (line 658) Enqueuing flush of Memtable-Standard1@498232521(43513
 20/80922269 serialized/live bytes, 85320 ops)
  INFO [NonPeriodicTasks:1] 2011-09-09 18:24:29,895 ColumnFamilyStore.java 
 (line 658) Enqueuing flush of Memtable-Standard1@1592308290(2310
 810/44514839 serialized/live bytes, 45310 ops)
  INFO [NonPeriodicTasks:1] 2011-09-09 18:24:30,897 ColumnFamilyStore.java 
 (line 658) Enqueuing flush of Memtable-Standard1@775439677(22684
 80/64984390 serialized/live bytes, 44480 ops)
  INFO [NonPeriodicTasks:1] 2011-09-09 18:24:31,899 ColumnFamilyStore.java 
 (line 658) Enqueuing flush of Memtable-Standard1@928217914(26741
 85/76231422 serialized/live bytes, 52435 ops)
  INFO [NonPeriodicTasks:1] 2011-09-09 18:24:32,901 ColumnFamilyStore.java 
 (line 658) Enqueuing flush of Memtable-Standard1@158103119(27511
 95/77317732 serialized/live bytes, 53945 ops)
  INFO [NonPeriodicTasks:1] 2011-09-09 18:24:33,903 ColumnFamilyStore.java 
 (line 658) Enqueuing flush of Memtable-Standard1@2035169258(3132
 420/88934701 serialized/live bytes, 61420 ops)
  INFO [NonPeriodicTasks:1] 2011-09-09 18:24:34,905 ColumnFamilyStore.java 
 (line 658) Enqueuing flush of Memtable-Standard1@1097314626(2979
 675/83651699 serialized/live bytes, 58425 ops)
 {noformat}
 The serialized to live size ratio appears completely out of whack.

--
This message is automatically generated by JIRA.
For more information on JIRA, see: http://www.atlassian.com/software/jira




[jira] [Commented] (CASSANDRA-2961) Expire dead gossip states based on time

2011-09-14 Thread paul cannon (JIRA)

[ 
https://issues.apache.org/jira/browse/CASSANDRA-2961?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanelfocusedCommentId=13104867#comment-13104867
 ] 

paul cannon commented on CASSANDRA-2961:


So it looks like expireTimeEndpointMap is meant to contain absolute timestamps, 
not durations; however, the default expiretime value (as returned by 
o.a.c.gms.Gossiper.getExpireTimeForEndpoint()) is aVeryLongTime.

That should probably be (System.currentTimeMillis() + aVeryLongTime).

Also, I think it would make more sense to pass expire times into the 
VersionedValue constructors, not call into the Gossiper from inside them.

 Expire dead gossip states based on time
 ---

 Key: CASSANDRA-2961
 URL: https://issues.apache.org/jira/browse/CASSANDRA-2961
 Project: Cassandra
  Issue Type: Improvement
Affects Versions: 1.0.0
Reporter: Brandon Williams
Assignee: Jérémy Sevellec
Priority: Minor
 Fix For: 1.0.1

 Attachments: trunk-2961-v2.patch, trunk-2961-v3.patch, 
 trunk-2961.patch


 Currently dead states are held until aVeryLongTime, 3 days.  The problem is 
 that if a node reboots within this period, it begins a new 3 days and will 
 repopulate the ring with the dead state.  While mostly harmless, perpetuating 
 the state forever is at least wasting a small amount of bandwidth.  Instead, 
 we can expire states based on a ttl, which will require that the cluster be 
 loosely time synced; within the quarantine period of 60s.

--
This message is automatically generated by JIRA.
For more information on JIRA, see: http://www.atlassian.com/software/jira




[jira] [Created] (CASSANDRA-3208) USE keyspace doesn't work for numeric keyspaces

2011-09-14 Thread Ophir Radnitz (JIRA)
USE keyspace doesn't work for numeric keyspaces
-

 Key: CASSANDRA-3208
 URL: https://issues.apache.org/jira/browse/CASSANDRA-3208
 Project: Cassandra
  Issue Type: Bug
Affects Versions: 0.8.4
Reporter: Ophir Radnitz


In the CLI, {code}USE keyspace;{code} doesn't work for keyspaces' names that 
contain only digits.
The error I'm getting is:
{{Syntax error at position 4: mismatched input '20110914' expecting Identifier}}

--
This message is automatically generated by JIRA.
For more information on JIRA, see: http://www.atlassian.com/software/jira




[jira] [Commented] (CASSANDRA-3203) Odd flush behavior

2011-09-14 Thread Brandon Williams (JIRA)

[ 
https://issues.apache.org/jira/browse/CASSANDRA-3203?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanelfocusedCommentId=13104883#comment-13104883
 ] 

Brandon Williams commented on CASSANDRA-3203:
-

bq. I'm getting liveRatio of 4-6 now which makes me wonder if we need to add a 
higher fudge factor to make it not OOM again. 

I couldn't OOM it, and I get much more consistent flush behavior now, even 
better than before CASSANDRA-1610 which inadvertently caused the re-counting.

+1

 Odd flush behavior
 --

 Key: CASSANDRA-3203
 URL: https://issues.apache.org/jira/browse/CASSANDRA-3203
 Project: Cassandra
  Issue Type: Bug
  Components: Core
Affects Versions: 1.0.0
Reporter: Brandon Williams
Priority: Critical
 Fix For: 1.0.0

 Attachments: 3203-prelim.txt, 3203-v2.txt


 Given the same workload against 0.8, trunk is creating more than twice the 
 amount of sstables.  Even though a uniform stress workload is being 
 generated, flush size degrades quickly:
 {noformat}
  INFO [NonPeriodicTasks:1] 2011-09-09 18:24:22,878 ColumnFamilyStore.java 
 (line 658) Enqueuing flush of Memtable-Standard1@2058235391(7741
 035/110172631 serialized/live bytes, 151785 ops)
  INFO [NonPeriodicTasks:1] 2011-09-09 18:24:24,888 ColumnFamilyStore.java 
 (line 658) Enqueuing flush of Memtable-Standard1@1520390052(3887
 220/72403158 serialized/live bytes, 76220 ops)
  INFO [NonPeriodicTasks:1] 2011-09-09 18:24:26,890 ColumnFamilyStore.java 
 (line 658) Enqueuing flush of Memtable-Standard1@1868496516(4097
 085/76255481 serialized/live bytes, 80335 ops)
  INFO [NonPeriodicTasks:1] 2011-09-09 18:24:28,893 ColumnFamilyStore.java 
 (line 658) Enqueuing flush of Memtable-Standard1@498232521(43513
 20/80922269 serialized/live bytes, 85320 ops)
  INFO [NonPeriodicTasks:1] 2011-09-09 18:24:29,895 ColumnFamilyStore.java 
 (line 658) Enqueuing flush of Memtable-Standard1@1592308290(2310
 810/44514839 serialized/live bytes, 45310 ops)
  INFO [NonPeriodicTasks:1] 2011-09-09 18:24:30,897 ColumnFamilyStore.java 
 (line 658) Enqueuing flush of Memtable-Standard1@775439677(22684
 80/64984390 serialized/live bytes, 44480 ops)
  INFO [NonPeriodicTasks:1] 2011-09-09 18:24:31,899 ColumnFamilyStore.java 
 (line 658) Enqueuing flush of Memtable-Standard1@928217914(26741
 85/76231422 serialized/live bytes, 52435 ops)
  INFO [NonPeriodicTasks:1] 2011-09-09 18:24:32,901 ColumnFamilyStore.java 
 (line 658) Enqueuing flush of Memtable-Standard1@158103119(27511
 95/77317732 serialized/live bytes, 53945 ops)
  INFO [NonPeriodicTasks:1] 2011-09-09 18:24:33,903 ColumnFamilyStore.java 
 (line 658) Enqueuing flush of Memtable-Standard1@2035169258(3132
 420/88934701 serialized/live bytes, 61420 ops)
  INFO [NonPeriodicTasks:1] 2011-09-09 18:24:34,905 ColumnFamilyStore.java 
 (line 658) Enqueuing flush of Memtable-Standard1@1097314626(2979
 675/83651699 serialized/live bytes, 58425 ops)
 {noformat}
 The serialized to live size ratio appears completely out of whack.

--
This message is automatically generated by JIRA.
For more information on JIRA, see: http://www.atlassian.com/software/jira




[jira] [Commented] (CASSANDRA-3206) increase file descriptor limit in deb, rpm packages

2011-09-14 Thread Peter Schuller (JIRA)

[ 
https://issues.apache.org/jira/browse/CASSANDRA-3206?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanelfocusedCommentId=13104892#comment-13104892
 ] 

Peter Schuller commented on CASSANDRA-3206:
---

My two cents: Just go wild. I really don't see the need to be conservative. On 
any modern system that you run Cassandra on, the resources consumed by file 
descriptors is going to be irrelevant and I don't see when you'd ever actually 
want Cassandra to hit the limit, unless it's *completely* run-away and buggy in 
which case the limit need not be low. Better a very high number so people don't 
run into it, than try to shave off.

64k seems reasonable, I'd be fine with 250k ;)


 increase file descriptor limit in deb, rpm packages
 ---

 Key: CASSANDRA-3206
 URL: https://issues.apache.org/jira/browse/CASSANDRA-3206
 Project: Cassandra
  Issue Type: Bug
  Components: Packaging
Reporter: Jonathan Ellis
Assignee: paul cannon
Priority: Minor
 Fix For: 0.8.6


 We can use a lot of file descriptors (one per socket, 5? per sstable).  
 People hit this regularly on the user list and it will get worse with Leveled 
 compaction, which limits sstable size to a relatively low size (currently 
 5MB).

--
This message is automatically generated by JIRA.
For more information on JIRA, see: http://www.atlassian.com/software/jira




[jira] [Commented] (CASSANDRA-3208) USE keyspace doesn't work for numeric keyspaces

2011-09-14 Thread Jonathan Ellis (JIRA)

[ 
https://issues.apache.org/jira/browse/CASSANDRA-3208?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanelfocusedCommentId=13104961#comment-13104961
 ] 

Jonathan Ellis commented on CASSANDRA-3208:
---

Did you try quoting the KS name?

 USE keyspace doesn't work for numeric keyspaces
 -

 Key: CASSANDRA-3208
 URL: https://issues.apache.org/jira/browse/CASSANDRA-3208
 Project: Cassandra
  Issue Type: Bug
Affects Versions: 0.8.4
Reporter: Ophir Radnitz
  Labels: cli

 In the CLI, {code}USE keyspace;{code} doesn't work for keyspaces' names 
 that contain only digits.
 The error I'm getting is:
 {{Syntax error at position 4: mismatched input '20110914' expecting 
 Identifier}}

--
This message is automatically generated by JIRA.
For more information on JIRA, see: http://www.atlassian.com/software/jira




[jira] [Commented] (CASSANDRA-3206) increase file descriptor limit in deb, rpm packages

2011-09-14 Thread Jonathan Ellis (JIRA)

[ 
https://issues.apache.org/jira/browse/CASSANDRA-3206?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanelfocusedCommentId=13104966#comment-13104966
 ] 

Jonathan Ellis commented on CASSANDRA-3206:
---

SGTM.

 increase file descriptor limit in deb, rpm packages
 ---

 Key: CASSANDRA-3206
 URL: https://issues.apache.org/jira/browse/CASSANDRA-3206
 Project: Cassandra
  Issue Type: Bug
  Components: Packaging
Reporter: Jonathan Ellis
Assignee: paul cannon
Priority: Minor
 Fix For: 0.8.6


 We can use a lot of file descriptors (one per socket, 5? per sstable).  
 People hit this regularly on the user list and it will get worse with Leveled 
 compaction, which limits sstable size to a relatively low size (currently 
 5MB).

--
This message is automatically generated by JIRA.
For more information on JIRA, see: http://www.atlassian.com/software/jira




svn commit: r1170893 - in /cassandra/branches/cassandra-1.0.0: CHANGES.txt build.xml conf/cassandra-env.sh src/java/org/apache/cassandra/db/Memtable.java

2011-09-14 Thread jbellis
Author: jbellis
Date: Wed Sep 14 23:08:34 2011
New Revision: 1170893

URL: http://svn.apache.org/viewvc?rev=1170893view=rev
Log:
Fix counting CFMetadata towards Memtable liveRatio
patch by jbellis; reviewed by brandonwilliams for CASSANDRA-3203

Modified:
cassandra/branches/cassandra-1.0.0/CHANGES.txt
cassandra/branches/cassandra-1.0.0/build.xml
cassandra/branches/cassandra-1.0.0/conf/cassandra-env.sh

cassandra/branches/cassandra-1.0.0/src/java/org/apache/cassandra/db/Memtable.java

Modified: cassandra/branches/cassandra-1.0.0/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/cassandra/branches/cassandra-1.0.0/CHANGES.txt?rev=1170893r1=1170892r2=1170893view=diff
==
--- cassandra/branches/cassandra-1.0.0/CHANGES.txt (original)
+++ cassandra/branches/cassandra-1.0.0/CHANGES.txt Wed Sep 14 23:08:34 2011
@@ -1,3 +1,7 @@
+1.0.0-rc1
+ * Fix counting CFMetadata towards Memtable liveRatio (CASSANDRA-3023)
+
+
 1.0.0-beta1
  * removed binarymemtable (CASSANDRA-2692)
  * add commitlog_total_space_in_mb to prevent fragmented logs (CASSANDRA-2427)

Modified: cassandra/branches/cassandra-1.0.0/build.xml
URL: 
http://svn.apache.org/viewvc/cassandra/branches/cassandra-1.0.0/build.xml?rev=1170893r1=1170892r2=1170893view=diff
==
--- cassandra/branches/cassandra-1.0.0/build.xml (original)
+++ cassandra/branches/cassandra-1.0.0/build.xml Wed Sep 14 23:08:34 2011
@@ -366,7 +366,7 @@ url=${svn.entry.url}?pathrev=${svn.entry
   /dependency
   dependency groupId=com.googlecode.json-simple 
artifactId=json-simple version=1.1/
   dependency groupId=com.github.stephenc.high-scale-lib 
artifactId=high-scale-lib version=1.1.2/
-  dependency groupId=com.github.stephenc artifactId=jamm 
version=0.2.4/
+  dependency groupId=com.github.stephenc artifactId=jamm 
version=0.2.5/
   dependency groupId=org.yaml artifactId=snakeyaml version=1.6/
   dependency groupId=org.apache.cassandra.deps artifactId=avro 
version=1.4.0-cassandra-1
 exclusion groupId=org.jboss.netty artifactId=netty/
@@ -1002,7 +1002,7 @@ url=${svn.entry.url}?pathrev=${svn.entry
 jvmarg value=-Dstorage-config=${test.conf}/
 jvmarg value=-Daccess.properties=${test.conf}/access.properties/
 jvmarg value=-Dlog4j.configuration=log4j-junit.properties /
-jvmarg value=-javaagent:${basedir}/lib/jamm-0.2.4.jar /
+jvmarg value=-javaagent:${basedir}/lib/jamm-0.2.5.jar /
 jvmarg value=-ea/
 optjvmargs/
 classpath

Modified: cassandra/branches/cassandra-1.0.0/conf/cassandra-env.sh
URL: 
http://svn.apache.org/viewvc/cassandra/branches/cassandra-1.0.0/conf/cassandra-env.sh?rev=1170893r1=1170892r2=1170893view=diff
==
--- cassandra/branches/cassandra-1.0.0/conf/cassandra-env.sh (original)
+++ cassandra/branches/cassandra-1.0.0/conf/cassandra-env.sh Wed Sep 14 
23:08:34 2011
@@ -100,7 +100,7 @@ JVM_OPTS=$JVM_OPTS -ea
 check_openjdk=`${JAVA:-java} -version 21 | awk '{if (NR == 2) {print $1}}'`
 if [ $check_openjdk != OpenJDK ]
 then
-JVM_OPTS=$JVM_OPTS -javaagent:$CASSANDRA_HOME/lib/jamm-0.2.4.jar
+JVM_OPTS=$JVM_OPTS -javaagent:$CASSANDRA_HOME/lib/jamm-0.2.5.jar
 fi
 
 # enable thread priorities, primarily so we can give periodic tasks

Modified: 
cassandra/branches/cassandra-1.0.0/src/java/org/apache/cassandra/db/Memtable.java
URL: 
http://svn.apache.org/viewvc/cassandra/branches/cassandra-1.0.0/src/java/org/apache/cassandra/db/Memtable.java?rev=1170893r1=1170892r2=1170893view=diff
==
--- 
cassandra/branches/cassandra-1.0.0/src/java/org/apache/cassandra/db/Memtable.java
 (original)
+++ 
cassandra/branches/cassandra-1.0.0/src/java/org/apache/cassandra/db/Memtable.java
 Wed Sep 14 23:08:34 2011
@@ -21,10 +21,7 @@ package org.apache.cassandra.db;
 import java.io.File;
 import java.io.IOException;
 import java.nio.ByteBuffer;
-import java.util.Collection;
-import java.util.Comparator;
-import java.util.Iterator;
-import java.util.Map;
+import java.util.*;
 import java.util.concurrent.*;
 import java.util.concurrent.atomic.AtomicLong;
 
@@ -55,7 +52,6 @@ public class Memtable
 private static final double MIN_SANE_LIVE_RATIO = 1.0;
 // max liveratio seen w/ 1-byte columns on a 64-bit jvm was 19. If it gets 
higher than 64 something is probably broken.
 private static final double MAX_SANE_LIVE_RATIO = 64.0;
-private static final MemoryMeter meter = new 
MemoryMeter().omitSharedBufferOverhead();
 
 // we're careful to only allow one count to run at a time because counting 
is slow
 // (can be minutes, for a large memtable and a busy server), so we could 
keep memtables
@@ -70,6 +66,8 @@ public class Memtable
 }
 

svn commit: r1170894 - in /cassandra/branches/cassandra-1.0: ./ conf/ contrib/ debian/ interface/thrift/gen-java/org/apache/cassandra/thrift/ src/java/org/apache/cassandra/config/ src/java/org/apache/

2011-09-14 Thread jbellis
Author: jbellis
Date: Wed Sep 14 23:09:38 2011
New Revision: 1170894

URL: http://svn.apache.org/viewvc?rev=1170894view=rev
Log:
merge #3203 from 1.0.0

Modified:
cassandra/branches/cassandra-1.0/   (props changed)
cassandra/branches/cassandra-1.0/CHANGES.txt
cassandra/branches/cassandra-1.0/build.xml
cassandra/branches/cassandra-1.0/conf/cassandra-env.sh
cassandra/branches/cassandra-1.0/contrib/   (props changed)
cassandra/branches/cassandra-1.0/debian/changelog

cassandra/branches/cassandra-1.0/interface/thrift/gen-java/org/apache/cassandra/thrift/Cassandra.java
   (props changed)

cassandra/branches/cassandra-1.0/interface/thrift/gen-java/org/apache/cassandra/thrift/Column.java
   (props changed)

cassandra/branches/cassandra-1.0/interface/thrift/gen-java/org/apache/cassandra/thrift/InvalidRequestException.java
   (props changed)

cassandra/branches/cassandra-1.0/interface/thrift/gen-java/org/apache/cassandra/thrift/NotFoundException.java
   (props changed)

cassandra/branches/cassandra-1.0/interface/thrift/gen-java/org/apache/cassandra/thrift/SuperColumn.java
   (props changed)

cassandra/branches/cassandra-1.0/src/java/org/apache/cassandra/config/CFMetaData.java

cassandra/branches/cassandra-1.0/src/java/org/apache/cassandra/db/Memtable.java

cassandra/branches/cassandra-1.0/tools/stress/src/org/apache/cassandra/stress/Session.java

Propchange: cassandra/branches/cassandra-1.0/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Sep 14 23:09:38 2011
@@ -5,7 +5,7 @@
 /cassandra/branches/cassandra-0.8.0:1125021-1130369
 /cassandra/branches/cassandra-0.8.1:1101014-1125018
 /cassandra/branches/cassandra-1.0:1167106,1167185
-/cassandra/branches/cassandra-1.0.0:1167104-1170608,1170641,1170682
+/cassandra/branches/cassandra-1.0.0:1167104-1170893
 /cassandra/tags/cassandra-0.7.0-rc3:1051699-1053689
 /cassandra/tags/cassandra-0.8.0-rc1:1102511-1125020
 /cassandra/trunk:1167085-1167102,1169870

Modified: cassandra/branches/cassandra-1.0/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/cassandra/branches/cassandra-1.0/CHANGES.txt?rev=1170894r1=1170893r2=1170894view=diff
==
--- cassandra/branches/cassandra-1.0/CHANGES.txt (original)
+++ cassandra/branches/cassandra-1.0/CHANGES.txt Wed Sep 14 23:09:38 2011
@@ -2,6 +2,10 @@
  * describe_ring should include datacenter/topology information 
(CASSANDRA-2882)
 
 
+1.0.0-rc1
+ * Fix counting CFMetadata towards Memtable liveRatio (CASSANDRA-3023)
+
+
 1.0.0-beta1
  * removed binarymemtable (CASSANDRA-2692)
  * add commitlog_total_space_in_mb to prevent fragmented logs (CASSANDRA-2427)
@@ -78,6 +82,8 @@
  * Fix backwards compatibilty for CQL memtable properties (CASSANDRA-3190)
  * Add five-minute delay before starting compactions on a restarted server
(CASSANDRA-3181)
+ * Reduce copies done for intra-host messages (CASSANDRA-1788, 3144)
+ * support of compaction strategy option for stress.java (CASSANDRA-3204)
 
 
 0.8.6

Modified: cassandra/branches/cassandra-1.0/build.xml
URL: 
http://svn.apache.org/viewvc/cassandra/branches/cassandra-1.0/build.xml?rev=1170894r1=1170893r2=1170894view=diff
==
--- cassandra/branches/cassandra-1.0/build.xml (original)
+++ cassandra/branches/cassandra-1.0/build.xml Wed Sep 14 23:09:38 2011
@@ -366,7 +366,7 @@ url=${svn.entry.url}?pathrev=${svn.entry
   /dependency
   dependency groupId=com.googlecode.json-simple 
artifactId=json-simple version=1.1/
   dependency groupId=com.github.stephenc.high-scale-lib 
artifactId=high-scale-lib version=1.1.2/
-  dependency groupId=com.github.stephenc artifactId=jamm 
version=0.2.4/
+  dependency groupId=com.github.stephenc artifactId=jamm 
version=0.2.5/
   dependency groupId=org.yaml artifactId=snakeyaml version=1.6/
   dependency groupId=org.apache.cassandra.deps artifactId=avro 
version=1.4.0-cassandra-1
 exclusion groupId=org.jboss.netty artifactId=netty/
@@ -1002,7 +1002,7 @@ url=${svn.entry.url}?pathrev=${svn.entry
 jvmarg value=-Dstorage-config=${test.conf}/
 jvmarg value=-Daccess.properties=${test.conf}/access.properties/
 jvmarg value=-Dlog4j.configuration=log4j-junit.properties /
-jvmarg value=-javaagent:${basedir}/lib/jamm-0.2.4.jar /
+jvmarg value=-javaagent:${basedir}/lib/jamm-0.2.5.jar /
 jvmarg value=-ea/
 optjvmargs/
 classpath

Modified: cassandra/branches/cassandra-1.0/conf/cassandra-env.sh
URL: 
http://svn.apache.org/viewvc/cassandra/branches/cassandra-1.0/conf/cassandra-env.sh?rev=1170894r1=1170893r2=1170894view=diff
==
--- cassandra/branches/cassandra-1.0/conf/cassandra-env.sh (original)
+++ 

[jira] [Resolved] (CASSANDRA-3203) Odd flush behavior

2011-09-14 Thread Jonathan Ellis (JIRA)

 [ 
https://issues.apache.org/jira/browse/CASSANDRA-3203?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel
 ]

Jonathan Ellis resolved CASSANDRA-3203.
---

Resolution: Fixed
  Reviewer: brandon.williams
  Assignee: Jonathan Ellis

committed

 Odd flush behavior
 --

 Key: CASSANDRA-3203
 URL: https://issues.apache.org/jira/browse/CASSANDRA-3203
 Project: Cassandra
  Issue Type: Bug
  Components: Core
Affects Versions: 1.0.0
Reporter: Brandon Williams
Assignee: Jonathan Ellis
Priority: Critical
 Fix For: 1.0.0

 Attachments: 3203-prelim.txt, 3203-v2.txt


 Given the same workload against 0.8, trunk is creating more than twice the 
 amount of sstables.  Even though a uniform stress workload is being 
 generated, flush size degrades quickly:
 {noformat}
  INFO [NonPeriodicTasks:1] 2011-09-09 18:24:22,878 ColumnFamilyStore.java 
 (line 658) Enqueuing flush of Memtable-Standard1@2058235391(7741
 035/110172631 serialized/live bytes, 151785 ops)
  INFO [NonPeriodicTasks:1] 2011-09-09 18:24:24,888 ColumnFamilyStore.java 
 (line 658) Enqueuing flush of Memtable-Standard1@1520390052(3887
 220/72403158 serialized/live bytes, 76220 ops)
  INFO [NonPeriodicTasks:1] 2011-09-09 18:24:26,890 ColumnFamilyStore.java 
 (line 658) Enqueuing flush of Memtable-Standard1@1868496516(4097
 085/76255481 serialized/live bytes, 80335 ops)
  INFO [NonPeriodicTasks:1] 2011-09-09 18:24:28,893 ColumnFamilyStore.java 
 (line 658) Enqueuing flush of Memtable-Standard1@498232521(43513
 20/80922269 serialized/live bytes, 85320 ops)
  INFO [NonPeriodicTasks:1] 2011-09-09 18:24:29,895 ColumnFamilyStore.java 
 (line 658) Enqueuing flush of Memtable-Standard1@1592308290(2310
 810/44514839 serialized/live bytes, 45310 ops)
  INFO [NonPeriodicTasks:1] 2011-09-09 18:24:30,897 ColumnFamilyStore.java 
 (line 658) Enqueuing flush of Memtable-Standard1@775439677(22684
 80/64984390 serialized/live bytes, 44480 ops)
  INFO [NonPeriodicTasks:1] 2011-09-09 18:24:31,899 ColumnFamilyStore.java 
 (line 658) Enqueuing flush of Memtable-Standard1@928217914(26741
 85/76231422 serialized/live bytes, 52435 ops)
  INFO [NonPeriodicTasks:1] 2011-09-09 18:24:32,901 ColumnFamilyStore.java 
 (line 658) Enqueuing flush of Memtable-Standard1@158103119(27511
 95/77317732 serialized/live bytes, 53945 ops)
  INFO [NonPeriodicTasks:1] 2011-09-09 18:24:33,903 ColumnFamilyStore.java 
 (line 658) Enqueuing flush of Memtable-Standard1@2035169258(3132
 420/88934701 serialized/live bytes, 61420 ops)
  INFO [NonPeriodicTasks:1] 2011-09-09 18:24:34,905 ColumnFamilyStore.java 
 (line 658) Enqueuing flush of Memtable-Standard1@1097314626(2979
 675/83651699 serialized/live bytes, 58425 ops)
 {noformat}
 The serialized to live size ratio appears completely out of whack.

--
This message is automatically generated by JIRA.
For more information on JIRA, see: http://www.atlassian.com/software/jira




[jira] [Commented] (CASSANDRA-3085) Race condition in sstable reference counting

2011-09-14 Thread Yang Yang (JIRA)

[ 
https://issues.apache.org/jira/browse/CASSANDRA-3085?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanelfocusedCommentId=13104993#comment-13104993
 ] 

Yang Yang commented on CASSANDRA-3085:
--

bq. but it will when we attempt to read from them next.

Jonathan: since the sstable deletion code is wrapped inside 
SSTableReader.releaseReference(), I thought as long as anyone is holding a 
reference to the SSTableReader, the file would not be deleted? could you please 
explain a bit?

Thanks
Yang

 Race condition in sstable reference counting
 

 Key: CASSANDRA-3085
 URL: https://issues.apache.org/jira/browse/CASSANDRA-3085
 Project: Cassandra
  Issue Type: Bug
  Components: Core
Affects Versions: 1.0.0
Reporter: Jonathan Ellis
Assignee: Jonathan Ellis
Priority: Critical
 Fix For: 1.0.0

 Attachments: 3085-v2.txt, 3085.txt


 DataTracker gives us an atomic View of memtable/sstables, but acquiring 
 references is not atomic.  So it is possible to acquire references to an 
 SSTableReader object that is no longer valid, as in this example:
 View V contains sstables {A, B}.  We attempt a read in thread T using this 
 View.
 Meanwhile, A and B are compacted to {C}, yielding View W.  No references 
 exist to A or B so they are cleaned up.
 Back in thread T we acquire references to A and B.  This does not cause an 
 error, but it will when we attempt to read from them next.

--
This message is automatically generated by JIRA.
For more information on JIRA, see: http://www.atlassian.com/software/jira




[jira] [Created] (CASSANDRA-3209) CLI does not display error when it is not possible to create a keyspace when schemas in cluster do not agree.

2011-09-14 Thread Todd Nine (JIRA)
CLI does not display error when it is not possible to create a keyspace when 
schemas in cluster do not agree.
-

 Key: CASSANDRA-3209
 URL: https://issues.apache.org/jira/browse/CASSANDRA-3209
 Project: Cassandra
  Issue Type: Bug
  Components: Core
Affects Versions: 0.8.1
 Environment: Latest brisk beta 2 deb on Ubuntu 10.10 server 64 bit.  
(Using chef recipe to install)
Reporter: Todd Nine


Cluster:

3 nodes.  2 online, 1 offline

describe cluster; displays 2 schema versions.  2 nodes are on 1 version, a 
single node is on a different version.

Issue this command in the CLI.

create keyspace TestKeyspace with placement_strategy = 
'org.apache.cassandra.locator.NetworkTopologyStrategy' and 
strategy_options=[{Brisk:3, Cassandra:0}];

What should happen.

An error should be displayed when the keyspace cannot be created.

What actually happens.

The user is presented with null as the output.

--
This message is automatically generated by JIRA.
For more information on JIRA, see: http://www.atlassian.com/software/jira




[jira] [Commented] (CASSANDRA-3209) CLI does not display error when it is not possible to create a keyspace when schemas in cluster do not agree.

2011-09-14 Thread Pavel Yaskevich (JIRA)

[ 
https://issues.apache.org/jira/browse/CASSANDRA-3209?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanelfocusedCommentId=13105013#comment-13105013
 ] 

Pavel Yaskevich commented on CASSANDRA-3209:


What does your system.log output on that matter?

 CLI does not display error when it is not possible to create a keyspace when 
 schemas in cluster do not agree.
 -

 Key: CASSANDRA-3209
 URL: https://issues.apache.org/jira/browse/CASSANDRA-3209
 Project: Cassandra
  Issue Type: Bug
  Components: Core
Affects Versions: 0.8.1
 Environment: Latest brisk beta 2 deb on Ubuntu 10.10 server 64 bit.  
 (Using chef recipe to install)
Reporter: Todd Nine
Assignee: Pavel Yaskevich
  Labels: cli

 Cluster:
 3 nodes.  2 online, 1 offline
 describe cluster; displays 2 schema versions.  2 nodes are on 1 version, a 
 single node is on a different version.
 Issue this command in the CLI.
 create keyspace TestKeyspace with placement_strategy = 
 'org.apache.cassandra.locator.NetworkTopologyStrategy' and 
 strategy_options=[{Brisk:3, Cassandra:0}];
 What should happen.
 An error should be displayed when the keyspace cannot be created.
 What actually happens.
 The user is presented with null as the output.

--
This message is automatically generated by JIRA.
For more information on JIRA, see: http://www.atlassian.com/software/jira




[jira] [Commented] (CASSANDRA-3085) Race condition in sstable reference counting

2011-09-14 Thread Jonathan Ellis (JIRA)

[ 
https://issues.apache.org/jira/browse/CASSANDRA-3085?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanelfocusedCommentId=13105018#comment-13105018
 ] 

Jonathan Ellis commented on CASSANDRA-3085:
---

Right.  A sstable starts with one reference.  When we do a read, we acquire a 
reference, then release when we're done.  When we compact it, we release a 
reference.  

So we can do arbitrary numbers of reads w/o reference count getting to zero, 
but once we compact, either the compact release or a read release will drop it 
to zero. This last release will unmap and delete it, whether from compaction or 
a read.

 Race condition in sstable reference counting
 

 Key: CASSANDRA-3085
 URL: https://issues.apache.org/jira/browse/CASSANDRA-3085
 Project: Cassandra
  Issue Type: Bug
  Components: Core
Affects Versions: 1.0.0
Reporter: Jonathan Ellis
Assignee: Jonathan Ellis
Priority: Critical
 Fix For: 1.0.0

 Attachments: 3085-v2.txt, 3085.txt


 DataTracker gives us an atomic View of memtable/sstables, but acquiring 
 references is not atomic.  So it is possible to acquire references to an 
 SSTableReader object that is no longer valid, as in this example:
 View V contains sstables {A, B}.  We attempt a read in thread T using this 
 View.
 Meanwhile, A and B are compacted to {C}, yielding View W.  No references 
 exist to A or B so they are cleaned up.
 Back in thread T we acquire references to A and B.  This does not cause an 
 error, but it will when we attempt to read from them next.

--
This message is automatically generated by JIRA.
For more information on JIRA, see: http://www.atlassian.com/software/jira




[jira] [Commented] (CASSANDRA-3209) CLI does not display error when it is not possible to create a keyspace when schemas in cluster do not agree.

2011-09-14 Thread Todd Nine (JIRA)

[ 
https://issues.apache.org/jira/browse/CASSANDRA-3209?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanelfocusedCommentId=13105038#comment-13105038
 ] 

Todd Nine commented on CASSANDRA-3209:
--

Unfortunately this was on a testing cluster which has since been shut down, so 
I don't have the system.log output.

 CLI does not display error when it is not possible to create a keyspace when 
 schemas in cluster do not agree.
 -

 Key: CASSANDRA-3209
 URL: https://issues.apache.org/jira/browse/CASSANDRA-3209
 Project: Cassandra
  Issue Type: Bug
  Components: Core
Affects Versions: 0.8.1
 Environment: Latest brisk beta 2 deb on Ubuntu 10.10 server 64 bit.  
 (Using chef recipe to install)
Reporter: Todd Nine
Assignee: Pavel Yaskevich
  Labels: cli

 Cluster:
 3 nodes.  2 online, 1 offline
 describe cluster; displays 2 schema versions.  2 nodes are on 1 version, a 
 single node is on a different version.
 Issue this command in the CLI.
 create keyspace TestKeyspace with placement_strategy = 
 'org.apache.cassandra.locator.NetworkTopologyStrategy' and 
 strategy_options=[{Brisk:3, Cassandra:0}];
 What should happen.
 An error should be displayed when the keyspace cannot be created.
 What actually happens.
 The user is presented with null as the output.

--
This message is automatically generated by JIRA.
For more information on JIRA, see: http://www.atlassian.com/software/jira




[jira] [Commented] (CASSANDRA-3198) debian packaging installation problem when installing for the first time

2011-09-14 Thread Shyamal Prasad (JIRA)

[ 
https://issues.apache.org/jira/browse/CASSANDRA-3198?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanelfocusedCommentId=13105042#comment-13105042
 ] 

Shyamal Prasad commented on CASSANDRA-3198:
---

BTW, I tested the snippet in Eric's comment with the additional pre-0.6.4-2 
check (my patch) pretty extensively: install, upgrade to package with new 
version, remove and reinstall etc. It certainly looks right, and I am sure it 
works because I tried it, several ways. I did not test the upgrade from 0.6.4-2 
since I did not completely understand why it was important, but I left it in 
once I traced it down to CASSANDRA-1004. As I suspected  there's people out 
there that know better :-)

(BTW, in testing I found one minor irritation that 
/var/log/cassandra/output.log gets created owned by root after installation. I 
suspect this is because it is created before jsvc switches the user to after 
allowing privileged operations to complete...once I'm sure the problem is real 
I'll file it separatelybut it was a good test case for the patch!)



 debian packaging installation problem when installing for the first time
 

 Key: CASSANDRA-3198
 URL: https://issues.apache.org/jira/browse/CASSANDRA-3198
 Project: Cassandra
  Issue Type: Bug
  Components: Packaging
Affects Versions: 0.8.5
Reporter: Jérémy Sevellec
Assignee: Jérémy Sevellec
 Fix For: 0.8.6

 Attachments: debian-postinst-fixperms.patch, trunk-3198-v1.patch


 when installing cassandra through the debian packaging for the first time, 
 there is permission problem when starting Cassandra.
 Normally, the postinst script change owner of /var/log/cassandra and 
 /var/lib/cassandra from root to cassandra user.
 there is a problem with the test which verify if threre is a need to change 
 the owner of these directory or not.
 On a new install, the $2 parameter is not set and the the test is false and 
 the owner is not changed.
 (simply, i think replace  with || might work)

--
This message is automatically generated by JIRA.
For more information on JIRA, see: http://www.atlassian.com/software/jira




[jira] [Updated] (CASSANDRA-3203) Odd flush behavior

2011-09-14 Thread Brandon Williams (JIRA)

 [ 
https://issues.apache.org/jira/browse/CASSANDRA-3203?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel
 ]

Brandon Williams updated CASSANDRA-3203:


Attachment: 3203.png

Here's what jconsole looks like with with a 1G heap receiving 100M inserts from 
stress.  Analysis of the heap indicates the memory decrease is due to bloom 
filters and index sampling, so I think we're safe without a fudge factor, 
especially since the fudge factor predated the SlabAllocator.  The points where 
the heap did hit ~75%, the GCI pressure valve did a good job in combination 
with CMS of dropping the usage back down before there was any danger.

 Odd flush behavior
 --

 Key: CASSANDRA-3203
 URL: https://issues.apache.org/jira/browse/CASSANDRA-3203
 Project: Cassandra
  Issue Type: Bug
  Components: Core
Affects Versions: 1.0.0
Reporter: Brandon Williams
Assignee: Jonathan Ellis
Priority: Critical
 Fix For: 1.0.0

 Attachments: 3203-prelim.txt, 3203-v2.txt, 3203.png


 Given the same workload against 0.8, trunk is creating more than twice the 
 amount of sstables.  Even though a uniform stress workload is being 
 generated, flush size degrades quickly:
 {noformat}
  INFO [NonPeriodicTasks:1] 2011-09-09 18:24:22,878 ColumnFamilyStore.java 
 (line 658) Enqueuing flush of Memtable-Standard1@2058235391(7741
 035/110172631 serialized/live bytes, 151785 ops)
  INFO [NonPeriodicTasks:1] 2011-09-09 18:24:24,888 ColumnFamilyStore.java 
 (line 658) Enqueuing flush of Memtable-Standard1@1520390052(3887
 220/72403158 serialized/live bytes, 76220 ops)
  INFO [NonPeriodicTasks:1] 2011-09-09 18:24:26,890 ColumnFamilyStore.java 
 (line 658) Enqueuing flush of Memtable-Standard1@1868496516(4097
 085/76255481 serialized/live bytes, 80335 ops)
  INFO [NonPeriodicTasks:1] 2011-09-09 18:24:28,893 ColumnFamilyStore.java 
 (line 658) Enqueuing flush of Memtable-Standard1@498232521(43513
 20/80922269 serialized/live bytes, 85320 ops)
  INFO [NonPeriodicTasks:1] 2011-09-09 18:24:29,895 ColumnFamilyStore.java 
 (line 658) Enqueuing flush of Memtable-Standard1@1592308290(2310
 810/44514839 serialized/live bytes, 45310 ops)
  INFO [NonPeriodicTasks:1] 2011-09-09 18:24:30,897 ColumnFamilyStore.java 
 (line 658) Enqueuing flush of Memtable-Standard1@775439677(22684
 80/64984390 serialized/live bytes, 44480 ops)
  INFO [NonPeriodicTasks:1] 2011-09-09 18:24:31,899 ColumnFamilyStore.java 
 (line 658) Enqueuing flush of Memtable-Standard1@928217914(26741
 85/76231422 serialized/live bytes, 52435 ops)
  INFO [NonPeriodicTasks:1] 2011-09-09 18:24:32,901 ColumnFamilyStore.java 
 (line 658) Enqueuing flush of Memtable-Standard1@158103119(27511
 95/77317732 serialized/live bytes, 53945 ops)
  INFO [NonPeriodicTasks:1] 2011-09-09 18:24:33,903 ColumnFamilyStore.java 
 (line 658) Enqueuing flush of Memtable-Standard1@2035169258(3132
 420/88934701 serialized/live bytes, 61420 ops)
  INFO [NonPeriodicTasks:1] 2011-09-09 18:24:34,905 ColumnFamilyStore.java 
 (line 658) Enqueuing flush of Memtable-Standard1@1097314626(2979
 675/83651699 serialized/live bytes, 58425 ops)
 {noformat}
 The serialized to live size ratio appears completely out of whack.

--
This message is automatically generated by JIRA.
For more information on JIRA, see: http://www.atlassian.com/software/jira




[jira] [Updated] (CASSANDRA-3210) memtables do not need to be flushed on the Table.apply() path anymore after 2449

2011-09-14 Thread Yang Yang (JIRA)

 [ 
https://issues.apache.org/jira/browse/CASSANDRA-3210?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel
 ]

Yang Yang updated CASSANDRA-3210:
-

Attachment: 0001-memtables-do-not-need-to-be-flushed-on-the-Table.app.patch

 memtables do not need to be flushed on the Table.apply() path anymore after 
 2449
 

 Key: CASSANDRA-3210
 URL: https://issues.apache.org/jira/browse/CASSANDRA-3210
 Project: Cassandra
  Issue Type: Bug
Reporter: Yang Yang
Priority: Trivial
 Attachments: 
 0001-memtables-do-not-need-to-be-flushed-on-the-Table.app.patch


 2449 removes auto-flush from Table.apply(), but the data structure is still 
 there, no harm, but better remove it:
 in
 https://github.com/apache/cassandra/blob/c7cdc317c9a14e29699f9842424388aee77d0e1a/src/java/org/apache/cassandra/db/Table.java
 line 399 and 470

--
This message is automatically generated by JIRA.
For more information on JIRA, see: http://www.atlassian.com/software/jira




[jira] [Created] (CASSANDRA-3210) memtables do not need to be flushed on the Table.apply() path anymore after 2449

2011-09-14 Thread Yang Yang (JIRA)
memtables do not need to be flushed on the Table.apply() path anymore after 2449


 Key: CASSANDRA-3210
 URL: https://issues.apache.org/jira/browse/CASSANDRA-3210
 Project: Cassandra
  Issue Type: Bug
Reporter: Yang Yang
Priority: Trivial
 Attachments: 
0001-memtables-do-not-need-to-be-flushed-on-the-Table.app.patch

2449 removes auto-flush from Table.apply(), but the data structure is still 
there, no harm, but better remove it:

in
https://github.com/apache/cassandra/blob/c7cdc317c9a14e29699f9842424388aee77d0e1a/src/java/org/apache/cassandra/db/Table.java

line 399 and 470

--
This message is automatically generated by JIRA.
For more information on JIRA, see: http://www.atlassian.com/software/jira




[jira] [Commented] (CASSANDRA-3206) increase file descriptor limit in deb, rpm packages

2011-09-14 Thread paul cannon (JIRA)

[ 
https://issues.apache.org/jira/browse/CASSANDRA-3206?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanelfocusedCommentId=13105082#comment-13105082
 ] 

paul cannon commented on CASSANDRA-3206:


I concur. I'll go with 100k unless someone has a good argument for having it be 
higher.

 increase file descriptor limit in deb, rpm packages
 ---

 Key: CASSANDRA-3206
 URL: https://issues.apache.org/jira/browse/CASSANDRA-3206
 Project: Cassandra
  Issue Type: Bug
  Components: Packaging
Reporter: Jonathan Ellis
Assignee: paul cannon
Priority: Minor
 Fix For: 0.8.6


 We can use a lot of file descriptors (one per socket, 5? per sstable).  
 People hit this regularly on the user list and it will get worse with Leveled 
 compaction, which limits sstable size to a relatively low size (currently 
 5MB).

--
This message is automatically generated by JIRA.
For more information on JIRA, see: http://www.atlassian.com/software/jira




[jira] [Created] (CASSANDRA-3211) Enhanced IP resolution for machines with multiple network interfaces

2011-09-14 Thread Brian ONeill (JIRA)
Enhanced IP resolution for machines with multiple network interfaces 
-

 Key: CASSANDRA-3211
 URL: https://issues.apache.org/jira/browse/CASSANDRA-3211
 Project: Cassandra
  Issue Type: Improvement
  Components: Hadoop
Affects Versions: 0.8.5
 Environment: Mac OS X and Linux with machines that have multiple 
network interfaces whereby the IP associated with the split is not on the 
network interface associated with localhost.
Reporter: Brian ONeill
 Fix For: 0.8.6


On unix machines that have multiple network interfaces whereby the IP 
associated with the split is not on the network interface associated with 
localhost, the getLocation method cannot find the proper IP and throws an 
exception no connection available.

I changed the implementation to use NetworkInterface instead of InetAddress 
using getLocalHost().

This is more reliable.  See the following references:
http://stackoverflow.com/questions/5813194/inetaddress-getlocalhost-does-not-return-expected-ip-address-from-c-windows-sy
http://stackoverflow.com/questions/4871451/inetaddress-getlocalhost-returns-wrong-result-when-hostname-is-64-chars
http://www.jguru.com/faq/view.jsp?EID=790132


--
This message is automatically generated by JIRA.
For more information on JIRA, see: http://www.atlassian.com/software/jira




[jira] [Updated] (CASSANDRA-3211) Enhanced IP resolution for machines with multiple network interfaces

2011-09-14 Thread Brian ONeill (JIRA)

 [ 
https://issues.apache.org/jira/browse/CASSANDRA-3211?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel
 ]

Brian ONeill updated CASSANDRA-3211:


Attachment: trunk-3211.txt

Patch Attached.

 Enhanced IP resolution for machines with multiple network interfaces 
 -

 Key: CASSANDRA-3211
 URL: https://issues.apache.org/jira/browse/CASSANDRA-3211
 Project: Cassandra
  Issue Type: Improvement
  Components: Hadoop
Affects Versions: 0.8.5
 Environment: Mac OS X and Linux with machines that have multiple 
 network interfaces whereby the IP associated with the split is not on the 
 network interface associated with localhost.
Reporter: Brian ONeill
 Fix For: 0.8.6

 Attachments: trunk-3211.txt


 On unix machines that have multiple network interfaces whereby the IP 
 associated with the split is not on the network interface associated with 
 localhost, the getLocation method cannot find the proper IP and throws an 
 exception no connection available.
 I changed the implementation to use NetworkInterface instead of InetAddress 
 using getLocalHost().
 This is more reliable.  See the following references:
 http://stackoverflow.com/questions/5813194/inetaddress-getlocalhost-does-not-return-expected-ip-address-from-c-windows-sy
 http://stackoverflow.com/questions/4871451/inetaddress-getlocalhost-returns-wrong-result-when-hostname-is-64-chars
 http://www.jguru.com/faq/view.jsp?EID=790132

--
This message is automatically generated by JIRA.
For more information on JIRA, see: http://www.atlassian.com/software/jira




[jira] [Commented] (CASSANDRA-3180) relocate Python CQL driver

2011-09-14 Thread Eric Evans (JIRA)

[ 
https://issues.apache.org/jira/browse/CASSANDRA-3180?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanelfocusedCommentId=13105088#comment-13105088
 ] 

Eric Evans commented on CASSANDRA-3180:
---

bq. I would like access.

Be sure to leave your Google address when requesting access.

 relocate Python CQL driver
 --

 Key: CASSANDRA-3180
 URL: https://issues.apache.org/jira/browse/CASSANDRA-3180
 Project: Cassandra
  Issue Type: Task
  Components: Drivers
Reporter: Eric Evans
Assignee: Eric Evans
Priority: Minor
  Labels: cql
 Fix For: 1.0.0

 Attachments: v1-0001-CASSANDRA-3180-remove-Python-driver-artifact.txt


 A new project as been created at 
 http://code.google.com/a/apache-extras.org/p/cassandra-dbapi2, a current 
 snapshot of the code from trunk has been imported, and the tests updated.
 I've configured commit notifications to be sent to 
 client-...@cassandra.apache.org, though this can be changed if people object.
 To the best of my knowledge, the only thing remaining is to configure the 
 initial set of committers and admins.  My thought was to setup all current 
 Cassandra committers (that want access), and Tyler Hobbs.

--
This message is automatically generated by JIRA.
For more information on JIRA, see: http://www.atlassian.com/software/jira




svn commit: r1170944 - in /cassandra/trunk: ./ conf/ contrib/ debian/ interface/thrift/gen-java/org/apache/cassandra/thrift/ src/java/org/apache/cassandra/config/ src/java/org/apache/cassandra/db/ too

2011-09-14 Thread jbellis
Author: jbellis
Date: Thu Sep 15 03:37:36 2011
New Revision: 1170944

URL: http://svn.apache.org/viewvc?rev=1170944view=rev
Log:
merge from 1.0

Modified:
cassandra/trunk/   (props changed)
cassandra/trunk/CHANGES.txt
cassandra/trunk/build.xml
cassandra/trunk/conf/cassandra-env.sh
cassandra/trunk/contrib/   (props changed)
cassandra/trunk/debian/changelog

cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/Cassandra.java
   (props changed)

cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/Column.java
   (props changed)

cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/InvalidRequestException.java
   (props changed)

cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/NotFoundException.java
   (props changed)

cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/SuperColumn.java
   (props changed)
cassandra/trunk/src/java/org/apache/cassandra/config/CFMetaData.java
cassandra/trunk/src/java/org/apache/cassandra/db/Memtable.java
cassandra/trunk/tools/stress/src/org/apache/cassandra/stress/Session.java

Propchange: cassandra/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Sep 15 03:37:36 2011
@@ -4,8 +4,8 @@
 /cassandra/branches/cassandra-0.8:1090934-1125013,1125019-1170335
 /cassandra/branches/cassandra-0.8.0:1125021-1130369
 /cassandra/branches/cassandra-0.8.1:1101014-1125018
-/cassandra/branches/cassandra-1.0:1167085-1170609,1170645,1170685
-/cassandra/branches/cassandra-1.0.0:1167104-1167229,1167232-1170608,1170641,1170682
+/cassandra/branches/cassandra-1.0:1167085-1170894
+/cassandra/branches/cassandra-1.0.0:1167104-1167229,1167232-1170893
 /cassandra/tags/cassandra-0.7.0-rc3:1051699-1053689
 /cassandra/tags/cassandra-0.8.0-rc1:1102511-1125020
 /incubator/cassandra/branches/cassandra-0.3:774578-796573

Modified: cassandra/trunk/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/cassandra/trunk/CHANGES.txt?rev=1170944r1=1170943r2=1170944view=diff
==
--- cassandra/trunk/CHANGES.txt (original)
+++ cassandra/trunk/CHANGES.txt Thu Sep 15 03:37:36 2011
@@ -2,6 +2,10 @@
  * describe_ring should include datacenter/topology information 
(CASSANDRA-2882)
 
 
+1.0.0-rc1
+ * Fix counting CFMetadata towards Memtable liveRatio (CASSANDRA-3023)
+
+
 1.0.0-beta1
  * removed binarymemtable (CASSANDRA-2692)
  * add commitlog_total_space_in_mb to prevent fragmented logs (CASSANDRA-2427)
@@ -78,6 +82,8 @@
  * Fix backwards compatibilty for CQL memtable properties (CASSANDRA-3190)
  * Add five-minute delay before starting compactions on a restarted server
(CASSANDRA-3181)
+ * Reduce copies done for intra-host messages (CASSANDRA-1788, 3144)
+ * support of compaction strategy option for stress.java (CASSANDRA-3204)
 
 
 0.8.6

Modified: cassandra/trunk/build.xml
URL: 
http://svn.apache.org/viewvc/cassandra/trunk/build.xml?rev=1170944r1=1170943r2=1170944view=diff
==
--- cassandra/trunk/build.xml (original)
+++ cassandra/trunk/build.xml Thu Sep 15 03:37:36 2011
@@ -369,7 +369,7 @@ url=${svn.entry.url}?pathrev=${svn.entry
   /dependency
   dependency groupId=com.googlecode.json-simple 
artifactId=json-simple version=1.1/
   dependency groupId=com.github.stephenc.high-scale-lib 
artifactId=high-scale-lib version=1.1.2/
-  dependency groupId=com.github.stephenc artifactId=jamm 
version=0.2.4/
+  dependency groupId=com.github.stephenc artifactId=jamm 
version=0.2.5/
   dependency groupId=org.yaml artifactId=snakeyaml version=1.6/
   dependency groupId=org.apache.cassandra.deps artifactId=avro 
version=1.4.0-cassandra-1
 exclusion groupId=org.jboss.netty artifactId=netty/
@@ -1047,7 +1047,7 @@ url=${svn.entry.url}?pathrev=${svn.entry
 jvmarg value=-Dstorage-config=${test.conf}/
 jvmarg value=-Daccess.properties=${test.conf}/access.properties/
 jvmarg value=-Dlog4j.configuration=log4j-junit.properties /
-jvmarg value=-javaagent:${basedir}/lib/jamm-0.2.4.jar /
+jvmarg value=-javaagent:${basedir}/lib/jamm-0.2.5.jar /
 jvmarg value=-ea/
 optjvmargs/
 classpath

Modified: cassandra/trunk/conf/cassandra-env.sh
URL: 
http://svn.apache.org/viewvc/cassandra/trunk/conf/cassandra-env.sh?rev=1170944r1=1170943r2=1170944view=diff
==
--- cassandra/trunk/conf/cassandra-env.sh (original)
+++ cassandra/trunk/conf/cassandra-env.sh Thu Sep 15 03:37:36 2011
@@ -100,7 +100,7 @@ JVM_OPTS=$JVM_OPTS -ea
 check_openjdk=`${JAVA:-java} -version 21 | awk '{if (NR == 2) {print $1}}'`
 if [ $check_openjdk != OpenJDK ]
 then
-JVM_OPTS=$JVM_OPTS 

svn commit: r1170945 - /cassandra/branches/cassandra-1.0.0/src/java/org/apache/cassandra/db/Table.java

2011-09-14 Thread jbellis
Author: jbellis
Date: Thu Sep 15 03:38:49 2011
New Revision: 1170945

URL: http://svn.apache.org/viewvc?rev=1170945view=rev
Log:
r/m unused memtablesToFlush code
patch by Yang Yang; reviewed by jbellis for CASSANDRA-3210

Modified:

cassandra/branches/cassandra-1.0.0/src/java/org/apache/cassandra/db/Table.java

Modified: 
cassandra/branches/cassandra-1.0.0/src/java/org/apache/cassandra/db/Table.java
URL: 
http://svn.apache.org/viewvc/cassandra/branches/cassandra-1.0.0/src/java/org/apache/cassandra/db/Table.java?rev=1170945r1=1170944r2=1170945view=diff
==
--- 
cassandra/branches/cassandra-1.0.0/src/java/org/apache/cassandra/db/Table.java 
(original)
+++ 
cassandra/branches/cassandra-1.0.0/src/java/org/apache/cassandra/db/Table.java 
Thu Sep 15 03:38:49 2011
@@ -396,7 +396,6 @@ public class Table
 */
 public void apply(RowMutation mutation, boolean writeCommitLog) throws 
IOException
 {
-ListMemtable memtablesToFlush = Collections.emptyList();
 if (logger.isDebugEnabled())
 logger.debug(applying mutation of row {}, 
ByteBufferUtil.bytesToHex(mutation.key()));
 
@@ -465,10 +464,6 @@ public class Table
 switchLock.readLock().unlock();
 }
 
-// flush memtables that got filled up outside the readlock 
(maybeSwitchMemtable acquires writeLock).
-// usually mTF will be empty and this will be a no-op.
-for (Memtable memtable : memtablesToFlush)
-memtable.cfs.maybeSwitchMemtable(memtable, writeCommitLog);
 }
 
 private static void ignoreObsoleteMutations(ColumnFamily cf, 
SortedSetByteBuffer mutatedIndexedColumns, ColumnFamily oldIndexedColumns)




buildbot failure in ASF Buildbot on cassandra-trunk

2011-09-14 Thread buildbot
The Buildbot has detected a new failure on builder cassandra-trunk while 
building ASF Buildbot.
Full details are available at:
 http://ci.apache.org/builders/cassandra-trunk/builds/1668

Buildbot URL: http://ci.apache.org/

Buildslave for this Build: isis_ubuntu

Build Reason: scheduler
Build Source Stamp: [branch cassandra/trunk] 1170944
Blamelist: jbellis

BUILD FAILED: failed compile

sincerely,
 -The Buildbot



[jira] [Resolved] (CASSANDRA-3210) memtables do not need to be flushed on the Table.apply() path anymore after 2449

2011-09-14 Thread Jonathan Ellis (JIRA)

 [ 
https://issues.apache.org/jira/browse/CASSANDRA-3210?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel
 ]

Jonathan Ellis resolved CASSANDRA-3210.
---

   Resolution: Fixed
Fix Version/s: 1.0.0
 Reviewer: jbellis
 Assignee: Yang Yang

committed, thanks!

 memtables do not need to be flushed on the Table.apply() path anymore after 
 2449
 

 Key: CASSANDRA-3210
 URL: https://issues.apache.org/jira/browse/CASSANDRA-3210
 Project: Cassandra
  Issue Type: Bug
Reporter: Yang Yang
Assignee: Yang Yang
Priority: Trivial
 Fix For: 1.0.0

 Attachments: 
 0001-memtables-do-not-need-to-be-flushed-on-the-Table.app.patch


 2449 removes auto-flush from Table.apply(), but the data structure is still 
 there, no harm, but better remove it:
 in
 https://github.com/apache/cassandra/blob/c7cdc317c9a14e29699f9842424388aee77d0e1a/src/java/org/apache/cassandra/db/Table.java
 line 399 and 470

--
This message is automatically generated by JIRA.
For more information on JIRA, see: http://www.atlassian.com/software/jira




svn commit: r1170947 - /cassandra/branches/cassandra-1.0.0/lib/jamm-0.2.5.jar

2011-09-14 Thread jbellis
Author: jbellis
Date: Thu Sep 15 04:00:33 2011
New Revision: 1170947

URL: http://svn.apache.org/viewvc?rev=1170947view=rev
Log:
add jamm-0.2.5.jar

Added:
cassandra/branches/cassandra-1.0.0/lib/jamm-0.2.5.jar   (with props)

Added: cassandra/branches/cassandra-1.0.0/lib/jamm-0.2.5.jar
URL: 
http://svn.apache.org/viewvc/cassandra/branches/cassandra-1.0.0/lib/jamm-0.2.5.jar?rev=1170947view=auto
==
Binary file - no diff available.

Propchange: cassandra/branches/cassandra-1.0.0/lib/jamm-0.2.5.jar
--
svn:mime-type = application/octet-stream




svn commit: r1170948 - in /cassandra/branches/cassandra-1.0: ./ contrib/ interface/thrift/gen-java/org/apache/cassandra/thrift/ lib/ src/java/org/apache/cassandra/db/

2011-09-14 Thread jbellis
Author: jbellis
Date: Thu Sep 15 04:01:47 2011
New Revision: 1170948

URL: http://svn.apache.org/viewvc?rev=1170948view=rev
Log:
merge from 1.0.0

Added:
cassandra/branches/cassandra-1.0/lib/jamm-0.2.5.jar
  - copied unchanged from r1170947, 
cassandra/branches/cassandra-1.0.0/lib/jamm-0.2.5.jar
Modified:
cassandra/branches/cassandra-1.0/   (props changed)
cassandra/branches/cassandra-1.0/contrib/   (props changed)

cassandra/branches/cassandra-1.0/interface/thrift/gen-java/org/apache/cassandra/thrift/Cassandra.java
   (props changed)

cassandra/branches/cassandra-1.0/interface/thrift/gen-java/org/apache/cassandra/thrift/Column.java
   (props changed)

cassandra/branches/cassandra-1.0/interface/thrift/gen-java/org/apache/cassandra/thrift/InvalidRequestException.java
   (props changed)

cassandra/branches/cassandra-1.0/interface/thrift/gen-java/org/apache/cassandra/thrift/NotFoundException.java
   (props changed)

cassandra/branches/cassandra-1.0/interface/thrift/gen-java/org/apache/cassandra/thrift/SuperColumn.java
   (props changed)
cassandra/branches/cassandra-1.0/src/java/org/apache/cassandra/db/Table.java

Propchange: cassandra/branches/cassandra-1.0/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Sep 15 04:01:47 2011
@@ -5,7 +5,7 @@
 /cassandra/branches/cassandra-0.8.0:1125021-1130369
 /cassandra/branches/cassandra-0.8.1:1101014-1125018
 /cassandra/branches/cassandra-1.0:1167106,1167185
-/cassandra/branches/cassandra-1.0.0:1167104-1170893
+/cassandra/branches/cassandra-1.0.0:1167104-1170947
 /cassandra/tags/cassandra-0.7.0-rc3:1051699-1053689
 /cassandra/tags/cassandra-0.8.0-rc1:1102511-1125020
 /cassandra/trunk:1167085-1167102,1169870

Propchange: cassandra/branches/cassandra-1.0/contrib/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Sep 15 04:01:47 2011
@@ -5,7 +5,7 @@
 /cassandra/branches/cassandra-0.8.0/contrib:1125021-1130369
 /cassandra/branches/cassandra-0.8.1/contrib:1101014-1125018
 /cassandra/branches/cassandra-1.0/contrib:1167106,1167185
-/cassandra/branches/cassandra-1.0.0/contrib:1167104-1170893
+/cassandra/branches/cassandra-1.0.0/contrib:1167104-1170947
 /cassandra/tags/cassandra-0.7.0-rc3/contrib:1051699-1053689
 /cassandra/tags/cassandra-0.8.0-rc1/contrib:1102511-1125020
 /cassandra/trunk/contrib:1167085-1167102,1169870

Propchange: 
cassandra/branches/cassandra-1.0/interface/thrift/gen-java/org/apache/cassandra/thrift/Cassandra.java
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Sep 15 04:01:47 2011
@@ -5,7 +5,7 @@
 
/cassandra/branches/cassandra-0.8.0/interface/thrift/gen-java/org/apache/cassandra/thrift/Cassandra.java:1125021-1130369
 
/cassandra/branches/cassandra-0.8.1/interface/thrift/gen-java/org/apache/cassandra/thrift/Cassandra.java:1101014-1125018
 
/cassandra/branches/cassandra-1.0/interface/thrift/gen-java/org/apache/cassandra/thrift/Cassandra.java:1167106,1167185
-/cassandra/branches/cassandra-1.0.0/interface/thrift/gen-java/org/apache/cassandra/thrift/Cassandra.java:1167104-1170893
+/cassandra/branches/cassandra-1.0.0/interface/thrift/gen-java/org/apache/cassandra/thrift/Cassandra.java:1167104-1170947
 
/cassandra/tags/cassandra-0.7.0-rc3/interface/thrift/gen-java/org/apache/cassandra/thrift/Cassandra.java:1051699-1053689
 
/cassandra/tags/cassandra-0.8.0-rc1/interface/thrift/gen-java/org/apache/cassandra/thrift/Cassandra.java:1102511-1125020
 
/cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/Cassandra.java:1167085-1167102,1169870

Propchange: 
cassandra/branches/cassandra-1.0/interface/thrift/gen-java/org/apache/cassandra/thrift/Column.java
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Sep 15 04:01:47 2011
@@ -5,7 +5,7 @@
 
/cassandra/branches/cassandra-0.8.0/interface/thrift/gen-java/org/apache/cassandra/thrift/Column.java:1125021-1130369
 
/cassandra/branches/cassandra-0.8.1/interface/thrift/gen-java/org/apache/cassandra/thrift/Column.java:1101014-1125018
 
/cassandra/branches/cassandra-1.0/interface/thrift/gen-java/org/apache/cassandra/thrift/Column.java:1167106,1167185
-/cassandra/branches/cassandra-1.0.0/interface/thrift/gen-java/org/apache/cassandra/thrift/Column.java:1167104-1170893
+/cassandra/branches/cassandra-1.0.0/interface/thrift/gen-java/org/apache/cassandra/thrift/Column.java:1167104-1170947
 
/cassandra/tags/cassandra-0.7.0-rc3/interface/thrift/gen-java/org/apache/cassandra/thrift/Column.java:1051699-1053689
 
/cassandra/tags/cassandra-0.8.0-rc1/interface/thrift/gen-java/org/apache/cassandra/thrift/Column.java:1102511-1125020
 
/cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/Column.java:1167085-1167102,1169870

Propchange: 

svn commit: r1170949 - in /cassandra/trunk: ./ contrib/ interface/thrift/gen-java/org/apache/cassandra/thrift/ lib/ src/java/org/apache/cassandra/db/

2011-09-14 Thread jbellis
Author: jbellis
Date: Thu Sep 15 04:02:38 2011
New Revision: 1170949

URL: http://svn.apache.org/viewvc?rev=1170949view=rev
Log:
merge from 1.0

Added:
cassandra/trunk/lib/jamm-0.2.5.jar
  - copied unchanged from r1170948, 
cassandra/branches/cassandra-1.0/lib/jamm-0.2.5.jar
Modified:
cassandra/trunk/   (props changed)
cassandra/trunk/contrib/   (props changed)

cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/Cassandra.java
   (props changed)

cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/Column.java
   (props changed)

cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/InvalidRequestException.java
   (props changed)

cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/NotFoundException.java
   (props changed)

cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/SuperColumn.java
   (props changed)
cassandra/trunk/src/java/org/apache/cassandra/db/Table.java

Propchange: cassandra/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Sep 15 04:02:38 2011
@@ -4,8 +4,8 @@
 /cassandra/branches/cassandra-0.8:1090934-1125013,1125019-1170335
 /cassandra/branches/cassandra-0.8.0:1125021-1130369
 /cassandra/branches/cassandra-0.8.1:1101014-1125018
-/cassandra/branches/cassandra-1.0:1167085-1170894
-/cassandra/branches/cassandra-1.0.0:1167104-1167229,1167232-1170893
+/cassandra/branches/cassandra-1.0:1167085-1170948
+/cassandra/branches/cassandra-1.0.0:1167104-1167229,1167232-1170947
 /cassandra/tags/cassandra-0.7.0-rc3:1051699-1053689
 /cassandra/tags/cassandra-0.8.0-rc1:1102511-1125020
 /incubator/cassandra/branches/cassandra-0.3:774578-796573

Propchange: cassandra/trunk/contrib/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Sep 15 04:02:38 2011
@@ -4,8 +4,8 @@
 /cassandra/branches/cassandra-0.8/contrib:1090934-1125013,1125019-1170335
 /cassandra/branches/cassandra-0.8.0/contrib:1125021-1130369
 /cassandra/branches/cassandra-0.8.1/contrib:1101014-1125018
-/cassandra/branches/cassandra-1.0/contrib:1167085-1170894
-/cassandra/branches/cassandra-1.0.0/contrib:1167104-1167229,1167232-1170893
+/cassandra/branches/cassandra-1.0/contrib:1167085-1170948
+/cassandra/branches/cassandra-1.0.0/contrib:1167104-1167229,1167232-1170947
 /cassandra/tags/cassandra-0.7.0-rc3/contrib:1051699-1053689
 /cassandra/tags/cassandra-0.8.0-rc1/contrib:1102511-1125020
 /incubator/cassandra/branches/cassandra-0.3/contrib:774578-796573

Propchange: 
cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/Cassandra.java
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Sep 15 04:02:38 2011
@@ -4,8 +4,8 @@
 
/cassandra/branches/cassandra-0.8/interface/thrift/gen-java/org/apache/cassandra/thrift/Cassandra.java:1090934-1125013,1125019-1170335
 
/cassandra/branches/cassandra-0.8.0/interface/thrift/gen-java/org/apache/cassandra/thrift/Cassandra.java:1125021-1130369
 
/cassandra/branches/cassandra-0.8.1/interface/thrift/gen-java/org/apache/cassandra/thrift/Cassandra.java:1101014-1125018
-/cassandra/branches/cassandra-1.0/interface/thrift/gen-java/org/apache/cassandra/thrift/Cassandra.java:1167085-1170894
-/cassandra/branches/cassandra-1.0.0/interface/thrift/gen-java/org/apache/cassandra/thrift/Cassandra.java:1167104-1167229,1167232-1170893
+/cassandra/branches/cassandra-1.0/interface/thrift/gen-java/org/apache/cassandra/thrift/Cassandra.java:1167085-1170948
+/cassandra/branches/cassandra-1.0.0/interface/thrift/gen-java/org/apache/cassandra/thrift/Cassandra.java:1167104-1167229,1167232-1170947
 
/cassandra/tags/cassandra-0.7.0-rc3/interface/thrift/gen-java/org/apache/cassandra/thrift/Cassandra.java:1051699-1053689
 
/cassandra/tags/cassandra-0.8.0-rc1/interface/thrift/gen-java/org/apache/cassandra/thrift/Cassandra.java:1102511-1125020
 
/incubator/cassandra/branches/cassandra-0.3/interface/gen-java/org/apache/cassandra/service/Cassandra.java:774578-796573

Propchange: 
cassandra/trunk/interface/thrift/gen-java/org/apache/cassandra/thrift/Column.java
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Sep 15 04:02:38 2011
@@ -4,8 +4,8 @@
 
/cassandra/branches/cassandra-0.8/interface/thrift/gen-java/org/apache/cassandra/thrift/Column.java:1090934-1125013,1125019-1170335
 
/cassandra/branches/cassandra-0.8.0/interface/thrift/gen-java/org/apache/cassandra/thrift/Column.java:1125021-1130369
 
/cassandra/branches/cassandra-0.8.1/interface/thrift/gen-java/org/apache/cassandra/thrift/Column.java:1101014-1125018
-/cassandra/branches/cassandra-1.0/interface/thrift/gen-java/org/apache/cassandra/thrift/Column.java:1167085-1170894

  1   2   >