(samza) branch master updated: SAMZA-2798: Populate worker.opts in environment variable only if available (#1693)

[bharathkk]

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

bharathkk pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/samza.git


The following commit(s) were added to refs/heads/master by this push:
     new 8ed3572be SAMZA-2798: Populate worker.opts in environment variable 
only if available (#1693)
8ed3572be is described below

commit 8ed3572bee37c04481be7c831fa455a8305f3fe8
Author: Bharath Kumarasubramanian <bharat...@apache.org>
AuthorDate: Wed Nov 22 13:49:33 2023 -0800

    SAMZA-2798: Populate worker.opts in environment variable only if available 
(#1693)
    
    Description
    Populate worker.opts in the environment variable only if available in the 
configs.
    
    Changes
    Check if worker.opts is present and then add it to environment variable
    
    Tests
    Updated unit tests
---
 samza-core/src/main/java/org/apache/samza/job/ShellCommandBuilder.java | 3 ++-
 .../src/test/java/org/apache/samza/job/TestShellCommandBuilder.java    | 1 -
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git 
a/samza-core/src/main/java/org/apache/samza/job/ShellCommandBuilder.java 
b/samza-core/src/main/java/org/apache/samza/job/ShellCommandBuilder.java
index 504d9a26f..4262145ee 100644
--- a/samza-core/src/main/java/org/apache/samza/job/ShellCommandBuilder.java
+++ b/samza-core/src/main/java/org/apache/samza/job/ShellCommandBuilder.java
@@ -44,9 +44,10 @@ public class ShellCommandBuilder extends CommandBuilder {
     envBuilder.put(ShellCommandConfig.ENV_CONTAINER_ID, this.id);
     envBuilder.put(ShellCommandConfig.ENV_COORDINATOR_URL, 
this.url.toString());
     envBuilder.put(ShellCommandConfig.ENV_JAVA_OPTS, 
shellCommandConfig.getTaskOpts().orElse(""));
-    envBuilder.put(ShellCommandConfig.WORKER_JVM_OPTS, 
shellCommandConfig.getWorkerOpts().orElse(""));
     envBuilder.put(ShellCommandConfig.ENV_ADDITIONAL_CLASSPATH_DIR,
         shellCommandConfig.getAdditionalClasspathDir().orElse(""));
+    shellCommandConfig.getWorkerOpts()
+        .ifPresent(workerOpts -> 
envBuilder.put(ShellCommandConfig.WORKER_JVM_OPTS, workerOpts));
     shellCommandConfig.getJavaHome().ifPresent(javaHome -> 
envBuilder.put(ShellCommandConfig.ENV_JAVA_HOME, javaHome));
     return envBuilder.build();
   }
diff --git 
a/samza-core/src/test/java/org/apache/samza/job/TestShellCommandBuilder.java 
b/samza-core/src/test/java/org/apache/samza/job/TestShellCommandBuilder.java
index afb6bfeec..4acba9487 100644
--- a/samza-core/src/test/java/org/apache/samza/job/TestShellCommandBuilder.java
+++ b/samza-core/src/test/java/org/apache/samza/job/TestShellCommandBuilder.java
@@ -45,7 +45,6 @@ public class TestShellCommandBuilder {
         ShellCommandConfig.ENV_CONTAINER_ID, "1",
         ShellCommandConfig.ENV_COORDINATOR_URL, URL_STRING,
         ShellCommandConfig.ENV_JAVA_OPTS, "",
-        ShellCommandConfig.WORKER_JVM_OPTS, "",
         ShellCommandConfig.ENV_ADDITIONAL_CLASSPATH_DIR, "");
     // assertions when command path is not set
     assertEquals("foo", shellCommandBuilder.buildCommand());