[42/59] [abbrv] hadoop git commit: YARN-7836. Added error check for updating service components. (Contributed by Gour Saha)

2018-02-26 Thread xyao 
YARN-7836.  Added error check for updating service components.
(Contributed by Gour Saha)


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

Branch: refs/heads/HDFS-7240
Commit: 190969006d4a7f9ef86d67bba472f7dc5642668a
Parents: 84a1321
Author: Eric Yang 
Authored: Thu Feb 22 16:08:30 2018 -0500
Committer: Eric Yang 
Committed: Thu Feb 22 16:08:30 2018 -0500

--
 .../hadoop/yarn/service/webapp/ApiServer.java   | 23 +--
 .../hadoop/yarn/service/TestApiServer.java  | 69 
 2 files changed, 75 insertions(+), 17 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/hadoop/blob/19096900/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services-api/src/main/java/org/apache/hadoop/yarn/service/webapp/ApiServer.java
--
diff --git 
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services-api/src/main/java/org/apache/hadoop/yarn/service/webapp/ApiServer.java
 
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services-api/src/main/java/org/apache/hadoop/yarn/service/webapp/ApiServer.java
index e58938e..1528596 100644
--- 
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services-api/src/main/java/org/apache/hadoop/yarn/service/webapp/ApiServer.java
+++ 
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services-api/src/main/java/org/apache/hadoop/yarn/service/webapp/ApiServer.java
@@ -280,14 +280,25 @@ public class ApiServer {
   @PathParam(COMPONENT_NAME) String componentName, Component component) {
 
 try {
-  UserGroupInformation ugi = getProxyUser(request);
+  if (component == null) {
+throw new YarnException("No component data provided");
+  }
+  if (component.getName() != null
+  && !component.getName().equals(componentName)) {
+String msg = "Component name in the request object ("
++ component.getName() + ") does not match that in the URI path ("
++ componentName + ")";
+throw new YarnException(msg);
+  }
+  if (component.getNumberOfContainers() == null) {
+throw new YarnException("No container count provided");
+  }
   if (component.getNumberOfContainers() < 0) {
-String message =
-"Service = " + appName + ", Component = " + component.getName()
-+ ": Invalid number of containers specified " + component
-.getNumberOfContainers();
+String message = "Invalid number of containers specified "
++ component.getNumberOfContainers();
 throw new YarnException(message);
   }
+  UserGroupInformation ugi = getProxyUser(request);
   Map original = ugi
   .doAs(new PrivilegedExceptionAction>() {
 @Override
@@ -296,7 +307,7 @@ public class ApiServer {
   sc.init(YARN_CONFIG);
   sc.start();
   Map original = sc.flexByRestService(appName,
-  Collections.singletonMap(component.getName(),
+  Collections.singletonMap(componentName,
   component.getNumberOfContainers()));
   sc.close();
   return original;

http://git-wip-us.apache.org/repos/asf/hadoop/blob/19096900/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services-api/src/test/java/org/apache/hadoop/yarn/service/TestApiServer.java
--
diff --git 
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services-api/src/test/java/org/apache/hadoop/yarn/service/TestApiServer.java
 
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services-api/src/test/java/org/apache/hadoop/yarn/service/TestApiServer.java
index 52057db..4629d28 100644
--- 
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services-api/src/test/java/org/apache/hadoop/yarn/service/TestApiServer.java
+++ 
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services-api/src/test/java/org/apache/hadoop/yarn/service/TestApiServer.java
@@ -17,6 +17,16 @@
 
 package org.apache.hadoop.yarn.service;
 
+import static org.junit.Assert.*;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.ws.rs.Path;
+import javax.ws.rs.core.Response;
+import javax.ws.rs.core.Response.Status;
+
 import org.apache.hadoop.conf.Configuration;
 import org.apache.hadoop.yarn.service.api.records.Artifact;
 import org.apache.hadoop.yarn.se

[43/50] [abbrv] hadoop git commit: YARN-7836. Added error check for updating service components. (Contributed by Gour Saha)

2018-02-23 Thread hanishakoneru 
YARN-7836.  Added error check for updating service components.
(Contributed by Gour Saha)


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

Branch: refs/heads/HDFS-12996
Commit: 190969006d4a7f9ef86d67bba472f7dc5642668a
Parents: 84a1321
Author: Eric Yang 
Authored: Thu Feb 22 16:08:30 2018 -0500
Committer: Eric Yang 
Committed: Thu Feb 22 16:08:30 2018 -0500

--
 .../hadoop/yarn/service/webapp/ApiServer.java   | 23 +--
 .../hadoop/yarn/service/TestApiServer.java  | 69 
 2 files changed, 75 insertions(+), 17 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/hadoop/blob/19096900/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services-api/src/main/java/org/apache/hadoop/yarn/service/webapp/ApiServer.java
--
diff --git 
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services-api/src/main/java/org/apache/hadoop/yarn/service/webapp/ApiServer.java
 
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services-api/src/main/java/org/apache/hadoop/yarn/service/webapp/ApiServer.java
index e58938e..1528596 100644
--- 
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services-api/src/main/java/org/apache/hadoop/yarn/service/webapp/ApiServer.java
+++ 
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services-api/src/main/java/org/apache/hadoop/yarn/service/webapp/ApiServer.java
@@ -280,14 +280,25 @@ public class ApiServer {
   @PathParam(COMPONENT_NAME) String componentName, Component component) {
 
 try {
-  UserGroupInformation ugi = getProxyUser(request);
+  if (component == null) {
+throw new YarnException("No component data provided");
+  }
+  if (component.getName() != null
+  && !component.getName().equals(componentName)) {
+String msg = "Component name in the request object ("
++ component.getName() + ") does not match that in the URI path ("
++ componentName + ")";
+throw new YarnException(msg);
+  }
+  if (component.getNumberOfContainers() == null) {
+throw new YarnException("No container count provided");
+  }
   if (component.getNumberOfContainers() < 0) {
-String message =
-"Service = " + appName + ", Component = " + component.getName()
-+ ": Invalid number of containers specified " + component
-.getNumberOfContainers();
+String message = "Invalid number of containers specified "
++ component.getNumberOfContainers();
 throw new YarnException(message);
   }
+  UserGroupInformation ugi = getProxyUser(request);
   Map original = ugi
   .doAs(new PrivilegedExceptionAction>() {
 @Override
@@ -296,7 +307,7 @@ public class ApiServer {
   sc.init(YARN_CONFIG);
   sc.start();
   Map original = sc.flexByRestService(appName,
-  Collections.singletonMap(component.getName(),
+  Collections.singletonMap(componentName,
   component.getNumberOfContainers()));
   sc.close();
   return original;

http://git-wip-us.apache.org/repos/asf/hadoop/blob/19096900/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services-api/src/test/java/org/apache/hadoop/yarn/service/TestApiServer.java
--
diff --git 
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services-api/src/test/java/org/apache/hadoop/yarn/service/TestApiServer.java
 
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services-api/src/test/java/org/apache/hadoop/yarn/service/TestApiServer.java
index 52057db..4629d28 100644
--- 
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services-api/src/test/java/org/apache/hadoop/yarn/service/TestApiServer.java
+++ 
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services-api/src/test/java/org/apache/hadoop/yarn/service/TestApiServer.java
@@ -17,6 +17,16 @@
 
 package org.apache.hadoop.yarn.service;
 
+import static org.junit.Assert.*;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.ws.rs.Path;
+import javax.ws.rs.core.Response;
+import javax.ws.rs.core.Response.Status;
+
 import org.apache.hadoop.conf.Configuration;
 import org.apache.hadoop.yarn.service.api.records.Artifact;
 import org.apache.hadoop.yarn.s

hadoop git commit: YARN-7836. Added error check for updating service components. (Contributed by Gour Saha) (Cherry-picked from commit 190969006d4a7f9ef86d67bba472f7dc5642668a)

2018-02-22 Thread eyang 
Repository: hadoop
Updated Branches:
  refs/heads/branch-3.1 bfbd43f2f -> 13922cc32


YARN-7836.  Added error check for updating service components.
(Contributed by Gour Saha)
(Cherry-picked from commit 190969006d4a7f9ef86d67bba472f7dc5642668a)


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

Branch: refs/heads/branch-3.1
Commit: 13922cc32d7fabf819592af271ad67e38aecf98d
Parents: bfbd43f
Author: Eric Yang 
Authored: Thu Feb 22 16:08:30 2018 -0500
Committer: Eric Yang 
Committed: Thu Feb 22 16:11:22 2018 -0500

--
 .../hadoop/yarn/service/webapp/ApiServer.java   | 23 +--
 .../hadoop/yarn/service/TestApiServer.java  | 69 
 2 files changed, 75 insertions(+), 17 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/hadoop/blob/13922cc3/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services-api/src/main/java/org/apache/hadoop/yarn/service/webapp/ApiServer.java
--
diff --git 
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services-api/src/main/java/org/apache/hadoop/yarn/service/webapp/ApiServer.java
 
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services-api/src/main/java/org/apache/hadoop/yarn/service/webapp/ApiServer.java
index e58938e..1528596 100644
--- 
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services-api/src/main/java/org/apache/hadoop/yarn/service/webapp/ApiServer.java
+++ 
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services-api/src/main/java/org/apache/hadoop/yarn/service/webapp/ApiServer.java
@@ -280,14 +280,25 @@ public class ApiServer {
   @PathParam(COMPONENT_NAME) String componentName, Component component) {
 
 try {
-  UserGroupInformation ugi = getProxyUser(request);
+  if (component == null) {
+throw new YarnException("No component data provided");
+  }
+  if (component.getName() != null
+  && !component.getName().equals(componentName)) {
+String msg = "Component name in the request object ("
++ component.getName() + ") does not match that in the URI path ("
++ componentName + ")";
+throw new YarnException(msg);
+  }
+  if (component.getNumberOfContainers() == null) {
+throw new YarnException("No container count provided");
+  }
   if (component.getNumberOfContainers() < 0) {
-String message =
-"Service = " + appName + ", Component = " + component.getName()
-+ ": Invalid number of containers specified " + component
-.getNumberOfContainers();
+String message = "Invalid number of containers specified "
++ component.getNumberOfContainers();
 throw new YarnException(message);
   }
+  UserGroupInformation ugi = getProxyUser(request);
   Map original = ugi
   .doAs(new PrivilegedExceptionAction>() {
 @Override
@@ -296,7 +307,7 @@ public class ApiServer {
   sc.init(YARN_CONFIG);
   sc.start();
   Map original = sc.flexByRestService(appName,
-  Collections.singletonMap(component.getName(),
+  Collections.singletonMap(componentName,
   component.getNumberOfContainers()));
   sc.close();
   return original;

http://git-wip-us.apache.org/repos/asf/hadoop/blob/13922cc3/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services-api/src/test/java/org/apache/hadoop/yarn/service/TestApiServer.java
--
diff --git 
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services-api/src/test/java/org/apache/hadoop/yarn/service/TestApiServer.java
 
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services-api/src/test/java/org/apache/hadoop/yarn/service/TestApiServer.java
index 52057db..4629d28 100644
--- 
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services-api/src/test/java/org/apache/hadoop/yarn/service/TestApiServer.java
+++ 
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services-api/src/test/java/org/apache/hadoop/yarn/service/TestApiServer.java
@@ -17,6 +17,16 @@
 
 package org.apache.hadoop.yarn.service;
 
+import static org.junit.Assert.*;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.ws.rs.Path;
+import javax.ws.rs.core.Response;
+import javax.ws.rs.core.Res

hadoop git commit: YARN-7836. Added error check for updating service components. (Contributed by Gour Saha)

2018-02-22 Thread eyang 
Repository: hadoop
Updated Branches:
  refs/heads/trunk 84a1321f6 -> 190969006


YARN-7836.  Added error check for updating service components.
(Contributed by Gour Saha)


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

Branch: refs/heads/trunk
Commit: 190969006d4a7f9ef86d67bba472f7dc5642668a
Parents: 84a1321
Author: Eric Yang 
Authored: Thu Feb 22 16:08:30 2018 -0500
Committer: Eric Yang 
Committed: Thu Feb 22 16:08:30 2018 -0500

--
 .../hadoop/yarn/service/webapp/ApiServer.java   | 23 +--
 .../hadoop/yarn/service/TestApiServer.java  | 69 
 2 files changed, 75 insertions(+), 17 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/hadoop/blob/19096900/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services-api/src/main/java/org/apache/hadoop/yarn/service/webapp/ApiServer.java
--
diff --git 
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services-api/src/main/java/org/apache/hadoop/yarn/service/webapp/ApiServer.java
 
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services-api/src/main/java/org/apache/hadoop/yarn/service/webapp/ApiServer.java
index e58938e..1528596 100644
--- 
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services-api/src/main/java/org/apache/hadoop/yarn/service/webapp/ApiServer.java
+++ 
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services-api/src/main/java/org/apache/hadoop/yarn/service/webapp/ApiServer.java
@@ -280,14 +280,25 @@ public class ApiServer {
   @PathParam(COMPONENT_NAME) String componentName, Component component) {
 
 try {
-  UserGroupInformation ugi = getProxyUser(request);
+  if (component == null) {
+throw new YarnException("No component data provided");
+  }
+  if (component.getName() != null
+  && !component.getName().equals(componentName)) {
+String msg = "Component name in the request object ("
++ component.getName() + ") does not match that in the URI path ("
++ componentName + ")";
+throw new YarnException(msg);
+  }
+  if (component.getNumberOfContainers() == null) {
+throw new YarnException("No container count provided");
+  }
   if (component.getNumberOfContainers() < 0) {
-String message =
-"Service = " + appName + ", Component = " + component.getName()
-+ ": Invalid number of containers specified " + component
-.getNumberOfContainers();
+String message = "Invalid number of containers specified "
++ component.getNumberOfContainers();
 throw new YarnException(message);
   }
+  UserGroupInformation ugi = getProxyUser(request);
   Map original = ugi
   .doAs(new PrivilegedExceptionAction>() {
 @Override
@@ -296,7 +307,7 @@ public class ApiServer {
   sc.init(YARN_CONFIG);
   sc.start();
   Map original = sc.flexByRestService(appName,
-  Collections.singletonMap(component.getName(),
+  Collections.singletonMap(componentName,
   component.getNumberOfContainers()));
   sc.close();
   return original;

http://git-wip-us.apache.org/repos/asf/hadoop/blob/19096900/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services-api/src/test/java/org/apache/hadoop/yarn/service/TestApiServer.java
--
diff --git 
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services-api/src/test/java/org/apache/hadoop/yarn/service/TestApiServer.java
 
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services-api/src/test/java/org/apache/hadoop/yarn/service/TestApiServer.java
index 52057db..4629d28 100644
--- 
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services-api/src/test/java/org/apache/hadoop/yarn/service/TestApiServer.java
+++ 
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services-api/src/test/java/org/apache/hadoop/yarn/service/TestApiServer.java
@@ -17,6 +17,16 @@
 
 package org.apache.hadoop.yarn.service;
 
+import static org.junit.Assert.*;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.ws.rs.Path;
+import javax.ws.rs.core.Response;
+import javax.ws.rs.core.Response.Status;
+
 import org.apache.hadoop.conf.Configuration;
 import org.apach