This class helps transparently handle retries in the event an error is observed, and will + * handle redirect(s) if they occur, all without the need for the caller of this class to know about + * those things and the state need to worry about how retries will happen. + */ final class BidiUploadStreamingStream { private final BidiUploadState state; @@ -382,7 +390,7 @@ static final class StreamingResponseObserver public void onStart(StreamController controller) { this.controller = controller; controller.disableAutoInboundFlowControl(); - controller.request(2); + controller.request(1); } @RequiresNonNull("controller") diff --git a/google-cloud-storage/src/main/java/com/google/cloud/storage/BlobAppendableUpload.java b/google-cloud-storage/src/main/java/com/google/cloud/storage/BlobAppendableUpload.java index 0a81c36a7c..e6f9167ac7 100644 --- a/google-cloud-storage/src/main/java/com/google/cloud/storage/BlobAppendableUpload.java +++ b/google-cloud-storage/src/main/java/com/google/cloud/storage/BlobAppendableUpload.java @@ -107,17 +107,12 @@ interface AppendableUploadWriteableByteChannel extends WritableByteChannel { * .}{@link FlushPolicy#getMaxPendingBytes() getMaxPendingBytes()}. If the outbound queue is * full, and can not fit more bytes, this method will return 0. * - *
This method may be invoked at any time. If another thread has already initiated a write - * operation upon this channel, however, then an invocation of this method will block until the - * first operation is complete. - * *
If your application needs to empty its ByteBuffer before progressing, use our helper - * method {@link StorageNonBlockingChannelUtils#blockingEmptyTo(ByteBuffer, - * WritableByteChannel)} like so: + * method {@link StorageChannelUtils#blockingEmptyTo(ByteBuffer, WritableByteChannel)} like so: * *
{@code
* try (AppendableUploadWriteableByteChannel channel = session.open()) {
- * int written = StorageNonBlockingChannelUtils.blockingEmptyTo(byteBuffer, channel);
+ * int written = StorageChannelUtils.blockingEmptyTo(byteBuffer, channel);
* }
* }
*
diff --git a/google-cloud-storage/src/main/java/com/google/cloud/storage/BlobAppendableUploadConfig.java b/google-cloud-storage/src/main/java/com/google/cloud/storage/BlobAppendableUploadConfig.java
index 8c9c99636c..a1b1ac7a85 100644
--- a/google-cloud-storage/src/main/java/com/google/cloud/storage/BlobAppendableUploadConfig.java
+++ b/google-cloud-storage/src/main/java/com/google/cloud/storage/BlobAppendableUploadConfig.java
@@ -32,8 +32,10 @@
import com.google.cloud.storage.UnifiedOpts.ObjectTargetOpt;
import com.google.cloud.storage.UnifiedOpts.Opts;
import com.google.common.base.MoreObjects;
+import com.google.common.base.Preconditions;
import com.google.storage.v2.BidiWriteObjectResponse;
import com.google.storage.v2.ServiceConstants.Values;
+import java.util.Objects;
import java.util.function.BiFunction;
import javax.annotation.concurrent.Immutable;
@@ -52,14 +54,17 @@ public final class BlobAppendableUploadConfig {
private static final BlobAppendableUploadConfig INSTANCE =
new BlobAppendableUploadConfig(
- FlushPolicy.minFlushSize(_256KiB), CloseAction.CLOSE_WITHOUT_FINALIZING);
+ FlushPolicy.minFlushSize(_256KiB), CloseAction.CLOSE_WITHOUT_FINALIZING, 3);
private final FlushPolicy flushPolicy;
private final CloseAction closeAction;
+ private final int maxRedirectsAllowed;
- private BlobAppendableUploadConfig(FlushPolicy flushPolicy, CloseAction closeAction) {
+ private BlobAppendableUploadConfig(
+ FlushPolicy flushPolicy, CloseAction closeAction, int maxRedirectsAllowed) {
this.flushPolicy = flushPolicy;
this.closeAction = closeAction;
+ this.maxRedirectsAllowed = maxRedirectsAllowed;
}
/**
@@ -90,7 +95,7 @@ public BlobAppendableUploadConfig withFlushPolicy(FlushPolicy flushPolicy) {
if (this.flushPolicy.equals(flushPolicy)) {
return this;
}
- return new BlobAppendableUploadConfig(flushPolicy, closeAction);
+ return new BlobAppendableUploadConfig(flushPolicy, closeAction, maxRedirectsAllowed);
}
/**
@@ -108,8 +113,9 @@ public CloseAction getCloseAction() {
}
/**
- * Return an instance with the {@code CloseAction} set to be the specified value. Default:
- * {@link CloseAction#CLOSE_WITHOUT_FINALIZING}
+ * Return an instance with the {@code CloseAction} set to be the specified value.
+ *
+ * Default: {@link CloseAction#CLOSE_WITHOUT_FINALIZING} * * @see #getCloseAction() * @since 2.51.0 This new api is in preview and is subject to breaking changes. @@ -120,14 +126,65 @@ public BlobAppendableUploadConfig withCloseAction(CloseAction closeAction) { if (this.closeAction == closeAction) { return this; } - return new BlobAppendableUploadConfig(flushPolicy, closeAction); + return new BlobAppendableUploadConfig(flushPolicy, closeAction, maxRedirectsAllowed); + } + + /** + * The {@code maxRedirectsAllowed} set to be the specified value. + * + *
Default: 3 + * + * @see #withMaxRedirectsAllowed(int) + * @since 2.56.0 This new api is in preview and is subject to breaking changes. + */ + @BetaApi + int getMaxRedirectsAllowed() { + return maxRedirectsAllowed; + } + + /** + * Return an instance with the {@code maxRedirectsAllowed} set to be the specified value. + * + *
Default: 3
+ *
+ * @see #getMaxRedirectsAllowed()
+ * @since 2.56.0 This new api is in preview and is subject to breaking changes.
+ */
+ @BetaApi
+ BlobAppendableUploadConfig withMaxRedirectsAllowed(int maxRedirectsAllowed) {
+ Preconditions.checkArgument(
+ maxRedirectsAllowed >= 0, "maxRedirectsAllowed >= 0 (%s >= 0)", maxRedirectsAllowed);
+ if (this.maxRedirectsAllowed == maxRedirectsAllowed) {
+ return this;
+ }
+ return new BlobAppendableUploadConfig(flushPolicy, closeAction, maxRedirectsAllowed);
+ }
+
+ @Override
+ public boolean equals(Object o) {
+ if (this == o) {
+ return true;
+ }
+ if (!(o instanceof BlobAppendableUploadConfig)) {
+ return false;
+ }
+ BlobAppendableUploadConfig that = (BlobAppendableUploadConfig) o;
+ return maxRedirectsAllowed == that.maxRedirectsAllowed
+ && Objects.equals(flushPolicy, that.flushPolicy)
+ && closeAction == that.closeAction;
+ }
+
+ @Override
+ public int hashCode() {
+ return Objects.hash(flushPolicy, closeAction, maxRedirectsAllowed);
}
@Override
public String toString() {
return MoreObjects.toStringHelper(this)
- .add("closeAction", closeAction)
.add("flushPolicy", flushPolicy)
+ .add("closeAction", closeAction)
+ .add("maxRedirectsAllowed", maxRedirectsAllowed)
.toString();
}
@@ -183,9 +240,6 @@ public enum CloseAction {
}
BlobAppendableUpload create(GrpcStorageImpl storage, BlobInfo info, Opts