---

pongad · web-flow · commit b1f82f8c0104 · 2017-05-18T10:15:13.000+10:00
yaml --- r: 5699 b: refs/heads/master c: c73d3b0 h: refs/heads/master i: 5697: 0387022 5695: 67eb9ab
diff --git a/[refs] b/[refs]
@@ -1,5 +1,5 @@
 ---
-refs/heads/master: 97f6164476e90f55e117d816d9b96b0eb78f7e4a
+refs/heads/master: c73d3b008ae965e64ca6e8a80a5b49b36970ec15
 refs/heads/travis: dae77e558b884bc1b165155482d76c8e40b0fca4
 refs/heads/gh-pages: f8ea70cdc599a5d39c2df480280877afb3bef9bd
 refs/tags/0.0.9: 22f1839238f66c39e67ed4dfdcd273b1ae2e8444
diff --git a/trunk/google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/spi/v1/Subscriber.java b/trunk/google-cloud-pubsub/src/main/java/com/google/cloud/pubsub/spi/v1/Subscriber.java
@@ -432,6 +432,7 @@ public static final class Builder {
     private static final Duration MIN_ACK_EXPIRATION_PADDING = Duration.ofMillis(100);
     private static final Duration DEFAULT_ACK_EXPIRATION_PADDING = Duration.ofMillis(500);
     private static final Duration DEFAULT_MAX_ACK_EXTENSION_PERIOD = Duration.ofMinutes(60);
+    private static final long DEFAULT_MEMORY_PERCENTAGE = 20;
 
     static final ExecutorProvider DEFAULT_EXECUTOR_PROVIDER =
         InstantiatingExecutorProvider.newBuilder()
@@ -447,7 +448,11 @@ public static final class Builder {
     Duration ackExpirationPadding = DEFAULT_ACK_EXPIRATION_PADDING;
     Duration maxAckExtensionPeriod = DEFAULT_MAX_ACK_EXTENSION_PERIOD;
 
-    FlowControlSettings flowControlSettings = FlowControlSettings.getDefaultInstance();
+    FlowControlSettings flowControlSettings =
+        FlowControlSettings.newBuilder()
+            .setMaxOutstandingRequestBytes(
+                Runtime.getRuntime().maxMemory() * DEFAULT_MEMORY_PERCENTAGE / 100L)
+            .build();
 
     ExecutorProvider executorProvider = DEFAULT_EXECUTOR_PROVIDER;
     @Nullable ExecutorProvider alarmsExecutorProvider;
