Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

CURATOR-588 Upgrade ZooKeeper to 3.6.3 #386

Merged
merged 3 commits into from Jul 6, 2021
Merged

CURATOR-588 Upgrade ZooKeeper to 3.6.3 #386

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b549744
Upgrade ZK to 3.6.3
eolivelli Jun 28, 2021
aaa6bdc
Update pom.xml
eolivelli Jul 2, 2021
49919bc
Fix ZK 3.5 compatibility test
eolivelli Jul 5, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
6 changes: 5 additions & 1 deletion curator-framework/src/test/java/org/apache/curator/framework/imps/TestFrameworkEdges.java
View file
Open in desktop
Expand Up @@ -670,9 +670,13 @@ public void testFailure() throws Exception
client.checkExists().forPath("/hey");
fail();
}
catch ( KeeperException.SessionExpiredException e )
{
// correct, this happens on ZK 3.6.3+
Copy link
Member

@tisonkun tisonkun Jul 5, 2021 •
edited

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why? Shall we add a link to the reason?

It is a bit weird a patch version bump cause behavior changes.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I really do not know why this is happening.
I have looked thru ZK 3.6.3 release notes and I haven't found anything that may be releated.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Fine. It is not a blocker for client library such as Curator, but is interesting...

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

probably Session Expiration is happening earlier with 3.6.3
with 3.6.2 we still see a ConnectionLoss, that usually becomes a SessionExpired when the client is able to connect again and the ZK server already expired it on the server side

}
catch ( KeeperException.ConnectionLossException e )
{
// correct
// correct, this happens on ZK 3.5.x, 3.6.0 -> 3.6.2
}
finally
{
Expand Down
2 changes: 1 addition & 1 deletion curator-test/src/main/java/org/apache/curator/test/TestingQuorumPeerMain.java
View file
Open in desktop
Expand Up @@ -60,7 +60,7 @@ public QuorumPeer getTestingQuorumPeer()
}

@Override
public void close() throws IOException
public void close()
{
if ( (quorumPeer != null) && !isClosed )
{
Expand Down
6 changes: 4 additions & 2 deletions pom.xml
View file
Open in desktop
Expand Up @@ -66,8 +66,10 @@
<short-jdk-version>8</short-jdk-version>
<jdk-version>1.${short-jdk-version}</jdk-version>

<redirectTestOutputToFile>true</redirectTestOutputToFile>

<!-- versions -->
<zookeeper-version>3.6.0</zookeeper-version>
<zookeeper-version>3.6.3</zookeeper-version>
<maven-bundle-plugin-version>5.1.1</maven-bundle-plugin-version>
<maven-javadoc-plugin-version>3.0.1</maven-javadoc-plugin-version>
<doxia-module-confluence-version>1.8</doxia-module-confluence-version>
Expand Down Expand Up @@ -772,7 +774,7 @@
<configuration>
<threadCount>1</threadCount>
<reuseForks>false</reuseForks>
<redirectTestOutputToFile>true</redirectTestOutputToFile>
<redirectTestOutputToFile>${redirectTestOutputToFile}</redirectTestOutputToFile>
<rerunFailingTestsCount>2</rerunFailingTestsCount>
</configuration>
</plugin>
Expand Down