Skip to content

HDDS-10204. TypedTable.putWithBatch may leak if conversion of value throws #6097

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
Jan 26, 2024
Merged

HDDS-10204. TypedTable.putWithBatch may leak if conversion of value throws #6097

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
16 changes: 12 additions & 4 deletions hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/utils/db/TypedTable.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@
import java.util.Objects;

import com.google.common.annotations.VisibleForTesting;
import org.apache.hadoop.hdds.utils.IOUtils;
import org.apache.hadoop.hdds.utils.MetadataKeyFilters;
import org.apache.hadoop.hdds.utils.TableCacheMetrics;
import org.apache.hadoop.hdds.utils.db.cache.CacheKey;
Expand Down Expand Up @@ -165,10 +166,17 @@ public void put(KEY key, VALUE value) throws IOException {
public void putWithBatch(BatchOperation batch, KEY key, VALUE value)
throws IOException {
if (supportCodecBuffer) {
// The buffers will be released after commit.
rawTable.putWithBatch(batch,
keyCodec.toDirectCodecBuffer(key),
valueCodec.toDirectCodecBuffer(value));
CodecBuffer keyBuffer = null;
CodecBuffer valueBuffer = null;
try {
keyBuffer = keyCodec.toDirectCodecBuffer(key);
valueBuffer = valueCodec.toDirectCodecBuffer(value);
// The buffers will be released after commit.
rawTable.putWithBatch(batch, keyBuffer, valueBuffer);
} catch (Exception e) {
IOUtils.closeQuietly(valueBuffer, keyBuffer);
throw e;
}
} else {
rawTable.putWithBatch(batch, encodeKey(key), encodeValue(value));
}
Expand Down