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.

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

Add Windows native method to retrieve the number of allocated bytes on disk for file #79698

Merged
merged 24 commits into from
Nov 5, 2021
Merged

Add Windows native method to retrieve the number of allocated bytes on disk for file #79698

Changes from 1 commit
Commits
Show all changes
24 commits
Select commit Hold shift + click to select a range
d13a95b
Add Windows native method to retrieve the number of allocated bytes o…
tlrx Oct 25, 2021
f4c5d77
test should fail
tlrx Oct 25, 2021
8f95d7b
test should succeed
tlrx Oct 25, 2021
806f501
more docs
tlrx Oct 26, 2021
f109191
test
tlrx Oct 26, 2021
0ef20a0
nits + fsync
tlrx Oct 26, 2021
39adb83
debug last failure @TestLogging
tlrx Oct 26, 2021
15abf62
avoid DisableFsyncFS
tlrx Oct 26, 2021
d1c4f77
remove @TestLogging
tlrx Oct 26, 2021
2af8a5a
Merge branch 'master' into windows-native-method-allocated-file-size
tlrx Oct 29, 2021
2540f7e
Merge branch 'master' into windows-native-method-allocated-file-size
tlrx Nov 2, 2021
ee5ab76
revert changes in boostrap natives
tlrx Nov 2, 2021
2d9275c
add org.elasticsearch.common.filesystem
tlrx Nov 2, 2021
6773071
Merge branch 'master' into windows-native-method-allocated-file-size
tlrx Nov 3, 2021
1cc458f
Merge branch 'master' into windows-native-method-allocated-file-size
tlrx Nov 4, 2021
c6ba764
feedback
tlrx Nov 4, 2021
e5a0e2c
more
tlrx Nov 4, 2021
9258da1
static method to init static member
tlrx Nov 5, 2021
e1aff78
@FunctionalInterface
tlrx Nov 5, 2021
c00295f
oneMb
tlrx Nov 5, 2021
853a9de
comment
tlrx Nov 5, 2021
5928b39
INVALID_FILE_SIZE
tlrx Nov 5, 2021
3357e8f
NO_ERROR
tlrx Nov 5, 2021
f77c0e0
Merge branch 'master' into windows-native-method-allocated-file-size
tlrx Nov 5, 2021
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
14 changes: 12 additions & 2 deletions ...rc/test/java/org/elasticsearch/xpack/searchablesnapshots/cache/common/CacheFileTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,10 +42,11 @@
import static org.elasticsearch.xpack.searchablesnapshots.cache.common.TestUtils.randomPopulateAndReads;
import static org.hamcrest.Matchers.containsString;
import static org.hamcrest.Matchers.equalTo;
import static org.hamcrest.Matchers.greaterThanOrEqualTo;
import static org.hamcrest.Matchers.hasSize;
import static org.hamcrest.Matchers.instanceOf;
import static org.hamcrest.Matchers.is;
import static org.hamcrest.Matchers.not;
import static org.hamcrest.Matchers.lessThan;
import static org.hamcrest.Matchers.notNullValue;
import static org.hamcrest.Matchers.nullValue;
import static org.hamcrest.Matchers.sameInstance;
Expand Down Expand Up @@ -411,7 +412,16 @@ public void testCacheFileCreatedAsSparseFile() throws Exception {
fill(cacheFile.getChannel(), Math.toIntExact(cacheFile.getLength() - 1L), Math.toIntExact(cacheFile.getLength()));

sizeOnDisk = Natives.allocatedSizeInBytes(file);
assertThat("Cache file should be sparse and not fully allocated on disk", sizeOnDisk, not(equalTo(1048576L)));
assertThat("Cache file should be sparse and not fully allocated on disk", sizeOnDisk, lessThan(1048576L));
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I have a slight preference for extracting the 1048576L as a constant (it appears in 3 places now and anyway I don't immediately recognise that this is a nice power of two).


fill(cacheFile.getChannel(), 0, Math.toIntExact(cacheFile.getLength()));

sizeOnDisk = Natives.allocatedSizeInBytes(file);
assertThat(
"Cache file should be fully allocated on disk (maybe more given cluster/block size)",
sizeOnDisk,
greaterThanOrEqualTo(1048576L)
);
} finally {
cacheFile.release(listener);
}
Expand Down