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/06 23:56:17 UTC
[01/17] git commit: handle-trigger-non-existance patch by Vijay;
reviewed by Brandon Williams for CASSANDRA-5826
Updated Branches:
refs/heads/cassandra-1.1 155afa1b7 -> 238139cda
refs/heads/cassandra-1.2 bcfe352ea -> 27943b117
refs/heads/cassandra-2.0 ed4a06771 -> 3205c10de
refs/heads/cassandra-2.0.0 3d95cad4f -> af85f2327
refs/heads/trunk 885ba119f -> 426caf7c0
handle-trigger-non-existance
patch by Vijay; reviewed by Brandon Williams for CASSANDRA-5826
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/6851c818
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/6851c818
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/6851c818
Branch: refs/heads/cassandra-2.0
Commit: 6851c81867f317110487b05b509841f5c159aaf1
Parents: cf62bdc
Author: Vijay Parthasarathy <vi...@gmail.com>
Authored: Mon Aug 5 19:45:57 2013 -0700
Committer: Vijay Parthasarathy <vi...@gmail.com>
Committed: Mon Aug 5 20:15:36 2013 -0700
----------------------------------------------------------------------
.../cassandra/triggers/TriggerExecutor.java | 6 ++++--
.../org/apache/cassandra/utils/FBUtilities.java | 18 +++++++++++++-----
2 files changed, 17 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/6851c818/src/java/org/apache/cassandra/triggers/TriggerExecutor.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/triggers/TriggerExecutor.java b/src/java/org/apache/cassandra/triggers/TriggerExecutor.java
index c6feb84..582a224 100644
--- a/src/java/org/apache/cassandra/triggers/TriggerExecutor.java
+++ b/src/java/org/apache/cassandra/triggers/TriggerExecutor.java
@@ -42,7 +42,6 @@ public class TriggerExecutor
private final Map<String, ITrigger> cachedTriggers = Maps.newConcurrentMap();
private final ClassLoader parent = Thread.currentThread().getContextClassLoader();
- private final File triggerDirectory = FBUtilities.cassandraTriggerDir();
private volatile ClassLoader customClassLoader;
private TriggerExecutor()
@@ -56,7 +55,10 @@ public class TriggerExecutor
*/
public void reloadClasses()
{
- customClassLoader = new CustomClassLoader(parent, triggerDirectory);
+ File tiggerDirectory = FBUtilities.cassandraTriggerDir();
+ if (tiggerDirectory == null)
+ return;
+ customClassLoader = new CustomClassLoader(parent, tiggerDirectory);
cachedTriggers.clear();
}
http://git-wip-us.apache.org/repos/asf/cassandra/blob/6851c818/src/java/org/apache/cassandra/utils/FBUtilities.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/utils/FBUtilities.java b/src/java/org/apache/cassandra/utils/FBUtilities.java
index 7873ce7..e5bd71e 100644
--- a/src/java/org/apache/cassandra/utils/FBUtilities.java
+++ b/src/java/org/apache/cassandra/utils/FBUtilities.java
@@ -52,7 +52,6 @@ import org.apache.cassandra.dht.Token;
import org.apache.cassandra.exceptions.ConfigurationException;
import org.apache.cassandra.io.IVersionedSerializer;
import org.apache.cassandra.io.util.DataOutputBuffer;
-import org.apache.cassandra.io.util.FileUtils;
import org.apache.cassandra.io.util.IAllocator;
import org.apache.cassandra.net.AsyncOneResponse;
import org.apache.thrift.TBase;
@@ -344,13 +343,22 @@ public class FBUtilities
public static File cassandraTriggerDir()
{
- File triggerDir;
+ File triggerDir = null;
if (System.getProperty("cassandra.triggers_dir") != null)
+ {
triggerDir = new File(System.getProperty("cassandra.triggers_dir"));
+ }
else
- triggerDir = new File(FBUtilities.class.getClassLoader().getResource(DEFAULT_TRIGGER_DIR).getFile());
- if (!triggerDir.exists())
- throw new RuntimeException("Trigger Directory doesnt exist, please create inside conf.");
+ {
+ URL confDir = FBUtilities.class.getClassLoader().getResource(DEFAULT_TRIGGER_DIR);
+ if (confDir != null)
+ triggerDir = new File(confDir.getFile());
+ }
+ if (triggerDir == null || !triggerDir.exists())
+ {
+ logger.warn("Trigger Directory doesnt exist, please create it and try again.");
+ return null;
+ }
return triggerDir;
}
[10/17] git commit: Merge branch 'cassandra-1.1' into cassandra-1.2
Posted by jb...@apache.org.
Merge branch 'cassandra-1.1' into cassandra-1.2
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/27943b11
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/27943b11
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/27943b11
Branch: refs/heads/cassandra-1.2
Commit: 27943b11770b81d0f94d6d4302cc7f4b76067327
Parents: bcfe352 238139c
Author: Jonathan Ellis <jb...@apache.org>
Authored: Tue Aug 6 16:55:42 2013 -0500
Committer: Jonathan Ellis <jb...@apache.org>
Committed: Tue Aug 6 16:55:42 2013 -0500
----------------------------------------------------------------------
----------------------------------------------------------------------
[06/17] git commit: catch all Throwables, not just Exceptions
Posted by jb...@apache.org.
catch all Throwables, not just Exceptions
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/238139cd
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/238139cd
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/238139cd
Branch: refs/heads/cassandra-1.1
Commit: 238139cda53eae51516c477f7ac10c5397df02a4
Parents: 155afa1
Author: Jonathan Ellis <jb...@apache.org>
Authored: Tue Aug 6 16:55:20 2013 -0500
Committer: Jonathan Ellis <jb...@apache.org>
Committed: Tue Aug 6 16:55:20 2013 -0500
----------------------------------------------------------------------
CHANGES.txt | 4 ++++
src/java/org/apache/cassandra/db/compaction/CompactionTask.java | 5 +++--
2 files changed, 7 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/238139cd/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 69df3de..75b349f 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,3 +1,7 @@
+1.1.next
+ * Backport compaction exception handling from 1.2
+
+
1.1.12
* Remove buggy thrift max message length option (CASSANDRA-5529)
* Add retry mechanism to OTC for non-droppable_verbs (CASSANDRA-5393)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/238139cd/src/java/org/apache/cassandra/db/compaction/CompactionTask.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/db/compaction/CompactionTask.java b/src/java/org/apache/cassandra/db/compaction/CompactionTask.java
index 02d20cf..b467a2f 100644
--- a/src/java/org/apache/cassandra/db/compaction/CompactionTask.java
+++ b/src/java/org/apache/cassandra/db/compaction/CompactionTask.java
@@ -23,6 +23,7 @@ import java.io.IOException;
import java.util.*;
import com.google.common.base.Predicates;
+import com.google.common.base.Throwables;
import com.google.common.collect.Iterators;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -188,7 +189,7 @@ public class CompactionTask extends AbstractCompactionTask
for (SSTableWriter completedWriter : writers)
sstables.add(completedWriter.closeAndOpenReader(maxAge));
}
- catch (Exception e)
+ catch (Throwable t)
{
for (SSTableWriter writer : writers)
writer.abort();
@@ -198,7 +199,7 @@ public class CompactionTask extends AbstractCompactionTask
sstable.markCompacted();
sstable.releaseReference();
}
- throw FBUtilities.unchecked(e);
+ throw Throwables.propagate(t);
}
finally
{
[14/17] git commit: Merge branch 'cassandra-1.2' into cassandra-2.0.0
Posted by jb...@apache.org.
Merge branch 'cassandra-1.2' into cassandra-2.0.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/af85f232
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/af85f232
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/af85f232
Branch: refs/heads/cassandra-2.0.0
Commit: af85f2327c0de134bb3cae84f6b09d811b774579
Parents: 3d95cad 27943b1
Author: Jonathan Ellis <jb...@apache.org>
Authored: Tue Aug 6 16:55:53 2013 -0500
Committer: Jonathan Ellis <jb...@apache.org>
Committed: Tue Aug 6 16:55:53 2013 -0500
----------------------------------------------------------------------
----------------------------------------------------------------------
[08/17] git commit: Merge branch 'cassandra-1.1' into cassandra-1.2
Posted by jb...@apache.org.
Merge branch 'cassandra-1.1' into cassandra-1.2
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/27943b11
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/27943b11
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/27943b11
Branch: refs/heads/cassandra-2.0
Commit: 27943b11770b81d0f94d6d4302cc7f4b76067327
Parents: bcfe352 238139c
Author: Jonathan Ellis <jb...@apache.org>
Authored: Tue Aug 6 16:55:42 2013 -0500
Committer: Jonathan Ellis <jb...@apache.org>
Committed: Tue Aug 6 16:55:42 2013 -0500
----------------------------------------------------------------------
----------------------------------------------------------------------
[07/17] git commit: catch all Throwables, not just Exceptions
Posted by jb...@apache.org.
catch all Throwables, not just Exceptions
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/238139cd
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/238139cd
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/238139cd
Branch: refs/heads/trunk
Commit: 238139cda53eae51516c477f7ac10c5397df02a4
Parents: 155afa1
Author: Jonathan Ellis <jb...@apache.org>
Authored: Tue Aug 6 16:55:20 2013 -0500
Committer: Jonathan Ellis <jb...@apache.org>
Committed: Tue Aug 6 16:55:20 2013 -0500
----------------------------------------------------------------------
CHANGES.txt | 4 ++++
src/java/org/apache/cassandra/db/compaction/CompactionTask.java | 5 +++--
2 files changed, 7 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/238139cd/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 69df3de..75b349f 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,3 +1,7 @@
+1.1.next
+ * Backport compaction exception handling from 1.2
+
+
1.1.12
* Remove buggy thrift max message length option (CASSANDRA-5529)
* Add retry mechanism to OTC for non-droppable_verbs (CASSANDRA-5393)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/238139cd/src/java/org/apache/cassandra/db/compaction/CompactionTask.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/db/compaction/CompactionTask.java b/src/java/org/apache/cassandra/db/compaction/CompactionTask.java
index 02d20cf..b467a2f 100644
--- a/src/java/org/apache/cassandra/db/compaction/CompactionTask.java
+++ b/src/java/org/apache/cassandra/db/compaction/CompactionTask.java
@@ -23,6 +23,7 @@ import java.io.IOException;
import java.util.*;
import com.google.common.base.Predicates;
+import com.google.common.base.Throwables;
import com.google.common.collect.Iterators;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -188,7 +189,7 @@ public class CompactionTask extends AbstractCompactionTask
for (SSTableWriter completedWriter : writers)
sstables.add(completedWriter.closeAndOpenReader(maxAge));
}
- catch (Exception e)
+ catch (Throwable t)
{
for (SSTableWriter writer : writers)
writer.abort();
@@ -198,7 +199,7 @@ public class CompactionTask extends AbstractCompactionTask
sstable.markCompacted();
sstable.releaseReference();
}
- throw FBUtilities.unchecked(e);
+ throw Throwables.propagate(t);
}
finally
{
[04/17] git commit: catch all Throwables, not just Exceptions
Posted by jb...@apache.org.
catch all Throwables, not just Exceptions
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/238139cd
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/238139cd
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/238139cd
Branch: refs/heads/cassandra-2.0
Commit: 238139cda53eae51516c477f7ac10c5397df02a4
Parents: 155afa1
Author: Jonathan Ellis <jb...@apache.org>
Authored: Tue Aug 6 16:55:20 2013 -0500
Committer: Jonathan Ellis <jb...@apache.org>
Committed: Tue Aug 6 16:55:20 2013 -0500
----------------------------------------------------------------------
CHANGES.txt | 4 ++++
src/java/org/apache/cassandra/db/compaction/CompactionTask.java | 5 +++--
2 files changed, 7 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/238139cd/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 69df3de..75b349f 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,3 +1,7 @@
+1.1.next
+ * Backport compaction exception handling from 1.2
+
+
1.1.12
* Remove buggy thrift max message length option (CASSANDRA-5529)
* Add retry mechanism to OTC for non-droppable_verbs (CASSANDRA-5393)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/238139cd/src/java/org/apache/cassandra/db/compaction/CompactionTask.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/db/compaction/CompactionTask.java b/src/java/org/apache/cassandra/db/compaction/CompactionTask.java
index 02d20cf..b467a2f 100644
--- a/src/java/org/apache/cassandra/db/compaction/CompactionTask.java
+++ b/src/java/org/apache/cassandra/db/compaction/CompactionTask.java
@@ -23,6 +23,7 @@ import java.io.IOException;
import java.util.*;
import com.google.common.base.Predicates;
+import com.google.common.base.Throwables;
import com.google.common.collect.Iterators;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -188,7 +189,7 @@ public class CompactionTask extends AbstractCompactionTask
for (SSTableWriter completedWriter : writers)
sstables.add(completedWriter.closeAndOpenReader(maxAge));
}
- catch (Exception e)
+ catch (Throwable t)
{
for (SSTableWriter writer : writers)
writer.abort();
@@ -198,7 +199,7 @@ public class CompactionTask extends AbstractCompactionTask
sstable.markCompacted();
sstable.releaseReference();
}
- throw FBUtilities.unchecked(e);
+ throw Throwables.propagate(t);
}
finally
{
[02/17] git commit: fix typo
Posted by jb...@apache.org.
fix typo
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/3d95cad4
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/3d95cad4
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/3d95cad4
Branch: refs/heads/cassandra-2.0
Commit: 3d95cad4f014deb7868a7cbd816351a6bdfacf32
Parents: 6851c81
Author: Vijay Parthasarathy <vi...@gmail.com>
Authored: Mon Aug 5 19:54:53 2013 -0700
Committer: Vijay Parthasarathy <vi...@gmail.com>
Committed: Mon Aug 5 20:15:50 2013 -0700
----------------------------------------------------------------------
src/java/org/apache/cassandra/utils/FBUtilities.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/3d95cad4/src/java/org/apache/cassandra/utils/FBUtilities.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/utils/FBUtilities.java b/src/java/org/apache/cassandra/utils/FBUtilities.java
index e5bd71e..0460eeb 100644
--- a/src/java/org/apache/cassandra/utils/FBUtilities.java
+++ b/src/java/org/apache/cassandra/utils/FBUtilities.java
@@ -356,7 +356,7 @@ public class FBUtilities
}
if (triggerDir == null || !triggerDir.exists())
{
- logger.warn("Trigger Directory doesnt exist, please create it and try again.");
+ logger.warn("Trigger directory doesn't exist, please create it and try again.");
return null;
}
return triggerDir;
[13/17] git commit: Merge branch 'cassandra-1.2' into cassandra-2.0.0
Posted by jb...@apache.org.
Merge branch 'cassandra-1.2' into cassandra-2.0.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/af85f232
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/af85f232
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/af85f232
Branch: refs/heads/cassandra-2.0
Commit: af85f2327c0de134bb3cae84f6b09d811b774579
Parents: 3d95cad 27943b1
Author: Jonathan Ellis <jb...@apache.org>
Authored: Tue Aug 6 16:55:53 2013 -0500
Committer: Jonathan Ellis <jb...@apache.org>
Committed: Tue Aug 6 16:55:53 2013 -0500
----------------------------------------------------------------------
----------------------------------------------------------------------
[16/17] git commit: Merge branch 'cassandra-2.0.0' into cassandra-2.0
Posted by jb...@apache.org.
Merge branch 'cassandra-2.0.0' into cassandra-2.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/3205c10d
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/3205c10d
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/3205c10d
Branch: refs/heads/trunk
Commit: 3205c10de90706d9ae2eb1982efae67fa575e214
Parents: ed4a067 af85f23
Author: Jonathan Ellis <jb...@apache.org>
Authored: Tue Aug 6 16:56:01 2013 -0500
Committer: Jonathan Ellis <jb...@apache.org>
Committed: Tue Aug 6 16:56:01 2013 -0500
----------------------------------------------------------------------
.../cassandra/triggers/TriggerExecutor.java | 6 ++++--
.../org/apache/cassandra/utils/FBUtilities.java | 18 +++++++++++++-----
2 files changed, 17 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
[11/17] git commit: Merge branch 'cassandra-1.1' into cassandra-1.2
Posted by jb...@apache.org.
Merge branch 'cassandra-1.1' into cassandra-1.2
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/27943b11
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/27943b11
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/27943b11
Branch: refs/heads/trunk
Commit: 27943b11770b81d0f94d6d4302cc7f4b76067327
Parents: bcfe352 238139c
Author: Jonathan Ellis <jb...@apache.org>
Authored: Tue Aug 6 16:55:42 2013 -0500
Committer: Jonathan Ellis <jb...@apache.org>
Committed: Tue Aug 6 16:55:42 2013 -0500
----------------------------------------------------------------------
----------------------------------------------------------------------
[17/17] git commit: Merge branch 'cassandra-2.0' into trunk
Posted by jb...@apache.org.
Merge branch 'cassandra-2.0' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/426caf7c
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/426caf7c
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/426caf7c
Branch: refs/heads/trunk
Commit: 426caf7c03f9e109115f5d8e26a694c03cf8f0c7
Parents: 885ba11 3205c10
Author: Jonathan Ellis <jb...@apache.org>
Authored: Tue Aug 6 16:56:10 2013 -0500
Committer: Jonathan Ellis <jb...@apache.org>
Committed: Tue Aug 6 16:56:10 2013 -0500
----------------------------------------------------------------------
----------------------------------------------------------------------
[12/17] git commit: Merge branch 'cassandra-1.2' into cassandra-2.0.0
Posted by jb...@apache.org.
Merge branch 'cassandra-1.2' into cassandra-2.0.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/af85f232
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/af85f232
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/af85f232
Branch: refs/heads/trunk
Commit: af85f2327c0de134bb3cae84f6b09d811b774579
Parents: 3d95cad 27943b1
Author: Jonathan Ellis <jb...@apache.org>
Authored: Tue Aug 6 16:55:53 2013 -0500
Committer: Jonathan Ellis <jb...@apache.org>
Committed: Tue Aug 6 16:55:53 2013 -0500
----------------------------------------------------------------------
----------------------------------------------------------------------
[09/17] git commit: Merge branch 'cassandra-1.1' into cassandra-1.2
Posted by jb...@apache.org.
Merge branch 'cassandra-1.1' into cassandra-1.2
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/27943b11
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/27943b11
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/27943b11
Branch: refs/heads/cassandra-2.0.0
Commit: 27943b11770b81d0f94d6d4302cc7f4b76067327
Parents: bcfe352 238139c
Author: Jonathan Ellis <jb...@apache.org>
Authored: Tue Aug 6 16:55:42 2013 -0500
Committer: Jonathan Ellis <jb...@apache.org>
Committed: Tue Aug 6 16:55:42 2013 -0500
----------------------------------------------------------------------
----------------------------------------------------------------------
[03/17] git commit: catch all Throwables, not just Exceptions
Posted by jb...@apache.org.
catch all Throwables, not just Exceptions
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/238139cd
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/238139cd
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/238139cd
Branch: refs/heads/cassandra-1.2
Commit: 238139cda53eae51516c477f7ac10c5397df02a4
Parents: 155afa1
Author: Jonathan Ellis <jb...@apache.org>
Authored: Tue Aug 6 16:55:20 2013 -0500
Committer: Jonathan Ellis <jb...@apache.org>
Committed: Tue Aug 6 16:55:20 2013 -0500
----------------------------------------------------------------------
CHANGES.txt | 4 ++++
src/java/org/apache/cassandra/db/compaction/CompactionTask.java | 5 +++--
2 files changed, 7 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/238139cd/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 69df3de..75b349f 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,3 +1,7 @@
+1.1.next
+ * Backport compaction exception handling from 1.2
+
+
1.1.12
* Remove buggy thrift max message length option (CASSANDRA-5529)
* Add retry mechanism to OTC for non-droppable_verbs (CASSANDRA-5393)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/238139cd/src/java/org/apache/cassandra/db/compaction/CompactionTask.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/db/compaction/CompactionTask.java b/src/java/org/apache/cassandra/db/compaction/CompactionTask.java
index 02d20cf..b467a2f 100644
--- a/src/java/org/apache/cassandra/db/compaction/CompactionTask.java
+++ b/src/java/org/apache/cassandra/db/compaction/CompactionTask.java
@@ -23,6 +23,7 @@ import java.io.IOException;
import java.util.*;
import com.google.common.base.Predicates;
+import com.google.common.base.Throwables;
import com.google.common.collect.Iterators;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -188,7 +189,7 @@ public class CompactionTask extends AbstractCompactionTask
for (SSTableWriter completedWriter : writers)
sstables.add(completedWriter.closeAndOpenReader(maxAge));
}
- catch (Exception e)
+ catch (Throwable t)
{
for (SSTableWriter writer : writers)
writer.abort();
@@ -198,7 +199,7 @@ public class CompactionTask extends AbstractCompactionTask
sstable.markCompacted();
sstable.releaseReference();
}
- throw FBUtilities.unchecked(e);
+ throw Throwables.propagate(t);
}
finally
{
[15/17] git commit: Merge branch 'cassandra-2.0.0' into cassandra-2.0
Posted by jb...@apache.org.
Merge branch 'cassandra-2.0.0' into cassandra-2.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/3205c10d
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/3205c10d
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/3205c10d
Branch: refs/heads/cassandra-2.0
Commit: 3205c10de90706d9ae2eb1982efae67fa575e214
Parents: ed4a067 af85f23
Author: Jonathan Ellis <jb...@apache.org>
Authored: Tue Aug 6 16:56:01 2013 -0500
Committer: Jonathan Ellis <jb...@apache.org>
Committed: Tue Aug 6 16:56:01 2013 -0500
----------------------------------------------------------------------
.../cassandra/triggers/TriggerExecutor.java | 6 ++++--
.../org/apache/cassandra/utils/FBUtilities.java | 18 +++++++++++++-----
2 files changed, 17 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
[05/17] git commit: catch all Throwables, not just Exceptions
Posted by jb...@apache.org.
catch all Throwables, not just Exceptions
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/238139cd
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/238139cd
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/238139cd
Branch: refs/heads/cassandra-2.0.0
Commit: 238139cda53eae51516c477f7ac10c5397df02a4
Parents: 155afa1
Author: Jonathan Ellis <jb...@apache.org>
Authored: Tue Aug 6 16:55:20 2013 -0500
Committer: Jonathan Ellis <jb...@apache.org>
Committed: Tue Aug 6 16:55:20 2013 -0500
----------------------------------------------------------------------
CHANGES.txt | 4 ++++
src/java/org/apache/cassandra/db/compaction/CompactionTask.java | 5 +++--
2 files changed, 7 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/238139cd/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 69df3de..75b349f 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,3 +1,7 @@
+1.1.next
+ * Backport compaction exception handling from 1.2
+
+
1.1.12
* Remove buggy thrift max message length option (CASSANDRA-5529)
* Add retry mechanism to OTC for non-droppable_verbs (CASSANDRA-5393)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/238139cd/src/java/org/apache/cassandra/db/compaction/CompactionTask.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/db/compaction/CompactionTask.java b/src/java/org/apache/cassandra/db/compaction/CompactionTask.java
index 02d20cf..b467a2f 100644
--- a/src/java/org/apache/cassandra/db/compaction/CompactionTask.java
+++ b/src/java/org/apache/cassandra/db/compaction/CompactionTask.java
@@ -23,6 +23,7 @@ import java.io.IOException;
import java.util.*;
import com.google.common.base.Predicates;
+import com.google.common.base.Throwables;
import com.google.common.collect.Iterators;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -188,7 +189,7 @@ public class CompactionTask extends AbstractCompactionTask
for (SSTableWriter completedWriter : writers)
sstables.add(completedWriter.closeAndOpenReader(maxAge));
}
- catch (Exception e)
+ catch (Throwable t)
{
for (SSTableWriter writer : writers)
writer.abort();
@@ -198,7 +199,7 @@ public class CompactionTask extends AbstractCompactionTask
sstable.markCompacted();
sstable.releaseReference();
}
- throw FBUtilities.unchecked(e);
+ throw Throwables.propagate(t);
}
finally
{