Apache
/
druid
mirror of https://github.com/apache/druid.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2470 from rasahner/IT_killFalse 

integration-tests: stop using kill=false to disable segments
This commit is contained in:
Fangjin Yang 2016-02-16 09:43:35 -08:00
parent e60fc1b7f1 34b143ae10
commit 5364aa5b6c
2 changed files with 16 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
integration-tests/src/main/java/io/druid/testing/clients/CoordinatorResourceTestClient.java
View File

@ -122,23 +122,30 @@ public class CoordinatorResourceTestClient
public void unloadSegmentsForDataSource(String dataSource, Interval interval)
{
killDataSource(dataSource, false, interval);
try {
makeRequest(
HttpMethod.DELETE,
String.format(
"%sdatasources/%s",
getCoordinatorURL(),
dataSource
)
);
}
catch (Exception e) {
throw Throwables.propagate(e);
}
}
public void deleteSegmentsDataSource(String dataSource, Interval interval)
{
killDataSource(dataSource, true, interval);
}
private void killDataSource(String dataSource, boolean kill, Interval interval)
{
try {
makeRequest(
HttpMethod.DELETE,
String.format(
"%sdatasources/%s/intervals/%s?kill=%s",
"%sdatasources/%s/intervals/%s?kill=true",
getCoordinatorURL(),
dataSource, interval.toString().replace("/", "_"), kill
dataSource, interval.toString().replace("/", "_")
)
);
}

7
integration-tests/src/test/java/io/druid/tests/indexer/ITKafkaTest.java
View File

@ -273,7 +273,7 @@ public class ITKafkaTest extends AbstractIndexerTest
}
@AfterClass
public void afterClass()
public void afterClass() throws Exception
{
LOG.info("teardown");
@ -285,13 +285,8 @@ public class ITKafkaTest extends AbstractIndexerTest
// remove segments
if (segmentsExist) {
try {
unloadAndKillData(DATASOURCE);
}
catch (Exception e) {
LOG.warn("exception while removing segments: [%s]", e.getMessage());
}
}
}
}