[2/2] hadoop git commit: YARN-8080. Add restart policy for YARN services. Contributed by Suma Shivaprasad

2018-05-17 Thread eyang
YARN-8080.  Add restart policy for YARN services.
Contributed by Suma Shivaprasad


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

Branch: refs/heads/trunk
Commit: 7f083ed8699a720d3fb82e4ec310356902a6ac30
Parents: 7802af6
Author: Eric Yang 
Authored: Thu May 17 17:16:50 2018 -0400
Committer: Eric Yang 
Committed: Thu May 17 17:16:50 2018 -0400

--
 ...RN-Simplified-V1-API-Layer-For-Services.yaml |   8 +
 .../hadoop/yarn/service/ClientAMService.java|   7 +-
 .../hadoop/yarn/service/ServiceContext.java |   4 +
 .../hadoop/yarn/service/ServiceManager.java |  25 +-
 .../hadoop/yarn/service/ServiceScheduler.java   |  73 ++-
 .../yarn/service/api/records/Component.java |  71 +++
 .../service/component/AlwaysRestartPolicy.java  |  82 
 .../yarn/service/component/Component.java   | 209 ++--
 .../component/ComponentRestartPolicy.java   |  45 ++
 .../service/component/NeverRestartPolicy.java   |  82 
 .../component/OnFailureRestartPolicy.java   |  87 
 .../component/instance/ComponentInstance.java   |  91 +++-
 .../hadoop/yarn/service/utils/ServiceUtils.java |  18 +
 .../hadoop/yarn/service/ServiceTestUtils.java   |  46 +-
 .../hadoop/yarn/service/TestServiceManager.java |   6 +-
 .../yarn/service/component/TestComponent.java   |  99 +++-
 .../component/TestComponentRestartPolicy.java   | 130 +
 .../instance/TestComponentInstance.java | 484 ++-
 .../markdown/yarn-service/YarnServiceAPI.md |   2 +
 19 files changed, 1447 insertions(+), 122 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/hadoop/blob/7f083ed8/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services-api/src/main/resources/definition/YARN-Simplified-V1-API-Layer-For-Services.yaml
--
diff --git 
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services-api/src/main/resources/definition/YARN-Simplified-V1-API-Layer-For-Services.yaml
 
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services-api/src/main/resources/definition/YARN-Simplified-V1-API-Layer-For-Services.yaml
index cea8296..d90ae06 100644
--- 
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services-api/src/main/resources/definition/YARN-Simplified-V1-API-Layer-For-Services.yaml
+++ 
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services-api/src/main/resources/definition/YARN-Simplified-V1-API-Layer-For-Services.yaml
@@ -424,6 +424,14 @@ definitions:
 items:
   type: string
 description: A list of quicklink keys defined at the service level, 
and to be resolved by this component.
+  restartPolicy:
+type: string
+description: Policy of restart component. Including ALWAYS (Always 
restart component even if instance exit code = 0); ON_FAILURE (Only restart 
component if instance exit code != 0); NEVER (Do not restart in any cases)
+enum:
+  - ALWAYS
+  - ON_FAILURE
+  - NEVER
+default: ALWAYS
   ReadinessCheck:
 description: A check to be performed to determine the readiness of a 
component instance (a container). If no readiness check is specified, the 
default readiness check will be used unless the 
yarn.service.default-readiness-check.enabled configuration property is set to 
false at the component, service, or system level. The artifact field is 
currently unsupported but may be implemented in the future, enabling a 
pluggable helper container to support advanced use cases.
 required:

http://git-wip-us.apache.org/repos/asf/hadoop/blob/7f083ed8/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/ClientAMService.java
--
diff --git 
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/ClientAMService.java
 
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/ClientAMService.java
index d5d6fa4..e97c3d6 100644
--- 
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/ClientAMService.java
+++ 

[2/2] hadoop git commit: YARN-8080. Add restart policy for YARN services. Contributed by Suma Shivaprasad

2018-05-17 Thread eyang
YARN-8080.  Add restart policy for YARN services.
Contributed by Suma Shivaprasad

(cherry picked from commit 7f083ed8699a720d3fb82e4ec310356902a6ac30)


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

Branch: refs/heads/branch-3.1
Commit: 044573b6281d02973254870106c36b60fd91547e
Parents: c6c3b0a
Author: Eric Yang 
Authored: Thu May 17 17:16:50 2018 -0400
Committer: Eric Yang 
Committed: Thu May 17 17:20:45 2018 -0400

--
 ...RN-Simplified-V1-API-Layer-For-Services.yaml |   8 +
 .../hadoop/yarn/service/ClientAMService.java|   7 +-
 .../hadoop/yarn/service/ServiceContext.java |   4 +
 .../hadoop/yarn/service/ServiceManager.java |  25 +-
 .../hadoop/yarn/service/ServiceScheduler.java   |  73 ++-
 .../yarn/service/api/records/Component.java |  71 +++
 .../service/component/AlwaysRestartPolicy.java  |  82 
 .../yarn/service/component/Component.java   | 209 ++--
 .../component/ComponentRestartPolicy.java   |  45 ++
 .../service/component/NeverRestartPolicy.java   |  82 
 .../component/OnFailureRestartPolicy.java   |  87 
 .../component/instance/ComponentInstance.java   |  91 +++-
 .../hadoop/yarn/service/utils/ServiceUtils.java |  18 +
 .../hadoop/yarn/service/ServiceTestUtils.java   |  46 +-
 .../hadoop/yarn/service/TestServiceManager.java |   6 +-
 .../yarn/service/component/TestComponent.java   |  99 +++-
 .../component/TestComponentRestartPolicy.java   | 130 +
 .../instance/TestComponentInstance.java | 484 ++-
 .../markdown/yarn-service/YarnServiceAPI.md |   2 +
 19 files changed, 1447 insertions(+), 122 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/hadoop/blob/044573b6/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services-api/src/main/resources/definition/YARN-Simplified-V1-API-Layer-For-Services.yaml
--
diff --git 
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services-api/src/main/resources/definition/YARN-Simplified-V1-API-Layer-For-Services.yaml
 
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services-api/src/main/resources/definition/YARN-Simplified-V1-API-Layer-For-Services.yaml
index cea8296..d90ae06 100644
--- 
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services-api/src/main/resources/definition/YARN-Simplified-V1-API-Layer-For-Services.yaml
+++ 
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services-api/src/main/resources/definition/YARN-Simplified-V1-API-Layer-For-Services.yaml
@@ -424,6 +424,14 @@ definitions:
 items:
   type: string
 description: A list of quicklink keys defined at the service level, 
and to be resolved by this component.
+  restartPolicy:
+type: string
+description: Policy of restart component. Including ALWAYS (Always 
restart component even if instance exit code = 0); ON_FAILURE (Only restart 
component if instance exit code != 0); NEVER (Do not restart in any cases)
+enum:
+  - ALWAYS
+  - ON_FAILURE
+  - NEVER
+default: ALWAYS
   ReadinessCheck:
 description: A check to be performed to determine the readiness of a 
component instance (a container). If no readiness check is specified, the 
default readiness check will be used unless the 
yarn.service.default-readiness-check.enabled configuration property is set to 
false at the component, service, or system level. The artifact field is 
currently unsupported but may be implemented in the future, enabling a 
pluggable helper container to support advanced use cases.
 required:

http://git-wip-us.apache.org/repos/asf/hadoop/blob/044573b6/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/ClientAMService.java
--
diff --git 
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/ClientAMService.java
 
b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/ClientAMService.java
index d5d6fa4..e97c3d6 100644
--- 
a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/main/java/org/apache/hadoop/yarn/service/ClientAMService.java
+++