Skip to content

Commit 1787933

Browse files
d-popkovekrivokonmapr
authored andcommitted
MapR [SPARK-1106] Regulate dependencies in dep-blacklist.txt via configure.sh(fix/refactor)
1 parent 56b90fa commit 1787933

File tree

2 files changed

+14
-6
lines changed

2 files changed

+14
-6
lines changed

bin/configure.sh

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,7 @@ if [ "$HBASE_INSTALLED" = true ]; then
5252
HBASE_HOME="$MAPR_HOME"/hbase/hbase-"$HBASE_VERSION"
5353
fi
5454

55+
HADOOP_VERSION=`cat $MAPR_HOME/hadoop/hadoopversion`
5556
SPARK_HOME="$MAPR_HOME"/spark/spark-"$SPARK_VERSION"
5657
SPARK_CONF="$SPARK_HOME"/conf
5758
SPARK_BIN="$SPARK_HOME"/bin
@@ -460,6 +461,16 @@ function registerPortHistoryServer() {
460461
fi
461462
}
462463

464+
function configureDepBlackList() {
465+
dep_blacklist_path=$MAPR_HOME/spark/spark-$SPARK_VERSION/conf/dep-blacklist.txt
466+
slf4j_reload4j=$(ls $MAPR_HOME/hadoop/hadoop-$HADOOP_VERSION/share/hadoop/common/lib/ | grep slf4j-reload4j)
467+
468+
echo $MAPR_HOME/hadoop/hadoop-$HADOOP_VERSION/share/hadoop/common/sources/hadoop-common-$HADOOP_VERSION.0-eep-900-SNAPSHOT-sources.jar >> $dep_blacklist_path
469+
echo $MAPR_HOME/hadoop/hadoop-$HADOOP_VERSION/share/hadoop/common/lib/$slf4j_reload4j >> $dep_blacklist_path
470+
echo $MAPR_HOME/lib/$slf4j_reload4j >> $dep_blacklist_path
471+
echo $MAPR_HOME/lib/log4j2/$(ls /opt/mapr/lib/log4j2/ | grep log4j-slf4j-impl) >> $dep_blacklist_path
472+
}
473+
463474
function registerServicePorts() {
464475
registerPortMaster
465476
registerPortThriftServer
@@ -620,6 +631,9 @@ fi
620631
if [ ! "$isSecure" -eq 2 ] ; then
621632
configureSecurity
622633
fi
634+
if [ ! -s $MAPR_HOME/spark/spark-$SPARK_VERSION/conf/dep-blacklist.txt ]; then
635+
configureDepBlackList
636+
fi
623637
createAppsSparkFolder
624638
change_permissions
625639
mkBackupForOldConfigs

conf/dep-blacklist.txt

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +0,0 @@
1-
/opt/mapr/hadoop/hadoop-2.7.0/share/hadoop/common/lib/avro-1.7.6.jar
2-
/opt/mapr/hadoop/hadoop-2.7.0/share/hadoop/mapreduce/lib/avro-1.7.6.jar
3-
/opt/mapr/lib/log4j2/log4j-slf4j-impl-2.17.1.jar
4-
/opt/mapr/lib/slf4j-reload4j-1.7.36.jar
5-
/opt/mapr/hadoop/hadoop-3.3.4/share/hadoop/common/sources/hadoop-common-3.3.4.0-eep-900-SNAPSHOT-sources.jar
6-
/opt/mapr/hadoop/hadoop-3.3.4/share/hadoop/common/lib/slf4j-reload4j-1.7.36.jar

0 commit comments

Comments
 (0)