You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by yu...@apache.org on 2014/04/09 00:14:03 UTC
[1/6] git commit: Fix concurrency issue for CASSANDRA-6818
Repository: cassandra
Updated Branches:
refs/heads/cassandra-2.0 c17dcd484 -> b1a307047
refs/heads/cassandra-2.1 da2acdd60 -> 5541352f1
refs/heads/trunk e1e91bebd -> 1b5bd51c4
Fix concurrency issue for CASSANDRA-6818
patch by yukim; reviewed by thobbs for CASSANDRA-7007
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/b1a30704
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/b1a30704
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/b1a30704
Branch: refs/heads/cassandra-2.0
Commit: b1a307047768980b5fdfcb0cffef5acea6924362
Parents: c17dcd4
Author: Yuki Morishita <yu...@apache.org>
Authored: Tue Apr 8 17:13:09 2014 -0500
Committer: Yuki Morishita <yu...@apache.org>
Committed: Tue Apr 8 17:13:09 2014 -0500
----------------------------------------------------------------------
src/java/org/apache/cassandra/streaming/StreamTransferTask.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/b1a30704/src/java/org/apache/cassandra/streaming/StreamTransferTask.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/streaming/StreamTransferTask.java b/src/java/org/apache/cassandra/streaming/StreamTransferTask.java
index 86f4ee2..7d0cc87 100644
--- a/src/java/org/apache/cassandra/streaming/StreamTransferTask.java
+++ b/src/java/org/apache/cassandra/streaming/StreamTransferTask.java
@@ -58,7 +58,7 @@ public class StreamTransferTask extends StreamTask
*
* @param sequenceNumber sequence number of file
*/
- public void complete(int sequenceNumber)
+ public synchronized void complete(int sequenceNumber)
{
OutgoingFileMessage file = files.remove(sequenceNumber);
if (file != null)
@@ -117,7 +117,7 @@ public class StreamTransferTask extends StreamTask
* @param unit unit of given time
* @return scheduled future for timeout task
*/
- public ScheduledFuture scheduleTimeout(final int sequenceNumber, long time, TimeUnit unit)
+ public synchronized ScheduledFuture scheduleTimeout(final int sequenceNumber, long time, TimeUnit unit)
{
if (timeoutExecutor.isShutdown())
return null;
[2/6] git commit: Fix concurrency issue for CASSANDRA-6818
Posted by yu...@apache.org.
Fix concurrency issue for CASSANDRA-6818
patch by yukim; reviewed by thobbs for CASSANDRA-7007
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/b1a30704
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/b1a30704
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/b1a30704
Branch: refs/heads/cassandra-2.1
Commit: b1a307047768980b5fdfcb0cffef5acea6924362
Parents: c17dcd4
Author: Yuki Morishita <yu...@apache.org>
Authored: Tue Apr 8 17:13:09 2014 -0500
Committer: Yuki Morishita <yu...@apache.org>
Committed: Tue Apr 8 17:13:09 2014 -0500
----------------------------------------------------------------------
src/java/org/apache/cassandra/streaming/StreamTransferTask.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/b1a30704/src/java/org/apache/cassandra/streaming/StreamTransferTask.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/streaming/StreamTransferTask.java b/src/java/org/apache/cassandra/streaming/StreamTransferTask.java
index 86f4ee2..7d0cc87 100644
--- a/src/java/org/apache/cassandra/streaming/StreamTransferTask.java
+++ b/src/java/org/apache/cassandra/streaming/StreamTransferTask.java
@@ -58,7 +58,7 @@ public class StreamTransferTask extends StreamTask
*
* @param sequenceNumber sequence number of file
*/
- public void complete(int sequenceNumber)
+ public synchronized void complete(int sequenceNumber)
{
OutgoingFileMessage file = files.remove(sequenceNumber);
if (file != null)
@@ -117,7 +117,7 @@ public class StreamTransferTask extends StreamTask
* @param unit unit of given time
* @return scheduled future for timeout task
*/
- public ScheduledFuture scheduleTimeout(final int sequenceNumber, long time, TimeUnit unit)
+ public synchronized ScheduledFuture scheduleTimeout(final int sequenceNumber, long time, TimeUnit unit)
{
if (timeoutExecutor.isShutdown())
return null;
[4/6] git commit: Merge branch 'cassandra-2.0' into cassandra-2.1
Posted by yu...@apache.org.
Merge branch 'cassandra-2.0' into cassandra-2.1
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/5541352f
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/5541352f
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/5541352f
Branch: refs/heads/trunk
Commit: 5541352f1b78e7c49a8af997a7878b6d9717f486
Parents: da2acdd b1a3070
Author: Yuki Morishita <yu...@apache.org>
Authored: Tue Apr 8 17:13:40 2014 -0500
Committer: Yuki Morishita <yu...@apache.org>
Committed: Tue Apr 8 17:13:40 2014 -0500
----------------------------------------------------------------------
src/java/org/apache/cassandra/streaming/StreamTransferTask.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/5541352f/src/java/org/apache/cassandra/streaming/StreamTransferTask.java
----------------------------------------------------------------------
[5/6] git commit: Merge branch 'cassandra-2.0' into cassandra-2.1
Posted by yu...@apache.org.
Merge branch 'cassandra-2.0' into cassandra-2.1
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/5541352f
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/5541352f
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/5541352f
Branch: refs/heads/cassandra-2.1
Commit: 5541352f1b78e7c49a8af997a7878b6d9717f486
Parents: da2acdd b1a3070
Author: Yuki Morishita <yu...@apache.org>
Authored: Tue Apr 8 17:13:40 2014 -0500
Committer: Yuki Morishita <yu...@apache.org>
Committed: Tue Apr 8 17:13:40 2014 -0500
----------------------------------------------------------------------
src/java/org/apache/cassandra/streaming/StreamTransferTask.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/5541352f/src/java/org/apache/cassandra/streaming/StreamTransferTask.java
----------------------------------------------------------------------
[6/6] git commit: Merge branch 'cassandra-2.1' into trunk
Posted by yu...@apache.org.
Merge branch 'cassandra-2.1' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/1b5bd51c
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/1b5bd51c
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/1b5bd51c
Branch: refs/heads/trunk
Commit: 1b5bd51c40aa8d8b7aae26848ed6a5059fea7718
Parents: e1e91be 5541352
Author: Yuki Morishita <yu...@apache.org>
Authored: Tue Apr 8 17:13:49 2014 -0500
Committer: Yuki Morishita <yu...@apache.org>
Committed: Tue Apr 8 17:13:49 2014 -0500
----------------------------------------------------------------------
src/java/org/apache/cassandra/streaming/StreamTransferTask.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
[3/6] git commit: Fix concurrency issue for CASSANDRA-6818
Posted by yu...@apache.org.
Fix concurrency issue for CASSANDRA-6818
patch by yukim; reviewed by thobbs for CASSANDRA-7007
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/b1a30704
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/b1a30704
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/b1a30704
Branch: refs/heads/trunk
Commit: b1a307047768980b5fdfcb0cffef5acea6924362
Parents: c17dcd4
Author: Yuki Morishita <yu...@apache.org>
Authored: Tue Apr 8 17:13:09 2014 -0500
Committer: Yuki Morishita <yu...@apache.org>
Committed: Tue Apr 8 17:13:09 2014 -0500
----------------------------------------------------------------------
src/java/org/apache/cassandra/streaming/StreamTransferTask.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/b1a30704/src/java/org/apache/cassandra/streaming/StreamTransferTask.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/streaming/StreamTransferTask.java b/src/java/org/apache/cassandra/streaming/StreamTransferTask.java
index 86f4ee2..7d0cc87 100644
--- a/src/java/org/apache/cassandra/streaming/StreamTransferTask.java
+++ b/src/java/org/apache/cassandra/streaming/StreamTransferTask.java
@@ -58,7 +58,7 @@ public class StreamTransferTask extends StreamTask
*
* @param sequenceNumber sequence number of file
*/
- public void complete(int sequenceNumber)
+ public synchronized void complete(int sequenceNumber)
{
OutgoingFileMessage file = files.remove(sequenceNumber);
if (file != null)
@@ -117,7 +117,7 @@ public class StreamTransferTask extends StreamTask
* @param unit unit of given time
* @return scheduled future for timeout task
*/
- public ScheduledFuture scheduleTimeout(final int sequenceNumber, long time, TimeUnit unit)
+ public synchronized ScheduledFuture scheduleTimeout(final int sequenceNumber, long time, TimeUnit unit)
{
if (timeoutExecutor.isShutdown())
return null;