You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by in...@apache.org on 2018/06/12 18:03:00 UTC
[1/5] hadoop git commit: YARN-8422. TestAMSimulator failing with NPE.
Contributed by Giovanni Matteo Fumarola.
Repository: hadoop
Updated Branches:
refs/heads/branch-2 85f3105e6 -> 85a7da089
refs/heads/branch-2.9 ae85eb4d9 -> 2f05744ce
refs/heads/branch-3.0 6a31dc992 -> fa9d4a749
refs/heads/branch-3.1 d5cd12c08 -> 8be28376a
refs/heads/trunk 6e756e8a6 -> c35481594
YARN-8422. TestAMSimulator failing with NPE. Contributed by Giovanni Matteo Fumarola.
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/c3548159
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/c3548159
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/c3548159
Branch: refs/heads/trunk
Commit: c35481594ffc372e3f846b0c8ebc2ff9e36ffdb0
Parents: 6e756e8
Author: Inigo Goiri <in...@apache.org>
Authored: Tue Jun 12 10:59:50 2018 -0700
Committer: Inigo Goiri <in...@apache.org>
Committed: Tue Jun 12 10:59:50 2018 -0700
----------------------------------------------------------------------
.../hadoop/yarn/sls/appmaster/TestAMSimulator.java | 13 ++++++++-----
1 file changed, 8 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/c3548159/hadoop-tools/hadoop-sls/src/test/java/org/apache/hadoop/yarn/sls/appmaster/TestAMSimulator.java
----------------------------------------------------------------------
diff --git a/hadoop-tools/hadoop-sls/src/test/java/org/apache/hadoop/yarn/sls/appmaster/TestAMSimulator.java b/hadoop-tools/hadoop-sls/src/test/java/org/apache/hadoop/yarn/sls/appmaster/TestAMSimulator.java
index bfc7d0c..bc8ea70 100644
--- a/hadoop-tools/hadoop-sls/src/test/java/org/apache/hadoop/yarn/sls/appmaster/TestAMSimulator.java
+++ b/hadoop-tools/hadoop-sls/src/test/java/org/apache/hadoop/yarn/sls/appmaster/TestAMSimulator.java
@@ -49,8 +49,8 @@ public class TestAMSimulator {
private YarnConfiguration conf;
private Path metricOutputDir;
- private Class slsScheduler;
- private Class scheduler;
+ private Class<?> slsScheduler;
+ private Class<?> scheduler;
@Parameterized.Parameters
public static Collection<Object[]> params() {
@@ -60,7 +60,7 @@ public class TestAMSimulator {
});
}
- public TestAMSimulator(Class slsScheduler, Class scheduler) {
+ public TestAMSimulator(Class<?> slsScheduler, Class<?> scheduler) {
this.slsScheduler = slsScheduler;
this.scheduler = scheduler;
}
@@ -115,7 +115,8 @@ public class TestAMSimulator {
}
private void createMetricOutputDir() {
- Path testDir = Paths.get(System.getProperty("test.build.data"));
+ Path testDir =
+ Paths.get(System.getProperty("test.build.data", "target/test-dir"));
try {
metricOutputDir = Files.createTempDirectory(testDir, "output");
} catch (IOException e) {
@@ -153,7 +154,9 @@ public class TestAMSimulator {
@After
public void tearDown() {
- rm.stop();
+ if (rm != null) {
+ rm.stop();
+ }
deleteMetricOutputDir();
}
---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org
[2/5] hadoop git commit: YARN-8422. TestAMSimulator failing with NPE.
Contributed by Giovanni Matteo Fumarola.
Posted by in...@apache.org.
YARN-8422. TestAMSimulator failing with NPE. Contributed by Giovanni Matteo Fumarola.
(cherry picked from commit c35481594ffc372e3f846b0c8ebc2ff9e36ffdb0)
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/8be28376
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/8be28376
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/8be28376
Branch: refs/heads/branch-3.1
Commit: 8be28376a91c4481983bd04c40096b798646ab90
Parents: d5cd12c
Author: Inigo Goiri <in...@apache.org>
Authored: Tue Jun 12 10:59:50 2018 -0700
Committer: Inigo Goiri <in...@apache.org>
Committed: Tue Jun 12 11:00:22 2018 -0700
----------------------------------------------------------------------
.../hadoop/yarn/sls/appmaster/TestAMSimulator.java | 13 ++++++++-----
1 file changed, 8 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/8be28376/hadoop-tools/hadoop-sls/src/test/java/org/apache/hadoop/yarn/sls/appmaster/TestAMSimulator.java
----------------------------------------------------------------------
diff --git a/hadoop-tools/hadoop-sls/src/test/java/org/apache/hadoop/yarn/sls/appmaster/TestAMSimulator.java b/hadoop-tools/hadoop-sls/src/test/java/org/apache/hadoop/yarn/sls/appmaster/TestAMSimulator.java
index bfc7d0c..bc8ea70 100644
--- a/hadoop-tools/hadoop-sls/src/test/java/org/apache/hadoop/yarn/sls/appmaster/TestAMSimulator.java
+++ b/hadoop-tools/hadoop-sls/src/test/java/org/apache/hadoop/yarn/sls/appmaster/TestAMSimulator.java
@@ -49,8 +49,8 @@ public class TestAMSimulator {
private YarnConfiguration conf;
private Path metricOutputDir;
- private Class slsScheduler;
- private Class scheduler;
+ private Class<?> slsScheduler;
+ private Class<?> scheduler;
@Parameterized.Parameters
public static Collection<Object[]> params() {
@@ -60,7 +60,7 @@ public class TestAMSimulator {
});
}
- public TestAMSimulator(Class slsScheduler, Class scheduler) {
+ public TestAMSimulator(Class<?> slsScheduler, Class<?> scheduler) {
this.slsScheduler = slsScheduler;
this.scheduler = scheduler;
}
@@ -115,7 +115,8 @@ public class TestAMSimulator {
}
private void createMetricOutputDir() {
- Path testDir = Paths.get(System.getProperty("test.build.data"));
+ Path testDir =
+ Paths.get(System.getProperty("test.build.data", "target/test-dir"));
try {
metricOutputDir = Files.createTempDirectory(testDir, "output");
} catch (IOException e) {
@@ -153,7 +154,9 @@ public class TestAMSimulator {
@After
public void tearDown() {
- rm.stop();
+ if (rm != null) {
+ rm.stop();
+ }
deleteMetricOutputDir();
}
---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org
[5/5] hadoop git commit: YARN-8422. TestAMSimulator failing with NPE.
Contributed by Giovanni Matteo Fumarola.
Posted by in...@apache.org.
YARN-8422. TestAMSimulator failing with NPE. Contributed by Giovanni Matteo Fumarola.
(cherry picked from commit c35481594ffc372e3f846b0c8ebc2ff9e36ffdb0)
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/2f05744c
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/2f05744c
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/2f05744c
Branch: refs/heads/branch-2.9
Commit: 2f05744ce834037b2d620d977ae7a159ed483b52
Parents: ae85eb4
Author: Inigo Goiri <in...@apache.org>
Authored: Tue Jun 12 10:59:50 2018 -0700
Committer: Inigo Goiri <in...@apache.org>
Committed: Tue Jun 12 11:02:38 2018 -0700
----------------------------------------------------------------------
.../hadoop/yarn/sls/appmaster/TestAMSimulator.java | 13 ++++++++-----
1 file changed, 8 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/2f05744c/hadoop-tools/hadoop-sls/src/test/java/org/apache/hadoop/yarn/sls/appmaster/TestAMSimulator.java
----------------------------------------------------------------------
diff --git a/hadoop-tools/hadoop-sls/src/test/java/org/apache/hadoop/yarn/sls/appmaster/TestAMSimulator.java b/hadoop-tools/hadoop-sls/src/test/java/org/apache/hadoop/yarn/sls/appmaster/TestAMSimulator.java
index 02dc26e..1963e96 100644
--- a/hadoop-tools/hadoop-sls/src/test/java/org/apache/hadoop/yarn/sls/appmaster/TestAMSimulator.java
+++ b/hadoop-tools/hadoop-sls/src/test/java/org/apache/hadoop/yarn/sls/appmaster/TestAMSimulator.java
@@ -48,8 +48,8 @@ public class TestAMSimulator {
private YarnConfiguration conf;
private Path metricOutputDir;
- private Class slsScheduler;
- private Class scheduler;
+ private Class<?> slsScheduler;
+ private Class<?> scheduler;
@Parameterized.Parameters
public static Collection<Object[]> params() {
@@ -59,7 +59,7 @@ public class TestAMSimulator {
});
}
- public TestAMSimulator(Class slsScheduler, Class scheduler) {
+ public TestAMSimulator(Class<?> slsScheduler, Class<?> scheduler) {
this.slsScheduler = slsScheduler;
this.scheduler = scheduler;
}
@@ -110,7 +110,8 @@ public class TestAMSimulator {
}
private void createMetricOutputDir() {
- Path testDir = Paths.get(System.getProperty("test.build.data"));
+ Path testDir =
+ Paths.get(System.getProperty("test.build.data", "target/test-dir"));
try {
metricOutputDir = Files.createTempDirectory(testDir, "output");
} catch (IOException e) {
@@ -148,7 +149,9 @@ public class TestAMSimulator {
@After
public void tearDown() {
- rm.stop();
+ if (rm != null) {
+ rm.stop();
+ }
deleteMetricOutputDir();
}
---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org
[3/5] hadoop git commit: YARN-8422. TestAMSimulator failing with NPE.
Contributed by Giovanni Matteo Fumarola.
Posted by in...@apache.org.
YARN-8422. TestAMSimulator failing with NPE. Contributed by Giovanni Matteo Fumarola.
(cherry picked from commit c35481594ffc372e3f846b0c8ebc2ff9e36ffdb0)
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/fa9d4a74
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/fa9d4a74
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/fa9d4a74
Branch: refs/heads/branch-3.0
Commit: fa9d4a74933b1d4e566cba6883d0c4344f03693b
Parents: 6a31dc9
Author: Inigo Goiri <in...@apache.org>
Authored: Tue Jun 12 10:59:50 2018 -0700
Committer: Inigo Goiri <in...@apache.org>
Committed: Tue Jun 12 11:01:22 2018 -0700
----------------------------------------------------------------------
.../hadoop/yarn/sls/appmaster/TestAMSimulator.java | 13 ++++++++-----
1 file changed, 8 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/fa9d4a74/hadoop-tools/hadoop-sls/src/test/java/org/apache/hadoop/yarn/sls/appmaster/TestAMSimulator.java
----------------------------------------------------------------------
diff --git a/hadoop-tools/hadoop-sls/src/test/java/org/apache/hadoop/yarn/sls/appmaster/TestAMSimulator.java b/hadoop-tools/hadoop-sls/src/test/java/org/apache/hadoop/yarn/sls/appmaster/TestAMSimulator.java
index 02dc26e..1963e96 100644
--- a/hadoop-tools/hadoop-sls/src/test/java/org/apache/hadoop/yarn/sls/appmaster/TestAMSimulator.java
+++ b/hadoop-tools/hadoop-sls/src/test/java/org/apache/hadoop/yarn/sls/appmaster/TestAMSimulator.java
@@ -48,8 +48,8 @@ public class TestAMSimulator {
private YarnConfiguration conf;
private Path metricOutputDir;
- private Class slsScheduler;
- private Class scheduler;
+ private Class<?> slsScheduler;
+ private Class<?> scheduler;
@Parameterized.Parameters
public static Collection<Object[]> params() {
@@ -59,7 +59,7 @@ public class TestAMSimulator {
});
}
- public TestAMSimulator(Class slsScheduler, Class scheduler) {
+ public TestAMSimulator(Class<?> slsScheduler, Class<?> scheduler) {
this.slsScheduler = slsScheduler;
this.scheduler = scheduler;
}
@@ -110,7 +110,8 @@ public class TestAMSimulator {
}
private void createMetricOutputDir() {
- Path testDir = Paths.get(System.getProperty("test.build.data"));
+ Path testDir =
+ Paths.get(System.getProperty("test.build.data", "target/test-dir"));
try {
metricOutputDir = Files.createTempDirectory(testDir, "output");
} catch (IOException e) {
@@ -148,7 +149,9 @@ public class TestAMSimulator {
@After
public void tearDown() {
- rm.stop();
+ if (rm != null) {
+ rm.stop();
+ }
deleteMetricOutputDir();
}
---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org
[4/5] hadoop git commit: YARN-8422. TestAMSimulator failing with NPE.
Contributed by Giovanni Matteo Fumarola.
Posted by in...@apache.org.
YARN-8422. TestAMSimulator failing with NPE. Contributed by Giovanni Matteo Fumarola.
(cherry picked from commit c35481594ffc372e3f846b0c8ebc2ff9e36ffdb0)
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/85a7da08
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/85a7da08
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/85a7da08
Branch: refs/heads/branch-2
Commit: 85a7da0899ce86f2a8ccd3444d7ff31e81bc12b5
Parents: 85f3105
Author: Inigo Goiri <in...@apache.org>
Authored: Tue Jun 12 10:59:50 2018 -0700
Committer: Inigo Goiri <in...@apache.org>
Committed: Tue Jun 12 11:01:45 2018 -0700
----------------------------------------------------------------------
.../hadoop/yarn/sls/appmaster/TestAMSimulator.java | 13 ++++++++-----
1 file changed, 8 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/85a7da08/hadoop-tools/hadoop-sls/src/test/java/org/apache/hadoop/yarn/sls/appmaster/TestAMSimulator.java
----------------------------------------------------------------------
diff --git a/hadoop-tools/hadoop-sls/src/test/java/org/apache/hadoop/yarn/sls/appmaster/TestAMSimulator.java b/hadoop-tools/hadoop-sls/src/test/java/org/apache/hadoop/yarn/sls/appmaster/TestAMSimulator.java
index 02dc26e..1963e96 100644
--- a/hadoop-tools/hadoop-sls/src/test/java/org/apache/hadoop/yarn/sls/appmaster/TestAMSimulator.java
+++ b/hadoop-tools/hadoop-sls/src/test/java/org/apache/hadoop/yarn/sls/appmaster/TestAMSimulator.java
@@ -48,8 +48,8 @@ public class TestAMSimulator {
private YarnConfiguration conf;
private Path metricOutputDir;
- private Class slsScheduler;
- private Class scheduler;
+ private Class<?> slsScheduler;
+ private Class<?> scheduler;
@Parameterized.Parameters
public static Collection<Object[]> params() {
@@ -59,7 +59,7 @@ public class TestAMSimulator {
});
}
- public TestAMSimulator(Class slsScheduler, Class scheduler) {
+ public TestAMSimulator(Class<?> slsScheduler, Class<?> scheduler) {
this.slsScheduler = slsScheduler;
this.scheduler = scheduler;
}
@@ -110,7 +110,8 @@ public class TestAMSimulator {
}
private void createMetricOutputDir() {
- Path testDir = Paths.get(System.getProperty("test.build.data"));
+ Path testDir =
+ Paths.get(System.getProperty("test.build.data", "target/test-dir"));
try {
metricOutputDir = Files.createTempDirectory(testDir, "output");
} catch (IOException e) {
@@ -148,7 +149,9 @@ public class TestAMSimulator {
@After
public void tearDown() {
- rm.stop();
+ if (rm != null) {
+ rm.stop();
+ }
deleteMetricOutputDir();
}
---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org