Repository: hadoop Updated Branches: refs/heads/trunk e7654c4a1 -> 5cb6e3e08
YARN-6473. Create ReservationInvariantChecker to validate ReservationSystem + Scheduler operations. Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/5cb6e3e0 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/5cb6e3e0 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/5cb6e3e0 Branch: refs/heads/trunk Commit: 5cb6e3e082ed9edbdb7c46d27daa049a4712e82b Parents: e7654c4 Author: Carlo Curino <cur...@apache.org> Authored: Wed May 10 14:49:25 2017 -0700 Committer: Carlo Curino <cur...@apache.org> Committed: Wed May 10 14:49:25 2017 -0700 ---------------------------------------------------------------------- .../sls/TestReservationSystemInvariants.java | 73 ++++++++++++++++++++ .../ReservationInvariantsChecker.java | 63 +++++++++++++++++ 2 files changed, 136 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/5cb6e3e0/hadoop-tools/hadoop-sls/src/test/java/org/apache/hadoop/yarn/sls/TestReservationSystemInvariants.java ---------------------------------------------------------------------- diff --git a/hadoop-tools/hadoop-sls/src/test/java/org/apache/hadoop/yarn/sls/TestReservationSystemInvariants.java b/hadoop-tools/hadoop-sls/src/test/java/org/apache/hadoop/yarn/sls/TestReservationSystemInvariants.java new file mode 100644 index 0000000..b3a79cb --- /dev/null +++ b/hadoop-tools/hadoop-sls/src/test/java/org/apache/hadoop/yarn/sls/TestReservationSystemInvariants.java @@ -0,0 +1,73 @@ +/** + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.hadoop.yarn.sls; + +import java.util.Arrays; +import java.util.Collection; + +import org.apache.hadoop.conf.Configuration; +import org.apache.hadoop.yarn.conf.YarnConfiguration; +import org.apache.hadoop.yarn.server.resourcemanager.monitor.invariants.InvariantsChecker; +import org.apache.hadoop.yarn.server.resourcemanager.monitor.invariants.ReservationInvariantsChecker; +import org.apache.hadoop.yarn.server.resourcemanager.scheduler.capacity.CapacityScheduler; +import org.apache.hadoop.yarn.server.resourcemanager.scheduler.fair.FairScheduler; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.junit.runners.Parameterized; +import org.junit.runners.Parameterized.Parameters; + +import net.jcip.annotations.NotThreadSafe; + +/** + * This test performs an SLS run enabling a + * {@code ReservationInvariantsChecker}. + */ +@RunWith(value = Parameterized.class) +@NotThreadSafe +public class TestReservationSystemInvariants extends BaseSLSRunnerTest { + + @Parameters(name = "Testing with: {1}, {0}, (nodeFile {3})") + public static Collection<Object[]> data() { + // Test with both schedulers, and all three trace types + return Arrays.asList(new Object[][] { + {CapacityScheduler.class.getCanonicalName(), "SYNTH", + "src/test/resources/syn.json", null}, + {FairScheduler.class.getCanonicalName(), "SYNTH", + "src/test/resources/syn.json", null} + }); + } + + @Test(timeout = 120000) + @SuppressWarnings("all") + public void testSimulatorRunning() throws Exception { + + Configuration conf = new Configuration(false); + conf.set(YarnConfiguration.RM_SCHEDULER, schedulerType); + conf.setBoolean(YarnConfiguration.RM_SCHEDULER_ENABLE_MONITORS, true); + conf.set(YarnConfiguration.RM_SCHEDULER_MONITOR_POLICIES, + ReservationInvariantsChecker.class.getCanonicalName()); + conf.setBoolean(InvariantsChecker.THROW_ON_VIOLATION, true); + + + long timeTillShutDownInSec = 90; + runSLS(conf, timeTillShutDownInSec); + + } + +} http://git-wip-us.apache.org/repos/asf/hadoop/blob/5cb6e3e0/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/monitor/invariants/ReservationInvariantsChecker.java ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/monitor/invariants/ReservationInvariantsChecker.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/monitor/invariants/ReservationInvariantsChecker.java new file mode 100644 index 0000000..2f9f03e --- /dev/null +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/monitor/invariants/ReservationInvariantsChecker.java @@ -0,0 +1,63 @@ +/** + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.apache.hadoop.yarn.server.resourcemanager.monitor.invariants; + +import org.apache.hadoop.yarn.server.resourcemanager.reservation.Plan; +import org.apache.hadoop.yarn.util.UTCClock; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import java.io.IOException; +import java.util.Collection; + +/** + * Invariant checker that checks certain reservation invariants are respected. + */ +public class ReservationInvariantsChecker extends InvariantsChecker { + + private static final Logger LOG = + LoggerFactory.getLogger(ReservationInvariantsChecker.class); + + private UTCClock clock = new UTCClock(); + + @Override + public void editSchedule() { + Collection<Plan> plans = + getContext().getReservationSystem().getAllPlans().values(); + + try { + for (Plan plan : plans) { + long currReservations = + plan.getReservationsAtTime(clock.getTime()).size(); + long numberReservationQueues = getContext().getScheduler() + .getQueueInfo(plan.getQueueName(), true, false).getChildQueues() + .size(); + if (currReservations != numberReservationQueues - 1) { + logOrThrow("Number of reservations (" + currReservations + + ") does NOT match the number of reservationQueues (" + + (numberReservationQueues - 1) + "), while it should."); + } + } + } catch (IOException io) { + throw new InvariantViolationException("Issue during invariant check: ", + io); + } + + } + +} --------------------------------------------------------------------- To unsubscribe, e-mail: common-commits-unsubscr...@hadoop.apache.org For additional commands, e-mail: common-commits-h...@hadoop.apache.org
