Skip to content

HDDS-12966. DBDefinitionFactory should not throw InvalidArnException #8454

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.

Sign up for GitHub

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
adoroszlai merged 1 commit into from
May 14, 2025
Merged

HDDS-12966. DBDefinitionFactory should not throw InvalidArnException #8454

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 4 additions & 7 deletions hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/debug/DBDefinitionFactory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,13 +21,12 @@
import static org.apache.hadoop.ozone.recon.ReconConstants.RECON_CONTAINER_KEY_DB;
import static org.apache.hadoop.ozone.recon.ReconConstants.RECON_OM_SNAPSHOT_DB;

import com.amazonaws.services.kms.model.InvalidArnException;
import com.google.common.base.Preconditions;
import java.nio.file.Path;
import java.util.Arrays;
import java.util.Collections;
import java.util.HashMap;
import java.util.Map;
import java.util.Objects;
import java.util.concurrent.atomic.AtomicReference;
import org.apache.hadoop.hdds.conf.ConfigurationSource;
import org.apache.hadoop.hdds.scm.metadata.SCMDBDefinition;
Expand Down Expand Up @@ -69,14 +68,12 @@ public static DBDefinition getDefinition(String dbName) {
return definition != null ? definition : getReconDBDefinition(dbName);
}

public static DBDefinition getDefinition(Path dbPath,
public static DBDefinition getDefinition(Path path,
ConfigurationSource config) {
Preconditions.checkNotNull(dbPath,
"Path is required to identify the used db scheme");
final Path dbPath = Objects.requireNonNull(path, "path == null");
final Path fileName = dbPath.getFileName();
if (fileName == null) {
throw new InvalidArnException(
"Path is required to identify the used db scheme");
throw new IllegalArgumentException("DB path has no filename");
}
String dbName = fileName.toString();
if (dbName.endsWith(OzoneConsts.CONTAINER_DB_SUFFIX)) {
Expand Down