Skip to content

fix: don't use threads for gRPC AuthMetadataPlugin, reverts #390 #467

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
busunkim96 merged 1 commit into from
Mar 25, 2020
Merged

fix: don't use threads for gRPC AuthMetadataPlugin, reverts #390 #467

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
20 changes: 1 addition & 19 deletions google/auth/transport/grpc.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@

from __future__ import absolute_import

from concurrent import futures
import logging

import six
Expand Down Expand Up @@ -51,15 +50,6 @@ class AuthMetadataPlugin(grpc.AuthMetadataPlugin):
object used to refresh credentials as needed.
"""

# Python 2.7 has no default for max_workers.
# In Python >= 3.5, ThreadPoolExecutor defaults to the
# number of processors on the machine, multiplied by 5.
if six.PY2: # pragma: NO COVER
max_workers = 5
else:
max_workers = None
_AUTH_THREAD_POOL = futures.ThreadPoolExecutor(max_workers=max_workers)

def __init__(self, credentials, request):
# pylint: disable=no-value-for-parameter
# pylint doesn't realize that the super method takes no arguments
Expand All @@ -82,13 +72,6 @@ def _get_authorization_headers(self, context):

return list(six.iteritems(headers))

@staticmethod
def _callback_wrapper(callback):
def wrapped(future):
callback(future.result(), None)

return wrapped

def __call__(self, context, callback):
"""Passes authorization metadata into the given callback.

Expand All @@ -97,8 +80,7 @@ def __call__(self, context, callback):
callback (grpc.AuthMetadataPluginCallback): The callback that will
be invoked to pass in the authorization metadata.
"""
future = self._AUTH_THREAD_POOL.submit(self._get_authorization_headers, context)
future.add_done_callback(self._callback_wrapper(callback))
callback(self._get_authorization_headers(context), None)


def secure_authorized_channel(
Expand Down