浏览代码

AMBARI-23945. Fix broken upgrade solr-client/solr/logfeeder/logsearch-portal commands.

Oliver Szabo 7 年之前
父节点
当前提交
172f6731ee

+ 0 - 4
ambari-server/src/main/resources/common-services/AMBARI_INFRA_SOLR/0.1.0/package/scripts/infra_solr.py

@@ -20,7 +20,6 @@ limitations under the License.
 import sys
 from ambari_commons.repo_manager import ManagerFactory
 from ambari_commons.shell import RepoCallContext
-from ambari_commons.os_utils import get_ambari_repo_file_full_name
 from resource_management.core.logger import Logger
 from resource_management.core.source import Template
 from resource_management.core.resources.system import Execute, File
@@ -152,10 +151,7 @@ class InfraSolr(Script):
   def upgrade_solr_instance(self, env):
     pkg_provider = ManagerFactory.get()
     context = RepoCallContext()
-    context.is_upgrade=True
     context.log_output = True
-    context.use_repos = {}
-    context.use_repos['ambari']=get_ambari_repo_file_full_name()
     pkg_provider.remove_package('ambari-infra-solr', context, ignore_dependencies=True)
     pkg_provider.upgrade_package('ambari-infra-solr', context)
 

+ 0 - 4
ambari-server/src/main/resources/common-services/AMBARI_INFRA_SOLR/0.1.0/package/scripts/infra_solr_client.py

@@ -19,7 +19,6 @@ limitations under the License.
 
 from ambari_commons.repo_manager import ManagerFactory
 from ambari_commons.shell import RepoCallContext
-from ambari_commons.os_utils import get_ambari_repo_file_full_name
 from resource_management.core.exceptions import ClientComponentHasNoStatus
 from resource_management.libraries.script.script import Script
 
@@ -53,10 +52,7 @@ class InfraSolrClient(Script):
   def upgrade_solr_client(self, env):
     pkg_provider = ManagerFactory.get()
     context = RepoCallContext()
-    context.is_upgrade=True
     context.log_output = True
-    context.use_repos = {}
-    context.use_repos['ambari']=get_ambari_repo_file_full_name()
     pkg_provider.remove_package('ambari-infra-solr-client', context, ignore_dependencies=True)
     pkg_provider.upgrade_package('ambari-infra-solr-client', context)
 

+ 0 - 4
ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/package/scripts/logfeeder.py

@@ -19,7 +19,6 @@ limitations under the License.
 
 from ambari_commons.repo_manager import ManagerFactory
 from ambari_commons.shell import RepoCallContext
-from ambari_commons.os_utils import get_ambari_repo_file_full_name
 from resource_management.core.resources.system import Execute
 from resource_management.libraries.functions.format import format
 from resource_management.libraries.functions.check_process_status import check_process_status
@@ -63,10 +62,7 @@ class LogFeeder(Script):
   def upgrade_logfeeder(self, env):
     pkg_provider = ManagerFactory.get()
     context = RepoCallContext()
-    context.is_upgrade=True
     context.log_output = True
-    context.use_repos = {}
-    context.use_repos['ambari']=get_ambari_repo_file_full_name()
     pkg_provider.remove_package('ambari-logsearch-logfeeder', context, ignore_dependencies=True)
     pkg_provider.upgrade_package('ambari-logsearch-logfeeder', context)
 

+ 0 - 4
ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/package/scripts/logsearch.py

@@ -19,7 +19,6 @@ limitations under the License.
 
 from ambari_commons.repo_manager import ManagerFactory
 from ambari_commons.shell import RepoCallContext
-from ambari_commons.os_utils import get_ambari_repo_file_full_name
 from resource_management.core.resources.system import Execute, File
 from resource_management.libraries.functions.check_process_status import check_process_status
 from resource_management.libraries.functions.format import format
@@ -64,10 +63,7 @@ class LogSearch(Script):
   def upgrade_logsearch_portal(self, env):
     pkg_provider = ManagerFactory.get()
     context = RepoCallContext()
-    context.is_upgrade=True
     context.log_output = True
-    context.use_repos = {}
-    context.use_repos['ambari']=get_ambari_repo_file_full_name()
     pkg_provider.remove_package('ambari-logsearch-portal', context, ignore_dependencies=True)
     pkg_provider.upgrade_package('ambari-logsearch-portal', context)