commit 3fe7ca1b1359a3fa0a08278e16909d1c883f19c3 Author: Eric Yang Date: Wed Apr 3 14:51:04 2019 -0400 YARN-9254. Added support for storing application catalog data to HDFS. Contributed by Eric Yang diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-docker/src/main/scripts/entrypoint.sh b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-docker/src/main/scripts/entrypoint.sh index 1666063..253a437 100755 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-docker/src/main/scripts/entrypoint.sh +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-applications-catalog/hadoop-yarn-applications-catalog-docker/src/main/scripts/entrypoint.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/bin/bash -x # Licensed to the Apache Software Foundation (ASF) under one or more # contributor license agreements. See the NOTICE file distributed with @@ -32,14 +32,34 @@ template_generator() { export JAVA_HOME=/usr/lib/jvm/jre export HADOOP_CONF_DIR=/etc/hadoop/conf -/opt/apache/solr/bin/solr start -p 8983 -force -/opt/apache/solr/bin/solr create_core -c appcatalog -force -/opt/apache/solr/bin/post -c appcatalog /tmp/samples.xml -if [ -d /etc/hadoop/conf ]; then - sed -i.bak 's/shared.loader=.*$/shared.loader=\/etc\/hadoop\/conf/g' /etc/tomcat/catalina.properties + +if [ "${SOLR_STORAGE_TYPE}" == "hdfs" ]; then + SOLR_OPTS="-Dsolr.directoryFactory=HdfsDirectoryFactory" + SOLR_OPTS="${SOLR_OPTS} -Dsolr.lock.type=hdfs" + if [ -e "$HADOOP_CONF_DIR" ]; then + SOLR_OPTS="${SOLR_OPTS} -Dsolr.hdfs.confdir=${HADOOP_CONF_DIR}" + fi +fi + +if [ "${SOLR_DATA_DIR}" != "" ]; then + SOLR_OPTS="${SOLR_OPTS} -Dsolr.data.dir=$SOLR_DATA_DIR" fi + if [ -e "$KEYTAB" ]; then + SOLR_OPTS="${SOLR_OPTS} -Dsolr.hdfs.security.kerberos.enabled=true" + SOLR_OPTS="${SOLR_OPTS} -Dsolr.hdfs.security.kerberos.keytabfile=${KEYTAB}" + SOLR_OPTS="${SOLR_OPTS} -Dsolr.hdfs.security.kerberos.principal=${PRINCIPAL}" export JAVA_OPTS="$JAVA_OPTS -Djava.security.auth.login.config=/etc/tomcat/jaas.config -Djava.security.krb5.conf=/etc/krb5.conf -Djavax.security.auth.useSubjectCredsOnly=false" template_generator /etc/tomcat/jaas.config.template /etc/tomcat/jaas.config fi + +export SOLR_OPTS + +/opt/apache/solr/bin/solr start $SOLR_OPTS -p 8983 -force +/opt/apache/solr/bin/solr create_core -c appcatalog -force +/opt/apache/solr/bin/post -c appcatalog /tmp/samples.xml +if [ -d /etc/hadoop/conf ]; then + sed -i.bak 's/shared.loader=.*$/shared.loader=\/etc\/hadoop\/conf/g' /etc/tomcat/catalina.properties +fi + /usr/libexec/tomcat/server start