From cabeaf8129fcd3adc963484a488676ae0cb77f62 Mon Sep 17 00:00:00 2001 From: Jim Dowling Date: Thu, 9 Apr 2015 21:24:39 +0200 Subject: [PATCH] Setting default charset for all hops tables to latin1 --- attributes/default.rb | 4 +++- templates/default/hops.sql.erb | 6 +++--- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/attributes/default.rb b/attributes/default.rb index 075a00f1..cf831145 100644 --- a/attributes/default.rb +++ b/attributes/default.rb @@ -1,8 +1,10 @@ +node.normal[:hadoop][:version] = "2.4.0" + include_attribute "kagent" include_attribute "hadoop" include_attribute "ndb" -node.normal[:hadoop][:version] = "2.4.0" + default[:hops][:download_url] = "#{node[:download_url]}/hops-#{node[:hadoop][:version]}.tgz" default[:hops][:hadoop_src_url] = "#{node[:download_url]}/hadoop-#{node[:hadoop][:version]}-src.tar.gz" diff --git a/templates/default/hops.sql.erb b/templates/default/hops.sql.erb index 208cb4ed..77f6588e 100644 --- a/templates/default/hops.sql.erb +++ b/templates/default/hops.sql.erb @@ -423,7 +423,7 @@ CREATE TABLE `yarn_rmnode` ( `nodemanager_version` VARCHAR(45) NULL, `uci_id` INT NULL, PRIMARY KEY (`rmnodeid`)) -ENGINE = ndbcluster +ENGINE = ndbcluster DEFAULT CHARSET=latin1$$ PACK_KEYS = DEFAULT PARTITION BY KEY(rmnodeid)$$ @@ -812,7 +812,7 @@ CREATE TABLE `yarn_nextheartbeat` ( REFERENCES `yarn_rmnode` (`rmnodeid`) ON DELETE CASCADE ON UPDATE NO ACTION) -ENGINE = ndbcluster$$ +ENGINE = ndbcluster DEFAULT CHARSET=latin1$$ delimiter $$ @@ -823,4 +823,4 @@ CREATE TABLE `yarn_pendingevents` ( `status` TINYINT NULL, `last_hb` INT NULL, PRIMARY KEY (`id`, `rmnodeid`)) -ENGINE = ndbcluster$$ \ No newline at end of file +ENGINE = ndbcluster DEFAULT CHARSET=latin1$$ \ No newline at end of file