hadoop git commit: HADOOP-10101. Update guava dependency to the latest version. (ozawa)
Repository: hadoop
Updated Branches:
refs/heads/trunk 1f6652443 -> 84ddedc0b
HADOOP-10101. Update guava dependency to the latest version. (ozawa)
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/84ddedc0
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/84ddedc0
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/84ddedc0
Branch: refs/heads/trunk
Commit: 84ddedc0b2d58257d45c16ee5e83b15f94a7ba3a
Parents: 1f66524
Author: Tsuyoshi Ozawa
Authored: Sat Mar 25 10:06:52 2017 +0900
Committer: Tsuyoshi Ozawa
Committed: Sat Mar 25 10:06:52 2017 +0900
--
.../main/java/org/apache/hadoop/fs/shell/XAttrCommands.java| 2 +-
.../main/java/org/apache/hadoop/ha/ZKFailoverController.java | 3 +--
.../main/java/org/apache/hadoop/metrics2/AbstractMetric.java | 3 ++-
.../src/main/java/org/apache/hadoop/metrics2/MetricsTag.java | 3 ++-
.../org/apache/hadoop/metrics2/impl/AbstractMetricsRecord.java | 3 ++-
.../src/main/java/org/apache/hadoop/metrics2/impl/MsInfo.java | 4 ++--
.../java/org/apache/hadoop/metrics2/lib/MetricsInfoImpl.java | 3 ++-
.../java/org/apache/hadoop/metrics2/lib/MetricsRegistry.java | 4 ++--
.../java/org/apache/hadoop/metrics2/source/JvmMetricsInfo.java | 6 +++---
.../java/org/apache/hadoop/metrics2/util/MetricsCache.java | 4 ++--
.../main/java/org/apache/hadoop/util/curator/ChildReaper.java | 4 ++--
.../org/apache/hadoop/hdfs/DFSInotifyEventInputStream.java | 4 ++--
.../org/apache/hadoop/hdfs/server/datanode/DataStorage.java| 2 +-
.../apache/hadoop/hdfs/server/namenode/AclTransformation.java | 4 ++--
.../org/apache/hadoop/hdfs/server/namenode/JournalSet.java | 2 +-
.../apache/hadoop/hdfs/qjournal/client/TestQJMWithFaults.java | 2 +-
.../hadoop/hdfs/qjournal/client/TestQuorumJournalManager.java | 2 +-
hadoop-project/pom.xml | 2 +-
.../records/impl/pb/ApplicationSubmissionContextPBImpl.java| 2 +-
.../src/main/java/org/apache/hadoop/yarn/webapp/WebApp.java| 4 ++--
.../hadoop/yarn/server/resourcemanager/RMAppManager.java | 6 +++---
.../scheduler/fair/AllocationFileLoaderService.java| 2 +-
.../server/resourcemanager/scheduler/fair/QueueManager.java| 2 +-
23 files changed, 38 insertions(+), 35 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/hadoop/blob/84ddedc0/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/shell/XAttrCommands.java
--
diff --git
a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/shell/XAttrCommands.java
b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/shell/XAttrCommands.java
index d55c80b..4505aa9 100644
---
a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/shell/XAttrCommands.java
+++
b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/shell/XAttrCommands.java
@@ -67,7 +67,7 @@ class XAttrCommands extends FsCommand {
"0x and 0s, respectively.\n" +
": The file or directory.\n";
private final static Function enValueOfFunc =
-Enums.valueOfFunction(XAttrCodec.class);
+Enums.stringConverter(XAttrCodec.class);
private String name = null;
private boolean dump = false;
http://git-wip-us.apache.org/repos/asf/hadoop/blob/84ddedc0/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ha/ZKFailoverController.java
--
diff --git
a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ha/ZKFailoverController.java
b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ha/ZKFailoverController.java
index 0ed9158..055bcaa 100644
---
a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ha/ZKFailoverController.java
+++
b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ha/ZKFailoverController.java
@@ -55,7 +55,6 @@ import org.apache.zookeeper.data.ACL;
import com.google.common.annotations.VisibleForTesting;
import com.google.common.base.Preconditions;
-import com.google.common.base.Throwables;
import com.google.common.util.concurrent.ThreadFactoryBuilder;
@InterfaceAudience.LimitedPrivate("HDFS")
@@ -511,7 +510,7 @@ public abstract class ZKFailoverController {
doFence(target);
} catch (Throwable t) {
recordActiveAttempt(new ActiveAttemptRecord(false, "Unable to fence old
active: " + StringUtils.stringifyException(t)));
- Throwables.propagate(t);
+ throw t;
}
}
http://git-wip-us.apache.org/repos/asf/hadoop/blob/84ddedc0/hadoop-common-project/hadoop-common/src/main/java/org
hadoop git commit: HADOOP-13602. Fix some warnings by findbugs in hadoop-maven-plugin. (ozawa)
Repository: hadoop
Updated Branches:
refs/heads/branch-2 a0b076785 -> d73359382
HADOOP-13602. Fix some warnings by findbugs in hadoop-maven-plugin. (ozawa)
(cherry picked from commit 8d619b4896ac31f63fd0083594b6e7d207ef71a0)
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/d7335938
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/d7335938
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/d7335938
Branch: refs/heads/branch-2
Commit: d73359382e78aaa362c5ad9c3ff84859d4758a37
Parents: a0b0767
Author: Tsuyoshi Ozawa
Authored: Fri Sep 23 01:37:06 2016 +0900
Committer: Tsuyoshi Ozawa
Committed: Fri Sep 23 01:37:24 2016 +0900
--
.../maven/plugin/cmakebuilder/CompileMojo.java | 4 +-
.../maven/plugin/cmakebuilder/TestMojo.java | 4 +-
.../hadoop/maven/plugin/protoc/ProtocMojo.java | 4 ++
.../apache/hadoop/maven/plugin/util/Exec.java | 6 ++-
.../plugin/versioninfo/VersionInfoMojo.java | 55 ++--
5 files changed, 42 insertions(+), 31 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/hadoop/blob/d7335938/hadoop-maven-plugins/src/main/java/org/apache/hadoop/maven/plugin/cmakebuilder/CompileMojo.java
--
diff --git
a/hadoop-maven-plugins/src/main/java/org/apache/hadoop/maven/plugin/cmakebuilder/CompileMojo.java
b/hadoop-maven-plugins/src/main/java/org/apache/hadoop/maven/plugin/cmakebuilder/CompileMojo.java
index afb11cb..0196352 100644
---
a/hadoop-maven-plugins/src/main/java/org/apache/hadoop/maven/plugin/cmakebuilder/CompileMojo.java
+++
b/hadoop-maven-plugins/src/main/java/org/apache/hadoop/maven/plugin/cmakebuilder/CompileMojo.java
@@ -14,6 +14,7 @@
package org.apache.hadoop.maven.plugin.cmakebuilder;
+import java.util.Locale;
import org.apache.hadoop.maven.plugin.util.Exec.OutputBufferThread;
import org.apache.hadoop.maven.plugin.util.Exec;
import org.apache.maven.plugin.AbstractMojo;
@@ -83,7 +84,8 @@ public class CompileMojo extends AbstractMojo {
// TODO: support Windows
private static void validatePlatform() throws MojoExecutionException {
-if (System.getProperty("os.name").toLowerCase().startsWith("windows")) {
+if (System.getProperty("os.name").toLowerCase(Locale.ENGLISH)
+.startsWith("windows")) {
throw new MojoExecutionException("CMakeBuilder does not yet support " +
"the Windows platform.");
}
http://git-wip-us.apache.org/repos/asf/hadoop/blob/d7335938/hadoop-maven-plugins/src/main/java/org/apache/hadoop/maven/plugin/cmakebuilder/TestMojo.java
--
diff --git
a/hadoop-maven-plugins/src/main/java/org/apache/hadoop/maven/plugin/cmakebuilder/TestMojo.java
b/hadoop-maven-plugins/src/main/java/org/apache/hadoop/maven/plugin/cmakebuilder/TestMojo.java
index 447331b..6b44198 100644
---
a/hadoop-maven-plugins/src/main/java/org/apache/hadoop/maven/plugin/cmakebuilder/TestMojo.java
+++
b/hadoop-maven-plugins/src/main/java/org/apache/hadoop/maven/plugin/cmakebuilder/TestMojo.java
@@ -14,6 +14,7 @@
package org.apache.hadoop.maven.plugin.cmakebuilder;
+import java.util.Locale;
import org.apache.hadoop.maven.plugin.util.Exec;
import org.apache.maven.execution.MavenSession;
import org.apache.maven.plugin.AbstractMojo;
@@ -111,7 +112,8 @@ public class TestMojo extends AbstractMojo {
// TODO: support Windows
private static void validatePlatform() throws MojoExecutionException {
-if (System.getProperty("os.name").toLowerCase().startsWith("windows")) {
+if (System.getProperty("os.name").toLowerCase(Locale.ENGLISH)
+.startsWith("windows")) {
throw new MojoExecutionException("CMakeBuilder does not yet support " +
"the Windows platform.");
}
http://git-wip-us.apache.org/repos/asf/hadoop/blob/d7335938/hadoop-maven-plugins/src/main/java/org/apache/hadoop/maven/plugin/protoc/ProtocMojo.java
--
diff --git
a/hadoop-maven-plugins/src/main/java/org/apache/hadoop/maven/plugin/protoc/ProtocMojo.java
b/hadoop-maven-plugins/src/main/java/org/apache/hadoop/maven/plugin/protoc/ProtocMojo.java
index 0dcac0e..df479fd 100644
---
a/hadoop-maven-plugins/src/main/java/org/apache/hadoop/maven/plugin/protoc/ProtocMojo.java
+++
b/hadoop-maven-plugins/src/main/java/org/apache/hadoop/maven/plugin/protoc/ProtocMojo.java
@@ -105,6 +105,10 @@ public class ProtocMojo extends AbstractMojo {
private boolean hasDirectoryChanged(File directory) throws IOException {
File[] listing = directory.listFiles();
boolean changed
hadoop git commit: HADOOP-13602. Fix some warnings by findbugs in hadoop-maven-plugin. (ozawa)
Repository: hadoop
Updated Branches:
refs/heads/trunk 537095d13 -> 8d619b489
HADOOP-13602. Fix some warnings by findbugs in hadoop-maven-plugin. (ozawa)
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/8d619b48
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/8d619b48
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/8d619b48
Branch: refs/heads/trunk
Commit: 8d619b4896ac31f63fd0083594b6e7d207ef71a0
Parents: 537095d
Author: Tsuyoshi Ozawa
Authored: Fri Sep 23 01:37:06 2016 +0900
Committer: Tsuyoshi Ozawa
Committed: Fri Sep 23 01:37:06 2016 +0900
--
.../maven/plugin/cmakebuilder/CompileMojo.java | 4 +-
.../maven/plugin/cmakebuilder/TestMojo.java | 4 +-
.../hadoop/maven/plugin/protoc/ProtocMojo.java | 4 ++
.../apache/hadoop/maven/plugin/util/Exec.java | 6 ++-
.../plugin/versioninfo/VersionInfoMojo.java | 55 ++--
5 files changed, 42 insertions(+), 31 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/hadoop/blob/8d619b48/hadoop-maven-plugins/src/main/java/org/apache/hadoop/maven/plugin/cmakebuilder/CompileMojo.java
--
diff --git
a/hadoop-maven-plugins/src/main/java/org/apache/hadoop/maven/plugin/cmakebuilder/CompileMojo.java
b/hadoop-maven-plugins/src/main/java/org/apache/hadoop/maven/plugin/cmakebuilder/CompileMojo.java
index afb11cb..0196352 100644
---
a/hadoop-maven-plugins/src/main/java/org/apache/hadoop/maven/plugin/cmakebuilder/CompileMojo.java
+++
b/hadoop-maven-plugins/src/main/java/org/apache/hadoop/maven/plugin/cmakebuilder/CompileMojo.java
@@ -14,6 +14,7 @@
package org.apache.hadoop.maven.plugin.cmakebuilder;
+import java.util.Locale;
import org.apache.hadoop.maven.plugin.util.Exec.OutputBufferThread;
import org.apache.hadoop.maven.plugin.util.Exec;
import org.apache.maven.plugin.AbstractMojo;
@@ -83,7 +84,8 @@ public class CompileMojo extends AbstractMojo {
// TODO: support Windows
private static void validatePlatform() throws MojoExecutionException {
-if (System.getProperty("os.name").toLowerCase().startsWith("windows")) {
+if (System.getProperty("os.name").toLowerCase(Locale.ENGLISH)
+.startsWith("windows")) {
throw new MojoExecutionException("CMakeBuilder does not yet support " +
"the Windows platform.");
}
http://git-wip-us.apache.org/repos/asf/hadoop/blob/8d619b48/hadoop-maven-plugins/src/main/java/org/apache/hadoop/maven/plugin/cmakebuilder/TestMojo.java
--
diff --git
a/hadoop-maven-plugins/src/main/java/org/apache/hadoop/maven/plugin/cmakebuilder/TestMojo.java
b/hadoop-maven-plugins/src/main/java/org/apache/hadoop/maven/plugin/cmakebuilder/TestMojo.java
index e676efd..95b6264 100644
---
a/hadoop-maven-plugins/src/main/java/org/apache/hadoop/maven/plugin/cmakebuilder/TestMojo.java
+++
b/hadoop-maven-plugins/src/main/java/org/apache/hadoop/maven/plugin/cmakebuilder/TestMojo.java
@@ -14,6 +14,7 @@
package org.apache.hadoop.maven.plugin.cmakebuilder;
+import java.util.Locale;
import org.apache.hadoop.maven.plugin.util.Exec;
import org.apache.maven.execution.MavenSession;
import org.apache.maven.plugin.AbstractMojo;
@@ -117,7 +118,8 @@ public class TestMojo extends AbstractMojo {
// TODO: support Windows
private static void validatePlatform() throws MojoExecutionException {
-if (System.getProperty("os.name").toLowerCase().startsWith("windows")) {
+if (System.getProperty("os.name").toLowerCase(Locale.ENGLISH)
+.startsWith("windows")) {
throw new MojoExecutionException("CMakeBuilder does not yet support " +
"the Windows platform.");
}
http://git-wip-us.apache.org/repos/asf/hadoop/blob/8d619b48/hadoop-maven-plugins/src/main/java/org/apache/hadoop/maven/plugin/protoc/ProtocMojo.java
--
diff --git
a/hadoop-maven-plugins/src/main/java/org/apache/hadoop/maven/plugin/protoc/ProtocMojo.java
b/hadoop-maven-plugins/src/main/java/org/apache/hadoop/maven/plugin/protoc/ProtocMojo.java
index 0dcac0e..df479fd 100644
---
a/hadoop-maven-plugins/src/main/java/org/apache/hadoop/maven/plugin/protoc/ProtocMojo.java
+++
b/hadoop-maven-plugins/src/main/java/org/apache/hadoop/maven/plugin/protoc/ProtocMojo.java
@@ -105,6 +105,10 @@ public class ProtocMojo extends AbstractMojo {
private boolean hasDirectoryChanged(File directory) throws IOException {
File[] listing = directory.listFiles();
boolean changed = false;
+ if (listing == null) {
+// not changed.
+return
hadoop git commit: HADOOP-13298. Fix the leftover L&N files in hadoop-build-tools/src/main/resources/META-INF/. (ozawa)
Repository: hadoop
Updated Branches:
refs/heads/branch-2.6 fc335e529 -> 2f546755c
HADOOP-13298. Fix the leftover L&N files in
hadoop-build-tools/src/main/resources/META-INF/. (ozawa)
(cherry picked from commit ea9f43781e5a9a4a6121dd3be106ced6b811754d)
(cherry picked from commit 65adabd0d1bba1c59653cfcd9b4b6253815adb15)
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/2f546755
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/2f546755
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/2f546755
Branch: refs/heads/branch-2.6
Commit: 2f546755c8186c8cc6368074e7290b5418ddb0e2
Parents: fc335e5
Author: Tsuyoshi Ozawa
Authored: Sat Jul 16 08:01:16 2016 +0900
Committer: Tsuyoshi Ozawa
Committed: Sat Jul 16 08:34:57 2016 +0900
--
hadoop-build-tools/pom.xml | 42
hadoop-common-project/hadoop-common/CHANGES.txt | 3 ++
pom.xml | 26
3 files changed, 45 insertions(+), 26 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/hadoop/blob/2f546755/hadoop-build-tools/pom.xml
--
diff --git a/hadoop-build-tools/pom.xml b/hadoop-build-tools/pom.xml
index 04bd8a3..e242dcb 100644
--- a/hadoop-build-tools/pom.xml
+++ b/hadoop-build-tools/pom.xml
@@ -29,6 +29,19 @@
false
+
+
+${project.basedir}/target/extra-resources
+META-INF
+
+ LICENSE.txt
+ NOTICE.txt
+
+
+
+${project.basedir}/src/main/resources
+
+
org.apache.maven.plugins
@@ -37,17 +50,46 @@
true
+
+
+org.apache.maven.plugins
+maven-resources-plugin
+
+
+copy-resources
+validate
+
+ copy-resources
+
+
+
${project.basedir}/target/extra-resources
+
+
+ ../
+
+LICENSE.txt
+NOTICE.txt
+
+
+
+
+
+
+
+
org.apache.maven.plugins
maven-remote-resources-plugin
+process-resources
bundle
+
${project.build.outputDirectory}
META-INF/LICENSE.txt
META-INF/NOTICE.txt
http://git-wip-us.apache.org/repos/asf/hadoop/blob/2f546755/hadoop-common-project/hadoop-common/CHANGES.txt
--
diff --git a/hadoop-common-project/hadoop-common/CHANGES.txt
b/hadoop-common-project/hadoop-common/CHANGES.txt
index 96980c1..3c35e44 100644
--- a/hadoop-common-project/hadoop-common/CHANGES.txt
+++ b/hadoop-common-project/hadoop-common/CHANGES.txt
@@ -17,6 +17,9 @@ Release 2.6.5 - UNRELEASED
HADOOP-12789. log classpath of ApplicationClassLoader at INFO level
(Sangjin Lee via mingma)
+HADOOP-13298. Fix the leftover L&N files in
+hadoop-build-tools/src/main/resources/META-INF/. (ozawa)
+
OPTIMIZATIONS
BUG FIXES
http://git-wip-us.apache.org/repos/asf/hadoop/blob/2f546755/pom.xml
--
diff --git a/pom.xml b/pom.xml
index 7b4a8bf..3cbbb7c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -243,32 +243,6 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xs
true
true
-
-
-org.apache.maven.plugins
-maven-antrun-plugin
-
-
-copy-files
-process-resources
-
- run
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
To unsubscribe, e-mail: common-commits-unsubscr...@hadoop.apache.org
For additional commands, e-mail: common-commits-h...@hadoop.apache.org
hadoop git commit: HADOOP-13298. Fix the leftover L&N files in hadoop-build-tools/src/main/resources/META-INF/. (ozawa)
Repository: hadoop
Updated Branches:
refs/heads/branch-2.7.3 c1e19ad53 -> 4ac726015
HADOOP-13298. Fix the leftover L&N files in
hadoop-build-tools/src/main/resources/META-INF/. (ozawa)
(cherry picked from commit ea9f43781e5a9a4a6121dd3be106ced6b811754d)
(cherry picked from commit 65adabd0d1bba1c59653cfcd9b4b6253815adb15)
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/4ac72601
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/4ac72601
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/4ac72601
Branch: refs/heads/branch-2.7.3
Commit: 4ac72601517cc6aa79e85a479902f391442b13eb
Parents: c1e19ad
Author: Tsuyoshi Ozawa
Authored: Sat Jul 16 08:01:16 2016 +0900
Committer: Tsuyoshi Ozawa
Committed: Sat Jul 16 08:24:56 2016 +0900
--
hadoop-build-tools/pom.xml | 42
hadoop-common-project/hadoop-common/CHANGES.txt | 3 ++
pom.xml | 26
3 files changed, 45 insertions(+), 26 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/hadoop/blob/4ac72601/hadoop-build-tools/pom.xml
--
diff --git a/hadoop-build-tools/pom.xml b/hadoop-build-tools/pom.xml
index e259351..36eff30 100644
--- a/hadoop-build-tools/pom.xml
+++ b/hadoop-build-tools/pom.xml
@@ -29,6 +29,19 @@
false
+
+
+${project.basedir}/target/extra-resources
+META-INF
+
+ LICENSE.txt
+ NOTICE.txt
+
+
+
+${project.basedir}/src/main/resources
+
+
org.apache.maven.plugins
@@ -37,17 +50,46 @@
true
+
+
+org.apache.maven.plugins
+maven-resources-plugin
+
+
+copy-resources
+validate
+
+ copy-resources
+
+
+
${project.basedir}/target/extra-resources
+
+
+ ../
+
+LICENSE.txt
+NOTICE.txt
+
+
+
+
+
+
+
+
org.apache.maven.plugins
maven-remote-resources-plugin
+process-resources
bundle
+
${project.build.outputDirectory}
META-INF/LICENSE.txt
META-INF/NOTICE.txt
http://git-wip-us.apache.org/repos/asf/hadoop/blob/4ac72601/hadoop-common-project/hadoop-common/CHANGES.txt
--
diff --git a/hadoop-common-project/hadoop-common/CHANGES.txt
b/hadoop-common-project/hadoop-common/CHANGES.txt
index 736dfd4..ae67722 100644
--- a/hadoop-common-project/hadoop-common/CHANGES.txt
+++ b/hadoop-common-project/hadoop-common/CHANGES.txt
@@ -23,6 +23,9 @@ Release 2.7.3 - UNRELEASED
HADOOP-12570. HDFS Secure Mode Documentation updates. (Arpit Agarwal)
+HADOOP-13298. Fix the leftover L&N files in
+hadoop-build-tools/src/main/resources/META-INF/. (ozawa)
+
OPTIMIZATIONS
HADOOP-12810. FileSystem#listLocatedStatus causes unnecessary RPC calls
http://git-wip-us.apache.org/repos/asf/hadoop/blob/4ac72601/pom.xml
--
diff --git a/pom.xml b/pom.xml
index db74353..1323204 100644
--- a/pom.xml
+++ b/pom.xml
@@ -251,32 +251,6 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xs
true
true
-
-
-org.apache.maven.plugins
-maven-antrun-plugin
-
-
-copy-files
-process-resources
-
- run
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
To unsubscribe, e-mail: common-commits-unsubscr...@hadoop.apache.org
For additional commands, e-mail: common-commits-h...@hadoop.apache.org
hadoop git commit: HADOOP-13298. Fix the leftover L&N files in hadoop-build-tools/src/main/resources/META-INF/. (ozawa)
Repository: hadoop
Updated Branches:
refs/heads/branch-2.7 c35c1e670 -> 65adabd0d
HADOOP-13298. Fix the leftover L&N files in
hadoop-build-tools/src/main/resources/META-INF/. (ozawa)
(cherry picked from commit ea9f43781e5a9a4a6121dd3be106ced6b811754d)
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/65adabd0
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/65adabd0
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/65adabd0
Branch: refs/heads/branch-2.7
Commit: 65adabd0d1bba1c59653cfcd9b4b6253815adb15
Parents: c35c1e6
Author: Tsuyoshi Ozawa
Authored: Sat Jul 16 08:01:16 2016 +0900
Committer: Tsuyoshi Ozawa
Committed: Sat Jul 16 08:20:43 2016 +0900
--
hadoop-build-tools/pom.xml | 42
hadoop-common-project/hadoop-common/CHANGES.txt | 3 ++
pom.xml | 26
3 files changed, 45 insertions(+), 26 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/hadoop/blob/65adabd0/hadoop-build-tools/pom.xml
--
diff --git a/hadoop-build-tools/pom.xml b/hadoop-build-tools/pom.xml
index e024e1a..4c0a137 100644
--- a/hadoop-build-tools/pom.xml
+++ b/hadoop-build-tools/pom.xml
@@ -29,6 +29,19 @@
false
+
+
+${project.basedir}/target/extra-resources
+META-INF
+
+ LICENSE.txt
+ NOTICE.txt
+
+
+
+${project.basedir}/src/main/resources
+
+
org.apache.maven.plugins
@@ -37,17 +50,46 @@
true
+
+
+org.apache.maven.plugins
+maven-resources-plugin
+
+
+copy-resources
+validate
+
+ copy-resources
+
+
+
${project.basedir}/target/extra-resources
+
+
+ ../
+
+LICENSE.txt
+NOTICE.txt
+
+
+
+
+
+
+
+
org.apache.maven.plugins
maven-remote-resources-plugin
+process-resources
bundle
+
${project.build.outputDirectory}
META-INF/LICENSE.txt
META-INF/NOTICE.txt
http://git-wip-us.apache.org/repos/asf/hadoop/blob/65adabd0/hadoop-common-project/hadoop-common/CHANGES.txt
--
diff --git a/hadoop-common-project/hadoop-common/CHANGES.txt
b/hadoop-common-project/hadoop-common/CHANGES.txt
index 42413fe..cae1f1e 100644
--- a/hadoop-common-project/hadoop-common/CHANGES.txt
+++ b/hadoop-common-project/hadoop-common/CHANGES.txt
@@ -41,6 +41,9 @@ Release 2.7.3 - UNRELEASED
HADOOP-12570. HDFS Secure Mode Documentation updates. (Arpit Agarwal)
+HADOOP-13298. Fix the leftover L&N files in
+hadoop-build-tools/src/main/resources/META-INF/. (ozawa)
+
OPTIMIZATIONS
HADOOP-12810. FileSystem#listLocatedStatus causes unnecessary RPC calls
http://git-wip-us.apache.org/repos/asf/hadoop/blob/65adabd0/pom.xml
--
diff --git a/pom.xml b/pom.xml
index aace76b..f8833db 100644
--- a/pom.xml
+++ b/pom.xml
@@ -251,32 +251,6 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xs
true
true
-
-
-org.apache.maven.plugins
-maven-antrun-plugin
-
-
-copy-files
-process-resources
-
- run
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
To unsubscribe, e-mail: common-commits-unsubscr...@hadoop.apache.org
For additional commands, e-mail: common-commits-h...@hadoop.apache.org
hadoop git commit: HADOOP-13298. Fix the leftover L&N files in hadoop-build-tools/src/main/resources/META-INF/. (ozawa)
Repository: hadoop
Updated Branches:
refs/heads/branch-2.8 a363277be -> e3c4989d7
HADOOP-13298. Fix the leftover L&N files in
hadoop-build-tools/src/main/resources/META-INF/. (ozawa)
(cherry picked from commit ea9f43781e5a9a4a6121dd3be106ced6b811754d)
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/e3c4989d
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/e3c4989d
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/e3c4989d
Branch: refs/heads/branch-2.8
Commit: e3c4989d74872e9168efb87c6ef25d500a5994cf
Parents: a363277
Author: Tsuyoshi Ozawa
Authored: Sat Jul 16 08:01:16 2016 +0900
Committer: Tsuyoshi Ozawa
Committed: Sat Jul 16 08:11:30 2016 +0900
--
hadoop-build-tools/pom.xml | 42 +
pom.xml| 26 -
2 files changed, 42 insertions(+), 26 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/hadoop/blob/e3c4989d/hadoop-build-tools/pom.xml
--
diff --git a/hadoop-build-tools/pom.xml b/hadoop-build-tools/pom.xml
index 91d0e84..02b7862 100644
--- a/hadoop-build-tools/pom.xml
+++ b/hadoop-build-tools/pom.xml
@@ -29,6 +29,19 @@
false
+
+
+${project.basedir}/target/extra-resources
+META-INF
+
+ LICENSE.txt
+ NOTICE.txt
+
+
+
+${project.basedir}/src/main/resources
+
+
org.apache.maven.plugins
@@ -37,17 +50,46 @@
true
+
+
+org.apache.maven.plugins
+maven-resources-plugin
+
+
+copy-resources
+validate
+
+ copy-resources
+
+
+
${project.basedir}/target/extra-resources
+
+
+ ../
+
+LICENSE.txt
+NOTICE.txt
+
+
+
+
+
+
+
+
org.apache.maven.plugins
maven-remote-resources-plugin
+process-resources
bundle
+
${project.build.outputDirectory}
META-INF/LICENSE.txt
META-INF/NOTICE.txt
http://git-wip-us.apache.org/repos/asf/hadoop/blob/e3c4989d/pom.xml
--
diff --git a/pom.xml b/pom.xml
index f594032..2977294 100644
--- a/pom.xml
+++ b/pom.xml
@@ -303,32 +303,6 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xs
dependency-check-maven
${dependency-check-maven.version}
-
-
-org.apache.maven.plugins
-maven-antrun-plugin
-
-
-copy-files
-process-resources
-
- run
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
To unsubscribe, e-mail: common-commits-unsubscr...@hadoop.apache.org
For additional commands, e-mail: common-commits-h...@hadoop.apache.org
hadoop git commit: HADOOP-13298. Fix the leftover L&N files in hadoop-build-tools/src/main/resources/META-INF/. (ozawa)
Repository: hadoop
Updated Branches:
refs/heads/branch-2 66a501be5 -> 18a7623bc
HADOOP-13298. Fix the leftover L&N files in
hadoop-build-tools/src/main/resources/META-INF/. (ozawa)
(cherry picked from commit ea9f43781e5a9a4a6121dd3be106ced6b811754d)
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/18a7623b
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/18a7623b
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/18a7623b
Branch: refs/heads/branch-2
Commit: 18a7623bc763f27cc8fcfb193d12ef78974fc813
Parents: 66a501b
Author: Tsuyoshi Ozawa
Authored: Sat Jul 16 08:01:16 2016 +0900
Committer: Tsuyoshi Ozawa
Committed: Sat Jul 16 08:03:28 2016 +0900
--
hadoop-build-tools/pom.xml | 42 +
pom.xml| 26 -
2 files changed, 42 insertions(+), 26 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/hadoop/blob/18a7623b/hadoop-build-tools/pom.xml
--
diff --git a/hadoop-build-tools/pom.xml b/hadoop-build-tools/pom.xml
index a559441..b2cee9e 100644
--- a/hadoop-build-tools/pom.xml
+++ b/hadoop-build-tools/pom.xml
@@ -29,6 +29,19 @@
false
+
+
+${project.basedir}/target/extra-resources
+META-INF
+
+ LICENSE.txt
+ NOTICE.txt
+
+
+
+${project.basedir}/src/main/resources
+
+
org.apache.maven.plugins
@@ -37,17 +50,46 @@
true
+
+
+org.apache.maven.plugins
+maven-resources-plugin
+
+
+copy-resources
+validate
+
+ copy-resources
+
+
+
${project.basedir}/target/extra-resources
+
+
+ ../
+
+LICENSE.txt
+NOTICE.txt
+
+
+
+
+
+
+
+
org.apache.maven.plugins
maven-remote-resources-plugin
+process-resources
bundle
+
${project.build.outputDirectory}
META-INF/LICENSE.txt
META-INF/NOTICE.txt
http://git-wip-us.apache.org/repos/asf/hadoop/blob/18a7623b/pom.xml
--
diff --git a/pom.xml b/pom.xml
index 5f49a2c..683d9f3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -304,32 +304,6 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xs
dependency-check-maven
${dependency-check-maven.version}
-
-
-org.apache.maven.plugins
-maven-antrun-plugin
-
-
-copy-files
-process-resources
-
- run
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
To unsubscribe, e-mail: common-commits-unsubscr...@hadoop.apache.org
For additional commands, e-mail: common-commits-h...@hadoop.apache.org
hadoop git commit: HADOOP-13298. Fix the leftover L&N files in hadoop-build-tools/src/main/resources/META-INF/. (ozawa)
Repository: hadoop
Updated Branches:
refs/heads/trunk f5f1c81e7 -> ea9f43781
HADOOP-13298. Fix the leftover L&N files in
hadoop-build-tools/src/main/resources/META-INF/. (ozawa)
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/ea9f4378
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/ea9f4378
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/ea9f4378
Branch: refs/heads/trunk
Commit: ea9f43781e5a9a4a6121dd3be106ced6b811754d
Parents: f5f1c81
Author: Tsuyoshi Ozawa
Authored: Sat Jul 16 08:01:16 2016 +0900
Committer: Tsuyoshi Ozawa
Committed: Sat Jul 16 08:01:16 2016 +0900
--
hadoop-build-tools/pom.xml | 44 -
pom.xml| 26
2 files changed, 43 insertions(+), 27 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/hadoop/blob/ea9f4378/hadoop-build-tools/pom.xml
--
diff --git a/hadoop-build-tools/pom.xml b/hadoop-build-tools/pom.xml
index e84c94f..b80cf57 100644
--- a/hadoop-build-tools/pom.xml
+++ b/hadoop-build-tools/pom.xml
@@ -29,6 +29,19 @@
false
+
+
+${project.basedir}/target/extra-resources
+META-INF
+
+ LICENSE.txt
+ NOTICE.txt
+
+
+
+${project.basedir}/src/main/resources
+
+
org.apache.maven.plugins
@@ -37,17 +50,46 @@
true
+
+
+org.apache.maven.plugins
+maven-resources-plugin
+
+
+copy-resources
+validate
+
+ copy-resources
+
+
+
${project.basedir}/target/extra-resources
+
+
+ ../
+
+LICENSE.txt
+NOTICE.txt
+
+
+
+
+
+
+
+
org.apache.maven.plugins
maven-remote-resources-plugin
+process-resources
bundle
+
${project.build.outputDirectory}
META-INF/LICENSE.txt
META-INF/NOTICE.txt
@@ -69,4 +111,4 @@
-
\ No newline at end of file
+
http://git-wip-us.apache.org/repos/asf/hadoop/blob/ea9f4378/pom.xml
--
diff --git a/pom.xml b/pom.xml
index 6e66f8b..ac3bec6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -413,32 +413,6 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xs
dependency-check-maven
${dependency-check-maven.version}
-
-
-org.apache.maven.plugins
-maven-antrun-plugin
-
-
-copy-files
-process-resources
-
- run
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
To unsubscribe, e-mail: common-commits-unsubscr...@hadoop.apache.org
For additional commands, e-mail: common-commits-h...@hadoop.apache.org
hadoop git commit: HADOOP-11361. Fix a race condition in MetricsSourceAdapter.updateJmxCache. Contributed by Vinayakumar B, Yongjun Zhang, and Brahma Reddy Battula. (ozawa)
Repository: hadoop
Updated Branches:
refs/heads/branch-2.7 954dac686 -> 7c5e7433e
HADOOP-11361. Fix a race condition in MetricsSourceAdapter.updateJmxCache.
Contributed by Vinayakumar B, Yongjun Zhang, and Brahma Reddy Battula. (ozawa)
Updated CHANGES.txt
(cherry picked from commit 77ffe7621212be9f462ca37a542a13d167eca4e0)
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/7c5e7433
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/7c5e7433
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/7c5e7433
Branch: refs/heads/branch-2.7
Commit: 7c5e7433e143a27763901e471e9f39f41bb24323
Parents: 954dac6
Author: Tsuyoshi Ozawa
Authored: Wed Jul 13 21:28:04 2016 +0900
Committer: Tsuyoshi Ozawa
Committed: Wed Jul 13 21:49:02 2016 +0900
--
hadoop-common-project/hadoop-common/CHANGES.txt | 3 ++
.../metrics2/impl/MetricsSourceAdapter.java | 33 +---
2 files changed, 17 insertions(+), 19 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/hadoop/blob/7c5e7433/hadoop-common-project/hadoop-common/CHANGES.txt
--
diff --git a/hadoop-common-project/hadoop-common/CHANGES.txt
b/hadoop-common-project/hadoop-common/CHANGES.txt
index e8535cc..dc002fa 100644
--- a/hadoop-common-project/hadoop-common/CHANGES.txt
+++ b/hadoop-common-project/hadoop-common/CHANGES.txt
@@ -15,6 +15,9 @@ Release 2.7.4 - UNRELEASED
HADOOP-13362. DefaultMetricsSystem leaks the source name when a source
unregisters (Junping Du via jlowe)
+HADOOP-11361. Fix a race condition in MetricsSourceAdapter.updateJmxCache.
+(Vinayakumar B, Yongjun Zhang, and Brahma Reddy Battula via ozawa)
+
Release 2.7.3 - UNRELEASED
INCOMPATIBLE CHANGES
http://git-wip-us.apache.org/repos/asf/hadoop/blob/7c5e7433/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics2/impl/MetricsSourceAdapter.java
--
diff --git
a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics2/impl/MetricsSourceAdapter.java
b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics2/impl/MetricsSourceAdapter.java
index d56ee53..04cd88c 100644
---
a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics2/impl/MetricsSourceAdapter.java
+++
b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics2/impl/MetricsSourceAdapter.java
@@ -31,6 +31,7 @@ import javax.management.ReflectionException;
import static com.google.common.base.Preconditions.*;
import com.google.common.annotations.VisibleForTesting;
+import com.google.common.base.Preconditions;
import com.google.common.collect.Maps;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@@ -59,7 +60,6 @@ class MetricsSourceAdapter implements DynamicMBean {
private final MBeanInfoBuilder infoBuilder;
private final Iterable injectedTags;
- private Iterable lastRecs;
private boolean lastRecsCleared;
private long jmxCacheTS = 0;
private long jmxCacheTTL;
@@ -175,18 +175,19 @@ class MetricsSourceAdapter implements DynamicMBean {
}
}
+// HADOOP-11361: Release lock here for avoid deadlock between
+// MetricsSystemImpl's lock and MetricsSourceAdapter's lock.
+Iterable lastRecs = null;
if (getAllMetrics) {
- MetricsCollectorImpl builder = new MetricsCollectorImpl();
- getMetrics(builder, true);
+ lastRecs = getMetrics(new MetricsCollectorImpl(), true);
}
-synchronized(this) {
- updateAttrCache();
- if (getAllMetrics) {
-updateInfoCache();
+synchronized (this) {
+ if (lastRecs != null) {
+updateAttrCache(lastRecs);
+updateInfoCache(lastRecs);
}
jmxCacheTS = Time.now();
- lastRecs = null; // in case regular interval update is not running
lastRecsCleared = true;
}
}
@@ -194,11 +195,6 @@ class MetricsSourceAdapter implements DynamicMBean {
Iterable getMetrics(MetricsCollectorImpl builder,
boolean all) {
builder.setRecordFilter(recordFilter).setMetricFilter(metricFilter);
-synchronized(this) {
- if (lastRecs == null && jmxCacheTS == 0) {
-all = true; // Get all the metrics to populate the sink caches
- }
-}
try {
source.getMetrics(builder, all);
}
@@ -210,10 +206,7 @@ class MetricsSourceAdapter implements DynamicMBean {
rb.add(t);
}
}
-synchronized(this) {
- lastRecs = builder.getRecords();
- return lastRecs;
-}
+return builder.getRecords();
}
synchronized void stop() {
@@ -247,13 +240,15 @@ class MetricsSou
hadoop git commit: HADOOP-11361. Fix a race condition in MetricsSourceAdapter.updateJmxCache. Contributed by Vinayakumar B, Yongjun Zhang, and Brahma Reddy Battula. (ozawa)
Repository: hadoop
Updated Branches:
refs/heads/branch-2.8 af94dfaa5 -> fa9ff4997
HADOOP-11361. Fix a race condition in MetricsSourceAdapter.updateJmxCache.
Contributed by Vinayakumar B, Yongjun Zhang, and Brahma Reddy Battula. (ozawa)
(cherry picked from commit 77ffe7621212be9f462ca37a542a13d167eca4e0)
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/fa9ff499
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/fa9ff499
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/fa9ff499
Branch: refs/heads/branch-2.8
Commit: fa9ff4997e989084a9363b6b3b61f640c0992732
Parents: af94dfa
Author: Tsuyoshi Ozawa
Authored: Wed Jul 13 21:28:04 2016 +0900
Committer: Tsuyoshi Ozawa
Committed: Wed Jul 13 21:41:11 2016 +0900
--
.../metrics2/impl/MetricsSourceAdapter.java | 33 +---
1 file changed, 14 insertions(+), 19 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/hadoop/blob/fa9ff499/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics2/impl/MetricsSourceAdapter.java
--
diff --git
a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics2/impl/MetricsSourceAdapter.java
b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics2/impl/MetricsSourceAdapter.java
index d56ee53..04cd88c 100644
---
a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics2/impl/MetricsSourceAdapter.java
+++
b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics2/impl/MetricsSourceAdapter.java
@@ -31,6 +31,7 @@ import javax.management.ReflectionException;
import static com.google.common.base.Preconditions.*;
import com.google.common.annotations.VisibleForTesting;
+import com.google.common.base.Preconditions;
import com.google.common.collect.Maps;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@@ -59,7 +60,6 @@ class MetricsSourceAdapter implements DynamicMBean {
private final MBeanInfoBuilder infoBuilder;
private final Iterable injectedTags;
- private Iterable lastRecs;
private boolean lastRecsCleared;
private long jmxCacheTS = 0;
private long jmxCacheTTL;
@@ -175,18 +175,19 @@ class MetricsSourceAdapter implements DynamicMBean {
}
}
+// HADOOP-11361: Release lock here for avoid deadlock between
+// MetricsSystemImpl's lock and MetricsSourceAdapter's lock.
+Iterable lastRecs = null;
if (getAllMetrics) {
- MetricsCollectorImpl builder = new MetricsCollectorImpl();
- getMetrics(builder, true);
+ lastRecs = getMetrics(new MetricsCollectorImpl(), true);
}
-synchronized(this) {
- updateAttrCache();
- if (getAllMetrics) {
-updateInfoCache();
+synchronized (this) {
+ if (lastRecs != null) {
+updateAttrCache(lastRecs);
+updateInfoCache(lastRecs);
}
jmxCacheTS = Time.now();
- lastRecs = null; // in case regular interval update is not running
lastRecsCleared = true;
}
}
@@ -194,11 +195,6 @@ class MetricsSourceAdapter implements DynamicMBean {
Iterable getMetrics(MetricsCollectorImpl builder,
boolean all) {
builder.setRecordFilter(recordFilter).setMetricFilter(metricFilter);
-synchronized(this) {
- if (lastRecs == null && jmxCacheTS == 0) {
-all = true; // Get all the metrics to populate the sink caches
- }
-}
try {
source.getMetrics(builder, all);
}
@@ -210,10 +206,7 @@ class MetricsSourceAdapter implements DynamicMBean {
rb.add(t);
}
}
-synchronized(this) {
- lastRecs = builder.getRecords();
- return lastRecs;
-}
+return builder.getRecords();
}
synchronized void stop() {
@@ -247,13 +240,15 @@ class MetricsSourceAdapter implements DynamicMBean {
return jmxCacheTTL;
}
- private void updateInfoCache() {
+ private void updateInfoCache(Iterable lastRecs) {
+Preconditions.checkNotNull(lastRecs, "LastRecs should not be null");
LOG.debug("Updating info cache...");
infoCache = infoBuilder.reset(lastRecs).get();
LOG.debug("Done");
}
- private int updateAttrCache() {
+ private int updateAttrCache(Iterable lastRecs) {
+Preconditions.checkNotNull(lastRecs, "LastRecs should not be null");
LOG.debug("Updating attr cache...");
int recNo = 0;
int numMetrics = 0;
-
To unsubscribe, e-mail: common-commits-unsubscr...@hadoop.apache.org
For additional commands, e-mail: common-commits-h...@hadoop.apache.org
hadoop git commit: HADOOP-11361. Fix a race condition in MetricsSourceAdapter.updateJmxCache. Contributed by Vinayakumar B, Yongjun Zhang, and Brahma Reddy Battula. (ozawa)
Repository: hadoop
Updated Branches:
refs/heads/branch-2 5b4e916b3 -> 22e719b16
HADOOP-11361. Fix a race condition in MetricsSourceAdapter.updateJmxCache.
Contributed by Vinayakumar B, Yongjun Zhang, and Brahma Reddy Battula. (ozawa)
(cherry picked from commit 77ffe7621212be9f462ca37a542a13d167eca4e0)
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/22e719b1
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/22e719b1
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/22e719b1
Branch: refs/heads/branch-2
Commit: 22e719b16e7687337ead65a3160af24c4b0a6e87
Parents: 5b4e916
Author: Tsuyoshi Ozawa
Authored: Wed Jul 13 21:28:04 2016 +0900
Committer: Tsuyoshi Ozawa
Committed: Wed Jul 13 21:28:20 2016 +0900
--
.../metrics2/impl/MetricsSourceAdapter.java | 33 +---
1 file changed, 14 insertions(+), 19 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/hadoop/blob/22e719b1/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics2/impl/MetricsSourceAdapter.java
--
diff --git
a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics2/impl/MetricsSourceAdapter.java
b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics2/impl/MetricsSourceAdapter.java
index d56ee53..04cd88c 100644
---
a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics2/impl/MetricsSourceAdapter.java
+++
b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics2/impl/MetricsSourceAdapter.java
@@ -31,6 +31,7 @@ import javax.management.ReflectionException;
import static com.google.common.base.Preconditions.*;
import com.google.common.annotations.VisibleForTesting;
+import com.google.common.base.Preconditions;
import com.google.common.collect.Maps;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@@ -59,7 +60,6 @@ class MetricsSourceAdapter implements DynamicMBean {
private final MBeanInfoBuilder infoBuilder;
private final Iterable injectedTags;
- private Iterable lastRecs;
private boolean lastRecsCleared;
private long jmxCacheTS = 0;
private long jmxCacheTTL;
@@ -175,18 +175,19 @@ class MetricsSourceAdapter implements DynamicMBean {
}
}
+// HADOOP-11361: Release lock here for avoid deadlock between
+// MetricsSystemImpl's lock and MetricsSourceAdapter's lock.
+Iterable lastRecs = null;
if (getAllMetrics) {
- MetricsCollectorImpl builder = new MetricsCollectorImpl();
- getMetrics(builder, true);
+ lastRecs = getMetrics(new MetricsCollectorImpl(), true);
}
-synchronized(this) {
- updateAttrCache();
- if (getAllMetrics) {
-updateInfoCache();
+synchronized (this) {
+ if (lastRecs != null) {
+updateAttrCache(lastRecs);
+updateInfoCache(lastRecs);
}
jmxCacheTS = Time.now();
- lastRecs = null; // in case regular interval update is not running
lastRecsCleared = true;
}
}
@@ -194,11 +195,6 @@ class MetricsSourceAdapter implements DynamicMBean {
Iterable getMetrics(MetricsCollectorImpl builder,
boolean all) {
builder.setRecordFilter(recordFilter).setMetricFilter(metricFilter);
-synchronized(this) {
- if (lastRecs == null && jmxCacheTS == 0) {
-all = true; // Get all the metrics to populate the sink caches
- }
-}
try {
source.getMetrics(builder, all);
}
@@ -210,10 +206,7 @@ class MetricsSourceAdapter implements DynamicMBean {
rb.add(t);
}
}
-synchronized(this) {
- lastRecs = builder.getRecords();
- return lastRecs;
-}
+return builder.getRecords();
}
synchronized void stop() {
@@ -247,13 +240,15 @@ class MetricsSourceAdapter implements DynamicMBean {
return jmxCacheTTL;
}
- private void updateInfoCache() {
+ private void updateInfoCache(Iterable lastRecs) {
+Preconditions.checkNotNull(lastRecs, "LastRecs should not be null");
LOG.debug("Updating info cache...");
infoCache = infoBuilder.reset(lastRecs).get();
LOG.debug("Done");
}
- private int updateAttrCache() {
+ private int updateAttrCache(Iterable lastRecs) {
+Preconditions.checkNotNull(lastRecs, "LastRecs should not be null");
LOG.debug("Updating attr cache...");
int recNo = 0;
int numMetrics = 0;
-
To unsubscribe, e-mail: common-commits-unsubscr...@hadoop.apache.org
For additional commands, e-mail: common-commits-h...@hadoop.apache.org
hadoop git commit: HADOOP-11361. Fix a race condition in MetricsSourceAdapter.updateJmxCache. Contributed by Vinayakumar B, Yongjun Zhang, and Brahma Reddy Battula. (ozawa)
Repository: hadoop
Updated Branches:
refs/heads/trunk 438b7c593 -> 77ffe7621
HADOOP-11361. Fix a race condition in MetricsSourceAdapter.updateJmxCache.
Contributed by Vinayakumar B, Yongjun Zhang, and Brahma Reddy Battula. (ozawa)
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/77ffe762
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/77ffe762
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/77ffe762
Branch: refs/heads/trunk
Commit: 77ffe7621212be9f462ca37a542a13d167eca4e0
Parents: 438b7c5
Author: Tsuyoshi Ozawa
Authored: Wed Jul 13 21:28:04 2016 +0900
Committer: Tsuyoshi Ozawa
Committed: Wed Jul 13 21:28:04 2016 +0900
--
.../metrics2/impl/MetricsSourceAdapter.java | 33 +---
1 file changed, 14 insertions(+), 19 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/hadoop/blob/77ffe762/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics2/impl/MetricsSourceAdapter.java
--
diff --git
a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics2/impl/MetricsSourceAdapter.java
b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics2/impl/MetricsSourceAdapter.java
index cbba014..3406ace 100644
---
a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics2/impl/MetricsSourceAdapter.java
+++
b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics2/impl/MetricsSourceAdapter.java
@@ -31,6 +31,7 @@ import javax.management.ReflectionException;
import static com.google.common.base.Preconditions.*;
import com.google.common.annotations.VisibleForTesting;
+import com.google.common.base.Preconditions;
import com.google.common.collect.Maps;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@@ -59,7 +60,6 @@ class MetricsSourceAdapter implements DynamicMBean {
private final MBeanInfoBuilder infoBuilder;
private final Iterable injectedTags;
- private Iterable lastRecs;
private boolean lastRecsCleared;
private long jmxCacheTS = 0;
private long jmxCacheTTL;
@@ -175,18 +175,19 @@ class MetricsSourceAdapter implements DynamicMBean {
}
}
+// HADOOP-11361: Release lock here for avoid deadlock between
+// MetricsSystemImpl's lock and MetricsSourceAdapter's lock.
+Iterable lastRecs = null;
if (getAllMetrics) {
- MetricsCollectorImpl builder = new MetricsCollectorImpl();
- getMetrics(builder, true);
+ lastRecs = getMetrics(new MetricsCollectorImpl(), true);
}
-synchronized(this) {
- updateAttrCache();
- if (getAllMetrics) {
-updateInfoCache();
+synchronized (this) {
+ if (lastRecs != null) {
+updateAttrCache(lastRecs);
+updateInfoCache(lastRecs);
}
jmxCacheTS = Time.now();
- lastRecs = null; // in case regular interval update is not running
lastRecsCleared = true;
}
}
@@ -194,11 +195,6 @@ class MetricsSourceAdapter implements DynamicMBean {
Iterable getMetrics(MetricsCollectorImpl builder,
boolean all) {
builder.setRecordFilter(recordFilter).setMetricFilter(metricFilter);
-synchronized(this) {
- if (lastRecs == null && jmxCacheTS == 0) {
-all = true; // Get all the metrics to populate the sink caches
- }
-}
try {
source.getMetrics(builder, all);
} catch (Exception e) {
@@ -209,10 +205,7 @@ class MetricsSourceAdapter implements DynamicMBean {
rb.add(t);
}
}
-synchronized(this) {
- lastRecs = builder.getRecords();
- return lastRecs;
-}
+return builder.getRecords();
}
synchronized void stop() {
@@ -246,13 +239,15 @@ class MetricsSourceAdapter implements DynamicMBean {
return jmxCacheTTL;
}
- private void updateInfoCache() {
+ private void updateInfoCache(Iterable lastRecs) {
+Preconditions.checkNotNull(lastRecs, "LastRecs should not be null");
LOG.debug("Updating info cache...");
infoCache = infoBuilder.reset(lastRecs).get();
LOG.debug("Done");
}
- private int updateAttrCache() {
+ private int updateAttrCache(Iterable lastRecs) {
+Preconditions.checkNotNull(lastRecs, "LastRecs should not be null");
LOG.debug("Updating attr cache...");
int recNo = 0;
int numMetrics = 0;
-
To unsubscribe, e-mail: common-commits-unsubscr...@hadoop.apache.org
For additional commands, e-mail: common-commits-h...@hadoop.apache.org
hadoop git commit: HADOOP-11993. maven enforcer plugin to ban java 8 incompatible dependencies. (ozawa)
Repository: hadoop Updated Branches: refs/heads/trunk d1626a7b3 -> 0185de076 HADOOP-11993. maven enforcer plugin to ban java 8 incompatible dependencies. (ozawa) Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/0185de07 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/0185de07 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/0185de07 Branch: refs/heads/trunk Commit: 0185de07676dc2f330d48453217222ad0d1cb3cf Parents: d1626a7 Author: Tsuyoshi Ozawa Authored: Fri Jul 8 05:40:52 2016 +0900 Committer: Tsuyoshi Ozawa Committed: Fri Jul 8 05:40:52 2016 +0900 -- hadoop-project/pom.xml | 28 +++- 1 file changed, 27 insertions(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/hadoop/blob/0185de07/hadoop-project/pom.xml -- diff --git a/hadoop-project/pom.xml b/hadoop-project/pom.xml index 80b6995..1274d78 100644 --- a/hadoop-project/pom.xml +++ b/hadoop-project/pom.xml @@ -1246,8 +1246,34 @@ - true + true + + +cglib:cglib: +com.sun.jersey:* +com.sun.jersey.contribs:* +com.sun.jersey.jersey-test-framework:* +com.google.inject:guice +org.ow2.asm:asm + + + +cglib:cglib:3.2.0 +com.google.inject:guice:4.0 +com.sun.jersey:jersey-core:1.19 +com.sun.jersey:jersey-servlet:1.19 +com.sun.jersey:jersey-json:1.19 +com.sun.jersey:jersey-server:1.19 +com.sun.jersey:jersey-client:1.19 +com.sun.jersey:jersey-grizzly2:1.19 + com.sun.jersey:jersey-grizzly2-servlet:1.19 + com.sun.jersey.jersey-test-framework:jersey-test-framework-core:1.19 + com.sun.jersey.jersey-test-framework:jersey-test-framework-grizzly2:1.19 + com.sun.jersey.contribs:jersey-guice:1.19 +org.ow2.asm:asm:5.0.0 + + - To unsubscribe, e-mail: common-commits-unsubscr...@hadoop.apache.org For additional commands, e-mail: common-commits-h...@hadoop.apache.org
hadoop git commit: HADOOP-13337. Update maven-enforcer-plugin versioin to 1.4.1. (ozawa)
Repository: hadoop Updated Branches: refs/heads/trunk aa42c7a6d -> 36cd0bce8 HADOOP-13337. Update maven-enforcer-plugin versioin to 1.4.1. (ozawa) Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/36cd0bce Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/36cd0bce Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/36cd0bce Branch: refs/heads/trunk Commit: 36cd0bce83b285d1f01a6c16f8f2b9284ac14cfc Parents: aa42c7a Author: Tsuyoshi Ozawa Authored: Fri Jul 1 15:40:06 2016 -0700 Committer: Tsuyoshi Ozawa Committed: Fri Jul 1 15:40:06 2016 -0700 -- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/hadoop/blob/36cd0bce/pom.xml -- diff --git a/pom.xml b/pom.xml index d86b45c..6e66f8b 100644 --- a/pom.xml +++ b/pom.xml @@ -97,7 +97,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xs 1.7 2.4 2.8 -1.3.1 +1.4.1 2.9.1 1.5 0.10 - To unsubscribe, e-mail: common-commits-unsubscr...@hadoop.apache.org For additional commands, e-mail: common-commits-h...@hadoop.apache.org
hadoop git commit: HADOOP-13337. Update maven-enforcer-plugin versioin to 1.4.1. (ozawa)
Repository: hadoop Updated Branches: refs/heads/branch-2 06b89f0d1 -> 44e6ae8cc HADOOP-13337. Update maven-enforcer-plugin versioin to 1.4.1. (ozawa) (cherry picked from commit 36cd0bce83b285d1f01a6c16f8f2b9284ac14cfc) Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/44e6ae8c Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/44e6ae8c Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/44e6ae8c Branch: refs/heads/branch-2 Commit: 44e6ae8cc53b1ee2538aee3ff2df0fa2e0020282 Parents: 06b89f0 Author: Tsuyoshi Ozawa Authored: Fri Jul 1 15:40:06 2016 -0700 Committer: Tsuyoshi Ozawa Committed: Fri Jul 1 15:41:17 2016 -0700 -- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/hadoop/blob/44e6ae8c/pom.xml -- diff --git a/pom.xml b/pom.xml index 991cbbf..5f49a2c 100644 --- a/pom.xml +++ b/pom.xml @@ -97,7 +97,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xs 1.7 2.4 2.8 -1.3.1 +1.4.1 2.9.1 1.5 0.10 - To unsubscribe, e-mail: common-commits-unsubscr...@hadoop.apache.org For additional commands, e-mail: common-commits-h...@hadoop.apache.org
hadoop git commit: HADOOP-12064. [JDK8] Update guice version to 4.0. (ozawa)
Repository: hadoop
Updated Branches:
refs/heads/trunk c25021fb7 -> 4009fa3a9
HADOOP-12064. [JDK8] Update guice version to 4.0. (ozawa)
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/4009fa3a
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/4009fa3a
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/4009fa3a
Branch: refs/heads/trunk
Commit: 4009fa3a9272ddfe3825b1bd61b3ab9dc0124050
Parents: c25021f
Author: Tsuyoshi Ozawa
Authored: Fri Jul 1 11:21:36 2016 -0700
Committer: Tsuyoshi Ozawa
Committed: Fri Jul 1 11:21:36 2016 -0700
--
hadoop-project/pom.xml | 11 ++-
1 file changed, 6 insertions(+), 5 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/hadoop/blob/4009fa3a/hadoop-project/pom.xml
--
diff --git a/hadoop-project/pom.xml b/hadoop-project/pom.xml
index 8810eff..80b6995 100644
--- a/hadoop-project/pom.xml
+++ b/hadoop-project/pom.xml
@@ -84,6 +84,7 @@
3.0.0
6.0.44
+4.0
1.8
@@ -537,9 +538,9 @@
-asm
+org.ow2.asm
asm
-3.2
+5.0.4
com.sun.jersey
@@ -571,19 +572,19 @@
com.google.inject
guice
-3.0
+${guice.version}
cglib
cglib
-2.2
+3.2.0
com.google.inject.extensions
guice-servlet
-3.0
+${guice.version}
-
To unsubscribe, e-mail: common-commits-unsubscr...@hadoop.apache.org
For additional commands, e-mail: common-commits-h...@hadoop.apache.org
hadoop git commit: addendum commit to close HADOOP-9613's PR. (ozawa)
Repository: hadoop Updated Branches: refs/heads/trunk e6cb07520 -> 42d53e806 addendum commit to close HADOOP-9613's PR. (ozawa) This closes #76 Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/42d53e80 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/42d53e80 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/42d53e80 Branch: refs/heads/trunk Commit: 42d53e806ecaa6bacf5218c401ecf32b079ea334 Parents: e6cb075 Author: Tsuyoshi Ozawa Authored: Thu Jun 23 05:54:39 2016 -0700 Committer: Tsuyoshi Ozawa Committed: Thu Jun 23 05:56:25 2016 -0700 -- -- - To unsubscribe, e-mail: common-commits-unsubscr...@hadoop.apache.org For additional commands, e-mail: common-commits-h...@hadoop.apache.org
hadoop git commit: MAPREDUCE-6721. mapreduce.reduce.shuffle.memory.limit.percent=0.0 should be legal to enforce shuffle to disk. (Gera Shegalov via ozawa)
Repository: hadoop
Updated Branches:
refs/heads/branch-2 856bc4e28 -> 3ecbfdfdc
MAPREDUCE-6721. mapreduce.reduce.shuffle.memory.limit.percent=0.0 should be
legal to enforce shuffle to disk. (Gera Shegalov via ozawa)
This closes #102
(cherry picked from commit 79a7289165510072c46779251ebb010248cb0ce8)
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/3ecbfdfd
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/3ecbfdfd
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/3ecbfdfd
Branch: refs/heads/branch-2
Commit: 3ecbfdfdc279c065329af2d3cae3aa598a5e3398
Parents: 856bc4e
Author: Tsuyoshi Ozawa
Authored: Wed Jun 22 17:13:50 2016 -0700
Committer: Tsuyoshi Ozawa
Committed: Wed Jun 22 17:20:49 2016 -0700
--
.../mapreduce/task/reduce/MergeManagerImpl.java | 2 +-
.../src/main/resources/mapred-default.xml | 3 ++-
.../mapreduce/task/reduce/TestMergeManager.java | 18 ++
3 files changed, 21 insertions(+), 2 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/hadoop/blob/3ecbfdfd/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/task/reduce/MergeManagerImpl.java
--
diff --git
a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/task/reduce/MergeManagerImpl.java
b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/task/reduce/MergeManagerImpl.java
index c99a330..1673ff8 100644
---
a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/task/reduce/MergeManagerImpl.java
+++
b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/task/reduce/MergeManagerImpl.java
@@ -178,7 +178,7 @@ public class MergeManagerImpl implements
MergeManager {
final float singleShuffleMemoryLimitPercent =
jobConf.getFloat(MRJobConfig.SHUFFLE_MEMORY_LIMIT_PERCENT,
DEFAULT_SHUFFLE_MEMORY_LIMIT_PERCENT);
-if (singleShuffleMemoryLimitPercent <= 0.0f
+if (singleShuffleMemoryLimitPercent < 0.0f
|| singleShuffleMemoryLimitPercent > 1.0f) {
throw new IllegalArgumentException("Invalid value for "
+ MRJobConfig.SHUFFLE_MEMORY_LIMIT_PERCENT + ": "
http://git-wip-us.apache.org/repos/asf/hadoop/blob/3ecbfdfd/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/resources/mapred-default.xml
--
diff --git
a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/resources/mapred-default.xml
b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/resources/mapred-default.xml
index 47b8260..fab5b25 100644
---
a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/resources/mapred-default.xml
+++
b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/resources/mapred-default.xml
@@ -443,7 +443,8 @@
mapreduce.reduce.shuffle.memory.limit.percent
0.25
Expert: Maximum percentage of the in-memory limit that a
- single shuffle can consume
+ single shuffle can consume. Range of valid values is [0.0, 1.0]. If the value
+ is 0.0 map outputs are shuffled directly to disk.
http://git-wip-us.apache.org/repos/asf/hadoop/blob/3ecbfdfd/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/test/java/org/apache/hadoop/mapreduce/task/reduce/TestMergeManager.java
--
diff --git
a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/test/java/org/apache/hadoop/mapreduce/task/reduce/TestMergeManager.java
b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/test/java/org/apache/hadoop/mapreduce/task/reduce/TestMergeManager.java
index ef860af..1c0d25b 100644
---
a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/test/java/org/apache/hadoop/mapreduce/task/reduce/TestMergeManager.java
+++
b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/test/java/org/apache/hadoop/mapreduce/task/reduce/TestMergeManager.java
@@ -41,6 +41,7 @@ import org.apache.hadoop.mapred.JobConf;
import org.apache.hadoop.mapred.MROutputFiles;
import org.apache.hadoop.mapred.MapOutputFile;
import org.apache.hadoop.mapreduce.MRJobConfig;
+import org.apache.hadoop.
hadoop git commit: MAPREDUCE-6721. mapreduce.reduce.shuffle.memory.limit.percent=0.0 should be legal to enforce shuffle to disk. (Gera Shegalov via ozawa)
Repository: hadoop
Updated Branches:
refs/heads/trunk 17eae9ebb -> 79a728916
MAPREDUCE-6721. mapreduce.reduce.shuffle.memory.limit.percent=0.0 should be
legal to enforce shuffle to disk. (Gera Shegalov via ozawa)
This closes #102
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/79a72891
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/79a72891
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/79a72891
Branch: refs/heads/trunk
Commit: 79a7289165510072c46779251ebb010248cb0ce8
Parents: 17eae9e
Author: Tsuyoshi Ozawa
Authored: Wed Jun 22 17:13:50 2016 -0700
Committer: Tsuyoshi Ozawa
Committed: Wed Jun 22 17:20:13 2016 -0700
--
.../mapreduce/task/reduce/MergeManagerImpl.java | 2 +-
.../src/main/resources/mapred-default.xml | 3 ++-
.../mapreduce/task/reduce/TestMergeManager.java | 18 ++
3 files changed, 21 insertions(+), 2 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/hadoop/blob/79a72891/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/task/reduce/MergeManagerImpl.java
--
diff --git
a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/task/reduce/MergeManagerImpl.java
b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/task/reduce/MergeManagerImpl.java
index c99a330..1673ff8 100644
---
a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/task/reduce/MergeManagerImpl.java
+++
b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapreduce/task/reduce/MergeManagerImpl.java
@@ -178,7 +178,7 @@ public class MergeManagerImpl implements
MergeManager {
final float singleShuffleMemoryLimitPercent =
jobConf.getFloat(MRJobConfig.SHUFFLE_MEMORY_LIMIT_PERCENT,
DEFAULT_SHUFFLE_MEMORY_LIMIT_PERCENT);
-if (singleShuffleMemoryLimitPercent <= 0.0f
+if (singleShuffleMemoryLimitPercent < 0.0f
|| singleShuffleMemoryLimitPercent > 1.0f) {
throw new IllegalArgumentException("Invalid value for "
+ MRJobConfig.SHUFFLE_MEMORY_LIMIT_PERCENT + ": "
http://git-wip-us.apache.org/repos/asf/hadoop/blob/79a72891/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/resources/mapred-default.xml
--
diff --git
a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/resources/mapred-default.xml
b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/resources/mapred-default.xml
index d973bd4..ebc43aa 100644
---
a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/resources/mapred-default.xml
+++
b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/resources/mapred-default.xml
@@ -447,7 +447,8 @@
mapreduce.reduce.shuffle.memory.limit.percent
0.25
Expert: Maximum percentage of the in-memory limit that a
- single shuffle can consume
+ single shuffle can consume. Range of valid values is [0.0, 1.0]. If the value
+ is 0.0 map outputs are shuffled directly to disk.
http://git-wip-us.apache.org/repos/asf/hadoop/blob/79a72891/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/test/java/org/apache/hadoop/mapreduce/task/reduce/TestMergeManager.java
--
diff --git
a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/test/java/org/apache/hadoop/mapreduce/task/reduce/TestMergeManager.java
b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/test/java/org/apache/hadoop/mapreduce/task/reduce/TestMergeManager.java
index ef860af..1c0d25b 100644
---
a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/test/java/org/apache/hadoop/mapreduce/task/reduce/TestMergeManager.java
+++
b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/test/java/org/apache/hadoop/mapreduce/task/reduce/TestMergeManager.java
@@ -41,6 +41,7 @@ import org.apache.hadoop.mapred.JobConf;
import org.apache.hadoop.mapred.MROutputFiles;
import org.apache.hadoop.mapred.MapOutputFile;
import org.apache.hadoop.mapreduce.MRJobConfig;
+import org.apache.hadoop.mapreduce.TaskAttemptID;
import
org.apache.hadoop.mapreduce.task.reduce.MergeManage
[2/3] hadoop git commit: HADOOP-9613. [JDK8] Update jersey version to latest 1.x release.
http://git-wip-us.apache.org/repos/asf/hadoop/blob/5d58858b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/test/java/org/apache/hadoop/yarn/server/applicationhistoryservice/webapp/TestAHSWebServices.java
--
diff --git
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/test/java/org/apache/hadoop/yarn/server/applicationhistoryservice/webapp/TestAHSWebServices.java
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/test/java/org/apache/hadoop/yarn/server/applicationhistoryservice/webapp/TestAHSWebServices.java
index 71b0275..3428323 100644
---
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/test/java/org/apache/hadoop/yarn/server/applicationhistoryservice/webapp/TestAHSWebServices.java
+++
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/test/java/org/apache/hadoop/yarn/server/applicationhistoryservice/webapp/TestAHSWebServices.java
@@ -18,6 +18,7 @@
package org.apache.hadoop.yarn.server.applicationhistoryservice.webapp;
+import static
org.apache.hadoop.yarn.webapp.WebServicesTestUtils.assertResponseStatusCode;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
@@ -67,6 +68,7 @@ import
org.apache.hadoop.yarn.server.timeline.security.TimelineACLsManager;
import org.apache.hadoop.yarn.api.records.timeline.TimelineAbout;
import org.apache.hadoop.yarn.util.timeline.TimelineUtils;
import org.apache.hadoop.yarn.webapp.GenericExceptionHandler;
+import org.apache.hadoop.yarn.webapp.GuiceServletConfig;
import org.apache.hadoop.yarn.webapp.JerseyTestBase;
import org.apache.hadoop.yarn.webapp.WebServicesTestUtils;
import org.apache.hadoop.yarn.webapp.util.WebAppUtils;
@@ -75,15 +77,14 @@ import org.codehaus.jettison.json.JSONException;
import org.codehaus.jettison.json.JSONObject;
import org.junit.AfterClass;
import org.junit.Assert;
+import org.junit.Before;
import org.junit.BeforeClass;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.junit.runners.Parameterized;
import com.google.inject.Guice;
-import com.google.inject.Injector;
import com.google.inject.Singleton;
-import com.google.inject.servlet.GuiceServletContextListener;
import com.google.inject.servlet.ServletModule;
import com.sun.jersey.api.client.ClientResponse;
import com.sun.jersey.api.client.ClientResponse.Status;
@@ -132,6 +133,8 @@ public class TestAHSWebServices extends JerseyTestBase {
historyClientService.start();
ahsWebservice = new AHSWebServices(historyClientService, conf);
fs = FileSystem.get(conf);
+GuiceServletConfig.setInjector(
+Guice.createInjector(new WebServletModule()));
}
@AfterClass
@@ -148,8 +151,7 @@ public class TestAHSWebServices extends JerseyTestBase {
return Arrays.asList(new Object[][] { { 0 }, { 1 } });
}
- private Injector injector = Guice.createInjector(new ServletModule() {
-
+ private static class WebServletModule extends ServletModule {
@Override
protected void configureServlets() {
bind(JAXBContextResolver.class);
@@ -159,7 +161,14 @@ public class TestAHSWebServices extends JerseyTestBase {
serve("/*").with(GuiceContainer.class);
filter("/*").through(TestSimpleAuthFilter.class);
}
- });
+ }
+
+ @Before
+ public void setUp() throws Exception {
+super.setUp();
+GuiceServletConfig.setInjector(
+Guice.createInjector(new WebServletModule()));
+ }
@Singleton
public static class TestSimpleAuthFilter extends AuthenticationFilter {
@@ -174,14 +183,6 @@ public class TestAHSWebServices extends JerseyTestBase {
}
}
- public class GuiceServletConfig extends GuiceServletContextListener {
-
-@Override
-protected Injector getInjector() {
- return injector;
-}
- }
-
private int round;
public TestAHSWebServices(int round) {
@@ -203,8 +204,8 @@ public class TestAHSWebServices extends JerseyTestBase {
.queryParam("user.name", USERS[round])
.accept(MediaType.APPLICATION_JSON)
.get(ClientResponse.class);
-assertEquals("404 not found expected", Status.NOT_FOUND,
-response.getClientResponseStatus());
+assertResponseStatusCode("404 not found expected",
+Status.NOT_FOUND, response.getStatusInfo());
}
@Test
@@ -221,11 +222,11 @@ public class TestAHSWebServices extends JerseyTestBase {
.accept(MediaType.APPLICATION_JSON)
.get(ClientResponse.class);
if (round == 1) {
- assertEquals(Status.FORBIDDEN, response.getClientResponseStatus());
+ assertResponseStatusCode(Status.FORBIDDEN, response.getStatusInfo());
return;
}
-assertEquals("404 not
[3/3] hadoop git commit: HADOOP-9613. [JDK8] Update jersey version to latest 1.x release.
HADOOP-9613. [JDK8] Update jersey version to latest 1.x release. Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/5d58858b Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/5d58858b Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/5d58858b Branch: refs/heads/trunk Commit: 5d58858bb6dfc07272ef099d60ca7cfb3b04423c Parents: 8c1f81d Author: Tsuyoshi Ozawa Authored: Tue Feb 16 01:02:09 2016 +0900 Committer: Tsuyoshi Ozawa Committed: Tue Jun 21 08:05:32 2016 +0900 -- hadoop-common-project/hadoop-common/pom.xml | 5 + .../v2/app/webapp/TestAMWebServices.java| 29 ++-- .../v2/app/webapp/TestAMWebServicesAttempt.java | 20 ++- .../app/webapp/TestAMWebServicesAttempts.java | 24 ++-- .../v2/app/webapp/TestAMWebServicesJobConf.java | 27 ++-- .../v2/app/webapp/TestAMWebServicesJobs.java| 31 ++--- .../v2/app/webapp/TestAMWebServicesTasks.java | 32 ++--- .../v2/hs/webapp/TestHsWebServices.java | 28 ++-- .../v2/hs/webapp/TestHsWebServicesAttempts.java | 33 ++--- .../v2/hs/webapp/TestHsWebServicesJobConf.java | 20 ++- .../v2/hs/webapp/TestHsWebServicesJobs.java | 35 +++-- .../hs/webapp/TestHsWebServicesJobsQuery.java | 60 .../v2/hs/webapp/TestHsWebServicesTasks.java| 32 ++--- hadoop-project/pom.xml | 19 ++- .../apache/hadoop/yarn/client/cli/LogsCLI.java | 3 +- .../hadoop-yarn/hadoop-yarn-common/pom.xml | 6 + .../yarn/client/api/impl/TimelineWriter.java| 3 +- .../client/api/impl/TestTimelineClient.java | 4 +- .../api/impl/TestTimelineClientForATS1_5.java | 4 +- .../hadoop/yarn/webapp/GuiceServletConfig.java | 43 ++ .../yarn/webapp/WebServicesTestUtils.java | 11 ++ .../webapp/TestAHSWebServices.java | 64 - .../webapp/TestTimelineWebServices.java | 56 .../nodemanager/webapp/TestNMWebServices.java | 29 ++-- .../webapp/TestNMWebServicesApps.java | 42 +++--- .../webapp/TestNMWebServicesContainers.java | 29 ++-- .../webapp/TestRMWebServices.java | 29 ++-- .../webapp/TestRMWebServicesApps.java | 51 +++ .../TestRMWebServicesAppsModification.java | 89 ++-- .../webapp/TestRMWebServicesCapacitySched.java | 65 + .../TestRMWebServicesDelegationTokens.java | 66 + .../webapp/TestRMWebServicesFairScheduler.java | 29 ++-- .../TestRMWebServicesForCSWithPartitions.java | 92 ++-- .../webapp/TestRMWebServicesNodeLabels.java | 30 ++-- .../webapp/TestRMWebServicesNodes.java | 35 ++--- .../webapp/TestRMWebServicesReservation.java| 139 ++- .../yarn/webapp/TestRMWithCSRFFilter.java | 22 +-- .../hadoop/yarn/webapp/TestRMWithXFSFilter.java | 19 +-- 38 files changed, 692 insertions(+), 663 deletions(-) -- http://git-wip-us.apache.org/repos/asf/hadoop/blob/5d58858b/hadoop-common-project/hadoop-common/pom.xml -- diff --git a/hadoop-common-project/hadoop-common/pom.xml b/hadoop-common-project/hadoop-common/pom.xml index 51ff7de..c21b81e 100644 --- a/hadoop-common-project/hadoop-common/pom.xml +++ b/hadoop-common-project/hadoop-common/pom.xml @@ -116,6 +116,11 @@ compile + com.sun.jersey + jersey-servlet + compile + + com.sun.jersey jersey-json http://git-wip-us.apache.org/repos/asf/hadoop/blob/5d58858b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/test/java/org/apache/hadoop/mapreduce/v2/app/webapp/TestAMWebServices.java -- diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/test/java/org/apache/hadoop/mapreduce/v2/app/webapp/TestAMWebServices.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/test/java/org/apache/hadoop/mapreduce/v2/app/webapp/TestAMWebServices.java index 21a2611..1fb6a08 100644 --- a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/test/java/org/apache/hadoop/mapreduce/v2/app/webapp/TestAMWebServices.java +++ b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/test/java/org/apache/hadoop/mapreduce/v2/app/webapp/TestAMWebServices.java @@ -18,6 +18,7 @@ package org.apache.hadoop.mapreduce.v2.app.webapp; +import static org.apache.hadoop.yarn.webapp.WebServicesTestUtils.assertResponseStatusCode; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; @@ -33,6 +34,7 @@ import org.apache.hadoop.conf.Configuration; import
[1/3] hadoop git commit: HADOOP-9613. [JDK8] Update jersey version to latest 1.x release.
Repository: hadoop
Updated Branches:
refs/heads/trunk 8c1f81d4b -> 5d58858bb
http://git-wip-us.apache.org/repos/asf/hadoop/blob/5d58858b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesFairScheduler.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/webapp/TestRMWebServicesFairScheduler.java
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesFairScheduler.java
index 1aed3a6..cbe360a 100644
---
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesFairScheduler.java
+++
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesFairScheduler.java
@@ -30,15 +30,15 @@ import
org.apache.hadoop.yarn.server.resourcemanager.scheduler.ResourceScheduler
import
org.apache.hadoop.yarn.server.resourcemanager.scheduler.fair.FairScheduler;
import
org.apache.hadoop.yarn.server.resourcemanager.scheduler.fair.QueueManager;
import org.apache.hadoop.yarn.webapp.GenericExceptionHandler;
+import org.apache.hadoop.yarn.webapp.GuiceServletConfig;
import org.apache.hadoop.yarn.webapp.JerseyTestBase;
import org.codehaus.jettison.json.JSONArray;
import org.codehaus.jettison.json.JSONException;
import org.codehaus.jettison.json.JSONObject;
+import org.junit.Before;
import org.junit.Test;
import com.google.inject.Guice;
-import com.google.inject.Injector;
-import com.google.inject.servlet.GuiceServletContextListener;
import com.google.inject.servlet.ServletModule;
import com.sun.jersey.api.client.ClientResponse;
import com.sun.jersey.api.client.WebResource;
@@ -47,9 +47,9 @@ import com.sun.jersey.test.framework.WebAppDescriptor;
public class TestRMWebServicesFairScheduler extends JerseyTestBase {
private static MockRM rm;
- private YarnConfiguration conf;
+ private static YarnConfiguration conf;
- private Injector injector = Guice.createInjector(new ServletModule() {
+ private static class WebServletModule extends ServletModule {
@Override
protected void configureServlets() {
bind(JAXBContextResolver.class);
@@ -62,16 +62,21 @@ public class TestRMWebServicesFairScheduler extends
JerseyTestBase {
bind(ResourceManager.class).toInstance(rm);
serve("/*").with(GuiceContainer.class);
}
- });
-
- public class GuiceServletConfig extends GuiceServletContextListener {
+ }
-@Override
-protected Injector getInjector() {
- return injector;
-}
+ static {
+GuiceServletConfig.setInjector(
+Guice.createInjector(new WebServletModule()));
}
-
+
+ @Before
+ @Override
+ public void setUp() throws Exception {
+super.setUp();
+GuiceServletConfig.setInjector(
+Guice.createInjector(new WebServletModule()));
+ }
+
public TestRMWebServicesFairScheduler() {
super(new WebAppDescriptor.Builder(
"org.apache.hadoop.yarn.server.resourcemanager.webapp")
http://git-wip-us.apache.org/repos/asf/hadoop/blob/5d58858b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesForCSWithPartitions.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/webapp/TestRMWebServicesForCSWithPartitions.java
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesForCSWithPartitions.java
index 8087e33..046cf8a 100644
---
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesForCSWithPartitions.java
+++
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServicesForCSWithPartitions.java
@@ -38,6 +38,7 @@ import
org.apache.hadoop.yarn.server.resourcemanager.scheduler.ResourceScheduler
import
org.apache.hadoop.yarn.server.resourcemanager.scheduler.capacity.CapacityScheduler;
import
org.apache.hadoop.yarn.server.resourcemanager.scheduler.capacity.CapacitySchedulerConfiguration;
import org.apache.hadoop.yarn.webapp.GenericExceptionHandler;
+import org.ap
hadoop git commit: HADOOP-10694. Remove synchronized input streams from Writable deserialization. Contributed by Gopal V and Rajesh Balamohan.
Repository: hadoop
Updated Branches:
refs/heads/branch-2 ba4883443 -> eb4182f8f
HADOOP-10694. Remove synchronized input streams from Writable deserialization.
Contributed by Gopal V and Rajesh Balamohan.
(cherry picked from commit 6e565780315469584c47515be6bd189f07840f1b)
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/eb4182f8
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/eb4182f8
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/eb4182f8
Branch: refs/heads/branch-2
Commit: eb4182f8f5f9c4b7d9b108fd887604380948a482
Parents: ba48834
Author: Tsuyoshi Ozawa
Authored: Tue May 10 17:27:10 2016 -0700
Committer: Tsuyoshi Ozawa
Committed: Tue May 10 17:27:43 2016 -0700
--
.../org/apache/hadoop/io/DataInputBuffer.java | 81 ++--
1 file changed, 74 insertions(+), 7 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/hadoop/blob/eb4182f8/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/DataInputBuffer.java
--
diff --git
a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/DataInputBuffer.java
b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/DataInputBuffer.java
index f0b6726..63c41c2 100644
---
a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/DataInputBuffer.java
+++
b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/DataInputBuffer.java
@@ -18,13 +18,14 @@
package org.apache.hadoop.io;
-import java.io.*;
-
import org.apache.hadoop.classification.InterfaceAudience;
import org.apache.hadoop.classification.InterfaceStability;
-/** A reusable {@link DataInput} implementation that reads from an in-memory
- * buffer.
+import java.io.ByteArrayInputStream;
+import java.io.DataInputStream;
+
+/** A reusable {@link java.io.DataInput} implementation
+ * that reads from an in-memory buffer.
*
* This saves memory over creating a new DataInputStream and
* ByteArrayInputStream each time data is read.
@@ -56,9 +57,75 @@ public class DataInputBuffer extends DataInputStream {
this.pos = start;
}
-public byte[] getData() { return buf; }
-public int getPosition() { return pos; }
-public int getLength() { return count; }
+public byte[] getData() {
+ return buf;
+}
+
+public int getPosition() {
+ return pos;
+}
+
+public int getLength() {
+ return count;
+}
+
+/* functions below comes verbatim from
+ hive.common.io.NonSyncByteArrayInputStream */
+
+/**
+ * {@inheritDoc}
+ */
+@Override
+public int read() {
+ return (pos < count) ? (buf[pos++] & 0xff) : -1;
+}
+
+/**
+ * {@inheritDoc}
+ */
+@Override
+public int read(byte[] b, int off, int len) {
+ if (b == null) {
+throw new NullPointerException();
+ } else if (off < 0 || len < 0 || len > b.length - off) {
+throw new IndexOutOfBoundsException();
+ }
+ if (pos >= count) {
+return -1;
+ }
+ if (pos + len > count) {
+len = count - pos;
+ }
+ if (len <= 0) {
+return 0;
+ }
+ System.arraycopy(buf, pos, b, off, len);
+ pos += len;
+ return len;
+}
+
+/**
+ * {@inheritDoc}
+ */
+@Override
+public long skip(long n) {
+ if (pos + n > count) {
+n = count - pos;
+ }
+ if (n < 0) {
+return 0;
+ }
+ pos += n;
+ return n;
+}
+
+/**
+ * {@inheritDoc}
+ */
+@Override
+public int available() {
+ return count - pos;
+}
}
private Buffer buffer;
-
To unsubscribe, e-mail: common-commits-unsubscr...@hadoop.apache.org
For additional commands, e-mail: common-commits-h...@hadoop.apache.org
hadoop git commit: HADOOP-10694. Remove synchronized input streams from Writable deserialization. Contributed by Gopal V and Rajesh Balamohan.
Repository: hadoop
Updated Branches:
refs/heads/trunk 27242f211 -> 6e5657803
HADOOP-10694. Remove synchronized input streams from Writable deserialization.
Contributed by Gopal V and Rajesh Balamohan.
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/6e565780
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/6e565780
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/6e565780
Branch: refs/heads/trunk
Commit: 6e565780315469584c47515be6bd189f07840f1b
Parents: 27242f2
Author: Tsuyoshi Ozawa
Authored: Tue May 10 17:27:10 2016 -0700
Committer: Tsuyoshi Ozawa
Committed: Tue May 10 17:27:10 2016 -0700
--
.../org/apache/hadoop/io/DataInputBuffer.java | 81 ++--
1 file changed, 74 insertions(+), 7 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/hadoop/blob/6e565780/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/DataInputBuffer.java
--
diff --git
a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/DataInputBuffer.java
b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/DataInputBuffer.java
index f0b6726..63c41c2 100644
---
a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/DataInputBuffer.java
+++
b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/DataInputBuffer.java
@@ -18,13 +18,14 @@
package org.apache.hadoop.io;
-import java.io.*;
-
import org.apache.hadoop.classification.InterfaceAudience;
import org.apache.hadoop.classification.InterfaceStability;
-/** A reusable {@link DataInput} implementation that reads from an in-memory
- * buffer.
+import java.io.ByteArrayInputStream;
+import java.io.DataInputStream;
+
+/** A reusable {@link java.io.DataInput} implementation
+ * that reads from an in-memory buffer.
*
* This saves memory over creating a new DataInputStream and
* ByteArrayInputStream each time data is read.
@@ -56,9 +57,75 @@ public class DataInputBuffer extends DataInputStream {
this.pos = start;
}
-public byte[] getData() { return buf; }
-public int getPosition() { return pos; }
-public int getLength() { return count; }
+public byte[] getData() {
+ return buf;
+}
+
+public int getPosition() {
+ return pos;
+}
+
+public int getLength() {
+ return count;
+}
+
+/* functions below comes verbatim from
+ hive.common.io.NonSyncByteArrayInputStream */
+
+/**
+ * {@inheritDoc}
+ */
+@Override
+public int read() {
+ return (pos < count) ? (buf[pos++] & 0xff) : -1;
+}
+
+/**
+ * {@inheritDoc}
+ */
+@Override
+public int read(byte[] b, int off, int len) {
+ if (b == null) {
+throw new NullPointerException();
+ } else if (off < 0 || len < 0 || len > b.length - off) {
+throw new IndexOutOfBoundsException();
+ }
+ if (pos >= count) {
+return -1;
+ }
+ if (pos + len > count) {
+len = count - pos;
+ }
+ if (len <= 0) {
+return 0;
+ }
+ System.arraycopy(buf, pos, b, off, len);
+ pos += len;
+ return len;
+}
+
+/**
+ * {@inheritDoc}
+ */
+@Override
+public long skip(long n) {
+ if (pos + n > count) {
+n = count - pos;
+ }
+ if (n < 0) {
+return 0;
+ }
+ pos += n;
+ return n;
+}
+
+/**
+ * {@inheritDoc}
+ */
+@Override
+public int available() {
+ return count - pos;
+}
}
private Buffer buffer;
-
To unsubscribe, e-mail: common-commits-unsubscr...@hadoop.apache.org
For additional commands, e-mail: common-commits-h...@hadoop.apache.org
[2/2] hadoop git commit: YARN-4648. Move preemption related tests from TestFairScheduler to TestFairSchedulerPreemption. Contributed by Kai Sasaki.
YARN-4648. Move preemption related tests from TestFairScheduler to
TestFairSchedulerPreemption. Contributed by Kai Sasaki.
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/0e12114c
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/0e12114c
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/0e12114c
Branch: refs/heads/trunk
Commit: 0e12114c9ccb0c6b16c258227a433b075418796e
Parents: 48c61cd
Author: Tsuyoshi Ozawa
Authored: Tue Feb 23 19:50:08 2016 +0900
Committer: Tsuyoshi Ozawa
Committed: Tue Feb 23 19:50:08 2016 +0900
--
hadoop-yarn-project/CHANGES.txt |3 +
.../scheduler/fair/TestFairScheduler.java | 1204
.../fair/TestFairSchedulerPreemption.java | 1295 +-
3 files changed, 1293 insertions(+), 1209 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/hadoop/blob/0e12114c/hadoop-yarn-project/CHANGES.txt
--
diff --git a/hadoop-yarn-project/CHANGES.txt b/hadoop-yarn-project/CHANGES.txt
index a25a580..e2ffec0 100644
--- a/hadoop-yarn-project/CHANGES.txt
+++ b/hadoop-yarn-project/CHANGES.txt
@@ -138,6 +138,9 @@ Release 2.9.0 - UNRELEASED
YARN-4708. Missing default mapper type in TimelineServer performance test
tool
usage. (Kai Sasaki via ozawa)
+YARN-4648. Move preemption related tests from TestFairScheduler to
+TestFairSchedulerPreemption. (Kai Sasaki via ozawa)
+
OPTIMIZATIONS
BUG FIXES
http://git-wip-us.apache.org/repos/asf/hadoop/blob/0e12114c/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fair/TestFairScheduler.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/scheduler/fair/TestFairScheduler.java
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fair/TestFairScheduler.java
index fac28b7..0575f33 100644
---
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fair/TestFairScheduler.java
+++
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fair/TestFairScheduler.java
@@ -57,7 +57,6 @@ import org.apache.hadoop.yarn.MockApps;
import org.apache.hadoop.yarn.api.records.ApplicationAttemptId;
import org.apache.hadoop.yarn.api.records.ApplicationId;
import org.apache.hadoop.yarn.api.records.ApplicationSubmissionContext;
-import org.apache.hadoop.yarn.api.records.Container;
import org.apache.hadoop.yarn.api.records.ContainerId;
import org.apache.hadoop.yarn.api.records.ContainerLaunchContext;
import org.apache.hadoop.yarn.api.records.FinalApplicationStatus;
@@ -94,11 +93,9 @@ import
org.apache.hadoop.yarn.server.resourcemanager.scheduler.event.AppAddedSch
import
org.apache.hadoop.yarn.server.resourcemanager.scheduler.event.AppAttemptAddedSchedulerEvent;
import
org.apache.hadoop.yarn.server.resourcemanager.scheduler.event.AppAttemptRemovedSchedulerEvent;
import
org.apache.hadoop.yarn.server.resourcemanager.scheduler.event.ContainerExpiredSchedulerEvent;
-import
org.apache.hadoop.yarn.server.resourcemanager.scheduler.event.ContainerPreemptEvent;
import
org.apache.hadoop.yarn.server.resourcemanager.scheduler.event.NodeAddedSchedulerEvent;
import
org.apache.hadoop.yarn.server.resourcemanager.scheduler.event.NodeRemovedSchedulerEvent;
import
org.apache.hadoop.yarn.server.resourcemanager.scheduler.event.NodeUpdateSchedulerEvent;
-import
org.apache.hadoop.yarn.server.resourcemanager.scheduler.event.SchedulerEventType;
import
org.apache.hadoop.yarn.server.resourcemanager.scheduler.fair.QueuePlacementRule.Default;
import
org.apache.hadoop.yarn.server.resourcemanager.scheduler.fair.policies.DominantResourceFairnessPolicy;
import
org.apache.hadoop.yarn.server.resourcemanager.scheduler.fair.policies.FifoPolicy;
@@ -1793,1122 +1790,6 @@ public class TestFairScheduler extends
FairSchedulerTestBase {
assertEquals(0.5f, root.getFairSharePreemptionThreshold(), 0.01);
}
- @Test (timeout = 5000)
- /**
- * Make sure containers are chosen to be preempted in the correct order.
- */
- public void testChoiceOfPreemptedContainers() throws Exception {
-conf.setLong(FairSchedulerConfiguration.PREEMPTION_INTERVAL, 5000);
-conf.setLong(FairSchedulerConfiguration.WAIT_TIME_BEFORE_KILL, 1
[2/2] hadoop git commit: YARN-4648. Move preemption related tests from TestFairScheduler to TestFairSchedulerPreemption. Contributed by Kai Sasaki.
YARN-4648. Move preemption related tests from TestFairScheduler to
TestFairSchedulerPreemption. Contributed by Kai Sasaki.
(cherry picked from commit 0e12114c9ccb0c6b16c258227a433b075418796e)
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/4ee55d03
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/4ee55d03
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/4ee55d03
Branch: refs/heads/branch-2
Commit: 4ee55d0322f2e97d447acdd5c7bf68cc7b7ac13a
Parents: 56b82de
Author: Tsuyoshi Ozawa
Authored: Tue Feb 23 19:50:08 2016 +0900
Committer: Tsuyoshi Ozawa
Committed: Tue Feb 23 19:50:40 2016 +0900
--
hadoop-yarn-project/CHANGES.txt |3 +
.../scheduler/fair/TestFairScheduler.java | 1204
.../fair/TestFairSchedulerPreemption.java | 1295 +-
3 files changed, 1293 insertions(+), 1209 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/hadoop/blob/4ee55d03/hadoop-yarn-project/CHANGES.txt
--
diff --git a/hadoop-yarn-project/CHANGES.txt b/hadoop-yarn-project/CHANGES.txt
index 37deb3c..14ecd2b 100644
--- a/hadoop-yarn-project/CHANGES.txt
+++ b/hadoop-yarn-project/CHANGES.txt
@@ -79,6 +79,9 @@ Release 2.9.0 - UNRELEASED
YARN-4708. Missing default mapper type in TimelineServer performance test
tool
usage. (Kai Sasaki via ozawa)
+YARN-4648. Move preemption related tests from TestFairScheduler to
+TestFairSchedulerPreemption. (Kai Sasaki via ozawa)
+
OPTIMIZATIONS
BUG FIXES
http://git-wip-us.apache.org/repos/asf/hadoop/blob/4ee55d03/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fair/TestFairScheduler.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/scheduler/fair/TestFairScheduler.java
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fair/TestFairScheduler.java
index 8b5263c..a7d2753 100644
---
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fair/TestFairScheduler.java
+++
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fair/TestFairScheduler.java
@@ -57,7 +57,6 @@ import org.apache.hadoop.yarn.MockApps;
import org.apache.hadoop.yarn.api.records.ApplicationAttemptId;
import org.apache.hadoop.yarn.api.records.ApplicationId;
import org.apache.hadoop.yarn.api.records.ApplicationSubmissionContext;
-import org.apache.hadoop.yarn.api.records.Container;
import org.apache.hadoop.yarn.api.records.ContainerId;
import org.apache.hadoop.yarn.api.records.ContainerLaunchContext;
import org.apache.hadoop.yarn.api.records.FinalApplicationStatus;
@@ -94,11 +93,9 @@ import
org.apache.hadoop.yarn.server.resourcemanager.scheduler.event.AppAddedSch
import
org.apache.hadoop.yarn.server.resourcemanager.scheduler.event.AppAttemptAddedSchedulerEvent;
import
org.apache.hadoop.yarn.server.resourcemanager.scheduler.event.AppAttemptRemovedSchedulerEvent;
import
org.apache.hadoop.yarn.server.resourcemanager.scheduler.event.ContainerExpiredSchedulerEvent;
-import
org.apache.hadoop.yarn.server.resourcemanager.scheduler.event.ContainerPreemptEvent;
import
org.apache.hadoop.yarn.server.resourcemanager.scheduler.event.NodeAddedSchedulerEvent;
import
org.apache.hadoop.yarn.server.resourcemanager.scheduler.event.NodeRemovedSchedulerEvent;
import
org.apache.hadoop.yarn.server.resourcemanager.scheduler.event.NodeUpdateSchedulerEvent;
-import
org.apache.hadoop.yarn.server.resourcemanager.scheduler.event.SchedulerEventType;
import
org.apache.hadoop.yarn.server.resourcemanager.scheduler.fair.QueuePlacementRule.Default;
import
org.apache.hadoop.yarn.server.resourcemanager.scheduler.fair.policies.DominantResourceFairnessPolicy;
import
org.apache.hadoop.yarn.server.resourcemanager.scheduler.fair.policies.FifoPolicy;
@@ -1793,1122 +1790,6 @@ public class TestFairScheduler extends
FairSchedulerTestBase {
assertEquals(0.5f, root.getFairSharePreemptionThreshold(), 0.01);
}
- @Test (timeout = 5000)
- /**
- * Make sure containers are chosen to be preempted in the correct order.
- */
- public void testChoiceOfPreemptedContainers() throws Exception {
-conf.setLong(FairSchedulerConfiguration.PREEMPTION_INTERVAL, 5000
[1/2] hadoop git commit: YARN-4648. Move preemption related tests from TestFairScheduler to TestFairSchedulerPreemption. Contributed by Kai Sasaki.
Repository: hadoop
Updated Branches:
refs/heads/branch-2 56b82de6e -> 4ee55d032
http://git-wip-us.apache.org/repos/asf/hadoop/blob/4ee55d03/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fair/TestFairSchedulerPreemption.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/scheduler/fair/TestFairSchedulerPreemption.java
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fair/TestFairSchedulerPreemption.java
index 6f759ce..5bdcc08 100644
---
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fair/TestFairSchedulerPreemption.java
+++
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fair/TestFairSchedulerPreemption.java
@@ -18,18 +18,31 @@
package org.apache.hadoop.yarn.server.resourcemanager.scheduler.fair;
import org.apache.hadoop.conf.Configuration;
+import org.apache.hadoop.metrics2.lib.DefaultMetricsSystem;
+import org.apache.hadoop.yarn.api.records.ApplicationAttemptId;
+import org.apache.hadoop.yarn.api.records.Container;
+import org.apache.hadoop.yarn.api.records.ContainerId;
+import org.apache.hadoop.yarn.api.records.Priority;
import org.apache.hadoop.yarn.api.records.Resource;
+import org.apache.hadoop.yarn.api.records.ResourceRequest;
import org.apache.hadoop.yarn.conf.YarnConfiguration;
+import org.apache.hadoop.yarn.event.AsyncDispatcher;
import org.apache.hadoop.yarn.server.resourcemanager.MockNodes;
import org.apache.hadoop.yarn.server.resourcemanager.MockRM;
+import org.apache.hadoop.yarn.server.resourcemanager.rmcontainer.RMContainer;
import org.apache.hadoop.yarn.server.resourcemanager.rmnode.RMNode;
+import org.apache.hadoop.yarn.server.resourcemanager.scheduler.QueueMetrics;
import
org.apache.hadoop.yarn.server.resourcemanager.scheduler.ResourceScheduler;
+import
org.apache.hadoop.yarn.server.resourcemanager.scheduler.SchedulerApplicationAttempt;
+import
org.apache.hadoop.yarn.server.resourcemanager.scheduler.event.ContainerPreemptEvent;
import
org.apache.hadoop.yarn.server.resourcemanager.scheduler.event.NodeAddedSchedulerEvent;
import
org.apache.hadoop.yarn.server.resourcemanager.scheduler.event.NodeUpdateSchedulerEvent;
-
+import
org.apache.hadoop.yarn.server.resourcemanager.scheduler.event.SchedulerEventType;
import org.apache.hadoop.yarn.util.ControlledClock;
import org.apache.hadoop.yarn.util.resource.Resources;
+
import org.junit.After;
+import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
@@ -37,6 +50,11 @@ import java.io.File;
import java.io.FileWriter;
import java.io.IOException;
import java.io.PrintWriter;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
@@ -84,7 +102,7 @@ public class TestFairSchedulerPreemption extends
FairSchedulerTestBase {
conf = null;
}
- private void startResourceManager(float utilizationThreshold) {
+ private void startResourceManagerWithStubbedFairScheduler(float
utilizationThreshold) {
conf.setFloat(FairSchedulerConfiguration.PREEMPTION_THRESHOLD,
utilizationThreshold);
resourceManager = new MockRM(conf);
@@ -98,6 +116,51 @@ public class TestFairSchedulerPreemption extends
FairSchedulerTestBase {
scheduler.updateInterval = 60 * 1000;
}
+ // YARN-4648: The starting code for ResourceManager mock is originated from
+ // TestFairScheduler. It should be keep as it was to guarantee no changing
+ // behaviour of ResourceManager preemption.
+ private void startResourceManagerWithRealFairScheduler() {
+scheduler = new FairScheduler();
+conf = new YarnConfiguration();
+conf.setClass(YarnConfiguration.RM_SCHEDULER, FairScheduler.class,
+ResourceScheduler.class);
+conf.setInt(YarnConfiguration.RM_SCHEDULER_MINIMUM_ALLOCATION_MB, 0);
+
conf.setInt(FairSchedulerConfiguration.RM_SCHEDULER_INCREMENT_ALLOCATION_MB,
+1024);
+conf.setInt(YarnConfiguration.RM_SCHEDULER_MAXIMUM_ALLOCATION_MB, 10240);
+conf.setBoolean(FairSchedulerConfiguration.ASSIGN_MULTIPLE, false);
+conf.setFloat(FairSchedulerConfiguration.PREEMPTION_THRESHOLD, 0f);
+conf.setFloat(
+FairSchedulerConfiguration
+.RM_SCHEDULER_RESERVATION_THRESHOLD_INCERMENT_MULTIPLE,
+TEST_RESERVATION_THRESHOLD);
+
+resourceManager = new
[1/2] hadoop git commit: YARN-4648. Move preemption related tests from TestFairScheduler to TestFairSchedulerPreemption. Contributed by Kai Sasaki.
Repository: hadoop
Updated Branches:
refs/heads/trunk 48c61cd6a -> 0e12114c9
http://git-wip-us.apache.org/repos/asf/hadoop/blob/0e12114c/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fair/TestFairSchedulerPreemption.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/scheduler/fair/TestFairSchedulerPreemption.java
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fair/TestFairSchedulerPreemption.java
index 6f759ce..5bdcc08 100644
---
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fair/TestFairSchedulerPreemption.java
+++
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fair/TestFairSchedulerPreemption.java
@@ -18,18 +18,31 @@
package org.apache.hadoop.yarn.server.resourcemanager.scheduler.fair;
import org.apache.hadoop.conf.Configuration;
+import org.apache.hadoop.metrics2.lib.DefaultMetricsSystem;
+import org.apache.hadoop.yarn.api.records.ApplicationAttemptId;
+import org.apache.hadoop.yarn.api.records.Container;
+import org.apache.hadoop.yarn.api.records.ContainerId;
+import org.apache.hadoop.yarn.api.records.Priority;
import org.apache.hadoop.yarn.api.records.Resource;
+import org.apache.hadoop.yarn.api.records.ResourceRequest;
import org.apache.hadoop.yarn.conf.YarnConfiguration;
+import org.apache.hadoop.yarn.event.AsyncDispatcher;
import org.apache.hadoop.yarn.server.resourcemanager.MockNodes;
import org.apache.hadoop.yarn.server.resourcemanager.MockRM;
+import org.apache.hadoop.yarn.server.resourcemanager.rmcontainer.RMContainer;
import org.apache.hadoop.yarn.server.resourcemanager.rmnode.RMNode;
+import org.apache.hadoop.yarn.server.resourcemanager.scheduler.QueueMetrics;
import
org.apache.hadoop.yarn.server.resourcemanager.scheduler.ResourceScheduler;
+import
org.apache.hadoop.yarn.server.resourcemanager.scheduler.SchedulerApplicationAttempt;
+import
org.apache.hadoop.yarn.server.resourcemanager.scheduler.event.ContainerPreemptEvent;
import
org.apache.hadoop.yarn.server.resourcemanager.scheduler.event.NodeAddedSchedulerEvent;
import
org.apache.hadoop.yarn.server.resourcemanager.scheduler.event.NodeUpdateSchedulerEvent;
-
+import
org.apache.hadoop.yarn.server.resourcemanager.scheduler.event.SchedulerEventType;
import org.apache.hadoop.yarn.util.ControlledClock;
import org.apache.hadoop.yarn.util.resource.Resources;
+
import org.junit.After;
+import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
@@ -37,6 +50,11 @@ import java.io.File;
import java.io.FileWriter;
import java.io.IOException;
import java.io.PrintWriter;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
@@ -84,7 +102,7 @@ public class TestFairSchedulerPreemption extends
FairSchedulerTestBase {
conf = null;
}
- private void startResourceManager(float utilizationThreshold) {
+ private void startResourceManagerWithStubbedFairScheduler(float
utilizationThreshold) {
conf.setFloat(FairSchedulerConfiguration.PREEMPTION_THRESHOLD,
utilizationThreshold);
resourceManager = new MockRM(conf);
@@ -98,6 +116,51 @@ public class TestFairSchedulerPreemption extends
FairSchedulerTestBase {
scheduler.updateInterval = 60 * 1000;
}
+ // YARN-4648: The starting code for ResourceManager mock is originated from
+ // TestFairScheduler. It should be keep as it was to guarantee no changing
+ // behaviour of ResourceManager preemption.
+ private void startResourceManagerWithRealFairScheduler() {
+scheduler = new FairScheduler();
+conf = new YarnConfiguration();
+conf.setClass(YarnConfiguration.RM_SCHEDULER, FairScheduler.class,
+ResourceScheduler.class);
+conf.setInt(YarnConfiguration.RM_SCHEDULER_MINIMUM_ALLOCATION_MB, 0);
+
conf.setInt(FairSchedulerConfiguration.RM_SCHEDULER_INCREMENT_ALLOCATION_MB,
+1024);
+conf.setInt(YarnConfiguration.RM_SCHEDULER_MAXIMUM_ALLOCATION_MB, 10240);
+conf.setBoolean(FairSchedulerConfiguration.ASSIGN_MULTIPLE, false);
+conf.setFloat(FairSchedulerConfiguration.PREEMPTION_THRESHOLD, 0f);
+conf.setFloat(
+FairSchedulerConfiguration
+.RM_SCHEDULER_RESERVATION_THRESHOLD_INCERMENT_MULTIPLE,
+TEST_RESERVATION_THRESHOLD);
+
+resourceManager = new Moc
hadoop git commit: HDFS-9084. Pagination, sorting and filtering of files/directories in the HDFS Web UI. (Contributed by Ravi Prakash)
Repository: hadoop
Updated Branches:
refs/heads/branch-2.8 cb4f5ebd3 -> 19a08eff6
HDFS-9084. Pagination, sorting and filtering of files/directories in the HDFS
Web UI. (Contributed by Ravi Prakash)
(cherry picked from commit 48c61cd6aa3feae6a4a71d2d1bb6d01a3d50c7b7)
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/19a08eff
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/19a08eff
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/19a08eff
Branch: refs/heads/branch-2.8
Commit: 19a08eff6f62fbb4e97d67bfa4736264709e5ef5
Parents: cb4f5eb
Author: Tsuyoshi Ozawa
Authored: Tue Feb 23 19:30:58 2016 +0900
Committer: Tsuyoshi Ozawa
Committed: Tue Feb 23 19:31:33 2016 +0900
--
hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt | 3 ++
.../src/main/webapps/hdfs/explorer.html | 15
.../src/main/webapps/hdfs/explorer.js | 38
3 files changed, 50 insertions(+), 6 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/hadoop/blob/19a08eff/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 98149b2..1086b8b 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
+++ b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
@@ -924,6 +924,9 @@ Release 2.8.0 - UNRELEASED
HDFS-9764. DistCp doesn't print value for several arguments including
-numListstatusThreads. (Wei-Chiu Chuang via Yongjun Zhang)
+HDFS-9084. Pagination, sorting and filtering of files/directories in the
+HDFS Web UI. (Ravi Prakash via ozawa)
+
OPTIMIZATIONS
HDFS-8026. Trace FSOutputSummer#writeChecksumChunks rather than
http://git-wip-us.apache.org/repos/asf/hadoop/blob/19a08eff/hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/hdfs/explorer.html
--
diff --git
a/hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/hdfs/explorer.html
b/hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/hdfs/explorer.html
index e66e1e7..5106006 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/hdfs/explorer.html
+++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/hdfs/explorer.html
@@ -21,6 +21,7 @@
+
Browsing HDFS
@@ -211,15 +212,15 @@
- <table class="table">
+ <table class="table" id="table-explorer">
<thead>
<tr>
-<th>Permission</th>
+<th title="Permissions">Permission</th>
<th>Owner</th>
<th>Group</th>
<th>Size</th>
-<th>Last Modified</th>
-<th>Replication</th>
+<th title="Last Modified">Last Modified</th>
+<th title="Replication">Replication</th>
<th>Block Size</th>
<th>Name</th>
<th></th>
@@ -235,8 +236,8 @@
</span></td>
<td><span class="explorer-owner-links">{owner}</span></td>
<td><span class="explorer-group-links">{group}</span></td>
-<td>{length|fmt_bytes}</td>
-<td>{#helper_date_tostring value="{modificationTime}"/}</td>
+<td>{length}</td>
+<td>{modificationTime}</td>
<td><span
class="explorer-replication-links">{replication}</span></td>
<td>{blockSize|fmt_bytes}</td>
<td><a inode-type="{type}"
class="explorer-browse-links">{pathSuffix}</a></td>
@@ -263,8 +264,10 @@
</p>
+
+
hadoop git commit: HDFS-9084. Pagination, sorting and filtering of files/directories in the HDFS Web UI. (Contributed by Ravi Prakash)
Repository: hadoop
Updated Branches:
refs/heads/branch-2 544a2ff7c -> 56b82de6e
HDFS-9084. Pagination, sorting and filtering of files/directories in the HDFS
Web UI. (Contributed by Ravi Prakash)
(cherry picked from commit 48c61cd6aa3feae6a4a71d2d1bb6d01a3d50c7b7)
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/56b82de6
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/56b82de6
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/56b82de6
Branch: refs/heads/branch-2
Commit: 56b82de6e13f2221de3b6d3d2d9f8331ae81687a
Parents: 544a2ff
Author: Tsuyoshi Ozawa
Authored: Tue Feb 23 19:30:58 2016 +0900
Committer: Tsuyoshi Ozawa
Committed: Tue Feb 23 19:31:22 2016 +0900
--
hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt | 3 ++
.../src/main/webapps/hdfs/explorer.html | 15
.../src/main/webapps/hdfs/explorer.js | 38
3 files changed, 50 insertions(+), 6 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/hadoop/blob/56b82de6/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 21fcdf7..8da6ed2 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
+++ b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
@@ -1011,6 +1011,9 @@ Release 2.8.0 - UNRELEASED
HDFS-9764. DistCp doesn't print value for several arguments including
-numListstatusThreads. (Wei-Chiu Chuang via Yongjun Zhang)
+HDFS-9084. Pagination, sorting and filtering of files/directories in the
+HDFS Web UI. (Ravi Prakash via ozawa)
+
OPTIMIZATIONS
HDFS-8026. Trace FSOutputSummer#writeChecksumChunks rather than
http://git-wip-us.apache.org/repos/asf/hadoop/blob/56b82de6/hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/hdfs/explorer.html
--
diff --git
a/hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/hdfs/explorer.html
b/hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/hdfs/explorer.html
index e66e1e7..5106006 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/hdfs/explorer.html
+++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/hdfs/explorer.html
@@ -21,6 +21,7 @@
+
Browsing HDFS
@@ -211,15 +212,15 @@
- <table class="table">
+ <table class="table" id="table-explorer">
<thead>
<tr>
-<th>Permission</th>
+<th title="Permissions">Permission</th>
<th>Owner</th>
<th>Group</th>
<th>Size</th>
-<th>Last Modified</th>
-<th>Replication</th>
+<th title="Last Modified">Last Modified</th>
+<th title="Replication">Replication</th>
<th>Block Size</th>
<th>Name</th>
<th></th>
@@ -235,8 +236,8 @@
</span></td>
<td><span class="explorer-owner-links">{owner}</span></td>
<td><span class="explorer-group-links">{group}</span></td>
-<td>{length|fmt_bytes}</td>
-<td>{#helper_date_tostring value="{modificationTime}"/}</td>
+<td>{length}</td>
+<td>{modificationTime}</td>
<td><span
class="explorer-replication-links">{replication}</span></td>
<td>{blockSize|fmt_bytes}</td>
<td><a inode-type="{type}"
class="explorer-browse-links">{pathSuffix}</a></td>
@@ -263,8 +264,10 @@
</p>
+
+
hadoop git commit: HDFS-9084. Pagination, sorting and filtering of files/directories in the HDFS Web UI. (Contributed by Ravi Prakash)
Repository: hadoop
Updated Branches:
refs/heads/trunk de09f4114 -> 48c61cd6a
HDFS-9084. Pagination, sorting and filtering of files/directories in the HDFS
Web UI. (Contributed by Ravi Prakash)
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/48c61cd6
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/48c61cd6
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/48c61cd6
Branch: refs/heads/trunk
Commit: 48c61cd6aa3feae6a4a71d2d1bb6d01a3d50c7b7
Parents: de09f41
Author: Tsuyoshi Ozawa
Authored: Tue Feb 23 19:30:58 2016 +0900
Committer: Tsuyoshi Ozawa
Committed: Tue Feb 23 19:30:58 2016 +0900
--
hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt | 3 ++
.../src/main/webapps/hdfs/explorer.html | 15
.../src/main/webapps/hdfs/explorer.js | 38
3 files changed, 50 insertions(+), 6 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/hadoop/blob/48c61cd6/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 256df39..440b7e8 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
+++ b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
@@ -1951,6 +1951,9 @@ Release 2.8.0 - UNRELEASED
HDFS-9764. DistCp doesn't print value for several arguments including
-numListstatusThreads. (Wei-Chiu Chuang via Yongjun Zhang)
+HDFS-9084. Pagination, sorting and filtering of files/directories in the
+HDFS Web UI. (Ravi Prakash via ozawa)
+
OPTIMIZATIONS
HDFS-8026. Trace FSOutputSummer#writeChecksumChunks rather than
http://git-wip-us.apache.org/repos/asf/hadoop/blob/48c61cd6/hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/hdfs/explorer.html
--
diff --git
a/hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/hdfs/explorer.html
b/hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/hdfs/explorer.html
index e66e1e7..5106006 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/hdfs/explorer.html
+++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/webapps/hdfs/explorer.html
@@ -21,6 +21,7 @@
+
Browsing HDFS
@@ -211,15 +212,15 @@
- <table class="table">
+ <table class="table" id="table-explorer">
<thead>
<tr>
-<th>Permission</th>
+<th title="Permissions">Permission</th>
<th>Owner</th>
<th>Group</th>
<th>Size</th>
-<th>Last Modified</th>
-<th>Replication</th>
+<th title="Last Modified">Last Modified</th>
+<th title="Replication">Replication</th>
<th>Block Size</th>
<th>Name</th>
<th></th>
@@ -235,8 +236,8 @@
</span></td>
<td><span class="explorer-owner-links">{owner}</span></td>
<td><span class="explorer-group-links">{group}</span></td>
-<td>{length|fmt_bytes}</td>
-<td>{#helper_date_tostring value="{modificationTime}"/}</td>
+<td>{length}</td>
+<td>{modificationTime}</td>
<td><span
class="explorer-replication-links">{replication}</span></td>
<td>{blockSize|fmt_bytes}</td>
<td><a inode-type="{type}"
class="explorer-browse-links">{pathSuffix}</a></td>
@@ -263,8 +264,10 @@
</p>
+
+
hadoop git commit: YARN-4708. Missing default mapper type in TimelineServer performance test tool usage. Contributed by Kai Sasaki.
Repository: hadoop
Updated Branches:
refs/heads/trunk d5abd293a -> b68901d7d
YARN-4708. Missing default mapper type in TimelineServer performance test tool
usage. Contributed by Kai Sasaki.
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/b68901d7
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/b68901d7
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/b68901d7
Branch: refs/heads/trunk
Commit: b68901d7dde9cb48545fcf0b94f2ac266b909a5d
Parents: d5abd29
Author: Tsuyoshi Ozawa
Authored: Mon Feb 22 07:49:50 2016 +0900
Committer: Tsuyoshi Ozawa
Committed: Mon Feb 22 07:54:53 2016 +0900
--
.../hadoop/mapreduce/TimelineServicePerformance.java | 2 +-
hadoop-yarn-project/CHANGES.txt| 2 ++
.../src/site/markdown/TimelineServer.md| 13 +++--
3 files changed, 10 insertions(+), 7 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/hadoop/blob/b68901d7/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapreduce/TimelineServicePerformance.java
--
diff --git
a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapreduce/TimelineServicePerformance.java
b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapreduce/TimelineServicePerformance.java
index 9f76659..0753d7f 100644
---
a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapreduce/TimelineServicePerformance.java
+++
b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapreduce/TimelineServicePerformance.java
@@ -48,7 +48,7 @@ public class TimelineServicePerformance extends Configured
implements Tool {
")\n" +
" [-v] timeline service version\n" +
" [-mtype ]\n" +
-" 1. simple entity write mapper\n" +
+" 1. simple entity write mapper (default)\n" +
" 2. jobhistory files replay mapper\n" +
" [-s <(KBs)test>] number of KB per put (mtype=1, default: " +
SimpleEntityWriterV1.KBS_SENT_DEFAULT + " KB)\n" +
http://git-wip-us.apache.org/repos/asf/hadoop/blob/b68901d7/hadoop-yarn-project/CHANGES.txt
--
diff --git a/hadoop-yarn-project/CHANGES.txt b/hadoop-yarn-project/CHANGES.txt
index 9b64204..d6aa4e4 100644
--- a/hadoop-yarn-project/CHANGES.txt
+++ b/hadoop-yarn-project/CHANGES.txt
@@ -135,6 +135,8 @@ Release 2.9.0 - UNRELEASED
YARN-4689. FairScheduler: Cleanup preemptContainer to be more readable.
(Kai Sasaki via kasha)
+YARN-4708. Missing default mapper type in TimelineServer performance test
tool
+usage. (Kai Sasaki via ozawa)
OPTIMIZATIONS
http://git-wip-us.apache.org/repos/asf/hadoop/blob/b68901d7/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-site/src/site/markdown/TimelineServer.md
--
diff --git
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-site/src/site/markdown/TimelineServer.md
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-site/src/site/markdown/TimelineServer.md
index 3e589d3..b10c860 100644
---
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-site/src/site/markdown/TimelineServer.md
+++
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-site/src/site/markdown/TimelineServer.md
@@ -783,8 +783,8 @@ String.
| `entitytype` | string | The entity type |
| `relatedentities` | map | The related entities' identifiers, which are
organized in a map of entityType : [entity1, entity2, ...] |
| `events` | list | The events of the entity |
-| `primaryfilters` | map | The primary filters of the entity, which are
orgainzied in a map of key : [value1, value2, ...] |
-| `otherinfo` | map | The other information of the entity, which is orgainzied
in a map of key : value |
+| `primaryfilters` | map | The primary filters of the entity, which are
organized in a map of key : [value1, value2, ...] |
+| `otherinfo` | map | The other information of the entity, which is organized
in a map of key : value |
| `starttime` | long | The start time of the entity |
### Response Examples:
@@ -2038,7 +2038,7 @@ this failure *will not* result in an HTTP error code
being retured.
A status code of 200 will be returned âhowever, there will be an error code
in the list of failed entities for each entity which could not
hadoop git commit: YARN-4708. Missing default mapper type in TimelineServer performance test tool usage. Contributed by Kai Sasaki.
Repository: hadoop
Updated Branches:
refs/heads/branch-2 7660cfd91 -> 929e869ae
YARN-4708. Missing default mapper type in TimelineServer performance test tool
usage. Contributed by Kai Sasaki.
(cherry picked from commit b68901d7dde9cb48545fcf0b94f2ac266b909a5d)
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/929e869a
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/929e869a
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/929e869a
Branch: refs/heads/branch-2
Commit: 929e869ae09506961f97fd5fcfc82b619cb6cb04
Parents: 7660cfd
Author: Tsuyoshi Ozawa
Authored: Mon Feb 22 07:49:50 2016 +0900
Committer: Tsuyoshi Ozawa
Committed: Mon Feb 22 07:55:35 2016 +0900
--
.../hadoop/mapreduce/TimelineServicePerformance.java | 2 +-
hadoop-yarn-project/CHANGES.txt| 2 ++
.../src/site/markdown/TimelineServer.md| 13 +++--
3 files changed, 10 insertions(+), 7 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/hadoop/blob/929e869a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapreduce/TimelineServicePerformance.java
--
diff --git
a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapreduce/TimelineServicePerformance.java
b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapreduce/TimelineServicePerformance.java
index 9f76659..0753d7f 100644
---
a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapreduce/TimelineServicePerformance.java
+++
b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapreduce/TimelineServicePerformance.java
@@ -48,7 +48,7 @@ public class TimelineServicePerformance extends Configured
implements Tool {
")\n" +
" [-v] timeline service version\n" +
" [-mtype ]\n" +
-" 1. simple entity write mapper\n" +
+" 1. simple entity write mapper (default)\n" +
" 2. jobhistory files replay mapper\n" +
" [-s <(KBs)test>] number of KB per put (mtype=1, default: " +
SimpleEntityWriterV1.KBS_SENT_DEFAULT + " KB)\n" +
http://git-wip-us.apache.org/repos/asf/hadoop/blob/929e869a/hadoop-yarn-project/CHANGES.txt
--
diff --git a/hadoop-yarn-project/CHANGES.txt b/hadoop-yarn-project/CHANGES.txt
index f24ee0b..2ddd7e6 100644
--- a/hadoop-yarn-project/CHANGES.txt
+++ b/hadoop-yarn-project/CHANGES.txt
@@ -76,6 +76,8 @@ Release 2.9.0 - UNRELEASED
YARN-4689. FairScheduler: Cleanup preemptContainer to be more readable.
(Kai Sasaki via kasha)
+YARN-4708. Missing default mapper type in TimelineServer performance test
tool
+usage. (Kai Sasaki via ozawa)
OPTIMIZATIONS
http://git-wip-us.apache.org/repos/asf/hadoop/blob/929e869a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-site/src/site/markdown/TimelineServer.md
--
diff --git
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-site/src/site/markdown/TimelineServer.md
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-site/src/site/markdown/TimelineServer.md
index 3e589d3..b10c860 100644
---
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-site/src/site/markdown/TimelineServer.md
+++
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-site/src/site/markdown/TimelineServer.md
@@ -783,8 +783,8 @@ String.
| `entitytype` | string | The entity type |
| `relatedentities` | map | The related entities' identifiers, which are
organized in a map of entityType : [entity1, entity2, ...] |
| `events` | list | The events of the entity |
-| `primaryfilters` | map | The primary filters of the entity, which are
orgainzied in a map of key : [value1, value2, ...] |
-| `otherinfo` | map | The other information of the entity, which is orgainzied
in a map of key : value |
+| `primaryfilters` | map | The primary filters of the entity, which are
organized in a map of key : [value1, value2, ...] |
+| `otherinfo` | map | The other information of the entity, which is organized
in a map of key : value |
| `starttime` | long | The start time of the entity |
### Response Examples:
@@ -2038,7 +2038,7 @@ this failure *will not* result in an HTTP error code
being retured.
A status code of 200 will be returned âhowever, there will be an error code
in the list
hadoop git commit: MAPREDUCE-6341. addendum patch to fix typos. Contributed by John Michael Luy.
Repository: hadoop Updated Branches: refs/heads/branch-2 2bf5a005f -> a33cdfb87 MAPREDUCE-6341. addendum patch to fix typos. Contributed by John Michael Luy. (cherry picked from commit 453e7e0d1091cf795152c8992c6c5cbc772d80d6) Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/a33cdfb8 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/a33cdfb8 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/a33cdfb8 Branch: refs/heads/branch-2 Commit: a33cdfb8759d2cd6ab003c796cdb5eb5e037575d Parents: 2bf5a00 Author: Tsuyoshi Ozawa Authored: Wed Feb 17 14:13:31 2016 +0900 Committer: Tsuyoshi Ozawa Committed: Wed Feb 17 14:18:04 2016 +0900 -- .../src/site/markdown/MapReduceTutorial.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) -- http://git-wip-us.apache.org/repos/asf/hadoop/blob/a33cdfb8/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/site/markdown/MapReduceTutorial.md -- diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/site/markdown/MapReduceTutorial.md b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/site/markdown/MapReduceTutorial.md index a035e96..8271e7e 100644 --- a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/site/markdown/MapReduceTutorial.md +++ b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/site/markdown/MapReduceTutorial.md @@ -319,7 +319,7 @@ Thus the output of the job is: < Goodbye, 1> < Hadoop, 2> < Hello, 2> -< World, 2>` +< World, 2> The `main` method specifies various facets of the job, such as the input/output paths (passed via the command line), key/value types, input/output formats etc., in the `Job`. It then calls the `job.waitForCompletion` to submit the job and monitor its progress. @@ -765,7 +765,7 @@ RecordWriter implementations write the job outputs to the `FileSystem`. Users submit jobs to Queues. Queues, as collection of jobs, allow the system to provide specific functionality. For example, queues use ACLs to control which users who can submit jobs to them. Queues are expected to be primarily used by Hadoop Schedulers. -Hadoop comes configured with a single mandatory queue, called 'default'. Queue names are defined in the `mapreduce.job.queuename`\> property of the Hadoop site configuration. Some job schedulers, such as the +Hadoop comes configured with a single mandatory queue, called 'default'. Queue names are defined in the `mapreduce.job.queuename` property of the Hadoop site configuration. Some job schedulers, such as the [Capacity Scheduler](../../hadoop-yarn/hadoop-yarn-site/CapacityScheduler.html), support multiple queues. @@ -799,7 +799,7 @@ The files/archives can be distributed by setting the property `mapreduce.job.cac and [Job.setCacheFiles(URI[])](../../api/org/apache/hadoop/mapreduce/Job.html)/ [Job.setCacheArchives(URI[])](../../api/org/apache/hadoop/mapreduce/Job.html) -where URI is of the form `hdfs://host:port/absolute-path\#link-name`. In Streaming, the files can be distributed through command line option `-cacheFile/-cacheArchive`. +where URI is of the form `hdfs://host:port/absolute-path#link-name`. In Streaming, the files can be distributed through command line option `-cacheFile/-cacheArchive`. The `DistributedCache` can also be used as a rudimentary software distribution mechanism for use in the map and/or reduce tasks. It can be used to distribute both jars and native libraries. The [Job.addArchiveToClassPath(Path)](../../api/org/apache/hadoop/mapreduce/Job.html) or
hadoop git commit: MAPREDUCE-6341. addendum patch to fix typos. Contributed by John Michael Luy.
Repository: hadoop Updated Branches: refs/heads/branch-2.8 e88c01fa5 -> 7ccb0e060 MAPREDUCE-6341. addendum patch to fix typos. Contributed by John Michael Luy. (cherry picked from commit 453e7e0d1091cf795152c8992c6c5cbc772d80d6) Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/7ccb0e06 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/7ccb0e06 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/7ccb0e06 Branch: refs/heads/branch-2.8 Commit: 7ccb0e06012f367429bea6f99c8ee57f23391401 Parents: e88c01f Author: Tsuyoshi Ozawa Authored: Wed Feb 17 14:13:31 2016 +0900 Committer: Tsuyoshi Ozawa Committed: Wed Feb 17 14:18:24 2016 +0900 -- .../src/site/markdown/MapReduceTutorial.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) -- http://git-wip-us.apache.org/repos/asf/hadoop/blob/7ccb0e06/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/site/markdown/MapReduceTutorial.md -- diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/site/markdown/MapReduceTutorial.md b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/site/markdown/MapReduceTutorial.md index a035e96..8271e7e 100644 --- a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/site/markdown/MapReduceTutorial.md +++ b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/site/markdown/MapReduceTutorial.md @@ -319,7 +319,7 @@ Thus the output of the job is: < Goodbye, 1> < Hadoop, 2> < Hello, 2> -< World, 2>` +< World, 2> The `main` method specifies various facets of the job, such as the input/output paths (passed via the command line), key/value types, input/output formats etc., in the `Job`. It then calls the `job.waitForCompletion` to submit the job and monitor its progress. @@ -765,7 +765,7 @@ RecordWriter implementations write the job outputs to the `FileSystem`. Users submit jobs to Queues. Queues, as collection of jobs, allow the system to provide specific functionality. For example, queues use ACLs to control which users who can submit jobs to them. Queues are expected to be primarily used by Hadoop Schedulers. -Hadoop comes configured with a single mandatory queue, called 'default'. Queue names are defined in the `mapreduce.job.queuename`\> property of the Hadoop site configuration. Some job schedulers, such as the +Hadoop comes configured with a single mandatory queue, called 'default'. Queue names are defined in the `mapreduce.job.queuename` property of the Hadoop site configuration. Some job schedulers, such as the [Capacity Scheduler](../../hadoop-yarn/hadoop-yarn-site/CapacityScheduler.html), support multiple queues. @@ -799,7 +799,7 @@ The files/archives can be distributed by setting the property `mapreduce.job.cac and [Job.setCacheFiles(URI[])](../../api/org/apache/hadoop/mapreduce/Job.html)/ [Job.setCacheArchives(URI[])](../../api/org/apache/hadoop/mapreduce/Job.html) -where URI is of the form `hdfs://host:port/absolute-path\#link-name`. In Streaming, the files can be distributed through command line option `-cacheFile/-cacheArchive`. +where URI is of the form `hdfs://host:port/absolute-path#link-name`. In Streaming, the files can be distributed through command line option `-cacheFile/-cacheArchive`. The `DistributedCache` can also be used as a rudimentary software distribution mechanism for use in the map and/or reduce tasks. It can be used to distribute both jars and native libraries. The [Job.addArchiveToClassPath(Path)](../../api/org/apache/hadoop/mapreduce/Job.html) or
hadoop git commit: MAPREDUCE-6341. addendum patch to fix typos. Contributed by John Michael Luy.
Repository: hadoop Updated Branches: refs/heads/trunk 2536ece7b -> 453e7e0d1 MAPREDUCE-6341. addendum patch to fix typos. Contributed by John Michael Luy. Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/453e7e0d Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/453e7e0d Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/453e7e0d Branch: refs/heads/trunk Commit: 453e7e0d1091cf795152c8992c6c5cbc772d80d6 Parents: 2536ece Author: Tsuyoshi Ozawa Authored: Wed Feb 17 14:13:31 2016 +0900 Committer: Tsuyoshi Ozawa Committed: Wed Feb 17 14:17:32 2016 +0900 -- .../src/site/markdown/MapReduceTutorial.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) -- http://git-wip-us.apache.org/repos/asf/hadoop/blob/453e7e0d/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/site/markdown/MapReduceTutorial.md -- diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/site/markdown/MapReduceTutorial.md b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/site/markdown/MapReduceTutorial.md index 74c6c66..16f3afb 100644 --- a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/site/markdown/MapReduceTutorial.md +++ b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/site/markdown/MapReduceTutorial.md @@ -319,7 +319,7 @@ Thus the output of the job is: < Goodbye, 1> < Hadoop, 2> < Hello, 2> -< World, 2>` +< World, 2> The `main` method specifies various facets of the job, such as the input/output paths (passed via the command line), key/value types, input/output formats etc., in the `Job`. It then calls the `job.waitForCompletion` to submit the job and monitor its progress. @@ -765,7 +765,7 @@ RecordWriter implementations write the job outputs to the `FileSystem`. Users submit jobs to Queues. Queues, as collection of jobs, allow the system to provide specific functionality. For example, queues use ACLs to control which users who can submit jobs to them. Queues are expected to be primarily used by Hadoop Schedulers. -Hadoop comes configured with a single mandatory queue, called 'default'. Queue names are defined in the `mapreduce.job.queuename`\> property of the Hadoop site configuration. Some job schedulers, such as the +Hadoop comes configured with a single mandatory queue, called 'default'. Queue names are defined in the `mapreduce.job.queuename` property of the Hadoop site configuration. Some job schedulers, such as the [Capacity Scheduler](../../hadoop-yarn/hadoop-yarn-site/CapacityScheduler.html), support multiple queues. @@ -799,7 +799,7 @@ The files/archives can be distributed by setting the property `mapreduce.job.cac and [Job.setCacheFiles(URI[])](../../api/org/apache/hadoop/mapreduce/Job.html)/ [Job.setCacheArchives(URI[])](../../api/org/apache/hadoop/mapreduce/Job.html) -where URI is of the form `hdfs://host:port/absolute-path\#link-name`. In Streaming, the files can be distributed through command line option `-cacheFile/-cacheArchive`. +where URI is of the form `hdfs://host:port/absolute-path#link-name`. In Streaming, the files can be distributed through command line option `-cacheFile/-cacheArchive`. The `DistributedCache` can also be used as a rudimentary software distribution mechanism for use in the map and/or reduce tasks. It can be used to distribute both jars and native libraries. The [Job.addArchiveToClassPath(Path)](../../api/org/apache/hadoop/mapreduce/Job.html) or
svn commit: r1728414 - in /hadoop/common/site/main: author/src/documentation/content/xdocs/ publish/
Author: ozawa
Date: Thu Feb 4 07:44:52 2016
New Revision: 1728414
URL: http://svn.apache.org/viewvc?rev=1728414&view=rev
Log:
add ozawa to PMC list
Modified:
hadoop/common/site/main/author/src/documentation/content/xdocs/who.xml
hadoop/common/site/main/publish/bylaws.pdf
hadoop/common/site/main/publish/index.pdf
hadoop/common/site/main/publish/issue_tracking.pdf
hadoop/common/site/main/publish/linkmap.pdf
hadoop/common/site/main/publish/mailing_lists.pdf
hadoop/common/site/main/publish/privacy_policy.pdf
hadoop/common/site/main/publish/releases.pdf
hadoop/common/site/main/publish/version_control.pdf
hadoop/common/site/main/publish/who.html
hadoop/common/site/main/publish/who.pdf
Modified: hadoop/common/site/main/author/src/documentation/content/xdocs/who.xml
URL:
http://svn.apache.org/viewvc/hadoop/common/site/main/author/src/documentation/content/xdocs/who.xml?rev=1728414&r1=1728413&r2=1728414&view=diff
==
--- hadoop/common/site/main/author/src/documentation/content/xdocs/who.xml
(original)
+++ hadoop/common/site/main/author/src/documentation/content/xdocs/who.xml Thu
Feb 4 07:44:52 2016
@@ -312,6 +312,14 @@
+ ozawa
+ http://people.apache.org/~ozawa";>Tsuyoshi Ozawa
+ NTT
+
+ +9
+
+
+
phunt
http://people.apache.org/~phunt";>Patrick Hunt
Cloudera
Modified: hadoop/common/site/main/publish/bylaws.pdf
URL:
http://svn.apache.org/viewvc/hadoop/common/site/main/publish/bylaws.pdf?rev=1728414&r1=1728413&r2=1728414&view=diff
==
Binary files - no diff available.
Modified: hadoop/common/site/main/publish/index.pdf
URL:
http://svn.apache.org/viewvc/hadoop/common/site/main/publish/index.pdf?rev=1728414&r1=1728413&r2=1728414&view=diff
==
Binary files - no diff available.
Modified: hadoop/common/site/main/publish/issue_tracking.pdf
URL:
http://svn.apache.org/viewvc/hadoop/common/site/main/publish/issue_tracking.pdf?rev=1728414&r1=1728413&r2=1728414&view=diff
==
Binary files - no diff available.
Modified: hadoop/common/site/main/publish/linkmap.pdf
URL:
http://svn.apache.org/viewvc/hadoop/common/site/main/publish/linkmap.pdf?rev=1728414&r1=1728413&r2=1728414&view=diff
==
Binary files - no diff available.
Modified: hadoop/common/site/main/publish/mailing_lists.pdf
URL:
http://svn.apache.org/viewvc/hadoop/common/site/main/publish/mailing_lists.pdf?rev=1728414&r1=1728413&r2=1728414&view=diff
==
Binary files - no diff available.
Modified: hadoop/common/site/main/publish/privacy_policy.pdf
URL:
http://svn.apache.org/viewvc/hadoop/common/site/main/publish/privacy_policy.pdf?rev=1728414&r1=1728413&r2=1728414&view=diff
==
Binary files - no diff available.
Modified: hadoop/common/site/main/publish/releases.pdf
URL:
http://svn.apache.org/viewvc/hadoop/common/site/main/publish/releases.pdf?rev=1728414&r1=1728413&r2=1728414&view=diff
==
Binary files - no diff available.
Modified: hadoop/common/site/main/publish/version_control.pdf
URL:
http://svn.apache.org/viewvc/hadoop/common/site/main/publish/version_control.pdf?rev=1728414&r1=1728413&r2=1728414&view=diff
==
Binary files - no diff available.
Modified: hadoop/common/site/main/publish/who.html
URL:
http://svn.apache.org/viewvc/hadoop/common/site/main/publish/who.html?rev=1728414&r1=1728413&r2=1728414&view=diff
==
--- hadoop/common/site/main/publish/who.html (original)
+++ hadoop/common/site/main/publish/who.html Thu Feb 4 07:44:52 2016
@@ -658,6 +658,17 @@ document.write("Last Published: " + docu
+ozawa
+ http://people.apache.org/~ozawa";>Tsuyoshi Ozawa
+ NTT
+
+ +9
+
+
+
+
+
+
phunt
http://people.apache.org/~phunt";>Patrick Hunt
Cloudera
@@ -935,7 +946,7 @@ document.write("Last Published: " + docu
-
+
Emeritus Hadoop PMC Members
@@ -950,7 +961,7 @@ document.write("Last Published: " + docu
-
+
Hadoop Committers
Hadoop's active committers include:
@@
hadoop git commit: YARN-4234. addendum patch to remove unnecessary file. Contributed by Masatake Iwasaki.
Repository: hadoop
Updated Branches:
refs/heads/trunk a308e8662 -> 65537845a
YARN-4234. addendum patch to remove unnecessary file. Contributed by Masatake
Iwasaki.
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/65537845
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/65537845
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/65537845
Branch: refs/heads/trunk
Commit: 65537845a9799c6a73eecccb4cd437def58459d8
Parents: a308e86
Author: Tsuyoshi Ozawa
Authored: Thu Dec 24 18:21:49 2015 +0900
Committer: Tsuyoshi Ozawa
Committed: Thu Dec 24 18:22:43 2015 +0900
--
q | 222 -
1 file changed, 222 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/hadoop/blob/65537845/q
--
diff --git a/q b/q
deleted file mode 100644
index 15ece5a..000
--- a/q
+++ /dev/null
@@ -1,222 +0,0 @@
-
- SSUUMMMMAARRYY OOFF LLEESSSS
CCOOMMMMAANNDDSS
-
- Commands marked with * may be preceded by a number, _N.
- Notes in parentheses indicate the behavior if _N is given.
-
- h H Display this help.
- q :q Q :Q ZZ Exit.
- ---
-
- MMOOVVIINNGG
-
- e ^E j ^N CR * Forward one line (or _N lines).
- y ^Y k ^K ^P * Backward one line (or _N lines).
- f ^F ^V SPACE * Forward one window (or _N lines).
- b ^B ESC-v * Backward one window (or _N lines).
- z * Forward one window (and set window to _N).
- w * Backward one window (and set window to _N).
- ESC-SPACE * Forward one window, but don't stop at end-of-file.
- d ^D * Forward one half-window (and set half-window to _N).
- u ^U * Backward one half-window (and set half-window to _N).
- ESC-) RightArrow * Left one half screen width (or _N positions).
- ESC-( LeftArrow * Right one half screen width (or _N positions).
- FForward forever; like "tail -f".
- r ^R ^LRepaint screen.
- RRepaint screen, discarding buffered input.
----
-Default "window" is the screen height.
-Default "half-window" is half of the screen height.
- ---
-
- SSEEAARRCCHHIINNGG
-
- /_p_a_t_t_e_r_n * Search forward for (_N-th) matching line.
- ?_p_a_t_t_e_r_n * Search backward for (_N-th) matching
line.
- n * Repeat previous search (for _N-th occurrence).
- N * Repeat previous search in reverse direction.
- ESC-n * Repeat previous search, spanning files.
- ESC-N * Repeat previous search, reverse dir. & spanning files.
- ESC-uUndo (toggle) search highlighting.
- &_p_a_t_t_e_r_n * Display only matching lines
----
-Search patterns may be modified by one or more of:
-^N or ! Search for NON-matching lines.
-^E or * Search multiple files (pass thru END OF FILE).
-^F or @ Start search at FIRST file (for /) or last file (for ?).
-^K Highlight matches, but don't move (KEEP position).
-^R Don't use REGULAR EXPRESSIONS.
- ---
-
- JJUUMMPPIINNGG
-
- g < ESC-< * Go to first line in file (or line _N).
- G > ESC-> * Go to last line in file (or line _N).
- p % * Go to beginning of file (or _N percent into file).
- t * Go to the (_N-th) next tag.
- T * Go to the (_N-th) previous tag.
- { ( [ * Find close bracket } ) ].
- } ) ] * Find open bracket { ( [.
- ESC-^F _<_c_1_> _<_c_2_> * Find close bracket _<_c_2_>.
- ESC-^B _<_c_1_> _<_c_2_> * Find open bracket _<_c_1_>
----
-Each "find close bracket" command goes forward to the close bracket
- matching the (_N-th) open bracket in the top line.
-Each "find open bracket" command goes backward to the open bracket
- matching the (_N-th) close bracket in the bottom line.
-
- m_<_l_e_t_t_
hadoop git commit: YARN-4348. ZKRMStateStore.syncInternal shouldn't wait for sync completion for avoiding blocking ZK's event thread. (ozawa)
Repository: hadoop
Updated Branches:
refs/heads/branch-2.6.3 25eacdc71 -> 921f56306
YARN-4348. ZKRMStateStore.syncInternal shouldn't wait for sync completion for
avoiding blocking ZK's event thread. (ozawa)
(cherry picked from commit 0460b8a8a3de232f236f49ef6769d38cda62cc28)
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/921f5630
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/921f5630
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/921f5630
Branch: refs/heads/branch-2.6.3
Commit: 921f56306b8d46e9d2c0708f098f568f52464325
Parents: 25eacdc
Author: Tsuyoshi Ozawa
Authored: Tue Dec 8 13:31:23 2015 +0900
Committer: Tsuyoshi Ozawa
Committed: Wed Dec 9 00:13:10 2015 +0900
--
hadoop-yarn-project/CHANGES.txt | 3 ++
.../recovery/ZKRMStateStore.java| 42 +++-
2 files changed, 18 insertions(+), 27 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/hadoop/blob/921f5630/hadoop-yarn-project/CHANGES.txt
--
diff --git a/hadoop-yarn-project/CHANGES.txt b/hadoop-yarn-project/CHANGES.txt
index de2eb86..e61a7f2 100644
--- a/hadoop-yarn-project/CHANGES.txt
+++ b/hadoop-yarn-project/CHANGES.txt
@@ -51,6 +51,9 @@ Release 2.6.3 - UNRELEASED
YARN-4365. FileSystemNodeLabelStore should check for root dir existence on
startup (Kuhu Shukla via jlowe)
+YARN-4348. ZKRMStateStore.syncInternal shouldn't wait for sync completion
for
+avoiding blocking ZK's event thread. (ozawa)
+
Release 2.6.2 - 2015-10-28
INCOMPATIBLE CHANGES
http://git-wip-us.apache.org/repos/asf/hadoop/blob/921f5630/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/recovery/ZKRMStateStore.java
--
diff --git
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/recovery/ZKRMStateStore.java
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/recovery/ZKRMStateStore.java
index 0475a68..a8acab8 100644
---
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/recovery/ZKRMStateStore.java
+++
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/recovery/ZKRMStateStore.java
@@ -114,12 +114,10 @@ public class ZKRMStateStore extends RMStateStore {
private List zkAuths;
class ZKSyncOperationCallback implements AsyncCallback.VoidCallback {
-public final CountDownLatch latch = new CountDownLatch(1);
@Override
public void processResult(int rc, String path, Object ctx){
if (rc == Code.OK.intValue()) {
LOG.info("ZooKeeper sync operation succeeded. path: " + path);
-latch.countDown();
} else {
LOG.fatal("ZooKeeper sync operation failed. Waiting for session " +
"timeout. path: " + path);
@@ -959,16 +957,20 @@ public class ZKRMStateStore extends RMStateStore {
* @return true if ZK.sync() succeededs, false if ZK.sync() fails.
* @throws InterruptedException
*/
- private boolean syncInternal(String path) throws InterruptedException {
-ZKSyncOperationCallback cb = new ZKSyncOperationCallback();
-if (path != null) {
- zkClient.sync(path, cb, null);
-} else {
- zkClient.sync(zkRootNodePath, cb, null);
+ private void syncInternal(final String path) throws InterruptedException {
+final ZKSyncOperationCallback cb = new ZKSyncOperationCallback();
+final String pathForSync = (path != null) ? path : zkRootNodePath;
+try {
+ new ZKAction() {
+@Override
+Void run() throws KeeperException, InterruptedException {
+ zkClient.sync(pathForSync, cb, null);
+ return null;
+}
+ }.runWithRetries();
+} catch (Exception e) {
+ LOG.fatal("sync failed.");
}
-boolean succeededToSync = cb.latch.await(
-zkSessionTimeout, TimeUnit.MILLISECONDS);
-return succeededToSync;
}
/**
@@ -1181,22 +1183,8 @@ public class ZKRMStateStore extends RMStateStore {
"Retry no. " + retry);
Thread.sleep(zkRetryInterval);
createConnection();
-boolean succeededToSync = false;
-try {
- succeededToSync = syncInternal(ke.getPath());
-} catch (Inter
hadoop git commit: YARN-4348. ZKRMStateStore.syncInternal shouldn't wait for sync completion for avoiding blocking ZK's event thread. (ozawa)
Repository: hadoop
Updated Branches:
refs/heads/branch-2.6 203c7a648 -> b345ffd7d
YARN-4348. ZKRMStateStore.syncInternal shouldn't wait for sync completion for
avoiding blocking ZK's event thread. (ozawa)
(cherry picked from commit 0460b8a8a3de232f236f49ef6769d38cda62cc28)
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/b345ffd7
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/b345ffd7
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/b345ffd7
Branch: refs/heads/branch-2.6
Commit: b345ffd7dfc461ee5fdd669f57d9b7b1d75cb5b2
Parents: 203c7a6
Author: Tsuyoshi Ozawa
Authored: Tue Dec 8 13:31:23 2015 +0900
Committer: Tsuyoshi Ozawa
Committed: Tue Dec 8 13:41:17 2015 +0900
--
hadoop-yarn-project/CHANGES.txt | 3 ++
.../recovery/ZKRMStateStore.java| 42 +++-
2 files changed, 18 insertions(+), 27 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/hadoop/blob/b345ffd7/hadoop-yarn-project/CHANGES.txt
--
diff --git a/hadoop-yarn-project/CHANGES.txt b/hadoop-yarn-project/CHANGES.txt
index de2eb86..e61a7f2 100644
--- a/hadoop-yarn-project/CHANGES.txt
+++ b/hadoop-yarn-project/CHANGES.txt
@@ -51,6 +51,9 @@ Release 2.6.3 - UNRELEASED
YARN-4365. FileSystemNodeLabelStore should check for root dir existence on
startup (Kuhu Shukla via jlowe)
+YARN-4348. ZKRMStateStore.syncInternal shouldn't wait for sync completion
for
+avoiding blocking ZK's event thread. (ozawa)
+
Release 2.6.2 - 2015-10-28
INCOMPATIBLE CHANGES
http://git-wip-us.apache.org/repos/asf/hadoop/blob/b345ffd7/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/recovery/ZKRMStateStore.java
--
diff --git
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/recovery/ZKRMStateStore.java
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/recovery/ZKRMStateStore.java
index 0475a68..a8acab8 100644
---
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/recovery/ZKRMStateStore.java
+++
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/recovery/ZKRMStateStore.java
@@ -114,12 +114,10 @@ public class ZKRMStateStore extends RMStateStore {
private List zkAuths;
class ZKSyncOperationCallback implements AsyncCallback.VoidCallback {
-public final CountDownLatch latch = new CountDownLatch(1);
@Override
public void processResult(int rc, String path, Object ctx){
if (rc == Code.OK.intValue()) {
LOG.info("ZooKeeper sync operation succeeded. path: " + path);
-latch.countDown();
} else {
LOG.fatal("ZooKeeper sync operation failed. Waiting for session " +
"timeout. path: " + path);
@@ -959,16 +957,20 @@ public class ZKRMStateStore extends RMStateStore {
* @return true if ZK.sync() succeededs, false if ZK.sync() fails.
* @throws InterruptedException
*/
- private boolean syncInternal(String path) throws InterruptedException {
-ZKSyncOperationCallback cb = new ZKSyncOperationCallback();
-if (path != null) {
- zkClient.sync(path, cb, null);
-} else {
- zkClient.sync(zkRootNodePath, cb, null);
+ private void syncInternal(final String path) throws InterruptedException {
+final ZKSyncOperationCallback cb = new ZKSyncOperationCallback();
+final String pathForSync = (path != null) ? path : zkRootNodePath;
+try {
+ new ZKAction() {
+@Override
+Void run() throws KeeperException, InterruptedException {
+ zkClient.sync(pathForSync, cb, null);
+ return null;
+}
+ }.runWithRetries();
+} catch (Exception e) {
+ LOG.fatal("sync failed.");
}
-boolean succeededToSync = cb.latch.await(
-zkSessionTimeout, TimeUnit.MILLISECONDS);
-return succeededToSync;
}
/**
@@ -1181,22 +1183,8 @@ public class ZKRMStateStore extends RMStateStore {
"Retry no. " + retry);
Thread.sleep(zkRetryInterval);
createConnection();
-boolean succeededToSync = false;
-try {
- succeededToSync = syncInternal(ke.getPath());
-} catch (Inter
hadoop git commit: Update CHANGES.txt for commit of YARN-4348 to branch-2.7 and branch-2.6.
Repository: hadoop Updated Branches: refs/heads/trunk fc470840a -> d7b3f8dbe Update CHANGES.txt for commit of YARN-4348 to branch-2.7 and branch-2.6. Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/d7b3f8db Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/d7b3f8db Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/d7b3f8db Branch: refs/heads/trunk Commit: d7b3f8dbe818cff5fee4f4c0c70d306776aa318e Parents: fc47084 Author: Tsuyoshi Ozawa Authored: Wed Dec 9 00:03:20 2015 +0900 Committer: Tsuyoshi Ozawa Committed: Wed Dec 9 00:03:20 2015 +0900 -- hadoop-yarn-project/CHANGES.txt | 3 +++ 1 file changed, 3 insertions(+) -- http://git-wip-us.apache.org/repos/asf/hadoop/blob/d7b3f8db/hadoop-yarn-project/CHANGES.txt -- diff --git a/hadoop-yarn-project/CHANGES.txt b/hadoop-yarn-project/CHANGES.txt index 3ba94b4..dcd9ec5 100644 --- a/hadoop-yarn-project/CHANGES.txt +++ b/hadoop-yarn-project/CHANGES.txt @@ -2029,6 +2029,9 @@ Release 2.6.3 - UNRELEASED YARN-4365. FileSystemNodeLabelStore should check for root dir existence on startup (Kuhu Shukla via jlowe) +YARN-4348. ZKRMStateStore.syncInternal shouldn't wait for sync completion for +avoiding blocking ZK's event thread. (ozawa) + Release 2.6.2 - 2015-10-28 INCOMPATIBLE CHANGES
hadoop git commit: YARN-4348. ZKRMStateStore.syncInternal shouldn't wait for sync completion for avoiding blocking ZK's event thread. (ozawa)
Repository: hadoop
Updated Branches:
refs/heads/branch-2.7 ba02e8f6d -> 0460b8a8a
YARN-4348. ZKRMStateStore.syncInternal shouldn't wait for sync completion for
avoiding blocking ZK's event thread. (ozawa)
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/0460b8a8
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/0460b8a8
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/0460b8a8
Branch: refs/heads/branch-2.7
Commit: 0460b8a8a3de232f236f49ef6769d38cda62cc28
Parents: ba02e8f
Author: Tsuyoshi Ozawa
Authored: Tue Dec 8 13:31:23 2015 +0900
Committer: Tsuyoshi Ozawa
Committed: Tue Dec 8 13:33:10 2015 +0900
--
hadoop-yarn-project/CHANGES.txt | 3 ++
.../recovery/ZKRMStateStore.java| 42 +++-
2 files changed, 18 insertions(+), 27 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/hadoop/blob/0460b8a8/hadoop-yarn-project/CHANGES.txt
--
diff --git a/hadoop-yarn-project/CHANGES.txt b/hadoop-yarn-project/CHANGES.txt
index 6171594..dd29f48 100644
--- a/hadoop-yarn-project/CHANGES.txt
+++ b/hadoop-yarn-project/CHANGES.txt
@@ -935,6 +935,9 @@ Release 2.6.3 - UNRELEASED
YARN-4365. FileSystemNodeLabelStore should check for root dir existence on
startup (Kuhu Shukla via jlowe)
+YARN-4348. ZKRMStateStore.syncInternal shouldn't wait for sync completion
for
+avoiding blocking ZK's event thread. (ozawa)
+
Release 2.6.2 - 2015-10-28
INCOMPATIBLE CHANGES
http://git-wip-us.apache.org/repos/asf/hadoop/blob/0460b8a8/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/recovery/ZKRMStateStore.java
--
diff --git
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/recovery/ZKRMStateStore.java
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/recovery/ZKRMStateStore.java
index f12ada7..70ccd8c 100644
---
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/recovery/ZKRMStateStore.java
+++
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/recovery/ZKRMStateStore.java
@@ -116,12 +116,10 @@ public class ZKRMStateStore extends RMStateStore {
private List zkAuths;
class ZKSyncOperationCallback implements AsyncCallback.VoidCallback {
-public final CountDownLatch latch = new CountDownLatch(1);
@Override
public void processResult(int rc, String path, Object ctx){
if (rc == Code.OK.intValue()) {
LOG.info("ZooKeeper sync operation succeeded. path: " + path);
-latch.countDown();
} else {
LOG.fatal("ZooKeeper sync operation failed. Waiting for session " +
"timeout. path: " + path);
@@ -945,16 +943,20 @@ public class ZKRMStateStore extends RMStateStore {
* @return true if ZK.sync() succeededs, false if ZK.sync() fails.
* @throws InterruptedException
*/
- private boolean syncInternal(String path) throws InterruptedException {
-ZKSyncOperationCallback cb = new ZKSyncOperationCallback();
-if (path != null) {
- zkClient.sync(path, cb, null);
-} else {
- zkClient.sync(zkRootNodePath, cb, null);
+ private void syncInternal(final String path) throws InterruptedException {
+final ZKSyncOperationCallback cb = new ZKSyncOperationCallback();
+final String pathForSync = (path != null) ? path : zkRootNodePath;
+try {
+ new ZKAction() {
+@Override
+Void run() throws KeeperException, InterruptedException {
+ zkClient.sync(pathForSync, cb, null);
+ return null;
+}
+ }.runWithRetries();
+} catch (Exception e) {
+ LOG.fatal("sync failed.");
}
-boolean succeededToSync = cb.latch.await(
-zkSessionTimeout, TimeUnit.MILLISECONDS);
-return succeededToSync;
}
/**
@@ -1211,22 +1213,8 @@ public class ZKRMStateStore extends RMStateStore {
"Retry no. " + retry);
Thread.sleep(zkRetryInterval);
createConnection();
-boolean succeededToSync = false;
-try {
- succeededToSync = syncInternal(ke.getPath());
-} catch (InterruptedException ie) {
- LOG.info("Interrupted
hadoop git commit: YARN-4380. TestResourceLocalizationService.testDownloadingResourcesOnContainerKill fails intermittently. Contributed by Varun Saxena.
Repository: hadoop
Updated Branches:
refs/heads/branch-2.7 b68f527b9 -> f50f889c1
YARN-4380.
TestResourceLocalizationService.testDownloadingResourcesOnContainerKill fails
intermittently. Contributed by Varun Saxena.
(cherry picked from commit 0656d2dc83af6a48a8d8d0e37cdf1f813124f366)
Conflicts:
hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/localizer/TestResourceLocalizationService.java
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/f50f889c
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/f50f889c
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/f50f889c
Branch: refs/heads/branch-2.7
Commit: f50f889c1789b08765eeb9b86a92891dcd54c6ff
Parents: b68f527
Author: Tsuyoshi Ozawa
Authored: Thu Nov 26 01:10:02 2015 +0900
Committer: Tsuyoshi Ozawa
Committed: Thu Nov 26 01:22:11 2015 +0900
--
hadoop-yarn-project/CHANGES.txt | 3 +++
.../TestResourceLocalizationService.java | 18 +-
2 files changed, 20 insertions(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/hadoop/blob/f50f889c/hadoop-yarn-project/CHANGES.txt
--
diff --git a/hadoop-yarn-project/CHANGES.txt b/hadoop-yarn-project/CHANGES.txt
index a2e9798..84037d2 100644
--- a/hadoop-yarn-project/CHANGES.txt
+++ b/hadoop-yarn-project/CHANGES.txt
@@ -34,6 +34,9 @@ Release 2.7.3 - UNRELEASED
YARN-4365. FileSystemNodeLabelStore should check for root dir existence on
startup (Kuhu Shukla via jlowe)
+YARN-4380.
TestResourceLocalizationService.testDownloadingResourcesOnContainerKill
+fails intermittently. (Varun Saxena via ozawa)
+
Release 2.7.2 - UNRELEASED
INCOMPATIBLE CHANGES
http://git-wip-us.apache.org/repos/asf/hadoop/blob/f50f889c/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/localizer/TestResourceLocalizationService.java
--
diff --git
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/localizer/TestResourceLocalizationService.java
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/localizer/TestResourceLocalizationService.java
index cfed5cd..ca0c29f 100644
---
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/localizer/TestResourceLocalizationService.java
+++
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/localizer/TestResourceLocalizationService.java
@@ -63,6 +63,7 @@ import java.util.Set;
import java.util.concurrent.BrokenBarrierException;
import java.util.concurrent.CyclicBarrier;
import java.util.concurrent.Future;
+import java.util.concurrent.atomic.AtomicInteger;
import org.apache.hadoop.fs.Options;
import org.junit.Assert;
@@ -1091,16 +1092,23 @@ public class TestResourceLocalizationService {
private static class DummyExecutor extends DefaultContainerExecutor {
private volatile boolean stopLocalization = false;
+private AtomicInteger numLocalizers = new AtomicInteger(0);
@Override
public void startLocalizer(Path nmPrivateContainerTokensPath,
InetSocketAddress nmAddr, String user, String appId, String locId,
LocalDirsHandlerService dirsHandler) throws IOException,
InterruptedException {
+ numLocalizers.incrementAndGet();
while (!stopLocalization) {
Thread.yield();
}
}
-void setStopLocalization() {
+private void waitForLocalizers(int num) {
+ while (numLocalizers.intValue() < num) {
+Thread.yield();
+ }
+}
+private void setStopLocalization() {
stopLocalization = true;
}
}
@@ -1243,6 +1251,10 @@ public class TestResourceLocalizationService {
spyService.handle(new ContainerLocalizationRequestEvent(c2, rsrcs1));
dispatcher.await();
+ // Wait for localizers of both container c1 and c2 to begin.
+ exec.waitForLocalizers(2);
+ LocalizerRunner locC1 =
+ spyService.getLocalizerRunner(c1.getContainerId().toString());
final String containerIdStr = c1.getContainerId().toString();
// Heartbeats from container localizer
LocalResourceStatus rsrc1success
hadoop git commit: YARN-4380. TestResourceLocalizationService.testDownloadingResourcesOnContainerKill fails intermittently. Contributed by Varun Saxena.
Repository: hadoop
Updated Branches:
refs/heads/branch-2 5794dc83b -> d76b523b0
YARN-4380.
TestResourceLocalizationService.testDownloadingResourcesOnContainerKill fails
intermittently. Contributed by Varun Saxena.
(cherry picked from commit 0656d2dc83af6a48a8d8d0e37cdf1f813124f366)
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/d76b523b
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/d76b523b
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/d76b523b
Branch: refs/heads/branch-2
Commit: d76b523b020fcd76e9abdd661967ca4a931d9863
Parents: 5794dc8
Author: Tsuyoshi Ozawa
Authored: Thu Nov 26 01:10:02 2015 +0900
Committer: Tsuyoshi Ozawa
Committed: Thu Nov 26 01:10:41 2015 +0900
--
hadoop-yarn-project/CHANGES.txt | 3 +++
.../TestResourceLocalizationService.java | 18 +-
2 files changed, 20 insertions(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/hadoop/blob/d76b523b/hadoop-yarn-project/CHANGES.txt
--
diff --git a/hadoop-yarn-project/CHANGES.txt b/hadoop-yarn-project/CHANGES.txt
index feef3a3..ac03f82 100644
--- a/hadoop-yarn-project/CHANGES.txt
+++ b/hadoop-yarn-project/CHANGES.txt
@@ -1054,6 +1054,9 @@ Release 2.7.3 - UNRELEASED
YARN-4365. FileSystemNodeLabelStore should check for root dir existence on
startup (Kuhu Shukla via jlowe)
+YARN-4380.
TestResourceLocalizationService.testDownloadingResourcesOnContainerKill
+fails intermittently. (Varun Saxena via ozawa)
+
Release 2.7.2 - UNRELEASED
INCOMPATIBLE CHANGES
http://git-wip-us.apache.org/repos/asf/hadoop/blob/d76b523b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/localizer/TestResourceLocalizationService.java
--
diff --git
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/localizer/TestResourceLocalizationService.java
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/localizer/TestResourceLocalizationService.java
index c14ec7f..64d3d68 100644
---
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/localizer/TestResourceLocalizationService.java
+++
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/localizer/TestResourceLocalizationService.java
@@ -63,6 +63,7 @@ import java.util.Set;
import java.util.concurrent.BrokenBarrierException;
import java.util.concurrent.CyclicBarrier;
import java.util.concurrent.Future;
+import java.util.concurrent.atomic.AtomicInteger;
import org.apache.hadoop.fs.Options;
import
org.apache.hadoop.yarn.server.nodemanager.executor.LocalizerStartContext;
@@ -1101,14 +1102,21 @@ public class TestResourceLocalizationService {
private static class DummyExecutor extends DefaultContainerExecutor {
private volatile boolean stopLocalization = false;
+private AtomicInteger numLocalizers = new AtomicInteger(0);
@Override
public void startLocalizer(LocalizerStartContext ctx)
throws IOException, InterruptedException {
+ numLocalizers.incrementAndGet();
while (!stopLocalization) {
Thread.yield();
}
}
-void setStopLocalization() {
+private void waitForLocalizers(int num) {
+ while (numLocalizers.intValue() < num) {
+Thread.yield();
+ }
+}
+private void setStopLocalization() {
stopLocalization = true;
}
}
@@ -1251,6 +1259,10 @@ public class TestResourceLocalizationService {
spyService.handle(new ContainerLocalizationRequestEvent(c2, rsrcs1));
dispatcher.await();
+ // Wait for localizers of both container c1 and c2 to begin.
+ exec.waitForLocalizers(2);
+ LocalizerRunner locC1 =
+ spyService.getLocalizerRunner(c1.getContainerId().toString());
final String containerIdStr = c1.getContainerId().toString();
// Heartbeats from container localizer
LocalResourceStatus rsrc1success = mock(LocalResourceStatus.class);
@@ -1318,6 +1330,10 @@ public class TestResourceLocalizationService {
Set paths =
Sets.newHashSet(new Path(locPath1), new Path(locPath1 + "_tmp"),
new Path(locPath2), new Path(locPath2 + "_tmp"));
+ // Wait for l
hadoop git commit: YARN-4380. TestResourceLocalizationService.testDownloadingResourcesOnContainerKill fails intermittently. Contributed by Varun Saxena.
Repository: hadoop
Updated Branches:
refs/heads/trunk 3e85542a7 -> 0656d2dc8
YARN-4380.
TestResourceLocalizationService.testDownloadingResourcesOnContainerKill fails
intermittently. Contributed by Varun Saxena.
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/0656d2dc
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/0656d2dc
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/0656d2dc
Branch: refs/heads/trunk
Commit: 0656d2dc83af6a48a8d8d0e37cdf1f813124f366
Parents: 3e85542
Author: Tsuyoshi Ozawa
Authored: Thu Nov 26 01:10:02 2015 +0900
Committer: Tsuyoshi Ozawa
Committed: Thu Nov 26 01:10:02 2015 +0900
--
hadoop-yarn-project/CHANGES.txt | 3 +++
.../TestResourceLocalizationService.java | 18 +-
2 files changed, 20 insertions(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/hadoop/blob/0656d2dc/hadoop-yarn-project/CHANGES.txt
--
diff --git a/hadoop-yarn-project/CHANGES.txt b/hadoop-yarn-project/CHANGES.txt
index e036335..d0b31dd 100644
--- a/hadoop-yarn-project/CHANGES.txt
+++ b/hadoop-yarn-project/CHANGES.txt
@@ -1106,6 +1106,9 @@ Release 2.7.3 - UNRELEASED
YARN-4365. FileSystemNodeLabelStore should check for root dir existence on
startup (Kuhu Shukla via jlowe)
+YARN-4380.
TestResourceLocalizationService.testDownloadingResourcesOnContainerKill
+fails intermittently. (Varun Saxena via ozawa)
+
Release 2.7.2 - UNRELEASED
INCOMPATIBLE CHANGES
http://git-wip-us.apache.org/repos/asf/hadoop/blob/0656d2dc/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/localizer/TestResourceLocalizationService.java
--
diff --git
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/localizer/TestResourceLocalizationService.java
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/localizer/TestResourceLocalizationService.java
index c14ec7f..64d3d68 100644
---
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/localizer/TestResourceLocalizationService.java
+++
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/localizer/TestResourceLocalizationService.java
@@ -63,6 +63,7 @@ import java.util.Set;
import java.util.concurrent.BrokenBarrierException;
import java.util.concurrent.CyclicBarrier;
import java.util.concurrent.Future;
+import java.util.concurrent.atomic.AtomicInteger;
import org.apache.hadoop.fs.Options;
import
org.apache.hadoop.yarn.server.nodemanager.executor.LocalizerStartContext;
@@ -1101,14 +1102,21 @@ public class TestResourceLocalizationService {
private static class DummyExecutor extends DefaultContainerExecutor {
private volatile boolean stopLocalization = false;
+private AtomicInteger numLocalizers = new AtomicInteger(0);
@Override
public void startLocalizer(LocalizerStartContext ctx)
throws IOException, InterruptedException {
+ numLocalizers.incrementAndGet();
while (!stopLocalization) {
Thread.yield();
}
}
-void setStopLocalization() {
+private void waitForLocalizers(int num) {
+ while (numLocalizers.intValue() < num) {
+Thread.yield();
+ }
+}
+private void setStopLocalization() {
stopLocalization = true;
}
}
@@ -1251,6 +1259,10 @@ public class TestResourceLocalizationService {
spyService.handle(new ContainerLocalizationRequestEvent(c2, rsrcs1));
dispatcher.await();
+ // Wait for localizers of both container c1 and c2 to begin.
+ exec.waitForLocalizers(2);
+ LocalizerRunner locC1 =
+ spyService.getLocalizerRunner(c1.getContainerId().toString());
final String containerIdStr = c1.getContainerId().toString();
// Heartbeats from container localizer
LocalResourceStatus rsrc1success = mock(LocalResourceStatus.class);
@@ -1318,6 +1330,10 @@ public class TestResourceLocalizationService {
Set paths =
Sets.newHashSet(new Path(locPath1), new Path(locPath1 + "_tmp"),
new Path(locPath2), new Path(locPath2 + "_tmp"));
+ // Wait for localizer runner thread for container c1 to finish.
+ while (locC1.getState()
hadoop git commit: MAPREDUCE-6555. TestMRAppMaster fails on trunk. (Junping Du via ozawa)
Repository: hadoop
Updated Branches:
refs/heads/trunk 8176ea7dc -> 3e85542a7
MAPREDUCE-6555. TestMRAppMaster fails on trunk. (Junping Du via ozawa)
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/3e85542a
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/3e85542a
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/3e85542a
Branch: refs/heads/trunk
Commit: 3e85542a7afb8bbbc19f2aa59da04ec824168c0e
Parents: 8176ea7
Author: Tsuyoshi Ozawa
Authored: Thu Nov 26 01:02:27 2015 +0900
Committer: Tsuyoshi Ozawa
Committed: Thu Nov 26 01:02:27 2015 +0900
--
hadoop-mapreduce-project/CHANGES.txt | 2 ++
.../java/org/apache/hadoop/mapreduce/v2/app/TestMRAppMaster.java | 2 ++
2 files changed, 4 insertions(+)
--
http://git-wip-us.apache.org/repos/asf/hadoop/blob/3e85542a/hadoop-mapreduce-project/CHANGES.txt
--
diff --git a/hadoop-mapreduce-project/CHANGES.txt
b/hadoop-mapreduce-project/CHANGES.txt
index 1631668..26a0776 100644
--- a/hadoop-mapreduce-project/CHANGES.txt
+++ b/hadoop-mapreduce-project/CHANGES.txt
@@ -231,6 +231,8 @@ Trunk (Unreleased)
MAPREDUCE-6540. TestMRTimelineEventHandling fails (sjlee)
+MAPREDUCE-6555. TestMRAppMaster fails on trunk. (Junping Du via ozawa)
+
BREAKDOWN OF MAPREDUCE-2841 (NATIVE TASK) SUBTASKS
MAPREDUCE-5985. native-task: Fix build on macosx. Contributed by
http://git-wip-us.apache.org/repos/asf/hadoop/blob/3e85542a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/test/java/org/apache/hadoop/mapreduce/v2/app/TestMRAppMaster.java
--
diff --git
a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/test/java/org/apache/hadoop/mapreduce/v2/app/TestMRAppMaster.java
b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/test/java/org/apache/hadoop/mapreduce/v2/app/TestMRAppMaster.java
index 9e0dafc..86fa33e 100644
---
a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/test/java/org/apache/hadoop/mapreduce/v2/app/TestMRAppMaster.java
+++
b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/test/java/org/apache/hadoop/mapreduce/v2/app/TestMRAppMaster.java
@@ -151,6 +151,8 @@ public class TestMRAppMaster {
String userName = "TestAppMasterUser";
JobConf conf = new JobConf();
conf.set(MRJobConfig.MR_AM_STAGING_DIR, stagingDir);
+conf.setInt(org.apache.hadoop.mapreduce.lib.output.FileOutputCommitter.
+FILEOUTPUTCOMMITTER_ALGORITHM_VERSION, 1);
ApplicationAttemptId applicationAttemptId = ConverterUtils
.toApplicationAttemptId(applicationAttemptIdStr);
JobId jobId = TypeConverter.toYarn(
hadoop git commit: YARN-4387. Fix typo in FairScheduler log message. Contributed by Xin Wang.
Repository: hadoop
Updated Branches:
refs/heads/branch-2 ac0ddc4fe -> 9e458c3e9
YARN-4387. Fix typo in FairScheduler log message. Contributed by Xin Wang.
(cherry picked from commit 28dfe721b86ccbaf2ddcfb7e709b226ac766803a)
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/9e458c3e
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/9e458c3e
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/9e458c3e
Branch: refs/heads/branch-2
Commit: 9e458c3e9e5d6ae7850b3d56309157e2213a6603
Parents: ac0ddc4
Author: Tsuyoshi Ozawa
Authored: Tue Nov 24 17:35:38 2015 +0900
Committer: Tsuyoshi Ozawa
Committed: Tue Nov 24 22:10:31 2015 +0900
--
hadoop-yarn-project/CHANGES.txt| 2 ++
.../yarn/server/resourcemanager/scheduler/fair/FairScheduler.java | 2 +-
2 files changed, 3 insertions(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/hadoop/blob/9e458c3e/hadoop-yarn-project/CHANGES.txt
--
diff --git a/hadoop-yarn-project/CHANGES.txt b/hadoop-yarn-project/CHANGES.txt
index d2ce060..fa2049a 100644
--- a/hadoop-yarn-project/CHANGES.txt
+++ b/hadoop-yarn-project/CHANGES.txt
@@ -1012,6 +1012,8 @@ Release 2.8.0 - UNRELEASED
YARN-4298. Fix findbugs warnings in hadoop-yarn-common.
(Sunil G via aajisaka)
+YARN-4387. Fix typo in FairScheduler log message. (Xin Wang via ozawa)
+
Release 2.7.3 - UNRELEASED
INCOMPATIBLE CHANGES
http://git-wip-us.apache.org/repos/asf/hadoop/blob/9e458c3e/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fair/FairScheduler.java
--
diff --git
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fair/FairScheduler.java
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fair/FairScheduler.java
index f1839f5..04977a6 100644
---
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fair/FairScheduler.java
+++
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fair/FairScheduler.java
@@ -500,7 +500,7 @@ public class FairScheduler extends
// containers on the RMNode (see SchedulerNode.releaseContainer()).
completedContainer(container, status, RMContainerEventType.KILL);
LOG.info("Killing container" + container +
-" (after waiting for premption for " +
+" (after waiting for preemption for " +
(getClock().getTime() - time) + "ms)");
}
} else {
hadoop git commit: YARN-4387. Fix typo in FairScheduler log message. Contributed by Xin Wang.
Repository: hadoop
Updated Branches:
refs/heads/trunk 8c0133f3d -> 28dfe721b
YARN-4387. Fix typo in FairScheduler log message. Contributed by Xin Wang.
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/28dfe721
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/28dfe721
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/28dfe721
Branch: refs/heads/trunk
Commit: 28dfe721b86ccbaf2ddcfb7e709b226ac766803a
Parents: 8c0133f
Author: Tsuyoshi Ozawa
Authored: Tue Nov 24 17:35:38 2015 +0900
Committer: Tsuyoshi Ozawa
Committed: Tue Nov 24 19:24:01 2015 +0900
--
hadoop-yarn-project/CHANGES.txt| 2 ++
.../yarn/server/resourcemanager/scheduler/fair/FairScheduler.java | 2 +-
2 files changed, 3 insertions(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/hadoop/blob/28dfe721/hadoop-yarn-project/CHANGES.txt
--
diff --git a/hadoop-yarn-project/CHANGES.txt b/hadoop-yarn-project/CHANGES.txt
index 6558e40..204c338 100644
--- a/hadoop-yarn-project/CHANGES.txt
+++ b/hadoop-yarn-project/CHANGES.txt
@@ -1064,6 +1064,8 @@ Release 2.8.0 - UNRELEASED
YARN-4298. Fix findbugs warnings in hadoop-yarn-common.
(Sunil G via aajisaka)
+YARN-4387. Fix typo in FairScheduler log message. (Xin Wang via ozawa)
+
Release 2.7.3 - UNRELEASED
INCOMPATIBLE CHANGES
http://git-wip-us.apache.org/repos/asf/hadoop/blob/28dfe721/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fair/FairScheduler.java
--
diff --git
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fair/FairScheduler.java
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fair/FairScheduler.java
index f1839f5..04977a6 100644
---
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fair/FairScheduler.java
+++
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/fair/FairScheduler.java
@@ -500,7 +500,7 @@ public class FairScheduler extends
// containers on the RMNode (see SchedulerNode.releaseContainer()).
completedContainer(container, status, RMContainerEventType.KILL);
LOG.info("Killing container" + container +
-" (after waiting for premption for " +
+" (after waiting for preemption for " +
(getClock().getTime() - time) + "ms)");
}
} else {
hadoop git commit: CHANGES.txt: add YARN-4367 to 2.8.0.
Repository: hadoop Updated Branches: refs/heads/trunk 52948bb20 -> fb0f09e46 CHANGES.txt: add YARN-4367 to 2.8.0. Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/fb0f09e4 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/fb0f09e4 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/fb0f09e4 Branch: refs/heads/trunk Commit: fb0f09e46b456789ec1c7470873b6de231430773 Parents: 52948bb Author: Tsuyoshi Ozawa Authored: Tue Nov 24 17:39:34 2015 +0900 Committer: Tsuyoshi Ozawa Committed: Tue Nov 24 17:39:34 2015 +0900 -- hadoop-yarn-project/CHANGES.txt | 2 ++ 1 file changed, 2 insertions(+) -- http://git-wip-us.apache.org/repos/asf/hadoop/blob/fb0f09e4/hadoop-yarn-project/CHANGES.txt -- diff --git a/hadoop-yarn-project/CHANGES.txt b/hadoop-yarn-project/CHANGES.txt index 0532e1d..24807d7 100644 --- a/hadoop-yarn-project/CHANGES.txt +++ b/hadoop-yarn-project/CHANGES.txt @@ -1059,6 +1059,8 @@ Release 2.8.0 - UNRELEASED YARN-4345. yarn rmadmin -updateNodeResource doesn't work (Junping Du via jlowe) +YARN-4367. SLS webapp doesn't load. (kasha). + Release 2.7.3 - UNRELEASED INCOMPATIBLE CHANGES
hadoop git commit: HADOOP-11149. TestZKFailoverController times out. Contributed by Steve Loughran. closes apache/hadoop#51
Repository: hadoop
Updated Branches:
refs/heads/trunk a4bd54f9d -> 053a51191
HADOOP-11149. TestZKFailoverController times out. Contributed by Steve
Loughran. closes apache/hadoop#51
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/053a5119
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/053a5119
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/053a5119
Branch: refs/heads/trunk
Commit: 053a5119197db3aef1842d1fa16c0f0872fffcac
Parents: a4bd54f
Author: Tsuyoshi Ozawa
Authored: Mon Nov 23 05:38:42 2015 +0900
Committer: Tsuyoshi Ozawa
Committed: Mon Nov 23 12:44:50 2015 +0900
--
hadoop-common-project/hadoop-common/CHANGES.txt | 3 +
.../org/apache/hadoop/ha/MiniZKFCCluster.java | 8 +-
.../hadoop/ha/TestZKFailoverController.java | 673 +--
3 files changed, 326 insertions(+), 358 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/hadoop/blob/053a5119/hadoop-common-project/hadoop-common/CHANGES.txt
--
diff --git a/hadoop-common-project/hadoop-common/CHANGES.txt
b/hadoop-common-project/hadoop-common/CHANGES.txt
index 26f97b4..8728fe9 100644
--- a/hadoop-common-project/hadoop-common/CHANGES.txt
+++ b/hadoop-common-project/hadoop-common/CHANGES.txt
@@ -1355,6 +1355,9 @@ Release 2.8.0 - UNRELEASED
HADOOP-8419. Fixed GzipCode NPE reset for IBM JDK. (Yu Li via eyang)
+HADOOP-11149. TestZKFailoverController times out. (Steve Loughran
+via ozawa)
+
OPTIMIZATIONS
HADOOP-12051. ProtobufRpcEngine.invoke() should use Exception.toString()
http://git-wip-us.apache.org/repos/asf/hadoop/blob/053a5119/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/ha/MiniZKFCCluster.java
--
diff --git
a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/ha/MiniZKFCCluster.java
b/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/ha/MiniZKFCCluster.java
index b496bf9..a5fbe8f 100644
---
a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/ha/MiniZKFCCluster.java
+++
b/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/ha/MiniZKFCCluster.java
@@ -133,9 +133,11 @@ public class MiniZKFCCluster {
* @throws Exception if either of the services had encountered a fatal error
*/
public void stop() throws Exception {
-for (DummyZKFCThread thr : thrs) {
- if (thr != null) {
-thr.interrupt();
+if (thrs != null) {
+ for (DummyZKFCThread thr : thrs) {
+if (thr != null) {
+ thr.interrupt();
+}
}
}
if (ctx != null) {
http://git-wip-us.apache.org/repos/asf/hadoop/blob/053a5119/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/ha/TestZKFailoverController.java
--
diff --git
a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/ha/TestZKFailoverController.java
b/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/ha/TestZKFailoverController.java
index b8d9ce4..164167c 100644
---
a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/ha/TestZKFailoverController.java
+++
b/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/ha/TestZKFailoverController.java
@@ -34,14 +34,23 @@ import org.apache.zookeeper.KeeperException;
import org.apache.zookeeper.ZooKeeper;
import org.apache.zookeeper.data.Stat;
import org.apache.zookeeper.server.auth.DigestAuthenticationProvider;
+import org.junit.After;
import org.junit.Before;
+import org.junit.Rule;
import org.junit.Test;
+import org.junit.rules.Timeout;
import org.mockito.Mockito;
public class TestZKFailoverController extends ClientBaseWithFixes {
private Configuration conf;
private MiniZKFCCluster cluster;
-
+
+ /**
+ * Set the timeout for every test
+ */
+ @Rule
+ public Timeout testTimeout = new Timeout(3 * 60 * 1000);
+
// Set up ZK digest-based credentials for the purposes of the tests,
// to make sure all of our functionality works with auth and ACLs
// present.
@@ -74,11 +83,21 @@ public class TestZKFailoverController extends
ClientBaseWithFixes {
this.cluster = new MiniZKFCCluster(conf, getServer(serverFactory));
}
+ @After
+ public void teardown() {
+if (cluster != null) {
+ try {
+cluster.stop();
+ } catch (Exception e) {
+LOG.warn("When stopping the cluster", e);
+ }
+}
+ }
/**
* Test that the various command lines for formatting the ZK directory
* function correctly.
*/
- @Test(timeout=15000)
+ @Test
public void testFormatZK() throws Exception {
D
hadoop git commit: HADOOP-12575. Add build instruction for docker toolbox instead of boot2docker. Contributed by Kai Sasaki.
Repository: hadoop Updated Branches: refs/heads/branch-2 c5fb02ba2 -> aa792b7d0 HADOOP-12575. Add build instruction for docker toolbox instead of boot2docker. Contributed by Kai Sasaki. (cherry picked from commit 25e82b4eb92262d56e543621cd7db6c0bf218690) Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/aa792b7d Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/aa792b7d Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/aa792b7d Branch: refs/heads/branch-2 Commit: aa792b7d0c180c74002e383b499fdb54be24f9d7 Parents: c5fb02b Author: Tsuyoshi Ozawa Authored: Thu Nov 19 17:44:10 2015 +0900 Committer: Tsuyoshi Ozawa Committed: Thu Nov 19 17:44:21 2015 +0900 -- BUILDING.txt| 10 +- hadoop-common-project/hadoop-common/CHANGES.txt | 3 +++ 2 files changed, 8 insertions(+), 5 deletions(-) -- http://git-wip-us.apache.org/repos/asf/hadoop/blob/aa792b7d/BUILDING.txt -- diff --git a/BUILDING.txt b/BUILDING.txt index a18853d..1492a10 100644 --- a/BUILDING.txt +++ b/BUILDING.txt @@ -26,11 +26,11 @@ On Linux: $ ./start-build-env.sh On Mac: -First make sure Homebrew has been installed ( http://brew.sh/ ) -$ brew install docker boot2docker -$ boot2docker init -m 4096 -$ boot2docker start -$ $(boot2docker shellinit) +First make sure Virtualbox and docker toolbox are installed. +You can use docker toolbox as described in http://docs.docker.com/mac/step_one/. +$ docker-machine create --driver virtualbox \ +--virtualbox-memory "4096" hadoopdev +$ eval $(docker-machine env hadoopdev) $ ./start-build-env.sh The prompt which is then presented is located at a mounted version of the source tree http://git-wip-us.apache.org/repos/asf/hadoop/blob/aa792b7d/hadoop-common-project/hadoop-common/CHANGES.txt -- diff --git a/hadoop-common-project/hadoop-common/CHANGES.txt b/hadoop-common-project/hadoop-common/CHANGES.txt index 18b1a53..62fe021 100644 --- a/hadoop-common-project/hadoop-common/CHANGES.txt +++ b/hadoop-common-project/hadoop-common/CHANGES.txt @@ -338,6 +338,9 @@ Release 2.8.0 - UNRELEASED HADOOP-12582. Using BytesWritable's getLength() and getBytes() instead of get() and getSize(). (Akira AJISAKA via ozawa) +HADOOP-12575. Add build instruction for docker toolbox instead of +boot2docker(Kai Sasaki via ozawa) + OPTIMIZATIONS HADOOP-11785. Reduce the number of listStatus operation in distcp
hadoop git commit: HADOOP-12575. Add build instruction for docker toolbox instead of boot2docker. Contributed by Kai Sasaki.
Repository: hadoop Updated Branches: refs/heads/trunk bd166f0ee -> 25e82b4eb HADOOP-12575. Add build instruction for docker toolbox instead of boot2docker. Contributed by Kai Sasaki. Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/25e82b4e Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/25e82b4e Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/25e82b4e Branch: refs/heads/trunk Commit: 25e82b4eb92262d56e543621cd7db6c0bf218690 Parents: bd166f0 Author: Tsuyoshi Ozawa Authored: Thu Nov 19 17:44:10 2015 +0900 Committer: Tsuyoshi Ozawa Committed: Thu Nov 19 17:44:10 2015 +0900 -- BUILDING.txt| 10 +- hadoop-common-project/hadoop-common/CHANGES.txt | 3 +++ 2 files changed, 8 insertions(+), 5 deletions(-) -- http://git-wip-us.apache.org/repos/asf/hadoop/blob/25e82b4e/BUILDING.txt -- diff --git a/BUILDING.txt b/BUILDING.txt index c7be7a3..91281be 100644 --- a/BUILDING.txt +++ b/BUILDING.txt @@ -28,11 +28,11 @@ On Linux: $ ./start-build-env.sh On Mac: -First make sure Homebrew has been installed ( http://brew.sh/ ) -$ brew install docker boot2docker -$ boot2docker init -m 4096 -$ boot2docker start -$ $(boot2docker shellinit) +First make sure Virtualbox and docker toolbox are installed. +You can use docker toolbox as described in http://docs.docker.com/mac/step_one/. +$ docker-machine create --driver virtualbox \ +--virtualbox-memory "4096" hadoopdev +$ eval $(docker-machine env hadoopdev) $ ./start-build-env.sh The prompt which is then presented is located at a mounted version of the source tree http://git-wip-us.apache.org/repos/asf/hadoop/blob/25e82b4e/hadoop-common-project/hadoop-common/CHANGES.txt -- diff --git a/hadoop-common-project/hadoop-common/CHANGES.txt b/hadoop-common-project/hadoop-common/CHANGES.txt index 087ba75..3bb8620 100644 --- a/hadoop-common-project/hadoop-common/CHANGES.txt +++ b/hadoop-common-project/hadoop-common/CHANGES.txt @@ -965,6 +965,9 @@ Release 2.8.0 - UNRELEASED HADOOP-12582. Using BytesWritable's getLength() and getBytes() instead of get() and getSize(). (Akira AJISAKA via ozawa) +HADOOP-12575. Add build instruction for docker toolbox instead of +boot2docker(Kai Sasaki via ozawa) + OPTIMIZATIONS HADOOP-11785. Reduce the number of listStatus operation in distcp
hadoop git commit: HADOOP-12582. Using BytesWritable's getLength() and getBytes() instead of get() and getSize(). Contributed by Akira AJISAKA.
Repository: hadoop
Updated Branches:
refs/heads/branch-2 3504d0e79 -> c5fb02ba2
HADOOP-12582. Using BytesWritable's getLength() and getBytes() instead of get()
and getSize(). Contributed by Akira AJISAKA.
(cherry picked from commit bd166f0eed058795dd70b2ee019356c55422173c)
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/c5fb02ba
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/c5fb02ba
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/c5fb02ba
Branch: refs/heads/branch-2
Commit: c5fb02ba254dc8d49a3511d1eb2246b573a4d26d
Parents: 3504d0e
Author: Tsuyoshi Ozawa
Authored: Thu Nov 19 17:26:23 2015 +0900
Committer: Tsuyoshi Ozawa
Committed: Thu Nov 19 17:27:35 2015 +0900
--
hadoop-common-project/hadoop-common/CHANGES.txt | 3 +++
.../org/apache/hadoop/io/file/tfile/KVGenerator.java | 13 ++---
.../org/apache/hadoop/io/file/tfile/KeySampler.java | 4 ++--
.../apache/hadoop/io/file/tfile/TestTFileSeek.java| 14 +++---
.../io/file/tfile/TestTFileSeqFileComparison.java | 12 ++--
5 files changed, 24 insertions(+), 22 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/hadoop/blob/c5fb02ba/hadoop-common-project/hadoop-common/CHANGES.txt
--
diff --git a/hadoop-common-project/hadoop-common/CHANGES.txt
b/hadoop-common-project/hadoop-common/CHANGES.txt
index ab27ce8..18b1a53 100644
--- a/hadoop-common-project/hadoop-common/CHANGES.txt
+++ b/hadoop-common-project/hadoop-common/CHANGES.txt
@@ -335,6 +335,9 @@ Release 2.8.0 - UNRELEASED
HADOOP-12564. Upgrade JUnit3 TestCase to JUnit 4 in
org.apache.hadoop.io package. (Dustin Cote via ozawa)
+HADOOP-12582. Using BytesWritable's getLength() and getBytes() instead
+of get() and getSize(). (Akira AJISAKA via ozawa)
+
OPTIMIZATIONS
HADOOP-11785. Reduce the number of listStatus operation in distcp
http://git-wip-us.apache.org/repos/asf/hadoop/blob/c5fb02ba/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/io/file/tfile/KVGenerator.java
--
diff --git
a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/io/file/tfile/KVGenerator.java
b/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/io/file/tfile/KVGenerator.java
index 86671ab..772bdba 100644
---
a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/io/file/tfile/KVGenerator.java
+++
b/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/io/file/tfile/KVGenerator.java
@@ -58,17 +58,16 @@ class KVGenerator {
while (n < len) {
byte[] word = dict[random.nextInt(dict.length)];
int l = Math.min(word.length, len - n);
- System.arraycopy(word, 0, o.get(), n, l);
+ System.arraycopy(word, 0, o.getBytes(), n, l);
n += l;
}
-if (sorted
-&& WritableComparator.compareBytes(lastKey.get(), MIN_KEY_LEN, lastKey
-.getSize()
-- MIN_KEY_LEN, o.get(), MIN_KEY_LEN, o.getSize() - MIN_KEY_LEN) >
0) {
+if (sorted && WritableComparator.compareBytes(
+lastKey.getBytes(), MIN_KEY_LEN, lastKey.getLength() - MIN_KEY_LEN,
+o.getBytes(), MIN_KEY_LEN, o.getLength() - MIN_KEY_LEN) > 0) {
incrementPrefix();
}
-System.arraycopy(prefix, 0, o.get(), 0, MIN_KEY_LEN);
+System.arraycopy(prefix, 0, o.getBytes(), 0, MIN_KEY_LEN);
lastKey.set(o);
}
@@ -79,7 +78,7 @@ class KVGenerator {
while (n < len) {
byte[] word = dict[random.nextInt(dict.length)];
int l = Math.min(word.length, len - n);
- System.arraycopy(word, 0, o.get(), n, l);
+ System.arraycopy(word, 0, o.getBytes(), n, l);
n += l;
}
}
http://git-wip-us.apache.org/repos/asf/hadoop/blob/c5fb02ba/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/io/file/tfile/KeySampler.java
--
diff --git
a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/io/file/tfile/KeySampler.java
b/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/io/file/tfile/KeySampler.java
index 92c9c52..223a7e3 100644
---
a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/io/file/tfile/KeySampler.java
+++
b/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/io/file/tfile/KeySampler.java
@@ -45,9 +45,9 @@ class KeySampler {
public void next(BytesWritable key) {
key.setSize(Math.max(MIN_KEY_LEN, keyLenRNG.nextInt()));
-random.nextBytes(key.get());
+random.nextBytes(key.getBytes());
int n = random.nextInt(max - min) +
hadoop git commit: HADOOP-12582. Using BytesWritable's getLength() and getBytes() instead of get() and getSize(). Contributed by Akira AJISAKA.
Repository: hadoop
Updated Branches:
refs/heads/trunk 23a130abd -> bd166f0ee
HADOOP-12582. Using BytesWritable's getLength() and getBytes() instead of get()
and getSize(). Contributed by Akira AJISAKA.
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/bd166f0e
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/bd166f0e
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/bd166f0e
Branch: refs/heads/trunk
Commit: bd166f0eed058795dd70b2ee019356c55422173c
Parents: 23a130a
Author: Tsuyoshi Ozawa
Authored: Thu Nov 19 17:26:23 2015 +0900
Committer: Tsuyoshi Ozawa
Committed: Thu Nov 19 17:27:23 2015 +0900
--
hadoop-common-project/hadoop-common/CHANGES.txt | 3 +++
.../org/apache/hadoop/io/file/tfile/KVGenerator.java | 13 ++---
.../org/apache/hadoop/io/file/tfile/KeySampler.java | 4 ++--
.../apache/hadoop/io/file/tfile/TestTFileSeek.java| 14 +++---
.../io/file/tfile/TestTFileSeqFileComparison.java | 12 ++--
5 files changed, 24 insertions(+), 22 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/hadoop/blob/bd166f0e/hadoop-common-project/hadoop-common/CHANGES.txt
--
diff --git a/hadoop-common-project/hadoop-common/CHANGES.txt
b/hadoop-common-project/hadoop-common/CHANGES.txt
index 4a151d9..087ba75 100644
--- a/hadoop-common-project/hadoop-common/CHANGES.txt
+++ b/hadoop-common-project/hadoop-common/CHANGES.txt
@@ -962,6 +962,9 @@ Release 2.8.0 - UNRELEASED
HADOOP-12564. Upgrade JUnit3 TestCase to JUnit 4 in
org.apache.hadoop.io package. (Dustin Cote via ozawa)
+HADOOP-12582. Using BytesWritable's getLength() and getBytes() instead
+of get() and getSize(). (Akira AJISAKA via ozawa)
+
OPTIMIZATIONS
HADOOP-11785. Reduce the number of listStatus operation in distcp
http://git-wip-us.apache.org/repos/asf/hadoop/blob/bd166f0e/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/io/file/tfile/KVGenerator.java
--
diff --git
a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/io/file/tfile/KVGenerator.java
b/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/io/file/tfile/KVGenerator.java
index 86671ab..772bdba 100644
---
a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/io/file/tfile/KVGenerator.java
+++
b/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/io/file/tfile/KVGenerator.java
@@ -58,17 +58,16 @@ class KVGenerator {
while (n < len) {
byte[] word = dict[random.nextInt(dict.length)];
int l = Math.min(word.length, len - n);
- System.arraycopy(word, 0, o.get(), n, l);
+ System.arraycopy(word, 0, o.getBytes(), n, l);
n += l;
}
-if (sorted
-&& WritableComparator.compareBytes(lastKey.get(), MIN_KEY_LEN, lastKey
-.getSize()
-- MIN_KEY_LEN, o.get(), MIN_KEY_LEN, o.getSize() - MIN_KEY_LEN) >
0) {
+if (sorted && WritableComparator.compareBytes(
+lastKey.getBytes(), MIN_KEY_LEN, lastKey.getLength() - MIN_KEY_LEN,
+o.getBytes(), MIN_KEY_LEN, o.getLength() - MIN_KEY_LEN) > 0) {
incrementPrefix();
}
-System.arraycopy(prefix, 0, o.get(), 0, MIN_KEY_LEN);
+System.arraycopy(prefix, 0, o.getBytes(), 0, MIN_KEY_LEN);
lastKey.set(o);
}
@@ -79,7 +78,7 @@ class KVGenerator {
while (n < len) {
byte[] word = dict[random.nextInt(dict.length)];
int l = Math.min(word.length, len - n);
- System.arraycopy(word, 0, o.get(), n, l);
+ System.arraycopy(word, 0, o.getBytes(), n, l);
n += l;
}
}
http://git-wip-us.apache.org/repos/asf/hadoop/blob/bd166f0e/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/io/file/tfile/KeySampler.java
--
diff --git
a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/io/file/tfile/KeySampler.java
b/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/io/file/tfile/KeySampler.java
index 92c9c52..223a7e3 100644
---
a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/io/file/tfile/KeySampler.java
+++
b/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/io/file/tfile/KeySampler.java
@@ -45,9 +45,9 @@ class KeySampler {
public void next(BytesWritable key) {
key.setSize(Math.max(MIN_KEY_LEN, keyLenRNG.nextInt()));
-random.nextBytes(key.get());
+random.nextBytes(key.getBytes());
int n = random.nextInt(max - min) + min;
-byte[] b = key.get();
+byte[] b = key.getBytes();
b[0]
[2/2] hadoop git commit: HADOOP-12564. Upgrade JUnit3 TestCase to JUnit 4 in org.apache.hadoop.io package. Contributed by Dustin Cote.
HADOOP-12564. Upgrade JUnit3 TestCase to JUnit 4 in org.apache.hadoop.io
package. Contributed by Dustin Cote.
(cherry picked from commit 989b9e3e11bd6bead262dc621251b5160d84f6a4)
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/eb4c9765
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/eb4c9765
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/eb4c9765
Branch: refs/heads/branch-2
Commit: eb4c9765d96840a4e2b104321d9796fdcfb0c118
Parents: 123e0b1
Author: Tsuyoshi Ozawa
Authored: Thu Nov 19 01:22:39 2015 +0900
Committer: Tsuyoshi Ozawa
Committed: Thu Nov 19 01:38:40 2015 +0900
--
hadoop-common-project/hadoop-common/CHANGES.txt | 3 +
.../java/org/apache/hadoop/io/AvroTestUtil.java | 2 +-
.../org/apache/hadoop/io/TestArrayFile.java | 17 ++--
.../hadoop/io/TestArrayPrimitiveWritable.java | 10 ++-
.../org/apache/hadoop/io/TestArrayWritable.java | 20 ++---
.../org/apache/hadoop/io/TestBloomMapFile.java | 31 ---
.../io/TestBoundedByteArrayOutputStream.java| 12 ++-
.../hadoop/io/TestDefaultStringifier.java | 10 ++-
.../apache/hadoop/io/TestEnumSetWritable.java | 15 +++-
.../apache/hadoop/io/TestGenericWritable.java | 20 +++--
.../java/org/apache/hadoop/io/TestMD5Hash.java | 14 ++--
.../org/apache/hadoop/io/TestMapWritable.java | 15 +++-
.../org/apache/hadoop/io/TestSequenceFile.java | 22 +++--
.../io/TestSequenceFileSerialization.java | 21 +++--
.../java/org/apache/hadoop/io/TestSetFile.java | 17 ++--
.../java/org/apache/hadoop/io/TestText.java | 85 +++-
.../org/apache/hadoop/io/TestTextNonUTF8.java | 12 ++-
.../java/org/apache/hadoop/io/TestUTF8.java | 16 +++-
.../apache/hadoop/io/TestVersionedWritable.java | 11 +--
.../java/org/apache/hadoop/io/TestWritable.java | 20 +++--
.../org/apache/hadoop/io/TestWritableName.java | 13 +--
.../org/apache/hadoop/io/TestWritableUtils.java | 14 ++--
.../hadoop/io/compress/TestCodecFactory.java| 14 ++--
.../io/compress/TestCompressionStreamReuse.java | 10 ++-
.../apache/hadoop/io/file/tfile/TestTFile.java | 16 +++-
.../io/file/tfile/TestTFileComparators.java | 14 +++-
.../hadoop/io/file/tfile/TestTFileSeek.java | 15 ++--
.../file/tfile/TestTFileSeqFileComparison.java | 12 ++-
.../hadoop/io/file/tfile/TestTFileSplit.java| 19 +++--
.../hadoop/io/file/tfile/TestTFileStreams.java | 55 +
.../file/tfile/TestTFileUnsortedByteArrays.java | 14 +++-
.../apache/hadoop/io/file/tfile/TestVLong.java | 24 --
.../serializer/avro/TestAvroSerialization.java | 11 ++-
33 files changed, 398 insertions(+), 206 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/hadoop/blob/eb4c9765/hadoop-common-project/hadoop-common/CHANGES.txt
--
diff --git a/hadoop-common-project/hadoop-common/CHANGES.txt
b/hadoop-common-project/hadoop-common/CHANGES.txt
index 92e1e3b..ab27ce8 100644
--- a/hadoop-common-project/hadoop-common/CHANGES.txt
+++ b/hadoop-common-project/hadoop-common/CHANGES.txt
@@ -332,6 +332,9 @@ Release 2.8.0 - UNRELEASED
HADOOP-12568. Update core-default.xml to describe posixGroups support.
(Wei-Chiu Chuang via aajisaka)
+HADOOP-12564. Upgrade JUnit3 TestCase to JUnit 4 in
+org.apache.hadoop.io package. (Dustin Cote via ozawa)
+
OPTIMIZATIONS
HADOOP-11785. Reduce the number of listStatus operation in distcp
http://git-wip-us.apache.org/repos/asf/hadoop/blob/eb4c9765/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/io/AvroTestUtil.java
--
diff --git
a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/io/AvroTestUtil.java
b/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/io/AvroTestUtil.java
index 74e9cc8..ec76ea0 100644
---
a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/io/AvroTestUtil.java
+++
b/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/io/AvroTestUtil.java
@@ -28,7 +28,7 @@ import org.apache.avro.reflect.ReflectDatumWriter;
import org.apache.avro.reflect.ReflectDatumReader;
import org.apache.avro.io.DecoderFactory;
-import static junit.framework.TestCase.assertEquals;
+import static org.junit.Assert.assertEquals;
public class AvroTestUtil {
http://git-wip-us.apache.org/repos/asf/hadoop/blob/eb4c9765/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/io/TestArrayFile.java
--
diff --git
a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/io/TestArrayFile.java
b/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/io/TestArrayFile.java
[1/2] hadoop git commit: HADOOP-12564. Upgrade JUnit3 TestCase to JUnit 4 in org.apache.hadoop.io package. Contributed by Dustin Cote.
Repository: hadoop
Updated Branches:
refs/heads/trunk 169921e8a -> 989b9e3e1
http://git-wip-us.apache.org/repos/asf/hadoop/blob/989b9e3e/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/io/file/tfile/TestTFileUnsortedByteArrays.java
--
diff --git
a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/io/file/tfile/TestTFileUnsortedByteArrays.java
b/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/io/file/tfile/TestTFileUnsortedByteArrays.java
index 2f7f2de..235e5e4 100644
---
a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/io/file/tfile/TestTFileUnsortedByteArrays.java
+++
b/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/io/file/tfile/TestTFileUnsortedByteArrays.java
@@ -19,8 +19,8 @@ package org.apache.hadoop.io.file.tfile;
import java.io.IOException;
+import org.junit.After;
import org.junit.Assert;
-import junit.framework.TestCase;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.fs.FSDataOutputStream;
@@ -29,8 +29,10 @@ import org.apache.hadoop.fs.Path;
import org.apache.hadoop.io.file.tfile.TFile.Reader;
import org.apache.hadoop.io.file.tfile.TFile.Writer;
import org.apache.hadoop.io.file.tfile.TFile.Reader.Scanner;
+import org.junit.Before;
+import org.junit.Test;
-public class TestTFileUnsortedByteArrays extends TestCase {
+public class TestTFileUnsortedByteArrays {
private static String ROOT =
System.getProperty("test.build.data", "/tmp/tfile-test");
@@ -61,7 +63,7 @@ public class TestTFileUnsortedByteArrays extends TestCase {
this.records2ndBlock = numRecords2ndBlock;
}
- @Override
+ @Before
public void setUp() throws IOException {
conf = new Configuration();
path = new Path(ROOT, outputFile);
@@ -75,12 +77,13 @@ public class TestTFileUnsortedByteArrays extends TestCase {
closeOutput();
}
- @Override
+ @After
public void tearDown() throws IOException {
fs.delete(path, true);
}
// we still can scan records in an unsorted TFile
+ @Test
public void testFailureScannerWithKeys() throws IOException {
Reader reader =
new Reader(fs.open(path), fs.getFileStatus(path).getLen(), conf);
@@ -101,6 +104,7 @@ public class TestTFileUnsortedByteArrays extends TestCase {
}
// we still can scan records in an unsorted TFile
+ @Test
public void testScan() throws IOException {
Reader reader =
new Reader(fs.open(path), fs.getFileStatus(path).getLen(), conf);
@@ -142,6 +146,7 @@ public class TestTFileUnsortedByteArrays extends TestCase {
}
// we still can scan records in an unsorted TFile
+ @Test
public void testScanRange() throws IOException {
Reader reader =
new Reader(fs.open(path), fs.getFileStatus(path).getLen(), conf);
@@ -182,6 +187,7 @@ public class TestTFileUnsortedByteArrays extends TestCase {
}
}
+ @Test
public void testFailureSeek() throws IOException {
Reader reader =
new Reader(fs.open(path), fs.getFileStatus(path).getLen(), conf);
http://git-wip-us.apache.org/repos/asf/hadoop/blob/989b9e3e/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/io/file/tfile/TestVLong.java
--
diff --git
a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/io/file/tfile/TestVLong.java
b/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/io/file/tfile/TestVLong.java
index a2bb219..9efd271 100644
---
a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/io/file/tfile/TestVLong.java
+++
b/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/io/file/tfile/TestVLong.java
@@ -21,16 +21,18 @@ package org.apache.hadoop.io.file.tfile;
import java.io.IOException;
import java.util.Random;
+import org.junit.After;
import org.junit.Assert;
-import junit.framework.TestCase;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.fs.FSDataInputStream;
import org.apache.hadoop.fs.FSDataOutputStream;
import org.apache.hadoop.fs.FileSystem;
import org.apache.hadoop.fs.Path;
+import org.junit.Before;
+import org.junit.Test;
-public class TestVLong extends TestCase {
+public class TestVLong {
private static String ROOT =
System.getProperty("test.build.data", "/tmp/tfile-test");
private Configuration conf;
@@ -38,7 +40,7 @@ public class TestVLong extends TestCase {
private Path path;
private String outputFile = "TestVLong";
- @Override
+ @Before
public void setUp() throws IOException {
conf = new Configuration();
path = new Path(ROOT, outputFile);
@@ -48,13 +50,14 @@ public class TestVLong extends TestCase {
}
}
- @Override
+ @After
public void tearDown() throws IOException {
if (fs.exists(path)) {
fs.delete(path, false);
}
}
+ @Te
[2/2] hadoop git commit: HADOOP-12564. Upgrade JUnit3 TestCase to JUnit 4 in org.apache.hadoop.io package. Contributed by Dustin Cote.
HADOOP-12564. Upgrade JUnit3 TestCase to JUnit 4 in org.apache.hadoop.io
package. Contributed by Dustin Cote.
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/989b9e3e
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/989b9e3e
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/989b9e3e
Branch: refs/heads/trunk
Commit: 989b9e3e11bd6bead262dc621251b5160d84f6a4
Parents: 169921e
Author: Tsuyoshi Ozawa
Authored: Thu Nov 19 01:22:39 2015 +0900
Committer: Tsuyoshi Ozawa
Committed: Thu Nov 19 01:38:18 2015 +0900
--
hadoop-common-project/hadoop-common/CHANGES.txt | 3 +
.../java/org/apache/hadoop/io/AvroTestUtil.java | 2 +-
.../org/apache/hadoop/io/TestArrayFile.java | 17 ++--
.../hadoop/io/TestArrayPrimitiveWritable.java | 10 ++-
.../org/apache/hadoop/io/TestArrayWritable.java | 20 ++---
.../org/apache/hadoop/io/TestBloomMapFile.java | 31 ---
.../io/TestBoundedByteArrayOutputStream.java| 12 ++-
.../hadoop/io/TestDefaultStringifier.java | 10 ++-
.../apache/hadoop/io/TestEnumSetWritable.java | 15 +++-
.../apache/hadoop/io/TestGenericWritable.java | 20 +++--
.../java/org/apache/hadoop/io/TestMD5Hash.java | 14 ++--
.../org/apache/hadoop/io/TestMapWritable.java | 15 +++-
.../org/apache/hadoop/io/TestSequenceFile.java | 22 +++--
.../io/TestSequenceFileSerialization.java | 21 +++--
.../java/org/apache/hadoop/io/TestSetFile.java | 17 ++--
.../java/org/apache/hadoop/io/TestText.java | 85 +++-
.../org/apache/hadoop/io/TestTextNonUTF8.java | 12 ++-
.../java/org/apache/hadoop/io/TestUTF8.java | 16 +++-
.../apache/hadoop/io/TestVersionedWritable.java | 11 +--
.../java/org/apache/hadoop/io/TestWritable.java | 20 +++--
.../org/apache/hadoop/io/TestWritableName.java | 13 +--
.../org/apache/hadoop/io/TestWritableUtils.java | 14 ++--
.../hadoop/io/compress/TestCodecFactory.java| 14 ++--
.../io/compress/TestCompressionStreamReuse.java | 10 ++-
.../apache/hadoop/io/file/tfile/TestTFile.java | 16 +++-
.../io/file/tfile/TestTFileComparators.java | 14 +++-
.../hadoop/io/file/tfile/TestTFileSeek.java | 15 ++--
.../file/tfile/TestTFileSeqFileComparison.java | 13 +--
.../hadoop/io/file/tfile/TestTFileSplit.java| 19 +++--
.../hadoop/io/file/tfile/TestTFileStreams.java | 55 +
.../file/tfile/TestTFileUnsortedByteArrays.java | 14 +++-
.../apache/hadoop/io/file/tfile/TestVLong.java | 24 --
.../serializer/avro/TestAvroSerialization.java | 11 ++-
33 files changed, 398 insertions(+), 207 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/hadoop/blob/989b9e3e/hadoop-common-project/hadoop-common/CHANGES.txt
--
diff --git a/hadoop-common-project/hadoop-common/CHANGES.txt
b/hadoop-common-project/hadoop-common/CHANGES.txt
index 94ad08a..4a151d9 100644
--- a/hadoop-common-project/hadoop-common/CHANGES.txt
+++ b/hadoop-common-project/hadoop-common/CHANGES.txt
@@ -959,6 +959,9 @@ Release 2.8.0 - UNRELEASED
HADOOP-12568. Update core-default.xml to describe posixGroups support.
(Wei-Chiu Chuang via aajisaka)
+HADOOP-12564. Upgrade JUnit3 TestCase to JUnit 4 in
+org.apache.hadoop.io package. (Dustin Cote via ozawa)
+
OPTIMIZATIONS
HADOOP-11785. Reduce the number of listStatus operation in distcp
http://git-wip-us.apache.org/repos/asf/hadoop/blob/989b9e3e/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/io/AvroTestUtil.java
--
diff --git
a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/io/AvroTestUtil.java
b/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/io/AvroTestUtil.java
index 74e9cc8..ec76ea0 100644
---
a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/io/AvroTestUtil.java
+++
b/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/io/AvroTestUtil.java
@@ -28,7 +28,7 @@ import org.apache.avro.reflect.ReflectDatumWriter;
import org.apache.avro.reflect.ReflectDatumReader;
import org.apache.avro.io.DecoderFactory;
-import static junit.framework.TestCase.assertEquals;
+import static org.junit.Assert.assertEquals;
public class AvroTestUtil {
http://git-wip-us.apache.org/repos/asf/hadoop/blob/989b9e3e/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/io/TestArrayFile.java
--
diff --git
a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/io/TestArrayFile.java
b/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/io/TestArrayFile.java
index ecf1db0..8c8da4a 100644
---
a/hadoop-common-project/hadoop-common
[1/2] hadoop git commit: HADOOP-12564. Upgrade JUnit3 TestCase to JUnit 4 in org.apache.hadoop.io package. Contributed by Dustin Cote.
Repository: hadoop
Updated Branches:
refs/heads/branch-2 123e0b16f -> eb4c9765d
http://git-wip-us.apache.org/repos/asf/hadoop/blob/eb4c9765/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/io/file/tfile/TestTFileUnsortedByteArrays.java
--
diff --git
a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/io/file/tfile/TestTFileUnsortedByteArrays.java
b/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/io/file/tfile/TestTFileUnsortedByteArrays.java
index 2f7f2de..235e5e4 100644
---
a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/io/file/tfile/TestTFileUnsortedByteArrays.java
+++
b/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/io/file/tfile/TestTFileUnsortedByteArrays.java
@@ -19,8 +19,8 @@ package org.apache.hadoop.io.file.tfile;
import java.io.IOException;
+import org.junit.After;
import org.junit.Assert;
-import junit.framework.TestCase;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.fs.FSDataOutputStream;
@@ -29,8 +29,10 @@ import org.apache.hadoop.fs.Path;
import org.apache.hadoop.io.file.tfile.TFile.Reader;
import org.apache.hadoop.io.file.tfile.TFile.Writer;
import org.apache.hadoop.io.file.tfile.TFile.Reader.Scanner;
+import org.junit.Before;
+import org.junit.Test;
-public class TestTFileUnsortedByteArrays extends TestCase {
+public class TestTFileUnsortedByteArrays {
private static String ROOT =
System.getProperty("test.build.data", "/tmp/tfile-test");
@@ -61,7 +63,7 @@ public class TestTFileUnsortedByteArrays extends TestCase {
this.records2ndBlock = numRecords2ndBlock;
}
- @Override
+ @Before
public void setUp() throws IOException {
conf = new Configuration();
path = new Path(ROOT, outputFile);
@@ -75,12 +77,13 @@ public class TestTFileUnsortedByteArrays extends TestCase {
closeOutput();
}
- @Override
+ @After
public void tearDown() throws IOException {
fs.delete(path, true);
}
// we still can scan records in an unsorted TFile
+ @Test
public void testFailureScannerWithKeys() throws IOException {
Reader reader =
new Reader(fs.open(path), fs.getFileStatus(path).getLen(), conf);
@@ -101,6 +104,7 @@ public class TestTFileUnsortedByteArrays extends TestCase {
}
// we still can scan records in an unsorted TFile
+ @Test
public void testScan() throws IOException {
Reader reader =
new Reader(fs.open(path), fs.getFileStatus(path).getLen(), conf);
@@ -142,6 +146,7 @@ public class TestTFileUnsortedByteArrays extends TestCase {
}
// we still can scan records in an unsorted TFile
+ @Test
public void testScanRange() throws IOException {
Reader reader =
new Reader(fs.open(path), fs.getFileStatus(path).getLen(), conf);
@@ -182,6 +187,7 @@ public class TestTFileUnsortedByteArrays extends TestCase {
}
}
+ @Test
public void testFailureSeek() throws IOException {
Reader reader =
new Reader(fs.open(path), fs.getFileStatus(path).getLen(), conf);
http://git-wip-us.apache.org/repos/asf/hadoop/blob/eb4c9765/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/io/file/tfile/TestVLong.java
--
diff --git
a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/io/file/tfile/TestVLong.java
b/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/io/file/tfile/TestVLong.java
index a2bb219..9efd271 100644
---
a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/io/file/tfile/TestVLong.java
+++
b/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/io/file/tfile/TestVLong.java
@@ -21,16 +21,18 @@ package org.apache.hadoop.io.file.tfile;
import java.io.IOException;
import java.util.Random;
+import org.junit.After;
import org.junit.Assert;
-import junit.framework.TestCase;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.fs.FSDataInputStream;
import org.apache.hadoop.fs.FSDataOutputStream;
import org.apache.hadoop.fs.FileSystem;
import org.apache.hadoop.fs.Path;
+import org.junit.Before;
+import org.junit.Test;
-public class TestVLong extends TestCase {
+public class TestVLong {
private static String ROOT =
System.getProperty("test.build.data", "/tmp/tfile-test");
private Configuration conf;
@@ -38,7 +40,7 @@ public class TestVLong extends TestCase {
private Path path;
private String outputFile = "TestVLong";
- @Override
+ @Before
public void setUp() throws IOException {
conf = new Configuration();
path = new Path(ROOT, outputFile);
@@ -48,13 +50,14 @@ public class TestVLong extends TestCase {
}
}
- @Override
+ @After
public void tearDown() throws IOException {
if (fs.exists(path)) {
fs.delete(path, false);
}
}
+
hadoop git commit: HADOOP-8419. Fixed GzipCode NPE reset for IBM JDK. (Yu Li via eyang)
Repository: hadoop
Updated Branches:
refs/heads/branch-2 d5782a419 -> 123e0b16f
HADOOP-8419. Fixed GzipCode NPE reset for IBM JDK. (Yu Li via eyang)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1431740
13f79535-47bb-0310-9956-ffa450edef68
(cherry picked from commit 80648492036d7f0aaa72082a875efc7cba500782)
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/123e0b16
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/123e0b16
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/123e0b16
Branch: refs/heads/branch-2
Commit: 123e0b16f28e178651453f6118ddd3e7198ac90d
Parents: d5782a4
Author: Eric Yang
Authored: Fri Jan 11 00:00:13 2013 +
Committer: Tsuyoshi Ozawa
Committed: Thu Nov 19 01:36:24 2015 +0900
--
hadoop-common-project/hadoop-common/CHANGES.txt | 2 +
.../io/compress/TestCompressionStreamReuse.java | 161 +++
2 files changed, 163 insertions(+)
--
http://git-wip-us.apache.org/repos/asf/hadoop/blob/123e0b16/hadoop-common-project/hadoop-common/CHANGES.txt
--
diff --git a/hadoop-common-project/hadoop-common/CHANGES.txt
b/hadoop-common-project/hadoop-common/CHANGES.txt
index 891a75e..92e1e3b 100644
--- a/hadoop-common-project/hadoop-common/CHANGES.txt
+++ b/hadoop-common-project/hadoop-common/CHANGES.txt
@@ -710,6 +710,8 @@ Release 2.8.0 - UNRELEASED
HADOOP-12567: NPE in SaslRpcServer (Sergey Shelukhin via cnauroth)
+HADOOP-8419. Fixed GzipCode NPE reset for IBM JDK. (Yu Li via eyang)
+
OPTIMIZATIONS
HADOOP-12051. ProtobufRpcEngine.invoke() should use Exception.toString()
http://git-wip-us.apache.org/repos/asf/hadoop/blob/123e0b16/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/io/compress/TestCompressionStreamReuse.java
--
diff --git
a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/io/compress/TestCompressionStreamReuse.java
b/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/io/compress/TestCompressionStreamReuse.java
new file mode 100644
index 000..2c28594
--- /dev/null
+++
b/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/io/compress/TestCompressionStreamReuse.java
@@ -0,0 +1,161 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.hadoop.io.compress;
+
+import java.io.BufferedInputStream;
+import java.io.BufferedOutputStream;
+import java.io.DataInputStream;
+import java.io.DataOutputStream;
+import java.io.IOException;
+import java.util.Random;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.apache.hadoop.conf.Configuration;
+import org.apache.hadoop.io.DataInputBuffer;
+import org.apache.hadoop.io.DataOutputBuffer;
+import org.apache.hadoop.io.RandomDatum;
+import org.apache.hadoop.io.compress.zlib.ZlibFactory;
+import org.apache.hadoop.io.compress.zlib.ZlibCompressor.CompressionLevel;
+import org.apache.hadoop.io.compress.zlib.ZlibCompressor.CompressionStrategy;
+import org.apache.hadoop.util.ReflectionUtils;
+
+import junit.framework.TestCase;
+
+public class TestCompressionStreamReuse extends TestCase {
+ private static final Log LOG = LogFactory
+ .getLog(TestCompressionStreamReuse.class);
+
+ private Configuration conf = new Configuration();
+ private int count = 1;
+ private int seed = new Random().nextInt();
+
+ public void testBZip2Codec() throws IOException {
+resetStateTest(conf, seed, count,
+"org.apache.hadoop.io.compress.BZip2Codec");
+ }
+
+ public void testGzipCompressStreamReuse() throws IOException {
+resetStateTest(conf, seed, count,
+"org.apache.hadoop.io.compress.GzipCodec");
+ }
+
+ public void testGzipCompressStreamReuseWithParam() throws IOException {
+Configuration conf = new Configuration(this.conf);
+ZlibFactory
+.setCompressionLe
hadoop git commit: Moved HADOOP-8419 in CHANGES.txt from 3.0.0 to 2.8.0.
Repository: hadoop Updated Branches: refs/heads/trunk 4a3b8f1ed -> 169921e8a Moved HADOOP-8419 in CHANGES.txt from 3.0.0 to 2.8.0. Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/169921e8 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/169921e8 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/169921e8 Branch: refs/heads/trunk Commit: 169921e8abc2efef1bda69ad0d4b530488c639d8 Parents: 4a3b8f1 Author: Tsuyoshi Ozawa Authored: Thu Nov 19 01:34:20 2015 +0900 Committer: Tsuyoshi Ozawa Committed: Thu Nov 19 01:34:20 2015 +0900 -- hadoop-common-project/hadoop-common/CHANGES.txt | 2 ++ 1 file changed, 2 insertions(+) -- http://git-wip-us.apache.org/repos/asf/hadoop/blob/169921e8/hadoop-common-project/hadoop-common/CHANGES.txt -- diff --git a/hadoop-common-project/hadoop-common/CHANGES.txt b/hadoop-common-project/hadoop-common/CHANGES.txt index 6522606..94ad08a 100644 --- a/hadoop-common-project/hadoop-common/CHANGES.txt +++ b/hadoop-common-project/hadoop-common/CHANGES.txt @@ -1331,6 +1331,8 @@ Release 2.8.0 - UNRELEASED HADOOP-12567: NPE in SaslRpcServer (Sergey Shelukhin via cnauroth) +HADOOP-8419. Fixed GzipCode NPE reset for IBM JDK. (Yu Li via eyang) + OPTIMIZATIONS HADOOP-12051. ProtobufRpcEngine.invoke() should use Exception.toString()
[2/3] hadoop git commit: HADOOP-12348. MetricsSystemImpl creates MetricsSourceAdapter with wrong time unit parameter. (zxu via rkanter)
HADOOP-12348. MetricsSystemImpl creates MetricsSourceAdapter with wrong time
unit parameter. (zxu via rkanter)
(cherry picked from commit 764f8baa99de35a0ced297b19b0cbe090c615a3b)
Conflicts:
hadoop-common-project/hadoop-common/CHANGES.txt
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/d8339503
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/d8339503
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/d8339503
Branch: refs/heads/branch-2.7
Commit: d83395031761cb34ee50da5228c9404f0c6e9093
Parents: 2b7e6f7
Author: Robert Kanter
Authored: Fri Sep 11 15:21:22 2015 -0700
Committer: Tsuyoshi Ozawa
Committed: Sat Nov 14 14:50:01 2015 +0900
--
hadoop-common-project/hadoop-common/CHANGES.txt| 3 +++
.../hadoop/metrics2/impl/MetricsSourceAdapter.java | 12
.../apache/hadoop/metrics2/impl/MetricsSystemImpl.java | 12 +---
.../hadoop/metrics2/impl/TestMetricsSystemImpl.java| 13 +
4 files changed, 29 insertions(+), 11 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/hadoop/blob/d8339503/hadoop-common-project/hadoop-common/CHANGES.txt
--
diff --git a/hadoop-common-project/hadoop-common/CHANGES.txt
b/hadoop-common-project/hadoop-common/CHANGES.txt
index f7a5ef7..7c182ec 100644
--- a/hadoop-common-project/hadoop-common/CHANGES.txt
+++ b/hadoop-common-project/hadoop-common/CHANGES.txt
@@ -28,6 +28,9 @@ Release 2.7.3 - UNRELEASED
HADOOP-11361. Fix a race condition in MetricsSourceAdapter.updateJmxCache.
(Brahma Reddy Battula via ozawa)
+HADOOP-12348. MetricsSystemImpl creates MetricsSourceAdapter with wrong
+time unit parameter. (zxu via rkanter)
+
Release 2.7.2 - UNRELEASED
INCOMPATIBLE CHANGES
http://git-wip-us.apache.org/repos/asf/hadoop/blob/d8339503/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics2/impl/MetricsSourceAdapter.java
--
diff --git
a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics2/impl/MetricsSourceAdapter.java
b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics2/impl/MetricsSourceAdapter.java
index 63a5782..d27bdcb 100644
---
a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics2/impl/MetricsSourceAdapter.java
+++
b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics2/impl/MetricsSourceAdapter.java
@@ -61,7 +61,7 @@ class MetricsSourceAdapter implements DynamicMBean {
private Iterable lastRecs;
private long jmxCacheTS = 0;
- private int jmxCacheTTL;
+ private long jmxCacheTTL;
private MBeanInfo infoCache;
private ObjectName mbeanName;
private final boolean startMBeans;
@@ -69,7 +69,7 @@ class MetricsSourceAdapter implements DynamicMBean {
MetricsSourceAdapter(String prefix, String name, String description,
MetricsSource source, Iterable injectedTags,
MetricsFilter recordFilter, MetricsFilter metricFilter,
- int jmxCacheTTL, boolean startMBeans) {
+ long jmxCacheTTL, boolean startMBeans) {
this.prefix = checkNotNull(prefix, "prefix");
this.name = checkNotNull(name, "name");
this.source = checkNotNull(source, "source");
@@ -84,7 +84,7 @@ class MetricsSourceAdapter implements DynamicMBean {
MetricsSourceAdapter(String prefix, String name, String description,
MetricsSource source, Iterable injectedTags,
- int period, MetricsConfig conf) {
+ long period, MetricsConfig conf) {
this(prefix, name, description, source, injectedTags,
conf.getFilter(RECORD_FILTER_KEY),
conf.getFilter(METRIC_FILTER_KEY),
@@ -230,7 +230,11 @@ class MetricsSourceAdapter implements DynamicMBean {
return mbeanName;
}
-
+ @VisibleForTesting
+ long getJmxCacheTTL() {
+return jmxCacheTTL;
+ }
+
private void updateInfoCache() {
LOG.debug("Updating info cache...");
infoCache = infoBuilder.reset(lastRecs).get();
http://git-wip-us.apache.org/repos/asf/hadoop/blob/d8339503/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics2/impl/MetricsSystemImpl.java
--
diff --git
a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics2/impl/MetricsSystemImpl.java
b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics2/impl/MetricsSystemImpl.java
index cbdfdbd..4f9289f 100644
---
a/hadoop-common-project/hadoop-common/src/m
hadoop git commit: Move HADOOP-11361, HADOOP-12348 and HADOOP-12482 from 2.8.0 to 2.7.3 in CHANGES.txt for backporting.
Repository: hadoop
Updated Branches:
refs/heads/branch-2 1b9385c56 -> d66fe1155
Move HADOOP-11361, HADOOP-12348 and HADOOP-12482 from 2.8.0 to 2.7.3 in
CHANGES.txt for backporting.
(cherry picked from commit c753617a48bffed491b9ca7a5ca6b3d2df5721bf)
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/d66fe115
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/d66fe115
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/d66fe115
Branch: refs/heads/branch-2
Commit: d66fe1155befecd2476198981db01841f70c7474
Parents: 1b9385c
Author: Tsuyoshi Ozawa
Authored: Sat Nov 14 14:02:34 2015 +0900
Committer: Tsuyoshi Ozawa
Committed: Sat Nov 14 14:44:17 2015 +0900
--
hadoop-common-project/hadoop-common/CHANGES.txt | 16
1 file changed, 8 insertions(+), 8 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/hadoop/blob/d66fe115/hadoop-common-project/hadoop-common/CHANGES.txt
--
diff --git a/hadoop-common-project/hadoop-common/CHANGES.txt
b/hadoop-common-project/hadoop-common/CHANGES.txt
index 64af697..6333c19 100644
--- a/hadoop-common-project/hadoop-common/CHANGES.txt
+++ b/hadoop-common-project/hadoop-common/CHANGES.txt
@@ -477,9 +477,6 @@ Release 2.8.0 - UNRELEASED
HADOOP-11962. Sasl message with MD5 challenge text shouldn't be LOG out
even in debug level. (Junping Du via wheat9)
-HADOOP-11361. Fix a race condition in MetricsSourceAdapter.updateJmxCache.
-(Brahma Reddy Battula via ozawa)
-
HADOOP-8174. Remove confusing comment in Path#isAbsolute()
(Suresh Srinivas via vinayakumarb)
@@ -619,9 +616,6 @@ Release 2.8.0 - UNRELEASED
HADOOP-11797. releasedocmaker.py needs to put ASF headers on output (aw)
-HADOOP-12348. MetricsSystemImpl creates MetricsSourceAdapter with wrong
-time unit parameter. (zxu via rkanter)
-
HADOOP-12087. [JDK8] Fix javadoc errors caused by incorrect or illegal
tags. (Akira AJISAKA via stevel).
@@ -708,8 +702,6 @@ Release 2.8.0 - UNRELEASED
fails intermittently due to assumption that a lease error will be thrown.
(Gaurav Kanade via cnauroth)
-HADOOP-12482. Race condition in JMX cache update. (Tony Wu via lei)
-
HADOOP-12560: Fix sprintf warnings in {{DomainSocket.c}} introduced by
HADOOP-12344 (Mingliang Liu via Colin P. McCabe)
@@ -822,6 +814,14 @@ Release 2.7.3 - UNRELEASED
HADOOP-12374. Updated expunge command description.
(WeiWei Yang via eyang)
+HADOOP-11361. Fix a race condition in MetricsSourceAdapter.updateJmxCache.
+(Brahma Reddy Battula via ozawa)
+
+HADOOP-12348. MetricsSystemImpl creates MetricsSourceAdapter with wrong
+time unit parameter. (zxu via rkanter)
+
+HADOOP-12482. Race condition in JMX cache update. (Tony Wu via lei)
+
Release 2.7.2 - UNRELEASED
INCOMPATIBLE CHANGES
[1/3] hadoop git commit: HADOOP-11361. Fix a race condition in MetricsSourceAdapter.updateJmxCache. Contributed by Brahma Reddy Battula.
Repository: hadoop
Updated Branches:
refs/heads/branch-2.7 47dfb69a2 -> 929699f7e
HADOOP-11361. Fix a race condition in MetricsSourceAdapter.updateJmxCache.
Contributed by Brahma Reddy Battula.
(cherry picked from commit 4356e8a5ef0ac6d11a34704b80ef360a710e623a)
Conflicts:
hadoop-common-project/hadoop-common/CHANGES.txt
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/2b7e6f7d
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/2b7e6f7d
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/2b7e6f7d
Branch: refs/heads/branch-2.7
Commit: 2b7e6f7dfd09483770b44fd1d6ba4c7047b2cec0
Parents: 47dfb69
Author: Tsuyoshi Ozawa
Authored: Thu May 14 10:20:45 2015 +0900
Committer: Tsuyoshi Ozawa
Committed: Sat Nov 14 14:48:33 2015 +0900
--
hadoop-common-project/hadoop-common/CHANGES.txt| 3 +++
.../hadoop/metrics2/impl/MetricsSourceAdapter.java | 17 +++--
2 files changed, 10 insertions(+), 10 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/hadoop/blob/2b7e6f7d/hadoop-common-project/hadoop-common/CHANGES.txt
--
diff --git a/hadoop-common-project/hadoop-common/CHANGES.txt
b/hadoop-common-project/hadoop-common/CHANGES.txt
index 9fccee9..f7a5ef7 100644
--- a/hadoop-common-project/hadoop-common/CHANGES.txt
+++ b/hadoop-common-project/hadoop-common/CHANGES.txt
@@ -25,6 +25,9 @@ Release 2.7.3 - UNRELEASED
HADOOP-12374. Updated expunge command description.
(WeiWei Yang via eyang)
+HADOOP-11361. Fix a race condition in MetricsSourceAdapter.updateJmxCache.
+(Brahma Reddy Battula via ozawa)
+
Release 2.7.2 - UNRELEASED
INCOMPATIBLE CHANGES
http://git-wip-us.apache.org/repos/asf/hadoop/blob/2b7e6f7d/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics2/impl/MetricsSourceAdapter.java
--
diff --git
a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics2/impl/MetricsSourceAdapter.java
b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics2/impl/MetricsSourceAdapter.java
index b0b758c..63a5782 100644
---
a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics2/impl/MetricsSourceAdapter.java
+++
b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/metrics2/impl/MetricsSourceAdapter.java
@@ -154,31 +154,28 @@ class MetricsSourceAdapter implements DynamicMBean {
private void updateJmxCache() {
boolean getAllMetrics = false;
-synchronized(this) {
+synchronized (this) {
if (Time.now() - jmxCacheTS >= jmxCacheTTL) {
// temporarilly advance the expiry while updating the cache
jmxCacheTS = Time.now() + jmxCacheTTL;
if (lastRecs == null) {
getAllMetrics = true;
}
- }
- else {
+ } else {
return;
}
-}
-if (getAllMetrics) {
- MetricsCollectorImpl builder = new MetricsCollectorImpl();
- getMetrics(builder, true);
-}
+ if (getAllMetrics) {
+MetricsCollectorImpl builder = new MetricsCollectorImpl();
+getMetrics(builder, true);
+ }
-synchronized(this) {
updateAttrCache();
if (getAllMetrics) {
updateInfoCache();
}
jmxCacheTS = Time.now();
- lastRecs = null; // in case regular interval update is not running
+ lastRecs = null; // in case regular interval update is not running
}
}
[3/3] hadoop git commit: HADOOP-12482. Race condition in JMX cache update. (Tony Wu via lei)
HADOOP-12482. Race condition in JMX cache update. (Tony Wu via lei)
(cherry picked from commit 0eb9c60c5bec79f531da8cb3226d7e8b1d7e6639)
Conflicts:
hadoop-common-project/hadoop-common/CHANGES.txt
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/929699f7
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/929699f7
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/929699f7
Branch: refs/heads/branch-2.7
Commit: 929699f7eb692d1cc0d02cee4d36778e4cd37b96
Parents: d833950
Author: Lei Xu
Authored: Mon Nov 9 22:59:58 2015 -0800
Committer: Tsuyoshi Ozawa
Committed: Sat Nov 14 14:58:50 2015 +0900
--
hadoop-common-project/hadoop-common/CHANGES.txt | 1418 ++
.../metrics2/impl/MetricsSourceAdapter.java | 11 +-
.../metrics2/impl/TestMetricsSourceAdapter.java | 195 ++-
3 files changed, 1621 insertions(+), 3 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/hadoop/blob/929699f7/hadoop-common-project/hadoop-common/CHANGES.txt
--
diff --git a/hadoop-common-project/hadoop-common/CHANGES.txt
b/hadoop-common-project/hadoop-common/CHANGES.txt
index 7c182ec..81b7ce1 100644
--- a/hadoop-common-project/hadoop-common/CHANGES.txt
+++ b/hadoop-common-project/hadoop-common/CHANGES.txt
@@ -1,5 +1,1421 @@
Hadoop Change Log
+<<<<<<< HEAD
+===
+Trunk (Unreleased)
+
+ INCOMPATIBLE CHANGES
+
+HADOOP-8124. Remove the deprecated FSDataOutputStream constructor,
+FSDataOutputStream.sync() and Syncable.sync(). (szetszwo)
+
+HADOOP-10474 Move o.a.h.record to hadoop-streaming. (wheat9)
+
+HADOOP-9902. Shell script rewrite (aw)
+
+HADOOP-10950. rework heap management vars (John Smith via aw)
+
+HADOOP-6857. FsShell should report raw disk usage including replication
+factor. (Byron Wong via shv)
+
+HADOOP-11657. Align the output of `hadoop fs -du` to be more Unix-like.
+(aajisaka)
+
+HADOOP-11553. Formalize the shell API (aw)
+
+HADOOP-11731. Rework the changelog and releasenotes (aw)
+
+HADOOP-11627. Remove io.native.lib.available.
+(Brahma Reddy Battula via aajisaka)
+
+HADOOP-11698. Remove DistCpV1 and Logalyzer.
+(Brahma Reddy Battula via aajisaka)
+
+HADOOP-11356. Removed deprecated
o.a.h.fs.permission.AccessControlException.
+(Li Lu via wheat9)
+
+HADOOP-10787 Rename/remove non-HADOOP_*, etc from the shell scripts.
+(aw via vvasudev)
+
+ NEW FEATURES
+
+HADOOP-6590. Add a username check for hadoop sub-commands (John Smith via
+aw)
+
+HADOOP-11353. Add support for .hadooprc (aw)
+
+HADOOP-9044. add FindClass main class to provide classpath checking
+of installations (Steve Loughran via aw)
+
+HADOOP-11485. Pluggable shell integration (aw)
+
+HADOOP-11554. Expose HadoopKerberosName as a hadoop subcommand (aw)
+
+HADOOP-11565. Add --slaves shell option (aw)
+
+HADOOP-9642. Configuration to resolve environment variables via
+${env.VARIABLE} references (Kengo Seki via aw)
+
+HADOOP-7947. Validate XMLs if a relevant tool is available, when using
+scripts (Kengo Seki via aw)
+
+HADOOP-10854. unit tests for the shell scripts (aw)
+
+HADOOP-10949. metrics2 sink plugin for Apache Kafka (Babak Behzad via aw)
+
+ IMPROVEMENTS
+
+HADOOP-11203. Allow ditscp to accept bandwitdh in fraction MegaBytes
+(Raju Bairishetti via amareshwari)
+
+HADOOP-8017. Configure hadoop-main pom to get rid of M2E plugin execution
+not covered (Eric Charles via bobby)
+
+HADOOP-8015. ChRootFileSystem should extend FilterFileSystem
+(Daryn Sharp via bobby)
+
+HADOOP-7595. Upgrade dependency to Avro 1.5.3. (Alejandro Abdelnur via atm)
+
+HADOOP-8078. Add capability to turn on security in unit tests. (Jaimin
+Jetly via jitendra)
+
+HADOOP-7757. Test file reference count is at least 3x actual value (Jon
+Eagles via bobby)
+
+HADOOP-8147. test-patch should run tests with -fn to avoid masking test
+failures (Robert Evans via tgraves)
+
+HADOOP-8290. Remove remaining references to hadoop.native.lib (harsh)
+
+HADOOP-8308. Support cross-project Jenkins builds. (tomwhite)
+
+HADOOP-8297. Writable javadocs don't carry default constructor (harsh)
+
+HADOOP-8360. empty-configuration.xml fails xml validation
+(Radim Kolar via harsh)
+
+HADOOP-7659. fs -getmerge isn't guaranteed to work well over non-HDFS
+filesystems (harsh)
+
+HADOOP-8434. Add tests for Configuration setter methods.
+(Madhukara Phatak via suresh)
+
+HADOOP-8523. test-patch.sh doesn't validate patches before building
+(Jack Dintruff via jeagles)
+
+HADOOP-8719. Workaround for kerberos-related log errors upon ru
hadoop git commit: Move HADOOP-11361, HADOOP-12348 and HADOOP-12482 from 2.8.0 to 2.7.3 in CHANGES.txt for backporting.
Repository: hadoop
Updated Branches:
refs/heads/trunk 47c79a2a4 -> c753617a4
Move HADOOP-11361, HADOOP-12348 and HADOOP-12482 from 2.8.0 to 2.7.3 in
CHANGES.txt for backporting.
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/c753617a
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/c753617a
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/c753617a
Branch: refs/heads/trunk
Commit: c753617a48bffed491b9ca7a5ca6b3d2df5721bf
Parents: 47c79a2
Author: Tsuyoshi Ozawa
Authored: Sat Nov 14 14:02:34 2015 +0900
Committer: Tsuyoshi Ozawa
Committed: Sat Nov 14 14:43:34 2015 +0900
--
hadoop-common-project/hadoop-common/CHANGES.txt | 16
1 file changed, 8 insertions(+), 8 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/hadoop/blob/c753617a/hadoop-common-project/hadoop-common/CHANGES.txt
--
diff --git a/hadoop-common-project/hadoop-common/CHANGES.txt
b/hadoop-common-project/hadoop-common/CHANGES.txt
index bed2ab7..796292c 100644
--- a/hadoop-common-project/hadoop-common/CHANGES.txt
+++ b/hadoop-common-project/hadoop-common/CHANGES.txt
@@ -1101,9 +1101,6 @@ Release 2.8.0 - UNRELEASED
HADOOP-11962. Sasl message with MD5 challenge text shouldn't be LOG out
even in debug level. (Junping Du via wheat9)
-HADOOP-11361. Fix a race condition in MetricsSourceAdapter.updateJmxCache.
-(Brahma Reddy Battula via ozawa)
-
HADOOP-8174. Remove confusing comment in Path#isAbsolute()
(Suresh Srinivas via vinayakumarb)
@@ -1243,9 +1240,6 @@ Release 2.8.0 - UNRELEASED
HADOOP-11797. releasedocmaker.py needs to put ASF headers on output (aw)
-HADOOP-12348. MetricsSystemImpl creates MetricsSourceAdapter with wrong
-time unit parameter. (zxu via rkanter)
-
HADOOP-12087. [JDK8] Fix javadoc errors caused by incorrect or illegal
tags. (Akira AJISAKA via stevel).
@@ -1329,8 +1323,6 @@ Release 2.8.0 - UNRELEASED
fails intermittently due to assumption that a lease error will be thrown.
(Gaurav Kanade via cnauroth)
-HADOOP-12482. Race condition in JMX cache update. (Tony Wu via lei)
-
HADOOP-12560: Fix sprintf warnings in {{DomainSocket.c}} introduced by
HADOOP-12344 (Mingliang Liu via Colin P. McCabe)
@@ -1443,6 +1435,14 @@ Release 2.7.3 - UNRELEASED
HADOOP-12374. Updated expunge command description.
(WeiWei Yang via eyang)
+HADOOP-11361. Fix a race condition in MetricsSourceAdapter.updateJmxCache.
+(Brahma Reddy Battula via ozawa)
+
+HADOOP-12348. MetricsSystemImpl creates MetricsSourceAdapter with wrong
+time unit parameter. (zxu via rkanter)
+
+HADOOP-12482. Race condition in JMX cache update. (Tony Wu via lei)
+
Release 2.7.2 - UNRELEASED
INCOMPATIBLE CHANGES
hadoop git commit: Updated CHANGES.txt to move HADOOP-12526 to 2.6.3.
Repository: hadoop
Updated Branches:
refs/heads/branch-2 f6f128c86 -> f6cecbfce
Updated CHANGES.txt to move HADOOP-12526 to 2.6.3.
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/f6cecbfc
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/f6cecbfc
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/f6cecbfc
Branch: refs/heads/branch-2
Commit: f6cecbfce586c4870d0f6b54b9bca2a30af7b9fa
Parents: f6f128c
Author: Tsuyoshi Ozawa
Authored: Wed Nov 11 23:18:55 2015 +0900
Committer: Tsuyoshi Ozawa
Committed: Wed Nov 11 23:21:36 2015 +0900
--
hadoop-common-project/hadoop-common/CHANGES.txt | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/hadoop/blob/f6cecbfc/hadoop-common-project/hadoop-common/CHANGES.txt
--
diff --git a/hadoop-common-project/hadoop-common/CHANGES.txt
b/hadoop-common-project/hadoop-common/CHANGES.txt
index cffc4fc..dc85f81 100644
--- a/hadoop-common-project/hadoop-common/CHANGES.txt
+++ b/hadoop-common-project/hadoop-common/CHANGES.txt
@@ -708,8 +708,6 @@ Release 2.8.0 - UNRELEASED
fails intermittently due to assumption that a lease error will be thrown.
(Gaurav Kanade via cnauroth)
-HADOOP-12526. there are duplicate dependency definitions in pom's (sjlee)
-
HADOOP-12482. Race condition in JMX cache update. (Tony Wu via lei)
HADOOP-12560: Fix sprintf warnings in {{DomainSocket.c}} introduced by
@@ -1632,6 +1630,8 @@ Release 2.6.3 - UNRELEASED
BUG FIXES
+HADOOP-12526. there are duplicate dependency definitions in pom's (sjlee)
+
Release 2.6.2 - 2015-10-28
INCOMPATIBLE CHANGES
hadoop git commit: Updated CHANGES.txt to move HADOOP-12526 to 2.6.3.
Repository: hadoop Updated Branches: refs/heads/branch-2.7 0bdb51d80 -> ba7b5f3a5 Updated CHANGES.txt to move HADOOP-12526 to 2.6.3. (cherry picked from commit f6cecbfce586c4870d0f6b54b9bca2a30af7b9fa) Conflicts: hadoop-common-project/hadoop-common/CHANGES.txt Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/ba7b5f3a Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/ba7b5f3a Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/ba7b5f3a Branch: refs/heads/branch-2.7 Commit: ba7b5f3a5dedd58a504c91fcae99cc0bd75d5d31 Parents: 0bdb51d Author: Tsuyoshi Ozawa Authored: Wed Nov 11 23:18:55 2015 +0900 Committer: Tsuyoshi Ozawa Committed: Wed Nov 11 23:23:14 2015 +0900 -- hadoop-common-project/hadoop-common/CHANGES.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -- http://git-wip-us.apache.org/repos/asf/hadoop/blob/ba7b5f3a/hadoop-common-project/hadoop-common/CHANGES.txt -- diff --git a/hadoop-common-project/hadoop-common/CHANGES.txt b/hadoop-common-project/hadoop-common/CHANGES.txt index a90cc3a..e5568aa 100644 --- a/hadoop-common-project/hadoop-common/CHANGES.txt +++ b/hadoop-common-project/hadoop-common/CHANGES.txt @@ -18,8 +18,6 @@ Release 2.7.3 - UNRELEASED HADOOP-12296. when setnetgrent returns 0 in linux, exception should be thrown (Chang Li via jlowe) -HADOOP-12526. there are duplicate dependency definitions in pom's (sjlee) - Release 2.7.2 - UNRELEASED INCOMPATIBLE CHANGES @@ -832,6 +830,8 @@ Release 2.6.3 - UNRELEASED BUG FIXES +HADOOP-12526. there are duplicate dependency definitions in pom's (sjlee) + Release 2.6.2 - 2015-10-28 INCOMPATIBLE CHANGES
hadoop git commit: Updated CHANGES.txt to move HADOOP-12526 to 2.6.3.
Repository: hadoop Updated Branches: refs/heads/trunk 23d0db551 -> d90769757 Updated CHANGES.txt to move HADOOP-12526 to 2.6.3. Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/d9076975 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/d9076975 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/d9076975 Branch: refs/heads/trunk Commit: d90769757ae95770c5a5bac78110db3f9e38014f Parents: 23d0db5 Author: Tsuyoshi Ozawa Authored: Wed Nov 11 23:18:55 2015 +0900 Committer: Tsuyoshi Ozawa Committed: Wed Nov 11 23:20:49 2015 +0900 -- hadoop-common-project/hadoop-common/CHANGES.txt | 2 ++ 1 file changed, 2 insertions(+) -- http://git-wip-us.apache.org/repos/asf/hadoop/blob/d9076975/hadoop-common-project/hadoop-common/CHANGES.txt -- diff --git a/hadoop-common-project/hadoop-common/CHANGES.txt b/hadoop-common-project/hadoop-common/CHANGES.txt index 5fce6dd..920fd03 100644 --- a/hadoop-common-project/hadoop-common/CHANGES.txt +++ b/hadoop-common-project/hadoop-common/CHANGES.txt @@ -2224,6 +2224,8 @@ Release 2.6.3 - UNRELEASED BUG FIXES +HADOOP-12526. there are duplicate dependency definitions in pom's (sjlee) + Release 2.6.2 - 2015-10-28 INCOMPATIBLE CHANGES
hadoop git commit: MAPREDUCE-5763. Warn message about httpshuffle in NM logs. Contributed by Akira AJISAKA.
Repository: hadoop
Updated Branches:
refs/heads/branch-2 7802248c2 -> 1c0c77e7f
MAPREDUCE-5763. Warn message about httpshuffle in NM logs. Contributed by Akira
AJISAKA.
(cherry picked from commit 668e897538e317d96784f75b4e1f979c72225db7)
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/1c0c77e7
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/1c0c77e7
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/1c0c77e7
Branch: refs/heads/branch-2
Commit: 1c0c77e7f0101e880682d76419b88f16bd663bcd
Parents: 7802248
Author: Tsuyoshi Ozawa
Authored: Mon Nov 9 15:25:31 2015 +0900
Committer: Tsuyoshi Ozawa
Committed: Mon Nov 9 15:26:02 2015 +0900
--
hadoop-mapreduce-project/CHANGES.txt | 3 +++
.../src/main/java/org/apache/hadoop/mapred/ShuffleHandler.java| 2 +-
2 files changed, 4 insertions(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/hadoop/blob/1c0c77e7/hadoop-mapreduce-project/CHANGES.txt
--
diff --git a/hadoop-mapreduce-project/CHANGES.txt
b/hadoop-mapreduce-project/CHANGES.txt
index bab1e02..151dd54 100644
--- a/hadoop-mapreduce-project/CHANGES.txt
+++ b/hadoop-mapreduce-project/CHANGES.txt
@@ -130,6 +130,9 @@ Release 2.8.0 - UNRELEASED
MAPREDUCE-6489. Fail fast rogue tasks that write too much to local disk
(Maysam Yabandeh via jlowe)
+MAPREDUCE-5763. Warn message about httpshuffle in NM logs.
+(Akira AJISAKA via ozawa)
+
OPTIMIZATIONS
MAPREDUCE-6376. Add avro binary support for jhist files (Ray Chiang via
http://git-wip-us.apache.org/repos/asf/hadoop/blob/1c0c77e7/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-shuffle/src/main/java/org/apache/hadoop/mapred/ShuffleHandler.java
--
diff --git
a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-shuffle/src/main/java/org/apache/hadoop/mapred/ShuffleHandler.java
b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-shuffle/src/main/java/org/apache/hadoop/mapred/ShuffleHandler.java
index d24b3a4..2fb7811 100644
---
a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-shuffle/src/main/java/org/apache/hadoop/mapred/ShuffleHandler.java
+++
b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-shuffle/src/main/java/org/apache/hadoop/mapred/ShuffleHandler.java
@@ -356,7 +356,7 @@ public class ShuffleHandler extends AuxiliaryService {
}
ShuffleHandler(MetricsSystem ms) {
-super("httpshuffle");
+super(MAPREDUCE_SHUFFLE_SERVICEID);
metrics = ms.register(new ShuffleMetrics());
}
hadoop git commit: MAPREDUCE-5763. Warn message about httpshuffle in NM logs. Contributed by Akira AJISAKA.
Repository: hadoop
Updated Branches:
refs/heads/trunk 655d43442 -> 668e89753
MAPREDUCE-5763. Warn message about httpshuffle in NM logs. Contributed by Akira
AJISAKA.
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/668e8975
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/668e8975
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/668e8975
Branch: refs/heads/trunk
Commit: 668e897538e317d96784f75b4e1f979c72225db7
Parents: 655d434
Author: Tsuyoshi Ozawa
Authored: Mon Nov 9 15:25:31 2015 +0900
Committer: Tsuyoshi Ozawa
Committed: Mon Nov 9 15:25:31 2015 +0900
--
hadoop-mapreduce-project/CHANGES.txt | 3 +++
.../src/main/java/org/apache/hadoop/mapred/ShuffleHandler.java| 2 +-
2 files changed, 4 insertions(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/hadoop/blob/668e8975/hadoop-mapreduce-project/CHANGES.txt
--
diff --git a/hadoop-mapreduce-project/CHANGES.txt
b/hadoop-mapreduce-project/CHANGES.txt
index 17b7f4e..766d300 100644
--- a/hadoop-mapreduce-project/CHANGES.txt
+++ b/hadoop-mapreduce-project/CHANGES.txt
@@ -423,6 +423,9 @@ Release 2.8.0 - UNRELEASED
MAPREDUCE-6489. Fail fast rogue tasks that write too much to local disk
(Maysam Yabandeh via jlowe)
+MAPREDUCE-5763. Warn message about httpshuffle in NM logs.
+(Akira AJISAKA via ozawa)
+
OPTIMIZATIONS
MAPREDUCE-6376. Add avro binary support for jhist files (Ray Chiang via
http://git-wip-us.apache.org/repos/asf/hadoop/blob/668e8975/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-shuffle/src/main/java/org/apache/hadoop/mapred/ShuffleHandler.java
--
diff --git
a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-shuffle/src/main/java/org/apache/hadoop/mapred/ShuffleHandler.java
b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-shuffle/src/main/java/org/apache/hadoop/mapred/ShuffleHandler.java
index d24b3a4..2fb7811 100644
---
a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-shuffle/src/main/java/org/apache/hadoop/mapred/ShuffleHandler.java
+++
b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-shuffle/src/main/java/org/apache/hadoop/mapred/ShuffleHandler.java
@@ -356,7 +356,7 @@ public class ShuffleHandler extends AuxiliaryService {
}
ShuffleHandler(MetricsSystem ms) {
-super("httpshuffle");
+super(MAPREDUCE_SHUFFLE_SERVICEID);
metrics = ms.register(new ShuffleMetrics());
}
hadoop git commit: YARN-4320. TestJobHistoryEventHandler fails as AHS in MiniYarnCluster no longer binds to default port 8188. Contributed by Varun Saxena.
Repository: hadoop
Updated Branches:
refs/heads/branch-2.7 663644191 -> c84ec0657
YARN-4320. TestJobHistoryEventHandler fails as AHS in MiniYarnCluster no longer
binds to default port 8188. Contributed by Varun Saxena.
(cherry picked from commit ce31b22739512804da38cf87e0ce1059e3128da3)
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/c84ec065
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/c84ec065
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/c84ec065
Branch: refs/heads/branch-2.7
Commit: c84ec0657f444b8114ef56a0a565d09c6ce11666
Parents: 6636441
Author: Tsuyoshi Ozawa
Authored: Fri Oct 30 17:51:39 2015 +0900
Committer: Tsuyoshi Ozawa
Committed: Fri Oct 30 18:00:45 2015 +0900
--
.../mapreduce/jobhistory/TestJobHistoryEventHandler.java | 10 +++---
hadoop-yarn-project/CHANGES.txt | 3 +++
.../ApplicationHistoryServer.java | 2 +-
3 files changed, 11 insertions(+), 4 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/hadoop/blob/c84ec065/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/test/java/org/apache/hadoop/mapreduce/jobhistory/TestJobHistoryEventHandler.java
--
diff --git
a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/test/java/org/apache/hadoop/mapreduce/jobhistory/TestJobHistoryEventHandler.java
b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/test/java/org/apache/hadoop/mapreduce/jobhistory/TestJobHistoryEventHandler.java
index 2b07efb..f213b32 100644
---
a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/test/java/org/apache/hadoop/mapreduce/jobhistory/TestJobHistoryEventHandler.java
+++
b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/test/java/org/apache/hadoop/mapreduce/jobhistory/TestJobHistoryEventHandler.java
@@ -489,9 +489,6 @@ public class TestJobHistoryEventHandler {
TestParams t = new TestParams(false);
Configuration conf = new YarnConfiguration();
conf.setBoolean(YarnConfiguration.TIMELINE_SERVICE_ENABLED, true);
-conf.setBoolean(MRJobConfig.MAPREDUCE_JOB_EMIT_TIMELINE_DATA, true);
-JHEvenHandlerForTest jheh = new JHEvenHandlerForTest(t.mockAppContext, 0);
-jheh.init(conf);
MiniYARNCluster yarnCluster = null;
long currentTime = System.currentTimeMillis();
try {
@@ -499,6 +496,13 @@ public class TestJobHistoryEventHandler {
TestJobHistoryEventHandler.class.getSimpleName(), 1, 1, 1, 1);
yarnCluster.init(conf);
yarnCluster.start();
+ Configuration confJHEH = new YarnConfiguration(conf);
+ confJHEH.setBoolean(MRJobConfig.MAPREDUCE_JOB_EMIT_TIMELINE_DATA, true);
+ confJHEH.set(YarnConfiguration.TIMELINE_SERVICE_WEBAPP_ADDRESS,
+ MiniYARNCluster.getHostname() + ":" +
+ yarnCluster.getApplicationHistoryServer().getPort());
+ JHEvenHandlerForTest jheh = new JHEvenHandlerForTest(t.mockAppContext,
0);
+ jheh.init(confJHEH);
jheh.start();
TimelineStore ts = yarnCluster.getApplicationHistoryServer()
.getTimelineStore();
http://git-wip-us.apache.org/repos/asf/hadoop/blob/c84ec065/hadoop-yarn-project/CHANGES.txt
--
diff --git a/hadoop-yarn-project/CHANGES.txt b/hadoop-yarn-project/CHANGES.txt
index a0dc87a..1fb8292 100644
--- a/hadoop-yarn-project/CHANGES.txt
+++ b/hadoop-yarn-project/CHANGES.txt
@@ -109,6 +109,9 @@ Release 2.7.2 - UNRELEASED
YARN-4312. TestSubmitApplicationWithRMHA fails on branch-2.7 and branch-2.6
as some of the test cases time out. (Varun Saxena via ozawa)
+YARN-4320. TestJobHistoryEventHandler fails as AHS in MiniYarnCluster no
longer
+binds to default port 8188. (Varun Saxena via ozawa)
+
Release 2.7.1 - 2015-07-06
INCOMPATIBLE CHANGES
http://git-wip-us.apache.org/repos/asf/hadoop/blob/c84ec065/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/main/java/org/apache/hadoop/yarn/server/applicationhistoryservice/ApplicationHistoryServer.java
--
diff --git
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/main/java/org/apache/hadoop/yarn/server/applicationhistoryservice/ApplicationHistoryServer.java
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/main/java/org/apache/hadoop/yarn/server/applicationhistoryservice/ApplicationHistoryServer.java
index 5777b1b..f915181 100644
---
hadoop git commit: YARN-4320. TestJobHistoryEventHandler fails as AHS in MiniYarnCluster no longer binds to default port 8188. Contributed by Varun Saxena.
Repository: hadoop
Updated Branches:
refs/heads/trunk d21214ce3 -> ce31b2273
YARN-4320. TestJobHistoryEventHandler fails as AHS in MiniYarnCluster no longer
binds to default port 8188. Contributed by Varun Saxena.
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/ce31b227
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/ce31b227
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/ce31b227
Branch: refs/heads/trunk
Commit: ce31b22739512804da38cf87e0ce1059e3128da3
Parents: d21214c
Author: Tsuyoshi Ozawa
Authored: Fri Oct 30 17:51:39 2015 +0900
Committer: Tsuyoshi Ozawa
Committed: Fri Oct 30 18:00:20 2015 +0900
--
.../mapreduce/jobhistory/TestJobHistoryEventHandler.java | 10 +++---
hadoop-yarn-project/CHANGES.txt | 3 +++
.../ApplicationHistoryServer.java | 2 +-
3 files changed, 11 insertions(+), 4 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/hadoop/blob/ce31b227/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/test/java/org/apache/hadoop/mapreduce/jobhistory/TestJobHistoryEventHandler.java
--
diff --git
a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/test/java/org/apache/hadoop/mapreduce/jobhistory/TestJobHistoryEventHandler.java
b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/test/java/org/apache/hadoop/mapreduce/jobhistory/TestJobHistoryEventHandler.java
index 2b07efb..f213b32 100644
---
a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/test/java/org/apache/hadoop/mapreduce/jobhistory/TestJobHistoryEventHandler.java
+++
b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/test/java/org/apache/hadoop/mapreduce/jobhistory/TestJobHistoryEventHandler.java
@@ -489,9 +489,6 @@ public class TestJobHistoryEventHandler {
TestParams t = new TestParams(false);
Configuration conf = new YarnConfiguration();
conf.setBoolean(YarnConfiguration.TIMELINE_SERVICE_ENABLED, true);
-conf.setBoolean(MRJobConfig.MAPREDUCE_JOB_EMIT_TIMELINE_DATA, true);
-JHEvenHandlerForTest jheh = new JHEvenHandlerForTest(t.mockAppContext, 0);
-jheh.init(conf);
MiniYARNCluster yarnCluster = null;
long currentTime = System.currentTimeMillis();
try {
@@ -499,6 +496,13 @@ public class TestJobHistoryEventHandler {
TestJobHistoryEventHandler.class.getSimpleName(), 1, 1, 1, 1);
yarnCluster.init(conf);
yarnCluster.start();
+ Configuration confJHEH = new YarnConfiguration(conf);
+ confJHEH.setBoolean(MRJobConfig.MAPREDUCE_JOB_EMIT_TIMELINE_DATA, true);
+ confJHEH.set(YarnConfiguration.TIMELINE_SERVICE_WEBAPP_ADDRESS,
+ MiniYARNCluster.getHostname() + ":" +
+ yarnCluster.getApplicationHistoryServer().getPort());
+ JHEvenHandlerForTest jheh = new JHEvenHandlerForTest(t.mockAppContext,
0);
+ jheh.init(confJHEH);
jheh.start();
TimelineStore ts = yarnCluster.getApplicationHistoryServer()
.getTimelineStore();
http://git-wip-us.apache.org/repos/asf/hadoop/blob/ce31b227/hadoop-yarn-project/CHANGES.txt
--
diff --git a/hadoop-yarn-project/CHANGES.txt b/hadoop-yarn-project/CHANGES.txt
index 2151136..874397d 100644
--- a/hadoop-yarn-project/CHANGES.txt
+++ b/hadoop-yarn-project/CHANGES.txt
@@ -1150,6 +1150,9 @@ Release 2.7.2 - UNRELEASED
YARN-4312. TestSubmitApplicationWithRMHA fails on branch-2.7 and branch-2.6
as some of the test cases time out. (Varun Saxena via ozawa)
+YARN-4320. TestJobHistoryEventHandler fails as AHS in MiniYarnCluster no
longer
+binds to default port 8188. (Varun Saxena via ozawa)
+
Release 2.7.1 - 2015-07-06
INCOMPATIBLE CHANGES
http://git-wip-us.apache.org/repos/asf/hadoop/blob/ce31b227/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/main/java/org/apache/hadoop/yarn/server/applicationhistoryservice/ApplicationHistoryServer.java
--
diff --git
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/main/java/org/apache/hadoop/yarn/server/applicationhistoryservice/ApplicationHistoryServer.java
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/main/java/org/apache/hadoop/yarn/server/applicationhistoryservice/ApplicationHistoryServer.java
index 111a85f..21e1c1a 100644
---
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoo
hadoop git commit: YARN-4320. TestJobHistoryEventHandler fails as AHS in MiniYarnCluster no longer binds to default port 8188. Contributed by Varun Saxena.
Repository: hadoop
Updated Branches:
refs/heads/branch-2 dd144035a -> 1c80473a4
YARN-4320. TestJobHistoryEventHandler fails as AHS in MiniYarnCluster no longer
binds to default port 8188. Contributed by Varun Saxena.
(cherry picked from commit ce31b22739512804da38cf87e0ce1059e3128da3)
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/1c80473a
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/1c80473a
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/1c80473a
Branch: refs/heads/branch-2
Commit: 1c80473a41bd3cac58878bf5587f935d33096077
Parents: dd14403
Author: Tsuyoshi Ozawa
Authored: Fri Oct 30 17:51:39 2015 +0900
Committer: Tsuyoshi Ozawa
Committed: Fri Oct 30 18:00:35 2015 +0900
--
.../mapreduce/jobhistory/TestJobHistoryEventHandler.java | 10 +++---
hadoop-yarn-project/CHANGES.txt | 3 +++
.../ApplicationHistoryServer.java | 2 +-
3 files changed, 11 insertions(+), 4 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/hadoop/blob/1c80473a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/test/java/org/apache/hadoop/mapreduce/jobhistory/TestJobHistoryEventHandler.java
--
diff --git
a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/test/java/org/apache/hadoop/mapreduce/jobhistory/TestJobHistoryEventHandler.java
b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/test/java/org/apache/hadoop/mapreduce/jobhistory/TestJobHistoryEventHandler.java
index 2b07efb..f213b32 100644
---
a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/test/java/org/apache/hadoop/mapreduce/jobhistory/TestJobHistoryEventHandler.java
+++
b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/test/java/org/apache/hadoop/mapreduce/jobhistory/TestJobHistoryEventHandler.java
@@ -489,9 +489,6 @@ public class TestJobHistoryEventHandler {
TestParams t = new TestParams(false);
Configuration conf = new YarnConfiguration();
conf.setBoolean(YarnConfiguration.TIMELINE_SERVICE_ENABLED, true);
-conf.setBoolean(MRJobConfig.MAPREDUCE_JOB_EMIT_TIMELINE_DATA, true);
-JHEvenHandlerForTest jheh = new JHEvenHandlerForTest(t.mockAppContext, 0);
-jheh.init(conf);
MiniYARNCluster yarnCluster = null;
long currentTime = System.currentTimeMillis();
try {
@@ -499,6 +496,13 @@ public class TestJobHistoryEventHandler {
TestJobHistoryEventHandler.class.getSimpleName(), 1, 1, 1, 1);
yarnCluster.init(conf);
yarnCluster.start();
+ Configuration confJHEH = new YarnConfiguration(conf);
+ confJHEH.setBoolean(MRJobConfig.MAPREDUCE_JOB_EMIT_TIMELINE_DATA, true);
+ confJHEH.set(YarnConfiguration.TIMELINE_SERVICE_WEBAPP_ADDRESS,
+ MiniYARNCluster.getHostname() + ":" +
+ yarnCluster.getApplicationHistoryServer().getPort());
+ JHEvenHandlerForTest jheh = new JHEvenHandlerForTest(t.mockAppContext,
0);
+ jheh.init(confJHEH);
jheh.start();
TimelineStore ts = yarnCluster.getApplicationHistoryServer()
.getTimelineStore();
http://git-wip-us.apache.org/repos/asf/hadoop/blob/1c80473a/hadoop-yarn-project/CHANGES.txt
--
diff --git a/hadoop-yarn-project/CHANGES.txt b/hadoop-yarn-project/CHANGES.txt
index 9f0455a..f94e67b 100644
--- a/hadoop-yarn-project/CHANGES.txt
+++ b/hadoop-yarn-project/CHANGES.txt
@@ -1098,6 +1098,9 @@ Release 2.7.2 - UNRELEASED
YARN-4312. TestSubmitApplicationWithRMHA fails on branch-2.7 and branch-2.6
as some of the test cases time out. (Varun Saxena via ozawa)
+YARN-4320. TestJobHistoryEventHandler fails as AHS in MiniYarnCluster no
longer
+binds to default port 8188. (Varun Saxena via ozawa)
+
Release 2.7.1 - 2015-07-06
INCOMPATIBLE CHANGES
http://git-wip-us.apache.org/repos/asf/hadoop/blob/1c80473a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/main/java/org/apache/hadoop/yarn/server/applicationhistoryservice/ApplicationHistoryServer.java
--
diff --git
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/main/java/org/apache/hadoop/yarn/server/applicationhistoryservice/ApplicationHistoryServer.java
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-applicationhistoryservice/src/main/java/org/apache/hadoop/yarn/server/applicationhistoryservice/ApplicationHistoryServer.java
index 111a85f..21e1c1a 100644
---
hadoop git commit: Add an entry of YARN-4312 to CHANGES.txt
Repository: hadoop Updated Branches: refs/heads/trunk f072eb5a2 -> d21214ce3 Add an entry of YARN-4312 to CHANGES.txt Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/d21214ce Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/d21214ce Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/d21214ce Branch: refs/heads/trunk Commit: d21214ce33cb176926aa3ae5a9f4efe00f66480b Parents: f072eb5 Author: Tsuyoshi Ozawa Authored: Fri Oct 30 17:56:59 2015 +0900 Committer: Tsuyoshi Ozawa Committed: Fri Oct 30 17:56:59 2015 +0900 -- hadoop-yarn-project/CHANGES.txt | 3 +++ 1 file changed, 3 insertions(+) -- http://git-wip-us.apache.org/repos/asf/hadoop/blob/d21214ce/hadoop-yarn-project/CHANGES.txt -- diff --git a/hadoop-yarn-project/CHANGES.txt b/hadoop-yarn-project/CHANGES.txt index 78c18d5..2151136 100644 --- a/hadoop-yarn-project/CHANGES.txt +++ b/hadoop-yarn-project/CHANGES.txt @@ -1147,6 +1147,9 @@ Release 2.7.2 - UNRELEASED YARN-3580. [JDK8] TestClientRMService.testGetLabelsToNodes fails. (Robert Kanter via junping_du) +YARN-4312. TestSubmitApplicationWithRMHA fails on branch-2.7 and branch-2.6 +as some of the test cases time out. (Varun Saxena via ozawa) + Release 2.7.1 - 2015-07-06 INCOMPATIBLE CHANGES
hadoop git commit: Add an entry of YARN-4312 to CHANGES.txt
Repository: hadoop Updated Branches: refs/heads/branch-2 c522a9ffc -> dd144035a Add an entry of YARN-4312 to CHANGES.txt (cherry picked from commit d21214ce33cb176926aa3ae5a9f4efe00f66480b) Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/dd144035 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/dd144035 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/dd144035 Branch: refs/heads/branch-2 Commit: dd144035a0619f1b7e993e6ba2d8fb64c83a2a33 Parents: c522a9f Author: Tsuyoshi Ozawa Authored: Fri Oct 30 17:56:59 2015 +0900 Committer: Tsuyoshi Ozawa Committed: Fri Oct 30 17:57:29 2015 +0900 -- hadoop-yarn-project/CHANGES.txt | 3 +++ 1 file changed, 3 insertions(+) -- http://git-wip-us.apache.org/repos/asf/hadoop/blob/dd144035/hadoop-yarn-project/CHANGES.txt -- diff --git a/hadoop-yarn-project/CHANGES.txt b/hadoop-yarn-project/CHANGES.txt index 548e5e1..9f0455a 100644 --- a/hadoop-yarn-project/CHANGES.txt +++ b/hadoop-yarn-project/CHANGES.txt @@ -1095,6 +1095,9 @@ Release 2.7.2 - UNRELEASED YARN-3580. [JDK8] TestClientRMService.testGetLabelsToNodes fails. (Robert Kanter via junping_du) +YARN-4312. TestSubmitApplicationWithRMHA fails on branch-2.7 and branch-2.6 +as some of the test cases time out. (Varun Saxena via ozawa) + Release 2.7.1 - 2015-07-06 INCOMPATIBLE CHANGES
hadoop git commit: YARN-4312. TestSubmitApplicationWithRMHA fails on branch-2.7 and branch-2.6 as some of the test cases time out. Contributed by Varun Saxena.
Repository: hadoop
Updated Branches:
refs/heads/branch-2.7 da564ef9a -> 663644191
YARN-4312. TestSubmitApplicationWithRMHA fails on branch-2.7 and branch-2.6 as
some of the test cases time out. Contributed by Varun Saxena.
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/66364419
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/66364419
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/66364419
Branch: refs/heads/branch-2.7
Commit: 66364419118c64c9d1c623f808f027ac45688759
Parents: da564ef
Author: Tsuyoshi Ozawa
Authored: Fri Oct 30 16:25:44 2015 +0900
Committer: Tsuyoshi Ozawa
Committed: Fri Oct 30 16:25:52 2015 +0900
--
hadoop-yarn-project/CHANGES.txt | 3 +++
.../server/resourcemanager/TestSubmitApplicationWithRMHA.java| 4 ++--
2 files changed, 5 insertions(+), 2 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/hadoop/blob/66364419/hadoop-yarn-project/CHANGES.txt
--
diff --git a/hadoop-yarn-project/CHANGES.txt b/hadoop-yarn-project/CHANGES.txt
index ca843b6..a0dc87a 100644
--- a/hadoop-yarn-project/CHANGES.txt
+++ b/hadoop-yarn-project/CHANGES.txt
@@ -106,6 +106,9 @@ Release 2.7.2 - UNRELEASED
YARN-3580. [JDK8] TestClientRMService.testGetLabelsToNodes fails. (Robert
Kanter
via junping_du)
+YARN-4312. TestSubmitApplicationWithRMHA fails on branch-2.7 and branch-2.6
+as some of the test cases time out. (Varun Saxena via ozawa)
+
Release 2.7.1 - 2015-07-06
INCOMPATIBLE CHANGES
http://git-wip-us.apache.org/repos/asf/hadoop/blob/66364419/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/TestSubmitApplicationWithRMHA.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/TestSubmitApplicationWithRMHA.java
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/TestSubmitApplicationWithRMHA.java
index 4cceddd..4658d60 100644
---
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/TestSubmitApplicationWithRMHA.java
+++
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/TestSubmitApplicationWithRMHA.java
@@ -224,7 +224,7 @@ public class TestSubmitApplicationWithRMHA extends
RMHATestBase{
// during SubmitApplication Call:
// 1) RMStateStore already saved the ApplicationState when failover happens
// 2) RMStateStore did not save the ApplicationState when failover happens
- @Test (timeout = 5000)
+ @Test (timeout = 5)
public void
testHandleRMHADuringSubmitApplicationCallWithSavedApplicationState()
throws Exception {
@@ -260,7 +260,7 @@ public class TestSubmitApplicationWithRMHA extends
RMHATestBase{
Assert.assertEquals(app1.getApplicationId(), app0.getApplicationId());
}
- @Test (timeout = 5000)
+ @Test (timeout = 5)
public void
testHandleRMHADuringSubmitApplicationCallWithoutSavedApplicationState()
throws Exception {
hadoop git commit: YARN-3580. [JDK8] TestClientRMService.testGetLabelsToNodes fails. Contributed by Robert Kanter.
Repository: hadoop
Updated Branches:
refs/heads/branch-2.7 ceefabc44 -> da564ef9a
YARN-3580. [JDK8] TestClientRMService.testGetLabelsToNodes fails. Contributed
by Robert Kanter.
(cherry picked from commit 31b627b2a8755dec0820d01f6f7ac96e4c6194e2)
Conflicts:
hadoop-yarn-project/CHANGES.txt
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/da564ef9
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/da564ef9
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/da564ef9
Branch: refs/heads/branch-2.7
Commit: da564ef9a771309ac744a773160202b23d0c67e3
Parents: ceefabc
Author: Junping Du
Authored: Wed May 6 16:49:16 2015 -0700
Committer: Tsuyoshi Ozawa
Committed: Fri Oct 30 15:59:40 2015 +0900
--
hadoop-yarn-project/CHANGES.txt | 3 ++
.../resourcemanager/TestClientRMService.java| 45 ++--
2 files changed, 25 insertions(+), 23 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/hadoop/blob/da564ef9/hadoop-yarn-project/CHANGES.txt
--
diff --git a/hadoop-yarn-project/CHANGES.txt b/hadoop-yarn-project/CHANGES.txt
index 232bf95..ca843b6 100644
--- a/hadoop-yarn-project/CHANGES.txt
+++ b/hadoop-yarn-project/CHANGES.txt
@@ -103,6 +103,9 @@ Release 2.7.2 - UNRELEASED
YARN-4313. Race condition in MiniMRYarnCluster when getting history server
address. (Jian He via xgong)
+YARN-3580. [JDK8] TestClientRMService.testGetLabelsToNodes fails. (Robert
Kanter
+via junping_du)
+
Release 2.7.1 - 2015-07-06
INCOMPATIBLE CHANGES
http://git-wip-us.apache.org/repos/asf/hadoop/blob/da564ef9/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/TestClientRMService.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/TestClientRMService.java
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/TestClientRMService.java
index 7014a29..26f4925 100644
---
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/TestClientRMService.java
+++
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/TestClientRMService.java
@@ -1409,9 +1409,11 @@ public class TestClientRMService {
RMNodeLabelsManager labelsMgr = rm.getRMContext().getNodeLabelManager();
labelsMgr.addToCluserNodeLabels(ImmutableSet.of("x", "y"));
+NodeId node1 = NodeId.newInstance("host1", 1234);
+NodeId node2 = NodeId.newInstance("host2", 1234);
Map> map = new HashMap>();
-map.put(NodeId.newInstance("host1", 0), ImmutableSet.of("x"));
-map.put(NodeId.newInstance("host2", 0), ImmutableSet.of("y"));
+map.put(node1, ImmutableSet.of("x"));
+map.put(node2, ImmutableSet.of("y"));
labelsMgr.replaceLabelsOnNode(map);
// Create a client.
@@ -1434,12 +1436,9 @@ public class TestClientRMService {
client.getNodeToLabels(GetNodesToLabelsRequest.newInstance());
Map> nodeToLabels = response1.getNodeToLabels();
Assert.assertTrue(nodeToLabels.keySet().containsAll(
-Arrays.asList(NodeId.newInstance("host1", 0),
-NodeId.newInstance("host2", 0;
-Assert.assertTrue(nodeToLabels.get(NodeId.newInstance("host1", 0))
-.containsAll(Arrays.asList("x")));
-Assert.assertTrue(nodeToLabels.get(NodeId.newInstance("host2", 0))
-.containsAll(Arrays.asList("y")));
+Arrays.asList(node1, node2)));
+Assert.assertTrue(nodeToLabels.get(node1).containsAll(Arrays.asList("x")));
+Assert.assertTrue(nodeToLabels.get(node2).containsAll(Arrays.asList("y")));
rpc.stopProxy(client, conf);
rm.close();
@@ -1459,12 +1458,17 @@ public class TestClientRMService {
RMNodeLabelsManager labelsMgr = rm.getRMContext().getNodeLabelManager();
labelsMgr.addToCluserNodeLabels(ImmutableSet.of("x", "y", "z"));
+NodeId node1A = NodeId.newInstance("host1", 1234);
+NodeId node1B = NodeId.newInstance("host1", 5678);
+NodeId node2A = NodeId.newInstance("host2", 1234);
+NodeId node3A = NodeId.newInstance(
hadoop git commit: Move YARN-3580 in CHANGES.txt from 2.8 to 2.7.2.
Repository: hadoop Updated Branches: refs/heads/branch-2 b505bf9e5 -> c522a9ffc Move YARN-3580 in CHANGES.txt from 2.8 to 2.7.2. (cherry picked from commit d2e01f4ed87c3c41156ec9a68855f923f8c0adf9) Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/c522a9ff Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/c522a9ff Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/c522a9ff Branch: refs/heads/branch-2 Commit: c522a9ffc2bebde7990bb090753dcf62708c91a9 Parents: b505bf9 Author: Tsuyoshi Ozawa Authored: Fri Oct 30 15:49:06 2015 +0900 Committer: Tsuyoshi Ozawa Committed: Fri Oct 30 15:51:04 2015 +0900 -- hadoop-yarn-project/CHANGES.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) -- http://git-wip-us.apache.org/repos/asf/hadoop/blob/c522a9ff/hadoop-yarn-project/CHANGES.txt -- diff --git a/hadoop-yarn-project/CHANGES.txt b/hadoop-yarn-project/CHANGES.txt index b7c822e..548e5e1 100644 --- a/hadoop-yarn-project/CHANGES.txt +++ b/hadoop-yarn-project/CHANGES.txt @@ -637,9 +637,6 @@ Release 2.8.0 - UNRELEASED YARN-3582. NPE in WebAppProxyServlet. (jian he via xgong) -YARN-3580. [JDK8] TestClientRMService.testGetLabelsToNodes fails. (Robert Kanter -via junping_du) - YARN-3577. Misspelling of threshold in log4j.properties for tests. (Brahma Reddy Battula via aajisaka) @@ -1095,6 +1092,9 @@ Release 2.7.2 - UNRELEASED YARN-4313. Race condition in MiniMRYarnCluster when getting history server address. (Jian He via xgong) +YARN-3580. [JDK8] TestClientRMService.testGetLabelsToNodes fails. (Robert Kanter +via junping_du) + Release 2.7.1 - 2015-07-06 INCOMPATIBLE CHANGES
hadoop git commit: Move YARN-3580 in CHANGES.txt from 2.8 to 2.7.2.
Repository: hadoop Updated Branches: refs/heads/trunk 7412ff48e -> d2e01f4ed Move YARN-3580 in CHANGES.txt from 2.8 to 2.7.2. Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/d2e01f4e Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/d2e01f4e Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/d2e01f4e Branch: refs/heads/trunk Commit: d2e01f4ed87c3c41156ec9a68855f923f8c0adf9 Parents: 7412ff4 Author: Tsuyoshi Ozawa Authored: Fri Oct 30 15:49:06 2015 +0900 Committer: Tsuyoshi Ozawa Committed: Fri Oct 30 15:49:06 2015 +0900 -- hadoop-yarn-project/CHANGES.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) -- http://git-wip-us.apache.org/repos/asf/hadoop/blob/d2e01f4e/hadoop-yarn-project/CHANGES.txt -- diff --git a/hadoop-yarn-project/CHANGES.txt b/hadoop-yarn-project/CHANGES.txt index d0fa27d..78c18d5 100644 --- a/hadoop-yarn-project/CHANGES.txt +++ b/hadoop-yarn-project/CHANGES.txt @@ -689,9 +689,6 @@ Release 2.8.0 - UNRELEASED YARN-3582. NPE in WebAppProxyServlet. (jian he via xgong) -YARN-3580. [JDK8] TestClientRMService.testGetLabelsToNodes fails. (Robert Kanter -via junping_du) - YARN-3577. Misspelling of threshold in log4j.properties for tests. (Brahma Reddy Battula via aajisaka) @@ -1147,6 +1144,9 @@ Release 2.7.2 - UNRELEASED YARN-4313. Race condition in MiniMRYarnCluster when getting history server address. (Jian He via xgong) +YARN-3580. [JDK8] TestClientRMService.testGetLabelsToNodes fails. (Robert Kanter +via junping_du) + Release 2.7.1 - 2015-07-06 INCOMPATIBLE CHANGES
hadoop git commit: YARN-4251. TestAMRMClientOnRMRestart#testAMRMClientOnAMRMTokenRollOverOnRMRestart is failing. Contributed by Brahma Reddy Battula.
Repository: hadoop
Updated Branches:
refs/heads/branch-2 7b90f7463 -> d29bff86c
YARN-4251.
TestAMRMClientOnRMRestart#testAMRMClientOnAMRMTokenRollOverOnRMRestart is
failing. Contributed by Brahma Reddy Battula.
(cherry picked from commit 9f4dfdf4eb60cc6b13da586dabcd95bd77fc783c)
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/d29bff86
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/d29bff86
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/d29bff86
Branch: refs/heads/branch-2
Commit: d29bff86c4511d1d3bcbe42673dba44b4d6189b7
Parents: 7b90f74
Author: Tsuyoshi Ozawa
Authored: Wed Oct 28 17:39:12 2015 +0900
Committer: Tsuyoshi Ozawa
Committed: Wed Oct 28 17:39:26 2015 +0900
--
hadoop-yarn-project/CHANGES.txt | 3 +++
.../hadoop/yarn/client/api/impl/TestAMRMClientOnRMRestart.java | 4 +++-
2 files changed, 6 insertions(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/hadoop/blob/d29bff86/hadoop-yarn-project/CHANGES.txt
--
diff --git a/hadoop-yarn-project/CHANGES.txt b/hadoop-yarn-project/CHANGES.txt
index fe804a2..4c98b87 100644
--- a/hadoop-yarn-project/CHANGES.txt
+++ b/hadoop-yarn-project/CHANGES.txt
@@ -976,6 +976,9 @@ Release 2.8.0 - UNRELEASED
YARN-4302. SLS not able start due to NPE in SchedulerApplicationAttempt
(Bibin A Chundatt via vvasudev)
+YARN-4251.
TestAMRMClientOnRMRestart#testAMRMClientOnAMRMTokenRollOverOnRMRestart
+is failing. (Brahma Reddy Battula via ozawa)
+
Release 2.7.2 - UNRELEASED
INCOMPATIBLE CHANGES
http://git-wip-us.apache.org/repos/asf/hadoop/blob/d29bff86/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/test/java/org/apache/hadoop/yarn/client/api/impl/TestAMRMClientOnRMRestart.java
--
diff --git
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/test/java/org/apache/hadoop/yarn/client/api/impl/TestAMRMClientOnRMRestart.java
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/test/java/org/apache/hadoop/yarn/client/api/impl/TestAMRMClientOnRMRestart.java
index 2394747..65c85d9 100644
---
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/test/java/org/apache/hadoop/yarn/client/api/impl/TestAMRMClientOnRMRestart.java
+++
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/test/java/org/apache/hadoop/yarn/client/api/impl/TestAMRMClientOnRMRestart.java
@@ -27,6 +27,7 @@ import java.util.List;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.net.NetworkTopology;
+import org.apache.hadoop.net.ServerSocketUtil;
import org.apache.hadoop.security.SecurityUtil;
import org.apache.hadoop.security.UserGroupInformation;
import org.apache.hadoop.security.token.SecretManager.InvalidToken;
@@ -458,7 +459,8 @@ public class TestAMRMClientOnRMRestart {
.getMasterKey().getKeyId() == newToken.decodeIdentifier().getKeyId());
// start 2nd RM
-conf.set(YarnConfiguration.RM_SCHEDULER_ADDRESS, "0.0.0.0:9030");
+conf.set(YarnConfiguration.RM_SCHEDULER_ADDRESS, "0.0.0.0:"
++ ServerSocketUtil.getPort(45020, 10));
final MyResourceManager2 rm2 = new MyResourceManager2(conf, memStore);
rm2.start();
nm1.setResourceTrackerService(rm2.getResourceTrackerService());
hadoop git commit: YARN-4251. TestAMRMClientOnRMRestart#testAMRMClientOnAMRMTokenRollOverOnRMRestart is failing. Contributed by Brahma Reddy Battula.
Repository: hadoop
Updated Branches:
refs/heads/trunk c201cf951 -> 9f4dfdf4e
YARN-4251.
TestAMRMClientOnRMRestart#testAMRMClientOnAMRMTokenRollOverOnRMRestart is
failing. Contributed by Brahma Reddy Battula.
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/9f4dfdf4
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/9f4dfdf4
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/9f4dfdf4
Branch: refs/heads/trunk
Commit: 9f4dfdf4eb60cc6b13da586dabcd95bd77fc783c
Parents: c201cf9
Author: Tsuyoshi Ozawa
Authored: Wed Oct 28 17:39:12 2015 +0900
Committer: Tsuyoshi Ozawa
Committed: Wed Oct 28 17:39:12 2015 +0900
--
hadoop-yarn-project/CHANGES.txt | 3 +++
.../hadoop/yarn/client/api/impl/TestAMRMClientOnRMRestart.java | 4 +++-
2 files changed, 6 insertions(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/hadoop/blob/9f4dfdf4/hadoop-yarn-project/CHANGES.txt
--
diff --git a/hadoop-yarn-project/CHANGES.txt b/hadoop-yarn-project/CHANGES.txt
index f5a3a83..26ea1f2 100644
--- a/hadoop-yarn-project/CHANGES.txt
+++ b/hadoop-yarn-project/CHANGES.txt
@@ -1028,6 +1028,9 @@ Release 2.8.0 - UNRELEASED
YARN-4302. SLS not able start due to NPE in SchedulerApplicationAttempt
(Bibin A Chundatt via vvasudev)
+YARN-4251.
TestAMRMClientOnRMRestart#testAMRMClientOnAMRMTokenRollOverOnRMRestart
+is failing. (Brahma Reddy Battula via ozawa)
+
Release 2.7.2 - UNRELEASED
INCOMPATIBLE CHANGES
http://git-wip-us.apache.org/repos/asf/hadoop/blob/9f4dfdf4/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/test/java/org/apache/hadoop/yarn/client/api/impl/TestAMRMClientOnRMRestart.java
--
diff --git
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/test/java/org/apache/hadoop/yarn/client/api/impl/TestAMRMClientOnRMRestart.java
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/test/java/org/apache/hadoop/yarn/client/api/impl/TestAMRMClientOnRMRestart.java
index 2394747..65c85d9 100644
---
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/test/java/org/apache/hadoop/yarn/client/api/impl/TestAMRMClientOnRMRestart.java
+++
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/test/java/org/apache/hadoop/yarn/client/api/impl/TestAMRMClientOnRMRestart.java
@@ -27,6 +27,7 @@ import java.util.List;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.net.NetworkTopology;
+import org.apache.hadoop.net.ServerSocketUtil;
import org.apache.hadoop.security.SecurityUtil;
import org.apache.hadoop.security.UserGroupInformation;
import org.apache.hadoop.security.token.SecretManager.InvalidToken;
@@ -458,7 +459,8 @@ public class TestAMRMClientOnRMRestart {
.getMasterKey().getKeyId() == newToken.decodeIdentifier().getKeyId());
// start 2nd RM
-conf.set(YarnConfiguration.RM_SCHEDULER_ADDRESS, "0.0.0.0:9030");
+conf.set(YarnConfiguration.RM_SCHEDULER_ADDRESS, "0.0.0.0:"
++ ServerSocketUtil.getPort(45020, 10));
final MyResourceManager2 rm2 = new MyResourceManager2(conf, memStore);
rm2.start();
nm1.setResourceTrackerService(rm2.getResourceTrackerService());
hadoop git commit: YARN-3573. MiniMRYarnCluster constructor that starts the timeline server using a boolean should be marked deprecated. Contributed by Brahma Reddy Battula.
Repository: hadoop
Updated Branches:
refs/heads/branch-2 103563720 -> 3138b43f1
YARN-3573. MiniMRYarnCluster constructor that starts the timeline server using
a boolean should be marked deprecated. Contributed by Brahma Reddy Battula.
(cherry picked from commit 96677bef00b03057038157efeb3c2ad4702914da)
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/3138b43f
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/3138b43f
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/3138b43f
Branch: refs/heads/branch-2
Commit: 3138b43f166aac69a05cfab26eb5ecdd079792da
Parents: 1035637
Author: Tsuyoshi Ozawa
Authored: Tue Oct 27 12:35:01 2015 +0900
Committer: Tsuyoshi Ozawa
Committed: Tue Oct 27 12:35:20 2015 +0900
--
.../java/org/apache/hadoop/mapreduce/v2/MiniMRYarnCluster.java| 2 +-
hadoop-yarn-project/CHANGES.txt | 3 +++
.../test/java/org/apache/hadoop/yarn/server/MiniYARNCluster.java | 1 +
3 files changed, 5 insertions(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/hadoop/blob/3138b43f/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapreduce/v2/MiniMRYarnCluster.java
--
diff --git
a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapreduce/v2/MiniMRYarnCluster.java
b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapreduce/v2/MiniMRYarnCluster.java
index 47b38a1..1dd6fca 100644
---
a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapreduce/v2/MiniMRYarnCluster.java
+++
b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapreduce/v2/MiniMRYarnCluster.java
@@ -74,7 +74,7 @@ public class MiniMRYarnCluster extends MiniYARNCluster {
public MiniMRYarnCluster(String testName, int noOfNMs) {
this(testName, noOfNMs, false);
}
-
+ @Deprecated
public MiniMRYarnCluster(String testName, int noOfNMs, boolean enableAHS) {
super(testName, 1, noOfNMs, 4, 4, enableAHS);
historyServerWrapper = new JobHistoryServerWrapper();
http://git-wip-us.apache.org/repos/asf/hadoop/blob/3138b43f/hadoop-yarn-project/CHANGES.txt
--
diff --git a/hadoop-yarn-project/CHANGES.txt b/hadoop-yarn-project/CHANGES.txt
index 11c06ea..2d2770a 100644
--- a/hadoop-yarn-project/CHANGES.txt
+++ b/hadoop-yarn-project/CHANGES.txt
@@ -970,6 +970,9 @@ Release 2.8.0 - UNRELEASED
YARN-4300. [JDK8] Fix javadoc errors caused by wrong tags. (aajisaka)
+YARN-3573. MiniMRYarnCluster constructor that starts the timeline server
+using a boolean should be marked deprecated. (Brahma Reddy Battula via
ozawa)
+
Release 2.7.2 - UNRELEASED
INCOMPATIBLE CHANGES
http://git-wip-us.apache.org/repos/asf/hadoop/blob/3138b43f/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-tests/src/test/java/org/apache/hadoop/yarn/server/MiniYARNCluster.java
--
diff --git
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-tests/src/test/java/org/apache/hadoop/yarn/server/MiniYARNCluster.java
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-tests/src/test/java/org/apache/hadoop/yarn/server/MiniYARNCluster.java
index a348390..713825a 100644
---
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-tests/src/test/java/org/apache/hadoop/yarn/server/MiniYARNCluster.java
+++
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-tests/src/test/java/org/apache/hadoop/yarn/server/MiniYARNCluster.java
@@ -134,6 +134,7 @@ public class MiniYARNCluster extends CompositeService {
* @param numLogDirs the number of nm-log-dirs per nodemanager
* @param enableAHS enable ApplicationHistoryServer or not
*/
+ @Deprecated
public MiniYARNCluster(
String testName, int numResourceManagers, int numNodeManagers,
int numLocalDirs, int numLogDirs, boolean enableAHS) {
hadoop git commit: YARN-3573. MiniMRYarnCluster constructor that starts the timeline server using a boolean should be marked deprecated. Contributed by Brahma Reddy Battula.
Repository: hadoop
Updated Branches:
refs/heads/trunk ea6b183a1 -> 96677bef0
YARN-3573. MiniMRYarnCluster constructor that starts the timeline server using
a boolean should be marked deprecated. Contributed by Brahma Reddy Battula.
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/96677bef
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/96677bef
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/96677bef
Branch: refs/heads/trunk
Commit: 96677bef00b03057038157efeb3c2ad4702914da
Parents: ea6b183
Author: Tsuyoshi Ozawa
Authored: Tue Oct 27 12:35:01 2015 +0900
Committer: Tsuyoshi Ozawa
Committed: Tue Oct 27 12:35:01 2015 +0900
--
.../java/org/apache/hadoop/mapreduce/v2/MiniMRYarnCluster.java| 2 +-
hadoop-yarn-project/CHANGES.txt | 3 +++
.../test/java/org/apache/hadoop/yarn/server/MiniYARNCluster.java | 1 +
3 files changed, 5 insertions(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/hadoop/blob/96677bef/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapreduce/v2/MiniMRYarnCluster.java
--
diff --git
a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapreduce/v2/MiniMRYarnCluster.java
b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapreduce/v2/MiniMRYarnCluster.java
index 47b38a1..1dd6fca 100644
---
a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapreduce/v2/MiniMRYarnCluster.java
+++
b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapreduce/v2/MiniMRYarnCluster.java
@@ -74,7 +74,7 @@ public class MiniMRYarnCluster extends MiniYARNCluster {
public MiniMRYarnCluster(String testName, int noOfNMs) {
this(testName, noOfNMs, false);
}
-
+ @Deprecated
public MiniMRYarnCluster(String testName, int noOfNMs, boolean enableAHS) {
super(testName, 1, noOfNMs, 4, 4, enableAHS);
historyServerWrapper = new JobHistoryServerWrapper();
http://git-wip-us.apache.org/repos/asf/hadoop/blob/96677bef/hadoop-yarn-project/CHANGES.txt
--
diff --git a/hadoop-yarn-project/CHANGES.txt b/hadoop-yarn-project/CHANGES.txt
index f94ce48..29259c4 100644
--- a/hadoop-yarn-project/CHANGES.txt
+++ b/hadoop-yarn-project/CHANGES.txt
@@ -1022,6 +1022,9 @@ Release 2.8.0 - UNRELEASED
YARN-4300. [JDK8] Fix javadoc errors caused by wrong tags. (aajisaka)
+YARN-3573. MiniMRYarnCluster constructor that starts the timeline server
+using a boolean should be marked deprecated. (Brahma Reddy Battula via
ozawa)
+
Release 2.7.2 - UNRELEASED
INCOMPATIBLE CHANGES
http://git-wip-us.apache.org/repos/asf/hadoop/blob/96677bef/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-tests/src/test/java/org/apache/hadoop/yarn/server/MiniYARNCluster.java
--
diff --git
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-tests/src/test/java/org/apache/hadoop/yarn/server/MiniYARNCluster.java
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-tests/src/test/java/org/apache/hadoop/yarn/server/MiniYARNCluster.java
index a348390..713825a 100644
---
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-tests/src/test/java/org/apache/hadoop/yarn/server/MiniYARNCluster.java
+++
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-tests/src/test/java/org/apache/hadoop/yarn/server/MiniYARNCluster.java
@@ -134,6 +134,7 @@ public class MiniYARNCluster extends CompositeService {
* @param numLogDirs the number of nm-log-dirs per nodemanager
* @param enableAHS enable ApplicationHistoryServer or not
*/
+ @Deprecated
public MiniYARNCluster(
String testName, int numResourceManagers, int numNodeManagers,
int numLocalDirs, int numLogDirs, boolean enableAHS) {
hadoop git commit: HADOOP-12457. [JDK8] Fix a failure of compiling common by javadoc. Contributed by Akira AJISAKA.
Repository: hadoop
Updated Branches:
refs/heads/branch-2 d9156c124 -> 103563720
HADOOP-12457. [JDK8] Fix a failure of compiling common by javadoc. Contributed
by Akira AJISAKA.
(cherry picked from commit ea6b183a1a649ad2874050ade8856286728c654c)
Conflicts:
hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/conf/Configuration.java
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/10356372
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/10356372
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/10356372
Branch: refs/heads/branch-2
Commit: 1035637200aa63df284a8fa9076c8a7f74e0510c
Parents: d9156c1
Author: Tsuyoshi Ozawa
Authored: Tue Oct 27 10:57:45 2015 +0900
Committer: Tsuyoshi Ozawa
Committed: Tue Oct 27 10:58:50 2015 +0900
--
hadoop-common-project/hadoop-common/CHANGES.txt | 3 +++
.../src/main/java/org/apache/hadoop/conf/Configuration.java | 8 +++-
.../src/main/java/org/apache/hadoop/fs/shell/Delete.java | 2 +-
.../src/main/java/org/apache/hadoop/ipc/Server.java | 2 +-
4 files changed, 12 insertions(+), 3 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/hadoop/blob/10356372/hadoop-common-project/hadoop-common/CHANGES.txt
--
diff --git a/hadoop-common-project/hadoop-common/CHANGES.txt
b/hadoop-common-project/hadoop-common/CHANGES.txt
index 2b12cc7..8398ad0 100644
--- a/hadoop-common-project/hadoop-common/CHANGES.txt
+++ b/hadoop-common-project/hadoop-common/CHANGES.txt
@@ -677,6 +677,9 @@ Release 2.8.0 - UNRELEASED
HADOOP-12513. Dockerfile lacks initial 'apt-get update'.
(Akihiro Suda via ozawa)
+HADOOP-12457. [JDK8] Fix a failure of compiling common by javadoc.
+(Akira AJISAKA via ozawa)
+
OPTIMIZATIONS
HADOOP-12051. ProtobufRpcEngine.invoke() should use Exception.toString()
http://git-wip-us.apache.org/repos/asf/hadoop/blob/10356372/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/conf/Configuration.java
--
diff --git
a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/conf/Configuration.java
b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/conf/Configuration.java
index 8cdae3d..1ed2654 100644
---
a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/conf/Configuration.java
+++
b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/conf/Configuration.java
@@ -167,7 +167,13 @@ import com.google.common.base.Preconditions;
* will be resolved to another property in this Configuration, while
* ${user.name} would then ordinarily be resolved to the value
* of the System property with that name.
- * By default, warnings will be given to any deprecated configuration
+ * When conf.get("otherdir") is called, then
${env.BASE_DIR}
+ * will be resolved to the value of the ${BASE_DIR}
environment variable.
+ * It supports ${env.NAME:-default} and
${env.NAME-default} notations.
+ * The former is resolved to "default" if ${NAME} environment
variable is undefined
+ * or its value is empty.
+ * The latter behaves the same way only if ${NAME} is
undefined.
+ * By default, warnings will be given to any deprecated configuration
* parameters and these are suppressible by configuring
* log4j.logger.org.apache.hadoop.conf.Configuration.deprecation in
* log4j.properties file.
http://git-wip-us.apache.org/repos/asf/hadoop/blob/10356372/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/shell/Delete.java
--
diff --git
a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/shell/Delete.java
b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/shell/Delete.java
index 6983eb9..a066395 100644
---
a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/shell/Delete.java
+++
b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/shell/Delete.java
@@ -65,7 +65,7 @@ class Delete {
"-[rR]: Recursively deletes directories.\n" +
"-skipTrash: option bypasses trash, if enabled, and immediately " +
"deletes .\n" +
-"-safely: option requires safety confirmationï¼if enabled, " +
+"-safely: option requires safety confirmation, if enabled, " +
"requires confirmation before deleting large directory with more "
+
"than files. Delay is " +
"expected when walking over large directory recursively to cou
hadoop git commit: HADOOP-12457. [JDK8] Fix a failure of compiling common by javadoc. Contributed by Akira AJISAKA.
Repository: hadoop
Updated Branches:
refs/heads/trunk 8a68630dd -> ea6b183a1
HADOOP-12457. [JDK8] Fix a failure of compiling common by javadoc. Contributed
by Akira AJISAKA.
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/ea6b183a
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/ea6b183a
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/ea6b183a
Branch: refs/heads/trunk
Commit: ea6b183a1a649ad2874050ade8856286728c654c
Parents: 8a68630
Author: Tsuyoshi Ozawa
Authored: Tue Oct 27 10:57:45 2015 +0900
Committer: Tsuyoshi Ozawa
Committed: Tue Oct 27 10:57:45 2015 +0900
--
hadoop-common-project/hadoop-common/CHANGES.txt | 3 +++
.../src/main/java/org/apache/hadoop/conf/Configuration.java | 2 +-
.../src/main/java/org/apache/hadoop/fs/shell/Delete.java | 2 +-
.../hadoop-common/src/main/java/org/apache/hadoop/ipc/Server.java | 2 +-
4 files changed, 6 insertions(+), 3 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/hadoop/blob/ea6b183a/hadoop-common-project/hadoop-common/CHANGES.txt
--
diff --git a/hadoop-common-project/hadoop-common/CHANGES.txt
b/hadoop-common-project/hadoop-common/CHANGES.txt
index 1b4b27e..a0c2fa1 100644
--- a/hadoop-common-project/hadoop-common/CHANGES.txt
+++ b/hadoop-common-project/hadoop-common/CHANGES.txt
@@ -1265,6 +1265,9 @@ Release 2.8.0 - UNRELEASED
HADOOP-12513. Dockerfile lacks initial 'apt-get update'.
(Akihiro Suda via ozawa)
+HADOOP-12457. [JDK8] Fix a failure of compiling common by javadoc.
+(Akira AJISAKA via ozawa)
+
OPTIMIZATIONS
HADOOP-12051. ProtobufRpcEngine.invoke() should use Exception.toString()
http://git-wip-us.apache.org/repos/asf/hadoop/blob/ea6b183a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/conf/Configuration.java
--
diff --git
a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/conf/Configuration.java
b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/conf/Configuration.java
index 8801c6c..8355d96 100644
---
a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/conf/Configuration.java
+++
b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/conf/Configuration.java
@@ -179,7 +179,7 @@ import com.google.common.base.Preconditions;
* When conf.get("otherdir") is called, then
${env.BASE_DIR}
* will be resolved to the value of the ${BASE_DIR}
environment variable.
* It supports ${env.NAME:-default} and
${env.NAME-default} notations.
- * The former is resolved to âdefaultâ if ${NAME}
environment variable is undefined
+ * The former is resolved to "default" if ${NAME} environment
variable is undefined
* or its value is empty.
* The latter behaves the same way only if ${NAME} is
undefined.
* By default, warnings will be given to any deprecated configuration
http://git-wip-us.apache.org/repos/asf/hadoop/blob/ea6b183a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/shell/Delete.java
--
diff --git
a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/shell/Delete.java
b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/shell/Delete.java
index 6983eb9..a066395 100644
---
a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/shell/Delete.java
+++
b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/shell/Delete.java
@@ -65,7 +65,7 @@ class Delete {
"-[rR]: Recursively deletes directories.\n" +
"-skipTrash: option bypasses trash, if enabled, and immediately " +
"deletes .\n" +
-"-safely: option requires safety confirmationï¼if enabled, " +
+"-safely: option requires safety confirmation, if enabled, " +
"requires confirmation before deleting large directory with more "
+
"than files. Delay is " +
"expected when walking over large directory recursively to count "
+
http://git-wip-us.apache.org/repos/asf/hadoop/blob/ea6b183a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ipc/Server.java
--
diff --git
a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ipc/Server.java
b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/ipc/Server.java
index 39cabc2..26043a7 100644
---
a/hadoop-common-project/hadoop-co
hadoop git commit: HADOOP-12513. Dockerfile lacks initial 'apt-get update'. Contributed by Akihiro Suda.
Repository: hadoop Updated Branches: refs/heads/trunk 5acdde474 -> 123b3db74 HADOOP-12513. Dockerfile lacks initial 'apt-get update'. Contributed by Akihiro Suda. Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/123b3db7 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/123b3db7 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/123b3db7 Branch: refs/heads/trunk Commit: 123b3db743a86aa18e46ec44a08f7b2e7c7f6350 Parents: 5acdde4 Author: Tsuyoshi Ozawa Authored: Mon Oct 26 23:17:45 2015 +0900 Committer: Tsuyoshi Ozawa Committed: Mon Oct 26 23:18:52 2015 +0900 -- dev-support/docker/Dockerfile | 7 --- hadoop-common-project/hadoop-common/CHANGES.txt | 3 +++ 2 files changed, 7 insertions(+), 3 deletions(-) -- http://git-wip-us.apache.org/repos/asf/hadoop/blob/123b3db7/dev-support/docker/Dockerfile -- diff --git a/dev-support/docker/Dockerfile b/dev-support/docker/Dockerfile index c8453cc..bc09ef2 100644 --- a/dev-support/docker/Dockerfile +++ b/dev-support/docker/Dockerfile @@ -24,9 +24,10 @@ FROM ubuntu:trusty WORKDIR /root -RUN apt-get install -y software-properties-common -RUN add-apt-repository -y ppa:webupd8team/java -RUN apt-get update +RUN apt-get update && \ +apt-get install -y software-properties-common && \ +add-apt-repository -y ppa:webupd8team/java && \ +apt-get update # Auto-accept the Oracle JDK license RUN echo oracle-java7-installer shared/accepted-oracle-license-v1-1 select true | sudo /usr/bin/debconf-set-selections http://git-wip-us.apache.org/repos/asf/hadoop/blob/123b3db7/hadoop-common-project/hadoop-common/CHANGES.txt -- diff --git a/hadoop-common-project/hadoop-common/CHANGES.txt b/hadoop-common-project/hadoop-common/CHANGES.txt index 87308f9..4764488 100644 --- a/hadoop-common-project/hadoop-common/CHANGES.txt +++ b/hadoop-common-project/hadoop-common/CHANGES.txt @@ -1259,6 +1259,9 @@ Release 2.8.0 - UNRELEASED HADOOP-12483. Maintain wrapped SASL ordering for postponed IPC responses. (Daryn Sharp via yliu) +HADOOP-12513. Dockerfile lacks initial 'apt-get update'. +(Akihiro Suda via ozawa) + OPTIMIZATIONS HADOOP-12051. ProtobufRpcEngine.invoke() should use Exception.toString()
hadoop git commit: HADOOP-12513. Dockerfile lacks initial 'apt-get update'. Contributed by Akihiro Suda.
Repository: hadoop Updated Branches: refs/heads/branch-2 33455fa41 -> 07169e25c HADOOP-12513. Dockerfile lacks initial 'apt-get update'. Contributed by Akihiro Suda. (cherry picked from commit 123b3db743a86aa18e46ec44a08f7b2e7c7f6350) Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/07169e25 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/07169e25 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/07169e25 Branch: refs/heads/branch-2 Commit: 07169e25ce5222c2851b6a74c708ef4169630e77 Parents: 33455fa Author: Tsuyoshi Ozawa Authored: Mon Oct 26 23:17:45 2015 +0900 Committer: Tsuyoshi Ozawa Committed: Mon Oct 26 23:19:14 2015 +0900 -- dev-support/docker/Dockerfile | 7 --- hadoop-common-project/hadoop-common/CHANGES.txt | 3 +++ 2 files changed, 7 insertions(+), 3 deletions(-) -- http://git-wip-us.apache.org/repos/asf/hadoop/blob/07169e25/dev-support/docker/Dockerfile -- diff --git a/dev-support/docker/Dockerfile b/dev-support/docker/Dockerfile index f761f8b..ad253a7 100644 --- a/dev-support/docker/Dockerfile +++ b/dev-support/docker/Dockerfile @@ -24,9 +24,10 @@ FROM ubuntu:trusty WORKDIR /root -RUN apt-get install -y software-properties-common -RUN add-apt-repository -y ppa:webupd8team/java -RUN apt-get update +RUN apt-get update && \ +apt-get install -y software-properties-common && \ +add-apt-repository -y ppa:webupd8team/java && \ +apt-get update # Auto-accept the Oracle JDK license RUN echo oracle-java7-installer shared/accepted-oracle-license-v1-1 select true | sudo /usr/bin/debconf-set-selections http://git-wip-us.apache.org/repos/asf/hadoop/blob/07169e25/hadoop-common-project/hadoop-common/CHANGES.txt -- diff --git a/hadoop-common-project/hadoop-common/CHANGES.txt b/hadoop-common-project/hadoop-common/CHANGES.txt index 7ac0878..176b50e 100644 --- a/hadoop-common-project/hadoop-common/CHANGES.txt +++ b/hadoop-common-project/hadoop-common/CHANGES.txt @@ -671,6 +671,9 @@ Release 2.8.0 - UNRELEASED HADOOP-12483. Maintain wrapped SASL ordering for postponed IPC responses. (Daryn Sharp via yliu) +HADOOP-12513. Dockerfile lacks initial 'apt-get update'. +(Akihiro Suda via ozawa) + OPTIMIZATIONS HADOOP-12051. ProtobufRpcEngine.invoke() should use Exception.toString()
hadoop git commit: YARN-3528. Tests with 12345 as hard-coded port break jenkins. Contributed by Brahma Reddy Battula.
Repository: hadoop
Updated Branches:
refs/heads/branch-2 e75799d5f -> e85ebf082
YARN-3528. Tests with 12345 as hard-coded port break jenkins. Contributed by
Brahma Reddy Battula.
Conflicts:
hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/TestNodeManagerShutdown.java
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/e85ebf08
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/e85ebf08
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/e85ebf08
Branch: refs/heads/branch-2
Commit: e85ebf08259265e8e32ba87331ee6fea038878bb
Parents: e75799d
Author: Tsuyoshi Ozawa
Authored: Mon Oct 26 16:45:11 2015 +0900
Committer: Tsuyoshi Ozawa
Committed: Mon Oct 26 17:06:46 2015 +0900
--
.../org/apache/hadoop/net/ServerSocketUtil.java | 2 +-
hadoop-yarn-project/CHANGES.txt | 3 ++
.../nodemanager/TestNodeManagerReboot.java | 13 +
.../nodemanager/TestNodeManagerResync.java | 22 ++-
.../nodemanager/TestNodeManagerShutdown.java| 29
.../nodemanager/TestNodeStatusUpdater.java | 27 --
.../BaseContainerManagerTest.java | 4 +--
.../TestContainerManagerRecovery.java | 3 +-
.../monitor/TestContainersMonitor.java | 1 -
9 files changed, 67 insertions(+), 37 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/hadoop/blob/e85ebf08/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/net/ServerSocketUtil.java
--
diff --git
a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/net/ServerSocketUtil.java
b/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/net/ServerSocketUtil.java
index 3685162..a3e1fff 100644
---
a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/net/ServerSocketUtil.java
+++
b/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/net/ServerSocketUtil.java
@@ -48,8 +48,8 @@ public class ServerSocketUtil {
if (tryPort == 0) {
continue;
}
- LOG.info("Using port " + tryPort);
try (ServerSocket s = new ServerSocket(tryPort)) {
+LOG.info("Using port " + tryPort);
return tryPort;
} catch (IOException e) {
tries++;
http://git-wip-us.apache.org/repos/asf/hadoop/blob/e85ebf08/hadoop-yarn-project/CHANGES.txt
--
diff --git a/hadoop-yarn-project/CHANGES.txt b/hadoop-yarn-project/CHANGES.txt
index 2c4c4fe..b9581d8 100644
--- a/hadoop-yarn-project/CHANGES.txt
+++ b/hadoop-yarn-project/CHANGES.txt
@@ -947,6 +947,9 @@ Release 2.8.0 - UNRELEASED
YARN-4246. NPE while listing app attempt. (Nijel S F via rohithsharmaks)
+YARN-3528. Tests with 12345 as hard-coded port break jenkins.
+(Brahma Reddy Battula via ozawa)
+
Release 2.7.2 - UNRELEASED
INCOMPATIBLE CHANGES
http://git-wip-us.apache.org/repos/asf/hadoop/blob/e85ebf08/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/TestNodeManagerReboot.java
--
diff --git
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/TestNodeManagerReboot.java
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/TestNodeManagerReboot.java
index 41c16a9..9fb8ebf 100644
---
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/TestNodeManagerReboot.java
+++
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/TestNodeManagerReboot.java
@@ -39,6 +39,7 @@ import org.apache.hadoop.fs.FileStatus;
import org.apache.hadoop.fs.Path;
import org.apache.hadoop.fs.RemoteIterator;
import org.apache.hadoop.fs.UnsupportedFileSystemException;
+import org.apache.hadoop.net.ServerSocketUtil;
import org.apache.hadoop.security.UserGroupInformation;
import org.apache.hadoop.yarn.api.ContainerManagementProtocol;
import org.apache.hadoop.yarn.api.protocolrecords.GetContainerStatusesRequest;
@@ -215,7 +216,7 @@ public class TestNodeManagerReboot {
}
- private void restartNM(int maxTries) {
+ private void restartNM(int maxTries) throws IOException {
nm.stop();
nm = new MyNodeManager();
nm.start();
@@ -296,7
hadoop git commit: YARN-3528. Tests with 12345 as hard-coded port break jenkins. Contributed by Brahma Reddy Battula.
Repository: hadoop
Updated Branches:
refs/heads/trunk b57f08c0d -> ce60b4fc8
YARN-3528. Tests with 12345 as hard-coded port break jenkins. Contributed by
Brahma Reddy Battula.
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/ce60b4fc
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/ce60b4fc
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/ce60b4fc
Branch: refs/heads/trunk
Commit: ce60b4fc8b72afaf475517df3638900abb8843ae
Parents: b57f08c
Author: Tsuyoshi Ozawa
Authored: Mon Oct 26 16:45:11 2015 +0900
Committer: Tsuyoshi Ozawa
Committed: Mon Oct 26 16:45:11 2015 +0900
--
.../org/apache/hadoop/net/ServerSocketUtil.java | 2 +-
hadoop-yarn-project/CHANGES.txt | 3 +++
.../nodemanager/TestNodeManagerReboot.java | 13 ++
.../nodemanager/TestNodeManagerResync.java | 22 +++-
.../nodemanager/TestNodeManagerShutdown.java| 27
.../nodemanager/TestNodeStatusUpdater.java | 27 +---
.../BaseContainerManagerTest.java | 4 +--
.../TestContainerManagerRecovery.java | 3 ++-
.../monitor/TestContainersMonitor.java | 1 -
9 files changed, 66 insertions(+), 36 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/hadoop/blob/ce60b4fc/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/net/ServerSocketUtil.java
--
diff --git
a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/net/ServerSocketUtil.java
b/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/net/ServerSocketUtil.java
index 3685162..a3e1fff 100644
---
a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/net/ServerSocketUtil.java
+++
b/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/net/ServerSocketUtil.java
@@ -48,8 +48,8 @@ public class ServerSocketUtil {
if (tryPort == 0) {
continue;
}
- LOG.info("Using port " + tryPort);
try (ServerSocket s = new ServerSocket(tryPort)) {
+LOG.info("Using port " + tryPort);
return tryPort;
} catch (IOException e) {
tries++;
http://git-wip-us.apache.org/repos/asf/hadoop/blob/ce60b4fc/hadoop-yarn-project/CHANGES.txt
--
diff --git a/hadoop-yarn-project/CHANGES.txt b/hadoop-yarn-project/CHANGES.txt
index 192843e..d06d026 100644
--- a/hadoop-yarn-project/CHANGES.txt
+++ b/hadoop-yarn-project/CHANGES.txt
@@ -999,6 +999,9 @@ Release 2.8.0 - UNRELEASED
YARN-4246. NPE while listing app attempt. (Nijel S F via rohithsharmaks)
+YARN-3528. Tests with 12345 as hard-coded port break jenkins.
+(Brahma Reddy Battula via ozawa)
+
Release 2.7.2 - UNRELEASED
INCOMPATIBLE CHANGES
http://git-wip-us.apache.org/repos/asf/hadoop/blob/ce60b4fc/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/TestNodeManagerReboot.java
--
diff --git
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/TestNodeManagerReboot.java
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/TestNodeManagerReboot.java
index 41c16a9..9fb8ebf 100644
---
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/TestNodeManagerReboot.java
+++
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/TestNodeManagerReboot.java
@@ -39,6 +39,7 @@ import org.apache.hadoop.fs.FileStatus;
import org.apache.hadoop.fs.Path;
import org.apache.hadoop.fs.RemoteIterator;
import org.apache.hadoop.fs.UnsupportedFileSystemException;
+import org.apache.hadoop.net.ServerSocketUtil;
import org.apache.hadoop.security.UserGroupInformation;
import org.apache.hadoop.yarn.api.ContainerManagementProtocol;
import org.apache.hadoop.yarn.api.protocolrecords.GetContainerStatusesRequest;
@@ -215,7 +216,7 @@ public class TestNodeManagerReboot {
}
- private void restartNM(int maxTries) {
+ private void restartNM(int maxTries) throws IOException {
nm.stop();
nm = new MyNodeManager();
nm.start();
@@ -296,7 +297,7 @@ public class TestNodeManagerReboot {
private class MyNodeManager extends NodeManager {
-public MyNodeManager() {
+public MyNodeManager() throws IOException {
su
hadoop git commit: HADOOP-7266. Deprecate metrics v1. Contributed by Akira AJISAKA.
Repository: hadoop
Updated Branches:
refs/heads/trunk 124a412a3 -> 35a303dfb
HADOOP-7266. Deprecate metrics v1. Contributed by Akira AJISAKA.
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/35a303df
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/35a303df
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/35a303df
Branch: refs/heads/trunk
Commit: 35a303dfbe348f96c465fb8778ced6b5bb617e89
Parents: 124a412
Author: Tsuyoshi Ozawa
Authored: Fri Oct 23 23:47:51 2015 +0900
Committer: Tsuyoshi Ozawa
Committed: Fri Oct 23 23:47:51 2015 +0900
--
hadoop-common-project/hadoop-common/CHANGES.txt | 2 ++
.../src/main/java/org/apache/hadoop/http/HttpServer2.java | 2 ++
.../src/main/java/org/apache/hadoop/metrics/ContextFactory.java | 3 +++
.../src/main/java/org/apache/hadoop/metrics/MetricsContext.java | 3 +++
.../main/java/org/apache/hadoop/metrics/MetricsException.java | 2 ++
.../src/main/java/org/apache/hadoop/metrics/MetricsRecord.java | 3 +++
.../src/main/java/org/apache/hadoop/metrics/MetricsServlet.java | 3 +++
.../src/main/java/org/apache/hadoop/metrics/MetricsUtil.java| 2 ++
.../src/main/java/org/apache/hadoop/metrics/Updater.java| 3 +++
.../java/org/apache/hadoop/metrics/ganglia/GangliaContext.java | 5 -
.../org/apache/hadoop/metrics/ganglia/GangliaContext31.java | 4
.../main/java/org/apache/hadoop/metrics/jvm/EventCounter.java | 3 +++
.../src/main/java/org/apache/hadoop/metrics/jvm/JvmMetrics.java | 3 +++
.../org/apache/hadoop/metrics/spi/AbstractMetricsContext.java | 3 +++
.../java/org/apache/hadoop/metrics/spi/CompositeContext.java| 4
.../main/java/org/apache/hadoop/metrics/spi/MetricValue.java| 1 +
.../java/org/apache/hadoop/metrics/spi/MetricsRecordImpl.java | 4
.../org/apache/hadoop/metrics/spi/NoEmitMetricsContext.java | 3 +++
.../main/java/org/apache/hadoop/metrics/spi/NullContext.java| 2 ++
.../apache/hadoop/metrics/spi/NullContextWithUpdateThread.java | 2 ++
.../main/java/org/apache/hadoop/metrics/spi/OutputRecord.java | 3 +++
.../src/main/java/org/apache/hadoop/metrics/spi/Util.java | 3 +++
.../src/main/java/org/apache/hadoop/metrics/util/MBeanUtil.java | 2 ++
.../main/java/org/apache/hadoop/metrics/util/MetricsBase.java | 2 ++
.../org/apache/hadoop/metrics/util/MetricsDynamicMBeanBase.java | 3 ++-
.../java/org/apache/hadoop/metrics/util/MetricsIntValue.java| 2 ++
.../java/org/apache/hadoop/metrics/util/MetricsLongValue.java | 2 ++
.../java/org/apache/hadoop/metrics/util/MetricsRegistry.java| 2 ++
.../org/apache/hadoop/metrics/util/MetricsTimeVaryingInt.java | 3 ++-
.../org/apache/hadoop/metrics/util/MetricsTimeVaryingLong.java | 3 ++-
.../org/apache/hadoop/metrics/util/MetricsTimeVaryingRate.java | 2 ++
.../test/java/org/apache/hadoop/metrics/TestMetricsServlet.java | 1 +
.../org/apache/hadoop/metrics/ganglia/TestGangliaContext.java | 1 +
.../java/org/apache/hadoop/metrics/spi/TestOutputRecord.java| 1 +
34 files changed, 83 insertions(+), 4 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/hadoop/blob/35a303df/hadoop-common-project/hadoop-common/CHANGES.txt
--
diff --git a/hadoop-common-project/hadoop-common/CHANGES.txt
b/hadoop-common-project/hadoop-common/CHANGES.txt
index a7a1d1b..87308f9 100644
--- a/hadoop-common-project/hadoop-common/CHANGES.txt
+++ b/hadoop-common-project/hadoop-common/CHANGES.txt
@@ -905,6 +905,8 @@ Release 2.8.0 - UNRELEASED
HADOOP-9692. Improving log message when SequenceFile reader throws
EOFException on zero-length file. (Zhe Zhang and Chu Tong via ozawa)
+HADOOP-7266. Deprecate metrics v1. (Akira AJISAKA via ozawa)
+
OPTIMIZATIONS
HADOOP-11785. Reduce the number of listStatus operation in distcp
http://git-wip-us.apache.org/repos/asf/hadoop/blob/35a303df/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/http/HttpServer2.java
--
diff --git
a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/http/HttpServer2.java
b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/http/HttpServer2.java
index 6fd34d5..d593205 100644
---
a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/http/HttpServer2.java
+++
b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/http/HttpServer2.java
@@ -541,7 +541,9 @@ public final class HttpServer2 implements FilterContainer {
/**
* Add default servlets.
+ * Note: /metrics servlet will be removed in 3.X release.
*/
+ @SuppressWarnings("deprecation")
protected void addDe
hadoop git commit: HADOOP-7266. Deprecate metrics v1. Contributed by Akira AJISAKA.
Repository: hadoop
Updated Branches:
refs/heads/branch-2 4ee8297c8 -> de739cabb
HADOOP-7266. Deprecate metrics v1. Contributed by Akira AJISAKA.
(cherry picked from commit 35a303dfbe348f96c465fb8778ced6b5bb617e89)
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/de739cab
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/de739cab
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/de739cab
Branch: refs/heads/branch-2
Commit: de739cabb1969b2439bc8395a6bfe7ef23671a36
Parents: 4ee8297
Author: Tsuyoshi Ozawa
Authored: Fri Oct 23 23:47:51 2015 +0900
Committer: Tsuyoshi Ozawa
Committed: Fri Oct 23 23:48:36 2015 +0900
--
hadoop-common-project/hadoop-common/CHANGES.txt | 2 ++
.../src/main/java/org/apache/hadoop/http/HttpServer2.java | 2 ++
.../src/main/java/org/apache/hadoop/metrics/ContextFactory.java | 3 +++
.../src/main/java/org/apache/hadoop/metrics/MetricsContext.java | 3 +++
.../main/java/org/apache/hadoop/metrics/MetricsException.java | 2 ++
.../src/main/java/org/apache/hadoop/metrics/MetricsRecord.java | 3 +++
.../src/main/java/org/apache/hadoop/metrics/MetricsServlet.java | 3 +++
.../src/main/java/org/apache/hadoop/metrics/MetricsUtil.java| 2 ++
.../src/main/java/org/apache/hadoop/metrics/Updater.java| 3 +++
.../java/org/apache/hadoop/metrics/ganglia/GangliaContext.java | 5 -
.../org/apache/hadoop/metrics/ganglia/GangliaContext31.java | 4
.../main/java/org/apache/hadoop/metrics/jvm/EventCounter.java | 3 +++
.../src/main/java/org/apache/hadoop/metrics/jvm/JvmMetrics.java | 3 +++
.../org/apache/hadoop/metrics/spi/AbstractMetricsContext.java | 3 +++
.../java/org/apache/hadoop/metrics/spi/CompositeContext.java| 4
.../main/java/org/apache/hadoop/metrics/spi/MetricValue.java| 1 +
.../java/org/apache/hadoop/metrics/spi/MetricsRecordImpl.java | 4
.../org/apache/hadoop/metrics/spi/NoEmitMetricsContext.java | 3 +++
.../main/java/org/apache/hadoop/metrics/spi/NullContext.java| 2 ++
.../apache/hadoop/metrics/spi/NullContextWithUpdateThread.java | 2 ++
.../main/java/org/apache/hadoop/metrics/spi/OutputRecord.java | 3 +++
.../src/main/java/org/apache/hadoop/metrics/spi/Util.java | 3 +++
.../src/main/java/org/apache/hadoop/metrics/util/MBeanUtil.java | 2 ++
.../main/java/org/apache/hadoop/metrics/util/MetricsBase.java | 2 ++
.../org/apache/hadoop/metrics/util/MetricsDynamicMBeanBase.java | 3 ++-
.../java/org/apache/hadoop/metrics/util/MetricsIntValue.java| 2 ++
.../java/org/apache/hadoop/metrics/util/MetricsLongValue.java | 2 ++
.../java/org/apache/hadoop/metrics/util/MetricsRegistry.java| 2 ++
.../org/apache/hadoop/metrics/util/MetricsTimeVaryingInt.java | 3 ++-
.../org/apache/hadoop/metrics/util/MetricsTimeVaryingLong.java | 3 ++-
.../org/apache/hadoop/metrics/util/MetricsTimeVaryingRate.java | 2 ++
.../test/java/org/apache/hadoop/metrics/TestMetricsServlet.java | 1 +
.../org/apache/hadoop/metrics/ganglia/TestGangliaContext.java | 1 +
.../java/org/apache/hadoop/metrics/spi/TestOutputRecord.java| 1 +
34 files changed, 83 insertions(+), 4 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/hadoop/blob/de739cab/hadoop-common-project/hadoop-common/CHANGES.txt
--
diff --git a/hadoop-common-project/hadoop-common/CHANGES.txt
b/hadoop-common-project/hadoop-common/CHANGES.txt
index 090d4e2..7ac0878 100644
--- a/hadoop-common-project/hadoop-common/CHANGES.txt
+++ b/hadoop-common-project/hadoop-common/CHANGES.txt
@@ -314,6 +314,8 @@ Release 2.8.0 - UNRELEASED
HADOOP-9692. Improving log message when SequenceFile reader throws
EOFException on zero-length file. (Zhe Zhang and Chu Tong via ozawa)
+HADOOP-7266. Deprecate metrics v1. (Akira AJISAKA via ozawa)
+
OPTIMIZATIONS
HADOOP-11785. Reduce the number of listStatus operation in distcp
http://git-wip-us.apache.org/repos/asf/hadoop/blob/de739cab/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/http/HttpServer2.java
--
diff --git
a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/http/HttpServer2.java
b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/http/HttpServer2.java
index 11ab23b..c6e7925 100644
---
a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/http/HttpServer2.java
+++
b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/http/HttpServer2.java
@@ -573,7 +573,9 @@ public final class HttpServer2 implements FilterContainer {
/**
* Add default servlets.
+ * Note: /metrics servlet will be removed in 3.X rele
[2/2] hadoop git commit: HADOOP-9692. Improving log message when SequenceFile reader throws EOFException on zero-length file. (Zhe Zhang and Chu Tong via ozawa)
HADOOP-9692. Improving log message when SequenceFile reader throws EOFException
on zero-length file. (Zhe Zhang and Chu Tong via ozawa)
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/513ec3de
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/513ec3de
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/513ec3de
Branch: refs/heads/trunk
Commit: 513ec3de194f705ca342de16829e1f85be227e7f
Parents: 039a1f9
Author: Tsuyoshi Ozawa
Authored: Thu Oct 22 11:55:25 2015 +0900
Committer: Tsuyoshi Ozawa
Committed: Fri Oct 23 06:50:50 2015 +0900
--
hadoop-common-project/hadoop-common/CHANGES.txt | 3 +++
.../java/org/apache/hadoop/io/SequenceFile.java | 15 +++---
.../org/apache/hadoop/io/TestSequenceFile.java | 21
3 files changed, 36 insertions(+), 3 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/hadoop/blob/513ec3de/hadoop-common-project/hadoop-common/CHANGES.txt
--
diff --git a/hadoop-common-project/hadoop-common/CHANGES.txt
b/hadoop-common-project/hadoop-common/CHANGES.txt
index 0d3daa2..a7a1d1b 100644
--- a/hadoop-common-project/hadoop-common/CHANGES.txt
+++ b/hadoop-common-project/hadoop-common/CHANGES.txt
@@ -902,6 +902,9 @@ Release 2.8.0 - UNRELEASED
HADOOP-10406. TestIPC.testIpcWithReaderQueuing may fail. (Xiao Chen via
wang)
+HADOOP-9692. Improving log message when SequenceFile reader throws
+EOFException on zero-length file. (Zhe Zhang and Chu Tong via ozawa)
+
OPTIMIZATIONS
HADOOP-11785. Reduce the number of listStatus operation in distcp
http://git-wip-us.apache.org/repos/asf/hadoop/blob/513ec3de/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/SequenceFile.java
--
diff --git
a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/SequenceFile.java
b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/SequenceFile.java
index e37e855..ed57eee 100644
---
a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/SequenceFile.java
+++
b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/SequenceFile.java
@@ -1912,17 +1912,26 @@ public class SequenceFile {
*/
private void init(boolean tempReader) throws IOException {
byte[] versionBlock = new byte[VERSION.length];
- in.readFully(versionBlock);
+ String exceptionMsg = this + " not a SequenceFile";
+
+ // Try to read sequence file header.
+ try {
+in.readFully(versionBlock);
+ } catch (EOFException e) {
+throw new EOFException(exceptionMsg);
+ }
if ((versionBlock[0] != VERSION[0]) ||
(versionBlock[1] != VERSION[1]) ||
- (versionBlock[2] != VERSION[2]))
+ (versionBlock[2] != VERSION[2])) {
throw new IOException(this + " not a SequenceFile");
+ }
// Set 'version'
version = versionBlock[3];
- if (version > VERSION[3])
+ if (version > VERSION[3]) {
throw new VersionMismatchException(VERSION[3], version);
+ }
if (version < BLOCK_COMPRESS_VERSION) {
UTF8 className = new UTF8();
http://git-wip-us.apache.org/repos/asf/hadoop/blob/513ec3de/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/io/TestSequenceFile.java
--
diff --git
a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/io/TestSequenceFile.java
b/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/io/TestSequenceFile.java
index 7495c6e..99c97db 100644
---
a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/io/TestSequenceFile.java
+++
b/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/io/TestSequenceFile.java
@@ -522,6 +522,27 @@ public class TestSequenceFile extends TestCase {
assertTrue("InputStream for " + path + " should have been closed.",
openedFile[0].isClosed());
}
+ /**
+ * Test to makes sure zero length sequence file is handled properly while
+ * initializing.
+ */
+ public void testInitZeroLengthSequenceFile() throws IOException {
+Configuration conf = new Configuration();
+LocalFileSystem fs = FileSystem.getLocal(conf);
+
+// create an empty file (which is not a valid sequence file)
+Path path = new Path(System.getProperty("test.build.data", ".") +
+ "/zerolength.seq");
+fs.create(path).close();
+
+try {
+ new SequenceFile.Reader(conf, SequenceFile.Reader.file(path));
+ fail("IOException expecte
[2/2] hadoop git commit: HADOOP-9692. Improving log message when SequenceFile reader throws EOFException on zero-length file. (Zhe Zhang and Chu Tong via ozawa)
HADOOP-9692. Improving log message when SequenceFile reader throws EOFException
on zero-length file. (Zhe Zhang and Chu Tong via ozawa)
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/525a67a6
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/525a67a6
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/525a67a6
Branch: refs/heads/branch-2
Commit: 525a67a62e50461bac90f343ba885a0547b9f813
Parents: 7d4246a
Author: Tsuyoshi Ozawa
Authored: Thu Oct 22 11:55:25 2015 +0900
Committer: Tsuyoshi Ozawa
Committed: Fri Oct 23 06:54:24 2015 +0900
--
hadoop-common-project/hadoop-common/CHANGES.txt | 3 +++
.../java/org/apache/hadoop/io/SequenceFile.java | 15 +++---
.../org/apache/hadoop/io/TestSequenceFile.java | 21
3 files changed, 36 insertions(+), 3 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/hadoop/blob/525a67a6/hadoop-common-project/hadoop-common/CHANGES.txt
--
diff --git a/hadoop-common-project/hadoop-common/CHANGES.txt
b/hadoop-common-project/hadoop-common/CHANGES.txt
index 263bdc9..090d4e2 100644
--- a/hadoop-common-project/hadoop-common/CHANGES.txt
+++ b/hadoop-common-project/hadoop-common/CHANGES.txt
@@ -311,6 +311,9 @@ Release 2.8.0 - UNRELEASED
HADOOP-10406. TestIPC.testIpcWithReaderQueuing may fail. (Xiao Chen via
wang)
+HADOOP-9692. Improving log message when SequenceFile reader throws
+EOFException on zero-length file. (Zhe Zhang and Chu Tong via ozawa)
+
OPTIMIZATIONS
HADOOP-11785. Reduce the number of listStatus operation in distcp
http://git-wip-us.apache.org/repos/asf/hadoop/blob/525a67a6/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/SequenceFile.java
--
diff --git
a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/SequenceFile.java
b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/SequenceFile.java
index e908205..149152f 100644
---
a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/SequenceFile.java
+++
b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/SequenceFile.java
@@ -1912,17 +1912,26 @@ public class SequenceFile {
*/
private void init(boolean tempReader) throws IOException {
byte[] versionBlock = new byte[VERSION.length];
- in.readFully(versionBlock);
+ String exceptionMsg = this + " not a SequenceFile";
+
+ // Try to read sequence file header.
+ try {
+in.readFully(versionBlock);
+ } catch (EOFException e) {
+throw new EOFException(exceptionMsg);
+ }
if ((versionBlock[0] != VERSION[0]) ||
(versionBlock[1] != VERSION[1]) ||
- (versionBlock[2] != VERSION[2]))
+ (versionBlock[2] != VERSION[2])) {
throw new IOException(this + " not a SequenceFile");
+ }
// Set 'version'
version = versionBlock[3];
- if (version > VERSION[3])
+ if (version > VERSION[3]) {
throw new VersionMismatchException(VERSION[3], version);
+ }
if (version < BLOCK_COMPRESS_VERSION) {
UTF8 className = new UTF8();
http://git-wip-us.apache.org/repos/asf/hadoop/blob/525a67a6/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/io/TestSequenceFile.java
--
diff --git
a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/io/TestSequenceFile.java
b/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/io/TestSequenceFile.java
index 7495c6e..99c97db 100644
---
a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/io/TestSequenceFile.java
+++
b/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/io/TestSequenceFile.java
@@ -522,6 +522,27 @@ public class TestSequenceFile extends TestCase {
assertTrue("InputStream for " + path + " should have been closed.",
openedFile[0].isClosed());
}
+ /**
+ * Test to makes sure zero length sequence file is handled properly while
+ * initializing.
+ */
+ public void testInitZeroLengthSequenceFile() throws IOException {
+Configuration conf = new Configuration();
+LocalFileSystem fs = FileSystem.getLocal(conf);
+
+// create an empty file (which is not a valid sequence file)
+Path path = new Path(System.getProperty("test.build.data", ".") +
+ "/zerolength.seq");
+fs.create(path).close();
+
+try {
+ new SequenceFile.Reader(conf, SequenceFile.Reader.file(path));
+ fail("IOException expecte
[1/2] hadoop git commit: Revert "HADOOP-9692. Improving log message when SequenceFile reader throws EOFException on zero-length file. Contributed by Zhe Zhang and Chu Tong."
Repository: hadoop Updated Branches: refs/heads/branch-2 b023539c1 -> 525a67a62 Revert "HADOOP-9692. Improving log message when SequenceFile reader throws EOFException on zero-length file. Contributed by Zhe Zhang and Chu Tong." This reverts commit 3ed9db0a385719e44f6bb4c9aaa42a371af65e2a. Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/7d4246a5 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/7d4246a5 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/7d4246a5 Branch: refs/heads/branch-2 Commit: 7d4246a5da15c49ee12a23e5bc94ee2faf9ddedf Parents: b023539 Author: Tsuyoshi Ozawa Authored: Fri Oct 23 06:53:56 2015 +0900 Committer: Tsuyoshi Ozawa Committed: Fri Oct 23 06:53:56 2015 +0900 -- hadoop-common-project/hadoop-common/CHANGES.txt | 3 --- 1 file changed, 3 deletions(-) -- http://git-wip-us.apache.org/repos/asf/hadoop/blob/7d4246a5/hadoop-common-project/hadoop-common/CHANGES.txt -- diff --git a/hadoop-common-project/hadoop-common/CHANGES.txt b/hadoop-common-project/hadoop-common/CHANGES.txt index c1f6a7f..263bdc9 100644 --- a/hadoop-common-project/hadoop-common/CHANGES.txt +++ b/hadoop-common-project/hadoop-common/CHANGES.txt @@ -311,9 +311,6 @@ Release 2.8.0 - UNRELEASED HADOOP-10406. TestIPC.testIpcWithReaderQueuing may fail. (Xiao Chen via wang) -HADOOP-9692. Improving log message when SequenceFile reader throws -EOFException on zero-length file. Contributed by Zhe Zhang and Chu Tong. - OPTIMIZATIONS HADOOP-11785. Reduce the number of listStatus operation in distcp
[1/2] hadoop git commit: Revert HADOOP-9692.
Repository: hadoop
Updated Branches:
refs/heads/trunk cb282d5b8 -> 513ec3de1
Revert HADOOP-9692.
This reverts commit 381610da620121c02073dbbaac669b80b41959b4.
This reverts commit b5ca649bff01c906033d71c9f983b4cdaa71a9d1.
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/039a1f9e
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/039a1f9e
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/039a1f9e
Branch: refs/heads/trunk
Commit: 039a1f9e968690cb66af224858e6e64b4f0b2926
Parents: cb282d5
Author: Tsuyoshi Ozawa
Authored: Fri Oct 23 06:43:15 2015 +0900
Committer: Tsuyoshi Ozawa
Committed: Fri Oct 23 06:48:26 2015 +0900
--
hadoop-common-project/hadoop-common/CHANGES.txt | 3 ---
.../java/org/apache/hadoop/io/SequenceFile.java | 15 +++---
.../org/apache/hadoop/io/TestSequenceFile.java | 21
3 files changed, 3 insertions(+), 36 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/hadoop/blob/039a1f9e/hadoop-common-project/hadoop-common/CHANGES.txt
--
diff --git a/hadoop-common-project/hadoop-common/CHANGES.txt
b/hadoop-common-project/hadoop-common/CHANGES.txt
index 87ba2ba..0d3daa2 100644
--- a/hadoop-common-project/hadoop-common/CHANGES.txt
+++ b/hadoop-common-project/hadoop-common/CHANGES.txt
@@ -902,9 +902,6 @@ Release 2.8.0 - UNRELEASED
HADOOP-10406. TestIPC.testIpcWithReaderQueuing may fail. (Xiao Chen via
wang)
-HADOOP-9692. Improving log message when SequenceFile reader throws
-EOFException on zero-length file. Contributed by Zhe Zhang and Chu Tong.
-
OPTIMIZATIONS
HADOOP-11785. Reduce the number of listStatus operation in distcp
http://git-wip-us.apache.org/repos/asf/hadoop/blob/039a1f9e/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/SequenceFile.java
--
diff --git
a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/SequenceFile.java
b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/SequenceFile.java
index ed57eee..e37e855 100644
---
a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/SequenceFile.java
+++
b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/SequenceFile.java
@@ -1912,26 +1912,17 @@ public class SequenceFile {
*/
private void init(boolean tempReader) throws IOException {
byte[] versionBlock = new byte[VERSION.length];
- String exceptionMsg = this + " not a SequenceFile";
-
- // Try to read sequence file header.
- try {
-in.readFully(versionBlock);
- } catch (EOFException e) {
-throw new EOFException(exceptionMsg);
- }
+ in.readFully(versionBlock);
if ((versionBlock[0] != VERSION[0]) ||
(versionBlock[1] != VERSION[1]) ||
- (versionBlock[2] != VERSION[2])) {
+ (versionBlock[2] != VERSION[2]))
throw new IOException(this + " not a SequenceFile");
- }
// Set 'version'
version = versionBlock[3];
- if (version > VERSION[3]) {
+ if (version > VERSION[3])
throw new VersionMismatchException(VERSION[3], version);
- }
if (version < BLOCK_COMPRESS_VERSION) {
UTF8 className = new UTF8();
http://git-wip-us.apache.org/repos/asf/hadoop/blob/039a1f9e/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/io/TestSequenceFile.java
--
diff --git
a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/io/TestSequenceFile.java
b/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/io/TestSequenceFile.java
index 99c97db..7495c6e 100644
---
a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/io/TestSequenceFile.java
+++
b/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/io/TestSequenceFile.java
@@ -522,27 +522,6 @@ public class TestSequenceFile extends TestCase {
assertTrue("InputStream for " + path + " should have been closed.",
openedFile[0].isClosed());
}
- /**
- * Test to makes sure zero length sequence file is handled properly while
- * initializing.
- */
- public void testInitZeroLengthSequenceFile() throws IOException {
-Configuration conf = new Configuration();
-LocalFileSystem fs = FileSystem.getLocal(conf);
-
-// create an empty file (which is not a valid sequence file)
-Path path = new Path(System.getProperty("test.build.data", ".") +
- "/zerolength.seq");
-fs.create(path).close();
-
-try {
- new
hadoop git commit: HADOOP-9692. Improving log message when SequenceFile reader throws EOFException on zero-length file. Contributed by Zhe Zhang and Chu Tong.
Repository: hadoop Updated Branches: refs/heads/branch-2 7579ec5bf -> 3ed9db0a3 HADOOP-9692. Improving log message when SequenceFile reader throws EOFException on zero-length file. Contributed by Zhe Zhang and Chu Tong. (cherry picked from commit 381610da620121c02073dbbaac669b80b41959b4) Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/3ed9db0a Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/3ed9db0a Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/3ed9db0a Branch: refs/heads/branch-2 Commit: 3ed9db0a385719e44f6bb4c9aaa42a371af65e2a Parents: 7579ec5 Author: Tsuyoshi Ozawa Authored: Thu Oct 22 11:59:12 2015 +0900 Committer: Tsuyoshi Ozawa Committed: Thu Oct 22 11:59:25 2015 +0900 -- hadoop-common-project/hadoop-common/CHANGES.txt | 3 +++ 1 file changed, 3 insertions(+) -- http://git-wip-us.apache.org/repos/asf/hadoop/blob/3ed9db0a/hadoop-common-project/hadoop-common/CHANGES.txt -- diff --git a/hadoop-common-project/hadoop-common/CHANGES.txt b/hadoop-common-project/hadoop-common/CHANGES.txt index b3bd02e..2ea0139 100644 --- a/hadoop-common-project/hadoop-common/CHANGES.txt +++ b/hadoop-common-project/hadoop-common/CHANGES.txt @@ -311,6 +311,9 @@ Release 2.8.0 - UNRELEASED HADOOP-10406. TestIPC.testIpcWithReaderQueuing may fail. (Xiao Chen via wang) +HADOOP-9692. Improving log message when SequenceFile reader throws +EOFException on zero-length file. Contributed by Zhe Zhang and Chu Tong. + OPTIMIZATIONS HADOOP-11785. Reduce the number of listStatus operation in distcp
[1/2] hadoop git commit: HADOOP-9692. SequenceFile reader throws EOFException on zero-length file. Contributed by Zhe Zhang and Chu Tong.
Repository: hadoop
Updated Branches:
refs/heads/trunk 3dadf369d -> 381610da6
HADOOP-9692. SequenceFile reader throws EOFException on zero-length file.
Contributed by Zhe Zhang and Chu Tong.
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/b5ca649b
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/b5ca649b
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/b5ca649b
Branch: refs/heads/trunk
Commit: b5ca649bff01c906033d71c9f983b4cdaa71a9d1
Parents: 3dadf36
Author: Tsuyoshi Ozawa
Authored: Thu Oct 22 11:55:25 2015 +0900
Committer: Tsuyoshi Ozawa
Committed: Thu Oct 22 11:55:25 2015 +0900
--
hadoop-common-project/hadoop-common/CHANGES.txt | 3 +++
.../java/org/apache/hadoop/io/SequenceFile.java | 15 +++---
.../org/apache/hadoop/io/TestSequenceFile.java | 21
3 files changed, 36 insertions(+), 3 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/hadoop/blob/b5ca649b/hadoop-common-project/hadoop-common/CHANGES.txt
--
diff --git a/hadoop-common-project/hadoop-common/CHANGES.txt
b/hadoop-common-project/hadoop-common/CHANGES.txt
index 7edf5cd..5acf369 100644
--- a/hadoop-common-project/hadoop-common/CHANGES.txt
+++ b/hadoop-common-project/hadoop-common/CHANGES.txt
@@ -1251,6 +1251,9 @@ Release 2.8.0 - UNRELEASED
HADOOP-12483. Maintain wrapped SASL ordering for postponed IPC responses.
(Daryn Sharp via yliu)
+HADOOP-9692. SequenceFile reader throws EOFException on zero-length file.
+(Zhe Zhang and Chu Tong via ozawa)
+
OPTIMIZATIONS
HADOOP-12051. ProtobufRpcEngine.invoke() should use Exception.toString()
http://git-wip-us.apache.org/repos/asf/hadoop/blob/b5ca649b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/SequenceFile.java
--
diff --git
a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/SequenceFile.java
b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/SequenceFile.java
index e37e855..ed57eee 100644
---
a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/SequenceFile.java
+++
b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/io/SequenceFile.java
@@ -1912,17 +1912,26 @@ public class SequenceFile {
*/
private void init(boolean tempReader) throws IOException {
byte[] versionBlock = new byte[VERSION.length];
- in.readFully(versionBlock);
+ String exceptionMsg = this + " not a SequenceFile";
+
+ // Try to read sequence file header.
+ try {
+in.readFully(versionBlock);
+ } catch (EOFException e) {
+throw new EOFException(exceptionMsg);
+ }
if ((versionBlock[0] != VERSION[0]) ||
(versionBlock[1] != VERSION[1]) ||
- (versionBlock[2] != VERSION[2]))
+ (versionBlock[2] != VERSION[2])) {
throw new IOException(this + " not a SequenceFile");
+ }
// Set 'version'
version = versionBlock[3];
- if (version > VERSION[3])
+ if (version > VERSION[3]) {
throw new VersionMismatchException(VERSION[3], version);
+ }
if (version < BLOCK_COMPRESS_VERSION) {
UTF8 className = new UTF8();
http://git-wip-us.apache.org/repos/asf/hadoop/blob/b5ca649b/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/io/TestSequenceFile.java
--
diff --git
a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/io/TestSequenceFile.java
b/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/io/TestSequenceFile.java
index 7495c6e..99c97db 100644
---
a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/io/TestSequenceFile.java
+++
b/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/io/TestSequenceFile.java
@@ -522,6 +522,27 @@ public class TestSequenceFile extends TestCase {
assertTrue("InputStream for " + path + " should have been closed.",
openedFile[0].isClosed());
}
+ /**
+ * Test to makes sure zero length sequence file is handled properly while
+ * initializing.
+ */
+ public void testInitZeroLengthSequenceFile() throws IOException {
+Configuration conf = new Configuration();
+LocalFileSystem fs = FileSystem.getLocal(conf);
+
+// create an empty file (which is not a valid sequence file)
+Path path = new Path(System.getProperty("test.build.data", ".") +
+ "/zerolength.seq");
+fs.create(path).close();
+
+try {
+ new SequenceFile.Reader(conf, Sequ
[2/2] hadoop git commit: HADOOP-9692. Improving log message when SequenceFile reader throws EOFException on zero-length file. Contributed by Zhe Zhang and Chu Tong.
HADOOP-9692. Improving log message when SequenceFile reader throws EOFException on zero-length file. Contributed by Zhe Zhang and Chu Tong. Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/381610da Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/381610da Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/381610da Branch: refs/heads/trunk Commit: 381610da620121c02073dbbaac669b80b41959b4 Parents: b5ca649 Author: Tsuyoshi Ozawa Authored: Thu Oct 22 11:59:12 2015 +0900 Committer: Tsuyoshi Ozawa Committed: Thu Oct 22 11:59:12 2015 +0900 -- hadoop-common-project/hadoop-common/CHANGES.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) -- http://git-wip-us.apache.org/repos/asf/hadoop/blob/381610da/hadoop-common-project/hadoop-common/CHANGES.txt -- diff --git a/hadoop-common-project/hadoop-common/CHANGES.txt b/hadoop-common-project/hadoop-common/CHANGES.txt index 5acf369..aebd4f3 100644 --- a/hadoop-common-project/hadoop-common/CHANGES.txt +++ b/hadoop-common-project/hadoop-common/CHANGES.txt @@ -899,6 +899,9 @@ Release 2.8.0 - UNRELEASED HADOOP-10406. TestIPC.testIpcWithReaderQueuing may fail. (Xiao Chen via wang) +HADOOP-9692. Improving log message when SequenceFile reader throws +EOFException on zero-length file. Contributed by Zhe Zhang and Chu Tong. + OPTIMIZATIONS HADOOP-11785. Reduce the number of listStatus operation in distcp @@ -1251,9 +1254,6 @@ Release 2.8.0 - UNRELEASED HADOOP-12483. Maintain wrapped SASL ordering for postponed IPC responses. (Daryn Sharp via yliu) -HADOOP-9692. SequenceFile reader throws EOFException on zero-length file. -(Zhe Zhang and Chu Tong via ozawa) - OPTIMIZATIONS HADOOP-12051. ProtobufRpcEngine.invoke() should use Exception.toString()
hadoop git commit: Moved CHANGES.txt entries to 2.6.2
Repository: hadoop Updated Branches: refs/heads/branch-2 be72ed1c7 -> e2f027ddd Moved CHANGES.txt entries to 2.6.2 YARN-2019, YARN-4092, YARN-4101, YARN-4087, YARN-3727, YARN-4005, YARN-3780, YARN-3802, YARN-3896, YARN-3554, YARN-3194, YARN-3798 (cherry picked from commit 14f0e2787c7c590d8ec1fc52f437866f34b098bd) Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/e2f027dd Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/e2f027dd Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/e2f027dd Branch: refs/heads/branch-2 Commit: e2f027dddcbbf7f339f518476e2d43c123b64abc Parents: be72ed1 Author: Tsuyoshi Ozawa Authored: Wed Oct 21 23:15:10 2015 +0900 Committer: Tsuyoshi Ozawa Committed: Wed Oct 21 23:25:43 2015 +0900 -- hadoop-yarn-project/CHANGES.txt | 54 ++-- 1 file changed, 21 insertions(+), 33 deletions(-) -- http://git-wip-us.apache.org/repos/asf/hadoop/blob/e2f027dd/hadoop-yarn-project/CHANGES.txt -- diff --git a/hadoop-yarn-project/CHANGES.txt b/hadoop-yarn-project/CHANGES.txt index 8afc2d2..5d4945a 100644 --- a/hadoop-yarn-project/CHANGES.txt +++ b/hadoop-yarn-project/CHANGES.txt @@ -926,9 +926,6 @@ Release 2.7.2 - UNRELEASED NEW FEATURES -YARN-2019. Retrospect on decision of making RM crashed if any exception throw -in ZKRMStateStore. (Jian He via junping_du) - IMPROVEMENTS YARN-3170. YARN architecture document needs updating. (Brahma Reddy Battula @@ -937,9 +934,6 @@ Release 2.7.2 - UNRELEASED YARN-3967. Fetch the application report from the AHS if the RM does not know about it. (Mit Desai via xgong) -YARN-4092. Fixed UI redirection to print useful messages when both RMs are -in standby mode. (Xuan Gong via jianhe) - YARN-2801. Add documentation for node labels feature. (Wangda Tan and Naganarasimha G R via ozawa) @@ -976,18 +970,12 @@ Release 2.7.2 - UNRELEASED YARN-3893. Both RM in active state when Admin#transitionToActive failure from refeshAll() (Bibin A Chundatt via rohithsharmaks) -YARN-4101. RM should print alert messages if Zookeeper and Resourcemanager -gets connection issue. (Xuan Gong via jianhe) - YARN-4103. RM WebServices missing scheme for appattempts logLinks. (Jonathan Eagles via vvasudeb) YARN-4105. Capacity Scheduler headroom for DRF is wrong (Chang Li via jlowe) -YARN-4087. Followup fixes after YARN-2019 regarding RM behavior when -state-store error occurs. (Jian He via xgong) - YARN-4096. App local logs are leaked if log aggregation fails to initialize for the app. (Jason Lowe via zxu) @@ -1015,27 +1003,12 @@ Release 2.7.2 - UNRELEASED YARN-4180. AMLauncher does not retry on failures when talking to NM. (adhoot) -YARN-3727. For better error recovery, check if the directory exists before -using it for localization. (Zhihai Xu via jlowe) - YARN-3619. ContainerMetrics unregisters during getMetrics and leads to ConcurrentModificationException (Zhihai Xu via jlowe) YARN-4209. RMStateStore FENCED state doesnât work due to updateFencedState called by stateMachine.doTransition. (Zhihai Xu via rohithsharmaks) -YARN-4005. Completed container whose app is finished is possibly not -removed from NMStateStore. (Jun Gong via jianhe) - -YARN-3780. Should use equals when compare Resource in RMNodeImpl#ReconnectNodeTransition. -(zhihai xu via devaraj) - -YARN-3802. Two RMNodes for the same NodeId are used in RM sometimes -after NM is reconnected. (zhihai xu via xgong) - -YARN-3896. RMNode transitioned from RUNNING to REBOOTED because its response id -has not been reset synchronously. (Jun Gong via rohithsharmaks) - Release 2.7.1 - 2015-07-06 INCOMPATIBLE CHANGES @@ -1101,9 +1074,6 @@ Release 2.7.1 - 2015-07-06 YARN-3358. Audit log not present while refreshing Service ACLs. (Varun Saxena via devaraj) -YARN-3554. Default value for maximum nodemanager connect wait time is too -high (Naganarasimha G R via jlowe) - YARN-3476. Nodemanager can fail to delete local logs if log aggregation fails (Rohith via jlowe) @@ -1709,9 +1679,6 @@ Release 2.7.0 - 2015-04-20 YARN-933. Fixed InvalidStateTransitonException at FINAL_SAVING state in RMApp. (Rohith Sharmaks via jianhe) -YARN-3194. RM should handle NMContainerStatuses sent by NM while -registering if NM is Reconnected node (Rohith via jlowe) - YARN-3247. TestQueueMappings should use CapacityScheduler explicitly. (Zhihai Xu via ozawa) @@ -1776,12 +1743,30 @@ Release 2.6.2 - UNRELEASED NEW FEATURES +YARN-2019. Retrospect on decision of making
