You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@storm.apache.org by bo...@apache.org on 2014/05/19 23:52:45 UTC
[20/24] git commit: Made the multilang serialiser topology specific
Made the multilang serialiser topology specific
Project: http://git-wip-us.apache.org/repos/asf/incubator-storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-storm/commit/660d8c42
Tree: http://git-wip-us.apache.org/repos/asf/incubator-storm/tree/660d8c42
Diff: http://git-wip-us.apache.org/repos/asf/incubator-storm/diff/660d8c42
Branch: refs/heads/master
Commit: 660d8c42ee8876847209e57ffa2c200ceefbbbbd
Parents: f5f41a0
Author: John Gilmore <jg...@ml.sun.ac.za>
Authored: Thu May 1 12:29:48 2014 +0200
Committer: John Gilmore <jg...@ml.sun.ac.za>
Committed: Thu May 1 12:29:48 2014 +0200
----------------------------------------------------------------------
conf/defaults.yaml | 2 +-
storm-core/src/jvm/backtype/storm/Config.java | 13 ++++++-------
.../src/jvm/backtype/storm/utils/ShellProcess.java | 4 ++--
3 files changed, 9 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-storm/blob/660d8c42/conf/defaults.yaml
----------------------------------------------------------------------
diff --git a/conf/defaults.yaml b/conf/defaults.yaml
index 66b2d41..c7af199 100644
--- a/conf/defaults.yaml
+++ b/conf/defaults.yaml
@@ -35,7 +35,6 @@ storm.zookeeper.retry.intervalceiling.millis: 30000
storm.cluster.mode: "distributed" # can be distributed or local
storm.local.mode.zmq: false
storm.thrift.transport: "backtype.storm.security.auth.SimpleTransportPlugin"
-storm.multilang.serializer: "backtype.storm.multilang.JsonSerializer"
storm.messaging.transport: "backtype.storm.messaging.netty.Context"
### nimbus.* configs are for the master
@@ -119,6 +118,7 @@ topology.acker.executors: null
topology.tasks: null
# maximum amount of time a message has to complete before it's considered failed
topology.message.timeout.secs: 30
+topology.multilang.serializer: "backtype.storm.multilang.JsonSerializer"
topology.skip.missing.kryo.registrations: false
topology.max.task.parallelism: null
topology.max.spout.pending: null
http://git-wip-us.apache.org/repos/asf/incubator-storm/blob/660d8c42/storm-core/src/jvm/backtype/storm/Config.java
----------------------------------------------------------------------
diff --git a/storm-core/src/jvm/backtype/storm/Config.java b/storm-core/src/jvm/backtype/storm/Config.java
index d99325c..593898f 100644
--- a/storm-core/src/jvm/backtype/storm/Config.java
+++ b/storm-core/src/jvm/backtype/storm/Config.java
@@ -44,13 +44,6 @@ import java.util.Map;
*/
public class Config extends HashMap<String, Object> {
/**
- * The serializer for communication between shell components and non-JVM
- * processes
- */
- public static final String STORM_MULTILANG_SERIALIZER = "storm.multilang.serializer";
- public static final Object STORM_MULTILANG_SERIALIZER_SCHEMA = String.class;
-
- /**
* The transporter for communication among Storm tasks
*/
public static final String STORM_MESSAGING_TRANSPORT = "storm.messaging.transport";
@@ -506,6 +499,12 @@ public class Config extends HashMap<String, Object> {
public static final String TOPOLOGY_DEBUG = "topology.debug";
public static final Object TOPOLOGY_DEBUG_SCHEMA = Boolean.class;
+ /**
+ * The serializer for communication between shell components and non-JVM
+ * processes
+ */
+ public static final String TOPOLOGY_MULTILANG_SERIALIZER = "topology.multilang.serializer";
+ public static final Object TOPOLOGY_MULTILANG_SERIALIZER_SCHEMA = String.class;
/**
* Whether or not the master should optimize topologies by running multiple
http://git-wip-us.apache.org/repos/asf/incubator-storm/blob/660d8c42/storm-core/src/jvm/backtype/storm/utils/ShellProcess.java
----------------------------------------------------------------------
diff --git a/storm-core/src/jvm/backtype/storm/utils/ShellProcess.java b/storm-core/src/jvm/backtype/storm/utils/ShellProcess.java
index 35a8c94..7455c9b 100644
--- a/storm-core/src/jvm/backtype/storm/utils/ShellProcess.java
+++ b/storm-core/src/jvm/backtype/storm/utils/ShellProcess.java
@@ -72,8 +72,8 @@ public class ShellProcess implements Serializable {
private ISerializer getSerializer(Map conf) {
//get factory class name
- String serializer_className = (String)conf.get(Config.STORM_MULTILANG_SERIALIZER);
- LOG.info("Storm multilang serializer:" + serializer_className);
+ String serializer_className = (String)conf.get(Config.TOPOLOGY_MULTILANG_SERIALIZER);
+ LOG.info("Storm multilang serializer: " + serializer_className);
ISerializer serializer = null;
try {