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 2015/05/26 19:20:43 UTC
[01/10] cassandra git commit: Handle runtime error case in
CASSANDRA-9132
Repository: cassandra
Updated Branches:
refs/heads/cassandra-2.0 5a571c629 -> 2beb66e87
refs/heads/cassandra-2.1 f3ca3686d -> 4e2691110
refs/heads/cassandra-2.2 c17e44a79 -> 6734e94b8
refs/heads/trunk 747e1005b -> 5e7cdc2cb
Handle runtime error case in CASSANDRA-9132
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/2beb66e8
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/2beb66e8
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/2beb66e8
Branch: refs/heads/cassandra-2.0
Commit: 2beb66e87e9a8115ab81f3274be0f29f4257641a
Parents: 5a571c6
Author: Yuki Morishita <yu...@apache.org>
Authored: Tue May 26 12:05:41 2015 -0500
Committer: Yuki Morishita <yu...@apache.org>
Committed: Tue May 26 12:05:41 2015 -0500
----------------------------------------------------------------------
.../cassandra/streaming/messages/IncomingFileMessage.java | 8 ++++++++
1 file changed, 8 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/2beb66e8/src/java/org/apache/cassandra/streaming/messages/IncomingFileMessage.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/streaming/messages/IncomingFileMessage.java b/src/java/org/apache/cassandra/streaming/messages/IncomingFileMessage.java
index 5e0e087..99662d0 100644
--- a/src/java/org/apache/cassandra/streaming/messages/IncomingFileMessage.java
+++ b/src/java/org/apache/cassandra/streaming/messages/IncomingFileMessage.java
@@ -54,6 +54,14 @@ public class IncomingFileMessage extends StreamMessage
}
catch (Throwable e)
{
+ // Throwable can be Runtime error containing IOException.
+ // In that case we don't want to retry.
+ Throwable cause = e;
+ while ((cause = cause.getCause()) != null)
+ {
+ if (cause instanceof IOException)
+ throw (IOException) cause;
+ }
// Otherwise, we can retry
session.doRetry(header, e);
return null;
[05/10] cassandra 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/4e269111
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/4e269111
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/4e269111
Branch: refs/heads/cassandra-2.2
Commit: 4e2691110bde17a54a1b378d5727cc6dcd156300
Parents: f3ca368 2beb66e
Author: Yuki Morishita <yu...@apache.org>
Authored: Tue May 26 12:16:34 2015 -0500
Committer: Yuki Morishita <yu...@apache.org>
Committed: Tue May 26 12:16:34 2015 -0500
----------------------------------------------------------------------
.../cassandra/streaming/messages/IncomingFileMessage.java | 8 ++++++++
1 file changed, 8 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/4e269111/src/java/org/apache/cassandra/streaming/messages/IncomingFileMessage.java
----------------------------------------------------------------------
diff --cc src/java/org/apache/cassandra/streaming/messages/IncomingFileMessage.java
index 9866d1e,99662d0..494af85
--- a/src/java/org/apache/cassandra/streaming/messages/IncomingFileMessage.java
+++ b/src/java/org/apache/cassandra/streaming/messages/IncomingFileMessage.java
@@@ -53,11 -52,18 +53,19 @@@ public class IncomingFileMessage extend
// This can be caused by network/node failure thus we are not retrying
throw eof;
}
- catch (Throwable e)
+ catch (Throwable t)
{
+ // Throwable can be Runtime error containing IOException.
+ // In that case we don't want to retry.
- Throwable cause = e;
++ Throwable cause = t;
+ while ((cause = cause.getCause()) != null)
+ {
+ if (cause instanceof IOException)
+ throw (IOException) cause;
+ }
+ JVMStabilityInspector.inspectThrowable(t);
// Otherwise, we can retry
- session.doRetry(header, e);
+ session.doRetry(header, t);
return null;
}
}
[07/10] cassandra 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/4e269111
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/4e269111
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/4e269111
Branch: refs/heads/trunk
Commit: 4e2691110bde17a54a1b378d5727cc6dcd156300
Parents: f3ca368 2beb66e
Author: Yuki Morishita <yu...@apache.org>
Authored: Tue May 26 12:16:34 2015 -0500
Committer: Yuki Morishita <yu...@apache.org>
Committed: Tue May 26 12:16:34 2015 -0500
----------------------------------------------------------------------
.../cassandra/streaming/messages/IncomingFileMessage.java | 8 ++++++++
1 file changed, 8 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/4e269111/src/java/org/apache/cassandra/streaming/messages/IncomingFileMessage.java
----------------------------------------------------------------------
diff --cc src/java/org/apache/cassandra/streaming/messages/IncomingFileMessage.java
index 9866d1e,99662d0..494af85
--- a/src/java/org/apache/cassandra/streaming/messages/IncomingFileMessage.java
+++ b/src/java/org/apache/cassandra/streaming/messages/IncomingFileMessage.java
@@@ -53,11 -52,18 +53,19 @@@ public class IncomingFileMessage extend
// This can be caused by network/node failure thus we are not retrying
throw eof;
}
- catch (Throwable e)
+ catch (Throwable t)
{
+ // Throwable can be Runtime error containing IOException.
+ // In that case we don't want to retry.
- Throwable cause = e;
++ Throwable cause = t;
+ while ((cause = cause.getCause()) != null)
+ {
+ if (cause instanceof IOException)
+ throw (IOException) cause;
+ }
+ JVMStabilityInspector.inspectThrowable(t);
// Otherwise, we can retry
- session.doRetry(header, e);
+ session.doRetry(header, t);
return null;
}
}
[08/10] cassandra git commit: Merge branch 'cassandra-2.1' into
cassandra-2.2
Posted by yu...@apache.org.
Merge branch 'cassandra-2.1' into cassandra-2.2
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/6734e94b
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/6734e94b
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/6734e94b
Branch: refs/heads/cassandra-2.2
Commit: 6734e94b8d17e3a9f15b3eace27e449881ec49d7
Parents: c17e44a 4e26911
Author: Yuki Morishita <yu...@apache.org>
Authored: Tue May 26 12:16:43 2015 -0500
Committer: Yuki Morishita <yu...@apache.org>
Committed: Tue May 26 12:16:43 2015 -0500
----------------------------------------------------------------------
.../cassandra/streaming/messages/IncomingFileMessage.java | 8 ++++++++
1 file changed, 8 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/6734e94b/src/java/org/apache/cassandra/streaming/messages/IncomingFileMessage.java
----------------------------------------------------------------------
[03/10] cassandra git commit: Handle runtime error case in
CASSANDRA-9132
Posted by yu...@apache.org.
Handle runtime error case in CASSANDRA-9132
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/2beb66e8
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/2beb66e8
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/2beb66e8
Branch: refs/heads/cassandra-2.2
Commit: 2beb66e87e9a8115ab81f3274be0f29f4257641a
Parents: 5a571c6
Author: Yuki Morishita <yu...@apache.org>
Authored: Tue May 26 12:05:41 2015 -0500
Committer: Yuki Morishita <yu...@apache.org>
Committed: Tue May 26 12:05:41 2015 -0500
----------------------------------------------------------------------
.../cassandra/streaming/messages/IncomingFileMessage.java | 8 ++++++++
1 file changed, 8 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/2beb66e8/src/java/org/apache/cassandra/streaming/messages/IncomingFileMessage.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/streaming/messages/IncomingFileMessage.java b/src/java/org/apache/cassandra/streaming/messages/IncomingFileMessage.java
index 5e0e087..99662d0 100644
--- a/src/java/org/apache/cassandra/streaming/messages/IncomingFileMessage.java
+++ b/src/java/org/apache/cassandra/streaming/messages/IncomingFileMessage.java
@@ -54,6 +54,14 @@ public class IncomingFileMessage extends StreamMessage
}
catch (Throwable e)
{
+ // Throwable can be Runtime error containing IOException.
+ // In that case we don't want to retry.
+ Throwable cause = e;
+ while ((cause = cause.getCause()) != null)
+ {
+ if (cause instanceof IOException)
+ throw (IOException) cause;
+ }
// Otherwise, we can retry
session.doRetry(header, e);
return null;
[09/10] cassandra git commit: Merge branch 'cassandra-2.1' into
cassandra-2.2
Posted by yu...@apache.org.
Merge branch 'cassandra-2.1' into cassandra-2.2
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/6734e94b
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/6734e94b
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/6734e94b
Branch: refs/heads/trunk
Commit: 6734e94b8d17e3a9f15b3eace27e449881ec49d7
Parents: c17e44a 4e26911
Author: Yuki Morishita <yu...@apache.org>
Authored: Tue May 26 12:16:43 2015 -0500
Committer: Yuki Morishita <yu...@apache.org>
Committed: Tue May 26 12:16:43 2015 -0500
----------------------------------------------------------------------
.../cassandra/streaming/messages/IncomingFileMessage.java | 8 ++++++++
1 file changed, 8 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/6734e94b/src/java/org/apache/cassandra/streaming/messages/IncomingFileMessage.java
----------------------------------------------------------------------
[06/10] cassandra 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/4e269111
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/4e269111
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/4e269111
Branch: refs/heads/cassandra-2.1
Commit: 4e2691110bde17a54a1b378d5727cc6dcd156300
Parents: f3ca368 2beb66e
Author: Yuki Morishita <yu...@apache.org>
Authored: Tue May 26 12:16:34 2015 -0500
Committer: Yuki Morishita <yu...@apache.org>
Committed: Tue May 26 12:16:34 2015 -0500
----------------------------------------------------------------------
.../cassandra/streaming/messages/IncomingFileMessage.java | 8 ++++++++
1 file changed, 8 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/4e269111/src/java/org/apache/cassandra/streaming/messages/IncomingFileMessage.java
----------------------------------------------------------------------
diff --cc src/java/org/apache/cassandra/streaming/messages/IncomingFileMessage.java
index 9866d1e,99662d0..494af85
--- a/src/java/org/apache/cassandra/streaming/messages/IncomingFileMessage.java
+++ b/src/java/org/apache/cassandra/streaming/messages/IncomingFileMessage.java
@@@ -53,11 -52,18 +53,19 @@@ public class IncomingFileMessage extend
// This can be caused by network/node failure thus we are not retrying
throw eof;
}
- catch (Throwable e)
+ catch (Throwable t)
{
+ // Throwable can be Runtime error containing IOException.
+ // In that case we don't want to retry.
- Throwable cause = e;
++ Throwable cause = t;
+ while ((cause = cause.getCause()) != null)
+ {
+ if (cause instanceof IOException)
+ throw (IOException) cause;
+ }
+ JVMStabilityInspector.inspectThrowable(t);
// Otherwise, we can retry
- session.doRetry(header, e);
+ session.doRetry(header, t);
return null;
}
}
[04/10] cassandra git commit: Handle runtime error case in
CASSANDRA-9132
Posted by yu...@apache.org.
Handle runtime error case in CASSANDRA-9132
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/2beb66e8
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/2beb66e8
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/2beb66e8
Branch: refs/heads/trunk
Commit: 2beb66e87e9a8115ab81f3274be0f29f4257641a
Parents: 5a571c6
Author: Yuki Morishita <yu...@apache.org>
Authored: Tue May 26 12:05:41 2015 -0500
Committer: Yuki Morishita <yu...@apache.org>
Committed: Tue May 26 12:05:41 2015 -0500
----------------------------------------------------------------------
.../cassandra/streaming/messages/IncomingFileMessage.java | 8 ++++++++
1 file changed, 8 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/2beb66e8/src/java/org/apache/cassandra/streaming/messages/IncomingFileMessage.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/streaming/messages/IncomingFileMessage.java b/src/java/org/apache/cassandra/streaming/messages/IncomingFileMessage.java
index 5e0e087..99662d0 100644
--- a/src/java/org/apache/cassandra/streaming/messages/IncomingFileMessage.java
+++ b/src/java/org/apache/cassandra/streaming/messages/IncomingFileMessage.java
@@ -54,6 +54,14 @@ public class IncomingFileMessage extends StreamMessage
}
catch (Throwable e)
{
+ // Throwable can be Runtime error containing IOException.
+ // In that case we don't want to retry.
+ Throwable cause = e;
+ while ((cause = cause.getCause()) != null)
+ {
+ if (cause instanceof IOException)
+ throw (IOException) cause;
+ }
// Otherwise, we can retry
session.doRetry(header, e);
return null;
[10/10] cassandra git commit: Merge branch 'cassandra-2.2' into trunk
Posted by yu...@apache.org.
Merge branch 'cassandra-2.2' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/5e7cdc2c
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/5e7cdc2c
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/5e7cdc2c
Branch: refs/heads/trunk
Commit: 5e7cdc2cb790c6d6d3886e0b554d0fbb3966bd9f
Parents: 747e100 6734e94
Author: Yuki Morishita <yu...@apache.org>
Authored: Tue May 26 12:20:27 2015 -0500
Committer: Yuki Morishita <yu...@apache.org>
Committed: Tue May 26 12:20:27 2015 -0500
----------------------------------------------------------------------
.../cassandra/streaming/messages/IncomingFileMessage.java | 8 ++++++++
1 file changed, 8 insertions(+)
----------------------------------------------------------------------
[02/10] cassandra git commit: Handle runtime error case in
CASSANDRA-9132
Posted by yu...@apache.org.
Handle runtime error case in CASSANDRA-9132
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/2beb66e8
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/2beb66e8
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/2beb66e8
Branch: refs/heads/cassandra-2.1
Commit: 2beb66e87e9a8115ab81f3274be0f29f4257641a
Parents: 5a571c6
Author: Yuki Morishita <yu...@apache.org>
Authored: Tue May 26 12:05:41 2015 -0500
Committer: Yuki Morishita <yu...@apache.org>
Committed: Tue May 26 12:05:41 2015 -0500
----------------------------------------------------------------------
.../cassandra/streaming/messages/IncomingFileMessage.java | 8 ++++++++
1 file changed, 8 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/2beb66e8/src/java/org/apache/cassandra/streaming/messages/IncomingFileMessage.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/streaming/messages/IncomingFileMessage.java b/src/java/org/apache/cassandra/streaming/messages/IncomingFileMessage.java
index 5e0e087..99662d0 100644
--- a/src/java/org/apache/cassandra/streaming/messages/IncomingFileMessage.java
+++ b/src/java/org/apache/cassandra/streaming/messages/IncomingFileMessage.java
@@ -54,6 +54,14 @@ public class IncomingFileMessage extends StreamMessage
}
catch (Throwable e)
{
+ // Throwable can be Runtime error containing IOException.
+ // In that case we don't want to retry.
+ Throwable cause = e;
+ while ((cause = cause.getCause()) != null)
+ {
+ if (cause instanceof IOException)
+ throw (IOException) cause;
+ }
// Otherwise, we can retry
session.doRetry(header, e);
return null;