pendingOrderingPolicyRecovery) {
+ if (null != this.pendingOPForRecoveredApps) {
+ pendingOrderingPolicyRecovery
+ .addAllSchedulableEntities(this.pendingOPForRecoveredApps
+ .getSchedulableEntities());
+ }
+ this.pendingOPForRecoveredApps = pendingOrderingPolicyRecovery;
+ }
+
/*
* Holds shared values used by all applications in
* the queue to calculate headroom on demand
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/common/fica/FiCaSchedulerApp.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/common/fica/FiCaSchedulerApp.java
index c9c792e352..4b88415ad8 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/common/fica/FiCaSchedulerApp.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/common/fica/FiCaSchedulerApp.java
@@ -99,12 +99,12 @@ public class FiCaSchedulerApp extends SchedulerApplicationAttempt {
String user, Queue queue, ActiveUsersManager activeUsersManager,
RMContext rmContext) {
this(applicationAttemptId, user, queue, activeUsersManager, rmContext,
- Priority.newInstance(0));
+ Priority.newInstance(0), false);
}
public FiCaSchedulerApp(ApplicationAttemptId applicationAttemptId,
String user, Queue queue, ActiveUsersManager activeUsersManager,
- RMContext rmContext, Priority appPriority) {
+ RMContext rmContext, Priority appPriority, boolean isAttemptRecovering) {
super(applicationAttemptId, user, queue, activeUsersManager, rmContext);
RMApp rmApp = rmContext.getRMApps().get(getApplicationId());
@@ -129,6 +129,7 @@ public class FiCaSchedulerApp extends SchedulerApplicationAttempt {
setAppAMNodePartitionName(partition);
setAMResource(partition, amResource);
setPriority(appPriority);
+ setAttemptRecovering(isAttemptRecovering);
scheduler = rmContext.getScheduler();
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/TestApplicationPriority.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/TestApplicationPriority.java
index 169e9f6a4a..2ad805a206 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/TestApplicationPriority.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/TestApplicationPriority.java
@@ -34,6 +34,8 @@ import org.apache.hadoop.yarn.api.records.Container;
import org.apache.hadoop.yarn.api.records.ContainerId;
import org.apache.hadoop.yarn.api.records.Priority;
import org.apache.hadoop.yarn.conf.YarnConfiguration;
+import org.apache.hadoop.yarn.event.Dispatcher;
+import org.apache.hadoop.yarn.event.DrainDispatcher;
import org.apache.hadoop.yarn.server.resourcemanager.MockAM;
import org.apache.hadoop.yarn.server.resourcemanager.MockNM;
import org.apache.hadoop.yarn.server.resourcemanager.MockNodes;
@@ -567,4 +569,166 @@ public class TestApplicationPriority {
Assert.assertEquals(6, schedulerAppAttemptApp1.getLiveContainers().size());
rm.stop();
}
+
+ /**
+ *
+ * Test case verifies the order of applications activated after RM Restart.
+ *
+ * App-1 and app-2 submitted and scheduled and running with a priority
+ * 5 and 6 Respectively
+ * App-3 submitted and scheduled with a priority 7. This
+ * is not activated since AMResourceLimit is reached
+ * RM restarted
+ * App-1 get activated nevertheless of AMResourceLimit
+ * App-2 and app-3 put in pendingOrderingPolicy
+ * After NM registration, app-3 is activated
+ *
+ * Expected Output : App-2 must get activated since app-2 was running earlier
+ *
+ * @throws Exception
+ */
+ @Test
+ public void testOrderOfActivatingThePriorityApplicationOnRMRestart()
+ throws Exception {
+ conf.setBoolean(YarnConfiguration.RECOVERY_ENABLED, true);
+ conf.setBoolean(YarnConfiguration.RM_WORK_PRESERVING_RECOVERY_ENABLED, true);
+ conf.set(YarnConfiguration.RM_STORE, MemoryRMStateStore.class.getName());
+ conf.setInt(YarnConfiguration.RM_AM_MAX_ATTEMPTS,
+ YarnConfiguration.DEFAULT_RM_AM_MAX_ATTEMPTS);
+ conf.setInt(YarnConfiguration.MAX_CLUSTER_LEVEL_APPLICATION_PRIORITY, 10);
+ final DrainDispatcher dispatcher = new DrainDispatcher();
+
+ MemoryRMStateStore memStore = new MemoryRMStateStore();
+ memStore.init(conf);
+
+ MockRM rm1 = new MockRM(conf, memStore) {
+ @Override
+ protected Dispatcher createDispatcher() {
+ return dispatcher;
+ }
+ };
+ rm1.start();
+
+ MockNM nm1 =
+ new MockNM("127.0.0.1:1234", 16384, rm1.getResourceTrackerService());
+ nm1.registerNode();
+
+ dispatcher.await();
+
+ ResourceScheduler scheduler = rm1.getRMContext().getScheduler();
+ LeafQueue defaultQueue =
+ (LeafQueue) ((CapacityScheduler) scheduler).getQueue("default");
+ int memory = defaultQueue.getAMResourceLimit().getMemory() / 2;
+
+ // App-1 with priority 5 submitted and running
+ Priority appPriority1 = Priority.newInstance(5);
+ RMApp app1 = rm1.submitApp(memory, appPriority1);
+ MockAM am1 = MockRM.launchAM(app1, rm1, nm1);
+ am1.registerAppAttempt();
+
+ // App-2 with priority 6 submitted and running
+ Priority appPriority2 = Priority.newInstance(6);
+ RMApp app2 = rm1.submitApp(memory, appPriority2);
+ MockAM am2 = MockRM.launchAM(app2, rm1, nm1);
+ am2.registerAppAttempt();
+
+ dispatcher.await();
+ Assert.assertEquals(2, defaultQueue.getNumActiveApplications());
+ Assert.assertEquals(0, defaultQueue.getNumPendingApplications());
+
+ // App-3 with priority 7 submitted and scheduled. But not activated since
+ // AMResourceLimit threshold
+ Priority appPriority3 = Priority.newInstance(7);
+ RMApp app3 = rm1.submitApp(memory, appPriority3);
+
+ dispatcher.await();
+ Assert.assertEquals(2, defaultQueue.getNumActiveApplications());
+ Assert.assertEquals(1, defaultQueue.getNumPendingApplications());
+
+ Iterator iterator =
+ defaultQueue.getOrderingPolicy().getSchedulableEntities().iterator();
+ FiCaSchedulerApp fcApp2 = iterator.next();
+ Assert.assertEquals(app2.getCurrentAppAttempt().getAppAttemptId(),
+ fcApp2.getApplicationAttemptId());
+
+ FiCaSchedulerApp fcApp1 = iterator.next();
+ Assert.assertEquals(app1.getCurrentAppAttempt().getAppAttemptId(),
+ fcApp1.getApplicationAttemptId());
+
+ iterator = defaultQueue.getPendingApplications().iterator();
+ FiCaSchedulerApp fcApp3 = iterator.next();
+ Assert.assertEquals(app3.getCurrentAppAttempt().getAppAttemptId(),
+ fcApp3.getApplicationAttemptId());
+
+ final DrainDispatcher dispatcher1 = new DrainDispatcher();
+ // create new RM to represent restart and recover state
+ MockRM rm2 = new MockRM(conf, memStore) {
+ @Override
+ protected Dispatcher createDispatcher() {
+ return dispatcher1;
+ }
+ };
+
+ // start new RM
+ rm2.start();
+ // change NM to point to new RM
+ nm1.setResourceTrackerService(rm2.getResourceTrackerService());
+
+ // Verify RM Apps after this restart
+ Assert.assertEquals(3, rm2.getRMContext().getRMApps().size());
+
+ dispatcher1.await();
+ scheduler = rm2.getRMContext().getScheduler();
+ defaultQueue =
+ (LeafQueue) ((CapacityScheduler) scheduler).getQueue("default");
+
+ // wait for all applications to get added to scheduler
+ int count = 5;
+ while (count-- > 0) {
+ if ((defaultQueue.getNumActiveApplications() + defaultQueue
+ .getNumPendingApplications()) == 3) {
+ break;
+ }
+ Thread.sleep(500);
+ }
+
+ // Before NM registration, AMResourceLimit threshold is 0. So 1st
+ // applications get activated nevertheless of AMResourceLimit threshold
+ // Two applications are in pending
+ Assert.assertEquals(1, defaultQueue.getNumActiveApplications());
+ Assert.assertEquals(2, defaultQueue.getNumPendingApplications());
+
+ // NM resync to new RM
+ nm1.registerNode();
+ dispatcher1.await();
+
+ // wait for activating one applications
+ count = 5;
+ while (count-- > 0) {
+ if (defaultQueue.getOrderingPolicy().getSchedulableEntities().size() == 2) {
+ break;
+ }
+ Thread.sleep(500);
+ }
+
+ // verify for order of activated applications iterator
+ iterator =
+ defaultQueue.getOrderingPolicy().getSchedulableEntities().iterator();
+ fcApp2 = iterator.next();
+ Assert.assertEquals(app2.getCurrentAppAttempt().getAppAttemptId(),
+ fcApp2.getApplicationAttemptId());
+
+ fcApp1 = iterator.next();
+ Assert.assertEquals(app1.getCurrentAppAttempt().getAppAttemptId(),
+ fcApp1.getApplicationAttemptId());
+
+ // verify for pending application iterator. It should be app-3 attempt
+ iterator = defaultQueue.getPendingApplications().iterator();
+ fcApp3 = iterator.next();
+ Assert.assertEquals(app3.getCurrentAppAttempt().getAppAttemptId(),
+ fcApp3.getApplicationAttemptId());
+
+ rm2.stop();
+ rm1.stop();
+ }
}
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/TestLeafQueue.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/TestLeafQueue.java
index 479e25a880..d4b8dcd3a9 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/TestLeafQueue.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/TestLeafQueue.java
@@ -2413,14 +2413,16 @@ public class TestLeafQueue {
TestUtils.getMockApplicationAttemptId(0, 0);
FiCaSchedulerApp app_0 =
spy(new FiCaSchedulerApp(appAttemptId_0, user_0, a,
- mock(ActiveUsersManager.class), spyRMContext, Priority.newInstance(3)));
+ mock(ActiveUsersManager.class), spyRMContext,
+ Priority.newInstance(3), false));
a.submitApplicationAttempt(app_0, user_0);
final ApplicationAttemptId appAttemptId_1 =
TestUtils.getMockApplicationAttemptId(1, 0);
FiCaSchedulerApp app_1 =
spy(new FiCaSchedulerApp(appAttemptId_1, user_0, a,
- mock(ActiveUsersManager.class), spyRMContext, Priority.newInstance(5)));
+ mock(ActiveUsersManager.class), spyRMContext,
+ Priority.newInstance(5), false));
a.submitApplicationAttempt(app_1, user_0);
Priority priority = TestUtils.createMockPriority(1);