From d54646e40957ffc18f651753941fac3068b79f8e Mon Sep 17 00:00:00 2001 From: Marcus Eriksson Date: Fri, 27 May 2022 00:40:44 +0200 Subject: [PATCH] UnsupportedOperationException when reducing scope for LCS compactions patch by Caleb Rackliffe; reviewed by Zhao Yang, Brandon Williams, and Marcus Eriksson for CASSANDRA-19704 Co-authored-by: Marcus Eriksson Co-authored-by: Caleb Rackliffe --- CHANGES.txt | 1 + .../db/compaction/LeveledCompactionTask.java | 2 +- .../test/LeveledCompactionTaskTest.java | 88 +++++++++++++++++++ 3 files changed, 90 insertions(+), 1 deletion(-) create mode 100644 test/distributed/org/apache/cassandra/distributed/test/LeveledCompactionTaskTest.java diff --git a/CHANGES.txt b/CHANGES.txt index 9ac326d3e2..52ec8bc211 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -1,4 +1,5 @@ 4.0.14 + * UnsupportedOperationException when reducing scope for LCS compactions (CASSANDRA-19704) * Make LWT conditions behavior on frozen and non-frozen columns consistent for null column values (CASSANDRA-19637) * Add timeout specifically for bootstrapping nodes (CASSANDRA-15439) * Bring Redhat package dirs/ownership/perms in line with Debian package (CASSANDRA-19565) diff --git a/src/java/org/apache/cassandra/db/compaction/LeveledCompactionTask.java b/src/java/org/apache/cassandra/db/compaction/LeveledCompactionTask.java index 5b94c545fe..ae9f15491b 100644 --- a/src/java/org/apache/cassandra/db/compaction/LeveledCompactionTask.java +++ b/src/java/org/apache/cassandra/db/compaction/LeveledCompactionTask.java @@ -56,7 +56,7 @@ public class LeveledCompactionTask extends CompactionTask @Override protected boolean partialCompactionsAcceptable() { - throw new UnsupportedOperationException("This is now handled in reduceScopeForLimitedSpace"); + return level == 0; } protected int getLevel() diff --git a/test/distributed/org/apache/cassandra/distributed/test/LeveledCompactionTaskTest.java b/test/distributed/org/apache/cassandra/distributed/test/LeveledCompactionTaskTest.java new file mode 100644 index 0000000000..f1051e6109 --- /dev/null +++ b/test/distributed/org/apache/cassandra/distributed/test/LeveledCompactionTaskTest.java @@ -0,0 +1,88 @@ +/* + * 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 + * regarding copyright ownership. The ASF licenses this file + * 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.distributed.test; + +import java.io.IOException; + +import org.junit.Test; + +import net.bytebuddy.ByteBuddy; +import net.bytebuddy.dynamic.loading.ClassLoadingStrategy; +import net.bytebuddy.implementation.MethodDelegation; +import org.apache.cassandra.db.Directories; +import org.apache.cassandra.db.Keyspace; +import org.apache.cassandra.distributed.Cluster; +import org.apache.cassandra.distributed.api.ConsistencyLevel; + +import static net.bytebuddy.matcher.ElementMatchers.named; +import static net.bytebuddy.matcher.ElementMatchers.takesArguments; +import static org.junit.Assert.fail; + +public class LeveledCompactionTaskTest extends TestBaseImpl +{ + @Test + public void testBuildCompactionCandidatesForAvailableDiskSpace() throws IOException + { + try (Cluster cluster = init(builder().withNodes(1).withInstanceInitializer(BB::install).start())) + { + cluster.schemaChange(withKeyspace("CREATE TABLE %s.tbl (id int primary key) WITH compaction = {'class':'LeveledCompactionStrategy', 'enabled':'false'}")); + for (int i = 0; i < 100; i++) + { + cluster.coordinator(1).execute(withKeyspace("INSERT INTO %s.tbl (id) VALUES (?)"), ConsistencyLevel.ALL, i); + if (i % 10 == 0) + cluster.get(1).flush(KEYSPACE); + } + cluster.get(1).flush(KEYSPACE); + cluster.setUncaughtExceptionsFilter((exception) -> exception.getMessage() != null && exception.getMessage().contains("Not enough space for compaction")); + + cluster.get(1).runOnInstance(() -> { + try + { + Keyspace.open(KEYSPACE).getColumnFamilyStore("tbl").enableAutoCompaction(true); + fail("This should fail, but only due to having no disk space"); + } + catch (Exception e) + { + if (!(e.getMessage() != null && e.getMessage().contains("Not enough space for compaction"))) + throw e; + } + }); + + } + } + + public static class BB + { + @SuppressWarnings("resource") + public static void install(ClassLoader cl, int id) + { + new ByteBuddy().rebase(Directories.class) + .method(named("hasAvailableDiskSpace").and(takesArguments(2))) + .intercept(MethodDelegation.to(BB.class)) + .make() + .load(cl, ClassLoadingStrategy.Default.INJECTION); + } + + @SuppressWarnings("unused") + public static boolean hasAvailableDiskSpace(long estimatedSSTables, long expectedTotalWriteSize) + { + return false; + } + } +}