Fix checkstyle errors

Author: afchung

hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/scheduler/ContainerScheduler.java

@@ -126,7 +126,7 @@ private static int getMaxOppQueueLengthFromConf(final Context context) {
   }
 
   private static OpportunisticContainersQueuePolicy
-  getOppContainersQueuePolicyFromConf(final Context context) {
+      getOppContainersQueuePolicyFromConf(final Context context) {
     final OpportunisticContainersQueuePolicy queuePolicy;
     if (context == null || context.getConf() == null) {
       queuePolicy = OpportunisticContainersQueuePolicy.DEFAULT;

hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/scheduler/OpportunisticContainersQueuePolicy.java

@@ -18,14 +18,16 @@
 
 package org.apache.hadoop.yarn.server.nodemanager.containermanager.scheduler;
 
+import org.apache.hadoop.yarn.conf.YarnConfiguration;
+
 /**
  * Determines how to schedule opportunistic containers at the NodeManager,
  * i.e., whether or not to accept, queue, or reject a container run request.
  */
 public enum OpportunisticContainersQueuePolicy {
   /**
    * Determines whether or not to run a container by the queue capacity:
-   * {@link org.apache.hadoop.yarn.conf.YarnConfiguration#NM_OPPORTUNISTIC_CONTAINERS_MAX_QUEUE_LENGTH}.
+   * {@link YarnConfiguration#NM_OPPORTUNISTIC_CONTAINERS_MAX_QUEUE_LENGTH}.
    * If there's enough capacity in the queue,
    * queues the container, otherwise rejects it.
    */

hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/BaseContainerManagerTest.java

@@ -160,7 +160,7 @@ public NMLogAggregationStatusTracker getNMLogAggregationStatusTracker() {
   private NodeResourceMonitorImpl nodeResourceMonitor = mock(
       NodeResourceMonitorImpl.class);
   private NodeHealthCheckerService nodeHealthCheckerService;
-  protected NodeStatusUpdater nodeStatusUpdater;
+  private NodeStatusUpdater nodeStatusUpdater;
   protected ContainerManagerImpl containerManager = null;
 
   public NodeStatusUpdater getNodeStatusUpdater() {

hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/BaseContainerSchedulerTest.java

@@ -66,11 +66,19 @@ public BaseContainerSchedulerTest() throws UnsupportedFileSystemException {
 
   public static class Listener implements ContainerStateTransitionListener {
 
-    public final Map<ContainerId, List<ContainerState>> states =
+    private final Map<ContainerId, List<ContainerState>> states =
         new HashMap<>();
-    public final Map<ContainerId, List<ContainerEventType>> events =
+    private final Map<ContainerId, List<ContainerEventType>> events =
         new HashMap<>();
 
+    public Map<ContainerId, List<ContainerEventType>> getEvents() {
+      return events;
+    }
+
+    public Map<ContainerId, List<ContainerState>> getStates() {
+      return states;
+    }
+
     @Override
     public void init(Context context) {}
 
@@ -93,13 +101,17 @@ public void postTransition(ContainerImpl op, ContainerState beforeState,
     }
   }
 
-  protected boolean delayContainers = true;
+  private boolean delayContainers = true;
+
+  protected void setDelayContainers(final boolean delayContainersParam) {
+    this.delayContainers = delayContainersParam;
+  }
 
   @Override
   protected ContainerManagerImpl createContainerManager(
       DeletionService delSrvc) {
     return new ContainerManagerImpl(context, exec, delSrvc,
-        nodeStatusUpdater, metrics, dirsHandler) {
+        getNodeStatusUpdater(), metrics, dirsHandler) {
 
       @Override
       protected UserGroupInformation getRemoteUgi() throws YarnException {

hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/scheduler/TestContainerSchedulerOppContainersByResources.java

@@ -232,7 +232,7 @@ public void testKillOpportunisticWhenNoResourcesAvailable() throws Exception {
 
     // Wait for the OContainer to get killed
     BaseContainerManagerTest.waitForNMContainerState(containerManager,
-        createContainerId(1), ContainerState.DONE,40);
+        createContainerId(1), ContainerState.DONE, 40);
 
     // Get container statuses.
     // Container 0 should be running and container 1 should be killed

hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/scheduler/TestContainerSchedulerQueuing.java

@@ -508,7 +508,7 @@ public void testPauseOpportunisticForGuaranteedContainer() throws Exception {
 
     List<org.apache.hadoop.yarn.server.nodemanager.containermanager.container.
         ContainerState> containerStates =
-        listener.states.get(createContainerId(0));
+        listener.getStates().get(createContainerId(0));
     Assert.assertEquals(Arrays.asList(
         org.apache.hadoop.yarn.server.nodemanager.containermanager.container.
             ContainerState.NEW,
@@ -529,7 +529,7 @@ public void testPauseOpportunisticForGuaranteedContainer() throws Exception {
         org.apache.hadoop.yarn.server.nodemanager.containermanager.container.
             ContainerState.DONE), containerStates);
     List<ContainerEventType> containerEventTypes =
-        listener.events.get(createContainerId(0));
+        listener.getEvents().get(createContainerId(0));
     Assert.assertEquals(Arrays.asList(ContainerEventType.INIT_CONTAINER,
         ContainerEventType.CONTAINER_LAUNCHED,
         ContainerEventType.PAUSE_CONTAINER,
@@ -1083,7 +1083,7 @@ public void testPromotionOfOpportunisticContainers() throws Exception {
 
     List<org.apache.hadoop.yarn.server.nodemanager.containermanager.container.
         ContainerState> containerStates =
-        listener.states.get(createContainerId(1));
+        listener.getStates().get(createContainerId(1));
     Assert.assertEquals(Arrays.asList(
         org.apache.hadoop.yarn.server.nodemanager.containermanager.container.
             ContainerState.NEW,
@@ -1094,7 +1094,7 @@ public void testPromotionOfOpportunisticContainers() throws Exception {
         org.apache.hadoop.yarn.server.nodemanager.containermanager.container.
             ContainerState.RUNNING), containerStates);
     List<ContainerEventType> containerEventTypes =
-        listener.events.get(createContainerId(1));
+        listener.getEvents().get(createContainerId(1));
     Assert.assertEquals(Arrays.asList(
         ContainerEventType.INIT_CONTAINER,
         ContainerEventType.UPDATE_CONTAINER_TOKEN,
@@ -1107,7 +1107,7 @@ public void testPromotionOfOpportunisticContainers() throws Exception {
   @Test
   public void testContainerUpdateExecTypeGuaranteedToOpportunistic()
       throws Exception {
-    delayContainers = true;
+    setDelayContainers(true);
     containerManager.start();
     // Construct the Container-id
     ContainerId cId = createContainerId(0);