Merge pull request #317 from caskdata/feature/COOK-55-derby-db-dir

COOK-55 Create Derby DB directories

Author: wolf31o2

recipes/hive_metastore.rb

@@ -2,7 +2,7 @@
 # Cookbook Name:: hadoop
 # Recipe:: hive_metastore
 #
-# Copyright © 2013-2015 Cask Data, Inc.
+# Copyright © 2013-2017 Cask Data, Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -40,6 +40,18 @@
   end
 end
 
+derby_db =
+  if hive_sql == 'derby' && node['hive'].key?('hive_site') && node['hive']['hive_site'].key?('javax.jdo.option.ConnectionURL')
+    node['hive']['hive_site']['javax.jdo.option.ConnectionURL'].split(':')[2].split(';').find { |o| /^databaseName/ =~ o }.split('=')[1]
+  else
+    # We set this to our default, because the Hive default uses the current working directory
+    '/var/lib/hive/metastore/metastore_db'
+  end
+
+directory ::File.dirname(derby_db) do
+  action :create
+end
+
 # Hive HDFS directories
 dfs = node['hadoop']['core_site']['fs.defaultFS']
 warehouse_dir =

recipes/oozie.rb

@@ -2,7 +2,7 @@
 # Cookbook Name:: hadoop
 # Recipe:: oozie
 #
-# Copyright © 2013-2016 Cask Data, Inc.
+# Copyright © 2013-2017 Cask Data, Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -35,6 +35,19 @@
     'derby'
   end
 
+derby_db =
+  if oozie_sql == 'derby' && node['oozie'].key?('oozie_site') && node['oozie']['oozie_site'].key?('oozie.service.JPAService.jdbc.url')
+    node['oozie']['oozie_site']['oozie.service.JPAService.jdbc.url'].split(':')[2].split(';').find { |o| /^databaseName/ =~ o }.split('=')
+  elsif node['oozie'].key?('oozie_site') && node['oozie']['oozie_site'].key?('oozie.db.schema.name')
+    "#{oozie_data_dir}/#{node['oozie']['oozie_site']['oozie.db.schema.name']}-db"
+  else
+    "#{oozie_data_dir}/oozie-db"
+  end
+
+directory ::File.dirname(derby_db) do
+  action :create
+end
+
 node.default['hadoop']['sql_connector'] = oozie_sql
 include_recipe 'hadoop::_sql_connectors'