Merge lp:~robert-ayres/charms/precise/hive/mysql-update into lp:charms/hive

[Robert Ayres]

Updates to current MySQL charm removing the previous Known Issues and workarounds.

[Marco Ceppi (marcoceppi)]

LGTM +1

review: Approve

=== modified file 'README.md'
--- README.md	2013-09-09 14:38:23 +0000
+++ README.md	2014-01-06 20:20:46 +0000
@@ -51,8 +51,8 @@
 A Hive server stores metadata in MySQL::
 
     juju deploy mysql
-
-**Please read Known Issues 1. below before proceeding further**
+    # hive requires ROW binlog
+    juju set mysql binlog-format=ROW
 
 To deploy a Hive service without a Metastore service::
 
@@ -61,8 +61,6 @@
     # associate Hive with MySQL
     juju add-relation hive-server:db mysql:db
 
-**Please read Known Issues 2. below before proceeding further**
-
     # associate Hive with HDFS Namenode
     juju add-relation hive-server:namenode hadoop-master:namenode
     # associate Hive with Jobtracker
@@ -75,8 +73,6 @@
     # associate Metastore with MySQL
     juju add-relation hive-metastore:db mysql:db
 
-**Please read Known Issues 2. below before proceeding further**
-
     # associate Metastore with Namenode
     juju add-relation hive-metastore:namenode hadoop-master:namenode
 
@@ -94,40 +90,3 @@
     juju add-unit hive-server
 
 This currently only works when using a Metastore service.
-
-## Known Issues
-
-
- 1. The current MySQL Charm does not alter the binlog format to 'ROW' (nor can
-the binlog be disabled) so attempting to use Hive will result in a nasty error
-message of::
-
-    'Cannot execute statement: impossible to write to binary log since
-     BINLOG_FORMAT = STATEMENT and at least one table uses a storage engine
-     limited to row-based logging. InnoDB is limited to row-logging when
-     transaction isolation level is READ COMMITTED or READ UNCOMMITTED.'
-
-The current solution is to ssh into a MySQL charm machine and manually set the
-binlog format::
-
-    sudo bash -c 'echo "binlog_format = ROW" >> /etc/mysql/conf.d/binlog.cnf'
-    sudo service mysql restart
-
-This should be done after deploying the MySQL charm.
-
- 1. The current MySQL Charm creates a database using 'utf8' encoding, which
-will give you the following error with Hive::
-
-    'MetaException(message:Got exception: javax.jdo.JDODataStoreException An
-     exception was thrown while adding/validating class(es) : Specified key was
-     too long; max key length is 767 bytes'
-
-The current solution is drop the database and recreate it (to use 'latin1'
-encoding)::
-
-    mysql -u root -p`cat /var/lib/juju/mysql.passwd` -e 'drop database `<name>`; \
-    create database `<name>`;'
-
-where '<name>' is the service name, either 'hive-server' or 'hive-metastore'.
-
-This should be done after you have associated Hive with the database.
 
=== modified file 'hooks/hive-common'
--- hooks/hive-common	2012-03-22 15:33:35 +0000
+++ hooks/hive-common	2014-01-06 20:20:46 +0000
@@ -186,7 +186,7 @@
 
 install_mysql_jdbc () {
     juju-log "Installing mysql jdbc driver"
-    apt-get -y install libmysql-java
+    apt-get -y install libmysql-java mysql-client
 }
 
 configure_mysql () {
@@ -195,6 +195,9 @@
     database=`relation-get database`
     user=`relation-get user`
     password=`relation-get password`
+    # mysql charm creates databases defaulting to utf-8, hive requires latin1
+    mysql -h $host -u "$user" "-p$password" "$database" \
+        -e "ALTER DATABASE \`$database\` CHARACTER SET=latin1"
     dir=`dotdee --dir /etc/hive/conf.juju/hive-site.xml`
     rm -f $dir/6*-* $dir/7*-*
     config_element hive.metastore.local true > $dir/61-hive.metastore.local