diff options
author | android-build-team Robot <android-build-team-robot@google.com> | 2021-04-30 01:07:44 +0000 |
---|---|---|
committer | android-build-team Robot <android-build-team-robot@google.com> | 2021-04-30 01:07:44 +0000 |
commit | 9349a9867ff5841e1ab530a8bf154978f6e99ed7 (patch) | |
tree | c17317e718ada6f5cc43e86d859522c5bcda6fd5 | |
parent | 5d7b54bb7d738699dedad861ca691cd98d55ae55 (diff) | |
parent | 3166f1a8bf81b62cf6865f9ea2cb04a39c696fd1 (diff) | |
download | vogar-android12-tests-release.tar.gz |
Snap for 7325276 from 3166f1a8bf81b62cf6865f9ea2cb04a39c696fd1 to sc-releaseandroid-vts-12.0_r9android-vts-12.0_r8android-vts-12.0_r7android-vts-12.0_r6android-vts-12.0_r5android-vts-12.0_r4android-vts-12.0_r3android-vts-12.0_r2android-vts-12.0_r12android-vts-12.0_r11android-vts-12.0_r10android-vts-12.0_r1android-security-12.0.0_r59android-security-12.0.0_r58android-security-12.0.0_r57android-security-12.0.0_r56android-security-12.0.0_r55android-security-12.0.0_r54android-security-12.0.0_r53android-security-12.0.0_r52android-security-12.0.0_r51android-security-12.0.0_r50android-security-12.0.0_r49android-security-12.0.0_r48android-security-12.0.0_r47android-security-12.0.0_r46android-security-12.0.0_r45android-security-12.0.0_r44android-security-12.0.0_r43android-security-12.0.0_r42android-security-12.0.0_r41android-security-12.0.0_r40android-security-12.0.0_r39android-security-12.0.0_r38android-security-12.0.0_r37android-security-12.0.0_r36android-security-12.0.0_r35android-security-12.0.0_r34android-platform-12.0.0_r9android-platform-12.0.0_r8android-platform-12.0.0_r7android-platform-12.0.0_r6android-platform-12.0.0_r5android-platform-12.0.0_r4android-platform-12.0.0_r31android-platform-12.0.0_r30android-platform-12.0.0_r3android-platform-12.0.0_r29android-platform-12.0.0_r28android-platform-12.0.0_r27android-platform-12.0.0_r26android-platform-12.0.0_r25android-platform-12.0.0_r24android-platform-12.0.0_r23android-platform-12.0.0_r22android-platform-12.0.0_r21android-platform-12.0.0_r20android-platform-12.0.0_r2android-platform-12.0.0_r19android-platform-12.0.0_r18android-platform-12.0.0_r17android-platform-12.0.0_r16android-platform-12.0.0_r15android-platform-12.0.0_r14android-platform-12.0.0_r13android-platform-12.0.0_r12android-platform-12.0.0_r11android-platform-12.0.0_r10android-platform-12.0.0_r1android-cts-12.0_r9android-cts-12.0_r8android-cts-12.0_r7android-cts-12.0_r6android-cts-12.0_r5android-cts-12.0_r4android-cts-12.0_r3android-cts-12.0_r2android-cts-12.0_r12android-cts-12.0_r11android-cts-12.0_r10android-cts-12.0_r1android-12.0.0_r9android-12.0.0_r8android-12.0.0_r34android-12.0.0_r33android-12.0.0_r31android-12.0.0_r30android-12.0.0_r3android-12.0.0_r25android-12.0.0_r2android-12.0.0_r11android-12.0.0_r10android-12.0.0_r1android12-tests-releaseandroid12-security-releaseandroid12-s5-releaseandroid12-s4-releaseandroid12-s3-releaseandroid12-s2-releaseandroid12-s1-releaseandroid12-releaseandroid12-platform-release
Change-Id: I82b0b027c2ea2524dd936ae960dd176675f395eb
-rw-r--r-- | OWNERS | 6 | ||||
-rw-r--r-- | src/vogar/HostFileCache.java | 6 |
2 files changed, 8 insertions, 4 deletions
@@ -1,3 +1,5 @@ -rpl@google.com -paulduffin@google.com android-libcore-team+review@google.com +dsrbecky@google.com +ngeoffray@google.com +paulduffin@google.com +rpl@google.com diff --git a/src/vogar/HostFileCache.java b/src/vogar/HostFileCache.java index a2282f3..9232902 100644 --- a/src/vogar/HostFileCache.java +++ b/src/vogar/HostFileCache.java @@ -17,6 +17,7 @@ package vogar; import java.io.File; +import java.lang.ProcessHandle; import java.util.List; import vogar.commands.Command; import vogar.commands.Mkdir; @@ -44,7 +45,8 @@ public class HostFileCache implements FileCache { private void mv(File source, File destination) { List<String> rawResult = new Command.Builder(log).args("mv", source, destination).execute(); // A successful move returns no results. - if (!rawResult.isEmpty()) { + // Note that other process might have moved the file to the destination at the same time. + if (!rawResult.isEmpty() && !destination.exists()) { throw new RuntimeException("Couldn't move " + source + " to " + destination + ": " + rawResult.get(0)); } @@ -60,7 +62,7 @@ public class HostFileCache implements FileCache { mkdir.mkdirs(CACHE_ROOT); // Copy it onto the same file system first, then atomically move it into place. // That way, if we fail, we don't leave anything dangerous lying around. - File temporary = new File(cachedFile + ".tmp"); + File temporary = new File(cachedFile + ".tmp" + String.valueOf(ProcessHandle.current().pid())); cp(source, temporary); mv(temporary, cachedFile); } |