Skip to content

HDDS-13927. Recon - OM Db delta updates handler resource cleanup. #9307

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
ArafatKhan2198 merged 2 commits into from
Nov 24, 2025
Merged

HDDS-13927. Recon - OM Db delta updates handler resource cleanup. #9307

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3e6db27
HDDS-13927. Recon - OM Db delta updates handler resource cleanup.
Nov 14, 2025
d781e63
HDDS-13927. Recon - OM Db delta updates handler resource cleanup.
Nov 17, 2025
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
28 changes: 28 additions & 0 deletions hadoop-ozone/recon/src/main/java/org/apache/hadoop/ozone/recon/tasks/OMDBUpdatesHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.concurrent.atomic.AtomicBoolean;
import org.apache.hadoop.hdds.utils.db.DBColumnFamilyDefinition;
import org.apache.hadoop.hdds.utils.db.Table;
import org.apache.hadoop.hdds.utils.db.managed.ManagedWriteBatch;
Expand All @@ -43,6 +44,8 @@ public class OMDBUpdatesHandler extends ManagedWriteBatch.Handler {
private static final Logger LOG =
LoggerFactory.getLogger(OMDBUpdatesHandler.class);

private final AtomicBoolean closed = new AtomicBoolean(false);

private Map<Integer, String> tablesNames;
private OMMetadataManager omMetadataManager;
private List<OMDBUpdateEvent> omdbUpdateEvents = new ArrayList<>();
Expand Down Expand Up @@ -96,6 +99,11 @@ public void delete(int cfIndex, byte[] keyBytes) {
private void processEvent(int cfIndex, byte[] keyBytes, byte[]
valueBytes, OMDBUpdateEvent.OMDBUpdateAction action)
throws IOException {

if (closed.get()) {
throw new IllegalStateException("OMDBUpdatesHandler has been closed");
}

String tableName = tablesNames.get(cfIndex);
// DTOKEN_TABLE is using OzoneTokenIdentifier as key instead of String
// and assuming to typecast as String while de-serializing will throw error.
Expand Down Expand Up @@ -335,6 +343,26 @@ public void markCommitWithTimestamp(final byte[] xid, final byte[] ts)

}

@Override
public void close() {
super.close();
if (closed.compareAndSet(false, true)) {
LOG.debug("Closing OMDBUpdatesHandler");

// Clear internal tracking map to help GC
// Note: We do NOT close tables obtained from omMetadataManager as they
// are owned and managed by the OMMetadataManager, not by this handler.
// Note: omdbUpdateEvents is intentionally NOT cleared here because
// getEvents() may be called after close() to retrieve the events
// for processing by ReconOmTasks
if (omdbLatestUpdateEvents != null) {
omdbLatestUpdateEvents.clear();
}

LOG.debug("OMDBUpdatesHandler cleanup completed");
}
}

/**
* Get List of events.
* @return List of events.
Expand Down