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 2016/08/15 16:51:31 UTC
[01/10] cassandra git commit: Throw RuntimeException if starting
transfer of already completed OutgoingFileMessage
Repository: cassandra
Updated Branches:
refs/heads/cassandra-2.2 315356c1d -> 88b3cfc3b
refs/heads/cassandra-3.0 74ac3cef1 -> e6dd15245
refs/heads/cassandra-3.9 903ac4d4f -> e72dc29e6
refs/heads/trunk 2143805ee -> 9df02b927
Throw RuntimeException if starting transfer of already completed OutgoingFileMessage
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/88b3cfc3
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/88b3cfc3
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/88b3cfc3
Branch: refs/heads/cassandra-2.2
Commit: 88b3cfc3b6b4417a913a512b461897378b48c039
Parents: 315356c
Author: Paulo Motta <pa...@gmail.com>
Authored: Fri Aug 12 22:06:27 2016 -0300
Committer: Yuki Morishita <yu...@apache.org>
Committed: Mon Aug 15 10:09:36 2016 -0500
----------------------------------------------------------------------
.../apache/cassandra/streaming/messages/OutgoingFileMessage.java | 3 +++
1 file changed, 3 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/88b3cfc3/src/java/org/apache/cassandra/streaming/messages/OutgoingFileMessage.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/streaming/messages/OutgoingFileMessage.java b/src/java/org/apache/cassandra/streaming/messages/OutgoingFileMessage.java
index a88386e..30b79f8 100644
--- a/src/java/org/apache/cassandra/streaming/messages/OutgoingFileMessage.java
+++ b/src/java/org/apache/cassandra/streaming/messages/OutgoingFileMessage.java
@@ -115,6 +115,9 @@ public class OutgoingFileMessage extends StreamMessage
@VisibleForTesting
public synchronized void startTransfer()
{
+ if (completed)
+ throw new RuntimeException(String.format("Transfer of file %s already completed or aborted (perhaps session failed?).",
+ filename));
transferring = true;
}
[08/10] cassandra git commit: Merge branch 'cassandra-3.0' into
cassandra-3.9
Posted by yu...@apache.org.
Merge branch 'cassandra-3.0' into cassandra-3.9
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/e72dc29e
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/e72dc29e
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/e72dc29e
Branch: refs/heads/cassandra-3.9
Commit: e72dc29e69ed21d15c70788cd2c2b620eeabeb6c
Parents: 903ac4d e6dd152
Author: Yuki Morishita <yu...@apache.org>
Authored: Mon Aug 15 10:09:55 2016 -0500
Committer: Yuki Morishita <yu...@apache.org>
Committed: Mon Aug 15 10:09:55 2016 -0500
----------------------------------------------------------------------
.../apache/cassandra/streaming/messages/OutgoingFileMessage.java | 3 +++
1 file changed, 3 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/e72dc29e/src/java/org/apache/cassandra/streaming/messages/OutgoingFileMessage.java
----------------------------------------------------------------------
[07/10] cassandra git commit: Merge branch 'cassandra-2.2' into
cassandra-3.0
Posted by yu...@apache.org.
Merge branch 'cassandra-2.2' into cassandra-3.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/e6dd1524
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/e6dd1524
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/e6dd1524
Branch: refs/heads/trunk
Commit: e6dd15245b87480cfda6b34f9834f341d161ee34
Parents: 74ac3ce 88b3cfc
Author: Yuki Morishita <yu...@apache.org>
Authored: Mon Aug 15 10:09:46 2016 -0500
Committer: Yuki Morishita <yu...@apache.org>
Committed: Mon Aug 15 10:09:46 2016 -0500
----------------------------------------------------------------------
.../apache/cassandra/streaming/messages/OutgoingFileMessage.java | 3 +++
1 file changed, 3 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/e6dd1524/src/java/org/apache/cassandra/streaming/messages/OutgoingFileMessage.java
----------------------------------------------------------------------
[06/10] cassandra git commit: Merge branch 'cassandra-2.2' into
cassandra-3.0
Posted by yu...@apache.org.
Merge branch 'cassandra-2.2' into cassandra-3.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/e6dd1524
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/e6dd1524
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/e6dd1524
Branch: refs/heads/cassandra-3.0
Commit: e6dd15245b87480cfda6b34f9834f341d161ee34
Parents: 74ac3ce 88b3cfc
Author: Yuki Morishita <yu...@apache.org>
Authored: Mon Aug 15 10:09:46 2016 -0500
Committer: Yuki Morishita <yu...@apache.org>
Committed: Mon Aug 15 10:09:46 2016 -0500
----------------------------------------------------------------------
.../apache/cassandra/streaming/messages/OutgoingFileMessage.java | 3 +++
1 file changed, 3 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/e6dd1524/src/java/org/apache/cassandra/streaming/messages/OutgoingFileMessage.java
----------------------------------------------------------------------
[02/10] cassandra git commit: Throw RuntimeException if starting
transfer of already completed OutgoingFileMessage
Posted by yu...@apache.org.
Throw RuntimeException if starting transfer of already completed OutgoingFileMessage
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/88b3cfc3
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/88b3cfc3
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/88b3cfc3
Branch: refs/heads/cassandra-3.0
Commit: 88b3cfc3b6b4417a913a512b461897378b48c039
Parents: 315356c
Author: Paulo Motta <pa...@gmail.com>
Authored: Fri Aug 12 22:06:27 2016 -0300
Committer: Yuki Morishita <yu...@apache.org>
Committed: Mon Aug 15 10:09:36 2016 -0500
----------------------------------------------------------------------
.../apache/cassandra/streaming/messages/OutgoingFileMessage.java | 3 +++
1 file changed, 3 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/88b3cfc3/src/java/org/apache/cassandra/streaming/messages/OutgoingFileMessage.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/streaming/messages/OutgoingFileMessage.java b/src/java/org/apache/cassandra/streaming/messages/OutgoingFileMessage.java
index a88386e..30b79f8 100644
--- a/src/java/org/apache/cassandra/streaming/messages/OutgoingFileMessage.java
+++ b/src/java/org/apache/cassandra/streaming/messages/OutgoingFileMessage.java
@@ -115,6 +115,9 @@ public class OutgoingFileMessage extends StreamMessage
@VisibleForTesting
public synchronized void startTransfer()
{
+ if (completed)
+ throw new RuntimeException(String.format("Transfer of file %s already completed or aborted (perhaps session failed?).",
+ filename));
transferring = true;
}
[04/10] cassandra git commit: Throw RuntimeException if starting
transfer of already completed OutgoingFileMessage
Posted by yu...@apache.org.
Throw RuntimeException if starting transfer of already completed OutgoingFileMessage
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/88b3cfc3
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/88b3cfc3
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/88b3cfc3
Branch: refs/heads/trunk
Commit: 88b3cfc3b6b4417a913a512b461897378b48c039
Parents: 315356c
Author: Paulo Motta <pa...@gmail.com>
Authored: Fri Aug 12 22:06:27 2016 -0300
Committer: Yuki Morishita <yu...@apache.org>
Committed: Mon Aug 15 10:09:36 2016 -0500
----------------------------------------------------------------------
.../apache/cassandra/streaming/messages/OutgoingFileMessage.java | 3 +++
1 file changed, 3 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/88b3cfc3/src/java/org/apache/cassandra/streaming/messages/OutgoingFileMessage.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/streaming/messages/OutgoingFileMessage.java b/src/java/org/apache/cassandra/streaming/messages/OutgoingFileMessage.java
index a88386e..30b79f8 100644
--- a/src/java/org/apache/cassandra/streaming/messages/OutgoingFileMessage.java
+++ b/src/java/org/apache/cassandra/streaming/messages/OutgoingFileMessage.java
@@ -115,6 +115,9 @@ public class OutgoingFileMessage extends StreamMessage
@VisibleForTesting
public synchronized void startTransfer()
{
+ if (completed)
+ throw new RuntimeException(String.format("Transfer of file %s already completed or aborted (perhaps session failed?).",
+ filename));
transferring = true;
}
[10/10] cassandra git commit: Merge branch 'cassandra-3.9' into trunk
Posted by yu...@apache.org.
Merge branch 'cassandra-3.9' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/9df02b92
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/9df02b92
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/9df02b92
Branch: refs/heads/trunk
Commit: 9df02b9279e091ad2237333b71a0fc17dac951d7
Parents: 2143805 e72dc29
Author: Yuki Morishita <yu...@apache.org>
Authored: Mon Aug 15 10:10:00 2016 -0500
Committer: Yuki Morishita <yu...@apache.org>
Committed: Mon Aug 15 10:10:00 2016 -0500
----------------------------------------------------------------------
.../apache/cassandra/streaming/messages/OutgoingFileMessage.java | 3 +++
1 file changed, 3 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/9df02b92/src/java/org/apache/cassandra/streaming/messages/OutgoingFileMessage.java
----------------------------------------------------------------------
[03/10] cassandra git commit: Throw RuntimeException if starting
transfer of already completed OutgoingFileMessage
Posted by yu...@apache.org.
Throw RuntimeException if starting transfer of already completed OutgoingFileMessage
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/88b3cfc3
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/88b3cfc3
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/88b3cfc3
Branch: refs/heads/cassandra-3.9
Commit: 88b3cfc3b6b4417a913a512b461897378b48c039
Parents: 315356c
Author: Paulo Motta <pa...@gmail.com>
Authored: Fri Aug 12 22:06:27 2016 -0300
Committer: Yuki Morishita <yu...@apache.org>
Committed: Mon Aug 15 10:09:36 2016 -0500
----------------------------------------------------------------------
.../apache/cassandra/streaming/messages/OutgoingFileMessage.java | 3 +++
1 file changed, 3 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/88b3cfc3/src/java/org/apache/cassandra/streaming/messages/OutgoingFileMessage.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/streaming/messages/OutgoingFileMessage.java b/src/java/org/apache/cassandra/streaming/messages/OutgoingFileMessage.java
index a88386e..30b79f8 100644
--- a/src/java/org/apache/cassandra/streaming/messages/OutgoingFileMessage.java
+++ b/src/java/org/apache/cassandra/streaming/messages/OutgoingFileMessage.java
@@ -115,6 +115,9 @@ public class OutgoingFileMessage extends StreamMessage
@VisibleForTesting
public synchronized void startTransfer()
{
+ if (completed)
+ throw new RuntimeException(String.format("Transfer of file %s already completed or aborted (perhaps session failed?).",
+ filename));
transferring = true;
}
[05/10] cassandra git commit: Merge branch 'cassandra-2.2' into
cassandra-3.0
Posted by yu...@apache.org.
Merge branch 'cassandra-2.2' into cassandra-3.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/e6dd1524
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/e6dd1524
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/e6dd1524
Branch: refs/heads/cassandra-3.9
Commit: e6dd15245b87480cfda6b34f9834f341d161ee34
Parents: 74ac3ce 88b3cfc
Author: Yuki Morishita <yu...@apache.org>
Authored: Mon Aug 15 10:09:46 2016 -0500
Committer: Yuki Morishita <yu...@apache.org>
Committed: Mon Aug 15 10:09:46 2016 -0500
----------------------------------------------------------------------
.../apache/cassandra/streaming/messages/OutgoingFileMessage.java | 3 +++
1 file changed, 3 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/e6dd1524/src/java/org/apache/cassandra/streaming/messages/OutgoingFileMessage.java
----------------------------------------------------------------------
[09/10] cassandra git commit: Merge branch 'cassandra-3.0' into
cassandra-3.9
Posted by yu...@apache.org.
Merge branch 'cassandra-3.0' into cassandra-3.9
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/e72dc29e
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/e72dc29e
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/e72dc29e
Branch: refs/heads/trunk
Commit: e72dc29e69ed21d15c70788cd2c2b620eeabeb6c
Parents: 903ac4d e6dd152
Author: Yuki Morishita <yu...@apache.org>
Authored: Mon Aug 15 10:09:55 2016 -0500
Committer: Yuki Morishita <yu...@apache.org>
Committed: Mon Aug 15 10:09:55 2016 -0500
----------------------------------------------------------------------
.../apache/cassandra/streaming/messages/OutgoingFileMessage.java | 3 +++
1 file changed, 3 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/e72dc29e/src/java/org/apache/cassandra/streaming/messages/OutgoingFileMessage.java
----------------------------------------------------------------------