-
Notifications
You must be signed in to change notification settings - Fork 633
HDDS-15935. Extract ExportFileManager and document container export directory layout #10866
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
Merged
Merged
Changes from all commits
Commits
Show all changes
7 commits
Select commit
Hold shift + click to select a range
a17119b
HDDS-15935. Extract ExportFileManager and document container export d…
sarvekshayr 0e6ce9b
Use gz and update javadoc
sarvekshayr 3617ba6
Use gz and file lock
sarvekshayr 915262f
Fix test failure in TestExportFileManager.testListCompletedArchivePaths
sarvekshayr e49bb60
Include jobId and remove in-progress marker
sarvekshayr 84a4c03
Create ExportJob.Id and use timestamp in filename
sarvekshayr 2a49695
Use - within component and _ for inter-component
sarvekshayr 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
234 changes: 234 additions & 0 deletions
234
...rver-scm/src/main/java/org/apache/hadoop/hdds/scm/container/export/ExportFileManager.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,234 @@ | ||
| /* | ||
| * 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.hadoop.hdds.scm.container.export; | ||
|
|
||
| import java.io.File; | ||
| import java.io.IOException; | ||
| import java.io.RandomAccessFile; | ||
| import java.nio.channels.FileLock; | ||
| import java.nio.channels.OverlappingFileLockException; | ||
| import java.nio.file.Files; | ||
| import java.nio.file.Path; | ||
| import java.nio.file.Paths; | ||
| import java.util.ArrayList; | ||
| import java.util.Arrays; | ||
| import java.util.Collections; | ||
| import java.util.Comparator; | ||
| import java.util.List; | ||
| import java.util.Objects; | ||
| import org.apache.commons.io.FileUtils; | ||
| import org.apache.hadoop.ozone.util.UUIDUtil; | ||
| import org.apache.ratis.util.AtomicFileOutputStream; | ||
| import org.slf4j.Logger; | ||
| import org.slf4j.LoggerFactory; | ||
|
|
||
| /** | ||
| * Manages on-disk paths and artifacts for container ID export jobs. | ||
| * | ||
| * <p>The export directory ({@code exportDirectory}, typically {@code {scm.db.dirs}/exports}) | ||
| * uses the layout below. The manager gzip-compresses the archive ({@code .tar.gz}) so operators | ||
| * can stream entries with {@code zcat}. | ||
| * | ||
| * <p>While a job runs, shard text files are written under {@code export_{jobId}/}. The archive is | ||
| * created only after all shards are written. The export manager writes | ||
| * {@code container-ids_{scope}_{timestamp}_job{jobId}.tar.gz.tmp} and atomically renames it to | ||
| * {@code .tar.gz} on close ({@link AtomicFileOutputStream}), so a partial {@code .tar.gz} is | ||
| * never visible. {@link #lock()} uses {@code in_use.lock} to exclude concurrent writers. | ||
| * | ||
| * <pre> | ||
| * {exportDirectory}/ | ||
| * ├── in_use.lock | ||
| * ├── container-ids_{scope}_{timestamp}_job{jobId}.tar.gz | ||
| * ├── container-ids_{scope}_{timestamp}_job{jobId}.tar.gz.tmp | ||
| * └── export_{jobId}/ | ||
| * ├── container-ids_{scope}_{metadataTimestamp}_part001.txt | ||
| * └── ... | ||
| * </pre> | ||
|
sarvekshayr marked this conversation as resolved.
|
||
| * | ||
| * <p><b>Incomplete work</b> ({@code export_{jobId}/} and {@code .tar.gz.tmp}) is removed by | ||
| * {@link #cleanupFailedJob(Path, File)} on failure or cancel, and by {@link #start()} for every | ||
| * leftover directory and temp file after SCM restart. Completed {@code .tar.gz} files are kept. | ||
| * | ||
| * <p><b>Completed {@code .tar.gz}</b> remains on disk until the export manager evicts it | ||
| * ({@code maxTerminalJobs} in {@code ContainerExportManager}) via {@link #deleteExportTar(String)}. | ||
| * | ||
| * <p><b>SCM restart:</b> in-memory job status is lost. {@link #start()} clears incomplete work; | ||
| * {@link #listCompletedArchivePaths()} returns existing {@code tarPath} values (oldest first); | ||
| * {@link #jobIdFromArchiveFileName(String)} parses {@code jobId} for terminal-job rebuild in | ||
| * {@code ContainerExportManager}. | ||
| */ | ||
| final class ExportFileManager { | ||
|
|
||
| private static final Logger LOG = LoggerFactory.getLogger(ExportFileManager.class); | ||
|
|
||
| static final String EXPORT_JOB_DIR_PREFIX = "export_"; | ||
| static final String EXPORT_ARCHIVE_JOB_INFIX = "_job"; | ||
| static final String EXPORT_ARCHIVE_SUFFIX = ".tar.gz"; | ||
| static final String EXPORT_ARCHIVE_TMP_SUFFIX = EXPORT_ARCHIVE_SUFFIX + AtomicFileOutputStream.TMP_EXTENSION; | ||
| static final String EXPORT_LOCK_NAME = "in_use.lock"; | ||
| private static final int ARCHIVE_TIMESTAMP_LENGTH = 16; | ||
|
|
||
| private final String exportDirectory; | ||
| private FileLock exportDirectoryLock; | ||
|
|
||
| ExportFileManager(String exportDirectory) { | ||
| this.exportDirectory = Objects.requireNonNull(exportDirectory, "exportDirectory == null"); | ||
| } | ||
|
|
||
| String getExportDirectory() { | ||
| return exportDirectory; | ||
| } | ||
|
|
||
| void start() throws IOException { | ||
| Files.createDirectories(Paths.get(exportDirectory)); | ||
| removeIncompleteWorkOnStartup(); | ||
| } | ||
|
|
||
| void lock() throws IOException { | ||
| if (exportDirectoryLock != null) { | ||
| return; | ||
| } | ||
| File lockFile = new File(exportDirectory, EXPORT_LOCK_NAME); | ||
| RandomAccessFile lockAccessFile = new RandomAccessFile(lockFile, "rws"); | ||
| try { | ||
| FileLock lock = lockAccessFile.getChannel().tryLock(); | ||
| if (lock == null) { | ||
| lockAccessFile.close(); | ||
| throw new OverlappingFileLockException(); | ||
| } | ||
| exportDirectoryLock = lock; | ||
| LOG.debug("Acquired container export directory lock {}", lockFile.getAbsolutePath()); | ||
| } catch (OverlappingFileLockException | IOException e) { | ||
| lockAccessFile.close(); | ||
| throw new IOException("Failed to lock container export directory " + exportDirectory, e); | ||
| } | ||
| } | ||
|
|
||
| void unlock() throws IOException { | ||
| if (exportDirectoryLock == null) { | ||
| return; | ||
| } | ||
| exportDirectoryLock.release(); | ||
| exportDirectoryLock.channel().close(); | ||
| exportDirectoryLock = null; | ||
| } | ||
|
|
||
| File resolveArchiveFile(ExportScope scope, String archiveTimestamp, ExportJob.Id jobId) { | ||
| return new File(exportDirectory, String.format("container-ids_%s_%s%s%s%s", | ||
| scope.getValue(), archiveTimestamp, EXPORT_ARCHIVE_JOB_INFIX, jobId.getValue(), EXPORT_ARCHIVE_SUFFIX)); | ||
| } | ||
|
|
||
| File resolveArchiveTempFile(ExportScope scope, String archiveTimestamp, ExportJob.Id jobId) { | ||
| return AtomicFileOutputStream.getTemporaryFile(resolveArchiveFile(scope, archiveTimestamp, jobId)); | ||
| } | ||
|
|
||
| /** | ||
| * Returns completed archive paths ({@code tarPath} in {@code ExportJob.Status}), oldest first. | ||
| */ | ||
| List<String> listCompletedArchivePaths() { | ||
| File exportDir = new File(exportDirectory); | ||
| File[] matches = exportDir.listFiles((dir, fileName) -> fileName.endsWith(EXPORT_ARCHIVE_SUFFIX) | ||
| && !fileName.endsWith(EXPORT_ARCHIVE_TMP_SUFFIX)); | ||
| if (matches == null || matches.length == 0) { | ||
| return Collections.emptyList(); | ||
| } | ||
| Arrays.sort(matches, Comparator.comparing( | ||
| file -> archiveTimestampFromArchiveFileName(file.getName()))); | ||
| List<String> archivePaths = new ArrayList<>(matches.length); | ||
| for (File archive : matches) { | ||
| archivePaths.add(archive.getAbsolutePath()); | ||
| } | ||
| return archivePaths; | ||
| } | ||
|
|
||
| static String archiveTimestampFromArchiveFileName(String fileName) { | ||
| int jobIndex = fileName.lastIndexOf(EXPORT_ARCHIVE_JOB_INFIX); | ||
| if (jobIndex < ARCHIVE_TIMESTAMP_LENGTH + 1 | ||
| || !fileName.endsWith(EXPORT_ARCHIVE_SUFFIX) | ||
| || fileName.endsWith(EXPORT_ARCHIVE_TMP_SUFFIX)) { | ||
| return null; | ||
| } | ||
| return fileName.substring(jobIndex - ARCHIVE_TIMESTAMP_LENGTH, jobIndex); | ||
| } | ||
|
|
||
| static ExportJob.Id jobIdFromArchiveFileName(String fileName) { | ||
| if (!fileName.endsWith(EXPORT_ARCHIVE_SUFFIX)) { | ||
| return null; | ||
| } | ||
| String nameWithoutSuffix = fileName.substring(0, fileName.length() - EXPORT_ARCHIVE_SUFFIX.length()); | ||
| int jobIndex = nameWithoutSuffix.lastIndexOf(EXPORT_ARCHIVE_JOB_INFIX); | ||
| if (jobIndex < 0) { | ||
| return null; | ||
| } | ||
| String jobId = nameWithoutSuffix.substring(jobIndex + EXPORT_ARCHIVE_JOB_INFIX.length()); | ||
| return UUIDUtil.isValidUuidString(jobId) ? ExportJob.Id.of(jobId) : null; | ||
| } | ||
|
|
||
| void deleteExportTar(String tarPath) { | ||
| if (tarPath == null) { | ||
| return; | ||
| } | ||
| File archive = new File(tarPath); | ||
| if (archive.isFile() && FileUtils.deleteQuietly(archive)) { | ||
| LOG.debug("Removed container export archive: {}", archive.getName()); | ||
| } | ||
| FileUtils.deleteQuietly(AtomicFileOutputStream.getTemporaryFile(archive)); | ||
| } | ||
|
|
||
| void cleanupFailedJob(Path jobDir, File archiveFile) { | ||
| if (jobDir != null) { | ||
| FileUtils.deleteQuietly(jobDir.toFile()); | ||
| } | ||
| if (archiveFile != null) { | ||
| FileUtils.deleteQuietly(AtomicFileOutputStream.getTemporaryFile(archiveFile)); | ||
| } | ||
| } | ||
|
|
||
| private void removeIncompleteWorkOnStartup() { | ||
| File exportDir = new File(exportDirectory); | ||
| File[] children = exportDir.listFiles(); | ||
| if (children != null) { | ||
| for (File child : children) { | ||
| if (child.isDirectory() && jobIdFromExportDirName(child.getName()) != null) { | ||
| FileUtils.deleteQuietly(child); | ||
| LOG.debug("Removed incomplete container export job directory: {}", child.getAbsolutePath()); | ||
| } | ||
| } | ||
| } | ||
| File[] tempFiles = exportDir.listFiles((dir, fileName) -> fileName.endsWith(EXPORT_ARCHIVE_TMP_SUFFIX)); | ||
| if (tempFiles != null) { | ||
| for (File tempFile : tempFiles) { | ||
| if (FileUtils.deleteQuietly(tempFile)) { | ||
| LOG.debug("Removed incomplete container export archive temp file: {}", tempFile.getName()); | ||
| } | ||
| } | ||
| } | ||
| } | ||
|
|
||
| static String exportJobDirName(ExportJob.Id jobId) { | ||
| return EXPORT_JOB_DIR_PREFIX + jobId.getValue(); | ||
| } | ||
|
|
||
| private static ExportJob.Id jobIdFromExportDirName(String dirName) { | ||
| if (!dirName.startsWith(EXPORT_JOB_DIR_PREFIX)) { | ||
| return null; | ||
| } | ||
| String jobId = dirName.substring(EXPORT_JOB_DIR_PREFIX.length()); | ||
| return UUIDUtil.isValidUuidString(jobId) ? ExportJob.Id.of(jobId) : null; | ||
| } | ||
| } | ||
74 changes: 74 additions & 0 deletions
74
...-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/container/export/ExportJob.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,74 @@ | ||
| /* | ||
| * 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.hadoop.hdds.scm.container.export; | ||
|
|
||
| import java.util.Objects; | ||
| import java.util.UUID; | ||
|
|
||
| /** | ||
| * Container ID export job identifier. | ||
| */ | ||
| public final class ExportJob { | ||
|
|
||
| /** | ||
| * Unique job identifier. | ||
| */ | ||
| public static final class Id { | ||
| private final String value; | ||
|
|
||
| private Id(String value) { | ||
| this.value = Objects.requireNonNull(value, "value == null"); | ||
| } | ||
|
|
||
| public static Id newId() { | ||
| return new Id(UUID.randomUUID().toString()); | ||
| } | ||
|
|
||
| public static Id of(String value) { | ||
| return new Id(value); | ||
| } | ||
|
|
||
| public String getValue() { | ||
| return value; | ||
| } | ||
|
|
||
| @Override | ||
| public String toString() { | ||
| return value; | ||
| } | ||
|
|
||
| @Override | ||
| public boolean equals(Object obj) { | ||
| if (this == obj) { | ||
| return true; | ||
| } | ||
| if (!(obj instanceof Id)) { | ||
| return false; | ||
| } | ||
| return value.equals(((Id) obj).value); | ||
| } | ||
|
|
||
| @Override | ||
| public int hashCode() { | ||
| return value.hashCode(); | ||
| } | ||
| } | ||
|
|
||
| private ExportJob() { | ||
| } | ||
| } |
Oops, something went wrong.
Oops, something went wrong.
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.
Uh oh!
There was an error while loading. Please reload this page.