diff --git a/devstack/files/monasca-transform/monasca-transform.conf b/devstack/files/monasca-transform/monasca-transform.conf index 1d13ec1..b585b95 100644 --- a/devstack/files/monasca-transform/monasca-transform.conf +++ b/devstack/files/monasca-transform/monasca-transform.conf @@ -6,7 +6,7 @@ data_driven_specs = monasca_transform.data_driven_specs.mysql_data_driven_specs_ offsets_max_revisions = 10 [database] -server_type = mysql +server_type = mysql:thin host = localhost database_name = monasca_transform username = m-transform @@ -55,7 +55,7 @@ service_log_filename=monasca-transform.log spark_event_logging_enabled = true # A list of jars which Spark should use -spark_jars_list = /opt/spark/current/lib/spark-streaming-kafka_2.10-1.6.1.jar,/opt/spark/current/lib/scala-library-2.10.1.jar,/opt/spark/current/lib/kafka_2.10-0.8.1.1.jar,/opt/spark/current/lib/metrics-core-2.2.0.jar,/usr/share/java/mysql.jar +spark_jars_list = /opt/spark/current/lib/spark-streaming-kafka_2.10-1.6.1.jar,/opt/spark/current/lib/scala-library-2.10.1.jar,/opt/spark/current/lib/kafka_2.10-0.8.1.1.jar,/opt/spark/current/lib/metrics-core-2.2.0.jar,/opt/spark/current/lib/drizzle-jdbc-1.3.jar # A list of where the Spark master(s) should run spark_master_list = spark://localhost:7077 diff --git a/devstack/files/spark/spark-defaults.conf b/devstack/files/spark/spark-defaults.conf index 7c83c21..8552ed9 100644 --- a/devstack/files/spark/spark-defaults.conf +++ b/devstack/files/spark/spark-defaults.conf @@ -1,5 +1,5 @@ -spark.driver.extraClassPath /usr/share/java/mysql.jar -spark.executor.extraClassPath /usr/share/java/mysql.jar +spark.driver.extraClassPath /opt/spark/current/lib/drizzle-jdbc-1.3.jar +spark.executor.extraClassPath /opt/spark/current/lib/drizzle-jdbc-1.3.jar spark.blockManager.port 7100 spark.broadcast.port 7105 diff --git a/devstack/plugin.sh b/devstack/plugin.sh index e802a2b..f2a3195 100755 --- a/devstack/plugin.sh +++ b/devstack/plugin.sh @@ -65,13 +65,6 @@ function pre_install_spark { : } - -function install_mysql_connector { - - sudo apt-get -y install libmysql-java - -} - function install_java_libs { pushd /opt/spark/current/lib @@ -356,8 +349,6 @@ function install_spark { sudo -u spark ln -sf /opt/spark/${SPARK_HADOOP_VERSION} /opt/spark/current - install_mysql_connector - install_java_libs create_spark_directories diff --git a/devstack/settings b/devstack/settings index 6c17d7d..4f254ad 100644 --- a/devstack/settings +++ b/devstack/settings @@ -41,4 +41,4 @@ APACHE_MIRROR=${APACHE_MIRROR:-http://archive.apache.org/dist} BASE_KAFKA_VERSION=${BASE_KAFKA_VERSION:-0.8.1.1} SCALA_VERSION=${SCALA_VERSION:-2.10} KAFKA_VERSION=${KAFKA_VERSION:-${SCALA_VERSION}-${BASE_KAFKA_VERSION}} -SPARK_JAVA_LIBS=("org/apache/kafka/kafka_2.10/0.8.1.1/kafka_2.10-0.8.1.1.jar" "org/scala-lang/scala-library/2.10.1/scala-library-2.10.1.jar" "com/yammer/metrics/metrics-core/2.2.0/metrics-core-2.2.0.jar" "org/apache/spark/spark-streaming-kafka_2.10/${SPARK_VERSION}/spark-streaming-kafka_2.10-${SPARK_VERSION}.jar") \ No newline at end of file +SPARK_JAVA_LIBS=("org/apache/kafka/kafka_2.10/0.8.1.1/kafka_2.10-0.8.1.1.jar" "org/scala-lang/scala-library/2.10.1/scala-library-2.10.1.jar" "com/yammer/metrics/metrics-core/2.2.0/metrics-core-2.2.0.jar" "org/apache/spark/spark-streaming-kafka_2.10/${SPARK_VERSION}/spark-streaming-kafka_2.10-${SPARK_VERSION}.jar" "org/drizzle/jdbc/drizzle-jdbc/1.3/drizzle-jdbc-1.3.jar") \ No newline at end of file diff --git a/etc/monasca-transform.conf b/etc/monasca-transform.conf index 915230c..9a5dd6c 100644 --- a/etc/monasca-transform.conf +++ b/etc/monasca-transform.conf @@ -6,7 +6,7 @@ data_driven_specs = monasca_transform.data_driven_specs.mysql_data_driven_specs_ offsets_max_revisions = 10 [database] -server_type = mysql +server_type = mysql:thin host = localhost database_name = monasca_transform username = m-transform diff --git a/tests/unit/config/config_initializer_test.py b/tests/unit/config/config_initializer_test.py index 9211cc6..05fa9e2 100644 --- a/tests/unit/config/config_initializer_test.py +++ b/tests/unit/config/config_initializer_test.py @@ -54,7 +54,7 @@ class TestConfigInitializer(unittest.TestCase): 'mysql_data_driven_specs_repo:MySQLDataDrivenSpecsRepo', cfg.CONF.repositories.data_driven_specs) - self.assertEqual('mysql', + self.assertEqual('mysql:thin', cfg.CONF.database.server_type) self.assertEqual('localhost', cfg.CONF.database.host)