You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by al...@apache.org on 2017/06/07 22:14:43 UTC
ambari git commit: AMBARI-21096. ADDENDUM. Provide additional logging
for config audit log (alejandro)
Repository: ambari
Updated Branches:
refs/heads/branch-2.5 4e97069ee -> 87e993e87
AMBARI-21096. ADDENDUM. Provide additional logging for config audit log (alejandro)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/87e993e8
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/87e993e8
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/87e993e8
Branch: refs/heads/branch-2.5
Commit: 87e993e8722d568c0afc02f6b41eb27d2a118854
Parents: 4e97069
Author: Alejandro Fernandez <af...@hortonworks.com>
Authored: Wed Jun 7 11:35:05 2017 -0700
Committer: Alejandro Fernandez <af...@hortonworks.com>
Committed: Wed Jun 7 15:14:44 2017 -0700
----------------------------------------------------------------------
.../server/controller/AmbariManagementControllerImpl.java | 5 ++++-
.../server/controller/internal/ConfigGroupResourceProvider.java | 3 ++-
2 files changed, 6 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/87e993e8/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariManagementControllerImpl.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariManagementControllerImpl.java b/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariManagementControllerImpl.java
index f454455..4cb72c2 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariManagementControllerImpl.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariManagementControllerImpl.java
@@ -1791,7 +1791,10 @@ public class AmbariManagementControllerImpl implements AmbariManagementControlle
}
}
note = cr.getServiceConfigVersionNote();
- configs.add(cluster.getConfig(configType, cr.getVersionTag()));
+ Config config = cluster.getConfig(configType, cr.getVersionTag());
+ if (null != config) {
+ configs.add(config);
+ }
}
if (!configs.isEmpty()) {
Map<String, Config> existingConfigTypeToConfig = new HashMap();
http://git-wip-us.apache.org/repos/asf/ambari/blob/87e993e8/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ConfigGroupResourceProvider.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ConfigGroupResourceProvider.java b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ConfigGroupResourceProvider.java
index 5c4fea2..200cf27 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ConfigGroupResourceProvider.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ConfigGroupResourceProvider.java
@@ -659,10 +659,11 @@ public class ConfigGroupResourceProvider extends
serviceName = requestServiceName;
}
+ int numHosts = (null != configGroup.getHosts()) ? configGroup.getHosts().size() : 0;
configLogger.info("(configchange) Updating configuration group host membership or config value. cluster: '{}', changed by: '{}', " +
"service_name: '{}', config group: '{}', tag: '{}', num hosts in config group: '{}', note: '{}'",
cluster.getClusterName(), getManagementController().getAuthName(),
- serviceName, request.getGroupName(), request.getTag(), configGroup.getHosts().size(), request.getServiceConfigVersionNote());
+ serviceName, request.getGroupName(), request.getTag(), numHosts, request.getServiceConfigVersionNote());
if (!request.getConfigs().isEmpty()) {
List<String> affectedConfigTypeList = new ArrayList(request.getConfigs().keySet());