[jira] [Commented] (CASSANDRA-3024) sstable and message varint encoding

2011-09-13 Thread Vladimir Loncar (JIRA)

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

Vladimir Loncar commented on CASSANDRA-3024:


{quote}
What about changing RandomAccessReader to something like (Descriptor desc,...) 
rather than (File file, ) and adding backwards compatibility there for 
fixed length/ variable length readInt/Long there?
{quote}
That's the approach I investigated. First obstacle I came across was that you 
need to override readInt(Long) which is declared final, and since this impacts 
other places (as Jonathan mentioned, streaming is one area) where it might not 
bee needed, it required more thought about implementing right.

 sstable and message varint encoding
 ---

 Key: CASSANDRA-3024
 URL: https://issues.apache.org/jira/browse/CASSANDRA-3024
 Project: Cassandra
  Issue Type: Improvement
  Components: Core
Reporter: Jonathan Ellis
Priority: Minor
 Fix For: 1.1


 We could save some sstable space by encoding longs and ints as vlong and 
 vint, respectively.  (Probably most short lengths would be better as vint 
 as well.)

--
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-13 Thread Yang Yang (JIRA)

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

Yang Yang commented on CASSANDRA-3179:
--

btw, as I was trying to going through the code to understand the problem, I 
found it seems that the MMapedSegmentedFile.cleanup() code could be skipped in 
some sequences of mixed read and compact:

read increases the refcount, then 
DataTracker.replaceCompactedSSTables()--- 
SSTableReader.releaseReference() could see a refcount of 2, and not call the 
dfile.cleanup()


it's not a big problem ( code seems to run fine with the cleanup() lines 
commented out), but that kind of thwarts the purpose of adding them in 

 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: Sylvain Lebresne
 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_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] [Created] (CASSANDRA-3194) repair streaming forwarding loop

2011-09-13 Thread Anton Winter (JIRA)
repair streaming forwarding loop


 Key: CASSANDRA-3194
 URL: https://issues.apache.org/jira/browse/CASSANDRA-3194
 Project: Cassandra
  Issue Type: Bug
  Components: Core
Affects Versions: 1.0.0
Reporter: Anton Winter


I am able to reproduce what appears to be a streaming forwarding loop when 
running repairs.  This affect only nodes using broadcast_address (ec2 external 
ip)  listen_address of 0.0.0.0. (Configuration is using property file snitch 
in a multi DC NTS where some DC's are EC2 and others are not).  The hosts in 
the other dc's not using broadcast_address do not experience this symptom.

on ec2 host dc1host1:
INFO [AntiEntropyStage:1] 2011-09-13 06:34:01,673 StreamingRepairTask.java 
(line 211) [streaming task #ce793c30-ddd1-11e0--071a4b76fefb] Received task 
from /0.0.0.0 to stream 12259 ranges to /external.ec2.ip.dc1host3
 INFO [AntiEntropyStage:1] 2011-09-13 06:34:01,673 StreamingRepairTask.java 
(line 136) [streaming task #ce793c30-ddd1-11e0--071a4b76fefb] Forwarding 
streaming repair of 12259 ranges to /external.ec2.ip.of.dc1host1 (to be 
streamed with /external.ip.of.host3)

The above appears to trigger another streaming task and results in saturating 
the network interfaces dc1host1.  The above log entries are repeated until 
cassandra is killed.

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




[jira] [Updated] (CASSANDRA-2890) Randomize (to some extend) the choice of the first replica for counter increment

2011-09-13 Thread Sylvain Lebresne (JIRA)

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

Sylvain Lebresne updated CASSANDRA-2890:


Fix Version/s: (was: 1.0.1)
   0.8.6

 Randomize (to some extend) the choice of the first replica for counter 
 increment
 

 Key: CASSANDRA-2890
 URL: https://issues.apache.org/jira/browse/CASSANDRA-2890
 Project: Cassandra
  Issue Type: Improvement
  Components: Core
Affects Versions: 0.8.0
Reporter: Sylvain Lebresne
Assignee: Sylvain Lebresne
Priority: Minor
  Labels: counters
 Fix For: 0.8.6


 Right now, we choose the first replica for a counter increments based solely 
 on what the snitch returns. If the clients requests are well balanced over 
 the cluster and the snitch not ill configured, this should not be a problem, 
 but this is probably too strong an assumption to make.
 The goal of this ticket is to change this to choose a random replica in the 
 current data center instead.

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




[jira] [Updated] (CASSANDRA-3197) Separate input and output connection details in ConfigHelper

2011-09-13 Thread Mck SembWever (JIRA)

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

Mck SembWever updated CASSANDRA-3197:
-

Attachment: CASSANDRA-3197-extra.patch

patch for contrib/pig 

 Separate input and output connection details in ConfigHelper
 

 Key: CASSANDRA-3197
 URL: https://issues.apache.org/jira/browse/CASSANDRA-3197
 Project: Cassandra
  Issue Type: Improvement
  Components: Hadoop
Affects Versions: 0.8.5
Reporter: Mck SembWever
Assignee: Mck SembWever
 Attachments: CASSANDRA-3197-extra.patch, CASSANDRA-3197.patch


 Currently ConfigHelper's getInitialAddress(..) getRpcPort(..) and 
 getPartitioner(..) 
 presume CFIF will be using the same cluster as CFOF.
 The latter two are a problem for me as on the same servers i'm running two 
 clusters, one w/ ByteOrderingPartitioner and the other with RP), and i would 
 like to read from the BOP cluster and write to the RP cluster.
 getInitialAddress(..) is of little concern to me.

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




[jira] [Updated] (CASSANDRA-3184) Update the versions that are referenced in the generated POMs so that they match the versions in svn's lib folder

2011-09-13 Thread Stephen Connolly (JIRA)

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

Stephen Connolly updated CASSANDRA-3184:


Attachment: CASSANDRA-3184.patch

Patch also fixes the version and scm paths in build.xml so that the generated 
POMs are correct

 Update the versions that are referenced in the generated POMs so that they 
 match the versions in svn's lib folder
 -

 Key: CASSANDRA-3184
 URL: https://issues.apache.org/jira/browse/CASSANDRA-3184
 Project: Cassandra
  Issue Type: Bug
  Components: Packaging
Affects Versions: 1.0.0
Reporter: Stephen Connolly
Assignee: Stephen Connolly
Priority: Blocker
 Fix For: 1.0.0

 Attachments: CASSANDRA-3184.patch


 Update the versions before the release so that the release uses the same 
 dependencies for Maven downloaded dependencies

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




[jira] [Assigned] (CASSANDRA-3184) Update the versions that are referenced in the generated POMs so that they match the versions in svn's lib folder

2011-09-13 Thread Stephen Connolly (JIRA)

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

Stephen Connolly reassigned CASSANDRA-3184:
---

Assignee: Sylvain Lebresne  (was: Stephen Connolly)

I've made the patch, up to a committer to take and apply

 Update the versions that are referenced in the generated POMs so that they 
 match the versions in svn's lib folder
 -

 Key: CASSANDRA-3184
 URL: https://issues.apache.org/jira/browse/CASSANDRA-3184
 Project: Cassandra
  Issue Type: Bug
  Components: Packaging
Affects Versions: 1.0.0
Reporter: Stephen Connolly
Assignee: Sylvain Lebresne
Priority: Blocker
 Fix For: 1.0.0

 Attachments: CASSANDRA-3184.patch


 Update the versions before the release so that the release uses the same 
 dependencies for Maven downloaded dependencies

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




[jira] [Updated] (CASSANDRA-3184) Update the versions that are referenced in the generated POMs so that they match the versions in svn's lib folder

2011-09-13 Thread Stephen Connolly (JIRA)

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

Stephen Connolly updated CASSANDRA-3184:


Reviewer: slebresne
Assignee: Stephen Connolly  (was: Sylvain Lebresne)

 Update the versions that are referenced in the generated POMs so that they 
 match the versions in svn's lib folder
 -

 Key: CASSANDRA-3184
 URL: https://issues.apache.org/jira/browse/CASSANDRA-3184
 Project: Cassandra
  Issue Type: Bug
  Components: Packaging
Affects Versions: 1.0.0
Reporter: Stephen Connolly
Assignee: Stephen Connolly
Priority: Blocker
 Fix For: 1.0.0

 Attachments: CASSANDRA-3184.patch


 Update the versions before the release so that the release uses the same 
 dependencies for Maven downloaded dependencies

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




[jira] [Updated] (CASSANDRA-2691) If an upload to central repository fails for an artifact, retry a couple of times before killing the build

2011-09-13 Thread Stephen Connolly (JIRA)

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

Stephen Connolly updated CASSANDRA-2691:


Reviewer: slebresne  (was: urandom)

 If an upload to central repository fails for an artifact, retry a couple of 
 times before killing the build
 --

 Key: CASSANDRA-2691
 URL: https://issues.apache.org/jira/browse/CASSANDRA-2691
 Project: Cassandra
  Issue Type: Improvement
Affects Versions: 0.7.7, 0.8.0
Reporter: Stephen Connolly
 Attachments: CASSANDRA-2691.patch


 Depends on MGPG-35 http://jira.codehaus.org/browse/MGPG-35

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




[jira] [Assigned] (CASSANDRA-2691) If an upload to central repository fails for an artifact, retry a couple of times before killing the build

2011-09-13 Thread Stephen Connolly (JIRA)

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

Stephen Connolly reassigned CASSANDRA-2691:
---

Assignee: Stephen Connolly

 If an upload to central repository fails for an artifact, retry a couple of 
 times before killing the build
 --

 Key: CASSANDRA-2691
 URL: https://issues.apache.org/jira/browse/CASSANDRA-2691
 Project: Cassandra
  Issue Type: Improvement
Affects Versions: 0.7.7, 0.8.0
Reporter: Stephen Connolly
Assignee: Stephen Connolly
 Attachments: CASSANDRA-2691.patch


 Depends on MGPG-35 http://jira.codehaus.org/browse/MGPG-35

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




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

2011-09-13 Thread JIRA
debian packaging installation problem when installatin 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


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-3198) debian packaging installation problem when installing for the first time

2011-09-13 Thread JIRA

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

Jérémy Sevellec updated CASSANDRA-3198:
---

Summary: debian packaging installation problem when installing for the 
first time  (was: debian packaging installation problem when installatin for 
the first time)

 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

 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-2890) Randomize (to some extend) the choice of the first replica for counter increment

2011-09-13 Thread Sylvain Lebresne (JIRA)

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

Sylvain Lebresne updated CASSANDRA-2890:


Attachment: 2890.patch

Ok, I wasn't understanding that the lowest value IP address is always chosen
thing, but as it turns out the DynamicSnitch uses the underlying snitch 
compareEndpoints() method if two endpoints have the same score (which includes 
the case where they have no scores at all, because no reads have been done for 
instance). And the SimpleSnitch compareEndpoints method happens to compare the 
endpoint by IP address. I'm not sure this is a really good choice because
  # this is not coherent with the sortEndpointByProximity sorting
  # this doesn't correspond to how the NetworkTopolySnitch compareEndpoints 
work when restricted to only one datacenter (it sets all node equal).
So I think there may be something to change in there, but anyway that is not 
completely relevant to this issue.

On this issue, I agree with Stu than tracking the latency and using that is 
probably the best solution (though that does suppose the use of the 
DynamicSnitch). However, this is not so simple, because the latency we have (on 
the coordinator) is the latency of the whole counter write, that is, it does 
not only include the read by the first replica, but also the local write (not a 
big deal) and the latencies of the writes to the other replica. Those last ones 
depends on the consistency level for instance. Also, a TimeoutException does 
not necessarily means that the first replica is to blame, it could be that 
enough other replica timed out (so that the consistency level wasn't achieved).

There may be solutions to those problem, but I don't see any simple ones. Now, 
as there is reports this is a problem in the wild, I propose we go for the 
simple randomize solution for now and push this directly to the 0.8 series.  
Attaching a patch (against 0.8) for this. Then we can open another ticket to 
improve over that.


 Randomize (to some extend) the choice of the first replica for counter 
 increment
 

 Key: CASSANDRA-2890
 URL: https://issues.apache.org/jira/browse/CASSANDRA-2890
 Project: Cassandra
  Issue Type: Improvement
  Components: Core
Affects Versions: 0.8.0
Reporter: Sylvain Lebresne
Assignee: Sylvain Lebresne
Priority: Minor
  Labels: counters
 Fix For: 0.8.6

 Attachments: 2890.patch


 Right now, we choose the first replica for a counter increments based solely 
 on what the snitch returns. If the clients requests are well balanced over 
 the cluster and the snitch not ill configured, this should not be a problem, 
 but this is probably too strong an assumption to make.
 The goal of this ticket is to change this to choose a random replica in the 
 current data center instead.

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




[jira] [Updated] (CASSANDRA-3197) Separate input and output connection details in ConfigHelper

2011-09-13 Thread Mck SembWever (JIRA)

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

Mck SembWever updated CASSANDRA-3197:
-

Fix Version/s: 0.8.6

 Separate input and output connection details in ConfigHelper
 

 Key: CASSANDRA-3197
 URL: https://issues.apache.org/jira/browse/CASSANDRA-3197
 Project: Cassandra
  Issue Type: Improvement
  Components: Hadoop
Affects Versions: 0.8.5
Reporter: Mck SembWever
Assignee: Mck SembWever
 Fix For: 0.8.6

 Attachments: CASSANDRA-3197-extra.patch, CASSANDRA-3197.patch


 Currently ConfigHelper's getInitialAddress(..) getRpcPort(..) and 
 getPartitioner(..) 
 presume CFIF will be using the same cluster as CFOF.
 The latter two are a problem for me as on the same servers i'm running two 
 clusters, one w/ ByteOrderingPartitioner and the other with RP), and i would 
 like to read from the BOP cluster and write to the RP cluster.
 getInitialAddress(..) is of little concern to me.

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




[jira] [Commented] (CASSANDRA-3192) NPE in RowRepairResolver

2011-09-13 Thread Sylvain Lebresne (JIRA)

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

Sylvain Lebresne commented on CASSANDRA-3192:
-

+1

 NPE in RowRepairResolver
 

 Key: CASSANDRA-3192
 URL: https://issues.apache.org/jira/browse/CASSANDRA-3192
 Project: Cassandra
  Issue Type: Bug
Affects Versions: 1.0.0
Reporter: Cathy Daw
Assignee: Jonathan Ellis
 Fix For: 1.0.0

 Attachments: 3192.txt


 On a 3 node brisk cluster (running against C* 1.0 branch), I was running the 
 java stress tool and the terasort concurrently in two sessions.  Eventually 
 both jobs failed with TimedOutException.
   
 From this point forward most additional activity will fail with a 
 TimedOutException. 
 * Java Stress Tool - 5 rows / 10 columns - Operation [0] retried 10 times - 
 error inserting key 0 ((TimedOutException))
 * Hive - show tables: FAILED: Error in metadata: 
 com.datastax.bdp.hadoop.hive.metastore.CassandraHiveMetaStoreException: There 
 was a problem with the Cassandra Hive MetaStore: Could not connect to 
 Cassandra. Reason: Error connecting to node localhost
 However, the Cassandra CLI appears to be happy
 * Cassandra CLI: you can successfully insert and read using consistencylevel 
 as ONE or ALL
 The seed node has the following error repeatedly occurring in the logs.  The 
 other two nodes have no errors.
 {code}
 ERROR [ReadRepairStage:15] 2011-09-13 00:44:25,971 
 AbstractCassandraDaemon.java (line 133) Fatal exception in thread 
 Thread[ReadRepairStage:15,5,main]
 java.lang.RuntimeException: java.lang.NullPointerException
   at 
 org.apache.cassandra.utils.WrappedRunnable.run(WrappedRunnable.java:34)
   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.lang.NullPointerException
   at 
 org.apache.cassandra.service.RowRepairResolver.resolve(RowRepairResolver.java:82)
   at 
 org.apache.cassandra.service.AsyncRepairCallback$1.runMayThrow(AsyncRepairCallback.java:54)
   at 
 org.apache.cassandra.utils.WrappedRunnable.run(WrappedRunnable.java:30)
   ... 3 more
 {code}

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




[jira] [Updated] (CASSANDRA-3184) Update the versions that are referenced in the generated POMs so that they match the versions in svn's lib folder

2011-09-13 Thread Sylvain Lebresne (JIRA)

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

Sylvain Lebresne updated CASSANDRA-3184:


Priority: Minor  (was: Blocker)

 Update the versions that are referenced in the generated POMs so that they 
 match the versions in svn's lib folder
 -

 Key: CASSANDRA-3184
 URL: https://issues.apache.org/jira/browse/CASSANDRA-3184
 Project: Cassandra
  Issue Type: Bug
  Components: Packaging
Affects Versions: 1.0.0
Reporter: Stephen Connolly
Assignee: Stephen Connolly
Priority: Minor
 Fix For: 1.0.0

 Attachments: CASSANDRA-3184.patch


 Update the versions before the release so that the release uses the same 
 dependencies for Maven downloaded dependencies

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




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

2011-09-13 Thread slebresne
Author: slebresne
Date: Tue Sep 13 12:30:58 2011
New Revision: 1170140

URL: http://svn.apache.org/viewvc?rev=1170140view=rev
Log:
Update generated POM's for Snappy and Lzf dependencies
patch by stephenc; reviewed by slebresne for CASSANDRA-3184

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=1170140r1=1170139r2=1170140view=diff
==
--- cassandra/branches/cassandra-1.0.0/build.xml (original)
+++ cassandra/branches/cassandra-1.0.0/build.xml Tue Sep 13 12:30:58 2011
@@ -25,8 +25,8 @@
 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.2-dev/
-property name=scm.default.path 
value=cassandra/branches/cassandra-0.8/
+property name=base.version value=1.0/
+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}/
 property name=scm.default.url 
value=http://svn.apache.org/viewvc/${scm.default.path}/
@@ -348,6 +348,8 @@ url=${svn.entry.url}?pathrev=${svn.entry
 license name=The Apache Software License, Version 2.0 
url=http://www.apache.org/licenses/LICENSE-2.0.txt/
 scm connection=${scm.connection} 
developerConnection=${scm.developerConnection} url=${scm.url}/
 dependencyManagement
+  dependency groupId=org.xerial.snappy artifactId=snappy-java 
version=1.0.3.3/
+  dependency groupId=com.ning artifactId=compress-lzf 
version=0.8.4/
   dependency groupId=com.google.guava artifactId=guava 
version=r08/
   dependency groupId=commons-cli artifactId=commons-cli 
version=1.1/
   dependency groupId=commons-codec artifactId=commons-codec 
version=1.2/
@@ -457,6 +459,8 @@ url=${svn.entry.url}?pathrev=${svn.entry
 artifactId=cassandra-parent
 version=${version}/
 scm connection=${scm.connection} 
developerConnection=${scm.developerConnection} url=${scm.url}/
+dependency groupId=org.xerial.snappy artifactId=snappy-java/
+dependency groupId=com.ning artifactId=compress-lzf/
 dependency groupId=com.google.guava artifactId=guava/
 dependency groupId=commons-cli artifactId=commons-cli/
 dependency groupId=commons-codec artifactId=commons-codec/




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

2011-09-13 Thread slebresne
Author: slebresne
Date: Tue Sep 13 12:32:36 2011
New Revision: 1170141

URL: http://svn.apache.org/viewvc?rev=1170141view=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 Tue Sep 13 12:32:36 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-1170025
+/cassandra/branches/cassandra-1.0.0:1167104-1170025,1170140
 /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=1170141r1=1170140r2=1170141view=diff
==
--- cassandra/branches/cassandra-1.0/build.xml (original)
+++ cassandra/branches/cassandra-1.0/build.xml Tue Sep 13 12:32:36 2011
@@ -25,8 +25,8 @@
 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.2-dev/
-property name=scm.default.path 
value=cassandra/branches/cassandra-0.8/
+property name=base.version value=1.0/
+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}/
 property name=scm.default.url 
value=http://svn.apache.org/viewvc/${scm.default.path}/
@@ -348,6 +348,8 @@ url=${svn.entry.url}?pathrev=${svn.entry
 license name=The Apache Software License, Version 2.0 
url=http://www.apache.org/licenses/LICENSE-2.0.txt/
 scm connection=${scm.connection} 
developerConnection=${scm.developerConnection} url=${scm.url}/
 dependencyManagement
+  dependency groupId=org.xerial.snappy artifactId=snappy-java 
version=1.0.3.3/
+  dependency groupId=com.ning artifactId=compress-lzf 
version=0.8.4/
   dependency groupId=com.google.guava artifactId=guava 
version=r08/
   dependency groupId=commons-cli artifactId=commons-cli 
version=1.1/
   dependency groupId=commons-codec artifactId=commons-codec 
version=1.2/
@@ -457,6 +459,8 @@ url=${svn.entry.url}?pathrev=${svn.entry
 artifactId=cassandra-parent
 version=${version}/
 scm connection=${scm.connection} 
developerConnection=${scm.developerConnection} url=${scm.url}/
+dependency groupId=org.xerial.snappy artifactId=snappy-java/
+dependency groupId=com.ning artifactId=compress-lzf/
 dependency groupId=com.google.guava artifactId=guava/
 dependency groupId=commons-cli artifactId=commons-cli/
 dependency groupId=commons-codec artifactId=commons-codec/

Propchange: cassandra/branches/cassandra-1.0/contrib/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Sep 13 12:32:36 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-1170025
+/cassandra/branches/cassandra-1.0.0/contrib:1167104-1170025,1170140
 /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 

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

2011-09-13 Thread slebresne
Author: slebresne
Date: Tue Sep 13 12:34:06 2011
New Revision: 1170143

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

Modified:
cassandra/trunk/   (props changed)
cassandra/trunk/build.xml
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)

Propchange: cassandra/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Sep 13 12:34:06 2011
@@ -4,8 +4,8 @@
 
/cassandra/branches/cassandra-0.8:1090934-1125013,1125019-1166782,1166809,1169823
 /cassandra/branches/cassandra-0.8.0:1125021-1130369
 /cassandra/branches/cassandra-0.8.1:1101014-1125018
-/cassandra/branches/cassandra-1.0:1167085-1170026
-/cassandra/branches/cassandra-1.0.0:1167104-1167229,1167232-1170025
+/cassandra/branches/cassandra-1.0:1167085-1170026,1170141
+/cassandra/branches/cassandra-1.0.0:1167104-1167229,1167232-1170025,1170140
 /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/build.xml
URL: 
http://svn.apache.org/viewvc/cassandra/trunk/build.xml?rev=1170143r1=1170142r2=1170143view=diff
==
--- cassandra/trunk/build.xml (original)
+++ cassandra/trunk/build.xml Tue Sep 13 12:34:06 2011
@@ -25,8 +25,8 @@
 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.2-dev/
-property name=scm.default.path 
value=cassandra/branches/cassandra-0.8/
+property name=base.version value=1.0/
+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}/
 property name=scm.default.url 
value=http://svn.apache.org/viewvc/${scm.default.path}/
@@ -351,6 +351,8 @@ url=${svn.entry.url}?pathrev=${svn.entry
 license name=The Apache Software License, Version 2.0 
url=http://www.apache.org/licenses/LICENSE-2.0.txt/
 scm connection=${scm.connection} 
developerConnection=${scm.developerConnection} url=${scm.url}/
 dependencyManagement
+  dependency groupId=org.xerial.snappy artifactId=snappy-java 
version=1.0.3.3/
+  dependency groupId=com.ning artifactId=compress-lzf 
version=0.8.4/
   dependency groupId=com.google.guava artifactId=guava 
version=r08/
   dependency groupId=commons-cli artifactId=commons-cli 
version=1.1/
   dependency groupId=commons-codec artifactId=commons-codec 
version=1.2/
@@ -460,6 +462,8 @@ url=${svn.entry.url}?pathrev=${svn.entry
 artifactId=cassandra-parent
 version=${version}/
 scm connection=${scm.connection} 
developerConnection=${scm.developerConnection} url=${scm.url}/
+dependency groupId=org.xerial.snappy artifactId=snappy-java/
+dependency groupId=com.ning artifactId=compress-lzf/
 dependency groupId=com.google.guava artifactId=guava/
 dependency groupId=commons-cli artifactId=commons-cli/
 dependency groupId=commons-codec artifactId=commons-codec/

Propchange: cassandra/trunk/contrib/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Sep 13 12:34:06 2011
@@ -4,8 +4,8 @@
 
/cassandra/branches/cassandra-0.8/contrib:1090934-1125013,1125019-1166782,1166809,1169823
 /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-1170026
-/cassandra/branches/cassandra-1.0.0/contrib:1167104-1167229,1167232-1170025
+/cassandra/branches/cassandra-1.0/contrib:1167085-1170026,1170141
+/cassandra/branches/cassandra-1.0.0/contrib:1167104-1167229,1167232-1170025,1170140
 /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: 

svn commit: r1170147 - /cassandra/branches/cassandra-0.7/build.xml

2011-09-13 Thread slebresne
Author: slebresne
Date: Tue Sep 13 12:37:39 2011
New Revision: 1170147

URL: http://svn.apache.org/viewvc?rev=1170147view=rev
Log:
Retry upload to central repository
patch by stephenc; reviewed by slebresne for CASSANDRA-2691

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

Modified: cassandra/branches/cassandra-0.7/build.xml
URL: 
http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.7/build.xml?rev=1170147r1=1170146r2=1170147view=diff
==
--- cassandra/branches/cassandra-0.7/build.xml (original)
+++ cassandra/branches/cassandra-0.7/build.xml Tue Sep 13 12:37:39 2011
@@ -255,7 +255,8 @@ 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.2:sign-and-deploy-file /
+arg 
value=org.apache.maven.plugins:maven-gpg-plugin:1.3:sign-and-deploy-file /
+arg value=-DretryFailedDeploymentCount=5 /
 arg value=-Durl=${maven-repository-url} /
 arg value=-DrepositoryId=${maven-repository-id} /
 arg value=-DpomFile=@{pomFile} /




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

2011-09-13 Thread slebresne
Author: slebresne
Date: Tue Sep 13 12:38:33 2011
New Revision: 1170148

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

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

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

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

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

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

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

Propchange: cassandra/branches/cassandra-0.8/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Sep 13 12:38:33 2011
@@ -1,5 +1,5 @@
 
/cassandra/branches/cassandra-0.6:922689-1052356,1052358-1053452,1053454,1053456-1131291
-/cassandra/branches/cassandra-0.7:1026516-1163782
+/cassandra/branches/cassandra-0.7:1026516-1163782,1170147
 /cassandra/branches/cassandra-0.7.0:1053690-1055654
 /cassandra/branches/cassandra-0.8:1090934-1125013,1125041
 /cassandra/branches/cassandra-0.8.0:1125021-1130369

Modified: cassandra/branches/cassandra-0.8/build.xml
URL: 
http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.8/build.xml?rev=1170148r1=1170147r2=1170148view=diff
==
--- cassandra/branches/cassandra-0.8/build.xml (original)
+++ cassandra/branches/cassandra-0.8/build.xml Tue Sep 13 12:38:33 2011
@@ -313,7 +313,8 @@ 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.2:sign-and-deploy-file /
+arg 
value=org.apache.maven.plugins:maven-gpg-plugin:1.3:sign-and-deploy-file /
+arg value=-DretryFailedDeploymentCount=5 /
 arg value=-Durl=${maven-repository-url} /
 arg value=-DrepositoryId=${maven-repository-id} /
 arg value=-DpomFile=@{pomFile} /

Propchange: cassandra/branches/cassandra-0.8/contrib/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Sep 13 12:38:33 2011
@@ -1,5 +1,5 @@
 
/cassandra/branches/cassandra-0.6/contrib:922689-1052356,1052358-1053452,1053454,1053456-1068009
-/cassandra/branches/cassandra-0.7/contrib:1026516-1163782
+/cassandra/branches/cassandra-0.7/contrib:1026516-1163782,1170147
 /cassandra/branches/cassandra-0.7.0/contrib:1053690-1055654
 /cassandra/branches/cassandra-0.8/contrib:1090934-1125013,1125041
 /cassandra/branches/cassandra-0.8.0/contrib:1125021-1130369

Propchange: 
cassandra/branches/cassandra-0.8/interface/thrift/gen-java/org/apache/cassandra/thrift/Cassandra.java
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Sep 13 12:38:33 2011
@@ -1,5 +1,5 @@
 
/cassandra/branches/cassandra-0.6/interface/thrift/gen-java/org/apache/cassandra/thrift/Cassandra.java:922689-1052356,1052358-1053452,1053454,1053456-1131291
-/cassandra/branches/cassandra-0.7/interface/thrift/gen-java/org/apache/cassandra/thrift/Cassandra.java:1026516-1163782
+/cassandra/branches/cassandra-0.7/interface/thrift/gen-java/org/apache/cassandra/thrift/Cassandra.java:1026516-1163782,1170147
 
/cassandra/branches/cassandra-0.7.0/interface/thrift/gen-java/org/apache/cassandra/thrift/Cassandra.java:1053690-1055654
 
/cassandra/branches/cassandra-0.8/interface/thrift/gen-java/org/apache/cassandra/thrift/Cassandra.java:1090934-1125013,1125041
 
/cassandra/branches/cassandra-0.8.0/interface/thrift/gen-java/org/apache/cassandra/thrift/Cassandra.java:1125021-1130369

Propchange: 
cassandra/branches/cassandra-0.8/interface/thrift/gen-java/org/apache/cassandra/thrift/Column.java
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Sep 13 12:38:33 2011
@@ -1,5 +1,5 @@
 
/cassandra/branches/cassandra-0.6/interface/thrift/gen-java/org/apache/cassandra/thrift/Column.java:922689-1052356,1052358-1053452,1053454,1053456-1131291
-/cassandra/branches/cassandra-0.7/interface/thrift/gen-java/org/apache/cassandra/thrift/Column.java:1026516-1163782
+/cassandra/branches/cassandra-0.7/interface/thrift/gen-java/org/apache/cassandra/thrift/Column.java:1026516-1163782,1170147
 

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

2011-09-13 Thread slebresne
Author: slebresne
Date: Tue Sep 13 12:39:44 2011
New Revision: 1170149

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

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

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

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

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

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

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

Propchange: cassandra/branches/cassandra-1.0.0/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Sep 13 12:39:44 2011
@@ -1,7 +1,7 @@
 
/cassandra/branches/cassandra-0.6:922689-1052356,1052358-1053452,1053454,1053456-1131291
-/cassandra/branches/cassandra-0.7:1026516-1163782
+/cassandra/branches/cassandra-0.7:1026516-1163782,1170147
 /cassandra/branches/cassandra-0.7.0:1053690-1055654
-/cassandra/branches/cassandra-0.8:1090934-1125013,1125019-1166782,1166809,1169823
+/cassandra/branches/cassandra-0.8:1090934-1125013,1125019-1166782,1166809,1169823,1170148
 /cassandra/branches/cassandra-0.8.0:1125021-1130369
 /cassandra/branches/cassandra-0.8.1:1101014-1125018
 /cassandra/tags/cassandra-0.7.0-rc3:1051699-1053689

Modified: cassandra/branches/cassandra-1.0.0/build.xml
URL: 
http://svn.apache.org/viewvc/cassandra/branches/cassandra-1.0.0/build.xml?rev=1170149r1=1170148r2=1170149view=diff
==
--- cassandra/branches/cassandra-1.0.0/build.xml (original)
+++ cassandra/branches/cassandra-1.0.0/build.xml Tue Sep 13 12:39:44 2011
@@ -315,7 +315,8 @@ 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.2:sign-and-deploy-file /
+arg 
value=org.apache.maven.plugins:maven-gpg-plugin:1.3:sign-and-deploy-file /
+arg value=-DretryFailedDeploymentCount=5 /
 arg value=-Durl=${maven-repository-url} /
 arg value=-DrepositoryId=${maven-repository-id} /
 arg value=-DpomFile=@{pomFile} /

Propchange: cassandra/branches/cassandra-1.0.0/contrib/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Sep 13 12:39:44 2011
@@ -1,7 +1,7 @@
 
/cassandra/branches/cassandra-0.6/contrib:922689-1052356,1052358-1053452,1053454,1053456-1068009
-/cassandra/branches/cassandra-0.7/contrib:1026516-1163782
+/cassandra/branches/cassandra-0.7/contrib:1026516-1163782,1170147
 /cassandra/branches/cassandra-0.7.0/contrib:1053690-1055654
-/cassandra/branches/cassandra-0.8/contrib:1090934-1125013,1125019-1166782,1166809,1169823
+/cassandra/branches/cassandra-0.8/contrib:1090934-1125013,1125019-1166782,1166809,1169823,1170148
 /cassandra/branches/cassandra-0.8.0/contrib:1125021-1130369
 /cassandra/branches/cassandra-0.8.1/contrib:1101014-1125018
 /cassandra/tags/cassandra-0.7.0-rc3/contrib:1051699-1053689

Propchange: 
cassandra/branches/cassandra-1.0.0/interface/thrift/gen-java/org/apache/cassandra/thrift/Cassandra.java
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Sep 13 12:39:44 2011
@@ -1,7 +1,7 @@
 
/cassandra/branches/cassandra-0.6/interface/thrift/gen-java/org/apache/cassandra/thrift/Cassandra.java:922689-1052356,1052358-1053452,1053454,1053456-1131291
-/cassandra/branches/cassandra-0.7/interface/thrift/gen-java/org/apache/cassandra/thrift/Cassandra.java:1026516-1163782
+/cassandra/branches/cassandra-0.7/interface/thrift/gen-java/org/apache/cassandra/thrift/Cassandra.java:1026516-1163782,1170147
 
/cassandra/branches/cassandra-0.7.0/interface/thrift/gen-java/org/apache/cassandra/thrift/Cassandra.java:1053690-1055654
-/cassandra/branches/cassandra-0.8/interface/thrift/gen-java/org/apache/cassandra/thrift/Cassandra.java:1090934-1125013,1125019-1166782,1166809,1169823
+/cassandra/branches/cassandra-0.8/interface/thrift/gen-java/org/apache/cassandra/thrift/Cassandra.java:1090934-1125013,1125019-1166782,1166809,1169823,1170148
 
/cassandra/branches/cassandra-0.8.0/interface/thrift/gen-java/org/apache/cassandra/thrift/Cassandra.java:1125021-1130369
 

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

2011-09-13 Thread slebresne
Author: slebresne
Date: Tue Sep 13 12:40:47 2011
New Revision: 1170151

URL: http://svn.apache.org/viewvc?rev=1170151view=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 Tue Sep 13 12:40:47 2011
@@ -1,11 +1,11 @@
 
/cassandra/branches/cassandra-0.6:922689-1052356,1052358-1053452,1053454,1053456-1131291
-/cassandra/branches/cassandra-0.7:1026516-1163782
+/cassandra/branches/cassandra-0.7:1026516-1163782,1170147
 /cassandra/branches/cassandra-0.7.0:1053690-1055654
-/cassandra/branches/cassandra-0.8:1090934-1125013,1125019-1166782,1166809,1169823
+/cassandra/branches/cassandra-0.8:1090934-1125013,1125019-1166782,1166809,1169823,1170148
 /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-1170025,1170140
+/cassandra/branches/cassandra-1.0.0:1167104-1170025,1170140,1170149
 /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=1170151r1=1170150r2=1170151view=diff
==
--- cassandra/branches/cassandra-1.0/build.xml (original)
+++ cassandra/branches/cassandra-1.0/build.xml Tue Sep 13 12:40:47 2011
@@ -315,7 +315,8 @@ 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.2:sign-and-deploy-file /
+arg 
value=org.apache.maven.plugins:maven-gpg-plugin:1.3:sign-and-deploy-file /
+arg value=-DretryFailedDeploymentCount=5 /
 arg value=-Durl=${maven-repository-url} /
 arg value=-DrepositoryId=${maven-repository-id} /
 arg value=-DpomFile=@{pomFile} /

Propchange: cassandra/branches/cassandra-1.0/contrib/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Sep 13 12:40:47 2011
@@ -1,11 +1,11 @@
 
/cassandra/branches/cassandra-0.6/contrib:922689-1052356,1052358-1053452,1053454,1053456-1068009
-/cassandra/branches/cassandra-0.7/contrib:1026516-1163782
+/cassandra/branches/cassandra-0.7/contrib:1026516-1163782,1170147
 /cassandra/branches/cassandra-0.7.0/contrib:1053690-1055654
-/cassandra/branches/cassandra-0.8/contrib:1090934-1125013,1125019-1166782,1166809,1169823
+/cassandra/branches/cassandra-0.8/contrib:1090934-1125013,1125019-1166782,1166809,1169823,1170148
 /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-1170025,1170140
+/cassandra/branches/cassandra-1.0.0/contrib:1167104-1170025,1170140,1170149
 /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 Tue Sep 13 12:40:47 2011
@@ -1,11 +1,11 @@
 
/cassandra/branches/cassandra-0.6/interface/thrift/gen-java/org/apache/cassandra/thrift/Cassandra.java:922689-1052356,1052358-1053452,1053454,1053456-1131291
-/cassandra/branches/cassandra-0.7/interface/thrift/gen-java/org/apache/cassandra/thrift/Cassandra.java:1026516-1163782
+/cassandra/branches/cassandra-0.7/interface/thrift/gen-java/org/apache/cassandra/thrift/Cassandra.java:1026516-1163782,1170147
 

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

2011-09-13 Thread slebresne
Author: slebresne
Date: Tue Sep 13 12:42:21 2011
New Revision: 1170152

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

Modified:
cassandra/trunk/   (props changed)
cassandra/trunk/build.xml
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)

Propchange: cassandra/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Sep 13 12:42:21 2011
@@ -1,11 +1,11 @@
 
/cassandra/branches/cassandra-0.6:922689-1052356,1052358-1053452,1053454,1053456-1131291
-/cassandra/branches/cassandra-0.7:1026516-1163782
+/cassandra/branches/cassandra-0.7:1026516-1163782,1170147
 /cassandra/branches/cassandra-0.7.0:1053690-1055654
-/cassandra/branches/cassandra-0.8:1090934-1125013,1125019-1166782,1166809,1169823
+/cassandra/branches/cassandra-0.8:1090934-1125013,1125019-1166782,1166809,1169823,1170148
 /cassandra/branches/cassandra-0.8.0:1125021-1130369
 /cassandra/branches/cassandra-0.8.1:1101014-1125018
-/cassandra/branches/cassandra-1.0:1167085-1170026,1170141
-/cassandra/branches/cassandra-1.0.0:1167104-1167229,1167232-1170025,1170140
+/cassandra/branches/cassandra-1.0:1167085-1170026,1170141,1170151
+/cassandra/branches/cassandra-1.0.0:1167104-1167229,1167232-1170025,1170140,1170149
 /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/build.xml
URL: 
http://svn.apache.org/viewvc/cassandra/trunk/build.xml?rev=1170152r1=1170151r2=1170152view=diff
==
--- cassandra/trunk/build.xml (original)
+++ cassandra/trunk/build.xml Tue Sep 13 12:42:21 2011
@@ -318,7 +318,8 @@ 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.2:sign-and-deploy-file /
+arg 
value=org.apache.maven.plugins:maven-gpg-plugin:1.3:sign-and-deploy-file /
+arg value=-DretryFailedDeploymentCount=5 /
 arg value=-Durl=${maven-repository-url} /
 arg value=-DrepositoryId=${maven-repository-id} /
 arg value=-DpomFile=@{pomFile} /

Propchange: cassandra/trunk/contrib/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Sep 13 12:42:21 2011
@@ -1,11 +1,11 @@
 
/cassandra/branches/cassandra-0.6/contrib:922689-1052356,1052358-1053452,1053454,1053456-1068009
-/cassandra/branches/cassandra-0.7/contrib:1026516-1163782
+/cassandra/branches/cassandra-0.7/contrib:1026516-1163782,1170147
 /cassandra/branches/cassandra-0.7.0/contrib:1053690-1055654
-/cassandra/branches/cassandra-0.8/contrib:1090934-1125013,1125019-1166782,1166809,1169823
+/cassandra/branches/cassandra-0.8/contrib:1090934-1125013,1125019-1166782,1166809,1169823,1170148
 /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-1170026,1170141
-/cassandra/branches/cassandra-1.0.0/contrib:1167104-1167229,1167232-1170025,1170140
+/cassandra/branches/cassandra-1.0/contrib:1167085-1170026,1170141,1170151
+/cassandra/branches/cassandra-1.0.0/contrib:1167104-1167229,1167232-1170025,1170140,1170149
 /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 Tue Sep 13 12:42:21 2011
@@ -1,11 +1,11 @@
 
/cassandra/branches/cassandra-0.6/interface/thrift/gen-java/org/apache/cassandra/thrift/Cassandra.java:922689-1052356,1052358-1053452,1053454,1053456-1131291
-/cassandra/branches/cassandra-0.7/interface/thrift/gen-java/org/apache/cassandra/thrift/Cassandra.java:1026516-1163782
+/cassandra/branches/cassandra-0.7/interface/thrift/gen-java/org/apache/cassandra/thrift/Cassandra.java:1026516-1163782,1170147
 

[jira] [Assigned] (CASSANDRA-3194) repair streaming forwarding loop

2011-09-13 Thread Jonathan Ellis (JIRA)

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

Jonathan Ellis reassigned CASSANDRA-3194:
-

Assignee: Sylvain Lebresne

 repair streaming forwarding loop
 

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


 I am able to reproduce what appears to be a streaming forwarding loop when 
 running repairs.  This affect only nodes using broadcast_address (ec2 
 external ip)  listen_address of 0.0.0.0. (Configuration is using property 
 file snitch in a multi DC NTS where some DC's are EC2 and others are not).  
 The hosts in the other dc's not using broadcast_address do not experience 
 this symptom.
 on ec2 host dc1host1:
 INFO [AntiEntropyStage:1] 2011-09-13 06:34:01,673 StreamingRepairTask.java 
 (line 211) [streaming task #ce793c30-ddd1-11e0--071a4b76fefb] Received 
 task from /0.0.0.0 to stream 12259 ranges to /external.ec2.ip.dc1host3
  INFO [AntiEntropyStage:1] 2011-09-13 06:34:01,673 StreamingRepairTask.java 
 (line 136) [streaming task #ce793c30-ddd1-11e0--071a4b76fefb] Forwarding 
 streaming repair of 12259 ranges to /external.ec2.ip.of.dc1host1 (to be 
 streamed with /external.ip.of.host3)
 The above appears to trigger another streaming task and results in saturating 
 the network interfaces dc1host1.  The above log entries are repeated until 
 cassandra is killed.

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




[jira] [Updated] (CASSANDRA-3194) repair streaming forwarding loop

2011-09-13 Thread Jonathan Ellis (JIRA)

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

Jonathan Ellis updated CASSANDRA-3194:
--

Fix Version/s: 1.0.0

 repair streaming forwarding loop
 

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


 I am able to reproduce what appears to be a streaming forwarding loop when 
 running repairs.  This affect only nodes using broadcast_address (ec2 
 external ip)  listen_address of 0.0.0.0. (Configuration is using property 
 file snitch in a multi DC NTS where some DC's are EC2 and others are not).  
 The hosts in the other dc's not using broadcast_address do not experience 
 this symptom.
 on ec2 host dc1host1:
 INFO [AntiEntropyStage:1] 2011-09-13 06:34:01,673 StreamingRepairTask.java 
 (line 211) [streaming task #ce793c30-ddd1-11e0--071a4b76fefb] Received 
 task from /0.0.0.0 to stream 12259 ranges to /external.ec2.ip.dc1host3
  INFO [AntiEntropyStage:1] 2011-09-13 06:34:01,673 StreamingRepairTask.java 
 (line 136) [streaming task #ce793c30-ddd1-11e0--071a4b76fefb] Forwarding 
 streaming repair of 12259 ranges to /external.ec2.ip.of.dc1host1 (to be 
 streamed with /external.ip.of.host3)
 The above appears to trigger another streaming task and results in saturating 
 the network interfaces dc1host1.  The above log entries are repeated until 
 cassandra is killed.

--
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-13 Thread Jonathan Ellis (JIRA)

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

Jonathan Ellis commented on CASSANDRA-3195:
---

Did you try quoting the desired name?

 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
Priority: Minor

 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] [Assigned] (CASSANDRA-3198) debian packaging installation problem when installing for the first time

2011-09-13 Thread Jonathan Ellis (JIRA)

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

Jonathan Ellis reassigned CASSANDRA-3198:
-

Assignee: Eric Evans

 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: Eric Evans

 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-2890) Randomize (to some extend) the choice of the first replica for counter increment

2011-09-13 Thread Jonathan Ellis (JIRA)

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

Jonathan Ellis commented on CASSANDRA-2890:
---

How necessary is this if we change SSnitch to match ANTS?

 Randomize (to some extend) the choice of the first replica for counter 
 increment
 

 Key: CASSANDRA-2890
 URL: https://issues.apache.org/jira/browse/CASSANDRA-2890
 Project: Cassandra
  Issue Type: Improvement
  Components: Core
Affects Versions: 0.8.0
Reporter: Sylvain Lebresne
Assignee: Sylvain Lebresne
Priority: Minor
  Labels: counters
 Fix For: 0.8.6

 Attachments: 2890.patch


 Right now, we choose the first replica for a counter increments based solely 
 on what the snitch returns. If the clients requests are well balanced over 
 the cluster and the snitch not ill configured, this should not be a problem, 
 but this is probably too strong an assumption to make.
 The goal of this ticket is to change this to choose a random replica in the 
 current data center instead.

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




[jira] [Updated] (CASSANDRA-3194) repair streaming forwarding loop

2011-09-13 Thread Sylvain Lebresne (JIRA)

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

Sylvain Lebresne updated CASSANDRA-3194:


Attachment: 3194.patch

Oups, forgot to switch to getBroadcastAddress  in StreamingRepairTask. Patch 
attached.

 repair streaming forwarding loop
 

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

 Attachments: 3194.patch


 I am able to reproduce what appears to be a streaming forwarding loop when 
 running repairs.  This affect only nodes using broadcast_address (ec2 
 external ip)  listen_address of 0.0.0.0. (Configuration is using property 
 file snitch in a multi DC NTS where some DC's are EC2 and others are not).  
 The hosts in the other dc's not using broadcast_address do not experience 
 this symptom.
 on ec2 host dc1host1:
 INFO [AntiEntropyStage:1] 2011-09-13 06:34:01,673 StreamingRepairTask.java 
 (line 211) [streaming task #ce793c30-ddd1-11e0--071a4b76fefb] Received 
 task from /0.0.0.0 to stream 12259 ranges to /external.ec2.ip.dc1host3
  INFO [AntiEntropyStage:1] 2011-09-13 06:34:01,673 StreamingRepairTask.java 
 (line 136) [streaming task #ce793c30-ddd1-11e0--071a4b76fefb] Forwarding 
 streaming repair of 12259 ranges to /external.ec2.ip.of.dc1host1 (to be 
 streamed with /external.ip.of.host3)
 The above appears to trigger another streaming task and results in saturating 
 the network interfaces dc1host1.  The above log entries are repeated until 
 cassandra is killed.

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




svn commit: r1170162 - in /cassandra/branches/cassandra-1.0.0: CHANGES.txt src/java/org/apache/cassandra/service/RowRepairResolver.java

2011-09-13 Thread jbellis
Author: jbellis
Date: Tue Sep 13 12:57:47 2011
New Revision: 1170162

URL: http://svn.apache.org/viewvc?rev=1170162view=rev
Log:
fix RRR NPE
patch by jbellis; reviewed by slebresne for CASSANDRA-3192

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

cassandra/branches/cassandra-1.0.0/src/java/org/apache/cassandra/service/RowRepairResolver.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=1170162r1=1170161r2=1170162view=diff
==
--- cassandra/branches/cassandra-1.0.0/CHANGES.txt (original)
+++ cassandra/branches/cassandra-1.0.0/CHANGES.txt Tue Sep 13 12:57:47 2011
@@ -24,7 +24,7 @@
  * use lazy initialization instead of class initialization in NodeId
(CASSANDRA-2953)
  * add paging to get_count (CASSANDRA-2894)
- * fix short reads in [multi]get (CASSANDRA-2643, 3157)
+ * fix short reads in [multi]get (CASSANDRA-2643, 3157, 3192)
  * add optional compression for sstables (CASSANDRA-47, 3001, 3128)
  * add scheduler JMX metrics (CASSANDRA-2962)
  * add block level checksum for compressed data (CASSANDRA-1717)

Modified: 
cassandra/branches/cassandra-1.0.0/src/java/org/apache/cassandra/service/RowRepairResolver.java
URL: 
http://svn.apache.org/viewvc/cassandra/branches/cassandra-1.0.0/src/java/org/apache/cassandra/service/RowRepairResolver.java?rev=1170162r1=1170161r2=1170162view=diff
==
--- 
cassandra/branches/cassandra-1.0.0/src/java/org/apache/cassandra/service/RowRepairResolver.java
 (original)
+++ 
cassandra/branches/cassandra-1.0.0/src/java/org/apache/cassandra/service/RowRepairResolver.java
 Tue Sep 13 12:57:47 2011
@@ -79,7 +79,7 @@ public class RowRepairResolver extends A
 endpoints.add(message.getFrom());
 
 // compute maxLiveColumns to prevent short reads -- see 
https://issues.apache.org/jira/browse/CASSANDRA-2643
-int liveColumns = cf.getLiveColumnCount();
+int liveColumns = cf == null ? 0 : cf.getLiveColumnCount();
 if (liveColumns  maxLiveColumns)
 maxLiveColumns = liveColumns;
 }




[jira] [Commented] (CASSANDRA-2691) If an upload to central repository fails for an artifact, retry a couple of times before killing the build

2011-09-13 Thread Hudson (JIRA)

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

Hudson commented on CASSANDRA-2691:
---

Integrated in Cassandra-0.7 #551 (See 
[https://builds.apache.org/job/Cassandra-0.7/551/])
Retry upload to central repository
patch by stephenc; reviewed by slebresne for CASSANDRA-2691

slebresne : 
http://svn.apache.org/viewcvs.cgi/?root=Apache-SVNview=revrev=1170147
Files : 
* /cassandra/branches/cassandra-0.7/build.xml


 If an upload to central repository fails for an artifact, retry a couple of 
 times before killing the build
 --

 Key: CASSANDRA-2691
 URL: https://issues.apache.org/jira/browse/CASSANDRA-2691
 Project: Cassandra
  Issue Type: Improvement
Affects Versions: 0.7.7, 0.8.0
Reporter: Stephen Connolly
Assignee: Stephen Connolly
 Fix For: 0.7.10

 Attachments: CASSANDRA-2691.patch


 Depends on MGPG-35 http://jira.codehaus.org/browse/MGPG-35

--
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-13 Thread Mauri Tikka (JIRA)

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

Mauri Tikka commented on CASSANDRA-3195:


create column family 'Config';

gives Invalid column family name: 'Config',

create column family Config;

gives Syntax error at position 21: unexpected  for `create column family 
Config;`.

or did I miss another way of quoting?



 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
Priority: Minor

 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-2890) Randomize (to some extend) the choice of the first replica for counter increment

2011-09-13 Thread Sylvain Lebresne (JIRA)

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

Sylvain Lebresne commented on CASSANDRA-2890:
-

bq. How necessary is this if we change SSnitch to match ANTS?

That would restore what I though was the previous behavior, i.e, for equal 
score the first alive replica in ring order will be picked. Which means that 
provided the ring is well balanced and the client query are well balanced too, 
the load will be uniform. But that suppose that
  # client queries are well balanced. True, this is already a requirement to 
get the best out of your cluster. But it would make it a much stronger 
requirement as more would depend on it.
  # this is for when the dynamic snitch returns equal scores. I think that is 
actually the stronger motivation for this: relying on the scores of the dynamic 
snitch when those scores are not influenced by the operation we're doing is 
likely a bad idea. Clusters that have a very low read rate (compared to the 
write one) will likely still experience poor load balancing. 

 Randomize (to some extend) the choice of the first replica for counter 
 increment
 

 Key: CASSANDRA-2890
 URL: https://issues.apache.org/jira/browse/CASSANDRA-2890
 Project: Cassandra
  Issue Type: Improvement
  Components: Core
Affects Versions: 0.8.0
Reporter: Sylvain Lebresne
Assignee: Sylvain Lebresne
Priority: Minor
  Labels: counters
 Fix For: 0.8.6

 Attachments: 2890.patch


 Right now, we choose the first replica for a counter increments based solely 
 on what the snitch returns. If the clients requests are well balanced over 
 the cluster and the snitch not ill configured, this should not be a problem, 
 but this is probably too strong an assumption to make.
 The goal of this ticket is to change this to choose a random replica in the 
 current data center instead.

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




[jira] [Commented] (CASSANDRA-3191) unable to start single node cluster when listen_address is not localhost

2011-09-13 Thread T Jake Luciani (JIRA)

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

T Jake Luciani commented on CASSANDRA-3191:
---

I left the listen address blank.  and the seed is 127.0.0.1

 unable to start single node cluster when listen_address is not localhost
 

 Key: CASSANDRA-3191
 URL: https://issues.apache.org/jira/browse/CASSANDRA-3191
 Project: Cassandra
  Issue Type: Bug
Reporter: T Jake Luciani
 Fix For: 1.0.0


 Due to bootstrap default == true
 {code}
 INFO 20:07:51,839 Joining: waiting for ring and schema information
  INFO 20:08:21,839 Joining: getting bootstrap token
 ERROR 20:08:21,843 Exception encountered during startup.
 java.lang.RuntimeException: No other nodes seen!  Unable to bootstrap
   at 
 org.apache.cassandra.dht.BootStrapper.getBootstrapSource(BootStrapper.java:168)
   at 
 org.apache.cassandra.dht.BootStrapper.getBalancedToken(BootStrapper.java:150)
   at 
 org.apache.cassandra.dht.BootStrapper.getBootstrapToken(BootStrapper.java:145)
   at 
 org.apache.cassandra.service.StorageService.joinTokenRing(StorageService.java:528)
   at 
 org.apache.cassandra.service.StorageService.initServer(StorageService.java:450)
   at 
 org.apache.cassandra.service.StorageService.initServer(StorageService.java:372)
   at 
 org.apache.cassandra.service.AbstractCassandraDaemon.setup(AbstractCassandraDaemon.java:213)
   at 
 org.apache.cassandra.service.AbstractCassandraDaemon.activate(AbstractCassandraDaemon.java:335)
   at 
 org.apache.cassandra.thrift.CassandraDaemon.main(CassandraDaemon.java:106)
 Exception encountered during startup.
 {code}

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




[jira] [Commented] (CASSANDRA-2890) Randomize (to some extend) the choice of the first replica for counter increment

2011-09-13 Thread Sylvain Lebresne (JIRA)

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

Sylvain Lebresne commented on CASSANDRA-2890:
-

That being said, I do think we should probably change SSnitch to match ANTS.

 Randomize (to some extend) the choice of the first replica for counter 
 increment
 

 Key: CASSANDRA-2890
 URL: https://issues.apache.org/jira/browse/CASSANDRA-2890
 Project: Cassandra
  Issue Type: Improvement
  Components: Core
Affects Versions: 0.8.0
Reporter: Sylvain Lebresne
Assignee: Sylvain Lebresne
Priority: Minor
  Labels: counters
 Fix For: 0.8.6

 Attachments: 2890.patch


 Right now, we choose the first replica for a counter increments based solely 
 on what the snitch returns. If the clients requests are well balanced over 
 the cluster and the snitch not ill configured, this should not be a problem, 
 but this is probably too strong an assumption to make.
 The goal of this ticket is to change this to choose a random replica in the 
 current data center instead.

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




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

2011-09-13 Thread Jonathan Ellis (JIRA)

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

Jonathan Ellis reassigned CASSANDRA-3195:
-

Assignee: Pavel Yaskevich

 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

 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-2890) Randomize (to some extend) the choice of the first replica for counter increment

2011-09-13 Thread Jonathan Ellis (JIRA)

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

Jonathan Ellis commented on CASSANDRA-2890:
---

Sounds reasonable.

Should we move threadlocalrandom to FBUtilities since we have one in 
CounterMutation as well?

 Randomize (to some extend) the choice of the first replica for counter 
 increment
 

 Key: CASSANDRA-2890
 URL: https://issues.apache.org/jira/browse/CASSANDRA-2890
 Project: Cassandra
  Issue Type: Improvement
  Components: Core
Affects Versions: 0.8.0
Reporter: Sylvain Lebresne
Assignee: Sylvain Lebresne
Priority: Minor
  Labels: counters
 Fix For: 0.8.6

 Attachments: 2890.patch


 Right now, we choose the first replica for a counter increments based solely 
 on what the snitch returns. If the clients requests are well balanced over 
 the cluster and the snitch not ill configured, this should not be a problem, 
 but this is probably too strong an assumption to make.
 The goal of this ticket is to change this to choose a random replica in the 
 current data center instead.

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




[jira] [Assigned] (CASSANDRA-3178) Counter shard merging is not thread safe

2011-09-13 Thread Sylvain Lebresne (JIRA)

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

Sylvain Lebresne reassigned CASSANDRA-3178:
---

Assignee: Sylvain Lebresne

 Counter shard merging is not thread safe
 

 Key: CASSANDRA-3178
 URL: https://issues.apache.org/jira/browse/CASSANDRA-3178
 Project: Cassandra
  Issue Type: Bug
  Components: Core
Affects Versions: 0.8.5
Reporter: Sylvain Lebresne
Assignee: Sylvain Lebresne
  Labels: counters
 Fix For: 0.8.6

 Attachments: 0001-Move-shard-merging-completely-to-compaction.patch, 
 0002-Simplify-improve-shard-merging-code.patch


 The first part of the counter shard merging process is done during counter 
 replication. This was done there because it requires that all replica are 
 made aware of the merging (we could only rely on nodetool repair for that but 
 that seems much too fragile, it's better as just a safety net). However this 
 part isn't thread safe as multiple threads can do the merging for the same 
 shard at the same time (which shouldn't really corrupt the counter value 
 per se, but result in an incorrect context).
 Synchronizing that part of the code would be very costly in term of 
 performance, so instance I propose to move the part of the shard merging done 
 during replication to compaction. It's a better place anyway. The only 
 downside is that it means compaction will sometime send mutations to other 
 node as a side effect, which doesn't feel very clean but is probably not a 
 big deal either.

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




[jira] [Commented] (CASSANDRA-2890) Randomize (to some extend) the choice of the first replica for counter increment

2011-09-13 Thread Sylvain Lebresne (JIRA)

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

Sylvain Lebresne commented on CASSANDRA-2890:
-

bq. Should we move threadlocalrandom to FBUtilities since we have one in 
CounterMutation as well?

We have one in ReadCallback too, and one or two places where we create one shot 
random object. We could move all that to FBUtilities?
Note though that is won't save us much allocation since all those uses of 
Random are done in different thread pools (and the one in CounterMutation may 
go away with CASSANDRA-3178 anyway).

 Randomize (to some extend) the choice of the first replica for counter 
 increment
 

 Key: CASSANDRA-2890
 URL: https://issues.apache.org/jira/browse/CASSANDRA-2890
 Project: Cassandra
  Issue Type: Improvement
  Components: Core
Affects Versions: 0.8.0
Reporter: Sylvain Lebresne
Assignee: Sylvain Lebresne
Priority: Minor
  Labels: counters
 Fix For: 0.8.6

 Attachments: 2890.patch


 Right now, we choose the first replica for a counter increments based solely 
 on what the snitch returns. If the clients requests are well balanced over 
 the cluster and the snitch not ill configured, this should not be a problem, 
 but this is probably too strong an assumption to make.
 The goal of this ticket is to change this to choose a random replica in the 
 current data center instead.

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




svn commit: r1170184 - in /cassandra/branches/cassandra-1.0.0/src/java/org/apache/cassandra: db/CollationController.java io/sstable/SSTableReader.java streaming/StreamInSession.java

2011-09-13 Thread slebresne
Author: slebresne
Date: Tue Sep 13 13:58:41 2011
New Revision: 1170184

URL: http://svn.apache.org/viewvc?rev=1170184view=rev
Log:
minor cleanups related to reference counting

Modified:

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

cassandra/branches/cassandra-1.0.0/src/java/org/apache/cassandra/io/sstable/SSTableReader.java

cassandra/branches/cassandra-1.0.0/src/java/org/apache/cassandra/streaming/StreamInSession.java

Modified: 
cassandra/branches/cassandra-1.0.0/src/java/org/apache/cassandra/db/CollationController.java
URL: 
http://svn.apache.org/viewvc/cassandra/branches/cassandra-1.0.0/src/java/org/apache/cassandra/db/CollationController.java?rev=1170184r1=1170183r2=1170184view=diff
==
--- 
cassandra/branches/cassandra-1.0.0/src/java/org/apache/cassandra/db/CollationController.java
 (original)
+++ 
cassandra/branches/cassandra-1.0.0/src/java/org/apache/cassandra/db/CollationController.java
 Tue Sep 13 13:58:41 2011
@@ -151,9 +151,9 @@ public class CollationController
 }
 finally
 {
-SSTableReader.releaseReferences(view.sstables);
 for (IColumnIterator iter : iterators)
 FileUtils.closeQuietly(iter);
+SSTableReader.releaseReferences(view.sstables);
 }
 }
 
@@ -223,9 +223,9 @@ public class CollationController
 }
 finally
 {
-SSTableReader.releaseReferences(view.sstables);
 for (IColumnIterator iter : iterators)
 FileUtils.closeQuietly(iter);
+SSTableReader.releaseReferences(view.sstables);
 }
 }
 

Modified: 
cassandra/branches/cassandra-1.0.0/src/java/org/apache/cassandra/io/sstable/SSTableReader.java
URL: 
http://svn.apache.org/viewvc/cassandra/branches/cassandra-1.0.0/src/java/org/apache/cassandra/io/sstable/SSTableReader.java?rev=1170184r1=1170183r2=1170184view=diff
==
--- 
cassandra/branches/cassandra-1.0.0/src/java/org/apache/cassandra/io/sstable/SSTableReader.java
 (original)
+++ 
cassandra/branches/cassandra-1.0.0/src/java/org/apache/cassandra/io/sstable/SSTableReader.java
 Tue Sep 13 13:58:41 2011
@@ -647,14 +647,8 @@ public class SSTableReader extends SSTab
 
 /**
  * Mark the sstable as compacted.
- * When calling this function, the caller must ensure two things:
- *  - He must have acquired a reference with acquireReference()
- *  - He must ensure that the SSTableReader is not referenced anywhere 
except for threads holding a reference.
- *
- * The reason we ask caller to acquire a reference is because this greatly 
simplify the logic here.
- * If that wasn't the case, markCompacted would have to deal with both the 
case where some thread still
- * have references and the case where no thread have any reference. Making 
this logic thread-safe is a
- * bit hard, so we make sure that at least the caller thread has a 
reference and delegate the rest to releaseRefence()
+ * When calling this function, the caller must ensure that the 
SSTableReader is not referenced anywhere
+ * except for threads holding a reference.
  */
 public void markCompacted()
 {

Modified: 
cassandra/branches/cassandra-1.0.0/src/java/org/apache/cassandra/streaming/StreamInSession.java
URL: 
http://svn.apache.org/viewvc/cassandra/branches/cassandra-1.0.0/src/java/org/apache/cassandra/streaming/StreamInSession.java?rev=1170184r1=1170183r2=1170184view=diff
==
--- 
cassandra/branches/cassandra-1.0.0/src/java/org/apache/cassandra/streaming/StreamInSession.java
 (original)
+++ 
cassandra/branches/cassandra-1.0.0/src/java/org/apache/cassandra/streaming/StreamInSession.java
 Tue Sep 13 13:58:41 2011
@@ -134,7 +134,9 @@ public class StreamInSession
 assert sstable.getTableName().equals(table);
 
 // Acquiring the reference (for secondary index building) 
before adding it makes sure we don't have to care about races
-sstable.acquireReference();
+if (!sstable.acquireReference())
+throw new RuntimeException(We shouldn't fail 
acquiring a reference on a sstable that has just been transfered);
+
 referenced.add(sstable);
 
 ColumnFamilyStore cfs = 
Table.open(sstable.getTableName()).getColumnFamilyStore(sstable.getColumnFamilyName());




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

2011-09-13 Thread slebresne
Author: slebresne
Date: Tue Sep 13 13:59:58 2011
New Revision: 1170185

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

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/CollationController.java

cassandra/branches/cassandra-1.0/src/java/org/apache/cassandra/io/sstable/SSTableReader.java

cassandra/branches/cassandra-1.0/src/java/org/apache/cassandra/streaming/StreamInSession.java

Propchange: cassandra/branches/cassandra-1.0/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Sep 13 13:59:58 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-1170025,1170140,1170149
+/cassandra/branches/cassandra-1.0.0:1167104-1170025,1170140,1170149,1170184
 /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 Tue Sep 13 13:59:58 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-1170025,1170140,1170149
+/cassandra/branches/cassandra-1.0.0/contrib:1167104-1170025,1170140,1170149,1170184
 /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 Tue Sep 13 13:59:58 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-1170025,1170140,1170149
+/cassandra/branches/cassandra-1.0.0/interface/thrift/gen-java/org/apache/cassandra/thrift/Cassandra.java:1167104-1170025,1170140,1170149,1170184
 
/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 Tue Sep 13 13:59:58 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-1170025,1170140,1170149
+/cassandra/branches/cassandra-1.0.0/interface/thrift/gen-java/org/apache/cassandra/thrift/Column.java:1167104-1170025,1170140,1170149,1170184
 
/cassandra/tags/cassandra-0.7.0-rc3/interface/thrift/gen-java/org/apache/cassandra/thrift/Column.java:1051699-1053689
 

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

2011-09-13 Thread slebresne
Author: slebresne
Date: Tue Sep 13 14:01:13 2011
New Revision: 1170186

URL: http://svn.apache.org/viewvc?rev=1170186view=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/db/CollationController.java
cassandra/trunk/src/java/org/apache/cassandra/io/sstable/SSTableReader.java
cassandra/trunk/src/java/org/apache/cassandra/streaming/StreamInSession.java

Propchange: cassandra/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Sep 13 14:01:13 2011
@@ -4,8 +4,8 @@
 
/cassandra/branches/cassandra-0.8:1090934-1125013,1125019-1166782,1166809,1169823,1170148
 /cassandra/branches/cassandra-0.8.0:1125021-1130369
 /cassandra/branches/cassandra-0.8.1:1101014-1125018
-/cassandra/branches/cassandra-1.0:1167085-1170026,1170141,1170151
-/cassandra/branches/cassandra-1.0.0:1167104-1167229,1167232-1170025,1170140,1170149
+/cassandra/branches/cassandra-1.0:1167085-1170026,1170141,1170151,1170185
+/cassandra/branches/cassandra-1.0.0:1167104-1167229,1167232-1170025,1170140,1170149,1170184
 /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 Tue Sep 13 14:01:13 2011
@@ -4,8 +4,8 @@
 
/cassandra/branches/cassandra-0.8/contrib:1090934-1125013,1125019-1166782,1166809,1169823,1170148
 /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-1170026,1170141,1170151
-/cassandra/branches/cassandra-1.0.0/contrib:1167104-1167229,1167232-1170025,1170140,1170149
+/cassandra/branches/cassandra-1.0/contrib:1167085-1170026,1170141,1170151,1170185
+/cassandra/branches/cassandra-1.0.0/contrib:1167104-1167229,1167232-1170025,1170140,1170149,1170184
 /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 Tue Sep 13 14:01:13 2011
@@ -4,8 +4,8 @@
 
/cassandra/branches/cassandra-0.8/interface/thrift/gen-java/org/apache/cassandra/thrift/Cassandra.java:1090934-1125013,1125019-1166782,1166809,1169823,1170148
 
/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-1170026,1170141,1170151
-/cassandra/branches/cassandra-1.0.0/interface/thrift/gen-java/org/apache/cassandra/thrift/Cassandra.java:1167104-1167229,1167232-1170025,1170140,1170149
+/cassandra/branches/cassandra-1.0/interface/thrift/gen-java/org/apache/cassandra/thrift/Cassandra.java:1167085-1170026,1170141,1170151,1170185
+/cassandra/branches/cassandra-1.0.0/interface/thrift/gen-java/org/apache/cassandra/thrift/Cassandra.java:1167104-1167229,1167232-1170025,1170140,1170149,1170184
 
/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 Tue Sep 13 14:01:13 2011
@@ -4,8 +4,8 @@
 
/cassandra/branches/cassandra-0.8/interface/thrift/gen-java/org/apache/cassandra/thrift/Column.java:1090934-1125013,1125019-1166782,1166809,1169823,1170148
 

[jira] [Commented] (CASSANDRA-3024) sstable and message varint encoding

2011-09-13 Thread Terje Marthinussen (JIRA)

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

Terje Marthinussen commented on CASSANDRA-3024:
---

For my test data (real life dataset using supercolumns) I got 10% additional 
size reduction over compression using vlq coded numbers on supercolumns/columns 
as well as  column timestamps which are relative to the supercolumns rather 
than absolute timestamps.

Already have some code for row relative timestamps, but not tested that yet

 sstable and message varint encoding
 ---

 Key: CASSANDRA-3024
 URL: https://issues.apache.org/jira/browse/CASSANDRA-3024
 Project: Cassandra
  Issue Type: Improvement
  Components: Core
Reporter: Jonathan Ellis
Priority: Minor
 Fix For: 1.1


 We could save some sstable space by encoding longs and ints as vlong and 
 vint, respectively.  (Probably most short lengths would be better as vint 
 as well.)

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




[jira] [Commented] (CASSANDRA-3024) sstable and message varint encoding

2011-09-13 Thread Terje Marthinussen (JIRA)

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

Terje Marthinussen commented on CASSANDRA-3024:
---

As a side note, is there any problems vlq encoding some unneeded values. If 
they are that rare, they probably have no real impact on performance?

I did not run any real benchmarks yet, but json2sstable actually ran a tiny bit 
faster (1-2%) with vlq encoding and relative timestamps.

 sstable and message varint encoding
 ---

 Key: CASSANDRA-3024
 URL: https://issues.apache.org/jira/browse/CASSANDRA-3024
 Project: Cassandra
  Issue Type: Improvement
  Components: Core
Reporter: Jonathan Ellis
Priority: Minor
 Fix For: 1.1


 We could save some sstable space by encoding longs and ints as vlong and 
 vint, respectively.  (Probably most short lengths would be better as vint 
 as well.)

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




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

2011-09-13 Thread JIRA

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

Jérémy Sevellec updated CASSANDRA-3198:
---

Attachment: trunk-3198-v1.patch

here is 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: Eric Evans
 Attachments: 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-2890) Randomize (to some extend) the choice of the first replica for counter increment

2011-09-13 Thread Jonathan Ellis (JIRA)

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

Jonathan Ellis commented on CASSANDRA-2890:
---

Would just like to consolidate the code, like we did w/ 
ThreadLocalMessageDigest.

 Randomize (to some extend) the choice of the first replica for counter 
 increment
 

 Key: CASSANDRA-2890
 URL: https://issues.apache.org/jira/browse/CASSANDRA-2890
 Project: Cassandra
  Issue Type: Improvement
  Components: Core
Affects Versions: 0.8.0
Reporter: Sylvain Lebresne
Assignee: Sylvain Lebresne
Priority: Minor
  Labels: counters
 Fix For: 0.8.6

 Attachments: 2890.patch


 Right now, we choose the first replica for a counter increments based solely 
 on what the snitch returns. If the clients requests are well balanced over 
 the cluster and the snitch not ill configured, this should not be a problem, 
 but this is probably too strong an assumption to make.
 The goal of this ticket is to change this to choose a random replica in the 
 current data center instead.

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




[jira] [Updated] (CASSANDRA-3143) Global caches (key/row)

2011-09-13 Thread Pavel Yaskevich (JIRA)

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

Pavel Yaskevich updated CASSANDRA-3143:
---

Attachment: 0005-cleanup-of-the-CFMetaData-and-thrift-avro-CfDef-and-.patch
0004-key-row-cache-tests-and-tweaks.patch
0003-CacheServiceMBean-and-correct-key-cache-loading.patch
0002-global-row-cache-and-ASC.readSaved-changed-to-abstra.patch
0001-global-key-cache.patch

rebased with latest trunk (last commit b9944399520c839f75725ec0f43e23fae5487ff4)

 Global caches (key/row)
 ---

 Key: CASSANDRA-3143
 URL: https://issues.apache.org/jira/browse/CASSANDRA-3143
 Project: Cassandra
  Issue Type: Improvement
Reporter: Pavel Yaskevich
Assignee: Pavel Yaskevich
Priority: Minor
  Labels: Core
 Fix For: 1.1

 Attachments: 0001-global-key-cache.patch, 
 0002-global-row-cache-and-ASC.readSaved-changed-to-abstra.patch, 
 0003-CacheServiceMBean-and-correct-key-cache-loading.patch, 
 0004-key-row-cache-tests-and-tweaks.patch, 
 0005-cleanup-of-the-CFMetaData-and-thrift-avro-CfDef-and-.patch


 Caches are difficult to configure well as ColumnFamilies are added, similar 
 to how memtables were difficult pre-CASSANDRA-2006.

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




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

2011-09-13 Thread Jonathan Ellis (JIRA)

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

Jonathan Ellis updated CASSANDRA-3198:
--

Reviewer: urandom
Assignee: Jérémy Sevellec  (was: Eric Evans)

 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
 Attachments: 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-3143) Global caches (key/row)

2011-09-13 Thread Pavel Yaskevich (JIRA)

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

Pavel Yaskevich commented on CASSANDRA-3143:


Please run `ant gen-thrift-java` and `ant avro-generate` right after you apply 
the set of patches.

 Global caches (key/row)
 ---

 Key: CASSANDRA-3143
 URL: https://issues.apache.org/jira/browse/CASSANDRA-3143
 Project: Cassandra
  Issue Type: Improvement
Reporter: Pavel Yaskevich
Assignee: Pavel Yaskevich
Priority: Minor
  Labels: Core
 Fix For: 1.1

 Attachments: 0001-global-key-cache.patch, 
 0002-global-row-cache-and-ASC.readSaved-changed-to-abstra.patch, 
 0003-CacheServiceMBean-and-correct-key-cache-loading.patch, 
 0004-key-row-cache-tests-and-tweaks.patch, 
 0005-cleanup-of-the-CFMetaData-and-thrift-avro-CfDef-and-.patch


 Caches are difficult to configure well as ColumnFamilies are added, similar 
 to how memtables were difficult pre-CASSANDRA-2006.

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




[jira] [Created] (CASSANDRA-3199) Counter write protocol: have the coordinator (instead of first replica) waits for replica responses directly

2011-09-13 Thread Sylvain Lebresne (JIRA)
Counter write protocol: have the coordinator (instead of first replica) waits 
for replica responses directly


 Key: CASSANDRA-3199
 URL: https://issues.apache.org/jira/browse/CASSANDRA-3199
 Project: Cassandra
  Issue Type: Improvement
  Components: Core
Reporter: Sylvain Lebresne
Priority: Minor


Current counter write protocol is this (where we take the case of write 
coordinator != first replica):
  # coordinator forward write request to first replica
  # first replica write locally and replicate to other replica
  # first replica waits for enough answers from the other replica to satisfy 
the consistency level
  # first replica acks the coordinator that completes the write to the client

This ticket proposes to modify this protocol to:
  # coordinator forward write request to first replica
  # first replica write locally, acks the coordinator for its own write and 
replicate to other replica
  # other replica respond directly to coordinator
  # once coordinator has enough responses, it completes the write

I see 2 advantages to this new protocol:
  * it should be at tad faster since it parallelizes wire transfer better
  * it woud make TimeoutException a bit less likely and more importantly, a 
TimeoutException would much more likely mean that the write hasn't been 
persisted. Indeed, in the current protocol, once the first replica has send the 
write to the other replica, it has to wait for the replica answers and answer 
the coordinator. If it dies during that time, we will return a 
TimeoutException, even though the first replica died after having done it's 
main job.

The cons is that this adds a bit of complexity. In particular, the other 
replica would have to answer to the coordinator for a query that has been 
issued by the first replica.

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




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

2011-09-13 Thread Sylvain Lebresne (JIRA)
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
 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




[jira] [Updated] (CASSANDRA-2890) Randomize (to some extend) the choice of the first replica for counter increment

2011-09-13 Thread Sylvain Lebresne (JIRA)

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

Sylvain Lebresne updated CASSANDRA-2890:


Attachment: 2890_v2.patch

Attaching v2 that moves ThreadLocalRandom uses to FBUtilities.

 Randomize (to some extend) the choice of the first replica for counter 
 increment
 

 Key: CASSANDRA-2890
 URL: https://issues.apache.org/jira/browse/CASSANDRA-2890
 Project: Cassandra
  Issue Type: Improvement
  Components: Core
Affects Versions: 0.8.0
Reporter: Sylvain Lebresne
Assignee: Sylvain Lebresne
Priority: Minor
  Labels: counters
 Fix For: 0.8.6

 Attachments: 2890.patch, 2890_v2.patch


 Right now, we choose the first replica for a counter increments based solely 
 on what the snitch returns. If the clients requests are well balanced over 
 the cluster and the snitch not ill configured, this should not be a problem, 
 but this is probably too strong an assumption to make.
 The goal of this ticket is to change this to choose a random replica in the 
 current data center instead.

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




[jira] [Commented] (CASSANDRA-2890) Randomize (to some extend) the choice of the first replica for counter increment

2011-09-13 Thread Jonathan Ellis (JIRA)

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

Jonathan Ellis commented on CASSANDRA-2890:
---

+1

 Randomize (to some extend) the choice of the first replica for counter 
 increment
 

 Key: CASSANDRA-2890
 URL: https://issues.apache.org/jira/browse/CASSANDRA-2890
 Project: Cassandra
  Issue Type: Improvement
  Components: Core
Affects Versions: 0.8.0
Reporter: Sylvain Lebresne
Assignee: Sylvain Lebresne
Priority: Minor
  Labels: counters
 Fix For: 0.8.6

 Attachments: 2890.patch, 2890_v2.patch


 Right now, we choose the first replica for a counter increments based solely 
 on what the snitch returns. If the clients requests are well balanced over 
 the cluster and the snitch not ill configured, this should not be a problem, 
 but this is probably too strong an assumption to make.
 The goal of this ticket is to change this to choose a random replica in the 
 current data center instead.

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




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

2011-09-13 Thread Eldon Stegall (JIRA)
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

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




svn commit: r1170220 - in /cassandra/branches/cassandra-1.0.0: ./ contrib/ interface/thrift/gen-java/org/apache/cassandra/thrift/ src/java/org/apache/cassandra/db/ src/java/org/apache/cassandra/servic

2011-09-13 Thread slebresne
Author: slebresne
Date: Tue Sep 13 16:03:51 2011
New Revision: 1170220

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

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

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

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

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

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

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

cassandra/branches/cassandra-1.0.0/src/java/org/apache/cassandra/db/CounterMutation.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/service/ReadCallback.java

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

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

Propchange: cassandra/branches/cassandra-1.0.0/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Sep 13 16:03:51 2011
@@ -1,7 +1,7 @@
 
/cassandra/branches/cassandra-0.6:922689-1052356,1052358-1053452,1053454,1053456-1131291
 /cassandra/branches/cassandra-0.7:1026516-1163782,1170147
 /cassandra/branches/cassandra-0.7.0:1053690-1055654
-/cassandra/branches/cassandra-0.8:1090934-1125013,1125019-1166782,1166809,1169823,1170148
+/cassandra/branches/cassandra-0.8:1090934-1125013,1125019-1166782,1166809,1169823,1170148,1170219
 /cassandra/branches/cassandra-0.8.0:1125021-1130369
 /cassandra/branches/cassandra-0.8.1:1101014-1125018
 /cassandra/tags/cassandra-0.7.0-rc3:1051699-1053689

Modified: cassandra/branches/cassandra-1.0.0/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/cassandra/branches/cassandra-1.0.0/CHANGES.txt?rev=1170220r1=1170219r2=1170220view=diff
==
--- cassandra/branches/cassandra-1.0.0/CHANGES.txt (original)
+++ cassandra/branches/cassandra-1.0.0/CHANGES.txt Tue Sep 13 16:03:51 2011
@@ -82,6 +82,7 @@
(CASSANDRA-3129)
  * CustomTThreadPoolServer to log TTransportException at DEBUG level
(CASSANDRA-3142)
+ * Randomize choice of first replica for counter increment (CASSANDRA-2890)
 
 
 0.8.5

Propchange: cassandra/branches/cassandra-1.0.0/contrib/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Sep 13 16:03:51 2011
@@ -1,7 +1,7 @@
 
/cassandra/branches/cassandra-0.6/contrib:922689-1052356,1052358-1053452,1053454,1053456-1068009
 /cassandra/branches/cassandra-0.7/contrib:1026516-1163782,1170147
 /cassandra/branches/cassandra-0.7.0/contrib:1053690-1055654
-/cassandra/branches/cassandra-0.8/contrib:1090934-1125013,1125019-1166782,1166809,1169823,1170148
+/cassandra/branches/cassandra-0.8/contrib:1090934-1125013,1125019-1166782,1166809,1169823,1170148,1170219
 /cassandra/branches/cassandra-0.8.0/contrib:1125021-1130369
 /cassandra/branches/cassandra-0.8.1/contrib:1101014-1125018
 /cassandra/tags/cassandra-0.7.0-rc3/contrib:1051699-1053689

Propchange: 
cassandra/branches/cassandra-1.0.0/interface/thrift/gen-java/org/apache/cassandra/thrift/Cassandra.java
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Sep 13 16:03:51 2011
@@ -1,7 +1,7 @@
 
/cassandra/branches/cassandra-0.6/interface/thrift/gen-java/org/apache/cassandra/thrift/Cassandra.java:922689-1052356,1052358-1053452,1053454,1053456-1131291
 
/cassandra/branches/cassandra-0.7/interface/thrift/gen-java/org/apache/cassandra/thrift/Cassandra.java:1026516-1163782,1170147
 
/cassandra/branches/cassandra-0.7.0/interface/thrift/gen-java/org/apache/cassandra/thrift/Cassandra.java:1053690-1055654
-/cassandra/branches/cassandra-0.8/interface/thrift/gen-java/org/apache/cassandra/thrift/Cassandra.java:1090934-1125013,1125019-1166782,1166809,1169823,1170148
+/cassandra/branches/cassandra-0.8/interface/thrift/gen-java/org/apache/cassandra/thrift/Cassandra.java:1090934-1125013,1125019-1166782,1166809,1169823,1170148,1170219
 
/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
 

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

2011-09-13 Thread slebresne
Author: slebresne
Date: Tue Sep 13 16:05:17 2011
New Revision: 1170221

URL: http://svn.apache.org/viewvc?rev=1170221view=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/CounterMutation.java

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

cassandra/branches/cassandra-1.0/src/java/org/apache/cassandra/service/ReadCallback.java

cassandra/branches/cassandra-1.0/src/java/org/apache/cassandra/service/StorageProxy.java

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

Propchange: cassandra/branches/cassandra-1.0/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Sep 13 16:05:17 2011
@@ -1,11 +1,11 @@
 
/cassandra/branches/cassandra-0.6:922689-1052356,1052358-1053452,1053454,1053456-1131291
 /cassandra/branches/cassandra-0.7:1026516-1163782,1170147
 /cassandra/branches/cassandra-0.7.0:1053690-1055654
-/cassandra/branches/cassandra-0.8:1090934-1125013,1125019-1166782,1166809,1169823,1170148
+/cassandra/branches/cassandra-0.8:1090934-1125013,1125019-1166782,1166809,1169823,1170148,1170219
 /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-1170025,1170140,1170149,1170184
+/cassandra/branches/cassandra-1.0.0:1167104-1170025,1170140,1170149,1170184,1170220
 /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=1170221r1=1170220r2=1170221view=diff
==
--- cassandra/branches/cassandra-1.0/CHANGES.txt (original)
+++ cassandra/branches/cassandra-1.0/CHANGES.txt Tue Sep 13 16:05:17 2011
@@ -86,6 +86,7 @@
(CASSANDRA-3129)
  * CustomTThreadPoolServer to log TTransportException at DEBUG level
(CASSANDRA-3142)
+ * Randomize choice of first replica for counter increment (CASSANDRA-2890)
 
 
 0.8.5

Propchange: cassandra/branches/cassandra-1.0/contrib/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Sep 13 16:05:17 2011
@@ -1,11 +1,11 @@
 
/cassandra/branches/cassandra-0.6/contrib:922689-1052356,1052358-1053452,1053454,1053456-1068009
 /cassandra/branches/cassandra-0.7/contrib:1026516-1163782,1170147
 /cassandra/branches/cassandra-0.7.0/contrib:1053690-1055654
-/cassandra/branches/cassandra-0.8/contrib:1090934-1125013,1125019-1166782,1166809,1169823,1170148
+/cassandra/branches/cassandra-0.8/contrib:1090934-1125013,1125019-1166782,1166809,1169823,1170148,1170219
 /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-1170025,1170140,1170149,1170184
+/cassandra/branches/cassandra-1.0.0/contrib:1167104-1170025,1170140,1170149,1170184,1170220
 /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 Tue Sep 13 16:05:17 2011
@@ -1,11 +1,11 @@
 
/cassandra/branches/cassandra-0.6/interface/thrift/gen-java/org/apache/cassandra/thrift/Cassandra.java:922689-1052356,1052358-1053452,1053454,1053456-1131291
 
/cassandra/branches/cassandra-0.7/interface/thrift/gen-java/org/apache/cassandra/thrift/Cassandra.java:1026516-1163782,1170147
 

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

2011-09-13 Thread slebresne
Author: slebresne
Date: Tue Sep 13 16:06:48 2011
New Revision: 1170222

URL: http://svn.apache.org/viewvc?rev=1170222view=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/CounterMutation.java
cassandra/trunk/src/java/org/apache/cassandra/db/HintedHandOffManager.java
cassandra/trunk/src/java/org/apache/cassandra/service/ReadCallback.java
cassandra/trunk/src/java/org/apache/cassandra/service/StorageProxy.java
cassandra/trunk/src/java/org/apache/cassandra/utils/FBUtilities.java

Propchange: cassandra/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Sep 13 16:06:48 2011
@@ -1,11 +1,11 @@
 
/cassandra/branches/cassandra-0.6:922689-1052356,1052358-1053452,1053454,1053456-1131291
 /cassandra/branches/cassandra-0.7:1026516-1163782,1170147
 /cassandra/branches/cassandra-0.7.0:1053690-1055654
-/cassandra/branches/cassandra-0.8:1090934-1125013,1125019-1166782,1166809,1169823,1170148
+/cassandra/branches/cassandra-0.8:1090934-1125013,1125019-1166782,1166809,1169823,1170148,1170219
 /cassandra/branches/cassandra-0.8.0:1125021-1130369
 /cassandra/branches/cassandra-0.8.1:1101014-1125018
-/cassandra/branches/cassandra-1.0:1167085-1170026,1170141,1170151,1170185
-/cassandra/branches/cassandra-1.0.0:1167104-1167229,1167232-1170025,1170140,1170149,1170184
+/cassandra/branches/cassandra-1.0:1167085-1170026,1170141,1170151,1170185,1170221
+/cassandra/branches/cassandra-1.0.0:1167104-1167229,1167232-1170025,1170140,1170149,1170184,1170220
 /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=1170222r1=1170221r2=1170222view=diff
==
--- cassandra/trunk/CHANGES.txt (original)
+++ cassandra/trunk/CHANGES.txt Tue Sep 13 16:06:48 2011
@@ -86,6 +86,7 @@
(CASSANDRA-3129)
  * CustomTThreadPoolServer to log TTransportException at DEBUG level
(CASSANDRA-3142)
+ * Randomize choice of first replica for counter increment (CASSANDRA-2890)
 
 
 0.8.5

Propchange: cassandra/trunk/contrib/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Sep 13 16:06:48 2011
@@ -1,11 +1,11 @@
 
/cassandra/branches/cassandra-0.6/contrib:922689-1052356,1052358-1053452,1053454,1053456-1068009
 /cassandra/branches/cassandra-0.7/contrib:1026516-1163782,1170147
 /cassandra/branches/cassandra-0.7.0/contrib:1053690-1055654
-/cassandra/branches/cassandra-0.8/contrib:1090934-1125013,1125019-1166782,1166809,1169823,1170148
+/cassandra/branches/cassandra-0.8/contrib:1090934-1125013,1125019-1166782,1166809,1169823,1170148,1170219
 /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-1170026,1170141,1170151,1170185
-/cassandra/branches/cassandra-1.0.0/contrib:1167104-1167229,1167232-1170025,1170140,1170149,1170184
+/cassandra/branches/cassandra-1.0/contrib:1167085-1170026,1170141,1170151,1170185,1170221
+/cassandra/branches/cassandra-1.0.0/contrib:1167104-1167229,1167232-1170025,1170140,1170149,1170184,1170220
 /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 Tue Sep 13 16:06:48 2011
@@ -1,11 +1,11 @@
 
/cassandra/branches/cassandra-0.6/interface/thrift/gen-java/org/apache/cassandra/thrift/Cassandra.java:922689-1052356,1052358-1053452,1053454,1053456-1131291
 
/cassandra/branches/cassandra-0.7/interface/thrift/gen-java/org/apache/cassandra/thrift/Cassandra.java:1026516-1163782,1170147
 
/cassandra/branches/cassandra-0.7.0/interface/thrift/gen-java/org/apache/cassandra/thrift/Cassandra.java:1053690-1055654

[jira] [Commented] (CASSANDRA-3202) CFMetata.getMergeShardChance returns readRepairChance

2011-09-13 Thread Jonathan Ellis (JIRA)

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

Jonathan Ellis commented on CASSANDRA-3202:
---

+1

 CFMetata.getMergeShardChance returns readRepairChance
 -

 Key: CASSANDRA-3202
 URL: https://issues.apache.org/jira/browse/CASSANDRA-3202
 Project: Cassandra
  Issue Type: Bug
  Components: Core
Affects Versions: 0.8.0
Reporter: Sylvain Lebresne
Priority: Trivial
  Labels: counters
 Fix For: 0.8.6

 Attachments: 3202.patch


 The summary says it all. Note that CASSANDRA-3178 will hopefully make that 
 option useless. But in the meantime, this breaks the tests in 1.0.0 since 
 read repair chance was set to 0.1 by default (while the test assumes 
 merge_shard_chance is 1), so let's fix that quickly.

--
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-13 Thread Eldon Stegall (JIRA)

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

Eldon Stegall updated CASSANDRA-3201:
-

Description: 
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


  was:When a mmap fails, Cassandra should exit. See 
https://wiki.apache.org/cassandra/ArchitectureInternals#line-60


 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




[jira] [Commented] (CASSANDRA-2890) Randomize (to some extend) the choice of the first replica for counter increment

2011-09-13 Thread Hudson (JIRA)

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

Hudson commented on CASSANDRA-2890:
---

Integrated in Cassandra-0.8 #325 (See 
[https://builds.apache.org/job/Cassandra-0.8/325/])
Randomize choice of first replica for counter increments
patch by slebresne; reviewed by jbellis for CASSANDRA-2890

slebresne : 
http://svn.apache.org/viewcvs.cgi/?root=Apache-SVNview=revrev=1170219
Files : 
* /cassandra/branches/cassandra-0.8/CHANGES.txt
* 
/cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/db/CounterMutation.java
* 
/cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/db/HintedHandOffManager.java
* 
/cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/service/ReadCallback.java
* 
/cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/service/StorageProxy.java
* 
/cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/utils/FBUtilities.java


 Randomize (to some extend) the choice of the first replica for counter 
 increment
 

 Key: CASSANDRA-2890
 URL: https://issues.apache.org/jira/browse/CASSANDRA-2890
 Project: Cassandra
  Issue Type: Improvement
  Components: Core
Affects Versions: 0.8.0
Reporter: Sylvain Lebresne
Assignee: Sylvain Lebresne
Priority: Minor
  Labels: counters
 Fix For: 0.8.6

 Attachments: 2890.patch, 2890_v2.patch


 Right now, we choose the first replica for a counter increments based solely 
 on what the snitch returns. If the clients requests are well balanced over 
 the cluster and the snitch not ill configured, this should not be a problem, 
 but this is probably too strong an assumption to make.
 The goal of this ticket is to change this to choose a random replica in the 
 current data center instead.

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




[jira] [Commented] (CASSANDRA-3191) unable to start single node cluster when listen_address is not localhost

2011-09-13 Thread Sylvain Lebresne (JIRA)

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

Sylvain Lebresne commented on CASSANDRA-3191:
-

I could be wrong, but I think that was is happening here is that leaving it 
blank will resolve to the machine address (i.e, not the loopback ip), and thus 
the node doesn't recognize itself as a seed. In a way, it's a configuration 
error, listen_address should be 127.0.0.1. Not sure we can really improve that 
error message, but maybe we can improve the comments in the yaml.

 unable to start single node cluster when listen_address is not localhost
 

 Key: CASSANDRA-3191
 URL: https://issues.apache.org/jira/browse/CASSANDRA-3191
 Project: Cassandra
  Issue Type: Bug
Reporter: T Jake Luciani
 Fix For: 1.0.0


 Due to bootstrap default == true
 {code}
 INFO 20:07:51,839 Joining: waiting for ring and schema information
  INFO 20:08:21,839 Joining: getting bootstrap token
 ERROR 20:08:21,843 Exception encountered during startup.
 java.lang.RuntimeException: No other nodes seen!  Unable to bootstrap
   at 
 org.apache.cassandra.dht.BootStrapper.getBootstrapSource(BootStrapper.java:168)
   at 
 org.apache.cassandra.dht.BootStrapper.getBalancedToken(BootStrapper.java:150)
   at 
 org.apache.cassandra.dht.BootStrapper.getBootstrapToken(BootStrapper.java:145)
   at 
 org.apache.cassandra.service.StorageService.joinTokenRing(StorageService.java:528)
   at 
 org.apache.cassandra.service.StorageService.initServer(StorageService.java:450)
   at 
 org.apache.cassandra.service.StorageService.initServer(StorageService.java:372)
   at 
 org.apache.cassandra.service.AbstractCassandraDaemon.setup(AbstractCassandraDaemon.java:213)
   at 
 org.apache.cassandra.service.AbstractCassandraDaemon.activate(AbstractCassandraDaemon.java:335)
   at 
 org.apache.cassandra.thrift.CassandraDaemon.main(CassandraDaemon.java:106)
 Exception encountered during startup.
 {code}

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




svn commit: r1170236 - in /cassandra/branches/cassandra-0.8: CHANGES.txt src/java/org/apache/cassandra/config/CFMetaData.java

2011-09-13 Thread slebresne
Author: slebresne
Date: Tue Sep 13 17:00:35 2011
New Revision: 1170236

URL: http://svn.apache.org/viewvc?rev=1170236view=rev
Log:
Fix CFMetata.getMergeShardChance returning readRepairChance
patch by slebresne; reviewed by jbellis for CASSANDRA-3202

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

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

Modified: cassandra/branches/cassandra-0.8/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.8/CHANGES.txt?rev=1170236r1=1170235r2=1170236view=diff
==
--- cassandra/branches/cassandra-0.8/CHANGES.txt (original)
+++ cassandra/branches/cassandra-0.8/CHANGES.txt Tue Sep 13 17:00:35 2011
@@ -12,6 +12,7 @@
  * Improve caching of same-version Messages on digest and repair paths
(CASSANDRA-3158)
  * Randomize choice of first replica for counter increment (CASSANDRA-2890)
+ * Fix using read_repair_chance instead of merge_shard_change (CASSANDRA-3202)
 
 
 0.8.5

Modified: 
cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/config/CFMetaData.java
URL: 
http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/config/CFMetaData.java?rev=1170236r1=1170235r2=1170236view=diff
==
--- 
cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/config/CFMetaData.java
 (original)
+++ 
cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/config/CFMetaData.java
 Tue Sep 13 17:00:35 2011
@@ -447,7 +447,7 @@ public final class CFMetaData
 
 public double getMergeShardsChance()
 {
-return readRepairChance;
+return mergeShardsChance;
 }
 
 public boolean getReplicateOnWrite()




svn commit: r1170237 - in /cassandra/branches/cassandra-1.0.0: ./ contrib/ interface/thrift/gen-java/org/apache/cassandra/thrift/ src/java/org/apache/cassandra/config/

2011-09-13 Thread slebresne
Author: slebresne
Date: Tue Sep 13 17:02:06 2011
New Revision: 1170237

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

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

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

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

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

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

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

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

Propchange: cassandra/branches/cassandra-1.0.0/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Sep 13 17:02:06 2011
@@ -1,7 +1,7 @@
 
/cassandra/branches/cassandra-0.6:922689-1052356,1052358-1053452,1053454,1053456-1131291
 /cassandra/branches/cassandra-0.7:1026516-1163782,1170147
 /cassandra/branches/cassandra-0.7.0:1053690-1055654
-/cassandra/branches/cassandra-0.8:1090934-1125013,1125019-1166782,1166809,1169823,1170148,1170219
+/cassandra/branches/cassandra-0.8:1090934-1125013,1125019-1166782,1166809,1169823,1170148,1170219,1170236
 /cassandra/branches/cassandra-0.8.0:1125021-1130369
 /cassandra/branches/cassandra-0.8.1:1101014-1125018
 /cassandra/tags/cassandra-0.7.0-rc3:1051699-1053689

Modified: cassandra/branches/cassandra-1.0.0/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/cassandra/branches/cassandra-1.0.0/CHANGES.txt?rev=1170237r1=1170236r2=1170237view=diff
==
--- cassandra/branches/cassandra-1.0.0/CHANGES.txt (original)
+++ cassandra/branches/cassandra-1.0.0/CHANGES.txt Tue Sep 13 17:02:06 2011
@@ -83,6 +83,7 @@
  * CustomTThreadPoolServer to log TTransportException at DEBUG level
(CASSANDRA-3142)
  * Randomize choice of first replica for counter increment (CASSANDRA-2890)
+ * Fix using read_repair_chance instead of merge_shard_change (CASSANDRA-3202)
 
 
 0.8.5

Propchange: cassandra/branches/cassandra-1.0.0/contrib/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Sep 13 17:02:06 2011
@@ -1,7 +1,7 @@
 
/cassandra/branches/cassandra-0.6/contrib:922689-1052356,1052358-1053452,1053454,1053456-1068009
 /cassandra/branches/cassandra-0.7/contrib:1026516-1163782,1170147
 /cassandra/branches/cassandra-0.7.0/contrib:1053690-1055654
-/cassandra/branches/cassandra-0.8/contrib:1090934-1125013,1125019-1166782,1166809,1169823,1170148,1170219
+/cassandra/branches/cassandra-0.8/contrib:1090934-1125013,1125019-1166782,1166809,1169823,1170148,1170219,1170236
 /cassandra/branches/cassandra-0.8.0/contrib:1125021-1130369
 /cassandra/branches/cassandra-0.8.1/contrib:1101014-1125018
 /cassandra/tags/cassandra-0.7.0-rc3/contrib:1051699-1053689

Propchange: 
cassandra/branches/cassandra-1.0.0/interface/thrift/gen-java/org/apache/cassandra/thrift/Cassandra.java
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Sep 13 17:02:06 2011
@@ -1,7 +1,7 @@
 
/cassandra/branches/cassandra-0.6/interface/thrift/gen-java/org/apache/cassandra/thrift/Cassandra.java:922689-1052356,1052358-1053452,1053454,1053456-1131291
 
/cassandra/branches/cassandra-0.7/interface/thrift/gen-java/org/apache/cassandra/thrift/Cassandra.java:1026516-1163782,1170147
 
/cassandra/branches/cassandra-0.7.0/interface/thrift/gen-java/org/apache/cassandra/thrift/Cassandra.java:1053690-1055654
-/cassandra/branches/cassandra-0.8/interface/thrift/gen-java/org/apache/cassandra/thrift/Cassandra.java:1090934-1125013,1125019-1166782,1166809,1169823,1170148,1170219
+/cassandra/branches/cassandra-0.8/interface/thrift/gen-java/org/apache/cassandra/thrift/Cassandra.java:1090934-1125013,1125019-1166782,1166809,1169823,1170148,1170219,1170236
 
/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/tags/cassandra-0.7.0-rc3/interface/thrift/gen-java/org/apache/cassandra/thrift/Cassandra.java:1051699-1053689

Propchange: 
cassandra/branches/cassandra-1.0.0/interface/thrift/gen-java/org/apache/cassandra/thrift/Column.java

[jira] [Commented] (CASSANDRA-3199) Counter write protocol: have the coordinator (instead of first replica) waits for replica responses directly

2011-09-13 Thread Ryan King (JIRA)

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

Ryan King commented on CASSANDRA-3199:
--

This may be out of scope for this ticket, but can we differentiate between 
exceptions in writing to the first replica and in replicating to the others? 
That might help us do some limited forms of retries with counters.

 Counter write protocol: have the coordinator (instead of first replica) waits 
 for replica responses directly
 

 Key: CASSANDRA-3199
 URL: https://issues.apache.org/jira/browse/CASSANDRA-3199
 Project: Cassandra
  Issue Type: Improvement
  Components: Core
Reporter: Sylvain Lebresne
Priority: Minor
  Labels: counters

 Current counter write protocol is this (where we take the case of write 
 coordinator != first replica):
   # coordinator forward write request to first replica
   # first replica write locally and replicate to other replica
   # first replica waits for enough answers from the other replica to satisfy 
 the consistency level
   # first replica acks the coordinator that completes the write to the client
 This ticket proposes to modify this protocol to:
   # coordinator forward write request to first replica
   # first replica write locally, acks the coordinator for its own write and 
 replicate to other replica
   # other replica respond directly to coordinator
   # once coordinator has enough responses, it completes the write
 I see 2 advantages to this new protocol:
   * it should be at tad faster since it parallelizes wire transfer better
   * it woud make TimeoutException a bit less likely and more importantly, a 
 TimeoutException would much more likely mean that the write hasn't been 
 persisted. Indeed, in the current protocol, once the first replica has send 
 the write to the other replica, it has to wait for the replica answers and 
 answer the coordinator. If it dies during that time, we will return a 
 TimeoutException, even though the first replica died after having done it's 
 main job.
 The cons is that this adds a bit of complexity. In particular, the other 
 replica would have to answer to the coordinator for a query that has been 
 issued by the first replica.

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




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

2011-09-13 Thread slebresne
Author: slebresne
Date: Tue Sep 13 17:07:27 2011
New Revision: 1170244

URL: http://svn.apache.org/viewvc?rev=1170244view=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/config/CFMetaData.java

Propchange: cassandra/branches/cassandra-1.0/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Sep 13 17:07:27 2011
@@ -1,11 +1,11 @@
 
/cassandra/branches/cassandra-0.6:922689-1052356,1052358-1053452,1053454,1053456-1131291
 /cassandra/branches/cassandra-0.7:1026516-1163782,1170147
 /cassandra/branches/cassandra-0.7.0:1053690-1055654
-/cassandra/branches/cassandra-0.8:1090934-1125013,1125019-1166782,1166809,1169823,1170148,1170219
+/cassandra/branches/cassandra-0.8:1090934-1125013,1125019-1166782,1166809,1169823,1170148,1170219,1170236
 /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-1170025,1170140,1170149,1170184,1170220
+/cassandra/branches/cassandra-1.0.0:1167104-1170025,1170140,1170149,1170184,1170220,1170237
 /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=1170244r1=1170243r2=1170244view=diff
==
--- cassandra/branches/cassandra-1.0/CHANGES.txt (original)
+++ cassandra/branches/cassandra-1.0/CHANGES.txt Tue Sep 13 17:07:27 2011
@@ -87,6 +87,7 @@
  * CustomTThreadPoolServer to log TTransportException at DEBUG level
(CASSANDRA-3142)
  * Randomize choice of first replica for counter increment (CASSANDRA-2890)
+ * Fix using read_repair_chance instead of merge_shard_change (CASSANDRA-3202)
 
 
 0.8.5

Propchange: cassandra/branches/cassandra-1.0/contrib/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Sep 13 17:07:27 2011
@@ -1,11 +1,11 @@
 
/cassandra/branches/cassandra-0.6/contrib:922689-1052356,1052358-1053452,1053454,1053456-1068009
 /cassandra/branches/cassandra-0.7/contrib:1026516-1163782,1170147
 /cassandra/branches/cassandra-0.7.0/contrib:1053690-1055654
-/cassandra/branches/cassandra-0.8/contrib:1090934-1125013,1125019-1166782,1166809,1169823,1170148,1170219
+/cassandra/branches/cassandra-0.8/contrib:1090934-1125013,1125019-1166782,1166809,1169823,1170148,1170219,1170236
 /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-1170025,1170140,1170149,1170184,1170220
+/cassandra/branches/cassandra-1.0.0/contrib:1167104-1170025,1170140,1170149,1170184,1170220,1170237
 /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 Tue Sep 13 17:07:27 2011
@@ -1,11 +1,11 @@
 
/cassandra/branches/cassandra-0.6/interface/thrift/gen-java/org/apache/cassandra/thrift/Cassandra.java:922689-1052356,1052358-1053452,1053454,1053456-1131291
 
/cassandra/branches/cassandra-0.7/interface/thrift/gen-java/org/apache/cassandra/thrift/Cassandra.java:1026516-1163782,1170147
 
/cassandra/branches/cassandra-0.7.0/interface/thrift/gen-java/org/apache/cassandra/thrift/Cassandra.java:1053690-1055654
-/cassandra/branches/cassandra-0.8/interface/thrift/gen-java/org/apache/cassandra/thrift/Cassandra.java:1090934-1125013,1125019-1166782,1166809,1169823,1170148,1170219

[jira] [Updated] (CASSANDRA-3191) unable to start single node cluster when listen_address is not localhost

2011-09-13 Thread Jonathan Ellis (JIRA)

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

Jonathan Ellis updated CASSANDRA-3191:
--

Attachment: 3191.txt

Patch to explain the problem and how to solve it in the exception message.
 

 unable to start single node cluster when listen_address is not localhost
 

 Key: CASSANDRA-3191
 URL: https://issues.apache.org/jira/browse/CASSANDRA-3191
 Project: Cassandra
  Issue Type: Bug
Affects Versions: 1.0.0
Reporter: T Jake Luciani
 Fix For: 1.0.0

 Attachments: 3191.txt


 Due to bootstrap default == true
 {code}
 INFO 20:07:51,839 Joining: waiting for ring and schema information
  INFO 20:08:21,839 Joining: getting bootstrap token
 ERROR 20:08:21,843 Exception encountered during startup.
 java.lang.RuntimeException: No other nodes seen!  Unable to bootstrap
   at 
 org.apache.cassandra.dht.BootStrapper.getBootstrapSource(BootStrapper.java:168)
   at 
 org.apache.cassandra.dht.BootStrapper.getBalancedToken(BootStrapper.java:150)
   at 
 org.apache.cassandra.dht.BootStrapper.getBootstrapToken(BootStrapper.java:145)
   at 
 org.apache.cassandra.service.StorageService.joinTokenRing(StorageService.java:528)
   at 
 org.apache.cassandra.service.StorageService.initServer(StorageService.java:450)
   at 
 org.apache.cassandra.service.StorageService.initServer(StorageService.java:372)
   at 
 org.apache.cassandra.service.AbstractCassandraDaemon.setup(AbstractCassandraDaemon.java:213)
   at 
 org.apache.cassandra.service.AbstractCassandraDaemon.activate(AbstractCassandraDaemon.java:335)
   at 
 org.apache.cassandra.thrift.CassandraDaemon.main(CassandraDaemon.java:106)
 Exception encountered during startup.
 {code}

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




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

2011-09-13 Thread slebresne
Author: slebresne
Date: Tue Sep 13 17:09:33 2011
New Revision: 1170246

URL: http://svn.apache.org/viewvc?rev=1170246view=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/config/CFMetaData.java

Propchange: cassandra/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Sep 13 17:09:33 2011
@@ -1,11 +1,11 @@
 
/cassandra/branches/cassandra-0.6:922689-1052356,1052358-1053452,1053454,1053456-1131291
 /cassandra/branches/cassandra-0.7:1026516-1163782,1170147
 /cassandra/branches/cassandra-0.7.0:1053690-1055654
-/cassandra/branches/cassandra-0.8:1090934-1125013,1125019-1166782,1166809,1169823,1170148,1170219
+/cassandra/branches/cassandra-0.8:1090934-1125013,1125019-1166782,1166809,1169823,1170148,1170219,1170236
 /cassandra/branches/cassandra-0.8.0:1125021-1130369
 /cassandra/branches/cassandra-0.8.1:1101014-1125018
-/cassandra/branches/cassandra-1.0:1167085-1170026,1170141,1170151,1170185,1170221
-/cassandra/branches/cassandra-1.0.0:1167104-1167229,1167232-1170025,1170140,1170149,1170184,1170220
+/cassandra/branches/cassandra-1.0:1167085-1170026,1170141,1170151,1170185,1170221,1170244
+/cassandra/branches/cassandra-1.0.0:1167104-1167229,1167232-1170025,1170140,1170149,1170184,1170220,1170237
 /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=1170246r1=1170245r2=1170246view=diff
==
--- cassandra/trunk/CHANGES.txt (original)
+++ cassandra/trunk/CHANGES.txt Tue Sep 13 17:09:33 2011
@@ -87,6 +87,7 @@
  * CustomTThreadPoolServer to log TTransportException at DEBUG level
(CASSANDRA-3142)
  * Randomize choice of first replica for counter increment (CASSANDRA-2890)
+ * Fix using read_repair_chance instead of merge_shard_change (CASSANDRA-3202)
 
 
 0.8.5

Propchange: cassandra/trunk/contrib/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Sep 13 17:09:33 2011
@@ -1,11 +1,11 @@
 
/cassandra/branches/cassandra-0.6/contrib:922689-1052356,1052358-1053452,1053454,1053456-1068009
 /cassandra/branches/cassandra-0.7/contrib:1026516-1163782,1170147
 /cassandra/branches/cassandra-0.7.0/contrib:1053690-1055654
-/cassandra/branches/cassandra-0.8/contrib:1090934-1125013,1125019-1166782,1166809,1169823,1170148,1170219
+/cassandra/branches/cassandra-0.8/contrib:1090934-1125013,1125019-1166782,1166809,1169823,1170148,1170219,1170236
 /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-1170026,1170141,1170151,1170185,1170221
-/cassandra/branches/cassandra-1.0.0/contrib:1167104-1167229,1167232-1170025,1170140,1170149,1170184,1170220
+/cassandra/branches/cassandra-1.0/contrib:1167085-1170026,1170141,1170151,1170185,1170221,1170244
+/cassandra/branches/cassandra-1.0.0/contrib:1167104-1167229,1167232-1170025,1170140,1170149,1170184,1170220,1170237
 /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 Tue Sep 13 17:09:33 2011
@@ -1,11 +1,11 @@
 
/cassandra/branches/cassandra-0.6/interface/thrift/gen-java/org/apache/cassandra/thrift/Cassandra.java:922689-1052356,1052358-1053452,1053454,1053456-1131291
 
/cassandra/branches/cassandra-0.7/interface/thrift/gen-java/org/apache/cassandra/thrift/Cassandra.java:1026516-1163782,1170147
 
/cassandra/branches/cassandra-0.7.0/interface/thrift/gen-java/org/apache/cassandra/thrift/Cassandra.java:1053690-1055654

buildbot success in ASF Buildbot on cassandra-trunk

2011-09-13 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/1660

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

Buildslave for this Build: isis_ubuntu

Build Reason: scheduler
Build Source Stamp: [branch cassandra/trunk] 1170246
Blamelist: slebresne

Build succeeded!

sincerely,
 -The Buildbot



[jira] [Commented] (CASSANDRA-3191) unable to start single node cluster when listen_address is not localhost

2011-09-13 Thread Sylvain Lebresne (JIRA)

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

Sylvain Lebresne commented on CASSANDRA-3191:
-

+1

 unable to start single node cluster when listen_address is not localhost
 

 Key: CASSANDRA-3191
 URL: https://issues.apache.org/jira/browse/CASSANDRA-3191
 Project: Cassandra
  Issue Type: Bug
Affects Versions: 1.0.0
Reporter: T Jake Luciani
 Fix For: 1.0.0

 Attachments: 3191.txt


 Due to bootstrap default == true
 {code}
 INFO 20:07:51,839 Joining: waiting for ring and schema information
  INFO 20:08:21,839 Joining: getting bootstrap token
 ERROR 20:08:21,843 Exception encountered during startup.
 java.lang.RuntimeException: No other nodes seen!  Unable to bootstrap
   at 
 org.apache.cassandra.dht.BootStrapper.getBootstrapSource(BootStrapper.java:168)
   at 
 org.apache.cassandra.dht.BootStrapper.getBalancedToken(BootStrapper.java:150)
   at 
 org.apache.cassandra.dht.BootStrapper.getBootstrapToken(BootStrapper.java:145)
   at 
 org.apache.cassandra.service.StorageService.joinTokenRing(StorageService.java:528)
   at 
 org.apache.cassandra.service.StorageService.initServer(StorageService.java:450)
   at 
 org.apache.cassandra.service.StorageService.initServer(StorageService.java:372)
   at 
 org.apache.cassandra.service.AbstractCassandraDaemon.setup(AbstractCassandraDaemon.java:213)
   at 
 org.apache.cassandra.service.AbstractCassandraDaemon.activate(AbstractCassandraDaemon.java:335)
   at 
 org.apache.cassandra.thrift.CassandraDaemon.main(CassandraDaemon.java:106)
 Exception encountered during startup.
 {code}

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




[jira] [Commented] (CASSANDRA-3194) repair streaming forwarding loop

2011-09-13 Thread Brandon Williams (JIRA)

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

Brandon Williams commented on CASSANDRA-3194:
-

+1

 repair streaming forwarding loop
 

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

 Attachments: 3194.patch


 I am able to reproduce what appears to be a streaming forwarding loop when 
 running repairs.  This affect only nodes using broadcast_address (ec2 
 external ip)  listen_address of 0.0.0.0. (Configuration is using property 
 file snitch in a multi DC NTS where some DC's are EC2 and others are not).  
 The hosts in the other dc's not using broadcast_address do not experience 
 this symptom.
 on ec2 host dc1host1:
 INFO [AntiEntropyStage:1] 2011-09-13 06:34:01,673 StreamingRepairTask.java 
 (line 211) [streaming task #ce793c30-ddd1-11e0--071a4b76fefb] Received 
 task from /0.0.0.0 to stream 12259 ranges to /external.ec2.ip.dc1host3
  INFO [AntiEntropyStage:1] 2011-09-13 06:34:01,673 StreamingRepairTask.java 
 (line 136) [streaming task #ce793c30-ddd1-11e0--071a4b76fefb] Forwarding 
 streaming repair of 12259 ranges to /external.ec2.ip.of.dc1host1 (to be 
 streamed with /external.ip.of.host3)
 The above appears to trigger another streaming task and results in saturating 
 the network interfaces dc1host1.  The above log entries are repeated until 
 cassandra is killed.

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




[jira] [Commented] (CASSANDRA-3202) CFMetata.getMergeShardChance returns readRepairChance

2011-09-13 Thread Hudson (JIRA)

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

Hudson commented on CASSANDRA-3202:
---

Integrated in Cassandra-0.8 #326 (See 
[https://builds.apache.org/job/Cassandra-0.8/326/])
Fix CFMetata.getMergeShardChance returning readRepairChance
patch by slebresne; reviewed by jbellis for CASSANDRA-3202

slebresne : 
http://svn.apache.org/viewcvs.cgi/?root=Apache-SVNview=revrev=1170236
Files : 
* /cassandra/branches/cassandra-0.8/CHANGES.txt
* 
/cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/config/CFMetaData.java


 CFMetata.getMergeShardChance returns readRepairChance
 -

 Key: CASSANDRA-3202
 URL: https://issues.apache.org/jira/browse/CASSANDRA-3202
 Project: Cassandra
  Issue Type: Bug
  Components: Core
Affects Versions: 0.8.0
Reporter: Sylvain Lebresne
Priority: Trivial
  Labels: counters
 Fix For: 0.8.6

 Attachments: 3202.patch


 The summary says it all. Note that CASSANDRA-3178 will hopefully make that 
 option useless. But in the meantime, this breaks the tests in 1.0.0 since 
 read repair chance was set to 0.1 by default (while the test assumes 
 merge_shard_chance is 1), so let's fix that quickly.

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




[jira] [Commented] (CASSANDRA-3188) cqlsh 2.0

2011-09-13 Thread paul cannon (JIRA)

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

paul cannon commented on CASSANDRA-3188:


For the sake of the potential set of features, I'd lean heavily toward Python 
on this one: much more easily integrated with readline (when available) and 
curses-type capabilities in general, plus more flexible/powerful in parsing 
input, formatting output, and responding to error situations.

Would it address the concerns of CASSANDRA-3010 if we built the Windows 
releases with py2exe or something like it? You'd just get a clicky or 
command-line executable, no manual Python or Thrift installing to worry about.

..On the other hand, cassandra-cli uses JMX for a few of its cluster-inspection 
duties; are those things that might be important in cqlsh 2.0? Guess I should 
find out what they are.

 cqlsh 2.0
 -

 Key: CASSANDRA-3188
 URL: https://issues.apache.org/jira/browse/CASSANDRA-3188
 Project: Cassandra
  Issue Type: Improvement
Reporter: Jonathan Ellis
Assignee: paul cannon
 Fix For: 1.0.1


 I'd like to see some improvements to cqlsh to bring it to feature parity w/ 
 the old cli:
 - describe [KS | CF | cluster | schema]
 - assume
 - connect / don't crap out w/ stacktrace if C* isn't currently running on 
 localhost
 - help
 It may be easier to do this by forking the cli and replacing its one-off api 
 with CQL, or it may be easier to add these features to cqlsh.
 Either is fine, but if it's a close call my inclination would be to build it 
 in Java for the reasoning over on CASSANDRA-3010.

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




svn commit: r1170257 - in /cassandra/branches/cassandra-1.0.0: conf/cassandra.yaml src/java/org/apache/cassandra/dht/BootStrapper.java src/java/org/apache/cassandra/service/AbstractCassandraDaemon.jav

2011-09-13 Thread jbellis
Author: jbellis
Date: Tue Sep 13 17:29:56 2011
New Revision: 1170257

URL: http://svn.apache.org/viewvc?rev=1170257view=rev
Log:
clarify No other nodes seen!  Unable to bootstrap error message
patch by jbellis; reviewed by slebresne for CASSANDRA-3191

Modified:
cassandra/branches/cassandra-1.0.0/conf/cassandra.yaml

cassandra/branches/cassandra-1.0.0/src/java/org/apache/cassandra/dht/BootStrapper.java

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

Modified: cassandra/branches/cassandra-1.0.0/conf/cassandra.yaml
URL: 
http://svn.apache.org/viewvc/cassandra/branches/cassandra-1.0.0/conf/cassandra.yaml?rev=1170257r1=1170256r2=1170257view=diff
==
--- cassandra/branches/cassandra-1.0.0/conf/cassandra.yaml (original)
+++ cassandra/branches/cassandra-1.0.0/conf/cassandra.yaml Tue Sep 13 17:29:56 
2011
@@ -84,8 +84,8 @@ saved_caches_directory: /var/lib/cassand
 commitlog_sync: periodic
 commitlog_sync_period_in_ms: 1
 
-# any class that implements the SeedProvider interface and has a constructor 
that takes a MapString, String of
-# parameters will do.
+# any class that implements the SeedProvider interface and has a
+# constructor that takes a MapString, String of parameters will do.
 seed_provider:
 # Addresses of hosts that are deemed contact points. 
 # Cassandra nodes use this list of hosts to find each other and learn

Modified: 
cassandra/branches/cassandra-1.0.0/src/java/org/apache/cassandra/dht/BootStrapper.java
URL: 
http://svn.apache.org/viewvc/cassandra/branches/cassandra-1.0.0/src/java/org/apache/cassandra/dht/BootStrapper.java?rev=1170257r1=1170256r2=1170257view=diff
==
--- 
cassandra/branches/cassandra-1.0.0/src/java/org/apache/cassandra/dht/BootStrapper.java
 (original)
+++ 
cassandra/branches/cassandra-1.0.0/src/java/org/apache/cassandra/dht/BootStrapper.java
 Tue Sep 13 17:29:56 2011
@@ -165,7 +165,12 @@ public class BootStrapper
 }
 
 if (endpoints.isEmpty())
-throw new RuntimeException(No other nodes seen!  Unable to 
bootstrap);
+throw new RuntimeException(No other nodes seen!  Unable to 
bootstrap.
+   + If you intended to start a 
single-node cluster, you should make sure 
+   + your broadcast_address (or 
listen_address) is listed as a seed.  
+   + Otherwise, you need to determine why 
the seed being contacted 
+   + has no knowledge of the rest of the 
cluster.  Usually, this can be solved 
+   + by giving all nodes the same seed 
list.);
 Collections.sort(endpoints, new ComparatorInetAddress()
 {
 public int compare(InetAddress ia1, InetAddress ia2)

Modified: 
cassandra/branches/cassandra-1.0.0/src/java/org/apache/cassandra/service/AbstractCassandraDaemon.java
URL: 
http://svn.apache.org/viewvc/cassandra/branches/cassandra-1.0.0/src/java/org/apache/cassandra/service/AbstractCassandraDaemon.java?rev=1170257r1=1170256r2=1170257view=diff
==
--- 
cassandra/branches/cassandra-1.0.0/src/java/org/apache/cassandra/service/AbstractCassandraDaemon.java
 (original)
+++ 
cassandra/branches/cassandra-1.0.0/src/java/org/apache/cassandra/service/AbstractCassandraDaemon.java
 Tue Sep 13 17:29:56 2011
@@ -346,15 +346,15 @@ public abstract class AbstractCassandraD
 }
 
 start();
-} catch (Throwable e)
+}
+catch (Throwable e)
 {
-String msg = Exception encountered during startup.;
-logger.error(msg, e);
+logger.error(Exception encountered during startup, e);
 
 // try to warn user on stdout too, if we haven't already detached
-System.out.println(msg);
 e.printStackTrace();
-
+System.out.println(Exception encountered during startup:  + 
e.getMessage());
+
 System.exit(3);
 }
 }




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

2011-09-13 Thread slebresne
Author: slebresne
Date: Tue Sep 13 17:34:08 2011
New Revision: 1170264

URL: http://svn.apache.org/viewvc?rev=1170264view=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/streaming/StreamingRepairTask.java

Propchange: cassandra/branches/cassandra-1.0/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Sep 13 17:34:08 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-1170025,1170140,1170149,1170184,1170220,1170237
+/cassandra/branches/cassandra-1.0.0:1167104-1170025,1170140,1170149,1170184,1170220,1170237,1170262
 /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=1170264r1=1170263r2=1170264view=diff
==
--- cassandra/branches/cassandra-1.0/CHANGES.txt (original)
+++ cassandra/branches/cassandra-1.0/CHANGES.txt Tue Sep 13 17:34:08 2011
@@ -58,7 +58,7 @@
  * generate hints for replicas that timeout, not just replicas that are known
to be down before starting (CASSANDRA-2034)
  * Add throttling for internode streaming (CASSANDRA-3080)
- * make the repair of a range repair all replica (CASSANDRA-2610)
+ * make the repair of a range repair all replica (CASSANDRA-2610, 3194)
  * expose the ability to repair the first range (as returned by the
partitioner) of a node (CASSANDRA-2606)
  * Streams Compression (CASSANDRA-3015)

Propchange: cassandra/branches/cassandra-1.0/contrib/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Sep 13 17:34:08 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-1170025,1170140,1170149,1170184,1170220,1170237
+/cassandra/branches/cassandra-1.0.0/contrib:1167104-1170025,1170140,1170149,1170184,1170220,1170237,1170262
 /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 Tue Sep 13 17:34:08 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-1170025,1170140,1170149,1170184,1170220,1170237
+/cassandra/branches/cassandra-1.0.0/interface/thrift/gen-java/org/apache/cassandra/thrift/Cassandra.java:1167104-1170025,1170140,1170149,1170184,1170220,1170237,1170262
 
/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

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

2011-09-13 Thread Jonathan Ellis (JIRA)

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

Jonathan Ellis updated CASSANDRA-3179:
--

Attachment: 3179-performance-test.txt

rebased performance-test

 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: Sylvain Lebresne
 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_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] [Updated] (CASSANDRA-3179) JVM segfaults

2011-09-13 Thread Jonathan Ellis (JIRA)

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

Jonathan Ellis updated CASSANDRA-3179:
--

Attachment: (was: 3179-performance-test.txt)

 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: Sylvain Lebresne
 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_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




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

2011-09-13 Thread slebresne
Author: slebresne
Date: Tue Sep 13 17:35:35 2011
New Revision: 1170265

URL: http://svn.apache.org/viewvc?rev=1170265view=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/streaming/StreamingRepairTask.java

Propchange: cassandra/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Sep 13 17:35:35 2011
@@ -4,8 +4,8 @@
 
/cassandra/branches/cassandra-0.8:1090934-1125013,1125019-1166782,1166809,1169823,1170148,1170219,1170236
 /cassandra/branches/cassandra-0.8.0:1125021-1130369
 /cassandra/branches/cassandra-0.8.1:1101014-1125018
-/cassandra/branches/cassandra-1.0:1167085-1170026,1170141,1170151,1170185,1170221,1170244
-/cassandra/branches/cassandra-1.0.0:1167104-1167229,1167232-1170025,1170140,1170149,1170184,1170220,1170237
+/cassandra/branches/cassandra-1.0:1167085-1170026,1170141,1170151,1170185,1170221,1170244,1170264
+/cassandra/branches/cassandra-1.0.0:1167104-1167229,1167232-1170025,1170140,1170149,1170184,1170220,1170237,1170262
 /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=1170265r1=1170264r2=1170265view=diff
==
--- cassandra/trunk/CHANGES.txt (original)
+++ cassandra/trunk/CHANGES.txt Tue Sep 13 17:35:35 2011
@@ -58,7 +58,7 @@
  * generate hints for replicas that timeout, not just replicas that are known
to be down before starting (CASSANDRA-2034)
  * Add throttling for internode streaming (CASSANDRA-3080)
- * make the repair of a range repair all replica (CASSANDRA-2610)
+ * make the repair of a range repair all replica (CASSANDRA-2610, 3194)
  * expose the ability to repair the first range (as returned by the
partitioner) of a node (CASSANDRA-2606)
  * Streams Compression (CASSANDRA-3015)

Propchange: cassandra/trunk/contrib/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Sep 13 17:35:35 2011
@@ -4,8 +4,8 @@
 
/cassandra/branches/cassandra-0.8/contrib:1090934-1125013,1125019-1166782,1166809,1169823,1170148,1170219,1170236
 /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-1170026,1170141,1170151,1170185,1170221,1170244
-/cassandra/branches/cassandra-1.0.0/contrib:1167104-1167229,1167232-1170025,1170140,1170149,1170184,1170220,1170237
+/cassandra/branches/cassandra-1.0/contrib:1167085-1170026,1170141,1170151,1170185,1170221,1170244,1170264
+/cassandra/branches/cassandra-1.0.0/contrib:1167104-1167229,1167232-1170025,1170140,1170149,1170184,1170220,1170237,1170262
 /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 Tue Sep 13 17:35:35 2011
@@ -4,8 +4,8 @@
 
/cassandra/branches/cassandra-0.8/interface/thrift/gen-java/org/apache/cassandra/thrift/Cassandra.java:1090934-1125013,1125019-1166782,1166809,1169823,1170148,1170219,1170236
 
/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-1170026,1170141,1170151,1170185,1170221,1170244
-/cassandra/branches/cassandra-1.0.0/interface/thrift/gen-java/org/apache/cassandra/thrift/Cassandra.java:1167104-1167229,1167232-1170025,1170140,1170149,1170184,1170220,1170237

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

2011-09-13 Thread Sylvain Lebresne (JIRA)

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

Sylvain Lebresne commented on CASSANDRA-3181:
-

What is unclear is what did stop the compactions from happening ? Because 
Brandon said that restarting didn't helped, but I get from that that compaction 
stopped before the restart. Basically, if the only thing that happened is 
after a restart, if you don't do any inserts, no compaction happens, then ok, 
that's not a big deal. But if it is indeed that Compaction just stops running 
at some point, then there is something that we need to fix.

 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: Benjamin Coverston
 Fix For: 1.0.0


 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] [Updated] (CASSANDRA-3179) JVM segfaults

2011-09-13 Thread Jonathan Ellis (JIRA)

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

Jonathan Ellis updated CASSANDRA-3179:
--

Attachment: (was: 3179-performance-test.txt)

 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: Sylvain Lebresne
 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_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] [Updated] (CASSANDRA-3179) JVM segfaults

2011-09-13 Thread Jonathan Ellis (JIRA)

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

Jonathan Ellis updated CASSANDRA-3179:
--

Attachment: 3179-performance-test.txt

 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: Sylvain Lebresne
 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_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-3164) GCInspector still not avoiding divide by zero

2011-09-13 Thread Sylvain Lebresne (JIRA)

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

Sylvain Lebresne commented on CASSANDRA-3164:
-

+1

 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




svn commit: r1170284 [1/3] - in /cassandra/branches/cassandra-0.8: ./ interface/ interface/thrift/gen-java/org/apache/cassandra/thrift/ src/java/org/apache/cassandra/service/ src/java/org/apache/cassa

2011-09-13 Thread brandonwilliams
Author: brandonwilliams
Date: Tue Sep 13 18:22:45 2011
New Revision: 1170284

URL: http://svn.apache.org/viewvc?rev=1170284view=rev
Log:
Return both listen_address and rpc_address through describe_ring.
Patch by Nick Bailey, reviewed by brandonwilliams for CASSANDRA-3187

Modified:
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

Modified: cassandra/branches/cassandra-0.8/NEWS.txt
URL: 
http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.8/NEWS.txt?rev=1170284r1=1170283r2=1170284view=diff
==
--- cassandra/branches/cassandra-0.8/NEWS.txt (original)
+++ cassandra/branches/cassandra-0.8/NEWS.txt Tue Sep 13 18:22:45 2011
@@ -1,3 +1,10 @@
+0.8.6
+=
+
+Features
+
+- describe_ring now returns both the listen_address and rpc_address
+
 0.8.5
 =
 

Modified: cassandra/branches/cassandra-0.8/interface/cassandra.thrift
URL: 
http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.8/interface/cassandra.thrift?rev=1170284r1=1170283r2=1170284view=diff
==
--- cassandra/branches/cassandra-0.8/interface/cassandra.thrift (original)
+++ cassandra/branches/cassandra-0.8/interface/cassandra.thrift Tue Sep 13 
18:22:45 2011

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

2011-09-13 Thread Jonathan Ellis (JIRA)

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

Jonathan Ellis updated CASSANDRA-3041:
--

Reviewer: jbellis  (was: thepaul)
Priority: Minor  (was: Major)
Assignee: Nick Bailey

 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-3181) Compaction fails to occur

2011-09-13 Thread Benjamin Coverston (JIRA)

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

Benjamin Coverston commented on CASSANDRA-3181:
---

From his repro I was able to get compactions going again with a simple 
write/flush.

From Brandon, he's not sure how compactions stopped. There are only two 
scenarios where I see compactions stopping like this with the tiered 
compaction strategy:

# the server was restarted
# a compaction failed unexpectedly

The fact that there were no errors in the log makes #2 unlikely. I'm pretty 
sure that we're just looking at a problem where a server restarts and there is 
no more activity triggering a flush.

 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: Benjamin Coverston
 Fix For: 1.0.0


 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] [Updated] (CASSANDRA-3041) Move streams data to too many nodes.

2011-09-13 Thread Jonathan Ellis (JIRA)

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

Jonathan Ellis updated CASSANDRA-3041:
--

Attachment: 3041-v2.txt

v2 uses Sets.difference instead of removeAll

 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
 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-3041) Move streams data to too many nodes.

2011-09-13 Thread Jonathan Ellis (JIRA)

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

Jonathan Ellis commented on CASSANDRA-3041:
---

From IRC:

{quote}
nickmbailey: new patch looks fine, the news.txt update should say move/decomm 
though
{quote}

 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




svn commit: r1170306 - in /cassandra/branches/cassandra-0.8: CHANGES.txt src/java/org/apache/cassandra/service/StorageService.java

2011-09-13 Thread jbellis
Author: jbellis
Date: Tue Sep 13 19:22:05 2011
New Revision: 1170306

URL: http://svn.apache.org/viewvc?rev=1170306view=rev
Log:
Avoid streaming data to nodes that already have it, on move as well as 
decommission
patch by Nick Bailey and jbellis for CASSANDRA-3041

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

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

Modified: cassandra/branches/cassandra-0.8/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.8/CHANGES.txt?rev=1170306r1=1170305r2=1170306view=diff
==
--- cassandra/branches/cassandra-0.8/CHANGES.txt (original)
+++ cassandra/branches/cassandra-0.8/CHANGES.txt Tue Sep 13 19:22:05 2011
@@ -13,6 +13,8 @@
(CASSANDRA-3158)
  * Randomize choice of first replica for counter increment (CASSANDRA-2890)
  * Fix using read_repair_chance instead of merge_shard_change (CASSANDRA-3202)
+ * Avoid streaming data to nodes that already have it, on move as well as
+   decommission (CASSANDRA-3041)
 
 
 0.8.5

Modified: 
cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/service/StorageService.java
URL: 
http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/service/StorageService.java?rev=1170306r1=1170305r2=1170306view=diff
==
--- 
cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/service/StorageService.java
 (original)
+++ 
cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/service/StorageService.java
 Tue Sep 13 19:22:05 2011
@@ -30,9 +30,7 @@ import java.util.concurrent.*;
 import javax.management.MBeanServer;
 import javax.management.ObjectName;
 
-import com.google.common.collect.ArrayListMultimap;
-import com.google.common.collect.HashMultimap;
-import com.google.common.collect.Multimap;
+import com.google.common.collect.*;
 import org.apache.log4j.Level;
 import org.apache.commons.lang.StringUtils;
 import org.slf4j.Logger;
@@ -46,6 +44,7 @@ import org.apache.cassandra.config.Confi
 import org.apache.cassandra.config.DatabaseDescriptor;
 import org.apache.cassandra.config.KSMetaData;
 import org.apache.cassandra.db.*;
+import org.apache.cassandra.db.Table;
 import org.apache.cassandra.db.commitlog.CommitLog;
 import org.apache.cassandra.dht.*;
 import org.apache.cassandra.gms.*;
@@ -1049,10 +1048,9 @@ public class StorageService implements I
 // all leaving nodes are gone.
 for (Range range : affectedRanges)
 {
-CollectionInetAddress currentEndpoints = 
strategy.calculateNaturalEndpoints(range.right, tm);
-CollectionInetAddress newEndpoints = 
strategy.calculateNaturalEndpoints(range.right, allLeftMetadata);
-newEndpoints.removeAll(currentEndpoints);
-pendingRanges.putAll(range, newEndpoints);
+SetInetAddress currentEndpoints = 
ImmutableSet.copyOf(strategy.calculateNaturalEndpoints(range.right, tm));
+SetInetAddress newEndpoints = 
ImmutableSet.copyOf(strategy.calculateNaturalEndpoints(range.right, 
allLeftMetadata));
+pendingRanges.putAll(range, Sets.difference(newEndpoints, 
currentEndpoints));
 }
 
 // At this stage pendingRanges has been updated according to leave 
operations. We can
@@ -2025,8 +2023,9 @@ public class StorageService implements I
 
 for (Range toStream : rangesPerTable.left)
 {
-ListInetAddress endpoints = 
strategy.calculateNaturalEndpoints(toStream.right, tokenMetaClone);
-rangeWithEndpoints.putAll(toStream, endpoints);
+SetInetAddress currentEndpoints = 
ImmutableSet.copyOf(strategy.calculateNaturalEndpoints(toStream.right, 
tokenMetadata_));
+SetInetAddress newEndpoints = 
ImmutableSet.copyOf(strategy.calculateNaturalEndpoints(toStream.right, 
tokenMetaClone));
+rangeWithEndpoints.putAll(toStream, 
Sets.difference(newEndpoints, currentEndpoints));
 }
 
 // associating table with range-to-endpoints map




svn commit: r1170308 - /cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/service/GCInspector.java

2011-09-13 Thread jbellis
Author: jbellis
Date: Tue Sep 13 19:24:15 2011
New Revision: 1170308

URL: http://svn.apache.org/viewvc?rev=1170308view=rev
Log:
Fix divide by zero error in GCInspector
patch by jbellis; reviewed by slebresne for CASSANDRA-3164

Modified:

cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/service/GCInspector.java

Modified: 
cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/service/GCInspector.java
URL: 
http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/service/GCInspector.java?rev=1170308r1=1170307r2=1170308view=diff
==
--- 
cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/service/GCInspector.java
 (original)
+++ 
cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/service/GCInspector.java
 Tue Sep 13 19:24:15 2011
@@ -106,7 +106,7 @@ public class GCInspector
 
 if (previousCount == null)
 previousCount = 0L;   
-if (count == previousCount)
+if (count.equals(previousCount))
 continue;
 
 gccounts.put(gc.getName(), count);




svn commit: r1170309 - /cassandra/branches/cassandra-0.7/CHANGES.txt

2011-09-13 Thread jbellis
Author: jbellis
Date: Tue Sep 13 19:25:44 2011
New Revision: 1170309

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

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

Modified: cassandra/branches/cassandra-0.7/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.7/CHANGES.txt?rev=1170309r1=1170308r2=1170309view=diff
==
--- cassandra/branches/cassandra-0.7/CHANGES.txt (original)
+++ cassandra/branches/cassandra-0.7/CHANGES.txt Tue Sep 13 19:25:44 2011
@@ -1,3 +1,7 @@
+0.7.10
+ * Fix divide by zero error in GCInspector (CASSANDRA-3164)
+
+
 0.7.9
  * don't include tmp files as sstable when create cfs (CASSANDRA-2929)
  * log Java classpath on startup (CASSANDRA-2895)




[jira] [Updated] (CASSANDRA-3025) PHP/PDO driver for Cassandra CQL

2011-09-13 Thread Mikko Koppanen (JIRA)

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

Mikko Koppanen updated CASSANDRA-3025:
--

Attachment: pdo_cassandra-0.2.0.tgz

Attaching latest version. 

- Switched to Cassandra 1.x branch and dropped support for 0.8.x.
- Fixed tests to new Cassandra types
- Use the new schema information returned with CqlResults

 PHP/PDO driver for Cassandra CQL
 

 Key: CASSANDRA-3025
 URL: https://issues.apache.org/jira/browse/CASSANDRA-3025
 Project: Cassandra
  Issue Type: New Feature
  Components: API
Reporter: Mikko Koppanen
  Labels: php
 Attachments: pdo_cassandra-0.1.0.tgz, pdo_cassandra-0.1.1.tgz, 
 pdo_cassandra-0.1.2.tgz, pdo_cassandra-0.1.3.tgz, pdo_cassandra-0.2.0.tgz, 
 php_test_results_20110818_2317.txt


 Hello,
 attached is the initial version of the PDO driver for Cassandra CQL language. 
 This is a native PHP extension written in what I would call a combination of 
 C and C++, due to PHP being C. The thrift API used is the C++.
 The API looks roughly following:
 {code}
 ?php
 $db = new PDO('cassandra:host=127.0.0.1;port=9160');
 $db-exec (CREATE KEYSPACE mytest with strategy_class = 'SimpleStrategy' and 
 strategy_options:replication_factor=1;);
 $db-exec (USE mytest);
 $db-exec (CREATE COLUMNFAMILY users (
   my_key varchar PRIMARY KEY,
   full_name varchar ););
   
 $stmt = $db-prepare (INSERT INTO users (my_key, full_name) VALUES (:key, 
 :full_name););
 $stmt-execute (array (':key' = 'mikko', ':full_name' = 'Mikko K' ));
 {code}
 Currently prepared statements are emulated on the client side but I 
 understand that there is a plan to add prepared statements to Cassandra CQL 
 API as well. I will add this feature in to the extension as soon as they are 
 implemented.
 Additional documentation can be found in github 
 https://github.com/mkoppanen/php-pdo_cassandra, in the form of rendered 
 MarkDown file. Tests are currently not included in the package file and they 
 can be found in the github for now as well.
 I have created documentation in docbook format as well, but have not yet 
 rendered it.
 Comments and feedback are welcome.
 Thanks,
 Mikko

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




svn commit: r1170310 - in /cassandra/branches/cassandra-0.8: ./ contrib/ interface/thrift/gen-java/org/apache/cassandra/thrift/ src/java/org/apache/cassandra/service/

2011-09-13 Thread jbellis
Author: jbellis
Date: Tue Sep 13 19:27:25 2011
New Revision: 1170310

URL: http://svn.apache.org/viewvc?rev=1170310view=rev
Log:
merge #3164 from 0.7

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

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

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

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

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

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

cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/service/GCInspector.java

Propchange: cassandra/branches/cassandra-0.8/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Sep 13 19:27:25 2011
@@ -1,5 +1,5 @@
 
/cassandra/branches/cassandra-0.6:922689-1052356,1052358-1053452,1053454,1053456-1131291
-/cassandra/branches/cassandra-0.7:1026516-1163782,1170147
+/cassandra/branches/cassandra-0.7:1026516-1170309
 /cassandra/branches/cassandra-0.7.0:1053690-1055654
 /cassandra/branches/cassandra-0.8:1090934-1125013,1125041
 /cassandra/branches/cassandra-0.8.0:1125021-1130369

Modified: cassandra/branches/cassandra-0.8/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.8/CHANGES.txt?rev=1170310r1=1170309r2=1170310view=diff
==
--- cassandra/branches/cassandra-0.8/CHANGES.txt (original)
+++ cassandra/branches/cassandra-0.8/CHANGES.txt Tue Sep 13 19:27:25 2011
@@ -15,6 +15,7 @@
  * Fix using read_repair_chance instead of merge_shard_change (CASSANDRA-3202)
  * Avoid streaming data to nodes that already have it, on move as well as
decommission (CASSANDRA-3041)
+ * Fix divide by zero error in GCInspector
 
 
 0.8.5

Propchange: cassandra/branches/cassandra-0.8/contrib/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Sep 13 19:27:25 2011
@@ -1,5 +1,5 @@
 
/cassandra/branches/cassandra-0.6/contrib:922689-1052356,1052358-1053452,1053454,1053456-1068009
-/cassandra/branches/cassandra-0.7/contrib:1026516-1163782,1170147
+/cassandra/branches/cassandra-0.7/contrib:1026516-1170309
 /cassandra/branches/cassandra-0.7.0/contrib:1053690-1055654
 /cassandra/branches/cassandra-0.8/contrib:1090934-1125013,1125041
 /cassandra/branches/cassandra-0.8.0/contrib:1125021-1130369

Propchange: 
cassandra/branches/cassandra-0.8/interface/thrift/gen-java/org/apache/cassandra/thrift/Cassandra.java
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Sep 13 19:27:25 2011
@@ -1,5 +1,5 @@
 
/cassandra/branches/cassandra-0.6/interface/thrift/gen-java/org/apache/cassandra/thrift/Cassandra.java:922689-1052356,1052358-1053452,1053454,1053456-1131291
-/cassandra/branches/cassandra-0.7/interface/thrift/gen-java/org/apache/cassandra/thrift/Cassandra.java:1026516-1163782,1170147
+/cassandra/branches/cassandra-0.7/interface/thrift/gen-java/org/apache/cassandra/thrift/Cassandra.java:1026516-1170309
 
/cassandra/branches/cassandra-0.7.0/interface/thrift/gen-java/org/apache/cassandra/thrift/Cassandra.java:1053690-1055654
 
/cassandra/branches/cassandra-0.8/interface/thrift/gen-java/org/apache/cassandra/thrift/Cassandra.java:1090934-1125013,1125041
 
/cassandra/branches/cassandra-0.8.0/interface/thrift/gen-java/org/apache/cassandra/thrift/Cassandra.java:1125021-1130369

Propchange: 
cassandra/branches/cassandra-0.8/interface/thrift/gen-java/org/apache/cassandra/thrift/Column.java
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Sep 13 19:27:25 2011
@@ -1,5 +1,5 @@
 
/cassandra/branches/cassandra-0.6/interface/thrift/gen-java/org/apache/cassandra/thrift/Column.java:922689-1052356,1052358-1053452,1053454,1053456-1131291
-/cassandra/branches/cassandra-0.7/interface/thrift/gen-java/org/apache/cassandra/thrift/Column.java:1026516-1163782,1170147
+/cassandra/branches/cassandra-0.7/interface/thrift/gen-java/org/apache/cassandra/thrift/Column.java:1026516-1170309
 
/cassandra/branches/cassandra-0.7.0/interface/thrift/gen-java/org/apache/cassandra/thrift/Column.java:1053690-1055654
 
/cassandra/branches/cassandra-0.8/interface/thrift/gen-java/org/apache/cassandra/thrift/Column.java:1090934-1125013,1125041
 

svn commit: r1170313 - /cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/net/IncomingTcpConnection.java

2011-09-13 Thread jbellis
Author: jbellis
Date: Tue Sep 13 19:31:20 2011
New Revision: 1170313

URL: http://svn.apache.org/viewvc?rev=1170313view=rev
Log:
r/m redundant log message

Modified:

cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/net/IncomingTcpConnection.java

Modified: 
cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/net/IncomingTcpConnection.java
URL: 
http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/net/IncomingTcpConnection.java?rev=1170313r1=1170312r2=1170313view=diff
==
--- 
cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/net/IncomingTcpConnection.java
 (original)
+++ 
cassandra/branches/cassandra-0.8/src/java/org/apache/cassandra/net/IncomingTcpConnection.java
 Tue Sep 13 19:31:20 2011
@@ -80,7 +80,6 @@ public class IncomingTcpConnection exten
 return;
 }
 
-logger.debug(version is {}, version);
 if (version  MessagingService.version_)
 {
 // save the endpoint so gossip will reconnect to it




svn commit: r1170316 - in /cassandra/branches/cassandra-0.8/interface: cassandra.thrift thrift/gen-java/org/apache/cassandra/thrift/Cassandra.java thrift/gen-java/org/apache/cassandra/thrift/Constants

2011-09-13 Thread jbellis
Author: jbellis
Date: Tue Sep 13 19:36:00 2011
New Revision: 1170316

URL: http://svn.apache.org/viewvc?rev=1170316view=rev
Log:
increment thrift VERSION for #1777 / #3187

Modified:
cassandra/branches/cassandra-0.8/interface/cassandra.thrift

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/Constants.java

Modified: cassandra/branches/cassandra-0.8/interface/cassandra.thrift
URL: 
http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.8/interface/cassandra.thrift?rev=1170316r1=1170315r2=1170316view=diff
==
--- cassandra/branches/cassandra-0.8/interface/cassandra.thrift (original)
+++ cassandra/branches/cassandra-0.8/interface/cassandra.thrift Tue Sep 13 
19:36:00 2011
@@ -46,7 +46,7 @@ namespace rb CassandraThrift
 #   for every edit that doesn't result in a change to major/minor.
 #
 # See the Semantic Versioning Specification (SemVer) http://semver.org.
-const string VERSION = 19.10.0
+const string VERSION = 19.16.0
 
 
 #

Modified: 
cassandra/branches/cassandra-0.8/interface/thrift/gen-java/org/apache/cassandra/thrift/Cassandra.java
URL: 
http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.8/interface/thrift/gen-java/org/apache/cassandra/thrift/Cassandra.java?rev=1170316r1=1170315r2=1170316view=diff
==
--- 
cassandra/branches/cassandra-0.8/interface/thrift/gen-java/org/apache/cassandra/thrift/Cassandra.java
 (original)
+++ 
cassandra/branches/cassandra-0.8/interface/thrift/gen-java/org/apache/cassandra/thrift/Cassandra.java
 Tue Sep 13 19:36:00 2011
@@ -9086,8 +9086,6 @@ public class Cassandra {
 
 private void readObject(java.io.ObjectInputStream in) throws 
java.io.IOException, ClassNotFoundException {
   try {
-// it doesn't seem like you should have to do this, but java 
serialization is wacky, and doesn't call the default constructor.
-__isset_bit_vector = new BitSet(1);
 read(new org.apache.thrift.protocol.TCompactProtocol(new 
org.apache.thrift.transport.TIOStreamTransport(in)));
   } catch (org.apache.thrift.TException te) {
 throw new java.io.IOException(te);
@@ -17043,6 +17041,8 @@ public class Cassandra {
 
 private void readObject(java.io.ObjectInputStream in) throws 
java.io.IOException, ClassNotFoundException {
   try {
+// it doesn't seem like you should have to do this, but java 
serialization is wacky, and doesn't call the default constructor.
+__isset_bit_vector = new BitSet(1);
 read(new org.apache.thrift.protocol.TCompactProtocol(new 
org.apache.thrift.transport.TIOStreamTransport(in)));
   } catch (org.apache.thrift.TException te) {
 throw new java.io.IOException(te);

Modified: 
cassandra/branches/cassandra-0.8/interface/thrift/gen-java/org/apache/cassandra/thrift/Constants.java
URL: 
http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.8/interface/thrift/gen-java/org/apache/cassandra/thrift/Constants.java?rev=1170316r1=1170315r2=1170316view=diff
==
--- 
cassandra/branches/cassandra-0.8/interface/thrift/gen-java/org/apache/cassandra/thrift/Constants.java
 (original)
+++ 
cassandra/branches/cassandra-0.8/interface/thrift/gen-java/org/apache/cassandra/thrift/Constants.java
 Tue Sep 13 19:36:00 2011
@@ -44,6 +44,6 @@ import org.slf4j.LoggerFactory;
 
 public class Constants {
 
-  public static final String VERSION = 19.10.0;
+  public static final String VERSION = 19.16.0;
 
 }




svn commit: r1170325 - /cassandra/branches/cassandra-1.0.0/interface/thrift/gen-java/org/apache/cassandra/thrift/Cassandra.java

2011-09-13 Thread jbellis
Author: jbellis
Date: Tue Sep 13 19:54:39 2011
New Revision: 1170325

URL: http://svn.apache.org/viewvc?rev=1170325view=rev
Log:
ant gen-thrift-java

Modified:

cassandra/branches/cassandra-1.0.0/interface/thrift/gen-java/org/apache/cassandra/thrift/Cassandra.java

Modified: 
cassandra/branches/cassandra-1.0.0/interface/thrift/gen-java/org/apache/cassandra/thrift/Cassandra.java
URL: 
http://svn.apache.org/viewvc/cassandra/branches/cassandra-1.0.0/interface/thrift/gen-java/org/apache/cassandra/thrift/Cassandra.java?rev=1170325r1=1170324r2=1170325view=diff
==
--- 
cassandra/branches/cassandra-1.0.0/interface/thrift/gen-java/org/apache/cassandra/thrift/Cassandra.java
 (original)
+++ 
cassandra/branches/cassandra-1.0.0/interface/thrift/gen-java/org/apache/cassandra/thrift/Cassandra.java
 Tue Sep 13 19:54:39 2011
@@ -17041,6 +17041,8 @@ public class Cassandra {
 
 private void readObject(java.io.ObjectInputStream in) throws 
java.io.IOException, ClassNotFoundException {
   try {
+// it doesn't seem like you should have to do this, but java 
serialization is wacky, and doesn't call the default constructor.
+__isset_bit_vector = new BitSet(1);
 read(new org.apache.thrift.protocol.TCompactProtocol(new 
org.apache.thrift.transport.TIOStreamTransport(in)));
   } catch (org.apache.thrift.TException te) {
 throw new java.io.IOException(te);




[jira] [Commented] (CASSANDRA-3025) PHP/PDO driver for Cassandra CQL

2011-09-13 Thread Jonathan Ellis (JIRA)

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

Jonathan Ellis commented on CASSANDRA-3025:
---

bq. This is implemented by adding extra parameter to prepared statement called 
CASSANDRA_ATTR_ROWSET_ITERATOR

Just to verify: did this get removed?

If so, I think we're good to commit.  I've created 
http://code.google.com/a/apache-extras.org/p/cassandra-pdo/ and assigned you 
commit access.

 PHP/PDO driver for Cassandra CQL
 

 Key: CASSANDRA-3025
 URL: https://issues.apache.org/jira/browse/CASSANDRA-3025
 Project: Cassandra
  Issue Type: New Feature
  Components: API
Reporter: Mikko Koppanen
  Labels: php
 Attachments: pdo_cassandra-0.1.0.tgz, pdo_cassandra-0.1.1.tgz, 
 pdo_cassandra-0.1.2.tgz, pdo_cassandra-0.1.3.tgz, pdo_cassandra-0.2.0.tgz, 
 php_test_results_20110818_2317.txt


 Hello,
 attached is the initial version of the PDO driver for Cassandra CQL language. 
 This is a native PHP extension written in what I would call a combination of 
 C and C++, due to PHP being C. The thrift API used is the C++.
 The API looks roughly following:
 {code}
 ?php
 $db = new PDO('cassandra:host=127.0.0.1;port=9160');
 $db-exec (CREATE KEYSPACE mytest with strategy_class = 'SimpleStrategy' and 
 strategy_options:replication_factor=1;);
 $db-exec (USE mytest);
 $db-exec (CREATE COLUMNFAMILY users (
   my_key varchar PRIMARY KEY,
   full_name varchar ););
   
 $stmt = $db-prepare (INSERT INTO users (my_key, full_name) VALUES (:key, 
 :full_name););
 $stmt-execute (array (':key' = 'mikko', ':full_name' = 'Mikko K' ));
 {code}
 Currently prepared statements are emulated on the client side but I 
 understand that there is a plan to add prepared statements to Cassandra CQL 
 API as well. I will add this feature in to the extension as soon as they are 
 implemented.
 Additional documentation can be found in github 
 https://github.com/mkoppanen/php-pdo_cassandra, in the form of rendered 
 MarkDown file. Tests are currently not included in the package file and they 
 can be found in the github for now as well.
 I have created documentation in docbook format as well, but have not yet 
 rendered it.
 Comments and feedback are welcome.
 Thanks,
 Mikko

--
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-13 Thread Sylvain Lebresne (JIRA)

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

Sylvain Lebresne commented on CASSANDRA-3181:
-

bq. . So I think repair was blocking minors

repair should be on its own executor now, so it shouldn't block minors.

bq. a compaction failed unexpectedly

hum, a compaction failing shouldn't stop other compactions. Otherwise this is 
worth fixing.

bq. I'm pretty sure that we're just looking at a problem where a server 
restarts and there is no more activity triggering a flush

If that's the case, then is there really much we want to do ? And even if we 
want, we should move that to 1.0.1. Just want to make sure this doesn't hide a 
real, unknown,  problem.

 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: Benjamin Coverston
 Fix For: 1.0.0


 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-13 Thread Jonathan Ellis (JIRA)

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

Jonathan Ellis commented on CASSANDRA-3181:
---

bq. CASSANDRA-2444 got in the way

I'm not sure what the right solution is here.  I buy the premise of 2444 that 
you don't necessarily want to get hammered by compaction when you're first 
starting up (warming up caches).  So I don't think check for compactions ever 
N seconds is a great policy.  But, I'm not sure check every N seconds, 
starting M minutes after startup is great either because it's not something a 
user will just guess when he's wondering why aren't compactions happening yet?

Any other ideas?

 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: Benjamin Coverston
 Fix For: 1.0.0


 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-13 Thread Brandon Williams (JIRA)

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

Brandon Williams commented on CASSANDRA-3181:
-

bq. repair should be on its own executor now, so it shouldn't block minors.

Ok, then maybe I just hit one of the OOM bugs, and compaction had never fully 
completed.  After restarting I never did any more writes, and we know 
compaction won't happen at startup.

bq. If that's the case, then is there really much we want to do ? And even if 
we want, we should move that to 1.0.1. Just want to make sure this doesn't hide 
a real, unknown, problem.

I think CASSANDRA-2444 was wrong.  It should be an option, and one that is off 
by default.  Starting a server with 1k sstables and having nothing happen is a 
bit of a shock, and having no way out of it besides hacks like forcing a flush 
or a major isn't great.

 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: Benjamin Coverston
 Fix For: 1.0.0


 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-3188) cqlsh 2.0

2011-09-13 Thread Jonathan Ellis (JIRA)

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

Jonathan Ellis commented on CASSANDRA-3188:
---

bq. Would it address the concerns of CASSANDRA-3010 if we built the Windows 
releases with py2exe or something like it?

I think the concerns there are (1) Windows, and py2exe would be great, and (2) 
anywhere else that building Thrift or other prerequisites is a bitch.

But I think (2) is mostly taken care of by pypi now, so yeah, if Python makes 
more sense as an implementation language then let's go for it.

 cqlsh 2.0
 -

 Key: CASSANDRA-3188
 URL: https://issues.apache.org/jira/browse/CASSANDRA-3188
 Project: Cassandra
  Issue Type: Improvement
Reporter: Jonathan Ellis
Assignee: paul cannon
 Fix For: 1.0.1


 I'd like to see some improvements to cqlsh to bring it to feature parity w/ 
 the old cli:
 - describe [KS | CF | cluster | schema]
 - assume
 - connect / don't crap out w/ stacktrace if C* isn't currently running on 
 localhost
 - help
 It may be easier to do this by forking the cli and replacing its one-off api 
 with CQL, or it may be easier to add these features to cqlsh.
 Either is fine, but if it's a close call my inclination would be to build it 
 in Java for the reasoning over on CASSANDRA-3010.

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




  1   2   >