[GitHub] zentol closed pull request #4467: [FLINK-7359] flink-storm should update ComponentConfiguration to stor…

[GitBox <gi...@apache.org>]

zentol closed pull request #4467: [FLINK-7359] flink-storm should update ComponentConfiguration to stor…
URL: https://github.com/apache/flink/pull/4467
 
 
   

This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:

As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):

diff --git a/flink-contrib/flink-storm/src/main/java/org/apache/flink/storm/wrappers/BoltWrapper.java b/flink-contrib/flink-storm/src/main/java/org/apache/flink/storm/wrappers/BoltWrapper.java
index 590faf382db..38efc88510e 100644
--- a/flink-contrib/flink-storm/src/main/java/org/apache/flink/storm/wrappers/BoltWrapper.java
+++ b/flink-contrib/flink-storm/src/main/java/org/apache/flink/storm/wrappers/BoltWrapper.java
@@ -268,6 +268,9 @@ public void open() throws Exception {
 				stormConfig.putAll(config.toMap());
 			}
 		}
+		if (this.bolt.getComponentConfiguration() != null) {
+			stormConfig.putAll(this.bolt.getComponentConfiguration());
+		}
 
 		this.topologyContext = WrapperSetupHelper.createTopologyContext(
 				getRuntimeContext(), this.bolt, this.name, this.stormTopology, stormConfig);
diff --git a/flink-contrib/flink-storm/src/main/java/org/apache/flink/storm/wrappers/SpoutWrapper.java b/flink-contrib/flink-storm/src/main/java/org/apache/flink/storm/wrappers/SpoutWrapper.java
index 458fffbfc37..b713ff8a238 100644
--- a/flink-contrib/flink-storm/src/main/java/org/apache/flink/storm/wrappers/SpoutWrapper.java
+++ b/flink-contrib/flink-storm/src/main/java/org/apache/flink/storm/wrappers/SpoutWrapper.java
@@ -252,6 +252,9 @@ public void run(final SourceContext<OUT> ctx) throws Exception {
 				stormConfig.putAll(config.toMap());
 			}
 		}
+		if (this.spout.getComponentConfiguration() != null) {
+			stormConfig.putAll(this.spout.getComponentConfiguration());
+		}
 
 		final TopologyContext stormTopologyContext = WrapperSetupHelper.createTopologyContext(
 				(StreamingRuntimeContext) super.getRuntimeContext(), this.spout, this.name,


 

----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
 
For queries about this service, please contact Infrastructure at:
users@infra.apache.org


With regards,
Apache Git Services