openstack
/
monasca-transform
Code Issues Proposed changes

Change jdbc driver to drizzle 

drizzle is BSD licensed compared with the GPLv2 mysql-connector from oracle.

Change-Id: Ie203a285cf031e5c29d6d7673fab437cfe8acca4
This commit is contained in:
David C Kennedy 2016-06-22 14:32:01 +01:00 committed by Ashwin Agate
parent 1c3a7989e7
commit b3f85e134e
6 changed files with 7 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
devstack/files/monasca-transform/monasca-transform.conf
View File

@ -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

4
devstack/files/spark/spark-defaults.conf
View File

@ -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

9
devstack/plugin.sh
View File

@ -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

2
devstack/settings
View File

@ -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")
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")

2
etc/monasca-transform.conf
View File

@ -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

2
tests/unit/config/config_initializer_test.py
View File

@ -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)