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:02 UTC
[1/6] cassandra git commit: Handle error when mutating repairedAt in
nodetool verify
Repository: cassandra
Updated Branches:
refs/heads/cassandra-3.0 7df36056b -> 7885a703d
refs/heads/cassandra-3.11 de6c62dd6 -> d36919096
refs/heads/trunk f2fc2e967 -> 5c3e33b17
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.0
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
[5/6] cassandra git commit: Merge branch 'cassandra-3.0' into
cassandra-3.11
Posted by ma...@apache.org.
Merge branch 'cassandra-3.0' into cassandra-3.11
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/d3691909
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/d3691909
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/d3691909
Branch: refs/heads/cassandra-3.11
Commit: d369190964be9a6011f707a7e584446f9ec57a73
Parents: de6c62d 7885a70
Author: Marcus Eriksson <ma...@apache.org>
Authored: Wed Feb 7 09:06:19 2018 +0100
Committer: Marcus Eriksson <ma...@apache.org>
Committed: Wed Feb 7 09:06:19 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/d3691909/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 30ca8a8,4e8f2ac..8c0d8f0
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,25 -1,6 +1,26 @@@
-3.0.16
- * Handle failure when mutating repaired status in Verifier (CASSANDRA-13933)
+3.11.2
+ * Remove dependencies on JVM internal classes from JMXServerUtils (CASSANDRA-14173)
+ * Add DEFAULT, UNSET, MBEAN and MBEANS to `ReservedKeywords` (CASSANDRA-14205)
+ * Add Unittest for schema migration fix (CASSANDRA-14140)
+ * Print correct snitch info from nodetool describecluster (CASSANDRA-13528)
* Close socket on error during connect on OutboundTcpConnection (CASSANDRA-9630)
+ * Enable CDC unittest (CASSANDRA-14141)
+ * Acquire read lock before accessing CompactionStrategyManager fields (CASSANDRA-14139)
+ * Split CommitLogStressTest to avoid timeout (CASSANDRA-14143)
+ * Avoid invalidating disk boundaries unnecessarily (CASSANDRA-14083)
+ * Avoid exposing compaction strategy index externally (CASSANDRA-14082)
+ * Prevent continuous schema exchange between 3.0 and 3.11 nodes (CASSANDRA-14109)
+ * Fix imbalanced disks when replacing node with same address with JBOD (CASSANDRA-14084)
+ * Reload compaction strategies when disk boundaries are invalidated (CASSANDRA-13948)
+ * Remove OpenJDK log warning (CASSANDRA-13916)
+ * Prevent compaction strategies from looping indefinitely (CASSANDRA-14079)
+ * Cache disk boundaries (CASSANDRA-13215)
+ * Add asm jar to build.xml for maven builds (CASSANDRA-11193)
+ * Round buffer size to powers of 2 for the chunk cache (CASSANDRA-13897)
+ * Update jackson JSON jars (CASSANDRA-13949)
+ * Avoid locks when checking LCS fanout and if we should defrag (CASSANDRA-13930)
+Merged from 3.0:
++ * Handle failure when mutating repaired status in Verifier (CASSANDRA-13933)
* Set encoding for javadoc generation (CASSANDRA-14154)
* Fix index target computation for dense composite tables with dropped compact storage (CASSANDRA-14104)
* Improve commit log chain marker updating (CASSANDRA-14108)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/d3691909/src/java/org/apache/cassandra/db/compaction/Verifier.java
----------------------------------------------------------------------
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cassandra.apache.org
For additional commands, e-mail: commits-help@cassandra.apache.org
[6/6] cassandra git commit: Merge branch 'cassandra-3.11' into trunk
Posted by ma...@apache.org.
Merge branch 'cassandra-3.11' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/5c3e33b1
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/5c3e33b1
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/5c3e33b1
Branch: refs/heads/trunk
Commit: 5c3e33b17c59a1f8e4eb8eee60cf4ea59accb6e0
Parents: f2fc2e9 d369190
Author: Marcus Eriksson <ma...@apache.org>
Authored: Wed Feb 7 09:10:33 2018 +0100
Committer: Marcus Eriksson <ma...@apache.org>
Committed: Wed Feb 7 09:10:33 2018 +0100
----------------------------------------------------------------------
CHANGES.txt | 1 +
.../cassandra/db/compaction/CompactionManager.java | 4 ++--
.../apache/cassandra/db/compaction/Verifier.java | 17 +++++++++++++----
test/unit/org/apache/cassandra/db/VerifyTest.java | 16 ++++++++--------
4 files changed, 24 insertions(+), 14 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/5c3e33b1/CHANGES.txt
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/5c3e33b1/src/java/org/apache/cassandra/db/compaction/CompactionManager.java
----------------------------------------------------------------------
diff --cc src/java/org/apache/cassandra/db/compaction/CompactionManager.java
index 046ae29,e158982..c5e5958
--- a/src/java/org/apache/cassandra/db/compaction/CompactionManager.java
+++ b/src/java/org/apache/cassandra/db/compaction/CompactionManager.java
@@@ -410,7 -398,7 +410,7 @@@ public class CompactionManager implemen
}
@Override
-- public void execute(LifecycleTransaction input) throws IOException
++ public void execute(LifecycleTransaction input)
{
verifyOne(cfs, input.onlyOne(), extendedVerify);
}
@@@ -985,7 -986,7 +985,7 @@@
}
}
-- private void verifyOne(ColumnFamilyStore cfs, SSTableReader sstable, boolean extendedVerify) throws IOException
++ private void verifyOne(ColumnFamilyStore cfs, SSTableReader sstable, boolean extendedVerify)
{
CompactionInfo.Holder verifyInfo = null;
http://git-wip-us.apache.org/repos/asf/cassandra/blob/5c3e33b1/src/java/org/apache/cassandra/db/compaction/Verifier.java
----------------------------------------------------------------------
diff --cc src/java/org/apache/cassandra/db/compaction/Verifier.java
index af00915,44a5850..5a2a828
--- a/src/java/org/apache/cassandra/db/compaction/Verifier.java
+++ b/src/java/org/apache/cassandra/db/compaction/Verifier.java
@@@ -87,7 -86,7 +87,7 @@@ public class Verifier implements Closea
this.verifyInfo = new VerifyInfo(dataFile, sstable);
}
-- public void verify(boolean extended) throws IOException
++ public void verify(boolean extended)
{
long rowStart = 0;
@@@ -248,15 -248,24 +248,24 @@@
throw (Error) th;
}
-- private void markAndThrow() throws IOException
++ private void markAndThrow()
{
markAndThrow(true);
}
-- private void markAndThrow(boolean mutateRepaired) throws IOException
++ private void markAndThrow(boolean mutateRepaired)
{
if (mutateRepaired) // if we are able to mutate repaired flag, an incremental repair should be enough
- sstable.descriptor.getMetadataSerializer().mutateRepaired(sstable.descriptor, ActiveRepairService.UNREPAIRED_SSTABLE, sstable.getSSTableMetadata().pendingRepair);
+ {
+ try
+ {
- sstable.descriptor.getMetadataSerializer().mutateRepairedAt(sstable.descriptor, ActiveRepairService.UNREPAIRED_SSTABLE);
++ sstable.descriptor.getMetadataSerializer().mutateRepaired(sstable.descriptor, ActiveRepairService.UNREPAIRED_SSTABLE, sstable.getSSTableMetadata().pendingRepair);
+ }
+ 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());
}
http://git-wip-us.apache.org/repos/asf/cassandra/blob/5c3e33b1/test/unit/org/apache/cassandra/db/VerifyTest.java
----------------------------------------------------------------------
diff --cc test/unit/org/apache/cassandra/db/VerifyTest.java
index 94fb9ec,6808c47..2eb741c
--- a/test/unit/org/apache/cassandra/db/VerifyTest.java
+++ b/test/unit/org/apache/cassandra/db/VerifyTest.java
@@@ -97,7 -94,7 +97,7 @@@ public class VerifyTes
@Test
-- public void testVerifyCorrect() throws IOException
++ public void testVerifyCorrect()
{
CompactionManager.instance.disableAutoCompaction();
Keyspace keyspace = Keyspace.open(KEYSPACE);
@@@ -118,7 -115,7 +118,7 @@@
}
@Test
-- public void testVerifyCounterCorrect() throws IOException
++ public void testVerifyCounterCorrect()
{
CompactionManager.instance.disableAutoCompaction();
Keyspace keyspace = Keyspace.open(KEYSPACE);
@@@ -139,7 -136,7 +139,7 @@@
}
@Test
-- public void testExtendedVerifyCorrect() throws IOException
++ public void testExtendedVerifyCorrect()
{
CompactionManager.instance.disableAutoCompaction();
Keyspace keyspace = Keyspace.open(KEYSPACE);
@@@ -160,7 -157,7 +160,7 @@@
}
@Test
-- public void testExtendedVerifyCounterCorrect() throws IOException
++ public void testExtendedVerifyCounterCorrect()
{
CompactionManager.instance.disableAutoCompaction();
Keyspace keyspace = Keyspace.open(KEYSPACE);
@@@ -181,7 -178,7 +181,7 @@@
}
@Test
-- public void testVerifyCorrectUncompressed() throws IOException
++ public void testVerifyCorrectUncompressed()
{
CompactionManager.instance.disableAutoCompaction();
Keyspace keyspace = Keyspace.open(KEYSPACE);
@@@ -202,7 -199,7 +202,7 @@@
}
@Test
-- public void testVerifyCounterCorrectUncompressed() throws IOException
++ public void testVerifyCounterCorrectUncompressed()
{
CompactionManager.instance.disableAutoCompaction();
Keyspace keyspace = Keyspace.open(KEYSPACE);
@@@ -223,7 -220,7 +223,7 @@@
}
@Test
-- public void testExtendedVerifyCorrectUncompressed() throws IOException
++ public void testExtendedVerifyCorrectUncompressed()
{
CompactionManager.instance.disableAutoCompaction();
Keyspace keyspace = Keyspace.open(KEYSPACE);
@@@ -244,7 -241,7 +244,7 @@@
}
@Test
-- public void testExtendedVerifyCounterCorrectUncompressed() throws IOException
++ public void testExtendedVerifyCounterCorrectUncompressed()
{
CompactionManager.instance.disableAutoCompaction();
Keyspace keyspace = Keyspace.open(KEYSPACE);
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cassandra.apache.org
For additional commands, e-mail: commits-help@cassandra.apache.org
[4/6] cassandra git commit: Merge branch 'cassandra-3.0' into
cassandra-3.11
Posted by ma...@apache.org.
Merge branch 'cassandra-3.0' into cassandra-3.11
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/d3691909
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/d3691909
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/d3691909
Branch: refs/heads/trunk
Commit: d369190964be9a6011f707a7e584446f9ec57a73
Parents: de6c62d 7885a70
Author: Marcus Eriksson <ma...@apache.org>
Authored: Wed Feb 7 09:06:19 2018 +0100
Committer: Marcus Eriksson <ma...@apache.org>
Committed: Wed Feb 7 09:06:19 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/d3691909/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 30ca8a8,4e8f2ac..8c0d8f0
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,25 -1,6 +1,26 @@@
-3.0.16
- * Handle failure when mutating repaired status in Verifier (CASSANDRA-13933)
+3.11.2
+ * Remove dependencies on JVM internal classes from JMXServerUtils (CASSANDRA-14173)
+ * Add DEFAULT, UNSET, MBEAN and MBEANS to `ReservedKeywords` (CASSANDRA-14205)
+ * Add Unittest for schema migration fix (CASSANDRA-14140)
+ * Print correct snitch info from nodetool describecluster (CASSANDRA-13528)
* Close socket on error during connect on OutboundTcpConnection (CASSANDRA-9630)
+ * Enable CDC unittest (CASSANDRA-14141)
+ * Acquire read lock before accessing CompactionStrategyManager fields (CASSANDRA-14139)
+ * Split CommitLogStressTest to avoid timeout (CASSANDRA-14143)
+ * Avoid invalidating disk boundaries unnecessarily (CASSANDRA-14083)
+ * Avoid exposing compaction strategy index externally (CASSANDRA-14082)
+ * Prevent continuous schema exchange between 3.0 and 3.11 nodes (CASSANDRA-14109)
+ * Fix imbalanced disks when replacing node with same address with JBOD (CASSANDRA-14084)
+ * Reload compaction strategies when disk boundaries are invalidated (CASSANDRA-13948)
+ * Remove OpenJDK log warning (CASSANDRA-13916)
+ * Prevent compaction strategies from looping indefinitely (CASSANDRA-14079)
+ * Cache disk boundaries (CASSANDRA-13215)
+ * Add asm jar to build.xml for maven builds (CASSANDRA-11193)
+ * Round buffer size to powers of 2 for the chunk cache (CASSANDRA-13897)
+ * Update jackson JSON jars (CASSANDRA-13949)
+ * Avoid locks when checking LCS fanout and if we should defrag (CASSANDRA-13930)
+Merged from 3.0:
++ * Handle failure when mutating repaired status in Verifier (CASSANDRA-13933)
* Set encoding for javadoc generation (CASSANDRA-14154)
* Fix index target computation for dense composite tables with dropped compact storage (CASSANDRA-14104)
* Improve commit log chain marker updating (CASSANDRA-14108)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/d3691909/src/java/org/apache/cassandra/db/compaction/Verifier.java
----------------------------------------------------------------------
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cassandra.apache.org
For additional commands, e-mail: commits-help@cassandra.apache.org
[3/6] cassandra git commit: Handle error when mutating repairedAt in
nodetool verify
Posted by ma...@apache.org.
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/trunk
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
[2/6] cassandra git commit: Handle error when mutating repairedAt in
nodetool verify
Posted by ma...@apache.org.
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