pkuwm opened a new pull request #950: Fix failure of dropping instance in TestCrushAutoRebalanceNonRack URL: https://github.com/apache/helix/pull/950 ### Issues - [ ] My PR addresses the following Helix issues and references them in the PR description: Fix one part of #939 ### Description - [ ] Here are some details about my PR, including screenshots of any UI changes: - What TestCrushAutoRebalanceNonRack is flaky. It could fail because of dropping instance failure. ``` 2020-04-13 01:01:32,366 [main] ERROR org.apache.helix.zookeeper.zkclient.ZkClient - Failed to delete /CLUSTER_TestCrushAutoRebalanceNonRack/INSTANCES/localhost_12921/MESSAGES org.apache.helix.zookeeper.zkclient.exception.ZkException: org.apache.zookeeper.KeeperException$NotEmptyException: KeeperErrorCode = Directory not empty for /CLUSTER_TestCrushAutoRebalanceNonRack/INSTANCES/localhost_12921/MESSAGES ``` - Why `ZkHelixAdmin.dropInstance()` has a retry. But in the log retry is not executed. The root cause is `ZkClient.deleteRecursively()` changes the throwing exception from HelixException to ZkClientException but `ZkHelixAdmin.dropInstance()` is still catching HelixException to retry. So ZkClientException is not caught and no retry to delete the path. - How To fix this, we need to catch `ZkClientException` instead of `HelixException`. And to make ZkHelixAdmin backward compatible, we also need to convert `ZkClientException` to `HelixException` to be re-thrown. ### Tests - [ ] The following tests are written for this issue: Enhance existing tests to verify the scenario when `ZkClientException` is thrown from ZkClient: - TestZkHelixAdmin.testZkHelixAdmin - TestZkBaseDataAccessor.testSyncRemove Enhance below to wait for the dropping instance to be offline: - TestCrushAutoRebalanceNonRack.testLackEnoughInstances - [ ] The following is the result of the "mvn test" command on the appropriate module: ``` [INFO] Tests run: 1121, Failures: 0, Errors: 0, Skipped: 1 [INFO] [INFO] ------------------------------------------------------------------------ [INFO] BUILD SUCCESS [INFO] ------------------------------------------------------------------------ [INFO] Total time: 01:13 h [INFO] Finished at: 2020-04-13T14:54:52-07:00 [INFO] ------------------------------------------------------------------------ ``` ### Commits - [ ] My commits all reference appropriate Apache Helix GitHub issues in their subject lines. In addition, my commits follow the guidelines from "[How to write a good git commit message](http://chris.beams.io/posts/git-commit/)": 1. Subject is separated from body by a blank line 1. Subject is limited to 50 characters (not including Jira issue reference) 1. Subject does not end with a period 1. Subject uses the imperative mood ("add", not "adding") 1. Body wraps at 72 characters 1. Body explains "what" and "why", not "how" ### Documentation (Optional) - [ ] In case of new functionality, my PR adds documentation in the following wiki page: (Link the GitHub wiki you added) ### Code Quality - [ ] My diff has been formatted using helix-style.xml (helix-style-intellij.xml if IntelliJ IDE is used)
---------------------------------------------------------------- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: [email protected] With regards, Apache Git Services --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
