YARN-4393. Fix intermittent test failure for TestResourceLocalizationService#testFailedDirsResourceRelease (Varun Saxana via rohithsharmaks)

(cherry picked from commit 791c1639ae0b351e0bf0b2ecec854dc72ab07935)

Conflicts:

	hadoop-yarn-project/CHANGES.txt
This commit is contained in:
Jason Lowe 2016-07-12 19:37:18 +00:00
parent 59818313d4
commit 7af3395a49
2 changed files with 5 additions and 0 deletions

View File

@ -39,6 +39,9 @@ Release 2.6.5 - UNRELEASED
YARN-5197. RM leaks containers if running container disappears from
node update. Contributed by Jason Lowe.
YARN-4393. Fix intermittent test failure for TestResourceLocalizationService
#testFailedDirsResourceRelease (Varun Saxana via rohithsharmaks)
Release 2.6.4 - 2016-02-11
INCOMPATIBLE CHANGES

View File

@ -2416,6 +2416,8 @@ public boolean matches(Object o) {
new ApplicationLocalizationEvent(
LocalizationEventType.DESTROY_APPLICATION_RESOURCES, app);
spyService.handle(destroyApp);
// Waits for APPLICATION_RESOURCES_CLEANEDUP event to be handled.
dispatcher.await();
verify(applicationBus).handle(argThat(matchesAppDestroy));
// verify we got the right delete calls