You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by ma...@apache.org on 2018/02/07 08:12:03 UTC
[2/6] cassandra git commit: Handle error when mutating repairedAt in
nodetool verify
Handle error when mutating repairedAt in nodetool verify
Patch by Sumanth Pasupuleti; reviewed by marcuse for CASSANDRA-13933
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/7885a703
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/7885a703
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/7885a703
Branch: refs/heads/cassandra-3.11
Commit: 7885a703d6dae8c3c6e5a6af632c6a23342593fc
Parents: 7df3605
Author: Sumanth Pasupuleti <su...@gmail.com>
Authored: Wed Feb 7 08:54:53 2018 +0100
Committer: Marcus Eriksson <ma...@apache.org>
Committed: Wed Feb 7 09:04:45 2018 +0100
----------------------------------------------------------------------
CHANGES.txt | 1 +
.../org/apache/cassandra/db/compaction/Verifier.java | 11 ++++++++++-
2 files changed, 11 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/7885a703/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 0eaab6e..4e8f2ac 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
3.0.16
+ * Handle failure when mutating repaired status in Verifier (CASSANDRA-13933)
* Close socket on error during connect on OutboundTcpConnection (CASSANDRA-9630)
* Set encoding for javadoc generation (CASSANDRA-14154)
* Fix index target computation for dense composite tables with dropped compact storage (CASSANDRA-14104)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/7885a703/src/java/org/apache/cassandra/db/compaction/Verifier.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/db/compaction/Verifier.java b/src/java/org/apache/cassandra/db/compaction/Verifier.java
index 68088b3..86bc377 100644
--- a/src/java/org/apache/cassandra/db/compaction/Verifier.java
+++ b/src/java/org/apache/cassandra/db/compaction/Verifier.java
@@ -255,7 +255,16 @@ public class Verifier implements Closeable
private void markAndThrow(boolean mutateRepaired) throws IOException
{
if (mutateRepaired) // if we are able to mutate repaired flag, an incremental repair should be enough
- sstable.descriptor.getMetadataSerializer().mutateRepairedAt(sstable.descriptor, ActiveRepairService.UNREPAIRED_SSTABLE);
+ {
+ try
+ {
+ sstable.descriptor.getMetadataSerializer().mutateRepairedAt(sstable.descriptor, ActiveRepairService.UNREPAIRED_SSTABLE);
+ }
+ catch(IOException ioe)
+ {
+ outputHandler.output("Error mutating repairedAt for SSTable " + sstable.getFilename() + ", as part of markAndThrow");
+ }
+ }
throw new CorruptSSTableException(new Exception(String.format("Invalid SSTable %s, please force %srepair", sstable.getFilename(), mutateRepaired ? "" : "a full ")), sstable.getFilename());
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cassandra.apache.org
For additional commands, e-mail: commits-help@cassandra.apache.org