You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@beam.apache.org by jb...@apache.org on 2017/04/06 17:21:56 UTC
[1/2] beam git commit: [BEAM-1856] Use the same configuration in
master thread and slave thread in the HDFSFileSink
Repository: beam
Updated Branches:
refs/heads/master 82694fe72 -> f87597e10
[BEAM-1856] Use the same configuration in master thread and slave thread in the HDFSFileSink
Project: http://git-wip-us.apache.org/repos/asf/beam/repo
Commit: http://git-wip-us.apache.org/repos/asf/beam/commit/8d0e6b52
Tree: http://git-wip-us.apache.org/repos/asf/beam/tree/8d0e6b52
Diff: http://git-wip-us.apache.org/repos/asf/beam/diff/8d0e6b52
Branch: refs/heads/master
Commit: 8d0e6b52ef594bb6a96ec272971766d38d06864f
Parents: 82694fe
Author: iteblog <wy...@163.com>
Authored: Sat Apr 1 17:41:05 2017 +0800
Committer: Jean-Baptiste Onofr� <jb...@apache.org>
Committed: Thu Apr 6 18:30:10 2017 +0200
----------------------------------------------------------------------
.../org/apache/beam/sdk/io/hadoop/SerializableConfiguration.java | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/beam/blob/8d0e6b52/sdks/java/io/hadoop-common/src/main/java/org/apache/beam/sdk/io/hadoop/SerializableConfiguration.java
----------------------------------------------------------------------
diff --git a/sdks/java/io/hadoop-common/src/main/java/org/apache/beam/sdk/io/hadoop/SerializableConfiguration.java b/sdks/java/io/hadoop-common/src/main/java/org/apache/beam/sdk/io/hadoop/SerializableConfiguration.java
index 10b4ed2..8101f4b 100644
--- a/sdks/java/io/hadoop-common/src/main/java/org/apache/beam/sdk/io/hadoop/SerializableConfiguration.java
+++ b/sdks/java/io/hadoop-common/src/main/java/org/apache/beam/sdk/io/hadoop/SerializableConfiguration.java
@@ -74,7 +74,8 @@ public class SerializableConfiguration implements Externalizable {
if (conf == null) {
return Job.getInstance();
} else {
- Job job = Job.getInstance();
+ // Don't reading configuration from slave thread, but only from master thread.
+ Job job = Job.getInstance(new Configuration(false));
for (Map.Entry<String, String> entry : conf.get()) {
job.getConfiguration().set(entry.getKey(), entry.getValue());
}
[2/2] beam git commit: [BEAM-1856] This closes #2399
Posted by jb...@apache.org.
[BEAM-1856] This closes #2399
Project: http://git-wip-us.apache.org/repos/asf/beam/repo
Commit: http://git-wip-us.apache.org/repos/asf/beam/commit/f87597e1
Tree: http://git-wip-us.apache.org/repos/asf/beam/tree/f87597e1
Diff: http://git-wip-us.apache.org/repos/asf/beam/diff/f87597e1
Branch: refs/heads/master
Commit: f87597e102a855df7e886895991323c9c7fa16c1
Parents: 82694fe 8d0e6b5
Author: Jean-Baptiste Onofr� <jb...@apache.org>
Authored: Thu Apr 6 19:04:50 2017 +0200
Committer: Jean-Baptiste Onofr� <jb...@apache.org>
Committed: Thu Apr 6 19:04:50 2017 +0200
----------------------------------------------------------------------
.../org/apache/beam/sdk/io/hadoop/SerializableConfiguration.java | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------