mirror of https://github.com/grpc/grpc.git
XdsServerBuilder, config fetching per resolved address and delaying bind/listen till fetch is complete
Yash Tibrewal
4 years ago
parent
4a0d59c27a
commit
4105d2ce20
31 changed files with 493 additions and 72 deletions
@ -0,0 +1,43 @@ |
||||
//
|
||||
//
|
||||
// Copyright 2020 gRPC authors.
|
||||
//
|
||||
// Licensed under the Apache License, Version 2.0 (the "License");
|
||||
// you may not use this file except in compliance with the License.
|
||||
// You may obtain a copy of the License at
|
||||
//
|
||||
// http://www.apache.org/licenses/LICENSE-2.0
|
||||
//
|
||||
// Unless required by applicable law or agreed to in writing, software
|
||||
// distributed under the License is distributed on an "AS IS" BASIS,
|
||||
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
// See the License for the specific language governing permissions and
|
||||
// limitations under the License.
|
||||
//
|
||||
//
|
||||
|
||||
#ifndef GRPCPP_XDS_SERVER_BUILDER_H |
||||
#define GRPCPP_XDS_SERVER_BUILDER_H |
||||
|
||||
#include <grpc/impl/codegen/port_platform.h> |
||||
|
||||
#include <grpcpp/server_builder.h> |
||||
|
||||
namespace grpc { |
||||
namespace experimental { |
||||
|
||||
class XdsServerBuilder : public ::grpc::ServerBuilder { |
||||
public: |
||||
std::unique_ptr<Server> BuildAndStart() override { |
||||
grpc_server_config_fetcher* fetcher = |
||||
grpc_server_config_fetcher_xds_create(); |
||||
if (fetcher == nullptr) return nullptr; |
||||
set_fetcher(fetcher); |
||||
return ServerBuilder::BuildAndStart(); |
||||
} |
||||
}; |
||||
|
||||
} // namespace experimental
|
||||
} // namespace grpc
|
||||
|
||||
#endif /* GRPCPP_XDS_SERVER_BUILDER_H */ |
||||
@ -0,0 +1,131 @@ |
||||
//
|
||||
//
|
||||
// Copyright 2020 gRPC authors.
|
||||
//
|
||||
// Licensed under the Apache License, Version 2.0 (the "License");
|
||||
// you may not use this file except in compliance with the License.
|
||||
// You may obtain a copy of the License at
|
||||
//
|
||||
// http://www.apache.org/licenses/LICENSE-2.0
|
||||
//
|
||||
// Unless required by applicable law or agreed to in writing, software
|
||||
// distributed under the License is distributed on an "AS IS" BASIS,
|
||||
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
// See the License for the specific language governing permissions and
|
||||
// limitations under the License.
|
||||
//
|
||||
//
|
||||
|
||||
#include <grpc/support/port_platform.h> |
||||
|
||||
#include "src/core/ext/xds/xds_client.h" |
||||
#include "src/core/lib/surface/api_trace.h" |
||||
#include "src/core/lib/surface/server.h" |
||||
|
||||
namespace grpc_core { |
||||
namespace { |
||||
|
||||
class XdsServerConfigFetcher : public grpc_server_config_fetcher { |
||||
public: |
||||
explicit XdsServerConfigFetcher(RefCountedPtr<XdsClient> xds_client) |
||||
: xds_client_(std::move(xds_client)) { |
||||
GPR_ASSERT(xds_client_ != nullptr); |
||||
} |
||||
|
||||
void StartWatch(std::string listening_address, |
||||
std::unique_ptr<grpc_server_config_fetcher::WatcherInterface> |
||||
watcher) override { |
||||
grpc_server_config_fetcher::WatcherInterface* watcher_ptr = watcher.get(); |
||||
auto listener_watcher = |
||||
absl::make_unique<ListenerWatcher>(std::move(watcher)); |
||||
auto* listener_watcher_ptr = listener_watcher.get(); |
||||
// TODO(yashykt): Get the resource name id from bootstrap
|
||||
xds_client_->WatchListenerData( |
||||
absl::StrCat("grpc/server?xds.resource.listening_address=", |
||||
listening_address), |
||||
std::move(listener_watcher)); |
||||
MutexLock lock(&mu_); |
||||
auto& watcher_state = watchers_[watcher_ptr]; |
||||
watcher_state.listening_address = listening_address; |
||||
watcher_state.listener_watcher = listener_watcher_ptr; |
||||
} |
||||
|
||||
void CancelWatch( |
||||
grpc_server_config_fetcher::WatcherInterface* watcher) override { |
||||
MutexLock lock(&mu_); |
||||
auto it = watchers_.find(watcher); |
||||
if (it != watchers_.end()) { |
||||
// Cancel the watch on the listener before erasing
|
||||
xds_client_->CancelListenerDataWatch(it->second.listening_address, |
||||
it->second.listener_watcher, |
||||
false /* delay_unsubscription */); |
||||
watchers_.erase(it); |
||||
} |
||||
} |
||||
|
||||
// Return the interested parties from the xds client so that it can be polled.
|
||||
grpc_pollset_set* interested_parties() override { |
||||
return xds_client_->interested_parties(); |
||||
} |
||||
|
||||
private: |
||||
class ListenerWatcher : public XdsClient::ListenerWatcherInterface { |
||||
public: |
||||
explicit ListenerWatcher( |
||||
std::unique_ptr<grpc_server_config_fetcher::WatcherInterface> |
||||
server_config_watcher) |
||||
: server_config_watcher_(std::move(server_config_watcher)) {} |
||||
|
||||
void OnListenerChanged(XdsApi::LdsUpdate listener) override { |
||||
// TODO(yashykt): Construct channel args according to received update
|
||||
server_config_watcher_->UpdateConfig(nullptr); |
||||
} |
||||
|
||||
void OnError(grpc_error* error) override { |
||||
gpr_log(GPR_ERROR, "ListenerWatcher:%p XdsClient reports error: %s", this, |
||||
grpc_error_string(error)); |
||||
GRPC_ERROR_UNREF(error); |
||||
// TODO(yashykt): We might want to bubble this error to the application.
|
||||
} |
||||
|
||||
void OnResourceDoesNotExist() override { |
||||
gpr_log(GPR_ERROR, |
||||
"ListenerWatcher:%p XdsClient reports requested listener does " |
||||
"not exist", |
||||
this); |
||||
// TODO(yashykt): We might want to bubble this error to the application.
|
||||
} |
||||
|
||||
private: |
||||
std::unique_ptr<grpc_server_config_fetcher::WatcherInterface> |
||||
server_config_watcher_; |
||||
}; |
||||
|
||||
struct WatcherState { |
||||
std::string listening_address; |
||||
ListenerWatcher* listener_watcher = nullptr; |
||||
}; |
||||
|
||||
RefCountedPtr<XdsClient> xds_client_; |
||||
Mutex mu_; |
||||
std::map<grpc_server_config_fetcher::WatcherInterface*, WatcherState> |
||||
watchers_; |
||||
}; |
||||
|
||||
} // namespace
|
||||
} // namespace grpc_core
|
||||
|
||||
grpc_server_config_fetcher* grpc_server_config_fetcher_xds_create() { |
||||
grpc_core::ApplicationCallbackExecCtx callback_exec_ctx; |
||||
grpc_core::ExecCtx exec_ctx; |
||||
GRPC_API_TRACE("grpc_server_config_fetcher_xds_create()", 0, ()); |
||||
grpc_error* error = GRPC_ERROR_NONE; |
||||
grpc_core::RefCountedPtr<grpc_core::XdsClient> xds_client = |
||||
grpc_core::XdsClient::GetOrCreate(&error); |
||||
if (error != GRPC_ERROR_NONE) { |
||||
gpr_log(GPR_ERROR, "Failed to create xds client: %s", |
||||
grpc_error_string(error)); |
||||
return nullptr; |
||||
} |
||||
return new grpc_core::XdsServerConfigFetcher(std::move(xds_client)); |
||||
} |
||||
Loading…
Reference in new issue