From b82b487f200712b118e09b880b72cb032c9f6f28 Mon Sep 17 00:00:00 2001 From: Parag Jain Date: Wed, 24 Feb 2016 17:16:18 -0600 Subject: [PATCH] remove extra kill parameter --- docs/content/design/coordinator.md | 2 +- .../CoordinatorResourceTestClient.java | 5 ++-- .../server/http/DatasourcesResource.java | 28 ++++++++----------- .../server/http/DatasourcesResourceTest.java | 23 +-------------- 4 files changed, 15 insertions(+), 43 deletions(-) diff --git a/docs/content/design/coordinator.md b/docs/content/design/coordinator.md index e959d73d33c..e25b0bd6a5c 100644 --- a/docs/content/design/coordinator.md +++ b/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}/intervals/{interval}?kill=true` +* `/druid/coordinator/v1/datasources/{dataSourceName}/intervals/{interval}` * `@Deprecated. /druid/coordinator/v1/datasources/{dataSourceName}?kill=true&interval={myISO8601Interval}` Runs a [Kill task](../ingestion/tasks.html) for a given interval and datasource. diff --git a/integration-tests/src/main/java/io/druid/testing/clients/CoordinatorResourceTestClient.java b/integration-tests/src/main/java/io/druid/testing/clients/CoordinatorResourceTestClient.java index 5307e1cdf40..b4636959305 100644 --- a/integration-tests/src/main/java/io/druid/testing/clients/CoordinatorResourceTestClient.java +++ b/integration-tests/src/main/java/io/druid/testing/clients/CoordinatorResourceTestClient.java @@ -36,9 +36,8 @@ import org.jboss.netty.handler.codec.http.HttpResponseStatus; import org.joda.time.Interval; import java.net.URL; -import java.net.URLEncoder; -import java.util.Map; import java.util.ArrayList; +import java.util.Map; public class CoordinatorResourceTestClient { @@ -143,7 +142,7 @@ public class CoordinatorResourceTestClient makeRequest( HttpMethod.DELETE, String.format( - "%sdatasources/%s/intervals/%s?kill=true", + "%sdatasources/%s/intervals/%s", getCoordinatorURL(), dataSource, interval.toString().replace("/", "_") ) diff --git a/server/src/main/java/io/druid/server/http/DatasourcesResource.java b/server/src/main/java/io/druid/server/http/DatasourcesResource.java index 2f6dec84c6e..069f5a6b8e8 100644 --- a/server/src/main/java/io/druid/server/http/DatasourcesResource.java +++ b/server/src/main/java/io/druid/server/http/DatasourcesResource.java @@ -49,7 +49,6 @@ 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; @@ -207,28 +206,23 @@ public class DatasourcesResource @Produces(MediaType.APPLICATION_JSON) public Response deleteDataSourceSpecificInterval( @PathParam("dataSourceName") final String dataSourceName, - @PathParam("interval") final String interval, - @QueryParam("kill") @DefaultValue("true") final String kill + @PathParam("interval") final String interval ) { if (indexingServiceClient == null) { return Response.ok(ImmutableMap.of("error", "no indexing service found")).build(); } final Interval theInterval = new Interval(interval.replace("_", "/")); - 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(); - } - } else { - return Response.ok(ImmutableMap.of("error", "kill is set to false")).build(); + 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(); } return Response.ok().build(); } diff --git a/server/src/test/java/io/druid/server/http/DatasourcesResourceTest.java b/server/src/test/java/io/druid/server/http/DatasourcesResourceTest.java index 55c124a806b..2ede408ce72 100644 --- a/server/src/test/java/io/druid/server/http/DatasourcesResourceTest.java +++ b/server/src/test/java/io/druid/server/http/DatasourcesResourceTest.java @@ -20,14 +20,11 @@ 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; @@ -399,29 +396,11 @@ public class DatasourcesResourceTest EasyMock.replay(indexingServiceClient, server); DatasourcesResource datasourcesResource = new DatasourcesResource(inventoryView, null, indexingServiceClient); - Response response = datasourcesResource.deleteDataSourceSpecificInterval("datasource1", interval, "true"); + Response response = datasourcesResource.deleteDataSourceSpecificInterval("datasource1", interval); 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 results = (ImmutableMap) response.getEntity(); - Assert.assertEquals(results, ImmutableMap.of("error", "kill is set to false")); - EasyMock.verify(indexingServiceClient, server); - } - }