Skip to content

Commit

Permalink
Simplified db management
Browse files Browse the repository at this point in the history
  • Loading branch information
sarvekshayr committed Nov 25, 2024
1 parent 4dce94a commit 9aa705f
Show file tree
Hide file tree
Showing 2 changed files with 26 additions and 114 deletions.
44 changes: 6 additions & 38 deletions hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/utils/db/RocksDatabase.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -139,7 +139,7 @@ public static List<byte[]> listColumnFamiliesEmptyOptions(final String path)
}
}

public static RocksDatabase open(File dbFile, ManagedDBOptions dbOptions,
static RocksDatabase open(File dbFile, ManagedDBOptions dbOptions,
ManagedWriteOptions writeOptions, Set<TableConfig> families,
boolean readOnly) throws IOException {
List<ColumnFamilyDescriptor> descriptors = null;
Expand Down Expand Up @@ -460,13 +460,8 @@ public void ingestExternalFile(ColumnFamily family, List<String> files,

public void put(ColumnFamily family, byte[] key, byte[] value)
throws IOException {
put(family.getHandle(), key, value);
}

public void put(ColumnFamilyHandle handle, byte[] key, byte[] value)
throws IOException {
try (UncheckedAutoCloseable ignored = acquire()) {
db.get().put(handle, writeOptions, key, value);
db.get().put(family.getHandle(), writeOptions, key, value);
} catch (RocksDBException e) {
closeOnError(e);
throw toIOException(this, "put " + bytes2String(key), e);
Expand Down Expand Up @@ -626,14 +621,9 @@ RocksCheckpoint createCheckpoint() {
*/
Supplier<byte[]> keyMayExist(ColumnFamily family, byte[] key)
throws IOException {
return keyMayExist(family.getHandle(), key);
}

public Supplier<byte[]> keyMayExist(ColumnFamilyHandle handle, byte[] key)
throws IOException {
try (UncheckedAutoCloseable ignored = acquire()) {
final Holder<byte[]> out = new Holder<>();
return db.get().keyMayExist(handle, key, out) ?
return db.get().keyMayExist(family.getHandle(), key, out) ?
out::getValue : null;
}
}
Expand Down Expand Up @@ -662,34 +652,12 @@ public Collection<ColumnFamily> getExtraColumnFamilies() {
return Collections.unmodifiableCollection(columnFamilies.values());
}

public void dropColumnFamily(ColumnFamilyHandle handle) throws IOException {
try (UncheckedAutoCloseable ignored = acquire()) {
db.get().dropColumnFamily(handle);
} catch (RocksDBException e) {
closeOnError(e);
throw toIOException(this, "dropColumnFamily", e);
}
}

public ColumnFamilyHandle createColumnFamily(ColumnFamilyDescriptor descriptor) throws IOException {
byte[] get(ColumnFamily family, byte[] key) throws IOException {
try (UncheckedAutoCloseable ignored = acquire()) {
return db.get().createColumnFamily(descriptor);
return db.get().get(family.getHandle(), key);
} catch (RocksDBException e) {
closeOnError(e);
throw toIOException(this, "createColumnFamily", e);
}
}

public byte[] get(ColumnFamily family, byte[] key) throws IOException {
return get(family.getHandle(), key, family.getName());
}

public byte[] get(ColumnFamilyHandle handle, byte[] key, String familyName) throws IOException {
try (UncheckedAutoCloseable ignored = acquire()) {
return db.get().get(handle, key);
} catch (RocksDBException e) {
closeOnError(e);
final String message = "get " + bytes2String(key) + " from " + familyName;
final String message = "get " + bytes2String(key) + " from " + family;
throw toIOException(this, message, e);
}
}
Expand Down
96 changes: 20 additions & 76 deletions hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/repair/om/FSORepairTool.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,15 +18,13 @@
package org.apache.hadoop.ozone.repair.om;

import org.apache.commons.io.FileUtils;
import org.apache.hadoop.hdds.conf.ConfigurationSource;
import org.apache.hadoop.hdds.conf.OzoneConfiguration;
import org.apache.hadoop.hdds.utils.db.RocksDatabase;
import org.apache.hadoop.hdds.utils.db.Table;
import org.apache.hadoop.hdds.utils.db.DBStore;
import org.apache.hadoop.hdds.utils.db.DBStoreBuilder;
import org.apache.hadoop.hdds.utils.db.TableIterator;
import org.apache.hadoop.hdds.utils.db.BatchOperation;
import org.apache.hadoop.hdds.utils.db.TableConfig;
import org.apache.hadoop.hdds.utils.db.DBProfile;
import org.apache.hadoop.hdds.utils.db.managed.ManagedWriteOptions;
import org.apache.hadoop.ozone.OmUtils;
import org.apache.hadoop.ozone.om.OmMetadataManagerImpl;
import org.apache.hadoop.ozone.om.helpers.BucketLayout;
Expand All @@ -39,26 +37,16 @@
import org.apache.hadoop.ozone.om.helpers.WithObjectID;
import org.apache.hadoop.ozone.om.request.file.OMFileRequest;
import org.apache.ratis.util.Preconditions;
import org.rocksdb.ColumnFamilyDescriptor;
import org.rocksdb.ColumnFamilyHandle;
import org.rocksdb.RocksDBException;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

import java.io.File;
import java.io.IOException;
import java.nio.charset.StandardCharsets;
import java.util.ArrayList;
import java.util.Collection;
import java.util.HashSet;
import java.util.List;
import java.util.Objects;
import java.util.Set;
import java.util.Stack;

import static java.nio.charset.StandardCharsets.UTF_8;
import static org.apache.hadoop.hdds.HddsConfigKeys.HDDS_DB_PROFILE;
import static org.apache.hadoop.hdds.utils.db.DBStoreBuilder.HDDS_DEFAULT_DB_PROFILE;
import static org.apache.hadoop.ozone.OzoneConsts.OM_KEY_PREFIX;

/**
Expand Down Expand Up @@ -95,13 +83,8 @@ public class FSORepairTool {
private final Table<String, SnapshotInfo> snapshotInfoTable;
private final String volumeFilter;
private final String bucketFilter;
// The temporary DB is used to track which items have been seen.
// Since usage of this DB is simple, use it directly from RocksDB.
private String reachableDBPath;
private static final String REACHABLE_TABLE = "reachable";
private static final byte[] REACHABLE_TABLE_BYTES = REACHABLE_TABLE.getBytes(StandardCharsets.UTF_8);
private ColumnFamilyHandle reachableCFHandle;
private RocksDatabase reachableDB;
private DBStore reachableDB;
private final ReportStatistics reachableStats;
private final ReportStatistics unreachableStats;
private final ReportStatistics unreferencedStats;
Expand Down Expand Up @@ -270,11 +253,8 @@ private void processBucket(OmVolumeArgs volume, OmBucketInfo bucketInfo) throws
return;
}
}
dropReachableTableIfExists();
createReachableTable();
markReachableObjectsInBucket(volume, bucketInfo);
handleUnreachableAndUnreferencedObjects(volume, bucketInfo);
dropReachableTableIfExists();
}

private Report buildReportAndLog() {
Expand Down Expand Up @@ -473,9 +453,9 @@ private Collection<String> getChildDirectoriesAndMarkAsReachable(OmVolumeArgs vo
* of the connected FSO tree.
*/
private void addReachableEntry(OmVolumeArgs volume, OmBucketInfo bucket, WithObjectID object) throws IOException {
byte[] reachableKey = buildReachableKey(volume, bucket, object).getBytes(StandardCharsets.UTF_8);
String reachableKey = buildReachableKey(volume, bucket, object);
// No value is needed for this table.
reachableDB.put(reachableCFHandle, reachableKey, new byte[]{});
reachableDB.getTable(REACHABLE_TABLE, String.class, byte[].class).put(reachableKey, new byte[]{});
}

/**
Expand All @@ -497,9 +477,9 @@ private static String buildReachableKey(OmVolumeArgs volume, OmBucketInfo bucket
* @return true if the entry's parent is in the reachable table.
*/
protected boolean isReachable(String fileOrDirKey) throws IOException {
byte[] reachableParentKey = buildReachableParentKey(fileOrDirKey).getBytes(StandardCharsets.UTF_8);
String reachableParentKey = buildReachableParentKey(fileOrDirKey);

return reachableDB.get(reachableCFHandle, reachableParentKey, REACHABLE_TABLE) != null;
return reachableDB.getTable(REACHABLE_TABLE, String.class, byte[].class).get(reachableParentKey) != null;
}

/**
Expand All @@ -523,68 +503,32 @@ private static String buildReachableParentKey(String fileOrDirKey) {
parentID;
}

private void openReachableDB() throws IOException {
private void openReachableDB() {
File reachableDBFile = new File(new File(omDBPath).getParentFile(), "reachable.db");
System.out.println("Creating database of reachable directories at " + reachableDBFile);
// Delete the DB from the last run if it exists.
if (reachableDBFile.exists()) {
FileUtils.deleteDirectory(reachableDBFile);
}
reachableDBPath = reachableDBFile.toString();
reachableDB = buildReachableRocksDB(reachableDBFile);
}

private RocksDatabase buildReachableRocksDB(File reachableDBFile) throws IOException {
DBProfile profile = new OzoneConfiguration().getEnum(HDDS_DB_PROFILE, HDDS_DEFAULT_DB_PROFILE);
Set<TableConfig> tableConfigs = new HashSet<>();

try {
tableConfigs.add(new TableConfig("default", profile.getColumnFamilyOptions()));

return RocksDatabase.open(reachableDBFile,
profile.getDBOptions(),
new ManagedWriteOptions(),
tableConfigs, false);
} finally {
for (TableConfig config : tableConfigs) {
config.close();
if (reachableDBFile.exists()) {
FileUtils.deleteDirectory(reachableDBFile);
}

ConfigurationSource conf = new OzoneConfiguration();
reachableDB = DBStoreBuilder.newBuilder(conf)
.setName("reachable.db")
.setPath(reachableDBFile.getParentFile().toPath())
.addTable(REACHABLE_TABLE)
.build();
} catch (IOException e) {
System.out.println("Error creating reachable.db: " + e.getMessage());
}
}

private void closeReachableDB() {
private void closeReachableDB() throws IOException {
if (reachableDB != null) {
reachableDB.close();
}
}

private void dropReachableTableIfExists() throws IOException {
try {
List<byte[]> availableCFs = reachableDB.listColumnFamiliesEmptyOptions(reachableDBPath);
boolean cfFound = false;
for (byte[] cfNameBytes: availableCFs) {
if (new String(cfNameBytes, UTF_8).equals(new String(REACHABLE_TABLE_BYTES, UTF_8))) {
cfFound = true;
break;
}
}

if (cfFound) {
reachableDB.dropColumnFamily(reachableCFHandle);
}
} catch (RocksDBException ex) {
throw new IOException(ex.getMessage(), ex);
} finally {
if (reachableCFHandle != null) {
reachableCFHandle.close();
}
}
}

private void createReachableTable() throws IOException {
reachableCFHandle = reachableDB.createColumnFamily(new ColumnFamilyDescriptor(REACHABLE_TABLE_BYTES));
}

/**
* Define a Report to be created.
*/
Expand Down

0 comments on commit 9aa705f

Please sign in to comment.