Fix ZooDelete in zookeeper client

Fix ZooDelete in zookeeper client to retry recoverable errors Closes-Bug #1692453 Change-Id: If9a9d10d8675acd181aeb2f8436c1aa944cbb13f
Juniper · May 24, 2017 · c130e97 · c130e97
1 parent 7e9e669
commit c130e97
Show file tree

Hide file tree

Showing 2 changed files with 30 additions and 1 deletion.
diff --git a/src/zookeeper/test/zookeeper_client_test.cc b/src/zookeeper/test/zookeeper_client_test.cc
@@ -212,6 +212,35 @@ TEST_F(ZookeeperClientTest, ZooCreateUnrecoverableError) {
     EXPECT_FALSE(cImpl->IsConnected());
 }
 
+TEST_F(ZookeeperClientTest, ZooDeleteRecoverableError) {
+    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));
+    int zkh(0xdeadbeef);
+    zhandle_t *zk_handle = (zhandle_t *)(&zkh);
+    EXPECT_CALL(*zmi, ZookeeperInit(StrEq("127.0.0.1:2181"), _, _, _, _, _))
+        .WillOnce(Return(zk_handle));
+    EXPECT_CALL(*zmi, ZooState(zk_handle))
+        .WillOnce(Return(ZOO_CONNECTED_STATE));
+    EXPECT_CALL(*zmi, ZooCreate(zk_handle, StrEq(zk_lock_name),
+        StrEq(zk_lock_id), zk_lock_id.length(), _, _, _, _))
+        .WillOnce(Return(ZOK));
+    EXPECT_TRUE(zk_lock.Lock());
+    EXPECT_TRUE(cImpl->IsConnected());
+    EXPECT_CALL(*zmi, ZooDelete(zk_handle, StrEq(zk_lock_name), _))
+        .WillOnce(Return(ZCONNECTIONLOSS))
+        .WillOnce(Return(ZOPERATIONTIMEOUT))
+        .WillOnce(Return(ZOK));
+    EXPECT_CALL(*zmi, ZookeeperClose(zk_handle));
+    EXPECT_TRUE(zk_lock.Release());
+    EXPECT_FALSE(cImpl->IsConnected());
+}
+
 int main(int argc, char **argv) {
     LoggingInit();
     ::testing::InitGoogleTest(&argc, argv);

diff --git a/src/zookeeper/zookeeper_client.cc b/src/zookeeper/zookeeper_client.cc
@@ -191,7 +191,7 @@ int ZookeeperClientImpl::DeleteNodeSync(const char *path, int *err) {
  retry:
     do {
         rc = zki_->ZooDelete(zk_handle_, path, -1);
-    } while (IsZooErrorUnrecoverable(rc));
+    } while (IsZooErrorRecoverable(rc));
     if (IsZooErrorUnrecoverable(rc)) {
         // Reconnect
         Reconnect();