[ambari] branch branch-feature-AMBARI-14714 updated: AMBARI-24046. Fix the incorrect string from config_name to config-name in mpack_advisor.py (#1480)
This is an automated email from the ASF dual-hosted git repository.
jluniya pushed a commit to branch branch-feature-AMBARI-14714
in repository https://gitbox.apache.org/repos/asf/ambari.git
The following commit(s) were added to refs/heads/branch-feature-AMBARI-14714 by
this push:
new e38b715 AMBARI-24046. Fix the incorrect string from config_name to
config-name in mpack_advisor.py (#1480)
e38b715 is described below
commit e38b715a903162defa8ca17c17ed2de68fb4200e
Author: swapanshridhar
AuthorDate: Wed Jun 6 14:30:55 2018 -0700
AMBARI-24046. Fix the incorrect string from config_name to config-name in
mpack_advisor.py (#1480)
---
ambari-server/src/main/resources/stacks/mpack_advisor.py | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/ambari-server/src/main/resources/stacks/mpack_advisor.py
b/ambari-server/src/main/resources/stacks/mpack_advisor.py
index f5c3530..ddb9058 100644
--- a/ambari-server/src/main/resources/stacks/mpack_advisor.py
+++ b/ambari-server/src/main/resources/stacks/mpack_advisor.py
@@ -1548,13 +1548,13 @@ class MpackAdvisorImpl(MpackAdvisor):
userValue =
convertToNumber(configurations[configName]["properties"][propertyName])
maxValue =
convertToNumber(recommendedDefaults[configName]["property_attributes"][propertyName]["maximum"])
if userValue > maxValue:
-validationItems.extend([{"config_name": propertyName, "item":
self.getWarnItem("Value is greater than the recommended maximum of {0}
".format(maxValue))}])
+validationItems.extend([{"config-name": propertyName, "item":
self.getWarnItem("Value is greater than the recommended maximum of {0}
".format(maxValue))}])
if "minimum" in
recommendedDefaults[configName]["property_attributes"][propertyName] and \
propertyName in
recommendedDefaults[configName]["properties"]:
userValue =
convertToNumber(configurations[configName]["properties"][propertyName])
minValue =
convertToNumber(recommendedDefaults[configName]["property_attributes"][propertyName]["minimum"])
if userValue < minValue:
-validationItems.extend([{"config_name": propertyName, "item":
self.getWarnItem("Value is less than the recommended minimum of {0}
".format(minValue))}])
+validationItems.extend([{"config-name": propertyName, "item":
self.getWarnItem("Value is less than the recommended minimum of {0}
".format(minValue))}])
validatedItems = self.toConfigurationValidationProblems(validationItems,
configName)
for validatedItem in validatedItems:
item = dict(itemHead.items() + validatedItem.items())
--
To stop receiving notification emails like this one, please contact
jlun...@apache.org.
[ambari] branch BUG-99072-hive-upgrade created (now cc81281)
This is an automated email from the ASF dual-hosted git repository. mgergely pushed a change to branch BUG-99072-hive-upgrade in repository https://gitbox.apache.org/repos/asf/ambari.git. at cc81281 BUG-99072-upgrade This branch includes the following new commits: new cc81281 BUG-99072-upgrade 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. -- To stop receiving notification emails like this one, please contact mgerg...@apache.org.
[ambari] 01/01: BUG-99072-upgrade
This is an automated email from the ASF dual-hosted git repository.
mgergely pushed a commit to branch BUG-99072-hive-upgrade
in repository https://gitbox.apache.org/repos/asf/ambari.git
commit cc81281c75efc0b3e20a90d359101703a52ec439
Author: Miklos Gergely
AuthorDate: Fri May 11 10:48:29 2018 +0200
BUG-99072-upgrade
---
.../0.12.0.2.0/package/scripts/params_linux.py | 1 +
.../HIVE/0.12.0.2.0/package/scripts/pre_upgrade.py | 91 ++
2 files changed, 92 insertions(+)
diff --git
a/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/params_linux.py
b/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/params_linux.py
index b13fa06..47a89ab 100644
---
a/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/params_linux.py
+++
b/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/params_linux.py
@@ -244,6 +244,7 @@ else:
hive_metastore_user_passwd =
config['configurations']['hive-site']['javax.jdo.option.ConnectionPassword']
hive_metastore_user_passwd = unicode(hive_metastore_user_passwd) if not
is_empty(hive_metastore_user_passwd) else hive_metastore_user_passwd
hive_metastore_db_type =
config['configurations']['hive-env']['hive_database_type']
+hive_db_schma_name =
config['configurations']['hive-site']['ambari.hive.db.schema.name']
#HACK Temporarily use dbType=azuredb while invoking schematool
if hive_metastore_db_type == "mssql":
diff --git
a/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/pre_upgrade.py
b/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/pre_upgrade.py
new file mode 100644
index 000..5391e75
--- /dev/null
+++
b/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/pre_upgrade.py
@@ -0,0 +1,91 @@
+#!/usr/bin/env python
+"""
+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.
+
+"""
+# Python Imports
+import os
+import shutil
+
+
+# Ambari Commons & Resource Management Imports
+from resource_management.core.exceptions import Fail
+from resource_management.core.logger import Logger
+from resource_management.core.resources.system import Execute, Directory
+from resource_management.libraries.functions import upgrade_summary
+from resource_management.libraries.functions.format import format
+from resource_management.libraries.script import Script
+
+class HivePreUpgrade(Script):
+
+ def backup_hive_metastore_database_local(self, env):
+import params
+env.set_params(params)
+
+self.__dump_mysql_db(True)
+
+ def backup_hive_metastore_database_external(self, env):
+import params
+env.set_params(params)
+
+is_db_here = params.hostname in params.hive_jdbc_connection_url
+if params.hive_metastore_db_type == "mysql":
+ self.__dump_mysql_db(is_db_here)
+elif params.hive_metastore_db_type == "postgres":
+ self.__dump_postgres_db(is_db_here)
+elif params.hive_metastore_db_type == "oracle":
+ self.__dump_oracle_db(is_db_here)
+else:
+ raise Fail(format("Unknown db type: {hive_metastore_db_type}. Please
create a db backup manually, then click on 'IGNORE AND PROCEED'"))
+
+ def __dump_mysql_db(self, is_db_here):
+command = format("mysqldump {hive_db_schma_name} > {{dump_file}}")
+self.__dump_db(command, "mysql", is_db_here)
+
+ def __dump_postgres_db(self, is_db_here):
+command = format("export PGPASSWORD='{hive_metastore_user_passwd}';
pg_dump -U {hive_metastore_user_name} {{hive_db_schma_name}} > {{dump_file}}")
+self.__dump_db(command, "postgres", is_db_here)
+
+ def __dump_oracle_db(self, is_db_here):
+command = format("exp
userid={hive_metastore_user_name}/{hive_metastore_user_passwd} full=y
file={{dump_file}}")
+self.__dump_db(command, "oracle", is_db_here)
+
+ def __dump_db(self, command, type, is_db_here):
+dump_dir = "/etc/hive/dbdump"
+dump_file =
format("{dump_dir}/hive-{stack_version_formatted}-{type}-dump.sql")
+if is_db_here:
+ if not os.path.exists(dump_dir):
+Directory(dump_dir)
+ Execute(format(command), user = "root")
+ Logger.info(format("Hive Metastore database backup created at
{dump_file}"))
[ambari] branch trunk updated: AMBARI-24044. Widget Browser add/hide functionality is not working correctly (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 269db6f AMBARI-24044. Widget Browser add/hide functionality is not
working correctly (akovalenko)
269db6f is described below
commit 269db6f5f44545225addd1a05fb7985378e4087c
Author: Aleksandr Kovalenko
AuthorDate: Wed Jun 6 18:49:12 2018 +0300
AMBARI-24044. Widget Browser add/hide functionality is not working
correctly (akovalenko)
---
.../app/controllers/main/service/info/metric.js| 104 ++---
.../common/modal_popups/widget_browser_popup.hbs | 2 +-
2 files changed, 71 insertions(+), 35 deletions(-)
diff --git a/ambari-web/app/controllers/main/service/info/metric.js
b/ambari-web/app/controllers/main/service/info/metric.js
index 349f1ef..d5bff81 100644
--- a/ambari-web/app/controllers/main/service/info/metric.js
+++ b/ambari-web/app/controllers/main/service/info/metric.js
@@ -92,6 +92,7 @@ App.MainServiceInfoMetricsController =
Em.Controller.extend(App.WidgetSectionMix
*/
loadAllSharedWidgetsSuccessCallback: function (data) {
var widgetIds = this.get('widgets').mapProperty('id');
+var activeNSWidgetLayouts = this.get('activeNSWidgetLayouts');
if (data.items[0] && data.items.length) {
this.set("allSharedWidgets",
data.items.filter(function (widget) {
@@ -99,17 +100,23 @@ App.MainServiceInfoMetricsController =
Em.Controller.extend(App.WidgetSectionMix
}).map(function (widget) {
var widgetType = widget.WidgetInfo.widget_type;
var widgetName = widget.WidgetInfo.widget_name;
- var widgetId = widget.WidgetInfo.id;
+ var widgetId = widget.WidgetInfo.id;
+ var widgetTag = widget.WidgetInfo.tag;
+ var inNSLayouts = false;
+ if (widgetTag) {
+inNSLayouts = activeNSWidgetLayouts.findProperty('nameServiceId',
widgetTag).get('widgets').someProperty('id', widgetId) &&
+ activeNSWidgetLayouts.findProperty('nameServiceId',
'all').get('widgets').someProperty('id', widgetId);
+ }
return Em.Object.create({
id: widgetId,
widgetName: widgetName,
-tag: widget.WidgetInfo.tag,
+tag: widgetTag,
metrics: widget.WidgetInfo.metrics,
description: widget.WidgetInfo.description,
widgetType: widgetType,
iconPath: "/img/widget-" + widgetType.toLowerCase() + ".png",
serviceName:
JSON.parse(widget.WidgetInfo.metrics).mapProperty('service_name').uniq().join('-'),
-added: widgetIds.contains(widgetId),
+added: widgetTag ? inNSLayouts : widgetIds.contains(widgetId),
isShared: widget.WidgetInfo.scope == "CLUSTER"
});
})
@@ -143,6 +150,7 @@ App.MainServiceInfoMetricsController =
Em.Controller.extend(App.WidgetSectionMix
*/
loadMineWidgetsSuccessCallback: function (data) {
var widgetIds = this.get('widgets').mapProperty('id');
+var activeNSWidgetLayouts = this.get('activeNSWidgetLayouts');
if (data.items[0] && data.items.length) {
this.set("mineWidgets",
data.items.filter(function (widget) {
@@ -150,17 +158,23 @@ App.MainServiceInfoMetricsController =
Em.Controller.extend(App.WidgetSectionMix
}).map(function (widget) {
var widgetType = widget.WidgetInfo.widget_type;
var widgetName = widget.WidgetInfo.widget_name;
- var widgetId = widget.WidgetInfo.id;
+ var widgetId = widget.WidgetInfo.id;
+ var widgetTag = widget.WidgetInfo.tag;
+ var inNSLayouts = false;
+ if (widgetTag) {
+inNSLayouts = activeNSWidgetLayouts.findProperty('nameServiceId',
widgetTag).get('widgets').someProperty('id', widgetId) &&
+ activeNSWidgetLayouts.findProperty('nameServiceId',
'all').get('widgets').someProperty('id', widgetId);
+ }
return Em.Object.create({
id: widget.WidgetInfo.id,
widgetName: widgetName,
-tag: widget.WidgetInfo.tag,
+tag: widgetTag,
metrics: widget.WidgetInfo.metrics,
description: widget.WidgetInfo.description,
widgetType: widgetType,
iconPath: "/img/widget-" + widgetType.toLowerCase() + ".png",
serviceName:
JSON.parse(widget.WidgetInfo.metrics).mapProperty('service_name').uniq().join('-'),
-added: widgetIds.contains(widgetId),
+added: widgetTag ? inNSLayouts : widgetIds.contains(widgetId),
isShared: widget.WidgetInfo.scope == "CLUSTER"
});
})
@@ -175,37 +189,59 @@ App.MainServiceInfoMetricsController =
Em.Controller.extend(App.WidgetSectionMix
* add widgets, on click handler for "Add"
*/
addWidget:
[ambari] branch trunk updated: AMBARI-24043. Increase outbound message buffer size. (mpapirkovskyy) (#1478)
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 17d1d4f AMBARI-24043. Increase outbound message buffer size.
(mpapirkovskyy) (#1478)
17d1d4f is described below
commit 17d1d4fb6db27520487fb2de49bd6e34cde2b1bb
Author: Myroslav Papirkovskyi
AuthorDate: Wed Jun 6 18:57:01 2018 +0300
AMBARI-24043. Increase outbound message buffer size. (mpapirkovskyy) (#1478)
---
.../ambari/server/configuration/Configuration.java | 26 +-
.../configuration/spring/AgentStompConfig.java | 5 +++--
2 files changed, 23 insertions(+), 8 deletions(-)
diff --git
a/ambari-server/src/main/java/org/apache/ambari/server/configuration/Configuration.java
b/ambari-server/src/main/java/org/apache/ambari/server/configuration/Configuration.java
index cc0042f..241edc2 100644
---
a/ambari-server/src/main/java/org/apache/ambari/server/configuration/Configuration.java
+++
b/ambari-server/src/main/java/org/apache/ambari/server/configuration/Configuration.java
@@ -1862,13 +1862,20 @@ public class Configuration {
"api.heartbeat.interval", 1);
/**
- * The maximum size of a stomp text message. Default is 2 MB.
+ * The maximum size of an incoming stomp text message. Default is 2 MB.
*/
- @Markdown(description = "The maximum size of a stomp text message. Default
is 2 MB.")
- public static final ConfigurationProperty STOMP_MAX_MESSAGE_SIZE =
new ConfigurationProperty<>(
+ @Markdown(description = "The maximum size of an incoming stomp text message.
Default is 2 MB.")
+ public static final ConfigurationProperty
STOMP_MAX_INCOMING_MESSAGE_SIZE = new ConfigurationProperty<>(
"stomp.max.message.size", 2*1024*1024);
/**
+ * The maximum size of a buffer for stomp message sending. Default is 5 MB.
+ */
+ @Markdown(description = "The maximum size of a buffer for stomp message
sending. Default is 5 MB.")
+ public static final ConfigurationProperty
STOMP_MAX_BUFFER_MESSAGE_SIZE = new ConfigurationProperty<>(
+ "stomp.max.message.size", 5*1024*1024);
+
+ /**
* The maximum number of threads used to extract Ambari Views when Ambari
* Server is starting up.
*/
@@ -4577,10 +4584,17 @@ public class Configuration {
}
/**
- * @return the maximum size of a stomp text message. Default is 2 MB.
+ * @return the maximum size of an incoming stomp text message. Default is 2
MB.
+ */
+ public int getStompMaxIncomingMessageSize() {
+return Integer.parseInt(getProperty(STOMP_MAX_INCOMING_MESSAGE_SIZE));
+ }
+
+ /**
+ * @return the maximum size of a buffer for stomp message sending. Default
is 5 MB.
*/
- public int getStompMaxMessageSize() {
-return Integer.parseInt(getProperty(STOMP_MAX_MESSAGE_SIZE));
+ public int getStompMaxBufferMessageSize() {
+return Integer.parseInt(getProperty(STOMP_MAX_BUFFER_MESSAGE_SIZE));
}
/**
diff --git
a/ambari-server/src/main/java/org/apache/ambari/server/configuration/spring/AgentStompConfig.java
b/ambari-server/src/main/java/org/apache/ambari/server/configuration/spring/AgentStompConfig.java
index 9e8be7c..7084e8f 100644
---
a/ambari-server/src/main/java/org/apache/ambari/server/configuration/spring/AgentStompConfig.java
+++
b/ambari-server/src/main/java/org/apache/ambari/server/configuration/spring/AgentStompConfig.java
@@ -55,7 +55,7 @@ public class AgentStompConfig extends
AbstractWebSocketMessageBrokerConfigurer {
public DefaultHandshakeHandler getHandshakeHandler() {
WebSocketServerFactory webSocketServerFactory = new
WebSocketServerFactory(servletContext);
-
webSocketServerFactory.getPolicy().setMaxTextMessageSize(configuration.getStompMaxMessageSize());
+
webSocketServerFactory.getPolicy().setMaxTextMessageSize(configuration.getStompMaxIncomingMessageSize());
return new DefaultHandshakeHandler(
new JettyRequestUpgradeStrategy(webSocketServerFactory));
@@ -81,6 +81,7 @@ public class AgentStompConfig extends
AbstractWebSocketMessageBrokerConfigurer {
@Override
public void configureWebSocketTransport(WebSocketTransportRegistration
registration) {
-registration.setMessageSizeLimit(configuration.getStompMaxMessageSize());
+
registration.setMessageSizeLimit(configuration.getStompMaxIncomingMessageSize());
+
registration.setSendBufferSizeLimit(configuration.getStompMaxBufferMessageSize());
}
}
--
To stop receiving notification emails like this one, please contact
mpapirkovs...@apache.org.
[ambari] branch trunk updated: AMBARI-24042. Kafka Service Check failed on https enabled/WE cluster after Ambari Upgrade. Error : Failed to check that topic exists (amagyar) (#1477)
This is an automated email from the ASF dual-hosted git repository.
amagyar 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 1bd7cdb AMBARI-24042. Kafka Service Check failed on https enabled/WE
cluster after Ambari Upgrade. Error : Failed to check that topic exists
(amagyar) (#1477)
1bd7cdb is described below
commit 1bd7cdb96df0db47c9ce94732051e32fdaa9435b
Author: Attila Magyar
AuthorDate: Wed Jun 6 16:15:12 2018 +0200
AMBARI-24042. Kafka Service Check failed on https enabled/WE cluster after
Ambari Upgrade. Error : Failed to check that topic exists (amagyar) (#1477)
---
.../resources/common-services/KAFKA/0.8.1/package/scripts/params.py| 2 ++
.../common-services/KAFKA/0.8.1/package/scripts/service_check.py | 3 +++
2 files changed, 5 insertions(+)
diff --git
a/ambari-server/src/main/resources/common-services/KAFKA/0.8.1/package/scripts/params.py
b/ambari-server/src/main/resources/common-services/KAFKA/0.8.1/package/scripts/params.py
index 17c678a..7b2de27 100644
---
a/ambari-server/src/main/resources/common-services/KAFKA/0.8.1/package/scripts/params.py
+++
b/ambari-server/src/main/resources/common-services/KAFKA/0.8.1/package/scripts/params.py
@@ -71,6 +71,8 @@ zookeeper_connect =
default("/configurations/kafka-broker/zookeeper.connect", No
kafka_user_nofile_limit =
default('/configurations/kafka-env/kafka_user_nofile_limit', 128000)
kafka_user_nproc_limit =
default('/configurations/kafka-env/kafka_user_nproc_limit', 65536)
+kafka_delete_topic_enable =
default('/configurations/kafka-broker/delete.topic.enable', True)
+
# parameters for 2.2+
if stack_version_formatted and
check_stack_feature(StackFeature.ROLLING_UPGRADE, stack_version_formatted):
kafka_home = os.path.join(stack_root, "current", "kafka-broker")
diff --git
a/ambari-server/src/main/resources/common-services/KAFKA/0.8.1/package/scripts/service_check.py
b/ambari-server/src/main/resources/common-services/KAFKA/0.8.1/package/scripts/service_check.py
index 86d72ad..748dbf2 100644
---
a/ambari-server/src/main/resources/common-services/KAFKA/0.8.1/package/scripts/service_check.py
+++
b/ambari-server/src/main/resources/common-services/KAFKA/0.8.1/package/scripts/service_check.py
@@ -44,6 +44,9 @@ class ServiceCheck(Script):
if topic_exists_cmd_code > 0:
raise Fail("Error encountered when attempting to list topics:
{0}".format(topic_exists_cmd_out))
+if not params.kafka_delete_topic_enable:
+ Logger.info('Kafka delete.topic.enable is not enabled. Skipping topic
creation: %s' % topic)
+ return
# run create topic command only if the topic doesn't exists
--
To stop receiving notification emails like this one, please contact
amag...@apache.org.
[ambari] branch trunk updated: AMBARI-23945. Update Solr migration README.md (fix port flag)
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 7ff9098 AMBARI-23945. Update Solr migration README.md (fix port flag) 7ff9098 is described below commit 7ff9098f78aabbac8915c394a10eb0168813217b Author: Olivér Szabó AuthorDate: Wed Jun 6 15:41:09 2018 +0200 AMBARI-23945. Update Solr migration README.md (fix port flag) --- ambari-infra/ambari-infra-solr-client/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ambari-infra/ambari-infra-solr-client/README.md b/ambari-infra/ambari-infra-solr-client/README.md index 586acdb..f40aa5c 100644 --- a/ambari-infra/ambari-infra-solr-client/README.md +++ b/ambari-infra/ambari-infra-solr-client/README.md @@ -77,7 +77,7 @@ CONFIG_INI_LOCATION=ambari_solr_migration.ini # output of the script with requir # note 1: use -s if ambari-server uses https # note 2: use --shared-driver if the backup location is shared for different hosts # note 3: use --hdfs-base-path if the index data is located on hdfs (or --ranger-hdfs-base-path if only ranger collection is located there), e.g.: /user/infra-solr -/usr/bin/python /usr/lib/ambari-infra-solr-client/migrationConfigGenerator.py --ini-file $CONFIG_INI_LOCATION --host c7401.ambari.apache.org -port 8080 --cluster cl1 --username admin --password admin --backup-base-path=/my/path --java-home /usr/jdk64/jdk1.8.0_112 +/usr/bin/python /usr/lib/ambari-infra-solr-client/migrationConfigGenerator.py --ini-file $CONFIG_INI_LOCATION --host c7401.ambari.apache.org --port 8080 --cluster cl1 --username admin --password admin --backup-base-path=/my/path --java-home /usr/jdk64/jdk1.8.0_112 ``` The generated config file output could be something like that: -- To stop receiving notification emails like this one, please contact oleew...@apache.org.
[ambari] branch trunk updated: 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 6482518 add com.sun.jndi.ldap.connect.pool.* settings to AMBARI_JVM_ARGS 6482518 is described below commit 6482518c1a204f1d6f06b760a29a546bca40447e Author: David F. Quiroga AuthorDate: Mon May 28 22:02:16 2018 -0700 add com.sun.jndi.ldap.connect.pool.* settings to AMBARI_JVM_ARGS --- ambari-server/conf/unix/ambari-env.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ambari-server/conf/unix/ambari-env.sh b/ambari-server/conf/unix/ambari-env.sh index 7ee2dc5..6371abb 100644 --- a/ambari-server/conf/unix/ambari-env.sh +++ b/ambari-server/conf/unix/ambari-env.sh @@ -15,7 +15,7 @@ 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" +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 -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 @@ -23,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 \ No newline at end of file +# export SERVER_CLASSPATH=/etc/hadoop/conf/secure -- To stop receiving notification emails like this one, please contact rle...@apache.org.
[ambari] branch branch-2.5 updated: Add jdeb support (#1323)
This is an automated email from the ASF dual-hosted git repository.
adoroszlai pushed a commit to branch branch-2.5
in repository https://gitbox.apache.org/repos/asf/ambari.git
The following commit(s) were added to refs/heads/branch-2.5 by this push:
new 0d99a88 Add jdeb support (#1323)
0d99a88 is described below
commit 0d99a88388f7614406b5a6158fb583ff79fc0b48
Author: Naresh Bhat
AuthorDate: Wed Jun 6 17:00:09 2018 +0530
Add jdeb support (#1323)
---
ambari-funtest/pom.xml| 22 ++
ambari-logsearch/pom.xml | 22 ++
ambari-metrics/ambari-metrics-grafana/pom.xml | 22 ++
utility/pom.xml | 22 ++
4 files changed, 88 insertions(+)
diff --git a/ambari-funtest/pom.xml b/ambari-funtest/pom.xml
index df0f934..e05b94a 100644
--- a/ambari-funtest/pom.xml
+++ b/ambari-funtest/pom.xml
@@ -24,6 +24,28 @@
Ambari Functional Tests
+
+ org.vafer
+ jdeb
+ 1.0.1
+
+
+
+ stub-execution
+ none
+
+ jdeb
+
+
+
+
+ true
+ false
+ false
+
${project.basedir}/../src/main/package/deb/control
+
+
+
maven-assembly-plugin
diff --git a/ambari-logsearch/pom.xml b/ambari-logsearch/pom.xml
index 808283c..dd64f50 100644
--- a/ambari-logsearch/pom.xml
+++ b/ambari-logsearch/pom.xml
@@ -49,6 +49,28 @@
+
+ org.vafer
+ jdeb
+ 1.0.1
+
+
+
+ stub-execution
+ none
+
+ jdeb
+
+
+
+
+ true
+ false
+ false
+
${project.basedir}/../src/main/package/deb/control
+
+
+
false
maven-assembly-plugin
diff --git a/ambari-metrics/ambari-metrics-grafana/pom.xml
b/ambari-metrics/ambari-metrics-grafana/pom.xml
index 4064b7c..7b26738 100644
--- a/ambari-metrics/ambari-metrics-grafana/pom.xml
+++ b/ambari-metrics/ambari-metrics-grafana/pom.xml
@@ -33,6 +33,28 @@
+
+ org.vafer
+ jdeb
+ 1.0.1
+
+
+
+ stub-execution
+ none
+
+ jdeb
+
+
+
+
+ true
+ false
+ false
+
${project.basedir}/../src/main/package/deb/control
+
+
+
org.codehaus.mojo
build-helper-maven-plugin
diff --git a/utility/pom.xml b/utility/pom.xml
index f130fbb..1ad0658 100644
--- a/utility/pom.xml
+++ b/utility/pom.xml
@@ -58,6 +58,28 @@
+
+ org.vafer
+ jdeb
+ 1.0.1
+
+
+
+ stub-execution
+ none
+
+ jdeb
+
+
+
+
+ true
+ false
+ false
+
${project.basedir}/../src/main/package/deb/control
+
+
+
maven-compiler-plugin
3.2
--
To stop receiving notification emails like this one, please contact
adorosz...@apache.org.
[ambari] branch branch-feature-AMBARI-14714 updated: AMBARI-14714. Fix some unit tests (#1464)
This is an automated email from the ASF dual-hosted git repository.
adoroszlai pushed a commit to branch branch-feature-AMBARI-14714
in repository https://gitbox.apache.org/repos/asf/ambari.git
The following commit(s) were added to refs/heads/branch-feature-AMBARI-14714 by
this push:
new a0fdfc1 AMBARI-14714. Fix some unit tests (#1464)
a0fdfc1 is described below
commit a0fdfc1f43f951c125c3143c1923b41c20ba13e3
Author: Doroszlai, Attila <6454655+adorosz...@users.noreply.github.com>
AuthorDate: Wed Jun 6 13:19:38 2018 +0200
AMBARI-14714. Fix some unit tests (#1464)
---
.../controller/AmbariManagementControllerImpl.java | 6 +-
.../internal/ProvisionClusterRequest.java | 12 +++
.../ambari/server/orm/dao/ServiceConfigDAO.java| 2 +-
.../server/orm/entities/ClusterServiceEntity.java | 4 +-
.../server/serveraction/kerberos/Component.java| 12 +++
.../ambari/server/state/ServiceGroupImpl.java | 1 +
.../api/resources/HostResourceDefinitionTest.java | 21 ++
.../checks/DatabaseConsistencyCheckHelperTest.java | 16 +---
.../AmbariManagementControllerImplTest.java| 34 ++---
.../controller/AmbariManagementControllerTest.java | 86 +++---
.../ambari/server/controller/AmbariServerTest.java | 22 +++---
.../BackgroundCustomCommandExecutionTest.java | 72 +-
.../controller/internal/RequestImplTest.java | 1 -
.../utilities/KerberosIdentityCleanerTest.java | 11 +--
.../orm/entities/ServiceConfigEntityTest.java | 16 ++--
...apAuthenticationProviderForDNWithSpaceTest.java | 1 +
.../AmbariLdapAuthenticationProviderTest.java | 1 +
.../kerberos/FinalizeKerberosServerActionTest.java | 1 +
.../kerberos/KerberosServerActionTest.java | 1 +
.../stack/StackManagerCommonServicesTest.java | 19 -
.../ambari/server/stack/StackModuleTest.java | 72 --
.../ambari/server/state/ConfigHelperTest.java | 12 ---
.../ambari/server/state/cluster/ClustersTest.java | 29 +++-
.../topology/ClusterDeployWithStartOnlyTest.java | 25 ++-
...terInstallWithoutStartOnComponentLevelTest.java | 25 ++-
.../topology/ClusterInstallWithoutStartTest.java | 25 ++-
.../ambari/server/update/HostUpdateHelperTest.java | 2 +-
.../server/upgrade/UpgradeCatalog251Test.java | 14
.../server/upgrade/UpgradeCatalog252Test.java | 24 +-
.../server/upgrade/UpgradeCatalog260Test.java | 37 +-
.../server/upgrade/UpgradeCatalog270Test.java | 18 -
.../cust_action_definitions1.xml | 6 +-
.../cust_action_definitions_invalid.xml| 3 +-
33 files changed, 339 insertions(+), 292 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 d7597d2..9b09655 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
@@ -1397,7 +1397,9 @@ public class AmbariManagementControllerImpl implements
AmbariManagementControlle
// filter on component name if provided
Set components = new HashSet<>();
if (request.getComponentName() != null) {
-components.add(s.getServiceComponent(request.getComponentName()));
+if
(s.getServiceComponents().keySet().contains(request.getComponentName())) {
+ components.add(s.getServiceComponent(request.getComponentName()));
+}
} else {
components.addAll(s.getServiceComponents().values());
}
@@ -3725,6 +3727,8 @@ public class AmbariManagementControllerImpl implements
AmbariManagementControlle
request.setServiceName(s.getName());
request.setComponentName(hostComponentStateEntity.getComponentName());
request.setComponentType(hostComponentStateEntity.getComponentType());
+ } else {
+s = cluster.getService(request.getServiceGroupName(),
request.getServiceName());
}
LOG.info("Received a hostComponent DELETE request"
diff --git
a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ProvisionClusterRequest.java
b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ProvisionClusterRequest.java
index 3b3700e..4dd0e68 100644
---
a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ProvisionClusterRequest.java
+++
b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ProvisionClusterRequest.java
@@ -36,6 +36,7 @@ import org.apache.ambari.server.state.SecurityType;
import org.apache.ambari.server.state.StackId;
import
org.apache.ambari.server.state.quicklinksprofile.QuickLinksProfileBuilder;
import
[ambari] branch trunk updated: AMBARI-24038 HDFS Metrics shows all blocks as 'Corrupt Replicas'. (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 3bffd3c AMBARI-24038 HDFS Metrics shows all blocks as 'Corrupt
Replicas'. (ababiichuk)
3bffd3c is described below
commit 3bffd3c2c6902481b36ff9d15fb3bd2d0710ea64
Author: ababiichuk
AuthorDate: Tue Jun 5 21:28:37 2018 +0300
AMBARI-24038 HDFS Metrics shows all blocks as 'Corrupt Replicas'.
(ababiichuk)
---
ambari-web/app/views/main/service/info/summary/hdfs/widgets.js | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/ambari-web/app/views/main/service/info/summary/hdfs/widgets.js
b/ambari-web/app/views/main/service/info/summary/hdfs/widgets.js
index 3071f3d..e6b4e53 100644
--- a/ambari-web/app/views/main/service/info/summary/hdfs/widgets.js
+++ b/ambari-web/app/views/main/service/info/summary/hdfs/widgets.js
@@ -63,7 +63,7 @@ App.HDFSSummaryWidgetsView =
Em.View.extend(App.NameNodeWidgetMixin, App.HDFSSum
dfsTotalBlocks: Em.computed.formatUnavailable('dfsTotalBlocksValue'),
- dfsCorruptBlocksValue: Em.computed.getByKey('model.dfsTotalBlocksValues',
'hostName'),
+ dfsCorruptBlocksValue: Em.computed.getByKey('model.dfsCorruptBlocksValues',
'hostName'),
dfsCorruptBlocks: Em.computed.formatUnavailable('dfsCorruptBlocksValue'),
--
To stop receiving notification emails like this one, please contact
ababiic...@apache.org.
[ambari] branch trunk updated: AMBARI-24040. Infra Solr start/stop should be idempotent. (#1473)
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 2727730 AMBARI-24040. Infra Solr start/stop should be idempotent.
(#1473)
2727730 is described below
commit 2727730f243895762d51a35c09846b612bdd646b
Author: Olivér Szabó
AuthorDate: Wed Jun 6 11:44:32 2018 +0200
AMBARI-24040. Infra Solr start/stop should be idempotent. (#1473)
* AMBARI-24040. Infra Solr start/stop should be idempotent.
* AMBARI-24040. Remove as_sudo import
---
.../0.1.0/package/scripts/infra_solr.py | 17 -
1 file changed, 16 insertions(+), 1 deletion(-)
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 502943e..5ae228b 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
@@ -59,11 +59,15 @@ class InfraSolr(Script):
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}\' 2>&1') \
if params.security_enabled else format('{solr_bindir}/solr start
-cloud -noprompt -s {infra_solr_datadir} 2>&1')
+
+check_process = format("{sudo} test -f {infra_solr_pidfile} && {sudo}
pgrep -F {infra_solr_pidfile}")
+
piped_start_cmd = format('{start_cmd} | tee {infra_solr_log}') + '; (exit
"${PIPESTATUS[0]}")'
Execute(
piped_start_cmd,
environment={'SOLR_INCLUDE':
format('{infra_solr_conf}/infra-solr-env.sh')},
user=params.infra_solr_user,
+ not_if=check_process,
logoutput=True
)
@@ -77,7 +81,6 @@ class InfraSolr(Script):
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}"),
logoutput=True
)
@@ -156,5 +159,17 @@ class InfraSolr(Script):
pkg_provider.remove_package('ambari-infra-solr', context,
ignore_dependencies=True)
pkg_provider.upgrade_package('ambari-infra-solr', context)
+ def get_log_folder(self):
+import params
+return params.infra_solr_log_dir
+
+ def get_user(self):
+import params
+return params.infra_solr_user
+
+ def get_pid_files(self):
+import status_params
+return [status_params.infra_solr_pidfile]
+
if __name__ == "__main__":
InfraSolr().execute()
\ No newline at end of file
--
To stop receiving notification emails like this one, please contact
oleew...@apache.org.
