Fix Gradiant#32

student-drawing · Aug 31, 2020 · 3a095d1 · 3a095d1
1 parent 6e29d7a
commit 3a095d1
Show file tree

Hide file tree

Showing 9 changed files with 38 additions and 34 deletions.
diff --git a/charts/hive-metastore/Chart.yaml b/charts/hive-metastore/Chart.yaml
@@ -13,4 +13,4 @@ sources:
 - https://github.com/apache/hive
 - https://github.com/gradiant/charts
 - https://github.com/big-data-europe/docker-hive
-version: 0.1.1
+version: 0.1.2
diff --git a/charts/hive-metastore/templates/configmap.yaml b/charts/hive-metastore/templates/configmap.yaml
@@ -36,6 +36,12 @@ data:
           <value>thrift://{{ include "hiveMetastore.fullname" . }}:9083</value>
         </property>
       {{- end }}
+      {{- if not (index .Values.conf "hiveSite" "hive.metastore.warehouse.dir")  }}
+      <property>
+        <name>hive.metastore.warehouse.dir</name>
+        <value>hdfs://{{ .Release.Name }}-hdfs:8020/user/hive/warehouse</value>
+      </property>
+    {{- end }}
       {{- if index .Values.conf "hiveSite" }}
       {{- range $key, $value := index .Values.conf "hiveSite" }}
       <property><name>{{ $key }}</name><value>{{ $value }}</value></property>

diff --git a/charts/hive-metastore/values.yaml b/charts/hive-metastore/values.yaml
@@ -15,4 +15,6 @@ image:
 resources: {}
 conf:
   hiveSite:
-    hive_metastore_uris: thrift://hive-metastore:9083
+    hive_metastore_uris: thrift://hive-metastore:9083
+    # if not set, default hive.metastore.warehouse.dir is default to: "hdfs://{{.Release.Name}}-hdfs:8020/user/hive/warehouse"
+    #hive.metastore.warehouse.dir:
diff --git a/charts/hive/Chart.yaml b/charts/hive/Chart.yaml
@@ -13,4 +13,4 @@ sources:
 - https://github.com/apache/hive
 - https://github.com/gradiant/charts
 - https://github.com/big-data-europe/docker-hive
-version: 0.1.3
+version: 0.1.4
diff --git a/charts/hive/requirements.yaml b/charts/hive/requirements.yaml
@@ -1,7 +1,7 @@
 dependencies:
 - name: hive-metastore
   alias: metastore
-  version: ~0.1.0
+  version: ~0.1.2
   repository: file://../hive-metastore
   condition: metastore.enabled
 - name: hdfs

diff --git a/charts/hive/resources/config/hive-site.xml b/charts/hive/resources/config/hive-site.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0"?>
 <?xml-stylesheet type="text/xsl" href="configuration.xsl"?>
+
 <configuration>
     {{- if not (index .Values.conf "hiveSite" "hive.metastore.uris")  }}
     <property>

diff --git a/charts/hive/resources/startup.sh b/charts/hive/resources/startup.sh
@@ -1,46 +1,44 @@
 #!/bin/bash
 
-: ${HADOOP_PREFIX:=/usr/local/hadoop}
+#: ${HADOOP_PREFIX:=/usr/local/hadoop}
 
-. $HADOOP_PREFIX/etc/hadoop/hadoop-env.sh
+#. $HADOOP_PREFIX/etc/hadoop/hadoop-env.sh
 
 # Directory to find config artifacts
-CONFIG_DIR="/tmp/hadoop-config"
+#CONFIG_DIR="/tmp/hadoop-config"
 
 set -x
 
 # Copy config files from volume mount
-for f in slaves core-site.xml hdfs-site.xml mapred-site.xml yarn-site.xml; do
-    if [[ -e ${CONFIG_DIR}/$f ]]; then
-    cp ${CONFIG_DIR}/$f $HADOOP_HOME/etc/hadoop/$f
-    else
-    echo "ERROR: Could not find $f in $CONFIG_DIR"
-    exit 1
-    fi
-done
+#for f in slaves core-site.xml hdfs-site.xml mapred-site.xml yarn-site.xml; do
+#    if [[ -e ${CONFIG_DIR}/$f ]]; then
+#    cp ${CONFIG_DIR}/$f $HADOOP_HOME/etc/hadoop/$f
+#    else
+#    echo "ERROR: Could not find $f in $CONFIG_DIR"
+#    exit 1
+#    fi
 
 # Note. This script set hive paths in hdfs with user hive and ensures hiveServer is runAsUser hive 
 
 HADOOP_USER_NAME={{ .Values.conf.hdfsAdminUser }} hdfs dfs -mkdir /tmp
 HADOOP_USER_NAME={{ .Values.conf.hdfsAdminUser }} hdfs dfs -mkdir -p  /user/hive/warehouse
 HADOOP_USER_NAME={{ .Values.conf.hdfsAdminUser }} hdfs dfs -chmod g+w /tmp
 HADOOP_USER_NAME={{ .Values.conf.hdfsAdminUser }} hdfs dfs -chmod g+w /user/hive/warehouse
-HADOOP_USER_NAME={{ .Values.conf.hdfsAdminUser }} hdfs dfs -chown hive:hive /tmp
 HADOOP_USER_NAME={{ .Values.conf.hdfsAdminUser }} hdfs dfs -chown hive:hive /user/hive/warehouse
 
 
-if id -u hive ; then
-    echo "hive user exists";
-else
-    echo "Creating hive user";
-    groupadd -g 500 -r hive && \
-    useradd --comment "Hive user" -u 500 --shell /bin/bash -M -r -g hive hive
-fi
+#if id -u hive ; then
+#    echo "hive user exists";
+#else
+#    echo "Creating hive user";
+#    groupadd -g 500 -r hive && \
+#    useradd --comment "Hive user" -u 500 --shell /bin/bash -M -r -g hive hive
+#fi
 
-if [[ whoami != hive ]]
-then 
-    echo "Switching to hive user";
-    su hive -c "cd $HIVE_HOME/bin; ./hiveserver2 --hiveconf hive.server2.enable.doAs=false"
-else
+#if [[ whoami != hive ]]
+#then 
+#    echo "Switching to hive user";
+#    su hive -c "cd $HIVE_HOME/bin; ./hiveserver2 --hiveconf hive.server2.enable.doAs=false"
+#else
     cd $HIVE_HOME/bin; ./hiveserver2 --hiveconf hive.server2.enable.doAs=false
-fi
+#fi
diff --git a/charts/hive/templates/hive-statefulset.yaml b/charts/hive/templates/hive-statefulset.yaml
@@ -46,7 +46,7 @@ spec:
         - name: hive-config
           mountPath: /opt/hive/conf
         - name: hadoop-config
-          mountPath: /tmp/hadoop-config
+          mountPath: /opt/hadoop/etc/hadoop
       volumes:
       - name: hadoop-config
         configMap:

diff --git a/charts/hive/values.yaml b/charts/hive/values.yaml
@@ -3,7 +3,7 @@
 
 
 image:
-  repository: bde2020/hive
+  repository: gradiant/hive
   tag: 2.3.2-postgresql-metastore
   pullPolicy: IfNotPresent
 
@@ -31,6 +31,3 @@ conf:
   #     fs.defaultFS: hdfs://hdfs-cluster:8020
   #   hdfsSite:
   #   ...
-
-
-