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

Revert "S3 CRT Client" #609

Merged
merged 1 commit into from
Jul 14, 2023
Merged

Revert "S3 CRT Client" #609

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
1 change: 0 additions & 1 deletion config/config.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,6 @@ s3Config:
s3Region: ${S3_REGION:-us-east-1}
s3EndPoint: ${S3_ENDPOINT:-http://localhost:9090}
s3Bucket: ${S3_BUCKET:-test-s3-bucket}
s3TargetThroughputGbps: ${S3_TARGET_THROUGHPUT_GBPS:-25}

tracingConfig:
zipkinEndpoint: ${ZIPKIN_TRACING_ENDPOINT:-http://localhost:9411/api/v2/spans}
Expand Down
5 changes: 0 additions & 5 deletions kaldb/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -313,11 +313,6 @@
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>software.amazon.awssdk.crt</groupId>
<artifactId>aws-crt</artifactId>
<version>0.22.1</version>
</dependency>

<dependency>
<groupId>org.apache.httpcomponents</groupId>
Expand Down
12 changes: 4 additions & 8 deletions kaldb/src/main/java/com/slack/kaldb/blobfs/s3/S3BlobFs.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,10 +47,6 @@
import software.amazon.awssdk.services.s3.model.S3Exception;
import software.amazon.awssdk.services.s3.model.S3Object;

/**
* @see S3CrtBlobFs
*/
@Deprecated
public class S3BlobFs extends BlobFs {
public static final String S3_SCHEME = "s3://";
private static final Logger LOG = LoggerFactory.getLogger(S3BlobFs.class);
Expand Down Expand Up @@ -230,7 +226,7 @@ private boolean copyFile(URI srcUri, URI dstUri) throws IOException {

@Override
public boolean mkdir(URI uri) throws IOException {
LOG.debug("mkdir {}", uri);
LOG.info("mkdir {}", uri);
try {
Preconditions.checkNotNull(uri, "uri is null");
String path = normalizeToDirectoryPrefix(uri);
Expand All @@ -253,7 +249,7 @@ public boolean mkdir(URI uri) throws IOException {

@Override
public boolean delete(URI segmentUri, boolean forceDelete) throws IOException {
LOG.debug("Deleting uri {} force {}", segmentUri, forceDelete);
LOG.info("Deleting uri {} force {}", segmentUri, forceDelete);
try {
if (isDirectory(segmentUri)) {
if (!forceDelete) {
Expand Down Expand Up @@ -316,7 +312,7 @@ public boolean doMove(URI srcUri, URI dstUri) throws IOException {

@Override
public boolean copy(URI srcUri, URI dstUri) throws IOException {
LOG.debug("Copying uri {} to uri {}", srcUri, dstUri);
LOG.info("Copying uri {} to uri {}", srcUri, dstUri);
Preconditions.checkState(exists(srcUri), "Source URI '%s' does not exist", srcUri);
if (srcUri.equals(dstUri)) {
return true;
Expand Down Expand Up @@ -415,7 +411,7 @@ public String[] listFiles(URI fileUri, boolean recursive) throws IOException {
continuationToken = listObjectsV2Response.nextContinuationToken();
}
String[] listedFiles = builder.build().toArray(new String[0]);
LOG.debug(
LOG.info(
"Listed {} files from URI: {}, is recursive: {}", listedFiles.length, fileUri, recursive);
return listedFiles;
} catch (Throwable t) {
Expand Down
Loading