Skip to content

data: check liveness before blessing data server #4851

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
merged 1 commit into from
Apr 9, 2021
Merged

data: check liveness before blessing data server #4851

Show file tree
Hide file tree
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
1 change: 1 addition & 0 deletions tensorboard/data/BUILD
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,6 +95,7 @@ py_library(
":ingester",
"//tensorboard:expect_grpc_installed",
"//tensorboard:expect_pkg_resources_installed",
"//tensorboard/data/proto:protos_all_py_pb2",
"//tensorboard/util:tb_logging",
],
)
Expand Down
23 changes: 17 additions & 6 deletions tensorboard/data/server_ingester.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@

from tensorboard.data import grpc_provider
from tensorboard.data import ingester
from tensorboard.data.proto import data_provider_pb2
from tensorboard.util import tb_logging


Expand All @@ -47,7 +48,8 @@ def __init__(self, address, *, channel_creds_type):
channel_creds_type: `grpc_util.ChannelCredsType`, as passed to
`--grpc_creds_type`.
"""
self._data_provider = _make_provider(address, channel_creds_type)
stub = _make_stub(address, channel_creds_type)
self._data_provider = grpc_provider.GrpcDataProvider(address, stub)

@property
def data_provider(self):
Expand Down Expand Up @@ -170,13 +172,23 @@ def start(self):
)

addr = "localhost:%d" % port
self._data_provider = _make_provider(addr, self._channel_creds_type)
stub = _make_stub(addr, self._channel_creds_type)
logger.info(
"Established connection to data server at pid %d via %s",
"Opened channel to data server at pid %d via %s",
popen.pid,
addr,
)

req = data_provider_pb2.GetExperimentRequest()
try:
stub.GetExperiment(req, timeout=5) # should be near-instant
except grpc.RpcError as e:
msg = "Failed to communicate with data server at %s: %s" % (addr, e)
logging.warning("%s", msg)
raise DataServerStartupError(msg) from e
logger.info("Got valid response from data server")
self._data_provider = grpc_provider.GrpcDataProvider(addr, stub)


def _maybe_read_file(path):
"""Read a file, or return `None` on ENOENT specifically."""
Expand All @@ -189,12 +201,11 @@ def _maybe_read_file(path):
raise


def _make_provider(addr, channel_creds_type):
def _make_stub(addr, channel_creds_type):
(creds, options) = channel_creds_type.channel_config()
options.append(("grpc.max_receive_message_length", 1024 * 1024 * 256))
channel = grpc.secure_channel(addr, creds, options=options)
stub = grpc_provider.make_stub(channel)
return grpc_provider.GrpcDataProvider(addr, stub)
return grpc_provider.make_stub(channel)


class NoDataServerError(RuntimeError):
Expand Down