You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by sm...@apache.org on 2013/10/11 03:28:23 UTC
git commit: Revert "AMBARI-3480. On Ambari Start,
re-check critical setup configs.(Artem Baranchuk via odiachenko)"
Updated Branches:
refs/heads/trunk 1a219f0a7 -> 1a109fb29
Revert "AMBARI-3480. On Ambari Start, re-check critical setup configs.(Artem Baranchuk via odiachenko)"
This reverts commit 82e92080c49c3f9c54ea527e38900b1e6abf71d8.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ambari/commit/1a109fb2
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ambari/tree/1a109fb2
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ambari/diff/1a109fb2
Branch: refs/heads/trunk
Commit: 1a109fb29cecb9538f888edf6d7e7ef7017dc502
Parents: 1a219f0
Author: Sumit Mohanty <sm...@hortonworks.com>
Authored: Thu Oct 10 18:27:42 2013 -0700
Committer: Sumit Mohanty <sm...@hortonworks.com>
Committed: Thu Oct 10 18:27:42 2013 -0700
----------------------------------------------------------------------
ambari-server/src/main/python/ambari-server.py | 9 ---------
.../src/test/python/TestAmbariServer.py | 19 +------------------
2 files changed, 1 insertion(+), 27 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ambari/blob/1a109fb2/ambari-server/src/main/python/ambari-server.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/python/ambari-server.py b/ambari-server/src/main/python/ambari-server.py
index 2c848b6..53c9362 100755
--- a/ambari-server/src/main/python/ambari-server.py
+++ b/ambari-server/src/main/python/ambari-server.py
@@ -2242,15 +2242,6 @@ def start(args):
"JDK manually to " + JDK_INSTALL_DIR
raise FatalException(1, err)
- if not is_local_database(args):
- result = find_jdbc_driver(args)
- msg = 'Before starting Ambari Server, ' \
- 'you must copy the {0} JDBC driver JAR file to {1}.'.format(
- DATABASE_FULL_NAMES[args.database],
- JAVA_SHARE_PATH)
- if result == -1:
- raise FatalException(-1, msg)
-
# Preparations
if is_root():
http://git-wip-us.apache.org/repos/asf/incubator-ambari/blob/1a109fb2/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 130d124..cc8c160 100644
--- a/ambari-server/src/test/python/TestAmbariServer.py
+++ b/ambari-server/src/test/python/TestAmbariServer.py
@@ -2213,11 +2213,9 @@ MIIFHjCCAwYCCQDpHKOBI+Lt0zANBgkqhkiG9w0BAQUFADBRMQswCQYDVQQGEwJV
@patch.object(ambari_server, "parse_properties_file")
@patch.object(ambari_server, "read_ambari_user")
@patch.object(ambari_server, "is_root")
- @patch.object(ambari_server, "is_local_database")
- @patch.object(ambari_server, "find_jdbc_driver")
@patch("getpass.getuser")
@patch("os.chdir")
- def test_start(self, chdir_mock, getuser_mock, find_jdbc_driver_mock, is_local_database_mock, is_root_mock, read_ambari_user_mock,
+ def test_start(self, chdir_mock, getuser_mock, is_root_mock, read_ambari_user_mock,
parse_properties_file_mock, check_postgre_up_mock,
print_error_msg_mock, find_jdk_mock, search_file_mock,
print_info_msg_mock, popenMock, openMock, pexistsMock,
@@ -2300,21 +2298,6 @@ MIIFHjCCAwYCCQDpHKOBI+Lt0zANBgkqhkiG9w0BAQUFADBRMQswCQYDVQQGEwJV
# Remote DB
args.persistence_type = "remote"
- args.database = "oracle"
-
- # Case when jdbc driver is not used
- is_local_database_mock.return_value = False
- find_jdbc_driver_mock.return_value = -1
- try:
- ambari_server.start(args)
- self.fail("Should fail with exception")
- except FatalException as e:
- self.assertTrue('Before starting Ambari Server' in e.reason)
-
- is_local_database_mock.reset_mock()
- find_jdbc_driver_mock.reset_mock()
- is_local_database_mock.return_value = True
- find_jdbc_driver_mock.return_value = 0
try:
ambari_server.start(args)
except FatalException as e: