[ambari] branch trunk updated: AMBARI-23945. ADDENDUM: --keep-backup was not added to restore command

[oleewere]

This is an automated email from the ASF dual-hosted git repository.

oleewere pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/ambari.git


The following commit(s) were added to refs/heads/trunk by this push:
     new 60e080f  AMBARI-23945. ADDENDUM: --keep-backup was not added to 
restore command
60e080f is described below

commit 60e080f37be6ec801e10ef44a3e8de667bd99634
Author: Oliver Szabo <oleew...@gmail.com>
AuthorDate: Mon Jun 25 16:37:05 2018 +0200

    AMBARI-23945. ADDENDUM: --keep-backup was not added to restore command
---
 .../src/main/resources/ambariSolrMigration.sh                       | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git 
a/ambari-infra/ambari-infra-solr-client/src/main/resources/ambariSolrMigration.sh
 
b/ambari-infra/ambari-infra-solr-client/src/main/resources/ambariSolrMigration.sh
index df18a88..938d649 100755
--- 
a/ambari-infra/ambari-infra-solr-client/src/main/resources/ambariSolrMigration.sh
+++ 
b/ambari-infra/ambari-infra-solr-client/src/main/resources/ambariSolrMigration.sh
@@ -78,12 +78,12 @@ function run_migrate_commands() {
   fi
 
   local skip_warnings_val=""
-  if [[ "$verbose" == "true" ]]; then
+  if [[ "$skip_warnings" == "true" ]]; then
     skip_warnings_val="--skip-warnings"
   fi
 
   local keep_backup_val=""
-  if [[ "$verbose" == "true" ]]; then
+  if [[ "$keep_backup" == "true" ]]; then
     keep_backup_val="--keep-backup"
   fi
 
@@ -173,7 +173,7 @@ function run_migrate_commands() {
     handle_result "$?" "Migrate Index" "$python_location" "$start_date"
 
     log_command "$python_location $script_location --ini-file $ini_file 
--action restore $keep_backup_val $verbose_val"
-    $python_location $script_location --ini-file $ini_file --action restore 
$verbose_val
+    $python_location $script_location --ini-file $ini_file --action restore 
$keep_backup_val $verbose_val
     handle_result "$?" "Restore" "$python_location" "$start_date"
 
     log_command "$python_location $script_location --ini-file $ini_file 
--action rolling-restart-solr $verbose_val --batch-interval $batch_interval"