-
Notifications
You must be signed in to change notification settings - Fork 488
Added upgrade step to remove old compaction temp files #6435
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Open
dlmarion
wants to merge
2
commits into
apache:main
Choose a base branch
from
dlmarion:6285-del-comp-tmp-files-in-upgrade
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
+270
−0
Open
Changes from all commits
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
150 changes: 150 additions & 0 deletions
150
test/src/main/java/org/apache/accumulo/test/upgrade/TmpFileUpgrade11to12TestIT.java
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,150 @@ | ||
| /* | ||
| * 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 | ||
| * | ||
| * https://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.accumulo.test.upgrade; | ||
|
|
||
| import static org.junit.jupiter.api.Assertions.assertEquals; | ||
| import static org.junit.jupiter.api.Assertions.assertFalse; | ||
| import static org.junit.jupiter.api.Assertions.assertTrue; | ||
|
|
||
| import java.util.HashMap; | ||
| import java.util.HashSet; | ||
| import java.util.Map; | ||
| import java.util.Map.Entry; | ||
| import java.util.Set; | ||
| import java.util.SortedSet; | ||
| import java.util.TreeSet; | ||
| import java.util.UUID; | ||
| import java.util.concurrent.atomic.AtomicInteger; | ||
| import java.util.stream.IntStream; | ||
|
|
||
| import org.apache.accumulo.core.Constants; | ||
| import org.apache.accumulo.core.client.Accumulo; | ||
| import org.apache.accumulo.core.client.AccumuloClient; | ||
| import org.apache.accumulo.core.data.TableId; | ||
| import org.apache.accumulo.core.metadata.SystemTables; | ||
| import org.apache.accumulo.core.metadata.schema.ExternalCompactionId; | ||
| import org.apache.accumulo.core.metadata.schema.TabletMetadata.ColumnType; | ||
| import org.apache.accumulo.core.metadata.schema.TabletsMetadata; | ||
| import org.apache.accumulo.harness.SharedMiniClusterBase; | ||
| import org.apache.accumulo.manager.upgrade.Upgrader11to12; | ||
| import org.apache.accumulo.server.ServerContext; | ||
| import org.apache.accumulo.server.util.FindCompactionTmpFiles.DeleteStats; | ||
| import org.apache.hadoop.fs.Path; | ||
| import org.apache.hadoop.io.Text; | ||
| import org.junit.jupiter.api.AfterAll; | ||
| import org.junit.jupiter.api.BeforeAll; | ||
| import org.junit.jupiter.api.Test; | ||
| import org.slf4j.Logger; | ||
| import org.slf4j.LoggerFactory; | ||
|
|
||
| public class TmpFileUpgrade11to12TestIT extends SharedMiniClusterBase { | ||
|
|
||
| private static final Logger LOG = LoggerFactory.getLogger(TmpFileUpgrade11to12TestIT.class); | ||
|
|
||
| @BeforeAll | ||
| public static void start() throws Exception { | ||
| SharedMiniClusterBase.startMiniCluster(); | ||
| } | ||
|
|
||
| @AfterAll | ||
| public static void stop() throws Exception { | ||
| stopMiniCluster(); | ||
| } | ||
|
|
||
| @Test | ||
| public void testDeleteOldCompactionTmpFiles() throws Exception { | ||
|
|
||
| final Set<String> fileNames = | ||
| Set.of("A00001.rf", "F000002.rf", "F000003.rf_tmp", "C000004.rf", "C000005.rf_tmp", | ||
| "C000006.rf_tmp_" + ExternalCompactionId.generate(UUID.randomUUID()), "A000007.rf_tmp"); | ||
|
|
||
| final Set<String> validFileNames = new HashSet<>(fileNames); | ||
| validFileNames.removeAll(Set.of("C000005.rf_tmp", "A000007.rf_tmp")); | ||
|
|
||
| final ServerContext ctx = getCluster().getServerContext(); | ||
| String[] tableNames = getUniqueNames(10); | ||
|
|
||
| final Set<String> volumePaths = new HashSet<>(); | ||
| ctx.getVolumeManager().getVolumes().forEach(v -> volumePaths.add(v.getBasePath())); | ||
|
|
||
| SortedSet<Text> splits = new TreeSet<>(); | ||
| IntStream.range(0, 9).forEach(i -> splits.add(new Text("" + i))); | ||
|
|
||
| try (AccumuloClient client = Accumulo.newClient().from(getClientProps()).build()) { | ||
| for (String tableName : tableNames) { | ||
| client.tableOperations().create(tableName); | ||
| client.tableOperations().addSplits(tableName, splits); | ||
| } | ||
|
|
||
| final Map<String,String> tableNameIdMap = ctx.tableOperations().tableIdMap(); | ||
| final Map<TableId,Set<String>> tableNameDirsMap = new HashMap<>(); | ||
| final AtomicInteger numTabletDirs = new AtomicInteger(0); | ||
| for (Entry<String,String> e : tableNameIdMap.entrySet()) { | ||
| final TableId tid = TableId.of(e.getValue()); | ||
| if (SystemTables.containsTableId(tid)) { | ||
| continue; | ||
| } | ||
| try (TabletsMetadata tm = | ||
| ctx.getAmple().readTablets().forTable(tid).fetch(ColumnType.DIR).build()) { | ||
| Set<String> tableDirs = new HashSet<>(); | ||
| tm.forEach(t -> { | ||
| numTabletDirs.incrementAndGet(); | ||
| tableDirs.add(t.getDirName()); | ||
| }); | ||
| tableNameDirsMap.put(tid, tableDirs); | ||
| } | ||
| } | ||
|
|
||
| final Set<Path> createdPaths = new HashSet<>(); | ||
| for (Entry<TableId,Set<String>> e : tableNameDirsMap.entrySet()) { | ||
| if (SystemTables.containsTableId(e.getKey())) { | ||
| continue; | ||
| } | ||
| for (String tabletDirName : e.getValue()) { | ||
| String tabletDirPath = Constants.HDFS_TABLES_DIR + Path.SEPARATOR + e.getKey() | ||
| + Path.SEPARATOR + tabletDirName; | ||
| for (String fileName : fileNames) { | ||
| for (String volume : volumePaths) { | ||
| Path p = | ||
| new Path(volume + Path.SEPARATOR + tabletDirPath + Path.SEPARATOR + fileName); | ||
| assertTrue(ctx.getVolumeManager().createNewFile(p)); | ||
| createdPaths.add(p); | ||
| } | ||
| } | ||
| } | ||
| } | ||
| LOG.info("Created {} files", createdPaths.size()); | ||
| LOG.info("{}", createdPaths); | ||
|
|
||
| Upgrader11to12 upgrader = new Upgrader11to12(); | ||
| DeleteStats stats = new DeleteStats(); | ||
| Set<Path> deleted = new HashSet<Path>(); | ||
| upgrader.deleteCompactionTempFiles(ctx, stats, deleted); | ||
| assertEquals(numTabletDirs.get() * 2, deleted.size()); | ||
| assertEquals(0, stats.error); | ||
| assertEquals(0, stats.failure); | ||
| assertEquals(deleted.size(), stats.success); | ||
|
|
||
| for (Path delete : deleted) { | ||
| assertFalse(validFileNames.contains(delete.getName())); | ||
| } | ||
| } | ||
| } | ||
|
|
||
| } |
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I wonder if we should throw an error if failures or errors is non-zero. I feel like we should not and treat this as a best effort.