[ambari] 01/03: AMBARI-23945. Infra Solr migration - remove 'solr_skip_generate_restore_host_cores' usages.

[ol...@apache.org]

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

commit 5273ffcb3c81334500ef063224681a3ddb3ddd21
Author: Oliver Szabo <ol...@gmail.com>
AuthorDate: Tue Jun 19 20:20:17 2018 +0200

    AMBARI-23945. Infra Solr migration - remove 'solr_skip_generate_restore_host_cores' usages.
---
 .../ambari-infra-solr-client/src/main/python/migrationHelper.py        | 3 ---
 .../AMBARI_INFRA_SOLR/0.1.0/package/scripts/command_commons.py         | 2 --
 2 files changed, 5 deletions(-)

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 854bd02..ddcba0c 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
@@ -374,8 +374,6 @@ def fill_parameters(options, config, collection, index_location, hdfs_path=None,
     params['solr_hdfs_path'] = hdfs_path
   if options.keep_backup:
     params['solr_keep_backup'] = True
-  if options.skip_generate_restore_host_cores:
-    params['solr_skip_generate_restore_host_cores'] = True
   return params
 
 def validte_common_options(options, parser, config):
@@ -1425,7 +1423,6 @@ if __name__=="__main__":
   parser.add_option("--disable-solr-host-check", dest="disable_solr_host_check", action="store_true", default=False, help="Disable to check solr hosts are good for the collection backups")
   parser.add_option("--core-filter", dest="core_filter", default=None, type="string", help="core filter for replica folders")
   parser.add_option("--skip-cores", dest="skip_cores", default=None, type="string", help="specific cores to skip (comma separated)")
-  parser.add_option("--skip-generate-restore-host-cores", dest="skip_generate_restore_host_cores", default=False, action="store_true", help="Skip the generation of restore_host_cores.json, just read the file itself, can be useful if command failed at some point.")
   parser.add_option("--hdfs-base-path", dest="hdfs_base_path", default=None, type="string", help="hdfs base path where the collections are located (e.g.: /user/infrasolr). Use if both atlas and ranger collections are on hdfs.")
   parser.add_option("--ranger-hdfs-base-path", dest="ranger_hdfs_base_path", default=None, type="string", help="hdfs base path where the ranger collection is located (e.g.: /user/infra-solr). Use if only ranger collection is on hdfs.")
   parser.add_option("--atlas-hdfs-base-path", dest="atlas_hdfs_base_path", default=None, type="string", help="hdfs base path where the atlas collections are located (e.g.: /user/infra-solr). Use if only atlas collections are on hdfs.")
diff --git a/ambari-server/src/main/resources/common-services/AMBARI_INFRA_SOLR/0.1.0/package/scripts/command_commons.py b/ambari-server/src/main/resources/common-services/AMBARI_INFRA_SOLR/0.1.0/package/scripts/command_commons.py
index 561a0c4..e9119c9 100644
--- a/ambari-server/src/main/resources/common-services/AMBARI_INFRA_SOLR/0.1.0/package/scripts/command_commons.py
+++ b/ambari-server/src/main/resources/common-services/AMBARI_INFRA_SOLR/0.1.0/package/scripts/command_commons.py
@@ -74,8 +74,6 @@ request_time_interval = int(default("/commandParams/solr_request_time_interval",
 check_hosts_default = True if params.security_enabled else False
 check_hosts = default("/commandParams/solr_check_hosts", check_hosts_default)
 
-skip_generate_restore_host_cores = default("/commandParams/solr_skip_generate_restore_host_cores", False)
-
 solr_protocol = "https" if params.infra_solr_ssl_enabled else "http"
 solr_port = format("{params.infra_solr_port}")
 solr_base_url = format("{solr_protocol}://{params.hostname}:{params.infra_solr_port}/solr")