[ 
https://issues.apache.org/jira/browse/SOLR-8724?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=15163779#comment-15163779
 ] 

Steve Rowe edited comment on SOLR-8724 at 2/24/16 9:01 PM:
-----------------------------------------------------------

Patch, all Solr tests pass for me.

There is only one non-drop-in aspect: ZOOKEEPER-1506 makes private the 
previously public {{QuorumPeer.QuorumServer}} constructors used in 
{{SolrZkServerProps.parseProperties()}}, which was copied from ZK v3.2's 
{{QuorumPeerConfig}} (which {{SolrZkServerProps}} extends) and modified to 
"[allow] us to set a default for the data dir before parsing zoo.cfg (which 
validates that there is a dataDir)" (<- comment above {{SolrZkServerProps}}).

Rather than try to make more local modifications to this copy to allow it to 
compile, I've taken the tack of lifting the 3.4.8 version of 
{{QuorumPeerConfig.parseProperties()}} (which has quite a few config changes we 
should likely be supporting anyway), and then applying the same mods that had 
been made to Solr's version:

# Add {{@Override}} annotation
# Add above-described fallback for when the "myid" file can't be found
# Specify the encoding when opening the "myid" file (LUCENE-5560)

I made two additional changes:

# Added a differently-named copy in {{SolrZkServerProps}} of a private access 
data member referred to from the new {{parseProperties()}}: 
{{QuorumPeerConfig.MIN_SNAP_RETAIN_COUNT}}
# Commented out a call to set "myid" in MDC

If it weren't for that last item, I'd advocate for getting rid of this patched 
{{parseProperties()}} and directly calling the superclass version, catching the 
".../myid file is missing" {{IllegalArgumentException}}, and handling setting 
the server id in the catch block.

[~markrmil...@gmail.com], I'd appreciate your review.


was (Author: steve_rowe):
Patch, all Solr tests pass for me.

There is only one non-drop-in aspect: ZOOKEEPER-1506 makes private the 
previously public {{QuorumPeer.QuorumServer}} constructors used in 
{{SolrZkServerProps.parseProperties()}}, which was copied from ZK v3.2's 
{{QuorumPeerConfig}} (which {{SolrZkServerProps}} extends) and modified to 
"[allow] us to set a default for the data dir before parsing zoo.cfg (which 
validates that there is a dataDir)" (<- comment above {{SolrZkServerProps}}, 
which extends {{QuorumPeerConfig}}).

Rather than try to make more local modifications to this copy to allow it to 
compile, I've taken the tack of lifting the 3.4.8 version of 
{{QuorumPeerConfig.parseProperties()}} (which has quite a few config changes we 
should likely be supporting anyway), and then applying the same mods that had 
been made to Solr's version:

# Add {{@Override}} annotation
# Add above-described fallback for when the "myid" file can't be found
# Specify the encoding when opening the "myid" file (LUCENE-5560)

I made two additional changes:

# Added a differently-named copy in {{SolrZkServerProps}} of a private access 
data member referred to from the new {{parseProperties()}}: 
{{QuorumPeerConfig.MIN_SNAP_RETAIN_COUNT}}
# Commented out a call to set "myid" in MDC

If it weren't for that last item, I'd advocate for getting rid of this patched 
{{parseProperties()}} and directly calling the superclass version, catching the 
".../myid file is missing" {{IllegalArgumentException}}, and handling setting 
the server id in the catch block.

[~markrmil...@gmail.com], I'd appreciate your review.

> Upgrade Zookeeper to 3.4.8
> --------------------------
>
>                 Key: SOLR-8724
>                 URL: https://issues.apache.org/jira/browse/SOLR-8724
>             Project: Solr
>          Issue Type: Bug
>            Reporter: Steve Rowe
>             Fix For: master
>
>         Attachments: SOLR-8724.patch
>
>
> Zookeeper 3.4.8 was released a few days ago - we should upgrade.



--
This message was sent by Atlassian JIRA
(v6.3.4#6332)

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@lucene.apache.org
For additional commands, e-mail: dev-h...@lucene.apache.org

Reply via email to