Repository: ambari Updated Branches: refs/heads/branch-feature-AMBARI-18901 0e4bf17bf -> 0c5850a2e
Revert "AMBARI-18904. Oozie service check fails due to timeout. (Balazs Bence Sari via stoader)" This reverts commit c76cac371d6483653f0e279640d54ed0dcb2bb7a. Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/245cffc3 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/245cffc3 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/245cffc3 Branch: refs/heads/branch-feature-AMBARI-18901 Commit: 245cffc3f5fcc8ce4b74029640c1a704560e16ee Parents: 0e4bf17 Author: Toader, Sebastian <[email protected]> Authored: Fri Nov 18 10:57:20 2016 +0100 Committer: Toader, Sebastian <[email protected]> Committed: Fri Nov 18 10:57:20 2016 +0100 ---------------------------------------------------------------------- .../main/resources/common-services/MAHOUT/1.0.0.2.3/metainfo.xml | 2 +- .../main/resources/common-services/OOZIE/4.0.0.2.0/metainfo.xml | 2 +- .../main/resources/common-services/OOZIE/4.2.0.2.3/metainfo.xml | 2 +- .../src/main/resources/common-services/PIG/0.12.0.2.0/metainfo.xml | 2 +- .../src/main/resources/common-services/TEZ/0.4.0.2.1/metainfo.xml | 2 +- .../src/main/resources/common-services/YARN/2.1.0.2.0/metainfo.xml | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/245cffc3/ambari-server/src/main/resources/common-services/MAHOUT/1.0.0.2.3/metainfo.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/MAHOUT/1.0.0.2.3/metainfo.xml b/ambari-server/src/main/resources/common-services/MAHOUT/1.0.0.2.3/metainfo.xml index 80274fc..f363e55 100644 --- a/ambari-server/src/main/resources/common-services/MAHOUT/1.0.0.2.3/metainfo.xml +++ b/ambari-server/src/main/resources/common-services/MAHOUT/1.0.0.2.3/metainfo.xml @@ -62,7 +62,7 @@ <commandScript> <script>scripts/service_check.py</script> <scriptType>PYTHON</scriptType> - <timeout>600</timeout> + <timeout>300</timeout> </commandScript> <requiredServices> http://git-wip-us.apache.org/repos/asf/ambari/blob/245cffc3/ambari-server/src/main/resources/common-services/OOZIE/4.0.0.2.0/metainfo.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/OOZIE/4.0.0.2.0/metainfo.xml b/ambari-server/src/main/resources/common-services/OOZIE/4.0.0.2.0/metainfo.xml index 1d6a1c1..eff162e 100644 --- a/ambari-server/src/main/resources/common-services/OOZIE/4.0.0.2.0/metainfo.xml +++ b/ambari-server/src/main/resources/common-services/OOZIE/4.0.0.2.0/metainfo.xml @@ -150,7 +150,7 @@ <commandScript> <script>scripts/service_check.py</script> <scriptType>PYTHON</scriptType> - <timeout>600</timeout> + <timeout>300</timeout> </commandScript> <requiredServices> http://git-wip-us.apache.org/repos/asf/ambari/blob/245cffc3/ambari-server/src/main/resources/common-services/OOZIE/4.2.0.2.3/metainfo.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/OOZIE/4.2.0.2.3/metainfo.xml b/ambari-server/src/main/resources/common-services/OOZIE/4.2.0.2.3/metainfo.xml index dcda7c0..7c7357c 100644 --- a/ambari-server/src/main/resources/common-services/OOZIE/4.2.0.2.3/metainfo.xml +++ b/ambari-server/src/main/resources/common-services/OOZIE/4.2.0.2.3/metainfo.xml @@ -162,7 +162,7 @@ <commandScript> <script>scripts/service_check.py</script> <scriptType>PYTHON</scriptType> - <timeout>600</timeout> + <timeout>300</timeout> </commandScript> <requiredServices> http://git-wip-us.apache.org/repos/asf/ambari/blob/245cffc3/ambari-server/src/main/resources/common-services/PIG/0.12.0.2.0/metainfo.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/PIG/0.12.0.2.0/metainfo.xml b/ambari-server/src/main/resources/common-services/PIG/0.12.0.2.0/metainfo.xml index c3190f8..d445e58 100644 --- a/ambari-server/src/main/resources/common-services/PIG/0.12.0.2.0/metainfo.xml +++ b/ambari-server/src/main/resources/common-services/PIG/0.12.0.2.0/metainfo.xml @@ -68,7 +68,7 @@ <commandScript> <script>scripts/service_check.py</script> <scriptType>PYTHON</scriptType> - <timeout>600</timeout> + <timeout>300</timeout> </commandScript> <requiredServices> http://git-wip-us.apache.org/repos/asf/ambari/blob/245cffc3/ambari-server/src/main/resources/common-services/TEZ/0.4.0.2.1/metainfo.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/TEZ/0.4.0.2.1/metainfo.xml b/ambari-server/src/main/resources/common-services/TEZ/0.4.0.2.1/metainfo.xml index b2677f1..8b3a153 100644 --- a/ambari-server/src/main/resources/common-services/TEZ/0.4.0.2.1/metainfo.xml +++ b/ambari-server/src/main/resources/common-services/TEZ/0.4.0.2.1/metainfo.xml @@ -86,7 +86,7 @@ <commandScript> <script>scripts/service_check.py</script> <scriptType>PYTHON</scriptType> - <timeout>600</timeout> + <timeout>300</timeout> </commandScript> <requiredServices> http://git-wip-us.apache.org/repos/asf/ambari/blob/245cffc3/ambari-server/src/main/resources/common-services/YARN/2.1.0.2.0/metainfo.xml ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/YARN/2.1.0.2.0/metainfo.xml b/ambari-server/src/main/resources/common-services/YARN/2.1.0.2.0/metainfo.xml index 0067dbe..25e242b 100644 --- a/ambari-server/src/main/resources/common-services/YARN/2.1.0.2.0/metainfo.xml +++ b/ambari-server/src/main/resources/common-services/YARN/2.1.0.2.0/metainfo.xml @@ -159,7 +159,7 @@ <commandScript> <script>scripts/service_check.py</script> <scriptType>PYTHON</scriptType> - <timeout>600</timeout> + <timeout>300</timeout> </commandScript> <requiredServices>
