Skip to content

YARN-11305. Fix TestLogAggregationService#testLocalFileDeletionAfterUpload Failed After YARN-11241(#4703). #4893

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 4 commits into from
Sep 20, 2022
Merged

YARN-11305. Fix TestLogAggregationService#testLocalFileDeletionAfterUpload Failed After YARN-11241(#4703). #4893

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
748fa05
YARN-11305. Fix TestLogAggregationService#testLocalFileDeletionAfterU…
Sep 15, 2022
1c89c3c
YARN-11305. Fix CheckStyle.
Sep 15, 2022
d553d26
YARN-11305. Fix CheckStyle.
Sep 16, 2022
b62f0ab
YARN-11305.Fix CheckStyle.
Sep 16, 2022
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
13 changes: 5 additions & 8 deletions ...op/yarn/server/nodemanager/containermanager/logaggregation/TestLogAggregationService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,7 @@
import java.util.List;
import java.util.Map;
import java.util.Set;
import java.util.Random;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.ConcurrentMap;
import java.util.concurrent.CountDownLatch;
Expand Down Expand Up @@ -206,7 +207,9 @@ private void verifyLocalFileDeletion(
logAggregationService.init(this.conf);
logAggregationService.start();

ApplicationId application1 = BuilderUtils.newApplicationId(1234, 1);
Random random = new Random(System.currentTimeMillis());
long clusterTimeStamp = random.nextLong();
ApplicationId application1 = BuilderUtils.newApplicationId(clusterTimeStamp, 1);

// AppLogDir should be created
File app1LogDir =
Expand Down Expand Up @@ -245,15 +248,9 @@ private void verifyLocalFileDeletion(

String containerIdStr = container11.toString();
File containerLogDir = new File(app1LogDir, containerIdStr);
int count = 0;
int maxAttempts = 50;
for (String fileType : new String[]{"stdout", "stderr", "syslog"}) {
File f = new File(containerLogDir, fileType);
count = 0;
while ((f.exists()) && (count < maxAttempts)) {
count++;
Thread.sleep(100);
}
GenericTestUtils.waitFor(() -> !f.exists(), 1000, 1000 * 50);
Assert.assertFalse("File [" + f + "] was not deleted", f.exists());
}
Assert.assertFalse("Directory [" + app1LogDir + "] was not deleted",
Expand Down