Apache
/
hadoop
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

YARN-1537. Fix race condition in TestLocalResourcesTrackerImpl.testLocalResourceCache. Contributed by Xuan Gong.

This commit is contained in:
Arun C. Murthy 2015-02-05 23:58:52 -08:00
parent 29c77de297
commit 92ff524182
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
hadoop-yarn-project/CHANGES.txt
View File

@ -464,6 +464,9 @@ Release 2.7.0 - UNRELEASED
YARN-3145. Fixed ConcurrentModificationException on CapacityScheduler YARN-3145. Fixed ConcurrentModificationException on CapacityScheduler
ParentQueue#getQueueUserAclInfo. (Tsuyoshi OZAWA via jianhe) ParentQueue#getQueueUserAclInfo. (Tsuyoshi OZAWA via jianhe)
YARN-1537. Fix race condition in
TestLocalResourcesTrackerImpl.testLocalResourceCache. (xgong via acmurthy)
Release 2.6.0 - 2014-11-18 Release 2.6.0 - 2014-11-18
INCOMPATIBLE CHANGES INCOMPATIBLE CHANGES

5
hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/localizer/TestLocalResourcesTrackerImpl.java
View File

@ -24,6 +24,7 @@ import static org.mockito.Matchers.eq;
import static org.mockito.Mockito.mock; import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.times; import static org.mockito.Mockito.times;
import static org.mockito.Mockito.verify; import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.timeout;
import java.io.File; import java.io.File;
import java.io.IOException; import java.io.IOException;
@ -313,7 +314,7 @@ public class TestLocalResourcesTrackerImpl {
// After receiving failed resource event; all waiting containers will be // After receiving failed resource event; all waiting containers will be
// notified with Container Resource Failed Event. // notified with Container Resource Failed Event.
Assert.assertEquals(0, localrsrc.size()); Assert.assertEquals(0, localrsrc.size());
verify(containerEventHandler, times(2)).handle( verify(containerEventHandler, timeout(1000).times(2)).handle(
isA(ContainerResourceFailedEvent.class)); isA(ContainerResourceFailedEvent.class));
Assert.assertEquals(ResourceState.FAILED, localizedResource.getState()); Assert.assertEquals(ResourceState.FAILED, localizedResource.getState());
@ -360,7 +361,7 @@ public class TestLocalResourcesTrackerImpl {
dispatcher.await(); dispatcher.await();
// Verifying ContainerResourceLocalizedEvent . // Verifying ContainerResourceLocalizedEvent .
verify(containerEventHandler, times(1)).handle( verify(containerEventHandler, timeout(1000).times(1)).handle(
isA(ContainerResourceLocalizedEvent.class)); isA(ContainerResourceLocalizedEvent.class));
Assert.assertEquals(ResourceState.LOCALIZED, localrsrc.get(lr) Assert.assertEquals(ResourceState.LOCALIZED, localrsrc.get(lr)
.getState()); .getState());