retry fuctionality for all bulk apis #18
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,127 @@ | ||
| /* | ||
| * Copyright © 2024 Cask Data, Inc. | ||
| * | ||
| * Licensed under the Apache License, Version 2.0 (the "License"); you may not | ||
| * use this file except in compliance with the License. You may obtain a copy of | ||
| * the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT | ||
| * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the | ||
| * License for the specific language governing permissions and limitations under | ||
| * the License. | ||
| */ | ||
| package io.cdap.plugin.salesforce.plugin.source.batch.util; | ||
|
|
||
| import com.sforce.async.AsyncApiException; | ||
| import com.sforce.async.BatchInfo; | ||
| import com.sforce.async.BatchInfoList; | ||
| import com.sforce.async.BulkConnection; | ||
| import com.sforce.async.JobInfo; | ||
| import com.sforce.ws.ConnectorConfig; | ||
| import dev.failsafe.Failsafe; | ||
| import dev.failsafe.RetryPolicy; | ||
| import org.slf4j.Logger; | ||
| import org.slf4j.LoggerFactory; | ||
|
|
||
| import java.io.InputStream; | ||
| import java.time.Duration; | ||
|
|
||
| /** | ||
| * BulkConnectionRetryWrapper class to retry all the salesforce api calls in case of failure. | ||
| */ | ||
| public class BulkConnectionRetryWrapper { | ||
|
|
||
| private final BulkConnection bulkConnection; | ||
| private final RetryPolicy retryPolicy; | ||
| private static final Logger LOG = LoggerFactory.getLogger(BulkConnectionRetryWrapper.class); | ||
|
|
||
| public BulkConnectionRetryWrapper(BulkConnection bulkConnection) { | ||
| this.bulkConnection = bulkConnection; | ||
| this.retryPolicy = SalesforceSplitUtil.getRetryPolicy(5L, 80L, 5); | ||
| } | ||
|
|
||
| public JobInfo createJob(JobInfo jobInfo) { | ||
| Object resultJobInfo = Failsafe.with(retryPolicy) | ||
| .onFailure(event -> LOG.info("Failed while creating job")) | ||
| .get(() -> { | ||
| try { | ||
| return bulkConnection.createJob(jobInfo); | ||
| } catch (AsyncApiException e) { | ||
| throw new SalesforceQueryExecutionException(e.getMessage()); | ||
| } | ||
| }); | ||
| return (JobInfo) resultJobInfo; | ||
| } | ||
|
|
||
| public JobInfo getJobStatus(String jobId) { | ||
| Object resultJobInfo = Failsafe.with(retryPolicy) | ||
| .onFailure(event -> LOG.info("Failed while getting job status")) | ||
| .get(() -> { | ||
| try { | ||
| return bulkConnection.getJobStatus(jobId); | ||
| } catch (AsyncApiException e) { | ||
| throw new SalesforceQueryExecutionException(e.getMessage()); | ||
| } | ||
| }); | ||
| return (JobInfo) resultJobInfo; | ||
| } | ||
|
|
||
| public void updateJob(JobInfo jobInfo) { | ||
| Failsafe.with(retryPolicy) | ||
| .onFailure(event -> LOG.info("Failed while updating job.")) | ||
| .get(() -> { | ||
| try { | ||
| return bulkConnection.updateJob(jobInfo); | ||
| } catch (AsyncApiException e) { | ||
| throw new SalesforceQueryExecutionException(e.getMessage()); | ||
| } | ||
| }); | ||
| } | ||
|
|
||
| public BatchInfoList getBatchInfoList(String jobId) throws AsyncApiException { | ||
|
There was a problem hiding this comment. Add try catch to each method and in catch add a method that handles asyncapiException and handle retry as retry will be happen based on SalesforceQueryExecutionException. |
||
| Object batchInfoList = Failsafe.with(retryPolicy) | ||
| .onFailure(event -> LOG.info("Failed while getting batch info list")) | ||
| .get(() -> { | ||
| try { | ||
| return bulkConnection.getBatchInfoList(jobId); | ||
| } catch (AsyncApiException e) { | ||
| throw new SalesforceQueryExecutionException(e.getMessage()); | ||
| } | ||
| }); | ||
| return (BatchInfoList) batchInfoList; | ||
| } | ||
|
|
||
| public BatchInfo getBatchInfo(String jobId, String batchId) throws AsyncApiException { | ||
| Object batchInfo = Failsafe.with(retryPolicy) | ||
| .onFailure(event -> LOG.info("Failed while getting batc status")) | ||
| .get(() -> { | ||
| try { | ||
| return bulkConnection.getBatchInfo(jobId, batchId); | ||
| } catch (AsyncApiException e) { | ||
| throw new SalesforceQueryExecutionException(e.getMessage()); | ||
| } | ||
| }); | ||
| return (BatchInfo) batchInfo; | ||
| } | ||
|
|
||
| public InputStream getBatchResultStream(String jobId, String batchId) throws AsyncApiException { | ||
| Object inputStream = Failsafe.with(retryPolicy) | ||
| .onFailure(event -> LOG.info("Failed while getting batch result stream")) | ||
| .get(() -> { | ||
| try { | ||
| return bulkConnection.getBatchResultStream(jobId, batchId); | ||
| } catch (AsyncApiException e) { | ||
| throw new SalesforceQueryExecutionException(e.getMessage()); | ||
| } | ||
| }); | ||
| return (InputStream) inputStream; | ||
| } | ||
|
|
||
| public ConnectorConfig getConfig() { | ||
| return bulkConnection.getConfig(); | ||
| } | ||
|
|
||
| } | ||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Some of the methods are still not called using retry wrapper. E.g. line 208. move those also to retry wrapper class