ambari git commit: AMBARI-19773 Enable incremental sync by default for fresh install for Ranger Usersync (mugdha)

[mugdha]

Repository: ambari
Updated Branches:
  refs/heads/trunk 7617c4e1c -> 55e35a65d


AMBARI-19773 Enable incremental sync by default for fresh install for Ranger 
Usersync (mugdha)


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

Branch: refs/heads/trunk
Commit: 55e35a65da5cdf9804886106ce4135a123061ba3
Parents: 7617c4e
Author: Mugdha Varadkar 
Authored: Mon Jan 30 14:24:59 2017 +0530
Committer: Mugdha Varadkar 
Committed: Tue Jan 31 11:44:17 2017 +0530

--
 .../RANGER/0.7.0/configuration/ranger-ugsync-site.xml  | 2 +-
 .../main/resources/stacks/HDP/2.3/upgrades/config-upgrade.xml  | 6 ++
 .../stacks/HDP/2.3/upgrades/nonrolling-upgrade-2.6.xml | 4 
 .../src/main/resources/stacks/HDP/2.3/upgrades/upgrade-2.6.xml | 1 +
 .../main/resources/stacks/HDP/2.4/upgrades/config-upgrade.xml  | 6 ++
 .../stacks/HDP/2.4/upgrades/nonrolling-upgrade-2.6.xml | 4 
 .../src/main/resources/stacks/HDP/2.4/upgrades/upgrade-2.6.xml | 1 +
 .../main/resources/stacks/HDP/2.5/upgrades/config-upgrade.xml  | 6 ++
 .../stacks/HDP/2.5/upgrades/nonrolling-upgrade-2.6.xml | 3 +++
 .../src/main/resources/stacks/HDP/2.5/upgrades/upgrade-2.6.xml | 1 +
 10 files changed, 33 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/55e35a65/ambari-server/src/main/resources/common-services/RANGER/0.7.0/configuration/ranger-ugsync-site.xml
--
diff --git 
a/ambari-server/src/main/resources/common-services/RANGER/0.7.0/configuration/ranger-ugsync-site.xml
 
b/ambari-server/src/main/resources/common-services/RANGER/0.7.0/configuration/ranger-ugsync-site.xml
index 15ee9fd..a994856 100644
--- 
a/ambari-server/src/main/resources/common-services/RANGER/0.7.0/configuration/ranger-ugsync-site.xml
+++ 
b/ambari-server/src/main/resources/common-services/RANGER/0.7.0/configuration/ranger-ugsync-site.xml
@@ -19,7 +19,7 @@
   
 ranger.usersync.ldap.deltasync
 Incremental Sync
-false
+true
 Enable Incremental Sync
 
   value-list

http://git-wip-us.apache.org/repos/asf/ambari/blob/55e35a65/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/config-upgrade.xml
--
diff --git 
a/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/config-upgrade.xml 
b/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/config-upgrade.xml
index 3ea660d..238f3be 100644
--- 
a/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/config-upgrade.xml
+++ 
b/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/config-upgrade.xml
@@ -319,6 +319,12 @@
 
 
   
+
+  
+ranger-ugsync-site
+
+  
 
   
 

http://git-wip-us.apache.org/repos/asf/ambari/blob/55e35a65/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/nonrolling-upgrade-2.6.xml
--
diff --git 
a/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/nonrolling-upgrade-2.6.xml
 
b/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/nonrolling-upgrade-2.6.xml
index 6153a8c..2beb708 100644
--- 
a/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/nonrolling-upgrade-2.6.xml
+++ 
b/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/nonrolling-upgrade-2.6.xml
@@ -526,6 +526,10 @@
 
   
 
+  
+
+  
+
   
 
   Updating the Ranger tagsync Log4J properties to include 
parameterizations

http://git-wip-us.apache.org/repos/asf/ambari/blob/55e35a65/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/upgrade-2.6.xml
--
diff --git 
a/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/upgrade-2.6.xml 
b/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/upgrade-2.6.xml
index daf249c..5d710ab 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/upgrade-2.6.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/upgrade-2.6.xml
@@ -630,6 +630,7 @@
   
 
   
+  
 
 
 

http://git-wip-us.apache.org/repos/asf/ambari/blob/55e35a65/ambari-server/src/main/resources/stacks/HDP/2.4/upgrades/config-upgrade.xml
--
diff --git 
a/ambari-server/src/main/resources/stacks/HDP/2.4/upgrades/config-upgrade.xml 

ambari git commit: AMBARI-19773 Enable incremental sync by default for fresh install for Ranger Usersync (mugdha)

[mugdha]

Repository: ambari
Updated Branches:
  refs/heads/branch-2.5 5251a2257 -> 65be27b59


AMBARI-19773 Enable incremental sync by default for fresh install for Ranger 
Usersync (mugdha)


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

Branch: refs/heads/branch-2.5
Commit: 65be27b592923bf63942d7d3b4d86766c544a566
Parents: 5251a22
Author: Mugdha Varadkar 
Authored: Mon Jan 30 14:24:59 2017 +0530
Committer: Mugdha Varadkar 
Committed: Tue Jan 31 11:43:20 2017 +0530

--
 .../RANGER/0.7.0/configuration/ranger-ugsync-site.xml  | 2 +-
 .../main/resources/stacks/HDP/2.3/upgrades/config-upgrade.xml  | 6 ++
 .../stacks/HDP/2.3/upgrades/nonrolling-upgrade-2.6.xml | 4 
 .../src/main/resources/stacks/HDP/2.3/upgrades/upgrade-2.6.xml | 1 +
 .../main/resources/stacks/HDP/2.4/upgrades/config-upgrade.xml  | 6 ++
 .../stacks/HDP/2.4/upgrades/nonrolling-upgrade-2.6.xml | 4 
 .../src/main/resources/stacks/HDP/2.4/upgrades/upgrade-2.6.xml | 1 +
 .../main/resources/stacks/HDP/2.5/upgrades/config-upgrade.xml  | 6 ++
 .../stacks/HDP/2.5/upgrades/nonrolling-upgrade-2.6.xml | 3 +++
 .../src/main/resources/stacks/HDP/2.5/upgrades/upgrade-2.6.xml | 1 +
 10 files changed, 33 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/65be27b5/ambari-server/src/main/resources/common-services/RANGER/0.7.0/configuration/ranger-ugsync-site.xml
--
diff --git 
a/ambari-server/src/main/resources/common-services/RANGER/0.7.0/configuration/ranger-ugsync-site.xml
 
b/ambari-server/src/main/resources/common-services/RANGER/0.7.0/configuration/ranger-ugsync-site.xml
index 15ee9fd..a994856 100644
--- 
a/ambari-server/src/main/resources/common-services/RANGER/0.7.0/configuration/ranger-ugsync-site.xml
+++ 
b/ambari-server/src/main/resources/common-services/RANGER/0.7.0/configuration/ranger-ugsync-site.xml
@@ -19,7 +19,7 @@
   
 ranger.usersync.ldap.deltasync
 Incremental Sync
-false
+true
 Enable Incremental Sync
 
   value-list

http://git-wip-us.apache.org/repos/asf/ambari/blob/65be27b5/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/config-upgrade.xml
--
diff --git 
a/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/config-upgrade.xml 
b/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/config-upgrade.xml
index 771c247..73d40fb 100644
--- 
a/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/config-upgrade.xml
+++ 
b/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/config-upgrade.xml
@@ -319,6 +319,12 @@
 
 
   
+
+  
+ranger-ugsync-site
+
+  
 
   
 

http://git-wip-us.apache.org/repos/asf/ambari/blob/65be27b5/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/nonrolling-upgrade-2.6.xml
--
diff --git 
a/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/nonrolling-upgrade-2.6.xml
 
b/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/nonrolling-upgrade-2.6.xml
index 44362f7..0afa2c9 100644
--- 
a/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/nonrolling-upgrade-2.6.xml
+++ 
b/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/nonrolling-upgrade-2.6.xml
@@ -526,6 +526,10 @@
 
   
 
+  
+
+  
+
   
 
   Updating the Ranger tagsync Log4J properties to include 
parameterizations

http://git-wip-us.apache.org/repos/asf/ambari/blob/65be27b5/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/upgrade-2.6.xml
--
diff --git 
a/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/upgrade-2.6.xml 
b/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/upgrade-2.6.xml
index daf249c..5d710ab 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/upgrade-2.6.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/upgrade-2.6.xml
@@ -630,6 +630,7 @@
   
 
   
+  
 
 
 

http://git-wip-us.apache.org/repos/asf/ambari/blob/65be27b5/ambari-server/src/main/resources/stacks/HDP/2.4/upgrades/config-upgrade.xml
--
diff --git 
a/ambari-server/src/main/resources/stacks/HDP/2.4/upgrades/config-upgrade.xml 

ambari git commit: AMBARI-19524 : Use stack-level Atlas conf directory instead of hard-coded /etc/atlas/conf path (Vishal Suvagia via mugdha)

[mugdha]

Repository: ambari
Updated Branches:
  refs/heads/branch-2.5 84c680a9e -> 5251a2257


AMBARI-19524 : Use stack-level Atlas conf directory instead of hard-coded 
/etc/atlas/conf path (Vishal Suvagia via mugdha)


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

Branch: refs/heads/branch-2.5
Commit: 5251a22579d0aae059a2d6591b9b6747dd0beb9a
Parents: 84c680a
Author: Vishal Suvagia 
Authored: Fri Jan 27 20:29:33 2017 +0530
Committer: Mugdha Varadkar 
Committed: Tue Jan 31 11:41:35 2017 +0530

--
 .../stacks/2.3/ATLAS/test_metadata_server.py| 65 ++--
 1 file changed, 32 insertions(+), 33 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/5251a225/ambari-server/src/test/python/stacks/2.3/ATLAS/test_metadata_server.py
--
diff --git 
a/ambari-server/src/test/python/stacks/2.3/ATLAS/test_metadata_server.py 
b/ambari-server/src/test/python/stacks/2.3/ATLAS/test_metadata_server.py
index 8ae6469..1bbf75e 100644
--- a/ambari-server/src/test/python/stacks/2.3/ATLAS/test_metadata_server.py
+++ b/ambari-server/src/test/python/stacks/2.3/ATLAS/test_metadata_server.py
@@ -19,6 +19,7 @@ limitations under the License.
 '''
 
 from mock.mock import MagicMock, call, patch
+from resource_management.libraries.script.script import Script
 from stacks.utils.RMFTestCase import *
 import json
 import sys
@@ -29,16 +30,16 @@ from only_for_platform import not_for_platform, 
PLATFORM_WINDOWS
 class TestMetadataServer(RMFTestCase):
   COMMON_SERVICES_PACKAGE_DIR = "ATLAS/0.1.0.2.3/package"
   STACK_VERSION = "2.3"
-
+  stack_root = Script.get_stack_root()
+  conf_dir = stack_root + "/current/atlas-server/conf"
   def configureResourcesCalled(self):
   # Both server and client
-  self.assertResourceCalled('Directory', 
'/usr/hdp/current/atlas-server/conf',
+  self.assertResourceCalled('Directory', self.conf_dir,
 owner='atlas',
 group='hadoop',
 create_parents = True,
 cd_access='a',
-mode=0755
-  )
+mode=0755)
 
   # Pid dir
   self.assertResourceCalled('Directory', '/var/run/atlas',
@@ -48,7 +49,7 @@ class TestMetadataServer(RMFTestCase):
 cd_access='a',
 mode=0755
   )
-  self.assertResourceCalled('Directory', 
'/usr/hdp/current/atlas-server/conf/solr',
+  self.assertResourceCalled('Directory', self.conf_dir + "/solr",
 owner='atlas',
 group='hadoop',
 create_parents = True,
@@ -65,7 +66,7 @@ class TestMetadataServer(RMFTestCase):
 mode=0755
   )
   # Data dir
-  self.assertResourceCalled('Directory', 
'/usr/hdp/current/atlas-server/data',
+  self.assertResourceCalled('Directory', 
self.stack_root+"/current/atlas-server/data",
 owner='atlas',
 group='hadoop',
 create_parents = True,
@@ -73,15 +74,15 @@ class TestMetadataServer(RMFTestCase):
 mode=0644
   )
   # Expanded war dir
-  self.assertResourceCalled('Directory', 
'/usr/hdp/current/atlas-server/server/webapp',
+  self.assertResourceCalled('Directory', 
self.stack_root+'/current/atlas-server/server/webapp',
 owner='atlas',
 group='hadoop',
 create_parents = True,
 cd_access='a',
 mode=0644
   )
-  self.assertResourceCalled('File', 
'/usr/hdp/current/atlas-server/server/webapp/atlas.war',
-  content = 
StaticFile('/usr/hdp/current/atlas-server/server/webapp/atlas.war'),
+  self.assertResourceCalled('File', 
self.stack_root+'/current/atlas-server/server/webapp/atlas.war',
+  content = 
StaticFile(self.stack_root+'/current/atlas-server/server/webapp/atlas.war'),
   )
   host_name = u"c6401.ambari.apache.org"
   app_props =  
dict(self.getConfig()['configurations']['application-properties'])
@@ -94,7 +95,7 @@ class TestMetadataServer(RMFTestCase):
   app_props["atlas.server.address.id1"] = u"%s:%s" % (host_name, 
metadata_port)
   app_props["atlas.server.ha.enabled"] = "false"
 
-  self.assertResourceCalled('File', 

ambari git commit: AMBARI-19524 : Use stack-level Atlas conf directory instead of hard-coded /etc/atlas/conf path (Vishal Suvagia via mugdha)

[mugdha]

Repository: ambari
Updated Branches:
  refs/heads/trunk 2f06c1cef -> 7617c4e1c


AMBARI-19524 : Use stack-level Atlas conf directory instead of hard-coded 
/etc/atlas/conf path (Vishal Suvagia via mugdha)


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

Branch: refs/heads/trunk
Commit: 7617c4e1cddceed3e567385b40731a8b8c58d3bc
Parents: 2f06c1c
Author: Vishal Suvagia 
Authored: Fri Jan 27 20:29:33 2017 +0530
Committer: Mugdha Varadkar 
Committed: Tue Jan 31 11:37:39 2017 +0530

--
 .../stacks/2.3/ATLAS/test_metadata_server.py| 65 ++--
 1 file changed, 32 insertions(+), 33 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/7617c4e1/ambari-server/src/test/python/stacks/2.3/ATLAS/test_metadata_server.py
--
diff --git 
a/ambari-server/src/test/python/stacks/2.3/ATLAS/test_metadata_server.py 
b/ambari-server/src/test/python/stacks/2.3/ATLAS/test_metadata_server.py
index 8ae6469..1bbf75e 100644
--- a/ambari-server/src/test/python/stacks/2.3/ATLAS/test_metadata_server.py
+++ b/ambari-server/src/test/python/stacks/2.3/ATLAS/test_metadata_server.py
@@ -19,6 +19,7 @@ limitations under the License.
 '''
 
 from mock.mock import MagicMock, call, patch
+from resource_management.libraries.script.script import Script
 from stacks.utils.RMFTestCase import *
 import json
 import sys
@@ -29,16 +30,16 @@ from only_for_platform import not_for_platform, 
PLATFORM_WINDOWS
 class TestMetadataServer(RMFTestCase):
   COMMON_SERVICES_PACKAGE_DIR = "ATLAS/0.1.0.2.3/package"
   STACK_VERSION = "2.3"
-
+  stack_root = Script.get_stack_root()
+  conf_dir = stack_root + "/current/atlas-server/conf"
   def configureResourcesCalled(self):
   # Both server and client
-  self.assertResourceCalled('Directory', 
'/usr/hdp/current/atlas-server/conf',
+  self.assertResourceCalled('Directory', self.conf_dir,
 owner='atlas',
 group='hadoop',
 create_parents = True,
 cd_access='a',
-mode=0755
-  )
+mode=0755)
 
   # Pid dir
   self.assertResourceCalled('Directory', '/var/run/atlas',
@@ -48,7 +49,7 @@ class TestMetadataServer(RMFTestCase):
 cd_access='a',
 mode=0755
   )
-  self.assertResourceCalled('Directory', 
'/usr/hdp/current/atlas-server/conf/solr',
+  self.assertResourceCalled('Directory', self.conf_dir + "/solr",
 owner='atlas',
 group='hadoop',
 create_parents = True,
@@ -65,7 +66,7 @@ class TestMetadataServer(RMFTestCase):
 mode=0755
   )
   # Data dir
-  self.assertResourceCalled('Directory', 
'/usr/hdp/current/atlas-server/data',
+  self.assertResourceCalled('Directory', 
self.stack_root+"/current/atlas-server/data",
 owner='atlas',
 group='hadoop',
 create_parents = True,
@@ -73,15 +74,15 @@ class TestMetadataServer(RMFTestCase):
 mode=0644
   )
   # Expanded war dir
-  self.assertResourceCalled('Directory', 
'/usr/hdp/current/atlas-server/server/webapp',
+  self.assertResourceCalled('Directory', 
self.stack_root+'/current/atlas-server/server/webapp',
 owner='atlas',
 group='hadoop',
 create_parents = True,
 cd_access='a',
 mode=0644
   )
-  self.assertResourceCalled('File', 
'/usr/hdp/current/atlas-server/server/webapp/atlas.war',
-  content = 
StaticFile('/usr/hdp/current/atlas-server/server/webapp/atlas.war'),
+  self.assertResourceCalled('File', 
self.stack_root+'/current/atlas-server/server/webapp/atlas.war',
+  content = 
StaticFile(self.stack_root+'/current/atlas-server/server/webapp/atlas.war'),
   )
   host_name = u"c6401.ambari.apache.org"
   app_props =  
dict(self.getConfig()['configurations']['application-properties'])
@@ -94,7 +95,7 @@ class TestMetadataServer(RMFTestCase):
   app_props["atlas.server.address.id1"] = u"%s:%s" % (host_name, 
metadata_port)
   app_props["atlas.server.ha.enabled"] = "false"
 
-  self.assertResourceCalled('File', 

ambari git commit: AMBARI-19702. Switch Pig default engine to tez in HDP 2.6 (Daniel Dai via alejandro)

[alejandro]

Repository: ambari
Updated Branches:
  refs/heads/branch-2.5 a4aae0667 -> 84c680a9e


AMBARI-19702. Switch Pig default engine to tez in HDP 2.6 (Daniel Dai via 
alejandro)


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

Branch: refs/heads/branch-2.5
Commit: 84c680a9ef14581463dc333b36ebcd3603cdaa78
Parents: a4aae06
Author: Alejandro Fernandez 
Authored: Mon Jan 30 19:29:16 2017 -0800
Committer: Alejandro Fernandez 
Committed: Mon Jan 30 19:29:16 2017 -0800

--
 .../stacks/HDP/2.3/upgrades/config-upgrade.xml  | 11 +++
 .../HDP/2.3/upgrades/nonrolling-upgrade-2.6.xml |  5 ++
 .../stacks/HDP/2.3/upgrades/upgrade-2.6.xml |  3 +
 .../stacks/HDP/2.4/upgrades/config-upgrade.xml  | 11 +++
 .../HDP/2.4/upgrades/nonrolling-upgrade-2.6.xml |  5 ++
 .../stacks/HDP/2.4/upgrades/upgrade-2.6.xml |  3 +
 .../stacks/HDP/2.5/upgrades/config-upgrade.xml  | 11 +++
 .../HDP/2.5/upgrades/nonrolling-upgrade-2.6.xml |  5 ++
 .../stacks/HDP/2.5/upgrades/upgrade-2.6.xml |  3 +
 .../PIG/configuration/pig-properties.xml| 93 
 10 files changed, 150 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/84c680a9/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/config-upgrade.xml
--
diff --git 
a/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/config-upgrade.xml 
b/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/config-upgrade.xml
index cf7ae72..771c247 100644
--- 
a/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/config-upgrade.xml
+++ 
b/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/config-upgrade.xml
@@ -123,6 +123,17 @@
   
 
 
+
+  
+
+  
+pig-properties
+
+  
+
+  
+
+
 
   
 

http://git-wip-us.apache.org/repos/asf/ambari/blob/84c680a9/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/nonrolling-upgrade-2.6.xml
--
diff --git 
a/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/nonrolling-upgrade-2.6.xml
 
b/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/nonrolling-upgrade-2.6.xml
index 9cb6b56..44362f7 100644
--- 
a/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/nonrolling-upgrade-2.6.xml
+++ 
b/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/nonrolling-upgrade-2.6.xml
@@ -359,6 +359,11 @@
 
   
 
+  
+  
+
+  
+
   
   
 

http://git-wip-us.apache.org/repos/asf/ambari/blob/84c680a9/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/upgrade-2.6.xml
--
diff --git 
a/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/upgrade-2.6.xml 
b/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/upgrade-2.6.xml
index a65b32c..daf249c 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/upgrade-2.6.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/upgrade-2.6.xml
@@ -831,6 +831,9 @@
 
 
   
+
+  
+
 
   
 

http://git-wip-us.apache.org/repos/asf/ambari/blob/84c680a9/ambari-server/src/main/resources/stacks/HDP/2.4/upgrades/config-upgrade.xml
--
diff --git 
a/ambari-server/src/main/resources/stacks/HDP/2.4/upgrades/config-upgrade.xml 
b/ambari-server/src/main/resources/stacks/HDP/2.4/upgrades/config-upgrade.xml
index 189d94a..f8183c5 100644
--- 
a/ambari-server/src/main/resources/stacks/HDP/2.4/upgrades/config-upgrade.xml
+++ 
b/ambari-server/src/main/resources/stacks/HDP/2.4/upgrades/config-upgrade.xml
@@ -57,6 +57,17 @@
   
 
 
+
+  
+
+  
+pig-properties
+
+  
+
+  
+
+
 
   
 

http://git-wip-us.apache.org/repos/asf/ambari/blob/84c680a9/ambari-server/src/main/resources/stacks/HDP/2.4/upgrades/nonrolling-upgrade-2.6.xml
--
diff --git 
a/ambari-server/src/main/resources/stacks/HDP/2.4/upgrades/nonrolling-upgrade-2.6.xml
 
b/ambari-server/src/main/resources/stacks/HDP/2.4/upgrades/nonrolling-upgrade-2.6.xml
index 710119f..8a8e1a1 100644
--- 
a/ambari-server/src/main/resources/stacks/HDP/2.4/upgrades/nonrolling-upgrade-2.6.xml
+++ 
b/ambari-server/src/main/resources/stacks/HDP/2.4/upgrades/nonrolling-upgrade-2.6.xml
@@ -408,6 

ambari git commit: AMBARI-19702. Switch Pig default engine to tez in HDP 2.6 (Daniel Dai via alejandro)

[alejandro]

Repository: ambari
Updated Branches:
  refs/heads/trunk 0b157069a -> 2f06c1cef


AMBARI-19702. Switch Pig default engine to tez in HDP 2.6 (Daniel Dai via 
alejandro)


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

Branch: refs/heads/trunk
Commit: 2f06c1cefac30e0a53d631cf2a2a6aef64a89e0c
Parents: 0b15706
Author: Alejandro Fernandez 
Authored: Mon Jan 30 19:26:18 2017 -0800
Committer: Alejandro Fernandez 
Committed: Mon Jan 30 19:26:18 2017 -0800

--
 .../stacks/HDP/2.3/upgrades/config-upgrade.xml  | 11 +++
 .../HDP/2.3/upgrades/nonrolling-upgrade-2.6.xml |  5 ++
 .../stacks/HDP/2.3/upgrades/upgrade-2.6.xml |  3 +
 .../stacks/HDP/2.4/upgrades/config-upgrade.xml  | 11 +++
 .../HDP/2.4/upgrades/nonrolling-upgrade-2.6.xml |  5 ++
 .../stacks/HDP/2.4/upgrades/upgrade-2.6.xml |  3 +
 .../stacks/HDP/2.5/upgrades/config-upgrade.xml  | 11 +++
 .../HDP/2.5/upgrades/nonrolling-upgrade-2.6.xml |  5 ++
 .../stacks/HDP/2.5/upgrades/upgrade-2.6.xml |  3 +
 .../PIG/configuration/pig-properties.xml| 93 
 10 files changed, 150 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/2f06c1ce/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/config-upgrade.xml
--
diff --git 
a/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/config-upgrade.xml 
b/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/config-upgrade.xml
index 1f3b5ad..3ea660d 100644
--- 
a/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/config-upgrade.xml
+++ 
b/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/config-upgrade.xml
@@ -123,6 +123,17 @@
   
 
 
+
+  
+
+  
+pig-properties
+
+  
+
+  
+
+
 
   
 

http://git-wip-us.apache.org/repos/asf/ambari/blob/2f06c1ce/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/nonrolling-upgrade-2.6.xml
--
diff --git 
a/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/nonrolling-upgrade-2.6.xml
 
b/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/nonrolling-upgrade-2.6.xml
index a9b1480..6153a8c 100644
--- 
a/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/nonrolling-upgrade-2.6.xml
+++ 
b/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/nonrolling-upgrade-2.6.xml
@@ -359,6 +359,11 @@
 
   
 
+  
+  
+
+  
+
   
   
 

http://git-wip-us.apache.org/repos/asf/ambari/blob/2f06c1ce/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/upgrade-2.6.xml
--
diff --git 
a/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/upgrade-2.6.xml 
b/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/upgrade-2.6.xml
index a65b32c..daf249c 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/upgrade-2.6.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/upgrade-2.6.xml
@@ -831,6 +831,9 @@
 
 
   
+
+  
+
 
   
 

http://git-wip-us.apache.org/repos/asf/ambari/blob/2f06c1ce/ambari-server/src/main/resources/stacks/HDP/2.4/upgrades/config-upgrade.xml
--
diff --git 
a/ambari-server/src/main/resources/stacks/HDP/2.4/upgrades/config-upgrade.xml 
b/ambari-server/src/main/resources/stacks/HDP/2.4/upgrades/config-upgrade.xml
index 7179099..8c8997d 100644
--- 
a/ambari-server/src/main/resources/stacks/HDP/2.4/upgrades/config-upgrade.xml
+++ 
b/ambari-server/src/main/resources/stacks/HDP/2.4/upgrades/config-upgrade.xml
@@ -57,6 +57,17 @@
   
 
 
+
+  
+
+  
+pig-properties
+
+  
+
+  
+
+
 
   
 

http://git-wip-us.apache.org/repos/asf/ambari/blob/2f06c1ce/ambari-server/src/main/resources/stacks/HDP/2.4/upgrades/nonrolling-upgrade-2.6.xml
--
diff --git 
a/ambari-server/src/main/resources/stacks/HDP/2.4/upgrades/nonrolling-upgrade-2.6.xml
 
b/ambari-server/src/main/resources/stacks/HDP/2.4/upgrades/nonrolling-upgrade-2.6.xml
index 7b9b062..f473071 100644
--- 
a/ambari-server/src/main/resources/stacks/HDP/2.4/upgrades/nonrolling-upgrade-2.6.xml
+++ 
b/ambari-server/src/main/resources/stacks/HDP/2.4/upgrades/nonrolling-upgrade-2.6.xml
@@ -408,6 +408,11 @@
 

ambari git commit: AMBARI-19788 : Wrong metrics path: /api/v1/cluster/summary##nimbusUptime. (avijayan)

[avijayan]

Repository: ambari
Updated Branches:
  refs/heads/trunk 433ba384c -> 0b157069a


AMBARI-19788 : Wrong metrics path: /api/v1/cluster/summary##nimbusUptime. 
(avijayan)


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

Branch: refs/heads/trunk
Commit: 0b157069a6766bcc2b8cfe827f019cd4fc7c5127
Parents: 433ba38
Author: Aravindan Vijayan 
Authored: Mon Jan 30 16:09:08 2017 -0800
Committer: Aravindan Vijayan 
Committed: Mon Jan 30 16:09:08 2017 -0800

--
 .../src/main/resources/common-services/STORM/0.10.0/metrics.json | 4 ++--
 .../src/main/resources/common-services/STORM/0.9.3/metrics.json  | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/0b157069/ambari-server/src/main/resources/common-services/STORM/0.10.0/metrics.json
--
diff --git 
a/ambari-server/src/main/resources/common-services/STORM/0.10.0/metrics.json 
b/ambari-server/src/main/resources/common-services/STORM/0.10.0/metrics.json
index 9617da5..b2b0404 100644
--- a/ambari-server/src/main/resources/common-services/STORM/0.10.0/metrics.json
+++ b/ambari-server/src/main/resources/common-services/STORM/0.10.0/metrics.json
@@ -102,8 +102,8 @@
   "pointInTime": true,
   "temporal": false
 },
-"metrics/api/v1/cluster/summary/nimbusUptime": {
-  "metric": "/api/v1/cluster/summary##nimbusUptime",
+"metrics/api/v1/nimbus/summary": {
+  "metric": "/api/v1/nimbus/summary?field=nimbuses##nimbuses",
   "pointInTime": true,
   "temporal": false
 }

http://git-wip-us.apache.org/repos/asf/ambari/blob/0b157069/ambari-server/src/main/resources/common-services/STORM/0.9.3/metrics.json
--
diff --git 
a/ambari-server/src/main/resources/common-services/STORM/0.9.3/metrics.json 
b/ambari-server/src/main/resources/common-services/STORM/0.9.3/metrics.json
index 9e6c64c..d9a11b2 100644
--- a/ambari-server/src/main/resources/common-services/STORM/0.9.3/metrics.json
+++ b/ambari-server/src/main/resources/common-services/STORM/0.9.3/metrics.json
@@ -101,8 +101,8 @@
   "pointInTime": true,
   "temporal": false
 },
-"metrics/api/v1/cluster/summary/nimbusUptime": {
-  "metric": "/api/v1/cluster/summary##nimbusUptime",
+"metrics/api/v1/nimbus/summary": {
+  "metric": "/api/v1/nimbus/summary?field=nimbuses##nimbuses",
   "pointInTime": true,
   "temporal": false
 }

ambari git commit: AMBARI-19760. HSI: Fixes for smaller clusters - higher concurrency, min_node_size (sseth via Swapan Shridhar).

[swapan]

Repository: ambari
Updated Branches:
  refs/heads/branch-2.5 40c206a76 -> d9a0cec8b


AMBARI-19760. HSI: Fixes for smaller clusters - higher concurrency, 
min_node_size (sseth via Swapan Shridhar).


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

Branch: refs/heads/branch-2.5
Commit: d9a0cec8b7ecc742f19d2108ed9adccd3dbc69fd
Parents: 40c206a
Author: Swapan Shridhar 
Authored: Mon Jan 30 11:52:19 2017 -0800
Committer: Swapan Shridhar 
Committed: Mon Jan 30 14:45:17 2017 -0800

--
 .../stacks/HDP/2.5/services/stack_advisor.py| 32 ++--
 .../stacks/2.5/common/test_stack_advisor.py | 22 +++---
 2 files changed, 34 insertions(+), 20 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/d9a0cec8/ambari-server/src/main/resources/stacks/HDP/2.5/services/stack_advisor.py
--
diff --git 
a/ambari-server/src/main/resources/stacks/HDP/2.5/services/stack_advisor.py 
b/ambari-server/src/main/resources/stacks/HDP/2.5/services/stack_advisor.py
index 71bde8a..fe9737a 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.5/services/stack_advisor.py
+++ b/ambari-server/src/main/resources/stacks/HDP/2.5/services/stack_advisor.py
@@ -783,10 +783,12 @@ class HDP25StackAdvisor(HDP24StackAdvisor):
 DEFAULT_EXECUTOR_TO_AM_RATIO = 20
 MIN_EXECUTOR_TO_AM_RATIO = 10
 MAX_CONCURRENT_QUERIES = 32
+MAX_CONCURRENT_QUERIES_SMALL_CLUSTERS = 4 # Concurrency for clusters with 
<10 executors
 leafQueueNames = None
 MB_TO_BYTES = 1048576
 hsi_site = self.getServicesSiteProperties(services, 
self.HIVE_INTERACTIVE_SITE)
 yarn_site = self.getServicesSiteProperties(services, "yarn-site")
+min_memory_required = 0
 
 # Update 'hive.llap.daemon.queue.name' prop combo entries
 self.setLlapDaemonQueuePropAttributes(services, configurations)
@@ -893,6 +895,7 @@ class HDP25StackAdvisor(HDP24StackAdvisor):
 yarn_min_container_size = float(self.get_yarn_min_container_size(services, 
configurations))
 tez_am_container_size = self.calculate_tez_am_container_size(services, 
long(total_cluster_capacity))
 normalized_tez_am_container_size = 
self._normalizeUp(tez_am_container_size, yarn_min_container_size)
+min_memory_required = min_memory_required + 
normalized_tez_am_container_size
 
 if yarn_site and "yarn.nodemanager.resource.cpu-vcores" in yarn_site:
   cpu_per_nm_host = 
float(yarn_site["yarn.nodemanager.resource.cpu-vcores"])
@@ -915,6 +918,7 @@ class HDP25StackAdvisor(HDP24StackAdvisor):
   return
 
 mem_per_thread_for_llap = float(mem_per_thread_for_llap)
+min_memory_required = min_memory_required + 
self._normalizeUp(mem_per_thread_for_llap, yarn_min_container_size)
 
 Logger.info("DBG: selected_queue_is_ambari_managed_llap = 
{0}".format(selected_queue_is_ambari_managed_llap))
 if not selected_queue_is_ambari_managed_llap:
@@ -968,11 +972,19 @@ class HDP25StackAdvisor(HDP24StackAdvisor):
  yarn_min_container_size)
 Logger.info("DBG: Calculated 'slider_am_container_size' : {0}, using 
following: yarn_min_container_size : "
   "{1}".format(slider_am_container_size, 
yarn_min_container_size))
-
+min_memory_required = min_memory_required + slider_am_container_size
 llap_mem_for_tezAm_and_daemons = total_llap_mem_normalized - 
slider_am_container_size
 Logger.info("DBG: Calculated 'llap_mem_for_tezAm_and_daemons' : {0}, using 
following : total_llap_mem_normalized : {1}, "
   "slider_am_container_size : 
{2}".format(llap_mem_for_tezAm_and_daemons, total_llap_mem_normalized, 
slider_am_container_size))
 
+Logger.info("DBG: min_memory_required: {0}, yarn_nm_mem_in_mb_normalized: 
{1}".format(min_memory_required, yarn_nm_mem_in_mb_normalized))
+min_nodes_required = int(ceil( min_memory_required / 
yarn_nm_mem_in_mb_normalized))
+Logger.info("DBG: min_node_required: {0}".format(min_nodes_required))
+if min_nodes_required > node_manager_cnt:
+  Logger.warn("ERROR: Not enough memory/nodes to run LLAP");
+  self.recommendDefaultLlapConfiguration(configurations, services, hosts)
+  return
+
 if llap_mem_for_tezAm_and_daemons < 2 * yarn_min_container_size:
   Logger.warning("Not enough capacity available on the cluster to run 
LLAP")
   self.recommendDefaultLlapConfiguration(configurations, services, hosts)
@@ -1042,9 +1054,9 @@ class HDP25StackAdvisor(HDP24StackAdvisor):
   "{2}, MIN_EXECUTOR_TO_AM_RATIO : {3}, 

ambari git commit: AMBARI-19760. HSI: Fixes for smaller clusters - higher concurrency, min_node_size (sseth via Swapan Shridhar).

[swapan]

Repository: ambari
Updated Branches:
  refs/heads/trunk 50b0d984e -> 433ba384c


AMBARI-19760. HSI: Fixes for smaller clusters - higher concurrency, 
min_node_size (sseth via Swapan Shridhar).


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

Branch: refs/heads/trunk
Commit: 433ba384c7d1ac94d560ca4bd9d9c709dd98d1f7
Parents: 50b0d98
Author: Swapan Shridhar 
Authored: Mon Jan 30 11:52:19 2017 -0800
Committer: Swapan Shridhar 
Committed: Mon Jan 30 14:41:14 2017 -0800

--
 .../stacks/HDP/2.5/services/stack_advisor.py| 32 ++--
 .../stacks/2.5/common/test_stack_advisor.py | 22 +++---
 2 files changed, 34 insertions(+), 20 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/433ba384/ambari-server/src/main/resources/stacks/HDP/2.5/services/stack_advisor.py
--
diff --git 
a/ambari-server/src/main/resources/stacks/HDP/2.5/services/stack_advisor.py 
b/ambari-server/src/main/resources/stacks/HDP/2.5/services/stack_advisor.py
index ca4a968..bf86cd5 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.5/services/stack_advisor.py
+++ b/ambari-server/src/main/resources/stacks/HDP/2.5/services/stack_advisor.py
@@ -783,10 +783,12 @@ class HDP25StackAdvisor(HDP24StackAdvisor):
 DEFAULT_EXECUTOR_TO_AM_RATIO = 20
 MIN_EXECUTOR_TO_AM_RATIO = 10
 MAX_CONCURRENT_QUERIES = 32
+MAX_CONCURRENT_QUERIES_SMALL_CLUSTERS = 4 # Concurrency for clusters with 
<10 executors
 leafQueueNames = None
 MB_TO_BYTES = 1048576
 hsi_site = self.getServicesSiteProperties(services, 
self.HIVE_INTERACTIVE_SITE)
 yarn_site = self.getServicesSiteProperties(services, "yarn-site")
+min_memory_required = 0
 
 # Update 'hive.llap.daemon.queue.name' prop combo entries
 self.setLlapDaemonQueuePropAttributes(services, configurations)
@@ -893,6 +895,7 @@ class HDP25StackAdvisor(HDP24StackAdvisor):
 yarn_min_container_size = float(self.get_yarn_min_container_size(services, 
configurations))
 tez_am_container_size = self.calculate_tez_am_container_size(services, 
long(total_cluster_capacity))
 normalized_tez_am_container_size = 
self._normalizeUp(tez_am_container_size, yarn_min_container_size)
+min_memory_required = min_memory_required + 
normalized_tez_am_container_size
 
 if yarn_site and "yarn.nodemanager.resource.cpu-vcores" in yarn_site:
   cpu_per_nm_host = 
float(yarn_site["yarn.nodemanager.resource.cpu-vcores"])
@@ -915,6 +918,7 @@ class HDP25StackAdvisor(HDP24StackAdvisor):
   return
 
 mem_per_thread_for_llap = float(mem_per_thread_for_llap)
+min_memory_required = min_memory_required + 
self._normalizeUp(mem_per_thread_for_llap, yarn_min_container_size)
 
 Logger.info("DBG: selected_queue_is_ambari_managed_llap = 
{0}".format(selected_queue_is_ambari_managed_llap))
 if not selected_queue_is_ambari_managed_llap:
@@ -968,11 +972,19 @@ class HDP25StackAdvisor(HDP24StackAdvisor):
  yarn_min_container_size)
 Logger.info("DBG: Calculated 'slider_am_container_size' : {0}, using 
following: yarn_min_container_size : "
   "{1}".format(slider_am_container_size, 
yarn_min_container_size))
-
+min_memory_required = min_memory_required + slider_am_container_size
 llap_mem_for_tezAm_and_daemons = total_llap_mem_normalized - 
slider_am_container_size
 Logger.info("DBG: Calculated 'llap_mem_for_tezAm_and_daemons' : {0}, using 
following : total_llap_mem_normalized : {1}, "
   "slider_am_container_size : 
{2}".format(llap_mem_for_tezAm_and_daemons, total_llap_mem_normalized, 
slider_am_container_size))
 
+Logger.info("DBG: min_memory_required: {0}, yarn_nm_mem_in_mb_normalized: 
{1}".format(min_memory_required, yarn_nm_mem_in_mb_normalized))
+min_nodes_required = int(ceil( min_memory_required / 
yarn_nm_mem_in_mb_normalized))
+Logger.info("DBG: min_node_required: {0}".format(min_nodes_required))
+if min_nodes_required > node_manager_cnt:
+  Logger.warn("ERROR: Not enough memory/nodes to run LLAP");
+  self.recommendDefaultLlapConfiguration(configurations, services, hosts)
+  return
+
 if llap_mem_for_tezAm_and_daemons < 2 * yarn_min_container_size:
   Logger.warning("Not enough capacity available on the cluster to run 
LLAP")
   self.recommendDefaultLlapConfiguration(configurations, services, hosts)
@@ -1042,9 +1054,9 @@ class HDP25StackAdvisor(HDP24StackAdvisor):
   "{2}, MIN_EXECUTOR_TO_AM_RATIO : {3}, 

ambari git commit: AMBARI-19781 Reassign wizard erases config properties attributes. (ababiichuk)

[ababiichuk]

Repository: ambari
Updated Branches:
  refs/heads/trunk 5cadb0636 -> 50b0d984e


AMBARI-19781 Reassign wizard erases config properties attributes. (ababiichuk)


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

Branch: refs/heads/trunk
Commit: 50b0d984ef186e18ebca3901f7f35d21f8294c81
Parents: 5cadb06
Author: Max Shepel 
Authored: Tue Jan 31 00:03:34 2017 +0200
Committer: Max Shepel 
Committed: Tue Jan 31 00:03:34 2017 +0200

--
 .../main/service/reassign/step3_controller.js |  9 +
 .../main/service/reassign/step4_controller.js | 12 
 .../main/service/reassign_controller.js   | 18 --
 ambari-web/app/routes/reassign_master_routes.js   |  3 ++-
 .../service/reassign/step4_controller_test.js | 10 +-
 5 files changed, 36 insertions(+), 16 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/50b0d984/ambari-web/app/controllers/main/service/reassign/step3_controller.js
--
diff --git 
a/ambari-web/app/controllers/main/service/reassign/step3_controller.js 
b/ambari-web/app/controllers/main/service/reassign/step3_controller.js
index f13cf0b..d4edb1e 100644
--- a/ambari-web/app/controllers/main/service/reassign/step3_controller.js
+++ b/ambari-web/app/controllers/main/service/reassign/step3_controller.js
@@ -259,6 +259,8 @@ App.ReassignMasterWizardStep3Controller = 
Em.Controller.extend({
 
   configs: null,
 
+  configsAttributes: null,
+
   secureConfigs: [],
 
   stepConfigs: [],
@@ -281,6 +283,7 @@ App.ReassignMasterWizardStep3Controller = 
Em.Controller.extend({
   clearStep: function () {
 this.setProperties({
   configs: null,
+  configsAttributes: null,
   secureConfigs: [],
   propertiesToChange: {}
 });
@@ -396,12 +399,18 @@ App.ReassignMasterWizardStep3Controller = 
Em.Controller.extend({
 var componentName = this.get('content.reassign.component_name');
 var targetHostName = this.get('content.reassignHosts.target');
 var configs = {};
+var attributes = {};
 var secureConfigs = [];
 
 data.items.forEach(function (item) {
   configs[item.type] = item.properties;
+  if (item.properties_attributes) {
+attributes[item.type] = item.properties_attributes;
+  }
 });
 
+this.set('configsAttributes', attributes);
+
 this.setAdditionalConfigs(configs, componentName, targetHostName);
 this.setSecureConfigs(secureConfigs, configs, componentName);
 

http://git-wip-us.apache.org/repos/asf/ambari/blob/50b0d984/ambari-web/app/controllers/main/service/reassign/step4_controller.js
--
diff --git 
a/ambari-web/app/controllers/main/service/reassign/step4_controller.js 
b/ambari-web/app/controllers/main/service/reassign/step4_controller.js
index 2e9d431..f87d05b 100644
--- a/ambari-web/app/controllers/main/service/reassign/step4_controller.js
+++ b/ambari-web/app/controllers/main/service/reassign/step4_controller.js
@@ -276,22 +276,24 @@ App.ReassignMasterWizardStep4Controller = 
App.HighAvailabilityProgressPageContro
 
   reconfigure: function () {
 var configs = this.get('content.configs'),
+  attributes = this.get('content.configsAttributes'),
   secureConfigs = this.get('content.secureConfigs'),
   componentName = this.get('content.reassign.component_name');
 this.saveClusterStatus(secureConfigs, this.getComponentDir(configs, 
componentName));
-this.saveConfigsToServer(configs);
+this.saveConfigsToServer(configs, attributes);
   },
 
   /**
* make PUT call to save configs to server
* @param configs
+   * @param attributes
*/
-  saveConfigsToServer: function (configs) {
+  saveConfigsToServer: function (configs, attributes) {
 App.ajax.send({
   name: 'common.across.services.configurations',
   sender: this,
   data: {
-data: '[' + this.getServiceConfigData(configs).toString() + ']'
+data: '[' + this.getServiceConfigData(configs, attributes).toString() 
+ ']'
   },
   success: 'onSaveConfigs',
   error: 'onTaskError'
@@ -300,10 +302,11 @@ App.ReassignMasterWizardStep4Controller = 
App.HighAvailabilityProgressPageContro
   /**
* gather and format config data before sending to server
* @param configs
+   * @param attributes
* @return {Array}
* @method getServiceConfigData
*/
-  getServiceConfigData: function (configs) {
+  getServiceConfigData: function (configs, attributes) {
 var componentName = 

ambari git commit: AMBARI-19781 Reassign wizard erases config properties attributes. (ababiichuk)

[ababiichuk]

Repository: ambari
Updated Branches:
  refs/heads/branch-2.5 c63cb94ec -> 40c206a76


AMBARI-19781 Reassign wizard erases config properties attributes. (ababiichuk)


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

Branch: refs/heads/branch-2.5
Commit: 40c206a76869d5725fac37abb2953351623b5ba1
Parents: c63cb94
Author: Max Shepel 
Authored: Mon Jan 30 23:47:51 2017 +0200
Committer: Max Shepel 
Committed: Mon Jan 30 23:47:51 2017 +0200

--
 .../main/service/reassign/step4_controller.js| 15 +++
 .../main/service/reassign/step4_controller_test.js   | 10 +-
 2 files changed, 16 insertions(+), 9 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/40c206a7/ambari-web/app/controllers/main/service/reassign/step4_controller.js
--
diff --git 
a/ambari-web/app/controllers/main/service/reassign/step4_controller.js 
b/ambari-web/app/controllers/main/service/reassign/step4_controller.js
index 431a67f..e14cb2a 100644
--- a/ambari-web/app/controllers/main/service/reassign/step4_controller.js
+++ b/ambari-web/app/controllers/main/service/reassign/step4_controller.js
@@ -754,10 +754,14 @@ App.ReassignMasterWizardStep4Controller = 
App.HighAvailabilityProgressPageContro
 var componentName = this.get('content.reassign.component_name');
 var targetHostName = this.get('content.reassignHosts.target');
 var configs = {};
+var attributes = {};
 var secureConfigs = [];
 
 data.items.forEach(function (item) {
   configs[item.type] = item.properties;
+  if (item.properties_attributes) {
+attributes[item.type] = item.properties_attributes;
+  }
 }, this);
 
 this.setAdditionalConfigs(configs, componentName, targetHostName);
@@ -797,7 +801,7 @@ App.ReassignMasterWizardStep4Controller = 
App.HighAvailabilityProgressPageContro
 }
 
 this.saveClusterStatus(secureConfigs, this.getComponentDir(configs, 
componentName));
-this.saveConfigsToServer(configs);
+this.saveConfigsToServer(configs, attributes);
 this.saveServiceProperties(configs);
   },
 
@@ -831,13 +835,14 @@ App.ReassignMasterWizardStep4Controller = 
App.HighAvailabilityProgressPageContro
   /**
* make PUT call to save configs to server
* @param configs
+   * @param attributes
*/
-  saveConfigsToServer: function (configs) {
+  saveConfigsToServer: function (configs, attributes) {
 App.ajax.send({
   name: 'common.across.services.configurations',
   sender: this,
   data: {
-data: '[' + this.getServiceConfigData(configs).toString() + ']'
+data: '[' + this.getServiceConfigData(configs, attributes).toString() 
+ ']'
   },
   success: 'onSaveConfigs',
   error: 'onTaskError'
@@ -846,10 +851,11 @@ App.ReassignMasterWizardStep4Controller = 
App.HighAvailabilityProgressPageContro
   /**
* gather and format config data before sending to server
* @param configs
+   * @param attributes
* @return {Array}
* @method getServiceConfigData
*/
-  getServiceConfigData: function (configs) {
+  getServiceConfigData: function (configs, attributes) {
 var componentName = this.get('content.reassign.component_name');
 var tagName = 'version' + (new Date).getTime();
 var configData = Object.keys(configs).map(function (_siteName) {
@@ -857,6 +863,7 @@ App.ReassignMasterWizardStep4Controller = 
App.HighAvailabilityProgressPageContro
 type: _siteName,
 tag: tagName,
 properties: configs[_siteName],
+properties_attributes: attributes[_siteName] || {},
 service_config_version_note: 
Em.I18n.t('services.reassign.step4.save.configuration.note').format(App.format.role(componentName,
 false))
   }
 });

http://git-wip-us.apache.org/repos/asf/ambari/blob/40c206a7/ambari-web/test/controllers/main/service/reassign/step4_controller_test.js
--
diff --git 
a/ambari-web/test/controllers/main/service/reassign/step4_controller_test.js 
b/ambari-web/test/controllers/main/service/reassign/step4_controller_test.js
index 32bbdbd..362153a 100644
--- a/ambari-web/test/controllers/main/service/reassign/step4_controller_test.js
+++ b/ambari-web/test/controllers/main/service/reassign/step4_controller_test.js
@@ -1095,13 +1095,13 @@ describe('App.ReassignMasterWizardStep4Controller', 
function () {
 it('No services', function () {
   services = [];
   controller.set('content.reassign.component_name', 'COMP1');
-  

ambari git commit: AMBARI-19786. Nimbus failed to start due to StringUtils ClassNotFound. (swagle)

[swagle]

Repository: ambari
Updated Branches:
  refs/heads/trunk 40319b38f -> 5cadb0636


AMBARI-19786. Nimbus failed to start due to StringUtils ClassNotFound. (swagle)


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

Branch: refs/heads/trunk
Commit: 5cadb0636d5e16df6b041735caae9d2847dd690d
Parents: 40319b3
Author: Siddharth Wagle 
Authored: Mon Jan 30 13:29:22 2017 -0800
Committer: Siddharth Wagle 
Committed: Mon Jan 30 13:29:22 2017 -0800

--
 .../storm/StormTimelineMetricsReporter.java | 25 ++--
 .../storm/StormTimelineMetricsReporter.java | 16 ++---
 2 files changed, 20 insertions(+), 21 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/5cadb063/ambari-metrics/ambari-metrics-storm-sink-legacy/src/main/java/org/apache/hadoop/metrics2/sink/storm/StormTimelineMetricsReporter.java
--
diff --git 
a/ambari-metrics/ambari-metrics-storm-sink-legacy/src/main/java/org/apache/hadoop/metrics2/sink/storm/StormTimelineMetricsReporter.java
 
b/ambari-metrics/ambari-metrics-storm-sink-legacy/src/main/java/org/apache/hadoop/metrics2/sink/storm/StormTimelineMetricsReporter.java
index fad9705..9a55f10 100644
--- 
a/ambari-metrics/ambari-metrics-storm-sink-legacy/src/main/java/org/apache/hadoop/metrics2/sink/storm/StormTimelineMetricsReporter.java
+++ 
b/ambari-metrics/ambari-metrics-storm-sink-legacy/src/main/java/org/apache/hadoop/metrics2/sink/storm/StormTimelineMetricsReporter.java
@@ -18,26 +18,25 @@
 
 package org.apache.hadoop.metrics2.sink.storm;
 
-import backtype.storm.generated.ClusterSummary;
-import backtype.storm.generated.SupervisorSummary;
-import backtype.storm.generated.TopologySummary;
-import backtype.storm.metric.IClusterReporter;
-import backtype.storm.utils.NimbusClient;
-import backtype.storm.utils.Utils;
+import java.net.InetAddress;
+import java.net.UnknownHostException;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
+import java.util.Map;
 
-import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.lang3.Validate;
 import org.apache.hadoop.metrics2.sink.timeline.AbstractTimelineMetricsSink;
 import org.apache.hadoop.metrics2.sink.timeline.TimelineMetric;
 import org.apache.hadoop.metrics2.sink.timeline.TimelineMetrics;
 import org.apache.hadoop.metrics2.sink.timeline.UnableToConnectException;
 
-import java.net.InetAddress;
-import java.net.UnknownHostException;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-import java.util.Map;
+import backtype.storm.generated.ClusterSummary;
+import backtype.storm.generated.SupervisorSummary;
+import backtype.storm.generated.TopologySummary;
+import backtype.storm.metric.IClusterReporter;
+import backtype.storm.utils.NimbusClient;
+import backtype.storm.utils.Utils;
 
 public class StormTimelineMetricsReporter extends AbstractTimelineMetricsSink
 implements IClusterReporter {

http://git-wip-us.apache.org/repos/asf/ambari/blob/5cadb063/ambari-metrics/ambari-metrics-storm-sink/src/main/java/org/apache/hadoop/metrics2/sink/storm/StormTimelineMetricsReporter.java
--
diff --git 
a/ambari-metrics/ambari-metrics-storm-sink/src/main/java/org/apache/hadoop/metrics2/sink/storm/StormTimelineMetricsReporter.java
 
b/ambari-metrics/ambari-metrics-storm-sink/src/main/java/org/apache/hadoop/metrics2/sink/storm/StormTimelineMetricsReporter.java
index 923de0f..535fae0 100644
--- 
a/ambari-metrics/ambari-metrics-storm-sink/src/main/java/org/apache/hadoop/metrics2/sink/storm/StormTimelineMetricsReporter.java
+++ 
b/ambari-metrics/ambari-metrics-storm-sink/src/main/java/org/apache/hadoop/metrics2/sink/storm/StormTimelineMetricsReporter.java
@@ -18,8 +18,15 @@
 
 package org.apache.hadoop.metrics2.sink.storm;
 
-import org.apache.commons.lang.StringUtils;
+import java.net.InetAddress;
+import java.net.UnknownHostException;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
+import java.util.Map;
+
 import org.apache.commons.lang3.ClassUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.apache.hadoop.metrics2.sink.timeline.AbstractTimelineMetricsSink;
 import org.apache.hadoop.metrics2.sink.timeline.TimelineMetric;
 import org.apache.hadoop.metrics2.sink.timeline.TimelineMetrics;
@@ -28,13 +35,6 @@ import 
org.apache.hadoop.metrics2.sink.timeline.configuration.Configuration;
 import org.apache.storm.metric.api.DataPoint;
 import 

ambari git commit: AMBARI-19786. Nimbus failed to start due to StringUtils ClassNotFound. (swagle)

[swagle]

Repository: ambari
Updated Branches:
  refs/heads/branch-2.5 f02153d46 -> c63cb94ec


AMBARI-19786. Nimbus failed to start due to StringUtils ClassNotFound. (swagle)


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

Branch: refs/heads/branch-2.5
Commit: c63cb94ec3ad67664bac2c459f8013493651f9a9
Parents: f02153d
Author: Siddharth Wagle 
Authored: Mon Jan 30 13:28:28 2017 -0800
Committer: Siddharth Wagle 
Committed: Mon Jan 30 13:28:37 2017 -0800

--
 .../storm/StormTimelineMetricsReporter.java | 25 ++--
 .../storm/StormTimelineMetricsReporter.java | 16 ++---
 2 files changed, 20 insertions(+), 21 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/c63cb94e/ambari-metrics/ambari-metrics-storm-sink-legacy/src/main/java/org/apache/hadoop/metrics2/sink/storm/StormTimelineMetricsReporter.java
--
diff --git 
a/ambari-metrics/ambari-metrics-storm-sink-legacy/src/main/java/org/apache/hadoop/metrics2/sink/storm/StormTimelineMetricsReporter.java
 
b/ambari-metrics/ambari-metrics-storm-sink-legacy/src/main/java/org/apache/hadoop/metrics2/sink/storm/StormTimelineMetricsReporter.java
index 454b2c8..9e216fc 100644
--- 
a/ambari-metrics/ambari-metrics-storm-sink-legacy/src/main/java/org/apache/hadoop/metrics2/sink/storm/StormTimelineMetricsReporter.java
+++ 
b/ambari-metrics/ambari-metrics-storm-sink-legacy/src/main/java/org/apache/hadoop/metrics2/sink/storm/StormTimelineMetricsReporter.java
@@ -18,26 +18,25 @@
 
 package org.apache.hadoop.metrics2.sink.storm;
 
-import backtype.storm.generated.ClusterSummary;
-import backtype.storm.generated.SupervisorSummary;
-import backtype.storm.generated.TopologySummary;
-import backtype.storm.metric.IClusterReporter;
-import backtype.storm.utils.NimbusClient;
-import backtype.storm.utils.Utils;
+import java.net.InetAddress;
+import java.net.UnknownHostException;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
+import java.util.Map;
 
-import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.lang3.Validate;
 import org.apache.hadoop.metrics2.sink.timeline.AbstractTimelineMetricsSink;
 import org.apache.hadoop.metrics2.sink.timeline.TimelineMetric;
 import org.apache.hadoop.metrics2.sink.timeline.TimelineMetrics;
 import org.apache.hadoop.metrics2.sink.timeline.UnableToConnectException;
 
-import java.net.InetAddress;
-import java.net.UnknownHostException;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-import java.util.Map;
+import backtype.storm.generated.ClusterSummary;
+import backtype.storm.generated.SupervisorSummary;
+import backtype.storm.generated.TopologySummary;
+import backtype.storm.metric.IClusterReporter;
+import backtype.storm.utils.NimbusClient;
+import backtype.storm.utils.Utils;
 
 public class StormTimelineMetricsReporter extends AbstractTimelineMetricsSink
   implements IClusterReporter {

http://git-wip-us.apache.org/repos/asf/ambari/blob/c63cb94e/ambari-metrics/ambari-metrics-storm-sink/src/main/java/org/apache/hadoop/metrics2/sink/storm/StormTimelineMetricsReporter.java
--
diff --git 
a/ambari-metrics/ambari-metrics-storm-sink/src/main/java/org/apache/hadoop/metrics2/sink/storm/StormTimelineMetricsReporter.java
 
b/ambari-metrics/ambari-metrics-storm-sink/src/main/java/org/apache/hadoop/metrics2/sink/storm/StormTimelineMetricsReporter.java
index 1de125b..53250ee 100644
--- 
a/ambari-metrics/ambari-metrics-storm-sink/src/main/java/org/apache/hadoop/metrics2/sink/storm/StormTimelineMetricsReporter.java
+++ 
b/ambari-metrics/ambari-metrics-storm-sink/src/main/java/org/apache/hadoop/metrics2/sink/storm/StormTimelineMetricsReporter.java
@@ -18,8 +18,15 @@
 
 package org.apache.hadoop.metrics2.sink.storm;
 
-import org.apache.commons.lang.StringUtils;
+import java.net.InetAddress;
+import java.net.UnknownHostException;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
+import java.util.Map;
+
 import org.apache.commons.lang3.ClassUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.apache.hadoop.metrics2.sink.timeline.AbstractTimelineMetricsSink;
 import org.apache.hadoop.metrics2.sink.timeline.TimelineMetric;
 import org.apache.hadoop.metrics2.sink.timeline.TimelineMetrics;
@@ -28,13 +35,6 @@ import 
org.apache.hadoop.metrics2.sink.timeline.configuration.Configuration;
 import org.apache.storm.metric.api.DataPoint;
 import 

ambari git commit: AMBARI-19778. For alerts, alert_hive_interactive_thrift_port.py script is reading hive.server2.transport.mode property from hive-site config, ideally it should be reading from hive-

[smohanty]

Repository: ambari
Updated Branches:
  refs/heads/branch-2.5 3d9cf0516 -> f02153d46


AMBARI-19778. For alerts, alert_hive_interactive_thrift_port.py script is 
reading hive.server2.transport.mode property from hive-site config, ideally it 
should be reading from hive-interactive-site config (Ayub Khan via smohanty)


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

Branch: refs/heads/branch-2.5
Commit: f02153d46bbe997f4c122f287e49169f7b131bed
Parents: 3d9cf05
Author: Sumit Mohanty 
Authored: Mon Jan 30 11:36:52 2017 -0800
Committer: Sumit Mohanty 
Committed: Mon Jan 30 11:37:40 2017 -0800

--
 .../package/alerts/alert_hive_interactive_thrift_port.py   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/f02153d4/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/alerts/alert_hive_interactive_thrift_port.py
--
diff --git 
a/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/alerts/alert_hive_interactive_thrift_port.py
 
b/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/alerts/alert_hive_interactive_thrift_port.py
index 25c4b28..9bb7edf 100644
--- 
a/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/alerts/alert_hive_interactive_thrift_port.py
+++ 
b/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/alerts/alert_hive_interactive_thrift_port.py
@@ -34,7 +34,7 @@ CRITICAL_MESSAGE = "Connection failed on host {0}:{1} ({2})"
 
 HIVE_SERVER_INTERACTIVE_THRIFT_PORT_KEY = 
'{{hive-interactive-site/hive.server2.thrift.port}}'
 HIVE_SERVER_INTERACTIVE_THRIFT_HTTP_PORT_KEY = 
'{{hive-interactive-site/hive.server2.thrift.http.port}}'
-HIVE_SERVER_INTERACTIVE_TRANSPORT_MODE_KEY = 
'{{hive-site/hive.server2.transport.mode}}'
+HIVE_SERVER_INTERACTIVE_TRANSPORT_MODE_KEY = 
'{{hive-interactive-site/hive.server2.transport.mode}}'
 SECURITY_ENABLED_KEY = '{{cluster-env/security_enabled}}'
 HIVE_SERVER2_INTERACTIVE_AUTHENTICATION_KEY = 
'{{hive-interactive-site/hive.server2.authentication}}'
 HIVE_SERVER2_AUTHENTICATION_KEY = '{{hive-site/hive.server2.authentication}}'

ambari git commit: AMBARI-19778. For alerts, alert_hive_interactive_thrift_port.py script is reading hive.server2.transport.mode property from hive-site config, ideally it should be reading from hive-

[smohanty]

Repository: ambari
Updated Branches:
  refs/heads/trunk 8d56db0ef -> 40319b38f


AMBARI-19778. For alerts, alert_hive_interactive_thrift_port.py script is 
reading hive.server2.transport.mode property from hive-site config, ideally it 
should be reading from hive-interactive-site config (Ayub Khan via smohanty)


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

Branch: refs/heads/trunk
Commit: 40319b38faa0a8c12fe80009d3571daae41545d4
Parents: 8d56db0
Author: Sumit Mohanty 
Authored: Mon Jan 30 11:36:52 2017 -0800
Committer: Sumit Mohanty 
Committed: Mon Jan 30 11:36:52 2017 -0800

--
 .../package/alerts/alert_hive_interactive_thrift_port.py   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/40319b38/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/alerts/alert_hive_interactive_thrift_port.py
--
diff --git 
a/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/alerts/alert_hive_interactive_thrift_port.py
 
b/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/alerts/alert_hive_interactive_thrift_port.py
index 25c4b28..9bb7edf 100644
--- 
a/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/alerts/alert_hive_interactive_thrift_port.py
+++ 
b/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/alerts/alert_hive_interactive_thrift_port.py
@@ -34,7 +34,7 @@ CRITICAL_MESSAGE = "Connection failed on host {0}:{1} ({2})"
 
 HIVE_SERVER_INTERACTIVE_THRIFT_PORT_KEY = 
'{{hive-interactive-site/hive.server2.thrift.port}}'
 HIVE_SERVER_INTERACTIVE_THRIFT_HTTP_PORT_KEY = 
'{{hive-interactive-site/hive.server2.thrift.http.port}}'
-HIVE_SERVER_INTERACTIVE_TRANSPORT_MODE_KEY = 
'{{hive-site/hive.server2.transport.mode}}'
+HIVE_SERVER_INTERACTIVE_TRANSPORT_MODE_KEY = 
'{{hive-interactive-site/hive.server2.transport.mode}}'
 SECURITY_ENABLED_KEY = '{{cluster-env/security_enabled}}'
 HIVE_SERVER2_INTERACTIVE_AUTHENTICATION_KEY = 
'{{hive-interactive-site/hive.server2.authentication}}'
 HIVE_SERVER2_AUTHENTICATION_KEY = '{{hive-site/hive.server2.authentication}}'

ambari git commit: AMBARI-19741. Ambari Server Unit Test failure on branch-2.5/trunk for testUpdateConfigForceSecurityEnabled. (Eugene Chekanskiy via yusaku)

[yusaku]

Repository: ambari
Updated Branches:
  refs/heads/branch-2.5 cae9ee29d -> 3d9cf0516


AMBARI-19741. Ambari Server Unit Test failure on branch-2.5/trunk for 
testUpdateConfigForceSecurityEnabled. (Eugene Chekanskiy via yusaku)


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

Branch: refs/heads/branch-2.5
Commit: 3d9cf0516506591efbf4714bbc8245ad4b41f16c
Parents: cae9ee2
Author: Yusaku Sako 
Authored: Mon Jan 30 11:27:10 2017 -0800
Committer: Yusaku Sako 
Committed: Mon Jan 30 11:27:10 2017 -0800

--
 .../UpdateKerberosConfigsServerActionTest.java| 18 +-
 1 file changed, 13 insertions(+), 5 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/3d9cf051/ambari-server/src/test/java/org/apache/ambari/server/serveraction/kerberos/UpdateKerberosConfigsServerActionTest.java
--
diff --git 
a/ambari-server/src/test/java/org/apache/ambari/server/serveraction/kerberos/UpdateKerberosConfigsServerActionTest.java
 
b/ambari-server/src/test/java/org/apache/ambari/server/serveraction/kerberos/UpdateKerberosConfigsServerActionTest.java
index 98b3f00..733d815 100644
--- 
a/ambari-server/src/test/java/org/apache/ambari/server/serveraction/kerberos/UpdateKerberosConfigsServerActionTest.java
+++ 
b/ambari-server/src/test/java/org/apache/ambari/server/serveraction/kerberos/UpdateKerberosConfigsServerActionTest.java
@@ -22,7 +22,7 @@ import static org.easymock.EasyMock.anyObject;
 import static org.easymock.EasyMock.capture;
 import static org.easymock.EasyMock.expect;
 import static org.easymock.EasyMock.expectLastCall;
-import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
 
 import java.io.File;
 import java.util.Collection;
@@ -37,6 +37,7 @@ import org.apache.ambari.server.state.Clusters;
 import org.apache.ambari.server.state.ConfigHelper;
 import org.apache.ambari.server.state.stack.OsFamily;
 import org.easymock.Capture;
+import org.easymock.CaptureType;
 import org.easymock.EasyMockSupport;
 import org.junit.Before;
 import org.junit.Rule;
@@ -152,8 +153,8 @@ public class UpdateKerberosConfigsServerActionTest extends 
EasyMockSupport{
 
 ConfigHelper configHelper = injector.getInstance(ConfigHelper.class);
 
-Capture configTypes = Capture.newInstance();
-Capture> configUpdates = Capture.newInstance();
+Capture configTypes = Capture.newInstance(CaptureType.ALL);
+Capture> configUpdates = 
Capture.newInstance(CaptureType.ALL);
 configHelper.updateConfigType(anyObject(Cluster.class), 
anyObject(AmbariManagementController.class),
 capture(configTypes), capture(configUpdates), 
anyObject(Collection.class), anyObject(String.class), anyObject(String.class));
 expectLastCall().atLeastOnce();
@@ -163,8 +164,15 @@ public class UpdateKerberosConfigsServerActionTest extends 
EasyMockSupport{
 action.setExecutionCommand(executionCommand);
 action.execute(null);
 
-assertEquals(configTypes.getValue(), "cluster-env");
-assertEquals(configUpdates.getValue().get("security_enabled"), "false");
+assertTrue(configTypes.getValues().contains("cluster-env"));
+boolean containsSecurityEnabled = false;
+for(Map properties: configUpdates.getValues()) {
+  if(properties.containsKey("security_enabled")) {
+containsSecurityEnabled = true;
+break;
+  }
+}
+assertTrue(containsSecurityEnabled);
 verifyAll();
   }
 

ambari git commit: AMBARI-19741. Ambari Server Unit Test failure on branch-2.5/trunk for testUpdateConfigForceSecurityEnabled. (Eugene Chekanskiy via yusaku)

[yusaku]

Repository: ambari
Updated Branches:
  refs/heads/trunk 93d4ffeda -> 8d56db0ef


AMBARI-19741. Ambari Server Unit Test failure on branch-2.5/trunk for 
testUpdateConfigForceSecurityEnabled. (Eugene Chekanskiy via yusaku)


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

Branch: refs/heads/trunk
Commit: 8d56db0efb9ea3bcb4cff968699c48065ddf1193
Parents: 93d4ffe
Author: Yusaku Sako 
Authored: Mon Jan 30 11:26:17 2017 -0800
Committer: Yusaku Sako 
Committed: Mon Jan 30 11:26:17 2017 -0800

--
 .../UpdateKerberosConfigsServerActionTest.java| 18 +-
 1 file changed, 13 insertions(+), 5 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/8d56db0e/ambari-server/src/test/java/org/apache/ambari/server/serveraction/kerberos/UpdateKerberosConfigsServerActionTest.java
--
diff --git 
a/ambari-server/src/test/java/org/apache/ambari/server/serveraction/kerberos/UpdateKerberosConfigsServerActionTest.java
 
b/ambari-server/src/test/java/org/apache/ambari/server/serveraction/kerberos/UpdateKerberosConfigsServerActionTest.java
index e756491..0442add 100644
--- 
a/ambari-server/src/test/java/org/apache/ambari/server/serveraction/kerberos/UpdateKerberosConfigsServerActionTest.java
+++ 
b/ambari-server/src/test/java/org/apache/ambari/server/serveraction/kerberos/UpdateKerberosConfigsServerActionTest.java
@@ -22,7 +22,7 @@ import static org.easymock.EasyMock.anyObject;
 import static org.easymock.EasyMock.capture;
 import static org.easymock.EasyMock.expect;
 import static org.easymock.EasyMock.expectLastCall;
-import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
 
 import java.io.File;
 import java.util.Collection;
@@ -37,6 +37,7 @@ import org.apache.ambari.server.state.Clusters;
 import org.apache.ambari.server.state.ConfigHelper;
 import org.apache.ambari.server.state.stack.OsFamily;
 import org.easymock.Capture;
+import org.easymock.CaptureType;
 import org.easymock.EasyMock;
 import org.easymock.EasyMockSupport;
 import org.junit.Before;
@@ -154,8 +155,8 @@ public class UpdateKerberosConfigsServerActionTest extends 
EasyMockSupport{
 
 ConfigHelper configHelper = injector.getInstance(ConfigHelper.class);
 
-Capture configTypes = Capture.newInstance();
-Capture> configUpdates = Capture.newInstance();
+Capture configTypes = Capture.newInstance(CaptureType.ALL);
+Capture> configUpdates = 
Capture.newInstance(CaptureType.ALL);
 configHelper.updateConfigType(anyObject(Cluster.class), 
anyObject(AmbariManagementController.class),
 capture(configTypes), capture(configUpdates), 
anyObject(Collection.class), anyObject(String.class), anyObject(String.class));
 expectLastCall().atLeastOnce();
@@ -165,8 +166,15 @@ public class UpdateKerberosConfigsServerActionTest extends 
EasyMockSupport{
 action.setExecutionCommand(executionCommand);
 action.execute(null);
 
-assertEquals(configTypes.getValue(), "cluster-env");
-assertEquals(configUpdates.getValue().get("security_enabled"), "false");
+assertTrue(configTypes.getValues().contains("cluster-env"));
+boolean containsSecurityEnabled = false;
+for(Map properties: configUpdates.getValues()) {
+  if(properties.containsKey("security_enabled")) {
+containsSecurityEnabled = true;
+break;
+  }
+}
+assertTrue(containsSecurityEnabled);
 verifyAll();
   }
 

ambari git commit: AMBARI-19719. Update rpc port for LLAP to 0 for HDP stack (Siddharth Seth via smohanty)

[smohanty]

Repository: ambari
Updated Branches:
  refs/heads/branch-2.5 d43f4c1bd -> cae9ee29d


AMBARI-19719. Update rpc port for LLAP to 0 for HDP stack (Siddharth Seth via 
smohanty)


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

Branch: refs/heads/branch-2.5
Commit: cae9ee29dd42c94c06569fb03643e23950752622
Parents: d43f4c1
Author: Sumit Mohanty 
Authored: Mon Jan 30 11:13:56 2017 -0800
Committer: Sumit Mohanty 
Committed: Mon Jan 30 11:13:56 2017 -0800

--
 .../server/upgrade/UpgradeCatalog250.java   | 30 ++--
 .../configuration/hive-interactive-site.xml |  2 +-
 2 files changed, 23 insertions(+), 9 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/cae9ee29/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog250.java
--
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog250.java
 
b/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog250.java
index 624e5a2..a8a5d17 100644
--- 
a/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog250.java
+++ 
b/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog250.java
@@ -332,7 +332,7 @@ public class UpgradeCatalog250 extends 
AbstractUpgradeCatalog {
   Set installedServices = cluster.getServices().keySet();
 
   if (installedServices.contains("HIVE")) {
-Config hiveSite = 
cluster.getDesiredConfigByType("hive-interactive-site");
+Config hiveSite = 
cluster.getDesiredConfigByType(HIVE_INTERACTIVE_SITE);
 if (hiveSite != null) {
   Map hiveSiteProperties = 
hiveSite.getProperties();
   String schedulerDelay = 
hiveSiteProperties.get("hive.llap.task.scheduler.locality.delay");
@@ -343,19 +343,19 @@ public class UpgradeCatalog250 extends 
AbstractUpgradeCatalog {
 int schedulerDelayInt = Integer.parseInt(schedulerDelay);
 if (schedulerDelayInt == -1) {
   // Old default. Set to new default.
-  updateConfigurationProperties("hive-interactive-site", 
Collections
+  updateConfigurationProperties(HIVE_INTERACTIVE_SITE, 
Collections
   
.singletonMap("hive.llap.task.scheduler.locality.delay", "8000"), true,
   false);
 }
   } catch (NumberFormatException e) {
 // Invalid existing value. Set to new default.
-updateConfigurationProperties("hive-interactive-site", 
Collections
+updateConfigurationProperties(HIVE_INTERACTIVE_SITE, 
Collections
 
.singletonMap("hive.llap.task.scheduler.locality.delay", "8000"), true,
 false);
   }
 }
   }
-  updateConfigurationProperties("hive-interactive-site",
+  updateConfigurationProperties(HIVE_INTERACTIVE_SITE,
   
Collections.singletonMap("hive.mapjoin.hybridgrace.hashtable", "true"), true,
   false);
   updateConfigurationProperties("tez-interactive-site",
@@ -607,6 +607,7 @@ public class UpgradeCatalog250 extends 
AbstractUpgradeCatalog {
*
* @throws AmbariException
*/
+  private static final String HIVE_INTERACTIVE_SITE = "hive-interactive-site";
   protected void updateHIVEInteractiveConfigs() throws AmbariException {
 AmbariManagementController ambariManagementController = 
injector.getInstance(AmbariManagementController.class);
 Clusters clusters = ambariManagementController.getClusters();
@@ -615,16 +616,29 @@ public class UpgradeCatalog250 extends 
AbstractUpgradeCatalog {
 
   if (clusterMap != null && !clusterMap.isEmpty()) {
 for (final Cluster cluster : clusterMap.values()) {
-  Config hiveInteractiveSite = 
cluster.getDesiredConfigByType("hive-interactive-site");
+  Config hiveInteractiveSite = 
cluster.getDesiredConfigByType(HIVE_INTERACTIVE_SITE);
   if (hiveInteractiveSite != null) {
-updateConfigurationProperties("hive-interactive-site", 
Collections.singletonMap("hive.tez.container.size",
+updateConfigurationProperties(HIVE_INTERACTIVE_SITE, 
Collections.singletonMap("hive.tez.container.size",
 "SET_ON_FIRST_INVOCATION"), true, true);
 
-updateConfigurationProperties("hive-interactive-site", 

ambari git commit: AMBARI-19783. Fix configuration-dependencies for druid. (Nishant Bangarwa via Swapan Shridhar)

[swapan]

Repository: ambari
Updated Branches:
  refs/heads/branch-2.5 862786b4a -> d43f4c1bd


AMBARI-19783. Fix configuration-dependencies for druid. (Nishant Bangarwa via 
Swapan Shridhar)


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

Branch: refs/heads/branch-2.5
Commit: d43f4c1bdebd45542a0a8e6265e67220637a7d79
Parents: 862786b
Author: Swapan Shridhar 
Authored: Mon Jan 30 10:59:25 2017 -0800
Committer: Swapan Shridhar 
Committed: Mon Jan 30 11:01:50 2017 -0800

--
 .../common-services/DRUID/0.9.2/metainfo.xml| 28 +---
 1 file changed, 18 insertions(+), 10 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/d43f4c1b/ambari-server/src/main/resources/common-services/DRUID/0.9.2/metainfo.xml
--
diff --git 
a/ambari-server/src/main/resources/common-services/DRUID/0.9.2/metainfo.xml 
b/ambari-server/src/main/resources/common-services/DRUID/0.9.2/metainfo.xml
index 7ae2b9c..baf3a1b 100644
--- a/ambari-server/src/main/resources/common-services/DRUID/0.9.2/metainfo.xml
+++ b/ambari-server/src/main/resources/common-services/DRUID/0.9.2/metainfo.xml
@@ -43,6 +43,9 @@
 PYTHON
 600
   
+  
+druid-coordinator
+  
 
 
   DRUID_OVERLORD
@@ -63,6 +66,9 @@
 PYTHON
 600
   
+  
+druid-overlord
+  
 
 
   DRUID_HISTORICAL
@@ -83,6 +89,9 @@
 PYTHON
 600
   
+  
+druid-historical
+  
 
 
   DRUID_BROKER
@@ -103,6 +112,9 @@
 PYTHON
 600
   
+  
+druid-broker
+  
 
 
   DRUID_MIDDLEMANAGER
@@ -123,6 +135,9 @@
 PYTHON
 600
   
+  
+druid-middlemanager
+  
 
 
   DRUID_ROUTER
@@ -144,6 +159,9 @@
 600
   
 
+
+  druid-router
+
   
 
   
@@ -182,19 +200,9 @@
   
 druid-common
 druid-env
-druid-coordinator
-druid-overlord
-druid-historical
-druid-broker
-druid-middlemanager
 druid-log4j
 druid-logrotate
-druid-router
 zoo.cfg
-core-site
-mapred-site
-yarn-site
-hdfs-site
   
 
   

ambari git commit: AMBARI-19783. Fix configuration-dependencies for druid. (Nishant Bangarwa via Swapan Shridhar)

[swapan]

Repository: ambari
Updated Branches:
  refs/heads/trunk b87343e15 -> 93d4ffeda


AMBARI-19783. Fix configuration-dependencies for druid. (Nishant Bangarwa via 
Swapan Shridhar)


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

Branch: refs/heads/trunk
Commit: 93d4ffeda4673adf20bcdde146372d5988b01531
Parents: b87343e
Author: Swapan Shridhar 
Authored: Mon Jan 30 10:59:25 2017 -0800
Committer: Swapan Shridhar 
Committed: Mon Jan 30 10:59:25 2017 -0800

--
 .../common-services/DRUID/0.9.2/metainfo.xml| 28 +---
 1 file changed, 18 insertions(+), 10 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/93d4ffed/ambari-server/src/main/resources/common-services/DRUID/0.9.2/metainfo.xml
--
diff --git 
a/ambari-server/src/main/resources/common-services/DRUID/0.9.2/metainfo.xml 
b/ambari-server/src/main/resources/common-services/DRUID/0.9.2/metainfo.xml
index 7ae2b9c..baf3a1b 100644
--- a/ambari-server/src/main/resources/common-services/DRUID/0.9.2/metainfo.xml
+++ b/ambari-server/src/main/resources/common-services/DRUID/0.9.2/metainfo.xml
@@ -43,6 +43,9 @@
 PYTHON
 600
   
+  
+druid-coordinator
+  
 
 
   DRUID_OVERLORD
@@ -63,6 +66,9 @@
 PYTHON
 600
   
+  
+druid-overlord
+  
 
 
   DRUID_HISTORICAL
@@ -83,6 +89,9 @@
 PYTHON
 600
   
+  
+druid-historical
+  
 
 
   DRUID_BROKER
@@ -103,6 +112,9 @@
 PYTHON
 600
   
+  
+druid-broker
+  
 
 
   DRUID_MIDDLEMANAGER
@@ -123,6 +135,9 @@
 PYTHON
 600
   
+  
+druid-middlemanager
+  
 
 
   DRUID_ROUTER
@@ -144,6 +159,9 @@
 600
   
 
+
+  druid-router
+
   
 
   
@@ -182,19 +200,9 @@
   
 druid-common
 druid-env
-druid-coordinator
-druid-overlord
-druid-historical
-druid-broker
-druid-middlemanager
 druid-log4j
 druid-logrotate
-druid-router
 zoo.cfg
-core-site
-mapred-site
-yarn-site
-hdfs-site
   
 
   

ambari git commit: AMBARI-19756. Add common log rotation settings to hive log4j2 -test fix (Madhuvanthi Radhakrishnan via smohanty)

[smohanty]

Repository: ambari
Updated Branches:
  refs/heads/trunk 0cc0e5d43 -> b87343e15


AMBARI-19756. Add common log rotation settings to hive log4j2 -test fix 
(Madhuvanthi Radhakrishnan via smohanty)


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

Branch: refs/heads/trunk
Commit: b87343e15f687778e721bad9483de1b3044fea0f
Parents: 0cc0e5d
Author: Sumit Mohanty 
Authored: Mon Jan 30 10:18:39 2017 -0800
Committer: Sumit Mohanty 
Committed: Mon Jan 30 10:19:08 2017 -0800

--
 .../resources/stacks/HDP/2.5/upgrades/config-upgrade.xml | 11 ---
 1 file changed, 11 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/b87343e1/ambari-server/src/main/resources/stacks/HDP/2.5/upgrades/config-upgrade.xml
--
diff --git 
a/ambari-server/src/main/resources/stacks/HDP/2.5/upgrades/config-upgrade.xml 
b/ambari-server/src/main/resources/stacks/HDP/2.5/upgrades/config-upgrade.xml
index 4bda941..157e0e9 100644
--- 
a/ambari-server/src/main/resources/stacks/HDP/2.5/upgrades/config-upgrade.xml
+++ 
b/ambari-server/src/main/resources/stacks/HDP/2.5/upgrades/config-upgrade.xml
@@ -345,17 +345,6 @@
   
 
   
-  
-
-  
-webhcat-log4j
-
-
-
-
-  
-
-  
 
 
   

ambari git commit: AMBARI-19756. Add common log rotation settings to hive log4j2 -test fix (Madhuvanthi Radhakrishnan via smohanty)

[smohanty]

Repository: ambari
Updated Branches:
  refs/heads/branch-2.5 e875aa3ae -> 862786b4a


AMBARI-19756. Add common log rotation settings to hive log4j2 -test fix 
(Madhuvanthi Radhakrishnan via smohanty)


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

Branch: refs/heads/branch-2.5
Commit: 862786b4a90e7e1d7efd9a96fa576a0fb5ca9f02
Parents: e875aa3
Author: Sumit Mohanty 
Authored: Mon Jan 30 10:18:39 2017 -0800
Committer: Sumit Mohanty 
Committed: Mon Jan 30 10:34:31 2017 -0800

--
 .../resources/stacks/HDP/2.5/upgrades/config-upgrade.xml | 11 ---
 1 file changed, 11 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/862786b4/ambari-server/src/main/resources/stacks/HDP/2.5/upgrades/config-upgrade.xml
--
diff --git 
a/ambari-server/src/main/resources/stacks/HDP/2.5/upgrades/config-upgrade.xml 
b/ambari-server/src/main/resources/stacks/HDP/2.5/upgrades/config-upgrade.xml
index 4bda941..157e0e9 100644
--- 
a/ambari-server/src/main/resources/stacks/HDP/2.5/upgrades/config-upgrade.xml
+++ 
b/ambari-server/src/main/resources/stacks/HDP/2.5/upgrades/config-upgrade.xml
@@ -345,17 +345,6 @@
   
 
   
-  
-
-  
-webhcat-log4j
-
-
-
-
-  
-
-  
 
 
   

ambari git commit: AMBARI-19716. CS queue refresh happens before the user clicks on the restart button. (Vivek Subramanian via yusaku)

[yusaku]

Repository: ambari
Updated Branches:
  refs/heads/branch-2.5 c12fbcc2d -> e875aa3ae


AMBARI-19716. CS queue refresh happens before the user clicks on the restart 
button. (Vivek Subramanian via yusaku)


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

Branch: refs/heads/branch-2.5
Commit: e875aa3ae0337cc6869f0c58f9b15c3dadd07fa5
Parents: c12fbcc
Author: Yusaku Sako 
Authored: Mon Jan 30 10:05:44 2017 -0800
Committer: Yusaku Sako 
Committed: Mon Jan 30 10:07:09 2017 -0800

--
 ambari-web/app/messages.js|  4 +++-
 .../configs/component_actions_by_configs.js   | 18 +-
 2 files changed, 20 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/e875aa3a/ambari-web/app/messages.js
--
diff --git a/ambari-web/app/messages.js b/ambari-web/app/messages.js
index bf3de62..9a41a63 100644
--- a/ambari-web/app/messages.js
+++ b/ambari-web/app/messages.js
@@ -417,8 +417,10 @@ Em.I18n.translations = {
   'popup.highlight':'click to highlight',
   'popup.confirmation.commonHeader':'Confirmation',
   'popup.confirmation.refreshYarnQueues.body':'It is strongly recommended to 
Refresh Yarn Queues after making a change to the capacity 
scheduler configuration. Would you like to proceed?',
-  'popup.warning.refreshYarnQueues.body': 'Warning: The queue configuration change may 
have affected the queue used by LLAP. An LLAP reconfiguration or restart may be 
required.',
+  'popup.warning.refreshYarnQueues.body': 'Warning: The queue configuration change may 
have affected the queue used by Hive LLAP. A Hive LLAP reconfiguration or 
restart may be required.',
   'popup.confirmation.refreshYarnQueues.buttonText':'Refresh Yarn Queues',
+  'popup.confirmation.hsiRestart.body':'It is strongly recommended to 
Restart HiveServer2 Interactive after making a change to the 
Hive LLAP sizing configuration. Would you like to proceed?',
+  'popup.confirmation.hsiRestart.buttonText':'Restart HiveServer2 Interactive',
   'popup.prompt.commonHeader':'Prompt',
   'popup.confirmationFeedBack.sending':'Sending...',
   'popup.confirmationFeedBack.query.fail':'Request failed',

http://git-wip-us.apache.org/repos/asf/ambari/blob/e875aa3a/ambari-web/app/mixins/main/service/configs/component_actions_by_configs.js
--
diff --git 
a/ambari-web/app/mixins/main/service/configs/component_actions_by_configs.js 
b/ambari-web/app/mixins/main/service/configs/component_actions_by_configs.js
index ebfc2c7..42e2dac 100644
--- a/ambari-web/app/mixins/main/service/configs/component_actions_by_configs.js
+++ b/ambari-web/app/mixins/main/service/configs/component_actions_by_configs.js
@@ -17,6 +17,7 @@
  */
 
 var App = require('app');
+var batchUtils = require('utils/batch_scheduled_requests');
 var stringUtils = require('utils/string_utils');
 
 /**
@@ -61,15 +62,19 @@ App.ComponentActionsByConfigs = Em.Mixin.create({
 
 if (configs.length) {
   if(config_action.get('fileName') === 'capacity-scheduler.xml' && 
!self.isYarnQueueRefreshed) {
+var hsiInstance = 
App.HostComponent.find().filterProperty('componentName', 
"HIVE_SERVER_INTERACTIVE");
 if(self.get('content.serviceName') === 'HIVE') {
   // Auto refresh yarn capacity scheduler if capacity-scheduler 
configs are changed from Hive configs page
   self.popupPrimaryButtonCallback(config_action);
+  // Show a popup to restart HSI if HSI is enabled
+  if(hsiInstance.length > 0) {
+self.showHsiRestartPopup(hsiInstance);
+  }
 } else {
   self.configAction = config_action;
   var body = config_action.get('popupProperties').body;
   
if(config_action.get('popupProperties').hasOwnProperty('conditionalWarning') && 
config_action.get('popupProperties').conditionalWarning === true) {
 // Check if Hive Server 2 Interactive is enabled and show a 
warning message if it is enabled
-var hsiInstance = 
App.HostComponent.find().filterProperty('componentName', 
"HIVE_SERVER_INTERACTIVE");
 if(hsiInstance.length > 0) {
   body += "" + 
config_action.get('popupProperties').warningMessage;
 }
@@ -84,6 +89,17 @@ App.ComponentActionsByConfigs = Em.Mixin.create({
 }
   },
 
+  showHsiRestartPopup: function (components) {
+var self = this;
+App.showConfirmationPopup(function () {
+  

ambari git commit: AMBARI-19716. CS queue refresh happens before the user clicks on the restart button. (Vivek Subramanian via yusaku)

[yusaku]

Repository: ambari
Updated Branches:
  refs/heads/trunk e4d0fa156 -> 0cc0e5d43


AMBARI-19716. CS queue refresh happens before the user clicks on the restart 
button. (Vivek Subramanian via yusaku)


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

Branch: refs/heads/trunk
Commit: 0cc0e5d43a49d75c300bdc190954e6639e6a50e1
Parents: e4d0fa1
Author: Yusaku Sako 
Authored: Mon Jan 30 10:05:44 2017 -0800
Committer: Yusaku Sako 
Committed: Mon Jan 30 10:05:44 2017 -0800

--
 ambari-web/app/messages.js|  4 +++-
 .../configs/component_actions_by_configs.js   | 18 +-
 2 files changed, 20 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/0cc0e5d4/ambari-web/app/messages.js
--
diff --git a/ambari-web/app/messages.js b/ambari-web/app/messages.js
index 83a19b0..8fbe198 100644
--- a/ambari-web/app/messages.js
+++ b/ambari-web/app/messages.js
@@ -431,8 +431,10 @@ Em.I18n.translations = {
   'popup.highlight':'click to highlight',
   'popup.confirmation.commonHeader':'Confirmation',
   'popup.confirmation.refreshYarnQueues.body':'It is strongly recommended to 
Refresh Yarn Queues after making a change to the capacity 
scheduler configuration. Would you like to proceed?',
-  'popup.warning.refreshYarnQueues.body': 'Warning: The queue configuration change may 
have affected the queue used by LLAP. An LLAP reconfiguration or restart may be 
required.',
+  'popup.warning.refreshYarnQueues.body': 'Warning: The queue configuration change may 
have affected the queue used by Hive LLAP. A Hive LLAP reconfiguration or 
restart may be required.',
   'popup.confirmation.refreshYarnQueues.buttonText':'Refresh Yarn Queues',
+  'popup.confirmation.hsiRestart.body':'It is strongly recommended to 
Restart HiveServer2 Interactive after making a change to the 
Hive LLAP sizing configuration. Would you like to proceed?',
+  'popup.confirmation.hsiRestart.buttonText':'Restart HiveServer2 Interactive',
   'popup.prompt.commonHeader':'Prompt',
   'popup.confirmationFeedBack.sending':'Sending...',
   'popup.confirmationFeedBack.query.fail':'Request failed',

http://git-wip-us.apache.org/repos/asf/ambari/blob/0cc0e5d4/ambari-web/app/mixins/main/service/configs/component_actions_by_configs.js
--
diff --git 
a/ambari-web/app/mixins/main/service/configs/component_actions_by_configs.js 
b/ambari-web/app/mixins/main/service/configs/component_actions_by_configs.js
index 35ddc0f..f52d1af 100644
--- a/ambari-web/app/mixins/main/service/configs/component_actions_by_configs.js
+++ b/ambari-web/app/mixins/main/service/configs/component_actions_by_configs.js
@@ -17,6 +17,7 @@
  */
 
 var App = require('app');
+var batchUtils = require('utils/batch_scheduled_requests');
 var stringUtils = require('utils/string_utils');
 
 /**
@@ -61,15 +62,19 @@ App.ComponentActionsByConfigs = Em.Mixin.create({
 
 if (configs.length) {
   if(config_action.get('fileName') === 'capacity-scheduler.xml' && 
!self.isYarnQueueRefreshed) {
+var hsiInstance = 
App.HostComponent.find().filterProperty('componentName', 
"HIVE_SERVER_INTERACTIVE");
 if(self.get('content.serviceName') === 'HIVE') {
   // Auto refresh yarn capacity scheduler if capacity-scheduler 
configs are changed from Hive configs page
   self.popupPrimaryButtonCallback(config_action);
+  // Show a popup to restart HSI if HSI is enabled
+  if(hsiInstance.length > 0) {
+self.showHsiRestartPopup(hsiInstance);
+  }
 } else {
   self.configAction = config_action;
   var body = config_action.get('popupProperties').body;
   
if(config_action.get('popupProperties').hasOwnProperty('conditionalWarning') && 
config_action.get('popupProperties').conditionalWarning === true) {
 // Check if Hive Server 2 Interactive is enabled and show a 
warning message if it is enabled
-var hsiInstance = 
App.HostComponent.find().filterProperty('componentName', 
"HIVE_SERVER_INTERACTIVE");
 if(hsiInstance.length > 0) {
   body += "" + 
config_action.get('popupProperties').warningMessage;
 }
@@ -84,6 +89,17 @@ App.ComponentActionsByConfigs = Em.Mixin.create({
 }
   },
 
+  showHsiRestartPopup: function (components) {
+var self = this;
+App.showConfirmationPopup(function () {
+  

ambari git commit: AMBARI-19749. Run ru_set_all script after installing packages on single host not belonging to any cluster (magyari_sandor)

[magyari_sandor]

Repository: ambari
Updated Branches:
  refs/heads/branch-2.5 d6a654e19 -> c12fbcc2d


AMBARI-19749. Run ru_set_all script after installing packages on single host 
not belonging to any cluster (magyari_sandor)


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

Branch: refs/heads/branch-2.5
Commit: c12fbcc2d72a120df9abee1d8fe947a7f1fbd72d
Parents: d6a654e
Author: Sandor Magyari 
Authored: Fri Jan 27 19:23:10 2017 +0100
Committer: Sandor Magyari 
Committed: Mon Jan 30 17:10:41 2017 +0100

--
 .../HostStackVersionResourceProvider.java   | 46 +++-
 .../HostStackVersionResourceProviderTest.java   | 11 +
 2 files changed, 56 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/c12fbcc2/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/HostStackVersionResourceProvider.java
--
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/HostStackVersionResourceProvider.java
 
b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/HostStackVersionResourceProvider.java
index 364a61e..8f2d4e6 100644
--- 
a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/HostStackVersionResourceProvider.java
+++ 
b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/HostStackVersionResourceProvider.java
@@ -94,6 +94,7 @@ public class HostStackVersionResourceProvider extends 
AbstractControllerResource
 
   /**
* Whether to force creating of install command on a host which is not 
member of any cluster yet.
+   * This will also run hdp-select for specified stack version.
*/
   protected static final String 
HOST_STACK_VERSION_FORCE_INSTALL_ON_NON_MEMBER_HOST_PROPERTY_ID = PropertyHelper
 .getPropertyId("HostStackVersions", "force_non_member_install");
@@ -105,6 +106,7 @@ public class HostStackVersionResourceProvider extends 
AbstractControllerResource
   protected static final String COMPONENT_NAME_PROPERTY_ID = "name";
 
   protected static final String INSTALL_PACKAGES_ACTION = "install_packages";
+  protected static final String STACK_SELECT_ACTION = "ru_set_all";
   protected static final String INSTALL_PACKAGES_FULL_NAME = "Install version";
 
 
@@ -303,7 +305,7 @@ public class HostStackVersionResourceProvider extends 
AbstractControllerResource
 
   private RequestStageContainer createInstallPackagesRequest(String hostName, 
final String desiredRepoVersion,
  String stackName, 
String stackVersion, String clName,
- boolean 
forceInstallOnNonMemberHost,
+ final boolean 
forceInstallOnNonMemberHost,
  Set> componentNames)
 throws NoSuchParentResourceException, SystemException {
 
@@ -523,6 +525,11 @@ public class HostStackVersionResourceProvider extends 
AbstractControllerResource
   throw new SystemException("Can not modify stage", e);
 }
 
+if (forceInstallOnNonMemberHost) {
+  addSelectStackStage(desiredRepoVersion, forceInstallOnNonMemberHost, 
cluster, filter, caption, req,
+hostLevelParams, clusterHostInfoJson);
+}
+
 try {
   if (!forceInstallOnNonMemberHost) {
 hostVersEntity.setState(RepositoryVersionState.INSTALLING);
@@ -536,6 +543,43 @@ public class HostStackVersionResourceProvider extends 
AbstractControllerResource
 return req;
   }
 
+  private void addSelectStackStage(String desiredRepoVersion, boolean 
forceInstallOnNonMemberHost, Cluster cluster,
+ RequestResourceFilter filter, String caption, 
RequestStageContainer req, Map hostLevelParams, String 
clusterHostInfoJson) throws SystemException {
+Stage stage;
+long stageId;
+ActionExecutionContext actionContext;
+Map commandParams = new HashMap();
+commandParams.put("version", desiredRepoVersion);
+
+stage = stageFactory.createNew(req.getId(),
+  "/tmp/ambari",
+  cluster.getClusterName(),
+  cluster.getClusterId(),
+  caption,
+  clusterHostInfoJson,
+  StageUtils.getGson().toJson(commandParams),
+  StageUtils.getGson().toJson(hostLevelParams));
+
+stageId = req.getLastStageId() + 1;
+if (0L == stageId) {
+  stageId = 1L;
+}
+stage.setStageId(stageId);
+

[08/30] ambari git commit: AMBARI-19761. HSI start fails after Ambari upgrade with Unrecognized option: --skiphadoopversion and --skiphbasecp (Swapan Shridhar via smohanty)

[ncole]

AMBARI-19761. HSI start fails after Ambari upgrade with Unrecognized option: 
--skiphadoopversion and --skiphbasecp (Swapan Shridhar via smohanty)


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

Branch: refs/heads/branch-dev-patch-upgrade
Commit: 771c9c011b3ea00e4ad0171b04bd851c7ee74ee0
Parents: c600985
Author: Sumit Mohanty 
Authored: Fri Jan 27 17:53:04 2017 -0800
Committer: Sumit Mohanty 
Committed: Fri Jan 27 17:53:04 2017 -0800

--
 .../HIVE/0.12.0.2.0/package/scripts/hive_server_interactive.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/771c9c01/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/hive_server_interactive.py
--
diff --git 
a/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/hive_server_interactive.py
 
b/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/hive_server_interactive.py
index 924c88c..ce10824 100644
--- 
a/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/hive_server_interactive.py
+++ 
b/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/hive_server_interactive.py
@@ -284,9 +284,9 @@ class HiveServerInteractiveDefault(HiveServerInteractive):
   cmd = format("{stack_root}/current/hive-server2-hive2/bin/hive --service 
llap --instances {params.num_llap_nodes}"
" --slider-am-container-mb {params.slider_am_container_mb} 
--size {params.llap_daemon_container_size}m"
" --cache {params.hive_llap_io_mem_size}m --xmx 
{params.llap_heap_size}m --loglevel {params.llap_log_level}"
-   " {params.llap_extra_slider_opts} --skiphadoopversion 
--skiphbasecp --output {LLAP_PACKAGE_CREATION_PATH}/{unique_name}")
+   " {params.llap_extra_slider_opts} --output 
{LLAP_PACKAGE_CREATION_PATH}/{unique_name}")
 
-  # '--slider-placement' param is supported from HDP Hive GA version.
+  # Append params that are supported from Hive llap GA version.
   if params.stack_supports_hive_interactive_ga:
 # Figure out the Slider Anti-affinity to be used.
 # YARN does not support anti-affinity, and therefore Slider implements 
AA by the means of exclusion lists, i.e, it
@@ -300,7 +300,7 @@ class HiveServerInteractiveDefault(HiveServerInteractive):
 else:
   Logger.info("Setting slider_placement: 4, as 
llap_daemon_container_size : {0} <= 0.5 * "
  "YARN NodeManager 
Memory({1})".format(params.llap_daemon_container_size, params.yarn_nm_mem))
-cmd += format(" --slider-placement {slider_placement}")
+cmd += format(" --slider-placement {slider_placement} 
--skiphadoopversion --skiphbasecp")
 
   if params.security_enabled:
 llap_keytab_splits = params.hive_llap_keytab_file.split("/")

[21/30] ambari git commit: AMBARI-19744. Hive View 2.0: Hive view starts with an empty page. (dipayanb)

[ncole]

AMBARI-19744. Hive View 2.0: Hive view starts with an empty page. (dipayanb)


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

Branch: refs/heads/branch-dev-patch-upgrade
Commit: 37b414241b9b8a7b909278335037b7c0fe6fa441
Parents: abcd063
Author: Dipayan Bhowmick 
Authored: Mon Jan 30 14:32:50 2017 +0530
Committer: Dipayan Bhowmick 
Committed: Mon Jan 30 14:33:41 2017 +0530

--
 .../src/main/resources/ui/app/routes/index.js   | 26 
 1 file changed, 26 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/37b41424/contrib/views/hive20/src/main/resources/ui/app/routes/index.js
--
diff --git a/contrib/views/hive20/src/main/resources/ui/app/routes/index.js 
b/contrib/views/hive20/src/main/resources/ui/app/routes/index.js
new file mode 100644
index 000..ddaff8a
--- /dev/null
+++ b/contrib/views/hive20/src/main/resources/ui/app/routes/index.js
@@ -0,0 +1,26 @@
+/**
+ * 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.
+ */
+
+import Ember from 'ember';
+
+export default Ember.Route.extend({
+  beforeModel() {
+this.transitionTo('queries');
+  }
+
+});

[07/30] ambari git commit: AMBARI-19759. Fix Spark2 service description string (Bikas Saha via smohanty)

[ncole]

AMBARI-19759. Fix Spark2 service description string (Bikas Saha via smohanty)


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

Branch: refs/heads/branch-dev-patch-upgrade
Commit: c60098536dcd7faf85e364fdcafed17cbba340a6
Parents: b3391f0
Author: Sumit Mohanty 
Authored: Fri Jan 27 16:02:15 2017 -0800
Committer: Sumit Mohanty 
Committed: Fri Jan 27 16:02:46 2017 -0800

--
 .../main/resources/stacks/HDP/2.6/services/SPARK2/metainfo.xml  | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/c6009853/ambari-server/src/main/resources/stacks/HDP/2.6/services/SPARK2/metainfo.xml
--
diff --git 
a/ambari-server/src/main/resources/stacks/HDP/2.6/services/SPARK2/metainfo.xml 
b/ambari-server/src/main/resources/stacks/HDP/2.6/services/SPARK2/metainfo.xml
index 34d3fdd..66341c9 100644
--- 
a/ambari-server/src/main/resources/stacks/HDP/2.6/services/SPARK2/metainfo.xml
+++ 
b/ambari-server/src/main/resources/stacks/HDP/2.6/services/SPARK2/metainfo.xml
@@ -23,8 +23,9 @@
   
 
   SPARK2
-  Apache Spark 2.1 is a fast and general engine for large-scale 
data processing. This service is bTechnical Preview/b.
-  2.1.x
+  Apache Spark is a fast and general engine for large-scale data 
processing
+  2.x
+  DEFAULT
 
   
 

[26/30] ambari git commit: AMBARI-19766. Not able to set the sla for an action node (Padma Priya N via gauravn7)

[ncole]

AMBARI-19766. Not able to set the sla for an action node (Padma Priya N via 
gauravn7)


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

Branch: refs/heads/branch-dev-patch-upgrade
Commit: da7202d41cbf9042ac844ad408a08c348ec06e7f
Parents: ff34b05
Author: Gaurav Nagar 
Authored: Mon Jan 30 17:39:33 2017 +0530
Committer: Gaurav Nagar 
Committed: Mon Jan 30 17:39:33 2017 +0530

--
 .../main/resources/ui/app/components/workflow-action-editor.js | 2 +-
 .../main/resources/ui/app/templates/components/sla-info.hbs| 6 +++---
 .../resources/ui/app/templates/components/sqoop-action.hbs | 2 +-
 .../resources/ui/app/templates/components/workflow-actions.hbs | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/da7202d4/contrib/views/wfmanager/src/main/resources/ui/app/components/workflow-action-editor.js
--
diff --git 
a/contrib/views/wfmanager/src/main/resources/ui/app/components/workflow-action-editor.js
 
b/contrib/views/wfmanager/src/main/resources/ui/app/components/workflow-action-editor.js
index f2d3ba8..43eeb5b 100644
--- 
a/contrib/views/wfmanager/src/main/resources/ui/app/components/workflow-action-editor.js
+++ 
b/contrib/views/wfmanager/src/main/resources/ui/app/components/workflow-action-editor.js
@@ -132,7 +132,7 @@ export default Ember.Component.extend( Ember.Evented,{
 }
 if(!CommonUtils.isSupportedAction(this.get('actionType')) && 
!this.get('actionModel.slaInfo')){
   this.set('customSlaInfo',  SlaInfo.create({}));
-}else{
+}else if(!CommonUtils.isSupportedAction(this.get('actionType')) && 
this.get('actionModel.slaInfo')){
   this.set('customSlaInfo',  this.get('actionModel.slaInfo'));
   this.set('customSlaEnabled', this.get('actionModel.slaEnabled'));
   delete this.get('actionModel').slaInfo;

http://git-wip-us.apache.org/repos/asf/ambari/blob/da7202d4/contrib/views/wfmanager/src/main/resources/ui/app/templates/components/sla-info.hbs
--
diff --git 
a/contrib/views/wfmanager/src/main/resources/ui/app/templates/components/sla-info.hbs
 
b/contrib/views/wfmanager/src/main/resources/ui/app/templates/components/sla-info.hbs
index 447bac2..2ebc259 100644
--- 
a/contrib/views/wfmanager/src/main/resources/ui/app/templates/components/sla-info.hbs
+++ 
b/contrib/views/wfmanager/src/main/resources/ui/app/templates/components/sla-info.hbs
@@ -35,7 +35,7 @@
   
 Should Start
 
-  {{input class="form-control" type="text" 
value=slaInfo.shouldStart.time placeholder="Should Start"}}
+  {{input class="form-control" type="text" 
value=slaInfo.shouldStart.time placeholder="Time period(eg. 5)" title="Time 
period in minutes/hours/days"}}
   {{field-error model=this field='slaInfo.shouldStart.time' 
showErrorMessage=showErrorMessage}}
 
 
@@ -50,7 +50,7 @@
   
 Should End*
 
-  {{input class="form-control" type="text" 
value=slaInfo.shouldEnd.time placeholder="Should End"}}
+  {{input class="form-control" type="text" 
value=slaInfo.shouldEnd.time placeholder="Time period(eg. 5)" title="Time 
period in minutes/hours/days"}}
   {{field-error model=this field='slaInfo.shouldEnd.time' 
showErrorMessage=showErrorMessage}}
 
 
@@ -65,7 +65,7 @@
   
 Max Duration
 
-  {{input class="form-control" type="text" 
value=slaInfo.maxDuration.time placeholder="Max Duration"}}
+  {{input class="form-control" type="text" 
value=slaInfo.maxDuration.time placeholder="Time period(eg. 5)" title="Time 
period in minutes/hours/days"}}
 
 
   

http://git-wip-us.apache.org/repos/asf/ambari/blob/da7202d4/contrib/views/wfmanager/src/main/resources/ui/app/templates/components/sqoop-action.hbs
--
diff --git 
a/contrib/views/wfmanager/src/main/resources/ui/app/templates/components/sqoop-action.hbs
 
b/contrib/views/wfmanager/src/main/resources/ui/app/templates/components/sqoop-action.hbs
index 3f0ec61..fb59149 100644
--- 
a/contrib/views/wfmanager/src/main/resources/ui/app/templates/components/sqoop-action.hbs
+++ 
b/contrib/views/wfmanager/src/main/resources/ui/app/templates/components/sqoop-action.hbs
@@ -32,7 +32,7 @@
 
   Command
   
-{{input type="text" class="form-control" name="command" 
value=actionModel.command placeholder="Sqoop Command"}}
+{{input 

[02/30] ambari git commit: AMBARI-19641: Deleted configuration groups are displayed along with active group (Amruta Borkar via dili)

[ncole]

AMBARI-19641: Deleted configuration groups are displayed along with active 
group (Amruta Borkar via dili)


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

Branch: refs/heads/branch-dev-patch-upgrade
Commit: 6d02a7a5b3415a87b0cbcf21d360942719efcb9d
Parents: dcdf95b
Author: Di Li 
Authored: Fri Jan 27 14:13:55 2017 -0500
Committer: Di Li 
Committed: Fri Jan 27 14:13:55 2017 -0500

--
 .../orm/entities/ServiceConfigEntity.java   |  2 +-
 .../server/orm/dao/ServiceConfigDAOTest.java| 66 
 2 files changed, 56 insertions(+), 12 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/6d02a7a5/ambari-server/src/main/java/org/apache/ambari/server/orm/entities/ServiceConfigEntity.java
--
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/orm/entities/ServiceConfigEntity.java
 
b/ambari-server/src/main/java/org/apache/ambari/server/orm/entities/ServiceConfigEntity.java
index 2d6ca20..8a1b316 100644
--- 
a/ambari-server/src/main/java/org/apache/ambari/server/orm/entities/ServiceConfigEntity.java
+++ 
b/ambari-server/src/main/java/org/apache/ambari/server/orm/entities/ServiceConfigEntity.java
@@ -50,7 +50,7 @@ import javax.persistence.TableGenerator;
 @NamedQuery(name = "ServiceConfigEntity.findNextServiceConfigVersion", 
query = "SELECT COALESCE(MAX(serviceConfig.version), 0) + 1 AS nextVersion FROM 
ServiceConfigEntity serviceConfig WHERE serviceConfig.serviceName=:serviceName 
AND serviceConfig.clusterId=:clusterId"),
 @NamedQuery(name = "ServiceConfigEntity.findAllServiceConfigsByStack", 
query = "SELECT serviceConfig FROM ServiceConfigEntity serviceConfig WHERE 
serviceConfig.clusterId=:clusterId AND serviceConfig.stack=:stack"),
 @NamedQuery(name = "ServiceConfigEntity.findLatestServiceConfigsByStack", 
query = "SELECT serviceConfig FROM ServiceConfigEntity serviceConfig WHERE 
serviceConfig.clusterId = :clusterId AND serviceConfig.version = (SELECT 
MAX(serviceConfig2.version) FROM ServiceConfigEntity serviceConfig2 WHERE 
serviceConfig2.clusterId=:clusterId AND serviceConfig2.stack=:stack AND 
serviceConfig2.serviceName = serviceConfig.serviceName)"),
-@NamedQuery(name = 
"ServiceConfigEntity.findLatestServiceConfigsByService", query = "SELECT scv 
FROM ServiceConfigEntity scv WHERE scv.clusterId = :clusterId AND 
scv.serviceName = :serviceName AND scv.version = (SELECT MAX(scv2.version) FROM 
ServiceConfigEntity scv2 WHERE (scv2.serviceName = :serviceName AND 
scv2.clusterId = :clusterId) AND (scv2.groupId = scv.groupId OR (scv2.groupId 
IS NULL AND scv.groupId IS NULL)))"),
+@NamedQuery(name = 
"ServiceConfigEntity.findLatestServiceConfigsByService", query = "SELECT scv 
FROM ServiceConfigEntity scv WHERE scv.clusterId = :clusterId AND 
scv.serviceName = :serviceName AND (scv.groupId = null OR scv.groupId IN 
(SELECT cg.groupId from ConfigGroupEntity cg)) AND scv.version = (SELECT 
MAX(scv2.version) FROM ServiceConfigEntity scv2 WHERE (scv2.serviceName = 
:serviceName AND scv2.clusterId = :clusterId) AND (scv2.groupId = scv.groupId 
OR (scv2.groupId IS NULL AND scv.groupId IS NULL)))"),
 @NamedQuery(name = 
"ServiceConfigEntity.findLatestServiceConfigsByCluster", query = "SELECT scv 
FROM ServiceConfigEntity scv WHERE scv.clusterId = :clusterId AND 
scv.serviceConfigId IN (SELECT MAX(scv1.serviceConfigId) FROM 
ServiceConfigEntity scv1 WHERE (scv1.clusterId = :clusterId) AND (scv1.groupId 
IS NULL) GROUP BY scv1.serviceName)")})
 public class ServiceConfigEntity {
   @Id

http://git-wip-us.apache.org/repos/asf/ambari/blob/6d02a7a5/ambari-server/src/test/java/org/apache/ambari/server/orm/dao/ServiceConfigDAOTest.java
--
diff --git 
a/ambari-server/src/test/java/org/apache/ambari/server/orm/dao/ServiceConfigDAOTest.java
 
b/ambari-server/src/test/java/org/apache/ambari/server/orm/dao/ServiceConfigDAOTest.java
index aafe557..5890c35 100644
--- 
a/ambari-server/src/test/java/org/apache/ambari/server/orm/dao/ServiceConfigDAOTest.java
+++ 
b/ambari-server/src/test/java/org/apache/ambari/server/orm/dao/ServiceConfigDAOTest.java
@@ -262,23 +262,43 @@ public class ServiceConfigDAOTest {
   @Test
   public void testGetLastServiceConfigsForService() throws Exception {
 String serviceName = "HDFS";
+Clusters clusters = injector.getInstance(Clusters.class);
+clusters.addCluster("c1", HDP_01);
+ConfigGroupEntity configGroupEntity1 = new ConfigGroupEntity();
+ClusterEntity clusterEntity = 

ambari git commit: AMBARI-19749. Run ru_set_all script after installing packages on single host not belonging to any cluster (magyari_sandor)

[magyari_sandor]

Repository: ambari
Updated Branches:
  refs/heads/trunk d6d247983 -> e4d0fa156


AMBARI-19749. Run ru_set_all script after installing packages on single host 
not belonging to any cluster (magyari_sandor)


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

Branch: refs/heads/trunk
Commit: e4d0fa156e6ac41bae7b7020f781d0dae1274894
Parents: d6d2479
Author: Sandor Magyari 
Authored: Fri Jan 27 19:23:10 2017 +0100
Committer: Sandor Magyari 
Committed: Mon Jan 30 16:39:58 2017 +0100

--
 .../HostStackVersionResourceProvider.java   | 46 +++-
 .../HostStackVersionResourceProviderTest.java   | 11 +
 2 files changed, 56 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/e4d0fa15/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/HostStackVersionResourceProvider.java
--
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/HostStackVersionResourceProvider.java
 
b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/HostStackVersionResourceProvider.java
index 364a61e..8f2d4e6 100644
--- 
a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/HostStackVersionResourceProvider.java
+++ 
b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/HostStackVersionResourceProvider.java
@@ -94,6 +94,7 @@ public class HostStackVersionResourceProvider extends 
AbstractControllerResource
 
   /**
* Whether to force creating of install command on a host which is not 
member of any cluster yet.
+   * This will also run hdp-select for specified stack version.
*/
   protected static final String 
HOST_STACK_VERSION_FORCE_INSTALL_ON_NON_MEMBER_HOST_PROPERTY_ID = PropertyHelper
 .getPropertyId("HostStackVersions", "force_non_member_install");
@@ -105,6 +106,7 @@ public class HostStackVersionResourceProvider extends 
AbstractControllerResource
   protected static final String COMPONENT_NAME_PROPERTY_ID = "name";
 
   protected static final String INSTALL_PACKAGES_ACTION = "install_packages";
+  protected static final String STACK_SELECT_ACTION = "ru_set_all";
   protected static final String INSTALL_PACKAGES_FULL_NAME = "Install version";
 
 
@@ -303,7 +305,7 @@ public class HostStackVersionResourceProvider extends 
AbstractControllerResource
 
   private RequestStageContainer createInstallPackagesRequest(String hostName, 
final String desiredRepoVersion,
  String stackName, 
String stackVersion, String clName,
- boolean 
forceInstallOnNonMemberHost,
+ final boolean 
forceInstallOnNonMemberHost,
  Set> componentNames)
 throws NoSuchParentResourceException, SystemException {
 
@@ -523,6 +525,11 @@ public class HostStackVersionResourceProvider extends 
AbstractControllerResource
   throw new SystemException("Can not modify stage", e);
 }
 
+if (forceInstallOnNonMemberHost) {
+  addSelectStackStage(desiredRepoVersion, forceInstallOnNonMemberHost, 
cluster, filter, caption, req,
+hostLevelParams, clusterHostInfoJson);
+}
+
 try {
   if (!forceInstallOnNonMemberHost) {
 hostVersEntity.setState(RepositoryVersionState.INSTALLING);
@@ -536,6 +543,43 @@ public class HostStackVersionResourceProvider extends 
AbstractControllerResource
 return req;
   }
 
+  private void addSelectStackStage(String desiredRepoVersion, boolean 
forceInstallOnNonMemberHost, Cluster cluster,
+ RequestResourceFilter filter, String caption, 
RequestStageContainer req, Map hostLevelParams, String 
clusterHostInfoJson) throws SystemException {
+Stage stage;
+long stageId;
+ActionExecutionContext actionContext;
+Map commandParams = new HashMap();
+commandParams.put("version", desiredRepoVersion);
+
+stage = stageFactory.createNew(req.getId(),
+  "/tmp/ambari",
+  cluster.getClusterName(),
+  cluster.getClusterId(),
+  caption,
+  clusterHostInfoJson,
+  StageUtils.getGson().toJson(commandParams),
+  StageUtils.getGson().toJson(hostLevelParams));
+
+stageId = req.getLastStageId() + 1;
+if (0L == stageId) {
+  stageId = 1L;
+}
+stage.setStageId(stageId);
+

[03/30] ambari git commit: AMBARI-19663. LLAP metrics collector host gets wrongly updated. (prasanthj via Swapan Shridhar).

[ncole]

AMBARI-19663. LLAP metrics collector host gets wrongly updated. (prasanthj via 
Swapan Shridhar).


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

Branch: refs/heads/branch-dev-patch-upgrade
Commit: 23522a28126bbb1216bb1b556fce1d24a7262d26
Parents: 6d02a7a
Author: Swapan Shridhar 
Authored: Fri Jan 27 11:16:03 2017 -0800
Committer: Swapan Shridhar 
Committed: Fri Jan 27 11:18:30 2017 -0800

--
 .../HIVE/0.12.0.2.0/package/scripts/params_linux.py  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/23522a28/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/params_linux.py
--
diff --git 
a/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/params_linux.py
 
b/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/params_linux.py
index 997975e..4907f93 100644
--- 
a/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/params_linux.py
+++ 
b/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/params_linux.py
@@ -513,7 +513,7 @@ hive_site_config = 
dict(config['configurations']['hive-site'])
 
 # AMS related params #
 
-ams_collector_hosts = default("/clusterHostInfo/metrics_collector_hosts", [])
+ams_collector_hosts = 
",".join(default("/clusterHostInfo/metrics_collector_hosts", []))
 has_metric_collector = not len(ams_collector_hosts) == 0
 if has_metric_collector:
   if 'cluster-env' in config['configurations'] and \
@@ -785,4 +785,4 @@ if enable_ranger_hive:
   if has_ranger_admin and stack_supports_ranger_audit_db and 
xa_audit_db_flavor.lower() == 'sqla':
 xa_audit_db_is_enabled = False
 
-# ranger hive plugin section end
\ No newline at end of file
+# ranger hive plugin section end

[01/30] ambari git commit: AMBARI-19737. Add a validation check in HSI about Capacity Scheduler preemption requirements.

[ncole]

Repository: ambari
Updated Branches:
  refs/heads/branch-dev-patch-upgrade 535327d12 -> 393ab3ee2


AMBARI-19737. Add a validation check in HSI about Capacity Scheduler preemption 
requirements.


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

Branch: refs/heads/branch-dev-patch-upgrade
Commit: dcdf95b28a98e47062727f270adf2b4c69816f93
Parents: 9963ac8
Author: Swapan Shridhar 
Authored: Fri Jan 27 11:02:48 2017 -0800
Committer: Swapan Shridhar 
Committed: Fri Jan 27 11:02:48 2017 -0800

--
 .../stacks/HDP/2.5/services/stack_advisor.py  | 12 
 .../2.5/common/services-normal-his-2-hosts.json   |  8 +++-
 .../2.5/common/services-normal-his-valid.json |  8 +++-
 .../stacks/2.5/common/test_stack_advisor.py   | 18 +++---
 4 files changed, 37 insertions(+), 9 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/dcdf95b2/ambari-server/src/main/resources/stacks/HDP/2.5/services/stack_advisor.py
--
diff --git 
a/ambari-server/src/main/resources/stacks/HDP/2.5/services/stack_advisor.py 
b/ambari-server/src/main/resources/stacks/HDP/2.5/services/stack_advisor.py
index 8e377da..ca4a968 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.5/services/stack_advisor.py
+++ b/ambari-server/src/main/resources/stacks/HDP/2.5/services/stack_advisor.py
@@ -388,8 +388,11 @@ class HDP25StackAdvisor(HDP24StackAdvisor):
 
   def validateHiveInteractiveEnvConfigurations(self, properties, 
recommendedDefaults, configurations, services, hosts):
 hive_site_env_properties = self.getSiteProperties(configurations, 
"hive-interactive-env")
+yarn_site_properties = self.getSiteProperties(configurations, "yarn-site")
 validationItems = []
 hsi_hosts = self.getHostsForComponent(services, "HIVE", 
"HIVE_SERVER_INTERACTIVE")
+
+# Check for expecting 'enable_hive_interactive' is ON given that there is 
HSI on atleast one host present.
 if len(hsi_hosts) > 0:
   # HIVE_SERVER_INTERACTIVE is mapped to a host
   if 'enable_hive_interactive' not in hive_site_env_properties or (
@@ -407,6 +410,15 @@ class HDP25StackAdvisor(HDP24StackAdvisor):
 "item": self.getErrorItem(
   "enable_hive_interactive in 
hive-interactive-env should be set to false.")})
 
+# Check for 'yarn.resourcemanager.scheduler.monitor.enable' config to be 
true if HSI is ON.
+if yarn_site_properties and 
'yarn.resourcemanager.scheduler.monitor.enable' in yarn_site_properties:
+  scheduler_monitor_enabled = 
yarn_site_properties['yarn.resourcemanager.scheduler.monitor.enable']
+  if scheduler_monitor_enabled.lower() == 'false' and 
hive_site_env_properties and 'enable_hive_interactive' in 
hive_site_env_properties and \
+hive_site_env_properties['enable_hive_interactive'].lower() == 'true':
+validationItems.append({"config-name": "enable_hive_interactive",
+"item": self.getWarnItem(
+  "When enabling LLAP, set 
'yarn.resourcemanager.scheduler.monitor.enable' to true to ensure that LLAP 
gets the full allocated capacity.")})
+
 validationProblems = 
self.toConfigurationValidationProblems(validationItems, "hive-interactive-env")
 return validationProblems
 

http://git-wip-us.apache.org/repos/asf/ambari/blob/dcdf95b2/ambari-server/src/test/python/stacks/2.5/common/services-normal-his-2-hosts.json
--
diff --git 
a/ambari-server/src/test/python/stacks/2.5/common/services-normal-his-2-hosts.json
 
b/ambari-server/src/test/python/stacks/2.5/common/services-normal-his-2-hosts.json
index 44698ed..0044bf1 100644
--- 
a/ambari-server/src/test/python/stacks/2.5/common/services-normal-his-2-hosts.json
+++ 
b/ambari-server/src/test/python/stacks/2.5/common/services-normal-his-2-hosts.json
@@ -1108,7 +1108,8 @@
 "hive.llap.daemon.queue.name": "llap",
 "hive.server2.enable.doAs": "true",
 "hive.llap.daemon.num.executors": "0",
-"hive.server2.tez.sessions.per.default.queue": "32"
+"hive.server2.tez.sessions.per.default.queue": "32",
+"hive.tez.container.size" : "341"
   }
 },
 "hive-interactive-env" : {
@@ -1159,6 +1160,11 @@
   "properties": {
 "tez.am.resource.memory.mb" : "341"
   }
+},
+"tez-interactive-site": {
+  "properties": {
+"tez.am.resource.memory.mb" : "341"
+  }
 }
   },
   

[04/30] ambari git commit: Revert "AMBARI-19741. Ambari Server Unit Test failure on branch-2.5/trunk for testUpdateConfigForceSecurityEnabled (echekanskiy via dlysnichenko)"

[ncole]

Revert "AMBARI-19741. Ambari Server Unit Test failure on branch-2.5/trunk for 
testUpdateConfigForceSecurityEnabled (echekanskiy via dlysnichenko)"

This reverts commit cc30798a6f1428fbe2a2dd6c64cac2c128cf9a23.


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

Branch: refs/heads/branch-dev-patch-upgrade
Commit: 65eb886720c2ccff344fe99928fabc23bcc48738
Parents: 23522a2
Author: Robert Levas 
Authored: Fri Jan 27 15:09:57 2017 -0500
Committer: Robert Levas 
Committed: Fri Jan 27 15:09:57 2017 -0500

--
 .../UpdateKerberosConfigsServerActionTest.java| 14 --
 1 file changed, 4 insertions(+), 10 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/65eb8867/ambari-server/src/test/java/org/apache/ambari/server/serveraction/kerberos/UpdateKerberosConfigsServerActionTest.java
--
diff --git 
a/ambari-server/src/test/java/org/apache/ambari/server/serveraction/kerberos/UpdateKerberosConfigsServerActionTest.java
 
b/ambari-server/src/test/java/org/apache/ambari/server/serveraction/kerberos/UpdateKerberosConfigsServerActionTest.java
index c8ebb63..e756491 100644
--- 
a/ambari-server/src/test/java/org/apache/ambari/server/serveraction/kerberos/UpdateKerberosConfigsServerActionTest.java
+++ 
b/ambari-server/src/test/java/org/apache/ambari/server/serveraction/kerberos/UpdateKerberosConfigsServerActionTest.java
@@ -22,7 +22,7 @@ import static org.easymock.EasyMock.anyObject;
 import static org.easymock.EasyMock.capture;
 import static org.easymock.EasyMock.expect;
 import static org.easymock.EasyMock.expectLastCall;
-import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.assertEquals;
 
 import java.io.File;
 import java.util.Collection;
@@ -43,6 +43,7 @@ import org.junit.Before;
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.rules.TemporaryFolder;
+
 import com.google.inject.AbstractModule;
 import com.google.inject.Guice;
 import com.google.inject.Injector;
@@ -164,15 +165,8 @@ public class UpdateKerberosConfigsServerActionTest extends 
EasyMockSupport{
 action.setExecutionCommand(executionCommand);
 action.execute(null);
 
-assertTrue(configTypes.getValues().contains("cluster-env"));
-boolean containsSecurityEnabled = false;
-for(Map properties: configUpdates.getValues()) {
-  if(properties.containsKey("security_enabled")) {
-containsSecurityEnabled = true;
-break;
-  }
-}
-assertTrue(containsSecurityEnabled);
+assertEquals(configTypes.getValue(), "cluster-env");
+assertEquals(configUpdates.getValue().get("security_enabled"), "false");
 verifyAll();
   }
 

[30/30] ambari git commit: Merge branch 'trunk' into branch-dev-patch-upgrade

[ncole]

Merge branch 'trunk' into branch-dev-patch-upgrade


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

Branch: refs/heads/branch-dev-patch-upgrade
Commit: 393ab3ee28a27c63084ee4700bf0386b6ceb4a9b
Parents: 535327d d6d2479
Author: Nate Cole 
Authored: Mon Jan 30 10:40:13 2017 -0500
Committer: Nate Cole 
Committed: Mon Jan 30 10:40:13 2017 -0500

--
 .../src/main/python/ambari_agent/ActionQueue.py |  28 ++--
 .../libraries/functions/solr_cloud_util.py  |   6 +-
 .../ambari-logsearch-portal/pom.xml |   5 +
 .../org/apache/ambari/logsearch/LogSearch.java  |  98 +---
 .../apache/ambari/logsearch/util/FileUtil.java  |  26 
 .../apache/ambari/logsearch/util/SSLUtil.java   | 141 ++
 .../logsearch/solr/AmbariSolrCloudCLI.java  |  13 +-
 .../logsearch/solr/AmbariSolrCloudClient.java   |   6 +
 .../solr/AmbariSolrCloudClientBuilder.java  |   6 +
 .../EnableKerberosPluginSolrZkCommand.java  |  25 +++-
 .../AmbariCustomCommandExecutionHelper.java |  16 ++
 .../server/hooks/users/UserHookParams.java  |   3 +-
 .../server/hooks/users/UserHookService.java |  23 ++-
 .../orm/entities/ServiceConfigEntity.java   |   2 +-
 .../AmbariAuthToLocalUserDetailsService.java|  17 ++-
 .../users/CsvFilePersisterService.java  |   6 +-
 .../users/PostUserCreationHookServerAction.java |   8 +-
 ambari-server/src/main/python/bootstrap.py  |   3 +-
 .../configuration/infra-solr-security-json.xml  |  36 +
 .../AMBARI_INFRA/0.1.0/metainfo.xml |   1 +
 .../0.1.0/package/scripts/params.py |   2 +
 .../0.1.0/package/scripts/setup_infra_solr.py   |  12 +-
 .../properties/infra-solr-security.json.j2  |  22 +++
 .../2.1.0.2.0/package/scripts/hdfs_namenode.py  |   4 +
 .../HDFS/2.1.0.2.0/package/scripts/utils.py |  14 +-
 .../2.1.0.2.0/package/scripts/zkfc_slave.py |   5 -
 .../3.0.0.3.0/package/scripts/hdfs_namenode.py  |   4 +
 .../HDFS/3.0.0.3.0/package/scripts/utils.py |  42 +++---
 .../3.0.0.3.0/package/scripts/zkfc_slave.py |   7 -
 .../package/scripts/hive_interactive.py |   4 +-
 .../package/scripts/hive_server_interactive.py  |   6 +-
 .../0.12.0.2.0/package/scripts/params_linux.py  |  12 +-
 .../scripts/post-user-creation-hook.sh  |   9 +-
 .../2.0.6/hooks/before-ANY/scripts/params.py|  16 +-
 .../stacks/HDP/2.0.6/services/stack_advisor.py  |  12 ++
 .../stacks/HDP/2.3/upgrades/config-upgrade.xml  |  20 +++
 .../HDP/2.3/upgrades/nonrolling-upgrade-2.4.xml |  12 ++
 .../HDP/2.3/upgrades/nonrolling-upgrade-2.5.xml |  12 ++
 .../HDP/2.3/upgrades/nonrolling-upgrade-2.6.xml |  12 ++
 .../stacks/HDP/2.3/upgrades/upgrade-2.4.xml |  11 ++
 .../stacks/HDP/2.3/upgrades/upgrade-2.5.xml |  11 ++
 .../stacks/HDP/2.3/upgrades/upgrade-2.6.xml |  11 ++
 .../stacks/HDP/2.4/upgrades/config-upgrade.xml  |  20 +++
 .../HDP/2.4/upgrades/nonrolling-upgrade-2.5.xml |  14 ++
 .../HDP/2.4/upgrades/nonrolling-upgrade-2.6.xml |  12 ++
 .../stacks/HDP/2.4/upgrades/upgrade-2.5.xml |  11 ++
 .../stacks/HDP/2.4/upgrades/upgrade-2.6.xml |  11 ++
 .../services/HIVE/configuration/hive-log4j2.xml |  25 +++-
 .../HIVE/configuration/llap-cli-log4j2.xml  |  25 +++-
 .../stacks/HDP/2.5/services/stack_advisor.py|  12 ++
 .../stacks/HDP/2.5/upgrades/config-upgrade.xml  |  28 
 .../HDP/2.5/upgrades/nonrolling-upgrade-2.6.xml |  14 +-
 .../stacks/HDP/2.5/upgrades/upgrade-2.6.xml |   6 +
 .../stacks/HDP/2.6/services/SPARK2/metainfo.xml |   5 +-
 .../HDP/3.0/hooks/before-ANY/scripts/params.py  |  19 ++-
 .../FAKEHDFS/package/scripts/zkfc_slave.py  |   5 +
 .../PERF/1.0/services/FAKEYARN/metainfo.xml |   4 +-
 .../src/main/resources/stacks/stack_advisor.py  |  38 -
 .../server/hooks/users/UserHookServiceTest.java |   9 ++
 .../server/orm/dao/ServiceConfigDAOTest.java|  66 +++--
 .../UpdateKerberosConfigsServerActionTest.java  |  14 +-
 .../PostUserCreationHookServerActionTest.java   |   3 +-
 .../stacks/2.0.6/common/test_stack_advisor.py   | 148 +++
 .../stacks/2.4/AMBARI_INFRA/test_infra_solr.py  |   7 +
 .../test/python/stacks/2.4/configs/default.json |   3 +
 .../stacks/2.5/HIVE/test_hive_server_int.py |   8 +-
 .../2.5/common/services-normal-his-2-hosts.json |   8 +-
 .../2.5/common/services-normal-his-valid.json   |   8 +-
 .../stacks/2.5/common/test_stack_advisor.py |  18 ++-
 ambari-web/app/styles/modal_popups.less |  42 +-
 .../views/common/modal_popups/log_tail_popup.js |   2 +-
 .../admin/stack_upgrade/upgrade_history_view.js |   2 +-
 .../src/main/resources/ui/app/models/queue.js   |   3 +
 

[20/30] ambari git commit: AMBARI-19752. Hive View 2.0 execute button needs some feedback (pallavkul)

[ncole]

AMBARI-19752. Hive View 2.0 execute button needs some feedback (pallavkul)


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

Branch: refs/heads/branch-dev-patch-upgrade
Commit: abcd0637c6f3328d0a6345e0573c30615cdcde83
Parents: 985daff
Author: pallavkul 
Authored: Mon Jan 30 14:27:44 2017 +0530
Committer: pallavkul 
Committed: Mon Jan 30 14:29:15 2017 +0530

--
 contrib/views/hive20/src/main/resources/ui/app/services/jobs.js  | 4 
 contrib/views/hive20/src/main/resources/ui/app/styles/app.scss   | 4 
 .../hive20/src/main/resources/ui/app/templates/queries/query.hbs | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/abcd0637/contrib/views/hive20/src/main/resources/ui/app/services/jobs.js
--
diff --git a/contrib/views/hive20/src/main/resources/ui/app/services/jobs.js 
b/contrib/views/hive20/src/main/resources/ui/app/services/jobs.js
index ff54152..5db22d0 100644
--- a/contrib/views/hive20/src/main/resources/ui/app/services/jobs.js
+++ b/contrib/views/hive20/src/main/resources/ui/app/services/jobs.js
@@ -27,16 +27,12 @@ export default Ember.Service.extend({
   },
 
   waitForJobToComplete(jobId, after, fetchDummyResult = true) {
-console.log()
 return new Ember.RSVP.Promise((resolve, reject) => {
   Ember.run.later(() => {
 this.get('store').findRecord('job', jobId, { reload: true })
   .then((job) => {
 let status = job.get('status').toLowerCase();
 if (status === 'succeeded') {
-  if (fetchDummyResult) {
-this._fetchDummyResult(jobId);
-  }
   resolve(status);
 } else if (status === 'error') {
   reject(status)

http://git-wip-us.apache.org/repos/asf/ambari/blob/abcd0637/contrib/views/hive20/src/main/resources/ui/app/styles/app.scss
--
diff --git a/contrib/views/hive20/src/main/resources/ui/app/styles/app.scss 
b/contrib/views/hive20/src/main/resources/ui/app/styles/app.scss
index e178222..17abb65 100644
--- a/contrib/views/hive20/src/main/resources/ui/app/styles/app.scss
+++ b/contrib/views/hive20/src/main/resources/ui/app/styles/app.scss
@@ -41,6 +41,10 @@
   height: 100%;
 }
 
+.fa-1-5{
+  font-size: 1.5em;
+}
+
 .fa-2 {
   font-size: 2em;
 }

http://git-wip-us.apache.org/repos/asf/ambari/blob/abcd0637/contrib/views/hive20/src/main/resources/ui/app/templates/queries/query.hbs
--
diff --git 
a/contrib/views/hive20/src/main/resources/ui/app/templates/queries/query.hbs 
b/contrib/views/hive20/src/main/resources/ui/app/templates/queries/query.hbs
index 9e9e542..7f91d6c 100644
--- a/contrib/views/hive20/src/main/resources/ui/app/templates/queries/query.hbs
+++ b/contrib/views/hive20/src/main/resources/ui/app/templates/queries/query.hbs
@@ -31,7 +31,7 @@
 {{fa-icon 
"check"}} Execute
 {{fa-icon "save"}} Save As
 {{#if isQueryRunning}}
-  http://www.bba-reman.com/images/fbloader.gif; height="22" 
width="32" />
+  {{fa-icon "spinner fa-1-5" spin=true}}
 {{/if}}
   
 

[28/30] ambari git commit: AMBARI-19775. ActionQueue thread may exit due to IOError in statusCommandResultQueue.empty(). (Attila Doroszlai via stoader)

[ncole]

AMBARI-19775. ActionQueue thread may exit due to IOError in 
statusCommandResultQueue.empty(). (Attila Doroszlai via stoader)


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

Branch: refs/heads/branch-dev-patch-upgrade
Commit: b722ffa6f612685096c0c528264fdf1ae86b5d64
Parents: af6ba59
Author: Attila Doroszlai 
Authored: Mon Jan 30 14:58:47 2017 +0100
Committer: Toader, Sebastian 
Committed: Mon Jan 30 14:58:47 2017 +0100

--
 .../src/main/python/ambari_agent/ActionQueue.py | 28 +++-
 1 file changed, 16 insertions(+), 12 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/b722ffa6/ambari-agent/src/main/python/ambari_agent/ActionQueue.py
--
diff --git a/ambari-agent/src/main/python/ambari_agent/ActionQueue.py 
b/ambari-agent/src/main/python/ambari_agent/ActionQueue.py
index 18d7c2a..8514a88 100644
--- a/ambari-agent/src/main/python/ambari_agent/ActionQueue.py
+++ b/ambari-agent/src/main/python/ambari_agent/ActionQueue.py
@@ -212,18 +212,22 @@ class ActionQueue(threading.Thread):
 pass
 
   def processStatusCommandResultQueueSafeEmpty(self):
-while not self.statusCommandResultQueue.empty():
-  try:
-result = self.statusCommandResultQueue.get(False)
-self.process_status_command_result(result)
-  except Queue.Empty:
-pass
-  except IOError:
-# on race condition in multiprocessing.Queue if get/put and thread 
kill are executed at the same time.
-# During queue.close IOError will be thrown (this prevents from 
permanently dead-locked get).
-pass
-  except UnicodeDecodeError:
-pass
+try:
+  while not self.statusCommandResultQueue.empty():
+try:
+  result = self.statusCommandResultQueue.get(False)
+  self.process_status_command_result(result)
+except Queue.Empty:
+  pass
+except IOError:
+  # on race condition in multiprocessing.Queue if get/put and thread 
kill are executed at the same time.
+  # During queue.close IOError will be thrown (this prevents from 
permanently dead-locked get).
+  pass
+except UnicodeDecodeError:
+  pass
+except IOError:
+  # queue.empty() may also throw IOError
+  pass
 
   def createCommandHandle(self, command):
 if command.has_key('__handle'):

[19/30] ambari git commit: AMBARI-19770. Hive View 2.0: New Job and New Table button does nothing. (dipayanb)

[ncole]

AMBARI-19770. Hive View 2.0: New Job and New Table button does nothing. 
(dipayanb)


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

Branch: refs/heads/branch-dev-patch-upgrade
Commit: 985dafff5330b97e4b92f1c4cf67ee201a8e6edd
Parents: ea1fbaa
Author: Dipayan Bhowmick 
Authored: Mon Jan 30 14:26:07 2017 +0530
Committer: Dipayan Bhowmick 
Committed: Mon Jan 30 14:28:04 2017 +0530

--
 .../hive20/src/main/resources/ui/app/app.js |  9 
 .../resources/ui/app/controllers/queries.js | 22 +
 .../main/resources/ui/app/models/worksheet.js   |  2 +-
 .../hive20/src/main/resources/ui/app/router.js  |  2 +
 .../main/resources/ui/app/routes/application.js |  4 +-
 .../ui/app/routes/databases/newtable.js | 30 
 .../src/main/resources/ui/app/routes/queries.js | 49 +---
 .../resources/ui/app/routes/queries/index.js|  9 ++--
 .../main/resources/ui/app/routes/queries/new.js | 38 +++
 .../resources/ui/app/routes/queries/query.js| 17 ---
 .../src/main/resources/ui/app/services/jobs.js  |  6 ++-
 .../components/top-application-bar.hbs  |  4 +-
 .../src/main/resources/ui/config/environment.js |  2 +
 13 files changed, 130 insertions(+), 64 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/985dafff/contrib/views/hive20/src/main/resources/ui/app/app.js
--
diff --git a/contrib/views/hive20/src/main/resources/ui/app/app.js 
b/contrib/views/hive20/src/main/resources/ui/app/app.js
index af4fdc4..0f83ee5 100644
--- a/contrib/views/hive20/src/main/resources/ui/app/app.js
+++ b/contrib/views/hive20/src/main/resources/ui/app/app.js
@@ -26,6 +26,15 @@ let App;
 Ember.MODEL_FACTORY_INJECTIONS = true;
 
 App = Ember.Application.extend({
+  // Basic logging, e.g. "Transitioned into 'post'"
+  LOG_TRANSITIONS: false,
+
+  // Extremely detailed logging, highlighting every internal
+  // step made while transitioning into a route, including
+  // `beforeModel`, `model`, and `afterModel` hooks, and
+  // information about redirects and aborted transitions
+  LOG_TRANSITIONS_INTERNAL: false,
+
   modulePrefix: config.modulePrefix,
   podModulePrefix: config.podModulePrefix,
   Resolver

http://git-wip-us.apache.org/repos/asf/ambari/blob/985dafff/contrib/views/hive20/src/main/resources/ui/app/controllers/queries.js
--
diff --git 
a/contrib/views/hive20/src/main/resources/ui/app/controllers/queries.js 
b/contrib/views/hive20/src/main/resources/ui/app/controllers/queries.js
new file mode 100644
index 000..dc99fd1
--- /dev/null
+++ b/contrib/views/hive20/src/main/resources/ui/app/controllers/queries.js
@@ -0,0 +1,22 @@
+/**
+ * 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.
+ */
+
+import Ember from 'ember';
+
+export default Ember.Controller.extend({
+});

http://git-wip-us.apache.org/repos/asf/ambari/blob/985dafff/contrib/views/hive20/src/main/resources/ui/app/models/worksheet.js
--
diff --git a/contrib/views/hive20/src/main/resources/ui/app/models/worksheet.js 
b/contrib/views/hive20/src/main/resources/ui/app/models/worksheet.js
index 23f16b0..9021e90 100644
--- a/contrib/views/hive20/src/main/resources/ui/app/models/worksheet.js
+++ b/contrib/views/hive20/src/main/resources/ui/app/models/worksheet.js
@@ -20,7 +20,7 @@ import DS from 'ember-data';
 
 export default DS.Model.extend({
   title: DS.attr('string'),
-  query: DS.attr('string'),
+  query: DS.attr('string', {defaultValue: ''}),
   selectedDb: DS.attr('string'),
   owner: DS.attr('string'),
   queryResult: DS.attr({defaultValue: {'schema' :[], 'rows' :[]}}),

[16/30] ambari git commit: AMBARI-19764. yarn.min.container.size is read incorrectly on first load of the Hive config page (smohanty)

[ncole]

AMBARI-19764. yarn.min.container.size is read incorrectly on first load of the 
Hive config page (smohanty)


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

Branch: refs/heads/branch-dev-patch-upgrade
Commit: 1eb4ca50b5043ebd8326db90851520f3ea359731
Parents: 716b2fc
Author: Sumit Mohanty 
Authored: Sun Jan 29 08:45:39 2017 -0800
Committer: Sumit Mohanty 
Committed: Sun Jan 29 08:45:39 2017 -0800

--
 .../stacks/HDP/2.0.6/services/stack_advisor.py  |  12 ++
 .../src/main/resources/stacks/stack_advisor.py  |  38 -
 .../stacks/2.0.6/common/test_stack_advisor.py   | 148 +++
 3 files changed, 191 insertions(+), 7 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/1eb4ca50/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/stack_advisor.py
--
diff --git 
a/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/stack_advisor.py 
b/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/stack_advisor.py
index af4539d..5c68f15 100644
--- 
a/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/stack_advisor.py
+++ 
b/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/stack_advisor.py
@@ -1457,6 +1457,18 @@ def getUserOperationContext(services, contextName):
 return userContext[contextName]
   return None
 
+# if serviceName is being added
+def isServiceBeingAdded(services, serviceName):
+  if services:
+if 'user-context' in services.keys():
+  userContext = services["user-context"]
+  if DefaultStackAdvisor.OPERATION in userContext and \
+  'AddService' == userContext[DefaultStackAdvisor.OPERATION] and \
+  DefaultStackAdvisor.OPERATION_DETAILS in userContext:
+if -1 != userContext["operation_details"].find(serviceName):
+  return True
+  return False
+
 # Validation helper methods
 def getSiteProperties(configurations, siteName):
   siteConfig = configurations.get(siteName)

http://git-wip-us.apache.org/repos/asf/ambari/blob/1eb4ca50/ambari-server/src/main/resources/stacks/stack_advisor.py
--
diff --git a/ambari-server/src/main/resources/stacks/stack_advisor.py 
b/ambari-server/src/main/resources/stacks/stack_advisor.py
index 9eb3973..d4b9ab7 100644
--- a/ambari-server/src/main/resources/stacks/stack_advisor.py
+++ b/ambari-server/src/main/resources/stacks/stack_advisor.py
@@ -1024,15 +1024,25 @@ class DefaultStackAdvisor(StackAdvisor):
 callContext = self.getCallContext(services)
 
 operation = self.getUserOperationContext(services, 
DefaultStackAdvisor.OPERATION)
+adding_yarn = self.isServiceBeingAdded(services, 'YARN')
 if operation:
   Logger.info("user operation context : " + str(operation))
 
 if services:  # its never None but some unit tests pass it as None
   # If min container value is changed (user is changing it)
-  # if its a validation call - just used what ever value is set
-  # If its not a cluster create or add yarn service (TBD)
-  if (self.getOldValue(services, "yarn-site", 
"yarn.scheduler.minimum-allocation-mb") or \
-'recommendConfigurations' != callContext) and operation != 
DefaultStackAdvisor.CLUSTER_CREATE_OPERATION:
+  # if its a validation call - just use what ever value is set
+  # If its a recommend attribute call (when UI lands on a page)
+  # If add service but YARN is not being added
+  if self.getOldValue(services, "yarn-site", 
"yarn.scheduler.minimum-allocation-mb") or \
+  'recommendConfigurations' != callContext or \
+  operation == DefaultStackAdvisor.RECOMMEND_ATTRIBUTE_OPERATION 
or \
+  (operation == DefaultStackAdvisor.ADD_SERVICE_OPERATION and not 
adding_yarn):
+
+Logger.info("Full context: callContext = " + str(callContext) +
+" and operation = " + str(operation) + " and adding YARN = 
" + str(adding_yarn) +
+" and old value exists = " +
+str(self.getOldValue(services, "yarn-site", 
"yarn.scheduler.minimum-allocation-mb")))
+
 '''yarn.scheduler.minimum-allocation-mb has changed - then pick this 
value up'''
 if "yarn-site" in services["configurations"] and \
 "yarn.scheduler.minimum-allocation-mb" in 
services["configurations"]["yarn-site"]["properties"] and \
@@ -1087,11 +1097,25 @@ class DefaultStackAdvisor(StackAdvisor):
 
   def getCallContext(self, services):
 if services:
-  if 'context' in services:

[15/30] ambari git commit: AMBARI-19767. Inconsistent auth-to-local rules processing during Kerberos authentication (rlevas)

[ncole]

AMBARI-19767. Inconsistent auth-to-local rules processing during Kerberos 
authentication (rlevas)


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

Branch: refs/heads/branch-dev-patch-upgrade
Commit: 716b2fca38a9db43b3211b9380f18149a3342256
Parents: e0765d9
Author: Robert Levas 
Authored: Sun Jan 29 11:14:59 2017 -0500
Committer: Robert Levas 
Committed: Sun Jan 29 11:15:24 2017 -0500

--
 .../AmbariAuthToLocalUserDetailsService.java   | 17 -
 1 file changed, 12 insertions(+), 5 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/716b2fca/ambari-server/src/main/java/org/apache/ambari/server/security/authentication/kerberos/AmbariAuthToLocalUserDetailsService.java
--
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/security/authentication/kerberos/AmbariAuthToLocalUserDetailsService.java
 
b/ambari-server/src/main/java/org/apache/ambari/server/security/authentication/kerberos/AmbariAuthToLocalUserDetailsService.java
index c85503c..1e4f6ea 100644
--- 
a/ambari-server/src/main/java/org/apache/ambari/server/security/authentication/kerberos/AmbariAuthToLocalUserDetailsService.java
+++ 
b/ambari-server/src/main/java/org/apache/ambari/server/security/authentication/kerberos/AmbariAuthToLocalUserDetailsService.java
@@ -49,6 +49,8 @@ public class AmbariAuthToLocalUserDetailsService implements 
UserDetailsService {
 
   private final List userTypeOrder;
 
+  private final String authToLocalRules;
+
   /**
* Constructor.
* 
@@ -80,18 +82,23 @@ public class AmbariAuthToLocalUserDetailsService implements 
UserDetailsService {
   orderedUserTypes = Collections.singletonList(UserType.LDAP);
 }
 
-KerberosName.setRules(authToLocalRules);
-
 this.users = users;
 this.userTypeOrder = orderedUserTypes;
+this.authToLocalRules = authToLocalRules;
   }
 
   @Override
   public UserDetails loadUserByUsername(String principal) throws 
UsernameNotFoundException {
-KerberosName kerberosName = new KerberosName(principal);
-
 try {
-  String username = kerberosName.getShortName();
+  String username;
+
+  // Since KerberosName relies on a static variable to hold on to the 
auth-to-local rules, attempt
+  // to protect access to the rule set by blocking other threads from 
chaning the rules out from
+  // under us during this operation.  Similar logic is used in 
org.apache.ambari.server.view.ViewContextImpl.getUsername().
+  synchronized (KerberosName.class) {
+KerberosName.setRules(authToLocalRules);
+username = new KerberosName(principal).getShortName();
+  }
 
   if (username == null) {
 String message = String.format("Failed to translate %s to a local 
username during Kerberos authentication.", principal);

[17/30] ambari git commit: AMBARI-19756. Add common log rotation settings to hive log4j2 (Madhuvanthi Radhakrishnan via smohanty)

[ncole]

AMBARI-19756. Add common log rotation settings to hive log4j2 (Madhuvanthi 
Radhakrishnan via smohanty)


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

Branch: refs/heads/branch-dev-patch-upgrade
Commit: c977113ccb18218befbb86479353f60bda4eb1d7
Parents: 1eb4ca5
Author: Sumit Mohanty 
Authored: Sun Jan 29 22:48:19 2017 -0800
Committer: Sumit Mohanty 
Committed: Sun Jan 29 22:48:19 2017 -0800

--
 .../package/scripts/hive_interactive.py |  4 +--
 .../0.12.0.2.0/package/scripts/params_linux.py  |  8 ++
 .../stacks/HDP/2.3/upgrades/config-upgrade.xml  | 20 ++
 .../HDP/2.3/upgrades/nonrolling-upgrade-2.4.xml | 12 +
 .../HDP/2.3/upgrades/nonrolling-upgrade-2.5.xml | 12 +
 .../HDP/2.3/upgrades/nonrolling-upgrade-2.6.xml | 12 +
 .../stacks/HDP/2.3/upgrades/upgrade-2.4.xml | 11 
 .../stacks/HDP/2.3/upgrades/upgrade-2.5.xml | 11 
 .../stacks/HDP/2.3/upgrades/upgrade-2.6.xml | 11 
 .../stacks/HDP/2.4/upgrades/config-upgrade.xml  | 20 ++
 .../HDP/2.4/upgrades/nonrolling-upgrade-2.5.xml | 14 ++
 .../HDP/2.4/upgrades/nonrolling-upgrade-2.6.xml | 12 +
 .../stacks/HDP/2.4/upgrades/upgrade-2.5.xml | 11 
 .../stacks/HDP/2.4/upgrades/upgrade-2.6.xml | 11 
 .../services/HIVE/configuration/hive-log4j2.xml | 25 -
 .../HIVE/configuration/llap-cli-log4j2.xml  | 25 -
 .../stacks/HDP/2.5/upgrades/config-upgrade.xml  | 28 
 .../HDP/2.5/upgrades/nonrolling-upgrade-2.6.xml | 14 +-
 .../stacks/HDP/2.5/upgrades/upgrade-2.6.xml |  6 +
 .../stacks/2.5/HIVE/test_hive_server_int.py |  8 +++---
 20 files changed, 266 insertions(+), 9 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/c977113c/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/hive_interactive.py
--
diff --git 
a/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/hive_interactive.py
 
b/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/hive_interactive.py
index 335a850..760752f 100644
--- 
a/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/hive_interactive.py
+++ 
b/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/hive_interactive.py
@@ -234,14 +234,14 @@ def hive_interactive(name=None):
mode=mode_identified,
group=params.user_group,
owner=params.hive_user,
-   content=params.llap_cli_log4j2)
+   content=InlineTemplate(params.llap_cli_log4j2))
 
   hive_log4j2_filename = 'hive-log4j2.properties'
   File(format("{hive_server_interactive_conf_dir}/{hive_log4j2_filename}"),
  mode=mode_identified,
  group=params.user_group,
  owner=params.hive_user,
- content=params.hive_log4j2)
+ content=InlineTemplate(params.hive_log4j2))
 
   hive_exec_log4j2_filename = 'hive-exec-log4j2.properties'
   
File(format("{hive_server_interactive_conf_dir}/{hive_exec_log4j2_filename}"),

http://git-wip-us.apache.org/repos/asf/ambari/blob/c977113c/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/params_linux.py
--
diff --git 
a/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/params_linux.py
 
b/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/params_linux.py
index 4907f93..adac228 100644
--- 
a/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/params_linux.py
+++ 
b/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/params_linux.py
@@ -603,6 +603,14 @@ has_hive_interactive = len(hive_interactive_hosts) > 0
 hive_llap_log_maxfilesize = 
default('/configurations/llap-daemon-log4j/hive_llap_log_maxfilesize', 256)
 hive_llap_log_maxbackupindex = 
default('/configurations/llap-daemon-log4j/hive_llap_log_maxbackupindex', 240)
 
+#hive log4j2 properties
+hive2_log_maxfilesize = 
default('/configurations/hive-log4j2/hive2_log_maxfilesize', 256)
+hive2_log_maxbackupindex = 
default('/configurations/hive-log4j2/hive2_log_maxbackupindex', 30)
+
+#llap cli log4j2 properties
+llap_cli_log_maxfilesize = 
default('/configurations/llap-cli-log4j2/llap_cli_log_maxfilesize', 256)
+llap_cli_log_maxbackupindex = 

[24/30] ambari git commit: AMBARI-19753. Hive2 View - Switching tabs after executing query loses state (pallavkul)

[ncole]

AMBARI-19753. Hive2 View - Switching tabs after executing query loses state 
(pallavkul)


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

Branch: refs/heads/branch-dev-patch-upgrade
Commit: 589f567e37800ff606f5c40eca99508ce8910899
Parents: 75c126e
Author: pallavkul 
Authored: Mon Jan 30 15:24:03 2017 +0530
Committer: pallavkul 
Committed: Mon Jan 30 15:24:03 2017 +0530

--
 .../src/main/resources/ui/app/models/worksheet.js   |  3 ++-
 .../src/main/resources/ui/app/routes/queries/query.js   | 12 ++--
 .../main/resources/ui/app/templates/queries/query.hbs   |  2 +-
 3 files changed, 9 insertions(+), 8 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/589f567e/contrib/views/hive20/src/main/resources/ui/app/models/worksheet.js
--
diff --git a/contrib/views/hive20/src/main/resources/ui/app/models/worksheet.js 
b/contrib/views/hive20/src/main/resources/ui/app/models/worksheet.js
index 9021e90..6a77633 100644
--- a/contrib/views/hive20/src/main/resources/ui/app/models/worksheet.js
+++ b/contrib/views/hive20/src/main/resources/ui/app/models/worksheet.js
@@ -35,6 +35,7 @@ export default DS.Model.extend({
   selectedMultiDb: DS.attr(),
   queryFile: DS.attr('string', {defaultValue: ""}),
   logFile: DS.attr('string', {defaultValue: ""}),
-  logResults: DS.attr('string', {defaultValue: ""})
+  logResults: DS.attr('string', {defaultValue: ""}),
+  isQueryRunning: DS.attr('boolean', {defaultValue: false})
 
 });

http://git-wip-us.apache.org/repos/asf/ambari/blob/589f567e/contrib/views/hive20/src/main/resources/ui/app/routes/queries/query.js
--
diff --git 
a/contrib/views/hive20/src/main/resources/ui/app/routes/queries/query.js 
b/contrib/views/hive20/src/main/resources/ui/app/routes/queries/query.js
index 7d387f0..753b7f7 100644
--- a/contrib/views/hive20/src/main/resources/ui/app/routes/queries/query.js
+++ b/contrib/views/hive20/src/main/resources/ui/app/routes/queries/query.js
@@ -75,10 +75,10 @@ export default Ember.Route.extend({
 selectedMultiDb.pushObject(selecteDBName);
 
 controller.set('worksheet', model);
-
controller.set('selectedTablesModels',this.get('controller.model').get('selectedTablesModels')
 || selectedTablesModels );
+controller.set('selectedTablesModels',model.get('selectedTablesModels') || 
selectedTablesModels );
 
-controller.set('selectedMultiDb', 
this.get('controller.model').get('selectedMultiDb') || selectedMultiDb);
-controller.set('isQueryRunning', false);
+controller.set('selectedMultiDb', model.get('selectedMultiDb') || 
selectedMultiDb);
+controller.set('isQueryRunning', model.get('isQueryRunning'));
 controller.set('currentQuery', model.get('query'));
 controller.set('queryResult', model.get('queryResult'));
 controller.set('currentJobId', null);
@@ -143,7 +143,7 @@ export default Ember.Route.extend({
   let worksheetTitle = this.get('controller.model').get('title');
 
   self.get('controller.model').set('jobData', []);
-  self.get('controller').set('isQueryRunning', true);
+  self.get('controller.model').set('isQueryRunning', true);
 
   //Making the result set emply every time query runs.
   self.get('controller').set('queryResult', 
self.get('controller').get('queryResult'));
@@ -247,7 +247,7 @@ export default Ember.Route.extend({
 
 self.get('controller').set('queryResult', data);
 self.get('controller.model').set('queryResult', data);
-self.get('controller').set('isQueryRunning', false);
+self.get('controller.model').set('isQueryRunning', false);
 
 let localArr = self.get('controller.model').get("jobData");
 localArr.push(data);
@@ -299,7 +299,7 @@ export default Ember.Route.extend({
   console.log('getJob route', data );
   self.get('controller').set('queryResult', data);
   self.get('controller.model').set('queryResult', data);
-  self.get('controller').set('isQueryRunning', false);
+  self.get('controller.model').set('isQueryRunning', false);
   self.get('controller.model').set('hidePreviousButton', false);
 
   let localArr = self.get('controller.model').get("jobData");

http://git-wip-us.apache.org/repos/asf/ambari/blob/589f567e/contrib/views/hive20/src/main/resources/ui/app/templates/queries/query.hbs
--
diff --git 

[06/30] ambari git commit: AMBARI-19754. Remove white border from the content area in popup wizards.(xiwang)

[ncole]

AMBARI-19754. Remove white border from the content area in popup 
wizards.(xiwang)


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

Branch: refs/heads/branch-dev-patch-upgrade
Commit: b3391f0dd030130add23b9ffb09fb7a776dfe969
Parents: 9d8a54c
Author: Xi Wang 
Authored: Fri Jan 27 11:16:49 2017 -0800
Committer: Xi Wang 
Committed: Fri Jan 27 14:22:02 2017 -0800

--
 ambari-web/app/styles/modal_popups.less | 42 +++-
 .../views/common/modal_popups/log_tail_popup.js |  2 +-
 .../admin/stack_upgrade/upgrade_history_view.js |  2 +-
 3 files changed, 42 insertions(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/b3391f0d/ambari-web/app/styles/modal_popups.less
--
diff --git a/ambari-web/app/styles/modal_popups.less 
b/ambari-web/app/styles/modal_popups.less
index c10ef30..a6a0196 100644
--- a/ambari-web/app/styles/modal_popups.less
+++ b/ambari-web/app/styles/modal_popups.less
@@ -81,10 +81,14 @@
   margin: 0;
 }
 
-/*90% width modal window start*/
+/*90% width wizard modal window start*/
 .wizard-modal-wrapper {
   .modal {
 .modal-body {
+  padding: 0;
+  .wizard {
+border: none;
+  }
   div.error {
 color: #b94a48;
 .help-block {
@@ -114,8 +118,42 @@
   }
 
 }
+/*90% width wizard modal window end*/
+
+/*90% width modal (non-wizard) window start*/
+
+.wide-modal-wrapper {
+  .modal {
+.modal-body {
+  div.error {
+color: #b94a48;
+.help-block {
+  color: #b94a48;
+}
+  }
+
+  div.error input{
+border-color: #b94a48;
+-webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
+-moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
+box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
+  }
+}
+  }
+
+  .content {
+padding: 0;
+  }
 
-/*90% width modal window end*/
+  //fix stripped in inner table
+  .table-striped tbody tr:nth-child(odd)
+  td .table-striped tbody
+  tr:nth-child(odd) td,
+  tr:nth-child(even) th {
+background-color: transparent;
+  }
+}
+/*90% width modal window (non-wizard) end*/
 
 /*700px width modal window start*/
 .modal-690px-width {

http://git-wip-us.apache.org/repos/asf/ambari/blob/b3391f0d/ambari-web/app/views/common/modal_popups/log_tail_popup.js
--
diff --git a/ambari-web/app/views/common/modal_popups/log_tail_popup.js 
b/ambari-web/app/views/common/modal_popups/log_tail_popup.js
index 1e6924f..6510ac9 100644
--- a/ambari-web/app/views/common/modal_popups/log_tail_popup.js
+++ b/ambari-web/app/views/common/modal_popups/log_tail_popup.js
@@ -22,7 +22,7 @@ var fileUtils = require('utils/file_utils');
 
 App.showLogTailPopup = function(content) {
   return App.ModalPopup.show({
-classNames: ['log-tail-popup', 'wizard-modal-wrapper', 
'full-height-modal'],
+classNames: ['log-tail-popup', 'wide-modal-wrapper', 'full-height-modal'],
 modalDialogClasses: ['modal-xlg'],
 header: fileUtils.fileNameFromPath(content.get('filePath')),
 primary: false,

http://git-wip-us.apache.org/repos/asf/ambari/blob/b3391f0d/ambari-web/app/views/main/admin/stack_upgrade/upgrade_history_view.js
--
diff --git 
a/ambari-web/app/views/main/admin/stack_upgrade/upgrade_history_view.js 
b/ambari-web/app/views/main/admin/stack_upgrade/upgrade_history_view.js
index c4a428e..aeee96e 100644
--- a/ambari-web/app/views/main/admin/stack_upgrade/upgrade_history_view.js
+++ b/ambari-web/app/views/main/admin/stack_upgrade/upgrade_history_view.js
@@ -297,7 +297,7 @@ App.MainAdminStackUpgradeHistoryView = 
App.TableView.extend(App.TableServerViewM
 this.get('controller').set('currentUpgradeRecord', record);
 
 App.ModalPopup.show({
-  classNames: ['wizard-modal-wrapper'],
+  classNames: ['wide-modal-wrapper'],
   modalDialogClasses: ['modal-xlg'],
   header: 
Em.I18n.t('admin.stackVersions.upgradeHistory.record.title').format(displayName,
 direction, toVersion),
   bodyClass: App.MainAdminStackUpgradeHistoryDetailsView,

[10/30] ambari git commit: AMBARI-19762. Kerberizing PERF cluster fails since cannot find principal name config in dummy.py. (Madhuvanthi Radhakrishnan via swagle)

[ncole]

AMBARI-19762. Kerberizing PERF cluster fails since cannot find principal name 
config in dummy.py. (Madhuvanthi Radhakrishnan via swagle)


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

Branch: refs/heads/branch-dev-patch-upgrade
Commit: 50403914c7a092f6e66726b3bf2331be13625f71
Parents: 0e8c966
Author: Siddharth Wagle 
Authored: Fri Jan 27 18:42:47 2017 -0800
Committer: Siddharth Wagle 
Committed: Fri Jan 27 18:42:47 2017 -0800

--
 .../PERF/1.0/services/FAKEHDFS/package/scripts/zkfc_slave.py| 5 +
 .../resources/stacks/PERF/1.0/services/FAKEYARN/metainfo.xml| 4 ++--
 2 files changed, 7 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/50403914/ambari-server/src/main/resources/stacks/PERF/1.0/services/FAKEHDFS/package/scripts/zkfc_slave.py
--
diff --git 
a/ambari-server/src/main/resources/stacks/PERF/1.0/services/FAKEHDFS/package/scripts/zkfc_slave.py
 
b/ambari-server/src/main/resources/stacks/PERF/1.0/services/FAKEHDFS/package/scripts/zkfc_slave.py
index 66e36ad..45f6348 100644
--- 
a/ambari-server/src/main/resources/stacks/PERF/1.0/services/FAKEHDFS/package/scripts/zkfc_slave.py
+++ 
b/ambari-server/src/main/resources/stacks/PERF/1.0/services/FAKEHDFS/package/scripts/zkfc_slave.py
@@ -33,6 +33,11 @@ class ZkfcSlave(Dummy):
   def __init__(self):
 super(ZkfcSlave, self).__init__()
 self.component_name = "FAKEZKFC"
+self.principal_conf_name = "hadoop-env"
+self.principal_name = "hdfs_principal_name"
+self.keytab_conf_name = "hadoop-env"
+self.keytab_name = "hdfs_user_keytab"
+
 
 if __name__ == "__main__":
   ZkfcSlave().execute()

http://git-wip-us.apache.org/repos/asf/ambari/blob/50403914/ambari-server/src/main/resources/stacks/PERF/1.0/services/FAKEYARN/metainfo.xml
--
diff --git 
a/ambari-server/src/main/resources/stacks/PERF/1.0/services/FAKEYARN/metainfo.xml
 
b/ambari-server/src/main/resources/stacks/PERF/1.0/services/FAKEYARN/metainfo.xml
index 0f926dd..e07f3a7 100644
--- 
a/ambari-server/src/main/resources/stacks/PERF/1.0/services/FAKEYARN/metainfo.xml
+++ 
b/ambari-server/src/main/resources/stacks/PERF/1.0/services/FAKEYARN/metainfo.xml
@@ -229,9 +229,9 @@
 
 
 
-  FAKEFAKEMAPREDUCE2
+  FAKEMAPREDUCE2
   2.7.1.2.5
-  FAKEFAKEMapReduce2
+  FAKEMapReduce2
   Apache Hadoop NextGen MapReduce (FAKEYARN)
   configuration-mapred
 

[11/30] ambari git commit: AMBARI-19680: On Capacity Scheduler view, click * button for Node label Access the 2nd time should de-select all node labels, but it doesn't. (sangeetar)

[ncole]

AMBARI-19680: On Capacity Scheduler view, click * button for Node label Access 
the 2nd time should de-select all node labels, but it doesn't. (sangeetar)


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

Branch: refs/heads/branch-dev-patch-upgrade
Commit: c2907860e4fea65d272a680509ce656ac6e1f4f0
Parents: 5040391
Author: Sangeeta Ravindran 
Authored: Sat Jan 28 00:23:56 2017 -0800
Committer: Sangeeta Ravindran 
Committed: Sat Jan 28 00:23:56 2017 -0800

--
 .../capacity-scheduler/src/main/resources/ui/app/models/queue.js  | 3 +++
 1 file changed, 3 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/c2907860/contrib/views/capacity-scheduler/src/main/resources/ui/app/models/queue.js
--
diff --git 
a/contrib/views/capacity-scheduler/src/main/resources/ui/app/models/queue.js 
b/contrib/views/capacity-scheduler/src/main/resources/ui/app/models/queue.js
index df0c684..9198aa5 100644
--- a/contrib/views/capacity-scheduler/src/main/resources/ui/app/models/queue.js
+++ b/contrib/views/capacity-scheduler/src/main/resources/ui/app/models/queue.js
@@ -106,6 +106,9 @@ App.Queue = DS.Model.extend({
   }.bind(this));
   this.notifyPropertyChange('labels');
   }
+  else {
+this.get('labels').clear();
+  }
 }
 
 return this.get('_accessAllLabels');

[13/30] ambari git commit: AMBARI-19723 Log Search portal not working if only solr needs SSL connection (mgergely)

[ncole]

AMBARI-19723 Log Search portal not working if only solr needs SSL connection 
(mgergely)

Change-Id: Iebb2ef076dd4f75af73757ab3f08f250c654df69


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

Branch: refs/heads/branch-dev-patch-upgrade
Commit: 015d404604da164aa939635b7835a9551321cc5e
Parents: 86fbb38
Author: Miklos Gergely 
Authored: Sun Jan 29 13:24:00 2017 +0100
Committer: Miklos Gergely 
Committed: Sun Jan 29 13:24:00 2017 +0100

--
 .../ambari-logsearch-portal/pom.xml |   5 +
 .../org/apache/ambari/logsearch/LogSearch.java  |  98 +
 .../apache/ambari/logsearch/util/FileUtil.java  |  26 
 .../apache/ambari/logsearch/util/SSLUtil.java   | 141 +++
 4 files changed, 148 insertions(+), 122 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/015d4046/ambari-logsearch/ambari-logsearch-portal/pom.xml
--
diff --git a/ambari-logsearch/ambari-logsearch-portal/pom.xml 
b/ambari-logsearch/ambari-logsearch-portal/pom.xml
index 61dcb37..32d4e2c 100755
--- a/ambari-logsearch/ambari-logsearch-portal/pom.xml
+++ b/ambari-logsearch/ambari-logsearch-portal/pom.xml
@@ -786,5 +786,10 @@
   bcprov-jdk15on
   1.55
 
+
+  org.bouncycastle
+  bcpkix-jdk15on
+  1.55
+
   
 

http://git-wip-us.apache.org/repos/asf/ambari/blob/015d4046/ambari-logsearch/ambari-logsearch-portal/src/main/java/org/apache/ambari/logsearch/LogSearch.java
--
diff --git 
a/ambari-logsearch/ambari-logsearch-portal/src/main/java/org/apache/ambari/logsearch/LogSearch.java
 
b/ambari-logsearch/ambari-logsearch-portal/src/main/java/org/apache/ambari/logsearch/LogSearch.java
index 88cc8bb..70053d2 100644
--- 
a/ambari-logsearch/ambari-logsearch-portal/src/main/java/org/apache/ambari/logsearch/LogSearch.java
+++ 
b/ambari-logsearch/ambari-logsearch-portal/src/main/java/org/apache/ambari/logsearch/LogSearch.java
@@ -18,17 +18,12 @@
  */
 package org.apache.ambari.logsearch;
 
-import java.io.File;
 import java.io.IOException;
 import java.net.MalformedURLException;
 import java.net.ServerSocket;
 import java.net.URI;
 import java.net.URISyntaxException;
 import java.net.URL;
-import java.security.KeyPair;
-import java.security.KeyStore;
-import java.security.Security;
-import java.security.cert.X509Certificate;
 import java.util.EnumSet;
 
 import org.apache.ambari.logsearch.common.ManageStartEndTime;
@@ -36,12 +31,7 @@ import org.apache.ambari.logsearch.common.PropertiesHelper;
 import org.apache.ambari.logsearch.conf.ApplicationConfig;
 import org.apache.ambari.logsearch.util.SSLUtil;
 import org.apache.ambari.logsearch.web.listener.LogSearchSessionListener;
-import org.apache.commons.io.FileUtils;
 import org.apache.commons.lang.StringUtils;
-import org.apache.tools.ant.Project;
-import org.apache.tools.ant.taskdefs.Chmod;
-import org.apache.tools.ant.types.FileSet;
-import org.bouncycastle.jce.provider.BouncyCastleProvider;
 import org.eclipse.jetty.server.Connector;
 import org.eclipse.jetty.server.HttpConfiguration;
 import org.eclipse.jetty.server.HttpConnectionFactory;
@@ -73,8 +63,6 @@ public class LogSearch {
   private static final Logger LOG = LoggerFactory.getLogger(LogSearch.class);
 
   private static final String LOGSEARCH_PROTOCOL_PROP = "logsearch.protocol";
-  private static final String LOGSEARCH_CERT_FOLDER_LOCATION = 
"logsearch.cert.folder.location";
-  private static final String LOGSEARCH_CERT_ALGORITHM = 
"logsearch.cert.algorithm";
   private static final String HTTPS_PROTOCOL = "https";
   private static final String HTTP_PROTOCOL = "http";
   private static final String HTTPS_PORT = "61889";
@@ -84,15 +72,6 @@ public class LogSearch {
   private static final String ROOT_CONTEXT = "/";
   private static final Integer SESSION_TIMEOUT = 60 * 30;
 
-  private static final String LOGSEARCH_CERT_FILENAME = "logsearch.crt";
-  private static final String LOGSEARCH_KEYSTORE_FILENAME = "logsearch.jks";
-  private static final String LOGSEARCH_KEYSTORE_PRIVATE_KEY = 
"logsearch.private.key";
-  private static final String LOGSEARCH_KEYSTORE_PUBLIC_KEY = 
"logsearch.public.key";
-  private static final String LOGSEARCH_CERT_DEFAULT_ALGORITHM = 
"sha256WithRSAEncryption";
-
-  public static final String LOGSEARCH_CERT_DEFAULT_FOLDER = 
"/etc/ambari-logsearch-portal/conf/keys";
-  public static final String LOGSEARCH_KEYSTORE_DEFAULT_PASSWORD = "bigdata";
-
   public static void main(String[] argv) {
 LogSearch logSearch 

[14/30] ambari git commit: AMBARI-19727. Extend security.json of Infra Solr as a configuration property in Ambari (oleewere)

[ncole]

AMBARI-19727. Extend security.json of Infra Solr as a configuration property in 
Ambari (oleewere)


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

Branch: refs/heads/branch-dev-patch-upgrade
Commit: e0765d9228aaa9ff3fba47249de67c85dd6eb945
Parents: 015d404
Author: oleewere 
Authored: Sun Jan 29 16:35:56 2017 +0100
Committer: oleewere 
Committed: Sun Jan 29 16:43:27 2017 +0100

--
 .../libraries/functions/solr_cloud_util.py  |  6 ++--
 .../logsearch/solr/AmbariSolrCloudCLI.java  | 13 ++-
 .../logsearch/solr/AmbariSolrCloudClient.java   |  6 
 .../solr/AmbariSolrCloudClientBuilder.java  |  6 
 .../EnableKerberosPluginSolrZkCommand.java  | 25 ++
 .../configuration/infra-solr-security-json.xml  | 36 
 .../AMBARI_INFRA/0.1.0/metainfo.xml |  1 +
 .../0.1.0/package/scripts/params.py |  2 ++
 .../0.1.0/package/scripts/setup_infra_solr.py   | 12 ++-
 .../properties/infra-solr-security.json.j2  | 22 
 .../stacks/2.4/AMBARI_INFRA/test_infra_solr.py  |  7 
 .../test/python/stacks/2.4/configs/default.json |  3 ++
 12 files changed, 128 insertions(+), 11 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/e0765d92/ambari-common/src/main/python/resource_management/libraries/functions/solr_cloud_util.py
--
diff --git 
a/ambari-common/src/main/python/resource_management/libraries/functions/solr_cloud_util.py
 
b/ambari-common/src/main/python/resource_management/libraries/functions/solr_cloud_util.py
index 3e076b8..4628211 100644
--- 
a/ambari-common/src/main/python/resource_management/libraries/functions/solr_cloud_util.py
+++ 
b/ambari-common/src/main/python/resource_management/libraries/functions/solr_cloud_util.py
@@ -143,14 +143,14 @@ def create_znode(zookeeper_quorum, solr_znode, 
java64_home, retry = 5 , interval
   create_znode_cmd = format('{solr_cli_prefix} --create-znode --retry {retry} 
--interval {interval}')
   Execute(create_znode_cmd)
 
-def setup_kerberos_plugin(zookeeper_quorum, solr_znode, java64_home, 
secure=False, jaas_file = None):
+def setup_kerberos_plugin(zookeeper_quorum, solr_znode, java64_home, 
secure=False, security_json_location = None, jaas_file = None):
   """
   Set Kerberos plugin on the Solr znode in security.json, if secure is False, 
then clear the security.json
   """
   solr_cli_prefix = __create_solr_cloud_cli_prefix(zookeeper_quorum, 
solr_znode, java64_home, True)
   setup_kerberos_plugin_cmd = format('{solr_cli_prefix} 
--setup-kerberos-plugin')
-  if secure and jaas_file is not None:
-setup_kerberos_plugin_cmd+=format(' --jaas-file {jaas_file} --secure')
+  if secure and jaas_file is not None and security_json_location is not None:
+setup_kerberos_plugin_cmd+=format(' --jaas-file {jaas_file} --secure 
--security-json-location {security_json_location}')
   Execute(setup_kerberos_plugin_cmd)
 
 def set_cluster_prop(zookeeper_quorum, solr_znode, prop_name, prop_value, 
java64_home, jaas_file = None):

http://git-wip-us.apache.org/repos/asf/ambari/blob/e0765d92/ambari-logsearch/ambari-logsearch-solr-client/src/main/java/org/apache/ambari/logsearch/solr/AmbariSolrCloudCLI.java
--
diff --git 
a/ambari-logsearch/ambari-logsearch-solr-client/src/main/java/org/apache/ambari/logsearch/solr/AmbariSolrCloudCLI.java
 
b/ambari-logsearch/ambari-logsearch-solr-client/src/main/java/org/apache/ambari/logsearch/solr/AmbariSolrCloudCLI.java
index 94e43e4..be73473 100644
--- 
a/ambari-logsearch/ambari-logsearch-solr-client/src/main/java/org/apache/ambari/logsearch/solr/AmbariSolrCloudCLI.java
+++ 
b/ambari-logsearch/ambari-logsearch-solr-client/src/main/java/org/apache/ambari/logsearch/solr/AmbariSolrCloudCLI.java
@@ -50,6 +50,7 @@ public class AmbariSolrCloudCLI {
   private static final String CHECK_ZNODE = "check-znode";
   private static final String SECURE_ZNODE_COMMAND = "secure-znode";
   private static final String SECURE_SOLR_ZNODE_COMMAND = "secure-solr-znode";
+  private static final String SECURITY_JSON_LOCATION = 
"security-json-location";
   private static final String CMD_LINE_SYNTAX =
 "\n./solrCloudCli.sh --create-collection -z 
host1:2181,host2:2181/ambari-solr -c collection -cs conf_set"
   + "\n./solrCloudCli.sh --upload-config -z 
host1:2181,host2:2181/ambari-solr -d /tmp/myconfig_dir -cs config_set"
@@ -61,7 +62,7 @@ public class AmbariSolrCloudCLI {
   + "\n./solrCloudCli.sh --cluster-prop -z 

[29/30] ambari git commit: AMBARI-19736. Format ZKFC commands failing while enabling NameNode HA (stoader)

[ncole]

AMBARI-19736. Format ZKFC commands failing while enabling NameNode HA (stoader)


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

Branch: refs/heads/branch-dev-patch-upgrade
Commit: d6d247983c5c66c11260a6d10e7b0e2746fa8146
Parents: b722ffa
Author: Toader, Sebastian 
Authored: Mon Jan 30 15:54:20 2017 +0100
Committer: Toader, Sebastian 
Committed: Mon Jan 30 15:54:20 2017 +0100

--
 .../2.1.0.2.0/package/scripts/hdfs_namenode.py  |  4 ++
 .../HDFS/2.1.0.2.0/package/scripts/utils.py | 14 ---
 .../2.1.0.2.0/package/scripts/zkfc_slave.py |  5 ---
 .../3.0.0.3.0/package/scripts/hdfs_namenode.py  |  4 ++
 .../HDFS/3.0.0.3.0/package/scripts/utils.py | 42 +++-
 .../3.0.0.3.0/package/scripts/zkfc_slave.py |  7 
 .../2.0.6/hooks/before-ANY/scripts/params.py| 16 ++--
 .../HDP/3.0/hooks/before-ANY/scripts/params.py  | 19 +++--
 8 files changed, 68 insertions(+), 43 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/d6d24798/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/package/scripts/hdfs_namenode.py
--
diff --git 
a/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/package/scripts/hdfs_namenode.py
 
b/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/package/scripts/hdfs_namenode.py
index a2edf38..0489792 100644
--- 
a/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/package/scripts/hdfs_namenode.py
+++ 
b/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/package/scripts/hdfs_namenode.py
@@ -34,6 +34,7 @@ from resource_management.libraries.functions import Direction
 from ambari_commons import OSCheck, OSConst
 from ambari_commons.os_family_impl import OsFamilyImpl, OsFamilyFuncImpl
 from utils import get_dfsadmin_base_command
+from utils import set_up_zkfc_security
 
 if OSCheck.is_windows_family():
   from resource_management.libraries.functions.windows_service_utils import 
check_windows_service_status
@@ -95,6 +96,9 @@ def namenode(action=None, hdfs_binary=None, do_format=True, 
upgrade_type=None,
 #we need this directory to be present before any action(HA manual steps for
 #additional namenode)
 create_name_dirs(params.dfs_name_dir)
+
+# set up failover /  secure zookeper ACLs, this feature is supported from 
HDP 2.6 ownwards
+set_up_zkfc_security(params)
   elif action == "start":
 Logger.info("Called service {0} with upgrade_type: {1}".format(action, 
str(upgrade_type)))
 setup_ranger_hdfs(upgrade_type=upgrade_type)

http://git-wip-us.apache.org/repos/asf/ambari/blob/d6d24798/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/package/scripts/utils.py
--
diff --git 
a/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/package/scripts/utils.py
 
b/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/package/scripts/utils.py
index 03aba7b..d8d0515 100644
--- 
a/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/package/scripts/utils.py
+++ 
b/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/package/scripts/utils.py
@@ -387,20 +387,24 @@ def get_dfsadmin_base_command(hdfs_binary, 
use_specific_namenode = False):
 def set_up_zkfc_security(params):
 """ Sets up security for accessing zookeper on secure clusters """
 
-# check if the namenode is HA (this may be redundant as the component is 
only installed if affirmative)
+if params.stack_supports_zk_security is False:
+  Logger.info("Skipping setting up secure ZNode ACL for HFDS as it's 
supported only for HDP 2.6 and above.")
+  return
+
+# check if the namenode is HA
 if params.dfs_ha_enabled is False:
-Logger.info("The namenode is not HA, zkfc security setup skipped.")
+Logger.info("Skipping setting up secure ZNode ACL for HFDS as it's 
supported only for NameNode HA mode.")
 return
 
 # check if the cluster is secure (skip otherwise)
 if params.security_enabled is False:
-Logger.info("The cluster is not secure, zkfc security setup skipped.")
+Logger.info("Skipping setting up secure ZNode ACL for HFDS as it's 
supported only for secure clusters.")
 return
 
 # process the JAAS template
 File(os.path.join(params.hadoop_conf_secure_dir, 'hdfs_jaas.conf'),
- owner='root',
- group='root',
+ owner=params.hdfs_user,
+ group=params.user_group,
  mode=0644,
  

[23/30] ambari git commit: AMBARI-19772. Job XML tag is not coming as part of FS action node (Madhan Mohan Reddy via gauravn7)

[ncole]

AMBARI-19772. Job XML tag is not coming as part of FS action node (Madhan Mohan 
Reddy via gauravn7)


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

Branch: refs/heads/branch-dev-patch-upgrade
Commit: 75c126e49231e3ed33e8cf7d6cd30747f7ef6db5
Parents: 9f5a8bf
Author: Gaurav Nagar 
Authored: Mon Jan 30 14:49:28 2017 +0530
Committer: Gaurav Nagar 
Committed: Mon Jan 30 14:49:28 2017 +0530

--
 .../wfmanager/src/main/resources/ui/app/domain/actionjob_hanlder.js | 1 +
 1 file changed, 1 insertion(+)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/75c126e4/contrib/views/wfmanager/src/main/resources/ui/app/domain/actionjob_hanlder.js
--
diff --git 
a/contrib/views/wfmanager/src/main/resources/ui/app/domain/actionjob_hanlder.js 
b/contrib/views/wfmanager/src/main/resources/ui/app/domain/actionjob_hanlder.js
index c9d9887..2a82c24 100644
--- 
a/contrib/views/wfmanager/src/main/resources/ui/app/domain/actionjob_hanlder.js
+++ 
b/contrib/views/wfmanager/src/main/resources/ui/app/domain/actionjob_hanlder.js
@@ -363,6 +363,7 @@ var FSActionJobHandler=ActionJobHandler.extend({
   init(){
 this.mapping=[
   {xml:"name-node",domain:"nameNode"},
+  {xml:"job-xml",domain:"jobXml",occurs:"many",domainProperty:"value"},
   {xml:"configuration", customHandler:this.configurationMapper},
   {xml:"delete"},
   {xml:"mkdir"},

[27/30] ambari git commit: AMBARI-19709:XML generated for bundle's is not as per oozie xsd (Padma Priya N via gauravn7)

[ncole]

AMBARI-19709:XML generated for bundle's is not as per oozie xsd (Padma Priya N 
via gauravn7)


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

Branch: refs/heads/branch-dev-patch-upgrade
Commit: af6ba590d20b75e6a276a9e0a81f416fefc8cfd9
Parents: da7202d
Author: Gaurav Nagar 
Authored: Mon Jan 30 17:42:14 2017 +0530
Committer: Gaurav Nagar 
Committed: Mon Jan 30 17:42:54 2017 +0530

--
 .../src/main/resources/ui/app/components/bundle-config.js  | 2 +-
 .../resources/ui/app/domain/bundle/bundle-xml-generator.js | 4 ++--
 .../main/resources/ui/app/domain/bundle/bundle-xml-importer.js | 6 ++
 3 files changed, 5 insertions(+), 7 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/af6ba590/contrib/views/wfmanager/src/main/resources/ui/app/components/bundle-config.js
--
diff --git 
a/contrib/views/wfmanager/src/main/resources/ui/app/components/bundle-config.js 
b/contrib/views/wfmanager/src/main/resources/ui/app/components/bundle-config.js
index 8b4c3d8..fe6dfd1 100644
--- 
a/contrib/views/wfmanager/src/main/resources/ui/app/components/bundle-config.js
+++ 
b/contrib/views/wfmanager/src/main/resources/ui/app/components/bundle-config.js
@@ -160,7 +160,7 @@ export default Ember.Component.extend(Ember.Evented, 
Validations, {
   throw new Error(e);
 }.bind(this));
   },
-  getBundleFromJSON(filePath){
+  getBundleFromJSON(draftBundle){
 this.set('bundle', JSON.parse(draftBundle));
   },
   getBundleFromHdfs(filePath){

http://git-wip-us.apache.org/repos/asf/ambari/blob/af6ba590/contrib/views/wfmanager/src/main/resources/ui/app/domain/bundle/bundle-xml-generator.js
--
diff --git 
a/contrib/views/wfmanager/src/main/resources/ui/app/domain/bundle/bundle-xml-generator.js
 
b/contrib/views/wfmanager/src/main/resources/ui/app/domain/bundle/bundle-xml-generator.js
index 7dc05a9..f2dcef9 100644
--- 
a/contrib/views/wfmanager/src/main/resources/ui/app/domain/bundle/bundle-xml-generator.js
+++ 
b/contrib/views/wfmanager/src/main/resources/ui/app/domain/bundle/bundle-xml-generator.js
@@ -25,8 +25,8 @@ var BundleGenerator= Ember.Object.extend({
 bundleApp._xmlns = 
"uri:oozie:bundle:"+this.bundle.schemaVersions.bundleVersion;
 bundleApp._name = this.bundle.name;
 if(!Ember.isEmpty(this.bundle.kickOffTime.value)){
-  bundleApp["control"] = {};
-  bundleApp["control"]["kick-off-time"] = this.bundle.kickOffTime.value;
+  bundleApp["controls"] = {};
+  bundleApp["controls"]["kick-off-time"] = this.bundle.kickOffTime.value;
 }
 this.generateCoordinatorsJson(bundleApp);
 var xmlAsStr = this.get("x2js").json2xml_str(xmlJson);

http://git-wip-us.apache.org/repos/asf/ambari/blob/af6ba590/contrib/views/wfmanager/src/main/resources/ui/app/domain/bundle/bundle-xml-importer.js
--
diff --git 
a/contrib/views/wfmanager/src/main/resources/ui/app/domain/bundle/bundle-xml-importer.js
 
b/contrib/views/wfmanager/src/main/resources/ui/app/domain/bundle/bundle-xml-importer.js
index a2053c9..b3eed4b 100644
--- 
a/contrib/views/wfmanager/src/main/resources/ui/app/domain/bundle/bundle-xml-importer.js
+++ 
b/contrib/views/wfmanager/src/main/resources/ui/app/domain/bundle/bundle-xml-importer.js
@@ -49,10 +49,8 @@ var BundleXmlImporter= Ember.Object.extend({
 } else {
   bundle.schemaVersions.bundleVersion = bundleVersion;
 }
-if(bundleApp.control && bundleApp.control["kick-off-time"]) {
-  bundle.kickOffTime = 
this.extractDateField(bundleApp["control"]["kick-off-time"]);
-}else{
-
+if(bundleApp.controls && bundleApp.controls["kick-off-time"]) {
+  bundle.kickOffTime = 
this.extractDateField(bundleApp["controls"]["kick-off-time"]);
 }
 this.processCoordinatorsJson(bundleApp, bundle);
 return {bundle: bundle, errors: errors};

[09/30] ambari git commit: AMBARI-19743. Agent registration fails with non-root agent user (Attila Doroszlai via smohanty)

[ncole]

AMBARI-19743. Agent registration fails with non-root agent user (Attila 
Doroszlai via smohanty)


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

Branch: refs/heads/branch-dev-patch-upgrade
Commit: 0e8c966d20b895442ea461ce488dcb9aae4d8638
Parents: 771c9c0
Author: Sumit Mohanty 
Authored: Fri Jan 27 18:17:48 2017 -0800
Committer: Sumit Mohanty 
Committed: Fri Jan 27 18:19:36 2017 -0800

--
 ambari-server/src/main/python/bootstrap.py | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/0e8c966d/ambari-server/src/main/python/bootstrap.py
--
diff --git a/ambari-server/src/main/python/bootstrap.py 
b/ambari-server/src/main/python/bootstrap.py
index d836040..f1c53ce 100755
--- a/ambari-server/src/main/python/bootstrap.py
+++ b/ambari-server/src/main/python/bootstrap.py
@@ -630,8 +630,7 @@ class BootstrapDefault(Bootstrap):
 self.host_log.write("==\n")
 self.host_log.write("Running create-python-wrap script...")
 
-command = "chmod a+x %s && %s" % \
-  (REMOTE_CREATE_PYTHON_WRAP_SCRIPT, 
REMOTE_CREATE_PYTHON_WRAP_SCRIPT)
+command = "chmod a+x {script} && {sudo} {script}".format(sudo=AMBARI_SUDO, 
script=REMOTE_CREATE_PYTHON_WRAP_SCRIPT)
 
 ssh = SSH(params.user, params.sshPort, params.sshkey_file, self.host, 
command,
   params.bootdir, self.host_log)

[12/30] ambari git commit: AMBARI-19726. Post user creation hook is passed the hdfs user from the hadoop-env config type. (Laszlo Puskas via stoader)

[ncole]

AMBARI-19726. Post user creation hook is passed the hdfs user from the 
hadoop-env config type. (Laszlo Puskas via stoader)


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

Branch: refs/heads/branch-dev-patch-upgrade
Commit: 86fbb38108e2d9b87f22b1920cada3a655677285
Parents: c290786
Author: Laszlo Puskas 
Authored: Sat Jan 28 18:27:31 2017 +0100
Committer: Toader, Sebastian 
Committed: Sat Jan 28 18:27:31 2017 +0100

--
 .../server/hooks/users/UserHookParams.java  |  3 ++-
 .../server/hooks/users/UserHookService.java | 23 ++--
 .../users/CsvFilePersisterService.java  |  6 ++---
 .../users/PostUserCreationHookServerAction.java |  8 ++-
 .../scripts/post-user-creation-hook.sh  |  9 ++--
 .../server/hooks/users/UserHookServiceTest.java |  9 
 .../PostUserCreationHookServerActionTest.java   |  3 ++-
 7 files changed, 45 insertions(+), 16 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/86fbb381/ambari-server/src/main/java/org/apache/ambari/server/hooks/users/UserHookParams.java
--
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/hooks/users/UserHookParams.java
 
b/ambari-server/src/main/java/org/apache/ambari/server/hooks/users/UserHookParams.java
index 6970dcc..4b1b5aa 100644
--- 
a/ambari-server/src/main/java/org/apache/ambari/server/hooks/users/UserHookParams.java
+++ 
b/ambari-server/src/main/java/org/apache/ambari/server/hooks/users/UserHookParams.java
@@ -34,7 +34,8 @@ public enum UserHookParams {
   // identify security related values
   CLUSTER_SECURITY_TYPE("cluster-security-type"),
   CMD_HDFS_PRINCIPAL("cmd-hdfs-principal"),
-  CMD_HDFS_KEYTAB("cmd-hdfs-keytab");
+  CMD_HDFS_KEYTAB("cmd-hdfs-keytab"),
+  CMD_HDFS_USER("cmd-hdfs-user");
 
 
   private String param;

http://git-wip-us.apache.org/repos/asf/ambari/blob/86fbb381/ambari-server/src/main/java/org/apache/ambari/server/hooks/users/UserHookService.java
--
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/hooks/users/UserHookService.java
 
b/ambari-server/src/main/java/org/apache/ambari/server/hooks/users/UserHookService.java
index c4ff1e4..69463ab 100644
--- 
a/ambari-server/src/main/java/org/apache/ambari/server/hooks/users/UserHookService.java
+++ 
b/ambari-server/src/main/java/org/apache/ambari/server/hooks/users/UserHookService.java
@@ -170,8 +170,10 @@ public class UserHookService implements HookService {
 
 commandParams.put(UserHookParams.CMD_HDFS_KEYTAB.param(), 
clusterData.getKeytab());
 commandParams.put(UserHookParams.CMD_HDFS_PRINCIPAL.param(), 
clusterData.getPrincipal());
+commandParams.put(UserHookParams.CMD_HDFS_USER.param(), 
clusterData.getHdfsUser());
 commandParams.put(UserHookParams.CMD_INPUT_FILE.param(), 
generateInputFileName());
 
+
 commandParams.put(UserHookParams.PAYLOAD.param(), 
objectMapper.writeValueAsString(context.getUserGroups()));
 
 return commandParams;
@@ -228,15 +230,16 @@ public class UserHookService implements HookService {
 break;
 }
 
-return new ClusterData(cluster.getClusterName(), cluster.getClusterId(), 
cluster.getSecurityType().name(), principal, keyTab);
-  }
 
-  private void getSecurityData(Configuration configuraiton) {
-//principal
+return new ClusterData(cluster.getClusterName(), cluster.getClusterId(), 
cluster.getSecurityType().name(), principal, keyTab, getHdfsUser(cluster));
+  }
 
-//keytab
+  private String getHdfsUser(Cluster cluster) {
+String hdfsUser = 
cluster.getDesiredConfigByType("hadoop-env").getProperties().get("hdfs_user");
+return hdfsUser;
   }
 
+
   /**
* Local representation of cluster data.
*/
@@ -247,12 +250,15 @@ public class UserHookService implements HookService {
 private String principal;
 private String keytab;
 
-public ClusterData(String clusterName, Long clusterId, String 
securityType, String principal, String keytab) {
+private String hdfsUser;
+
+public ClusterData(String clusterName, Long clusterId, String 
securityType, String principal, String keytab, String hdfsUser) {
   this.clusterName = clusterName;
   this.clusterId = clusterId;
   this.securityType = securityType;
   this.principal = principal;
   this.keytab = keytab;
+  this.hdfsUser = hdfsUser;
 }
 
 public String getClusterName() {
@@ -274,6 +280,9 @@ public class UserHookService implements HookService {
 public String getKeytab() 

[25/30] ambari git commit: AMBARI-19774. Undo Add Node feature needed for workflow designer similar to Undo Delete(Padma Priya N via gauravn7)

[ncole]

AMBARI-19774. Undo Add Node feature needed for workflow designer similar to 
Undo Delete(Padma Priya N via gauravn7)


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

Branch: refs/heads/branch-dev-patch-upgrade
Commit: ff34b053d047889d261524f4b676b915a9176934
Parents: 589f567
Author: Gaurav Nagar 
Authored: Mon Jan 30 17:36:57 2017 +0530
Committer: Gaurav Nagar 
Committed: Mon Jan 30 17:37:49 2017 +0530

--
 .../src/main/resources/ui/app/components/flow-designer.js| 5 +++--
 .../resources/ui/app/templates/components/flow-designer.hbs  | 8 +---
 2 files changed, 8 insertions(+), 5 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/ff34b053/contrib/views/wfmanager/src/main/resources/ui/app/components/flow-designer.js
--
diff --git 
a/contrib/views/wfmanager/src/main/resources/ui/app/components/flow-designer.js 
b/contrib/views/wfmanager/src/main/resources/ui/app/components/flow-designer.js
index 1292832..f863656 100644
--- 
a/contrib/views/wfmanager/src/main/resources/ui/app/components/flow-designer.js
+++ 
b/contrib/views/wfmanager/src/main/resources/ui/app/components/flow-designer.js
@@ -616,7 +616,7 @@ export default Ember.Component.extend(FindNodeMixin, 
Validations, {
 }
 this.rerender();
 this.doValidation();
-this.showUndo('node');
+this.showUndo('nodeDeleted');
   },
   addWorkflowBranch(node){
 this.createSnapshot();
@@ -846,6 +846,7 @@ export default Ember.Component.extend(FindNodeMixin, 
Validations, {
   this.rerender();
   this.doValidation();
   this.scrollToNewPosition();
+  this.showUndo('nodeAdded');
 },
 nameChanged(){
   this.doValidation();
@@ -1095,7 +1096,7 @@ export default Ember.Component.extend(FindNodeMixin, 
Validations, {
   this.persistWorkInProgress();
 },
 
-undoDelete () {
+undo () {
   var workflowImporter = WorkflowJsonImporter.create({});
   var workflow = 
workflowImporter.importWorkflow(this.get('workflowSnapshot'));
   this.resetDesigner();

http://git-wip-us.apache.org/repos/asf/ambari/blob/ff34b053/contrib/views/wfmanager/src/main/resources/ui/app/templates/components/flow-designer.hbs
--
diff --git 
a/contrib/views/wfmanager/src/main/resources/ui/app/templates/components/flow-designer.hbs
 
b/contrib/views/wfmanager/src/main/resources/ui/app/templates/components/flow-designer.hbs
index 2b8844e..df0a9ba 100644
--- 
a/contrib/views/wfmanager/src/main/resources/ui/app/templates/components/flow-designer.hbs
+++ 
b/contrib/views/wfmanager/src/main/resources/ui/app/templates/components/flow-designer.hbs
@@ -141,10 +141,12 @@
   {{designer-errors errors=errors validationErrors=validationErrors}}
   {{#if undoAvailable}}
 
-  {{#if (eq undoType 'node')}}
-Node {{deletedNode.name}} deleted Undo
+  {{#if (eq undoType 'nodeDeleted')}}
+Node deleted Undo
+  {{else if (eq undoType 'nodeAdded')}}
+Node added Undo
   {{else}}
-Transition deleted Undo
+Transition deleted Undo
   {{/if}}
 
   {{/if}}

[18/30] ambari git commit: AMBARI-19750. Hive2 view - Clicking on browse databases does not work (pallavkul)

[ncole]

AMBARI-19750. Hive2 view - Clicking on browse databases does not work 
(pallavkul)


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

Branch: refs/heads/branch-dev-patch-upgrade
Commit: ea1fbaa020907c7a433275447043b509f8868dcd
Parents: c977113
Author: pallavkul 
Authored: Mon Jan 30 14:21:16 2017 +0530
Committer: pallavkul 
Committed: Mon Jan 30 14:21:16 2017 +0530

--
 .../components/multiple-database-search-bar.js  | 31 +++-
 .../components/multiple-database-search-bar.hbs | 11 ---
 2 files changed, 35 insertions(+), 7 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/ea1fbaa0/contrib/views/hive20/src/main/resources/ui/app/components/multiple-database-search-bar.js
--
diff --git 
a/contrib/views/hive20/src/main/resources/ui/app/components/multiple-database-search-bar.js
 
b/contrib/views/hive20/src/main/resources/ui/app/components/multiple-database-search-bar.js
index 817a826..c27f80f 100644
--- 
a/contrib/views/hive20/src/main/resources/ui/app/components/multiple-database-search-bar.js
+++ 
b/contrib/views/hive20/src/main/resources/ui/app/components/multiple-database-search-bar.js
@@ -66,6 +66,12 @@ export default Ember.Component.extend({
 return selecteddblist;
   }),
 
+  focusComesFromOutside(e){
+let blurredEl = e.relatedTarget;
+return !blurredEl || 
!blurredEl.classList.contains('ember-power-select-search-input');
+  },
+
+
   actions: {
 createOnEnter(select, e) {
   if (e.keyCode === 13 && select.isOpen &&
@@ -79,10 +85,33 @@ export default Ember.Component.extend({
   }
 },
 
+handleFocus(select, e) {
+  if (this.focusComesFromOutside(e)) {
+select.actions.open();
+this.$('.browse').addClass('open');
+  }
+
+},
+
+handleBlur() {
+  //console.log('handleBlur');
+},
+
 updateTables(){
   this.sendAction('changeDbHandler', this.get('selectedDbs'));
-}
+},
+
+browse(){
 
+  if(this.$('.browse').hasClass('open')){
+this.$('.browse').removeClass('open');
+this.$('.multiple-db-select input').focusout();
+  } else {
+this.$('.browse').addClass('open');
+this.$('.multiple-db-select input').focus();
+  }
+
+}
   }
 
 });

http://git-wip-us.apache.org/repos/asf/ambari/blob/ea1fbaa0/contrib/views/hive20/src/main/resources/ui/app/templates/components/multiple-database-search-bar.hbs
--
diff --git 
a/contrib/views/hive20/src/main/resources/ui/app/templates/components/multiple-database-search-bar.hbs
 
b/contrib/views/hive20/src/main/resources/ui/app/templates/components/multiple-database-search-bar.hbs
index cc102b4..e620347 100644
--- 
a/contrib/views/hive20/src/main/resources/ui/app/templates/components/multiple-database-search-bar.hbs
+++ 
b/contrib/views/hive20/src/main/resources/ui/app/templates/components/multiple-database-search-bar.hbs
@@ -22,22 +22,21 @@
 
 
   
-
 {{#power-select-multiple
+class="multiple-db-select"
 placeholder="Search databases"
 options=allDbs
 selected=selectedMultiDb
 onchange=(pipe-action (action (mut selectedDbs)) (action "updateTables"))
+onfocus=(action "handleFocus")
+onblur=(action "handleBlur")
 onkeydown=(action "createOnEnter")
 as |number|}}
   {{fa-icon "database"}} {{number}}
 {{/power-select-multiple}}
-
-
-  {{fa-icon "folder"}} 
Browse 
+
+  {{fa-icon "folder"}} Browse 
 
-
-
   
 
 

[22/30] ambari git commit: AMBARI-19666 : Fixed Hive view loosing one row every 100 row in result set. (nitirajrathore)

[ncole]

AMBARI-19666 : Fixed Hive view loosing one row every 100 row in result set. 
(nitirajrathore)


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

Branch: refs/heads/branch-dev-patch-upgrade
Commit: 9f5a8bf6a7c670845adfa07369e9c56ff68e9798
Parents: 37b4142
Author: Nitiraj Singh Rathore 
Authored: Mon Jan 30 14:33:43 2017 +0530
Committer: Nitiraj Singh Rathore 
Committed: Mon Jan 30 14:34:26 2017 +0530

--
 .../org/apache/ambari/view/hive2/actor/ResultSetIterator.java | 3 ++-
 .../org/apache/ambari/view/hive20/actor/ResultSetIterator.java| 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/9f5a8bf6/contrib/views/hive-next/src/main/java/org/apache/ambari/view/hive2/actor/ResultSetIterator.java
--
diff --git 
a/contrib/views/hive-next/src/main/java/org/apache/ambari/view/hive2/actor/ResultSetIterator.java
 
b/contrib/views/hive-next/src/main/java/org/apache/ambari/view/hive2/actor/ResultSetIterator.java
index 1052bd4..5bde12d 100644
--- 
a/contrib/views/hive-next/src/main/java/org/apache/ambari/view/hive2/actor/ResultSetIterator.java
+++ 
b/contrib/views/hive-next/src/main/java/org/apache/ambari/view/hive2/actor/ResultSetIterator.java
@@ -116,7 +116,8 @@ public class ResultSetIterator extends HiveActor {
 }
 int index = 0;
 try {
-  while (resultSet.next() && index < batchSize) {
+  // check batchsize first becaue resultSet.next() fetches the new row as 
well before returning true/false.
+  while (index < batchSize && resultSet.next()) {
 index++;
 rows.add(getRowFromResultSet(resultSet));
   }

http://git-wip-us.apache.org/repos/asf/ambari/blob/9f5a8bf6/contrib/views/hive20/src/main/java/org/apache/ambari/view/hive20/actor/ResultSetIterator.java
--
diff --git 
a/contrib/views/hive20/src/main/java/org/apache/ambari/view/hive20/actor/ResultSetIterator.java
 
b/contrib/views/hive20/src/main/java/org/apache/ambari/view/hive20/actor/ResultSetIterator.java
index 4b4a407..5da5ee1 100644
--- 
a/contrib/views/hive20/src/main/java/org/apache/ambari/view/hive20/actor/ResultSetIterator.java
+++ 
b/contrib/views/hive20/src/main/java/org/apache/ambari/view/hive20/actor/ResultSetIterator.java
@@ -115,7 +115,8 @@ public class ResultSetIterator extends HiveActor {
 }
 int index = 0;
 try {
-  while (resultSet.next() && index < batchSize) {
+  // check batchsize first becaue resultSet.next() fetches the new row as 
well before returning true/false.
+  while (index < batchSize && resultSet.next()) {
 index++;
 rows.add(getRowFromResultSet(resultSet));
   }

[05/30] ambari git commit: AMBARI-19751: Credential Store params should be in the command json for RESTART

[ncole]

AMBARI-19751: Credential Store params should be in the command json for RESTART


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

Branch: refs/heads/branch-dev-patch-upgrade
Commit: 9d8a54c23146db595e81d72785c4f9779f3bee00
Parents: 65eb886
Author: Nahappan Somasundaram 
Authored: Fri Jan 27 09:56:03 2017 -0800
Committer: Nahappan Somasundaram 
Committed: Fri Jan 27 12:32:59 2017 -0800

--
 .../AmbariCustomCommandExecutionHelper.java | 16 
 1 file changed, 16 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/9d8a54c2/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariCustomCommandExecutionHelper.java
--
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariCustomCommandExecutionHelper.java
 
b/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariCustomCommandExecutionHelper.java
index 8b851ac..93f4a8f 100644
--- 
a/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariCustomCommandExecutionHelper.java
+++ 
b/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariCustomCommandExecutionHelper.java
@@ -175,6 +175,8 @@ public class AmbariCustomCommandExecutionHelper {
   @Inject
   private HostRoleCommandDAO hostRoleCommandDAO;
 
+  private Map>> 
configCredentialsForService = new HashMap<>();
+
   protected static final String SERVICE_CHECK_COMMAND_NAME = "SERVICE_CHECK";
   protected static final String START_COMMAND_NAME = "START";
   protected static final String RESTART_COMMAND_NAME = "RESTART";
@@ -382,6 +384,20 @@ public class AmbariCustomCommandExecutionHelper {
 
   
execCmd.setAvailableServicesFromServiceInfoMap(ambariMetaInfo.getServices(stackId.getStackName(),
 stackId.getStackVersion()));
 
+  // Get the value of credential store enabled from the DB
+  Service clusterService = cluster.getService(serviceName);
+  
execCmd.setCredentialStoreEnabled(String.valueOf(clusterService.isCredentialStoreEnabled()));
+
+  // Get the map of service config type to password properties for the 
service
+  Map> configCredentials;
+  configCredentials = 
configCredentialsForService.get(clusterService.getName());
+  if (configCredentials == null) {
+configCredentials = 
configHelper.getCredentialStoreEnabledProperties(stackId, clusterService);
+configCredentialsForService.put(clusterService.getName(), 
configCredentials);
+  }
+
+  execCmd.setConfigurationCredentials(configCredentials);
+
   Map hostLevelParams = new TreeMap<>();
 
   hostLevelParams.put(CUSTOM_COMMAND, commandName);

ambari git commit: AMBARI-19736. Format ZKFC commands failing while enabling NameNode HA (stoader)

[stoader]

Repository: ambari
Updated Branches:
  refs/heads/branch-2.5 205ef2bd4 -> d6a654e19


AMBARI-19736. Format ZKFC commands failing while enabling NameNode HA (stoader)


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

Branch: refs/heads/branch-2.5
Commit: d6a654e194729c8cda472857c50f8095c83d8c97
Parents: 205ef2b
Author: Toader, Sebastian 
Authored: Mon Jan 30 15:56:30 2017 +0100
Committer: Toader, Sebastian 
Committed: Mon Jan 30 15:56:30 2017 +0100

--
 .../HDFS/2.1.0.2.0/package/scripts/hdfs_namenode.py |  4 
 .../HDFS/2.1.0.2.0/package/scripts/utils.py | 14 +-
 .../HDFS/2.1.0.2.0/package/scripts/zkfc_slave.py|  5 -
 .../HDP/2.0.6/hooks/before-ANY/scripts/params.py| 16 +---
 4 files changed, 26 insertions(+), 13 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/d6a654e1/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/package/scripts/hdfs_namenode.py
--
diff --git 
a/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/package/scripts/hdfs_namenode.py
 
b/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/package/scripts/hdfs_namenode.py
index a2edf38..0489792 100644
--- 
a/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/package/scripts/hdfs_namenode.py
+++ 
b/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/package/scripts/hdfs_namenode.py
@@ -34,6 +34,7 @@ from resource_management.libraries.functions import Direction
 from ambari_commons import OSCheck, OSConst
 from ambari_commons.os_family_impl import OsFamilyImpl, OsFamilyFuncImpl
 from utils import get_dfsadmin_base_command
+from utils import set_up_zkfc_security
 
 if OSCheck.is_windows_family():
   from resource_management.libraries.functions.windows_service_utils import 
check_windows_service_status
@@ -95,6 +96,9 @@ def namenode(action=None, hdfs_binary=None, do_format=True, 
upgrade_type=None,
 #we need this directory to be present before any action(HA manual steps for
 #additional namenode)
 create_name_dirs(params.dfs_name_dir)
+
+# set up failover /  secure zookeper ACLs, this feature is supported from 
HDP 2.6 ownwards
+set_up_zkfc_security(params)
   elif action == "start":
 Logger.info("Called service {0} with upgrade_type: {1}".format(action, 
str(upgrade_type)))
 setup_ranger_hdfs(upgrade_type=upgrade_type)

http://git-wip-us.apache.org/repos/asf/ambari/blob/d6a654e1/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/package/scripts/utils.py
--
diff --git 
a/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/package/scripts/utils.py
 
b/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/package/scripts/utils.py
index 03aba7b..d8d0515 100644
--- 
a/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/package/scripts/utils.py
+++ 
b/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/package/scripts/utils.py
@@ -387,20 +387,24 @@ def get_dfsadmin_base_command(hdfs_binary, 
use_specific_namenode = False):
 def set_up_zkfc_security(params):
 """ Sets up security for accessing zookeper on secure clusters """
 
-# check if the namenode is HA (this may be redundant as the component is 
only installed if affirmative)
+if params.stack_supports_zk_security is False:
+  Logger.info("Skipping setting up secure ZNode ACL for HFDS as it's 
supported only for HDP 2.6 and above.")
+  return
+
+# check if the namenode is HA
 if params.dfs_ha_enabled is False:
-Logger.info("The namenode is not HA, zkfc security setup skipped.")
+Logger.info("Skipping setting up secure ZNode ACL for HFDS as it's 
supported only for NameNode HA mode.")
 return
 
 # check if the cluster is secure (skip otherwise)
 if params.security_enabled is False:
-Logger.info("The cluster is not secure, zkfc security setup skipped.")
+Logger.info("Skipping setting up secure ZNode ACL for HFDS as it's 
supported only for secure clusters.")
 return
 
 # process the JAAS template
 File(os.path.join(params.hadoop_conf_secure_dir, 'hdfs_jaas.conf'),
- owner='root',
- group='root',
+ owner=params.hdfs_user,
+ group=params.user_group,
  mode=0644,
  content=Template("hdfs_jaas.conf.j2")
  )

ambari git commit: AMBARI-19736. Format ZKFC commands failing while enabling NameNode HA (stoader)

[stoader]

Repository: ambari
Updated Branches:
  refs/heads/trunk b722ffa6f -> d6d247983


AMBARI-19736. Format ZKFC commands failing while enabling NameNode HA (stoader)


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

Branch: refs/heads/trunk
Commit: d6d247983c5c66c11260a6d10e7b0e2746fa8146
Parents: b722ffa
Author: Toader, Sebastian 
Authored: Mon Jan 30 15:54:20 2017 +0100
Committer: Toader, Sebastian 
Committed: Mon Jan 30 15:54:20 2017 +0100

--
 .../2.1.0.2.0/package/scripts/hdfs_namenode.py  |  4 ++
 .../HDFS/2.1.0.2.0/package/scripts/utils.py | 14 ---
 .../2.1.0.2.0/package/scripts/zkfc_slave.py |  5 ---
 .../3.0.0.3.0/package/scripts/hdfs_namenode.py  |  4 ++
 .../HDFS/3.0.0.3.0/package/scripts/utils.py | 42 +++-
 .../3.0.0.3.0/package/scripts/zkfc_slave.py |  7 
 .../2.0.6/hooks/before-ANY/scripts/params.py| 16 ++--
 .../HDP/3.0/hooks/before-ANY/scripts/params.py  | 19 +++--
 8 files changed, 68 insertions(+), 43 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/d6d24798/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/package/scripts/hdfs_namenode.py
--
diff --git 
a/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/package/scripts/hdfs_namenode.py
 
b/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/package/scripts/hdfs_namenode.py
index a2edf38..0489792 100644
--- 
a/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/package/scripts/hdfs_namenode.py
+++ 
b/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/package/scripts/hdfs_namenode.py
@@ -34,6 +34,7 @@ from resource_management.libraries.functions import Direction
 from ambari_commons import OSCheck, OSConst
 from ambari_commons.os_family_impl import OsFamilyImpl, OsFamilyFuncImpl
 from utils import get_dfsadmin_base_command
+from utils import set_up_zkfc_security
 
 if OSCheck.is_windows_family():
   from resource_management.libraries.functions.windows_service_utils import 
check_windows_service_status
@@ -95,6 +96,9 @@ def namenode(action=None, hdfs_binary=None, do_format=True, 
upgrade_type=None,
 #we need this directory to be present before any action(HA manual steps for
 #additional namenode)
 create_name_dirs(params.dfs_name_dir)
+
+# set up failover /  secure zookeper ACLs, this feature is supported from 
HDP 2.6 ownwards
+set_up_zkfc_security(params)
   elif action == "start":
 Logger.info("Called service {0} with upgrade_type: {1}".format(action, 
str(upgrade_type)))
 setup_ranger_hdfs(upgrade_type=upgrade_type)

http://git-wip-us.apache.org/repos/asf/ambari/blob/d6d24798/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/package/scripts/utils.py
--
diff --git 
a/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/package/scripts/utils.py
 
b/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/package/scripts/utils.py
index 03aba7b..d8d0515 100644
--- 
a/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/package/scripts/utils.py
+++ 
b/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/package/scripts/utils.py
@@ -387,20 +387,24 @@ def get_dfsadmin_base_command(hdfs_binary, 
use_specific_namenode = False):
 def set_up_zkfc_security(params):
 """ Sets up security for accessing zookeper on secure clusters """
 
-# check if the namenode is HA (this may be redundant as the component is 
only installed if affirmative)
+if params.stack_supports_zk_security is False:
+  Logger.info("Skipping setting up secure ZNode ACL for HFDS as it's 
supported only for HDP 2.6 and above.")
+  return
+
+# check if the namenode is HA
 if params.dfs_ha_enabled is False:
-Logger.info("The namenode is not HA, zkfc security setup skipped.")
+Logger.info("Skipping setting up secure ZNode ACL for HFDS as it's 
supported only for NameNode HA mode.")
 return
 
 # check if the cluster is secure (skip otherwise)
 if params.security_enabled is False:
-Logger.info("The cluster is not secure, zkfc security setup skipped.")
+Logger.info("Skipping setting up secure ZNode ACL for HFDS as it's 
supported only for secure clusters.")
 return
 
 # process the JAAS template
 File(os.path.join(params.hadoop_conf_secure_dir, 'hdfs_jaas.conf'),
- owner='root',
- group='root',
+ owner=params.hdfs_user,
+ 

ambari git commit: AMBARI-19775. ActionQueue thread may exit due to IOError in statusCommandResultQueue.empty(). (Attila Doroszlai via stoader)

[stoader]

Repository: ambari
Updated Branches:
  refs/heads/branch-2.5 07e293d21 -> 205ef2bd4


AMBARI-19775. ActionQueue thread may exit due to IOError in 
statusCommandResultQueue.empty(). (Attila Doroszlai via stoader)


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

Branch: refs/heads/branch-2.5
Commit: 205ef2bd41068174c88b53ec5520ef543be59c30
Parents: 07e293d
Author: Attila Doroszlai 
Authored: Mon Jan 30 14:58:47 2017 +0100
Committer: Toader, Sebastian 
Committed: Mon Jan 30 15:00:14 2017 +0100

--
 .../src/main/python/ambari_agent/ActionQueue.py | 28 +++-
 1 file changed, 16 insertions(+), 12 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/205ef2bd/ambari-agent/src/main/python/ambari_agent/ActionQueue.py
--
diff --git a/ambari-agent/src/main/python/ambari_agent/ActionQueue.py 
b/ambari-agent/src/main/python/ambari_agent/ActionQueue.py
index 18d7c2a..8514a88 100644
--- a/ambari-agent/src/main/python/ambari_agent/ActionQueue.py
+++ b/ambari-agent/src/main/python/ambari_agent/ActionQueue.py
@@ -212,18 +212,22 @@ class ActionQueue(threading.Thread):
 pass
 
   def processStatusCommandResultQueueSafeEmpty(self):
-while not self.statusCommandResultQueue.empty():
-  try:
-result = self.statusCommandResultQueue.get(False)
-self.process_status_command_result(result)
-  except Queue.Empty:
-pass
-  except IOError:
-# on race condition in multiprocessing.Queue if get/put and thread 
kill are executed at the same time.
-# During queue.close IOError will be thrown (this prevents from 
permanently dead-locked get).
-pass
-  except UnicodeDecodeError:
-pass
+try:
+  while not self.statusCommandResultQueue.empty():
+try:
+  result = self.statusCommandResultQueue.get(False)
+  self.process_status_command_result(result)
+except Queue.Empty:
+  pass
+except IOError:
+  # on race condition in multiprocessing.Queue if get/put and thread 
kill are executed at the same time.
+  # During queue.close IOError will be thrown (this prevents from 
permanently dead-locked get).
+  pass
+except UnicodeDecodeError:
+  pass
+except IOError:
+  # queue.empty() may also throw IOError
+  pass
 
   def createCommandHandle(self, command):
 if command.has_key('__handle'):

ambari git commit: AMBARI-19775. ActionQueue thread may exit due to IOError in statusCommandResultQueue.empty(). (Attila Doroszlai via stoader)

[stoader]

Repository: ambari
Updated Branches:
  refs/heads/trunk af6ba590d -> b722ffa6f


AMBARI-19775. ActionQueue thread may exit due to IOError in 
statusCommandResultQueue.empty(). (Attila Doroszlai via stoader)


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

Branch: refs/heads/trunk
Commit: b722ffa6f612685096c0c528264fdf1ae86b5d64
Parents: af6ba59
Author: Attila Doroszlai 
Authored: Mon Jan 30 14:58:47 2017 +0100
Committer: Toader, Sebastian 
Committed: Mon Jan 30 14:58:47 2017 +0100

--
 .../src/main/python/ambari_agent/ActionQueue.py | 28 +++-
 1 file changed, 16 insertions(+), 12 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/b722ffa6/ambari-agent/src/main/python/ambari_agent/ActionQueue.py
--
diff --git a/ambari-agent/src/main/python/ambari_agent/ActionQueue.py 
b/ambari-agent/src/main/python/ambari_agent/ActionQueue.py
index 18d7c2a..8514a88 100644
--- a/ambari-agent/src/main/python/ambari_agent/ActionQueue.py
+++ b/ambari-agent/src/main/python/ambari_agent/ActionQueue.py
@@ -212,18 +212,22 @@ class ActionQueue(threading.Thread):
 pass
 
   def processStatusCommandResultQueueSafeEmpty(self):
-while not self.statusCommandResultQueue.empty():
-  try:
-result = self.statusCommandResultQueue.get(False)
-self.process_status_command_result(result)
-  except Queue.Empty:
-pass
-  except IOError:
-# on race condition in multiprocessing.Queue if get/put and thread 
kill are executed at the same time.
-# During queue.close IOError will be thrown (this prevents from 
permanently dead-locked get).
-pass
-  except UnicodeDecodeError:
-pass
+try:
+  while not self.statusCommandResultQueue.empty():
+try:
+  result = self.statusCommandResultQueue.get(False)
+  self.process_status_command_result(result)
+except Queue.Empty:
+  pass
+except IOError:
+  # on race condition in multiprocessing.Queue if get/put and thread 
kill are executed at the same time.
+  # During queue.close IOError will be thrown (this prevents from 
permanently dead-locked get).
+  pass
+except UnicodeDecodeError:
+  pass
+except IOError:
+  # queue.empty() may also throw IOError
+  pass
 
   def createCommandHandle(self, command):
 if command.has_key('__handle'):

ambari git commit: AMBARI-19709:XML generated for bundle's is not as per oozie xsd (Padma Priya N via gauravn7)

[gnagar]

Repository: ambari
Updated Branches:
  refs/heads/trunk da7202d41 -> af6ba590d


AMBARI-19709:XML generated for bundle's is not as per oozie xsd (Padma Priya N 
via gauravn7)


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

Branch: refs/heads/trunk
Commit: af6ba590d20b75e6a276a9e0a81f416fefc8cfd9
Parents: da7202d
Author: Gaurav Nagar 
Authored: Mon Jan 30 17:42:14 2017 +0530
Committer: Gaurav Nagar 
Committed: Mon Jan 30 17:42:54 2017 +0530

--
 .../src/main/resources/ui/app/components/bundle-config.js  | 2 +-
 .../resources/ui/app/domain/bundle/bundle-xml-generator.js | 4 ++--
 .../main/resources/ui/app/domain/bundle/bundle-xml-importer.js | 6 ++
 3 files changed, 5 insertions(+), 7 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/af6ba590/contrib/views/wfmanager/src/main/resources/ui/app/components/bundle-config.js
--
diff --git 
a/contrib/views/wfmanager/src/main/resources/ui/app/components/bundle-config.js 
b/contrib/views/wfmanager/src/main/resources/ui/app/components/bundle-config.js
index 8b4c3d8..fe6dfd1 100644
--- 
a/contrib/views/wfmanager/src/main/resources/ui/app/components/bundle-config.js
+++ 
b/contrib/views/wfmanager/src/main/resources/ui/app/components/bundle-config.js
@@ -160,7 +160,7 @@ export default Ember.Component.extend(Ember.Evented, 
Validations, {
   throw new Error(e);
 }.bind(this));
   },
-  getBundleFromJSON(filePath){
+  getBundleFromJSON(draftBundle){
 this.set('bundle', JSON.parse(draftBundle));
   },
   getBundleFromHdfs(filePath){

http://git-wip-us.apache.org/repos/asf/ambari/blob/af6ba590/contrib/views/wfmanager/src/main/resources/ui/app/domain/bundle/bundle-xml-generator.js
--
diff --git 
a/contrib/views/wfmanager/src/main/resources/ui/app/domain/bundle/bundle-xml-generator.js
 
b/contrib/views/wfmanager/src/main/resources/ui/app/domain/bundle/bundle-xml-generator.js
index 7dc05a9..f2dcef9 100644
--- 
a/contrib/views/wfmanager/src/main/resources/ui/app/domain/bundle/bundle-xml-generator.js
+++ 
b/contrib/views/wfmanager/src/main/resources/ui/app/domain/bundle/bundle-xml-generator.js
@@ -25,8 +25,8 @@ var BundleGenerator= Ember.Object.extend({
 bundleApp._xmlns = 
"uri:oozie:bundle:"+this.bundle.schemaVersions.bundleVersion;
 bundleApp._name = this.bundle.name;
 if(!Ember.isEmpty(this.bundle.kickOffTime.value)){
-  bundleApp["control"] = {};
-  bundleApp["control"]["kick-off-time"] = this.bundle.kickOffTime.value;
+  bundleApp["controls"] = {};
+  bundleApp["controls"]["kick-off-time"] = this.bundle.kickOffTime.value;
 }
 this.generateCoordinatorsJson(bundleApp);
 var xmlAsStr = this.get("x2js").json2xml_str(xmlJson);

http://git-wip-us.apache.org/repos/asf/ambari/blob/af6ba590/contrib/views/wfmanager/src/main/resources/ui/app/domain/bundle/bundle-xml-importer.js
--
diff --git 
a/contrib/views/wfmanager/src/main/resources/ui/app/domain/bundle/bundle-xml-importer.js
 
b/contrib/views/wfmanager/src/main/resources/ui/app/domain/bundle/bundle-xml-importer.js
index a2053c9..b3eed4b 100644
--- 
a/contrib/views/wfmanager/src/main/resources/ui/app/domain/bundle/bundle-xml-importer.js
+++ 
b/contrib/views/wfmanager/src/main/resources/ui/app/domain/bundle/bundle-xml-importer.js
@@ -49,10 +49,8 @@ var BundleXmlImporter= Ember.Object.extend({
 } else {
   bundle.schemaVersions.bundleVersion = bundleVersion;
 }
-if(bundleApp.control && bundleApp.control["kick-off-time"]) {
-  bundle.kickOffTime = 
this.extractDateField(bundleApp["control"]["kick-off-time"]);
-}else{
-
+if(bundleApp.controls && bundleApp.controls["kick-off-time"]) {
+  bundle.kickOffTime = 
this.extractDateField(bundleApp["controls"]["kick-off-time"]);
 }
 this.processCoordinatorsJson(bundleApp, bundle);
 return {bundle: bundle, errors: errors};

ambari git commit: AMBARI-19709:XML generated for bundle's is not as per oozie xsd (Padma Priya N via gauravn7)

[gnagar]

Repository: ambari
Updated Branches:
  refs/heads/branch-2.5 be62c09bd -> 07e293d21


AMBARI-19709:XML generated for bundle's is not as per oozie xsd (Padma Priya N 
via gauravn7)


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

Branch: refs/heads/branch-2.5
Commit: 07e293d21e35dff695ad9fd4c6f0f985b1f2c24d
Parents: be62c09
Author: Gaurav Nagar 
Authored: Mon Jan 30 17:42:14 2017 +0530
Committer: Gaurav Nagar 
Committed: Mon Jan 30 17:42:14 2017 +0530

--
 .../src/main/resources/ui/app/components/bundle-config.js  | 2 +-
 .../resources/ui/app/domain/bundle/bundle-xml-generator.js | 4 ++--
 .../main/resources/ui/app/domain/bundle/bundle-xml-importer.js | 6 ++
 3 files changed, 5 insertions(+), 7 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/07e293d2/contrib/views/wfmanager/src/main/resources/ui/app/components/bundle-config.js
--
diff --git 
a/contrib/views/wfmanager/src/main/resources/ui/app/components/bundle-config.js 
b/contrib/views/wfmanager/src/main/resources/ui/app/components/bundle-config.js
index 8b4c3d8..fe6dfd1 100644
--- 
a/contrib/views/wfmanager/src/main/resources/ui/app/components/bundle-config.js
+++ 
b/contrib/views/wfmanager/src/main/resources/ui/app/components/bundle-config.js
@@ -160,7 +160,7 @@ export default Ember.Component.extend(Ember.Evented, 
Validations, {
   throw new Error(e);
 }.bind(this));
   },
-  getBundleFromJSON(filePath){
+  getBundleFromJSON(draftBundle){
 this.set('bundle', JSON.parse(draftBundle));
   },
   getBundleFromHdfs(filePath){

http://git-wip-us.apache.org/repos/asf/ambari/blob/07e293d2/contrib/views/wfmanager/src/main/resources/ui/app/domain/bundle/bundle-xml-generator.js
--
diff --git 
a/contrib/views/wfmanager/src/main/resources/ui/app/domain/bundle/bundle-xml-generator.js
 
b/contrib/views/wfmanager/src/main/resources/ui/app/domain/bundle/bundle-xml-generator.js
index 7dc05a9..f2dcef9 100644
--- 
a/contrib/views/wfmanager/src/main/resources/ui/app/domain/bundle/bundle-xml-generator.js
+++ 
b/contrib/views/wfmanager/src/main/resources/ui/app/domain/bundle/bundle-xml-generator.js
@@ -25,8 +25,8 @@ var BundleGenerator= Ember.Object.extend({
 bundleApp._xmlns = 
"uri:oozie:bundle:"+this.bundle.schemaVersions.bundleVersion;
 bundleApp._name = this.bundle.name;
 if(!Ember.isEmpty(this.bundle.kickOffTime.value)){
-  bundleApp["control"] = {};
-  bundleApp["control"]["kick-off-time"] = this.bundle.kickOffTime.value;
+  bundleApp["controls"] = {};
+  bundleApp["controls"]["kick-off-time"] = this.bundle.kickOffTime.value;
 }
 this.generateCoordinatorsJson(bundleApp);
 var xmlAsStr = this.get("x2js").json2xml_str(xmlJson);

http://git-wip-us.apache.org/repos/asf/ambari/blob/07e293d2/contrib/views/wfmanager/src/main/resources/ui/app/domain/bundle/bundle-xml-importer.js
--
diff --git 
a/contrib/views/wfmanager/src/main/resources/ui/app/domain/bundle/bundle-xml-importer.js
 
b/contrib/views/wfmanager/src/main/resources/ui/app/domain/bundle/bundle-xml-importer.js
index a2053c9..b3eed4b 100644
--- 
a/contrib/views/wfmanager/src/main/resources/ui/app/domain/bundle/bundle-xml-importer.js
+++ 
b/contrib/views/wfmanager/src/main/resources/ui/app/domain/bundle/bundle-xml-importer.js
@@ -49,10 +49,8 @@ var BundleXmlImporter= Ember.Object.extend({
 } else {
   bundle.schemaVersions.bundleVersion = bundleVersion;
 }
-if(bundleApp.control && bundleApp.control["kick-off-time"]) {
-  bundle.kickOffTime = 
this.extractDateField(bundleApp["control"]["kick-off-time"]);
-}else{
-
+if(bundleApp.controls && bundleApp.controls["kick-off-time"]) {
+  bundle.kickOffTime = 
this.extractDateField(bundleApp["controls"]["kick-off-time"]);
 }
 this.processCoordinatorsJson(bundleApp, bundle);
 return {bundle: bundle, errors: errors};

ambari git commit: AMBARI-19766. Not able to set the sla for an action node (Padma Priya N via gauravn7)

[gnagar]

Repository: ambari
Updated Branches:
  refs/heads/branch-2.5 984d2 -> be62c09bd


AMBARI-19766. Not able to set the sla for an action node (Padma Priya N via 
gauravn7)


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

Branch: refs/heads/branch-2.5
Commit: be62c09bd7eaf7562425e68ffa00d32000941cbe
Parents: 984
Author: Gaurav Nagar 
Authored: Mon Jan 30 17:39:33 2017 +0530
Committer: Gaurav Nagar 
Committed: Mon Jan 30 17:40:38 2017 +0530

--
 .../main/resources/ui/app/components/workflow-action-editor.js | 2 +-
 .../main/resources/ui/app/templates/components/sla-info.hbs| 6 +++---
 .../resources/ui/app/templates/components/sqoop-action.hbs | 2 +-
 .../resources/ui/app/templates/components/workflow-actions.hbs | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/be62c09b/contrib/views/wfmanager/src/main/resources/ui/app/components/workflow-action-editor.js
--
diff --git 
a/contrib/views/wfmanager/src/main/resources/ui/app/components/workflow-action-editor.js
 
b/contrib/views/wfmanager/src/main/resources/ui/app/components/workflow-action-editor.js
index f2d3ba8..43eeb5b 100644
--- 
a/contrib/views/wfmanager/src/main/resources/ui/app/components/workflow-action-editor.js
+++ 
b/contrib/views/wfmanager/src/main/resources/ui/app/components/workflow-action-editor.js
@@ -132,7 +132,7 @@ export default Ember.Component.extend( Ember.Evented,{
 }
 if(!CommonUtils.isSupportedAction(this.get('actionType')) && 
!this.get('actionModel.slaInfo')){
   this.set('customSlaInfo',  SlaInfo.create({}));
-}else{
+}else if(!CommonUtils.isSupportedAction(this.get('actionType')) && 
this.get('actionModel.slaInfo')){
   this.set('customSlaInfo',  this.get('actionModel.slaInfo'));
   this.set('customSlaEnabled', this.get('actionModel.slaEnabled'));
   delete this.get('actionModel').slaInfo;

http://git-wip-us.apache.org/repos/asf/ambari/blob/be62c09b/contrib/views/wfmanager/src/main/resources/ui/app/templates/components/sla-info.hbs
--
diff --git 
a/contrib/views/wfmanager/src/main/resources/ui/app/templates/components/sla-info.hbs
 
b/contrib/views/wfmanager/src/main/resources/ui/app/templates/components/sla-info.hbs
index 447bac2..2ebc259 100644
--- 
a/contrib/views/wfmanager/src/main/resources/ui/app/templates/components/sla-info.hbs
+++ 
b/contrib/views/wfmanager/src/main/resources/ui/app/templates/components/sla-info.hbs
@@ -35,7 +35,7 @@
   
 Should Start
 
-  {{input class="form-control" type="text" 
value=slaInfo.shouldStart.time placeholder="Should Start"}}
+  {{input class="form-control" type="text" 
value=slaInfo.shouldStart.time placeholder="Time period(eg. 5)" title="Time 
period in minutes/hours/days"}}
   {{field-error model=this field='slaInfo.shouldStart.time' 
showErrorMessage=showErrorMessage}}
 
 
@@ -50,7 +50,7 @@
   
 Should End*
 
-  {{input class="form-control" type="text" 
value=slaInfo.shouldEnd.time placeholder="Should End"}}
+  {{input class="form-control" type="text" 
value=slaInfo.shouldEnd.time placeholder="Time period(eg. 5)" title="Time 
period in minutes/hours/days"}}
   {{field-error model=this field='slaInfo.shouldEnd.time' 
showErrorMessage=showErrorMessage}}
 
 
@@ -65,7 +65,7 @@
   
 Max Duration
 
-  {{input class="form-control" type="text" 
value=slaInfo.maxDuration.time placeholder="Max Duration"}}
+  {{input class="form-control" type="text" 
value=slaInfo.maxDuration.time placeholder="Time period(eg. 5)" title="Time 
period in minutes/hours/days"}}
 
 
   

http://git-wip-us.apache.org/repos/asf/ambari/blob/be62c09b/contrib/views/wfmanager/src/main/resources/ui/app/templates/components/sqoop-action.hbs
--
diff --git 
a/contrib/views/wfmanager/src/main/resources/ui/app/templates/components/sqoop-action.hbs
 
b/contrib/views/wfmanager/src/main/resources/ui/app/templates/components/sqoop-action.hbs
index 3f0ec61..fb59149 100644
--- 
a/contrib/views/wfmanager/src/main/resources/ui/app/templates/components/sqoop-action.hbs
+++ 
b/contrib/views/wfmanager/src/main/resources/ui/app/templates/components/sqoop-action.hbs
@@ -32,7 +32,7 @@
 
   Command
   
-{{input type="text" class="form-control" name="command" 

ambari git commit: AMBARI-19766. Not able to set the sla for an action node (Padma Priya N via gauravn7)

[gnagar]

Repository: ambari
Updated Branches:
  refs/heads/trunk ff34b053d -> da7202d41


AMBARI-19766. Not able to set the sla for an action node (Padma Priya N via 
gauravn7)


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

Branch: refs/heads/trunk
Commit: da7202d41cbf9042ac844ad408a08c348ec06e7f
Parents: ff34b05
Author: Gaurav Nagar 
Authored: Mon Jan 30 17:39:33 2017 +0530
Committer: Gaurav Nagar 
Committed: Mon Jan 30 17:39:33 2017 +0530

--
 .../main/resources/ui/app/components/workflow-action-editor.js | 2 +-
 .../main/resources/ui/app/templates/components/sla-info.hbs| 6 +++---
 .../resources/ui/app/templates/components/sqoop-action.hbs | 2 +-
 .../resources/ui/app/templates/components/workflow-actions.hbs | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/da7202d4/contrib/views/wfmanager/src/main/resources/ui/app/components/workflow-action-editor.js
--
diff --git 
a/contrib/views/wfmanager/src/main/resources/ui/app/components/workflow-action-editor.js
 
b/contrib/views/wfmanager/src/main/resources/ui/app/components/workflow-action-editor.js
index f2d3ba8..43eeb5b 100644
--- 
a/contrib/views/wfmanager/src/main/resources/ui/app/components/workflow-action-editor.js
+++ 
b/contrib/views/wfmanager/src/main/resources/ui/app/components/workflow-action-editor.js
@@ -132,7 +132,7 @@ export default Ember.Component.extend( Ember.Evented,{
 }
 if(!CommonUtils.isSupportedAction(this.get('actionType')) && 
!this.get('actionModel.slaInfo')){
   this.set('customSlaInfo',  SlaInfo.create({}));
-}else{
+}else if(!CommonUtils.isSupportedAction(this.get('actionType')) && 
this.get('actionModel.slaInfo')){
   this.set('customSlaInfo',  this.get('actionModel.slaInfo'));
   this.set('customSlaEnabled', this.get('actionModel.slaEnabled'));
   delete this.get('actionModel').slaInfo;

http://git-wip-us.apache.org/repos/asf/ambari/blob/da7202d4/contrib/views/wfmanager/src/main/resources/ui/app/templates/components/sla-info.hbs
--
diff --git 
a/contrib/views/wfmanager/src/main/resources/ui/app/templates/components/sla-info.hbs
 
b/contrib/views/wfmanager/src/main/resources/ui/app/templates/components/sla-info.hbs
index 447bac2..2ebc259 100644
--- 
a/contrib/views/wfmanager/src/main/resources/ui/app/templates/components/sla-info.hbs
+++ 
b/contrib/views/wfmanager/src/main/resources/ui/app/templates/components/sla-info.hbs
@@ -35,7 +35,7 @@
   
 Should Start
 
-  {{input class="form-control" type="text" 
value=slaInfo.shouldStart.time placeholder="Should Start"}}
+  {{input class="form-control" type="text" 
value=slaInfo.shouldStart.time placeholder="Time period(eg. 5)" title="Time 
period in minutes/hours/days"}}
   {{field-error model=this field='slaInfo.shouldStart.time' 
showErrorMessage=showErrorMessage}}
 
 
@@ -50,7 +50,7 @@
   
 Should End*
 
-  {{input class="form-control" type="text" 
value=slaInfo.shouldEnd.time placeholder="Should End"}}
+  {{input class="form-control" type="text" 
value=slaInfo.shouldEnd.time placeholder="Time period(eg. 5)" title="Time 
period in minutes/hours/days"}}
   {{field-error model=this field='slaInfo.shouldEnd.time' 
showErrorMessage=showErrorMessage}}
 
 
@@ -65,7 +65,7 @@
   
 Max Duration
 
-  {{input class="form-control" type="text" 
value=slaInfo.maxDuration.time placeholder="Max Duration"}}
+  {{input class="form-control" type="text" 
value=slaInfo.maxDuration.time placeholder="Time period(eg. 5)" title="Time 
period in minutes/hours/days"}}
 
 
   

http://git-wip-us.apache.org/repos/asf/ambari/blob/da7202d4/contrib/views/wfmanager/src/main/resources/ui/app/templates/components/sqoop-action.hbs
--
diff --git 
a/contrib/views/wfmanager/src/main/resources/ui/app/templates/components/sqoop-action.hbs
 
b/contrib/views/wfmanager/src/main/resources/ui/app/templates/components/sqoop-action.hbs
index 3f0ec61..fb59149 100644
--- 
a/contrib/views/wfmanager/src/main/resources/ui/app/templates/components/sqoop-action.hbs
+++ 
b/contrib/views/wfmanager/src/main/resources/ui/app/templates/components/sqoop-action.hbs
@@ -32,7 +32,7 @@
 
   Command
   
-{{input type="text" class="form-control" name="command" 

ambari git commit: AMBARI-19774. Undo Add Node feature needed for workflow designer similar to Undo Delete(Padma Priya N via gauravn7)

[gnagar]

Repository: ambari
Updated Branches:
  refs/heads/trunk 589f567e3 -> ff34b053d


AMBARI-19774. Undo Add Node feature needed for workflow designer similar to 
Undo Delete(Padma Priya N via gauravn7)


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

Branch: refs/heads/trunk
Commit: ff34b053d047889d261524f4b676b915a9176934
Parents: 589f567
Author: Gaurav Nagar 
Authored: Mon Jan 30 17:36:57 2017 +0530
Committer: Gaurav Nagar 
Committed: Mon Jan 30 17:37:49 2017 +0530

--
 .../src/main/resources/ui/app/components/flow-designer.js| 5 +++--
 .../resources/ui/app/templates/components/flow-designer.hbs  | 8 +---
 2 files changed, 8 insertions(+), 5 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/ff34b053/contrib/views/wfmanager/src/main/resources/ui/app/components/flow-designer.js
--
diff --git 
a/contrib/views/wfmanager/src/main/resources/ui/app/components/flow-designer.js 
b/contrib/views/wfmanager/src/main/resources/ui/app/components/flow-designer.js
index 1292832..f863656 100644
--- 
a/contrib/views/wfmanager/src/main/resources/ui/app/components/flow-designer.js
+++ 
b/contrib/views/wfmanager/src/main/resources/ui/app/components/flow-designer.js
@@ -616,7 +616,7 @@ export default Ember.Component.extend(FindNodeMixin, 
Validations, {
 }
 this.rerender();
 this.doValidation();
-this.showUndo('node');
+this.showUndo('nodeDeleted');
   },
   addWorkflowBranch(node){
 this.createSnapshot();
@@ -846,6 +846,7 @@ export default Ember.Component.extend(FindNodeMixin, 
Validations, {
   this.rerender();
   this.doValidation();
   this.scrollToNewPosition();
+  this.showUndo('nodeAdded');
 },
 nameChanged(){
   this.doValidation();
@@ -1095,7 +1096,7 @@ export default Ember.Component.extend(FindNodeMixin, 
Validations, {
   this.persistWorkInProgress();
 },
 
-undoDelete () {
+undo () {
   var workflowImporter = WorkflowJsonImporter.create({});
   var workflow = 
workflowImporter.importWorkflow(this.get('workflowSnapshot'));
   this.resetDesigner();

http://git-wip-us.apache.org/repos/asf/ambari/blob/ff34b053/contrib/views/wfmanager/src/main/resources/ui/app/templates/components/flow-designer.hbs
--
diff --git 
a/contrib/views/wfmanager/src/main/resources/ui/app/templates/components/flow-designer.hbs
 
b/contrib/views/wfmanager/src/main/resources/ui/app/templates/components/flow-designer.hbs
index 2b8844e..df0a9ba 100644
--- 
a/contrib/views/wfmanager/src/main/resources/ui/app/templates/components/flow-designer.hbs
+++ 
b/contrib/views/wfmanager/src/main/resources/ui/app/templates/components/flow-designer.hbs
@@ -141,10 +141,12 @@
   {{designer-errors errors=errors validationErrors=validationErrors}}
   {{#if undoAvailable}}
 
-  {{#if (eq undoType 'node')}}
-Node {{deletedNode.name}} deleted Undo
+  {{#if (eq undoType 'nodeDeleted')}}
+Node deleted Undo
+  {{else if (eq undoType 'nodeAdded')}}
+Node added Undo
   {{else}}
-Transition deleted Undo
+Transition deleted Undo
   {{/if}}
 
   {{/if}}

ambari git commit: AMBARI-19774. Undo Add Node feature needed for workflow designer similar to Undo Delete(Padma Priya N via gauravn7)

[gnagar]

Repository: ambari
Updated Branches:
  refs/heads/branch-2.5 1e921872e -> 984d2


AMBARI-19774. Undo Add Node feature needed for workflow designer similar to 
Undo Delete(Padma Priya N via gauravn7)


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

Branch: refs/heads/branch-2.5
Commit: 984d287b354aa4f9ba0b3ca9958d3b595c07
Parents: 1e92187
Author: Gaurav Nagar 
Authored: Mon Jan 30 17:36:57 2017 +0530
Committer: Gaurav Nagar 
Committed: Mon Jan 30 17:36:57 2017 +0530

--
 .../src/main/resources/ui/app/components/flow-designer.js| 5 +++--
 .../resources/ui/app/templates/components/flow-designer.hbs  | 8 +---
 2 files changed, 8 insertions(+), 5 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/984d/contrib/views/wfmanager/src/main/resources/ui/app/components/flow-designer.js
--
diff --git 
a/contrib/views/wfmanager/src/main/resources/ui/app/components/flow-designer.js 
b/contrib/views/wfmanager/src/main/resources/ui/app/components/flow-designer.js
index 1292832..f863656 100644
--- 
a/contrib/views/wfmanager/src/main/resources/ui/app/components/flow-designer.js
+++ 
b/contrib/views/wfmanager/src/main/resources/ui/app/components/flow-designer.js
@@ -616,7 +616,7 @@ export default Ember.Component.extend(FindNodeMixin, 
Validations, {
 }
 this.rerender();
 this.doValidation();
-this.showUndo('node');
+this.showUndo('nodeDeleted');
   },
   addWorkflowBranch(node){
 this.createSnapshot();
@@ -846,6 +846,7 @@ export default Ember.Component.extend(FindNodeMixin, 
Validations, {
   this.rerender();
   this.doValidation();
   this.scrollToNewPosition();
+  this.showUndo('nodeAdded');
 },
 nameChanged(){
   this.doValidation();
@@ -1095,7 +1096,7 @@ export default Ember.Component.extend(FindNodeMixin, 
Validations, {
   this.persistWorkInProgress();
 },
 
-undoDelete () {
+undo () {
   var workflowImporter = WorkflowJsonImporter.create({});
   var workflow = 
workflowImporter.importWorkflow(this.get('workflowSnapshot'));
   this.resetDesigner();

http://git-wip-us.apache.org/repos/asf/ambari/blob/984d/contrib/views/wfmanager/src/main/resources/ui/app/templates/components/flow-designer.hbs
--
diff --git 
a/contrib/views/wfmanager/src/main/resources/ui/app/templates/components/flow-designer.hbs
 
b/contrib/views/wfmanager/src/main/resources/ui/app/templates/components/flow-designer.hbs
index 2b8844e..df0a9ba 100644
--- 
a/contrib/views/wfmanager/src/main/resources/ui/app/templates/components/flow-designer.hbs
+++ 
b/contrib/views/wfmanager/src/main/resources/ui/app/templates/components/flow-designer.hbs
@@ -141,10 +141,12 @@
   {{designer-errors errors=errors validationErrors=validationErrors}}
   {{#if undoAvailable}}
 
-  {{#if (eq undoType 'node')}}
-Node {{deletedNode.name}} deleted Undo
+  {{#if (eq undoType 'nodeDeleted')}}
+Node deleted Undo
+  {{else if (eq undoType 'nodeAdded')}}
+Node added Undo
   {{else}}
-Transition deleted Undo
+Transition deleted Undo
   {{/if}}
 
   {{/if}}

ambari git commit: AMBARI-19753. Hive2 View - Switching tabs after executing query loses state (pallavkul)

[pallavkul]

Repository: ambari
Updated Branches:
  refs/heads/branch-2.5 3aeb3ce31 -> 1e921872e


AMBARI-19753. Hive2 View - Switching tabs after executing query loses state 
(pallavkul)


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

Branch: refs/heads/branch-2.5
Commit: 1e921872e65eace3a6bda3a008d243dec255bfba
Parents: 3aeb3ce
Author: pallavkul 
Authored: Mon Jan 30 15:24:03 2017 +0530
Committer: pallavkul 
Committed: Mon Jan 30 15:28:31 2017 +0530

--
 .../src/main/resources/ui/app/models/worksheet.js   |  3 ++-
 .../src/main/resources/ui/app/routes/queries/query.js   | 12 ++--
 .../main/resources/ui/app/templates/queries/query.hbs   |  2 +-
 3 files changed, 9 insertions(+), 8 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/1e921872/contrib/views/hive20/src/main/resources/ui/app/models/worksheet.js
--
diff --git a/contrib/views/hive20/src/main/resources/ui/app/models/worksheet.js 
b/contrib/views/hive20/src/main/resources/ui/app/models/worksheet.js
index 9021e90..6a77633 100644
--- a/contrib/views/hive20/src/main/resources/ui/app/models/worksheet.js
+++ b/contrib/views/hive20/src/main/resources/ui/app/models/worksheet.js
@@ -35,6 +35,7 @@ export default DS.Model.extend({
   selectedMultiDb: DS.attr(),
   queryFile: DS.attr('string', {defaultValue: ""}),
   logFile: DS.attr('string', {defaultValue: ""}),
-  logResults: DS.attr('string', {defaultValue: ""})
+  logResults: DS.attr('string', {defaultValue: ""}),
+  isQueryRunning: DS.attr('boolean', {defaultValue: false})
 
 });

http://git-wip-us.apache.org/repos/asf/ambari/blob/1e921872/contrib/views/hive20/src/main/resources/ui/app/routes/queries/query.js
--
diff --git 
a/contrib/views/hive20/src/main/resources/ui/app/routes/queries/query.js 
b/contrib/views/hive20/src/main/resources/ui/app/routes/queries/query.js
index 7d387f0..753b7f7 100644
--- a/contrib/views/hive20/src/main/resources/ui/app/routes/queries/query.js
+++ b/contrib/views/hive20/src/main/resources/ui/app/routes/queries/query.js
@@ -75,10 +75,10 @@ export default Ember.Route.extend({
 selectedMultiDb.pushObject(selecteDBName);
 
 controller.set('worksheet', model);
-
controller.set('selectedTablesModels',this.get('controller.model').get('selectedTablesModels')
 || selectedTablesModels );
+controller.set('selectedTablesModels',model.get('selectedTablesModels') || 
selectedTablesModels );
 
-controller.set('selectedMultiDb', 
this.get('controller.model').get('selectedMultiDb') || selectedMultiDb);
-controller.set('isQueryRunning', false);
+controller.set('selectedMultiDb', model.get('selectedMultiDb') || 
selectedMultiDb);
+controller.set('isQueryRunning', model.get('isQueryRunning'));
 controller.set('currentQuery', model.get('query'));
 controller.set('queryResult', model.get('queryResult'));
 controller.set('currentJobId', null);
@@ -143,7 +143,7 @@ export default Ember.Route.extend({
   let worksheetTitle = this.get('controller.model').get('title');
 
   self.get('controller.model').set('jobData', []);
-  self.get('controller').set('isQueryRunning', true);
+  self.get('controller.model').set('isQueryRunning', true);
 
   //Making the result set emply every time query runs.
   self.get('controller').set('queryResult', 
self.get('controller').get('queryResult'));
@@ -247,7 +247,7 @@ export default Ember.Route.extend({
 
 self.get('controller').set('queryResult', data);
 self.get('controller.model').set('queryResult', data);
-self.get('controller').set('isQueryRunning', false);
+self.get('controller.model').set('isQueryRunning', false);
 
 let localArr = self.get('controller.model').get("jobData");
 localArr.push(data);
@@ -299,7 +299,7 @@ export default Ember.Route.extend({
   console.log('getJob route', data );
   self.get('controller').set('queryResult', data);
   self.get('controller.model').set('queryResult', data);
-  self.get('controller').set('isQueryRunning', false);
+  self.get('controller.model').set('isQueryRunning', false);
   self.get('controller.model').set('hidePreviousButton', false);
 
   let localArr = self.get('controller.model').get("jobData");

http://git-wip-us.apache.org/repos/asf/ambari/blob/1e921872/contrib/views/hive20/src/main/resources/ui/app/templates/queries/query.hbs
--
diff 

ambari git commit: AMBARI-19753. Hive2 View - Switching tabs after executing query loses state (pallavkul)

[pallavkul]

Repository: ambari
Updated Branches:
  refs/heads/trunk 75c126e49 -> 589f567e3


AMBARI-19753. Hive2 View - Switching tabs after executing query loses state 
(pallavkul)


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

Branch: refs/heads/trunk
Commit: 589f567e37800ff606f5c40eca99508ce8910899
Parents: 75c126e
Author: pallavkul 
Authored: Mon Jan 30 15:24:03 2017 +0530
Committer: pallavkul 
Committed: Mon Jan 30 15:24:03 2017 +0530

--
 .../src/main/resources/ui/app/models/worksheet.js   |  3 ++-
 .../src/main/resources/ui/app/routes/queries/query.js   | 12 ++--
 .../main/resources/ui/app/templates/queries/query.hbs   |  2 +-
 3 files changed, 9 insertions(+), 8 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/589f567e/contrib/views/hive20/src/main/resources/ui/app/models/worksheet.js
--
diff --git a/contrib/views/hive20/src/main/resources/ui/app/models/worksheet.js 
b/contrib/views/hive20/src/main/resources/ui/app/models/worksheet.js
index 9021e90..6a77633 100644
--- a/contrib/views/hive20/src/main/resources/ui/app/models/worksheet.js
+++ b/contrib/views/hive20/src/main/resources/ui/app/models/worksheet.js
@@ -35,6 +35,7 @@ export default DS.Model.extend({
   selectedMultiDb: DS.attr(),
   queryFile: DS.attr('string', {defaultValue: ""}),
   logFile: DS.attr('string', {defaultValue: ""}),
-  logResults: DS.attr('string', {defaultValue: ""})
+  logResults: DS.attr('string', {defaultValue: ""}),
+  isQueryRunning: DS.attr('boolean', {defaultValue: false})
 
 });

http://git-wip-us.apache.org/repos/asf/ambari/blob/589f567e/contrib/views/hive20/src/main/resources/ui/app/routes/queries/query.js
--
diff --git 
a/contrib/views/hive20/src/main/resources/ui/app/routes/queries/query.js 
b/contrib/views/hive20/src/main/resources/ui/app/routes/queries/query.js
index 7d387f0..753b7f7 100644
--- a/contrib/views/hive20/src/main/resources/ui/app/routes/queries/query.js
+++ b/contrib/views/hive20/src/main/resources/ui/app/routes/queries/query.js
@@ -75,10 +75,10 @@ export default Ember.Route.extend({
 selectedMultiDb.pushObject(selecteDBName);
 
 controller.set('worksheet', model);
-
controller.set('selectedTablesModels',this.get('controller.model').get('selectedTablesModels')
 || selectedTablesModels );
+controller.set('selectedTablesModels',model.get('selectedTablesModels') || 
selectedTablesModels );
 
-controller.set('selectedMultiDb', 
this.get('controller.model').get('selectedMultiDb') || selectedMultiDb);
-controller.set('isQueryRunning', false);
+controller.set('selectedMultiDb', model.get('selectedMultiDb') || 
selectedMultiDb);
+controller.set('isQueryRunning', model.get('isQueryRunning'));
 controller.set('currentQuery', model.get('query'));
 controller.set('queryResult', model.get('queryResult'));
 controller.set('currentJobId', null);
@@ -143,7 +143,7 @@ export default Ember.Route.extend({
   let worksheetTitle = this.get('controller.model').get('title');
 
   self.get('controller.model').set('jobData', []);
-  self.get('controller').set('isQueryRunning', true);
+  self.get('controller.model').set('isQueryRunning', true);
 
   //Making the result set emply every time query runs.
   self.get('controller').set('queryResult', 
self.get('controller').get('queryResult'));
@@ -247,7 +247,7 @@ export default Ember.Route.extend({
 
 self.get('controller').set('queryResult', data);
 self.get('controller.model').set('queryResult', data);
-self.get('controller').set('isQueryRunning', false);
+self.get('controller.model').set('isQueryRunning', false);
 
 let localArr = self.get('controller.model').get("jobData");
 localArr.push(data);
@@ -299,7 +299,7 @@ export default Ember.Route.extend({
   console.log('getJob route', data );
   self.get('controller').set('queryResult', data);
   self.get('controller.model').set('queryResult', data);
-  self.get('controller').set('isQueryRunning', false);
+  self.get('controller.model').set('isQueryRunning', false);
   self.get('controller.model').set('hidePreviousButton', false);
 
   let localArr = self.get('controller.model').get("jobData");

http://git-wip-us.apache.org/repos/asf/ambari/blob/589f567e/contrib/views/hive20/src/main/resources/ui/app/templates/queries/query.hbs
--
diff --git 

ambari git commit: AMBARI-19772. Job XML tag is not coming as part of FS action node (Madhan Mohan Reddy via gauravn7)

[gnagar]

Repository: ambari
Updated Branches:
  refs/heads/branch-2.5 009036a84 -> 3aeb3ce31


AMBARI-19772. Job XML tag is not coming as part of FS action node (Madhan Mohan 
Reddy via gauravn7)


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

Branch: refs/heads/branch-2.5
Commit: 3aeb3ce31ddb3eb6315c27ccb41f5552c8cefcc3
Parents: 009036a
Author: Gaurav Nagar 
Authored: Mon Jan 30 14:49:28 2017 +0530
Committer: Gaurav Nagar 
Committed: Mon Jan 30 14:50:25 2017 +0530

--
 .../wfmanager/src/main/resources/ui/app/domain/actionjob_hanlder.js | 1 +
 1 file changed, 1 insertion(+)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/3aeb3ce3/contrib/views/wfmanager/src/main/resources/ui/app/domain/actionjob_hanlder.js
--
diff --git 
a/contrib/views/wfmanager/src/main/resources/ui/app/domain/actionjob_hanlder.js 
b/contrib/views/wfmanager/src/main/resources/ui/app/domain/actionjob_hanlder.js
index c9d9887..2a82c24 100644
--- 
a/contrib/views/wfmanager/src/main/resources/ui/app/domain/actionjob_hanlder.js
+++ 
b/contrib/views/wfmanager/src/main/resources/ui/app/domain/actionjob_hanlder.js
@@ -363,6 +363,7 @@ var FSActionJobHandler=ActionJobHandler.extend({
   init(){
 this.mapping=[
   {xml:"name-node",domain:"nameNode"},
+  {xml:"job-xml",domain:"jobXml",occurs:"many",domainProperty:"value"},
   {xml:"configuration", customHandler:this.configurationMapper},
   {xml:"delete"},
   {xml:"mkdir"},

ambari git commit: AMBARI-19772. Job XML tag is not coming as part of FS action node (Madhan Mohan Reddy via gauravn7)

[gnagar]

Repository: ambari
Updated Branches:
  refs/heads/trunk 9f5a8bf6a -> 75c126e49


AMBARI-19772. Job XML tag is not coming as part of FS action node (Madhan Mohan 
Reddy via gauravn7)


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

Branch: refs/heads/trunk
Commit: 75c126e49231e3ed33e8cf7d6cd30747f7ef6db5
Parents: 9f5a8bf
Author: Gaurav Nagar 
Authored: Mon Jan 30 14:49:28 2017 +0530
Committer: Gaurav Nagar 
Committed: Mon Jan 30 14:49:28 2017 +0530

--
 .../wfmanager/src/main/resources/ui/app/domain/actionjob_hanlder.js | 1 +
 1 file changed, 1 insertion(+)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/75c126e4/contrib/views/wfmanager/src/main/resources/ui/app/domain/actionjob_hanlder.js
--
diff --git 
a/contrib/views/wfmanager/src/main/resources/ui/app/domain/actionjob_hanlder.js 
b/contrib/views/wfmanager/src/main/resources/ui/app/domain/actionjob_hanlder.js
index c9d9887..2a82c24 100644
--- 
a/contrib/views/wfmanager/src/main/resources/ui/app/domain/actionjob_hanlder.js
+++ 
b/contrib/views/wfmanager/src/main/resources/ui/app/domain/actionjob_hanlder.js
@@ -363,6 +363,7 @@ var FSActionJobHandler=ActionJobHandler.extend({
   init(){
 this.mapping=[
   {xml:"name-node",domain:"nameNode"},
+  {xml:"job-xml",domain:"jobXml",occurs:"many",domainProperty:"value"},
   {xml:"configuration", customHandler:this.configurationMapper},
   {xml:"delete"},
   {xml:"mkdir"},

ambari git commit: AMBARI-19666 : Fixed Hive view loosing one row every 100 row in result set. (nitirajrathore)

[nitiraj]

Repository: ambari
Updated Branches:
  refs/heads/branch-2.5 b75046d60 -> 009036a84


AMBARI-19666 : Fixed Hive view loosing one row every 100 row in result set. 
(nitirajrathore)


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

Branch: refs/heads/branch-2.5
Commit: 009036a840800ca8acff879cce1100b23acc2bcb
Parents: b75046d
Author: Nitiraj Singh Rathore 
Authored: Mon Jan 30 14:33:43 2017 +0530
Committer: Nitiraj Singh Rathore 
Committed: Mon Jan 30 14:43:09 2017 +0530

--
 .../org/apache/ambari/view/hive2/actor/ResultSetIterator.java | 3 ++-
 .../org/apache/ambari/view/hive20/actor/ResultSetIterator.java| 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/009036a8/contrib/views/hive-next/src/main/java/org/apache/ambari/view/hive2/actor/ResultSetIterator.java
--
diff --git 
a/contrib/views/hive-next/src/main/java/org/apache/ambari/view/hive2/actor/ResultSetIterator.java
 
b/contrib/views/hive-next/src/main/java/org/apache/ambari/view/hive2/actor/ResultSetIterator.java
index 1052bd4..5bde12d 100644
--- 
a/contrib/views/hive-next/src/main/java/org/apache/ambari/view/hive2/actor/ResultSetIterator.java
+++ 
b/contrib/views/hive-next/src/main/java/org/apache/ambari/view/hive2/actor/ResultSetIterator.java
@@ -116,7 +116,8 @@ public class ResultSetIterator extends HiveActor {
 }
 int index = 0;
 try {
-  while (resultSet.next() && index < batchSize) {
+  // check batchsize first becaue resultSet.next() fetches the new row as 
well before returning true/false.
+  while (index < batchSize && resultSet.next()) {
 index++;
 rows.add(getRowFromResultSet(resultSet));
   }

http://git-wip-us.apache.org/repos/asf/ambari/blob/009036a8/contrib/views/hive20/src/main/java/org/apache/ambari/view/hive20/actor/ResultSetIterator.java
--
diff --git 
a/contrib/views/hive20/src/main/java/org/apache/ambari/view/hive20/actor/ResultSetIterator.java
 
b/contrib/views/hive20/src/main/java/org/apache/ambari/view/hive20/actor/ResultSetIterator.java
index 4b4a407..5da5ee1 100644
--- 
a/contrib/views/hive20/src/main/java/org/apache/ambari/view/hive20/actor/ResultSetIterator.java
+++ 
b/contrib/views/hive20/src/main/java/org/apache/ambari/view/hive20/actor/ResultSetIterator.java
@@ -115,7 +115,8 @@ public class ResultSetIterator extends HiveActor {
 }
 int index = 0;
 try {
-  while (resultSet.next() && index < batchSize) {
+  // check batchsize first becaue resultSet.next() fetches the new row as 
well before returning true/false.
+  while (index < batchSize && resultSet.next()) {
 index++;
 rows.add(getRowFromResultSet(resultSet));
   }

ambari git commit: AMBARI-19666 : Fixed Hive view loosing one row every 100 row in result set. (nitirajrathore)

[nitiraj]

Repository: ambari
Updated Branches:
  refs/heads/trunk 37b414241 -> 9f5a8bf6a


AMBARI-19666 : Fixed Hive view loosing one row every 100 row in result set. 
(nitirajrathore)


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

Branch: refs/heads/trunk
Commit: 9f5a8bf6a7c670845adfa07369e9c56ff68e9798
Parents: 37b4142
Author: Nitiraj Singh Rathore 
Authored: Mon Jan 30 14:33:43 2017 +0530
Committer: Nitiraj Singh Rathore 
Committed: Mon Jan 30 14:34:26 2017 +0530

--
 .../org/apache/ambari/view/hive2/actor/ResultSetIterator.java | 3 ++-
 .../org/apache/ambari/view/hive20/actor/ResultSetIterator.java| 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/9f5a8bf6/contrib/views/hive-next/src/main/java/org/apache/ambari/view/hive2/actor/ResultSetIterator.java
--
diff --git 
a/contrib/views/hive-next/src/main/java/org/apache/ambari/view/hive2/actor/ResultSetIterator.java
 
b/contrib/views/hive-next/src/main/java/org/apache/ambari/view/hive2/actor/ResultSetIterator.java
index 1052bd4..5bde12d 100644
--- 
a/contrib/views/hive-next/src/main/java/org/apache/ambari/view/hive2/actor/ResultSetIterator.java
+++ 
b/contrib/views/hive-next/src/main/java/org/apache/ambari/view/hive2/actor/ResultSetIterator.java
@@ -116,7 +116,8 @@ public class ResultSetIterator extends HiveActor {
 }
 int index = 0;
 try {
-  while (resultSet.next() && index < batchSize) {
+  // check batchsize first becaue resultSet.next() fetches the new row as 
well before returning true/false.
+  while (index < batchSize && resultSet.next()) {
 index++;
 rows.add(getRowFromResultSet(resultSet));
   }

http://git-wip-us.apache.org/repos/asf/ambari/blob/9f5a8bf6/contrib/views/hive20/src/main/java/org/apache/ambari/view/hive20/actor/ResultSetIterator.java
--
diff --git 
a/contrib/views/hive20/src/main/java/org/apache/ambari/view/hive20/actor/ResultSetIterator.java
 
b/contrib/views/hive20/src/main/java/org/apache/ambari/view/hive20/actor/ResultSetIterator.java
index 4b4a407..5da5ee1 100644
--- 
a/contrib/views/hive20/src/main/java/org/apache/ambari/view/hive20/actor/ResultSetIterator.java
+++ 
b/contrib/views/hive20/src/main/java/org/apache/ambari/view/hive20/actor/ResultSetIterator.java
@@ -115,7 +115,8 @@ public class ResultSetIterator extends HiveActor {
 }
 int index = 0;
 try {
-  while (resultSet.next() && index < batchSize) {
+  // check batchsize first becaue resultSet.next() fetches the new row as 
well before returning true/false.
+  while (index < batchSize && resultSet.next()) {
 index++;
 rows.add(getRowFromResultSet(resultSet));
   }

ambari git commit: AMBARI-19744. Hive View 2.0: Hive view starts with an empty page. (dipayanb)

[dbhowmick]

Repository: ambari
Updated Branches:
  refs/heads/trunk abcd0637c -> 37b414241


AMBARI-19744. Hive View 2.0: Hive view starts with an empty page. (dipayanb)


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

Branch: refs/heads/trunk
Commit: 37b414241b9b8a7b909278335037b7c0fe6fa441
Parents: abcd063
Author: Dipayan Bhowmick 
Authored: Mon Jan 30 14:32:50 2017 +0530
Committer: Dipayan Bhowmick 
Committed: Mon Jan 30 14:33:41 2017 +0530

--
 .../src/main/resources/ui/app/routes/index.js   | 26 
 1 file changed, 26 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/37b41424/contrib/views/hive20/src/main/resources/ui/app/routes/index.js
--
diff --git a/contrib/views/hive20/src/main/resources/ui/app/routes/index.js 
b/contrib/views/hive20/src/main/resources/ui/app/routes/index.js
new file mode 100644
index 000..ddaff8a
--- /dev/null
+++ b/contrib/views/hive20/src/main/resources/ui/app/routes/index.js
@@ -0,0 +1,26 @@
+/**
+ * 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.
+ */
+
+import Ember from 'ember';
+
+export default Ember.Route.extend({
+  beforeModel() {
+this.transitionTo('queries');
+  }
+
+});

ambari git commit: AMBARI-19744. Hive View 2.0: Hive view starts with an empty page. (dipayanb)

[dbhowmick]

Repository: ambari
Updated Branches:
  refs/heads/branch-2.5 c9ab7a680 -> b75046d60


AMBARI-19744. Hive View 2.0: Hive view starts with an empty page. (dipayanb)


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

Branch: refs/heads/branch-2.5
Commit: b75046d6034198b4cc645e27d0dadee942c1bf94
Parents: c9ab7a6
Author: Dipayan Bhowmick 
Authored: Mon Jan 30 14:32:50 2017 +0530
Committer: Dipayan Bhowmick 
Committed: Mon Jan 30 14:32:50 2017 +0530

--
 .../src/main/resources/ui/app/routes/index.js   | 26 
 1 file changed, 26 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/b75046d6/contrib/views/hive20/src/main/resources/ui/app/routes/index.js
--
diff --git a/contrib/views/hive20/src/main/resources/ui/app/routes/index.js 
b/contrib/views/hive20/src/main/resources/ui/app/routes/index.js
new file mode 100644
index 000..ddaff8a
--- /dev/null
+++ b/contrib/views/hive20/src/main/resources/ui/app/routes/index.js
@@ -0,0 +1,26 @@
+/**
+ * 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.
+ */
+
+import Ember from 'ember';
+
+export default Ember.Route.extend({
+  beforeModel() {
+this.transitionTo('queries');
+  }
+
+});

ambari git commit: AMBARI-19752. Hive View 2.0 execute button needs some feedback (pallavkul)

[pallavkul]

Repository: ambari
Updated Branches:
  refs/heads/branch-2.5 fe1523fcb -> c9ab7a680


AMBARI-19752. Hive View 2.0 execute button needs some feedback (pallavkul)


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

Branch: refs/heads/branch-2.5
Commit: c9ab7a68004582f7a69faed5249ca2dd167fcae1
Parents: fe1523f
Author: pallavkul 
Authored: Mon Jan 30 14:27:44 2017 +0530
Committer: pallavkul 
Committed: Mon Jan 30 14:30:42 2017 +0530

--
 contrib/views/hive20/src/main/resources/ui/app/services/jobs.js  | 4 
 contrib/views/hive20/src/main/resources/ui/app/styles/app.scss   | 4 
 .../hive20/src/main/resources/ui/app/templates/queries/query.hbs | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/c9ab7a68/contrib/views/hive20/src/main/resources/ui/app/services/jobs.js
--
diff --git a/contrib/views/hive20/src/main/resources/ui/app/services/jobs.js 
b/contrib/views/hive20/src/main/resources/ui/app/services/jobs.js
index ff54152..5db22d0 100644
--- a/contrib/views/hive20/src/main/resources/ui/app/services/jobs.js
+++ b/contrib/views/hive20/src/main/resources/ui/app/services/jobs.js
@@ -27,16 +27,12 @@ export default Ember.Service.extend({
   },
 
   waitForJobToComplete(jobId, after, fetchDummyResult = true) {
-console.log()
 return new Ember.RSVP.Promise((resolve, reject) => {
   Ember.run.later(() => {
 this.get('store').findRecord('job', jobId, { reload: true })
   .then((job) => {
 let status = job.get('status').toLowerCase();
 if (status === 'succeeded') {
-  if (fetchDummyResult) {
-this._fetchDummyResult(jobId);
-  }
   resolve(status);
 } else if (status === 'error') {
   reject(status)

http://git-wip-us.apache.org/repos/asf/ambari/blob/c9ab7a68/contrib/views/hive20/src/main/resources/ui/app/styles/app.scss
--
diff --git a/contrib/views/hive20/src/main/resources/ui/app/styles/app.scss 
b/contrib/views/hive20/src/main/resources/ui/app/styles/app.scss
index e178222..17abb65 100644
--- a/contrib/views/hive20/src/main/resources/ui/app/styles/app.scss
+++ b/contrib/views/hive20/src/main/resources/ui/app/styles/app.scss
@@ -41,6 +41,10 @@
   height: 100%;
 }
 
+.fa-1-5{
+  font-size: 1.5em;
+}
+
 .fa-2 {
   font-size: 2em;
 }

http://git-wip-us.apache.org/repos/asf/ambari/blob/c9ab7a68/contrib/views/hive20/src/main/resources/ui/app/templates/queries/query.hbs
--
diff --git 
a/contrib/views/hive20/src/main/resources/ui/app/templates/queries/query.hbs 
b/contrib/views/hive20/src/main/resources/ui/app/templates/queries/query.hbs
index 9e9e542..7f91d6c 100644
--- a/contrib/views/hive20/src/main/resources/ui/app/templates/queries/query.hbs
+++ b/contrib/views/hive20/src/main/resources/ui/app/templates/queries/query.hbs
@@ -31,7 +31,7 @@
 {{fa-icon 
"check"}} Execute
 {{fa-icon "save"}} Save As
 {{#if isQueryRunning}}
-  http://www.bba-reman.com/images/fbloader.gif; height="22" 
width="32" />
+  {{fa-icon "spinner fa-1-5" spin=true}}
 {{/if}}
   
 

ambari git commit: AMBARI-19752. Hive View 2.0 execute button needs some feedback (pallavkul)

[pallavkul]

Repository: ambari
Updated Branches:
  refs/heads/trunk 985dafff5 -> abcd0637c


AMBARI-19752. Hive View 2.0 execute button needs some feedback (pallavkul)


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

Branch: refs/heads/trunk
Commit: abcd0637c6f3328d0a6345e0573c30615cdcde83
Parents: 985daff
Author: pallavkul 
Authored: Mon Jan 30 14:27:44 2017 +0530
Committer: pallavkul 
Committed: Mon Jan 30 14:29:15 2017 +0530

--
 contrib/views/hive20/src/main/resources/ui/app/services/jobs.js  | 4 
 contrib/views/hive20/src/main/resources/ui/app/styles/app.scss   | 4 
 .../hive20/src/main/resources/ui/app/templates/queries/query.hbs | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/abcd0637/contrib/views/hive20/src/main/resources/ui/app/services/jobs.js
--
diff --git a/contrib/views/hive20/src/main/resources/ui/app/services/jobs.js 
b/contrib/views/hive20/src/main/resources/ui/app/services/jobs.js
index ff54152..5db22d0 100644
--- a/contrib/views/hive20/src/main/resources/ui/app/services/jobs.js
+++ b/contrib/views/hive20/src/main/resources/ui/app/services/jobs.js
@@ -27,16 +27,12 @@ export default Ember.Service.extend({
   },
 
   waitForJobToComplete(jobId, after, fetchDummyResult = true) {
-console.log()
 return new Ember.RSVP.Promise((resolve, reject) => {
   Ember.run.later(() => {
 this.get('store').findRecord('job', jobId, { reload: true })
   .then((job) => {
 let status = job.get('status').toLowerCase();
 if (status === 'succeeded') {
-  if (fetchDummyResult) {
-this._fetchDummyResult(jobId);
-  }
   resolve(status);
 } else if (status === 'error') {
   reject(status)

http://git-wip-us.apache.org/repos/asf/ambari/blob/abcd0637/contrib/views/hive20/src/main/resources/ui/app/styles/app.scss
--
diff --git a/contrib/views/hive20/src/main/resources/ui/app/styles/app.scss 
b/contrib/views/hive20/src/main/resources/ui/app/styles/app.scss
index e178222..17abb65 100644
--- a/contrib/views/hive20/src/main/resources/ui/app/styles/app.scss
+++ b/contrib/views/hive20/src/main/resources/ui/app/styles/app.scss
@@ -41,6 +41,10 @@
   height: 100%;
 }
 
+.fa-1-5{
+  font-size: 1.5em;
+}
+
 .fa-2 {
   font-size: 2em;
 }

http://git-wip-us.apache.org/repos/asf/ambari/blob/abcd0637/contrib/views/hive20/src/main/resources/ui/app/templates/queries/query.hbs
--
diff --git 
a/contrib/views/hive20/src/main/resources/ui/app/templates/queries/query.hbs 
b/contrib/views/hive20/src/main/resources/ui/app/templates/queries/query.hbs
index 9e9e542..7f91d6c 100644
--- a/contrib/views/hive20/src/main/resources/ui/app/templates/queries/query.hbs
+++ b/contrib/views/hive20/src/main/resources/ui/app/templates/queries/query.hbs
@@ -31,7 +31,7 @@
 {{fa-icon 
"check"}} Execute
 {{fa-icon "save"}} Save As
 {{#if isQueryRunning}}
-  http://www.bba-reman.com/images/fbloader.gif; height="22" 
width="32" />
+  {{fa-icon "spinner fa-1-5" spin=true}}
 {{/if}}
   
 

ambari git commit: AMBARI-19770. Hive View 2.0: New Job and New Table button does nothing. (dipayanb)

[dbhowmick]

Repository: ambari
Updated Branches:
  refs/heads/trunk ea1fbaa02 -> 985dafff5


AMBARI-19770. Hive View 2.0: New Job and New Table button does nothing. 
(dipayanb)


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

Branch: refs/heads/trunk
Commit: 985dafff5330b97e4b92f1c4cf67ee201a8e6edd
Parents: ea1fbaa
Author: Dipayan Bhowmick 
Authored: Mon Jan 30 14:26:07 2017 +0530
Committer: Dipayan Bhowmick 
Committed: Mon Jan 30 14:28:04 2017 +0530

--
 .../hive20/src/main/resources/ui/app/app.js |  9 
 .../resources/ui/app/controllers/queries.js | 22 +
 .../main/resources/ui/app/models/worksheet.js   |  2 +-
 .../hive20/src/main/resources/ui/app/router.js  |  2 +
 .../main/resources/ui/app/routes/application.js |  4 +-
 .../ui/app/routes/databases/newtable.js | 30 
 .../src/main/resources/ui/app/routes/queries.js | 49 +---
 .../resources/ui/app/routes/queries/index.js|  9 ++--
 .../main/resources/ui/app/routes/queries/new.js | 38 +++
 .../resources/ui/app/routes/queries/query.js| 17 ---
 .../src/main/resources/ui/app/services/jobs.js  |  6 ++-
 .../components/top-application-bar.hbs  |  4 +-
 .../src/main/resources/ui/config/environment.js |  2 +
 13 files changed, 130 insertions(+), 64 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/985dafff/contrib/views/hive20/src/main/resources/ui/app/app.js
--
diff --git a/contrib/views/hive20/src/main/resources/ui/app/app.js 
b/contrib/views/hive20/src/main/resources/ui/app/app.js
index af4fdc4..0f83ee5 100644
--- a/contrib/views/hive20/src/main/resources/ui/app/app.js
+++ b/contrib/views/hive20/src/main/resources/ui/app/app.js
@@ -26,6 +26,15 @@ let App;
 Ember.MODEL_FACTORY_INJECTIONS = true;
 
 App = Ember.Application.extend({
+  // Basic logging, e.g. "Transitioned into 'post'"
+  LOG_TRANSITIONS: false,
+
+  // Extremely detailed logging, highlighting every internal
+  // step made while transitioning into a route, including
+  // `beforeModel`, `model`, and `afterModel` hooks, and
+  // information about redirects and aborted transitions
+  LOG_TRANSITIONS_INTERNAL: false,
+
   modulePrefix: config.modulePrefix,
   podModulePrefix: config.podModulePrefix,
   Resolver

http://git-wip-us.apache.org/repos/asf/ambari/blob/985dafff/contrib/views/hive20/src/main/resources/ui/app/controllers/queries.js
--
diff --git 
a/contrib/views/hive20/src/main/resources/ui/app/controllers/queries.js 
b/contrib/views/hive20/src/main/resources/ui/app/controllers/queries.js
new file mode 100644
index 000..dc99fd1
--- /dev/null
+++ b/contrib/views/hive20/src/main/resources/ui/app/controllers/queries.js
@@ -0,0 +1,22 @@
+/**
+ * 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.
+ */
+
+import Ember from 'ember';
+
+export default Ember.Controller.extend({
+});

http://git-wip-us.apache.org/repos/asf/ambari/blob/985dafff/contrib/views/hive20/src/main/resources/ui/app/models/worksheet.js
--
diff --git a/contrib/views/hive20/src/main/resources/ui/app/models/worksheet.js 
b/contrib/views/hive20/src/main/resources/ui/app/models/worksheet.js
index 23f16b0..9021e90 100644
--- a/contrib/views/hive20/src/main/resources/ui/app/models/worksheet.js
+++ b/contrib/views/hive20/src/main/resources/ui/app/models/worksheet.js
@@ -20,7 +20,7 @@ import DS from 'ember-data';
 
 export default DS.Model.extend({
   title: DS.attr('string'),
-  query: DS.attr('string'),
+  query: DS.attr('string', {defaultValue: ''}),
   selectedDb: DS.attr('string'),
   owner: DS.attr('string'),
   queryResult: DS.attr({defaultValue: {'schema' :[], 'rows' :[]}}),

ambari git commit: AMBARI-19770. Hive View 2.0: New Job and New Table button does nothing. (dipayanb)

[dbhowmick]

Repository: ambari
Updated Branches:
  refs/heads/branch-2.5 c850ad731 -> fe1523fcb


AMBARI-19770. Hive View 2.0: New Job and New Table button does nothing. 
(dipayanb)


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

Branch: refs/heads/branch-2.5
Commit: fe1523fcb36b3ce69209fd5b1a6f693756f7526f
Parents: c850ad7
Author: Dipayan Bhowmick 
Authored: Mon Jan 30 14:26:07 2017 +0530
Committer: Dipayan Bhowmick 
Committed: Mon Jan 30 14:27:09 2017 +0530

--
 .../hive20/src/main/resources/ui/app/app.js |  9 
 .../resources/ui/app/controllers/queries.js | 22 +
 .../main/resources/ui/app/models/worksheet.js   |  2 +-
 .../hive20/src/main/resources/ui/app/router.js  |  2 +
 .../main/resources/ui/app/routes/application.js |  4 +-
 .../ui/app/routes/databases/newtable.js | 30 
 .../src/main/resources/ui/app/routes/queries.js | 49 +---
 .../resources/ui/app/routes/queries/index.js|  9 ++--
 .../main/resources/ui/app/routes/queries/new.js | 38 +++
 .../resources/ui/app/routes/queries/query.js| 17 ---
 .../src/main/resources/ui/app/services/jobs.js  |  6 ++-
 .../components/top-application-bar.hbs  |  4 +-
 .../src/main/resources/ui/config/environment.js |  2 +
 13 files changed, 130 insertions(+), 64 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/fe1523fc/contrib/views/hive20/src/main/resources/ui/app/app.js
--
diff --git a/contrib/views/hive20/src/main/resources/ui/app/app.js 
b/contrib/views/hive20/src/main/resources/ui/app/app.js
index af4fdc4..0f83ee5 100644
--- a/contrib/views/hive20/src/main/resources/ui/app/app.js
+++ b/contrib/views/hive20/src/main/resources/ui/app/app.js
@@ -26,6 +26,15 @@ let App;
 Ember.MODEL_FACTORY_INJECTIONS = true;
 
 App = Ember.Application.extend({
+  // Basic logging, e.g. "Transitioned into 'post'"
+  LOG_TRANSITIONS: false,
+
+  // Extremely detailed logging, highlighting every internal
+  // step made while transitioning into a route, including
+  // `beforeModel`, `model`, and `afterModel` hooks, and
+  // information about redirects and aborted transitions
+  LOG_TRANSITIONS_INTERNAL: false,
+
   modulePrefix: config.modulePrefix,
   podModulePrefix: config.podModulePrefix,
   Resolver

http://git-wip-us.apache.org/repos/asf/ambari/blob/fe1523fc/contrib/views/hive20/src/main/resources/ui/app/controllers/queries.js
--
diff --git 
a/contrib/views/hive20/src/main/resources/ui/app/controllers/queries.js 
b/contrib/views/hive20/src/main/resources/ui/app/controllers/queries.js
new file mode 100644
index 000..dc99fd1
--- /dev/null
+++ b/contrib/views/hive20/src/main/resources/ui/app/controllers/queries.js
@@ -0,0 +1,22 @@
+/**
+ * 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.
+ */
+
+import Ember from 'ember';
+
+export default Ember.Controller.extend({
+});

http://git-wip-us.apache.org/repos/asf/ambari/blob/fe1523fc/contrib/views/hive20/src/main/resources/ui/app/models/worksheet.js
--
diff --git a/contrib/views/hive20/src/main/resources/ui/app/models/worksheet.js 
b/contrib/views/hive20/src/main/resources/ui/app/models/worksheet.js
index 23f16b0..9021e90 100644
--- a/contrib/views/hive20/src/main/resources/ui/app/models/worksheet.js
+++ b/contrib/views/hive20/src/main/resources/ui/app/models/worksheet.js
@@ -20,7 +20,7 @@ import DS from 'ember-data';
 
 export default DS.Model.extend({
   title: DS.attr('string'),
-  query: DS.attr('string'),
+  query: DS.attr('string', {defaultValue: ''}),
   selectedDb: DS.attr('string'),
   owner: DS.attr('string'),
   queryResult: DS.attr({defaultValue: {'schema' :[], 'rows' :[]}}),

ambari git commit: AMBARI-19750. Hive2 view - Clicking on browse databases does not work (pallavkul)

[pallavkul]

Repository: ambari
Updated Branches:
  refs/heads/branch-2.5 7aad1cab7 -> c850ad731


AMBARI-19750. Hive2 view - Clicking on browse databases does not work 
(pallavkul)


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

Branch: refs/heads/branch-2.5
Commit: c850ad731af9e52afe68fbc9f0aa3c003ecefb4a
Parents: 7aad1ca
Author: pallavkul 
Authored: Mon Jan 30 14:21:16 2017 +0530
Committer: pallavkul 
Committed: Mon Jan 30 14:22:58 2017 +0530

--
 .../components/multiple-database-search-bar.js  | 31 +++-
 .../components/multiple-database-search-bar.hbs | 11 ---
 2 files changed, 35 insertions(+), 7 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/c850ad73/contrib/views/hive20/src/main/resources/ui/app/components/multiple-database-search-bar.js
--
diff --git 
a/contrib/views/hive20/src/main/resources/ui/app/components/multiple-database-search-bar.js
 
b/contrib/views/hive20/src/main/resources/ui/app/components/multiple-database-search-bar.js
index 817a826..c27f80f 100644
--- 
a/contrib/views/hive20/src/main/resources/ui/app/components/multiple-database-search-bar.js
+++ 
b/contrib/views/hive20/src/main/resources/ui/app/components/multiple-database-search-bar.js
@@ -66,6 +66,12 @@ export default Ember.Component.extend({
 return selecteddblist;
   }),
 
+  focusComesFromOutside(e){
+let blurredEl = e.relatedTarget;
+return !blurredEl || 
!blurredEl.classList.contains('ember-power-select-search-input');
+  },
+
+
   actions: {
 createOnEnter(select, e) {
   if (e.keyCode === 13 && select.isOpen &&
@@ -79,10 +85,33 @@ export default Ember.Component.extend({
   }
 },
 
+handleFocus(select, e) {
+  if (this.focusComesFromOutside(e)) {
+select.actions.open();
+this.$('.browse').addClass('open');
+  }
+
+},
+
+handleBlur() {
+  //console.log('handleBlur');
+},
+
 updateTables(){
   this.sendAction('changeDbHandler', this.get('selectedDbs'));
-}
+},
+
+browse(){
 
+  if(this.$('.browse').hasClass('open')){
+this.$('.browse').removeClass('open');
+this.$('.multiple-db-select input').focusout();
+  } else {
+this.$('.browse').addClass('open');
+this.$('.multiple-db-select input').focus();
+  }
+
+}
   }
 
 });

http://git-wip-us.apache.org/repos/asf/ambari/blob/c850ad73/contrib/views/hive20/src/main/resources/ui/app/templates/components/multiple-database-search-bar.hbs
--
diff --git 
a/contrib/views/hive20/src/main/resources/ui/app/templates/components/multiple-database-search-bar.hbs
 
b/contrib/views/hive20/src/main/resources/ui/app/templates/components/multiple-database-search-bar.hbs
index cc102b4..e620347 100644
--- 
a/contrib/views/hive20/src/main/resources/ui/app/templates/components/multiple-database-search-bar.hbs
+++ 
b/contrib/views/hive20/src/main/resources/ui/app/templates/components/multiple-database-search-bar.hbs
@@ -22,22 +22,21 @@
 
 
   
-
 {{#power-select-multiple
+class="multiple-db-select"
 placeholder="Search databases"
 options=allDbs
 selected=selectedMultiDb
 onchange=(pipe-action (action (mut selectedDbs)) (action "updateTables"))
+onfocus=(action "handleFocus")
+onblur=(action "handleBlur")
 onkeydown=(action "createOnEnter")
 as |number|}}
   {{fa-icon "database"}} {{number}}
 {{/power-select-multiple}}
-
-
-  {{fa-icon "folder"}} 
Browse 
+
+  {{fa-icon "folder"}} Browse 
 
-
-
   
 
 

ambari git commit: AMBARI-19750. Hive2 view - Clicking on browse databases does not work (pallavkul)

[pallavkul]

Repository: ambari
Updated Branches:
  refs/heads/trunk c977113cc -> ea1fbaa02


AMBARI-19750. Hive2 view - Clicking on browse databases does not work 
(pallavkul)


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

Branch: refs/heads/trunk
Commit: ea1fbaa020907c7a433275447043b509f8868dcd
Parents: c977113
Author: pallavkul 
Authored: Mon Jan 30 14:21:16 2017 +0530
Committer: pallavkul 
Committed: Mon Jan 30 14:21:16 2017 +0530

--
 .../components/multiple-database-search-bar.js  | 31 +++-
 .../components/multiple-database-search-bar.hbs | 11 ---
 2 files changed, 35 insertions(+), 7 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/ea1fbaa0/contrib/views/hive20/src/main/resources/ui/app/components/multiple-database-search-bar.js
--
diff --git 
a/contrib/views/hive20/src/main/resources/ui/app/components/multiple-database-search-bar.js
 
b/contrib/views/hive20/src/main/resources/ui/app/components/multiple-database-search-bar.js
index 817a826..c27f80f 100644
--- 
a/contrib/views/hive20/src/main/resources/ui/app/components/multiple-database-search-bar.js
+++ 
b/contrib/views/hive20/src/main/resources/ui/app/components/multiple-database-search-bar.js
@@ -66,6 +66,12 @@ export default Ember.Component.extend({
 return selecteddblist;
   }),
 
+  focusComesFromOutside(e){
+let blurredEl = e.relatedTarget;
+return !blurredEl || 
!blurredEl.classList.contains('ember-power-select-search-input');
+  },
+
+
   actions: {
 createOnEnter(select, e) {
   if (e.keyCode === 13 && select.isOpen &&
@@ -79,10 +85,33 @@ export default Ember.Component.extend({
   }
 },
 
+handleFocus(select, e) {
+  if (this.focusComesFromOutside(e)) {
+select.actions.open();
+this.$('.browse').addClass('open');
+  }
+
+},
+
+handleBlur() {
+  //console.log('handleBlur');
+},
+
 updateTables(){
   this.sendAction('changeDbHandler', this.get('selectedDbs'));
-}
+},
+
+browse(){
 
+  if(this.$('.browse').hasClass('open')){
+this.$('.browse').removeClass('open');
+this.$('.multiple-db-select input').focusout();
+  } else {
+this.$('.browse').addClass('open');
+this.$('.multiple-db-select input').focus();
+  }
+
+}
   }
 
 });

http://git-wip-us.apache.org/repos/asf/ambari/blob/ea1fbaa0/contrib/views/hive20/src/main/resources/ui/app/templates/components/multiple-database-search-bar.hbs
--
diff --git 
a/contrib/views/hive20/src/main/resources/ui/app/templates/components/multiple-database-search-bar.hbs
 
b/contrib/views/hive20/src/main/resources/ui/app/templates/components/multiple-database-search-bar.hbs
index cc102b4..e620347 100644
--- 
a/contrib/views/hive20/src/main/resources/ui/app/templates/components/multiple-database-search-bar.hbs
+++ 
b/contrib/views/hive20/src/main/resources/ui/app/templates/components/multiple-database-search-bar.hbs
@@ -22,22 +22,21 @@
 
 
   
-
 {{#power-select-multiple
+class="multiple-db-select"
 placeholder="Search databases"
 options=allDbs
 selected=selectedMultiDb
 onchange=(pipe-action (action (mut selectedDbs)) (action "updateTables"))
+onfocus=(action "handleFocus")
+onblur=(action "handleBlur")
 onkeydown=(action "createOnEnter")
 as |number|}}
   {{fa-icon "database"}} {{number}}
 {{/power-select-multiple}}
-
-
-  {{fa-icon "folder"}} 
Browse 
+
+  {{fa-icon "folder"}} Browse 
 
-
-