Skip to content
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

chore: config aws s3 sdk to avoid connection closed error 2 #50995

Merged
merged 4 commits into from
Jan 9, 2025
+7 −1
Merged

chore: config aws s3 sdk to avoid connection closed error 2 #50995

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
aa2e8c5
Add config to prevent connection closed errors. Bump versions.
tryangul Jan 8, 2025
c6f381d
Rev s3 connector RC.
tryangul Jan 8, 2025
ec28cfd
Revert "Rev s3 connector RC."
tryangul Jan 8, 2025
2c18031
fmt
tryangul Jan 9, 2025
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
3 changes: 2 additions & 1 deletion airbyte-cdk/bulk/toolkits/load-s3/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,5 +5,6 @@ dependencies {
api project(':airbyte-cdk:bulk:toolkits:bulk-cdk-toolkit-load-object-storage')

testFixturesApi(testFixtures(project(":airbyte-cdk:bulk:toolkits:bulk-cdk-toolkit-load-object-storage")))
implementation("aws.sdk.kotlin:s3:1.3.94")
implementation("aws.sdk.kotlin:s3:1.3.98")
implementation("aws.smithy.kotlin:http-client-engine-okhttp:1.3.31")
}
5 changes: 5 additions & 0 deletions airbyte-cdk/bulk/toolkits/load-s3/src/main/kotlin/io/airbyte/cdk/load/file/s3/S3Client.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ import aws.sdk.kotlin.services.s3.model.PutObjectRequest
import aws.smithy.kotlin.runtime.auth.awscredentials.CredentialsProvider
import aws.smithy.kotlin.runtime.content.ByteStream
import aws.smithy.kotlin.runtime.content.toInputStream
import aws.smithy.kotlin.runtime.http.engine.okhttp.OkHttpEngine
import aws.smithy.kotlin.runtime.net.url.Url
import edu.umd.cs.findbugs.annotations.SuppressFBWarnings
import io.airbyte.cdk.load.command.aws.AWSAccessKeyConfigurationProvider
Expand All @@ -38,6 +39,7 @@ import jakarta.inject.Singleton
import java.io.ByteArrayOutputStream
import java.io.InputStream
import java.io.OutputStream
import kotlin.time.Duration.Companion.milliseconds
import kotlinx.coroutines.flow.flow

data class S3Object(override val key: String, override val storageConfig: S3BucketConfiguration) :
Expand Down Expand Up @@ -244,6 +246,9 @@ class S3ClientFactory(
Url.parse(it)
} else null
}
// Fix for connection reset issue:
// https://github.com/awslabs/aws-sdk-kotlin/issues/1214#issuecomment-2464831817
httpClient(OkHttpEngine) { connectionIdlePollingInterval = 200.milliseconds }
}

return S3Client(
Expand Down
Loading