YARN-6542. Fix the logger in TestAlignedPlanner and TestGreedyReservationAgent.
(cherry picked from commit e514fc432a424c57bdce16cad1d5b1d2e010f34e) Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/2030f408 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/2030f408 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/2030f408 Branch: refs/heads/branch-2 Commit: 2030f408e01ac0a215c8dbe9b04a7e5d3a46d7b0 Parents: 0eae1c6 Author: Subru Krishnan <su...@apache.org> Authored: Mon May 1 18:10:07 2017 -0700 Committer: Subru Krishnan <su...@apache.org> Committed: Mon May 1 18:31:08 2017 -0700 ---------------------------------------------------------------------- .../reservation/planning/TestAlignedPlanner.java | 8 ++++++-- .../reservation/planning/TestGreedyReservationAgent.java | 8 ++++++-- 2 files changed, 12 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/2030f408/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/reservation/planning/TestAlignedPlanner.java ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/reservation/planning/TestAlignedPlanner.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/reservation/planning/TestAlignedPlanner.java index 7207d71..fd187fc 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/reservation/planning/TestAlignedPlanner.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/reservation/planning/TestAlignedPlanner.java @@ -52,12 +52,16 @@ import org.apache.hadoop.yarn.server.resourcemanager.scheduler.QueueMetrics; import org.apache.hadoop.yarn.util.resource.DefaultResourceCalculator; import org.apache.hadoop.yarn.util.resource.ResourceCalculator; import org.apache.hadoop.yarn.util.resource.Resources; -import org.eclipse.jetty.util.log.Log; import org.junit.Before; import org.junit.Test; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; public class TestAlignedPlanner { + private static final Logger LOG = LoggerFactory + .getLogger(TestAlignedPlanner.class); + private ReservationAgent agentRight; private ReservationAgent agentLeft; private InMemoryPlan plan; @@ -1030,7 +1034,7 @@ public class TestAlignedPlanner { // Initialize random seed long seed = rand.nextLong(); rand.setSeed(seed); - Log.getLog().info("Running with seed: " + seed); + LOG.info("Running with seed: " + seed); // Set cluster parameters long timeWindow = 1000000L; http://git-wip-us.apache.org/repos/asf/hadoop/blob/2030f408/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/reservation/planning/TestGreedyReservationAgent.java ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/reservation/planning/TestGreedyReservationAgent.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/reservation/planning/TestGreedyReservationAgent.java index 46bfa80..51b971b 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/reservation/planning/TestGreedyReservationAgent.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/reservation/planning/TestGreedyReservationAgent.java @@ -55,16 +55,20 @@ import org.apache.hadoop.yarn.server.resourcemanager.scheduler.capacity.Capacity import org.apache.hadoop.yarn.util.resource.DefaultResourceCalculator; import org.apache.hadoop.yarn.util.resource.ResourceCalculator; import org.apache.hadoop.yarn.util.resource.Resources; -import org.eclipse.jetty.util.log.Log; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.junit.runners.Parameterized; import org.junit.runners.Parameterized.Parameters; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; @RunWith(Parameterized.class) public class TestGreedyReservationAgent { + private static final Logger LOG = LoggerFactory + .getLogger(TestGreedyReservationAgent.class); + ReservationAgent agent; InMemoryPlan plan; Resource minAlloc = Resource.newInstance(1024, 1); @@ -89,7 +93,7 @@ public class TestGreedyReservationAgent { long seed = rand.nextLong(); rand.setSeed(seed); - Log.getLog().info("Running with seed: " + seed); + LOG.info("Running with seed: " + seed); // setting completely loose quotas long timeWindow = 1000000L; --------------------------------------------------------------------- To unsubscribe, e-mail: common-commits-unsubscr...@hadoop.apache.org For additional commands, e-mail: common-commits-h...@hadoop.apache.org
