You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by ja...@apache.org on 2014/07/09 01:22:46 UTC
[1/2] git commit: Anti-compaction proceeds if any part of the repair
failed
Repository: cassandra
Updated Branches:
refs/heads/cassandra-2.1 8571fb578 -> b9d2684a8
Anti-compaction proceeds if any part of the repair failed
patch by jasobrown; reviewed by yukim for CASSANDRA-7521
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/eb4032e5
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/eb4032e5
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/eb4032e5
Branch: refs/heads/cassandra-2.1
Commit: eb4032e5fb4b5c7ec4f59989c0e62ebc431c1e21
Parents: 895eaec
Author: Jason Brown <ja...@apple.com>
Authored: Tue Jul 8 16:20:58 2014 -0700
Committer: Jason Brown <ja...@apple.com>
Committed: Tue Jul 8 16:20:58 2014 -0700
----------------------------------------------------------------------
CHANGES.txt | 1 +
.../cassandra/service/ActiveRepairService.java | 22 +++++++++++---------
.../cassandra/service/StorageService.java | 5 ++++-
3 files changed, 17 insertions(+), 11 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/eb4032e5/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 180b044..7fff2d4 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,5 +1,6 @@
2.1.0-final
* (Windows) fix startup when WMI memory query fails (CASSANDRA-7505)
+ * Anti-compaction proceeds if any part of the repair failed (CASANDRA-7521)
2.1.0-rc3
http://git-wip-us.apache.org/repos/asf/cassandra/blob/eb4032e5/src/java/org/apache/cassandra/service/ActiveRepairService.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/service/ActiveRepairService.java b/src/java/org/apache/cassandra/service/ActiveRepairService.java
index 70394bc..35a86f6 100644
--- a/src/java/org/apache/cassandra/service/ActiveRepairService.java
+++ b/src/java/org/apache/cassandra/service/ActiveRepairService.java
@@ -316,19 +316,21 @@ public class ActiveRepairService
parentRepairSessions.put(parentRepairSession, new ParentRepairSession(columnFamilyStores, ranges, sstablesToRepair, System.currentTimeMillis()));
}
- public void finishParentSession(UUID parentSession, Set<InetAddress> neighbors) throws InterruptedException, ExecutionException, IOException
+ public void finishParentSession(UUID parentSession, Set<InetAddress> neighbors, boolean doAntiCompaction) throws InterruptedException, ExecutionException, IOException
{
-
- for (InetAddress neighbor : neighbors)
- {
- AnticompactionRequest acr = new AnticompactionRequest(parentSession);
- MessageOut<RepairMessage> req = acr.createMessage();
- MessagingService.instance().sendOneWay(req, neighbor);
- }
try
{
- List<Future<?>> futures = doAntiCompaction(parentSession);
- FBUtilities.waitOnFutures(futures);
+ if (doAntiCompaction)
+ {
+ for (InetAddress neighbor : neighbors)
+ {
+ AnticompactionRequest acr = new AnticompactionRequest(parentSession);
+ MessageOut<RepairMessage> req = acr.createMessage();
+ MessagingService.instance().sendOneWay(req, neighbor);
+ }
+ List<Future<?>> futures = doAntiCompaction(parentSession);
+ FBUtilities.waitOnFutures(futures);
+ }
}
finally
{
http://git-wip-us.apache.org/repos/asf/cassandra/blob/eb4032e5/src/java/org/apache/cassandra/service/StorageService.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/service/StorageService.java b/src/java/org/apache/cassandra/service/StorageService.java
index feaeac8..3fd3781 100644
--- a/src/java/org/apache/cassandra/service/StorageService.java
+++ b/src/java/org/apache/cassandra/service/StorageService.java
@@ -2765,6 +2765,7 @@ public class StorageService extends NotificationBroadcasterSupport implements IE
}
}
+ boolean successful = true;
for (RepairFuture future : futures)
{
try
@@ -2776,19 +2777,21 @@ public class StorageService extends NotificationBroadcasterSupport implements IE
}
catch (ExecutionException e)
{
+ successful = false;
message = String.format("Repair session %s for range %s failed with error %s", future.session.getId(), future.session.getRange().toString(), e.getCause().getMessage());
logger.error(message, e);
sendNotification("repair", message, new int[]{cmd, ActiveRepairService.Status.SESSION_FAILED.ordinal()});
}
catch (Exception e)
{
+ successful = false;
message = String.format("Repair session %s for range %s failed with error %s", future.session.getId(), future.session.getRange().toString(), e.getMessage());
logger.error(message, e);
sendNotification("repair", message, new int[]{cmd, ActiveRepairService.Status.SESSION_FAILED.ordinal()});
}
}
if (!fullRepair)
- ActiveRepairService.instance.finishParentSession(parentSession, allNeighbors);
+ ActiveRepairService.instance.finishParentSession(parentSession, allNeighbors, successful);
sendNotification("repair", String.format("Repair command #%d finished", cmd), new int[]{cmd, ActiveRepairService.Status.FINISHED.ordinal()});
}
}, null);
[2/2] git commit: Merge branch 'cassandra-2.1.0' into cassandra-2.1
Posted by ja...@apache.org.
Merge branch 'cassandra-2.1.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/b9d2684a
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/b9d2684a
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/b9d2684a
Branch: refs/heads/cassandra-2.1
Commit: b9d2684a89339e0290fb5db51bfb2c551f150e59
Parents: 8571fb5 eb4032e
Author: Jason Brown <ja...@apple.com>
Authored: Tue Jul 8 16:22:26 2014 -0700
Committer: Jason Brown <ja...@apple.com>
Committed: Tue Jul 8 16:22:26 2014 -0700
----------------------------------------------------------------------
CHANGES.txt | 1 +
.../cassandra/service/ActiveRepairService.java | 22 +++++++++++---------
.../cassandra/service/StorageService.java | 5 ++++-
3 files changed, 17 insertions(+), 11 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/b9d2684a/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 9e84d31,7fff2d4..b3d8a4c
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,12 -1,6 +1,13 @@@
+2.1.1
+ * Improve schema merge performance (CASSANDRA-7444)
+ * Fix NPE when unknown prepared statement ID is used (CASSANDRA-7454)
+ * Adjust MT depth based on # of partition validating (CASSANDRA-5263)
+ * Optimise NativeCell comparisons (CASSANDRA-6755)
+
+
2.1.0-final
* (Windows) fix startup when WMI memory query fails (CASSANDRA-7505)
+ * Anti-compaction proceeds if any part of the repair failed (CASANDRA-7521)
2.1.0-rc3