ambari git commit: AMBARI-21226. Add two new Spark thrift server related configurations in Spark stack (Saisai Shao via smohanty)

2017-06-13 Thread smohanty 
Repository: ambari
Updated Branches:
  refs/heads/branch-2.5 558d9e3da -> 2461ddbcd


AMBARI-21226. Add two new Spark thrift server related configurations in Spark 
stack (Saisai Shao via smohanty)


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

Branch: refs/heads/branch-2.5
Commit: 2461ddbcd1c4fa00b628395b60625648a9074cd9
Parents: 558d9e3
Author: Sumit Mohanty 
Authored: Tue Jun 13 19:57:06 2017 -0700
Committer: Sumit Mohanty 
Committed: Tue Jun 13 19:57:48 2017 -0700

--
 .../configuration/spark-thrift-sparkconf.xml| 40 
 .../configuration/spark2-thrift-sparkconf.xml   | 40 
 .../stacks/HDP/2.6/upgrades/config-upgrade.xml  | 24 
 .../HDP/2.6/upgrades/nonrolling-upgrade-2.6.xml | 26 +
 .../stacks/HDP/2.6/upgrades/upgrade-2.6.xml | 32 ++--
 5 files changed, 142 insertions(+), 20 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/2461ddbc/ambari-server/src/main/resources/stacks/HDP/2.6/services/SPARK/configuration/spark-thrift-sparkconf.xml
--
diff --git 
a/ambari-server/src/main/resources/stacks/HDP/2.6/services/SPARK/configuration/spark-thrift-sparkconf.xml
 
b/ambari-server/src/main/resources/stacks/HDP/2.6/services/SPARK/configuration/spark-thrift-sparkconf.xml
new file mode 100644
index 000..001ef1e
--- /dev/null
+++ 
b/ambari-server/src/main/resources/stacks/HDP/2.6/services/SPARK/configuration/spark-thrift-sparkconf.xml
@@ -0,0 +1,40 @@
+
+
+
+  
+spark.yarn.executor.failuresValidityInterval
+2h
+
+  Defines the validity interval for executor failure tracking.
+  Executor failures which are older than the validity interval will be 
ignored.
+
+
+  
+  
+spark.yarn.maxAppAttempts
+1
+
+  The maximum number of attempts that will be made to submit the 
application.
+  It should be no larger than the global number of max attempts in the 
YARN configuration.
+
+
+  
+

http://git-wip-us.apache.org/repos/asf/ambari/blob/2461ddbc/ambari-server/src/main/resources/stacks/HDP/2.6/services/SPARK2/configuration/spark2-thrift-sparkconf.xml
--
diff --git 
a/ambari-server/src/main/resources/stacks/HDP/2.6/services/SPARK2/configuration/spark2-thrift-sparkconf.xml
 
b/ambari-server/src/main/resources/stacks/HDP/2.6/services/SPARK2/configuration/spark2-thrift-sparkconf.xml
new file mode 100644
index 000..001ef1e
--- /dev/null
+++ 
b/ambari-server/src/main/resources/stacks/HDP/2.6/services/SPARK2/configuration/spark2-thrift-sparkconf.xml
@@ -0,0 +1,40 @@
+
+
+
+  
+spark.yarn.executor.failuresValidityInterval
+2h
+
+  Defines the validity interval for executor failure tracking.
+  Executor failures which are older than the validity interval will be 
ignored.
+
+
+  
+  
+spark.yarn.maxAppAttempts
+1
+
+  The maximum number of attempts that will be made to submit the 
application.
+  It should be no larger than the global number of max attempts in the 
YARN configuration.
+
+
+  
+

http://git-wip-us.apache.org/repos/asf/ambari/blob/2461ddbc/ambari-server/src/main/resources/stacks/HDP/2.6/upgrades/config-upgrade.xml
--
diff --git 
a/ambari-server/src/main/resources/stacks/HDP/2.6/upgrades/config-upgrade.xml 
b/ambari-server/src/main/resources/stacks/HDP/2.6/upgrades/config-upgrade.xml
index 1610bb5..564dead 100644
--- 
a/ambari-server/src/main/resources/stacks/HDP/2.6/upgrades/config-upgrade.xml
+++ 
b/ambari-server/src/main/resources/stacks/HDP/2.6/upgrades/config-upgrade.xml
@@ -168,5 +168,29 @@
   
 
 
+
+  
+
+  
+spark-thrift-sparkconf
+
+
+  
+
+  
+
+
+
+  
+
+  
+spark2-thrift-sparkconf
+
+
+  
+
+  
+
+
   
 

http://git-wip-us.apache.org/repos/asf/ambari/blob/2461ddbc/ambari-server/src/main/resources/stacks/HDP/2.6/upgrades/nonrolling-upgrade-2.6.xml
--
diff --git 
a/ambari-server/src/main/resources/stacks/HDP/2.6/upgrades/nonrolling-upgrade-2.6.xml
 
b/ambari-server/src/main/resources/stacks/HDP/2.6/upgrades/nonrolling-upgrade-2.6.xml
index 1cdd184..6b827c9 100644
--- 
a/ambari-server/src/main/resources/stacks/HDP/2.6/upgrades/nonrolling-upgrade-2.6.xml

ambari git commit: AMBARI-21226. Add two new Spark thrift server related configurations in Spark stack (Saisai Shao via smohanty)

2017-06-13 Thread smohanty 
Repository: ambari
Updated Branches:
  refs/heads/trunk df685b92d -> 24e2cacb8


AMBARI-21226. Add two new Spark thrift server related configurations in Spark 
stack (Saisai Shao via smohanty)


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

Branch: refs/heads/trunk
Commit: 24e2cacb8ede081824b9162ba124acdffa33e0ec
Parents: df685b9
Author: Sumit Mohanty 
Authored: Tue Jun 13 19:57:06 2017 -0700
Committer: Sumit Mohanty 
Committed: Tue Jun 13 19:57:12 2017 -0700

--
 .../configuration/spark-thrift-sparkconf.xml| 40 
 .../configuration/spark2-thrift-sparkconf.xml   | 40 
 .../stacks/HDP/2.6/upgrades/config-upgrade.xml  | 24 
 .../HDP/2.6/upgrades/nonrolling-upgrade-2.6.xml | 26 +
 .../stacks/HDP/2.6/upgrades/upgrade-2.6.xml | 32 ++--
 5 files changed, 142 insertions(+), 20 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/24e2cacb/ambari-server/src/main/resources/stacks/HDP/2.6/services/SPARK/configuration/spark-thrift-sparkconf.xml
--
diff --git 
a/ambari-server/src/main/resources/stacks/HDP/2.6/services/SPARK/configuration/spark-thrift-sparkconf.xml
 
b/ambari-server/src/main/resources/stacks/HDP/2.6/services/SPARK/configuration/spark-thrift-sparkconf.xml
new file mode 100644
index 000..001ef1e
--- /dev/null
+++ 
b/ambari-server/src/main/resources/stacks/HDP/2.6/services/SPARK/configuration/spark-thrift-sparkconf.xml
@@ -0,0 +1,40 @@
+
+
+
+  
+spark.yarn.executor.failuresValidityInterval
+2h
+
+  Defines the validity interval for executor failure tracking.
+  Executor failures which are older than the validity interval will be 
ignored.
+
+
+  
+  
+spark.yarn.maxAppAttempts
+1
+
+  The maximum number of attempts that will be made to submit the 
application.
+  It should be no larger than the global number of max attempts in the 
YARN configuration.
+
+
+  
+

http://git-wip-us.apache.org/repos/asf/ambari/blob/24e2cacb/ambari-server/src/main/resources/stacks/HDP/2.6/services/SPARK2/configuration/spark2-thrift-sparkconf.xml
--
diff --git 
a/ambari-server/src/main/resources/stacks/HDP/2.6/services/SPARK2/configuration/spark2-thrift-sparkconf.xml
 
b/ambari-server/src/main/resources/stacks/HDP/2.6/services/SPARK2/configuration/spark2-thrift-sparkconf.xml
new file mode 100644
index 000..001ef1e
--- /dev/null
+++ 
b/ambari-server/src/main/resources/stacks/HDP/2.6/services/SPARK2/configuration/spark2-thrift-sparkconf.xml
@@ -0,0 +1,40 @@
+
+
+
+  
+spark.yarn.executor.failuresValidityInterval
+2h
+
+  Defines the validity interval for executor failure tracking.
+  Executor failures which are older than the validity interval will be 
ignored.
+
+
+  
+  
+spark.yarn.maxAppAttempts
+1
+
+  The maximum number of attempts that will be made to submit the 
application.
+  It should be no larger than the global number of max attempts in the 
YARN configuration.
+
+
+  
+

http://git-wip-us.apache.org/repos/asf/ambari/blob/24e2cacb/ambari-server/src/main/resources/stacks/HDP/2.6/upgrades/config-upgrade.xml
--
diff --git 
a/ambari-server/src/main/resources/stacks/HDP/2.6/upgrades/config-upgrade.xml 
b/ambari-server/src/main/resources/stacks/HDP/2.6/upgrades/config-upgrade.xml
index 1610bb5..564dead 100644
--- 
a/ambari-server/src/main/resources/stacks/HDP/2.6/upgrades/config-upgrade.xml
+++ 
b/ambari-server/src/main/resources/stacks/HDP/2.6/upgrades/config-upgrade.xml
@@ -168,5 +168,29 @@
   
 
 
+
+  
+
+  
+spark-thrift-sparkconf
+
+
+  
+
+  
+
+
+
+  
+
+  
+spark2-thrift-sparkconf
+
+
+  
+
+  
+
+
   
 

http://git-wip-us.apache.org/repos/asf/ambari/blob/24e2cacb/ambari-server/src/main/resources/stacks/HDP/2.6/upgrades/nonrolling-upgrade-2.6.xml
--
diff --git 
a/ambari-server/src/main/resources/stacks/HDP/2.6/upgrades/nonrolling-upgrade-2.6.xml
 
b/ambari-server/src/main/resources/stacks/HDP/2.6/upgrades/nonrolling-upgrade-2.6.xml
index 1cdd184..6b827c9 100644
--- 
a/ambari-server/src/main/resources/stacks/HDP/2.6/upgrades/nonrolling-upgrade-2.6.xml
+++

svn commit: r1798639 - in /ambari/site: issue-tracking.html license.html mail-lists.html project-info.html team-list.html

2017-06-13 Thread yusaku 
Author: yusaku
Date: Tue Jun 13 20:37:15 2017
New Revision: 1798639

URL: http://svn.apache.org/viewvc?rev=1798639=rev
Log:
Updated team page. (yusaku)

Modified:
ambari/site/issue-tracking.html
ambari/site/license.html
ambari/site/mail-lists.html
ambari/site/project-info.html
ambari/site/team-list.html

Modified: ambari/site/issue-tracking.html
URL: 
http://svn.apache.org/viewvc/ambari/site/issue-tracking.html?rev=1798639=1798638=1798639=diff
==
--- ambari/site/issue-tracking.html (original)
+++ ambari/site/issue-tracking.html Tue Jun 13 20:37:15 2017
@@ -1,13 +1,13 @@
 
 
 http://www.w3.org/1999/xhtml; xml:lang="en" lang="en">
   
 
 
-
+
 
 Ambari - Issue Tracking
 
@@ -353,7 +353,7 @@
 
 
 
-  Last Published: 
2017-06-08 |
+  Last Published: 
2017-06-13 |
   Version: 2.5.1
 
 

Modified: ambari/site/license.html
URL: 
http://svn.apache.org/viewvc/ambari/site/license.html?rev=1798639=1798638=1798639=diff
==
--- ambari/site/license.html (original)
+++ ambari/site/license.html Tue Jun 13 20:37:15 2017
@@ -1,13 +1,13 @@
 
 
 http://www.w3.org/1999/xhtml; xml:lang="en" lang="en">
   
 
 
-
+
 
 Ambari - Project License
 
@@ -353,7 +353,7 @@
 
 
 
-  Last Published: 
2017-06-08 |
+  Last Published: 
2017-06-13 |
   Version: 2.5.1
 
 

Modified: ambari/site/mail-lists.html
URL: 
http://svn.apache.org/viewvc/ambari/site/mail-lists.html?rev=1798639=1798638=1798639=diff
==
--- ambari/site/mail-lists.html (original)
+++ ambari/site/mail-lists.html Tue Jun 13 20:37:15 2017
@@ -1,13 +1,13 @@
 
 
 http://www.w3.org/1999/xhtml; xml:lang="en" lang="en">
   
 
 
-
+
 
 Ambari - Project Mailing Lists
 
@@ -353,7 +353,7 @@
 
 
 
-  Last Published: 
2017-06-08 |
+  Last Published: 
2017-06-13 |
   Version: 2.5.1
 
 

Modified: ambari/site/project-info.html
URL: 
http://svn.apache.org/viewvc/ambari/site/project-info.html?rev=1798639=1798638=1798639=diff
==
--- ambari/site/project-info.html (original)
+++ ambari/site/project-info.html Tue Jun 13 20:37:15 2017
@@ -1,13 +1,13 @@
 
 
 http://www.w3.org/1999/xhtml; xml:lang="en" lang="en">
   
 
 
-
+
 
 Ambari - Project Information
 
@@ -353,7 +353,7 @@
 
 
 
-  Last Published: 
2017-06-08 |
+  Last Published: 
2017-06-13 |
   Version: 2.5.1
 
 

Modified: ambari/site/team-list.html
URL: 
http://svn.apache.org/viewvc/ambari/site/team-list.html?rev=1798639=1798638=1798639=diff
==
--- ambari/site/team-list.html (original)
+++ ambari/site/team-list.html Tue Jun 13 20:37:15 2017
@@ -1,13 +1,13 @@
 
 
 http://www.w3.org/1999/xhtml; xml:lang="en" lang="en">
   
 
 
-
+
 
 Ambari - Team list
 
@@ -353,7 +353,7 @@
 
 
 
-  Last Published: 
2017-06-08 |
+  Last Published: 
2017-06-13 |
   Version: 2.5.1
 
 
@@ -1154,461 +1154,469 @@
 +5.5
 +5.5
 
+hapylestat
+Dmytro Grinenko
+mailto:hapyles...@apache.org;>hapyles...@apache.org
+Hortonworks
+Committer
++2
++2
+
 hitesh
 Hitesh Shah
 mailto:hit...@apache.org;>hit...@apache.org
 -
 PMC
 -8
--8
-
+-8
+
 jagane
 Jagane Sundar
 mailto:jag...@apache.org;>jag...@apache.org
 WANdisco
 PMC
 -8
--8
-
+-8
+
 jaoki
 Jun Aoki
 mailto:ja...@apache.org;>ja...@apache.org
 Pivotal
 Committer
 -8
--8
-
+-8
+
 jaimin
 Jaimin Jetly
 mailto:jai...@apache.org;>jai...@apache.org
 Hortonworks
 PMC
 -8
--8
-
+-8
+
 jitendra
 Jitendra Pandey
 mailto:jiten...@apache.org;>jiten...@apache.org
 Hortonworks
 PMC
 -8
--8
-
+-8
+
 jluniya
 Jayush Luniya
 mailto:jlun...@apache.org;>jlun...@apache.org
 Hortonworks
 PMC
 -8
--8
-
+-8
+
 jmarron
 Juanjo Marron
 mailto:jmar...@apache.org;>jmar...@apache.org
 IBM
 Committer
 -8
--8
-
+-8
+
 jonathanhurley
 Jonathan Hurley
 mailto:jonathanhur...@apache.org;>jonathanhur...@apache.org
 Hortonworks
 PMC
 -8
--8
-
+-8
+
 jspeidel
 John Speidel
 mailto:jspei...@apache.org;>jspei...@apache.org
 -
 PMC
 -8
--8
-
+-8
+
 kzhang
 Kan Zhang

ambari git commit: Updated team page. (yusaku)

2017-06-13 Thread yusaku 
Repository: ambari
Updated Branches:
  refs/heads/trunk 31ac3c21b -> df685b92d


Updated team page. (yusaku)


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

Branch: refs/heads/trunk
Commit: df685b92d9c99f55757dc36858653130eaddf30c
Parents: 31ac3c2
Author: Yusaku Sako 
Authored: Tue Jun 13 13:36:33 2017 -0700
Committer: Yusaku Sako 
Committed: Tue Jun 13 13:36:33 2017 -0700

--
 docs/pom.xml | 12 
 1 file changed, 12 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/df685b92/docs/pom.xml
--
diff --git a/docs/pom.xml b/docs/pom.xml
index 95478e4..e936c0d 100644
--- a/docs/pom.xml
+++ b/docs/pom.xml
@@ -458,6 +458,18 @@
 
 
 
+hapylestat
+Dmytro Grinenko
+hapyles...@apache.org
++2
+
+Committer
+
+
+Hortonworks
+
+
+
 hitesh
 Hitesh Shah
 hit...@apache.org

[2/2] ambari git commit: AMBARI-21239. Ambari leaves a lot of processes from Hive alert on the machine (aonishuk)

2017-06-13 Thread aonishuk 
AMBARI-21239. Ambari leaves a lot of processes from Hive alert on the machine 
(aonishuk)


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

Branch: refs/heads/branch-2.5
Commit: 558d9e3da6f5706f711b8f701bdb1e2b541e8f94
Parents: f2c91c2
Author: Andrew Onishuk 
Authored: Tue Jun 13 17:01:10 2017 +0300
Committer: Andrew Onishuk 
Committed: Tue Jun 13 17:01:10 2017 +0300

--
 .../libraries/functions/hive_check.py |  5 -
 .../stacks/2.0.6/HIVE/test_hive_service_check.py  | 14 +++---
 2 files changed, 15 insertions(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/558d9e3d/ambari-common/src/main/python/resource_management/libraries/functions/hive_check.py
--
diff --git 
a/ambari-common/src/main/python/resource_management/libraries/functions/hive_check.py
 
b/ambari-common/src/main/python/resource_management/libraries/functions/hive_check.py
index 92d16a2..d8f6696 100644
--- 
a/ambari-common/src/main/python/resource_management/libraries/functions/hive_check.py
+++ 
b/ambari-common/src/main/python/resource_management/libraries/functions/hive_check.py
@@ -21,6 +21,7 @@ limitations under the License.
 from resource_management.core import global_lock
 from resource_management.core.resources import Execute
 from resource_management.libraries.functions import format
+from resource_management.core.signal_utils import TerminateStrategy
 
 
 def check_thrift_port_sasl(address, port, hive_auth="NOSASL", key=None, 
kinitcmd=None, smokeuser='ambari-qa',
@@ -76,4 +77,6 @@ def check_thrift_port_sasl(address, port, hive_auth="NOSASL", 
key=None, kinitcmd
   Execute(cmd,
 user=smokeuser,
 path=["/bin/", "/usr/bin/", "/usr/lib/hive/bin/", "/usr/sbin/"],
-timeout=check_command_timeout)
+timeout=check_command_timeout,
+timeout_kill_strategy=TerminateStrategy.KILL_PROCESS_TREE,
+  )

http://git-wip-us.apache.org/repos/asf/ambari/blob/558d9e3d/ambari-server/src/test/python/stacks/2.0.6/HIVE/test_hive_service_check.py
--
diff --git 
a/ambari-server/src/test/python/stacks/2.0.6/HIVE/test_hive_service_check.py 
b/ambari-server/src/test/python/stacks/2.0.6/HIVE/test_hive_service_check.py
index 52da83a..6877519 100644
--- a/ambari-server/src/test/python/stacks/2.0.6/HIVE/test_hive_service_check.py
+++ b/ambari-server/src/test/python/stacks/2.0.6/HIVE/test_hive_service_check.py
@@ -46,6 +46,7 @@ class TestServiceCheck(RMFTestCase):
   path = ['/bin/', '/usr/bin/', 
'/usr/lib/hive/bin/', '/usr/sbin/'],
   user = 'ambari-qa',
   timeout = 30,
+  timeout_kill_strategy = 2,
   )
 self.assertResourceCalled('File', '/tmp/hcatSmoke.sh',
 content = StaticFile('hcatSmoke.sh'),
@@ -160,6 +161,7 @@ class TestServiceCheck(RMFTestCase):
   path = ['/bin/', '/usr/bin/', 
'/usr/lib/hive/bin/', '/usr/sbin/'],
   user = 'ambari-qa',
   timeout = 30,
+  timeout_kill_strategy = 2,
   )
 self.assertResourceCalled('File', '/tmp/hcatSmoke.sh',
 content = StaticFile('hcatSmoke.sh'),
@@ -276,7 +278,9 @@ class TestServiceCheck(RMFTestCase):
 self.assertResourceCalled('Execute', "! beeline -u 
'jdbc:hive2://c6402.ambari.apache.org:10010/;transportMode=binary'  -e '' 2>&1| 
awk '{print}'|grep -i -e 'Connection refused' -e 'Invalid URL'",
   path = ['/bin/', '/usr/bin/', '/usr/lib/hive/bin/', '/usr/sbin/'],
   timeout = 30,
-  user = 'ambari-qa')
+  user = 'ambari-qa',
+  timeout_kill_strategy = 2,
+)
 
 self.assertResourceCalled('File', '/tmp/hcatSmoke.sh',
   content = StaticFile('hcatSmoke.sh'),
@@ -313,13 +317,17 @@ class TestServiceCheck(RMFTestCase):
   "! beeline -u 
'jdbc:hive2://c6402.ambari.apache.org:10010/;transportMode=binary'  -e '' 2>&1| 
awk '{print}'|grep -i -e 'Connection refused' -e 'Invalid URL'",
   path = ['/bin/', '/usr/bin/', '/usr/lib/hive/bin/', '/usr/sbin/'],
   timeout = 30,
-  user = 'ambari-qa')
+  user = 'ambari-qa',
+  timeout_kill_strategy = 2,
+)
 
 self.assertResourceCalled('Execute',
   "! beeline -u 
'jdbc:hive2://c6402.ambari.apache.org:10500/;transportMode=binary'  -e '' 2>&1| 
awk '{print}'|grep -i -e 'Connection refused'

[1/2] ambari git commit: AMBARI-21239. Ambari leaves a lot of processes from Hive alert on the machine (aonishuk)

2017-06-13 Thread aonishuk 
Repository: ambari
Updated Branches:
  refs/heads/branch-2.5 f2c91c250 -> 558d9e3da
  refs/heads/trunk f80c6ee45 -> 31ac3c21b


AMBARI-21239. Ambari leaves a lot of processes from Hive alert on the machine 
(aonishuk)


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

Branch: refs/heads/trunk
Commit: 31ac3c21b71868df4f4e2ac82e72defa79767bd6
Parents: f80c6ee
Author: Andrew Onishuk 
Authored: Tue Jun 13 17:01:06 2017 +0300
Committer: Andrew Onishuk 
Committed: Tue Jun 13 17:01:06 2017 +0300

--
 .../libraries/functions/hive_check.py |  5 -
 .../stacks/2.0.6/HIVE/test_hive_service_check.py  | 14 +++---
 2 files changed, 15 insertions(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/31ac3c21/ambari-common/src/main/python/resource_management/libraries/functions/hive_check.py
--
diff --git 
a/ambari-common/src/main/python/resource_management/libraries/functions/hive_check.py
 
b/ambari-common/src/main/python/resource_management/libraries/functions/hive_check.py
index 92d16a2..d8f6696 100644
--- 
a/ambari-common/src/main/python/resource_management/libraries/functions/hive_check.py
+++ 
b/ambari-common/src/main/python/resource_management/libraries/functions/hive_check.py
@@ -21,6 +21,7 @@ limitations under the License.
 from resource_management.core import global_lock
 from resource_management.core.resources import Execute
 from resource_management.libraries.functions import format
+from resource_management.core.signal_utils import TerminateStrategy
 
 
 def check_thrift_port_sasl(address, port, hive_auth="NOSASL", key=None, 
kinitcmd=None, smokeuser='ambari-qa',
@@ -76,4 +77,6 @@ def check_thrift_port_sasl(address, port, hive_auth="NOSASL", 
key=None, kinitcmd
   Execute(cmd,
 user=smokeuser,
 path=["/bin/", "/usr/bin/", "/usr/lib/hive/bin/", "/usr/sbin/"],
-timeout=check_command_timeout)
+timeout=check_command_timeout,
+timeout_kill_strategy=TerminateStrategy.KILL_PROCESS_TREE,
+  )

http://git-wip-us.apache.org/repos/asf/ambari/blob/31ac3c21/ambari-server/src/test/python/stacks/2.0.6/HIVE/test_hive_service_check.py
--
diff --git 
a/ambari-server/src/test/python/stacks/2.0.6/HIVE/test_hive_service_check.py 
b/ambari-server/src/test/python/stacks/2.0.6/HIVE/test_hive_service_check.py
index 0e5dac7..0d87315 100644
--- a/ambari-server/src/test/python/stacks/2.0.6/HIVE/test_hive_service_check.py
+++ b/ambari-server/src/test/python/stacks/2.0.6/HIVE/test_hive_service_check.py
@@ -46,6 +46,7 @@ class TestServiceCheck(RMFTestCase):
   path = ['/bin/', '/usr/bin/', 
'/usr/lib/hive/bin/', '/usr/sbin/'],
   user = 'ambari-qa',
   timeout = 30,
+  timeout_kill_strategy = 2,
   )
 self.assertResourceCalled('File', '/tmp/hcatSmoke.sh',
 content = StaticFile('hcatSmoke.sh'),
@@ -160,6 +161,7 @@ class TestServiceCheck(RMFTestCase):
   path = ['/bin/', '/usr/bin/', 
'/usr/lib/hive/bin/', '/usr/sbin/'],
   user = 'ambari-qa',
   timeout = 30,
+  timeout_kill_strategy = 2,
   )
 self.assertResourceCalled('File', '/tmp/hcatSmoke.sh',
 content = StaticFile('hcatSmoke.sh'),
@@ -276,7 +278,9 @@ class TestServiceCheck(RMFTestCase):
 self.assertResourceCalled('Execute', "! beeline -u 
'jdbc:hive2://c6402.ambari.apache.org:10010/;transportMode=binary'  -e '' 2>&1| 
awk '{print}'|grep -i -e 'Connection refused' -e 'Invalid URL'",
   path = ['/bin/', '/usr/bin/', '/usr/lib/hive/bin/', '/usr/sbin/'],
   timeout = 30,
-  user = 'ambari-qa')
+  user = 'ambari-qa',
+  timeout_kill_strategy = 2,
+)
 
 self.assertResourceCalled('File', '/tmp/hcatSmoke.sh',
   content = StaticFile('hcatSmoke.sh'),
@@ -313,13 +317,17 @@ class TestServiceCheck(RMFTestCase):
   "! beeline -u 
'jdbc:hive2://c6402.ambari.apache.org:10010/;transportMode=binary'  -e '' 2>&1| 
awk '{print}'|grep -i -e 'Connection refused' -e 'Invalid URL'",
   path = ['/bin/', '/usr/bin/', '/usr/lib/hive/bin/', '/usr/sbin/'],
   timeout = 30,
-  user = 'ambari-qa')
+  user = 'ambari-qa',
+  timeout_kill_strategy = 2,
+)
 
 self.assertResourceCalled('Execute',
   "! beeline -u

ambari git commit: AMBARI-21233. ambari-web hits JS error in dev mode (alexantonenko)

2017-06-13 Thread alexantonenko 
Repository: ambari
Updated Branches:
  refs/heads/trunk fc00b2caf -> f80c6ee45


AMBARI-21233. ambari-web hits JS error in dev mode (alexantonenko)


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

Branch: refs/heads/trunk
Commit: f80c6ee45b5c6708aa9db98b9afe7ebbeba2afe7
Parents: fc00b2c
Author: Alex Antonenko 
Authored: Tue Jun 13 15:33:14 2017 +0300
Committer: Alex Antonenko 
Committed: Tue Jun 13 15:33:14 2017 +0300

--
 ambari-web/app/controllers/global/cluster_controller.js   | 2 +-
 ambari-web/app/controllers/global/user_settings_controller.js | 3 +++
 ambari-web/app/mappers/repository_version_mapper.js   | 2 +-
 ambari-web/app/utils/ajax/ajax.js | 2 +-
 ambari-web/app/views/main/dashboard/widgets.js| 2 +-
 ambari-web/test/controllers/wizard/step8_test.js  | 4 ++--
 ambari-web/test/views/main/dashboard/widgets_test.js  | 4 ++--
 7 files changed, 11 insertions(+), 8 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/f80c6ee4/ambari-web/app/controllers/global/cluster_controller.js
--
diff --git a/ambari-web/app/controllers/global/cluster_controller.js 
b/ambari-web/app/controllers/global/cluster_controller.js
index 29c979e..e68f281 100644
--- a/ambari-web/app/controllers/global/cluster_controller.js
+++ b/ambari-web/app/controllers/global/cluster_controller.js
@@ -144,7 +144,7 @@ App.ClusterController = 
Em.Controller.extend(App.ReloadPopupMixin, {
 
   setServerClock: function (data) {
 var clientClock = new Date().getTime();
-var serverClock = (data.RootServiceComponents.server_clock).toString();
+var serverClock = (Em.getWithDefault(data, 
'RootServiceComponents.server_clock', '')).toString();
 serverClock = serverClock.length < 13 ? serverClock + '000' : serverClock;
 App.set('clockDistance', serverClock - clientClock);
 App.set('currentServerTime', parseInt(serverClock));

http://git-wip-us.apache.org/repos/asf/ambari/blob/f80c6ee4/ambari-web/app/controllers/global/user_settings_controller.js
--
diff --git a/ambari-web/app/controllers/global/user_settings_controller.js 
b/ambari-web/app/controllers/global/user_settings_controller.js
index 68d7e65..f2542bd 100644
--- a/ambari-web/app/controllers/global/user_settings_controller.js
+++ b/ambari-web/app/controllers/global/user_settings_controller.js
@@ -119,6 +119,9 @@ App.UserSettingsController = 
Em.Controller.extend(App.Persist, {
 var userSettings = {};
 var self = this;
 this.dataLoading().done(function (json) {
+  if (!json) {
+return;
+  }
   Object.keys(userSettingsKeys).forEach(function (k) {
 var value = userSettingsKeys[k].defaultValue;
 if (undefined === json[userSettingsKeys[k].name]) {

http://git-wip-us.apache.org/repos/asf/ambari/blob/f80c6ee4/ambari-web/app/mappers/repository_version_mapper.js
--
diff --git a/ambari-web/app/mappers/repository_version_mapper.js 
b/ambari-web/app/mappers/repository_version_mapper.js
index 8ef50db..f4858ba 100644
--- a/ambari-web/app/mappers/repository_version_mapper.js
+++ b/ambari-web/app/mappers/repository_version_mapper.js
@@ -145,7 +145,7 @@ App.repoVersionMapper = App.QuickDataMapper.create({
   resultService.push(this.parseIt(serviceObj, 
this.get('modelService')));
 }, this);
   }
-  repo.use_redhat_satellite = 
item.operating_systems[0].OperatingSystems.ambari_managed_repositories === 
false;
+  repo.use_redhat_satellite = Em.get(item, 
'operating_systems.0.OperatingSystems.ambari_managed_repositories') === false;
   repo.operating_systems = osArray;
   repo.stack_services = serviceArray;
   resultRepoVersion.push(this.parseIt(repo, 
this.modelRepoVersion(isCurrentStackOnly)));

http://git-wip-us.apache.org/repos/asf/ambari/blob/f80c6ee4/ambari-web/app/utils/ajax/ajax.js
--
diff --git a/ambari-web/app/utils/ajax/ajax.js 
b/ambari-web/app/utils/ajax/ajax.js
index c595181..5919091 100644
--- a/ambari-web/app/utils/ajax/ajax.js
+++ b/ambari-web/app/utils/ajax/ajax.js
@@ -3101,7 +3101,7 @@ var ajax = Em.Object.extend({
   MAX_GET_URL_LENGTH: 2048,
 
   consoleMsg: function(name, url) {
-return Em.I18n.t('app.logger.ajax').format(name, url.substr(7, 100));
+return Em.I18n.t('app.logger.ajax').format(name, url ?

[2/2] ambari git commit: AMBARI-21228. Rename userconfig resource to event history in Log Search Portal (oleewere)

2017-06-13 Thread oleewere 
AMBARI-21228. Rename userconfig resource to event history in Log Search Portal 
(oleewere)


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

Branch: refs/heads/trunk
Commit: fc00b2caf927d083c70812bf1552aafa68958d1f
Parents: 27a9938
Author: oleewere 
Authored: Mon Jun 12 17:12:58 2017 +0200
Committer: oleewere 
Committed: Tue Jun 13 13:47:23 2017 +0200

--
 .../logfeeder/common/LogFeederConstants.java|   2 +-
 .../ambari/logsearch/conf/SecurityConfig.java   |  18 +-
 .../ambari/logsearch/conf/SolrConfig.java   |  12 +-
 .../conf/SolrEventHistoryPropsConfig.java   | 116 +++
 .../logsearch/conf/SolrUserPropsConfig.java | 116 ---
 .../conf/global/SolrEventHistoryState.java  |  60 ++
 .../conf/global/SolrUserConfigState.java|  60 --
 .../EventHistoryRequestQueryConverter.java  |  67 +++
 .../UserConfigRequestQueryConverter.java|  67 ---
 .../logsearch/dao/EventHistorySolrDao.java  | 117 +++
 .../logsearch/dao/SolrSchemaFieldDao.java   |   8 +-
 .../ambari/logsearch/dao/UserConfigSolrDao.java | 117 ---
 .../ambari/logsearch/doc/DocConstants.java  |  12 +-
 .../logsearch/manager/EventHistoryManager.java  | 199 +++
 .../logsearch/manager/UserConfigManager.java| 199 ---
 .../request/EventHistoryParamDefinition.java|  38 
 .../request/UserConfigParamDefinition.java  |  38 
 .../model/request/impl/EventHistoryRequest.java |  53 +
 .../model/request/impl/UserConfigRequest.java   |  53 -
 .../model/response/EventHistoryData.java|  97 +
 .../response/EventHistoryDataListResponse.java  |  55 +
 .../model/response/UserConfigData.java  |  97 -
 .../response/UserConfigDataListResponse.java|  55 -
 .../logsearch/rest/EventHistoryResource.java|  82 
 .../ambari/logsearch/rest/StatusResource.java   |  16 +-
 .../logsearch/rest/UserConfigResource.java  |  82 
 .../ambari/logsearch/solr/SolrConstants.java|   4 +-
 .../LogsearchEventHistoryStateFilter.java   |  52 +
 .../filters/LogsearchUserConfigStateFilter.java |  52 -
 .../EventHistoryRequestQueryConverterTest.java  |  50 +
 .../UserConfigRequestQueryConverterTest.java|  50 -
 .../collection_bases/VEventHistoryListBase.js   |   8 +-
 .../scripts/model_bases/VUserFilterBase.js  |   2 +-
 .../main/webapp/scripts/views/common/Header.js  |   2 +-
 34 files changed, 1028 insertions(+), 1028 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/fc00b2ca/ambari-logsearch/ambari-logsearch-logfeeder/src/main/java/org/apache/ambari/logfeeder/common/LogFeederConstants.java
--
diff --git 
a/ambari-logsearch/ambari-logsearch-logfeeder/src/main/java/org/apache/ambari/logfeeder/common/LogFeederConstants.java
 
b/ambari-logsearch/ambari-logsearch-logfeeder/src/main/java/org/apache/ambari/logfeeder/common/LogFeederConstants.java
index a7559aa..a76 100644
--- 
a/ambari-logsearch/ambari-logsearch-logfeeder/src/main/java/org/apache/ambari/logfeeder/common/LogFeederConstants.java
+++ 
b/ambari-logsearch/ambari-logsearch-logfeeder/src/main/java/org/apache/ambari/logfeeder/common/LogFeederConstants.java
@@ -29,7 +29,7 @@ public class LogFeederConstants {
   public static final String SOLR_COMPONENT = "type";
   public static final String SOLR_HOST = "host";
 
-  // UserConfig Constants History
+  // Event History Constants History
   public static final String VALUES = "jsons";
   public static final String ROW_TYPE = "rowtype";
   

http://git-wip-us.apache.org/repos/asf/ambari/blob/fc00b2ca/ambari-logsearch/ambari-logsearch-server/src/main/java/org/apache/ambari/logsearch/conf/SecurityConfig.java
--
diff --git 
a/ambari-logsearch/ambari-logsearch-server/src/main/java/org/apache/ambari/logsearch/conf/SecurityConfig.java
 
b/ambari-logsearch/ambari-logsearch-server/src/main/java/org/apache/ambari/logsearch/conf/SecurityConfig.java
index 973dc4b..441b628 100644
--- 
a/ambari-logsearch/ambari-logsearch-server/src/main/java/org/apache/ambari/logsearch/conf/SecurityConfig.java
+++ 
b/ambari-logsearch/ambari-logsearch-server/src/main/java/org/apache/ambari/logsearch/conf/SecurityConfig.java
@@ -33,7 +33,7 @@ import 
org.apache.ambari.logsearch.web.filters.LogsearchKRBAuthenticationFilter;
 import org.apache.ambari.logsearch.web.filters.LogsearchJWTFilter;
 import

[1/2] ambari git commit: AMBARI-21228. Rename userconfig resource to event history in Log Search Portal (oleewere)

2017-06-13 Thread oleewere 
Repository: ambari
Updated Branches:
  refs/heads/trunk 27a99389e -> fc00b2caf


http://git-wip-us.apache.org/repos/asf/ambari/blob/fc00b2ca/ambari-logsearch/ambari-logsearch-server/src/main/java/org/apache/ambari/logsearch/rest/StatusResource.java
--
diff --git 
a/ambari-logsearch/ambari-logsearch-server/src/main/java/org/apache/ambari/logsearch/rest/StatusResource.java
 
b/ambari-logsearch/ambari-logsearch-server/src/main/java/org/apache/ambari/logsearch/rest/StatusResource.java
index 8cc6b94..3499bce 100644
--- 
a/ambari-logsearch/ambari-logsearch-server/src/main/java/org/apache/ambari/logsearch/rest/StatusResource.java
+++ 
b/ambari-logsearch/ambari-logsearch-server/src/main/java/org/apache/ambari/logsearch/rest/StatusResource.java
@@ -34,7 +34,7 @@ import java.util.Map;
 import static 
org.apache.ambari.logsearch.doc.DocConstants.StatusOperationDescriptions.AUDIT_LOGS_STATUS_OD;
 import static 
org.apache.ambari.logsearch.doc.DocConstants.StatusOperationDescriptions.SERVICE_LOGS_STATUS_OD;
 import static 
org.apache.ambari.logsearch.doc.DocConstants.StatusOperationDescriptions.STATUS_OD;
-import static 
org.apache.ambari.logsearch.doc.DocConstants.StatusOperationDescriptions.USER_CONFIG_STATUS_OD;
+import static 
org.apache.ambari.logsearch.doc.DocConstants.StatusOperationDescriptions.EVENT_HISTORY_STATUS_OD;
 
 @Api(value = "status", description = "Status Operations")
 @Path("status")
@@ -51,8 +51,8 @@ public class StatusResource {
   private SolrCollectionState solrAuditLogsState;
 
   @Inject
-  @Named("solrUserConfigState")
-  private SolrCollectionState solrUserConfigState;
+  @Named("solrEventHistoryState")
+  private SolrCollectionState solrEventHistoryState;
 
   @GET
   @Produces({"application/json"})
@@ -61,7 +61,7 @@ public class StatusResource {
 Map response = new HashMap<>();
 response.put("serviceLogs", solrServiceLogsState);
 response.put("auditLogs", solrAuditLogsState);
-response.put("userConfig", solrUserConfigState);
+response.put("eventHistory", solrEventHistoryState);
 return response;
   }
 
@@ -82,10 +82,10 @@ public class StatusResource {
   }
 
   @GET
-  @Path("/userconfig")
+  @Path("/history")
   @Produces({"application/json"})
-  @ApiOperation(USER_CONFIG_STATUS_OD)
-  public SolrCollectionState getSolrUserConfigStatus() {
-return solrUserConfigState;
+  @ApiOperation(EVENT_HISTORY_STATUS_OD)
+  public SolrCollectionState getSolrEventHistoryStatus() {
+return solrEventHistoryState;
   }
 }

http://git-wip-us.apache.org/repos/asf/ambari/blob/fc00b2ca/ambari-logsearch/ambari-logsearch-server/src/main/java/org/apache/ambari/logsearch/rest/UserConfigResource.java
--
diff --git 
a/ambari-logsearch/ambari-logsearch-server/src/main/java/org/apache/ambari/logsearch/rest/UserConfigResource.java
 
b/ambari-logsearch/ambari-logsearch-server/src/main/java/org/apache/ambari/logsearch/rest/UserConfigResource.java
deleted file mode 100644
index 00b971a..000
--- 
a/ambari-logsearch/ambari-logsearch-server/src/main/java/org/apache/ambari/logsearch/rest/UserConfigResource.java
+++ /dev/null
@@ -1,82 +0,0 @@
-/*
- * 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.ambari.logsearch.rest;
-
-import javax.inject.Inject;
-import javax.inject.Named;
-import javax.ws.rs.BeanParam;
-import javax.ws.rs.DELETE;
-import javax.ws.rs.GET;
-import javax.ws.rs.POST;
-import javax.ws.rs.Path;
-import javax.ws.rs.PathParam;
-import javax.ws.rs.Produces;
-
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import org.apache.ambari.logsearch.manager.UserConfigManager;
-import org.apache.ambari.logsearch.model.request.impl.UserConfigRequest;
-import org.apache.ambari.logsearch.model.response.UserConfigData;
-import org.apache.ambari.logsearch.model.response.UserConfigDataListResponse;
-import org.springframework.context.annotation.Scope;
-
-import java.util.List;
-
-import static 
org.apache.ambari.logsearch.doc.DocConstants.UserConfigOperationDescriptions.*;
-
-@Api(value = "userconfig", description =

[2/2] ambari git commit: AMBARI-21224. RU: Oozie LR job failed (aonishuk)

2017-06-13 Thread aonishuk 
AMBARI-21224. RU: Oozie LR job failed (aonishuk)


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

Branch: refs/heads/branch-2.5
Commit: f2c91c250b7a1bb27a49e440413bb6a2892696e6
Parents: 21959a4
Author: Andrew Onishuk 
Authored: Tue Jun 13 14:44:08 2017 +0300
Committer: Andrew Onishuk 
Committed: Tue Jun 13 14:44:08 2017 +0300

--
 .../HDP/2.6/services/YARN/configuration-mapred/mapred-site.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/f2c91c25/ambari-server/src/main/resources/stacks/HDP/2.6/services/YARN/configuration-mapred/mapred-site.xml
--
diff --git 
a/ambari-server/src/main/resources/stacks/HDP/2.6/services/YARN/configuration-mapred/mapred-site.xml
 
b/ambari-server/src/main/resources/stacks/HDP/2.6/services/YARN/configuration-mapred/mapred-site.xml
index bbfdc24..f03125b 100644
--- 
a/ambari-server/src/main/resources/stacks/HDP/2.6/services/YARN/configuration-mapred/mapred-site.xml
+++ 
b/ambari-server/src/main/resources/stacks/HDP/2.6/services/YARN/configuration-mapred/mapred-site.xml
@@ -19,7 +19,7 @@
 
 
 yarn.app.mapreduce.client.job.max-retries
-30
+60
 
 The number of retries the client will make for getJob and 
dependent calls.

[1/2] ambari git commit: AMBARI-21224. RU: Oozie LR job failed (aonishuk)

2017-06-13 Thread aonishuk 
Repository: ambari
Updated Branches:
  refs/heads/branch-2.5 21959a495 -> f2c91c250
  refs/heads/trunk 1f19461f1 -> 27a99389e


AMBARI-21224. RU: Oozie LR job failed (aonishuk)


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

Branch: refs/heads/trunk
Commit: 27a99389e3c3566b6fc58b17cb06510ab9bffa13
Parents: 1f19461
Author: Andrew Onishuk 
Authored: Tue Jun 13 14:44:05 2017 +0300
Committer: Andrew Onishuk 
Committed: Tue Jun 13 14:44:05 2017 +0300

--
 .../HDP/2.6/services/YARN/configuration-mapred/mapred-site.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/27a99389/ambari-server/src/main/resources/stacks/HDP/2.6/services/YARN/configuration-mapred/mapred-site.xml
--
diff --git 
a/ambari-server/src/main/resources/stacks/HDP/2.6/services/YARN/configuration-mapred/mapred-site.xml
 
b/ambari-server/src/main/resources/stacks/HDP/2.6/services/YARN/configuration-mapred/mapred-site.xml
index bbfdc24..f03125b 100644
--- 
a/ambari-server/src/main/resources/stacks/HDP/2.6/services/YARN/configuration-mapred/mapred-site.xml
+++ 
b/ambari-server/src/main/resources/stacks/HDP/2.6/services/YARN/configuration-mapred/mapred-site.xml
@@ -19,7 +19,7 @@
 
 
 yarn.app.mapreduce.client.job.max-retries
-30
+60
 
 The number of retries the client will make for getJob and 
dependent calls.