big-data/hadoop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

YARN-11305. Fix TestLogAggregationService#testLocalFileDeletionAfterUpload Failed After YARN-11241. (#4893). Contributed by fanshilun.

Browse Source 
Signed-off-by: Ayush Saxena <ayushsaxena@apache.org>
This commit is contained in:
slfan1989 2022-09-21 01:36:24 +08:00 committed by GitHub
parent a134628d1b
commit fd687bb4c4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/logaggregation/TestLogAggregationService.java
View File

@ -56,6 +56,7 @@
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.Set; import java.util.Set;
import java.util.Random;
import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.ConcurrentMap; import java.util.concurrent.ConcurrentMap;
import java.util.concurrent.CountDownLatch; import java.util.concurrent.CountDownLatch;
@ -206,7 +207,9 @@ private void verifyLocalFileDeletion(
logAggregationService.init(this.conf); logAggregationService.init(this.conf);
logAggregationService.start(); 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 // AppLogDir should be created
File app1LogDir = File app1LogDir =
@ -245,15 +248,9 @@ private void verifyLocalFileDeletion(
String containerIdStr = container11.toString(); String containerIdStr = container11.toString();
File containerLogDir = new File(app1LogDir, containerIdStr); File containerLogDir = new File(app1LogDir, containerIdStr);
int count = 0;
int maxAttempts = 50;
for (String fileType : new String[]{"stdout", "stderr", "syslog"}) { for (String fileType : new String[]{"stdout", "stderr", "syslog"}) {
File f = new File(containerLogDir, fileType); File f = new File(containerLogDir, fileType);
count = 0; GenericTestUtils.waitFor(() -> !f.exists(), 1000, 1000 * 50);
while ((f.exists()) && (count < maxAttempts)) {
count++;
Thread.sleep(100);
}
Assert.assertFalse("File [" + f + "] was not deleted", f.exists()); Assert.assertFalse("File [" + f + "] was not deleted", f.exists());
} }
Assert.assertFalse("Directory [" + app1LogDir + "] was not deleted", Assert.assertFalse("Directory [" + app1LogDir + "] was not deleted",