You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by jb...@apache.org on 2013/08/05 23:43:14 UTC
[1/7] git commit: updated versioning for 2.0.0 rc1 release
Updated Branches:
refs/heads/cassandra-2.0 e8ae6720e -> 4b4ccc3cc
refs/heads/cassandra-2.0.0 e8ae6720e -> 4b4ccc3cc
refs/heads/trunk 1302263c4 -> 4b4ccc3cc
updated versioning for 2.0.0 rc1 release
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/e8ae6720
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/e8ae6720
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/e8ae6720
Branch: refs/heads/trunk
Commit: e8ae6720e52502572596f0137729998222262b78
Parents: 1302263
Author: Eric Evans <ee...@apache.org>
Authored: Mon Aug 5 10:17:47 2013 -0500
Committer: Eric Evans <ee...@apache.org>
Committed: Mon Aug 5 10:17:47 2013 -0500
----------------------------------------------------------------------
build.xml | 2 +-
debian/changelog | 6 ++++++
2 files changed, 7 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/e8ae6720/build.xml
----------------------------------------------------------------------
diff --git a/build.xml b/build.xml
index d3ef50c..a40405e 100644
--- a/build.xml
+++ b/build.xml
@@ -25,7 +25,7 @@
<property name="debuglevel" value="source,lines,vars"/>
<!-- default version and SCM information -->
- <property name="base.version" value="2.0.0-beta2"/>
+ <property name="base.version" value="2.0.0-rc1"/>
<property name="scm.connection" value="scm:git://git.apache.org/cassandra.git"/>
<property name="scm.developerConnection" value="scm:git://git.apache.org/cassandra.git"/>
<property name="scm.url" value="http://git-wip-us.apache.org/repos/asf?p=cassandra.git;a=tree"/>
http://git-wip-us.apache.org/repos/asf/cassandra/blob/e8ae6720/debian/changelog
----------------------------------------------------------------------
diff --git a/debian/changelog b/debian/changelog
index fc418c7..236f5c2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+cassandra (2.0.0~rc1) unstable; urgency=low
+
+ * New release candidate
+
+ -- Eric Evans <ee...@apache.org>, 05 Aug 2013 10:11:43 -0500
+
cassandra (2.0.0~beta2) unstable; urgency=low
* New beta release
[5/7] git commit: fix CAS contention timeout patch by Soumava Ghosh;
reviewed by jbellis for CASSANDRA-5830
Posted by jb...@apache.org.
fix CAS contention timeout
patch by Soumava Ghosh; reviewed by jbellis for CASSANDRA-5830
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/4b4ccc3c
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/4b4ccc3c
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/4b4ccc3c
Branch: refs/heads/cassandra-2.0.0
Commit: 4b4ccc3ccfcc7be8fad0b25bde9a180f0016d520
Parents: c0d189f
Author: Jonathan Ellis <jb...@apache.org>
Authored: Mon Aug 5 16:42:59 2013 -0500
Committer: Jonathan Ellis <jb...@apache.org>
Committed: Mon Aug 5 16:42:59 2013 -0500
----------------------------------------------------------------------
CHANGES.txt | 4 ++++
src/java/org/apache/cassandra/service/StorageProxy.java | 2 +-
2 files changed, 5 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/4b4ccc3c/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index c83372b..67227a1 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,3 +1,7 @@
+2.0.0
+ * fix CAS contention timeout (CASSANDRA-5830)
+
+
2.0.0-rc1
* improve DecimalSerializer performance (CASSANDRA-5837)
* fix potential spurious wakeup in AsyncOneResponse (CASSANDRA-5690)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/4b4ccc3c/src/java/org/apache/cassandra/service/StorageProxy.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/service/StorageProxy.java b/src/java/org/apache/cassandra/service/StorageProxy.java
index 6d0d060..fb5cbe4 100644
--- a/src/java/org/apache/cassandra/service/StorageProxy.java
+++ b/src/java/org/apache/cassandra/service/StorageProxy.java
@@ -355,7 +355,7 @@ public class StorageProxy implements StorageProxyMBean
long timeout = TimeUnit.MILLISECONDS.toNanos(DatabaseDescriptor.getCasContentionTimeout());
PrepareCallback summary = null;
- while (start - System.nanoTime() < timeout)
+ while (System.nanoTime() - start < timeout)
{
long ballotMillis = summary == null
? System.currentTimeMillis()
[2/7] git commit: update test for separate paxos/commit CLs
Posted by jb...@apache.org.
update test for separate paxos/commit CLs
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/c0d189f4
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/c0d189f4
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/c0d189f4
Branch: refs/heads/cassandra-2.0
Commit: c0d189f4f2675d903d30b5bd787b4d177704ea12
Parents: e8ae672
Author: Jonathan Ellis <jb...@apache.org>
Authored: Mon Aug 5 16:27:39 2013 -0500
Committer: Jonathan Ellis <jb...@apache.org>
Committed: Mon Aug 5 16:27:39 2013 -0500
----------------------------------------------------------------------
test/system/test_thrift_server.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/c0d189f4/test/system/test_thrift_server.py
----------------------------------------------------------------------
diff --git a/test/system/test_thrift_server.py b/test/system/test_thrift_server.py
index 5d4a167..7ecc8f1 100644
--- a/test/system/test_thrift_server.py
+++ b/test/system/test_thrift_server.py
@@ -233,7 +233,7 @@ class TestMutations(ThriftTester):
def test_cas(self):
_set_keyspace('Keyspace1')
def cas(expected, updates):
- return client.cas('key1', 'Standard1', expected, updates, ConsistencyLevel.ONE)
+ return client.cas('key1', 'Standard1', expected, updates, ConsistencyLevel.SERIAL, ConsistencyLevel.QUORUM)
cas_result = cas(_SIMPLE_COLUMNS, _SIMPLE_COLUMNS)
assert not cas_result.success
[3/7] git commit: update test for separate paxos/commit CLs
Posted by jb...@apache.org.
update test for separate paxos/commit CLs
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/c0d189f4
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/c0d189f4
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/c0d189f4
Branch: refs/heads/trunk
Commit: c0d189f4f2675d903d30b5bd787b4d177704ea12
Parents: e8ae672
Author: Jonathan Ellis <jb...@apache.org>
Authored: Mon Aug 5 16:27:39 2013 -0500
Committer: Jonathan Ellis <jb...@apache.org>
Committed: Mon Aug 5 16:27:39 2013 -0500
----------------------------------------------------------------------
test/system/test_thrift_server.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/c0d189f4/test/system/test_thrift_server.py
----------------------------------------------------------------------
diff --git a/test/system/test_thrift_server.py b/test/system/test_thrift_server.py
index 5d4a167..7ecc8f1 100644
--- a/test/system/test_thrift_server.py
+++ b/test/system/test_thrift_server.py
@@ -233,7 +233,7 @@ class TestMutations(ThriftTester):
def test_cas(self):
_set_keyspace('Keyspace1')
def cas(expected, updates):
- return client.cas('key1', 'Standard1', expected, updates, ConsistencyLevel.ONE)
+ return client.cas('key1', 'Standard1', expected, updates, ConsistencyLevel.SERIAL, ConsistencyLevel.QUORUM)
cas_result = cas(_SIMPLE_COLUMNS, _SIMPLE_COLUMNS)
assert not cas_result.success
[6/7] git commit: fix CAS contention timeout patch by Soumava Ghosh;
reviewed by jbellis for CASSANDRA-5830
Posted by jb...@apache.org.
fix CAS contention timeout
patch by Soumava Ghosh; reviewed by jbellis for CASSANDRA-5830
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/4b4ccc3c
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/4b4ccc3c
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/4b4ccc3c
Branch: refs/heads/cassandra-2.0
Commit: 4b4ccc3ccfcc7be8fad0b25bde9a180f0016d520
Parents: c0d189f
Author: Jonathan Ellis <jb...@apache.org>
Authored: Mon Aug 5 16:42:59 2013 -0500
Committer: Jonathan Ellis <jb...@apache.org>
Committed: Mon Aug 5 16:42:59 2013 -0500
----------------------------------------------------------------------
CHANGES.txt | 4 ++++
src/java/org/apache/cassandra/service/StorageProxy.java | 2 +-
2 files changed, 5 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/4b4ccc3c/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index c83372b..67227a1 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,3 +1,7 @@
+2.0.0
+ * fix CAS contention timeout (CASSANDRA-5830)
+
+
2.0.0-rc1
* improve DecimalSerializer performance (CASSANDRA-5837)
* fix potential spurious wakeup in AsyncOneResponse (CASSANDRA-5690)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/4b4ccc3c/src/java/org/apache/cassandra/service/StorageProxy.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/service/StorageProxy.java b/src/java/org/apache/cassandra/service/StorageProxy.java
index 6d0d060..fb5cbe4 100644
--- a/src/java/org/apache/cassandra/service/StorageProxy.java
+++ b/src/java/org/apache/cassandra/service/StorageProxy.java
@@ -355,7 +355,7 @@ public class StorageProxy implements StorageProxyMBean
long timeout = TimeUnit.MILLISECONDS.toNanos(DatabaseDescriptor.getCasContentionTimeout());
PrepareCallback summary = null;
- while (start - System.nanoTime() < timeout)
+ while (System.nanoTime() - start < timeout)
{
long ballotMillis = summary == null
? System.currentTimeMillis()
[4/7] git commit: update test for separate paxos/commit CLs
Posted by jb...@apache.org.
update test for separate paxos/commit CLs
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/c0d189f4
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/c0d189f4
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/c0d189f4
Branch: refs/heads/cassandra-2.0.0
Commit: c0d189f4f2675d903d30b5bd787b4d177704ea12
Parents: e8ae672
Author: Jonathan Ellis <jb...@apache.org>
Authored: Mon Aug 5 16:27:39 2013 -0500
Committer: Jonathan Ellis <jb...@apache.org>
Committed: Mon Aug 5 16:27:39 2013 -0500
----------------------------------------------------------------------
test/system/test_thrift_server.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/c0d189f4/test/system/test_thrift_server.py
----------------------------------------------------------------------
diff --git a/test/system/test_thrift_server.py b/test/system/test_thrift_server.py
index 5d4a167..7ecc8f1 100644
--- a/test/system/test_thrift_server.py
+++ b/test/system/test_thrift_server.py
@@ -233,7 +233,7 @@ class TestMutations(ThriftTester):
def test_cas(self):
_set_keyspace('Keyspace1')
def cas(expected, updates):
- return client.cas('key1', 'Standard1', expected, updates, ConsistencyLevel.ONE)
+ return client.cas('key1', 'Standard1', expected, updates, ConsistencyLevel.SERIAL, ConsistencyLevel.QUORUM)
cas_result = cas(_SIMPLE_COLUMNS, _SIMPLE_COLUMNS)
assert not cas_result.success
[7/7] git commit: fix CAS contention timeout patch by Soumava Ghosh;
reviewed by jbellis for CASSANDRA-5830
Posted by jb...@apache.org.
fix CAS contention timeout
patch by Soumava Ghosh; reviewed by jbellis for CASSANDRA-5830
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/4b4ccc3c
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/4b4ccc3c
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/4b4ccc3c
Branch: refs/heads/trunk
Commit: 4b4ccc3ccfcc7be8fad0b25bde9a180f0016d520
Parents: c0d189f
Author: Jonathan Ellis <jb...@apache.org>
Authored: Mon Aug 5 16:42:59 2013 -0500
Committer: Jonathan Ellis <jb...@apache.org>
Committed: Mon Aug 5 16:42:59 2013 -0500
----------------------------------------------------------------------
CHANGES.txt | 4 ++++
src/java/org/apache/cassandra/service/StorageProxy.java | 2 +-
2 files changed, 5 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/4b4ccc3c/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index c83372b..67227a1 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,3 +1,7 @@
+2.0.0
+ * fix CAS contention timeout (CASSANDRA-5830)
+
+
2.0.0-rc1
* improve DecimalSerializer performance (CASSANDRA-5837)
* fix potential spurious wakeup in AsyncOneResponse (CASSANDRA-5690)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/4b4ccc3c/src/java/org/apache/cassandra/service/StorageProxy.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/service/StorageProxy.java b/src/java/org/apache/cassandra/service/StorageProxy.java
index 6d0d060..fb5cbe4 100644
--- a/src/java/org/apache/cassandra/service/StorageProxy.java
+++ b/src/java/org/apache/cassandra/service/StorageProxy.java
@@ -355,7 +355,7 @@ public class StorageProxy implements StorageProxyMBean
long timeout = TimeUnit.MILLISECONDS.toNanos(DatabaseDescriptor.getCasContentionTimeout());
PrepareCallback summary = null;
- while (start - System.nanoTime() < timeout)
+ while (System.nanoTime() - start < timeout)
{
long ballotMillis = summary == null
? System.currentTimeMillis()