bigdata-dev team mailing list archive

[Kevin W Monroe <kevin.monroe@xxxxxxxxxxxxx>]

Kevin W Monroe has proposed merging lp:~bigdata-dev/charms/trusty/apache-hive/trunk into lp:charms/trusty/apache-hive.

Requested reviews:
  Kevin W Monroe (kwmonroe)

For more details, see:
https://code.launchpad.net/~bigdata-dev/charms/trusty/apache-hive/trunk/+merge/268672
-- 
Your team Juju Big Data Development is subscribed to branch lp:~bigdata-dev/charms/trusty/apache-hive/trunk.

=== modified file 'hooks/callbacks.py'
--- hooks/callbacks.py	2015-07-24 16:09:06 +0000
+++ hooks/callbacks.py	2015-08-20 23:13:52 +0000
@@ -84,10 +84,18 @@
         unitdata.kv().flush(True)
 
     def setup_hive_config(self):
-        # copy default config into alternate dir
-        conf_dir = self.dist_config.path('hive') / 'conf'
-        self.dist_config.path('hive_conf').rmtree_p()
-        conf_dir.copytree(self.dist_config.path('hive_conf'))
+        '''
+        copy the default configuration files to hive_conf property
+        defined in dist.yaml
+        '''
+        default_conf = self.dist_config.path('hive') / 'conf'
+        hive_conf = self.dist_config.path('hive_conf')
+        hive_conf.rmtree_p()
+        default_conf.copytree(hive_conf)
+        # Now remove the conf included in the tarball and symlink our real conf
+        default_conf.rmtree_p()
+        hive_conf.symlink(default_conf)
+
         hive_env = self.dist_config.path('hive_conf') / 'hive-env.sh'
         if not hive_env.exists():
             (self.dist_config.path('hive_conf') / 'hive-env.sh.template').copy(hive_env)
@@ -135,7 +143,8 @@
         """
         parts = [command] + list(args)
         quoted = ' '.join("'%s'" % p for p in parts)
-        Popen(['su', user, '-c', quoted])
+        e = utils.read_etc_env()
+        Popen(['su', user, '-c', quoted], env=e)
 
     def start(self):
         if not utils.jps('HiveServer2'):

=== modified file 'resources.yaml'
--- resources.yaml	2015-07-24 16:09:06 +0000
+++ resources.yaml	2015-08-20 23:13:52 +0000
@@ -4,7 +4,7 @@
   pathlib:
     pypi: path.py>=7.0
   jujubigdata:
-    pypi: jujubigdata>=2.0.0,<3.0.0
+    pypi: jujubigdata>=4.0.0,<5.0.0
 optional_resources:
   hive-ppc64le:
     url: https://git.launchpad.net/bigdata-data/plain/apache/ppc64le/apache-hive-0.13.0-bin.tar.gz?id=c34a21c939f5fce9ab89b95d65fe2df50e7bbab0