[ambari] branch trunk updated: Update team page. (yusaku)
This is an automated email from the ASF dual-hosted git repository. yusaku 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 8a5d252 Update team page. (yusaku) 8a5d252 is described below commit 8a5d25212ada2ab0890dc1c3feb9440fcf402963 Author: Yusaku SakoAuthorDate: Tue May 22 19:20:23 2018 -0700 Update team page. (yusaku) --- docs/pom.xml | 1 - 1 file changed, 1 deletion(-) diff --git a/docs/pom.xml b/docs/pom.xml index 348f017..2234e3e 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -1087,7 +1087,6 @@ Committer -Hortonworks -- To stop receiving notification emails like this one, please contact yus...@apache.org.
[ambari] branch trunk updated: Revert "add com.sun.jndi.ldap.connect.pool.* settings to AMBARI_JVM_ARGS"
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 bc6bc7c Revert "add com.sun.jndi.ldap.connect.pool.* settings to AMBARI_JVM_ARGS" bc6bc7c is described below commit bc6bc7c316d3b58a9cbe30262a8fc6ba1d562029 Author: Robert LevasAuthorDate: Tue May 22 17:54:41 2018 -0400 Revert "add com.sun.jndi.ldap.connect.pool.* settings to AMBARI_JVM_ARGS" This reverts commit 905c68f8753218dac264f1096e3795099b717498. --- ambari-server/conf/unix/ambari-env.sh | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/ambari-server/conf/unix/ambari-env.sh b/ambari-server/conf/unix/ambari-env.sh index b1cfd85..7ee2dc5 100644 --- a/ambari-server/conf/unix/ambari-env.sh +++ b/ambari-server/conf/unix/ambari-env.sh @@ -16,8 +16,6 @@ AMBARI_PASSHPHRASE="DEV" export AMBARI_JVM_ARGS="$AMBARI_JVM_ARGS -Xms512m -Xmx2048m -XX:MaxPermSize=128m -Djava.security.auth.login.config=$ROOT/etc/ambari-server/conf/krb5JAASLogin.conf -Djava.security.krb5.conf=/etc/krb5.conf -Djavax.security.auth.useSubjectCredsOnly=false" -# ldap connection pooling -export AMBARI_JVM_ARGS=$AMBARI_JVM_ARGS" -Dcom.sun.jndi.ldap.connect.pool.protocol='plain ssl' -Dcom.sun.jndi.ldap.connect.pool.maxsize=20 -Dcom.sun.jndi.ldap.connect.pool.timeout=30" export PATH=$PATH:$ROOT/var/lib/ambari-server export PYTHONPATH=$ROOT/usr/lib/ambari-server/lib:$PYTHONPATH @@ -25,4 +23,4 @@ export PYTHONPATH=$ROOT/usr/lib/ambari-server/lib:$PYTHONPATH # export PYTHON=/usr/bin/python2 # to add additional directory or jar to server classpath use SERVER_CLASSPATH variable -# export SERVER_CLASSPATH=/etc/hadoop/conf/secure +# export SERVER_CLASSPATH=/etc/hadoop/conf/secure \ No newline at end of file -- To stop receiving notification emails like this one, please contact rle...@apache.org.
[ambari] branch trunk updated: AMBARI-23928 Fixed Database scripts for Mysql
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 8464362 AMBARI-23928 Fixed Database scripts for Mysql 8464362 is described below commit 84643629d209f973c24a7113c535bc28a5017f53 Author: Srikanth JanardhanAuthorDate: Tue May 22 18:55:43 2018 +0530 AMBARI-23928 Fixed Database scripts for Mysql --- ambari-server/src/main/resources/Ambari-DDL-MySQL-CREATE.sql | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ambari-server/src/main/resources/Ambari-DDL-MySQL-CREATE.sql b/ambari-server/src/main/resources/Ambari-DDL-MySQL-CREATE.sql index 681545a..7e7c4d0 100644 --- a/ambari-server/src/main/resources/Ambari-DDL-MySQL-CREATE.sql +++ b/ambari-server/src/main/resources/Ambari-DDL-MySQL-CREATE.sql @@ -333,7 +333,7 @@ CREATE TABLE user_authentication ( authentication_type VARCHAR(50) NOT NULL, authentication_key VARCHAR(2048), create_time TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP, - update_time TIMESTAMP DEFAULT 0, + update_time TIMESTAMP DEFAULT NOW(), CONSTRAINT PK_user_authentication PRIMARY KEY (user_authentication_id), CONSTRAINT FK_user_authentication_users FOREIGN KEY (user_id) REFERENCES users (user_id) ); -- To stop receiving notification emails like this one, please contact rle...@apache.org.
[ambari] branch trunk updated: [AMBARI-23877] Service auto-start not working (dgrinenko)
This is an automated email from the ASF dual-hosted git repository. hapylestat 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 571dfe6 [AMBARI-23877] Service auto-start not working (dgrinenko) 571dfe6 is described below commit 571dfe62627e786efad31fa35702c61785004dab Author: ReishinAuthorDate: Fri May 18 03:44:39 2018 +0300 [AMBARI-23877] Service auto-start not working (dgrinenko) --- .../src/main/python/ambari_agent/ActionQueue.py| 19 +- .../src/main/python/ambari_agent/AmbariConfig.py | 8 +- .../python/ambari_agent/ComponentStatusExecutor.py | 1 - .../main/python/ambari_agent/InitializerModule.py | 24 +- .../main/python/ambari_agent/RecoveryManager.py| 337 - .../python/ambari_agent/TestRecoveryManager.py | 119 +--- .../apache/ambari/server/agent/RecoveryConfig.java | 22 +- .../server/agent/RecoveryConfigComponent.java | 118 .../ambari/server/agent/RecoveryConfigHelper.java | 8 +- .../configuration/RecoveryConfigHelperTest.java| 53 +++- 10 files changed, 392 insertions(+), 317 deletions(-) diff --git a/ambari-agent/src/main/python/ambari_agent/ActionQueue.py b/ambari-agent/src/main/python/ambari_agent/ActionQueue.py index 65239ed..f0c996b 100644 --- a/ambari-agent/src/main/python/ambari_agent/ActionQueue.py +++ b/ambari-agent/src/main/python/ambari_agent/ActionQueue.py @@ -143,7 +143,7 @@ class ActionQueue(threading.Thread): if self.parallel_execution == 0: command = self.commandQueue.get(True, self.EXECUTION_COMMAND_WAIT_TIME) -if command == None: +if command is None: break self.process_command(command) @@ -153,17 +153,16 @@ class ActionQueue(threading.Thread): while not self.stop_event.is_set(): command = self.commandQueue.get(True, self.EXECUTION_COMMAND_WAIT_TIME) - if command == None: + if command is None: break # If command is not retry_enabled then do not start them in parallel # checking just one command is enough as all commands for a stage is sent # at the same time and retry is only enabled for initial start/install - retryAble = False + retry_able = False if 'commandParams' in command and 'command_retry_enabled' in command['commandParams']: -retryAble = command['commandParams']['command_retry_enabled'] == "true" - if retryAble: -logger.info("Kicking off a thread for the command, id=" + -str(command['commandId']) + " taskId=" + str(command['taskId'])) +retry_able = command['commandParams']['command_retry_enabled'] == "true" + if retry_able: +logger.info("Kicking off a thread for the command, id={} taskId={}".format(command['commandId'], command['taskId'])) t = threading.Thread(target=self.process_command, args=(command,)) t.daemon = True t.start() @@ -172,14 +171,14 @@ class ActionQueue(threading.Thread): break pass pass -except (Queue.Empty): +except Queue.Empty: pass - except: + except Exception: logger.exception("ActionQueue thread failed with exception. Re-running it") logger.info("ActionQueue thread has successfully finished") def fillRecoveryCommands(self): -if not self.tasks_in_progress_or_pending(): +if self.recovery_manager.enabled() and not self.tasks_in_progress_or_pending(): self.put(self.recovery_manager.get_recovery_commands()) def processBackgroundQueueSafeEmpty(self): diff --git a/ambari-agent/src/main/python/ambari_agent/AmbariConfig.py b/ambari-agent/src/main/python/ambari_agent/AmbariConfig.py index 1e95fbe..88aa8ea 100644 --- a/ambari-agent/src/main/python/ambari_agent/AmbariConfig.py +++ b/ambari-agent/src/main/python/ambari_agent/AmbariConfig.py @@ -186,21 +186,23 @@ class AmbariConfig: @property def cluster_cache_dir(self): return os.path.join(self.cache_dir, FileCache.CLUSTER_CACHE_DIRECTORY) - @property - def recovery_cache_dir(self): -return os.path.join(self.cache_dir, FileCache.RECOVERY_CACHE_DIRECTORY) + @property def alerts_cachedir(self): return os.path.join(self.cache_dir, FileCache.ALERTS_CACHE_DIRECTORY) + @property def stacks_dir(self): return os.path.join(self.cache_dir, FileCache.STACKS_CACHE_DIRECTORY) + @property def common_services_dir(self): return os.path.join(self.cache_dir, FileCache.COMMON_SERVICES_DIRECTORY) + @property def extensions_dir(self): return os.path.join(self.cache_dir, FileCache.EXTENSIONS_CACHE_DIRECTORY) +
[ambari] branch trunk updated: AMBARI-23927 Disabled alert status isn't "NONE"
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 7b89c5a AMBARI-23927 Disabled alert status isn't "NONE" 7b89c5a is described below commit 7b89c5a69f8a0c0cf53085058957f5e69debafd9 Author: Andrii TkachAuthorDate: Tue May 22 16:02:46 2018 +0300 AMBARI-23927 Disabled alert status isn't "NONE" --- .../templates/main/alerts/alert_definition/alert_definition_summary.hbs | 2 +- .../app/views/main/alerts/alert_definition/alert_definition_summary.js | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/ambari-web/app/templates/main/alerts/alert_definition/alert_definition_summary.hbs b/ambari-web/app/templates/main/alerts/alert_definition/alert_definition_summary.hbs index 5947711..981033a 100644 --- a/ambari-web/app/templates/main/alerts/alert_definition/alert_definition_summary.hbs +++ b/ambari-web/app/templates/main/alerts/alert_definition/alert_definition_summary.hbs @@ -16,7 +16,7 @@ * limitations under the License. }} -{{#if view.hasMultipleCount}} +{{#if view.isActiveDefinitionState}} {{#each st in view.definitionState}} {{#if st.count}} {{st.count}} diff --git a/ambari-web/app/views/main/alerts/alert_definition/alert_definition_summary.js b/ambari-web/app/views/main/alerts/alert_definition/alert_definition_summary.js index 524d451..575501e 100644 --- a/ambari-web/app/views/main/alerts/alert_definition/alert_definition_summary.js +++ b/ambari-web/app/views/main/alerts/alert_definition/alert_definition_summary.js @@ -29,6 +29,8 @@ App.AlertDefinitionSummary = Em.View.extend({ hasMultipleCount: Em.computed.gt('content.hostCnt', 0), + isActiveDefinitionState: Em.computed.and('hasMultipleCount', 'content.enabled'), + definitionState: function () { var content = this.get('content'); if (!content) { -- To stop receiving notification emails like this one, please contact atk...@apache.org.
[ambari] branch trunk updated: AMBARI-23926. Phantom null request shows up on the bg ops for Stop All SCH. (#1350)
This is an automated email from the ASF dual-hosted git repository. mpapirkovskyy 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 36c5955 AMBARI-23926. Phantom null request shows up on the bg ops for Stop All SCH. (#1350) 36c5955 is described below commit 36c59558924c267f166016a113f89e1e06461bbd Author: Myroslav PapirkovskyiAuthorDate: Tue May 22 18:01:08 2018 +0300 AMBARI-23926. Phantom null request shows up on the bg ops for Stop All SCH. (#1350) * AMBARI-23926. Phantom null request shows up on the bg ops for Stop All SCH. (mpapirkovskyy) * AMBARI-23926. Phantom null request shows up on the bg ops for Stop All SCH. (mpapirkovskyy) --- .../main/java/org/apache/ambari/server/events/RequestUpdateEvent.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/ambari-server/src/main/java/org/apache/ambari/server/events/RequestUpdateEvent.java b/ambari-server/src/main/java/org/apache/ambari/server/events/RequestUpdateEvent.java index abf367b..1ce98f0 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/events/RequestUpdateEvent.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/events/RequestUpdateEvent.java @@ -28,6 +28,7 @@ import org.apache.ambari.server.orm.dao.HostRoleCommandDAO; import org.apache.ambari.server.orm.entities.HostRoleCommandEntity; import org.apache.ambari.server.orm.entities.RequestEntity; import org.apache.ambari.server.topology.TopologyManager; +import org.apache.ambari.server.utils.StageUtils; import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonProperty; @@ -159,7 +160,8 @@ public class RequestUpdateEvent extends STOMPEvent { this.id = id; this.requestId = requestId; this.status = status; - this.hostName = hostName; + // AMBARI_SERVER_ACTION does not have attached host, so we use server host + this.hostName = (hostName == null) ? StageUtils.getHostName() : hostName; } public Long getId() { -- To stop receiving notification emails like this one, please contact mpapirkovs...@apache.org.
[ambari] branch trunk updated: AMBARI-23063. "Stale Alerts" alert has to be re-done properly (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 223cabc AMBARI-23063. "Stale Alerts" alert has to be re-done properly (aonishuk) 223cabc is described below commit 223cabc5684ce7ee29a410ec3ac5ac987f9bae96 Author: Andrew OnishukAuthorDate: Tue May 22 16:06:44 2018 +0300 AMBARI-23063. "Stale Alerts" alert has to be re-done properly (aonishuk) --- ambari-agent/conf/unix/ambari-agent.ini | 2 ++ ambari-agent/src/main/python/ambari_agent/AlertStatusReporter.py | 9 + ambari-agent/src/main/python/ambari_agent/AmbariConfig.py| 4 3 files changed, 11 insertions(+), 4 deletions(-) diff --git a/ambari-agent/conf/unix/ambari-agent.ini b/ambari-agent/conf/unix/ambari-agent.ini index c6cf803..8596790 100644 --- a/ambari-agent/conf/unix/ambari-agent.ini +++ b/ambari-agent/conf/unix/ambari-agent.ini @@ -41,6 +41,8 @@ command_reports_interval=5 status_commands_run_interval=20 alert_grace_period=5 status_command_timeout=5 +; (send_alert_changes_only) - enabling this is necessary to deploy big perf clusters +send_alert_changes_only=0 alert_kinit_timeout=1440 system_resource_overrides=/etc/resource_overrides ; memory_threshold_soft_mb=400 diff --git a/ambari-agent/src/main/python/ambari_agent/AlertStatusReporter.py b/ambari-agent/src/main/python/ambari_agent/AlertStatusReporter.py index 173c03b..dd17c5a 100644 --- a/ambari-agent/src/main/python/ambari_agent/AlertStatusReporter.py +++ b/ambari-agent/src/main/python/ambari_agent/AlertStatusReporter.py @@ -42,6 +42,7 @@ class AlertStatusReporter(threading.Thread): self.stale_alerts_monitor = initializer_module.stale_alerts_monitor self.server_responses_listener = initializer_module.server_responses_listener self.reported_alerts = defaultdict(lambda:defaultdict(lambda:[])) +self.send_alert_changes_only = initializer_module.config.send_alert_changes_only threading.Thread.__init__(self) def run(self): @@ -58,11 +59,11 @@ class AlertStatusReporter(threading.Thread): self.clean_not_existing_clusters_info() alerts = self.collector.alerts() self.stale_alerts_monitor.save_executed_alerts(alerts) - changed_alerts = self.get_changed_alerts(alerts) + alerts_to_send = self.get_changed_alerts(alerts) if self.send_alert_changes_only else alerts - if changed_alerts and self.initializer_module.is_registered: -correlation_id = self.initializer_module.connection.send(message=changed_alerts, destination=Constants.ALERTS_STATUS_REPORTS_ENDPOINT, log_message_function=AlertStatusReporter.log_sending) - self.server_responses_listener.listener_functions_on_success[correlation_id] = lambda headers, message: self.save_results(changed_alerts) + if alerts_to_send and self.initializer_module.is_registered: +correlation_id = self.initializer_module.connection.send(message=alerts_to_send, destination=Constants.ALERTS_STATUS_REPORTS_ENDPOINT, log_message_function=AlertStatusReporter.log_sending) + self.server_responses_listener.listener_functions_on_success[correlation_id] = lambda headers, message: self.save_results(alerts_to_send) except ConnectionIsAlreadyClosed: # server and agent disconnected during sending data. Not an issue pass diff --git a/ambari-agent/src/main/python/ambari_agent/AmbariConfig.py b/ambari-agent/src/main/python/ambari_agent/AmbariConfig.py index 4a5236b..1e95fbe 100644 --- a/ambari-agent/src/main/python/ambari_agent/AmbariConfig.py +++ b/ambari-agent/src/main/python/ambari_agent/AmbariConfig.py @@ -340,6 +340,10 @@ class AmbariConfig: """ return self.get('security', 'ca_cert_path', default="") + @property + def send_alert_changes_only(self): +return bool(self.get('agent', 'send_alert_changes_only', '0')) + def isSameHostList(hostlist1, hostlist2): is_same = True -- To stop receiving notification emails like this one, please contact aonis...@apache.org.
[ambari] branch trunk updated: [AMBARI-23921] If Kerberos is enabled, then stack upgrade prerequisite check should ensure the KDC admin credential is persisted
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 ceaf5cf [AMBARI-23921] If Kerberos is enabled, then stack upgrade prerequisite check should ensure the KDC admin credential is persisted ceaf5cf is described below commit ceaf5cfb1b79a973724bbe13596213555c5c1893 Author: Robert LevasAuthorDate: Mon May 21 22:30:19 2018 -0400 [AMBARI-23921] If Kerberos is enabled, then stack upgrade prerequisite check should ensure the KDC admin credential is persisted --- .../ambari/server/checks/CheckDescription.java | 13 ++ .../KerberosAdminPersistedCredentialCheck.java | 104 ++ .../KerberosAdminPersistedCredentialCheckTest.java | 229 + 3 files changed, 346 insertions(+) diff --git a/ambari-server/src/main/java/org/apache/ambari/server/checks/CheckDescription.java b/ambari-server/src/main/java/org/apache/ambari/server/checks/CheckDescription.java index 4ef5d50..76b8e23 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/checks/CheckDescription.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/checks/CheckDescription.java @@ -379,6 +379,19 @@ public class CheckDescription { "Hence need to migrate existing data to newer formats post upgrade. " + "To migrate existing data, Kindly refer and follow Apache Atlas documentation for 1.0 release.").build()); + public static CheckDescription KERBEROS_ADMIN_CREDENTIAL_CHECK = new CheckDescription("KERBEROS_ADMIN_CREDENTIAL_CHECK", + PrereqCheckType.CLUSTER, + "The KDC administrator credentials need to be stored in Ambari persisted credential store.", + new ImmutableMap.Builder () + .put(KerberosAdminPersistedCredentialCheck.KEY_PERSISTED_STORE_NOT_CONFIGURED, + "Ambari's credential store has not been configured. " + + "This is needed so the KDC administrator credential may be stored long enough to ensure it will be around if needed during the upgrade process.") + .put(KerberosAdminPersistedCredentialCheck.KEY_CREDENTIAL_NOT_STORED, + "The KDC administrator credential has not been stored in the persisted credential store. " + + "Visit the Kerberos administrator page to set the credential. " + + "This is needed so the KDC administrator credential may be stored long enough to ensure it will be around if needed during the upgrade process.") + .build()); + private String m_name; private PrereqCheckType m_type; private String m_description; diff --git a/ambari-server/src/main/java/org/apache/ambari/server/checks/KerberosAdminPersistedCredentialCheck.java b/ambari-server/src/main/java/org/apache/ambari/server/checks/KerberosAdminPersistedCredentialCheck.java new file mode 100644 index 000..1e5821d --- /dev/null +++ b/ambari-server/src/main/java/org/apache/ambari/server/checks/KerberosAdminPersistedCredentialCheck.java @@ -0,0 +1,104 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.apache.ambari.server.checks; + +import java.util.Collections; +import java.util.Set; + +import org.apache.ambari.server.AmbariException; +import org.apache.ambari.server.controller.KerberosHelper; +import org.apache.ambari.server.controller.PrereqCheckRequest; +import org.apache.ambari.server.security.encryption.CredentialStoreService; +import org.apache.ambari.server.security.encryption.CredentialStoreType; +import org.apache.ambari.server.state.Cluster; +import org.apache.ambari.server.state.SecurityType; +import org.apache.ambari.server.state.stack.PrereqCheckStatus; +import org.apache.ambari.server.state.stack.PrerequisiteCheck; +import org.apache.ambari.server.state.stack.upgrade.UpgradeType; + +import com.google.inject.Inject; + +/** + * The {@link KerberosAdminPersistedCredentialCheck} class is used to check that the Kerberos + * administrator credentials are stored in the persisted credential store when Kerberos is enabled. + * + * This is needed
[ambari] branch trunk updated: [AMBARI-23917] Infra Solr: show start/sop command output in ambari command. (#1339)
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 64838b8 [AMBARI-23917] Infra Solr: show start/sop command output in ambari command. (#1339) 64838b8 is described below commit 64838b886b44693ef117575ceeb8cc69ee453c47 Author: Olivér SzabóAuthorDate: Tue May 22 13:17:56 2018 +0200 [AMBARI-23917] Infra Solr: show start/sop command output in ambari command. (#1339) * AMBARI-23917. Infra Solr: show start/sop command output in ambari command. * AMBARI-23917. Remove PIPESTATUS from ambari format --- .../0.1.0/package/scripts/infra_solr.py | 17 +++-- 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/ambari-server/src/main/resources/common-services/AMBARI_INFRA_SOLR/0.1.0/package/scripts/infra_solr.py b/ambari-server/src/main/resources/common-services/AMBARI_INFRA_SOLR/0.1.0/package/scripts/infra_solr.py index a11f207..da1eaa8 100644 --- a/ambari-server/src/main/resources/common-services/AMBARI_INFRA_SOLR/0.1.0/package/scripts/infra_solr.py +++ b/ambari-server/src/main/resources/common-services/AMBARI_INFRA_SOLR/0.1.0/package/scripts/infra_solr.py @@ -54,12 +54,14 @@ class InfraSolr(Script): generate_logfeeder_input_config('ambari-infra', Template("input.config-ambari-infra.json.j2", extra_imports=[default])) setup_solr_znode_env() -start_cmd = format('{solr_bindir}/solr start -cloud -noprompt -s {infra_solr_datadir} -Dsolr.kerberos.name.rules=\'{infra_solr_kerberos_name_rules}\' >> {infra_solr_log} 2>&1') \ -if params.security_enabled else format('{solr_bindir}/solr start -cloud -noprompt -s {infra_solr_datadir} >> {infra_solr_log} 2>&1') +start_cmd = format('{solr_bindir}/solr start -cloud -noprompt -s {infra_solr_datadir} -Dsolr.kerberos.name.rules=\'{infra_solr_kerberos_name_rules}\' 2>&1') \ +if params.security_enabled else format('{solr_bindir}/solr start -cloud -noprompt -s {infra_solr_datadir} 2>&1') +piped_start_cmd = format('{start_cmd} | tee {infra_solr_log}') + '; (exit "${PIPESTATUS[0]}")' Execute( - start_cmd, + piped_start_cmd, environment={'SOLR_INCLUDE': format('{infra_solr_conf}/infra-solr-env.sh')}, - user=params.infra_solr_user + user=params.infra_solr_user, + logoutput=True ) def stop(self, env, upgrade_type=None): @@ -67,10 +69,13 @@ class InfraSolr(Script): env.set_params(params) try: - Execute(format('{solr_bindir}/solr stop -all >> {infra_solr_log}'), + stop_cmd=format('{solr_bindir}/solr stop -all') + piped_stop_cmd=format('{stop_cmd} | tee {infra_solr_log}') + '; (exit "${PIPESTATUS[0]}")' + Execute(piped_stop_cmd, environment={'SOLR_INCLUDE': format('{infra_solr_conf}/infra-solr-env.sh')}, user=params.infra_solr_user, - only_if=format("test -f {prev_infra_solr_pidfile}") + only_if=format("test -f {prev_infra_solr_pidfile}"), + logoutput=True ) File(params.prev_infra_solr_pidfile, -- To stop receiving notification emails like this one, please contact oleew...@apache.org.
[ambari] branch trunk updated (2fd0d50 -> 5a1c1aa)
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 2fd0d50 AMBARI-23913 New UI Makes it hard to see that a host is in a "Decommissioning" state add fe26d92 AMBARI-23912. Ambari should mark HSI hosts as ACTIVE or STANDBY add 4b48c05 AMBARI-23912. Ambari should mark HSI hosts as ACTIVE or STANDBY add 533229c AMBARI-23912. Ambari should mark HSI hosts as ACTIVE or STANDBY (test review) new 5a1c1aa Merge pull request #1340 from hiveww/AMBARI-23912-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/mappers/service_metrics_mapper.js | 74 ++- ambari-web/app/utils/ajax/ajax.js | 13 +++ .../test/mappers/service_metrics_mapper_test.js| 100 + 3 files changed, 186 insertions(+), 1 deletion(-) -- To stop receiving notification emails like this one, please contact alexantone...@apache.org.
[ambari] 01/01: Merge pull request #1340 from hiveww/AMBARI-23912-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 5a1c1aaa1ad524465dfa3d6987749228ae4c64c7 Merge: 2fd0d50 533229c Author: Alexander AntonenkoAuthorDate: Tue May 22 13:31:08 2018 +0300 Merge pull request #1340 from hiveww/AMBARI-23912-trunk AMBARI-23912. Ambari should mark HSI hosts as ACTIVE or STANDBY ambari-web/app/mappers/service_metrics_mapper.js | 74 ++- ambari-web/app/utils/ajax/ajax.js | 13 +++ .../test/mappers/service_metrics_mapper_test.js| 100 + 3 files changed, 186 insertions(+), 1 deletion(-) -- To stop receiving notification emails like this one, please contact alexantone...@apache.org.
[ambari] branch trunk updated: AMBARI-23913 New UI Makes it hard to see that a host is in a "Decommissioning" state
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 2fd0d50 AMBARI-23913 New UI Makes it hard to see that a host is in a "Decommissioning" state 2fd0d50 is described below commit 2fd0d503de923d7049d462d935977497549ea2dd Author: Andrii TkachAuthorDate: Mon May 21 16:11:13 2018 +0300 AMBARI-23913 New UI Makes it hard to see that a host is in a "Decommissioning" state --- .../host/details/host_components/decommissionable.js | 16 ++-- .../host_component_views/decommissionable_test.js | 19 --- 2 files changed, 6 insertions(+), 29 deletions(-) diff --git a/ambari-web/app/mixins/main/host/details/host_components/decommissionable.js b/ambari-web/app/mixins/main/host/details/host_components/decommissionable.js index d3eb0c5..645db5c 100644 --- a/ambari-web/app/mixins/main/host/details/host_components/decommissionable.js +++ b/ambari-web/app/mixins/main/host/details/host_components/decommissionable.js @@ -109,16 +109,12 @@ App.Decommissionable = Em.Mixin.create({ * @type {String} */ componentTextStatus: function () { -var componentTextStatus = this.get('content.componentTextStatus'); -var hostComponent = this.get('hostComponent'); -if (hostComponent) { - componentTextStatus = hostComponent.get('componentTextStatus'); - if (this.get('isComponentRecommissionAvailable')) { -if (this.get('isComponentDecommissioning')) { - componentTextStatus = Em.I18n.t('hosts.host.decommissioning'); -} else { - componentTextStatus = Em.I18n.t('hosts.host.decommissioned'); -} +let componentTextStatus = this.get('content.componentTextStatus'); +if (this.get('isComponentRecommissionAvailable')) { + if (this.get('isComponentDecommissioning')) { +componentTextStatus = Em.I18n.t('hosts.host.decommissioning'); + } else { +componentTextStatus = Em.I18n.t('hosts.host.decommissioned'); } } return componentTextStatus; diff --git a/ambari-web/test/views/main/host/details/host_component_views/decommissionable_test.js b/ambari-web/test/views/main/host/details/host_component_views/decommissionable_test.js index bc3c280..0a6886f 100644 --- a/ambari-web/test/views/main/host/details/host_component_views/decommissionable_test.js +++ b/ambari-web/test/views/main/host/details/host_component_views/decommissionable_test.js @@ -51,7 +51,6 @@ describe('App.Decommissionable', function() { var tests = Em.A([ { content: Em.Object.create({componentTextStatus: 'status'}), -hostComponent: null, isComponentRecommissionAvailable: false, isComponentDecommissioning: false, e: 'status', @@ -59,23 +58,6 @@ describe('App.Decommissionable', function() { }, { content: Em.Object.create({componentTextStatus: 'status'}), -hostComponent: Em.Object.create({componentTextStatus: 'new_status'}), -isComponentRecommissionAvailable: false, -isComponentDecommissioning: false, -e: 'new_status', -m: 'get hostComponent status' - }, - { -content: Em.Object.create({componentTextStatus: 'status'}), -hostComponent: Em.Object.create({componentTextStatus: 'new_status'}), -isComponentRecommissionAvailable: false, -isComponentDecommissioning: false, -e: 'new_status', -m: 'get hostComponent status' - }, - { -content: Em.Object.create({componentTextStatus: 'status'}), -hostComponent: Em.Object.create({componentTextStatus: 'new_status'}), isComponentRecommissionAvailable: true, isComponentDecommissioning: true, e: Em.I18n.t('hosts.host.decommissioning'), @@ -83,7 +65,6 @@ describe('App.Decommissionable', function() { }, { content: Em.Object.create({componentTextStatus: 'status'}), -hostComponent: Em.Object.create({componentTextStatus: 'new_status'}), isComponentRecommissionAvailable: true, isComponentDecommissioning: false, e: Em.I18n.t('hosts.host.decommissioned'), -- To stop receiving notification emails like this one, please contact atk...@apache.org.
[ambari] branch trunk updated: AMBARI-21701. Check for org.apache.ambari.metrics.sink.relocated (#1346)
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 ec030bc AMBARI-21701. Check for org.apache.ambari.metrics.sink.relocated (#1346) ec030bc is described below commit ec030bcadd013ca7bd6da46c1b5acef4954e2cff Author: Doroszlai, Attila <6454655+adorosz...@users.noreply.github.com> AuthorDate: Tue May 22 08:18:14 2018 +0200 AMBARI-21701. Check for org.apache.ambari.metrics.sink.relocated (#1346) --- ambari-server/checkstyle.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ambari-server/checkstyle.xml b/ambari-server/checkstyle.xml index f1fc3a1..79e62d4 100644 --- a/ambari-server/checkstyle.xml +++ b/ambari-server/checkstyle.xml @@ -24,7 +24,7 @@ - + -- To stop receiving notification emails like this one, please contact adorosz...@apache.org.