Merge branch 'netty-default'

Conflicts: storm-netty/project.clj
revans2 · Dec 21, 2013 · d79f6b8 · d79f6b8
2 parents d3414f5 + 962d520
commit d79f6b8
Show file tree

Hide file tree

Showing 23 changed files with 36 additions and 459 deletions.
diff --git a/MODULES b/MODULES
@@ -1,4 +1,3 @@
 storm-console-logging
 storm-core
-storm-netty
 
diff --git a/bin/install_zmq.sh b/bin/install_zmq.sh
diff --git a/conf/defaults.yaml b/conf/defaults.yaml
@@ -35,7 +35,7 @@ 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.messaging.transport: "backtype.storm.messaging.zmq"
+storm.messaging.transport: "backtype.storm.messaging.netty.Context"
 
 ### nimbus.* configs are for the master
 nimbus.host: "localhost"

diff --git a/storm-core/project.clj b/storm-core/project.clj
@@ -25,7 +25,6 @@
                  [clj-time "0.4.1"]
                  [com.netflix.curator/curator-framework "1.0.1"
                   :exclusions [log4j/log4j]]
-                 [backtype/jzmq "2.1.0"]
                  [com.googlecode.json-simple/json-simple "1.1"]
                  [compojure "1.1.3"]
                  [hiccup "0.3.6"]
@@ -42,6 +41,7 @@
                  [com.google.guava/guava "13.0"]
                  [ch.qos.logback/logback-classic "1.0.6"]
                  [org.slf4j/log4j-over-slf4j "1.6.6"]
+                 [io.netty/netty "3.6.3.Final"]
                  ]
 
   :source-paths ["src/clj"]

diff --git a/storm-core/src/clj/backtype/storm/messaging/zmq.clj b/storm-core/src/clj/backtype/storm/messaging/zmq.clj
diff --git a/storm-core/src/clj/backtype/storm/testing.clj b/storm-core/src/clj/backtype/storm/testing.clj
@@ -111,7 +111,7 @@
 ;; local dir is always overridden in maps
 ;; can customize the supervisors (except for ports) by passing in map for :supervisors parameter
 ;; if need to customize amt of ports more, can use add-supervisor calls afterwards
-(defnk mk-local-storm-cluster [:supervisors 2 :ports-per-supervisor 3 :daemon-conf {} :inimbus nil :supervisor-slot-port-min 1]
+(defnk mk-local-storm-cluster [:supervisors 2 :ports-per-supervisor 3 :daemon-conf {} :inimbus nil :supervisor-slot-port-min 1024]
   (let [zk-tmp (local-temp-path)
         [zk-port zk-handle] (zk/mk-inprocess-zookeeper zk-tmp)
         daemon-conf (merge (read-storm-config)

diff --git a/storm-core/src/clj/zilch/mq.clj b/storm-core/src/clj/zilch/mq.clj
diff --git a/...acktype/storm/messaging/netty/Client.java → ...acktype/storm/messaging/netty/Client.java b/...acktype/storm/messaging/netty/Client.java → ...acktype/storm/messaging/netty/Client.java
@@ -17,6 +17,17 @@
  */
 package backtype.storm.messaging.netty;
 
+import backtype.storm.Config;
+import backtype.storm.messaging.IConnection;
+import backtype.storm.messaging.TaskMessage;
+import backtype.storm.utils.Utils;
+import org.jboss.netty.bootstrap.ClientBootstrap;
+import org.jboss.netty.channel.Channel;
+import org.jboss.netty.channel.ChannelFactory;
+import org.jboss.netty.channel.socket.nio.NioClientSocketChannelFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
 import java.net.InetSocketAddress;
 import java.util.Map;
 import java.util.Random;
@@ -26,18 +37,6 @@
 import java.util.concurrent.atomic.AtomicInteger;
 import java.util.concurrent.atomic.AtomicReference;
 
-import org.jboss.netty.bootstrap.ClientBootstrap;
-import org.jboss.netty.channel.Channel;
-import org.jboss.netty.channel.ChannelFactory;
-import org.jboss.netty.channel.socket.nio.NioClientSocketChannelFactory;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import backtype.storm.Config;
-import backtype.storm.messaging.IConnection;
-import backtype.storm.messaging.TaskMessage;
-import backtype.storm.utils.Utils;
-
 class Client implements IConnection {
     private static final Logger LOG = LoggerFactory.getLogger(Client.class);
     private final int max_retries;

diff --git a/...cktype/storm/messaging/netty/Context.java → ...cktype/storm/messaging/netty/Context.java b/...cktype/storm/messaging/netty/Context.java → ...cktype/storm/messaging/netty/Context.java
@@ -17,12 +17,12 @@
  */
 package backtype.storm.messaging.netty;
 
-import java.util.Map;
-import java.util.Vector;
-
 import backtype.storm.messaging.IConnection;
 import backtype.storm.messaging.IContext;
 
+import java.util.Map;
+import java.util.Vector;
+
 public class Context implements IContext {
     @SuppressWarnings("rawtypes")
     private Map storm_conf;

diff --git a/...storm/messaging/netty/ControlMessage.java → ...storm/messaging/netty/ControlMessage.java b/...storm/messaging/netty/ControlMessage.java → ...storm/messaging/netty/ControlMessage.java
@@ -20,7 +20,6 @@
 import org.jboss.netty.buffer.ChannelBuffer;
 import org.jboss.netty.buffer.ChannelBufferOutputStream;
 import org.jboss.netty.buffer.ChannelBuffers;
-import org.jboss.netty.channel.Channel;
 
 enum ControlMessage {
     CLOSE_MESSAGE((short)-100),

diff --git a/...e/storm/messaging/netty/MessageBatch.java → ...e/storm/messaging/netty/MessageBatch.java b/...e/storm/messaging/netty/MessageBatch.java → ...e/storm/messaging/netty/MessageBatch.java
@@ -17,14 +17,12 @@
  */
 package backtype.storm.messaging.netty;
 
-import java.util.ArrayList;
-
+import backtype.storm.messaging.TaskMessage;
 import org.jboss.netty.buffer.ChannelBuffer;
 import org.jboss.netty.buffer.ChannelBufferOutputStream;
 import org.jboss.netty.buffer.ChannelBuffers;
-import org.jboss.netty.channel.Channel;
 
-import backtype.storm.messaging.TaskMessage;
+import java.util.ArrayList;
 
 class MessageBatch {
     private int buffer_size;