Repository: ambari Updated Branches: refs/heads/branch-2.5 2b0cf6dd9 -> 9d4a91a6b
AMBARI-19112 : Grafana start failing at create datasource step (and a minor AbstractUpgradeCatalog log line change). Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/9d4a91a6 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/9d4a91a6 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/9d4a91a6 Branch: refs/heads/branch-2.5 Commit: 9d4a91a6b6b6e89f48fd81b06117336418cd2b12 Parents: 2b0cf6d Author: Aravindan Vijayan <[email protected]> Authored: Tue Dec 6 12:09:39 2016 -0800 Committer: Aravindan Vijayan <[email protected]> Committed: Tue Dec 6 12:09:39 2016 -0800 ---------------------------------------------------------------------- .../org/apache/ambari/server/upgrade/AbstractUpgradeCatalog.java | 4 ++-- .../AMBARI_METRICS/0.1.0/package/scripts/metrics_grafana_util.py | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/9d4a91a6/ambari-server/src/main/java/org/apache/ambari/server/upgrade/AbstractUpgradeCatalog.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/upgrade/AbstractUpgradeCatalog.java b/ambari-server/src/main/java/org/apache/ambari/server/upgrade/AbstractUpgradeCatalog.java index b1db4e4..dbf45c3 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/upgrade/AbstractUpgradeCatalog.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/upgrade/AbstractUpgradeCatalog.java @@ -585,8 +585,8 @@ public abstract class AbstractUpgradeCatalog implements UpgradeCatalog { } if (!Maps.difference(oldConfigProperties, mergedProperties).areEqual()) { - LOG.info("Applying configuration with tag '{}' to " + - "cluster '{}'", newTag, cluster.getClusterName()); + LOG.info("Applying configuration with tag '{}' and configType '{}' to " + + "cluster '{}'", newTag, configType, cluster.getClusterName()); Map<String, Map<String, String>> propertiesAttributes = null; if (oldConfig != null) { http://git-wip-us.apache.org/repos/asf/ambari/blob/9d4a91a6/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/scripts/metrics_grafana_util.py ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/scripts/metrics_grafana_util.py b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/scripts/metrics_grafana_util.py index 7c2f2df..aff95eb 100644 --- a/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/scripts/metrics_grafana_util.py +++ b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/scripts/metrics_grafana_util.py @@ -29,8 +29,8 @@ import socket import ambari_simplejson as json import network -GRAFANA_CONNECT_TRIES = 5 -GRAFANA_CONNECT_TIMEOUT = 10 +GRAFANA_CONNECT_TRIES = 15 +GRAFANA_CONNECT_TIMEOUT = 20 GRAFANA_SEARCH_BUILTIN_DASHBOARDS = "/api/search?tag=builtin" GRAFANA_DATASOURCE_URL = "/api/datasources" GRAFANA_DASHBOARDS_URL = "/api/dashboards/db"
