You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by sa...@apache.org on 2018/01/29 19:23:05 UTC
[2/3] lucene-solr:master: SOLR-11658: ZK mentions: 3.4.10->3.4.11.
Also fixed CHANGES.txt attribution.
SOLR-11658: ZK mentions: 3.4.10->3.4.11. Also fixed CHANGES.txt attribution.
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/e6928d85
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/e6928d85
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/e6928d85
Branch: refs/heads/master
Commit: e6928d857ae6cd60b595036d0f7c01a7906e92da
Parents: c73bc6b
Author: Steve Rowe <sa...@apache.org>
Authored: Mon Jan 29 14:20:10 2018 -0500
Committer: Steve Rowe <sa...@apache.org>
Committed: Mon Jan 29 14:20:10 2018 -0500
----------------------------------------------------------------------
solr/CHANGES.txt | 4 ++--
.../src/adding-custom-plugins-in-solrcloud-mode.adoc | 2 +-
.../src/setting-up-an-external-zookeeper-ensemble.adoc | 6 +++---
solr/solr-ref-guide/src/zookeeper-access-control.adoc | 2 +-
4 files changed, 7 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/e6928d85/solr/CHANGES.txt
----------------------------------------------------------------------
diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt
index 8f0ea2a..ddd176e 100644
--- a/solr/CHANGES.txt
+++ b/solr/CHANGES.txt
@@ -26,7 +26,7 @@ Apache Tika 1.16
Carrot2 3.15.0
Velocity 1.7 and Velocity Tools 2.0
Apache UIMA 2.3.1
-Apache ZooKeeper 3.4.10
+Apache ZooKeeper 3.4.11
Jetty 9.3.20.v20170531
Upgrade Notes
@@ -235,7 +235,7 @@ Other Changes
* SOLR-11051: Use disk free metric in default cluster preferences (noble)
-* SOLR-11658: Upgrade ZooKeeper dependency to 3.4.11 (Steve Rowe, Erick Erickson)
+* SOLR-11658: Upgrade ZooKeeper dependency to 3.4.11 (Jason Gerlowski, Steve Rowe, Erick Erickson)
================== 7.2.1 ==================
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/e6928d85/solr/solr-ref-guide/src/adding-custom-plugins-in-solrcloud-mode.adoc
----------------------------------------------------------------------
diff --git a/solr/solr-ref-guide/src/adding-custom-plugins-in-solrcloud-mode.adoc b/solr/solr-ref-guide/src/adding-custom-plugins-in-solrcloud-mode.adoc
index 31ec775..c14e9adb 100644
--- a/solr/solr-ref-guide/src/adding-custom-plugins-in-solrcloud-mode.adoc
+++ b/solr/solr-ref-guide/src/adding-custom-plugins-in-solrcloud-mode.adoc
@@ -146,7 +146,7 @@ The `.der` files that are output from Step 2 should then be loaded to ZooKeeper
At the current time, you can only use the ZooKeeper `zkCli.sh` (or `zkCli.cmd` on Windows) script to issue these commands (the Solr version has the same name, but is not the same). If you have your own ZooKeeper ensemble running already, you can find the script in `$ZK_INSTALL/bin/zkCli.sh` (or `zkCli.cmd` if you are using Windows).
-NOTE: If you are running the embedded ZooKeeper that is included with Solr, you *do not* have this script already; in order to use it, you will need to download a copy of ZooKeeper v3.4.10 from http://zookeeper.apache.org/. Don't worry about configuring the download, you're just trying to get the command line utility script. When you start the script, you will connect to the embedded ZooKeeper.
+NOTE: If you are running the embedded ZooKeeper that is included with Solr, you *do not* have this script already; in order to use it, you will need to download a copy of ZooKeeper v3.4.11 from http://zookeeper.apache.org/. Don't worry about configuring the download, you're just trying to get the command line utility script. When you start the script, you will connect to the embedded ZooKeeper.
To load the keys, you will need to connect to ZooKeeper with `zkCli.sh`, create the directories, and then create the key file, as in the following example.
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/e6928d85/solr/solr-ref-guide/src/setting-up-an-external-zookeeper-ensemble.adoc
----------------------------------------------------------------------
diff --git a/solr/solr-ref-guide/src/setting-up-an-external-zookeeper-ensemble.adoc b/solr/solr-ref-guide/src/setting-up-an-external-zookeeper-ensemble.adoc
index 1834df5..ff23661 100644
--- a/solr/solr-ref-guide/src/setting-up-an-external-zookeeper-ensemble.adoc
+++ b/solr/solr-ref-guide/src/setting-up-an-external-zookeeper-ensemble.adoc
@@ -23,7 +23,7 @@ Shutting down a redundant Solr instance will also shut down its ZooKeeper server
The solution to this problem is to set up an external ZooKeeper ensemble. Fortunately, while this process can seem intimidating due to the number of powerful options, setting up a simple ensemble is actually quite straightforward, as described below.
.How Many ZooKeepers?
-[quote,ZooKeeper Administrator's Guide,http://zookeeper.apache.org/doc/r3.4.10/zookeeperAdmin.html]
+[quote,ZooKeeper Administrator's Guide,http://zookeeper.apache.org/doc/r3.4.11/zookeeperAdmin.html]
____
"For a ZooKeeper service to be active, there must be a majority of non-failing machines that can communicate with each other. *To create a deployment that can tolerate the failure of F machines, you should count on deploying 2xF+1 machines*. Thus, a deployment that consists of three machines can handle one failure, and a deployment of five machines can handle two failures. Note that a deployment of six machines can only handle two failures since three machines is not a majority.
@@ -36,7 +36,7 @@ It is generally recommended to have an odd number of ZooKeeper servers in your e
For example, if you only have two ZooKeeper nodes and one goes down, 50% of available servers is not a majority, so ZooKeeper will no longer serve requests. However, if you have three ZooKeeper nodes and one goes down, you have 66% of available servers available, and ZooKeeper will continue normally while you repair the one down node. If you have 5 nodes, you could continue operating with two down nodes if necessary.
-More information on ZooKeeper clusters is available from the ZooKeeper documentation at http://zookeeper.apache.org/doc/r3.4.10/zookeeperAdmin.html#sc_zkMulitServerSetup.
+More information on ZooKeeper clusters is available from the ZooKeeper documentation at http://zookeeper.apache.org/doc/r3.4.11/zookeeperAdmin.html#sc_zkMulitServerSetup.
== Download Apache ZooKeeper
@@ -46,7 +46,7 @@ The first step in setting up Apache ZooKeeper is, of course, to download the sof
====
When using stand-alone ZooKeeper, you need to take care to keep your version of ZooKeeper updated with the latest version distributed with Solr. Since you are using it as a stand-alone application, it does not get upgraded when you upgrade Solr.
-Solr currently uses Apache ZooKeeper v3.4.10.
+Solr currently uses Apache ZooKeeper v3.4.11.
====
== Setting Up a Single ZooKeeper
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/e6928d85/solr/solr-ref-guide/src/zookeeper-access-control.adoc
----------------------------------------------------------------------
diff --git a/solr/solr-ref-guide/src/zookeeper-access-control.adoc b/solr/solr-ref-guide/src/zookeeper-access-control.adoc
index 8766154..1880474 100644
--- a/solr/solr-ref-guide/src/zookeeper-access-control.adoc
+++ b/solr/solr-ref-guide/src/zookeeper-access-control.adoc
@@ -16,7 +16,7 @@
// specific language governing permissions and limitations
// under the License.
-This section describes using ZooKeeper access control lists (ACLs) with Solr. For information about ZooKeeper ACLs, see the ZooKeeper documentation at http://zookeeper.apache.org/doc/r3.4.10/zookeeperProgrammers.html#sc_ZooKeeperAccessControl.
+This section describes using ZooKeeper access control lists (ACLs) with Solr. For information about ZooKeeper ACLs, see the ZooKeeper documentation at http://zookeeper.apache.org/doc/r3.4.11/zookeeperProgrammers.html#sc_ZooKeeperAccessControl.
== About ZooKeeper ACLs