hadoop-common-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cnaur...@apache.org
Subject [3/3] hadoop git commit: HDFS-9571. Fix ASF Licence warnings in Jenkins reports. Contributed by Brahma Reddy Battula.
Date Fri, 18 Dec 2015 00:35:09 GMT
HDFS-9571. Fix ASF Licence warnings in Jenkins reports. Contributed by Brahma Reddy Battula.

(cherry picked from commit 6da9deec204a4fa69dfc2d891ce934979d59b0ab)
(cherry picked from commit 7e5306e7952c1020b4cf9b4f71057ebb40db4ad7)


Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/9a6814f3
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/9a6814f3
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/9a6814f3

Branch: refs/heads/branch-2.8
Commit: 9a6814f37cd105aaf6f288797622cf7a217a7be6
Parents: e5e5ba4
Author: cnauroth <cnauroth@apache.org>
Authored: Thu Dec 17 16:26:01 2015 -0800
Committer: cnauroth <cnauroth@apache.org>
Committed: Thu Dec 17 16:26:16 2015 -0800

----------------------------------------------------------------------
 hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt      |  3 +++
 .../apache/hadoop/hdfs/TestMiniDFSCluster.java   | 19 +++++++++++++------
 .../TestBlocksWithNotEnoughRacks.java            |  8 ++++----
 .../hdfs/server/namenode/TestHostsFiles.java     |  8 ++++----
 4 files changed, 24 insertions(+), 14 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/hadoop/blob/9a6814f3/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
----------------------------------------------------------------------
diff --git a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
index e0fe04e..6204544 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
+++ b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
@@ -1603,6 +1603,9 @@ Release 2.8.0 - UNRELEASED
     HDFS-9572. Prevent DataNode log spam if a client connects on the data
     transfer port but sends no data. (cnauroth)
 
+    HDFS-9571. Fix ASF Licence warnings in Jenkins reports
+    (Brahma Reddy Battula via cnauroth)
+
 Release 2.7.3 - UNRELEASED
 
   INCOMPATIBLE CHANGES

http://git-wip-us.apache.org/repos/asf/hadoop/blob/9a6814f3/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestMiniDFSCluster.java
----------------------------------------------------------------------
diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestMiniDFSCluster.java
b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestMiniDFSCluster.java
index ec5895b..78ae8b1 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestMiniDFSCluster.java
+++ b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestMiniDFSCluster.java
@@ -63,17 +63,24 @@ public class TestMiniDFSCluster {
    */
   @Test(timeout=100000)
   public void testClusterWithoutSystemProperties() throws Throwable {
+    String oldPrp = System.getProperty(MiniDFSCluster.PROP_TEST_BUILD_DATA);
     System.clearProperty(MiniDFSCluster.PROP_TEST_BUILD_DATA);
-    Configuration conf = new HdfsConfiguration();
-    File testDataCluster1 = new File(testDataPath, CLUSTER_1);
-    String c1Path = testDataCluster1.getAbsolutePath();
-    conf.set(MiniDFSCluster.HDFS_MINIDFS_BASEDIR, c1Path);
-    MiniDFSCluster cluster = new MiniDFSCluster.Builder(conf).build();
+    MiniDFSCluster cluster = null;
     try {
+      Configuration conf = new HdfsConfiguration();
+      File testDataCluster1 = new File(testDataPath, CLUSTER_1);
+      String c1Path = testDataCluster1.getAbsolutePath();
+      conf.set(MiniDFSCluster.HDFS_MINIDFS_BASEDIR, c1Path);
+      cluster = new MiniDFSCluster.Builder(conf).build();
       assertEquals(new File(c1Path + "/data"),
           new File(cluster.getDataDirectory()));
     } finally {
-      cluster.shutdown();
+      if (oldPrp != null) {
+        System.setProperty(MiniDFSCluster.PROP_TEST_BUILD_DATA, oldPrp);
+      }
+      if (cluster != null) {
+        cluster.shutdown();
+      }
     }
   }
 

http://git-wip-us.apache.org/repos/asf/hadoop/blob/9a6814f3/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/blockmanagement/TestBlocksWithNotEnoughRacks.java
----------------------------------------------------------------------
diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/blockmanagement/TestBlocksWithNotEnoughRacks.java
b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/blockmanagement/TestBlocksWithNotEnoughRacks.java
index 7676f2e..3d00e26 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/blockmanagement/TestBlocksWithNotEnoughRacks.java
+++ b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/blockmanagement/TestBlocksWithNotEnoughRacks.java
@@ -386,8 +386,8 @@ public class TestBlocksWithNotEnoughRacks {
 
     // Configure an excludes file
     FileSystem localFileSys = FileSystem.getLocal(conf);
-    Path workingDir = localFileSys.getWorkingDirectory();
-    Path dir = new Path(workingDir, "build/test/data/temp/decommission");
+    Path workingDir = new Path(MiniDFSCluster.getBaseDirectory());
+    Path dir = new Path(workingDir, "temp/decommission");
     Path excludeFile = new Path(dir, "exclude");
     Path includeFile = new Path(dir, "include");
     assertTrue(localFileSys.mkdirs(dir));
@@ -439,8 +439,8 @@ public class TestBlocksWithNotEnoughRacks {
 
     // Configure an excludes file
     FileSystem localFileSys = FileSystem.getLocal(conf);
-    Path workingDir = localFileSys.getWorkingDirectory();
-    Path dir = new Path(workingDir, "build/test/data/temp/decommission");
+    Path workingDir = new Path(MiniDFSCluster.getBaseDirectory());
+    Path dir = new Path(workingDir, "temp/decommission");
     Path excludeFile = new Path(dir, "exclude");
     Path includeFile = new Path(dir, "include");
     assertTrue(localFileSys.mkdirs(dir));

http://git-wip-us.apache.org/repos/asf/hadoop/blob/9a6814f3/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/TestHostsFiles.java
----------------------------------------------------------------------
diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/TestHostsFiles.java
b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/TestHostsFiles.java
index 28f1348..bf4d8ff 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/TestHostsFiles.java
+++ b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/TestHostsFiles.java
@@ -83,8 +83,8 @@ public class TestHostsFiles {
 
     // Configure an excludes file
     FileSystem localFileSys = FileSystem.getLocal(conf);
-    Path workingDir = localFileSys.getWorkingDirectory();
-    Path dir = new Path(workingDir, "build/test/data/temp/decommission");
+    Path workingDir = new Path(MiniDFSCluster.getBaseDirectory());
+    Path dir = new Path(workingDir, "temp/decommission");
     Path excludeFile = new Path(dir, "exclude");
     Path includeFile = new Path(dir, "include");
     assertTrue(localFileSys.mkdirs(dir));
@@ -143,8 +143,8 @@ public class TestHostsFiles {
 
     // Configure an excludes file
     FileSystem localFileSys = FileSystem.getLocal(conf);
-    Path workingDir = localFileSys.getWorkingDirectory();
-    Path dir = new Path(workingDir, "build/test/data/temp/decommission");
+    Path workingDir = new Path(MiniDFSCluster.getBaseDirectory());
+    Path dir = new Path(workingDir, "temp/decommission");
     Path excludeFile = new Path(dir, "exclude");
     Path includeFile = new Path(dir, "include");
     assertTrue(localFileSys.mkdirs(dir));


Mime
View raw message