Merge pull request #1195 from himanshug/task_storage_config_fix

correctly parse recentlyFinishedThreshold from config
This commit is contained in:
Fangjin Yang 2015-03-12 16:50:49 -07:00
commit a508c0955f
3 changed files with 65 additions and 1 deletions

View File

@ -17,6 +17,7 @@
package io.druid.indexing.common.config;
import com.fasterxml.jackson.annotation.JsonCreator;
import com.fasterxml.jackson.annotation.JsonProperty;
import org.joda.time.Duration;
import org.joda.time.Period;
@ -29,6 +30,16 @@ public class TaskStorageConfig
@NotNull
public Duration recentlyFinishedThreshold = new Period("PT24H").toStandardDuration();
@JsonCreator
public TaskStorageConfig(
@JsonProperty("recentlyFinishedThreshold") Period period
)
{
if(period != null) {
this.recentlyFinishedThreshold = period.toStandardDuration();
}
}
public Duration getRecentlyFinishedThreshold()
{
return recentlyFinishedThreshold;

View File

@ -0,0 +1,53 @@
/*
* Licensed to Metamarkets Group Inc. (Metamarkets) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
* regarding copyright ownership. Metamarkets licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
*/
package io.druid.indexing.common.config;
import org.joda.time.Period;
import org.junit.Assert;
import org.junit.Test;
import com.fasterxml.jackson.databind.ObjectMapper;
import io.druid.jackson.DefaultObjectMapper;
public class TaskStorageConfigTest
{
private final ObjectMapper jsonMapper = new DefaultObjectMapper();
@Test
public void testDeserializationFromJson() throws Exception
{
TaskStorageConfig config = jsonMapper.readValue(
"{\"recentlyFinishedThreshold\": \"PT12H\" }",
TaskStorageConfig.class);
Assert.assertEquals(Period.parse("PT12H").toStandardDuration(), config.getRecentlyFinishedThreshold());
}
@Test
public void testDeserializationDefault() throws Exception
{
TaskStorageConfig config = jsonMapper.readValue(
"{}",
TaskStorageConfig.class);
Assert.assertEquals(Period.parse("PT24H").toStandardDuration(), config.getRecentlyFinishedThreshold());
}
}

View File

@ -251,7 +251,7 @@ public class TaskLifecycleTest
TaskQueueConfig.class
);
ts = new HeapMemoryTaskStorage(
new TaskStorageConfig()
new TaskStorageConfig(null)
{
}
);