ambari-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From swa...@apache.org
Subject ambari git commit: AMBARI-19378. Druid db connection check fails if user uploads connector jar manually in extension folder. ((Nishant Bangarwa via Swapan Shridhar).)
Date Tue, 07 Feb 2017 23:41:01 GMT
Repository: ambari
Updated Branches:
  refs/heads/trunk de56092a4 -> c99ca1254


AMBARI-19378. Druid db connection check fails if user uploads connector jar manually in extension
folder. ((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/c99ca125
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/c99ca125
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/c99ca125

Branch: refs/heads/trunk
Commit: c99ca1254fb48a207a6759b3ba113aa859a6b0ba
Parents: de56092
Author: Swapan Shridhar <sshridhar@hortonworks.com>
Authored: Tue Feb 7 15:40:50 2017 -0800
Committer: Swapan Shridhar <sshridhar@hortonworks.com>
Committed: Tue Feb 7 15:40:50 2017 -0800

----------------------------------------------------------------------
 .../DRUID/0.9.2/package/scripts/druid_node.py           |  2 +-
 .../src/test/python/stacks/2.6/DRUID/test_druid.py      | 12 ++++++------
 2 files changed, 7 insertions(+), 7 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/c99ca125/ambari-server/src/main/resources/common-services/DRUID/0.9.2/package/scripts/druid_node.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/common-services/DRUID/0.9.2/package/scripts/druid_node.py
b/ambari-server/src/main/resources/common-services/DRUID/0.9.2/package/scripts/druid_node.py
index bdb6007..6c1cc20 100644
--- a/ambari-server/src/main/resources/common-services/DRUID/0.9.2/package/scripts/druid_node.py
+++ b/ambari-server/src/main/resources/common-services/DRUID/0.9.2/package/scripts/druid_node.py
@@ -55,7 +55,7 @@ class DruidBase(Script):
     # Verify Database connection on Druid start
     if params.metadata_storage_type == 'mysql':
       if not params.jdbc_driver_jar or not os.path.isfile(params.connector_download_dir +
os.path.sep + params.jdbc_driver_jar):
-        path_to_jdbc =  params.druid_extensions_dir + os.path.sep + "*"
+        path_to_jdbc =  params.connector_download_dir + os.path.sep + "*"
         error_message = "Error! Sorry, but we can't find jdbc driver for mysql.So, db connection
check can fail." + \
                         "Please run 'ambari-server setup --jdbc-db=mysql --jdbc-driver={path_to_jdbc}
on server host.'"
         Logger.error(error_message)

http://git-wip-us.apache.org/repos/asf/ambari/blob/c99ca125/ambari-server/src/test/python/stacks/2.6/DRUID/test_druid.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/python/stacks/2.6/DRUID/test_druid.py b/ambari-server/src/test/python/stacks/2.6/DRUID/test_druid.py
index 422e9ba..f35fd8e 100644
--- a/ambari-server/src/test/python/stacks/2.6/DRUID/test_druid.py
+++ b/ambari-server/src/test/python/stacks/2.6/DRUID/test_druid.py
@@ -63,7 +63,7 @@ class TestDruid(RMFTestCase):
                        target=RMFTestCase.TARGET_COMMON_SERVICES
                        )
     self.assert_configure_default('druid-overlord')
-    self.assertResourceCalled('Execute', format("/usr/jdk64/jdk1.7.0_45/bin/java -cp /usr/lib/ambari-agent/DBConnectionVerification.jar:/usr/hdp/current/druid-overlord/extensions/*
org.apache.ambari.server.DBConnectionVerification 'jdbc:mysql://my-db-host:3306/druid?createDatabaseIfNotExist=true'
druid diurd com.mysql.jdbc.Driver"),
+    self.assertResourceCalled('Execute', format("/usr/jdk64/jdk1.7.0_45/bin/java -cp /usr/lib/ambari-agent/DBConnectionVerification.jar:/usr/hdp/current/druid-overlord/extensions/mysql-metadata-storage/*
org.apache.ambari.server.DBConnectionVerification 'jdbc:mysql://my-db-host:3306/druid?createDatabaseIfNotExist=true'
druid diurd com.mysql.jdbc.Driver"),
                               user='druid',
                               tries=5,
                               try_sleep=10
@@ -109,7 +109,7 @@ class TestDruid(RMFTestCase):
                        target=RMFTestCase.TARGET_COMMON_SERVICES
                        )
     self.assert_configure_default('druid-coordinator')
-    self.assertResourceCalled('Execute', format("/usr/jdk64/jdk1.7.0_45/bin/java -cp /usr/lib/ambari-agent/DBConnectionVerification.jar:/usr/hdp/current/druid-coordinator/extensions/*
org.apache.ambari.server.DBConnectionVerification 'jdbc:mysql://my-db-host:3306/druid?createDatabaseIfNotExist=true'
druid diurd com.mysql.jdbc.Driver"),
+    self.assertResourceCalled('Execute', format("/usr/jdk64/jdk1.7.0_45/bin/java -cp /usr/lib/ambari-agent/DBConnectionVerification.jar:/usr/hdp/current/druid-coordinator/extensions/mysql-metadata-storage/*
org.apache.ambari.server.DBConnectionVerification 'jdbc:mysql://my-db-host:3306/druid?createDatabaseIfNotExist=true'
druid diurd com.mysql.jdbc.Driver"),
                               user='druid',
                               tries=5,
                               try_sleep=10
@@ -155,7 +155,7 @@ class TestDruid(RMFTestCase):
                        target=RMFTestCase.TARGET_COMMON_SERVICES
                        )
     self.assert_configure_default('druid-broker')
-    self.assertResourceCalled('Execute', format("/usr/jdk64/jdk1.7.0_45/bin/java -cp /usr/lib/ambari-agent/DBConnectionVerification.jar:/usr/hdp/current/druid-broker/extensions/*
org.apache.ambari.server.DBConnectionVerification 'jdbc:mysql://my-db-host:3306/druid?createDatabaseIfNotExist=true'
druid diurd com.mysql.jdbc.Driver"),
+    self.assertResourceCalled('Execute', format("/usr/jdk64/jdk1.7.0_45/bin/java -cp /usr/lib/ambari-agent/DBConnectionVerification.jar:/usr/hdp/current/druid-broker/extensions/mysql-metadata-storage/*
org.apache.ambari.server.DBConnectionVerification 'jdbc:mysql://my-db-host:3306/druid?createDatabaseIfNotExist=true'
druid diurd com.mysql.jdbc.Driver"),
                               user='druid',
                               tries=5,
                               try_sleep=10
@@ -201,7 +201,7 @@ class TestDruid(RMFTestCase):
                        target=RMFTestCase.TARGET_COMMON_SERVICES
                        )
     self.assert_configure_default('druid-router')
-    self.assertResourceCalled('Execute', format("/usr/jdk64/jdk1.7.0_45/bin/java -cp /usr/lib/ambari-agent/DBConnectionVerification.jar:/usr/hdp/current/druid-router/extensions/*
org.apache.ambari.server.DBConnectionVerification 'jdbc:mysql://my-db-host:3306/druid?createDatabaseIfNotExist=true'
druid diurd com.mysql.jdbc.Driver"),
+    self.assertResourceCalled('Execute', format("/usr/jdk64/jdk1.7.0_45/bin/java -cp /usr/lib/ambari-agent/DBConnectionVerification.jar:/usr/hdp/current/druid-router/extensions/mysql-metadata-storage/*
org.apache.ambari.server.DBConnectionVerification 'jdbc:mysql://my-db-host:3306/druid?createDatabaseIfNotExist=true'
druid diurd com.mysql.jdbc.Driver"),
                               user='druid',
                               tries=5,
                               try_sleep=10
@@ -247,7 +247,7 @@ class TestDruid(RMFTestCase):
                        target=RMFTestCase.TARGET_COMMON_SERVICES
                        )
     self.assert_configure_default('druid-historical')
-    self.assertResourceCalled('Execute', format("/usr/jdk64/jdk1.7.0_45/bin/java -cp /usr/lib/ambari-agent/DBConnectionVerification.jar:/usr/hdp/current/druid-historical/extensions/*
org.apache.ambari.server.DBConnectionVerification 'jdbc:mysql://my-db-host:3306/druid?createDatabaseIfNotExist=true'
druid diurd com.mysql.jdbc.Driver"),
+    self.assertResourceCalled('Execute', format("/usr/jdk64/jdk1.7.0_45/bin/java -cp /usr/lib/ambari-agent/DBConnectionVerification.jar:/usr/hdp/current/druid-historical/extensions/mysql-metadata-storage/*
org.apache.ambari.server.DBConnectionVerification 'jdbc:mysql://my-db-host:3306/druid?createDatabaseIfNotExist=true'
druid diurd com.mysql.jdbc.Driver"),
                               user='druid',
                               tries=5,
                               try_sleep=10
@@ -293,7 +293,7 @@ class TestDruid(RMFTestCase):
                        target=RMFTestCase.TARGET_COMMON_SERVICES
                        )
     self.assert_configure_default('druid-middlemanager')
-    self.assertResourceCalled('Execute', format("/usr/jdk64/jdk1.7.0_45/bin/java -cp /usr/lib/ambari-agent/DBConnectionVerification.jar:/usr/hdp/current/druid-middlemanager/extensions/*
org.apache.ambari.server.DBConnectionVerification 'jdbc:mysql://my-db-host:3306/druid?createDatabaseIfNotExist=true'
druid diurd com.mysql.jdbc.Driver"),
+    self.assertResourceCalled('Execute', format("/usr/jdk64/jdk1.7.0_45/bin/java -cp /usr/lib/ambari-agent/DBConnectionVerification.jar:/usr/hdp/current/druid-middlemanager/extensions/mysql-metadata-storage/*
org.apache.ambari.server.DBConnectionVerification 'jdbc:mysql://my-db-host:3306/druid?createDatabaseIfNotExist=true'
druid diurd com.mysql.jdbc.Driver"),
                               user='druid',
                               tries=5,
                               try_sleep=10


Mime
View raw message