[oozie] branch master updated: OOZIE-3608 Coordinator emits wrong WARN about TimeZones (larsfrancke via gezapeti)

[gezapeti]

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

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


The following commit(s) were added to refs/heads/master by this push:
     new 7bcd981  OOZIE-3608 Coordinator emits wrong WARN about TimeZones 
(larsfrancke via gezapeti)
7bcd981 is described below

commit 7bcd9819dd825dc906f03978cd4e967c75d108b0
Author: Gezapeti Cseh <gezap...@apache.org>
AuthorDate: Fri Aug 28 22:25:42 2020 +0200

    OOZIE-3608 Coordinator emits wrong WARN about TimeZones (larsfrancke via 
gezapeti)
---
 release-log.txt                                                  | 1 +
 tools/src/main/java/org/apache/oozie/tools/OozieSharelibCLI.java | 4 +++-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/release-log.txt b/release-log.txt
index a50476d..e6e2f77 100644
--- a/release-log.txt
+++ b/release-log.txt
@@ -1,5 +1,6 @@
 -- Oozie 5.3.0 release (trunk - unreleased)
 
+OOZIE-3605 ShareLib installation does not honor dfs.replication in HDFS 
configuration (luyuanhao via gezapeti)
 OOZIE-3608 Coordinator emits wrong WARN about TimeZones (larsfrancke via 
gezapeti)
 OOZIE-3601 Upgrade quartz to 2.3.2 (dengliming via matijhs)
 OOZIE-3586 Oozie spark actions using --keytab fail due to duplicate dist. 
cache (jmakai via asalamon74)
diff --git a/tools/src/main/java/org/apache/oozie/tools/OozieSharelibCLI.java 
b/tools/src/main/java/org/apache/oozie/tools/OozieSharelibCLI.java
index b49f4a7..f9a2c87 100644
--- a/tools/src/main/java/org/apache/oozie/tools/OozieSharelibCLI.java
+++ b/tools/src/main/java/org/apache/oozie/tools/OozieSharelibCLI.java
@@ -388,7 +388,7 @@ public class OozieSharelibCLI {
     @VisibleForTesting
     static final class CopyTaskCallable implements 
Callable<CopyTaskConfiguration> {
 
-        private final static short REPLICATION_FACTOR = 3;
+        private final short REPLICATION_FACTOR;
         private final FileSystem fileSystem;
         private final File file;
         private final Path destinationPath;
@@ -409,6 +409,8 @@ public class OozieSharelibCLI {
             this.destinationPath = copyTask.dstPath;
             this.failedCopyTasks = failedCopyTasks;
             this.fileSystem = copyTask.fs;
+            this.REPLICATION_FACTOR = (short) this.fileSystem.getConf().getInt(
+                    DFSConfigKeys.DFS_REPLICATION_KEY, 
DFSConfigKeys.DFS_REPLICATION_DEFAULT);
             this.blockSize = blockSize;
             this.targetName = trgName;
         }