Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id F2D41200B53 for ; Tue, 12 Jul 2016 21:38:41 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id F152B160A56; Tue, 12 Jul 2016 19:38:41 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 472C9160A53 for ; Tue, 12 Jul 2016 21:38:41 +0200 (CEST) Received: (qmail 22850 invoked by uid 500); 12 Jul 2016 19:38:40 -0000 Mailing-List: contact common-commits-help@hadoop.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Delivered-To: mailing list common-commits@hadoop.apache.org Received: (qmail 22841 invoked by uid 99); 12 Jul 2016 19:38:40 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 12 Jul 2016 19:38:40 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 3067ADFF68; Tue, 12 Jul 2016 19:38:40 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: jlowe@apache.org To: common-commits@hadoop.apache.org Message-Id: X-Mailer: ASF-Git Admin Mailer Subject: hadoop git commit: YARN-4393. Fix intermittent test failure for TestResourceLocalizationService#testFailedDirsResourceRelease (Varun Saxana via rohithsharmaks) (cherry picked from commit 791c1639ae0b351e0bf0b2ecec854dc72ab07935) Date: Tue, 12 Jul 2016 19:38:40 +0000 (UTC) archived-at: Tue, 12 Jul 2016 19:38:42 -0000 Repository: hadoop Updated Branches: refs/heads/branch-2.6 59818313d -> 7af3395a4 YARN-4393. Fix intermittent test failure for TestResourceLocalizationService#testFailedDirsResourceRelease (Varun Saxana via rohithsharmaks) (cherry picked from commit 791c1639ae0b351e0bf0b2ecec854dc72ab07935) Conflicts: hadoop-yarn-project/CHANGES.txt Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/7af3395a Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/7af3395a Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/7af3395a Branch: refs/heads/branch-2.6 Commit: 7af3395a496d98c465ff314db2277e080ef38135 Parents: 5981831 Author: Jason Lowe Authored: Tue Jul 12 19:37:18 2016 +0000 Committer: Jason Lowe Committed: Tue Jul 12 19:37:18 2016 +0000 ---------------------------------------------------------------------- hadoop-yarn-project/CHANGES.txt | 3 +++ .../localizer/TestResourceLocalizationService.java | 2 ++ 2 files changed, 5 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/7af3395a/hadoop-yarn-project/CHANGES.txt ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/CHANGES.txt b/hadoop-yarn-project/CHANGES.txt index b120e51..7ede65d 100644 --- a/hadoop-yarn-project/CHANGES.txt +++ b/hadoop-yarn-project/CHANGES.txt @@ -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 http://git-wip-us.apache.org/repos/asf/hadoop/blob/7af3395a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/localizer/TestResourceLocalizationService.java ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/localizer/TestResourceLocalizationService.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/localizer/TestResourceLocalizationService.java index f374f66..8c56382 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/localizer/TestResourceLocalizationService.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/localizer/TestResourceLocalizationService.java @@ -2416,6 +2416,8 @@ public class TestResourceLocalizationService { 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 --------------------------------------------------------------------- To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org For additional commands, e-mail: common-commits-help@hadoop.apache.org