Browse Source

AMBARI-15769. Add Maria DB support for Ambari Server. (mpapirkovskyy)

Myroslav Papirkovskyi 9 years ago
parent
commit
14fcf31aaa

+ 2 - 5
ambari-server/src/main/java/org/apache/ambari/server/orm/EclipseLinkSessionCustomizer.java

@@ -20,7 +20,6 @@ package org.apache.ambari.server.orm;
 import javax.activation.DataSource;
 import javax.activation.DataSource;
 
 
 import org.eclipse.persistence.config.SessionCustomizer;
 import org.eclipse.persistence.config.SessionCustomizer;
-import org.eclipse.persistence.platform.database.MySQLPlatform;
 import org.eclipse.persistence.sessions.DatabaseLogin;
 import org.eclipse.persistence.sessions.DatabaseLogin;
 import org.eclipse.persistence.sessions.JNDIConnector;
 import org.eclipse.persistence.sessions.JNDIConnector;
 import org.eclipse.persistence.sessions.Session;
 import org.eclipse.persistence.sessions.Session;
@@ -55,10 +54,8 @@ public class EclipseLinkSessionCustomizer implements SessionCustomizer {
    */
    */
   @Override
   @Override
   public void customize(Session session) throws Exception {
   public void customize(Session session) throws Exception {
-    //Override transaction isolation level for MySQL to match EclipseLink shared cache behavior
+    // ensure db behavior is same as shared cache
     DatabaseLogin databaseLogin = (DatabaseLogin) session.getDatasourceLogin();
     DatabaseLogin databaseLogin = (DatabaseLogin) session.getDatasourceLogin();
-    if (databaseLogin.getDatasourcePlatform() instanceof MySQLPlatform) {
-      databaseLogin.setTransactionIsolation(DatabaseLogin.TRANSACTION_READ_COMMITTED);
-    }
+    databaseLogin.setTransactionIsolation(DatabaseLogin.TRANSACTION_READ_COMMITTED);
   }
   }
 }
 }

+ 1 - 1
ambari-server/src/main/python/ambari_server/dbConfiguration.py

@@ -349,7 +349,7 @@ class DBMSConfigFactoryLinux(DBMSConfigFactory):
     self.DBMS_LIST = [
     self.DBMS_LIST = [
       DBMSDesc(self.DBMS_KEYS_LIST[3], STORAGE_TYPE_LOCAL, 'PostgreSQL', 'Embedded', createPGConfig),
       DBMSDesc(self.DBMS_KEYS_LIST[3], STORAGE_TYPE_LOCAL, 'PostgreSQL', 'Embedded', createPGConfig),
       DBMSDesc(self.DBMS_KEYS_LIST[1], STORAGE_TYPE_REMOTE, 'Oracle', '', createOracleConfig),
       DBMSDesc(self.DBMS_KEYS_LIST[1], STORAGE_TYPE_REMOTE, 'Oracle', '', createOracleConfig),
-      DBMSDesc(self.DBMS_KEYS_LIST[2], STORAGE_TYPE_REMOTE, 'MySQL', '', createMySQLConfig),
+      DBMSDesc(self.DBMS_KEYS_LIST[2], STORAGE_TYPE_REMOTE, 'MySQL (MariaDB)', '', createMySQLConfig),
       DBMSDesc(self.DBMS_KEYS_LIST[3], STORAGE_TYPE_REMOTE, 'PostgreSQL', '', createPGConfig),
       DBMSDesc(self.DBMS_KEYS_LIST[3], STORAGE_TYPE_REMOTE, 'PostgreSQL', '', createPGConfig),
       DBMSDesc(self.DBMS_KEYS_LIST[4], STORAGE_TYPE_REMOTE, 'Microsoft SQL Server', 'Tech Preview', createMSSQLConfig),
       DBMSDesc(self.DBMS_KEYS_LIST[4], STORAGE_TYPE_REMOTE, 'Microsoft SQL Server', 'Tech Preview', createMSSQLConfig),
       DBMSDesc(self.DBMS_KEYS_LIST[5], STORAGE_TYPE_REMOTE, 'SQL Anywhere', '', createSQLAConfig)
       DBMSDesc(self.DBMS_KEYS_LIST[5], STORAGE_TYPE_REMOTE, 'SQL Anywhere', '', createSQLAConfig)