[systemds] branch main updated: [SYSTEMDS-3476] Spark with default settings

[baunsgaard]

This is an automated email from the ASF dual-hosted git repository.

baunsgaard pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/systemds.git


The following commit(s) were added to refs/heads/main by this push:
     new a3fab6a87d [SYSTEMDS-3476] Spark with default settings
a3fab6a87d is described below

commit a3fab6a87d88593c490ba384fd13c413c14cd161
Author: baunsgaard <baunsga...@tugraz.at>
AuthorDate: Sat Dec 10 12:40:11 2022 +0100

    [SYSTEMDS-3476] Spark with default settings
    
    This commit fixes a minor bug introduced in the fix for spark
    default settings, by separating the Log4J setting into two
    variables in the bash /bin/systemds.
---
 bin/systemds | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/bin/systemds b/bin/systemds
index 745d92ddea..efa47c1abc 100755
--- a/bin/systemds
+++ b/bin/systemds
@@ -100,17 +100,16 @@ if [ -z "$LOG4JPROP" ] ; then
   if [ -z "${LOG4JPROP}" ]; then
     LOG4JPROP=""
   else
-    LOG4JPROP="-Dlog4j.configuration=file:$LOG4JPROP"
+    LOG4JPROPFULL="-Dlog4j.configuration=file:$LOG4JPROP"
   fi
 else
   # L4J was set by env var. Unset if that setting is wrong
   LOG4JPROP2=$(find "$LOG4JPROP")
   if [ -z "${LOG4JPROP2}" ]; then
     LOG4JPROP=""
-  elif [ -z "${SYSTEMDS_DISTRIBUTED_OPTS}" ]; then
-    LOG4JPROP=$LOG4JPROP
   else
-    LOG4JPROP="-Dlog4j.configuration=file:$LOG4JPROP2"
+    LOG4JPROP=$LOG4JPROP
+    LOG4JPROPFULL="-Dlog4j.configuration=file:$LOG4JPROP2"
   fi
 fi
 
@@ -434,7 +433,7 @@ if [ $WORKER == 1 ]; then
   CMD=" \
   java $SYSTEMDS_STANDALONE_OPTS \
   -cp $CLASSPATH \
-  $LOG4JPROP \
+  $LOG4JPROPFULL \
   org.apache.sysds.api.DMLScript \
   -w $PORT \
   $CONFIG_FILE \
@@ -449,7 +448,7 @@ elif [ "$FEDMONITORING" == 1 ]; then
   CMD=" \
   java $SYSTEMDS_STANDALONE_OPTS \
   -cp $CLASSPATH \
-  $LOG4JPROP \
+  $LOG4JPROPFULL \
   org.apache.sysds.api.DMLScript \
   -fedMonitoring $PORT \
   $CONFIG_FILE \
@@ -464,7 +463,7 @@ elif [ $SYSDS_DISTRIBUTED == 0 ]; then
   CMD=" \
   java $SYSTEMDS_STANDALONE_OPTS \
   -cp $CLASSPATH \
-  $LOG4JPROP \
+  $LOG4JPROPFULL \
   org.apache.sysds.api.DMLScript \
   -f $SCRIPT_FILE \
   -exec $SYSDS_EXEC_MODE \