fix(pubsub): update batching and flow control parameters to be same as the other client libraries (#9597)

pradn · plamut · commit c5eba0f41e4b · 2019-11-11T10:27:36.000+02:00
* Update batching and flow control parameters to be same as the other client libraries.

* Fix tests

* Update test leaser param
diff --git a/packages/google-cloud-pubsub/google/cloud/pubsub_v1/types.py b/packages/google-cloud-pubsub/google/cloud/pubsub_v1/types.py
@@ -39,9 +39,9 @@
     "BatchSettings", ["max_bytes", "max_latency", "max_messages"]
 )
 BatchSettings.__new__.__defaults__ = (
-    1000 * 1000 * 10,  # max_bytes: documented "10 MB", enforced 10000000
-    0.05,  # max_latency: 0.05 seconds
-    1000,  # max_messages: 1,000
+    1 * 1000 * 1000,  # max_bytes: 1 MB
+    0.01,  # max_latency: 10 ms
+    100,  # max_messages: 100
 )
 
 if sys.version_info >= (3, 5):
@@ -70,8 +70,8 @@
 )
 FlowControl.__new__.__defaults__ = (
     100 * 1024 * 1024,  # max_bytes: 100mb
-    100,  # max_messages: 100
-    2 * 60 * 60,  # max_lease_duration: 2 hours.
+    1000,  # max_messages: 1000
+    1 * 60 * 60,  # max_lease_duration: 1 hour.
 )
 
 if sys.version_info >= (3, 5):
diff --git a/packages/google-cloud-pubsub/tests/unit/pubsub_v1/publisher/test_publisher_client.py b/packages/google-cloud-pubsub/tests/unit/pubsub_v1/publisher/test_publisher_client.py
@@ -31,9 +31,9 @@ def test_init():
     # A plain client should have an `api` (the underlying GAPIC) and a
     # batch settings object, which should have the defaults.
     assert isinstance(client.api, publisher_client.PublisherClient)
-    assert client.batch_settings.max_bytes == 10 * 1000 * 1000
-    assert client.batch_settings.max_latency == 0.05
-    assert client.batch_settings.max_messages == 1000
+    assert client.batch_settings.max_bytes == 1 * 1000 * 1000
+    assert client.batch_settings.max_latency == 0.01
+    assert client.batch_settings.max_messages == 100
 
 
 def test_init_w_custom_transport():
@@ -44,9 +44,9 @@ def test_init_w_custom_transport():
     # batch settings object, which should have the defaults.
     assert isinstance(client.api, publisher_client.PublisherClient)
     assert client.api.transport is transport
-    assert client.batch_settings.max_bytes == 10 * 1000 * 1000
-    assert client.batch_settings.max_latency == 0.05
-    assert client.batch_settings.max_messages == 1000
+    assert client.batch_settings.max_bytes == 1 * 1000 * 1000
+    assert client.batch_settings.max_latency == 0.01
+    assert client.batch_settings.max_messages == 100
 
 
 def test_init_emulator(monkeypatch):
diff --git a/packages/google-cloud-pubsub/tests/unit/pubsub_v1/subscriber/test_streaming_pull_manager.py b/packages/google-cloud-pubsub/tests/unit/pubsub_v1/subscriber/test_streaming_pull_manager.py
@@ -660,9 +660,9 @@ def test__on_response_with_leaser_overload():
         ]
     )
 
-    # Adjust message bookkeeping in leaser. Pick 99 messages, which is just below
+    # Adjust message bookkeeping in leaser. Pick 999 messages, which is just below
     # the default FlowControl.max_messages limit.
-    fake_leaser_add(leaser, init_msg_count=99, init_bytes=990)
+    fake_leaser_add(leaser, init_msg_count=999, init_bytes=9900)
 
     # Actually run the method and prove that modack and schedule
     # are called in the expected way.

Original file line number	Diff line number	Diff line change
`@@ -39,9 +39,9 @@`
`39`	`39`	`"BatchSettings", ["max_bytes", "max_latency", "max_messages"]`
`40`	`40`	`)`
`41`	`41`	`BatchSettings.__new__.__defaults__ = (`
`42`		`- 1000 * 1000 * 10, # max_bytes: documented "10 MB", enforced 10000000`
`43`		`- 0.05, # max_latency: 0.05 seconds`
`44`		`- 1000, # max_messages: 1,000`
	`42`	`+ 1 * 1000 * 1000, # max_bytes: 1 MB`
	`43`	`+ 0.01, # max_latency: 10 ms`
	`44`	`+ 100, # max_messages: 100`
`45`	`45`	`)`
`46`	`46`
`47`	`47`	`if sys.version_info >= (3, 5):`
`@@ -70,8 +70,8 @@`
`70`	`70`	`)`
`71`	`71`	`FlowControl.__new__.__defaults__ = (`
`72`	`72`	`100 * 1024 * 1024, # max_bytes: 100mb`
`73`		`- 100, # max_messages: 100`
`74`		`- 2 * 60 * 60, # max_lease_duration: 2 hours.`
	`73`	`+ 1000, # max_messages: 1000`
	`74`	`+ 1 * 60 * 60, # max_lease_duration: 1 hour.`
`75`	`75`	`)`
`76`	`76`
`77`	`77`	`if sys.version_info >= (3, 5):`
Original file line number	Diff line number	Diff line change
`@@ -660,9 +660,9 @@ def test__on_response_with_leaser_overload():`
`660`	`660`	`]`
`661`	`661`	`)`
`662`	`662`
`663`		`- # Adjust message bookkeeping in leaser. Pick 99 messages, which is just below`
	`663`	`+ # Adjust message bookkeeping in leaser. Pick 999 messages, which is just below`
`664`	`664`	`# the default FlowControl.max_messages limit.`
`665`		`- fake_leaser_add(leaser, init_msg_count=99, init_bytes=990)`
	`665`	`+ fake_leaser_add(leaser, init_msg_count=999, init_bytes=9900)`
`666`	`666`
`667`	`667`	`# Actually run the method and prove that modack and schedule`
`668`	`668`	`# are called in the expected way.`