ambari-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jlun...@apache.org
Subject ambari git commit: AMBARI-12878: BE: Ambari Server start fails with SQLA DB type due to typo in ambari_server_main.py (jluniya)
Date Wed, 26 Aug 2015 15:57:55 GMT
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 <jluniya@hortonworks.com>
Authored: Wed Aug 26 08:57:45 2015 -0700
Committer: Jayush Luniya <jluniya@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 @@
                   <location>src/main/resources/Ambari-DDL-SQLServer-DROP.sql</location>
                 </source>
                 <source>
+                  <location>target/classes/Ambari-DDL-SQLAnywhere-CREATE.sql</location>
+                </source>
+                <source>
+                  <location>src/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>
+              <src>target/classes/Ambari-DDL-SQLAnywhere-CREATE.sql</src>
+              <type>file</type>
+              <mapper>
+                <type>perm</type>
+                <prefix>/var/lib/ambari-server/resources</prefix>
+              </mapper>
+            </data>
+            <data>
+              <src>src/main/resources/Ambari-DDL-SQLAnywhere-DROP.sql</src>
+              <type>file</type>
+              <mapper>
+                <type>perm</type>
+                <prefix>/var/lib/ambari-server/resources</prefix>
+              </mapper>
+            </data>
+            <data>
               <src>${project.build.directory}/DBConnectionVerification.jar</src>
               <type>file</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


Mime
View raw message