mirror of https://github.com/apache/druid.git
Fix pod template reading logic (#15915)
* Fix pod template reading * PR changes * Fix unit tests
This commit is contained in:
George Shiqi Wu
GitHub
parent
9eaaeb5c16
commit
2c0d1128f8
|
|
@ -20,10 +20,6 @@
|
|||
package org.apache.druid.k8s.overlord.taskadapter;
|
||||
|
||||
import com.fasterxml.jackson.databind.ObjectMapper;
|
||||
import com.fasterxml.jackson.databind.cfg.MapperConfig;
|
||||
import com.fasterxml.jackson.databind.introspect.AnnotatedClass;
|
||||
import com.fasterxml.jackson.databind.introspect.AnnotatedClassResolver;
|
||||
import com.fasterxml.jackson.databind.jsontype.NamedType;
|
||||
import com.google.common.collect.ImmutableMap;
|
||||
import com.google.common.collect.Lists;
|
||||
import io.fabric8.kubernetes.api.model.EnvVar;
|
||||
|
|
@ -60,10 +56,12 @@ import java.nio.charset.Charset;
|
|||
import java.nio.file.Files;
|
||||
import java.util.Collection;
|
||||
import java.util.HashMap;
|
||||
import java.util.HashSet;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
import java.util.Optional;
|
||||
import java.util.Properties;
|
||||
import java.util.Set;
|
||||
|
||||
/**
|
||||
* A PodTemplate {@link TaskAdapter} to transform tasks to kubernetes jobs and kubernetes pods to tasks
|
||||
|
|
@ -84,7 +82,9 @@ public class PodTemplateTaskAdapter implements TaskAdapter
|
|||
public static final String TYPE = "customTemplateAdapter";
|
||||
|
||||
private static final Logger log = new Logger(PodTemplateTaskAdapter.class);
|
||||
private static final String TASK_PROPERTY = IndexingServiceModuleHelper.INDEXER_RUNNER_PROPERTY_PREFIX + ".k8s.podTemplate.%s";
|
||||
|
||||
|
||||
private static final String TASK_PROPERTY = IndexingServiceModuleHelper.INDEXER_RUNNER_PROPERTY_PREFIX + ".k8s.podTemplate.";
|
||||
|
||||
private final KubernetesTaskRunnerConfig taskRunnerConfig;
|
||||
private final TaskConfig taskConfig;
|
||||
|
|
@ -212,37 +212,46 @@ public class PodTemplateTaskAdapter implements TaskAdapter
|
|||
|
||||
private HashMap<String, PodTemplate> initializePodTemplates(Properties properties)
|
||||
{
|
||||
HashMap<String, PodTemplate> podTemplateMap = new HashMap<>();
|
||||
Optional<PodTemplate> basePodTemplate = loadPodTemplate("base", properties);
|
||||
if (!basePodTemplate.isPresent()) {
|
||||
throw new IAE("Pod template task adapter requires a base pod template to be specified");
|
||||
Set<String> taskAdapterTemplateKeys = getTaskAdapterTemplates(properties);
|
||||
if (!taskAdapterTemplateKeys.contains("base")) {
|
||||
throw new IAE("Pod template task adapter requires a base pod template to be specified under druid.indexer.runner.k8s.podTemplate.base");
|
||||
}
|
||||
podTemplateMap.put("base", basePodTemplate.get());
|
||||
|
||||
MapperConfig config = mapper.getDeserializationConfig();
|
||||
AnnotatedClass cls = AnnotatedClassResolver.resolveWithoutSuperTypes(config, Task.class);
|
||||
Collection<NamedType> taskSubtypes = mapper.getSubtypeResolver().collectAndResolveSubtypesByClass(config, cls);
|
||||
for (NamedType namedType : taskSubtypes) {
|
||||
String taskType = namedType.getName();
|
||||
Optional<PodTemplate> template = loadPodTemplate(taskType, properties);
|
||||
template.ifPresent(podTemplate -> podTemplateMap.put(taskType, podTemplate));
|
||||
HashMap<String, PodTemplate> podTemplateMap = new HashMap<>();
|
||||
for (String taskAdapterTemplateKey : taskAdapterTemplateKeys) {
|
||||
Optional<PodTemplate> template = loadPodTemplate(taskAdapterTemplateKey, properties);
|
||||
template.ifPresent(podTemplate -> podTemplateMap.put(taskAdapterTemplateKey, podTemplate));
|
||||
}
|
||||
return podTemplateMap;
|
||||
}
|
||||
|
||||
private static Set<String> getTaskAdapterTemplates(Properties properties)
|
||||
{
|
||||
Set<String> taskAdapterTemplates = new HashSet<>();
|
||||
|
||||
for (String runtimeProperty : properties.stringPropertyNames()) {
|
||||
if (runtimeProperty.startsWith(TASK_PROPERTY)) {
|
||||
String[] taskAdapterPropertyPaths = runtimeProperty.split("\\.");
|
||||
taskAdapterTemplates.add(taskAdapterPropertyPaths[taskAdapterPropertyPaths.length - 1]);
|
||||
}
|
||||
}
|
||||
|
||||
return taskAdapterTemplates;
|
||||
}
|
||||
|
||||
private Optional<PodTemplate> loadPodTemplate(String key, Properties properties)
|
||||
{
|
||||
String property = StringUtils.format(TASK_PROPERTY, key);
|
||||
String property = TASK_PROPERTY + key;
|
||||
String podTemplateFile = properties.getProperty(property);
|
||||
if (podTemplateFile == null) {
|
||||
log.debug("Pod template file not specified for [%s]", key);
|
||||
return Optional.empty();
|
||||
throw new IAE("Pod template file not specified for [%s]", property);
|
||||
|
||||
}
|
||||
try {
|
||||
return Optional.of(Serialization.unmarshal(Files.newInputStream(new File(podTemplateFile).toPath()), PodTemplate.class));
|
||||
}
|
||||
catch (Exception e) {
|
||||
throw new ISE(e, "Failed to load pod template file for [%s] at [%s]", property, podTemplateFile);
|
||||
throw new IAE(e, "Failed to load pod template file for [%s] at [%s]", property, podTemplateFile);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -23,6 +23,8 @@ import com.fasterxml.jackson.databind.ObjectMapper;
|
|||
import com.google.common.base.Optional;
|
||||
import com.google.common.collect.ImmutableMap;
|
||||
import io.fabric8.kubernetes.api.model.PodTemplate;
|
||||
import io.fabric8.kubernetes.api.model.PodTemplateBuilder;
|
||||
import io.fabric8.kubernetes.api.model.VolumeBuilder;
|
||||
import io.fabric8.kubernetes.api.model.batch.v1.Job;
|
||||
import io.fabric8.kubernetes.api.model.batch.v1.JobBuilder;
|
||||
import org.apache.commons.lang.RandomStringUtils;
|
||||
|
|
@ -33,7 +35,6 @@ import org.apache.druid.indexing.common.config.TaskConfigBuilder;
|
|||
import org.apache.druid.indexing.common.task.NoopTask;
|
||||
import org.apache.druid.indexing.common.task.Task;
|
||||
import org.apache.druid.java.util.common.IAE;
|
||||
import org.apache.druid.java.util.common.ISE;
|
||||
import org.apache.druid.k8s.overlord.KubernetesTaskRunnerConfig;
|
||||
import org.apache.druid.k8s.overlord.common.Base64Compression;
|
||||
import org.apache.druid.k8s.overlord.common.DruidK8sConstants;
|
||||
|
|
@ -93,8 +94,8 @@ public class PodTemplateTaskAdapterTest
|
|||
@Test
|
||||
public void test_fromTask_withoutBasePodTemplateInRuntimeProperites_raisesIAE()
|
||||
{
|
||||
Assert.assertThrows(
|
||||
"Pod template task adapter requires a base pod template to be specified",
|
||||
Exception exception = Assert.assertThrows(
|
||||
"No base prop should throw an IAE",
|
||||
IAE.class,
|
||||
() -> new PodTemplateTaskAdapter(
|
||||
taskRunnerConfig,
|
||||
|
|
@ -104,19 +105,20 @@ public class PodTemplateTaskAdapterTest
|
|||
new Properties(),
|
||||
taskLogs
|
||||
));
|
||||
Assert.assertEquals(exception.getMessage(), "Pod template task adapter requires a base pod template to be specified under druid.indexer.runner.k8s.podTemplate.base");
|
||||
}
|
||||
|
||||
@Test
|
||||
public void test_fromTask_withBasePodTemplateInRuntimeProperites_withEmptyFile_raisesISE() throws IOException
|
||||
public void test_fromTask_withBasePodTemplateInRuntimeProperites_withEmptyFile_raisesIAE() throws IOException
|
||||
{
|
||||
Path templatePath = Files.createFile(tempDir.resolve("empty.yaml"));
|
||||
|
||||
Properties props = new Properties();
|
||||
props.setProperty("druid.indexer.runner.k8s.podTemplate.base", templatePath.toString());
|
||||
|
||||
Assert.assertThrows(
|
||||
"Pod template task adapter requires a base pod template to be specified",
|
||||
ISE.class,
|
||||
Exception exception = Assert.assertThrows(
|
||||
"Empty base pod template should throw a exception",
|
||||
IAE.class,
|
||||
() -> new PodTemplateTaskAdapter(
|
||||
taskRunnerConfig,
|
||||
taskConfig,
|
||||
|
|
@ -125,6 +127,9 @@ public class PodTemplateTaskAdapterTest
|
|||
props,
|
||||
taskLogs
|
||||
));
|
||||
|
||||
Assert.assertTrue(exception.getMessage().contains("Failed to load pod template file for"));
|
||||
|
||||
}
|
||||
|
||||
@Test
|
||||
|
|
@ -186,7 +191,7 @@ public class PodTemplateTaskAdapterTest
|
|||
}
|
||||
|
||||
@Test
|
||||
public void test_fromTask_withNoopPodTemplateInRuntimeProperties_withEmptyFile_raisesISE() throws IOException
|
||||
public void test_fromTask_withNoopPodTemplateInRuntimeProperties_withEmptyFile_raisesIAE() throws IOException
|
||||
{
|
||||
Path baseTemplatePath = Files.createFile(tempDir.resolve("base.yaml"));
|
||||
Path noopTemplatePath = Files.createFile(tempDir.resolve("noop.yaml"));
|
||||
|
|
@ -196,7 +201,7 @@ public class PodTemplateTaskAdapterTest
|
|||
props.setProperty("druid.indexer.runner.k8s.podTemplate.base", baseTemplatePath.toString());
|
||||
props.setProperty("druid.indexer.runner.k8s.podTemplate.noop", noopTemplatePath.toString());
|
||||
|
||||
Assert.assertThrows(ISE.class, () -> new PodTemplateTaskAdapter(
|
||||
Assert.assertThrows(IAE.class, () -> new PodTemplateTaskAdapter(
|
||||
taskRunnerConfig,
|
||||
taskConfig,
|
||||
node,
|
||||
|
|
@ -520,7 +525,51 @@ public class PodTemplateTaskAdapterTest
|
|||
.collect(Collectors.toList()).get(0).getValue());
|
||||
}
|
||||
|
||||
@Test
|
||||
public void test_fromTask_withIndexKafkaPodTemplateInRuntimeProperites() throws IOException
|
||||
{
|
||||
Path baseTemplatePath = Files.createFile(tempDir.resolve("base.yaml"));
|
||||
mapper.writeValue(baseTemplatePath.toFile(), podTemplateSpec);
|
||||
|
||||
Path kafkaTemplatePath = Files.createFile(tempDir.resolve("kafka.yaml"));
|
||||
PodTemplate kafkaPodTemplate = new PodTemplateBuilder(podTemplateSpec)
|
||||
.editTemplate()
|
||||
.editSpec()
|
||||
.setNewVolumeLike(0, new VolumeBuilder().withName("volume").build())
|
||||
.endVolume()
|
||||
.endSpec()
|
||||
.endTemplate()
|
||||
.build();
|
||||
mapper.writeValue(kafkaTemplatePath.toFile(), kafkaPodTemplate);
|
||||
|
||||
Properties props = new Properties();
|
||||
props.setProperty("druid.indexer.runner.k8s.podTemplate.base", baseTemplatePath.toString());
|
||||
props.setProperty("druid.indexer.runner.k8s.podTemplate.index_kafka", kafkaTemplatePath.toString());
|
||||
|
||||
PodTemplateTaskAdapter adapter = new PodTemplateTaskAdapter(
|
||||
taskRunnerConfig,
|
||||
taskConfig,
|
||||
node,
|
||||
mapper,
|
||||
props,
|
||||
taskLogs
|
||||
);
|
||||
|
||||
Task kafkaTask = new NoopTask("id", "id", "datasource", 0, 0, null) {
|
||||
@Override
|
||||
public String getType()
|
||||
{
|
||||
return "index_kafka";
|
||||
}
|
||||
};
|
||||
|
||||
Task noopTask = new NoopTask("id", "id", "datasource", 0, 0, null);
|
||||
Job actual = adapter.fromTask(kafkaTask);
|
||||
Assert.assertEquals(1, actual.getSpec().getTemplate().getSpec().getVolumes().size(), 1);
|
||||
|
||||
actual = adapter.fromTask(noopTask);
|
||||
Assert.assertEquals(0, actual.getSpec().getTemplate().getSpec().getVolumes().size(), 1);
|
||||
}
|
||||
|
||||
private void assertJobSpecsEqual(Job actual, Job expected) throws IOException
|
||||
{
|
||||
|
|
|
|||
Loading…
Reference in New Issue