[incubator-gobblin] branch master updated: [GOBBLIN-1213] add common job properties to jobProps using putAll

[hutran]

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

hutran pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-gobblin.git


The following commit(s) were added to refs/heads/master by this push:
     new c179ca2  [GOBBLIN-1213] add common job properties to jobProps using 
putAll
c179ca2 is described below

commit c179ca20866238b9232c7aeda279bbd1b9c401d6
Author: Arjun <ab...@linkedin.com>
AuthorDate: Mon Aug 17 20:32:17 2020 -0700

    [GOBBLIN-1213] add common job properties to jobProps using putAll
    
    Closes #3084 from arjun4084346/commonProps
---
 .../main/java/org/apache/gobblin/configuration/ConfigurationKeys.java  | 2 +-
 .../main/java/org/apache/gobblin/cluster/GobblinHelixJobScheduler.java | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git 
a/gobblin-api/src/main/java/org/apache/gobblin/configuration/ConfigurationKeys.java
 
b/gobblin-api/src/main/java/org/apache/gobblin/configuration/ConfigurationKeys.java
index 1300af6..8524f1f 100644
--- 
a/gobblin-api/src/main/java/org/apache/gobblin/configuration/ConfigurationKeys.java
+++ 
b/gobblin-api/src/main/java/org/apache/gobblin/configuration/ConfigurationKeys.java
@@ -353,7 +353,7 @@ public class ConfigurationKeys {
   public static final String FORK_MAX_WAIT_MININUTES = "fork.max.wait.minutes";
   public static final long DEFAULT_FORK_MAX_WAIT_MININUTES = 60;
   public static final String FORK_CLOSE_WRITER_ON_COMPLETION = 
"fork.closeWriterOnCompletion";
-  public static final boolean DEFAULT_FORK_CLOSE_WRITER_ON_COMPLETION = true;
+  public static final boolean DEFAULT_FORK_CLOSE_WRITER_ON_COMPLETION = false;
 
 
   /**
diff --git 
a/gobblin-cluster/src/main/java/org/apache/gobblin/cluster/GobblinHelixJobScheduler.java
 
b/gobblin-cluster/src/main/java/org/apache/gobblin/cluster/GobblinHelixJobScheduler.java
index 43438d8..8959378 100644
--- 
a/gobblin-cluster/src/main/java/org/apache/gobblin/cluster/GobblinHelixJobScheduler.java
+++ 
b/gobblin-cluster/src/main/java/org/apache/gobblin/cluster/GobblinHelixJobScheduler.java
@@ -304,7 +304,8 @@ public class GobblinHelixJobScheduler extends JobScheduler 
implements StandardMe
     String jobUri = newJobArrival.getJobName();
     LOGGER.info("Received new job configuration of job " + jobUri);
     try {
-      Properties jobProps = new Properties(this.commonJobProperties);
+      Properties jobProps = new Properties();
+      jobProps.putAll(this.commonJobProperties);
       jobProps.putAll(newJobArrival.getJobConfig());
 
       // set uri so that we can delete this job later