This is an automated email from the ASF dual-hosted git repository.
brandonwilliams pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/cassandra.git
The following commit(s) were added to refs/heads/trunk by this push:
new 7e0c0e5 Harden sstableupgrade unit test
7e0c0e5 is described below
commit 7e0c0e59c7c5a27df2dfce52f02c2cb7c0eff968
Author: Bereng <berenguerbl...@gmail.com>
AuthorDate: Wed Nov 4 09:01:05 2020 +0100
Harden sstableupgrade unit test
Patch by Berenguer Blasi, reviewed by brandonwilliams for
CASSANDRA-16011
---
.../apache/cassandra/tools/StandaloneUpgrader.java | 6 +-
.../cassandra/io/sstable/LegacySSTableTest.java | 4 +-
.../tools/StandaloneUpgraderOnSStablesTest.java | 157 +++++++++++++++++++++
3 files changed, 164 insertions(+), 3 deletions(-)
diff --git a/src/java/org/apache/cassandra/tools/StandaloneUpgrader.java
b/src/java/org/apache/cassandra/tools/StandaloneUpgrader.java
index ed25e42..323dab1 100644
--- a/src/java/org/apache/cassandra/tools/StandaloneUpgrader.java
+++ b/src/java/org/apache/cassandra/tools/StandaloneUpgrader.java
@@ -22,6 +22,7 @@ import java.util.concurrent.TimeUnit;
import org.apache.commons.cli.*;
+import org.apache.cassandra.config.DatabaseDescriptor;
import org.apache.cassandra.db.ColumnFamilyStore;
import org.apache.cassandra.db.Directories;
import org.apache.cassandra.db.Keyspace;
@@ -48,7 +49,10 @@ public class StandaloneUpgrader
public static void main(String args[])
{
Options options = Options.parseArgs(args);
- Util.initDatabaseDescriptor();
+ if (Boolean.getBoolean(Util.ALLOW_TOOL_REINIT_FOR_TEST))
+ DatabaseDescriptor.toolInitialization(false); //Necessary for
testing
+ else
+ Util.initDatabaseDescriptor();
try
{
diff --git a/test/unit/org/apache/cassandra/io/sstable/LegacySSTableTest.java
b/test/unit/org/apache/cassandra/io/sstable/LegacySSTableTest.java
index 7a18133..940084f 100644
--- a/test/unit/org/apache/cassandra/io/sstable/LegacySSTableTest.java
+++ b/test/unit/org/apache/cassandra/io/sstable/LegacySSTableTest.java
@@ -445,7 +445,7 @@ public class LegacySSTableTest
new
StreamPlan(StreamOperation.OTHER).transferStreams(FBUtilities.getBroadcastAddressAndPort(),
streams).execute().get();
}
- private static void truncateLegacyTables(String legacyVersion) throws
Exception
+ public static void truncateLegacyTables(String legacyVersion) throws
Exception
{
logger.info("Truncating legacy version {}", legacyVersion);
Keyspace.open("legacy_tables").getColumnFamilyStore(String.format("legacy_%s_simple",
legacyVersion)).truncateBlocking();
@@ -463,7 +463,7 @@ public class LegacySSTableTest
Keyspace.open("legacy_tables").getColumnFamilyStore(String.format("legacy_%s_clust_counter",
legacyVersion)).forceMajorCompaction();
}
- private static void loadLegacyTables(String legacyVersion) throws Exception
+ public static void loadLegacyTables(String legacyVersion) throws Exception
{
logger.info("Preparing legacy version {}", legacyVersion);
loadLegacyTable("legacy_%s_simple", legacyVersion);
diff --git
a/test/unit/org/apache/cassandra/tools/StandaloneUpgraderOnSStablesTest.java
b/test/unit/org/apache/cassandra/tools/StandaloneUpgraderOnSStablesTest.java
new file mode 100644
index 0000000..570610b
--- /dev/null
+++ b/test/unit/org/apache/cassandra/tools/StandaloneUpgraderOnSStablesTest.java
@@ -0,0 +1,157 @@
+/*
+ * 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.tools;
+
+import java.io.File;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+import java.util.Set;
+import java.util.stream.Collectors;
+
+import org.junit.AfterClass;
+import org.junit.BeforeClass;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import org.apache.cassandra.OrderedJUnit4ClassRunner;
+import org.apache.cassandra.db.ColumnFamilyStore;
+import org.apache.cassandra.db.Keyspace;
+import org.apache.cassandra.exceptions.ConfigurationException;
+import org.apache.cassandra.exceptions.StartupException;
+import org.apache.cassandra.io.sstable.LegacySSTableTest;
+import org.apache.cassandra.io.sstable.format.SSTableReader;
+import org.apache.cassandra.service.StorageService;
+import org.apache.cassandra.tools.ToolRunner.ToolResult;
+import org.assertj.core.api.Assertions;
+import org.assertj.core.util.Lists;
+
+import static org.junit.Assert.assertEquals;
+
+/*
+ * SStableUpdater should be run with the server shutdown, but we need to set
up a certain env to be able to
+ * load/swap/drop sstable files under the test's feet. Hence why we need a
separate file vs StandaloneUpgraderTest.
+ *
+ * Caution: heavy hacking ahead.
+ */
+@RunWith(OrderedJUnit4ClassRunner.class)
+public class StandaloneUpgraderOnSStablesTest
+{
+ String legacyId =
LegacySSTableTest.legacyVersions[LegacySSTableTest.legacyVersions.length - 1];
+
+ @BeforeClass
+ public static void defineSchema() throws ConfigurationException
+ {
+ LegacySSTableTest.defineSchema();
+ System.setProperty(Util.ALLOW_TOOL_REINIT_FOR_TEST, "true"); //
Necessary for testing
+ }
+
+ @AfterClass
+ public static void clearClassEnv()
+ {
+ System.clearProperty(Util.ALLOW_TOOL_REINIT_FOR_TEST);
+ }
+
+ @Test
+ public void testUpgradeKeepFiles() throws Throwable
+ {
+ LegacySSTableTest.truncateLegacyTables(legacyId);
+ LegacySSTableTest.loadLegacyTables(legacyId);
+
+ List<String> origFiles = getSStableFiles("legacy_tables", "legacy_" +
legacyId + "_simple");
+ ToolResult tool = ToolRunner.invokeClass(StandaloneUpgrader.class,
+ "-k",
+ "legacy_tables",
+ "legacy_" + legacyId +
"_simple");
+ Assertions.assertThat(tool.getStdout()).contains("Found 1 sstables
that need upgrading.");
+
Assertions.assertThat(tool.getStdout()).contains("legacy_tables/legacy_" +
legacyId + "_simple");
+ Assertions.assertThat(tool.getStdout()).contains("-Data.db");
+ tool.assertOnCleanExit();
+
+ List<String> newFiles = getSStableFiles("legacy_tables", "legacy_" +
legacyId + "_simple");
+ origFiles.removeAll(newFiles);
+ assertEquals(0, origFiles.size()); // check previous version files are
kept
+ }
+
+ @Test
+ public void testUpgradeSnapshot() throws Throwable
+ {
+ LegacySSTableTest.truncateLegacyTables(legacyId);
+ LegacySSTableTest.loadLegacyTables(legacyId);
+ StorageService.instance.takeSnapshot("testsnapshot",
+ Collections.emptyMap(),
+ "legacy_tables.legacy_" +
legacyId + "_simple");
+
+ ToolResult tool = ToolRunner.invokeClass(StandaloneUpgrader.class,
+ "-k",
+ "legacy_tables",
+ "legacy_" + legacyId +
"_simple",
+ "wrongsnapshot");
+ Assertions.assertThat(tool.getStdout()).contains("Found 0 sstables
that need upgrading.");
+
+ tool = ToolRunner.invokeClass(StandaloneUpgrader.class,
+ "legacy_tables",
+ "legacy_" + legacyId + "_simple",
+ "testsnapshot");
+ Assertions.assertThat(tool.getStdout()).contains("Found 1 sstables
that need upgrading.");
+
Assertions.assertThat(tool.getStdout()).contains("legacy_tables/legacy_" +
legacyId + "_simple");
+ Assertions.assertThat(tool.getStdout()).contains("-Data.db");
+ tool.assertOnCleanExit();
+ }
+
+ @Test
+ public void testUpgrade() throws Throwable
+ {
+ LegacySSTableTest.truncateLegacyTables(legacyId);
+ LegacySSTableTest.loadLegacyTables(legacyId);
+
+ List<String> origFiles = getSStableFiles("legacy_tables", "legacy_" +
legacyId + "_simple");
+ ToolResult tool = ToolRunner.invokeClass(StandaloneUpgrader.class,
+ "legacy_tables",
+ "legacy_" + legacyId +
"_simple");
+ Assertions.assertThat(tool.getStdout()).contains("Found 1 sstables
that need upgrading.");
+
Assertions.assertThat(tool.getStdout()).contains("legacy_tables/legacy_" +
legacyId + "_simple");
+ Assertions.assertThat(tool.getStdout()).contains("-Data.db");
+ tool.assertOnCleanExit();
+
+ List<String> newFiles = getSStableFiles("legacy_tables", "legacy_" +
legacyId + "_simple");
+ int origSize = origFiles.size();
+ origFiles.removeAll(newFiles);
+ assertEquals(origSize, origFiles.size()); // check previous version
files are gone
+ }
+
+ private List<String> getSStableFiles(String ks, String table) throws
StartupException
+ {
+ ColumnFamilyStore cfs = Keyspace.open(ks).getColumnFamilyStore(table);
+ cfs.forceBlockingFlush();
+ ColumnFamilyStore.scrubDataDirectories(cfs.metadata());
+
+ Set<SSTableReader> sstables = cfs.getLiveSSTables();
+ if (sstables.isEmpty())
+ return Lists.emptyList();
+
+ String sstableFileName = sstables.iterator().next().getFilename();
+ File sstablesDir = new File(sstableFileName).getParentFile();
+ return Arrays.asList(sstablesDir.listFiles())
+ .stream()
+ .filter(f -> f.isFile())
+ .map(file -> file.toString())
+ .collect(Collectors.toList());
+ }
+}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org
For additional commands, e-mail: commits-h...@cassandra.apache.org
