Selaa lähdekoodia

Revert 1380931: ZOOKEEPER-1105 c client zookeeper_close not send CLOSE_OP
request to server (lincoln.lee via michim)


git-svn-id: https://svn.apache.org/repos/asf/zookeeper/trunk@1385378 13f79535-47bb-0310-9956-ffa450edef68

Michi Mutsuzaki 13 vuotta sitten
vanhempi
commit
146441c559
2 muutettua tiedostoa jossa 0 lisäystä ja 19 poistoa
  1. 0 3
      CHANGES.txt
  2. 0 16
      src/c/src/zookeeper.c

+ 0 - 3
CHANGES.txt

@@ -234,9 +234,6 @@ BUGFIXES:
   ZOOKEEPER-1328. Misplaced assertion for the test case 'FLELostMessageTest'
   and not identifying misfunctions. (Rakesh R via mahadev)
 
-  ZOOKEEPER-1105 c client zookeeper_close not send CLOSE_OP request to server
-  (lincoln.lee via michim)
-
   ZOOKEEPER-1380. zkperl: _zk_release_watch doesn't remove items properly from
   the watch list. (Botond Hejj via mahadev)
 

+ 0 - 16
src/c/src/zookeeper.c

@@ -2521,22 +2521,6 @@ int zookeeper_close(zhandle_t *zh)
         /* make sure the close request is sent; we set timeout to an arbitrary
          * (but reasonable) number of milliseconds since we want the call to block*/
         rc=adaptor_send_queue(zh, 3000);
-
-        /* make sure server has read the close request and sent back a response*/ 
-        struct pollfd fd_s[1];
-        fd_s[0].fd = zh->fd;
-        fd_s[0].events = POLLIN;
-        int ret = poll(fd_s, 1, 1000);
-        if (ret == 0) {
-            LOG_WARN(("Timeout when waitting for server's reply after sending a close request, sessionId=%#llx\n",
-                zh->client_id.client_id));
-        } else if (ret < 0) {
-            LOG_WARN(("System error happens when waitting for server's reply, sessionId=%#llx\n",
-                zh->client_id.client_id));
-        } else {
-            // do nothing
-        }
-
     }else{
         LOG_INFO(("Freeing zookeeper resources for sessionId=%#llx\n",
                 zh->client_id.client_id));