natas_hw
/
cassandra
mirror of https://github.com/apache/cassandra
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Test failure: org.apache.cassandra.distributed.test.UpgradeSSTablesTest 

patch by Berenguer Blasi; reviewed by Brandon Williams, Stefan Miklosovic for CASSANDRA-18635
This commit is contained in:
Bereng 2024-02-13 11:11:19 +01:00
parent a26fa6cf2c
commit 451b0c010f
1 changed files with 21 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/java/org/apache/cassandra/tools/nodetool/UpgradeSSTable.java
View File

@ -24,6 +24,9 @@ import io.airlift.airline.Option;
import java.util.ArrayList;
import java.util.List;
import org.apache.commons.lang3.exception.ExceptionUtils;
import org.apache.cassandra.db.compaction.CompactionInterruptedException;
import org.apache.cassandra.tools.NodeProbe;
import org.apache.cassandra.tools.NodeTool.NodeToolCmd;
@ -56,13 +59,25 @@ public class UpgradeSSTable extends NodeToolCmd
for (String keyspace : keyspaces)
{
try
for (int retries = 0; retries < 5; retries++)
{
probe.upgradeSSTables(probe.output().out, keyspace, !includeAll, maxSSTableTimestamp, jobs, tableNames);
}
catch (Exception e)
{
throw new RuntimeException("Error occurred during enabling auto-compaction", e);
try
{
if (retries > 0)
Thread.sleep(500);
probe.upgradeSSTables(probe.output().out, keyspace, !includeAll, maxSSTableTimestamp, jobs, tableNames);
break;
}
catch (RuntimeException cie)
{
// Spin retry. See CASSANDRA-18635
if (ExceptionUtils.indexOfThrowable(cie, CompactionInterruptedException.class) != -1 && retries == 4)
throw (cie);
}
catch (Exception e)
{
throw new RuntimeException("Error occurred during enabling auto-compaction", e);
}
}
}
}