Repository: incubator-gobblin Updated Branches: refs/heads/master 6ef8cddc7 -> 081004e12
[GOBBLIN-522] Fix multiple build issues Closes #2392 from yukuai518/fixbuild Project: http://git-wip-us.apache.org/repos/asf/incubator-gobblin/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-gobblin/commit/081004e1 Tree: http://git-wip-us.apache.org/repos/asf/incubator-gobblin/tree/081004e1 Diff: http://git-wip-us.apache.org/repos/asf/incubator-gobblin/diff/081004e1 Branch: refs/heads/master Commit: 081004e12c6a1c62642969412689482b177207a2 Parents: 6ef8cdd Author: Kuai Yu <[email protected]> Authored: Fri Jun 29 15:58:22 2018 -0700 Committer: Hung Tran <[email protected]> Committed: Fri Jun 29 15:58:22 2018 -0700 ---------------------------------------------------------------------- .../org/apache/gobblin/data/management/copy/CopySource.java | 8 ++++++-- .../main/java/org/apache/gobblin/runtime/task/NoopTask.java | 6 +++++- .../gobblin/service/modules/core/GobblinServiceManager.java | 6 ++++-- .../modules/template/HOCONInputStreamFlowTemplate.java | 6 ++++-- 4 files changed, 19 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-gobblin/blob/081004e1/gobblin-data-management/src/main/java/org/apache/gobblin/data/management/copy/CopySource.java ---------------------------------------------------------------------- diff --git a/gobblin-data-management/src/main/java/org/apache/gobblin/data/management/copy/CopySource.java b/gobblin-data-management/src/main/java/org/apache/gobblin/data/management/copy/CopySource.java index b1ce7a6..4cf0b64 100644 --- a/gobblin-data-management/src/main/java/org/apache/gobblin/data/management/copy/CopySource.java +++ b/gobblin-data-management/src/main/java/org/apache/gobblin/data/management/copy/CopySource.java @@ -251,8 +251,12 @@ public class CopySource extends AbstractSource<String, FileAwareInputStream> { log.info(String.format("Actions for dataset %s file set %s.", entry.getKey().getDataset().datasetURN(), entry.getKey().getName())); for (WorkUnit workUnit : entry.getValue()) { - CopyEntity copyEntity = deserializeCopyEntity(workUnit); - log.info(copyEntity.explain()); + try { + CopyEntity copyEntity = deserializeCopyEntity(workUnit); + log.info(copyEntity.explain()); + } catch (Exception e) { + log.info("Cannot deserialize CopyEntity from wu : {}", workUnit.toString()); + } } } return Lists.newArrayList(); http://git-wip-us.apache.org/repos/asf/incubator-gobblin/blob/081004e1/gobblin-runtime/src/main/java/org/apache/gobblin/runtime/task/NoopTask.java ---------------------------------------------------------------------- diff --git a/gobblin-runtime/src/main/java/org/apache/gobblin/runtime/task/NoopTask.java b/gobblin-runtime/src/main/java/org/apache/gobblin/runtime/task/NoopTask.java index 8bbb6e2..86c0437 100644 --- a/gobblin-runtime/src/main/java/org/apache/gobblin/runtime/task/NoopTask.java +++ b/gobblin-runtime/src/main/java/org/apache/gobblin/runtime/task/NoopTask.java @@ -38,6 +38,11 @@ public class NoopTask extends BaseAbstractTask { return workUnit; } + @Override + public boolean isSpeculativeExecutionSafe() { + return true; + } + /** * The factory for a {@link NoopTask}. */ @@ -56,5 +61,4 @@ public class NoopTask extends BaseAbstractTask { private NoopTask(TaskContext taskContext) { super(taskContext); } - } http://git-wip-us.apache.org/repos/asf/incubator-gobblin/blob/081004e1/gobblin-service/src/main/java/org/apache/gobblin/service/modules/core/GobblinServiceManager.java ---------------------------------------------------------------------- diff --git a/gobblin-service/src/main/java/org/apache/gobblin/service/modules/core/GobblinServiceManager.java b/gobblin-service/src/main/java/org/apache/gobblin/service/modules/core/GobblinServiceManager.java index 365ecb4..071c126 100644 --- a/gobblin-service/src/main/java/org/apache/gobblin/service/modules/core/GobblinServiceManager.java +++ b/gobblin-service/src/main/java/org/apache/gobblin/service/modules/core/GobblinServiceManager.java @@ -233,8 +233,10 @@ public class GobblinServiceManager implements ApplicationLauncher, StandardMetri .resources(Lists.<Class<? extends BaseResource>>newArrayList(FlowConfigsResource.class)) .injector(injector) .build(); - this.restliServer.setPort(ConfigUtils.getInt(config, - ServiceConfigKeys.SERVICE_PORT, Integer.valueOf(0))); + if (config.hasPath(ServiceConfigKeys.SERVICE_PORT)) { + this.restliServer.setPort(config.getInt(ServiceConfigKeys.SERVICE_PORT)); + } + this.serviceLauncher.addService(restliServer); } http://git-wip-us.apache.org/repos/asf/incubator-gobblin/blob/081004e1/gobblin-service/src/main/java/org/apache/gobblin/service/modules/template/HOCONInputStreamFlowTemplate.java ---------------------------------------------------------------------- diff --git a/gobblin-service/src/main/java/org/apache/gobblin/service/modules/template/HOCONInputStreamFlowTemplate.java b/gobblin-service/src/main/java/org/apache/gobblin/service/modules/template/HOCONInputStreamFlowTemplate.java index 3847fd2..553f067 100644 --- a/gobblin-service/src/main/java/org/apache/gobblin/service/modules/template/HOCONInputStreamFlowTemplate.java +++ b/gobblin-service/src/main/java/org/apache/gobblin/service/modules/template/HOCONInputStreamFlowTemplate.java @@ -32,6 +32,8 @@ import org.apache.gobblin.configuration.ConfigurationKeys; import org.apache.gobblin.runtime.api.JobTemplate; import org.apache.gobblin.runtime.api.SpecNotFoundException; import org.apache.gobblin.service.modules.template_catalog.FlowCatalogWithTemplates; +import org.apache.gobblin.util.ConfigUtils; + /** * A {@link FlowTemplate} that loads a HOCON file as a {@link StaticFlowTemplate}. @@ -39,7 +41,7 @@ import org.apache.gobblin.service.modules.template_catalog.FlowCatalogWithTempla @Alpha public class HOCONInputStreamFlowTemplate extends StaticFlowTemplate { public static final String VERSION_KEY = "gobblin.flow.template.version"; - public static final String DEFAULT_VERSION = "1"; + private static final String DEFAULT_VERSION = "1"; public HOCONInputStreamFlowTemplate(InputStream inputStream, URI uri, FlowCatalogWithTemplates catalog) throws SpecNotFoundException, IOException, ReflectiveOperationException, JobTemplate.TemplateException { @@ -49,7 +51,7 @@ public class HOCONInputStreamFlowTemplate extends StaticFlowTemplate { public HOCONInputStreamFlowTemplate(Config config, URI uri, FlowCatalogWithTemplates catalog) throws SpecNotFoundException, IOException, ReflectiveOperationException, JobTemplate.TemplateException { - super(uri, config.hasPath(VERSION_KEY) ? config.getString(VERSION_KEY) : DEFAULT_VERSION, + super(uri, ConfigUtils.getString(config, VERSION_KEY, DEFAULT_VERSION), config.hasPath(ConfigurationKeys.FLOW_DESCRIPTION_KEY) ? config .getString(ConfigurationKeys.FLOW_DESCRIPTION_KEY) : "", config, catalog); }
