(systemds) branch main updated: [SYSTEMDS-3684] Startup SYSTEMDS_STANDALONE_OPTS Regression Fix

[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 e94df56c8b [SYSTEMDS-3684] Startup SYSTEMDS_STANDALONE_OPTS Regression 
Fix
e94df56c8b is described below

commit e94df56c8b81ed8c3d4cf2bb25aab5eec795cd1e
Author: Sebastian Baunsgaard <baunsga...@apache.org>
AuthorDate: Tue Mar 26 18:09:22 2024 +0100

    [SYSTEMDS-3684] Startup SYSTEMDS_STANDALONE_OPTS Regression Fix
    
    This commit fixes a bug I introduced a couple of weeks ago,
    where I erroneously forgot to include the java arguments
    from SYSTEMDS_STANDALONE_OPTS in the bin/systemds file,
    when I changed the launching from using -cp to -jar
    for performance gains in startup time of SystemDS.
    
    Thank you to Louis Le Page for finding the regression.
    
    Closes #2007
---
 bin/systemds | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/bin/systemds b/bin/systemds
index bbe581c907..65f2a82867 100755
--- a/bin/systemds
+++ b/bin/systemds
@@ -431,7 +431,8 @@ if [ $WORKER == 1 ]; then
   print_out "#  starting Federated worker on port $PORT"
   print_out 
"###############################################################################"
   CMD=" \
-  java $LOG4JPROPFULL \
+  java $SYSTEMDS_STANDALONE_OPTS \
+  $LOG4JPROPFULL \
   -jar $SYSTEMDS_JAR_FILE \
   -w $PORT \
   $CONFIG_FILE \
@@ -444,7 +445,8 @@ elif [ "$FEDMONITORING" == 1 ]; then
   print_out "#  starting Federated backend monitoring on port $PORT"
   print_out 
"###############################################################################"
   CMD=" \
-  java $LOG4JPROPFULL \
+  java $SYSTEMDS_STANDALONE_OPTS \
+  $LOG4JPROPFULL \
   -jar $SYSTEMDS_JAR_FILE \
   -fedMonitoring $PORT \
   $CONFIG_FILE \
@@ -457,7 +459,8 @@ elif [ $SYSDS_DISTRIBUTED == 0 ]; then
   print_out "#  Running script $SCRIPT_FILE locally with opts: $*"
   print_out 
"###############################################################################"
   CMD=" \
-  java $LOG4JPROPFULL \
+  java $SYSTEMDS_STANDALONE_OPTS \
+  $LOG4JPROPFULL \
   -jar $SYSTEMDS_JAR_FILE \
   -f $SCRIPT_FILE \
   -exec $SYSDS_EXEC_MODE \