This is an automated email from the ASF dual-hosted git repository.
oleewere pushed a commit to branch branch-2.7
in repository https://gitbox.apache.org/repos/asf/ambari.git
The following commit(s) were added to refs/heads/branch-2.7 by this push:
new 17ff45d AMBARI-24746. Upgrade Solr version to 7.5.0 (#2452)
17ff45d is described below
commit 17ff45d0c9e1d1ef1185a0581ec95a9011ab4135
Author: Olivér Szabó <[email protected]>
AuthorDate: Fri Oct 12 18:37:07 2018 +0200
AMBARI-24746. Upgrade Solr version to 7.5.0 (#2452)
---
ambari-infra/ambari-infra-manager/docker/docker-compose.yml | 2 +-
.../ambari-infra-manager/docker/infra-manager-docker-compose.sh | 2 +-
ambari-infra/ambari-infra-solr-client/README.md | 8 ++++----
.../ambari-infra-solr-client/src/main/python/migrationHelper.py | 2 +-
.../src/main/resources/solrIndexHelper.sh | 8 ++++----
.../ambari-infra-solr-plugin/docker/infra-solr-docker-compose.sh | 2 +-
ambari-infra/pom.xml | 2 +-
.../src/main/configsets/audit_logs/conf/solrconfig.xml | 2 +-
.../src/main/configsets/hadoop_logs/conf/solrconfig.xml | 2 +-
.../src/main/configsets/history/conf/solrconfig.xml | 2 +-
ambari-logsearch/docker/Dockerfile | 2 +-
ambari-logsearch/docker/docker-compose.yml | 2 +-
ambari-logsearch/docker/logsearch-docker.sh | 2 +-
ambari-logsearch/docker/solr.yml | 2 +-
ambari-logsearch/docker/sso.yml | 2 +-
ambari-logsearch/pom.xml | 2 +-
.../java/org/apache/ambari/server/upgrade/UpgradeCatalog271.java | 8 ++++----
.../LOGSEARCH/0.5.0/properties/audit_logs-solrconfig.xml.j2 | 2 +-
.../LOGSEARCH/0.5.0/properties/service_logs-solrconfig.xml.j2 | 2 +-
19 files changed, 28 insertions(+), 28 deletions(-)
diff --git a/ambari-infra/ambari-infra-manager/docker/docker-compose.yml
b/ambari-infra/ambari-infra-manager/docker/docker-compose.yml
index 2369d85..c031cd7 100644
--- a/ambari-infra/ambari-infra-manager/docker/docker-compose.yml
+++ b/ambari-infra/ambari-infra-manager/docker/docker-compose.yml
@@ -27,7 +27,7 @@ services:
ZOO_SERVERS: server.1=zookeeper:2888:3888
solr:
# TODO: use infra-solr
- image: solr:${SOLR_VERSION:-7.4.0}
+ image: solr:${SOLR_VERSION:-7.5.0}
restart: always
hostname: solr
ports:
diff --git
a/ambari-infra/ambari-infra-manager/docker/infra-manager-docker-compose.sh
b/ambari-infra/ambari-infra-manager/docker/infra-manager-docker-compose.sh
index 5271909..531440d 100755
--- a/ambari-infra/ambari-infra-manager/docker/infra-manager-docker-compose.sh
+++ b/ambari-infra/ambari-infra-manager/docker/infra-manager-docker-compose.sh
@@ -72,7 +72,7 @@ AMBARI_LOCATION=$AMBARI_LOCATION
ZOOKEEPER_VERSION=3.4.10
ZOOKEEPER_CONNECTION_STRING=zookeeper:2181
-SOLR_VERSION=7.4.0
+SOLR_VERSION=7.5.0
HADOOP_VERSION=3.0.0
EOF
diff --git a/ambari-infra/ambari-infra-solr-client/README.md
b/ambari-infra/ambari-infra-solr-client/README.md
index 2b6d004..24218eb 100644
--- a/ambari-infra/ambari-infra-solr-client/README.md
+++ b/ambari-infra/ambari-infra-solr-client/README.md
@@ -472,7 +472,7 @@ If the script finished successfully and everything looks
green on Ambari UI as w
Migration for `ranger_audits` collection (cores):
```bash
-# by default, you will mirate to Lucene 6.6.2, if you want to migrate again to
Solr 7 (not requred), you can use --version 7.4.0 flag
+# by default, you will mirate to Lucene 6.6.2, if you want to migrate again to
Solr 7 (not requred), you can use --version 7.5.0 flag
/usr/lib/ambari-infra-solr-client/migrationHelper.py --ini-file
$CONFIG_INI_LOCATION --action migrate -s RANGER
```
@@ -487,7 +487,7 @@ infra-lucene-index-tool upgrade-index -d /tmp/ranger-backup
-f -b -g
# with 'infra-lucene-index-tool help' command you can checkout the command
line options
```
-By default, the tool will migrate from lucene version 5 to lucene version
6.6.2. (that's ok for Solr 7) If you want a lucene 7 index, you will need to
re-run the migration tool command with `-v 7.4.0` option.
+By default, the tool will migrate from lucene version 5 to lucene version
6.6.2. (that's ok for Solr 7) If you want a lucene 7 index, you will need to
re-run the migration tool command with `-v 7.5.0` option.
#### <a id="v/2.-migrate-atlas-collections">VI/2. Migrate Atlas collections</a>
@@ -509,7 +509,7 @@ infra-lucene-index-tool upgrade-index -d
/tmp/fulltext_index_backup -f -b -g
# with 'infra-lucene-index-tool help' command you can checkout the command
line options
```
-By default, the tool will migrate from lucene version 5 to lucene version
6.6.2. (that's ok for Solr 7) If you want a lucene 7 index, you will need to
re-run the migration tool command with `-v 7.4.0` option.
+By default, the tool will migrate from lucene version 5 to lucene version
6.6.2. (that's ok for Solr 7) If you want a lucene 7 index, you will need to
re-run the migration tool command with `-v 7.5.0` option.
### <a id="vi.-restore-collections">VII. Restore Collections</a>
@@ -852,7 +852,7 @@ Options:
location of the index backups (for ranger). required
only if no backup path in the ini file
--version=INDEX_VERSION
- lucene index version for migration (6.6.2 or 7.4.0)
+ lucene index version for migration (6.6.2 or 7.5.0)
--solr-async-request-tries=SOLR_ASYNC_REQUEST_TRIES
number of max tries for async Solr requests (e.g.:
delete operation)
diff --git
a/ambari-infra/ambari-infra-solr-client/src/main/python/migrationHelper.py
b/ambari-infra/ambari-infra-solr-client/src/main/python/migrationHelper.py
index 498c61b..911bc52 100755
--- a/ambari-infra/ambari-infra-solr-client/src/main/python/migrationHelper.py
+++ b/ambari-infra/ambari-infra-solr-client/src/main/python/migrationHelper.py
@@ -1913,7 +1913,7 @@ if __name__=="__main__":
parser.add_option("--atlas-index-location", dest="atlas_index_location",
type="string", help="location of the index backups (for atlas). required only
if no backup path in the ini file")
parser.add_option("--ranger-index-location", dest="ranger_index_location",
type="string", help="location of the index backups (for ranger). required only
if no backup path in the ini file")
- parser.add_option("--version", dest="index_version", type="string",
default="6.6.2", help="lucene index version for migration (6.6.2 or 7.4.0)")
+ parser.add_option("--version", dest="index_version", type="string",
default="6.6.2", help="lucene index version for migration (6.6.2 or 7.5.0)")
parser.add_option("--solr-async-request-tries",
dest="solr_async_request_tries", type="int", default=400, help="number of max
tries for async Solr requests (e.g.: delete operation)")
parser.add_option("--request-tries", dest="request_tries", type="int",
help="number of tries for BACKUP/RESTORE status api calls in the request")
parser.add_option("--request-time-interval", dest="request_time_interval",
type="int", help="time interval between BACKUP/RESTORE status api calls in the
request")
diff --git
a/ambari-infra/ambari-infra-solr-client/src/main/resources/solrIndexHelper.sh
b/ambari-infra/ambari-infra-solr-client/src/main/resources/solrIndexHelper.sh
index 5cd5b5f..ab84546 100755
---
a/ambari-infra/ambari-infra-solr-client/src/main/resources/solrIndexHelper.sh
+++
b/ambari-infra/ambari-infra-solr-client/src/main/resources/solrIndexHelper.sh
@@ -43,7 +43,7 @@ function print_help() {
-b, --backup-enabled Use indexer tool with backup
snapshots. (core filter won't be used)
-g, --debug Enable debug mode, IndexUpgrader
output will be verbose.
-f, --force Force to start index upgrade,
even is the version is at least 6.
- -v, --version Lucene version to upgrade
(default: 6.6.2, available: 6.6.2, 7.4.0)
+ -v, --version Lucene version to upgrade
(default: 6.6.2, available: 6.6.2, 7.5.0)
EOF
}
@@ -51,7 +51,7 @@ function upgrade_core() {
local INDEX_DIR=${1:?"usage: <index_base_dir> e.g.:
/opt/ambari_infra_solr/data"}
local FORCE_UPDATE=${2:?"usage <force_update_flag> e.g.: true"}
local SOLR_CORE_FILTERS=${3:?"usage: <comma separated core filters> e.g.:
hadoop_logs,audit_logs,history"}
- local LUCENE_VERSION=${4:?"usage <lucene_index_version> e.g.: 7.4.0"}
+ local LUCENE_VERSION=${4:?"usage <lucene_index_version> e.g.: 7.5.0"}
local BACKUP_MODE=${5:?"usage <backup_mode_enabled> e.g.: true"}
local DEBUG_MODE=${6:?"usage <debug_mode> e.g.: true"}
SOLR_CORE_FILTER_ARR=$(echo $SOLR_CORE_FILTERS | sed "s/,/ /g")
@@ -204,12 +204,12 @@ function upgrade_index() {
function upgrade_index_tool() {
# see: https://cwiki.apache.org/confluence/display/solr/IndexUpgrader+Tool
- : ${INDEX_VERSION:?"Please set the INDEX_VERSION variable! (6.6.2 or 7.4.0)"}
+ : ${INDEX_VERSION:?"Please set the INDEX_VERSION variable! (6.6.2 or 7.5.0)"}
PATH=$JAVA_HOME/bin:$PATH $JVM -classpath
"$DIR/migrate/lucene-core-$INDEX_VERSION.jar:$DIR/migrate/lucene-backward-codecs-$INDEX_VERSION.jar"
org.apache.lucene.index.IndexUpgrader ${@}
}
function check_index_tool() {
- : ${INDEX_VERSION:?"Please set the INDEX_VERSION variable! (6.6.2 or 7.4.0)"}
+ : ${INDEX_VERSION:?"Please set the INDEX_VERSION variable! (6.6.2 or 7.5.0)"}
PATH=$JAVA_HOME/bin:$PATH $JVM -classpath
"$DIR/migrate/lucene-core-$INDEX_VERSION.jar:$DIR/migrate/lucene-backward-codecs-$INDEX_VERSION.jar"
org.apache.lucene.index.CheckIndex ${@}
}
diff --git
a/ambari-infra/ambari-infra-solr-plugin/docker/infra-solr-docker-compose.sh
b/ambari-infra/ambari-infra-solr-plugin/docker/infra-solr-docker-compose.sh
index 502d87a..7ddb757 100755
--- a/ambari-infra/ambari-infra-solr-plugin/docker/infra-solr-docker-compose.sh
+++ b/ambari-infra/ambari-infra-solr-plugin/docker/infra-solr-docker-compose.sh
@@ -72,7 +72,7 @@ AMBARI_LOCATION=$AMBARI_LOCATION
ZOOKEEPER_VERSION=3.4.10
ZOOKEEPER_CONNECTION_STRING=zookeeper:2181
-SOLR_VERSION=7.4.0
+SOLR_VERSION=7.5.0
EOF
}
diff --git a/ambari-infra/pom.xml b/ambari-infra/pom.xml
index 1a601f3..4dadabf 100644
--- a/ambari-infra/pom.xml
+++ b/ambari-infra/pom.xml
@@ -25,7 +25,7 @@
<properties>
<jdk.version>1.8</jdk.version>
- <solr.version>7.4.0</solr.version>
+ <solr.version>7.5.0</solr.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<python.ver>python >= 2.6</python.ver>
<deb.python.ver>python (>= 2.6)</deb.python.ver>
diff --git
a/ambari-logsearch/ambari-logsearch-server/src/main/configsets/audit_logs/conf/solrconfig.xml
b/ambari-logsearch/ambari-logsearch-server/src/main/configsets/audit_logs/conf/solrconfig.xml
index 8f54121..ea77a09 100644
---
a/ambari-logsearch/ambari-logsearch-server/src/main/configsets/audit_logs/conf/solrconfig.xml
+++
b/ambari-logsearch/ambari-logsearch-server/src/main/configsets/audit_logs/conf/solrconfig.xml
@@ -35,7 +35,7 @@
that you fully re-index after changing this setting as it can
affect both how text is indexed and queried.
-->
- <luceneMatchVersion>7.4.0</luceneMatchVersion>
+ <luceneMatchVersion>7.5.0</luceneMatchVersion>
<!-- <lib/> directives can be used to instruct Solr to load any Jars
identified and use them to resolve any "plugins" specified in
diff --git
a/ambari-logsearch/ambari-logsearch-server/src/main/configsets/hadoop_logs/conf/solrconfig.xml
b/ambari-logsearch/ambari-logsearch-server/src/main/configsets/hadoop_logs/conf/solrconfig.xml
index 9f1c36d..946f215 100644
---
a/ambari-logsearch/ambari-logsearch-server/src/main/configsets/hadoop_logs/conf/solrconfig.xml
+++
b/ambari-logsearch/ambari-logsearch-server/src/main/configsets/hadoop_logs/conf/solrconfig.xml
@@ -35,7 +35,7 @@
that you fully re-index after changing this setting as it can
affect both how text is indexed and queried.
-->
- <luceneMatchVersion>7.4.0</luceneMatchVersion>
+ <luceneMatchVersion>7.5.0</luceneMatchVersion>
<!-- <lib/> directives can be used to instruct Solr to load any Jars
identified and use them to resolve any "plugins" specified in
diff --git
a/ambari-logsearch/ambari-logsearch-server/src/main/configsets/history/conf/solrconfig.xml
b/ambari-logsearch/ambari-logsearch-server/src/main/configsets/history/conf/solrconfig.xml
index 866b218..4c8cc1c 100644
---
a/ambari-logsearch/ambari-logsearch-server/src/main/configsets/history/conf/solrconfig.xml
+++
b/ambari-logsearch/ambari-logsearch-server/src/main/configsets/history/conf/solrconfig.xml
@@ -16,7 +16,7 @@
limitations under the License.
-->
<config>
- <luceneMatchVersion>7.4.0</luceneMatchVersion>
+ <luceneMatchVersion>7.5.0</luceneMatchVersion>
<lib dir="${solr.install.dir:../../../..}/dist/"
regex="solr-dataimporthandler-.*\.jar" />
diff --git a/ambari-logsearch/docker/Dockerfile
b/ambari-logsearch/docker/Dockerfile
index d076565..9087bc3 100644
--- a/ambari-logsearch/docker/Dockerfile
+++ b/ambari-logsearch/docker/Dockerfile
@@ -54,7 +54,7 @@ RUN echo 'X11DisplayOffset 10\n' /etc/ssh/sshd_config
RUN git config --global url."https://".insteadOf git://
# Install Solr
-ENV SOLR_VERSION 7.4.0
+ENV SOLR_VERSION 7.5.0
RUN wget --no-check-certificate -O /root/solr-$SOLR_VERSION.tgz
http://public-repo-1.hortonworks.com/ARTIFACTS/dist/lucene/solr/$SOLR_VERSION/solr-$SOLR_VERSION.tgz
RUN cd /root && tar -zxvf /root/solr-$SOLR_VERSION.tgz
diff --git a/ambari-logsearch/docker/docker-compose.yml
b/ambari-logsearch/docker/docker-compose.yml
index fb14622..dc136bf 100644
--- a/ambari-logsearch/docker/docker-compose.yml
+++ b/ambari-logsearch/docker/docker-compose.yml
@@ -26,7 +26,7 @@ services:
ZOO_MY_ID: 1
ZOO_SERVERS: server.1=zookeeper:2888:3888
solr:
- image: solr:${SOLR_VERSION:-7.4.0}
+ image: solr:${SOLR_VERSION:-7.5.0}
restart: always
hostname: solr
ports:
diff --git a/ambari-logsearch/docker/logsearch-docker.sh
b/ambari-logsearch/docker/logsearch-docker.sh
index 72a332a..8966361 100755
--- a/ambari-logsearch/docker/logsearch-docker.sh
+++ b/ambari-logsearch/docker/logsearch-docker.sh
@@ -109,7 +109,7 @@ AMBARI_LOCATION=$AMBARI_LOCATION
ZOOKEEPER_VERSION=3.4.10
ZOOKEEPER_CONNECTION_STRING=zookeeper:2181
-SOLR_VERSION=7.4.0
+SOLR_VERSION=7.5.0
EOF
echo ".env file has been created. Check it out before starting Log Search.
($sdir/.env)"
exit
diff --git a/ambari-logsearch/docker/solr.yml b/ambari-logsearch/docker/solr.yml
index 2975af6..5bef837 100644
--- a/ambari-logsearch/docker/solr.yml
+++ b/ambari-logsearch/docker/solr.yml
@@ -15,7 +15,7 @@
version: '3.3'
services:
solr:
- image: solr:${SOLR_VERSION:-7.4.0}
+ image: solr:${SOLR_VERSION:-7.5.0}
restart: always
networks:
- logsearch-network
diff --git a/ambari-logsearch/docker/sso.yml b/ambari-logsearch/docker/sso.yml
index 0837dd8..9d27d4f 100644
--- a/ambari-logsearch/docker/sso.yml
+++ b/ambari-logsearch/docker/sso.yml
@@ -26,7 +26,7 @@ services:
ZOO_MY_ID: 1
ZOO_SERVERS: server.1=zookeeper:2888:3888
solr:
- image: solr:${SOLR_VERSION:-7.4.0}
+ image: solr:${SOLR_VERSION:-7.5.0}
restart: always
hostname: solr
ports:
diff --git a/ambari-logsearch/pom.xml b/ambari-logsearch/pom.xml
index a30860d..e85eadb 100644
--- a/ambari-logsearch/pom.xml
+++ b/ambari-logsearch/pom.xml
@@ -45,7 +45,7 @@
<deb.python.ver>python (>= 2.6)</deb.python.ver>
<deb.architecture>amd64</deb.architecture>
<deb.dependency.list>${deb.python.ver}</deb.dependency.list>
- <solr.version>7.4.0</solr.version>
+ <solr.version>7.5.0</solr.version>
<hadoop.version>3.0.0</hadoop.version>
<common.io.version>2.5</common.io.version>
<zookeeper.version>3.4.6.2.3.0.0-2557</zookeeper.version>
diff --git
a/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog271.java
b/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog271.java
index eb609b1..1bc15f7 100644
---
a/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog271.java
+++
b/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog271.java
@@ -342,7 +342,7 @@ public class UpgradeCatalog271 extends
AbstractUpgradeCatalog {
}
/**
- * Upgrade lucene version to 7.4.0 in Solr config of Log Search collections
and Solr Log4j config
+ * Upgrade lucene version to 7.5.0 in Solr config of Log Search collections
and Solr Log4j config
*/
protected void updateSolrConfigurations() throws AmbariException {
AmbariManagementController ambariManagementController =
injector.getInstance(AmbariManagementController.class);
@@ -356,8 +356,8 @@ public class UpgradeCatalog271 extends
AbstractUpgradeCatalog {
return;
for (final Cluster cluster : clusterMap.values()) {
- updateConfig(cluster, "logsearch-service_logs-solrconfig", (content) ->
updateLuceneMatchVersion(content,"7.4.0"));
- updateConfig(cluster, "logsearch-audit_logs-solrconfig", (content) ->
updateLuceneMatchVersion(content,"7.4.0"));
+ updateConfig(cluster, "logsearch-service_logs-solrconfig", (content) ->
updateLuceneMatchVersion(content,"7.5.0"));
+ updateConfig(cluster, "logsearch-audit_logs-solrconfig", (content) ->
updateLuceneMatchVersion(content,"7.5.0"));
updateConfig(cluster, "infra-solr-log4j", (content) ->
SOLR_NEW_LOG4J2_XML);
}
}
@@ -378,4 +378,4 @@ public class UpgradeCatalog271 extends
AbstractUpgradeCatalog {
return content.replaceAll("<luceneMatchVersion>.*</luceneMatchVersion>",
"<luceneMatchVersion>" + newLuceneMatchVersion +
"</luceneMatchVersion>");
}
-}
\ No newline at end of file
+}
diff --git
a/ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/properties/audit_logs-solrconfig.xml.j2
b/ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/properties/audit_logs-solrconfig.xml.j2
index f05e19c..f4b7d4a 100644
---
a/ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/properties/audit_logs-solrconfig.xml.j2
+++
b/ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/properties/audit_logs-solrconfig.xml.j2
@@ -35,7 +35,7 @@ this file, see http://wiki.apache.org/solr/SolrConfigXml.
that you fully re-index after changing this setting as it can
affect both how text is indexed and queried.
-->
- <luceneMatchVersion>7.4.0</luceneMatchVersion>
+ <luceneMatchVersion>7.5.0</luceneMatchVersion>
<!-- <lib/> directives can be used to instruct Solr to load any Jars
identified and use them to resolve any "plugins" specified in
diff --git
a/ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/properties/service_logs-solrconfig.xml.j2
b/ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/properties/service_logs-solrconfig.xml.j2
index 358c8ee..f42a074 100644
---
a/ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/properties/service_logs-solrconfig.xml.j2
+++
b/ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/properties/service_logs-solrconfig.xml.j2
@@ -35,7 +35,7 @@ this file, see http://wiki.apache.org/solr/SolrConfigXml.
that you fully re-index after changing this setting as it can
affect both how text is indexed and queried.
-->
- <luceneMatchVersion>7.4.0</luceneMatchVersion>
+ <luceneMatchVersion>7.5.0</luceneMatchVersion>
<!-- <lib/> directives can be used to instruct Solr to load any Jars
identified and use them to resolve any "plugins" specified in
