oleewere closed pull request #24: AMBARI-25067. Upgrade Solr version to 7.6.0 from 7.5.0 URL: https://github.com/apache/ambari-infra/pull/24
This is a PR merged from a forked repository. As GitHub hides the original diff on merge, it is displayed below for the sake of provenance: As this is a foreign pull request (from a fork), the diff is supplied below (as it won't show otherwise due to GitHub magic): diff --git a/ambari-infra-assembly/build.xml b/ambari-infra-assembly/build.xml new file mode 100644 index 00000000..488f1aff --- /dev/null +++ b/ambari-infra-assembly/build.xml @@ -0,0 +1,59 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<!-- + Licensed to the Apache Software Foundation (ASF) under one or more + contributor license agreements. See the NOTICE file distributed with + this work for additional information regarding copyright ownership. + The ASF licenses this file to You under the Apache License, Version 2.0 + (the "License"); you may not use this file except in compliance with + the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +--> +<project basedir="." default="package" name="infra-assembly"> + <target name="package"> + <get + src="${solr.tar}" + dest="${project.build.directory}/solr.tgz" + usetimestamp="true" + /> + <untar + src="${project.build.directory}/solr.tgz" + dest="${project.build.directory}/" + compression="gzip" + /> + <move todir="${project.build.directory}/solr"> + <fileset dir="${project.build.directory}/solr-${solr.version}"/> + </move> + + <delete + file="${project.build.directory}/solr/server/solr-webapp/webapp/WEB-INF/lib/${common-fileupload.old.jar.name}"/> + <get src="${common-fileupload.location.url}" dest="target/${common-fileupload.jar.name}" usetimestamp="true"/> + <move file="target/${common-fileupload.jar.name}" + toDir="${project.build.directory}/solr/server/solr-webapp/webapp/WEB-INF/lib/"/> + + <copy file="${infra.solr.plugin.dir}/target/ambari-infra-solr-plugin-${project.version}.jar" + toDir="${project.build.directory}/solr/server/solr-webapp/webapp/WEB-INF/lib/"/> + <copy file="${infra.solr.plugin.dir}/target/libs/ambari-metrics-common-${ambari-metrics.version}.jar" + toDir="${project.build.directory}/solr/server/solr-webapp/webapp/WEB-INF/lib/"/> + <copy file="${infra.solr.plugin.dir}/target/libs/commons-logging-1.1.1.jar" + toDir="${project.build.directory}/solr/server/solr-webapp/webapp/WEB-INF/lib/"/> + <chmod file="${project.build.directory}/solr/bin/**" perm="755"/> + <chmod file="${project.build.directory}/solr/server/scripts/**" perm="755"/> + + <copy todir="${project.build.directory}" > + <fileset dir="${jenkins.docker.folder}" includes="**"/> + </copy> + <copy todir="${project.build.directory}/docker-infra-solr/solr" > + <fileset dir="${project.build.directory}/solr" includes="**"/> + </copy> + <copy todir="${project.build.directory}/docker-infra-solr/solr-client" > + <fileset dir="${solr.client.dir}/target/package" includes="**"/> + </copy> + </target> +</project> \ No newline at end of file diff --git a/ambari-infra-assembly/pom.xml b/ambari-infra-assembly/pom.xml index fe9d72e5..ef9953c4 100644 --- a/ambari-infra-assembly/pom.xml +++ b/ambari-infra-assembly/pom.xml @@ -175,34 +175,10 @@ <goal>run</goal> </goals> <configuration> - <target name="Download Solr"> - <get - src="${solr.tar}" - dest="${project.build.directory}/solr.tgz" - usetimestamp="true" - /> - <untar - src="${project.build.directory}/solr.tgz" - dest="${project.build.directory}/" - compression="gzip" - /> - <move todir="${project.build.directory}/solr"> - <fileset dir="${project.build.directory}/solr-${solr.version}"/> - </move> - - <delete file="${project.build.directory}/solr/server/solr-webapp/webapp/WEB-INF/lib/${common-fileupload.old.jar.name}"/> - <get src="${common-fileupload.location.url}" dest="target/${common-fileupload.jar.name}" usetimestamp="true"/> - <move file="target/${common-fileupload.jar.name}" - toDir="${project.build.directory}/solr/server/solr-webapp/webapp/WEB-INF/lib/"/> - - <copy file="${infra.solr.plugin.dir}/target/ambari-infra-solr-plugin-${project.version}.jar" - toDir="${project.build.directory}/solr/server/solr-webapp/webapp/WEB-INF/lib/"/> - <copy file="${infra.solr.plugin.dir}/target/libs/ambari-metrics-common-${ambari-metrics.version}.jar" - toDir="${project.build.directory}/solr/server/solr-webapp/webapp/WEB-INF/lib/"/> - <copy file="${infra.solr.plugin.dir}/target/libs/commons-logging-1.1.1.jar" - toDir="${project.build.directory}/solr/server/solr-webapp/webapp/WEB-INF/lib/"/> - <chmod file="${project.build.directory}/solr/bin/**" perm="755"/> - <chmod file="${project.build.directory}/solr/server/scripts/**" perm="755"/> + <target> + <ant antfile="build.xml"> + <target name="package"/> + </ant> </target> </configuration> </execution> @@ -370,44 +346,10 @@ <goal>run</goal> </goals> <configuration> - <target name="Download Solr"> - <get - src="${solr.tar}" - dest="${project.build.directory}/solr.tgz" - usetimestamp="true" - /> - <untar - src="${project.build.directory}/solr.tgz" - dest="${project.build.directory}/" - compression="gzip" - /> - <move todir="${project.build.directory}/solr"> - <fileset dir="${project.build.directory}/solr-${solr.version}"/> - </move> - - <delete file="${project.build.directory}/solr/server/solr-webapp/webapp/WEB-INF/lib/${common-fileupload.old.jar.name}"/> - <get src="${common-fileupload.location.url}" dest="target/${common-fileupload.jar.name}" usetimestamp="true"/> - <move file="target/${common-fileupload.jar.name}" - toDir="${project.build.directory}/solr/server/solr-webapp/webapp/WEB-INF/lib/"/> - - <copy file="${infra.solr.plugin.dir}/target/ambari-infra-solr-plugin-${project.version}.jar" - toDir="${project.build.directory}/solr/server/solr-webapp/webapp/WEB-INF/lib/"/> - <copy file="${infra.solr.plugin.dir}/target/libs/ambari-metrics-common-${ambari-metrics.version}.jar" - toDir="${project.build.directory}/solr/server/solr-webapp/webapp/WEB-INF/lib/"/> - <copy file="${infra.solr.plugin.dir}/target/libs/commons-logging-1.1.1.jar" - toDir="${project.build.directory}/solr/server/solr-webapp/webapp/WEB-INF/lib/"/> - <chmod file="${project.build.directory}/solr/bin/**" perm="755"/> - <chmod file="${project.build.directory}/solr/server/scripts/**" perm="755"/> - - <copy todir="${project.build.directory}" > - <fileset dir="${jenkins.docker.folder}" includes="**"/> - </copy> - <copy todir="${project.build.directory}/docker-infra-solr/solr" > - <fileset dir="${project.build.directory}/solr" includes="**"/> - </copy> - <copy todir="${project.build.directory}/docker-infra-solr/solr-client" > - <fileset dir="${solr.client.dir}/target/package" includes="**"/> - </copy> + <target> + <ant antfile="build.xml"> + <target name="package"/> + </ant> </target> </configuration> </execution> diff --git a/ambari-infra-manager/docker/docker-compose.yml b/ambari-infra-manager/docker/docker-compose.yml index de4ce368..e506939d 100644 --- a/ambari-infra-manager/docker/docker-compose.yml +++ b/ambari-infra-manager/docker/docker-compose.yml @@ -29,7 +29,7 @@ services: solr: # TODO: use infra-solr container_name: solr - image: solr:${SOLR_VERSION:-7.5.0} + image: solr:${SOLR_VERSION:-7.6.0} restart: always hostname: solr ports: diff --git a/ambari-infra-manager/docker/infra-manager-docker-compose.sh b/ambari-infra-manager/docker/infra-manager-docker-compose.sh index 0c18e6f2..dc2a48db 100755 --- a/ambari-infra-manager/docker/infra-manager-docker-compose.sh +++ b/ambari-infra-manager/docker/infra-manager-docker-compose.sh @@ -72,7 +72,7 @@ AMBARI_INFRA_LOCATION=$AMBARI_INFRA_LOCATION ZOOKEEPER_VERSION=3.4.10 ZOOKEEPER_CONNECTION_STRING=zookeeper:2181 -SOLR_VERSION=7.5.0 +SOLR_VERSION=7.6.0 HADOOP_VERSION=3.0.0 EOF diff --git a/ambari-infra-solr-client/README.md b/ambari-infra-solr-client/README.md index 24218eb2..5d573171 100644 --- a/ambari-infra-solr-client/README.md +++ b/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.5.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.6.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.5.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.6.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.5.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.6.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.5.0) + lucene index version for migration (6.6.2 or 7.6.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-solr-client/src/main/python/migrationHelper.py b/ambari-infra-solr-client/src/main/python/migrationHelper.py index 96a0206c..e44044cc 100755 --- a/ambari-infra-solr-client/src/main/python/migrationHelper.py +++ b/ambari-infra-solr-client/src/main/python/migrationHelper.py @@ -1913,7 +1913,7 @@ def transfer_old_data(options, accessor, parser, config): 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.5.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.6.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-solr-client/src/main/resources/solrIndexHelper.sh b/ambari-infra-solr-client/src/main/resources/solrIndexHelper.sh index ab845461..6df5b84e 100755 --- a/ambari-infra-solr-client/src/main/resources/solrIndexHelper.sh +++ b/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.5.0) + -v, --version Lucene version to upgrade (default: 6.6.2, available: 6.6.2, 7.6.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.5.0"} + local LUCENE_VERSION=${4:?"usage <lucene_index_version> e.g.: 7.6.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.5.0)"} + : ${INDEX_VERSION:?"Please set the INDEX_VERSION variable! (6.6.2 or 7.6.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.5.0)"} + : ${INDEX_VERSION:?"Please set the INDEX_VERSION variable! (6.6.2 or 7.6.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-solr-plugin/docker/infra-solr-docker-compose.sh b/ambari-infra-solr-plugin/docker/infra-solr-docker-compose.sh index a3df897d..7653d69a 100755 --- a/ambari-infra-solr-plugin/docker/infra-solr-docker-compose.sh +++ b/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.5.0 +SOLR_VERSION=7.6.0 EOF } diff --git a/pom.xml b/pom.xml index 80c4877b..5791f390 100644 --- a/pom.xml +++ b/pom.xml @@ -25,7 +25,7 @@ <properties> <jdk.version>1.8</jdk.version> - <solr.version>7.5.0</solr.version> + <solr.version>7.6.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> ---------------------------------------------------------------- This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
