This is an automated email from the ASF dual-hosted git repository.
jluniya pushed a commit to branch branch-feature-AMBARI-14714
in repository https://gitbox.apache.org/repos/asf/ambari.git
The following commit(s) were added to refs/heads/branch-feature-AMBARI-14714 by
this push:
new 6433f33 AMBARI-23398: Fix merge issues in branch-feature-AMBARI-14714
(jluniya) (#821)
6433f33 is described below
commit 6433f335ff69211147df8022aa316b08a5f3945c
Author: jayush <jay...@gmail.com>
AuthorDate: Wed Mar 28 18:07:39 2018 -0700
AMBARI-23398: Fix merge issues in branch-feature-AMBARI-14714 (jluniya)
(#821)
Change-Id: I618c8b018939c6da8374cce0418e2454ebe37234
---
.../libraries/functions/get_not_managed_resources.py | 1 +
.../java/org/apache/ambari/server/agent/CommandRepository.java | 3 +++
.../ambari/server/controller/AmbariManagementControllerImpl.java | 7 +++++--
3 files changed, 9 insertions(+), 2 deletions(-)
diff --git
a/ambari-common/src/main/python/resource_management/libraries/functions/get_not_managed_resources.py
b/ambari-common/src/main/python/resource_management/libraries/functions/get_not_managed_resources.py
index 247aa0d..6181d5f 100644
---
a/ambari-common/src/main/python/resource_management/libraries/functions/get_not_managed_resources.py
+++
b/ambari-common/src/main/python/resource_management/libraries/functions/get_not_managed_resources.py
@@ -37,6 +37,7 @@ def get_not_managed_resources():
not_managed_hdfs_path_list =
json.loads(config['clusterLevelParams']['not_managed_hdfs_path_list'])[:]
if get_cluster_setting_value('managed_hdfs_resource_property_names') is not
None:
managed_hdfs_resource_property_names =
get_cluster_setting_value('managed_hdfs_resource_property_names')
+ managed_hdfs_resource_property_list = filter(None, [property.strip() for
property in managed_hdfs_resource_property_names.split(',')])
for property_name in managed_hdfs_resource_property_list:
property_value = default('/configurations/' + property_name, None)
diff --git
a/ambari-server/src/main/java/org/apache/ambari/server/agent/CommandRepository.java
b/ambari-server/src/main/java/org/apache/ambari/server/agent/CommandRepository.java
index 87d69d1..cc972b6 100644
---
a/ambari-server/src/main/java/org/apache/ambari/server/agent/CommandRepository.java
+++
b/ambari-server/src/main/java/org/apache/ambari/server/agent/CommandRepository.java
@@ -41,12 +41,15 @@ public class CommandRepository {
private List<Repository> m_repositories = new ArrayList<>();
@SerializedName("mpackId")
+ @JsonProperty("mpackId")
private long m_mpackId;
@SerializedName("mpackName")
+ @JsonProperty("mpackName")
private String m_mpackName;
@SerializedName("mpackVersion")
+ @JsonProperty("mpackVersion")
private String m_mpackVersion;
@SerializedName("repoFileName")
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 d4e40cc..ac85548 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
@@ -840,8 +840,9 @@ public class AmbariManagementControllerImpl implements
AmbariManagementControlle
// set restartRequired flag for monitoring services
setMonitoringServicesRestartRequired(requests);
// now doing actual work
- return persistServiceComponentHosts(requests);
-
+ Set<ServiceComponentHostResponse> responses =
persistServiceComponentHosts(requests);
+
m_topologyHolder.get().updateData(getAddedComponentsTopologyEvent(requests));
+ return responses;
}
Set<ServiceComponentHostResponse>
persistServiceComponentHosts(Set<ServiceComponentHostRequest> requests)
@@ -1066,6 +1067,8 @@ public class AmbariManagementControllerImpl implements
AmbariManagementControlle
// If the config type is for a service, then allow a user with
SERVICE_MODIFY_CONFIGS to
// update, else ensure the user has CLUSTER_MODIFY_CONFIGS
Service service = cluster.getServiceByConfigType(configType);
+
+
// Get the changes so that the user's intention can be determined. For
example, maybe
// the user wants to change the run-as user for a service or maybe the the
cluster-wide
// recovery mode setting.
--
To stop receiving notification emails like this one, please contact
jlun...@apache.org.
