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

Jump to bottom

Set gRPC message options and keepalive. #4269

Merged

lukesneeringer merged 12 commits into googleapis:master from lukesneeringer:custom-channel

Oct 30, 2017

Contributor

lukesneeringer commented Oct 26, 2017 •

edited

Loading

Fixes #4083, although the UNAVAILABLE errors still occur sometimes for other reasons.

That will need to be handled with new retry logic, and is being tracked as #4234.

Addendum: Fixes #3886.

Luke Sneeringer added 10 commits

October 26, 2017 11:12


          Add futures for subscriptions.

978775b

This causes the `.open` method on subscriptions to return a future,
which can be used to block the main thread or trap exceptions.


          Re-factor futures into a hierarchy; add tests.

823c6a3


          Document the futures coming from subscriber.

c358ff6


          Add a keeyalive.

1c31d8e


          Ctrl+S, a thing.

1fd38d5


          Address incorrect docs.

4e469aa


          Remove _wait

9112aa7


          Futures are canonically google.api_core.futures.Future.

03076f8


          Merge branch 'subscribe-future' into custom-channel

b586128


          Merge branch 'public-master' into custom-channel

7aa4bb5

lukesneeringer self-assigned this

lukesneeringer requested a review from theacodes

October 26, 2017 22:05

googlebot added the cla: yes label

Contributor Author

lukesneeringer commented Oct 26, 2017

Ignore the long list of commits that included #4265; squash will fix it. :-)

dhermes approved these changes

View reviewed changes

Contributor

dhermes left a comment

LGTM, but I'd love it if you addressed my nits 😀

pubsub/google/cloud/pubsub_v1/subscriber/client.py Outdated

+                      target = '{host}:{port}'.format(
+                          host=subscriber_client.SubscriberClient.SERVICE_ADDRESS,
+                          port=subscriber_client.SubscriberClient.DEFAULT_SERVICE_PORT,
+                      )

This comment was marked as spam.

Sign in to view

pubsub/google/cloud/pubsub_v1/subscriber/client.py Outdated

+                              'grpc.max_send_message_length': -1,
+                              'grpc.max_receive_message_length': -1,
+                              'grpc.keepalive_time_ms': 30000,
+                          }.items(),

This comment was marked as spam.

Sign in to view

pubsub/google/cloud/pubsub_v1/subscriber/client.py Outdated

+                          host=subscriber_client.SubscriberClient.SERVICE_ADDRESS,
+                          port=subscriber_client.SubscriberClient.DEFAULT_SERVICE_PORT,
+                      )
+                      kwargs.setdefault('channel', grpc_helpers.create_channel(

This comment was marked as spam.

Sign in to view

This comment was marked as spam.

Sign in to view

This comment was marked as spam.

Sign in to view

This comment was marked as spam.

Sign in to view

dhermes reviewed

View reviewed changes

pubsub/google/cloud/pubsub_v1/subscriber/client.py Outdated

+              import grpc
+              from google import auth
+              from google.api_core import grpc_helpers

This comment was marked as spam.

Sign in to view

pubsub/google/cloud/pubsub_v1/subscriber/client.py Outdated

+                          host=subscriber_client.SubscriberClient.SERVICE_ADDRESS,
+                          port=subscriber_client.SubscriberClient.DEFAULT_SERVICE_PORT,
+                      )
+                      kwargs.setdefault('channel', grpc_helpers.create_channel(

This comment was marked as spam.

Sign in to view

Luke Sneeringer added 2 commits

October 30, 2017 07:42


          Address @dhermes feedback; add emulator logic.

4e1518b


          Add unit tests for emulator host.

c82445e

lukesneeringer merged commit 743ade4 into googleapis:master

lukesneeringer deleted the custom-channel branch

October 30, 2017 15:51

dhermes reviewed

View reviewed changes

pubsub/google/cloud/pubsub_v1/publisher/client.py

                       self._batch_lock = threading.Lock()
                       self._batches = {}
+                  @property
+                  def target(self):

This comment was marked as spam.

Sign in to view

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels