natas_hw
/
grpc
0
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[thready-tsan] Make sure the DNS resolver can complete callbacks (#36825) 

Closes #36825

COPYBARA_INTEGRATE_REVIEW=https://github.com/grpc/grpc/pull/36825 from ctiller:csc 53928bdcb1
PiperOrigin-RevId: 640689749
This commit is contained in:
Craig Tiller 2024-06-05 16:37:51 -07:00 committed by Copybara-Service
parent 6814867e78
commit 51d1d7ca1b
2 changed files with 18 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/core/lib/event_engine/thready_event_engine/thready_event_engine.cc
View File

@ -85,7 +85,9 @@ bool ThreadyEventEngine::IsWorkerThread() {
absl::StatusOr<std::unique_ptr<EventEngine::DNSResolver>> absl::StatusOr<std::unique_ptr<EventEngine::DNSResolver>>
ThreadyEventEngine::GetDNSResolver( ThreadyEventEngine::GetDNSResolver(
const DNSResolver::ResolverOptions& options) { const DNSResolver::ResolverOptions& options) {
return std::make_unique<ThreadyDNSResolver>(*impl_->GetDNSResolver(options)); return std::make_unique<ThreadyDNSResolver>(
*impl_->GetDNSResolver(options),
std::static_pointer_cast<ThreadyEventEngine>(shared_from_this()));
} }
void ThreadyEventEngine::Run(Closure* closure) { void ThreadyEventEngine::Run(Closure* closure) {
@ -116,10 +118,10 @@ void ThreadyEventEngine::ThreadyDNSResolver::LookupHostname(
LookupHostnameCallback on_resolve, absl::string_view name, LookupHostnameCallback on_resolve, absl::string_view name,
absl::string_view default_port) { absl::string_view default_port) {
return impl_->LookupHostname( return impl_->LookupHostname(
[this, on_resolve = std::move(on_resolve)]( [engine = engine_, on_resolve = std::move(on_resolve)](
absl::StatusOr<std::vector<ResolvedAddress>> addresses) mutable { absl::StatusOr<std::vector<ResolvedAddress>> addresses) mutable {
engine_->Asynchronously([on_resolve = std::move(on_resolve), engine->Asynchronously([on_resolve = std::move(on_resolve),
addresses = std::move(addresses)]() mutable { addresses = std::move(addresses)]() mutable {
on_resolve(std::move(addresses)); on_resolve(std::move(addresses));
}); });
}, },
@ -129,13 +131,12 @@ void ThreadyEventEngine::ThreadyDNSResolver::LookupHostname(
void ThreadyEventEngine::ThreadyDNSResolver::LookupSRV( void ThreadyEventEngine::ThreadyDNSResolver::LookupSRV(
LookupSRVCallback on_resolve, absl::string_view name) { LookupSRVCallback on_resolve, absl::string_view name) {
return impl_->LookupSRV( return impl_->LookupSRV(
[this, on_resolve = std::move(on_resolve)]( [engine = engine_, on_resolve = std::move(on_resolve)](
absl::StatusOr<std::vector<SRVRecord>> records) mutable { absl::StatusOr<std::vector<SRVRecord>> records) mutable {
return engine_->Asynchronously( return engine->Asynchronously([on_resolve = std::move(on_resolve),
[on_resolve = std::move(on_resolve), records = std::move(records)]() mutable {
records = std::move(records)]() mutable { on_resolve(std::move(records));
on_resolve(std::move(records)); });
});
}, },
name); name);
} }
@ -143,10 +144,10 @@ void ThreadyEventEngine::ThreadyDNSResolver::LookupSRV(
void ThreadyEventEngine::ThreadyDNSResolver::LookupTXT( void ThreadyEventEngine::ThreadyDNSResolver::LookupTXT(
LookupTXTCallback on_resolve, absl::string_view name) { LookupTXTCallback on_resolve, absl::string_view name) {
return impl_->LookupTXT( return impl_->LookupTXT(
[this, on_resolve = std::move(on_resolve)]( [engine = engine_, on_resolve = std::move(on_resolve)](
absl::StatusOr<std::vector<std::string>> record) mutable { absl::StatusOr<std::vector<std::string>> record) mutable {
return engine_->Asynchronously([on_resolve = std::move(on_resolve), return engine->Asynchronously([on_resolve = std::move(on_resolve),
record = std::move(record)]() mutable { record = std::move(record)]() mutable {
on_resolve(std::move(record)); on_resolve(std::move(record));
}); });
}, },

7
src/core/lib/event_engine/thready_event_engine/thready_event_engine.h
View File

@ -77,8 +77,9 @@ class ThreadyEventEngine final : public EventEngine {
private: private:
class ThreadyDNSResolver final : public DNSResolver { class ThreadyDNSResolver final : public DNSResolver {
public: public:
explicit ThreadyDNSResolver(std::unique_ptr<DNSResolver> impl) ThreadyDNSResolver(std::unique_ptr<DNSResolver> impl,
: impl_(std::move(impl)) {} std::shared_ptr<ThreadyEventEngine> engine)
: impl_(std::move(impl)), engine_(std::move(engine)) {}
void LookupHostname(LookupHostnameCallback on_resolve, void LookupHostname(LookupHostnameCallback on_resolve,
absl::string_view name, absl::string_view name,
absl::string_view default_port) override; absl::string_view default_port) override;
@ -89,7 +90,7 @@ class ThreadyEventEngine final : public EventEngine {
private: private:
std::unique_ptr<DNSResolver> impl_; std::unique_ptr<DNSResolver> impl_;
ThreadyEventEngine* engine_; std::shared_ptr<ThreadyEventEngine> engine_;
}; };
void Asynchronously(absl::AnyInvocable<void()> fn); void Asynchronously(absl::AnyInvocable<void()> fn);