ambari git commit: AMBARI-12811: Disable old APIs to manage baseurl values (Nahappan Somasundaram via jluniya)

2015-08-26 Thread jluniya 
Repository: ambari
Updated Branches:
  refs/heads/trunk 7819edfd1 - bbb042f32


AMBARI-12811: Disable old APIs to manage baseurl values (Nahappan Somasundaram 
via jluniya)


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

Branch: refs/heads/trunk
Commit: bbb042f32d5b7bb3937d6426f16243fd27effb45
Parents: 7819edf
Author: Jayush Luniya jlun...@hortonworks.com
Authored: Wed Aug 26 08:48:49 2015 -0700
Committer: Jayush Luniya jlun...@hortonworks.com
Committed: Wed Aug 26 08:48:49 2015 -0700

--
 ambari-server/conf/unix/ambari.properties   |  3 ++
 .../server/configuration/Configuration.java |  9 +
 .../AmbariManagementControllerImpl.java | 23 +--
 .../AmbariManagementControllerTest.java | 42 
 4 files changed, 73 insertions(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/bbb042f3/ambari-server/conf/unix/ambari.properties
--
diff --git a/ambari-server/conf/unix/ambari.properties 
b/ambari-server/conf/unix/ambari.properties
index 75e0fe1..43faa2f 100644
--- a/ambari-server/conf/unix/ambari.properties
+++ b/ambari-server/conf/unix/ambari.properties
@@ -92,3 +92,6 @@ skip.service.checks=false
 
 rolling.upgrade.min.stack=HDP-2.2
 rolling.upgrade.max.stack=
+
+# stack version for deprecating base url in metainfo table
+baseurl.api.metainfo.deprecate.min.version=2.2

http://git-wip-us.apache.org/repos/asf/ambari/blob/bbb042f3/ambari-server/src/main/java/org/apache/ambari/server/configuration/Configuration.java
--
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/configuration/Configuration.java
 
b/ambari-server/src/main/java/org/apache/ambari/server/configuration/Configuration.java
index 0b0ee95..67fb08e 100644
--- 
a/ambari-server/src/main/java/org/apache/ambari/server/configuration/Configuration.java
+++ 
b/ambari-server/src/main/java/org/apache/ambari/server/configuration/Configuration.java
@@ -438,6 +438,12 @@ public class Configuration {
   public static final String ALERTS_EXECUTION_SCHEDULER_THREADS_KEY = 
alerts.execution.scheduler.maxThreads;
   public static final String ALERTS_EXECUTION_SCHEDULER_THREADS_DEFAULT = 2;
 
+  /**
+   * Repository Base URL is no longer stored in metainfo table starting HDP 
version 2.2. It is in repo_version table.
+   */
+  public static final String BASEURL_API_DEPRECATED_STACK_VERSION = 
baseurl.api.metainfo.deprecate.min.version;
+  public static final String BASEURL_API_DEPRECATED_STACK_VERSION_DEFAULT = 
2.2;
+
   private static final Logger LOG = LoggerFactory.getLogger(
   Configuration.class);
 
@@ -636,6 +642,9 @@ public class Configuration {
 configsMap.put(PROXY_ALLOWED_HOST_PORTS, properties.getProperty(
 PROXY_ALLOWED_HOST_PORTS, PROXY_ALLOWED_HOST_PORTS_DEFAULT));
 
+configsMap.put(BASEURL_API_DEPRECATED_STACK_VERSION, 
properties.getProperty(
+BASEURL_API_DEPRECATED_STACK_VERSION, 
BASEURL_API_DEPRECATED_STACK_VERSION_DEFAULT));
+
 File passFile = new File(configsMap.get(SRVR_KSTR_DIR_KEY) + File.separator
 + configsMap.get(SRVR_CRT_PASS_FILE_KEY));
 String password = null;

http://git-wip-us.apache.org/repos/asf/ambari/blob/bbb042f3/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariManagementControllerImpl.java
--
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariManagementControllerImpl.java
 
b/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariManagementControllerImpl.java
index ef6fc58..fe7f369 100644
--- 
a/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariManagementControllerImpl.java
+++ 
b/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariManagementControllerImpl.java
@@ -160,6 +160,7 @@ import 
org.apache.ambari.server.state.svccomphost.ServiceComponentHostStartEvent
 import 
org.apache.ambari.server.state.svccomphost.ServiceComponentHostStopEvent;
 import 
org.apache.ambari.server.state.svccomphost.ServiceComponentHostUpgradeEvent;
 import org.apache.ambari.server.utils.StageUtils;
+import org.apache.ambari.server.utils.VersionUtils;
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.collections.MultiMap;
 import org.apache.commons.io.IOUtils;
@@ -3501,14 +3502,28 @@ public class AmbariManagementControllerImpl implements 
AmbariManagementControlle
   @Override
   public void updateRepositories(SetRepositoryRequest

ambari git commit: AMBARI-12878: BE: Ambari Server start fails with SQLA DB type due to typo in ambari_server_main.py (jluniya)

2015-08-26 Thread jluniya 
Repository: ambari
Updated Branches:
  refs/heads/trunk bbb042f32 - 24e752b94


AMBARI-12878: BE: Ambari Server start fails with SQLA DB type due to typo in 
ambari_server_main.py (jluniya)


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

Branch: refs/heads/trunk
Commit: 24e752b942afc73335f828d26fd95accbc1e8e2e
Parents: bbb042f
Author: Jayush Luniya jlun...@hortonworks.com
Authored: Wed Aug 26 08:57:45 2015 -0700
Committer: Jayush Luniya jlun...@hortonworks.com
Committed: Wed Aug 26 08:57:45 2015 -0700

--
 ambari-server/pom.xml   | 22 
 .../src/main/python/ambari_server_main.py   |  2 +-
 2 files changed, 23 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/24e752b9/ambari-server/pom.xml
--
diff --git a/ambari-server/pom.xml b/ambari-server/pom.xml
index cf99bee..01301da 100644
--- a/ambari-server/pom.xml
+++ b/ambari-server/pom.xml
@@ -513,6 +513,12 @@
   
locationsrc/main/resources/Ambari-DDL-SQLServer-DROP.sql/location
 /source
 source
+  
locationtarget/classes/Ambari-DDL-SQLAnywhere-CREATE.sql/location
+/source
+source
+  
locationsrc/main/resources/Ambari-DDL-SQLAnywhere-DROP.sql/location
+/source
+source
   
location${project.build.directory}/DBConnectionVerification.jar/location
 /source
 source
@@ -966,6 +972,22 @@
   /mapper
 /data
 data
+  srctarget/classes/Ambari-DDL-SQLAnywhere-CREATE.sql/src
+  typefile/type
+  mapper
+typeperm/type
+prefix/var/lib/ambari-server/resources/prefix
+  /mapper
+/data
+data
+  srcsrc/main/resources/Ambari-DDL-SQLAnywhere-DROP.sql/src
+  typefile/type
+  mapper
+typeperm/type
+prefix/var/lib/ambari-server/resources/prefix
+  /mapper
+/data
+data
   
src${project.build.directory}/DBConnectionVerification.jar/src
   typefile/type
   mapper

http://git-wip-us.apache.org/repos/asf/ambari/blob/24e752b9/ambari-server/src/main/python/ambari_server_main.py
--
diff --git a/ambari-server/src/main/python/ambari_server_main.py 
b/ambari-server/src/main/python/ambari_server_main.py
index cc37ce9..dcca85a 100644
--- a/ambari-server/src/main/python/ambari_server_main.py
+++ b/ambari-server/src/main/python/ambari_server_main.py
@@ -260,7 +260,7 @@ def server_process_main(options, scmStatus=None):
   class_path = os.path.abspath(class_path) + os.pathsep + 
get_ambari_classpath()
   jdbc_driver_path = get_jdbc_driver_path(options, properties)
   if jdbc_driver_path not in class_path:
-class_path = class_path + os.pathsep + get_ambari_classpath()
+class_path = class_path + os.pathsep + jdbc_driver_path
 
   if SERVER_CLASSPATH_KEY in os.environ:
   class_path =  os.environ[SERVER_CLASSPATH_KEY] + os.pathsep + class_path

ambari git commit: AMBARI-12878: BE: Ambari Server start fails with SQLA DB type due to typo in ambari_server_main.py (jluniya)

2015-08-26 Thread jluniya 
Repository: ambari
Updated Branches:
  refs/heads/branch-2.1 d304151ba - b80441e8c


AMBARI-12878: BE: Ambari Server start fails with SQLA DB type due to typo in 
ambari_server_main.py (jluniya)


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

Branch: refs/heads/branch-2.1
Commit: b80441e8cd56fb5b583c7830a1a6c0cb341d3d84
Parents: d304151
Author: Jayush Luniya jlun...@hortonworks.com
Authored: Wed Aug 26 08:57:45 2015 -0700
Committer: Jayush Luniya jlun...@hortonworks.com
Committed: Wed Aug 26 08:59:12 2015 -0700

--
 ambari-server/pom.xml   | 22 
 .../src/main/python/ambari_server_main.py   |  2 +-
 2 files changed, 23 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/b80441e8/ambari-server/pom.xml
--
diff --git a/ambari-server/pom.xml b/ambari-server/pom.xml
index 43a8978..dd2b571 100644
--- a/ambari-server/pom.xml
+++ b/ambari-server/pom.xml
@@ -512,6 +512,12 @@
   
locationsrc/main/resources/Ambari-DDL-SQLServer-DROP.sql/location
 /source
 source
+  
locationtarget/classes/Ambari-DDL-SQLAnywhere-CREATE.sql/location
+/source
+source
+  
locationsrc/main/resources/Ambari-DDL-SQLAnywhere-DROP.sql/location
+/source
+source
   
location${project.build.directory}/DBConnectionVerification.jar/location
 /source
 source
@@ -965,6 +971,22 @@
   /mapper
 /data
 data
+  srctarget/classes/Ambari-DDL-SQLAnywhere-CREATE.sql/src
+  typefile/type
+  mapper
+typeperm/type
+prefix/var/lib/ambari-server/resources/prefix
+  /mapper
+/data
+data
+  srcsrc/main/resources/Ambari-DDL-SQLAnywhere-DROP.sql/src
+  typefile/type
+  mapper
+typeperm/type
+prefix/var/lib/ambari-server/resources/prefix
+  /mapper
+/data
+data
   
src${project.build.directory}/DBConnectionVerification.jar/src
   typefile/type
   mapper

http://git-wip-us.apache.org/repos/asf/ambari/blob/b80441e8/ambari-server/src/main/python/ambari_server_main.py
--
diff --git a/ambari-server/src/main/python/ambari_server_main.py 
b/ambari-server/src/main/python/ambari_server_main.py
index cc37ce9..dcca85a 100644
--- a/ambari-server/src/main/python/ambari_server_main.py
+++ b/ambari-server/src/main/python/ambari_server_main.py
@@ -260,7 +260,7 @@ def server_process_main(options, scmStatus=None):
   class_path = os.path.abspath(class_path) + os.pathsep + 
get_ambari_classpath()
   jdbc_driver_path = get_jdbc_driver_path(options, properties)
   if jdbc_driver_path not in class_path:
-class_path = class_path + os.pathsep + get_ambari_classpath()
+class_path = class_path + os.pathsep + jdbc_driver_path
 
   if SERVER_CLASSPATH_KEY in os.environ:
   class_path =  os.environ[SERVER_CLASSPATH_KEY] + os.pathsep + class_path

ambari git commit: AMBARI-12888: After adding Ranger with SQLA, ambari-server Restart fails (jluniya)

2015-08-26 Thread jluniya 
Repository: ambari
Updated Branches:
  refs/heads/branch-2.1 b80441e8c - 571178d69


AMBARI-12888: After adding Ranger with SQLA, ambari-server Restart fails 
(jluniya)

Conflicts:
ambari-server/src/test/python/TestAmbariServer.py


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

Branch: refs/heads/branch-2.1
Commit: 571178d69a8927c49792a0bd48c837b66b50bf1b
Parents: b80441e
Author: Jayush Luniya jlun...@hortonworks.com
Authored: Wed Aug 26 14:52:59 2015 -0700
Committer: Jayush Luniya jlun...@hortonworks.com
Committed: Wed Aug 26 14:59:37 2015 -0700

--
 .../python/ambari_server/serverConfiguration.py | 14 --
 .../src/test/python/TestAmbariServer.py | 20 +---
 2 files changed, 1 insertion(+), 33 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/571178d6/ambari-server/src/main/python/ambari_server/serverConfiguration.py
--
diff --git a/ambari-server/src/main/python/ambari_server/serverConfiguration.py 
b/ambari-server/src/main/python/ambari_server/serverConfiguration.py
index 5191e5c..90daff5 100644
--- a/ambari-server/src/main/python/ambari_server/serverConfiguration.py
+++ b/ambari-server/src/main/python/ambari_server/serverConfiguration.py
@@ -1180,17 +1180,6 @@ def get_ambari_jars():
  + default_jar_location)
 return default_jar_location
 
-def get_share_jars():
-  share_jars = 
-  file_list = []
-  file_list.extend(glob.glob(configDefaults.JAVA_SHARE_PATH + os.sep + 
*mysql*))
-  file_list.extend(glob.glob(configDefaults.JAVA_SHARE_PATH + os.sep + 
*sqljdbc*))
-  file_list.extend(glob.glob(configDefaults.JAVA_SHARE_PATH + os.sep + 
*ojdbc*))
-  file_list.extend(glob.glob(configDefaults.JAVA_SHARE_PATH + os.sep + 
*sajdbc4*))
-  if len(file_list)  0:
-share_jars = string.join(file_list, os.pathsep)
-  return share_jars
-
 def get_jdbc_cp():
   jdbc_jar_path = 
   properties = get_ambari_properties()
@@ -1203,9 +1192,6 @@ def get_ambari_classpath():
   jdbc_cp = get_jdbc_cp()
   if len(jdbc_cp)  0:
 ambari_cp = ambari_cp + os.pathsep + jdbc_cp
-  share_cp = get_share_jars()
-  if len(share_cp)  0:
-ambari_cp = ambari_cp + os.pathsep + share_cp
   return ambari_cp
 
 def get_full_ambari_classpath(conf_dir = None):

http://git-wip-us.apache.org/repos/asf/ambari/blob/571178d6/ambari-server/src/test/python/TestAmbariServer.py
--
diff --git a/ambari-server/src/test/python/TestAmbariServer.py 
b/ambari-server/src/test/python/TestAmbariServer.py
index d6b7c93..58e6289 100644
--- a/ambari-server/src/test/python/TestAmbariServer.py
+++ b/ambari-server/src/test/python/TestAmbariServer.py
@@ -63,7 +63,7 @@ with patch(platform.linux_distribution, return_value = 
os_distro_value):
 from ambari_server.resourceFilesKeeper import ResourceFilesKeeper, 
KeeperException
 from ambari_server.serverConfiguration import configDefaults, \
   check_database_name_property, OS_FAMILY_PROPERTY, \
-  find_properties_file, get_ambari_classpath, get_ambari_jars, 
get_ambari_properties, get_JAVA_HOME, get_share_jars, \
+  find_properties_file, get_ambari_classpath, get_ambari_jars, 
get_ambari_properties, get_JAVA_HOME, \
   parse_properties_file, read_ambari_user, update_ambari_properties, 
update_properties_2, write_property, find_jdk, \
   AMBARI_CONF_VAR, AMBARI_SERVER_LIB, JDBC_DATABASE_PROPERTY, 
JDBC_RCA_PASSWORD_FILE_PROPERTY, \
   PERSISTENCE_TYPE_PROPERTY, JDBC_URL_PROPERTY, get_conf_dir, 
JDBC_USER_NAME_PROPERTY, JDBC_PASSWORD_PROPERTY, \
@@ -710,7 +710,6 @@ class TestAmbariServer(TestCase):
 sys.stdout = sys.__stdout__
 pass
 
-
   @not_for_platform(PLATFORM_WINDOWS)
   @patch(time.sleep)
   @patch(subprocess.Popen)
@@ -732,7 +731,6 @@ class TestAmbariServer(TestCase):
 self.assertEqual(1, retcode)
 pass
 
-
   @not_for_platform(PLATFORM_WINDOWS)
   @patch(shlex.split)
   @patch(subprocess.Popen)
@@ -777,7 +775,6 @@ class TestAmbariServer(TestCase):
 self.assertTrue(splitMock.called)
 pass
 
-
   @patch(ambari_server.serverConfiguration.get_conf_dir)
   @patch(ambari_server.serverConfiguration.search_file)
   def test_write_property(self, search_file_mock, get_conf_dir_mock):
@@ -791,7 +788,6 @@ class TestAmbariServer(TestCase):
 self.assertTrue(expected_content in result)
 pass
 
-
   @not_for_platform(PLATFORM_WINDOWS)
   @patch(ambari_server.dbConfiguration.decrypt_password_for_alias)
   @patch(ambari_server.dbConfiguration_linux.run_os_command)
@@ -927,25

ambari git commit: AMBARI-12871. Ambari startup scripts exhibit long delays (5+ seconds each) on every modifying user operation. This adds a few minutes to the time it takes to start or restart any

2015-08-26 Thread aonishuk 
Repository: ambari
Updated Branches:
  refs/heads/branch-2.1 8967aa315 - a808ddc71


AMBARI-12871. Ambari startup scripts exhibit long delays (5+ seconds each) on 
every modifying user operation. This adds a few minutes to the time it takes 
to start or restart any component, causing excessive downtime for every config 
change. (aonishuk)


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

Branch: refs/heads/branch-2.1
Commit: a808ddc71db74c461abdd016d830b7a5aca146f7
Parents: 8967aa3
Author: Andrew Onishuk aonis...@hortonworks.com
Authored: Wed Aug 26 12:31:40 2015 +0300
Committer: Andrew Onishuk aonis...@hortonworks.com
Committed: Wed Aug 26 12:31:40 2015 +0300

--
 .../before-ANY/scripts/shared_initialization.py   | 12 +---
 .../2.0.6/hooks/before-ANY/test_before_any.py | 18 --
 2 files changed, 5 insertions(+), 25 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/a808ddc7/ambari-server/src/main/resources/stacks/HDP/2.0.6/hooks/before-ANY/scripts/shared_initialization.py
--
diff --git 
a/ambari-server/src/main/resources/stacks/HDP/2.0.6/hooks/before-ANY/scripts/shared_initialization.py
 
b/ambari-server/src/main/resources/stacks/HDP/2.0.6/hooks/before-ANY/scripts/shared_initialization.py
index 4def30f..a22c27c 100644
--- 
a/ambari-server/src/main/resources/stacks/HDP/2.0.6/hooks/before-ANY/scripts/shared_initialization.py
+++ 
b/ambari-server/src/main/resources/stacks/HDP/2.0.6/hooks/before-ANY/scripts/shared_initialization.py
@@ -64,25 +64,23 @@ def setup_users():
   
   import params
 
-  if not params.host_sys_prepped:
+  if not params.host_sys_prepped and not params.ignore_groupsusers_create:
 for group in params.group_list:
   Group(group,
-  ignore_failures = params.ignore_groupsusers_create
   )
 
 for user in params.user_list:
   User(user,
   gid = params.user_to_gid_dict[user],
   groups = params.user_to_groups_dict[user],
-  ignore_failures = params.ignore_groupsusers_create
   )
 
 if params.override_uid == true:
   set_uid(params.smoke_user, params.smoke_user_dirs)
 else:
-  print 'Skipping setting uid for smoke user as host is sys prepped'
+  Logger.info('Skipping setting uid for smoke user as host is sys prepped')
   else:
-print 'Skipping creation of User and Group as host is sys prepped'
+Logger.info('Skipping creation of User and Group as host is sys prepped or 
ignore_groupsusers_create flag is on')
 pass
 
 
@@ -96,7 +94,7 @@ def setup_users():
 if not params.host_sys_prepped and params.override_uid == true:
   set_uid(params.hbase_user, params.hbase_user_dirs)
 else:
-  print 'Skipping setting uid for hbase user as host is sys prepped'
+  Logger.info('Skipping setting uid for hbase user as host is sys 
prepped')  
   pass
 
   if not params.host_sys_prepped:
@@ -105,7 +103,7 @@ def setup_users():
 if params.has_tez and params.hdp_stack_version !=  and 
compare_versions(params.hdp_stack_version, '2.3') = 0:
 create_tez_am_view_acls()
   else:
-print 'Skipping setting dfs cluster admin and tez view acls as host is sys 
prepped'
+Logger.info('Skipping setting dfs cluster admin and tez view acls as host 
is sys prepped')
 
 def create_dfs_cluster_admins():
   

http://git-wip-us.apache.org/repos/asf/ambari/blob/a808ddc7/ambari-server/src/test/python/stacks/2.0.6/hooks/before-ANY/test_before_any.py
--
diff --git 
a/ambari-server/src/test/python/stacks/2.0.6/hooks/before-ANY/test_before_any.py
 
b/ambari-server/src/test/python/stacks/2.0.6/hooks/before-ANY/test_before_any.py
index 37a52df..82740fc 100644
--- 
a/ambari-server/src/test/python/stacks/2.0.6/hooks/before-ANY/test_before_any.py
+++ 
b/ambari-server/src/test/python/stacks/2.0.6/hooks/before-ANY/test_before_any.py
@@ -50,87 +50,69 @@ class TestHookBeforeInstall(RMFTestCase):
 content = 
DownloadSource('http://c6401.ambari.apache.org:8080/resources//UnlimitedJCEPolicyJDK7.zip'),
 )
 self.assertResourceCalled('Group', 'hadoop',
-ignore_failures = False,
 )
 self.assertResourceCalled('Group', 'nobody',
-ignore_failures = False,
 )
 self.assertResourceCalled('Group', 'users',
-ignore_failures = False,
 )
 self.assertResourceCalled('User', 'hive',
 gid = 'hadoop',
-ignore_failures = False,
 groups = [u'hadoop'],
 )
 self.assertResourceCalled('User', 'oozie',
 gid = 'hadoop',
-

ambari git commit: AMBARI-12871. Ambari startup scripts exhibit long delays (5+ seconds each) on every modifying user operation. This adds a few minutes to the time it takes to start or restart any

2015-08-26 Thread aonishuk 
Repository: ambari
Updated Branches:
  refs/heads/trunk fac57e538 - 6ccabc61e


AMBARI-12871. Ambari startup scripts exhibit long delays (5+ seconds each) on 
every modifying user operation. This adds a few minutes to the time it takes 
to start or restart any component, causing excessive downtime for every config 
change. (aonishuk)


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

Branch: refs/heads/trunk
Commit: 6ccabc61e451347d1b3168d8fe1eb7a98d6bd6b6
Parents: fac57e5
Author: Andrew Onishuk aonis...@hortonworks.com
Authored: Wed Aug 26 12:29:18 2015 +0300
Committer: Andrew Onishuk aonis...@hortonworks.com
Committed: Wed Aug 26 12:30:49 2015 +0300

--
 .../before-ANY/scripts/shared_initialization.py   | 12 +---
 .../2.0.6/hooks/before-ANY/test_before_any.py | 18 --
 2 files changed, 5 insertions(+), 25 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/6ccabc61/ambari-server/src/main/resources/stacks/HDP/2.0.6/hooks/before-ANY/scripts/shared_initialization.py
--
diff --git 
a/ambari-server/src/main/resources/stacks/HDP/2.0.6/hooks/before-ANY/scripts/shared_initialization.py
 
b/ambari-server/src/main/resources/stacks/HDP/2.0.6/hooks/before-ANY/scripts/shared_initialization.py
index 9c4352a..bd44caf 100644
--- 
a/ambari-server/src/main/resources/stacks/HDP/2.0.6/hooks/before-ANY/scripts/shared_initialization.py
+++ 
b/ambari-server/src/main/resources/stacks/HDP/2.0.6/hooks/before-ANY/scripts/shared_initialization.py
@@ -30,25 +30,23 @@ def setup_users():
   
   import params
 
-  if not params.host_sys_prepped:
+  if not params.host_sys_prepped and not params.ignore_groupsusers_create:
 for group in params.group_list:
   Group(group,
-  ignore_failures = params.ignore_groupsusers_create
   )
 
 for user in params.user_list:
   User(user,
   gid = params.user_to_gid_dict[user],
   groups = params.user_to_groups_dict[user],
-  ignore_failures = params.ignore_groupsusers_create
   )
 
 if params.override_uid == true:
   set_uid(params.smoke_user, params.smoke_user_dirs)
 else:
-  print 'Skipping setting uid for smoke user as host is sys prepped'
+  Logger.info('Skipping setting uid for smoke user as host is sys prepped')
   else:
-print 'Skipping creation of User and Group as host is sys prepped'
+Logger.info('Skipping creation of User and Group as host is sys prepped or 
ignore_groupsusers_create flag is on')
 pass
 
 
@@ -62,7 +60,7 @@ def setup_users():
 if not params.host_sys_prepped and params.override_uid == true:
   set_uid(params.hbase_user, params.hbase_user_dirs)
 else:
-  print 'Skipping setting uid for hbase user as host is sys prepped'
+  Logger.info('Skipping setting uid for hbase user as host is sys 
prepped')  
   pass
 
   if not params.host_sys_prepped:
@@ -71,7 +69,7 @@ def setup_users():
 if params.has_tez and params.hdp_stack_version !=  and 
compare_versions(params.hdp_stack_version, '2.3') = 0:
 create_tez_am_view_acls()
   else:
-print 'Skipping setting dfs cluster admin and tez view acls as host is sys 
prepped'
+Logger.info('Skipping setting dfs cluster admin and tez view acls as host 
is sys prepped')
 
 def create_dfs_cluster_admins():
   

http://git-wip-us.apache.org/repos/asf/ambari/blob/6ccabc61/ambari-server/src/test/python/stacks/2.0.6/hooks/before-ANY/test_before_any.py
--
diff --git 
a/ambari-server/src/test/python/stacks/2.0.6/hooks/before-ANY/test_before_any.py
 
b/ambari-server/src/test/python/stacks/2.0.6/hooks/before-ANY/test_before_any.py
index 368eb68..b553a29 100644
--- 
a/ambari-server/src/test/python/stacks/2.0.6/hooks/before-ANY/test_before_any.py
+++ 
b/ambari-server/src/test/python/stacks/2.0.6/hooks/before-ANY/test_before_any.py
@@ -48,87 +48,69 @@ class TestHookBeforeInstall(RMFTestCase):
 )
 
 self.assertResourceCalled('Group', 'hadoop',
-ignore_failures = False,
 )
 self.assertResourceCalled('Group', 'nobody',
-ignore_failures = False,
 )
 self.assertResourceCalled('Group', 'users',
-ignore_failures = False,
 )
 self.assertResourceCalled('User', 'hive',
 gid = 'hadoop',
-ignore_failures = False,
 groups = [u'hadoop'],
 )
 self.assertResourceCalled('User', 'oozie',
 gid = 'hadoop',
-ignore_failures = False,
 groups = [u'users'],
 )
 self.assertResourceCalled('User', 'nobody',

ambari git commit: AMBARI-12875. BE: Modify Hive stack definition to support SQL Anywhere.(vbrodetskyi)

2015-08-26 Thread vbrodetskyi 
Repository: ambari
Updated Branches:
  refs/heads/trunk 76990f4a8 - adc32c91e


AMBARI-12875. BE: Modify Hive stack definition to support SQL 
Anywhere.(vbrodetskyi)


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

Branch: refs/heads/trunk
Commit: adc32c91e7ebf316bd04b50bfac63e88db2133d5
Parents: 76990f4
Author: Vitaly Brodetskyi vbrodets...@hortonworks.com
Authored: Wed Aug 26 14:34:51 2015 +0300
Committer: Vitaly Brodetskyi vbrodets...@hortonworks.com
Committed: Wed Aug 26 14:34:51 2015 +0300

--
 .../HIVE/0.12.0.2.0/configuration/hive-env.xml  |  3 -
 .../services/HIVE/configuration/hive-env.xml|  3 -
 .../services/HIVE/configuration/hive-env.xml| 71 
 .../services/HIVE/configuration/hive-site.xml   | 12 
 .../stacks/HDP/2.3/services/stack_advisor.py| 34 +-
 .../stacks/2.3/common/test_stack_advisor.py |  3 +-
 6 files changed, 118 insertions(+), 8 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/adc32c91/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/configuration/hive-env.xml
--
diff --git 
a/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/configuration/hive-env.xml
 
b/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/configuration/hive-env.xml
index 21c52e1..784f06b 100644
--- 
a/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/configuration/hive-env.xml
+++ 
b/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/configuration/hive-env.xml
@@ -153,9 +153,6 @@ else
 fi
 export METASTORE_PORT={{hive_metastore_port}}
 
-{% if sqla_db_used %}
-export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:{{jdbc_libs_dir}}
-{% endif %}
 /value
   /property
   

http://git-wip-us.apache.org/repos/asf/ambari/blob/adc32c91/ambari-server/src/main/resources/stacks/HDP/2.2/services/HIVE/configuration/hive-env.xml
--
diff --git 
a/ambari-server/src/main/resources/stacks/HDP/2.2/services/HIVE/configuration/hive-env.xml
 
b/ambari-server/src/main/resources/stacks/HDP/2.2/services/HIVE/configuration/hive-env.xml
index 6420333..ec0381a 100644
--- 
a/ambari-server/src/main/resources/stacks/HDP/2.2/services/HIVE/configuration/hive-env.xml
+++ 
b/ambari-server/src/main/resources/stacks/HDP/2.2/services/HIVE/configuration/hive-env.xml
@@ -72,9 +72,6 @@ fi
 
 export METASTORE_PORT={{hive_metastore_port}}
 
-{% if sqla_db_used %}
-export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:{{jdbc_libs_dir}}
-{% endif %}
 /value
   /property
 

http://git-wip-us.apache.org/repos/asf/ambari/blob/adc32c91/ambari-server/src/main/resources/stacks/HDP/2.3/services/HIVE/configuration/hive-env.xml
--
diff --git 
a/ambari-server/src/main/resources/stacks/HDP/2.3/services/HIVE/configuration/hive-env.xml
 
b/ambari-server/src/main/resources/stacks/HDP/2.3/services/HIVE/configuration/hive-env.xml
new file mode 100644
index 000..b7b3127
--- /dev/null
+++ 
b/ambari-server/src/main/resources/stacks/HDP/2.3/services/HIVE/configuration/hive-env.xml
@@ -0,0 +1,71 @@
+?xml version=1.0?
+?xml-stylesheet type=text/xsl href=configuration.xsl?
+!--
+/**
+ * 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.
+ */
+--
+
+configuration
+
+  !-- hive-env.sh --
+  property
+namecontent/name
+descriptionThis is the jinja template for hive-env.sh file/description
+value
+ if [ $SERVICE = cli ]; then
+   if [ -z $DEBUG ]; then
+ export HADOOP_OPTS=$HADOOP_OPTS -XX:NewRatio=12 -XX:MaxHeapFreeRatio=40 
-XX:MinHeapFreeRatio=15 -XX:+UseNUMA -XX:+UseParallelGC -XX:-UseGCOverheadLimit
+   else
+ export HADOOP_OPTS=$HADOOP_OPTS -XX:NewRatio=12 -XX:MaxHeapFreeRatio=40 
-XX:MinHeapFreeRatio=15 -XX:-UseGCOverheadLimit
+   fi
+ fi
+
+# The

[2/2] ambari git commit: AMBARI-12870. Installing Ambari-2.1.0 removes /etc/sudoers.d/ambari-agent file (aonishuk)

2015-08-26 Thread aonishuk 
AMBARI-12870. Installing Ambari-2.1.0 removes /etc/sudoers.d/ambari-agent file 
(aonishuk)


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

Branch: refs/heads/branch-2.1
Commit: 90a012b7114335a902b5f2f9b4304d16f4a0b722
Parents: a808ddc
Author: Andrew Onishuk aonis...@hortonworks.com
Authored: Wed Aug 26 14:11:44 2015 +0300
Committer: Andrew Onishuk aonis...@hortonworks.com
Committed: Wed Aug 26 14:11:44 2015 +0300

--
 ambari-agent/src/main/package/deb/control/preinst | 4 
 ambari-agent/src/main/package/rpm/preinstall.sh   | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/90a012b7/ambari-agent/src/main/package/deb/control/preinst
--
diff --git a/ambari-agent/src/main/package/deb/control/preinst 
b/ambari-agent/src/main/package/deb/control/preinst
index e9fa78b..7265c55 100644
--- a/ambari-agent/src/main/package/deb/control/preinst
+++ b/ambari-agent/src/main/package/deb/control/preinst
@@ -31,7 +31,11 @@ fi
 BAK=/etc/ambari-agent/conf/ambari-agent.ini.old
 ORIG=/etc/ambari-agent/conf/ambari-agent.ini
 
+BAK_SUDOERS=/etc/sudoers.d/ambari-agent.bak
+ORIG_SUDOERS=/etc/sudoers.d/ambari-agent
+
 [ -f $ORIG ]  mv -f $ORIG $BAK
+[ -f $ORIG_SUDOERS ]  echo Moving $ORIG_SUDOERS to $BAK_SUDOERS. Please 
restore the file if you were using it for ambari-agent non-root functionality 
 mv -f $ORIG_SUDOERS $BAK_SUDOERS
 
 if [ -d $STACKS_FOLDER ]
 then

http://git-wip-us.apache.org/repos/asf/ambari/blob/90a012b7/ambari-agent/src/main/package/rpm/preinstall.sh
--
diff --git a/ambari-agent/src/main/package/rpm/preinstall.sh 
b/ambari-agent/src/main/package/rpm/preinstall.sh
index e135c18..d7419d3 100644
--- a/ambari-agent/src/main/package/rpm/preinstall.sh
+++ b/ambari-agent/src/main/package/rpm/preinstall.sh
@@ -31,7 +31,7 @@ BAK_SUDOERS=/etc/sudoers.d/ambari-agent.bak
 ORIG_SUDOERS=/etc/sudoers.d/ambari-agent
 
 [ -f $ORIG ]  mv -f $ORIG $BAK
-[ -f $ORIG_SUDOERS ]  mv -f $ORIG_SUDOERS $BAK_SUDOERS
+[ -f $ORIG_SUDOERS ]  echo Moving $ORIG_SUDOERS to $BAK_SUDOERS. Please 
restore the file if you were using it for ambari-agent non-root functionality 
 mv -f $ORIG_SUDOERS $BAK_SUDOERS
 
 if [ -d $STACKS_FOLDER ]
 then

ambari git commit: AMBARI-12879. Warn the user about HDFS Upgrade not finalized in Ambari Web UI (onechiporenko)

2015-08-26 Thread onechiporenko 
Repository: ambari
Updated Branches:
  refs/heads/trunk adc32c91e - 5d159a376


AMBARI-12879. Warn the user about HDFS Upgrade not finalized in Ambari Web UI 
(onechiporenko)


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

Branch: refs/heads/trunk
Commit: 5d159a376d2315f08aa579e47bf35a1fa2d3c47b
Parents: adc32c9
Author: Oleg Nechiporenko onechipore...@apache.org
Authored: Wed Aug 26 14:27:05 2015 +0300
Committer: Oleg Nechiporenko onechipore...@apache.org
Committed: Wed Aug 26 14:37:39 2015 +0300

--
 .../main/admin/stack_and_upgrade_controller.js  | 46 ++
 ambari-web/app/messages.js  |  1 +
 ambari-web/app/styles/application.less  |  2 +-
 ambari-web/app/templates/application.hbs|  7 +-
 ambari-web/app/utils/ajax/ajax.js   |  4 +
 .../admin/stack_upgrade/upgrade_wizard_view.js  |  2 +-
 .../admin/stack_and_upgrade_controller_test.js  | 91 +++-
 .../stack_upgrade/upgrade_wizard_view_test.js   |  3 +-
 8 files changed, 151 insertions(+), 5 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/5d159a37/ambari-web/app/controllers/main/admin/stack_and_upgrade_controller.js
--
diff --git 
a/ambari-web/app/controllers/main/admin/stack_and_upgrade_controller.js 
b/ambari-web/app/controllers/main/admin/stack_and_upgrade_controller.js
index e9829ce..fa5b479 100644
--- a/ambari-web/app/controllers/main/admin/stack_and_upgrade_controller.js
+++ b/ambari-web/app/controllers/main/admin/stack_and_upgrade_controller.js
@@ -83,6 +83,18 @@ App.MainAdminStackAndUpgradeController = 
Em.Controller.extend(App.LocalStorage,
*/
   taskDetailsProperties: ['status', 'stdout', 'stderr', 'error_log', 
'host_name', 'output_log'],
 
+  /**
+   * Context for Finalize item
+   * @type {string}
+   */
+  finalizeContext: 'Confirm Finalize',
+
+  /**
+   * Check if current item is Finalize
+   * @type {boolean}
+   */
+  isFinalizeItem: false,
+
   isLoadUpgradeDataPending: false,
 
   /**
@@ -798,6 +810,40 @@ App.MainAdminStackAndUpgradeController = 
Em.Controller.extend(App.LocalStorage,
   }.observes('App.upgradeState'),
 
   /**
+   * Check codeApp.upgradeState/code for HOLDING
+   * If it is, send request to check if current item is Finalize
+   * @method updateFinalize
+   */
+  updateFinalize: function () {
+var upgradeState = App.get('upgradeState');
+if (upgradeState === 'HOLDING') {
+  return App.ajax.send({
+name: 'admin.upgrade.finalizeContext',
+sender: this,
+success: 'updateFinalizeSuccessCallback',
+error: 'updateFinalizeErrorCallback'
+  })
+}
+else {
+  this.set('isFinalizeItem', false);
+}
+  }.observes('App.upgradeState'),
+
+  /**
+   *
+   * @param {object|null} data
+   * @method updateFinalizeSuccessCallback
+   */
+  updateFinalizeSuccessCallback: function (data) {
+var context = data ? Em.get(data, 
'upgrade_groups.firstObject.upgrade_items.firstObject.UpgradeItem.context') : 
'';
+this.set('isFinalizeItem', context === this.get('finalizeContext'));
+  },
+
+  updateFinalizeErrorCallback: function() {
+this.set('isFinalizeItem', false);
+  },
+
+  /**
* show dialog with tasks of upgrade
* @return {App.ModalPopup}
*/

http://git-wip-us.apache.org/repos/asf/ambari/blob/5d159a37/ambari-web/app/messages.js
--
diff --git a/ambari-web/app/messages.js b/ambari-web/app/messages.js
index 53156d0..3b613e7 100644
--- a/ambari-web/app/messages.js
+++ b/ambari-web/app/messages.js
@@ -1407,6 +1407,7 @@ Em.I18n.translations = {
   'admin.stackVersions.version.reinstall': Reinstall Packages,
   'admin.stackVersions.version.performUpgrade': Perform Upgrade,
   'admin.stackVersions.version.upgrade.pause': Upgrade: Action Required,
+  'admin.stackVersions.version.upgrade.notFinalized.warning': The upgrade has 
not been finalized yet. After the cluster is verified to be functional, do not 
forget to finalize the upgrade as soon as possible (within a couple of days is 
highly recommended) as running the cluster in unfinalized state causes extra 
resource requirements on HDFS.,
   'admin.stackVersions.version.upgrade.running': Upgrade: In Process,
   'admin.stackVersions.version.upgrade.aborted': Upgrade: Aborted,
   'admin.stackVersions.version.downgrade.pause': Downgrade: Action Required,

http://git-wip-us.apache.org/repos/asf/ambari/blob/5d159a37/ambari-web/app/styles/application.less
--
diff --git

ambari git commit: AMBARI-12879. Warn the user about HDFS Upgrade not finalized in Ambari Web UI (onechiporenko)

2015-08-26 Thread onechiporenko 
Repository: ambari
Updated Branches:
  refs/heads/branch-2.1 90a012b71 - 989ced8be


AMBARI-12879. Warn the user about HDFS Upgrade not finalized in Ambari Web UI 
(onechiporenko)


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

Branch: refs/heads/branch-2.1
Commit: 989ced8be0b94131f1ef841de7308002cda0e303
Parents: 90a012b
Author: Oleg Nechiporenko onechipore...@apache.org
Authored: Wed Aug 26 14:27:05 2015 +0300
Committer: Oleg Nechiporenko onechipore...@apache.org
Committed: Wed Aug 26 14:27:05 2015 +0300

--
 .../main/admin/stack_and_upgrade_controller.js  | 46 ++
 ambari-web/app/messages.js  |  1 +
 ambari-web/app/styles/application.less  |  2 +-
 ambari-web/app/templates/application.hbs|  7 +-
 ambari-web/app/utils/ajax/ajax.js   |  4 +
 .../admin/stack_upgrade/upgrade_wizard_view.js  |  2 +-
 .../admin/stack_and_upgrade_controller_test.js  | 91 +++-
 .../stack_upgrade/upgrade_wizard_view_test.js   |  3 +-
 8 files changed, 151 insertions(+), 5 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/989ced8b/ambari-web/app/controllers/main/admin/stack_and_upgrade_controller.js
--
diff --git 
a/ambari-web/app/controllers/main/admin/stack_and_upgrade_controller.js 
b/ambari-web/app/controllers/main/admin/stack_and_upgrade_controller.js
index e9829ce..fa5b479 100644
--- a/ambari-web/app/controllers/main/admin/stack_and_upgrade_controller.js
+++ b/ambari-web/app/controllers/main/admin/stack_and_upgrade_controller.js
@@ -83,6 +83,18 @@ App.MainAdminStackAndUpgradeController = 
Em.Controller.extend(App.LocalStorage,
*/
   taskDetailsProperties: ['status', 'stdout', 'stderr', 'error_log', 
'host_name', 'output_log'],
 
+  /**
+   * Context for Finalize item
+   * @type {string}
+   */
+  finalizeContext: 'Confirm Finalize',
+
+  /**
+   * Check if current item is Finalize
+   * @type {boolean}
+   */
+  isFinalizeItem: false,
+
   isLoadUpgradeDataPending: false,
 
   /**
@@ -798,6 +810,40 @@ App.MainAdminStackAndUpgradeController = 
Em.Controller.extend(App.LocalStorage,
   }.observes('App.upgradeState'),
 
   /**
+   * Check codeApp.upgradeState/code for HOLDING
+   * If it is, send request to check if current item is Finalize
+   * @method updateFinalize
+   */
+  updateFinalize: function () {
+var upgradeState = App.get('upgradeState');
+if (upgradeState === 'HOLDING') {
+  return App.ajax.send({
+name: 'admin.upgrade.finalizeContext',
+sender: this,
+success: 'updateFinalizeSuccessCallback',
+error: 'updateFinalizeErrorCallback'
+  })
+}
+else {
+  this.set('isFinalizeItem', false);
+}
+  }.observes('App.upgradeState'),
+
+  /**
+   *
+   * @param {object|null} data
+   * @method updateFinalizeSuccessCallback
+   */
+  updateFinalizeSuccessCallback: function (data) {
+var context = data ? Em.get(data, 
'upgrade_groups.firstObject.upgrade_items.firstObject.UpgradeItem.context') : 
'';
+this.set('isFinalizeItem', context === this.get('finalizeContext'));
+  },
+
+  updateFinalizeErrorCallback: function() {
+this.set('isFinalizeItem', false);
+  },
+
+  /**
* show dialog with tasks of upgrade
* @return {App.ModalPopup}
*/

http://git-wip-us.apache.org/repos/asf/ambari/blob/989ced8b/ambari-web/app/messages.js
--
diff --git a/ambari-web/app/messages.js b/ambari-web/app/messages.js
index 04f4ba4..1113e4a 100644
--- a/ambari-web/app/messages.js
+++ b/ambari-web/app/messages.js
@@ -1433,6 +1433,7 @@ Em.I18n.translations = {
   'admin.stackVersions.version.reinstall': Reinstall Packages,
   'admin.stackVersions.version.performUpgrade': Perform Upgrade,
   'admin.stackVersions.version.upgrade.pause': Upgrade: Action Required,
+  'admin.stackVersions.version.upgrade.notFinalized.warning': The upgrade has 
not been finalized yet. After the cluster is verified to be functional, do not 
forget to finalize the upgrade as soon as possible (within a couple of days is 
highly recommended) as running the cluster in unfinalized state causes extra 
resource requirements on HDFS.,
   'admin.stackVersions.version.upgrade.running': Upgrade: In Process,
   'admin.stackVersions.version.upgrade.aborted': Upgrade: Aborted,
   'admin.stackVersions.version.downgrade.pause': Downgrade: Action Required,

http://git-wip-us.apache.org/repos/asf/ambari/blob/989ced8b/ambari-web/app/styles/application.less
--
diff --git

ambari git commit: AMBARI-12875. BE: Modify Hive stack definition to support SQL Anywhere.(vbrodetskyi)

2015-08-26 Thread vbrodetskyi 
Repository: ambari
Updated Branches:
  refs/heads/branch-2.1 989ced8be - d304151ba


AMBARI-12875. BE: Modify Hive stack definition to support SQL 
Anywhere.(vbrodetskyi)


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

Branch: refs/heads/branch-2.1
Commit: d304151ba91859dc6248d9f939831e68d8ee8950
Parents: 989ced8
Author: Vitaly Brodetskyi vbrodets...@hortonworks.com
Authored: Wed Aug 26 14:32:01 2015 +0300
Committer: Vitaly Brodetskyi vbrodets...@hortonworks.com
Committed: Wed Aug 26 14:32:54 2015 +0300

--
 .../HIVE/0.12.0.2.0/configuration/hive-env.xml  |  3 -
 .../services/HIVE/configuration/hive-env.xml|  3 -
 .../services/HIVE/configuration/hive-env.xml| 71 
 .../services/HIVE/configuration/hive-site.xml   | 12 
 .../stacks/HDP/2.3/services/stack_advisor.py| 34 +-
 .../stacks/2.3/common/test_stack_advisor.py |  3 +-
 6 files changed, 118 insertions(+), 8 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/d304151b/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/configuration/hive-env.xml
--
diff --git 
a/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/configuration/hive-env.xml
 
b/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/configuration/hive-env.xml
index 21c52e1..784f06b 100644
--- 
a/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/configuration/hive-env.xml
+++ 
b/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/configuration/hive-env.xml
@@ -153,9 +153,6 @@ else
 fi
 export METASTORE_PORT={{hive_metastore_port}}
 
-{% if sqla_db_used %}
-export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:{{jdbc_libs_dir}}
-{% endif %}
 /value
   /property
   

http://git-wip-us.apache.org/repos/asf/ambari/blob/d304151b/ambari-server/src/main/resources/stacks/HDP/2.2/services/HIVE/configuration/hive-env.xml
--
diff --git 
a/ambari-server/src/main/resources/stacks/HDP/2.2/services/HIVE/configuration/hive-env.xml
 
b/ambari-server/src/main/resources/stacks/HDP/2.2/services/HIVE/configuration/hive-env.xml
index 6420333..ec0381a 100644
--- 
a/ambari-server/src/main/resources/stacks/HDP/2.2/services/HIVE/configuration/hive-env.xml
+++ 
b/ambari-server/src/main/resources/stacks/HDP/2.2/services/HIVE/configuration/hive-env.xml
@@ -72,9 +72,6 @@ fi
 
 export METASTORE_PORT={{hive_metastore_port}}
 
-{% if sqla_db_used %}
-export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:{{jdbc_libs_dir}}
-{% endif %}
 /value
   /property
 

http://git-wip-us.apache.org/repos/asf/ambari/blob/d304151b/ambari-server/src/main/resources/stacks/HDP/2.3/services/HIVE/configuration/hive-env.xml
--
diff --git 
a/ambari-server/src/main/resources/stacks/HDP/2.3/services/HIVE/configuration/hive-env.xml
 
b/ambari-server/src/main/resources/stacks/HDP/2.3/services/HIVE/configuration/hive-env.xml
new file mode 100644
index 000..b7b3127
--- /dev/null
+++ 
b/ambari-server/src/main/resources/stacks/HDP/2.3/services/HIVE/configuration/hive-env.xml
@@ -0,0 +1,71 @@
+?xml version=1.0?
+?xml-stylesheet type=text/xsl href=configuration.xsl?
+!--
+/**
+ * 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.
+ */
+--
+
+configuration
+
+  !-- hive-env.sh --
+  property
+namecontent/name
+descriptionThis is the jinja template for hive-env.sh file/description
+value
+ if [ $SERVICE = cli ]; then
+   if [ -z $DEBUG ]; then
+ export HADOOP_OPTS=$HADOOP_OPTS -XX:NewRatio=12 -XX:MaxHeapFreeRatio=40 
-XX:MinHeapFreeRatio=15 -XX:+UseNUMA -XX:+UseParallelGC -XX:-UseGCOverheadLimit
+   else
+ export HADOOP_OPTS=$HADOOP_OPTS -XX:NewRatio=12 -XX:MaxHeapFreeRatio=40 
-XX:MinHeapFreeRatio=15 -XX:-UseGCOverheadLimit
+   fi
+ fi
+

ambari git commit: AMBARI-12887. Depending upon Ranger db_flavor, SQL_CONNECTOR_JAR is not changing on Ambari UI. (jaimin)

2015-08-26 Thread jaimin 
Repository: ambari
Updated Branches:
  refs/heads/branch-2.1 571178d69 - b0c43b061


AMBARI-12887. Depending upon Ranger db_flavor, SQL_CONNECTOR_JAR is not 
changing on Ambari UI. (jaimin)


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

Branch: refs/heads/branch-2.1
Commit: b0c43b061450149fe2e88d093bd9cf1610975280
Parents: 571178d
Author: Jaimin Jetly jai...@hortonworks.com
Authored: Wed Aug 26 16:15:10 2015 -0700
Committer: Jaimin Jetly jai...@hortonworks.com
Committed: Wed Aug 26 16:15:10 2015 -0700

--
 ambari-web/app/views/common/controls_view.js|   9 +-
 .../test/views/common/controls_view_test.js | 185 ++-
 2 files changed, 102 insertions(+), 92 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/b0c43b06/ambari-web/app/views/common/controls_view.js
--
diff --git a/ambari-web/app/views/common/controls_view.js 
b/ambari-web/app/views/common/controls_view.js
index 91be642..d61c367 100644
--- a/ambari-web/app/views/common/controls_view.js
+++ b/ambari-web/app/views/common/controls_view.js
@@ -497,7 +497,7 @@ App.ServiceConfigRadioButtons = 
Ember.View.extend(App.ServiceConfigCalculateId,
 
   onOptionsChange: function () {
 // The following if condition will be satisfied only for installer wizard 
flow
-if (this.getPropertyByType('connection_url')  
this.get('hostNameProperty')) {
+if (this.get('hostNameProperty')) {
   /** if new db is selected host name must be same as master of selected 
service (and can't be changed)**/
   if (this.get('isNewDb')) {
 var initProperty = this.get('hostNameProperty.recommendedValue') || 
this.get('hostNameProperty.savedValue');
@@ -507,7 +507,9 @@ App.ServiceConfigRadioButtons = 
Ember.View.extend(App.ServiceConfigCalculateId,
 this.get('hostNameProperty').set('isEditable', true);
   }
   this.setRequiredProperties(['driver', 'sql_jar_connector', 'db_type']);
-  this.setConnectionUrl(this.get('hostNameProperty.value'), 
this.get('databaseProperty.value'), this.get('userProperty.value'), 
this.get('passwordProperty.value'));
+  if (this.getPropertyByType('connection_url')) {
+this.setConnectionUrl(this.get('hostNameProperty.value'), 
this.get('databaseProperty.value'), this.get('userProperty.value'), 
this.get('passwordProperty.value'));
+  }
   this.handleSpecialUserPassProperties();
 }
   }.observes('databaseProperty.value', 'hostNameProperty.value', 
'serviceConfig.value', 'userProperty.value', 'passwordProperty.value'),
@@ -573,8 +575,9 @@ App.ServiceConfigRadioButtons = 
Ember.View.extend(App.ServiceConfigCalculateId,
*/
   getPropertyByType: function(propertyType) {
 if 
(dbInfo.dpPropertiesByServiceMap[this.get('serviceConfig.serviceName')]) {
+  //@TODO: dbInfo.dpPropertiesByServiceMap has corresponding property name 
but does not have filenames with it. this can cause issue when there are 
multiple db properties with same name belonging to different files
   /** check if selected service has db properties**/
-  return this.get('categoryConfigsAll').findProperty('name', 
dbInfo.dpPropertiesByServiceMap[this.get('serviceConfig.serviceName')][propertyType]);
+  return this.get('parentView.serviceConfigs').findProperty('name', 
dbInfo.dpPropertiesByServiceMap[this.get('serviceConfig.serviceName')][propertyType]);
 }
 return null;
   },

http://git-wip-us.apache.org/repos/asf/ambari/blob/b0c43b06/ambari-web/test/views/common/controls_view_test.js
--
diff --git a/ambari-web/test/views/common/controls_view_test.js 
b/ambari-web/test/views/common/controls_view_test.js
index b21128a..95a6727 100644
--- a/ambari-web/test/views/common/controls_view_test.js
+++ b/ambari-web/test/views/common/controls_view_test.js
@@ -21,58 +21,58 @@ require('views/common/controls_view');
 
 describe('App.ServiceConfigRadioButtons', function () {
 
-  describe('#setConnectionUrl', function() {
+  describe('#setConnectionUrl', function () {
 var view = App.ServiceConfigRadioButtons.create();
-beforeEach(function() {
-  sinon.stub(view, 'getPropertyByType', function(name) {
+beforeEach(function () {
+  sinon.stub(view, 'getPropertyByType', function (name) {
 return App.ServiceConfigProperty.create({'name': name});
   });
-  sinon.stub(view, 'getDefaultPropertyValue', function() {
+  sinon.stub(view, 'getDefaultPropertyValue', function () {
 return 'host:{0},db:{1}';
   });
 });
 
-afterEach(function() {
+

ambari git commit: AMBARI-12887. Depending upon Ranger db_flavor, SQL_CONNECTOR_JAR is not changing on Ambari UI. (jaimin)

2015-08-26 Thread jaimin 
Repository: ambari
Updated Branches:
  refs/heads/trunk d7f3f31a6 - 892270d0d


AMBARI-12887. Depending upon Ranger db_flavor, SQL_CONNECTOR_JAR is not 
changing on Ambari UI. (jaimin)


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

Branch: refs/heads/trunk
Commit: 892270d0df9c9f4e708c0d74da7af294a9988289
Parents: d7f3f31
Author: Jaimin Jetly jai...@hortonworks.com
Authored: Wed Aug 26 16:15:10 2015 -0700
Committer: Jaimin Jetly jai...@hortonworks.com
Committed: Wed Aug 26 16:22:36 2015 -0700

--
 ambari-web/app/views/common/controls_view.js|   9 +-
 .../test/views/common/controls_view_test.js | 184 ++-
 2 files changed, 102 insertions(+), 91 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/892270d0/ambari-web/app/views/common/controls_view.js
--
diff --git a/ambari-web/app/views/common/controls_view.js 
b/ambari-web/app/views/common/controls_view.js
index a93f957..4ff6222 100644
--- a/ambari-web/app/views/common/controls_view.js
+++ b/ambari-web/app/views/common/controls_view.js
@@ -498,7 +498,7 @@ App.ServiceConfigRadioButtons = 
Ember.View.extend(App.ServiceConfigCalculateId,
 
   onOptionsChange: function () {
 // The following if condition will be satisfied only for installer wizard 
flow
-if (this.getPropertyByType('connection_url')  
this.get('hostNameProperty')) {
+if (this.get('hostNameProperty')) {
   /** if new db is selected host name must be same as master of selected 
service (and can't be changed)**/
   if (this.get('isNewDb')) {
 var initProperty = this.get('hostNameProperty.recommendedValue') || 
this.get('hostNameProperty.savedValue');
@@ -508,7 +508,9 @@ App.ServiceConfigRadioButtons = 
Ember.View.extend(App.ServiceConfigCalculateId,
 this.get('hostNameProperty').set('isEditable', true);
   }
   this.setRequiredProperties(['driver', 'sql_jar_connector', 'db_type']);
-  this.setConnectionUrl(this.get('hostNameProperty.value'), 
this.get('databaseProperty.value'), this.get('userProperty.value'), 
this.get('passwordProperty.value'));
+  if (this.getPropertyByType('connection_url')) {
+this.setConnectionUrl(this.get('hostNameProperty.value'), 
this.get('databaseProperty.value'), this.get('userProperty.value'), 
this.get('passwordProperty.value'));
+  }
   this.handleSpecialUserPassProperties();
 }
   }.observes('databaseProperty.value', 'hostNameProperty.value', 
'serviceConfig.value', 'userProperty.value', 'passwordProperty.value'),
@@ -574,8 +576,9 @@ App.ServiceConfigRadioButtons = 
Ember.View.extend(App.ServiceConfigCalculateId,
*/
   getPropertyByType: function(propertyType) {
 if 
(dbInfo.dpPropertiesByServiceMap[this.get('serviceConfig.serviceName')]) {
+  //@TODO: dbInfo.dpPropertiesByServiceMap has corresponding property name 
but does not have filenames with it. this can cause issue when there are 
multiple db properties with same name belonging to different files
   /** check if selected service has db properties**/
-  return this.get('categoryConfigsAll').findProperty('name', 
dbInfo.dpPropertiesByServiceMap[this.get('serviceConfig.serviceName')][propertyType]);
+  return this.get('parentView.serviceConfigs').findProperty('name', 
dbInfo.dpPropertiesByServiceMap[this.get('serviceConfig.serviceName')][propertyType]);
 }
 return null;
   },

http://git-wip-us.apache.org/repos/asf/ambari/blob/892270d0/ambari-web/test/views/common/controls_view_test.js
--
diff --git a/ambari-web/test/views/common/controls_view_test.js 
b/ambari-web/test/views/common/controls_view_test.js
index 6dd1185..e191068 100644
--- a/ambari-web/test/views/common/controls_view_test.js
+++ b/ambari-web/test/views/common/controls_view_test.js
@@ -22,58 +22,58 @@ var validator = require('utils/validator');
 
 describe('App.ServiceConfigRadioButtons', function () {
 
-  describe('#setConnectionUrl', function() {
+  describe('#setConnectionUrl', function () {
 var view = App.ServiceConfigRadioButtons.create();
-beforeEach(function() {
-  sinon.stub(view, 'getPropertyByType', function(name) {
+beforeEach(function () {
+  sinon.stub(view, 'getPropertyByType', function (name) {
 return App.ServiceConfigProperty.create({'name': name});
   });
-  sinon.stub(view, 'getDefaultPropertyValue', function() {
+  sinon.stub(view, 'getDefaultPropertyValue', function () {
 return 'host:{0},db:{1}';
   });
 });
 
-afterEach(function() {
+

ambari git commit: AMBARI-12891. Config group select tweaks.(xiwang)

2015-08-26 Thread xiwang 
Repository: ambari
Updated Branches:
  refs/heads/trunk 892270d0d - 84339970b


AMBARI-12891. Config group select tweaks.(xiwang)


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

Branch: refs/heads/trunk
Commit: 84339970bbca782bbf05e0382d7cfa95b06ad438
Parents: 892270d
Author: Xi Wang xiw...@apache.org
Authored: Wed Aug 26 16:18:13 2015 -0700
Committer: Xi Wang xiw...@apache.org
Committed: Wed Aug 26 18:01:12 2015 -0700

--
 ambari-web/app/styles/application.less | 5 +
 ambari-web/app/views/common/configs/service_config_view.js | 4 ++--
 2 files changed, 7 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/84339970/ambari-web/app/styles/application.less
--
diff --git a/ambari-web/app/styles/application.less 
b/ambari-web/app/styles/application.less
index d9ec7d7..0dde3bf 100644
--- a/ambari-web/app/styles/application.less
+++ b/ambari-web/app/styles/application.less
@@ -5439,6 +5439,11 @@ input[type=radio].align-checkbox, 
input[type=checkbox].align-checkbox {
   .select-create-config-group-div {
 margin-left: 20px;
 margin-bottom: 20px;
+.btn-group .dropdown-menu {
+  max-height: 160px;
+  max-width: 300px;
+  overflow: scroll;
+}
   }
   .message{
 color: #777;

http://git-wip-us.apache.org/repos/asf/ambari/blob/84339970/ambari-web/app/views/common/configs/service_config_view.js
--
diff --git a/ambari-web/app/views/common/configs/service_config_view.js 
b/ambari-web/app/views/common/configs/service_config_view.js
index 232eca1..29bd226 100644
--- a/ambari-web/app/views/common/configs/service_config_view.js
+++ b/ambari-web/app/views/common/configs/service_config_view.js
@@ -313,8 +313,8 @@ App.ConfigGroupDropdownView = Ember.TextField.extend({
*/
   disabled: function () {
 if (this.get('controller.isInstaller')) return false;
-return !this.get('controller.versionLoaded');
-  }.property('controller.versionLoaded', 'controller.isInstaller'),
+return !this.get('controller.versionLoaded') || 
this.get('controller.isHostsConfigsPage');
+  }.property('controller.versionLoaded', 'controller.isInstaller', 
'controller.isHostsConfigsPage'),
 
   didInsertElement: function() {
 var self = this;

ambari git commit: Revert AMBARI-12811: Disable old APIs to manage baseurl values (Nahappan Somasundaram via jluniya)

2015-08-26 Thread smohanty 
Repository: ambari
Updated Branches:
  refs/heads/trunk 84339970b - 4c73ea906


Revert AMBARI-12811: Disable old APIs to manage baseurl values (Nahappan 
Somasundaram via jluniya)

This reverts commit bbb042f32d5b7bb3937d6426f16243fd27effb45.


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

Branch: refs/heads/trunk
Commit: 4c73ea906d02df2c79ef76f5cf6fd2b94ea78ca6
Parents: 8433997
Author: Sumit Mohanty smoha...@hortonworks.com
Authored: Wed Aug 26 18:04:36 2015 -0700
Committer: Sumit Mohanty smoha...@hortonworks.com
Committed: Wed Aug 26 18:04:36 2015 -0700

--
 ambari-server/conf/unix/ambari.properties   |  3 --
 .../server/configuration/Configuration.java |  9 -
 .../AmbariManagementControllerImpl.java | 23 ++-
 .../AmbariManagementControllerTest.java | 42 
 4 files changed, 4 insertions(+), 73 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/4c73ea90/ambari-server/conf/unix/ambari.properties
--
diff --git a/ambari-server/conf/unix/ambari.properties 
b/ambari-server/conf/unix/ambari.properties
index 43faa2f..75e0fe1 100644
--- a/ambari-server/conf/unix/ambari.properties
+++ b/ambari-server/conf/unix/ambari.properties
@@ -92,6 +92,3 @@ skip.service.checks=false
 
 rolling.upgrade.min.stack=HDP-2.2
 rolling.upgrade.max.stack=
-
-# stack version for deprecating base url in metainfo table
-baseurl.api.metainfo.deprecate.min.version=2.2

http://git-wip-us.apache.org/repos/asf/ambari/blob/4c73ea90/ambari-server/src/main/java/org/apache/ambari/server/configuration/Configuration.java
--
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/configuration/Configuration.java
 
b/ambari-server/src/main/java/org/apache/ambari/server/configuration/Configuration.java
index 67fb08e..0b0ee95 100644
--- 
a/ambari-server/src/main/java/org/apache/ambari/server/configuration/Configuration.java
+++ 
b/ambari-server/src/main/java/org/apache/ambari/server/configuration/Configuration.java
@@ -438,12 +438,6 @@ public class Configuration {
   public static final String ALERTS_EXECUTION_SCHEDULER_THREADS_KEY = 
alerts.execution.scheduler.maxThreads;
   public static final String ALERTS_EXECUTION_SCHEDULER_THREADS_DEFAULT = 2;
 
-  /**
-   * Repository Base URL is no longer stored in metainfo table starting HDP 
version 2.2. It is in repo_version table.
-   */
-  public static final String BASEURL_API_DEPRECATED_STACK_VERSION = 
baseurl.api.metainfo.deprecate.min.version;
-  public static final String BASEURL_API_DEPRECATED_STACK_VERSION_DEFAULT = 
2.2;
-
   private static final Logger LOG = LoggerFactory.getLogger(
   Configuration.class);
 
@@ -642,9 +636,6 @@ public class Configuration {
 configsMap.put(PROXY_ALLOWED_HOST_PORTS, properties.getProperty(
 PROXY_ALLOWED_HOST_PORTS, PROXY_ALLOWED_HOST_PORTS_DEFAULT));
 
-configsMap.put(BASEURL_API_DEPRECATED_STACK_VERSION, 
properties.getProperty(
-BASEURL_API_DEPRECATED_STACK_VERSION, 
BASEURL_API_DEPRECATED_STACK_VERSION_DEFAULT));
-
 File passFile = new File(configsMap.get(SRVR_KSTR_DIR_KEY) + File.separator
 + configsMap.get(SRVR_CRT_PASS_FILE_KEY));
 String password = null;

http://git-wip-us.apache.org/repos/asf/ambari/blob/4c73ea90/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariManagementControllerImpl.java
--
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariManagementControllerImpl.java
 
b/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariManagementControllerImpl.java
index fe7f369..ef6fc58 100644
--- 
a/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariManagementControllerImpl.java
+++ 
b/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariManagementControllerImpl.java
@@ -160,7 +160,6 @@ import 
org.apache.ambari.server.state.svccomphost.ServiceComponentHostStartEvent
 import 
org.apache.ambari.server.state.svccomphost.ServiceComponentHostStopEvent;
 import 
org.apache.ambari.server.state.svccomphost.ServiceComponentHostUpgradeEvent;
 import org.apache.ambari.server.utils.StageUtils;
-import org.apache.ambari.server.utils.VersionUtils;
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.collections.MultiMap;
 import org.apache.commons.io.IOUtils;
@@ -3502,28 +3501,14 @@ public class AmbariManagementControllerImpl implements

ambari git commit: AMBARI-12888: After adding Ranger with SQLA, ambari-server Restart fails (jluniya)

2015-08-26 Thread jluniya 
Repository: ambari
Updated Branches:
  refs/heads/trunk 24e752b94 - d7f3f31a6


AMBARI-12888: After adding Ranger with SQLA, ambari-server Restart fails 
(jluniya)


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

Branch: refs/heads/trunk
Commit: d7f3f31a6e70af12d632382bc92d9dded4b1e020
Parents: 24e752b
Author: Jayush Luniya jlun...@hortonworks.com
Authored: Wed Aug 26 14:52:59 2015 -0700
Committer: Jayush Luniya jlun...@hortonworks.com
Committed: Wed Aug 26 14:52:59 2015 -0700

--
 .../python/ambari_server/serverConfiguration.py | 14 -
 .../src/test/python/TestAmbariServer.py | 33 +---
 2 files changed, 1 insertion(+), 46 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/d7f3f31a/ambari-server/src/main/python/ambari_server/serverConfiguration.py
--
diff --git a/ambari-server/src/main/python/ambari_server/serverConfiguration.py 
b/ambari-server/src/main/python/ambari_server/serverConfiguration.py
index 6b3974b..03da9f9 100644
--- a/ambari-server/src/main/python/ambari_server/serverConfiguration.py
+++ b/ambari-server/src/main/python/ambari_server/serverConfiguration.py
@@ -1203,17 +1203,6 @@ def get_ambari_jars():
  + default_jar_location)
 return default_jar_location
 
-def get_share_jars():
-  share_jars = 
-  file_list = []
-  file_list.extend(glob.glob(configDefaults.JAVA_SHARE_PATH + os.sep + 
*mysql*))
-  file_list.extend(glob.glob(configDefaults.JAVA_SHARE_PATH + os.sep + 
*sqljdbc*))
-  file_list.extend(glob.glob(configDefaults.JAVA_SHARE_PATH + os.sep + 
*ojdbc*))
-  file_list.extend(glob.glob(configDefaults.JAVA_SHARE_PATH + os.sep + 
*sajdbc4*))
-  if len(file_list)  0:
-share_jars = string.join(file_list, os.pathsep)
-  return share_jars
-
 def get_jdbc_cp():
   jdbc_jar_path = 
   properties = get_ambari_properties()
@@ -1226,9 +1215,6 @@ def get_ambari_classpath():
   jdbc_cp = get_jdbc_cp()
   if len(jdbc_cp)  0:
 ambari_cp = ambari_cp + os.pathsep + jdbc_cp
-  share_cp = get_share_jars()
-  if len(share_cp)  0:
-ambari_cp = ambari_cp + os.pathsep + share_cp
   return ambari_cp
 
 def get_full_ambari_classpath(conf_dir = None):

http://git-wip-us.apache.org/repos/asf/ambari/blob/d7f3f31a/ambari-server/src/test/python/TestAmbariServer.py
--
diff --git a/ambari-server/src/test/python/TestAmbariServer.py 
b/ambari-server/src/test/python/TestAmbariServer.py
index dc4a038..7b913e1 100644
--- a/ambari-server/src/test/python/TestAmbariServer.py
+++ b/ambari-server/src/test/python/TestAmbariServer.py
@@ -60,7 +60,7 @@ with patch(platform.linux_distribution, return_value = 
os_distro_value):
 from ambari_server.resourceFilesKeeper import ResourceFilesKeeper, 
KeeperException
 from ambari_server.serverConfiguration import configDefaults, \
   check_database_name_property, OS_FAMILY_PROPERTY, \
-  find_properties_file, get_ambari_classpath, get_ambari_jars, 
get_ambari_properties, get_JAVA_HOME, get_share_jars, \
+  find_properties_file, get_ambari_classpath, get_ambari_jars, 
get_ambari_properties, get_JAVA_HOME, \
   parse_properties_file, read_ambari_user, update_ambari_properties, 
update_properties_2, write_property, find_jdk, \
   AMBARI_CONF_VAR, AMBARI_SERVER_LIB, JDBC_DATABASE_PROPERTY, 
JDBC_RCA_PASSWORD_FILE_PROPERTY, \
   PERSISTENCE_TYPE_PROPERTY, JDBC_URL_PROPERTY, get_conf_dir, 
JDBC_USER_NAME_PROPERTY, JDBC_PASSWORD_PROPERTY, \
@@ -795,7 +795,6 @@ class TestAmbariServer(TestCase):
 sys.stdout = sys.__stdout__
 pass
 
-
   @not_for_platform(PLATFORM_WINDOWS)
   @patch(time.sleep)
   @patch(subprocess.Popen)
@@ -817,7 +816,6 @@ class TestAmbariServer(TestCase):
 self.assertEqual(1, retcode)
 pass
 
-
   @not_for_platform(PLATFORM_WINDOWS)
   @patch(shlex.split)
   @patch(subprocess.Popen)
@@ -862,7 +860,6 @@ class TestAmbariServer(TestCase):
 self.assertTrue(splitMock.called)
 pass
 
-
   @not_for_platform(PLATFORM_WINDOWS)
   @patch(ambari_server.serverConfiguration.get_conf_dir)
   @patch(ambari_server.serverConfiguration.search_file)
@@ -897,7 +894,6 @@ class TestAmbariServer(TestCase):
   os.unlink(tf1.name)
 pass
 
-
   @not_for_platform(PLATFORM_WINDOWS)
   @patch(ambari_server.dbConfiguration.decrypt_password_for_alias)
   @patch(ambari_server.dbConfiguration_linux.run_os_command)
@@ -926,7 +922,6 @@ class TestAmbariServer(TestCase):
 self.assertEqual((0, None, None), result)
 pass
 
-