[
https://issues.apache.org/jira/browse/ZOOKEEPER-2080?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=15722835#comment-15722835
]
ASF GitHub Bot commented on ZOOKEEPER-2080:
-------------------------------------------
Github user hanm commented on a diff in the pull request:
https://github.com/apache/zookeeper/pull/92#discussion_r90916712
--- Diff: src/java/main/org/apache/zookeeper/server/quorum/QuorumPeer.java
---
@@ -1390,24 +1406,29 @@ public QuorumVerifier configFromString(String s)
throws IOException, ConfigExcep
}
/**
- * Return QuorumVerifier object for the last committed configuration
+ * Return QuorumVerifier object for the last committed configuration.
*/
-
- public synchronized QuorumVerifier getQuorumVerifier(){
- return quorumVerifier;
-
+ public QuorumVerifier getQuorumVerifier(){
+ synchronized (qvLock) {
+ return quorumVerifier;
+ }
}
- public synchronized QuorumVerifier getLastSeenQuorumVerifier(){
- return lastSeenQuorumVerifier;
+ /**
+ * Return QuorumVerifier object for the last proposed configuration.
+ */
+ public QuorumVerifier getLastSeenQuorumVerifier(){
+ synchronized (qvLock) {
+ return lastSeenQuorumVerifier;
+ }
}
- public synchronized void connectNewPeers(){
- if (qcm!=null && getQuorumVerifier()!=null &&
getLastSeenQuorumVerifier()!=null) {
- Map<Long, QuorumServer> committedView =
getQuorumVerifier().getAllMembers();
- for (Entry<Long, QuorumServer> e:
getLastSeenQuorumVerifier().getAllMembers().entrySet()){
+ private void connectNewPeers(){
--- End diff --
@lvfangmin Good suggestion, PR updated. Thanks for double checking.
> ReconfigRecoveryTest fails intermittently
> -----------------------------------------
>
> Key: ZOOKEEPER-2080
> URL: https://issues.apache.org/jira/browse/ZOOKEEPER-2080
> Project: ZooKeeper
> Issue Type: Sub-task
> Reporter: Ted Yu
> Assignee: Michael Han
> Fix For: 3.5.3, 3.6.0
>
> Attachments: ZOOKEEPER-2080.patch, ZOOKEEPER-2080.patch,
> ZOOKEEPER-2080.patch, ZOOKEEPER-2080.patch, ZOOKEEPER-2080.patch,
> ZOOKEEPER-2080.patch, jacoco-ZOOKEEPER-2080.unzip-grows-to-70MB.7z,
> repro-20150816.log, threaddump.log
>
>
> I got the following test failure on MacBook with trunk code:
> {code}
> Testcase: testCurrentObserverIsParticipantInNewConfig took 93.628 sec
> FAILED
> waiting for server 2 being up
> junit.framework.AssertionFailedError: waiting for server 2 being up
> at
> org.apache.zookeeper.server.quorum.ReconfigRecoveryTest.testCurrentObserverIsParticipantInNewConfig(ReconfigRecoveryTest.java:529)
> at
> org.apache.zookeeper.JUnit4ZKTestRunner$LoggedInvokeMethod.evaluate(JUnit4ZKTestRunner.java:52)
> {code}
--
This message was sent by Atlassian JIRA
(v6.3.4#6332)
