Skip to content

DHFPROD-2501: If 'uris'is null and job is stopped return the response immediately #2481

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
SameeraPriyathamTadikonda merged 2 commits into from
May 10, 2019
Merged

DHFPROD-2501: If 'uris'is null and job is stopped return the response immediately #2481

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
d5eecd0
If 'uris' is null and job is stopped return the response immediately
May 10, 2019
55e9eba
'stepStatus' contains the prefixes not the other way around
May 10, 2019
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
20 changes: 15 additions & 5 deletions marklogic-data-hub/src/main/java/com/marklogic/hub/step/impl/QueryStepRunner.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -309,16 +309,26 @@ private RunStepResponse runHarmonizer(RunStepResponse runStepResponse, Collectio
listener.onStatusChange(runStepResponse.getJobId(), 0, JobStatus.RUNNING_PREFIX + step, 0,0, "starting step execution");
});

if ( !isStopped.get() && (uris == null || uris.size() == 0 )) {
if (uris == null || uris.size() == 0) {
JsonNode jobDoc = null;
final String stepStatus;
if(isStopped.get()) {
stepStatus = JobStatus.CANCELED_PREFIX + step;
}
else {
stepStatus = JobStatus.COMPLETED_PREFIX + step;
}

stepStatusListeners.forEach((StepStatusListener listener) -> {
listener.onStatusChange(runStepResponse.getJobId(), 100, JobStatus.COMPLETED_PREFIX + step, 0, 0, "collector returned 0 items");
listener.onStatusChange(runStepResponse.getJobId(), 100, stepStatus, 0, 0,
(stepStatus.contains(JobStatus.COMPLETED_PREFIX) ? "collector returned 0 items" : "job was stopped"));
});
stepFinishedListeners.forEach((StepFinishedListener::onStepFinished));
runStepResponse.setCounts(0,0,0,0,0);
runStepResponse.withStatus(JobStatus.COMPLETED_PREFIX + step);
JsonNode jobDoc = null;
runStepResponse.withStatus(stepStatus);

try {
jobDoc = jobDocManager.postJobs(jobId, JobStatus.COMPLETED_PREFIX + step, step, step, runStepResponse);
jobDoc = jobDocManager.postJobs(jobId, stepStatus, step, stepStatus.contains(JobStatus.COMPLETED_PREFIX) ? step : null, runStepResponse);
}
catch (Exception e) {
throw e;
Expand Down
21 changes: 16 additions & 5 deletions marklogic-data-hub/src/main/java/com/marklogic/hub/step/impl/WriteStepRunner.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -396,16 +396,27 @@ private RunStepResponse runIngester(RunStepResponse runStepResponse, Collection<
stepStatusListeners.forEach((StepStatusListener listener) -> {
listener.onStatusChange(runStepResponse.getJobId(), 0, JobStatus.RUNNING_PREFIX + step, 0, 0, "starting step execution");
});
if ( !isStopped.get() && (uris == null || uris.size() == 0 )) {

if (uris == null || uris.size() == 0 ) {
JsonNode jobDoc = null;
final String stepStatus;
if(isStopped.get()) {
stepStatus = JobStatus.CANCELED_PREFIX + step;
}
else {
stepStatus = JobStatus.COMPLETED_PREFIX + step;
}

stepStatusListeners.forEach((StepStatusListener listener) -> {
listener.onStatusChange(runStepResponse.getJobId(), 100, JobStatus.COMPLETED_PREFIX + step, 0, 0, "provided file path returned 0 items");
listener.onStatusChange(runStepResponse.getJobId(), 100, stepStatus, 0, 0,
(stepStatus.contains(JobStatus.COMPLETED_PREFIX) ? "provided file path returned 0 items" : "job was stopped"));
});
stepFinishedListeners.forEach((StepFinishedListener::onStepFinished));
runStepResponse.setCounts(0,0,0,0,0);
runStepResponse.withStatus(JobStatus.COMPLETED_PREFIX + step);
JsonNode jobDoc;
runStepResponse.withStatus(stepStatus);

try {
jobDoc = jobDocManager.postJobs(jobId, JobStatus.COMPLETED_PREFIX + step, step, step, runStepResponse);
jobDoc = jobDocManager.postJobs(jobId, stepStatus, step, stepStatus.contains(JobStatus.COMPLETED_PREFIX) ? step : null, runStepResponse);
}
catch (Exception e) {
throw e;
Expand Down