--amend

Author: amahussein

hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-distributedshell/src/test/java/org/apache/hadoop/yarn/applications/distributedshell/DistributedShellBaseTest.java

@@ -101,7 +101,7 @@ public abstract class DistributedShellBaseTest {
       "--appname",
       ""
   };
-  protected static MiniDFSCluster hdfsCluster = null;
+  private static MiniDFSCluster hdfsCluster = null;
   private static MiniYARNCluster yarnCluster = null;
   private static String yarnSiteBackupPath = null;
   private static String yarnSitePath = null;
@@ -128,8 +128,10 @@ public static void setupUnitTests() throws Exception {
     // backup the original yarn-site file.
     yarnSitePath = url.getPath();
     yarnSiteBackupPath = url.getPath() + "-backup";
-    Files.copy(Paths.get(yarnSitePath), Paths.get(yarnSiteBackupPath),
-        StandardCopyOption.COPY_ATTRIBUTES, StandardCopyOption.REPLACE_EXISTING);
+    Files.copy(Paths.get(yarnSitePath),
+        Paths.get(yarnSiteBackupPath),
+        StandardCopyOption.COPY_ATTRIBUTES,
+        StandardCopyOption.REPLACE_EXISTING);
   }
 
   @AfterClass
@@ -598,4 +600,8 @@ private void waitForNMsToRegister() throws Exception {
       return (rmContext.getRMNodes().size() >= NUM_NMS);
     }, 100, 60000);
   }
+
+  protected MiniDFSCluster getHDFSCluster() {
+    return hdfsCluster;
+  }
 }

hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-distributedshell/src/test/java/org/apache/hadoop/yarn/applications/distributedshell/TestDSTimelineV15.java

@@ -51,8 +51,8 @@ protected void customizeConfiguration(
       YarnConfiguration config) throws Exception {
     setUpHDFSCluster();
     PluginStoreTestUtils.prepareFileSystemForPluginStore(
-        hdfsCluster.getFileSystem());
-    PluginStoreTestUtils.prepareConfiguration(config, hdfsCluster);
+        getHDFSCluster().getFileSystem());
+    PluginStoreTestUtils.prepareConfiguration(config, getHDFSCluster());
     config.set(YarnConfiguration.TIMELINE_SERVICE_ENTITY_GROUP_PLUGIN_CLASSES,
         DistributedShellTimelinePlugin.class.getName());
   }
@@ -75,7 +75,7 @@ protected void checkTimeline(ApplicationId appId,
     GenericTestUtils.waitFor(() -> {
       try {
         RemoteIterator<FileStatus> iterApps =
-            hdfsCluster.getFileSystem().listStatusIterator(doneDir);
+            getHDFSCluster().getFileSystem().listStatusIterator(doneDir);
         return (iterApps.hasNext());
       } catch (Exception e) {
         exceptionRef.set(e);