You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@storm.apache.org by kn...@apache.org on 2015/11/23 22:08:10 UTC

[31/37] storm git commit: Addressing PR comments.

Addressing PR comments.


Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/aee48646
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/aee48646
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/aee48646

Branch: refs/heads/master
Commit: aee486467788de1a60d8d0194719829c2e313d14
Parents: 711e36f
Author: Kyle Nusbaum <Ky...@gmail.com>
Authored: Fri Nov 20 17:16:52 2015 -0600
Committer: Kyle Nusbaum <Ky...@gmail.com>
Committed: Fri Nov 20 17:16:52 2015 -0600

----------------------------------------------------------------------
 bin/storm.py                                    |  3 +-
 .../cluster_state/zookeeper_state_factory.clj   |  4 +-
 storm-core/src/clj/backtype/storm/util.clj      |  8 +--
 .../org/apache/storm/pacemaker/pacemaker.clj    | 62 ++++++++--------
 .../storm/pacemaker/pacemaker_state_factory.clj |  4 +-
 .../backtype/storm/cluster/ClusterState.java    |  4 +-
 .../storm/cluster/ClusterStateFactory.java      |  2 +-
 .../backtype/storm/messaging/netty/Client.java  | 74 ++++++++++----------
 .../storm/messaging/netty/ControlMessage.java   |  2 +-
 .../messaging/netty/INettySerializable.java     |  4 +-
 .../netty/KerberosSaslNettyClient.java          |  1 -
 .../netty/KerberosSaslNettyServer.java          | 17 +----
 .../netty/KerberosSaslServerHandler.java        | 14 ++--
 .../storm/messaging/netty/SaslMessageToken.java | 11 ++-
 .../storm/messaging/netty/SaslNettyServer.java  |  1 -
 .../messaging/netty/SaslStormServerHandler.java |  4 +-
 .../backtype/storm/messaging/netty/Server.java  | 36 ++++------
 .../messaging/netty/StormClientHandler.java     |  2 +-
 .../messaging/netty/StormServerHandler.java     |  4 +-
 .../backtype/storm/security/auth/AuthUtils.java | 22 ++++--
 .../apache/storm/pacemaker/PacemakerClient.java | 31 ++++----
 .../apache/storm/pacemaker/PacemakerServer.java | 25 ++++---
 .../storm/pacemaker/codec/ThriftDecoder.java    |  5 +-
 .../storm/pacemaker/codec/ThriftEncoder.java    |  6 +-
 .../clj/org/apache/storm/pacemaker_test.clj     |  4 +-
 25 files changed, 173 insertions(+), 177 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/storm/blob/aee48646/bin/storm.py
----------------------------------------------------------------------
diff --git a/bin/storm.py b/bin/storm.py
index 497691d..52e5843 100755
--- a/bin/storm.py
+++ b/bin/storm.py
@@ -266,7 +266,8 @@ def upload_credentials(*args):
 def heartbeats(*args):
     """Syntax: [storm heartbeats [cmd]]
 
-    list [KEY...] - lists heartbeats nodes under KEY currently in pacemaker.
+    list PATH - lists heartbeats nodes under PATH currently in the ClusterState.
+    get  PATH - Get the heartbeat data at PATH
     """
     exec_storm_class(
         "backtype.storm.command.heartbeats",

http://git-wip-us.apache.org/repos/asf/storm/blob/aee48646/storm-core/src/clj/backtype/storm/cluster_state/zookeeper_state_factory.clj
----------------------------------------------------------------------
diff --git a/storm-core/src/clj/backtype/storm/cluster_state/zookeeper_state_factory.clj b/storm-core/src/clj/backtype/storm/cluster_state/zookeeper_state_factory.clj
index ca45ec4..ff942db 100644
--- a/storm-core/src/clj/backtype/storm/cluster_state/zookeeper_state_factory.clj
+++ b/storm-core/src/clj/backtype/storm/cluster_state/zookeeper_state_factory.clj
@@ -16,8 +16,8 @@
 
 (ns backtype.storm.cluster-state.zookeeper-state-factory
   (:import [org.apache.curator.framework.state ConnectionStateListener])
-  (:import [org.apache.zookeeper KeeperException KeeperException$NoNodeException ZooDefs ZooDefs$Ids ZooDefs$Perms]
-           [backtype.storm.cluster ClusterState ClusterStateContext DaemonType])
+  (:import [org.apache.zookeeper KeeperException$NoNodeException]
+           [backtype.storm.cluster ClusterState DaemonType])
   (:use [backtype.storm cluster config log util])
   (:require [backtype.storm [zookeeper :as zk]])
   (:gen-class

http://git-wip-us.apache.org/repos/asf/storm/blob/aee48646/storm-core/src/clj/backtype/storm/util.clj
----------------------------------------------------------------------
diff --git a/storm-core/src/clj/backtype/storm/util.clj b/storm-core/src/clj/backtype/storm/util.clj
index 0b21309..0fab3e7 100644
--- a/storm-core/src/clj/backtype/storm/util.clj
+++ b/storm-core/src/clj/backtype/storm/util.clj
@@ -1064,16 +1064,16 @@
 
 (defn retry-on-exception
   "Retries specific function on exception based on retries count"
-  [tries task-description f & args]
+  [retries task-description f & args]
   (let [res (try {:value (apply f args)}
               (catch Exception e
-                (if (= 0 tries)
+                (if (= 0 retries)
                   (throw e)
                   {:exception e})))]
     (if (:exception res)
       (do 
-        (log-error (:exception res) (str "Failed to " task-description ". Will make [" tries "] more attempts."))
-        (recur (dec tries) task-description f args))
+        (log-error (:exception res) (str "Failed to " task-description ". Will make [" retries "] more attempts."))
+        (recur (dec retries) task-description f args))
       (do 
         (log-debug (str "Successful " task-description "."))
         (:value res)))))

http://git-wip-us.apache.org/repos/asf/storm/blob/aee48646/storm-core/src/clj/org/apache/storm/pacemaker/pacemaker.clj
----------------------------------------------------------------------
diff --git a/storm-core/src/clj/org/apache/storm/pacemaker/pacemaker.clj b/storm-core/src/clj/org/apache/storm/pacemaker/pacemaker.clj
index cd48eb4..588f6aa 100644
--- a/storm-core/src/clj/org/apache/storm/pacemaker/pacemaker.clj
+++ b/storm-core/src/clj/org/apache/storm/pacemaker/pacemaker.clj
@@ -16,11 +16,9 @@
 
 (ns org.apache.storm.pacemaker.pacemaker
   (:import [org.apache.storm.pacemaker PacemakerServer IServerMessageHandler]
-           [java.util.concurrent ConcurrentHashMap ThreadPoolExecutor TimeUnit LinkedBlockingDeque]
+           [java.util.concurrent ConcurrentHashMap]
            [java.util.concurrent.atomic AtomicInteger]
-           [java.util Date]
-           [backtype.storm.generated
-            HBAuthorizationException HBExecutionException HBNodes HBRecords
+           [backtype.storm.generated HBNodes
             HBServerMessageType HBMessage HBMessageData HBPulse])
   (:use [clojure.string :only [replace-first split]]
         [backtype.storm log config util])
@@ -64,41 +62,41 @@
 
 (defn- report-stats [heartbeats stats last-five-s]
   (loop []
-      (let [send-count (.getAndSet (:send-pulse-count stats) 0)
-            received-size (.getAndSet (:total-received-size stats) 0)
-            get-count (.getAndSet (:get-pulse-count stats) 0)
-            sent-size (.getAndSet (:total-sent-size stats) 0)
-            largest (.getAndSet (:largest-heartbeat-size stats) 0)
-            average (.getAndSet (:average-heartbeat-size stats) 0)
-            total-keys (.size heartbeats)]
-        (log-debug "\nReceived " send-count " heartbeats totaling " received-size " bytes,\n"
-                   "Sent " get-count " heartbeats totaling " sent-size " bytes,\n"
-                   "The largest heartbeat was " largest " bytes,\n"
-                   "The average heartbeat was " average " bytes,\n"
-                   "Pacemaker contained " total-keys " total keys\n"
-                   "in the last " sleep-seconds " second(s)")
-        (dosync (ref-set last-five-s
-                         {:send-pulse-count send-count
-                          :total-received-size received-size
-                          :get-pulse-count get-count
-                          :total-sent-size sent-size
-                          :largest-heartbeat-size largest
-                          :average-heartbeat-size average
-                          :total-keys total-keys})))
-      (Thread/sleep (* 1000 sleep-seconds))
-      (recur)))
+    (let [send-count (.getAndSet (:send-pulse-count stats) 0)
+          received-size (.getAndSet (:total-received-size stats) 0)
+          get-count (.getAndSet (:get-pulse-count stats) 0)
+          sent-size (.getAndSet (:total-sent-size stats) 0)
+          largest (.getAndSet (:largest-heartbeat-size stats) 0)
+          average (.getAndSet (:average-heartbeat-size stats) 0)
+          total-keys (.size heartbeats)]
+      (log-debug "\nReceived " send-count " heartbeats totaling " received-size " bytes,\n"
+                 "Sent " get-count " heartbeats totaling " sent-size " bytes,\n"
+                 "The largest heartbeat was " largest " bytes,\n"
+                 "The average heartbeat was " average " bytes,\n"
+                 "Pacemaker contained " total-keys " total keys\n"
+                 "in the last " sleep-seconds " second(s)")
+      (dosync (ref-set last-five-s
+                       {:send-pulse-count send-count
+                        :total-received-size received-size
+                        :get-pulse-count get-count
+                        :total-sent-size sent-size
+                        :largest-heartbeat-size largest
+                        :average-heartbeat-size average
+                        :total-keys total-keys})))
+    (Thread/sleep (* 1000 sleep-seconds))
+    (recur)))
 
 ;; JMX stuff
 (defn register [last-five-s]
   (jmx/register-mbean
-   (jmx/create-bean
-    last-five-s)
-   "org.apache.storm.pacemaker.pacemaker:stats=Stats_Last_5_Seconds"))
+    (jmx/create-bean
+      last-five-s)
+    "org.apache.storm.pacemaker.pacemaker:stats=Stats_Last_5_Seconds"))
 
 
 ;; Pacemaker Functions
 
-(defn hb-data [conf]
+(defn hb-data []
   (ConcurrentHashMap.))
 
 (defn create-path [^String path heartbeats]
@@ -168,7 +166,7 @@
   (HBMessage. HBServerMessageType/NOT_AUTHORIZED nil))
 
 (defn mk-handler [conf]
-  (let [heartbeats ^ConcurrentHashMap (hb-data conf)
+  (let [heartbeats ^ConcurrentHashMap (hb-data)
         pacemaker-stats {:send-pulse-count (AtomicInteger.)
                          :total-received-size (AtomicInteger.)
                          :get-pulse-count (AtomicInteger.)

http://git-wip-us.apache.org/repos/asf/storm/blob/aee48646/storm-core/src/clj/org/apache/storm/pacemaker/pacemaker_state_factory.clj
----------------------------------------------------------------------
diff --git a/storm-core/src/clj/org/apache/storm/pacemaker/pacemaker_state_factory.clj b/storm-core/src/clj/org/apache/storm/pacemaker/pacemaker_state_factory.clj
index 9dc7809..537397a 100644
--- a/storm-core/src/clj/org/apache/storm/pacemaker/pacemaker_state_factory.clj
+++ b/storm-core/src/clj/org/apache/storm/pacemaker/pacemaker_state_factory.clj
@@ -23,8 +23,8 @@
              [log :refer :all]
              [util :as util]])
   (:import [backtype.storm.generated
-            HBExecutionException HBNodes HBRecords
-            HBServerMessageType HBMessage HBMessageData HBPulse]
+            HBExecutionException HBServerMessageType HBMessage
+            HBMessageData HBPulse]
            [backtype.storm.cluster_state zookeeper_state_factory]
            [backtype.storm.cluster ClusterState]
            [org.apache.storm.pacemaker PacemakerClient])

http://git-wip-us.apache.org/repos/asf/storm/blob/aee48646/storm-core/src/jvm/backtype/storm/cluster/ClusterState.java
----------------------------------------------------------------------
diff --git a/storm-core/src/jvm/backtype/storm/cluster/ClusterState.java b/storm-core/src/jvm/backtype/storm/cluster/ClusterState.java
index e0ddc06..bca085f 100644
--- a/storm-core/src/jvm/backtype/storm/cluster/ClusterState.java
+++ b/storm-core/src/jvm/backtype/storm/cluster/ClusterState.java
@@ -89,7 +89,7 @@ public interface ClusterState {
      * @param acls The acls to apply to the path. May be null.
      * @return path
      */
-    void set_ephemeral_node(String path, byte[] data, List<ACL> acls);
+    String set_ephemeral_node(String path, byte[] data, List<ACL> acls);
 
     /**
      * Gets the 'version' of the node at a path. Optionally sets a watch
@@ -203,7 +203,7 @@ public interface ClusterState {
     /**
      * Force consistency on a path. Any writes committed on the path before
      * this call will be completely propagated when it returns.
-     * @param The path to synchronize.
+     * @param path The path to synchronize.
      */
     void sync_path(String path);
 }

http://git-wip-us.apache.org/repos/asf/storm/blob/aee48646/storm-core/src/jvm/backtype/storm/cluster/ClusterStateFactory.java
----------------------------------------------------------------------
diff --git a/storm-core/src/jvm/backtype/storm/cluster/ClusterStateFactory.java b/storm-core/src/jvm/backtype/storm/cluster/ClusterStateFactory.java
index d33646b..1f946ee 100644
--- a/storm-core/src/jvm/backtype/storm/cluster/ClusterStateFactory.java
+++ b/storm-core/src/jvm/backtype/storm/cluster/ClusterStateFactory.java
@@ -23,6 +23,6 @@ import org.apache.zookeeper.data.ACL;
 
 public interface ClusterStateFactory {
     
-    public ClusterState mkState(APersistentMap config, APersistentMap auth_conf, List<ACL> acls, ClusterStateContext context);
+    ClusterState mkState(APersistentMap config, APersistentMap auth_conf, List<ACL> acls, ClusterStateContext context);
 
 }

http://git-wip-us.apache.org/repos/asf/storm/blob/aee48646/storm-core/src/jvm/backtype/storm/messaging/netty/Client.java
----------------------------------------------------------------------
diff --git a/storm-core/src/jvm/backtype/storm/messaging/netty/Client.java b/storm-core/src/jvm/backtype/storm/messaging/netty/Client.java
index 23d8124..4f813ba 100644
--- a/storm-core/src/jvm/backtype/storm/messaging/netty/Client.java
+++ b/storm-core/src/jvm/backtype/storm/messaging/netty/Client.java
@@ -243,7 +243,7 @@ public class Client extends ConnectionWithStatus implements IStatefulObject, ISa
         if (closing) {
             int numMessages = iteratorSize(msgs);
             LOG.error("discarding {} messages because the Netty client to {} is being closed", numMessages,
-                      dstAddressPrefixedName);
+                    dstAddressPrefixedName);
             return;
         }
 
@@ -347,20 +347,20 @@ public class Client extends ConnectionWithStatus implements IStatefulObject, ISa
 
         ChannelFuture future = channel.write(batch);
         future.addListener(new ChannelFutureListener() {
-                public void operationComplete(ChannelFuture future) throws Exception {
-                    pendingMessages.addAndGet(0 - numMessages);
-                    if (future.isSuccess()) {
-                        LOG.debug("sent {} messages to {}", numMessages, dstAddressPrefixedName);
-                        messagesSent.getAndAdd(batch.size());
-                    } else {
-                        LOG.error("failed to send {} messages to {}: {}", numMessages, dstAddressPrefixedName,
-                                  future.getCause());
-                        closeChannelAndReconnect(future.getChannel());
-                        messagesLost.getAndAdd(numMessages);
-                    }
+            public void operationComplete(ChannelFuture future) throws Exception {
+                pendingMessages.addAndGet(0 - numMessages);
+                if (future.isSuccess()) {
+                    LOG.debug("sent {} messages to {}", numMessages, dstAddressPrefixedName);
+                    messagesSent.getAndAdd(batch.size());
+                } else {
+                    LOG.error("failed to send {} messages to {}: {}", numMessages, dstAddressPrefixedName,
+                            future.getCause());
+                    closeChannelAndReconnect(future.getChannel());
+                    messagesLost.getAndAdd(numMessages);
                 }
+            }
 
-            });
+        });
     }
 
     /**
@@ -397,7 +397,7 @@ public class Client extends ConnectionWithStatus implements IStatefulObject, ISa
 
     private void waitForPendingMessagesToBeSent() {
         LOG.info("waiting up to {} ms to send {} pending messages to {}",
-                 PENDING_MESSAGES_FLUSH_TIMEOUT_MS, pendingMessages.get(), dstAddressPrefixedName);
+                PENDING_MESSAGES_FLUSH_TIMEOUT_MS, pendingMessages.get(), dstAddressPrefixedName);
         long totalPendingMsgs = pendingMessages.get();
         long startMs = System.currentTimeMillis();
         while (pendingMessages.get() != 0) {
@@ -405,7 +405,7 @@ public class Client extends ConnectionWithStatus implements IStatefulObject, ISa
                 long deltaMs = System.currentTimeMillis() - startMs;
                 if (deltaMs > PENDING_MESSAGES_FLUSH_TIMEOUT_MS) {
                     LOG.error("failed to send all pending messages to {} within timeout, {} of {} messages were not " +
-                              "sent", dstAddressPrefixedName, pendingMessages.get(), totalPendingMsgs);
+                            "sent", dstAddressPrefixedName, pendingMessages.get(), totalPendingMsgs);
                     break;
                 }
                 Thread.sleep(PENDING_MESSAGES_FLUSH_INTERVAL_MS);
@@ -528,7 +528,7 @@ public class Client extends ConnectionWithStatus implements IStatefulObject, ISa
 
         private void reschedule(Throwable t) {
             String baseMsg = String.format("connection attempt %s to %s failed", connectionAttempts,
-                                           dstAddressPrefixedName);
+                    dstAddressPrefixedName);
             String failureMsg = (t == null) ? baseMsg : baseMsg + ": " + t.toString();
             LOG.error(failureMsg);
             long nextDelayMs = retryPolicy.getSleepTimeMs(connectionAttempts.get(), 0);
@@ -545,32 +545,32 @@ public class Client extends ConnectionWithStatus implements IStatefulObject, ISa
                 LOG.debug("connecting to {} [attempt {}]", address.toString(), connectionAttempt);
                 ChannelFuture future = bootstrap.connect(address);
                 future.addListener(new ChannelFutureListener() {
-                        @Override
-                        public void operationComplete(ChannelFuture future) throws Exception {
-                            // This call returns immediately
-                            Channel newChannel = future.getChannel();
-
-                            if (future.isSuccess() && connectionEstablished(newChannel)) {
-                                boolean setChannel = channelRef.compareAndSet(null, newChannel);
-                                checkState(setChannel);
-                                LOG.debug("successfully connected to {}, {} [attempt {}]", address.toString(), newChannel.toString(),
-                                          connectionAttempt);
-                                if (messagesLost.get() > 0) {
-                                    LOG.warn("Re-connection to {} was successful but {} messages has been lost so far", address.toString(), messagesLost.get());
-                                }
-                            } else {
-                                Throwable cause = future.getCause();
-                                reschedule(cause);
-                                if (newChannel != null) {
-                                    newChannel.close();
-                                }
+                    @Override
+                    public void operationComplete(ChannelFuture future) throws Exception {
+                        // This call returns immediately
+                        Channel newChannel = future.getChannel();
+
+                        if (future.isSuccess() && connectionEstablished(newChannel)) {
+                            boolean setChannel = channelRef.compareAndSet(null, newChannel);
+                            checkState(setChannel);
+                            LOG.debug("successfully connected to {}, {} [attempt {}]", address.toString(), newChannel.toString(),
+                                    connectionAttempt);
+                            if (messagesLost.get() > 0) {
+                                LOG.warn("Re-connection to {} was successful but {} messages has been lost so far", address.toString(), messagesLost.get());
+                            }
+                        } else {
+                            Throwable cause = future.getCause();
+                            reschedule(cause);
+                            if (newChannel != null) {
+                                newChannel.close();
                             }
                         }
-                    });
+                    }
+                });
             } else {
                 close();
                 throw new RuntimeException("Giving up to scheduleConnect to " + dstAddressPrefixedName + " after " +
-                                           connectionAttempts + " failed attempts. " + messagesLost.get() + " messages were lost");
+                        connectionAttempts + " failed attempts. " + messagesLost.get() + " messages were lost");
 
             }
         }

http://git-wip-us.apache.org/repos/asf/storm/blob/aee48646/storm-core/src/jvm/backtype/storm/messaging/netty/ControlMessage.java
----------------------------------------------------------------------
diff --git a/storm-core/src/jvm/backtype/storm/messaging/netty/ControlMessage.java b/storm-core/src/jvm/backtype/storm/messaging/netty/ControlMessage.java
index 769d010..7f60078 100644
--- a/storm-core/src/jvm/backtype/storm/messaging/netty/ControlMessage.java
+++ b/storm-core/src/jvm/backtype/storm/messaging/netty/ControlMessage.java
@@ -55,7 +55,7 @@ public enum ControlMessage implements INettySerializable {
     
     /**
      * encode the current Control Message into a channel buffer
-     * @throws Exception
+     * @throws IOException
      */
     public ChannelBuffer buffer() throws IOException {
         ChannelBufferOutputStream bout = new ChannelBufferOutputStream(ChannelBuffers.directBuffer(encodeLength()));      

http://git-wip-us.apache.org/repos/asf/storm/blob/aee48646/storm-core/src/jvm/backtype/storm/messaging/netty/INettySerializable.java
----------------------------------------------------------------------
diff --git a/storm-core/src/jvm/backtype/storm/messaging/netty/INettySerializable.java b/storm-core/src/jvm/backtype/storm/messaging/netty/INettySerializable.java
index 945e6e9..6cc6de2 100644
--- a/storm-core/src/jvm/backtype/storm/messaging/netty/INettySerializable.java
+++ b/storm-core/src/jvm/backtype/storm/messaging/netty/INettySerializable.java
@@ -21,6 +21,6 @@ import java.io.IOException;
 import org.jboss.netty.buffer.ChannelBuffer;
 
 public interface INettySerializable {
-    public ChannelBuffer buffer() throws IOException;
-    public int encodeLength();
+    ChannelBuffer buffer() throws IOException;
+    int encodeLength();
 }

http://git-wip-us.apache.org/repos/asf/storm/blob/aee48646/storm-core/src/jvm/backtype/storm/messaging/netty/KerberosSaslNettyClient.java
----------------------------------------------------------------------
diff --git a/storm-core/src/jvm/backtype/storm/messaging/netty/KerberosSaslNettyClient.java b/storm-core/src/jvm/backtype/storm/messaging/netty/KerberosSaslNettyClient.java
index 1295394..90dc4b6 100644
--- a/storm-core/src/jvm/backtype/storm/messaging/netty/KerberosSaslNettyClient.java
+++ b/storm-core/src/jvm/backtype/storm/messaging/netty/KerberosSaslNettyClient.java
@@ -113,7 +113,6 @@ public class KerberosSaslNettyClient {
         try {
             Principal principal = (Principal)subject.getPrincipals().toArray()[0];
             final String fPrincipalName = principal.getName();
-            KerberosName kerbName = new KerberosName(principal.getName());
             final String fHost = (String)storm_conf.get(Config.PACEMAKER_HOST);
             final String fServiceName = serviceName;
             final CallbackHandler fch = ch;

http://git-wip-us.apache.org/repos/asf/storm/blob/aee48646/storm-core/src/jvm/backtype/storm/messaging/netty/KerberosSaslNettyServer.java
----------------------------------------------------------------------
diff --git a/storm-core/src/jvm/backtype/storm/messaging/netty/KerberosSaslNettyServer.java b/storm-core/src/jvm/backtype/storm/messaging/netty/KerberosSaslNettyServer.java
index a935608..a16c01b 100644
--- a/storm-core/src/jvm/backtype/storm/messaging/netty/KerberosSaslNettyServer.java
+++ b/storm-core/src/jvm/backtype/storm/messaging/netty/KerberosSaslNettyServer.java
@@ -17,7 +17,6 @@
  */
 package backtype.storm.messaging.netty;
 
-import backtype.storm.Config;
 import backtype.storm.security.auth.AuthUtils;
 import backtype.storm.security.auth.KerberosPrincipalToLocal;
 import java.io.IOException;
@@ -53,7 +52,6 @@ class KerberosSaslNettyServer {
 
     private SaslServer saslServer;
     private Subject subject;
-    private String jaas_section;
     private List<String> authorizedUsers;
 
     KerberosSaslNettyServer(Map storm_conf, String jaas_section, List<String> authorizedUsers) {
@@ -70,7 +68,7 @@ class KerberosSaslNettyServer {
 
         LOG.debug("KerberosSaslNettyServer: authmethod {}", SaslUtils.KERBEROS);
 
-        KerberosSaslCallbackHandler ch = new KerberosSaslNettyServer.KerberosSaslCallbackHandler(storm_conf, authorizedUsers);
+        KerberosSaslCallbackHandler ch = new KerberosSaslNettyServer.KerberosSaslCallbackHandler(authorizedUsers);
 
         //login our principal
         subject = null;
@@ -138,25 +136,14 @@ class KerberosSaslNettyServer {
         return saslServer.getAuthorizationID();
     }
 
-    private String getPrincipal(Subject subject) {
-        Set<Principal> principals = (Set<Principal>)subject.getPrincipals();
-        if (principals==null || principals.size()<1) {
-            LOG.info("No principal found in login subject");
-            return null;
-        }
-        return ((Principal)(principals.toArray()[0])).getName();
-    }
-
     /** CallbackHandler for SASL DIGEST-MD5 mechanism */
     public static class KerberosSaslCallbackHandler implements CallbackHandler {
 
         /** Used to authenticate the clients */
-        private Map config;
         private List<String> authorizedUsers;
 
-        public KerberosSaslCallbackHandler(Map config, List<String> authorizedUsers) {
+        public KerberosSaslCallbackHandler(List<String> authorizedUsers) {
             LOG.debug("KerberosSaslCallback: Creating KerberosSaslCallback handler.");
-            this.config = config;
             this.authorizedUsers = authorizedUsers;
         }
 

http://git-wip-us.apache.org/repos/asf/storm/blob/aee48646/storm-core/src/jvm/backtype/storm/messaging/netty/KerberosSaslServerHandler.java
----------------------------------------------------------------------
diff --git a/storm-core/src/jvm/backtype/storm/messaging/netty/KerberosSaslServerHandler.java b/storm-core/src/jvm/backtype/storm/messaging/netty/KerberosSaslServerHandler.java
index e4a6e29..c31da17 100644
--- a/storm-core/src/jvm/backtype/storm/messaging/netty/KerberosSaslServerHandler.java
+++ b/storm-core/src/jvm/backtype/storm/messaging/netty/KerberosSaslServerHandler.java
@@ -51,8 +51,9 @@ public class KerberosSaslServerHandler extends SimpleChannelUpstreamHandler {
     public void messageReceived(ChannelHandlerContext ctx, MessageEvent e)
         throws Exception {
         Object msg = e.getMessage();
-        if (msg == null)
+        if (msg == null) {
             return;
+        }
 
         Channel channel = ctx.getChannel();
 
@@ -70,14 +71,13 @@ public class KerberosSaslServerHandler extends SimpleChannelUpstreamHandler {
                     LOG.debug("No saslNettyServer for {}  yet; creating now, with topology token: ", channel);
                     try {
                         saslNettyServer = new KerberosSaslNettyServer(storm_conf, jaas_section, authorizedUsers);
+                        KerberosSaslNettyServerState.getKerberosSaslNettyServer.set(channel,
+                                                                                    saslNettyServer);
                     } catch (RuntimeException ioe) {
                         LOG.error("Error occurred while creating saslNettyServer on server {} for client {}",
                                   channel.getLocalAddress(), channel.getRemoteAddress());
-                        saslNettyServer = null;
+                        throw ioe;
                     }
-
-                    KerberosSaslNettyServerState.getKerberosSaslNettyServer.set(channel,
-                                                                                saslNettyServer);
                 } else {
                     LOG.debug("Found existing saslNettyServer on server: {} for client {}",
                               channel.getLocalAddress(), channel.getRemoteAddress());
@@ -125,7 +125,9 @@ public class KerberosSaslServerHandler extends SimpleChannelUpstreamHandler {
 
     @Override
     public void exceptionCaught(ChannelHandlerContext ctx, ExceptionEvent e) {
-        if(server != null) server.closeChannel(e.getChannel());
+        if(server != null) {
+            server.closeChannel(e.getChannel());
+        }
     }
 
 }

http://git-wip-us.apache.org/repos/asf/storm/blob/aee48646/storm-core/src/jvm/backtype/storm/messaging/netty/SaslMessageToken.java
----------------------------------------------------------------------
diff --git a/storm-core/src/jvm/backtype/storm/messaging/netty/SaslMessageToken.java b/storm-core/src/jvm/backtype/storm/messaging/netty/SaslMessageToken.java
index 70e7089..8a133d1 100644
--- a/storm-core/src/jvm/backtype/storm/messaging/netty/SaslMessageToken.java
+++ b/storm-core/src/jvm/backtype/storm/messaging/netty/SaslMessageToken.java
@@ -72,17 +72,16 @@ public class SaslMessageToken implements INettySerializable {
         this.token = token;
     }
 
-
     public int encodeLength() {
         return 2 + 4 + token.length;
     }
 
     /**
      * encode the current SaslToken Message into a channel buffer
-     * SaslTokenMessageRequest is encoded as: identifier .... short(2) always it
-     * is -500 payload length .... int payload .... byte[]
+     * SaslTokenMessageRequest is encoded as: identifier .... short(2)
+     * payload length .... int payload .... byte[]
      * 
-     * @throws Exception
+     * @throws IOException
      */
     public ChannelBuffer buffer() throws IOException {
         ChannelBufferOutputStream bout = new ChannelBufferOutputStream(
@@ -92,7 +91,7 @@ public class SaslMessageToken implements INettySerializable {
             payload_len = token.length;
 
         bout.writeShort(IDENTIFIER);
-        bout.writeInt((int) payload_len);
+        bout.writeInt(payload_len);
 
         if (payload_len > 0) {
             bout.write(token);
@@ -105,7 +104,7 @@ public class SaslMessageToken implements INettySerializable {
         ChannelBuffer sm_buffer = ChannelBuffers.copiedBuffer(serial);
         short identifier = sm_buffer.readShort();
         int payload_len = sm_buffer.readInt();
-        if(identifier != -500) {
+        if(identifier != IDENTIFIER) {
             return null;
         }
         byte token[] = new byte[payload_len];

http://git-wip-us.apache.org/repos/asf/storm/blob/aee48646/storm-core/src/jvm/backtype/storm/messaging/netty/SaslNettyServer.java
----------------------------------------------------------------------
diff --git a/storm-core/src/jvm/backtype/storm/messaging/netty/SaslNettyServer.java b/storm-core/src/jvm/backtype/storm/messaging/netty/SaslNettyServer.java
index 0c4b24e..887a6c6 100644
--- a/storm-core/src/jvm/backtype/storm/messaging/netty/SaslNettyServer.java
+++ b/storm-core/src/jvm/backtype/storm/messaging/netty/SaslNettyServer.java
@@ -35,7 +35,6 @@ import org.slf4j.LoggerFactory;
 
 class SaslNettyServer {
 
-
     private static final Logger LOG = LoggerFactory
         .getLogger(SaslNettyServer.class);
 

http://git-wip-us.apache.org/repos/asf/storm/blob/aee48646/storm-core/src/jvm/backtype/storm/messaging/netty/SaslStormServerHandler.java
----------------------------------------------------------------------
diff --git a/storm-core/src/jvm/backtype/storm/messaging/netty/SaslStormServerHandler.java b/storm-core/src/jvm/backtype/storm/messaging/netty/SaslStormServerHandler.java
index 2836e80..a8f9978 100644
--- a/storm-core/src/jvm/backtype/storm/messaging/netty/SaslStormServerHandler.java
+++ b/storm-core/src/jvm/backtype/storm/messaging/netty/SaslStormServerHandler.java
@@ -147,7 +147,7 @@ public class SaslStormServerHandler extends SimpleChannelUpstreamHandler {
             token = secretKey.getBytes();
         }
 
-        LOG.debug("SASL credentials for storm topology " + topologyName
-                  + " is " + secretKey);
+        LOG.debug("SASL credentials for storm topology {} is {}",
+                  topologyName, secretKey);
     }
 }

http://git-wip-us.apache.org/repos/asf/storm/blob/aee48646/storm-core/src/jvm/backtype/storm/messaging/netty/Server.java
----------------------------------------------------------------------
diff --git a/storm-core/src/jvm/backtype/storm/messaging/netty/Server.java b/storm-core/src/jvm/backtype/storm/messaging/netty/Server.java
index 684e9ea..4990f63 100644
--- a/storm-core/src/jvm/backtype/storm/messaging/netty/Server.java
+++ b/storm-core/src/jvm/backtype/storm/messaging/netty/Server.java
@@ -19,42 +19,32 @@ package backtype.storm.messaging.netty;
 
 import backtype.storm.Config;
 import backtype.storm.grouping.Load;
+import backtype.storm.messaging.ConnectionWithStatus;
+import backtype.storm.messaging.IConnectionCallback;
 import backtype.storm.messaging.TaskMessage;
 import backtype.storm.metric.api.IStatefulObject;
 import backtype.storm.serialization.KryoValuesSerializer;
 import backtype.storm.utils.Utils;
-import org.jboss.netty.bootstrap.ServerBootstrap;
-import org.jboss.netty.channel.Channel;
-import org.jboss.netty.channel.ChannelFactory;
-import org.jboss.netty.channel.group.ChannelGroup;
-import org.jboss.netty.channel.group.DefaultChannelGroup;
-import org.jboss.netty.channel.socket.nio.NioServerSocketChannelFactory;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
+import java.io.IOException;
 import java.net.InetSocketAddress;
-import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.Collection;
 import java.util.HashMap;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
-import java.util.Collection;
-import java.util.concurrent.atomic.AtomicInteger;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.Executors;
-import java.util.concurrent.LinkedBlockingQueue;
 import java.util.concurrent.ThreadFactory;
-import java.io.IOException;
-
-
-import backtype.storm.messaging.ConnectionWithStatus;
-import backtype.storm.messaging.IConnection;
-import backtype.storm.messaging.IConnectionCallback;
-import backtype.storm.messaging.TaskMessage;
-import backtype.storm.metric.api.IStatefulObject;
-import backtype.storm.serialization.KryoValuesSerializer;
-import backtype.storm.utils.Utils;
+import java.util.concurrent.atomic.AtomicInteger;
+import org.jboss.netty.bootstrap.ServerBootstrap;
+import org.jboss.netty.channel.Channel;
+import org.jboss.netty.channel.ChannelFactory;
+import org.jboss.netty.channel.group.ChannelGroup;
+import org.jboss.netty.channel.group.DefaultChannelGroup;
+import org.jboss.netty.channel.socket.nio.NioServerSocketChannelFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 class Server extends ConnectionWithStatus implements IStatefulObject, ISaslServer {
 

http://git-wip-us.apache.org/repos/asf/storm/blob/aee48646/storm-core/src/jvm/backtype/storm/messaging/netty/StormClientHandler.java
----------------------------------------------------------------------
diff --git a/storm-core/src/jvm/backtype/storm/messaging/netty/StormClientHandler.java b/storm-core/src/jvm/backtype/storm/messaging/netty/StormClientHandler.java
index 696a2fc..877b6d8 100644
--- a/storm-core/src/jvm/backtype/storm/messaging/netty/StormClientHandler.java
+++ b/storm-core/src/jvm/backtype/storm/messaging/netty/StormClientHandler.java
@@ -75,7 +75,7 @@ public class StormClientHandler extends SimpleChannelUpstreamHandler  {
                                        + message + " (" + client.getDstAddress() + ")");
         }
     }
-        
+
     @Override
     public void channelInterestChanged(ChannelHandlerContext ctx, ChannelStateEvent e) throws Exception {
         client.notifyInterestChanged(e.getChannel());

http://git-wip-us.apache.org/repos/asf/storm/blob/aee48646/storm-core/src/jvm/backtype/storm/messaging/netty/StormServerHandler.java
----------------------------------------------------------------------
diff --git a/storm-core/src/jvm/backtype/storm/messaging/netty/StormServerHandler.java b/storm-core/src/jvm/backtype/storm/messaging/netty/StormServerHandler.java
index 45f6542..8140df6 100644
--- a/storm-core/src/jvm/backtype/storm/messaging/netty/StormServerHandler.java
+++ b/storm-core/src/jvm/backtype/storm/messaging/netty/StormServerHandler.java
@@ -43,8 +43,8 @@ public class StormServerHandler extends SimpleChannelUpstreamHandler  {
     public void channelConnected(ChannelHandlerContext ctx, ChannelStateEvent e) {
         server.channelConnected(e.getChannel());
         if(channel != null) {
-            LOG.debug("Replacing channel with new channel: "
-                      + channel.toString() + " -> " + e.getChannel().toString());
+            LOG.debug("Replacing channel with new channel: {} -> ",
+                      channel, e.getChannel());
         }
         channel = e.getChannel();
         server.channelConnected(channel);

http://git-wip-us.apache.org/repos/asf/storm/blob/aee48646/storm-core/src/jvm/backtype/storm/security/auth/AuthUtils.java
----------------------------------------------------------------------
diff --git a/storm-core/src/jvm/backtype/storm/security/auth/AuthUtils.java b/storm-core/src/jvm/backtype/storm/security/auth/AuthUtils.java
index 943199c..429c712 100644
--- a/storm-core/src/jvm/backtype/storm/security/auth/AuthUtils.java
+++ b/storm-core/src/jvm/backtype/storm/security/auth/AuthUtils.java
@@ -22,6 +22,7 @@ import javax.security.auth.login.Configuration;
 import javax.security.auth.login.AppConfigurationEntry;
 import javax.security.auth.Subject;
 import java.security.URIParameter;
+import java.security.MessageDigest;
 
 import backtype.storm.security.INimbusCredentialPlugin;
 import org.slf4j.Logger;
@@ -32,10 +33,10 @@ import java.net.URI;
 import java.util.Collection;
 import java.util.Set;
 import java.util.HashSet;
-import java.util.HashMap;
 import java.util.Map;
 import java.util.SortedMap;
 import java.util.TreeMap;
+import java.lang.StringBuilder;
 
 public class AuthUtils {
     private static final Logger LOG = LoggerFactory.getLogger(AuthUtils.class);
@@ -75,10 +76,9 @@ public class AuthUtils {
 
     /**
      * Pull a set of keys out of a Configuration.
-     * @param configs_to_pull A set of config keys that you want the values of.
      * @param conf The config to pull the key/value pairs out of.
      * @param conf_entry The app configuration entry name to get stuff from.
-     * @return Return a map of the configs in configs_to_pull to their values.
+     * @return Return a map of the configs in conf.
      */
     public static SortedMap<String, ?> PullConfig(Configuration conf,
                                             String conf_entry) throws IOException {
@@ -93,7 +93,6 @@ public class AuthUtils {
         }
 
         TreeMap<String, Object> results = new TreeMap<>();
-        
 
         for(AppConfigurationEntry entry: configurationEntries) {
             Map<String, ?> options = entry.getOptions();
@@ -333,6 +332,19 @@ public class AuthUtils {
             return null;
         }
 
-        return username + ":" + password;
+        try {
+            MessageDigest digest = MessageDigest.getInstance("SHA-512");
+            byte[] output = digest.digest((username + ":" + password).getBytes());
+
+            StringBuilder builder = new StringBuilder();
+            for(byte b : output) {
+            builder.append(String.format("%02x", b));
+            }
+            return builder.toString();
+        }
+        catch(java.security.NoSuchAlgorithmException e) {
+            LOG.error("Cant run SHA-512 digest. Algorithm not available.", e);
+            throw new RuntimeException(e);
+        }
     }
 }

http://git-wip-us.apache.org/repos/asf/storm/blob/aee48646/storm-core/src/jvm/org/apache/storm/pacemaker/PacemakerClient.java
----------------------------------------------------------------------
diff --git a/storm-core/src/jvm/org/apache/storm/pacemaker/PacemakerClient.java b/storm-core/src/jvm/org/apache/storm/pacemaker/PacemakerClient.java
index c144982..4f4a737 100644
--- a/storm-core/src/jvm/org/apache/storm/pacemaker/PacemakerClient.java
+++ b/storm-core/src/jvm/org/apache/storm/pacemaker/PacemakerClient.java
@@ -19,7 +19,6 @@ package org.apache.storm.pacemaker;
 
 import backtype.storm.Config;
 import backtype.storm.generated.HBMessage;
-import backtype.storm.messaging.netty.Client;
 import backtype.storm.messaging.netty.ISaslClient;
 import backtype.storm.messaging.netty.NettyRenameThreadFactory;
 import backtype.storm.security.auth.AuthUtils;
@@ -60,7 +59,7 @@ public class PacemakerClient implements ISaslClient {
 
     private StormBoundedExponentialBackoffRetry backoff = new StormBoundedExponentialBackoffRetry(100, 5000, 20);
     private int retryTimes = 0;
-    
+
     public PacemakerClient(Map config) {
 
         String host = (String)config.get(Config.PACEMAKER_HOST);
@@ -73,8 +72,9 @@ public class PacemakerClient implements ISaslClient {
         String auth = (String)config.get(Config.PACEMAKER_AUTH_METHOD);
         ThriftNettyClientCodec.AuthMethod authMethod;
 
-        if(auth.equals("DIGEST")) {
+        switch(auth) {
 
+        case "DIGEST":
             Configuration login_conf = AuthUtils.GetConfiguration(config);
             authMethod = ThriftNettyClientCodec.AuthMethod.DIGEST;
             secret = AuthUtils.makeDigestPayload(login_conf, AuthUtils.LOGIN_CONTEXT_PACEMAKER_DIGEST);
@@ -82,17 +82,20 @@ public class PacemakerClient implements ISaslClient {
                 LOG.error("Can't start pacemaker server without digest secret.");
                 throw new RuntimeException("Can't start pacemaker server without digest secret.");
             }
+            break;
 
-        }
-        else if(auth.equals("KERBEROS")) {
+        case "KERBEROS":
             authMethod = ThriftNettyClientCodec.AuthMethod.KERBEROS;
-        }
-        else {
-            if(!auth.equals("NONE")) {
-                LOG.warn("Invalid auth scheme: '{}'. Falling back to 'NONE'", auth);
-            }
-            
+            break;
+
+        case "NONE":
+            authMethod = ThriftNettyClientCodec.AuthMethod.NONE;
+            break;
+
+        default:
             authMethod = ThriftNettyClientCodec.AuthMethod.NONE;
+            LOG.warn("Invalid auth scheme: '{}'. Falling back to 'NONE'", auth);
+            break;
         }
 
         closing = new AtomicBoolean(false);
@@ -199,10 +202,10 @@ public class PacemakerClient implements ISaslClient {
     public void gotMessage(HBMessage m) {
         int message_id = m.get_message_id();
         if(message_id >=0 && message_id < maxPending) {
-            
-            LOG.debug("Pacemaker Client got message: {}", m.toString());
+
+            LOG.debug("Pacemaker client got message: {}", m.toString());
             HBMessage request = messages[message_id];
-            
+
             if(request == null) {
                 LOG.debug("No message for slot: {}", Integer.toString(message_id));
             }

http://git-wip-us.apache.org/repos/asf/storm/blob/aee48646/storm-core/src/jvm/org/apache/storm/pacemaker/PacemakerServer.java
----------------------------------------------------------------------
diff --git a/storm-core/src/jvm/org/apache/storm/pacemaker/PacemakerServer.java b/storm-core/src/jvm/org/apache/storm/pacemaker/PacemakerServer.java
index adba9ab..0422dba 100644
--- a/storm-core/src/jvm/org/apache/storm/pacemaker/PacemakerServer.java
+++ b/storm-core/src/jvm/org/apache/storm/pacemaker/PacemakerServer.java
@@ -61,7 +61,9 @@ class PacemakerServer implements ISaslServer {
         this.topo_name = "pacemaker_server";
 
         String auth = (String)config.get(Config.PACEMAKER_AUTH_METHOD);
-        if(auth.equals("DIGEST")) {
+        switch(auth) {
+
+        case "DIGEST":
             Configuration login_conf = AuthUtils.GetConfiguration(config);
             authMethod = ThriftNettyServerCodec.AuthMethod.DIGEST;
             this.secret = AuthUtils.makeDigestPayload(login_conf, AuthUtils.LOGIN_CONTEXT_PACEMAKER_DIGEST);
@@ -69,14 +71,17 @@ class PacemakerServer implements ISaslServer {
                 LOG.error("Can't start pacemaker server without digest secret.");
                 throw new RuntimeException("Can't start pacemaker server without digest secret.");
             }
-        }
-        else if(auth.equals("KERBEROS")) {
+            break;
+
+        case "KERBEROS":
             authMethod = ThriftNettyServerCodec.AuthMethod.KERBEROS;
-        }
-        else if(auth.equals("NONE")) {
+            break;
+
+        case "NONE":
             authMethod = ThriftNettyServerCodec.AuthMethod.NONE;
-        }
-        else {
+            break;
+
+        default:
             LOG.error("Can't start pacemaker server without proper PACEMAKER_AUTH_METHOD.");
             throw new RuntimeException("Can't start pacemaker server without proper PACEMAKER_AUTH_METHOD.");
         }
@@ -115,7 +120,7 @@ class PacemakerServer implements ISaslServer {
 
     public void cleanPipeline(Channel channel) {
         boolean authenticated = authenticated_channels.contains(channel);
-        if(!authenticated) {       
+        if(!authenticated) {
             if(channel.getPipeline().get(ThriftNettyServerCodec.SASL_HANDLER) != null) {
                 channel.getPipeline().remove(ThriftNettyServerCodec.SASL_HANDLER);
             }
@@ -124,10 +129,10 @@ class PacemakerServer implements ISaslServer {
             }
         }
     }
-    
+
     public void received(Object mesg, String remote, Channel channel) throws InterruptedException {
         cleanPipeline(channel);
-        
+
         boolean authenticated = (authMethod == ThriftNettyServerCodec.AuthMethod.NONE) || authenticated_channels.contains(channel);
         HBMessage m = (HBMessage)mesg;
         LOG.debug("received message. Passing to handler. {} : {} : {}",

http://git-wip-us.apache.org/repos/asf/storm/blob/aee48646/storm-core/src/jvm/org/apache/storm/pacemaker/codec/ThriftDecoder.java
----------------------------------------------------------------------
diff --git a/storm-core/src/jvm/org/apache/storm/pacemaker/codec/ThriftDecoder.java b/storm-core/src/jvm/org/apache/storm/pacemaker/codec/ThriftDecoder.java
index c964df2..113594a 100644
--- a/storm-core/src/jvm/org/apache/storm/pacemaker/codec/ThriftDecoder.java
+++ b/storm-core/src/jvm/org/apache/storm/pacemaker/codec/ThriftDecoder.java
@@ -21,7 +21,6 @@ import org.jboss.netty.handler.codec.frame.FrameDecoder;
 import org.jboss.netty.channel.ChannelHandlerContext;
 import org.jboss.netty.channel.Channel;
 import backtype.storm.generated.HBMessage;
-import backtype.storm.generated.HBMessageData;
 import backtype.storm.generated.HBServerMessageType;
 import org.jboss.netty.buffer.ChannelBuffer;
 import backtype.storm.utils.Utils;
@@ -53,13 +52,13 @@ public class ThriftDecoder extends FrameDecoder {
 
         HBMessage m;
         if(buf.hasArray()) {
-            m = (HBMessage)Utils.thriftDeserialize(HBMessage.class, buf.array(), 0, thriftLen);
+            m = Utils.thriftDeserialize(HBMessage.class, buf.array(), 0, thriftLen);
             buf.readerIndex(buf.readerIndex() + thriftLen);
         }
         else {
             byte serialized[] = new byte[thriftLen];
             buf.readBytes(serialized, 0, thriftLen);
-            m = (HBMessage)Utils.thriftDeserialize(HBMessage.class, serialized);
+            m = Utils.thriftDeserialize(HBMessage.class, serialized);
         }
 
         if(m.get_type() == HBServerMessageType.CONTROL_MESSAGE) {

http://git-wip-us.apache.org/repos/asf/storm/blob/aee48646/storm-core/src/jvm/org/apache/storm/pacemaker/codec/ThriftEncoder.java
----------------------------------------------------------------------
diff --git a/storm-core/src/jvm/org/apache/storm/pacemaker/codec/ThriftEncoder.java b/storm-core/src/jvm/org/apache/storm/pacemaker/codec/ThriftEncoder.java
index fb2c5be..a6912f2 100644
--- a/storm-core/src/jvm/org/apache/storm/pacemaker/codec/ThriftEncoder.java
+++ b/storm-core/src/jvm/org/apache/storm/pacemaker/codec/ThriftEncoder.java
@@ -66,7 +66,9 @@ public class ThriftEncoder extends OneToOneEncoder {
 
     @Override
     protected Object encode(ChannelHandlerContext ctx, Channel channel, Object msg) {
-        if(msg == null) return null;
+        if(msg == null) {
+            return null;
+        }
 
         LOG.debug("Trying to encode: " + msg.getClass().toString() + " : " + msg.toString());
 
@@ -92,7 +94,7 @@ public class ThriftEncoder extends OneToOneEncoder {
         }
 
         try {
-            byte serialized[] = Utils.thriftSerialize((TBase)m);
+            byte serialized[] = Utils.thriftSerialize(m);
             ChannelBuffer ret = ChannelBuffers.directBuffer(serialized.length + 4);
 
             ret.writeInt(serialized.length);

http://git-wip-us.apache.org/repos/asf/storm/blob/aee48646/storm-core/test/clj/org/apache/storm/pacemaker_test.clj
----------------------------------------------------------------------
diff --git a/storm-core/test/clj/org/apache/storm/pacemaker_test.clj b/storm-core/test/clj/org/apache/storm/pacemaker_test.clj
index 4c5359f..0987923 100644
--- a/storm-core/test/clj/org/apache/storm/pacemaker_test.clj
+++ b/storm-core/test/clj/org/apache/storm/pacemaker_test.clj
@@ -18,8 +18,8 @@
             [org.apache.storm.pacemaker [pacemaker :as pacemaker]]
             [conjure.core :as conjure])
   (:import [backtype.storm.generated
-            HBExecutionException HBNodes HBRecords
-            HBServerMessageType HBMessage HBMessageData HBPulse]))
+            HBExecutionException HBServerMessageType
+            HBMessage HBMessageData HBPulse]))
 
 (defn- message-with-rand-id [type data]
   (let [mid (rand-int 1000)