diff options
author | 2018-06-12 14:06:33 -0700 | |
---|---|---|
committer | 2018-06-12 14:06:33 -0700 | |
commit | eb10abe94a32fcb7d0b2a5f1614717456ea07705 (patch) | |
tree | f8a8ecdcf3d74841abf2c94b82f818b294161da2 /src/core/ext/filters/client_channel/resolver | |
parent | 56e59ef6b03c73ecddf0954ee409a3f60ed5ea30 (diff) | |
parent | 4e8a2f5f273a9ef44499c9505c665df37ac507d5 (diff) |
Merge pull request #15648 from apolcyn/remove_fd_shutdown_already_closed
Remove already_closed param from fd_orphan
Diffstat (limited to 'src/core/ext/filters/client_channel/resolver')
-rw-r--r-- | src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_ev_driver_posix.cc | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_ev_driver_posix.cc b/src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_ev_driver_posix.cc index 151865cea7..f496e9694d 100644 --- a/src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_ev_driver_posix.cc +++ b/src/core/ext/filters/client_channel/resolver/dns/c_ares/grpc_ares_ev_driver_posix.cc @@ -104,17 +104,11 @@ static void fd_node_destroy(fd_node* fdn) { GPR_ASSERT(!fdn->writable_registered); GPR_ASSERT(fdn->already_shutdown); gpr_mu_destroy(&fdn->mu); - /* TODO: we need to pass a non-null "release_fd" parameter to - * grpc_fd_orphan because "epollsig" iomgr will close the fd - * even if "already_closed" is true, and it only leaves it open - * if "release_fd" is non-null. This is unlike the rest of the - * pollers, should this be changed within epollsig? */ - int dummy_release_fd; /* c-ares library has closed the fd inside grpc_fd. This fd may be picked up immediately by another thread, and should not be closed by the following grpc_fd_orphan. */ - grpc_fd_orphan(fdn->fd, nullptr, &dummy_release_fd, true /* already_closed */, - "c-ares query finished"); + int dummy_release_fd; + grpc_fd_orphan(fdn->fd, nullptr, &dummy_release_fd, "c-ares query finished"); gpr_free(fdn); } |