Fix for issue 2021

docs/content/design/coordinator.md

@@ -258,7 +258,7 @@ Optional Header Parameters for auditing the config change can also be specified.
 
 Disables a datasource.
 
-* `/druid/coordinator/v1/datasources/{dataSourceName}?kill=true&interval={myISO8601Interval}>`
+* `/druid/coordinator/v1/datasources/{dataSourceName}/intervals/{interval}?kill=true>`
 
 Runs a [Kill task](../misc/tasks.html) for a given interval and datasource.
 

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

@@ -49,6 +49,7 @@ import org.joda.time.Interval;
 import javax.annotation.Nullable;
 import javax.ws.rs.Consumes;
 import javax.ws.rs.DELETE;
+import javax.ws.rs.DefaultValue;
 import javax.ws.rs.GET;
 import javax.ws.rs.POST;
 import javax.ws.rs.Path;
@@ -167,44 +168,26 @@ public class DatasourcesResource
   }
 
   @DELETE
-	@Deprecated
   @Path("/{dataSourceName}")
   @Produces(MediaType.APPLICATION_JSON)
   public Response deleteDataSource(
-      @PathParam("dataSourceName") final String dataSourceName,
+      @PathParam("dataSourceName") final String dataSourceName
-      @QueryParam("kill") final String kill,
-      @QueryParam("interval") final String interval
   )
   {
-    if (indexingServiceClient == null) {
-      return Response.ok(ImmutableMap.of("error", "no indexing service found")).build();
-    }
-    if (kill != null && Boolean.valueOf(kill)) {
-      try {
-        indexingServiceClient.killSegments(dataSourceName, new Interval(interval));
-      }
-      catch (Exception e) {
-        return Response.serverError().entity(
-            ImmutableMap.of(
-                "error",
-                "Exception occurred. Are you sure you have an indexing service?"
-            )
-        )
-                       .build();
-      }
-    } else {
     if (!databaseSegmentManager.removeDatasource(dataSourceName)) {
       return Response.noContent().build();
     }
-    }
-
     return Response.ok().build();
   }
 
   @DELETE
   @Path("/{dataSourceName}/intervals/{interval}")
   @Produces(MediaType.APPLICATION_JSON)
-	public Response deleteDataSourceSpecificInterval(@PathParam("dataSourceName") final String dataSourceName, @PathParam("interval") final String interval, @QueryParam("kill") final String kill)
+  public Response deleteDataSourceSpecificInterval(
+      @PathParam("dataSourceName") final String dataSourceName,
+      @PathParam("interval") final String interval,
+      @QueryParam("kill") @DefaultValue("true") final String kill
+  )
   {
     if (indexingServiceClient == null) {
       return Response.ok(ImmutableMap.of("error", "no indexing service found")).build();
@@ -213,13 +196,17 @@ public class DatasourcesResource
     if (kill != null && Boolean.valueOf(kill)) {
       try {
         indexingServiceClient.killSegments(dataSourceName, new Interval(theInterval));
-			} catch (Exception e) {
+      }
-				return Response.serverError().entity(ImmutableMap.of("error", "Exception occurred. Are you sure you have an indexing service?")).build();
+      catch (Exception e) {
+        return Response.serverError()
+                       .entity(ImmutableMap.of(
+                           "error",
+                           "Exception occurred. Are you sure you have an indexing service?"
+                       ))
+                       .build();
       }
     } else {
-			if (!databaseSegmentManager.removeDatasource(dataSourceName)) {
+      return Response.ok(ImmutableMap.of("error", "kill is set to false")).build();
-				return Response.noContent().build();
-			}
     }
     return Response.ok().build();
   }

server/src/test/java/io/druid/server/http/DatasourcesResourceTest.java

@@ -20,12 +20,14 @@
 package io.druid.server.http;
 
 import com.google.common.collect.ImmutableList;
+import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.ImmutableSet;
 import io.druid.client.CoordinatorServerView;
 import io.druid.client.DruidDataSource;
 import io.druid.client.DruidServer;
 import io.druid.client.InventoryView;
 import io.druid.client.indexing.IndexingServiceClient;
+import io.druid.metadata.MetadataSegmentManager;
 import io.druid.timeline.DataSegment;
 import org.easymock.EasyMock;
 import org.joda.time.Interval;
@@ -398,8 +400,43 @@ public class DatasourcesResourceTest
 
     DatasourcesResource datasourcesResource = new DatasourcesResource(inventoryView, null, indexingServiceClient);
     Response response = datasourcesResource.deleteDataSourceSpecificInterval("datasource1", interval, "true");
+
     Assert.assertEquals(200, response.getStatus());
+    Assert.assertEquals(null,response.getEntity());
     EasyMock.verify(indexingServiceClient, server);
   }
 
+  @Test
+  public void testDeleteDataSourceSpecificIntervalKillFalse() throws Exception
+  {
+    String interval = "2010-01-01_P1D";
+    Interval theInterval = new Interval(interval.replace("_", "/"));
+
+    IndexingServiceClient indexingServiceClient = EasyMock.createStrictMock(IndexingServiceClient.class);
+    EasyMock.replay(indexingServiceClient, server);
+
+    DatasourcesResource datasourcesResource = new DatasourcesResource(inventoryView, null, indexingServiceClient);
+    Response response = datasourcesResource.deleteDataSourceSpecificInterval("datasource1", interval, "false");
+
+    Assert.assertEquals(200, response.getStatus());
+    ImmutableMap<String, String> results = (ImmutableMap<String, String>) response.getEntity();
+    Assert.assertEquals(results, ImmutableMap.<String, String>of("error", "kill is set to false"));
+    EasyMock.verify(indexingServiceClient, server);
+  }
+
+  @Test
+  public void testDeleteDataSource() throws Exception
+  {
+    MetadataSegmentManager databaseSegmentManager = EasyMock.createStrictMock(MetadataSegmentManager.class);
+    EasyMock.expect(databaseSegmentManager.removeDatasource("datasource1")).andReturn(true).atLeastOnce();
+    EasyMock.replay(server, databaseSegmentManager);
+
+    DatasourcesResource datasourcesResource = new DatasourcesResource(null, databaseSegmentManager, null);
+    Response response = datasourcesResource.deleteDataSource("datasource1");
+
+    Assert.assertEquals(200, response.getStatus());
+    Assert.assertEquals(null,response.getEntity());
+    EasyMock.verify(databaseSegmentManager, server);
+  }
+
 }