You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@gobblin.apache.org by hu...@apache.org on 2017/09/28 16:54:39 UTC
incubator-gobblin git commit: [GOBBLIN-268] Generate unique job name
and job uri for GaaS
Repository: incubator-gobblin
Updated Branches:
refs/heads/master 859fadcc3 -> ae0ba2815
[GOBBLIN-268] Generate unique job name and job uri for GaaS
Closes #2121 from yukuai518/gaas_job
Project: http://git-wip-us.apache.org/repos/asf/incubator-gobblin/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-gobblin/commit/ae0ba281
Tree: http://git-wip-us.apache.org/repos/asf/incubator-gobblin/tree/ae0ba281
Diff: http://git-wip-us.apache.org/repos/asf/incubator-gobblin/diff/ae0ba281
Branch: refs/heads/master
Commit: ae0ba2815bf877607761250dd91e4e0338527d48
Parents: 859fadc
Author: Kuai Yu <ku...@linkedin.com>
Authored: Thu Sep 28 09:54:34 2017 -0700
Committer: Hung Tran <hu...@linkedin.com>
Committed: Thu Sep 28 09:54:34 2017 -0700
----------------------------------------------------------------------
.../modules/flow/MultiHopsFlowToJobSpecCompiler.java | 10 +++++++---
1 file changed, 7 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-gobblin/blob/ae0ba281/gobblin-service/src/main/java/org/apache/gobblin/service/modules/flow/MultiHopsFlowToJobSpecCompiler.java
----------------------------------------------------------------------
diff --git a/gobblin-service/src/main/java/org/apache/gobblin/service/modules/flow/MultiHopsFlowToJobSpecCompiler.java b/gobblin-service/src/main/java/org/apache/gobblin/service/modules/flow/MultiHopsFlowToJobSpecCompiler.java
index 96d41e5..ba5c203 100644
--- a/gobblin-service/src/main/java/org/apache/gobblin/service/modules/flow/MultiHopsFlowToJobSpecCompiler.java
+++ b/gobblin-service/src/main/java/org/apache/gobblin/service/modules/flow/MultiHopsFlowToJobSpecCompiler.java
@@ -289,7 +289,10 @@ public class MultiHopsFlowToJobSpecCompiler extends BaseFlowToJobSpecCompiler {
// Add job.name and job.group
if (flowSpec.getConfig().hasPath(ConfigurationKeys.FLOW_NAME_KEY)) {
jobSpec.setConfig(jobSpec.getConfig()
- .withValue(ConfigurationKeys.JOB_NAME_KEY, flowSpec.getConfig().getValue(ConfigurationKeys.FLOW_NAME_KEY)));
+ .withValue(ConfigurationKeys.JOB_NAME_KEY, ConfigValueFactory.fromAnyRef(
+ flowSpec.getConfig().getValue(ConfigurationKeys.FLOW_NAME_KEY).unwrapped().toString()
+ + "-" + sourceNode.getNodeName()
+ + "-" + targetNode.getNodeName())));
}
if (flowSpec.getConfig().hasPath(ConfigurationKeys.FLOW_GROUP_KEY)) {
jobSpec.setConfig(jobSpec.getConfig()
@@ -329,8 +332,9 @@ public class MultiHopsFlowToJobSpecCompiler extends BaseFlowToJobSpecCompiler {
*/
public static URI jobSpecURIGenerator(FlowSpec flowSpec, ServiceNode sourceNode, ServiceNode targetNode) {
try {
- return new URI(flowSpec.getUri().getScheme(), flowSpec.getUri().getAuthority(),
- "/" + sourceNode.getNodeName() + "-" + targetNode.getNodeName(), null);
+ return new URI(JobSpec.Builder.DEFAULT_JOB_CATALOG_SCHEME, flowSpec.getUri().getAuthority(),
+ StringUtils.appendIfMissing(StringUtils.prependIfMissing(flowSpec.getUri().getPath(), "/"),"/")
+ + sourceNode.getNodeName() + "-" + targetNode.getNodeName(), null);
} catch (URISyntaxException e) {
log.error(
"URI construction failed when jobSpec from " + sourceNode.getNodeName() + " to " + targetNode.getNodeName());