Merge "Keeping on retrying zookeeper_init forever" into R3.2

Juniper · Jan 31, 2017 · 357dd76 · 357dd76
2 parents 1aed849 + 379df67
commit 357dd76
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 29 deletions.
diff --git a/src/zookeeper/test/zookeeper_client_test.cc b/src/zookeeper/test/zookeeper_client_test.cc
@@ -85,20 +85,6 @@ TEST_F(ZookeeperClientTest, Basic) {
     EXPECT_FALSE(cImpl->IsConnected());
 }
 
-TEST_F(ZookeeperClientTest, ZookeeperInitFail) {
-    ZookeeperMockInterface *zmi(new ZookeeperMockInterface);
-    EXPECT_CALL(*zmi, ZooSetDebugLevel(_));
-    impl::ZookeeperClientImpl *cImpl(
-        new impl::ZookeeperClientImpl("Test", "127.0.0.1:2181", zmi));
-    std::auto_ptr<ZookeeperClient> client(CreateClient(cImpl));
-    std::string zk_lock_name("/test-lock");
-    ZookeeperLock zk_lock(client.get(), zk_lock_name.c_str());
-    std::string zk_lock_id(GetLockId(zk_lock));
-    EXPECT_CALL(*zmi, ZookeeperInit(StrEq("127.0.0.1:2181"), _, _, _, _, _));
-    EXPECT_FALSE(zk_lock.Lock());
-    EXPECT_FALSE(cImpl->IsConnected());
-}
-
 TEST_F(ZookeeperClientTest, ZooStateConnecting2Connect) {
     ZookeeperMockInterface *zmi(new ZookeeperMockInterface);
     EXPECT_CALL(*zmi, ZooSetDebugLevel(_));

diff --git a/src/zookeeper/zookeeper_client.cc b/src/zookeeper/zookeeper_client.cc
@@ -91,23 +91,12 @@ bool ZookeeperClientImpl::Connect() {
                                          NULL,
                                          NULL,
                                          0);
-        // Unfortunately, EINVAL is highly overloaded in zookeeper_init
-        // and can correspond to:
-        //   (1) Empty / invalid 'host' string format.
-        //   (2) Any getaddrinfo error other than EAI_NONAME,
-        //       EAI_NODATA, and EAI_MEMORY are mapped to EINVAL.
-        // Either way, retrying is not problematic.
-        if (zk_handle_ == NULL && errno == EINVAL) {
-            ZOO_LOG(WARN, "zookeeper_init FAILED: (" << errno <<
-                "): retrying in 1 second");
-            sleep(1);
-            continue;
-        }
         if (zk_handle_ == NULL) {
             int zerrno(errno);
-            ZOO_LOG_ERR("zookeeper_init returned NULL zhandle: ("
-                << zerrno << ")");
-            return false;
+            ZOO_LOG_ERR("zookeeper_init FAILED: (" << zerrno <<
+                "): servers: " << servers_ << " retrying in 1 second");
+            sleep(1);
+            continue;
         }
         // Block till session is connected
         while (!connected_) {