[ambari] branch trunk updated: AMBARI-23529 : Utility function to get namenode logical hostname and namespace for a given hostname. (#954)
This is an automated email from the ASF dual-hosted git repository. swagle pushed a commit to branch trunk in repository https://gitbox.apache.org/repos/asf/ambari.git The following commit(s) were added to refs/heads/trunk by this push: new 70c42f5 AMBARI-23529 : Utility function to get namenode logical hostname and namespace for a given hostname. (#954) 70c42f5 is described below commit 70c42f560032bf9f7f03c3ee74194c4b1f99a5c5 Author: vishalsuvagiaAuthorDate: Fri Apr 13 04:14:58 2018 +0530 AMBARI-23529 : Utility function to get namenode logical hostname and namespace for a given hostname. (#954) --- .../libraries/functions/namenode_ha_utils.py | 28 ++ 1 file changed, 28 insertions(+) diff --git a/ambari-common/src/main/python/resource_management/libraries/functions/namenode_ha_utils.py b/ambari-common/src/main/python/resource_management/libraries/functions/namenode_ha_utils.py index 0d2cd3f..c68d713 100644 --- a/ambari-common/src/main/python/resource_management/libraries/functions/namenode_ha_utils.py +++ b/ambari-common/src/main/python/resource_management/libraries/functions/namenode_ha_utils.py @@ -383,3 +383,31 @@ def get_name_service_by_hostname(hdfs_site, host_name): nn_rpc = nn_rpc_port.split(':')[0] if nn_rpc == host_name: return ns + +def get_namespace_mapping_for_hostname(hostname, hdfs_site, security_enabled, run_user): + namenode_address_map_list = get_namenode_states(hdfs_site, security_enabled, run_user) + namenode_logical_name = None + for each_namenode_address_map in namenode_address_map_list: +if len(each_namenode_address_map) != 0: + for namenode_hostname_logical_map_tuple in each_namenode_address_map: +namenode_hostname = namenode_hostname_logical_map_tuple[1].split(":")[0] +if hostname == namenode_hostname: + namenode_logical_name = namenode_hostname_logical_map_tuple[0] + break +if namenode_logical_name is not None: + break + + + namenode_nameservices = get_nameservices(hdfs_site) + namespace_nameservice = None + if namenode_nameservices and len(namenode_nameservices) > 0: +for name_service in namenode_nameservices: + namenode_logical_names_list = hdfs_site.get('dfs.ha.namenodes.' + str(name_service), None) + if namenode_logical_names_list and ',' in namenode_logical_names_list: +for each_namenode_logical_name in namenode_logical_names_list.split(','): + if namenode_logical_name == each_namenode_logical_name: +namespace_nameservice = name_service +break + if namespace_nameservice is not None: +break + return namespace_nameservice,namenode_logical_name -- To stop receiving notification emails like this one, please contact swa...@apache.org.
[ambari] 01/01: [AMBARI-23508] Misuse get_all_attributes in execution_command.py, it is actually in module_configs.py
This is an automated email from the ASF dual-hosted git repository. mradhakrishnan pushed a commit to branch branch-feature-AMBARI-14714 in repository https://gitbox.apache.org/repos/asf/ambari.git commit 788dee3f08634dedf8cdf22ba5716042de3030f4 Merge: f93c9af e6c7963 Author: mradha25AuthorDate: Thu Apr 12 14:38:28 2018 -0700 [AMBARI-23508] Misuse get_all_attributes in execution_command.py, it is actually in module_configs.py .../stack-hooks/after-INSTALL/scripts/shared_initialization.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- To stop receiving notification emails like this one, please contact mradhakrish...@apache.org.
[ambari] branch branch-feature-AMBARI-14714 updated (f93c9af -> 788dee3)
This is an automated email from the ASF dual-hosted git repository. mradhakrishnan pushed a change to branch branch-feature-AMBARI-14714 in repository https://gitbox.apache.org/repos/asf/ambari.git. from f93c9af AMBARI-23508: Update execution_command module to handle data type con… (#957) add 4e7f7eb AMBARI-23508: Update execution_command module to handle data type conversion issue add b4cacd8 AMBARI-23508: Update execution_command module to handle data type conversion issue add c1fdcea Merge branch 'AMBARI-23508-branch-feature-AMBARI-14714' of https://github.com/scottduan/ambari into AMBARI-23508-branch-feature-AMBARI-14714 add 3737c41 Merge branch 'AMBARI-23508-branch-feature-AMBARI-14714' of https://github.com/scottduan/ambari into AMBARI-23508-branch-feature-AMBARI-14714 add 5cd0361 Merge branch 'AMBARI-23508-branch-feature-AMBARI-14714' of https://github.com/scottduan/ambari into AMBARI-23508-branch-feature-AMBARI-14714 add a847d26 AMBARI-23508-2: Misuse one execution_command package api add e6c7963 Merge remote-tracking branch 'upstream/branch-feature-AMBARI-14714' into AMBARI-23508-branch-feature-AMBARI-14714 new 788dee3 [AMBARI-23508] Misuse get_all_attributes in execution_command.py, it is actually in module_configs.py The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: .../stack-hooks/after-INSTALL/scripts/shared_initialization.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- To stop receiving notification emails like this one, please contact mradhakrish...@apache.org.
[ambari] branch trunk updated (9c5e834 -> 6804d35)
This is an automated email from the ASF dual-hosted git repository. avijayan pushed a change to branch trunk in repository https://gitbox.apache.org/repos/asf/ambari.git. from 9c5e834 AMBARI-23556. Fix constraint issue during logfeeder log entry testing. (#979) new 5ab Revert "[AMBARI-23493] Decommission Datanode doesn't work (dsen)" new 6804d35 Revert "[AMBARI-23370] Download client configs fails due to clusterLevelParam m… (#914)" The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: .../AmbariCustomCommandExecutionHelper.java| 16 -- .../server/controller/KerberosHelperImpl.java | 10 +- .../internal/ClientConfigResourceProvider.java | 75 +++-- .../topology/ClusterConfigurationRequest.java | 5 +- .../org/apache/ambari/server/utils/StageUtils.java | 89 -- .../HDFS/2.1.0.2.0/package/scripts/params_linux.py | 5 +- .../YARN/2.1.0.2.0/package/scripts/params_linux.py | 5 +- .../stacks/HDP/2.6/services/YARN/kerberos.json | 2 +- .../controller/AmbariManagementControllerTest.java | 11 +- .../internal/ClientConfigResourceProviderTest.java | 184 ++--- .../apache/ambari/server/utils/StageUtilsTest.java | 28 ++-- 11 files changed, 291 insertions(+), 139 deletions(-) -- To stop receiving notification emails like this one, please contact avija...@apache.org.
[ambari] 02/02: Revert "[AMBARI-23370] Download client configs fails due to clusterLevelParam m… (#914)"
This is an automated email from the ASF dual-hosted git repository. avijayan pushed a commit to branch trunk in repository https://gitbox.apache.org/repos/asf/ambari.git commit 6804d3558a149c94a3ce796fccf02a181cac7cf6 Author: Aravindan VijayanAuthorDate: Thu Apr 12 12:07:18 2018 -0700 Revert "[AMBARI-23370] Download client configs fails due to clusterLevelParam m… (#914)" This reverts commit e3e56219bb5d79e6b59e436f8e623d54037e45b8. --- .../server/controller/KerberosHelperImpl.java | 10 +- .../internal/ClientConfigResourceProvider.java | 75 +++-- .../topology/ClusterConfigurationRequest.java | 5 +- .../org/apache/ambari/server/utils/StageUtils.java | 61 +-- .../stacks/HDP/2.6/services/YARN/kerberos.json | 2 +- .../controller/AmbariManagementControllerTest.java | 2 +- .../internal/ClientConfigResourceProviderTest.java | 184 ++--- .../apache/ambari/server/utils/StageUtilsTest.java | 24 +-- 8 files changed, 257 insertions(+), 106 deletions(-) diff --git a/ambari-server/src/main/java/org/apache/ambari/server/controller/KerberosHelperImpl.java b/ambari-server/src/main/java/org/apache/ambari/server/controller/KerberosHelperImpl.java index 3f0ea84..d2323c4 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/controller/KerberosHelperImpl.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/controller/KerberosHelperImpl.java @@ -588,6 +588,8 @@ public class KerberosHelperImpl implements KerberosHelper { configurations.put("clusterHostInfo", clusterHostInfoMap); } +Map componentToClusterInfoMap = StageUtils.getComponentToClusterInfoKeyMap(); + // Iterate through the recommendations to find the recommended host assignments for (RecommendationResponse.HostGroup hostGroup : hostGroups) { Set
[ambari] 01/02: Revert "[AMBARI-23493] Decommission Datanode doesn't work (dsen)"
This is an automated email from the ASF dual-hosted git repository. avijayan pushed a commit to branch trunk in repository https://gitbox.apache.org/repos/asf/ambari.git commit 5ab9037ff820d312a747547226225d6b5911 Author: Aravindan VijayanAuthorDate: Thu Apr 12 12:07:06 2018 -0700 Revert "[AMBARI-23493] Decommission Datanode doesn't work (dsen)" This reverts commit 675ca9a64f70fae517aeefcadcbab137a239922a. --- .../AmbariCustomCommandExecutionHelper.java| 16 - .../org/apache/ambari/server/utils/StageUtils.java | 28 ++ .../HDFS/2.1.0.2.0/package/scripts/params_linux.py | 5 +--- .../YARN/2.1.0.2.0/package/scripts/params_linux.py | 5 +--- .../controller/AmbariManagementControllerTest.java | 9 --- .../apache/ambari/server/utils/StageUtilsTest.java | 4 6 files changed, 34 insertions(+), 33 deletions(-) diff --git a/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariCustomCommandExecutionHelper.java b/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariCustomCommandExecutionHelper.java index d396d12..61b14c4 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariCustomCommandExecutionHelper.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariCustomCommandExecutionHelper.java @@ -129,7 +129,6 @@ public class AmbariCustomCommandExecutionHelper { public final static String DECOM_INCLUDED_HOSTS = "included_hosts"; public final static String DECOM_EXCLUDED_HOSTS = "excluded_hosts"; - public final static String ALL_DECOMMISSIONED_HOSTS = "all_decommissioned_hosts"; public final static String DECOM_SLAVE_COMPONENT = "slave_type"; public final static String HBASE_MARK_DRAINING_ONLY = "mark_draining_only"; public final static String UPDATE_FILES_ONLY = "update_files_only"; @@ -1057,10 +1056,6 @@ public class AmbariCustomCommandExecutionHelper { } Map commandParams = new HashMap<>(); - - commandParams.put(ALL_DECOMMISSIONED_HOSTS, - StringUtils.join(calculateDecommissionedNodes(service, slaveCompType), ',')); - if (serviceName.equals(Service.Type.HBASE.name())) { commandParams.put(DECOM_EXCLUDED_HOSTS, StringUtils.join(listOfExcludedHosts, ',')); if ((isDrainOnlyRequest != null) && isDrainOnlyRequest.equals("true")) { @@ -1077,17 +1072,6 @@ public class AmbariCustomCommandExecutionHelper { } } - private Set calculateDecommissionedNodes(Service service, String slaveCompType) throws AmbariException { -Set decommissionedHostsSet = new HashSet<>(); -ServiceComponent serviceComponent = service.getServiceComponent(slaveCompType); -for (ServiceComponentHost serviceComponentHost : serviceComponent.getServiceComponentHosts().values()) { - if (serviceComponentHost.getComponentAdminState() == HostComponentAdminState.DECOMMISSIONED) { -decommissionedHostsSet.add(serviceComponentHost.getHostName()); - } -} -return decommissionedHostsSet; - } - private StringBuilder getReadableDecommissionCommandDetail( ActionExecutionContext actionExecutionContext, Set includedHosts, diff --git a/ambari-server/src/main/java/org/apache/ambari/server/utils/StageUtils.java b/ambari-server/src/main/java/org/apache/ambari/server/utils/StageUtils.java index f023b3a..1130e3d 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/utils/StageUtils.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/utils/StageUtils.java @@ -58,8 +58,10 @@ import org.apache.ambari.server.configuration.Configuration; import org.apache.ambari.server.controller.ActionExecutionContext; import org.apache.ambari.server.state.Cluster; import org.apache.ambari.server.state.Host; +import org.apache.ambari.server.state.HostComponentAdminState; import org.apache.ambari.server.state.Service; import org.apache.ambari.server.state.ServiceComponent; +import org.apache.ambari.server.state.ServiceComponentHost; import org.apache.ambari.server.state.svccomphost.ServiceComponentHostInstallEvent; import org.apache.ambari.server.topology.TopologyManager; import org.apache.commons.lang.StringUtils; @@ -90,6 +92,8 @@ public class StageUtils { protected static final String RACKS = "all_racks"; protected static final String IPV4_ADDRESSES = "all_ipv4_ips"; + private static Map decommissionedToClusterInfoKeyMap = +new HashMap<>(); private volatile static Gson gson; @Inject @@ -145,6 +149,12 @@ public class StageUtils { StageUtils.configuration = configuration; } + static { +decommissionedToClusterInfoKeyMap.put("DATANODE", "decom_dn_hosts"); +decommissionedToClusterInfoKeyMap.put("TASKTRACKER", "decom_tt_hosts"); +decommissionedToClusterInfoKeyMap.put("NODEMANAGER", "decom_nm_hosts"); +decommissionedToClusterInfoKeyMap.put("HBASE_REGIONSERVER",
[ambari] branch trunk updated: AMBARI-23556. Fix constraint issue during logfeeder log entry testing. (#979)
This is an automated email from the ASF dual-hosted git repository. oleewere pushed a commit to branch trunk in repository https://gitbox.apache.org/repos/asf/ambari.git The following commit(s) were added to refs/heads/trunk by this push: new 9c5e834 AMBARI-23556. Fix constraint issue during logfeeder log entry testing. (#979) 9c5e834 is described below commit 9c5e834303ea28a12cbe1c7238148b402a74811e Author: Olivér SzabóAuthorDate: Thu Apr 12 20:20:54 2018 +0200 AMBARI-23556. Fix constraint issue during logfeeder log entry testing. (#979) --- .../ambari/logsearch/model/request/impl/ShipperConfigTestRequest.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/ambari-logsearch/ambari-logsearch-server/src/main/java/org/apache/ambari/logsearch/model/request/impl/ShipperConfigTestRequest.java b/ambari-logsearch/ambari-logsearch-server/src/main/java/org/apache/ambari/logsearch/model/request/impl/ShipperConfigTestRequest.java index 0cd39ba..5d37c54 100644 --- a/ambari-logsearch/ambari-logsearch-server/src/main/java/org/apache/ambari/logsearch/model/request/impl/ShipperConfigTestRequest.java +++ b/ambari-logsearch/ambari-logsearch-server/src/main/java/org/apache/ambari/logsearch/model/request/impl/ShipperConfigTestRequest.java @@ -20,6 +20,7 @@ package org.apache.ambari.logsearch.model.request.impl; import org.apache.ambari.logsearch.model.request.ShipperConfigTestParams; import org.hibernate.validator.constraints.NotBlank; +import org.hibernate.validator.constraints.NotEmpty; import java.util.Map; @@ -31,7 +32,7 @@ public class ShipperConfigTestRequest implements ShipperConfigTestParams { @NotBlank private String testEntry; - @NotBlank + @NotEmpty private Map shipperConfig; @Override -- To stop receiving notification emails like this one, please contact oleew...@apache.org.
[ambari] branch trunk updated: AMBARI-23560. Refactor base_alert to support multiple nameservices (aonishuk)
This is an automated email from the ASF dual-hosted git repository. aonishuk pushed a commit to branch trunk in repository https://gitbox.apache.org/repos/asf/ambari.git The following commit(s) were added to refs/heads/trunk by this push: new 81224a3 AMBARI-23560. Refactor base_alert to support multiple nameservices (aonishuk) 81224a3 is described below commit 81224a3608e1f6db1138992d9c16ba9ebda5975b Author: Andrew OnishukAuthorDate: Thu Apr 12 16:25:22 2018 +0300 AMBARI-23560. Refactor base_alert to support multiple nameservices (aonishuk) --- .../main/python/ambari_agent/alerts/base_alert.py | 51 +- 1 file changed, 31 insertions(+), 20 deletions(-) diff --git a/ambari-agent/src/main/python/ambari_agent/alerts/base_alert.py b/ambari-agent/src/main/python/ambari_agent/alerts/base_alert.py index 9d894c5..1acad26 100644 --- a/ambari-agent/src/main/python/ambari_agent/alerts/base_alert.py +++ b/ambari-agent/src/main/python/ambari_agent/alerts/base_alert.py @@ -433,6 +433,7 @@ class BaseAlert(object): ha_alias_key = alert_uri_lookup_keys.ha_alias_key ha_http_pattern = alert_uri_lookup_keys.ha_http_pattern ha_https_pattern = alert_uri_lookup_keys.ha_https_pattern +ha_nameservice_aliases = {} # if HA alias key is not defined then it's not HA environment if ha_alias_key is None: @@ -444,18 +445,25 @@ class BaseAlert(object): return None # convert dfs.ha.namenodes.{{ha-nameservice}} into dfs.ha.namenodes.c1ha - ha_alias_key = ha_alias_key.replace(self.HA_NAMESERVICE_PARAM, ha_nameservice) - ha_nameservice_alias = self._get_configuration_value(configurations, ha_alias_key) + ha_nameservices = filter(None, ha_nameservice.split(',')) - if ha_nameservice_alias is None: + for nameservice in ha_nameservices: +ha_alias_key_nameservice = ha_alias_key.replace(self.HA_NAMESERVICE_PARAM, nameservice) +ha_nameservice_alias = self._get_configuration_value(configurations, ha_alias_key_nameservice) + + +if ha_nameservice_alias: + ha_nameservice_aliases[nameservice] = ha_nameservice_alias + + if not ha_nameservice_aliases: logger.warning("[Alert][{0}] HA nameservice value is present but there are no aliases for {1}".format( self.get_name(), ha_alias_key)) return None else: - ha_nameservice_alias = self._get_configuration_value(configurations, ha_alias_key) + ha_nameservice_aliases = {None: self._get_configuration_value(configurations, ha_alias_key)} # if HA nameservice is not defined then the fact that the HA alias_key could not be evaluated shows that it's not HA environment - if ha_nameservice_alias is None: + if ha_nameservice_aliases[None] is None: return None # determine which pattern to use (http or https) @@ -477,22 +485,25 @@ class BaseAlert(object): return None -# convert dfs.namenode.http-address.{{ha-nameservice}}.{{alias}} into -# dfs.namenode.http-address.c1ha.{{alias}} -if ha_nameservice is not None: - ha_pattern = ha_pattern.replace(self.HA_NAMESERVICE_PARAM, ha_nameservice) - # for each alias, grab it and check to see if this host matches -for alias in ha_nameservice_alias.split(','): - # convert dfs.namenode.http-address.c1ha.{{alias}} into - # dfs.namenode.http-address.c1ha.nn1 - key = ha_pattern.replace(self.HA_ALIAS_PARAM, alias.strip()) - - # get the host for dfs.namenode.http-address.c1ha.nn1 and see if it's - # this host - value = self._get_configuration_value(configurations, key) - if value is not None and (self.host_name.lower() in value.lower() or self.public_host_name.lower() in value.lower()): -return AlertUri(uri=value, is_ssl_enabled=is_ssl_enabled) +for nameservice, aliases in ha_nameservice_aliases.iteritems(): + for alias in aliases.split(','): + +# convert dfs.namenode.http-address.{{ha-nameservice}}.{{alias}} into +# dfs.namenode.http-address.c1ha.{{alias}} +ha_pattern_current = ha_pattern +if nameservice is not None: + ha_pattern_current = ha_pattern_current.replace(self.HA_NAMESERVICE_PARAM, nameservice) +# convert dfs.namenode.http-address.c1ha.{{alias}} into +# dfs.namenode.http-address.c1ha.nn1 +key = ha_pattern_current.replace(self.HA_ALIAS_PARAM, alias.strip()) + +# get the host for dfs.namenode.http-address.c1ha.nn1 and see if it's +# this host +value = self._get_configuration_value(configurations, key) + +if value is not None and (self.host_name.lower() in value.lower() or self.public_host_name.lower() in value.lower()): + return AlertUri(uri=value, is_ssl_enabled=is_ssl_enabled) return None -- To stop receiving notification emails like this one, please contact aonis...@apache.org.
[ambari] branch branch-feature-AMBARI-14714-configs created (now f93c9af)
This is an automated email from the ASF dual-hosted git repository. mradhakrishnan pushed a change to branch branch-feature-AMBARI-14714-configs in repository https://gitbox.apache.org/repos/asf/ambari.git. at f93c9af AMBARI-23508: Update execution_command module to handle data type con… (#957) No new revisions were added by this update. -- To stop receiving notification emails like this one, please contact mradhakrish...@apache.org.
[ambari] branch trunk updated: AMBARI-23559. Journalnode restart step is required when edits dir is changed (akovalenko)
This is an automated email from the ASF dual-hosted git repository. akovalenko pushed a commit to branch trunk in repository https://gitbox.apache.org/repos/asf/ambari.git The following commit(s) were added to refs/heads/trunk by this push: new 81a6957 AMBARI-23559. Journalnode restart step is required when edits dir is changed (akovalenko) 81a6957 is described below commit 81a6957a7a48f1d664e357142e82708d5a745e8e Author: Aleksandr KovalenkoAuthorDate: Thu Apr 12 16:43:25 2018 +0300 AMBARI-23559. Journalnode restart step is required when edits dir is changed (akovalenko) --- .../main/admin/federation/step4_controller.js | 31 +- ambari-web/app/messages.js | 19 ++--- 2 files changed, 40 insertions(+), 10 deletions(-) diff --git a/ambari-web/app/controllers/main/admin/federation/step4_controller.js b/ambari-web/app/controllers/main/admin/federation/step4_controller.js index c9c6557..ff609f7 100644 --- a/ambari-web/app/controllers/main/admin/federation/step4_controller.js +++ b/ambari-web/app/controllers/main/admin/federation/step4_controller.js @@ -22,7 +22,7 @@ App.NameNodeFederationWizardStep4Controller = App.HighAvailabilityProgressPageCo name: "nameNodeFederationWizardStep4Controller", - commands: ['reconfigureServices', 'installNameNode', 'installZKFC', 'formatNameNode', 'formatZKFC', 'startZKFC', 'startNameNode', 'bootstrapNameNode', 'createWidgets', 'startZKFC2', 'startNameNode2', 'restartAllServices'], + commands: ['reconfigureServices', 'installNameNode', 'installZKFC', 'restartJournalNodes', 'formatNameNode', 'formatZKFC', 'startZKFC', 'startNameNode', 'bootstrapNameNode', 'createWidgets', 'startZKFC2', 'startNameNode2', 'restartAllServices'], tasksMessagesPrefix: 'admin.nameNodeFederation.wizard.step', @@ -72,6 +72,35 @@ App.NameNodeFederationWizardStep4Controller = App.HighAvailabilityProgressPageCo this.createInstallComponentTask('ZKFC', this.get('newNameNodeHosts'), "HDFS"); }, + restartJournalNodes: function () { +var context = "Restart JournalNodes"; + +var resource_filters = { + component_name: "JOURNALNODE", + hosts: App.HostComponent.find().filterProperty('componentName', 'JOURNALNODE').mapProperty('hostName').join(','), + service_name: "HDFS" +}; + +var operation_level = { + level: "HOST_COMPONENT", + cluster_name: this.get('content.cluster.name'), + service_name: "HDFS", + hostcomponent_name: "JOURNALNODE" +}; + +App.ajax.send({ + name: 'restart.hostComponents', + sender: this, + data: { +context: context, +resource_filters: [resource_filters], +operation_level: operation_level + }, + success: 'startPolling', + error: 'onTaskError' +}); + }, + formatNameNode: function () { App.ajax.send({ name: 'nameNode.federation.formatNameNode', diff --git a/ambari-web/app/messages.js b/ambari-web/app/messages.js index ee4492f..fbd7dd0 100644 --- a/ambari-web/app/messages.js +++ b/ambari-web/app/messages.js @@ -1692,15 +1692,16 @@ Em.I18n.translations = { 'admin.nameNodeFederation.wizard.step4.task0.title': 'Reconfigure Services', 'admin.nameNodeFederation.wizard.step4.task1.title': 'Install Additional NameNodes', 'admin.nameNodeFederation.wizard.step4.task2.title': 'Install Additional ZKFCs', - 'admin.nameNodeFederation.wizard.step4.task3.title': 'Format NameNode', - 'admin.nameNodeFederation.wizard.step4.task4.title': 'Format ZKFC', - 'admin.nameNodeFederation.wizard.step4.task5.title': 'Start ZKFC', - 'admin.nameNodeFederation.wizard.step4.task6.title': 'Start NameNode', - 'admin.nameNodeFederation.wizard.step4.task7.title': 'Bootstrap NameNode', - 'admin.nameNodeFederation.wizard.step4.task8.title': 'Create widgets', - 'admin.nameNodeFederation.wizard.step4.task9.title': 'Start ZKFC', - 'admin.nameNodeFederation.wizard.step4.task10.title': 'Start NameNode', - 'admin.nameNodeFederation.wizard.step4.task11.title': 'Restart Required Services', + 'admin.nameNodeFederation.wizard.step4.task3.title': 'Restart JournalNodes', + 'admin.nameNodeFederation.wizard.step4.task4.title': 'Format NameNode', + 'admin.nameNodeFederation.wizard.step4.task5.title': 'Format ZKFC', + 'admin.nameNodeFederation.wizard.step4.task6.title': 'Start ZKFC', + 'admin.nameNodeFederation.wizard.step4.task7.title': 'Start NameNode', + 'admin.nameNodeFederation.wizard.step4.task8.title': 'Bootstrap NameNode', + 'admin.nameNodeFederation.wizard.step4.task9.title': 'Create widgets', + 'admin.nameNodeFederation.wizard.step4.task10.title': 'Start ZKFC', + 'admin.nameNodeFederation.wizard.step4.task11.title': 'Start NameNode', + 'admin.nameNodeFederation.wizard.step4.task12.title': 'Restart Required Services', 'admin.security.title':'Kerberos security has not been enabled', 'admin.security.enabled': 'Kerberos security is
[ambari] branch trunk updated: [AMBARI-23526] Make sure that we update topology cache on agent side when Kerberizing the cluster (#951)
This is an automated email from the ASF dual-hosted git repository. rlevas pushed a commit to branch trunk in repository https://gitbox.apache.org/repos/asf/ambari.git The following commit(s) were added to refs/heads/trunk by this push: new 59eeafe [AMBARI-23526] Make sure that we update topology cache on agent side when Kerberizing the cluster (#951) 59eeafe is described below commit 59eeafe28eaeff7f07b84e8f3957ebb3780e9d13 Author: smolnar82 <34065904+smolna...@users.noreply.github.com> AuthorDate: Thu Apr 12 18:30:21 2018 +0200 [AMBARI-23526] Make sure that we update topology cache on agent side when Kerberizing the cluster (#951) * AMBARI-23526. Make sure that we update topology cache on agent side when Kerberizing the cluster * AMBARI-23526. Added license headers and updated JUnit test * AMBARI-23526. Injecting TopologyHolder in constructor to enable unit testing without creating Guice environment * AMBARI-23526. Triggering upgrade topology event in the Finalize Operations stage --- .../controller/AmbariManagementControllerImpl.java | 20 .../server/serveraction/AbstractServerAction.java | 7 ++ .../kerberos/FinalizeKerberosServerAction.java | 27 +- .../before-START/scripts/shared_initialization.py | 4 ++-- .../kerberos/FinalizeKerberosServerActionTest.java | 13 +-- 5 files changed, 55 insertions(+), 16 deletions(-) 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 0bd6ae0..a68ef89 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 @@ -52,7 +52,6 @@ import static org.apache.ambari.server.agent.ExecutionCommand.KeyNames.SERVICE_P import static org.apache.ambari.server.agent.ExecutionCommand.KeyNames.SERVICE_REPO_INFO; import static org.apache.ambari.server.agent.ExecutionCommand.KeyNames.STACK_NAME; import static org.apache.ambari.server.agent.ExecutionCommand.KeyNames.STACK_VERSION; -import static org.apache.ambari.server.agent.ExecutionCommand.KeyNames.UNLIMITED_KEY_JCE_REQUIRED; import static org.apache.ambari.server.agent.ExecutionCommand.KeyNames.USER_GROUPS; import static org.apache.ambari.server.agent.ExecutionCommand.KeyNames.USER_LIST; import static org.apache.ambari.server.controller.AmbariCustomCommandExecutionHelper.masterToSlaveMappingForDecom; @@ -2579,16 +2578,6 @@ public class AmbariManagementControllerImpl implements AmbariManagementControlle hostParams.put(CLIENTS_TO_UPDATE_CONFIGS, getClientsToUpdateConfigs(componentInfo)); -// If we are starting a component, calculate whether the unlimited key JCE policy is -// required for the relevant host. One of the following indicates that the unlimited -// key JCE policy is required: -// -// * The component explicitly requires it whether Kerberos is enabled or not (example, SMARTSENSE/HST_SERVER) -// * The component explicitly requires it only when Kerberos is enabled AND Kerberos is enabled (example, most components) -// -// Set/update the unlimited_key_jce_required value as needed -hostParams.put(UNLIMITED_KEY_JCE_REQUIRED, (getUnlimitedKeyJCERequirement(componentInfo, cluster.getSecurityType())) ? "true" : "false"); - execCmd.setHostLevelParams(hostParams); MaproleParams = new TreeMap<>(); @@ -5690,6 +5679,15 @@ public class AmbariManagementControllerImpl implements AmbariManagementControlle statusCommandParams.put(ExecutionCommand.KeyNames.CLIENTS_TO_UPDATE_CONFIGS, getClientsToUpdateConfigs(componentInfo)); + + // If we are starting a component, calculate whether the unlimited key JCE policy is + // required for the relevant host. One of the following indicates that the unlimited + // key JCE policy is required: + // + // * The component explicitly requires it whether Kerberos is enabled or not (example, SMARTSENSE/HST_SERVER) + // * The component explicitly requires it only when Kerberos is enabled AND Kerberos is enabled (example, most components) + // + // Set/update the unlimited_key_jce_required value as needed statusCommandParams.put(ExecutionCommand.KeyNames.UNLIMITED_KEY_JCE_REQUIRED, Boolean.toString(getUnlimitedKeyJCERequirement(componentInfo, clusterSecurityType))); } diff --git a/ambari-server/src/main/java/org/apache/ambari/server/serveraction/AbstractServerAction.java b/ambari-server/src/main/java/org/apache/ambari/server/serveraction/AbstractServerAction.java index a3286a9..c13eb5b 100644 ---
[ambari] branch trunk updated: AMBARI-23550. Ambari Metrics references outdated jars (#973)
This is an automated email from the ASF dual-hosted git repository. adoroszlai pushed a commit to branch trunk in repository https://gitbox.apache.org/repos/asf/ambari.git The following commit(s) were added to refs/heads/trunk by this push: new b7f4861 AMBARI-23550. Ambari Metrics references outdated jars (#973) b7f4861 is described below commit b7f48618c055963891b608bd73799870b095df10 Author: Doroszlai, Attila <6454655+adorosz...@users.noreply.github.com> AuthorDate: Thu Apr 12 18:03:03 2018 +0200 AMBARI-23550. Ambari Metrics references outdated jars (#973) --- ambari-metrics/ambari-metrics-timelineservice/pom.xml| 6 +++--- .../metrics/timeline/AbstractMiniHBaseClusterTest.java | 4 +++- ambari-metrics/pom.xml | 12 ++-- 3 files changed, 12 insertions(+), 10 deletions(-) diff --git a/ambari-metrics/ambari-metrics-timelineservice/pom.xml b/ambari-metrics/ambari-metrics-timelineservice/pom.xml index 13076f5..56a56e5 100644 --- a/ambari-metrics/ambari-metrics-timelineservice/pom.xml +++ b/ambari-metrics/ambari-metrics-timelineservice/pom.xml @@ -34,9 +34,9 @@ 2.5.0 -3.0.0.3.0.0.2-97 -5.0.0.3.0.0.2-97 -2.0.0.3.0.0.2-97 +3.0.0.3.0.0.0-1181 +5.0.0.3.0.0.0-1181 +2.0.0.3.0.0.0-1181 diff --git a/ambari-metrics/ambari-metrics-timelineservice/src/test/java/org/apache/hadoop/yarn/server/applicationhistoryservice/metrics/timeline/AbstractMiniHBaseClusterTest.java b/ambari-metrics/ambari-metrics-timelineservice/src/test/java/org/apache/hadoop/yarn/server/applicationhistoryservice/metrics/timeline/AbstractMiniHBaseClusterTest.java index c4cebd6..afad57a 100644 --- a/ambari-metrics/ambari-metrics-timelineservice/src/test/java/org/apache/hadoop/yarn/server/applicationhistoryservice/metrics/timeline/AbstractMiniHBaseClusterTest.java +++ b/ambari-metrics/ambari-metrics-timelineservice/src/test/java/org/apache/hadoop/yarn/server/applicationhistoryservice/metrics/timeline/AbstractMiniHBaseClusterTest.java @@ -39,9 +39,10 @@ import java.util.Properties; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.apache.hadoop.conf.Configuration; +import org.apache.hadoop.hbase.HBaseTestingUtility; +import org.apache.hadoop.hbase.HConstants; import org.apache.hadoop.hbase.IntegrationTestingUtility; import org.apache.hadoop.hbase.client.Admin; -import org.apache.hadoop.hbase.client.HBaseAdmin; import org.apache.hadoop.metrics2.sink.timeline.TimelineMetric; import org.apache.hadoop.metrics2.sink.timeline.TimelineMetrics; import org.apache.hadoop.yarn.server.applicationhistoryservice.metrics.timeline.aggregators.AggregatorUtils; @@ -156,6 +157,7 @@ public abstract class AbstractMiniHBaseClusterTest extends BaseTest { Boolean.FALSE.toString()); props.put("java.security.krb5.realm", ""); props.put("java.security.krb5.kdc", ""); +props.put(HConstants.REGIONSERVER_PORT, String.valueOf(HBaseTestingUtility.randomFreePort())); return props; } diff --git a/ambari-metrics/pom.xml b/ambari-metrics/pom.xml index 32f7ab2..7be2f26 100644 --- a/ambari-metrics/pom.xml +++ b/ambari-metrics/pom.xml @@ -40,14 +40,14 @@ python = 2.6 python (= 2.6) - http://dev.hortonworks.com.s3.amazonaws.com/HDP/centos7/3.x/BUILDS/3.0.0.2-97/tars/hbase/hbase-2.0.0.3.0.0.2-97-bin.tar.gz -hbase-2.0.0.3.0.0.2-97 - http://dev.hortonworks.com.s3.amazonaws.com/HDP/centos7/3.x/BUILDS/3.0.0.2-97/tars/hadoop/hadoop-3.0.0.3.0.0.2-97.tar.gz -hadoop-3.0.0.3.0.0.2-97 + http://dev.hortonworks.com.s3.amazonaws.com/HDP/centos7/3.x/BUILDS/3.0.0.0-1181/tars/hbase/hbase-2.0.0.3.0.0.0-1181-bin.tar.gz +hbase-2.0.0.3.0.0.0-1181 + http://dev.hortonworks.com.s3.amazonaws.com/HDP/centos7/3.x/BUILDS/3.0.0.0-1181/tars/hadoop/hadoop-3.0.0.3.0.0.0-1181.tar.gz +hadoop-3.0.0.3.0.0.0-1181 grafana-2.6.0 https://grafanarel.s3.amazonaws.com/builds/grafana-2.6.0.linux-x64.tar.gz - http://dev.hortonworks.com.s3.amazonaws.com/HDP/centos7/3.x/BUILDS/3.0.0.2-97/tars/phoenix/phoenix-5.0.0.3.0.0.2-97.tar.gz -phoenix-5.0.0.3.0.0.2-97 + http://dev.hortonworks.com.s3.amazonaws.com/HDP/centos7/3.x/BUILDS/3.0.0.0-1181/tars/phoenix/phoenix-5.0.0.3.0.0.0-1181.tar.gz +phoenix-5.0.0.3.0.0.0-1181 /usr/lib/python2.6/site-packages/resource_monitoring 1.6.2 apache.snapshots.https -- To stop receiving notification emails like this one, please contact adorosz...@apache.org.
[ambari] branch trunk updated: AMBARI-23142 - ADDENDUM Add AMS Metrics publisher to Infra Solr (#969)
This is an automated email from the ASF dual-hosted git repository. swagle pushed a commit to branch trunk in repository https://gitbox.apache.org/repos/asf/ambari.git The following commit(s) were added to refs/heads/trunk by this push: new ad6c7b0 AMBARI-23142 - ADDENDUM Add AMS Metrics publisher to Infra Solr (#969) ad6c7b0 is described below commit ad6c7b0ee632d8d5d78150aaea8bb738065aba12 Author: kasakrisz <33458261+kasakr...@users.noreply.github.com> AuthorDate: Thu Apr 12 18:03:45 2018 +0200 AMBARI-23142 - ADDENDUM Add AMS Metrics publisher to Infra Solr (#969) --- .../ambari-metrics/datasource.js | 158 --- ...es.json => grafana-infra-solr-collections.json} | 505 ++--- .../HDP/grafana-infra-solr-cores.json | 250 +- .../HDP/grafana-infra-solr-hosts.json | 335 +- 4 files changed, 705 insertions(+), 543 deletions(-) diff --git a/ambari-metrics/ambari-metrics-grafana/ambari-metrics/datasource.js b/ambari-metrics/ambari-metrics-grafana/ambari-metrics/datasource.js index 4a6a77c..65b834b 100644 --- a/ambari-metrics/ambari-metrics-grafana/ambari-metrics/datasource.js +++ b/ambari-metrics/ambari-metrics-grafana/ambari-metrics/datasource.js @@ -343,18 +343,31 @@ define([ }; // Infra Solr Calls -var getSolrCoreData = function(target) { -var instanceId = typeof target.templatedCluster == 'undefined' ? '' : '=' + target.templatedCluster; -var precision = target.precision === 'default' || typeof target.precision == 'undefined' ? '' : '=' -+ target.precision; -var metricAggregator = target.aggregator === "none" ? '' : '._' + target.aggregator; -var metricTransform = !target.transform || target.transform === "none" ? '' : '._' + target.transform; -var seriesAggregator = !target.seriesAggregator || target.seriesAggregator === "none" ? '' : '=' + target.seriesAggregator; -return self.doAmbariRequest({ url: '/ws/v1/timeline/metrics?metricNames=' + target.sCoreMetric + metricTransform + instanceId -+ metricAggregator + '=ambari-infra-solr=' + from + '=' + to + precision + seriesAggregator }).then( -allHostMetricsData(target) -); -}; + var getSolrCoreData = function(target) { + var instanceId = typeof target.templatedCluster == 'undefined' ? '' : '=' + target.templatedCluster; + var precision = target.precision === 'default' || typeof target.precision == 'undefined' ? '' : '=' + + target.precision; + var metricAggregator = target.aggregator === "none" ? '' : '._' + target.aggregator; + var metricTransform = !target.transform || target.transform === "none" ? '' : '._' + target.transform; + var seriesAggregator = !target.seriesAggregator || target.seriesAggregator === "none" ? '' : '=' + target.seriesAggregator; + return self.doAmbariRequest({ url: '/ws/v1/timeline/metrics?metricNames=' + target.sCoreMetric + metricTransform + instanceId + + metricAggregator + '=ambari-infra-solr=' + from + '=' + to + precision + seriesAggregator }).then( + allHostMetricsData(target) + ); + }; + + var getSolrCollectionData = function(target) { + var instanceId = typeof target.templatedCluster == 'undefined' ? '' : '=' + target.templatedCluster; + var precision = target.precision === 'default' || typeof target.precision == 'undefined' ? '' : '=' + + target.precision; + var metricAggregator = target.aggregator === "none" ? '' : '._' + target.aggregator; + var metricTransform = !target.transform || target.transform === "none" ? '' : '._' + target.transform; + var seriesAggregator = !target.seriesAggregator || target.seriesAggregator === "none" ? '' : '=' + target.seriesAggregator; + return self.doAmbariRequest({ url: '/ws/v1/timeline/metrics?metricNames=' + target.sCollectionMetric + metricTransform + instanceId + + metricAggregator + '=ambari-infra-solr=' + from + '=' + to + precision + seriesAggregator }).then( + allHostMetricsData(target) + ); + }; // Druid calls. var getDruidData = function(target) { @@ -473,22 +486,39 @@ define([ }); } - //Templatized Dashboard for Infra Solr Cores - if (templateSrv.variables[0].query === "infra_solr_core") { - var allCores = templateSrv.variables.filter(function(variable) { return variable.query === "infra_solr_core";}); - var selectedCores = (_.isEmpty(allCores)) ? "" : allCores[0].options.filter(function(core) -
[ambari] branch trunk updated (4a344db -> 7e17481)
This is an automated email from the ASF dual-hosted git repository. alexantonenko pushed a change to branch trunk in repository https://gitbox.apache.org/repos/asf/ambari.git. from 4a344db AMBARI-23543 Comparing config versions style tweaks add b6a3bbc AMBARI-23561. Ambari (HSI HA): Missing option to add another 'Hiveserver Interactive' component under actions menu for Active/Passive HSI. new 7e17481 Merge pull request #982 from hiveww/AMBARI-23561-trunk The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: ambari-web/app/messages.js| 1 + ambari-web/app/views/main/service/item.js | 6 ++ 2 files changed, 7 insertions(+) -- To stop receiving notification emails like this one, please contact alexantone...@apache.org.
[ambari] 01/01: Merge pull request #982 from hiveww/AMBARI-23561-trunk
This is an automated email from the ASF dual-hosted git repository. alexantonenko pushed a commit to branch trunk in repository https://gitbox.apache.org/repos/asf/ambari.git commit 7e174817e8edc3e9c48893c010928814a7a47b24 Merge: 4a344db b6a3bbc Author: Alexander AntonenkoAuthorDate: Thu Apr 12 18:54:19 2018 +0300 Merge pull request #982 from hiveww/AMBARI-23561-trunk AMBARI-23561. Ambari (HSI HA): Missing option to add another 'Hiveser… ambari-web/app/messages.js| 1 + ambari-web/app/views/main/service/item.js | 6 ++ 2 files changed, 7 insertions(+) -- To stop receiving notification emails like this one, please contact alexantone...@apache.org.
[ambari] branch trunk updated: AMBARI-23543 Comparing config versions style tweaks
This is an automated email from the ASF dual-hosted git repository. atkach pushed a commit to branch trunk in repository https://gitbox.apache.org/repos/asf/ambari.git The following commit(s) were added to refs/heads/trunk by this push: new 4a344db AMBARI-23543 Comparing config versions style tweaks 4a344db is described below commit 4a344dba2c4ae7ae6ded5f3b28c37a43081df1c7 Author: Andrii TkachAuthorDate: Wed Apr 11 17:01:07 2018 +0300 AMBARI-23543 Comparing config versions style tweaks --- ambari-web/app/messages.js | 2 +- ambari-web/app/styles/config_versions_control.less | 10 +++--- .../app/templates/common/configs/config_versions_control.hbs | 8 .../app/templates/common/configs/config_versions_dropdown.hbs | 4 ++-- 4 files changed, 10 insertions(+), 14 deletions(-) diff --git a/ambari-web/app/messages.js b/ambari-web/app/messages.js index 70cc8d7..7927674 100644 --- a/ambari-web/app/messages.js +++ b/ambari-web/app/messages.js @@ -2327,7 +2327,7 @@ Em.I18n.translations = { 'services.service.config.configHistory.leftArrow.tooltip': 'Show later versions', 'services.service.config.configHistory.dismissIcon.tooltip': 'Dismiss', 'services.service.config.configHistory.makeCurrent.message': 'Created from service config version {0}', - 'services.service.config.configHistory.comparing': 'Comparing Changes', + 'services.service.config.configHistory.comparing': 'Comparing Changes in', 'services.service.config.setRecommendedValue': 'Set Recommended', 'services.service.config.database.msg.jdbcSetup.detailed': 'To use {0} with Hive, you must ' + 'download the {4} from {0}. Once downloaded to the Ambari Server host, run: ' + diff --git a/ambari-web/app/styles/config_versions_control.less b/ambari-web/app/styles/config_versions_control.less index 86584ad..9ed84c8 100644 --- a/ambari-web/app/styles/config_versions_control.less +++ b/ambari-web/app/styles/config_versions_control.less @@ -22,7 +22,7 @@ #config-versions-control { .dropdown-menu { min-width: 600px; -padding-bottom: 20px; +padding-bottom: 8px; li { padding: 3px 20px; } @@ -89,15 +89,11 @@ height: 30px; cursor: pointer; } - .make-current { -color: @health-status-green; -border-color: @health-status-green; - } .compare-bar { background-color: @border-color; padding: 10px 15px; -.close { - line-height: 30px; +.compare-label { + vertical-align: middle; } } } diff --git a/ambari-web/app/templates/common/configs/config_versions_control.hbs b/ambari-web/app/templates/common/configs/config_versions_control.hbs index 251276b..e5dbcef 100644 --- a/ambari-web/app/templates/common/configs/config_versions_control.hbs +++ b/ambari-web/app/templates/common/configs/config_versions_control.hbs @@ -19,8 +19,8 @@ {{#if view.isCompareMode}} - - {{t services.service.config.configHistory.comparing}}: + + {{t services.service.config.configHistory.comparing}}: {{view App.ConfigVersionsDropdownView serviceVersionsBinding="view.primaryServiceVersionsInCompare" isCompareMode="true"}} @@ -29,12 +29,12 @@ serviceVersionsBinding="view.secondaryServiceVersionsInCompare" isSecondary="true" isCompareMode="true"}} - + {{else}} {{view App.ConfigVersionsDropdownView serviceVersionsBinding="view.serviceVersions"}} {{#unless view.displayedServiceVersion.isCurrent}} - + {{t dashboard.configHistory.info-bar.revert.button}} {{/unless}} diff --git a/ambari-web/app/templates/common/configs/config_versions_dropdown.hbs b/ambari-web/app/templates/common/configs/config_versions_dropdown.hbs index 1442145..b693700 100644 --- a/ambari-web/app/templates/common/configs/config_versions_dropdown.hbs +++ b/ambari-web/app/templates/common/configs/config_versions_dropdown.hbs @@ -21,7 +21,7 @@ {{t common.version}}: {{view.displayedServiceVersion.version}} - + {{view Em.TextField valueBinding="view.filterValue" class="form-control" placeholderBinding="view.searchLabel"}} @@ -60,7 +60,7 @@ {{#unless view.isCompareMode}} - + {{/unless}} -- To stop receiving notification emails like this one, please contact atk...@apache.org.
[ambari] branch trunk updated: AMBARI-23542 UI Performance Tuning
This is an automated email from the ASF dual-hosted git repository. atkach pushed a commit to branch trunk in repository https://gitbox.apache.org/repos/asf/ambari.git The following commit(s) were added to refs/heads/trunk by this push: new c7a83ae AMBARI-23542 UI Performance Tuning c7a83ae is described below commit c7a83ae3ffbe8d7d573639fae0d6f3f6be3dea65 Author: Andrii TkachAuthorDate: Wed Apr 11 16:31:33 2018 +0300 AMBARI-23542 UI Performance Tuning --- .../app/controllers/global/cluster_controller.js | 4 -- .../main/admin/highAvailability_controller.js | 4 +- .../main/dashboard/config_history_controller.js| 15 +++-- ambari-web/app/controllers/main/host.js| 50 +-- .../app/mixins/main/service/themes_mapping.js | 24 --- ambari-web/app/routes/reassign_master_routes.js| 2 +- .../templates/main/dashboard/config_history.hbs| 4 +- ambari-web/app/utils/ajax/ajax.js | 13 ambari-web/app/utils/config.js | 75 +- .../views/main/dashboard/config_history_view.js| 7 +- ambari-web/app/views/main/host.js | 5 -- .../views/main/host/details/host_component_view.js | 2 +- .../main/admin/highAvailability_controller_test.js | 10 +-- .../dashboard/config_history_controller_test.js| 4 +- ambari-web/test/controllers/main/host_test.js | 45 - .../main/host/details/host_component_view_test.js | 9 ++- ambari-web/test/views/main/host_test.js| 19 -- 17 files changed, 91 insertions(+), 201 deletions(-) diff --git a/ambari-web/app/controllers/global/cluster_controller.js b/ambari-web/app/controllers/global/cluster_controller.js index 349a73c..20b0e8a 100644 --- a/ambari-web/app/controllers/global/cluster_controller.js +++ b/ambari-web/app/controllers/global/cluster_controller.js @@ -177,10 +177,6 @@ App.ClusterController = Em.Controller.extend(App.ReloadPopupMixin, { App.router.get('userSettingsController').getAllUserSettings(); App.router.get('errorsHandlerController').loadErrorLogs(); -var hostsController = App.router.get('mainHostController'); -hostsController.set('isCountersUpdating', true); -hostsController.updateStatusCounters(); - this.loadClusterInfo(); this.restoreUpgradeState(); App.router.get('wizardWatcherController').getUser(); diff --git a/ambari-web/app/controllers/main/admin/highAvailability_controller.js b/ambari-web/app/controllers/main/admin/highAvailability_controller.js index e9a86df..5a18e57 100644 --- a/ambari-web/app/controllers/main/admin/highAvailability_controller.js +++ b/ambari-web/app/controllers/main/admin/highAvailability_controller.js @@ -43,7 +43,7 @@ App.MainAdminHighAvailabilityController = App.WizardController.extend({ message.push(Em.I18n.t('admin.highAvailability.error.maintenanceMode')); } -if (App.router.get('mainHostController.hostsCountMap.TOTAL') < 3) { +if (App.get('allHostNames.length') < 3) { message.push(Em.I18n.t('admin.highAvailability.error.hostsNum')); } if (message.length > 0) { @@ -69,7 +69,7 @@ App.MainAdminHighAvailabilityController = App.WizardController.extend({ message.push(Em.I18n.t('admin.rm_highAvailability.error.zooKeeperNum')); } -if (App.router.get('mainHostController.hostsCountMap.TOTAL') < 3) { +if (App.get('allHostNames.length') < 3) { message.push(Em.I18n.t('admin.rm_highAvailability.error.hostsNum')); } if (message.length > 0) { diff --git a/ambari-web/app/controllers/main/dashboard/config_history_controller.js b/ambari-web/app/controllers/main/dashboard/config_history_controller.js index 73c5386..ffef7e4 100644 --- a/ambari-web/app/controllers/main/dashboard/config_history_controller.js +++ b/ambari-web/app/controllers/main/dashboard/config_history_controller.js @@ -106,12 +106,15 @@ App.MainConfigHistoryController = Em.ArrayController.extend(App.TableServerMixin * - total counter of service config versions(called in parallel) * - current versions * - filtered versions + * @param {boolean} shouldUpdateCounter * @return {*} */ - load: function () { -var dfd = $.Deferred(); -this.updateTotalCounter(); -this.loadConfigVersionsToModel().done(function () { + load: function (shouldUpdateCounter = false) { +const dfd = $.Deferred(); +this.loadConfigVersionsToModel().done(() => { + if (shouldUpdateCounter) { +this.updateTotalCounter(); + } dfd.resolve(); }); return dfd.promise(); @@ -143,7 +146,7 @@ App.MainConfigHistoryController = Em.ArrayController.extend(App.TableServerMixin }, updateTotalCounterSuccess: function (data, opt, params) { -this.set('totalCount', data.itemTotal); +this.set('totalCount', Number(data.itemTotal)); }, getUrl: function (queryParams) { @@ -160,7 +163,7 @@ App.MainConfigHistoryController
[ambari] 01/02: AMBARI-23527 Slash not unescaped in property name
This is an automated email from the ASF dual-hosted git repository. atkach pushed a commit to branch trunk in repository https://gitbox.apache.org/repos/asf/ambari.git commit f913ba37919d40a135a15e43ac0be104eb94a53f Author: Andrii TkachAuthorDate: Tue Apr 10 16:30:30 2018 +0300 AMBARI-23527 Slash not unescaped in property name --- ambari-web/app/mappers/configs/stack_config_properties_mapper.js | 1 + ambari-web/app/mappers/configs/themes_mapper.js | 2 +- ambari-web/app/utils/config.js | 1 + 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/ambari-web/app/mappers/configs/stack_config_properties_mapper.js b/ambari-web/app/mappers/configs/stack_config_properties_mapper.js index 75a5564..153907c 100644 --- a/ambari-web/app/mappers/configs/stack_config_properties_mapper.js +++ b/ambari-web/app/mappers/configs/stack_config_properties_mapper.js @@ -145,6 +145,7 @@ App.stackConfigPropertiesMapper = App.QuickDataMapper.create({ staticConfigInfo.value = staticConfigInfo.recommendedValue = App.config.formatPropertyValue(staticConfigInfo, v); staticConfigInfo.isSecureConfig = App.config.getIsSecure(staticConfigInfo.name); staticConfigInfo.description = App.config.getDescription(staticConfigInfo.description, staticConfigInfo.displayType); + staticConfigInfo.name = JSON.parse('"' + staticConfigInfo.name + '"'); staticConfigInfo.isUserProperty = false; App.configsCollection.add(staticConfigInfo); diff --git a/ambari-web/app/mappers/configs/themes_mapper.js b/ambari-web/app/mappers/configs/themes_mapper.js index 8d00f3b..cd4bb05 100644 --- a/ambari-web/app/mappers/configs/themes_mapper.js +++ b/ambari-web/app/mappers/configs/themes_mapper.js @@ -233,7 +233,7 @@ App.themesMapper = App.QuickDataMapper.create({ showLabel: false, isOverridable: false, recommendedValue: true, -name: configName, +name: JSON.parse('"' + configName + '"'), isUserProperty: false, filename: fileName, fileName: fileName, diff --git a/ambari-web/app/utils/config.js b/ambari-web/app/utils/config.js index 2748464..18bbf29 100644 --- a/ambari-web/app/utils/config.js +++ b/ambari-web/app/utils/config.js @@ -283,6 +283,7 @@ App.config = Em.Object.create({ * @returns {*|Object} */ getDefaultConfig: function(name, fileName, coreObject) { +name = JSON.parse('"' + name + '"'); var cfg = App.configsCollection.getConfigByName(name, fileName) || App.config.createDefaultConfig(name, fileName, false); if (Em.typeOf(coreObject) === 'object') { -- To stop receiving notification emails like this one, please contact atk...@apache.org.
[ambari] branch trunk updated (6885d87 -> 06424bd)
This is an automated email from the ASF dual-hosted git repository. atkach pushed a change to branch trunk in repository https://gitbox.apache.org/repos/asf/ambari.git. from 6885d87 AMBARI-23554 NN federation: switching namespaces for dashboard widgets doesn't work. (ababiichuk) new f913ba3 AMBARI-23527 Slash not unescaped in property name new 06424bd AMBARI-23527 Slash not unescaped in property name The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: .../app/mappers/configs/stack_config_properties_mapper.js | 1 + ambari-web/app/mappers/configs/themes_mapper.js | 2 +- ambari-web/app/mixins/common/configs/configs_comparator.js| 11 ++- ambari-web/app/utils/config.js| 1 + 4 files changed, 9 insertions(+), 6 deletions(-) -- To stop receiving notification emails like this one, please contact atk...@apache.org.
[ambari] 02/02: AMBARI-23527 Slash not unescaped in property name
This is an automated email from the ASF dual-hosted git repository. atkach pushed a commit to branch trunk in repository https://gitbox.apache.org/repos/asf/ambari.git commit 06424bd6c6003145f48378d09714db3f1fff5a6a Author: Andrii TkachAuthorDate: Wed Apr 11 17:16:14 2018 +0300 AMBARI-23527 Slash not unescaped in property name --- ambari-web/app/mixins/common/configs/configs_comparator.js | 11 ++- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/ambari-web/app/mixins/common/configs/configs_comparator.js b/ambari-web/app/mixins/common/configs/configs_comparator.js index 0af60ce..4dbcfc1 100644 --- a/ambari-web/app/mixins/common/configs/configs_comparator.js +++ b/ambari-web/app/mixins/common/configs/configs_comparator.js @@ -88,9 +88,10 @@ App.ConfigsComparator = Em.Mixin.create({ if (serviceName === 'YARN' && configuration.type === 'capacity-scheduler') { this.addCompareCSConfigs(configuration, serviceVersionMap, item); } else { - for (var prop in configuration.properties) { -serviceVersionMap[item.service_config_version][prop + '-' + configuration.type] = { - name: prop, + for (const prop in configuration.properties) { +const name = JSON.parse('"' + prop + '"'); +serviceVersionMap[item.service_config_version][name + '-' + configuration.type] = { + name: name, value: configuration.properties[prop], type: configuration.type, tag: configuration.tag, @@ -98,8 +99,8 @@ App.ConfigsComparator = Em.Mixin.create({ service_config_version: item.service_config_version, filename: App.config.getOriginalFileName(configuration.type) }; -if (Em.isNone(configNamesMap[prop])) { - allConfigs.push(this.getMockConfig(prop, serviceName, App.config.getOriginalFileName(configuration.type))); +if (Em.isNone(configNamesMap[name])) { + allConfigs.push(this.getMockConfig(name, serviceName, App.config.getOriginalFileName(configuration.type))); } } } -- To stop receiving notification emails like this one, please contact atk...@apache.org.
[ambari] branch trunk updated: AMBARI-23554 NN federation: switching namespaces for dashboard widgets doesn't work. (ababiichuk)
This is an automated email from the ASF dual-hosted git repository. ababiichuk pushed a commit to branch trunk in repository https://gitbox.apache.org/repos/asf/ambari.git The following commit(s) were added to refs/heads/trunk by this push: new 6885d87 AMBARI-23554 NN federation: switching namespaces for dashboard widgets doesn't work. (ababiichuk) 6885d87 is described below commit 6885d877de9b64304ecd3479257982a6f4fc354c Author: aBabiichukAuthorDate: Thu Apr 12 15:42:22 2018 +0300 AMBARI-23554 NN federation: switching namespaces for dashboard widgets doesn't work. (ababiichuk) --- ambari-web/app/templates/main/dashboard/widgets.hbs | 6 -- ambari-web/app/views/main/service/info/summary.js | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/ambari-web/app/templates/main/dashboard/widgets.hbs b/ambari-web/app/templates/main/dashboard/widgets.hbs index 867ac94..62d1c89 100644 --- a/ambari-web/app/templates/main/dashboard/widgets.hbs +++ b/ambari-web/app/templates/main/dashboard/widgets.hbs @@ -102,8 +102,10 @@ {{#each groupLayout in group.allWidgets}} {{#if groupLayout.isActive}} {{#each widget in groupLayout.widgets}} -{{#if widget.isVisible}} - {{view widget.viewClass widgetBinding="widget"}} +{{#if widget}} + {{#if widget.isVisible}} +{{view widget.viewClass widgetBinding="widget"}} + {{/if}} {{/if}} {{/each}} {{/if}} diff --git a/ambari-web/app/views/main/service/info/summary.js b/ambari-web/app/views/main/service/info/summary.js index 4113242..a501e1d 100644 --- a/ambari-web/app/views/main/service/info/summary.js +++ b/ambari-web/app/views/main/service/info/summary.js @@ -217,7 +217,7 @@ App.MainServiceInfoSummaryView = Em.View.extend({ const masters = this.get('service.hostComponents').filterProperty('isMaster'), slaves = this.get('service.slaveComponents').toArray(), clients = this.get('service.clientComponents').toArray(), -masterGroups = this.get('svc') ? this.get('svc.masterComponentGroups').toArray() : []; +masterGroups = this.get('svc.masterComponentGroups') ? this.get('svc.masterComponentGroups').toArray() : []; if (this.get('mastersLength') !== masters.length || this.get('mastersObj.length') !== masterGroups.length) { let mastersInit = this.get('mastersObj').mapProperty('components').reduce((acc, group) => { -- To stop receiving notification emails like this one, please contact ababiic...@apache.org.
[ambari] branch trunk updated: [AMBARI-23493] Decommission Datanode doesn't work (dsen)
This is an automated email from the ASF dual-hosted git repository. dsen pushed a commit to branch trunk in repository https://gitbox.apache.org/repos/asf/ambari.git The following commit(s) were added to refs/heads/trunk by this push: new 675ca9a [AMBARI-23493] Decommission Datanode doesn't work (dsen) 675ca9a is described below commit 675ca9a64f70fae517aeefcadcbab137a239922a Author: Dmytro SenAuthorDate: Thu Apr 12 11:58:51 2018 +0300 [AMBARI-23493] Decommission Datanode doesn't work (dsen) --- .../AmbariCustomCommandExecutionHelper.java| 16 + .../org/apache/ambari/server/utils/StageUtils.java | 28 -- .../HDFS/2.1.0.2.0/package/scripts/params_linux.py | 5 +++- .../YARN/2.1.0.2.0/package/scripts/params_linux.py | 5 +++- .../controller/AmbariManagementControllerTest.java | 9 +++ .../apache/ambari/server/utils/StageUtilsTest.java | 4 6 files changed, 33 insertions(+), 34 deletions(-) diff --git a/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariCustomCommandExecutionHelper.java b/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariCustomCommandExecutionHelper.java index 61b14c4..d396d12 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariCustomCommandExecutionHelper.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariCustomCommandExecutionHelper.java @@ -129,6 +129,7 @@ public class AmbariCustomCommandExecutionHelper { public final static String DECOM_INCLUDED_HOSTS = "included_hosts"; public final static String DECOM_EXCLUDED_HOSTS = "excluded_hosts"; + public final static String ALL_DECOMMISSIONED_HOSTS = "all_decommissioned_hosts"; public final static String DECOM_SLAVE_COMPONENT = "slave_type"; public final static String HBASE_MARK_DRAINING_ONLY = "mark_draining_only"; public final static String UPDATE_FILES_ONLY = "update_files_only"; @@ -1056,6 +1057,10 @@ public class AmbariCustomCommandExecutionHelper { } Map commandParams = new HashMap<>(); + + commandParams.put(ALL_DECOMMISSIONED_HOSTS, + StringUtils.join(calculateDecommissionedNodes(service, slaveCompType), ',')); + if (serviceName.equals(Service.Type.HBASE.name())) { commandParams.put(DECOM_EXCLUDED_HOSTS, StringUtils.join(listOfExcludedHosts, ',')); if ((isDrainOnlyRequest != null) && isDrainOnlyRequest.equals("true")) { @@ -1072,6 +1077,17 @@ public class AmbariCustomCommandExecutionHelper { } } + private Set calculateDecommissionedNodes(Service service, String slaveCompType) throws AmbariException { +Set decommissionedHostsSet = new HashSet<>(); +ServiceComponent serviceComponent = service.getServiceComponent(slaveCompType); +for (ServiceComponentHost serviceComponentHost : serviceComponent.getServiceComponentHosts().values()) { + if (serviceComponentHost.getComponentAdminState() == HostComponentAdminState.DECOMMISSIONED) { +decommissionedHostsSet.add(serviceComponentHost.getHostName()); + } +} +return decommissionedHostsSet; + } + private StringBuilder getReadableDecommissionCommandDetail( ActionExecutionContext actionExecutionContext, Set includedHosts, diff --git a/ambari-server/src/main/java/org/apache/ambari/server/utils/StageUtils.java b/ambari-server/src/main/java/org/apache/ambari/server/utils/StageUtils.java index 1130e3d..f023b3a 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/utils/StageUtils.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/utils/StageUtils.java @@ -58,10 +58,8 @@ import org.apache.ambari.server.configuration.Configuration; import org.apache.ambari.server.controller.ActionExecutionContext; import org.apache.ambari.server.state.Cluster; import org.apache.ambari.server.state.Host; -import org.apache.ambari.server.state.HostComponentAdminState; import org.apache.ambari.server.state.Service; import org.apache.ambari.server.state.ServiceComponent; -import org.apache.ambari.server.state.ServiceComponentHost; import org.apache.ambari.server.state.svccomphost.ServiceComponentHostInstallEvent; import org.apache.ambari.server.topology.TopologyManager; import org.apache.commons.lang.StringUtils; @@ -92,8 +90,6 @@ public class StageUtils { protected static final String RACKS = "all_racks"; protected static final String IPV4_ADDRESSES = "all_ipv4_ips"; - private static Map decommissionedToClusterInfoKeyMap = -new HashMap<>(); private volatile static Gson gson; @Inject @@ -149,12 +145,6 @@ public class StageUtils { StageUtils.configuration = configuration; } - static { -decommissionedToClusterInfoKeyMap.put("DATANODE", "decom_dn_hosts"); -decommissionedToClusterInfoKeyMap.put("TASKTRACKER", "decom_tt_hosts"); -decommissionedToClusterInfoKeyMap.put("NODEMANAGER",
[ambari] branch trunk updated: AMBARI-23512 Log Search UI: search box fixes
This is an automated email from the ASF dual-hosted git repository. ababiichuk pushed a commit to branch trunk in repository https://gitbox.apache.org/repos/asf/ambari.git The following commit(s) were added to refs/heads/trunk by this push: new e16bdec AMBARI-23512 Log Search UI: search box fixes e16bdec is described below commit e16bdec9b875213dedca1556d22fb1a6b602a95e Author: Istvan TobiasAuthorDate: Thu Apr 12 12:38:15 2018 +0200 AMBARI-23512 Log Search UI: search box fixes --- .../filters-panel/filters-panel.component.html | 2 +- .../search-box/search-box.component.html | 10 ++-- .../search-box/search-box.component.less | 16 +- .../components/search-box/search-box.component.ts | 63 +++--- .../ambari-logsearch-web/src/assets/i18n/en.json | 2 + 5 files changed, 69 insertions(+), 24 deletions(-) diff --git a/ambari-logsearch/ambari-logsearch-web/src/app/components/filters-panel/filters-panel.component.html b/ambari-logsearch/ambari-logsearch-web/src/app/components/filters-panel/filters-panel.component.html index 397603b..1ff8e62 100644 --- a/ambari-logsearch/ambari-logsearch-web/src/app/components/filters-panel/filters-panel.component.html +++ b/ambari-logsearch/ambari-logsearch-web/src/app/components/filters-panel/filters-panel.component.html @@ -19,7 +19,7 @@ diff --git a/ambari-logsearch/ambari-logsearch-web/src/app/components/search-box/search-box.component.html b/ambari-logsearch/ambari-logsearch-web/src/app/components/search-box/search-box.component.html index 786c130..2b462bf 100644 --- a/ambari-logsearch/ambari-logsearch-web/src/app/components/search-box/search-box.component.html +++ b/ambari-logsearch/ambari-logsearch-web/src/app/components/search-box/search-box.component.html @@ -18,12 +18,15 @@ {{item.label | translate}} - - + + {{parameter.label | translate}}: {{parameter.value}} - + + + {{activeItem.label | translate}}: + diff --git a/ambari-logsearch/ambari-logsearch-web/src/app/components/search-box/search-box.component.less b/ambari-logsearch/ambari-logsearch-web/src/app/components/search-box/search-box.component.less index 1b54e83..b99f6aa 100644 --- a/ambari-logsearch/ambari-logsearch-web/src/app/components/search-box/search-box.component.less +++ b/ambari-logsearch/ambari-logsearch-web/src/app/components/search-box/search-box.component.less @@ -42,9 +42,15 @@ font-weight: normal; } -.remove-parameter { +.action-icon { cursor: pointer; } +.fa-search-plus { + color: @form-success-color; +} +.fa-search-minus { + color: @form-error-color; +} } .active-parameter-label { @@ -56,6 +62,7 @@ position: relative; min-width: @inactive-input-width; height: @input-height; +flex-grow: 1; .search-item-input { border: none; @@ -104,4 +111,11 @@ } } } + + .clear-all-btn { +color: @unknown-color; +cursor: pointer; +height: 1em; +width: 1em; + } } diff --git a/ambari-logsearch/ambari-logsearch-web/src/app/components/search-box/search-box.component.ts b/ambari-logsearch/ambari-logsearch-web/src/app/components/search-box/search-box.component.ts index ade57e5..b9a43df 100644 --- a/ambari-logsearch/ambari-logsearch-web/src/app/components/search-box/search-box.component.ts +++ b/ambari-logsearch/ambari-logsearch-web/src/app/components/search-box/search-box.component.ts @@ -38,23 +38,6 @@ import {UtilsService} from '@app/services/utils.service'; }) export class SearchBoxComponent implements OnInit, OnDestroy, ControlValueAccessor { - constructor(private utils: UtilsService) { - } - - ngOnInit(): void { -this.parameterInput = this.parameterInputRef.nativeElement; -this.valueInput = this.valueInputRef.nativeElement; -this.parameterNameChangeSubject.subscribe(this.onParameterNameChange); -this.parameterAddSubject.subscribe(this.onParameterAdd); -this.updateValueSubject.subscribe(this.updateValue); - } - - ngOnDestroy(): void { -this.parameterNameChangeSubject.unsubscribe(); -this.parameterAddSubject.unsubscribe(); -this.updateValueSubject.unsubscribe(); - } - private currentId: number = 0; private isExclude: boolean = false; @@ -137,6 +120,22 @@ export class SearchBoxComponent implements OnInit, OnDestroy, ControlValueAccess */ parameters: SearchBoxParameterProcessed[] = []; + constructor(private utils: UtilsService) {} + + ngOnInit(): void { +this.parameterInput = this.parameterInputRef.nativeElement; +this.valueInput = this.valueInputRef.nativeElement; +this.parameterNameChangeSubject.subscribe(this.onParameterNameChange); +this.parameterAddSubject.subscribe(this.onParameterAdd); +this.updateValueSubject.subscribe(this.updateValue); + } + + ngOnDestroy(): void { +this.parameterNameChangeSubject.unsubscribe(); +
[ambari] branch trunk updated: AMBARI-23514 Log Search UI: various fixes for History feature
This is an automated email from the ASF dual-hosted git repository. ababiichuk pushed a commit to branch trunk in repository https://gitbox.apache.org/repos/asf/ambari.git The following commit(s) were added to refs/heads/trunk by this push: new 4f93c3c AMBARI-23514 Log Search UI: various fixes for History feature 4f93c3c is described below commit 4f93c3c793da419b684a56b6e282947d7b974316 Author: Istvan TobiasAuthorDate: Thu Apr 12 12:17:28 2018 +0200 AMBARI-23514 Log Search UI: various fixes for History feature --- .../action-menu/action-menu.component.html | 12 +- .../action-menu/action-menu.component.less | 70 .../action-menu/action-menu.component.ts | 8 +- .../menu-button/menu-button.component.html | 2 +- .../menu-button/menu-button.component.less | 10 ++ .../menu-button/menu-button.component.ts | 51 +++--- .../src/app/modules/app-load/app-load.module.ts| 4 +- .../modules/app-load/services/app-load.service.ts | 8 +- .../dropdown-list/dropdown-list.component.html | 6 +- .../src/app/modules/shared/variables.less | 2 +- .../src/app/services/auth.service.ts | 6 +- .../src/app/services/history-manager.service.ts| 93 +- .../src/app/services/http-client.service.ts| 2 +- .../src/app/services/logs-container.service.ts | 5 +- .../app/services/logs-filtering-utils.service.ts | 196 - 15 files changed, 389 insertions(+), 86 deletions(-) diff --git a/ambari-logsearch/ambari-logsearch-web/src/app/components/action-menu/action-menu.component.html b/ambari-logsearch/ambari-logsearch-web/src/app/components/action-menu/action-menu.component.html index b2bf90f..3df719a 100644 --- a/ambari-logsearch/ambari-logsearch-web/src/app/components/action-menu/action-menu.component.html +++ b/ambari-logsearch/ambari-logsearch-web/src/app/components/action-menu/action-menu.component.html @@ -17,12 +17,16 @@ + class="history-menu" [class.disabled]="!undoItems.length" [isDisabled]="!undoItems.length" + listClass="history-dropdown" (buttonClick)="undoLatest()" (selectItem)="undo($event)"> + + class="history-menu" [class.disabled]="!redoItems.length" [isDisabled]="!redoItems.length" + listClass="history-dropdown" (buttonClick)="redoLatest()" (selectItem)="redo($event)"> + + class="history-menu" [class.disabled]="!historyItems.length" [isDisabled]="!historyItems.length" + listClass="history-dropdown" [isRightAlign]="true"> a, &:hover { +color: #262626; +text-decoration: none; +background-color: transparent; +.list-item-label.label-container { + background-color: #f5f5f5; +} + } +} +li:not(.selection-all):first-child { + &:before { +top: 50%; + } +} +li:not(.selection-all):last-child { + &:before { +bottom: 50%; + } +} +li:not(.selection-all):hover { + &:after { +background: @unknown-color; + } +} + } +} } } diff --git a/ambari-logsearch/ambari-logsearch-web/src/app/components/action-menu/action-menu.component.ts b/ambari-logsearch/ambari-logsearch-web/src/app/components/action-menu/action-menu.component.ts index 6b02843..394bebc 100644 --- a/ambari-logsearch/ambari-logsearch-web/src/app/components/action-menu/action-menu.component.ts +++ b/ambari-logsearch/ambari-logsearch-web/src/app/components/action-menu/action-menu.component.ts @@ -63,11 +63,15 @@ export class ActionMenuComponent { } undoLatest(): void { -this.historyManager.undo(this.undoItems[0]); +if (this.undoItems.length) { + this.historyManager.undo(this.undoItems[0]); +} } redoLatest(): void { -this.historyManager.redo(this.redoItems[0]); +if (this.redoItems.length) { + this.historyManager.redo(this.redoItems[0]); +} } undo(item: ListItem): void { diff --git a/ambari-logsearch/ambari-logsearch-web/src/app/components/menu-button/menu-button.component.html b/ambari-logsearch/ambari-logsearch-web/src/app/components/menu-button/menu-button.component.html index 12dd59c..27c 100644 --- a/ambari-logsearch/ambari-logsearch-web/src/app/components/menu-button/menu-button.component.html +++ b/ambari-logsearch/ambari-logsearch-web/src/app/components/menu-button/menu-button.component.html @@ -15,7 +15,7 @@ limitations under the License. --> - + diff --git a/ambari-logsearch/ambari-logsearch-web/src/app/components/menu-button/menu-button.component.less b/ambari-logsearch/ambari-logsearch-web/src/app/components/menu-button/menu-button.component.less index ba9b461..f5f2079 100644 ---
[ambari] branch trunk updated: [AMBARI-23534] Log Search UI: service logs chart fixes
This is an automated email from the ASF dual-hosted git repository. ababiichuk pushed a commit to branch trunk in repository https://gitbox.apache.org/repos/asf/ambari.git The following commit(s) were added to refs/heads/trunk by this push: new cf86bfd [AMBARI-23534] Log Search UI: service logs chart fixes cf86bfd is described below commit cf86bfd5f9a0225d55fbb3b4e20d363b34ac7e8f Author: Istvan TobiasAuthorDate: Wed Apr 11 03:33:04 2018 +0200 [AMBARI-23534] Log Search UI: service logs chart fixes --- .../classes/components/graph/graph.component.ts| 102 - .../components/graph/time-graph.component.ts | 33 --- .../time-histogram/time-histogram.component.ts | 11 ++- .../src/mockdata/mock-data-get.ts | 61 ++-- 4 files changed, 117 insertions(+), 90 deletions(-) diff --git a/ambari-logsearch/ambari-logsearch-web/src/app/classes/components/graph/graph.component.ts b/ambari-logsearch/ambari-logsearch-web/src/app/classes/components/graph/graph.component.ts index b9140cd..baf3ce4 100644 --- a/ambari-logsearch/ambari-logsearch-web/src/app/classes/components/graph/graph.component.ts +++ b/ambari-logsearch/ambari-logsearch-web/src/app/classes/components/graph/graph.component.ts @@ -17,38 +17,22 @@ */ import { - AfterViewInit, OnChanges, SimpleChanges, ViewChild, ElementRef, Input, Output, EventEmitter + AfterViewInit, OnChanges, SimpleChanges, ViewChild, ElementRef, Input, Output, EventEmitter, OnInit, OnDestroy } from '@angular/core'; import * as d3 from 'd3'; import * as d3sc from 'd3-scale-chromatic'; +import {Observable} from 'rxjs/Observable'; +import 'rxjs/add/observable/fromEvent'; +import 'rxjs/add/operator/throttleTime'; import { - GraphPositionOptions, GraphMarginOptions, GraphTooltipInfo, LegendItem, GraphEventData, GraphEmittedEvent +GraphPositionOptions, GraphMarginOptions, GraphTooltipInfo, LegendItem, GraphEventData, GraphEmittedEvent } from '@app/classes/graph'; import {HomogeneousObject} from '@app/classes/object'; import {ServiceInjector} from '@app/classes/service-injector'; import {UtilsService} from '@app/services/utils.service'; +import {Subscription} from 'rxjs/Subscription'; -export class GraphComponent implements AfterViewInit, OnChanges { - - constructor() { -this.utils = ServiceInjector.injector.get(UtilsService); - } - - ngAfterViewInit() { -this.graphContainer = this.graphContainerRef.nativeElement; -this.tooltip = this.tooltipRef.nativeElement; -this.host = d3.select(this.graphContainer); - } - - ngOnChanges(changes: SimpleChanges) { -const dataChange = changes.data; -if (dataChange && dataChange.currentValue && !this.utils.isEmptyObject(dataChange.currentValue) - && (!dataChange.previousValue || this.utils.isEmptyObject(dataChange.previousValue)) - && this.utils.isEmptyObject(this.labels)) { - this.setDefaultLabels(); -} -this.createGraph(); - } +export class GraphComponent implements AfterViewInit, OnChanges, OnInit, OnDestroy { @Input() data: HomogeneousObject = {}; @@ -197,6 +181,38 @@ export class GraphComponent implements AfterViewInit, OnChanges { */ private tooltipOnTheLeft: boolean = false; + protected subscriptions: Subscription[] = []; + + constructor() { +this.utils = ServiceInjector.injector.get(UtilsService); + } + + ngOnInit() { +this.subscriptions.push( + Observable.fromEvent(window, 'resize').throttleTime(100).subscribe(this.onWindowResize) +); + } + + ngOnDestroy() { +this.subscriptions.forEach((subscription: Subscription) => subscription.unsubscribe()); + } + + ngAfterViewInit() { +this.graphContainer = this.graphContainerRef.nativeElement; +this.tooltip = this.tooltipRef.nativeElement; +this.host = d3.select(this.graphContainer); + } + + ngOnChanges(changes: SimpleChanges) { +const dataChange = changes.data; +if (dataChange && dataChange.currentValue && !this.utils.isEmptyObject(dataChange.currentValue) + && (!dataChange.previousValue || this.utils.isEmptyObject(dataChange.previousValue)) + && this.utils.isEmptyObject(this.labels)) { + this.setDefaultLabels(); +} +this.createGraph(); + } + /** * This will return the information about the used levels and the connected colors and labels. * The goal is to provide an easy property to the template to display the legend of the levels. @@ -209,6 +225,10 @@ export class GraphComponent implements AfterViewInit, OnChanges { })); } + onWindowResize = () => { +this.createGraph(); + } + protected createGraph(): void { if (this.host && !this.utils.isEmptyObject(this.labels)) { this.setup(); @@ -221,16 +241,16 @@ export class GraphComponent implements AfterViewInit, OnChanges { * Method that sets default labels map object based on data if no custom one is specified */
[ambari] branch trunk updated: AMBARI-23544 NameNode namespaces aren't displayed after HDFS page refresh. (ababiichuk)
This is an automated email from the ASF dual-hosted git repository. ababiichuk pushed a commit to branch trunk in repository https://gitbox.apache.org/repos/asf/ambari.git The following commit(s) were added to refs/heads/trunk by this push: new 1ad21ee AMBARI-23544 NameNode namespaces aren't displayed after HDFS page refresh. (ababiichuk) 1ad21ee is described below commit 1ad21eecb127af9776f0fb50ee905f3d6b1d74ea Author: ababiichukAuthorDate: Wed Apr 11 20:05:59 2018 +0300 AMBARI-23544 NameNode namespaces aren't displayed after HDFS page refresh. (ababiichuk) --- .../mixins/main/dashboard/widgets/namenode_widget.js| 2 +- ambari-web/app/models/service/hdfs.js | 2 +- ambari-web/app/views/main/service/info/summary.js | 17 + 3 files changed, 11 insertions(+), 10 deletions(-) diff --git a/ambari-web/app/mixins/main/dashboard/widgets/namenode_widget.js b/ambari-web/app/mixins/main/dashboard/widgets/namenode_widget.js index 5283634..ff40d11 100644 --- a/ambari-web/app/mixins/main/dashboard/widgets/namenode_widget.js +++ b/ambari-web/app/mixins/main/dashboard/widgets/namenode_widget.js @@ -31,7 +31,7 @@ App.NameNodeWidgetMixin = Em.Mixin.create({ clusterId: Em.computed.alias('componentGroup.clusterId'), hostName: function () { -const allHostNames = this.get('componentGroup.hosts'), +const allHostNames = this.get('componentGroup.hosts') || [], hostComponents = App.HostComponent.find().filter(component => { return component.get('componentName') === 'NAMENODE' && allHostNames.contains(component.get('hostName')); }), diff --git a/ambari-web/app/models/service/hdfs.js b/ambari-web/app/models/service/hdfs.js index f4b7f45..2a27dd6 100644 --- a/ambari-web/app/models/service/hdfs.js +++ b/ambari-web/app/models/service/hdfs.js @@ -120,7 +120,7 @@ App.HDFSService = App.Service.extend({ } }); return result; - }.property('hostComponents.length') + }.property('hostComponents.length', 'App.router.clusterController.isHDFSNameSpacesLoaded') }); App.HDFSService.FIXTURES = []; diff --git a/ambari-web/app/views/main/service/info/summary.js b/ambari-web/app/views/main/service/info/summary.js index 72b4621..4113242 100644 --- a/ambari-web/app/views/main/service/info/summary.js +++ b/ambari-web/app/views/main/service/info/summary.js @@ -166,7 +166,7 @@ App.MainServiceInfoSummaryView = Em.View.extend({ var self = this; if (!this.get('service') || this.get('service.deleteInProgress')) return; Em.run.once(self, 'setComponentsContent'); - }.observes('service.hostComponents.length', 'service.slaveComponents.@each.totalCount', 'service.clientComponents.@each.totalCount'), + }.observes('service.hostComponents.length', 'service.slaveComponents.@each.totalCount', 'service.clientComponents.@each.totalCount', 'svc.masterComponentGroups.length'), loadServiceSummary: function () { var serviceName = this.get('serviceName'); @@ -214,12 +214,13 @@ App.MainServiceInfoSummaryView = Em.View.extend({ if (Em.isNone(this.get('service'))) { return; } - var masters = this.get('service.hostComponents').filterProperty('isMaster'); - var slaves = this.get('service.slaveComponents').toArray(); - var clients = this.get('service.clientComponents').toArray(); + const masters = this.get('service.hostComponents').filterProperty('isMaster'), +slaves = this.get('service.slaveComponents').toArray(), +clients = this.get('service.clientComponents').toArray(), +masterGroups = this.get('svc') ? this.get('svc.masterComponentGroups').toArray() : []; - if (this.get('mastersLength') !== masters.length) { -const mastersInit = this.get('mastersObj').mapProperty('components').reduce((acc, group) => { + if (this.get('mastersLength') !== masters.length || this.get('mastersObj.length') !== masterGroups.length) { +let mastersInit = this.get('mastersObj').mapProperty('components').reduce((acc, group) => { return [...acc, ...group]; }, []); this.updateComponentList(mastersInit, masters); @@ -286,8 +287,8 @@ App.MainServiceInfoSummaryView = Em.View.extend({ service: null, svc: function () { -var svc = this.get('controller.content'); -var svcName = svc.get('serviceName'); +let svc = this.get('controller.content'); +const svcName = svc ? svc.get('serviceName') : null; if (svcName) { switch (svcName.toLowerCase()) { case 'hdfs': -- To stop receiving notification emails like this one, please contact ababiic...@apache.org.
[ambari] branch trunk updated: AMBARI-23551. Disable system out for Logfeeder log (logfeeder.out) (#974)
This is an automated email from the ASF dual-hosted git repository. oleewere pushed a commit to branch trunk in repository https://gitbox.apache.org/repos/asf/ambari.git The following commit(s) were added to refs/heads/trunk by this push: new 52a527e AMBARI-23551. Disable system out for Logfeeder log (logfeeder.out) (#974) 52a527e is described below commit 52a527e6fd70c14cf8f9af75ce1edc550da0f89b Author: Olivér SzabóAuthorDate: Thu Apr 12 11:13:16 2018 +0200 AMBARI-23551. Disable system out for Logfeeder log (logfeeder.out) (#974) --- .../LOGSEARCH/0.5.0/properties/logfeeder-log4j.xml.j2| 9 - 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/properties/logfeeder-log4j.xml.j2 b/ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/properties/logfeeder-log4j.xml.j2 index 697d672..5f06f41 100644 --- a/ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/properties/logfeeder-log4j.xml.j2 +++ b/ambari-server/src/main/resources/common-services/LOGSEARCH/0.5.0/properties/logfeeder-log4j.xml.j2 @@ -47,25 +47,24 @@ limitations under the License. - + - + - - + + - -- To stop receiving notification emails like this one, please contact oleew...@apache.org.
[ambari] branch trunk updated (70edbb5 -> fcdc4da)
This is an automated email from the ASF dual-hosted git repository. alexantonenko pushed a change to branch trunk in repository https://gitbox.apache.org/repos/asf/ambari.git. from 70edbb5 AMBARI-23541. Sometimes host checks never complete. (mpapirkovskyy) add 115def9 AMBARI-23525. Customize Services - SNameNodeHost label value is not shown in UI under All Configurations -> HDFS -> Advanced Tab new fcdc4da Merge pull request #949 from hiveww/AMBARI-23525-trunk The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: ambari-web/app/views/common/controls_view.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- To stop receiving notification emails like this one, please contact alexantone...@apache.org.
[ambari] 01/01: Merge pull request #949 from hiveww/AMBARI-23525-trunk
This is an automated email from the ASF dual-hosted git repository. alexantonenko pushed a commit to branch trunk in repository https://gitbox.apache.org/repos/asf/ambari.git commit fcdc4da582d74f6aaed3839e2f7aa0373d1913f3 Merge: 70edbb5 115def9 Author: Alexander AntonenkoAuthorDate: Thu Apr 12 12:04:02 2018 +0300 Merge pull request #949 from hiveww/AMBARI-23525-trunk AMBARI-23525. Customize Services - SNameNodeHost label value is not s… ambari-web/app/views/common/controls_view.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- To stop receiving notification emails like this one, please contact alexantone...@apache.org.