Skip to content
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.

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

8264821: DirectIOTest fails on a system with large block size #193

Closed
wants to merge 1 commit into from
Closed
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2017, 2021, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -47,30 +47,37 @@

public class DirectIOTest {

private static final int SIZE = 4096;
private static final int BASE_SIZE = 4096;
private static long blockSize;

private static void testWrite(Path p) throws Exception {
private static int testWrite(Path p) throws Exception {
try (FileChannel fc = FileChannel.open(p, StandardOpenOption.WRITE,
ExtendedOpenOption.DIRECT)) {
FileStore fs = Files.getFileStore(p);
int alignment = (int)fs.getBlockSize();
ByteBuffer src = ByteBuffer.allocateDirect(SIZE + alignment - 1)
int bs = (int)blockSize;
int size = Math.max(BASE_SIZE, bs);
int alignment = bs;
ByteBuffer src = ByteBuffer.allocateDirect(size + alignment - 1)
.alignedSlice(alignment);
for (int j = 0; j < SIZE; j++) {
assert src.capacity() != 0;
for (int j = 0; j < size; j++) {
src.put((byte)0);
}
src.flip();
fc.write(src);
return size;
}
}

private static void testRead(Path p) throws Exception {
private static int testRead(Path p) throws Exception {
try (FileChannel fc = FileChannel.open(p, ExtendedOpenOption.DIRECT)) {
FileStore fs = Files.getFileStore(p);
int alignment = (int)fs.getBlockSize();
ByteBuffer dest = ByteBuffer.allocateDirect(SIZE + alignment - 1)
int bs = (int)blockSize;
int size = Math.max(BASE_SIZE, bs);
int alignment = bs;
ByteBuffer dest = ByteBuffer.allocateDirect(size + alignment - 1)
.alignedSlice(alignment);
assert dest.capacity() != 0;
fc.read(dest);
return size;
}
}

@@ -93,15 +100,16 @@ public static boolean isDirectIOSupportedByFS(Path p) throws Exception {
return supported;
}

private static boolean isFileInCache(Path p) {
private static boolean isFileInCache(int size, Path p) {
String path = p.toString();
return isFileInCache0(SIZE, path);
return isFileInCache0(size, path);
}

private static native boolean isFileInCache0(int size, String path);

public static void main(String[] args) throws Exception {
Path p = createTempFile();
blockSize = Files.getFileStore(p).getBlockSize();

if (!isDirectIOSupportedByFS(p)) {
Files.delete(p);
@@ -111,13 +119,13 @@ public static void main(String[] args) throws Exception {
System.loadLibrary("DirectIO");

try {
testWrite(p);
if (isFileInCache(p)) {
int size = testWrite(p);
if (isFileInCache(size, p)) {
throw new RuntimeException("DirectIO is not working properly with "
+ "write. File still exists in cache!");
}
testRead(p);
if (isFileInCache(p)) {
size = testRead(p);
if (isFileInCache(size, p)) {
throw new RuntimeException("DirectIO is not working properly with "
+ "read. File still exists in cache!");
}