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/10/03 20:48:44 UTC
[1/2] incubator-gobblin git commit: [GOBBLIN-274] Fix wait for
salesforce batch completion
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 <hu...@linkedin.com>
Authored: Tue Oct 3 13:32:23 2017 -0700
Committer: Hung Tran <hu...@linkedin.com>
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);
[2/2] incubator-gobblin git commit: Merge pull request #2127 from
htran1/salesforce_pk_fix
Posted by hu...@apache.org.
Merge pull request #2127 from htran1/salesforce_pk_fix
Project: http://git-wip-us.apache.org/repos/asf/incubator-gobblin/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-gobblin/commit/9795cd58
Tree: http://git-wip-us.apache.org/repos/asf/incubator-gobblin/tree/9795cd58
Diff: http://git-wip-us.apache.org/repos/asf/incubator-gobblin/diff/9795cd58
Branch: refs/heads/master
Commit: 9795cd58df36be7b504f035ca225503009765eb0
Parents: adb810a 01dae18
Author: Hung Tran <hu...@linkedin.com>
Authored: Tue Oct 3 13:48:23 2017 -0700
Committer: Hung Tran <hu...@linkedin.com>
Committed: Tue Oct 3 13:48:23 2017 -0700
----------------------------------------------------------------------
.../java/org/apache/gobblin/salesforce/SalesforceExtractor.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------