Skip to content

Fix incorrect use of Path.getRoot() #8751

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
merged 2 commits into from
Apr 29, 2025
Merged

Fix incorrect use of Path.getRoot() #8751

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b7ab377
Fix incorrect use of Path.getRoot()
jbachorik Apr 29, 2025
cf7859d
Adjust tests
jbachorik Apr 29, 2025
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
4 changes: 3 additions & 1 deletion ...filing-controller/src/main/java/com/datadog/profiling/controller/TempLocationManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -465,7 +465,9 @@ private void createTempDir(Path tempDir) {
// we will find the first offender not having the expected permissions and fail the check
if (isPosixFs) {
// take the first subfolder below the base temp dir
Path root = baseTempDir.resolve(baseTempDir.relativize(tempDir).getRoot());
// we can wave the checks for tempDir being a subdir of baseTempDir because that's how it is
// created
Path root = baseTempDir.resolve(baseTempDir.relativize(tempDir).getName(0));
try {
AtomicReference<Path> failed = new AtomicReference<>();
Files.walkFileTree(
Expand Down
27 changes: 1 addition & 26 deletions ...ng-controller/src/test/java/com/datadog/profiling/controller/TempLocationManagerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@
import java.util.UUID;
import java.util.concurrent.Phaser;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicBoolean;
import java.util.concurrent.locks.LockSupport;
import java.util.stream.Stream;
import org.junit.jupiter.api.Test;
Expand Down Expand Up @@ -80,8 +79,7 @@ void testFromConfigNotWritable() throws Exception {
Properties props = new Properties();
props.put(ProfilingConfig.PROFILING_TEMP_DIR, myDir.toString());
ConfigProvider configProvider = ConfigProvider.withPropertiesOverride(props);
TempLocationManager tempLocationManager = new TempLocationManager(configProvider);
assertThrows(IllegalStateException.class, tempLocationManager::getTempDir);
assertThrows(IllegalStateException.class, () -> new TempLocationManager(configProvider));
}

@ParameterizedTest
Expand Down Expand Up @@ -246,29 +244,6 @@ public FileVisitResult visitFile(Path file, BasicFileAttributes attrs)
assertEquals(shouldSucceed, rslt);
}

@Test
void testShortCircuit() throws Exception {
Path baseDir =
Files.createTempDirectory(
"ddprof-test-",
PosixFilePermissions.asFileAttribute(PosixFilePermissions.fromString("rwx------")));
AtomicBoolean executed = new AtomicBoolean();
TempLocationManager.CleanupHook hook =
new TempLocationManager.CleanupHook() {
@Override
public void onCleanupStart(boolean selfCleanup, long timeout, TimeUnit unit) {
executed.set(true);
}
};
TempLocationManager instance = instance(baseDir, false, hook);

instance.createDirStructure();

boolean ret = instance.cleanup(false);
assertTrue(ret);
assertFalse(executed.get());
}

private static Stream<Arguments> timeoutTestArguments() {
List<Arguments> argumentsList = new ArrayList<>();
for (boolean selfCleanup : new boolean[] {true, false}) {
Expand Down