You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by nc...@apache.org on 2017/04/17 20:18:08 UTC
[14/34] ambari git commit: AMBARI-20746 Change to warning log if
Ambari doesn't have baseurls for Install Packages step before EU/RU (dili)
AMBARI-20746 Change to warning log if Ambari doesn't have baseurls for Install Packages step before EU/RU (dili)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/b9c82add
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/b9c82add
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/b9c82add
Branch: refs/heads/branch-feature-AMBARI-12556
Commit: b9c82add7fbe5ef652da1a47a0276b63a279470c
Parents: 273dfca
Author: Di Li <di...@apache.org>
Authored: Thu Apr 13 13:15:56 2017 -0400
Committer: Di Li <di...@apache.org>
Committed: Thu Apr 13 13:15:56 2017 -0400
----------------------------------------------------------------------
.../internal/ClusterStackVersionResourceProvider.java | 3 +++
.../controller/internal/HostStackVersionResourceProvider.java | 5 +++++
.../main/resources/custom_actions/scripts/install_packages.py | 2 +-
3 files changed, 9 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/b9c82add/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ClusterStackVersionResourceProvider.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ClusterStackVersionResourceProvider.java b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ClusterStackVersionResourceProvider.java
index 92e72ed..1d278d0 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ClusterStackVersionResourceProvider.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ClusterStackVersionResourceProvider.java
@@ -610,6 +610,9 @@ public class ClusterStackVersionResourceProvider extends AbstractControllerResou
osFamily, repoVersion.getVersion(), stackId));
}
+ if (repoInfo.isEmpty()){
+ LOG.error(String.format("Repository list is empty. Ambari may not be managing the repositories for %s", osFamily));
+ }
// determine packages for all services that are installed on host
List<ServiceOsSpecific.Package> packages = new ArrayList<>();
http://git-wip-us.apache.org/repos/asf/ambari/blob/b9c82add/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/HostStackVersionResourceProvider.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/HostStackVersionResourceProvider.java b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/HostStackVersionResourceProvider.java
index 8f2d4e6..811ce9b 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/HostStackVersionResourceProvider.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/HostStackVersionResourceProvider.java
@@ -398,6 +398,11 @@ public class HostStackVersionResourceProvider extends AbstractControllerResource
"not defined. Repo version=%s, stackId=%s",
osFamily, desiredRepoVersion, stackId));
}
+
+ if (repoInfo.isEmpty()){
+ LOG.error(String.format("Repository list is empty. Ambari may not be managing the repositories for %s", osFamily));
+ }
+
// For every host at cluster, determine packages for all installed services
List<ServiceOsSpecific.Package> packages = new ArrayList<>();
Set<String> servicesOnHost = new HashSet<>();
http://git-wip-us.apache.org/repos/asf/ambari/blob/b9c82add/ambari-server/src/main/resources/custom_actions/scripts/install_packages.py
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/custom_actions/scripts/install_packages.py b/ambari-server/src/main/resources/custom_actions/scripts/install_packages.py
index 112abe3..33adce1 100644
--- a/ambari-server/src/main/resources/custom_actions/scripts/install_packages.py
+++ b/ambari-server/src/main/resources/custom_actions/scripts/install_packages.py
@@ -127,7 +127,7 @@ class InstallPackages(Script):
Logger.info("Will install packages for repository version {0}".format(self.repository_version))
if 0 == len(base_urls):
- Logger.info("Repository list is empty. Ambari may not be managing the repositories for {0}.".format(self.repository_version))
+ Logger.warning("Repository list is empty. Ambari may not be managing the repositories for {0}.".format(self.repository_version))
try:
append_to_file = False