Repository: incubator-gobblin Updated Branches: refs/heads/master adb810a7b -> 9795cd58d
[GOBBLIN-274] Fix wait for salesforce batch completion Project: http://git-wip-us.apache.org/repos/asf/incubator-gobblin/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-gobblin/commit/01dae18e Tree: http://git-wip-us.apache.org/repos/asf/incubator-gobblin/tree/01dae18e Diff: http://git-wip-us.apache.org/repos/asf/incubator-gobblin/diff/01dae18e Branch: refs/heads/master Commit: 01dae18e0b44b459b38d4810b58a471e8b43a272 Parents: adb810a Author: Hung Tran <[email protected]> Authored: Tue Oct 3 13:32:23 2017 -0700 Committer: Hung Tran <[email protected]> Committed: Tue Oct 3 13:32:23 2017 -0700 ---------------------------------------------------------------------- .../java/org/apache/gobblin/salesforce/SalesforceExtractor.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-gobblin/blob/01dae18e/gobblin-salesforce/src/main/java/org/apache/gobblin/salesforce/SalesforceExtractor.java ---------------------------------------------------------------------- diff --git a/gobblin-salesforce/src/main/java/org/apache/gobblin/salesforce/SalesforceExtractor.java b/gobblin-salesforce/src/main/java/org/apache/gobblin/salesforce/SalesforceExtractor.java index c0c340d..38b4d1b 100644 --- a/gobblin-salesforce/src/main/java/org/apache/gobblin/salesforce/SalesforceExtractor.java +++ b/gobblin-salesforce/src/main/java/org/apache/gobblin/salesforce/SalesforceExtractor.java @@ -733,7 +733,7 @@ public class SalesforceExtractor extends RestApiExtractor { // wait for completion, failure, or formation of PK chunking batches while ((bulkBatchInfo.getState() != BatchStateEnum.Completed) && (bulkBatchInfo.getState() != BatchStateEnum.Failed) - && (usingPkChunking && bulkBatchInfo.getState() != BatchStateEnum.NotProcessed)) { + && (!usingPkChunking || bulkBatchInfo.getState() != BatchStateEnum.NotProcessed)) { Thread.sleep(retryInterval * 1000); bulkBatchInfo = this.bulkConnection.getBatchInfo(this.bulkJob.getId(), bulkBatchInfo.getId()); log.debug("Bulk Api Batch Info:" + bulkBatchInfo);
