hadoop git commit: Revert "YARN-6804. [YARN core changes] Allow custom hostname for docker containers in native services. Contributed by Billie Rinaldi"

2017-07-22 Thread brahma 
Repository: hadoop
Updated Branches:
  refs/heads/trunk 465c21343 -> 2054324d4


Revert "YARN-6804. [YARN core changes] Allow custom hostname for docker 
containers in native services. Contributed by Billie Rinaldi"

This reverts commit 4a771d9010de0867ac901bead075383ddf1f30dc.


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

Branch: refs/heads/trunk
Commit: 2054324d471a6152ba34284b4259d4fd09c71704
Parents: 465c213
Author: Brahma Reddy Battula 
Authored: Sun Jul 23 12:56:18 2017 +0800
Committer: Brahma Reddy Battula 
Committed: Sun Jul 23 12:56:18 2017 +0800

--
 .../client/binding/RegistryPathUtils.java   |  2 +-
 .../hadoop/registry/client/types/Endpoint.java  |  4 +-
 .../registry/client/types/ServiceRecord.java|  4 +-
 .../hadoop-yarn-server-nodemanager/pom.xml  |  4 --
 .../runtime/DockerLinuxContainerRuntime.java| 67 +---
 .../linux/runtime/docker/DockerRunCommand.java  |  6 --
 .../impl/container-executor.c   |  4 --
 .../test/test-container-executor.c  | 16 ++---
 .../runtime/TestDockerContainerRuntime.java | 58 -
 9 files changed, 44 insertions(+), 121 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/hadoop/blob/2054324d/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-registry/src/main/java/org/apache/hadoop/registry/client/binding/RegistryPathUtils.java
--
diff --git 
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-registry/src/main/java/org/apache/hadoop/registry/client/binding/RegistryPathUtils.java
 
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-registry/src/main/java/org/apache/hadoop/registry/client/binding/RegistryPathUtils.java
index 5fa45f9..5d8ea3f 100644
--- 
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-registry/src/main/java/org/apache/hadoop/registry/client/binding/RegistryPathUtils.java
+++ 
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-registry/src/main/java/org/apache/hadoop/registry/client/binding/RegistryPathUtils.java
@@ -213,6 +213,6 @@ public class RegistryPathUtils {
* @return a string suitable for use in registry paths.
*/
   public static String encodeYarnID(String yarnId) {
-return yarnId.replace("container", "ctr").replace("_", "-");
+return yarnId.replace("_", "-");
   }
 }

http://git-wip-us.apache.org/repos/asf/hadoop/blob/2054324d/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-registry/src/main/java/org/apache/hadoop/registry/client/types/Endpoint.java
--
diff --git 
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-registry/src/main/java/org/apache/hadoop/registry/client/types/Endpoint.java
 
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-registry/src/main/java/org/apache/hadoop/registry/client/types/Endpoint.java
index 392884f..395f836 100644
--- 
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-registry/src/main/java/org/apache/hadoop/registry/client/types/Endpoint.java
+++ 
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-registry/src/main/java/org/apache/hadoop/registry/client/types/Endpoint.java
@@ -19,7 +19,7 @@
 package org.apache.hadoop.registry.client.types;
 
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
-import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.google.common.base.Preconditions;
 import org.apache.hadoop.classification.InterfaceAudience;
 import org.apache.hadoop.classification.InterfaceStability;
@@ -46,7 +46,7 @@ import java.util.Map;
 @InterfaceAudience.Public
 @InterfaceStability.Evolving
 @JsonIgnoreProperties(ignoreUnknown = true)
-@JsonInclude(JsonInclude.Include.NON_NULL)
+@JsonSerialize(include = JsonSerialize.Inclusion.NON_NULL)
 public final class Endpoint implements Cloneable {
 
   /**

http://git-wip-us.apache.org/repos/asf/hadoop/blob/2054324d/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-registry/src/main/java/org/apache/hadoop/registry/client/types/ServiceRecord.java
--
diff --git 
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-registry/src/main/java/org/apache/hadoop/registry/client/types/ServiceRecord.java
 
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-registry/src/main/java/org/apache/hadoop/registry/client/types/ServiceRecord.java
index d40866a..674d6d3 100644
--- 
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-registry/src/main/java/org/apache/hadoop/registry/client/types/ServiceRecord.java
+++

hadoop git commit: HDFS-12167. Ozone: Intermittent failure TestContainerPersistence#testListKey. Contributed by Surendra Singh Lilhore.

2017-07-22 Thread wwei 
Repository: hadoop
Updated Branches:
  refs/heads/HDFS-7240 63e211ff7 -> c53909520


HDFS-12167. Ozone: Intermittent failure TestContainerPersistence#testListKey. 
Contributed by Surendra Singh Lilhore.


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

Branch: refs/heads/HDFS-7240
Commit: c539095200142b1c448c06584f757be0a335bee6
Parents: 63e211f
Author: Weiwei Yang 
Authored: Sat Jul 22 22:02:35 2017 +0800
Committer: Weiwei Yang 
Committed: Sat Jul 22 22:02:35 2017 +0800

--
 .../ozone/container/common/impl/TestContainerPersistence.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/hadoop/blob/c5390952/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/ozone/container/common/impl/TestContainerPersistence.java
--
diff --git 
a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/ozone/container/common/impl/TestContainerPersistence.java
 
b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/ozone/container/common/impl/TestContainerPersistence.java
index b33ee86..6282894 100644
--- 
a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/ozone/container/common/impl/TestContainerPersistence.java
+++ 
b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/ozone/container/common/impl/TestContainerPersistence.java
@@ -816,7 +816,7 @@ public class TestContainerPersistence {
 
   @Test
   public void testListKey() throws Exception {
-String containerName = "c0" + RandomStringUtils.randomAscii(10);
+String containerName = "c0" + RandomStringUtils.randomAlphanumeric(10);
 Pipeline pipeline = createSingleNodePipeline(containerName);
 List expectedKeys = new ArrayList();
 for (int i = 0; i < 10; i++) {


-
To unsubscribe, e-mail: common-commits-unsubscr...@hadoop.apache.org
For additional commands, e-mail: common-commits-h...@hadoop.apache.org

[hadoop] Git Push Summary

2017-07-22 Thread naganarasimha_gr 
Repository: hadoop
Updated Branches:
  refs/heads/yarn-3409 [created] 465c21343

-
To unsubscribe, e-mail: common-commits-unsubscr...@hadoop.apache.org
For additional commands, e-mail: common-commits-h...@hadoop.apache.org