grpc 1.8.0 → 1.8.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 74a77c78abce7257fdaa25cfb65ecb7f83b27e4ad28b4b666a4feed7e4b27c08
-  data.tar.gz: 85b19a9083cc8cfd345983e005fcf0ce781521e0ead7b17597d1ab83fbcfb066
+  metadata.gz: '0608a89917ee43dca921f344a0e999259a4359f188cae5bf21f09f08298d66da'
+  data.tar.gz: 8c5a07aef607e15c825f21ff993e761542c27bc5e2539945a78e20617f6bfe36
 SHA512:
-  metadata.gz: 4d3bc3185b76aeed824be5e086b60f0f66dda03211d601daf5067eb48ccbb69807eef5fd3429fed4ccbb8e7ef0cc672bc143faabdf9578bcba5fa2ff24edac98
-  data.tar.gz: 1f22737f1fbd9ae2c9d84c37107811f4e89301866e109b17bafc0487a8dbd9a7c59f821be45ef689a04bd1edc69718d897b9a7f55b1ba167aea147903b8207b2
+  metadata.gz: '09c712f7d2136cf6582b103412c93726f36de3d2ad8a52f14432be730b0edfc1891cc3920d8375a64143304480a7459d04b988d360dade90dbdc0980ef94070e'
+  data.tar.gz: 92d5ff1d379b7caf349974f4665e4b489f4cb2d7d380d95fc5fab5f2eb1b09f414741754215966afd7f3d214c61b9ed6fce386e7fbe262854113548ff0034505

data/Makefile

@@ -412,8 +412,8 @@ Q = @
 endif
 
 CORE_VERSION = 5.0.0
-CPP_VERSION = 1.8.0
-CSHARP_VERSION = 1.8.0
+CPP_VERSION = 1.8.3
+CSHARP_VERSION = 1.8.3
 
 CPPFLAGS_NO_ARCH += $(addprefix -I, $(INCLUDES)) $(addprefix -D, $(DEFINES))
 CPPFLAGS += $(CPPFLAGS_NO_ARCH) $(ARCH_FLAGS)

data/src/core/lib/iomgr/ev_epoll1_linux.cc

@@ -1258,8 +1258,6 @@ const grpc_event_engine_vtable* grpc_init_epoll1_linux(bool explicit_request) {
 /* If GRPC_LINUX_EPOLL is not defined, it means epoll is not available. Return
  * NULL */
 const grpc_event_engine_vtable* grpc_init_epoll1_linux(bool explicit_request) {
-  gpr_log(GPR_ERROR,
-          "Skipping epoll1 becuase GRPC_LINUX_EPOLL is not defined.");
   return NULL;
 }
 #endif /* defined(GRPC_POSIX_SOCKET) */

data/src/core/lib/iomgr/ev_epollex_linux.cc

@@ -1479,8 +1479,6 @@ const grpc_event_engine_vtable* grpc_init_epollex_linux(
  * NULL */
 const grpc_event_engine_vtable* grpc_init_epollex_linux(
     bool explicitly_requested) {
-  gpr_log(GPR_ERROR,
-          "Skipping epollex becuase GRPC_LINUX_EPOLL is not defined.");
   return NULL;
 }
 #endif /* defined(GRPC_POSIX_SOCKET) */

data/src/core/lib/iomgr/ev_epollsig_linux.cc

@@ -1758,8 +1758,6 @@ const grpc_event_engine_vtable* grpc_init_epollsig_linux(
  * NULL */
 const grpc_event_engine_vtable* grpc_init_epollsig_linux(
     bool explicit_request) {
-  gpr_log(GPR_ERROR,
-          "Skipping epollsig becuase GRPC_LINUX_EPOLL is not defined.");
   return NULL;
 }
 #endif /* defined(GRPC_POSIX_SOCKET) */

data/src/core/lib/iomgr/ev_poll_posix.cc

@@ -71,6 +71,7 @@ struct grpc_fd {
   int shutdown;
   int closed;
   int released;
+  gpr_atm pollhup;
   grpc_error* shutdown_error;
 
   /* The watcher list.
@@ -339,6 +340,7 @@ static grpc_fd* fd_create(int fd, const char* name) {
   r->on_done_closure = nullptr;
   r->closed = 0;
   r->released = 0;
+  gpr_atm_no_barrier_store(&r->pollhup, 0);
   r->read_notifier_pollset = nullptr;
 
   char* name2;
@@ -964,7 +966,8 @@ static grpc_error* pollset_work(grpc_exec_ctx* exec_ctx, grpc_pollset* pollset,
       pfds[0].events = POLLIN;
       pfds[0].revents = 0;
       for (i = 0; i < pollset->fd_count; i++) {
-        if (fd_is_orphaned(pollset->fds[i])) {
+        if (fd_is_orphaned(pollset->fds[i]) ||
+            gpr_atm_no_barrier_load(&pollset->fds[i]->pollhup) == 1) {
           GRPC_FD_UNREF(pollset->fds[i], "multipoller");
         } else {
           pollset->fds[fd_count++] = pollset->fds[i];
@@ -1031,6 +1034,12 @@ static grpc_error* pollset_work(grpc_exec_ctx* exec_ctx, grpc_pollset* pollset,
                       pfds[i].fd, (pfds[i].revents & POLLIN_CHECK) != 0,
                       (pfds[i].revents & POLLOUT_CHECK) != 0, pfds[i].revents);
             }
+            /* This is a mitigation to prevent poll() from spinning on a
+             ** POLLHUP https://github.com/grpc/grpc/pull/13665
+             */
+            if (pfds[i].revents & POLLHUP) {
+              gpr_atm_no_barrier_store(&watchers[i].fd->pollhup, 1);
+            }
             fd_end_poll(exec_ctx, &watchers[i], pfds[i].revents & POLLIN_CHECK,
                         pfds[i].revents & POLLOUT_CHECK, pollset);
           }

data/src/core/lib/iomgr/tcp_client_windows.cc

@@ -104,6 +104,7 @@ static void on_connect(grpc_exec_ctx* exec_ctx, void* acp, grpc_error* error) {
       GPR_ASSERT(transfered_bytes == 0);
       if (!wsa_success) {
         error = GRPC_WSA_ERROR(WSAGetLastError(), "ConnectEx");
+        closesocket(socket->socket);
       } else {
         *ep =
             grpc_tcp_create(exec_ctx, socket, ac->channel_args, ac->addr_name);

data/src/ruby/lib/grpc/version.rb

@@ -14,5 +14,5 @@
 
 # GRPC contains the General RPC module.
 module GRPC
-  VERSION = '1.8.0'
+  VERSION = '1.8.3'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: grpc
 version: !ruby/object:Gem::Version
-  version: 1.8.0
+  version: 1.8.3
 platform: ruby
 authors:
 - gRPC Authors
 autorequire: 
 bindir: src/ruby/bin
 cert_chain: []
-date: 2017-12-13 00:00:00.000000000 Z
+date: 2018-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: google-protobuf
@@ -1433,7 +1433,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.3
+rubygems_version: 2.7.4
 signing_key: 
 specification_version: 4
 summary: GRPC system in Ruby