Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[GOBBLIN-1821] Let flow execution ID propagate to the Job ID if it exists #3684

Merged
merged 2 commits into from
Apr 24, 2023
Merged

[GOBBLIN-1821] Let flow execution ID propagate to the Job ID if it exists #3684

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0f9a56f
Let flow execution ID propagate to the Job ID if it exists
Will-Lo Apr 21, 2023
1b09770
Address comment
Will-Lo Apr 21, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion gobblin-cluster/src/main/java/org/apache/gobblin/cluster/HelixUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,7 @@
import org.apache.gobblin.runtime.listeners.JobListener;
import org.apache.gobblin.util.Id;
import org.apache.gobblin.util.JobLauncherUtils;
import org.apache.gobblin.util.PropertiesUtils;

import static org.apache.helix.task.TaskState.STOPPED;

Expand Down Expand Up @@ -159,7 +160,8 @@ public static List<? extends Tag<?>> initBaseEventTags(Properties jobProps,
if (jobProps.containsKey(ConfigurationKeys.JOB_ID_KEY)) {
jobId = jobProps.getProperty(ConfigurationKeys.JOB_ID_KEY);
} else {
jobId = JobLauncherUtils.newJobId(JobState.getJobNameFromProps(jobProps));
jobId = JobLauncherUtils.newJobId(JobState.getJobNameFromProps(jobProps),
PropertiesUtils.getPropAsLong(jobProps, ConfigurationKeys.FLOW_EXECUTION_ID_KEY, System.currentTimeMillis()));
jobProps.put(ConfigurationKeys.JOB_ID_KEY, jobId);
}

Expand Down
10 changes: 10 additions & 0 deletions gobblin-utility/src/main/java/org/apache/gobblin/util/JobLauncherUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,16 @@ public static String newJobId(String jobName) {
return Id.Job.create(jobName, System.currentTimeMillis()).toString();
}

/**
* Create a new job ID from a flow execution ID.
*
* @param jobName job name
* @return new job ID
*/
public static String newJobId(String jobName, long executionId) {
return Id.Job.create(jobName, executionId).toString();
}

/**
* Create a new task ID for the job with the given job ID.
*
Expand Down