Skip to content

HDDS-9986. Log if there is a failure in closing RocksDB #5852

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
hemantk-12 merged 1 commit into from
Dec 22, 2023
Merged

HDDS-9986. Log if there is a failure in closing RocksDB #5852

Show file tree
Hide file tree
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
4 changes: 2 additions & 2 deletions hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/utils/db/RDBStore.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -226,12 +226,12 @@ public void close() throws IOException {
}

RDBMetrics.unRegister();
IOUtils.closeQuietly(checkPointManager);
IOUtils.close(LOG, checkPointManager);
if (rocksDBCheckpointDiffer != null) {
RocksDBCheckpointDifferHolder
.invalidateCacheEntry(rocksDBCheckpointDiffer.getMetadataDir());
}
IOUtils.closeQuietly(db);
IOUtils.close(LOG, db);
}

@Override
Expand Down
4 changes: 2 additions & 2 deletions ...-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/snapshot/SnapshotCache.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -169,8 +169,8 @@ public ReferenceCounted<IOmMetadataReader, SnapshotCache> get(String key,
// does not exist, and increment the reference count on the instance.
ReferenceCounted<IOmMetadataReader, SnapshotCache> rcOmSnapshot =
dbMap.compute(key, (k, v) -> {
LOG.info("Loading snapshot. Table key: {}", k);
if (v == null) {
LOG.info("Loading snapshot. Table key: {}", k);
try {
v = new ReferenceCounted<>(cacheLoader.load(k), false, this);
} catch (OMException omEx) {
Expand Down Expand Up @@ -317,7 +317,7 @@ private void cleanupInternal() {
Preconditions.checkState(rcOmSnapshot == result,
"Cache map entry removal failure. The cache is in an inconsistent "
+ "state. Expected OmSnapshot instance: " + rcOmSnapshot
+ ", actual: " + result);
+ ", actual: " + result + " for key: " + key);

pendingEvictionList.remove(result);

Expand Down