fixes

server/src/main/java/io/druid/server/coordinator/DruidCoordinator.java

@@ -44,6 +44,7 @@ import io.druid.client.DruidDataSource;
 import io.druid.client.DruidServer;
 import io.druid.client.ServerInventoryView;
 import io.druid.client.indexing.IndexingServiceClient;
+import io.druid.collections.CountingMap;
 import io.druid.common.config.JacksonConfigManager;
 import io.druid.concurrent.Execs;
 import io.druid.curator.discovery.ServiceAnnouncer;
@@ -73,6 +74,7 @@ import java.util.Set;
 import java.util.concurrent.Callable;
 import java.util.concurrent.ConcurrentMap;
 import java.util.concurrent.ScheduledExecutorService;
+import java.util.concurrent.atomic.AtomicLong;
 import java.util.concurrent.atomic.AtomicReference;
 
 /**
@@ -191,40 +193,41 @@ public class DruidCoordinator
 
   public Map<String, Double> getReplicationStatus()
   {
-    // find expected load
+    // find expected load per datasource
-    final Map<String, Integer> expectedSegmentsInCluster = Maps.newHashMap();
+    final CountingMap<String> expectedSegmentsInCluster = new CountingMap<>();
     final DateTime now = new DateTime();
     for (DataSegment segment : getAvailableDataSegments()) {
       List<Rule> rules = databaseRuleManager.getRulesWithDefault(segment.getDataSource());
       for (Rule rule : rules) {
         if (rule instanceof LoadRule && rule.appliesTo(segment, now)) {
-          Integer count = expectedSegmentsInCluster.get(segment.getIdentifier());
+          expectedSegmentsInCluster.add(segment.getDataSource(), ((LoadRule) rule).getReplicants());
-          if (count == null) {
+          //Integer count = expectedSegmentsInCluster.get(segment.getDataSource());
-            count = 0;
+          //if (count == null) {
-          }
+          //  count = 0;
-          expectedSegmentsInCluster.put(segment.getIdentifier(), count + ((LoadRule) rule).getReplicants());
+          //}
+          //expectedSegmentsInCluster.put(segment.getDataSource(), count + ((LoadRule) rule).getReplicants());
           break;
         }
       }
     }
 
-    // find segments currently loaded
+    // find segments currently loaded per datasource
     Map<String, Integer> segmentsInCluster = Maps.newHashMap();
     for (DruidServer druidServer : serverInventoryView.getInventory()) {
       for (DataSegment segment : druidServer.getSegments().values()) {
-        Integer count = segmentsInCluster.get(segment.getIdentifier());
+        Integer count = segmentsInCluster.get(segment.getDataSource());
         if (count == null) {
           count = 0;
         }
-        segmentsInCluster.put(segment.getIdentifier(), count + 1);
+        segmentsInCluster.put(segment.getDataSource(), count + 1);
       }
     }
 
     // compare available segments with currently loaded
     Map<String, Double> loadStatus = Maps.newHashMap();
-    for (Map.Entry<String, Integer> entry : expectedSegmentsInCluster.entrySet()) {
+    for (Map.Entry<String, AtomicLong> entry : expectedSegmentsInCluster.entrySet()) {
       Integer actual = segmentsInCluster.get(entry.getKey());
-      loadStatus.put(entry.getKey(), 100 * (actual == null ? 0.0D : (double) actual) / entry.getValue());
+      loadStatus.put(entry.getKey(), 100 * (actual == null ? 0.0D : (double) actual) / entry.getValue().get());
     }
 
     return loadStatus;

server/src/main/java/io/druid/server/http/CoordinatorDynamicConfigsResource.java

@@ -32,7 +32,7 @@ import javax.ws.rs.core.Response;
 
 /**
  */
-@Path("/coordinator/config")
+@Path("/druid/coordinator/v1/config")
 public class CoordinatorDynamicConfigsResource
 {
   private final JacksonConfigManager manager;

server/src/main/java/io/druid/server/http/CoordinatorResource.java

@@ -19,8 +19,13 @@
 
 package io.druid.server.http;
 
+import com.google.common.base.Function;
+import com.google.common.collect.ImmutableMap;
+import com.google.common.collect.Maps;
 import com.google.inject.Inject;
 import io.druid.server.coordinator.DruidCoordinator;
+import io.druid.server.coordinator.LoadQueuePeon;
+import io.druid.timeline.DataSegment;
 
 import javax.ws.rs.GET;
 import javax.ws.rs.Path;
@@ -30,7 +35,7 @@ import javax.ws.rs.core.Response;
 
 /**
  */
-@Path("/coordinator")
+@Path("/druid/coordinator/v1")
 public class CoordinatorResource
 {
   private final DruidCoordinator coordinator;
@@ -67,8 +72,40 @@ public class CoordinatorResource
   @GET
   @Path("loadqueue")
   @Produces("application/json")
-  public Response getLoadQueue()
+  public Response getLoadQueue(
+      @QueryParam("simple") String simple
+  )
   {
+    if (simple != null) {
+      return Response.ok(
+          Maps.transformValues(
+              coordinator.getLoadManagementPeons(),
+              new Function<LoadQueuePeon, Object>()
+              {
+                @Override
+                public Object apply(LoadQueuePeon input)
+                {
+                  long loadSize = 0;
+                  for (DataSegment dataSegment : input.getSegmentsToLoad()) {
+                    loadSize += dataSegment.getSize();
+                  }
+
+                  long dropSize = 0;
+                  for (DataSegment dataSegment : input.getSegmentsToDrop()) {
+                    dropSize += dataSegment.getSize();
+                  }
+
+                  return new ImmutableMap.Builder<>()
+                      .put("segmentsToLoad", input.getSegmentsToLoad().size())
+                      .put("segmentsToDrop", input.getSegmentsToDrop().size())
+                      .put("segmentsToLoadSize", loadSize)
+                      .put("segmentsToDropSize", dropSize)
+                      .build();
+                }
+              }
+          )
+      ).build();
+    }
     return Response.ok(coordinator.getLoadManagementPeons()).build();
   }
 }

server/src/main/java/io/druid/server/http/DBResource.java

@@ -39,7 +39,7 @@ import java.util.List;
 
 /**
  */
-@Path("/db")
+@Path("/druid/coordinator/v1/db")
 public class DBResource
 {
   private final DatabaseSegmentManager databaseSegmentManager;

server/src/main/java/io/druid/server/http/DatasourcesResource.java

@@ -53,7 +53,7 @@ import java.util.TreeSet;
 
 /**
  */
-@Path("/datasources")
+@Path("/druid/coordinator/v1/datasources")
 public class DatasourcesResource
 {
   private static Map<String, Object> makeSimpleDatasource(DruidDataSource input)

server/src/main/java/io/druid/server/http/RulesResource.java

@@ -31,7 +31,7 @@ import javax.ws.rs.core.Response;
 
 /**
  */
-@Path("/rules")
+@Path("/druid/coordinator/v1/rules")
 public class RulesResource
 {
   private final DatabaseRuleManager databaseRuleManager;

server/src/main/java/io/druid/server/http/ServersResource.java

@@ -40,7 +40,7 @@ import java.util.Map;
 
 /**
  */
-@Path("/servers")
+@Path("/druid/coordinator/v1/servers")
 public class ServersResource
 {
   private static Map<String, Object> makeSimpleServer(DruidServer input)

server/src/main/java/io/druid/server/http/TiersResource.java

@@ -19,6 +19,7 @@
 
 package io.druid.server.http;
 
+import com.google.api.client.util.Maps;
 import com.google.common.collect.HashBasedTable;
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.Sets;
@@ -37,19 +38,9 @@ import java.util.Set;
 
 /**
  */
-@Path("/tiers")
+@Path("/druid/coordinator/v1/tiers")
 public class TiersResource
 {
-  private static Map<String, Object> makeSimpleTier(DruidServer input)
-  {
-    return new ImmutableMap.Builder<String, Object>()
-        .put("host", input.getHost())
-        .put("tier", input.getTier())
-        .put("currSize", input.getCurrSize())
-        .put("maxSize", input.getMaxSize())
-        .build();
-  }
-
   private final InventoryView serverInventoryView;
 
   @Inject
@@ -61,7 +52,6 @@ public class TiersResource
   }
 
   @GET
-  @Path("/tiers")
   @Produces("application/json")
   public Response getTiers(
       @QueryParam("simple") String simple
@@ -70,13 +60,20 @@ public class TiersResource
     Response.ResponseBuilder builder = Response.status(Response.Status.OK);
 
     if (simple != null) {
-      Table<String, String, Long> metadata = HashBasedTable.create();
+      Map<String, Map<String, Long>> metadata = Maps.newHashMap();
       for (DruidServer druidServer : serverInventoryView.getInventory()) {
-        Long currSize = metadata.get(druidServer.getTier(), "currSize");
+        Map<String, Long> tierMetadata = metadata.get(druidServer.getTier());
-        metadata.put(druidServer.getTier(), "currSize", (currSize == null) ? 0 : currSize + druidServer.getCurrSize());
 
-        Long maxSize = metadata.get(druidServer.getTier(), "maxSize");
+        if (tierMetadata == null) {
-        metadata.put(druidServer.getTier(), "maxSize", (maxSize == null) ? 0 : maxSize + druidServer.getMaxSize());
+          tierMetadata = Maps.newHashMap();
+          metadata.put(druidServer.getTier(), tierMetadata);
+        }
+
+        Long currSize = tierMetadata.get("currSize");
+        tierMetadata.put("currSize", (currSize == null) ? 0 : currSize + druidServer.getCurrSize());
+
+        Long maxSize = tierMetadata.get("maxSize");
+        tierMetadata.put("maxSize", (maxSize == null) ? 0 : maxSize + druidServer.getMaxSize());
       }
       return builder.entity(metadata).build();
     }
@@ -85,7 +82,7 @@ public class TiersResource
     for (DruidServer server : serverInventoryView.getInventory()) {
       tiers.add(server.getTier());
     }
-    return builder.entity(tiers)
+
-                  .build();
+    return builder.entity(tiers).build();
   }
 }

server/src/main/resources/static/js/enable-0.0.1.js

@@ -21,7 +21,7 @@ $(document).ready(function() {
           var selected = $('#datasources option:selected').text();
           $.ajax({
             type: 'POST',
-            url:'/info/datasources/' + selected,
+            url:'/druid/coordinator/v1/datasources/' + selected,
             data: JSON.stringify(selected),
             contentType:"application/json; charset=utf-8",
             dataType:"json",
@@ -50,7 +50,7 @@ $(document).ready(function() {
         var selected = $('#datasources option:selected').text();
         $.ajax({
           type: 'DELETE',
-          url:'/info/datasources/' + selected,
+          url:'/druid/coordinator/v1/datasources/' + selected,
           data: JSON.stringify(selected),
           contentType:"application/json; charset=utf-8",
           dataType:"json",
@@ -70,12 +70,12 @@ $(document).ready(function() {
     }
   });
 
-  $.getJSON("/info/db/datasources", function(enabled_datasources) {
+  $.getJSON("/druid/coordinator/v1/db/datasources", function(enabled_datasources) {
     $.each(enabled_datasources, function(index, datasource) {
       $('#enabled_datasources').append($('<li>' + datasource + '</li>'));
     });
 
-    $.getJSON("/info/db/datasources?includeDisabled", function(db_datasources) {
+    $.getJSON("/druid/coordinator/v1/db/datasources?includeDisabled", function(db_datasources) {
       var disabled_datasources = _.difference(db_datasources, enabled_datasources);
       $.each(disabled_datasources, function(index, datasource) {
         $('#disabled_datasources').append($('<li>' + datasource + '</li>'));

server/src/main/resources/static/js/handlers-0.0.1.js

@@ -2,7 +2,7 @@
 
 $(document).ready(function() {
 
-  var basePath = "/info/";
+  var basePath = "/druid/coordinator/v1/";
   var type = $('#select_type').attr('value') + '';
   var view = $('#select_view').attr('value') + '';
 

server/src/main/resources/static/js/init-0.0.2.js

@@ -100,8 +100,8 @@ $(document).ready(function() {
   }
 
   // Execution stuff
-  $.get('/info/coordinator', function(data) {
+  $.get('/druid/coordinator/v1/leader', function(data) {
-    $("#coordinator").html('Current Cluster Coordinator: ' + data.host);
+    $("#coordinator").html('Current Cluster Coordinator Leader: ' + data.host);
   });
 
   $('#move_segment').submit(function() {
@@ -118,57 +118,10 @@ $(document).ready(function() {
       });
     }
 
-/*
-    $.ajax({
-      url:"/coordinator/move",
-      type: "POST",
-      data: JSON.stringify(data),
-      contentType:"application/json; charset=utf-8",
-      dataType:"json",
-      error: function(xhr, status, error) {
-        alert(error + ": " + xhr.responseText);
-      },
-      success: function(data, status, xhr) {
-        for (seg in CONSOLE.selected_segments) {
-          CONSOLE.selected_segments[seg].children('.server_host').text($('#move_segment > .to').val());
-        }
-      }
-    });
-*/
     return false;
   });
 
-
+  $.get('/druid/coordinator/v1/servers?full', function(data) {
-/*$
-  ('#drop_segment').submit(function() {
-    var data = [];
-
-    if ($.isEmptyObject(CONSOLE.selected_segments)) {
-      alert("Please select at least one segment");
-    }
-    for (seg in CONSOLE.selected_segments) {
-      data.push({
-        'segmentName' : seg,
-        'from' : CONSOLE.selected_segments[seg]
-      });
-    }
-
-    $.ajax({
-      url:"/coordinator/drop",
-      type: "POST",
-      data: JSON.stringify(data),
-      contentType:"application/json; charset=utf-8",
-      dataType:"json",
-      error: function(xhr, status, error) {
-        alert(error + ": " + xhr.responseText);
-      }
-    });
-
-    return false;
-  });
-*/
-
-  $.get('/info/cluster', function(data) {
     $('.loading').hide();
     
     initTables(data);
@@ -176,26 +129,5 @@ $(document).ready(function() {
     var oTable = [];
     initDataTable($('#servers'), oTable);
     initDataTable($('#segments'), oTable);
-
-    // init select segments
-    /*$("#segments tbody").click(function(event) {
-      var el = $(event.target.parentNode);
-      var key = el.children('.segment_name').text();
-      if (el.is("tr")) {
-        if (el.hasClass('row_selected')) {
-          el.removeClass('row_selected');
-          delete CONSOLE.selected_segments[key];
-        } else {
-          el.addClass('row_selected');
-          CONSOLE.selected_segments[key] = el;
-        }
-
-        var html ="";
-        for (segment in CONSOLE.selected_segments) {
-          html += segment + ' on ' + CONSOLE.selected_segments[segment].children('.server_host').text() + '<br/>';
-        }
-        $('#selected_segments').html(html);
-      }
-    });*/
   });
 });

server/src/main/resources/static/js/kill-0.0.1.js

@@ -22,7 +22,7 @@ $(document).ready(function() {
           var interval = $('#interval').val();
           $.ajax({
             type: 'DELETE',
-            url:'/info/datasources/' + selected +'?kill=true&interval=' + interval,
+            url:'/druid/coordinator/v1/datasources/' + selected +'?kill=true&interval=' + interval,
             contentType:"application/json; charset=utf-8",
             dataType:"json",
             error: function(xhr, status, error) {
@@ -41,7 +41,7 @@ $(document).ready(function() {
       }
   });
 
-  $.getJSON("/info/db/datasources?includeDisabled", function(data) {
+  $.getJSON("/druid/coordinator/v1/db/datasources?includeDisabled", function(data) {
     $.each(data, function(index, datasource) {
       $('#datasources').append($('<option></option>').attr("value", datasource).text(datasource));
     });

server/src/main/resources/static/js/rules-0.0.1.js

@@ -115,7 +115,7 @@ function makeTiersDropdown(rule) {
 function getRules() {
   var selected = $('#datasources option:selected').text();
   if (selected !== "") {
-    $.getJSON("/info/rules/" + selected, function(data) {
+    $.getJSON("/druid/coordinator/v1/rules/" + selected, function(data) {
       $('#rules_list').empty();
       if (!$.isEmptyObject(data)) {
         $.each(data, function(index, rule) {
@@ -189,7 +189,7 @@ $(document).ready(function() {
         var selected = $('#datasources option:selected').text();
         $.ajax({
           type: 'POST',
-          url:'/info/rules/' + selected,
+          url:'/druid/coordinator/v1/rules/' + selected,
           data: JSON.stringify(rules),
           contentType:"application/json; charset=utf-8",
           dataType:"json",
@@ -209,11 +209,11 @@ $(document).ready(function() {
     }
   });
 
-  $.getJSON("/info/tiers", function(theTiers) {
+  $.getJSON("/druid/coordinator/v1/tiers", function(theTiers) {
       tiers = theTiers;
   });
 
-  $.getJSON("/info/db/datasources", function(data) {
+  $.getJSON("/druid/coordinator/v1/db/datasources", function(data) {
     $.each(data, function(index, datasource) {
       $('#datasources').append($('<option></option>').attr("value", datasource).text(datasource));
     });

services/src/main/java/io/druid/cli/CoordinatorJettyServerInitializer.java

@@ -53,7 +53,7 @@ class CoordinatorJettyServerInitializer implements JettyServerInitializer
     // The coordinator really needs a standarized api path
     root.addFilter(GuiceFilter.class, "/status/*", null);
     root.addFilter(GuiceFilter.class, "/info/*", null);
-    root.addFilter(GuiceFilter.class, "/coordinator/*", null);
+    root.addFilter(GuiceFilter.class, "/druid/coordinator/*", null);
 
     HandlerList handlerList = new HandlerList();
     handlerList.setHandlers(new Handler[]{root});