This is an automated email from the ASF dual-hosted git repository.
gianm pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/druid.git
The following commit(s) were added to refs/heads/master by this push:
new 4f83cee078f fix: Track load completion in
StorageLocationVirtualStorageManager. (#19555)
4f83cee078f is described below
commit 4f83cee078fcb68de59861b79e087583e7d07b6e
Author: Gian Merlino <[email protected]>
AuthorDate: Thu Jun 4 14:54:02 2026 -0700
fix: Track load completion in StorageLocationVirtualStorageManager. (#19555)
Most metrics are tracked by the StorageLocation itself, but it needs
help from the higher level layer to track load completion.
---
.../StorageLocationVirtualStorageManager.java | 4 +++-
.../StorageLocationVirtualStorageManagerTest.java | 24 ++++++++++++++++++++++
2 files changed, 27 insertions(+), 1 deletion(-)
diff --git
a/server/src/main/java/org/apache/druid/segment/loading/external/StorageLocationVirtualStorageManager.java
b/server/src/main/java/org/apache/druid/segment/loading/external/StorageLocationVirtualStorageManager.java
index 943d22506a4..d8a351cbc82 100644
---
a/server/src/main/java/org/apache/druid/segment/loading/external/StorageLocationVirtualStorageManager.java
+++
b/server/src/main/java/org/apache/druid/segment/loading/external/StorageLocationVirtualStorageManager.java
@@ -135,7 +135,9 @@ public class StorageLocationVirtualStorageManager
implements VirtualStorageManag
public void mount(StorageLocation location)
{
super.mount(location);
- mounted.set(true);
+ if (mounted.compareAndSet(false, true)) {
+ location.trackWeakLoad(getSize());
+ }
}
@Override
diff --git
a/server/src/test/java/org/apache/druid/segment/loading/external/StorageLocationVirtualStorageManagerTest.java
b/server/src/test/java/org/apache/druid/segment/loading/external/StorageLocationVirtualStorageManagerTest.java
index 7c0d5cbdf32..1f1ded3631e 100644
---
a/server/src/test/java/org/apache/druid/segment/loading/external/StorageLocationVirtualStorageManagerTest.java
+++
b/server/src/test/java/org/apache/druid/segment/loading/external/StorageLocationVirtualStorageManagerTest.java
@@ -122,6 +122,12 @@ public class StorageLocationVirtualStorageManagerTest
Assertions.assertEquals(1, location.getWeakStats().getHoldCount());
Assertions.assertEquals(1, location.getWeakEntryCount());
+ // Validate that both load begin and load complete were tracked
+ Assertions.assertEquals(1, location.getWeakStats().getLoadBeginCount());
+ Assertions.assertEquals(content.length(),
location.getWeakStats().getLoadBeginBytes());
+ Assertions.assertEquals(1, location.getWeakStats().getLoadCount());
+ Assertions.assertEquals(content.length(),
location.getWeakStats().getLoadBytes());
+
File file = cachedFile.getFile();
Assertions.assertNotNull(file);
Assertions.assertTrue(file.exists());
@@ -156,6 +162,10 @@ public class StorageLocationVirtualStorageManagerTest
Assertions.assertEquals(0, location.getWeakStats().getHoldCount());
Assertions.assertEquals(1, location.getWeakEntryCount());
+ // Initial populate counts as a completed load
+ Assertions.assertEquals(1, location.getWeakStats().getLoadCount());
+ Assertions.assertEquals(content.length(),
location.getWeakStats().getLoadBytes());
+
// Then get
try (CachedFile cachedFile = manager.get(identifier)) {
Assertions.assertNotNull(cachedFile);
@@ -164,6 +174,11 @@ public class StorageLocationVirtualStorageManagerTest
// Hold should be re-acquired
Assertions.assertEquals(1, location.getWeakStats().getHoldCount());
+ // A hit does not count as another load
+ Assertions.assertEquals(1, location.getWeakStats().getLoadCount());
+ Assertions.assertEquals(content.length(),
location.getWeakStats().getLoadBytes());
+ Assertions.assertEquals(1, location.getWeakStats().getHitCount());
+
String readContent = new String(
Files.readAllBytes(cachedFile.getFile().toPath()),
StandardCharsets.UTF_8
@@ -384,6 +399,10 @@ public class StorageLocationVirtualStorageManagerTest
Assertions.assertEquals(2, location.getWeakStats().getHoldCount());
+ // Only the first call counts as a load
+ Assertions.assertEquals(1, location.getWeakStats().getLoadCount());
+ Assertions.assertEquals(content1.length(),
location.getWeakStats().getLoadBytes());
+
// Should have first content, not second
String readContent = new String(
Files.readAllBytes(cachedFile2.getFile().toPath()),
@@ -488,6 +507,11 @@ public class StorageLocationVirtualStorageManagerTest
// Note: The entry may still be in the cache but in an unmounted state.
// StorageLocation will eventually evict it. The important thing is that
// the exception was properly thrown and the file was not successfully
created.
+
+ // A failed populate counts as a load begin, but not as a completed load.
+ Assertions.assertEquals(1, location.getWeakStats().getLoadBeginCount());
+ Assertions.assertEquals(0, location.getWeakStats().getLoadCount());
+ Assertions.assertEquals(0, location.getWeakStats().getLoadBytes());
}
@Test
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
