You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by ol...@apache.org on 2018/06/16 16:53:10 UTC
[ambari] branch trunk updated: AMBARI-23945. Fix broken upgrade
solr-client/solr/logfeeder/logsearch-portal commands.
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 172f673 AMBARI-23945. Fix broken upgrade solr-client/solr/logfeeder/logsearch-portal commands.
172f673 is described below
commit 172f6731ee804d846b450bd1d462eddb9a8b45a7
Author: Oliver Szabo <ol...@gmail.com>
AuthorDate: Sat Jun 16 18:48:38 2018 +0200
AMBARI-23945. Fix broken upgrade solr-client/solr/logfeeder/logsearch-portal commands.
---
.../AMBARI_INFRA_SOLR/0.1.0/package/scripts/infra_solr.py | 4 ----
.../AMBARI_INFRA_SOLR/0.1.0/package/scripts/infra_solr_client.py | 4 ----
.../common-services/LOGSEARCH/0.5.0/package/scripts/logfeeder.py | 4 ----
.../common-services/LOGSEARCH/0.5.0/package/scripts/logsearch.py | 4 ----
4 files changed, 16 deletions(-)
diff --git a/ambari-server/src/main/resources/common-services/AMBARI_INFRA_SOLR/0.1.0/package/scripts/infra_solr.py b/ambari-server/src/main/resources/common-services/AMBARI_INFRA_SOLR/0.1.0/package/scripts/infra_solr.py
index 5ae228b..2fd4321 100644
--- a/ambari-server/src/main/resources/common-services/AMBARI_INFRA_SOLR/0.1.0/package/scripts/infra_solr.py
+++ b/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)
diff --git a/ambari-server/src/main/resources/common-services/AMBARI_INFRA_SOLR/0.1.0/package/scripts/infra_solr_client.py b/ambari-server/src/main/resources/common-services/AMBARI_INFRA_SOLR/0.1.0/package/scripts/infra_solr_client.py
index 5fd412b..2ff997f 100644
--- a/ambari-server/src/main/resources/common-services/AMBARI_INFRA_SOLR/0.1.0/package/scripts/infra_solr_client.py
+++ b/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)
diff --git a/ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/package/scripts/logfeeder.py b/ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/package/scripts/logfeeder.py
index 375cf55..db647ff 100644
--- a/ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/package/scripts/logfeeder.py
+++ b/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)
diff --git a/ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/package/scripts/logsearch.py b/ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/package/scripts/logsearch.py
index 1dd5d8d..fdafaaf 100644
--- a/ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/package/scripts/logsearch.py
+++ b/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)
--
To stop receiving notification emails like this one, please contact
oleewere@apache.org.