Skip to content

Fix DataflowJobManager to update existing job instance instead of creating new one #678

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

Merged
feast-ci-bot merged 1 commit into from
May 5, 2020
Merged

Fix DataflowJobManager to update existing job instance instead of creating new one #678

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
42 changes: 22 additions & 20 deletions core/src/main/java/feast/core/job/dataflow/DataflowJobManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,6 @@
import java.util.Collections;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
import lombok.extern.slf4j.Slf4j;
import org.apache.beam.runners.dataflow.DataflowPipelineJob;
import org.apache.beam.runners.dataflow.DataflowRunner;
Expand Down Expand Up @@ -120,12 +119,15 @@ public Job startJob(Job job) {
for (FeatureSet featureSet : job.getFeatureSets()) {
featureSetProtos.add(featureSet.toProto());
}
return submitDataflowJob(
job.getId(),
featureSetProtos,
job.getSource().toProto(),
job.getStore().toProto(),
false);
String extId =
submitDataflowJob(
job.getId(),
featureSetProtos,
job.getSource().toProto(),
job.getStore().toProto(),
false);
job.setExtId(extId);
return job;

} catch (InvalidProtocolBufferException e) {
log.error(e.getMessage());
Expand All @@ -150,8 +152,17 @@ public Job updateJob(Job job) {
for (FeatureSet featureSet : job.getFeatureSets()) {
featureSetProtos.add(featureSet.toProto());
}
return submitDataflowJob(
job.getId(), featureSetProtos, job.getSource().toProto(), job.getStore().toProto(), true);

String extId =
submitDataflowJob(
job.getId(),
featureSetProtos,
job.getSource().toProto(),
job.getStore().toProto(),
true);

job.setExtId(extId);
return job;
} catch (InvalidProtocolBufferException e) {
log.error(e.getMessage());
throw new IllegalArgumentException(
Expand Down Expand Up @@ -236,7 +247,7 @@ public JobStatus getJobStatus(Job job) {
return JobStatus.UNKNOWN;
}

private Job submitDataflowJob(
private String submitDataflowJob(
String jobName,
List<FeatureSetProto.FeatureSet> featureSetProtos,
SourceProto.Source source,
Expand All @@ -245,17 +256,8 @@ private Job submitDataflowJob(
try {
ImportOptions pipelineOptions = getPipelineOptions(jobName, featureSetProtos, sink, update);
DataflowPipelineJob pipelineResult = runPipeline(pipelineOptions);
List<FeatureSet> featureSets =
featureSetProtos.stream().map(FeatureSet::fromProto).collect(Collectors.toList());
String jobId = waitForJobToRun(pipelineResult);
return new Job(
jobName,
jobId,
getRunnerType(),
Source.fromProto(source),
Store.fromProto(sink),
featureSets,
JobStatus.PENDING);
return jobId;
} catch (Exception e) {
log.error("Error submitting job", e);
throw new JobExecutionException(String.format("Error running ingestion job: %s", e), e);
Expand Down