git commit: Revert AMBARI-7218. rename host group deletes configs (dlysnichenko)
Repository: ambari Updated Branches: refs/heads/trunk 9cf27bf86 - 22b1df064 Revert AMBARI-7218. rename host group deletes configs (dlysnichenko) This reverts commit 9ce44c953de1154883887538c5979e5d9036a30c. Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/22b1df06 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/22b1df06 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/22b1df06 Branch: refs/heads/trunk Commit: 22b1df06454e32753864ea3a622d9cd5b8d921fa Parents: 9cf27bf Author: Lisnichenko Dmitro dlysniche...@hortonworks.com Authored: Wed Sep 10 13:13:46 2014 +0300 Committer: Lisnichenko Dmitro dlysniche...@hortonworks.com Committed: Wed Sep 10 13:13:46 2014 +0300 -- .../internal/ConfigGroupResourceProvider.java | 136 +++ .../ConfigGroupResourceProviderTest.java| 130 -- 2 files changed, 49 insertions(+), 217 deletions(-) -- http://git-wip-us.apache.org/repos/asf/ambari/blob/22b1df06/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 52df317..6e13d9c 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 @@ -383,36 +383,6 @@ public class ConfigGroupResourceProvider extends cluster.deleteConfigGroup(request.getId()); } - private void basicRequestValidation(ConfigGroupRequest request) { -if (request.getId() == null -|| request.getClusterName() == null -|| request.getClusterName().isEmpty() -|| request.getGroupName() == null -|| request.getGroupName().isEmpty()) { - LOG.debug(Received a config group request with request id = + - request.getId() + , cluster name = + - request.getClusterName() + , group name = + request.getGroupName()); - throw new IllegalArgumentException(Request id, + - cluster name and + - group name have to be provided.); -} - } - - private void validateRenameRequest(ConfigGroupRequest request) { -if (request.getTag() != null -|| (request.getHosts() != null ! request.getHosts().isEmpty()) -|| request.getDescription() != null -|| request.getServiceConfigVersionNote() != null -|| (request.getConfigs()!=null ! request.getConfigs().isEmpty())) { - throw new IllegalArgumentException(Request with id + - request.getId() + - seems to be a config group rename request. + - Renaming config group can not be combined with other + - operations, so hosts, configs, description, service config version note + - request fields should not be populated.); -} - } - private void validateRequest(ConfigGroupRequest request) { if (request.getClusterName() == null || request.getClusterName().isEmpty() @@ -534,87 +504,79 @@ public class ConfigGroupResourceProvider extends Clusters clusters = getManagementController().getClusters(); for (ConfigGroupRequest request : requests) { - basicRequestValidation(request); Cluster cluster; try { cluster = clusters.getCluster(request.getClusterName()); } catch (ClusterNotFoundException e) { throw new ParentObjectNotFoundException( - String.format( -The cluster %s does not exist, can not update a config group, - request.getClusterName()), e); + Attempted to add a config group to a cluster which doesn't exist, e); } + if (request.getId() == null) { +throw new AmbariException(Config group Id is a required parameter.); + } + + validateRequest(request); + // Find config group - MapLong, ConfigGroup configGroups = cluster.getConfigGroups(); - ConfigGroup configGroup = configGroups.get(request.getId()); + ConfigGroup configGroup = cluster.getConfigGroups().get(request.getId()); if (configGroup == null) { throw new AmbariException(Config group not found + , clusterName = + request.getClusterName() + , groupId = + request.getId()); } + String serviceName = configGroup.getServiceName(); + String requestServiceName =
[35/39] git commit: Revert AMBARI-7218. rename host group deletes configs (dlysnichenko)
Revert AMBARI-7218. rename host group deletes configs (dlysnichenko) This reverts commit 9ce44c953de1154883887538c5979e5d9036a30c. Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/22b1df06 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/22b1df06 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/22b1df06 Branch: refs/heads/branch-alerts-dev Commit: 22b1df06454e32753864ea3a622d9cd5b8d921fa Parents: 9cf27bf Author: Lisnichenko Dmitro dlysniche...@hortonworks.com Authored: Wed Sep 10 13:13:46 2014 +0300 Committer: Lisnichenko Dmitro dlysniche...@hortonworks.com Committed: Wed Sep 10 13:13:46 2014 +0300 -- .../internal/ConfigGroupResourceProvider.java | 136 +++ .../ConfigGroupResourceProviderTest.java| 130 -- 2 files changed, 49 insertions(+), 217 deletions(-) -- http://git-wip-us.apache.org/repos/asf/ambari/blob/22b1df06/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 52df317..6e13d9c 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 @@ -383,36 +383,6 @@ public class ConfigGroupResourceProvider extends cluster.deleteConfigGroup(request.getId()); } - private void basicRequestValidation(ConfigGroupRequest request) { -if (request.getId() == null -|| request.getClusterName() == null -|| request.getClusterName().isEmpty() -|| request.getGroupName() == null -|| request.getGroupName().isEmpty()) { - LOG.debug(Received a config group request with request id = + - request.getId() + , cluster name = + - request.getClusterName() + , group name = + request.getGroupName()); - throw new IllegalArgumentException(Request id, + - cluster name and + - group name have to be provided.); -} - } - - private void validateRenameRequest(ConfigGroupRequest request) { -if (request.getTag() != null -|| (request.getHosts() != null ! request.getHosts().isEmpty()) -|| request.getDescription() != null -|| request.getServiceConfigVersionNote() != null -|| (request.getConfigs()!=null ! request.getConfigs().isEmpty())) { - throw new IllegalArgumentException(Request with id + - request.getId() + - seems to be a config group rename request. + - Renaming config group can not be combined with other + - operations, so hosts, configs, description, service config version note + - request fields should not be populated.); -} - } - private void validateRequest(ConfigGroupRequest request) { if (request.getClusterName() == null || request.getClusterName().isEmpty() @@ -534,87 +504,79 @@ public class ConfigGroupResourceProvider extends Clusters clusters = getManagementController().getClusters(); for (ConfigGroupRequest request : requests) { - basicRequestValidation(request); Cluster cluster; try { cluster = clusters.getCluster(request.getClusterName()); } catch (ClusterNotFoundException e) { throw new ParentObjectNotFoundException( - String.format( -The cluster %s does not exist, can not update a config group, - request.getClusterName()), e); + Attempted to add a config group to a cluster which doesn't exist, e); } + if (request.getId() == null) { +throw new AmbariException(Config group Id is a required parameter.); + } + + validateRequest(request); + // Find config group - MapLong, ConfigGroup configGroups = cluster.getConfigGroups(); - ConfigGroup configGroup = configGroups.get(request.getId()); + ConfigGroup configGroup = cluster.getConfigGroups().get(request.getId()); if (configGroup == null) { throw new AmbariException(Config group not found + , clusterName = + request.getClusterName() + , groupId = + request.getId()); } + String serviceName = configGroup.getServiceName(); + String requestServiceName = cluster.getServiceForConfigTypes(request.getConfigs().keySet()); + if (serviceName != null