-
Notifications
You must be signed in to change notification settings - Fork 119
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
fix(storage): Fix SocketTimeoutException when executing a long multi-…
…part upload (#2973)
- Loading branch information
Showing
11 changed files
with
288 additions
and
156 deletions.
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
100 changes: 100 additions & 0 deletions
100
...3/src/main/java/com/amplifyframework/storage/s3/transfer/worker/BlockingTransferWorker.kt
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,100 @@ | ||
| /* | ||
| * Copyright 2025 Amazon.com, Inc. or its affiliates. All Rights Reserved. | ||
| * | ||
| * Licensed under the Apache License, Version 2.0 (the "License"). | ||
| * You may not use this file except in compliance with the License. | ||
| * A copy of the License is located at | ||
| * | ||
| * http://aws.amazon.com/apache2.0 | ||
| * | ||
| * or in the "license" file accompanying this file. This file 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 com.amplifyframework.storage.s3.transfer.worker | ||
|
|
||
| import android.content.Context | ||
| import android.util.Log | ||
| import androidx.work.Data | ||
| import androidx.work.Worker | ||
| import androidx.work.WorkerParameters | ||
| import androidx.work.workDataOf | ||
| import com.amplifyframework.core.Amplify | ||
| import com.amplifyframework.core.category.CategoryType | ||
| import com.amplifyframework.storage.TransferState | ||
| import com.amplifyframework.storage.s3.AWSS3StoragePlugin | ||
| import com.amplifyframework.storage.s3.transfer.TransferDB | ||
| import com.amplifyframework.storage.s3.transfer.TransferRecord | ||
| import com.amplifyframework.storage.s3.transfer.TransferStatusUpdater | ||
| import com.amplifyframework.storage.s3.transfer.worker.BaseTransferWorker.Companion.OUTPUT_TRANSFER_RECORD_ID | ||
| import com.amplifyframework.storage.s3.transfer.worker.BaseTransferWorker.Companion.PART_RECORD_ID | ||
| import com.amplifyframework.storage.s3.transfer.worker.BaseTransferWorker.Companion.TRANSFER_RECORD_ID | ||
| import java.lang.Exception | ||
| import java.net.SocketException | ||
|
|
||
| /** | ||
| * Base worker to perform transfer file task. | ||
| */ | ||
| internal abstract class BlockingTransferWorker( | ||
| private val transferStatusUpdater: TransferStatusUpdater, | ||
| private val transferDB: TransferDB, | ||
| context: Context, | ||
| workerParameters: WorkerParameters | ||
| ) : Worker(context, workerParameters), BaseTransferWorker { | ||
|
|
||
| internal lateinit var transferRecord: TransferRecord | ||
| internal lateinit var outputData: Data | ||
|
|
||
| private val logger = | ||
| Amplify.Logging.logger( | ||
| CategoryType.STORAGE, | ||
| AWSS3StoragePlugin.AWS_S3_STORAGE_LOG_NAMESPACE.format(this::class.java.simpleName) | ||
| ) | ||
|
|
||
| override fun doWork(): Result { | ||
| val result = runCatching { | ||
| val transferRecordId = | ||
| inputData.keyValueMap[PART_RECORD_ID] as? Int ?: inputData.keyValueMap[TRANSFER_RECORD_ID] as Int | ||
| outputData = workDataOf(OUTPUT_TRANSFER_RECORD_ID to inputData.keyValueMap[TRANSFER_RECORD_ID] as Int) | ||
| transferDB.getTransferRecordById(transferRecordId)?.let { tr -> | ||
| transferRecord = tr | ||
| performWork() | ||
| } ?: return run { | ||
| Result.failure(outputData) | ||
| } | ||
| } | ||
|
|
||
| return when { | ||
| result.isSuccess -> { | ||
| result.getOrThrow() | ||
| } | ||
| else -> { | ||
| val ex = result.exceptionOrNull() | ||
| logger.error("${this.javaClass.simpleName} failed with exception: ${Log.getStackTraceString(ex)}") | ||
| if (isRetryableError(ex)) { | ||
| Result.retry() | ||
| } else { | ||
| transferStatusUpdater.updateOnError(transferRecord.id, Exception(ex)) | ||
| transferStatusUpdater.updateTransferState( | ||
| transferRecord.id, | ||
| TransferState.FAILED | ||
| ) | ||
| Result.failure(outputData) | ||
| } | ||
| } | ||
| } | ||
| } | ||
|
|
||
| abstract fun performWork(): Result | ||
|
|
||
| internal open var maxRetryCount = 0 | ||
|
|
||
| private fun isRetryableError(e: Throwable?): Boolean { | ||
| return !isNetworkAvailable(applicationContext) || | ||
| runAttemptCount < maxRetryCount || | ||
| // SocketException is thrown when download is terminated due to network disconnection. | ||
| e is SocketException | ||
| } | ||
| } |
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
Oops, something went wrong.