You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by al...@apache.org on 2015/12/19 00:39:52 UTC
[1/4] cassandra git commit: Fix bugs in commit log archiving startup
behavior
Repository: cassandra
Updated Branches:
refs/heads/trunk 01b3508e0 -> 7e4737716
Fix bugs in commit log archiving startup behavior
patch by Ariel Weisberg; reviewed by Branimir Lambov for CASSANDRA-10593
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/3740f815
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/3740f815
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/3740f815
Branch: refs/heads/trunk
Commit: 3740f815c21254bd625ad1cbe8d47aa657727a83
Parents: 124f1bd
Author: Ariel Weisberg <ar...@datastax.com>
Authored: Thu Dec 3 14:37:26 2015 -0500
Committer: Aleksey Yeschenko <al...@apache.org>
Committed: Fri Dec 18 23:37:05 2015 +0000
----------------------------------------------------------------------
CHANGES.txt | 1 +
.../cassandra/db/commitlog/CommitLogArchiver.java | 17 ++++++++++-------
.../db/commitlog/CommitLogSegmentManager.java | 3 ++-
3 files changed, 13 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/3740f815/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 90f1bca..581784e 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
2.1.13
+ * Fix bugs in commit log archiving startup behavior (CASSANDRA-10593)
* (cqlsh) further optimise COPY FROM (CASSANDRA-9302)
* Allow CREATE TABLE WITH ID (CASSANDRA-9179)
* Make Stress compiles within eclipse (CASSANDRA-10807)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/3740f815/src/java/org/apache/cassandra/db/commitlog/CommitLogArchiver.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/db/commitlog/CommitLogArchiver.java b/src/java/org/apache/cassandra/db/commitlog/CommitLogArchiver.java
index 91f3179..8d9a6b3 100644
--- a/src/java/org/apache/cassandra/db/commitlog/CommitLogArchiver.java
+++ b/src/java/org/apache/cassandra/db/commitlog/CommitLogArchiver.java
@@ -1,5 +1,5 @@
/*
- *
+ *
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -7,16 +7,16 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
- *
+ *
*/
package org.apache.cassandra.db.commitlog;
@@ -173,10 +173,13 @@ public class CommitLogArchiver
}
catch (ExecutionException e)
{
- if (e.getCause() instanceof IOException)
+ if (e.getCause() instanceof RuntimeException)
{
- logger.error("Looks like the archiving of file {} failed earlier, cassandra is going to ignore this segment for now.", name);
- return false;
+ if (e.getCause().getCause() instanceof IOException)
+ {
+ logger.error("Looks like the archiving of file {} failed earlier, cassandra is going to ignore this segment for now.", name, e.getCause().getCause());
+ return false;
+ }
}
throw new RuntimeException(e);
}
http://git-wip-us.apache.org/repos/asf/cassandra/blob/3740f815/src/java/org/apache/cassandra/db/commitlog/CommitLogSegmentManager.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/db/commitlog/CommitLogSegmentManager.java b/src/java/org/apache/cassandra/db/commitlog/CommitLogSegmentManager.java
index 9310d67..0ea54ab 100644
--- a/src/java/org/apache/cassandra/db/commitlog/CommitLogSegmentManager.java
+++ b/src/java/org/apache/cassandra/db/commitlog/CommitLogSegmentManager.java
@@ -383,7 +383,8 @@ public class CommitLogSegmentManager
void recycleSegment(final File file)
{
if (isCapExceeded()
- || CommitLogDescriptor.fromFileName(file.getName()).getMessagingVersion() != MessagingService.current_version)
+ || CommitLogDescriptor.fromFileName(file.getName()).getMessagingVersion() != MessagingService.current_version
+ || !DatabaseDescriptor.getCommitLogSegmentRecyclingEnabled())
{
// (don't decrease managed size, since this was never a "live" segment)
logger.debug("(Unopened) segment {} is no longer needed and will be deleted now", file);
[2/4] cassandra git commit: Merge branch 'cassandra-2.1' into
cassandra-2.2
Posted by al...@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/c26b3971
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/c26b3971
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/c26b3971
Branch: refs/heads/trunk
Commit: c26b3971622f55589f4f080516c9e01311b4e7b1
Parents: bcd68b5 3740f81
Author: Aleksey Yeschenko <al...@apache.org>
Authored: Fri Dec 18 23:38:40 2015 +0000
Committer: Aleksey Yeschenko <al...@apache.org>
Committed: Fri Dec 18 23:38:40 2015 +0000
----------------------------------------------------------------------
CHANGES.txt | 1 +
.../apache/cassandra/db/commitlog/CommitLogArchiver.java | 9 ++++++---
2 files changed, 7 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/c26b3971/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 88ef42e,581784e..1ff1a5c
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,12 -1,5 +1,13 @@@
-2.1.13
+2.2.5
+ * (cqlsh) show correct column names for empty result sets (CASSANDRA-9813)
+ * Add new types to Stress (CASSANDRA-9556)
+ * Add property to allow listening on broadcast interface (CASSANDRA-9748)
+ * Fix regression in split size on CqlInputFormat (CASSANDRA-10835)
+ * Better handling of SSL connection errors inter-node (CASSANDRA-10816)
+ * Disable reloading of GossipingPropertyFileSnitch (CASSANDRA-9474)
+ * Verify tables in pseudo-system keyspaces at startup (CASSANDRA-10761)
+Merged from 2.1:
+ * Fix bugs in commit log archiving startup behavior (CASSANDRA-10593)
* (cqlsh) further optimise COPY FROM (CASSANDRA-9302)
* Allow CREATE TABLE WITH ID (CASSANDRA-9179)
* Make Stress compiles within eclipse (CASSANDRA-10807)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/c26b3971/src/java/org/apache/cassandra/db/commitlog/CommitLogArchiver.java
----------------------------------------------------------------------
[3/4] cassandra git commit: Merge branch 'cassandra-2.2' into
cassandra-3.0
Posted by al...@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/d5326d4a
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/d5326d4a
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/d5326d4a
Branch: refs/heads/trunk
Commit: d5326d4aa5d1d89d36c0600508323ccf8fa109da
Parents: 2800bf1 c26b397
Author: Aleksey Yeschenko <al...@apache.org>
Authored: Fri Dec 18 23:39:09 2015 +0000
Committer: Aleksey Yeschenko <al...@apache.org>
Committed: Fri Dec 18 23:39:09 2015 +0000
----------------------------------------------------------------------
CHANGES.txt | 1 +
.../apache/cassandra/db/commitlog/CommitLogArchiver.java | 9 ++++++---
2 files changed, 7 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/d5326d4a/CHANGES.txt
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/d5326d4a/src/java/org/apache/cassandra/db/commitlog/CommitLogArchiver.java
----------------------------------------------------------------------
[4/4] cassandra git commit: Merge branch 'cassandra-3.0' into trunk
Posted by al...@apache.org.
Merge branch 'cassandra-3.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/7e473771
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/7e473771
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/7e473771
Branch: refs/heads/trunk
Commit: 7e47377164949d23a468cf012736efb96f1e7dcc
Parents: 01b3508 d5326d4
Author: Aleksey Yeschenko <al...@apache.org>
Authored: Fri Dec 18 23:39:37 2015 +0000
Committer: Aleksey Yeschenko <al...@apache.org>
Committed: Fri Dec 18 23:39:37 2015 +0000
----------------------------------------------------------------------
CHANGES.txt | 1 +
.../apache/cassandra/db/commitlog/CommitLogArchiver.java | 9 ++++++---
2 files changed, 7 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/7e473771/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 0df24d5,d0f1613..bf2ca61
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -30,7 -7,12 +30,8 @@@ Merged from 2.2
* (cqlsh) show correct column names for empty result sets (CASSANDRA-9813)
* Add new types to Stress (CASSANDRA-9556)
* Add property to allow listening on broadcast interface (CASSANDRA-9748)
- * Fix regression in split size on CqlInputFormat (CASSANDRA-10835)
- * Better handling of SSL connection errors inter-node (CASSANDRA-10816)
- * Disable reloading of GossipingPropertyFileSnitch (CASSANDRA-9474)
- * Verify tables in pseudo-system keyspaces at startup (CASSANDRA-10761)
Merged from 2.1:
+ * Fix bugs in commit log archiving startup behavior (CASSANDRA-10593)
* (cqlsh) further optimise COPY FROM (CASSANDRA-9302)
* Allow CREATE TABLE WITH ID (CASSANDRA-9179)
* Make Stress compiles within eclipse (CASSANDRA-10807)