From 7de5c7806e8c91def566faa8007b676abfa6020c Mon Sep 17 00:00:00 2001
From: Eric Tschetter <cheddar@metamarketsgroup.com>
Date: Fri, 1 Feb 2013 16:19:17 -0600
Subject: [PATCH] 1) Some whitespace changes 2) Fix up the alerting to actually
 include the segment and server for when the MasterBalancer has something
 stuck in the queue

---
 .../com/metamx/druid/http/ComputeNode.java    |  4 ++-
 .../com/metamx/druid/master/DruidMaster.java  | 29 +++++++++----------
 .../druid/master/DruidMasterBalancer.java     | 14 +++------
 3 files changed, 21 insertions(+), 26 deletions(-)

diff --git a/server/src/main/java/com/metamx/druid/http/ComputeNode.java b/server/src/main/java/com/metamx/druid/http/ComputeNode.java
index c559a82d3bc..c6d284403c0 100644
--- a/server/src/main/java/com/metamx/druid/http/ComputeNode.java
+++ b/server/src/main/java/com/metamx/druid/http/ComputeNode.java
@@ -126,7 +126,9 @@ public class ComputeNode extends BaseServerNode<ComputeNode>
             getConfigFactory().buildWithReplacements(
                 ExecutorServiceConfig.class, ImmutableMap.of("base_path", "druid.processing")
             )
-        ), emitter, new ServiceMetricEvent.Builder()
+        ),
+        emitter,
+        new ServiceMetricEvent.Builder()
     );
 
     final ServerManager serverManager = new ServerManager(segmentLoader, conglomerate, emitter, executorService);
diff --git a/server/src/main/java/com/metamx/druid/master/DruidMaster.java b/server/src/main/java/com/metamx/druid/master/DruidMaster.java
index 80172c432fa..cf2b07bf62f 100644
--- a/server/src/main/java/com/metamx/druid/master/DruidMaster.java
+++ b/server/src/main/java/com/metamx/druid/master/DruidMaster.java
@@ -594,21 +594,20 @@ public class DruidMaster
                 public DruidMasterRuntimeParams run(DruidMasterRuntimeParams params)
                 {
                   // Display info about all historical servers
-                  Iterable<DruidServer> servers =
-                      FunctionalIterable.create(serverInventoryManager.getInventory())
-                                        .filter(
-                                            new Predicate<DruidServer>()
-                                            {
-                                              @Override
-                                              public boolean apply(
-                                                  @Nullable DruidServer input
-                                              )
-                                              {
-                                                return input.getType()
-                                                            .equalsIgnoreCase("historical");
-                                              }
-                                            }
-                                        );
+                  Iterable<DruidServer> servers =FunctionalIterable
+                      .create(serverInventoryManager.getInventory())
+                      .filter(
+                          new Predicate<DruidServer>()
+                          {
+                            @Override
+                            public boolean apply(
+                                @Nullable DruidServer input
+                            )
+                            {
+                              return input.getType().equalsIgnoreCase("historical");
+                            }
+                          }
+                      );
                   if (log.isDebugEnabled()) {
                     log.debug("Servers");
                     for (DruidServer druidServer : servers) {
diff --git a/server/src/main/java/com/metamx/druid/master/DruidMasterBalancer.java b/server/src/main/java/com/metamx/druid/master/DruidMasterBalancer.java
index 75d3534fef6..42e8a4868cb 100644
--- a/server/src/main/java/com/metamx/druid/master/DruidMasterBalancer.java
+++ b/server/src/main/java/com/metamx/druid/master/DruidMasterBalancer.java
@@ -19,8 +19,6 @@
 
 package com.metamx.druid.master;
 
-import com.google.common.collect.ImmutableMap;
-import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
 import com.google.common.collect.MinMaxPriorityQueue;
 import com.google.common.collect.Sets;
@@ -30,7 +28,6 @@ import com.metamx.druid.client.DruidServer;
 import com.metamx.emitter.EmittingLogger;
 
 import java.util.Comparator;
-import java.util.List;
 import java.util.Map;
 import java.util.Set;
 import java.util.TreeSet;
@@ -71,13 +68,10 @@ public class DruidMasterBalancer implements DruidMasterHelper
     for (BalancerSegmentHolder holder : currentlyMovingSegments.get(tier).values()) {
       holder.reduceLifetime();
       if (holder.getLifetime() <= 0) {
-        log.makeAlert(
-            "[%s]: Balancer move segments queue has a segment stuck",
-            tier,
-            ImmutableMap.<String, Object>builder()
-                        .put("segment", holder.getSegment().getIdentifier())
-                        .build()
-        ).emit();
+        log.makeAlert("[%s]: Balancer move segments queue has a segment stuck", tier)
+            .addData("segment", holder.getSegment().getIdentifier())
+            .addData("server", holder.getServer())
+            .emit();
       }
     }
   }