Skip to content

Fix gcs endpoint pipeline option wiring #39435

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

Merged
shunping merged 1 commit into from
Jul 23, 2026
+27 −3
Merged

Fix gcs endpoint pipeline option wiring #39435

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
17 changes: 14 additions & 3 deletions ...-cloud-platform-core/src/main/java/org/apache/beam/sdk/extensions/gcp/util/GcsUtilV1.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -261,12 +261,18 @@ public boolean shouldRetry(IOException e) {
this.credentials = credentials;
this.maxBytesRewrittenPerCall = null;
this.numRewriteTokensUsed = null;
googleCloudStorageOptions =
GoogleCloudStorageOptions.Builder optionsBuilder =
GoogleCloudStorageOptions.builder()
.setAppName("Beam")
.setReadChannelOptions(gcsReadOptions)
.setGrpcEnabled(shouldUseGrpc)
.build();
.setGrpcEnabled(shouldUseGrpc);
if (storageClient.getRootUrl() != null) {
optionsBuilder.setStorageRootUrl(storageClient.getRootUrl());
}
if (storageClient.getServicePath() != null) {
optionsBuilder.setStorageServicePath(storageClient.getServicePath());
}
googleCloudStorageOptions = optionsBuilder.build();
try {
googleCloudStorage =
createGoogleCloudStorage(googleCloudStorageOptions, storageClient, credentials);
Expand Down Expand Up @@ -495,6 +501,11 @@ private Long toFileSize(StorageObjectOrIOException storageObjectOrIOException)
}
}

@VisibleForTesting
GoogleCloudStorage getGoogleCloudStorage() {
return googleCloudStorage;
}

@VisibleForTesting
void setCloudStorageImpl(GoogleCloudStorage g) {
googleCloudStorage = g;
Expand Down
13 changes: 13 additions & 0 deletions ...loud-platform-core/src/test/java/org/apache/beam/sdk/extensions/gcp/util/GcsUtilTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,7 @@
import com.google.auth.Credentials;
import com.google.cloud.hadoop.gcsio.CreateObjectOptions;
import com.google.cloud.hadoop.gcsio.GoogleCloudStorage;
import com.google.cloud.hadoop.gcsio.GoogleCloudStorageImpl;
import com.google.cloud.hadoop.gcsio.GoogleCloudStorageOptions;
import com.google.cloud.hadoop.gcsio.GoogleCloudStorageReadOptions;
import com.google.cloud.hadoop.gcsio.StorageResourceId;
Expand Down Expand Up @@ -1866,6 +1867,18 @@ public void testReadMetricsAreNotCollectedWhenNotEnabledOpenWithOptions() throws
testReadMetrics(false, GoogleCloudStorageReadOptions.DEFAULT);
}

@Test
public void testGcsEndpoint() throws IOException {
GcsOptions pipelineOptions = PipelineOptionsFactory.as(GcsOptions.class);
pipelineOptions.setGcsEndpoint("http://localhost:4443/storage/v1/");

GcsUtil gcsUtil = pipelineOptions.getGcsUtil();
GoogleCloudStorageImpl gcsImpl =
(GoogleCloudStorageImpl) gcsUtil.delegate.getGoogleCloudStorage();
assertEquals("http://localhost:4443/", gcsImpl.getOptions().getStorageRootUrl());
assertEquals("storage/v1/", gcsImpl.getOptions().getStorageServicePath());
}

/** A helper to wrap a {@link GenericJson} object in a content stream. */
private static InputStream toStream(String content) throws IOException {
return new ByteArrayInputStream(content.getBytes(StandardCharsets.UTF_8));
Expand Down
Loading