Skip to content

HDDS-2464. Avoid unnecessary allocations for FileChannel.open call #147

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
nandakumar131 merged 1 commit into from
Nov 13, 2019
Merged

HDDS-2464. Avoid unnecessary allocations for FileChannel.open call #147

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
25 changes: 19 additions & 6 deletions ...-service/src/main/java/org/apache/hadoop/ozone/container/keyvalue/helpers/ChunkUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,14 +43,18 @@
import java.nio.ByteBuffer;
import java.nio.channels.FileChannel;
import java.nio.channels.FileLock;
import java.nio.file.OpenOption;
import java.nio.file.Path;
import java.nio.file.StandardOpenOption;
import java.nio.file.attribute.FileAttribute;
import java.security.NoSuchAlgorithmException;
import java.util.EnumSet;
import java.util.Set;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.ExecutionException;

import static org.apache.hadoop.hdds.protocol.datanode.proto.ContainerProtos.Result.*;
import static java.util.Collections.unmodifiableSet;

/**
* Utility methods for chunk operations for KeyValue container.
Expand All @@ -59,6 +63,19 @@ public final class ChunkUtils {

private static final Set<Path> LOCKS = ConcurrentHashMap.newKeySet();

// skip SYNC and DSYNC to reduce contention on file.lock
private static final Set<? extends OpenOption> WRITE_OPTIONS =
unmodifiableSet(EnumSet.of(
StandardOpenOption.CREATE,
StandardOpenOption.WRITE,
StandardOpenOption.SPARSE
));
private static final Set<? extends OpenOption> READ_OPTIONS =
unmodifiableSet(EnumSet.of(
StandardOpenOption.READ
));
private static final FileAttribute<?>[] NO_ATTRIBUTES = {};

/** Never constructed. **/
private ChunkUtils() {

Expand All @@ -85,11 +102,7 @@ public static void writeData(File chunkFile, ChunkInfo chunkInfo,
processFileExclusively(path, () -> {
FileChannel file = null;
try {
// skip SYNC and DSYNC to reduce contention on file.lock
file = FileChannel.open(path,
StandardOpenOption.CREATE,
StandardOpenOption.WRITE,
StandardOpenOption.SPARSE);
file = FileChannel.open(path, WRITE_OPTIONS, NO_ATTRIBUTES);

int size;
try (FileLock ignored = file.lock()) {
Expand Down Expand Up @@ -167,7 +180,7 @@ public static ByteBuffer readData(File chunkFile, ChunkInfo data,
FileChannel file = null;

try {
file = FileChannel.open(path, StandardOpenOption.READ);
file = FileChannel.open(path, READ_OPTIONS, NO_ATTRIBUTES);

try (FileLock ignored = file.lock(offset, len, true)) {
file.read(buf, offset);
Expand Down