@@ -467,12 +467,31 @@ function registerPortHistoryServer() {
467467
468468function configureDepBlackList() {
469469 dep_blacklist_path=$MAPR_HOME /spark/spark-$SPARK_VERSION /conf/dep-blacklist.txt
470- slf4j_reload4j=$( ls $MAPR_HOME /hadoop/hadoop-$HADOOP_VERSION /share/hadoop/common/lib/ | grep slf4j-reload4j)
471470
472- echo $MAPR_HOME /hadoop/hadoop-$HADOOP_VERSION /share/hadoop/common/sources/hadoop-common-$HADOOP_VERSION .* sources.jar >> $dep_blacklist_path
473- echo $MAPR_HOME /hadoop/hadoop-$HADOOP_VERSION /share/hadoop/common/lib/$slf4j_reload4j >> $dep_blacklist_path
474- echo $MAPR_HOME /lib/$slf4j_reload4j >> $dep_blacklist_path
475- echo $MAPR_HOME /lib/log4j2/$( ls /opt/mapr/lib/log4j2/ | grep log4j-slf4j-impl) >> $dep_blacklist_path
471+ slf4j_reload4j_name=$( ls $MAPR_HOME /hadoop/hadoop-$HADOOP_VERSION /share/hadoop/common/lib/ | grep slf4j-reload4j)
472+ slf4j_reload4j_hadoop_path=$MAPR_HOME /hadoop/hadoop-$HADOOP_VERSION /share/hadoop/common/lib/$slf4j_reload4j_name
473+ slf4j_reload4j_lib_path=$MAPR_HOME /lib/$slf4j_reload4j_name
474+
475+ hadoop_common_name=$( ls $MAPR_HOME /hadoop/hadoop-$HADOOP_VERSION /share/hadoop/common/sources/ | grep hadoop-common | grep -v test)
476+ hadoop_common_path=$MAPR_HOME /hadoop/hadoop-$HADOOP_VERSION /share/hadoop/common/sources/$hadoop_common_name
477+
478+ log4j2_slf4j_impl_path=$MAPR_HOME /lib/log4j2/$( ls /opt/mapr/lib/log4j2/ | grep log4j-slf4j-impl)
479+
480+ if ! grep -q $hadoop_common_path $dep_blacklist_path ; then
481+ echo $hadoop_common_path >> $dep_blacklist_path
482+ fi
483+
484+ if ! grep -q $slf4j_reload4j_hadoop_path $dep_blacklist_path ; then
485+ echo $slf4j_reload4j_hadoop_path >> $dep_blacklist_path
486+ fi
487+
488+ if ! grep -q $slf4j_reload4j_lib_path $dep_blacklist_path ; then
489+ echo $slf4j_reload4j_lib_path >> $dep_blacklist_path
490+ fi
491+
492+ if ! grep -q $log4j2_slf4j_impl_path $dep_blacklist_path ; then
493+ echo $log4j2_slf4j_impl_path >> $dep_blacklist_path
494+ fi
476495}
477496
478497function registerServicePorts() {
635654if [ ! " $isSecure " -eq 2 ] ; then
636655 configureSecurity
637656fi
638- if [ ! -s $MAPR_HOME /spark/spark-$SPARK_VERSION /conf/dep-blacklist.txt ]; then
639- configureDepBlackList
640- fi
657+ configureDepBlackList
641658createAppsSparkFolder
642659change_permissions
643660mkBackupForOldConfigs
0 commit comments