diff options
| author |  Jan Tattermusch <jtattermusch@users.noreply.github.com> | 2018-02-05 12:09:17 -0500 |
|---|---|---|
| committer |  GitHub <noreply@github.com> | 2018-02-05 12:09:17 -0500 |
| commit | b1f5d59b4fb567cdcc6786122d7bfcbd698f9af0 (patch) | |
| tree | 6d7eea5c8ad54a0d708c996083220fc337a1251d /src/core | |
| parent | ed5e27070a2784d042d2ca03c350ac55d2f49053 (diff) | |
| parent | af66bedd11add091bebfdf4e8b60dbdce237aee9 (diff) | |
Merge pull request #14272 from ncteisen/bug-chasing
Fix resource_quota bug
Diffstat (limited to 'src/core')
| -rw-r--r-- | src/core/lib/iomgr/ev_poll_posix.cc | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/src/core/lib/iomgr/ev_poll_posix.cc b/src/core/lib/iomgr/ev_poll_posix.cc index ad92a93beb..8ccc256222 100644 --- a/src/core/lib/iomgr/ev_poll_posix.cc +++ b/src/core/lib/iomgr/ev_poll_posix.cc @@ -457,16 +457,20 @@ static grpc_error* fd_shutdown_error(grpc_fd* fd) { if (!fd->shutdown) { return GRPC_ERROR_NONE; } else { - return GRPC_ERROR_CREATE_REFERENCING_FROM_STATIC_STRING( - "FD shutdown", &fd->shutdown_error, 1); + return grpc_error_set_int(GRPC_ERROR_CREATE_REFERENCING_FROM_STATIC_STRING( + "FD shutdown", &fd->shutdown_error, 1), + GRPC_ERROR_INT_GRPC_STATUS, + GRPC_STATUS_UNAVAILABLE); } } static void notify_on_locked(grpc_fd* fd, grpc_closure** st, grpc_closure* closure) { if (fd->shutdown || gpr_atm_no_barrier_load(&fd->pollhup)) { - GRPC_CLOSURE_SCHED(closure, - GRPC_ERROR_CREATE_FROM_STATIC_STRING("FD shutdown")); + GRPC_CLOSURE_SCHED( + closure, grpc_error_set_int( + GRPC_ERROR_CREATE_FROM_STATIC_STRING("FD shutdown"), + GRPC_ERROR_INT_GRPC_STATUS, GRPC_STATUS_UNAVAILABLE)); } else if (*st == CLOSURE_NOT_READY) { /* not ready ==> switch to a waiting state by setting the closure */ *st = closure; |