[1/2] ambari git commit: AMBARI-11575. hive-site.xml property hive.security.metastore.authorization.manager becomes invalid when switching values in Choose Authorization widget (srimanth)
Repository: ambari Updated Branches: refs/heads/branch-2.1 ab526ff5f - b36ce9c6a http://git-wip-us.apache.org/repos/asf/ambari/blob/b36ce9c6/ambari-server/src/main/resources/stacks/HDPWIN/2.2/services/HIVE/configuration/hive-site.xml -- diff --git a/ambari-server/src/main/resources/stacks/HDPWIN/2.2/services/HIVE/configuration/hive-site.xml b/ambari-server/src/main/resources/stacks/HDPWIN/2.2/services/HIVE/configuration/hive-site.xml index e6421ee..ff14e4c 100644 --- a/ambari-server/src/main/resources/stacks/HDPWIN/2.2/services/HIVE/configuration/hive-site.xml +++ b/ambari-server/src/main/resources/stacks/HDPWIN/2.2/services/HIVE/configuration/hive-site.xml @@ -92,6 +92,12 @@ limitations under the License. The Hive client authorization manager class name. The user defined authorization class should implement interface org.apache.hadoop.hive.ql.security.authorization.HiveAuthorizationProvider. /description +depends-on + property +typehive-env/type +namehive_security_authorization/name + /property +/depends-on /property property @@ -968,11 +974,17 @@ limitations under the License. hive client authenticator manager class name. The user defined authenticator should implement interface org.apache.hadoop.hive.ql.security.HiveAuthenticationProvider. /description +depends-on + property +typehive-env/type +namehive_security_authorization/name + /property +/depends-on /property property namehive.security.metastore.authorization.manager/name display-nameHive Authorization Manager/display-name - valueorg.apache.hadoop.hive.ql.security.authorization.StorageBasedAuthorizationProvider,org.apache.hadoop.hive.ql.security.authorization.MetaStoreAuthzAPIAuthorizerEmbedOnly/value + valueorg.apache.hadoop.hive.ql.security.authorization.StorageBasedAuthorizationProvider/value description authorization manager class name to be used in the metastore for authorization. The user defined authorization class should implement interface @@ -1245,12 +1257,23 @@ limitations under the License. property namehive.server2.tez.default.queues/name +display-nameDefault query queues/display-name valuedefault/value description A list of comma separated values corresponding to YARN queues of the same name. When HiveServer2 is launched in Tez mode, this configuration needs to be set for multiple Tez sessions to run in parallel on the cluster. /description +value-attributes + typecombo/type + entries +entry + valuedefault/value + labelDefault/label +/entry + /entries + selection-cardinality1+/selection-cardinality +/value-attributes /property property http://git-wip-us.apache.org/repos/asf/ambari/blob/b36ce9c6/ambari-server/src/main/resources/stacks/HDPWIN/2.2/services/HIVE/configuration/hiveserver2-site.xml -- diff --git a/ambari-server/src/main/resources/stacks/HDPWIN/2.2/services/HIVE/configuration/hiveserver2-site.xml b/ambari-server/src/main/resources/stacks/HDPWIN/2.2/services/HIVE/configuration/hiveserver2-site.xml index c0cb31c..b68ddbe 100644 --- a/ambari-server/src/main/resources/stacks/HDPWIN/2.2/services/HIVE/configuration/hiveserver2-site.xml +++ b/ambari-server/src/main/resources/stacks/HDPWIN/2.2/services/HIVE/configuration/hiveserver2-site.xml @@ -23,6 +23,12 @@ limitations under the License. namehive.security.authenticator.manager/name valueorg.apache.hadoop.hive.ql.security.SessionStateUserAuthenticator/value descriptionHive client authenticator manager class name. The user-defined authenticator class should implement interface org.apache.hadoop.hive.ql.security.HiveAuthenticationProvider. /description +depends-on + property +typehive-env/type +namehive_security_authorization/name + /property +/depends-on /property property @@ -30,79 +36,19 @@ limitations under the License. valueorg.apache.hadoop.hive.ql.security.authorization.plugin.sqlstd.SQLStdHiveAuthorizerFactory/value descriptionthe hive client authorization manager class name. The user defined authorization class should implement interface org.apache.hadoop.hive.ql.security.authorization.HiveAuthorizationProvider. /description +depends-on + property +typehive-env/type +namehive_security_authorization/name + /property +/depends-on /property - - property -namehive.server2.enable.doAs/name -valuetrue/value -description - Setting this property to true will have HiveServer2 execute - Hive operations as the user making the calls to it. -/description -display-nameRun as end user instead of Hive
[2/2] ambari git commit: AMBARI-11575. hive-site.xml property hive.security.metastore.authorization.manager becomes invalid when switching values in Choose Authorization widget (srimanth)
AMBARI-11575. hive-site.xml property hive.security.metastore.authorization.manager becomes invalid when switching values in Choose Authorization widget (srimanth) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/b36ce9c6 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/b36ce9c6 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/b36ce9c6 Branch: refs/heads/branch-2.1 Commit: b36ce9c6a61313a4b25217e2d6d3eadabd8f9372 Parents: ab526ff Author: Srimanth Gunturi sgunt...@hortonworks.com Authored: Sun May 31 12:03:35 2015 -0700 Committer: Srimanth Gunturi sgunt...@hortonworks.com Committed: Mon Jun 8 15:24:25 2015 -0700 -- .../0.12.0.2.0/package/scripts/params_linux.py |2 +- .../services/HIVE/configuration/hive-site.xml | 35 +- .../HIVE/configuration/hive-site.xml.orig | 1691 -- .../HIVE/configuration/hiveserver2-site.xml | 84 +- .../ranger-hive-plugin-properties.xml |6 - .../HDP/2.2/services/HIVE/themes/theme.json | 16 +- .../stacks/HDP/2.2/services/stack_advisor.py| 64 +- .../stacks/HDP/2.3/services/stack_advisor.py| 21 +- .../services/HIVE/configuration/hive-site.xml | 25 +- .../HIVE/configuration/hiveserver2-site.xml | 93 +- .../HDPWIN/2.2/services/HIVE/themes/theme.json | 16 +- .../stacks/HDPWIN/2.2/services/stack_advisor.py | 43 +- .../stacks/2.2/common/test_stack_advisor.py | 36 +- .../controllers/main/service/info/summary.js|5 - ambari-web/app/data/HDP2.2/site_properties.js | 11 - .../utils/configs/modification_handlers/hive.js | 122 -- 16 files changed, 211 insertions(+), 2059 deletions(-) -- http://git-wip-us.apache.org/repos/asf/ambari/blob/b36ce9c6/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/params_linux.py -- 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 653f7a6..14c413f 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 @@ -455,7 +455,7 @@ if security_enabled: #For curl command in ranger plugin to get db connector if has_ranger_admin: - enable_ranger_hive = (config['configurations']['ranger-hive-plugin-properties']['ranger-hive-plugin-enabled'].lower() == 'yes') + enable_ranger_hive = (config['configurations']['hive-env']['hive_security_authorization'].lower() == 'ranger') repo_config_password = unicode(config['configurations']['ranger-hive-plugin-properties']['REPOSITORY_CONFIG_PASSWORD']) xa_audit_db_flavor = (config['configurations']['admin-properties']['DB_FLAVOR']).lower() http://git-wip-us.apache.org/repos/asf/ambari/blob/b36ce9c6/ambari-server/src/main/resources/stacks/HDP/2.2/services/HIVE/configuration/hive-site.xml -- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.2/services/HIVE/configuration/hive-site.xml b/ambari-server/src/main/resources/stacks/HDP/2.2/services/HIVE/configuration/hive-site.xml index 5f24e7c..9c53773 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.2/services/HIVE/configuration/hive-site.xml +++ b/ambari-server/src/main/resources/stacks/HDP/2.2/services/HIVE/configuration/hive-site.xml @@ -92,6 +92,12 @@ limitations under the License. The Hive client authorization manager class name. The user defined authorization class should implement interface org.apache.hadoop.hive.ql.security.authorization.HiveAuthorizationProvider. /description +depends-on + property +typehive-env/type +namehive_security_authorization/name + /property +/depends-on /property property @@ -983,11 +989,17 @@ limitations under the License. hive client authenticator manager class name. The user defined authenticator should implement interface org.apache.hadoop.hive.ql.security.HiveAuthenticationProvider. /description +depends-on + property +typehive-env/type +namehive_security_authorization/name + /property +/depends-on /property property namehive.security.metastore.authorization.manager/name display-nameHive Authorization Manager/display-name - valueorg.apache.hadoop.hive.ql.security.authorization.StorageBasedAuthorizationProvider,org.apache.hadoop.hive.ql.security.authorization.MetaStoreAuthzAPIAuthorizerEmbedOnly/value +
[2/2] ambari git commit: AMBARI-11794. RU: during upgrade reopening of browser sends to strange page (alexantonenko)
AMBARI-11794. RU: during upgrade reopening of browser sends to strange page
(alexantonenko)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/87586c67
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/87586c67
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/87586c67
Branch: refs/heads/trunk
Commit: 87586c6703ec2c4952d8e4d0e399f5b8b3938fdb
Parents: d668f2c
Author: Alex Antonenko hiv...@gmail.com
Authored: Mon Jun 8 22:17:08 2015 +0300
Committer: Alex Antonenko hiv...@gmail.com
Committed: Tue Jun 9 00:35:40 2015 +0300
--
ambari-web/app/data/controller_route.js | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/87586c67/ambari-web/app/data/controller_route.js
--
diff --git a/ambari-web/app/data/controller_route.js
b/ambari-web/app/data/controller_route.js
index b324b51..d6319f5 100644
--- a/ambari-web/app/data/controller_route.js
+++ b/ambari-web/app/data/controller_route.js
@@ -63,7 +63,7 @@ module.exports = [
},
{
wizardControllerName:
App.router.get('mainAdminStackAndUpgradeController.name'),
-route: 'main.admin.stackAndUpgrade'
+route: App.db.get('MainAdminStackAndUpgrade', 'upgradeState') == 'INIT' ?
'main.admin.stackAndUpgrade.index' : 'main.admin.stackAndUpgrade.versions'
},
{
wizardControllerName: App.router.get('widgetWizardController.name'),
ambari git commit: AMBARI-11799: [WinTP2] Build stalls at ambari-admin (jluniya)
Repository: ambari Updated Branches: refs/heads/branch-2.1 2488fa8bc - ab526ff5f AMBARI-11799: [WinTP2] Build stalls at ambari-admin (jluniya) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/ab526ff5 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/ab526ff5 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/ab526ff5 Branch: refs/heads/branch-2.1 Commit: ab526ff5f4d00df2db6a4d661f52a2bb2bf9765d Parents: 2488fa8 Author: Jayush Luniya jlun...@hortonworks.com Authored: Mon Jun 8 15:14:26 2015 -0700 Committer: Jayush Luniya jlun...@hortonworks.com Committed: Mon Jun 8 15:15:35 2015 -0700 -- ambari-admin/set-ambari-version.cmd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/ambari/blob/ab526ff5/ambari-admin/set-ambari-version.cmd -- diff --git a/ambari-admin/set-ambari-version.cmd b/ambari-admin/set-ambari-version.cmd index 14fdec6..2b827fc 100644 --- a/ambari-admin/set-ambari-version.cmd +++ b/ambari-admin/set-ambari-version.cmd @@ -14,4 +14,4 @@ rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. rem See the License for the specific language governing permissions and rem limitations under the License. -powershell -File set-ambari-version.ps1 %* \ No newline at end of file +powershell -File set-ambari-version.ps1 %* NUL \ No newline at end of file
ambari git commit: AMBARI-11787. Install Wizard, Step6: Next button is not working after deselect Kafka (akovalenko)
Repository: ambari
Updated Branches:
refs/heads/trunk 0e6fc2409 - d64cf1ffe
AMBARI-11787. Install Wizard, Step6: Next button is not working after deselect
Kafka (akovalenko)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/d64cf1ff
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/d64cf1ff
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/d64cf1ff
Branch: refs/heads/trunk
Commit: d64cf1ffe7e6a5e6e5e3b5756220cf4a0b000da1
Parents: 0e6fc24
Author: Aleksandr Kovalenko akovale...@hortonworks.com
Authored: Mon Jun 8 16:22:51 2015 +0300
Committer: Aleksandr Kovalenko akovale...@hortonworks.com
Committed: Mon Jun 8 18:03:57 2015 +0300
--
ambari-web/app/mappers/configs/themes_mapper.js | 2 ++
1 file changed, 2 insertions(+)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/d64cf1ff/ambari-web/app/mappers/configs/themes_mapper.js
--
diff --git a/ambari-web/app/mappers/configs/themes_mapper.js
b/ambari-web/app/mappers/configs/themes_mapper.js
index 5f00730..eda0e52 100644
--- a/ambari-web/app/mappers/configs/themes_mapper.js
+++ b/ambari-web/app/mappers/configs/themes_mapper.js
@@ -187,6 +187,8 @@ App.themesMapper = App.QuickDataMapper.create({
service_name: serviceName
});
});
+App.store.commit();
App.store.loadMany(this.get(tabModel), advancedTabs);
+App.store.commit();
}
});
ambari git commit: AMBARI-11783. Hive service check failed during Rolling upgrade due to JAVA_HOME not set (ncole)
Repository: ambari
Updated Branches:
refs/heads/trunk d64cf1ffe - ce33632aa
AMBARI-11783. Hive service check failed during Rolling upgrade due to JAVA_HOME
not set (ncole)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/ce33632a
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/ce33632a
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/ce33632a
Branch: refs/heads/trunk
Commit: ce33632aa1aab77a40ba711928b2b0576b8efbc6
Parents: d64cf1f
Author: Nate Cole nc...@hortonworks.com
Authored: Mon Jun 8 08:04:52 2015 -0400
Committer: Nate Cole nc...@hortonworks.com
Committed: Mon Jun 8 13:03:58 2015 -0400
--
.../libraries/functions/hdp_select.py | 5 +--
.../2.0.6/HIVE/test_hive_service_check.py | 36 +++-
2 files changed, 38 insertions(+), 3 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/ce33632a/ambari-common/src/main/python/resource_management/libraries/functions/hdp_select.py
--
diff --git
a/ambari-common/src/main/python/resource_management/libraries/functions/hdp_select.py
b/ambari-common/src/main/python/resource_management/libraries/functions/hdp_select.py
index 668c8b1..4a24301 100644
---
a/ambari-common/src/main/python/resource_management/libraries/functions/hdp_select.py
+++
b/ambari-common/src/main/python/resource_management/libraries/functions/hdp_select.py
@@ -69,7 +69,8 @@ SERVER_ROLE_DIRECTORY_MAP = {
SERVICE_CHECK_DIRECTORY_MAP = {
HDFS_SERVICE_CHECK : hadoop-client,
TEZ_SERVICE_CHECK : hadoop-client,
- PIG_SERVICE_CHECK : hadoop-client
+ PIG_SERVICE_CHECK : hadoop-client,
+ HIVE_SERVICE_CHECK : hadoop-client
}
# /usr/hdp/current/hadoop-client/[bin|sbin|libexec|lib]
@@ -202,4 +203,4 @@ def _get_upgrade_stack():
if direction and stack_name and stack_version:
return (stack_name, stack_version)
- return None
\ No newline at end of file
+ return None
http://git-wip-us.apache.org/repos/asf/ambari/blob/ce33632a/ambari-server/src/test/python/stacks/2.0.6/HIVE/test_hive_service_check.py
--
diff --git
a/ambari-server/src/test/python/stacks/2.0.6/HIVE/test_hive_service_check.py
b/ambari-server/src/test/python/stacks/2.0.6/HIVE/test_hive_service_check.py
index 476bd14..5bf85fd 100644
--- a/ambari-server/src/test/python/stacks/2.0.6/HIVE/test_hive_service_check.py
+++ b/ambari-server/src/test/python/stacks/2.0.6/HIVE/test_hive_service_check.py
@@ -17,11 +17,13 @@ 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.
'''
+import json
import os
from mock.mock import MagicMock, call, patch
from stacks.utils.RMFTestCase import *
import datetime, sys, socket
-import resource_management.libraries.functions
+import resource_management.libraries.functions
+
@patch.object(resource_management.libraries.functions,
get_unique_id_and_date, new = MagicMock(return_value=''))
@patch(socket.socket)
@patch(time.time, new=MagicMock(return_value=1431110511.43))
@@ -246,3 +248,35 @@ class TestServiceCheck(RMFTestCase):
try_sleep = 5,
)
self.assertNoMoreResources()
+
+
+
+ def test_service_check_during_upgrade(self, socket_mock):
+config_file = self.get_src_folder() +
/test/python/stacks/2.2/configs/hive-upgrade.json
+with open(config_file, 'r') as f:
+ json_content = json.load(f)
+
+json_content['commandParams']['version'] = 2.3.0.0-1234
+
+self.executeScript(self.COMMON_SERVICES_PACKAGE_DIR +
/scripts/service_check.py,
+ classname=HiveServiceCheck,
+ command=service_check,
+ config_dict = json_content,
+ hdp_stack_version = self.STACK_VERSION,
+ target = RMFTestCase.TARGET_COMMON_SERVICES)
+
+self.assertResourceCalled('Execute', ! beeline -u
'jdbc:hive2://c6402.ambari.apache.org:10010/;transportMode=binary' -e '' 21|
awk '{print}'|grep -i -e 'Connection refused' -e 'Invalid URL',
+ path = ['/bin/', '/usr/bin/', '/usr/lib/hive/bin/', '/usr/sbin/'],
+ timeout = 30,
+ user = 'ambari-qa')
+
+self.assertResourceCalled('File', '/tmp/hcatSmoke.sh',
+ content = StaticFile('hcatSmoke.sh'),
+ mode = 0755)
+
+self.assertResourceCalled('Execute', env JAVA_HOME=/usr/jdk64/jdk1.7.0_45
/tmp/hcatSmoke.sh hcatsmoke prepare,
+logoutput = True,
+path = ['/usr/sbin','/usr/local/bin','/bin','/usr/bin',
'/bin:/usr/hdp/current/hadoop-client/bin:/usr/hdp/2.3.0.0-1234/hive/bin'],
+tries = 3,
+user = 'ambari-qa',
+try_sleep = 5)
ambari git commit: AMBARI-11787. Install Wizard, Step6: Next button is not working after deselect Kafka (akovalenko)
Repository: ambari
Updated Branches:
refs/heads/branch-2.1 5454e3541 - 225ee6fa4
AMBARI-11787. Install Wizard, Step6: Next button is not working after deselect
Kafka (akovalenko)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/225ee6fa
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/225ee6fa
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/225ee6fa
Branch: refs/heads/branch-2.1
Commit: 225ee6fa4465223fad462f23f1e3e16fe4842d56
Parents: 5454e35
Author: Aleksandr Kovalenko akovale...@hortonworks.com
Authored: Mon Jun 8 18:03:57 2015 +0300
Committer: Aleksandr Kovalenko akovale...@hortonworks.com
Committed: Mon Jun 8 19:50:05 2015 +0300
--
ambari-web/app/mappers/configs/themes_mapper.js | 2 ++
1 file changed, 2 insertions(+)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/225ee6fa/ambari-web/app/mappers/configs/themes_mapper.js
--
diff --git a/ambari-web/app/mappers/configs/themes_mapper.js
b/ambari-web/app/mappers/configs/themes_mapper.js
index 5f00730..eda0e52 100644
--- a/ambari-web/app/mappers/configs/themes_mapper.js
+++ b/ambari-web/app/mappers/configs/themes_mapper.js
@@ -187,6 +187,8 @@ App.themesMapper = App.QuickDataMapper.create({
service_name: serviceName
});
});
+App.store.commit();
App.store.loadMany(this.get(tabModel), advancedTabs);
+App.store.commit();
}
});
ambari git commit: AMBARI-11790. Remove all occurrences of a property from a configuration hierarchy
Repository: ambari
Updated Branches:
refs/heads/trunk ce33632aa - 6a9d590aa
AMBARI-11790. Remove all occurrences of a property from a configuration
hierarchy
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/6a9d590a
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/6a9d590a
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/6a9d590a
Branch: refs/heads/trunk
Commit: 6a9d590aaeeb24045a62fa3780582dbb51a7521f
Parents: ce33632
Author: John Speidel jspei...@hortonworks.com
Authored: Mon Jun 8 11:19:38 2015 -0400
Committer: John Speidel jspei...@hortonworks.com
Committed: Mon Jun 8 13:11:27 2015 -0400
--
.../ambari/server/topology/Configuration.java | 15 +--
.../server/topology/ConfigurationTest.java | 44
2 files changed, 48 insertions(+), 11 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/6a9d590a/ambari-server/src/main/java/org/apache/ambari/server/topology/Configuration.java
--
diff --git
a/ambari-server/src/main/java/org/apache/ambari/server/topology/Configuration.java
b/ambari-server/src/main/java/org/apache/ambari/server/topology/Configuration.java
index b7b9343..91b7736 100644
---
a/ambari-server/src/main/java/org/apache/ambari/server/topology/Configuration.java
+++
b/ambari-server/src/main/java/org/apache/ambari/server/topology/Configuration.java
@@ -248,6 +248,8 @@ public class Configuration {
/**
* Remove a property from the configuration hierarchy.
+ * All occurrences of the property are removed from the config hierarchy
such that
+ * a subsequent call to getPropertyValue() for the removed property will
return null.
*
* @param configTypeconfiguration type
* @param propertyName property name
@@ -257,10 +259,15 @@ public class Configuration {
*/
public String removeProperty(String configType, String propertyName) {
String previousValue = null;
-if (properties.containsKey(configType)
properties.get(configType).containsKey(propertyName)) {
- previousValue = properties.get(configType).remove(propertyName);
-} else if (parentConfiguration != null) {
- previousValue = parentConfiguration.removeProperty(configType,
propertyName);
+if (properties.containsKey(configType)) {
+ previousValue = properties.get(configType).remove(propertyName);
+}
+
+if (parentConfiguration != null) {
+ String parentPreviousValue =
parentConfiguration.removeProperty(configType, propertyName);
+ if (previousValue == null) {
+previousValue = parentPreviousValue;
+ }
}
return previousValue;
}
http://git-wip-us.apache.org/repos/asf/ambari/blob/6a9d590a/ambari-server/src/test/java/org/apache/ambari/server/topology/ConfigurationTest.java
--
diff --git
a/ambari-server/src/test/java/org/apache/ambari/server/topology/ConfigurationTest.java
b/ambari-server/src/test/java/org/apache/ambari/server/topology/ConfigurationTest.java
index 1b9734e..9bab88f 100644
---
a/ambari-server/src/test/java/org/apache/ambari/server/topology/ConfigurationTest.java
+++
b/ambari-server/src/test/java/org/apache/ambari/server/topology/ConfigurationTest.java
@@ -26,6 +26,7 @@ import java.util.Map;
import org.junit.Test;
import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertTrue;
/**
@@ -104,7 +105,7 @@ public class ConfigurationTest {
@Test
public void testGetFullProperties_withParent() {
-Configuration configuration = createConfigurationWithParentsPropsOnly();
+Configuration configuration = createConfigurationWithParents_PropsOnly();
// get prop maps prior to calling getFullProperties
MapString, MapString, String leafProperties =
configuration.getProperties();
MapString, MapString, String parentProperties =
configuration.getParentConfiguration().getProperties();
@@ -157,7 +158,7 @@ public class ConfigurationTest {
@Test
public void testGetFullProperties_withParent_specifyDepth() {
-Configuration configuration = createConfigurationWithParentsPropsOnly();
+Configuration configuration = createConfigurationWithParents_PropsOnly();
// get prop maps prior to calling getFullProperties
MapString, MapString, String leafProperties =
configuration.getProperties();
MapString, MapString, String parentProperties =
configuration.getParentConfiguration().getProperties();
@@ -226,7 +227,7 @@ public class ConfigurationTest {
@Test
public void testGetFullAttributes_withParent() {
-Configuration configuration =
createConfigurationWithParentsAttributesOnly();
+Configuration
ambari git commit: AMBARI-11743. NameNode is forced to leave safemode, which causes HBMaster master to crash if done too quickly (alejandro)
Repository: ambari
Updated Branches:
refs/heads/branch-2.1 6301496e9 - 3a273df10
AMBARI-11743. NameNode is forced to leave safemode, which causes HBMaster
master to crash if done too quickly (alejandro)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/3a273df1
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/3a273df1
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/3a273df1
Branch: refs/heads/branch-2.1
Commit: 3a273df10efeb5456a44b93c472637360792c75d
Parents: 6301496
Author: Alejandro Fernandez afernan...@hortonworks.com
Authored: Mon Jun 8 17:03:06 2015 -0700
Committer: Alejandro Fernandez afernan...@hortonworks.com
Committed: Mon Jun 8 17:03:06 2015 -0700
--
.../libraries/functions/copy_tarball.py | 9 ++-
.../2.1.0.2.0/package/scripts/hdfs_namenode.py | 50 +---
.../python/stacks/2.0.6/HDFS/test_namenode.py | 83 +++-
.../stacks/2.0.6/HIVE/test_hive_server.py | 29 ---
.../stacks/2.2/SPARK/test_job_history_server.py | 39 -
5 files changed, 125 insertions(+), 85 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/3a273df1/ambari-common/src/main/python/resource_management/libraries/functions/copy_tarball.py
--
diff --git
a/ambari-common/src/main/python/resource_management/libraries/functions/copy_tarball.py
b/ambari-common/src/main/python/resource_management/libraries/functions/copy_tarball.py
index 1226439..8eab473 100644
---
a/ambari-common/src/main/python/resource_management/libraries/functions/copy_tarball.py
+++
b/ambari-common/src/main/python/resource_management/libraries/functions/copy_tarball.py
@@ -73,14 +73,15 @@ def _get_single_version_from_hdp_select():
code, stdoutdata = shell.call(get_hdp_versions_cmd, logoutput=True)
with open(tmp_file, 'r+') as file:
out = file.read()
- except:
-Logger.error(Could not parse output of {0}.format(str(tmp_file)))
+ except Exception, e:
+Logger.logger.exception(Could not parse output of {0}. Error:
{1}.format(str(tmp_file), str(e)))
finally:
try:
if os.path.exists(tmp_file):
os.remove(tmp_file)
-except:
- pass
+except Exception, e:
+ Logger.logger.exception(Could not remove file {0}. Error:
{1}.format(str(tmp_file), str(e)))
+
if code != 0 or out is None or out == :
Logger.error(Could not verify HDP version by calling '{0}'. Return Code:
{1}, Output: {2}..format(get_hdp_versions_cmd, str(code), str(out)))
return None
http://git-wip-us.apache.org/repos/asf/ambari/blob/3a273df1/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/package/scripts/hdfs_namenode.py
--
diff --git
a/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/package/scripts/hdfs_namenode.py
b/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/package/scripts/hdfs_namenode.py
index d26d145..827c03d 100644
---
a/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/package/scripts/hdfs_namenode.py
+++
b/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/package/scripts/hdfs_namenode.py
@@ -89,61 +89,53 @@ def namenode(action=None, do_format=True,
rolling_restart=False, env=None):
Execute(format({kinit_path_local} -kt {hdfs_user_keytab}
{hdfs_principal_name}),
user = params.hdfs_user)
-is_namenode_safe_mode_off = format(hadoop dfsadmin -fs {namenode_address}
-safemode get | grep 'Safe mode is OFF')
+is_namenode_safe_mode_off = format(hdfs dfsadmin -fs {namenode_address}
-safemode get | grep 'Safe mode is OFF')
if params.dfs_ha_enabled:
is_active_namenode_cmd = as_user(format(hdfs --config {hadoop_conf_dir}
haadmin -getServiceState {namenode_id} | grep active), params.hdfs_user,
env={'PATH':params.hadoop_bin_dir})
else:
is_active_namenode_cmd = None
-# During normal operations, if HA is enabled and it is in standby, then
stay in current state, otherwise, leave safemode.
-# During Rolling Upgrade, both namenodes must leave safemode.
+# During normal operations, if HA is enabled and it is in standby, then no
need to check safemode staus.
+# During Rolling Upgrade, both namenodes must eventually leave safemode,
and Ambari can wait for this.
# ___Scenario_|_Expected safemode state___|_Wait for safemode
OFF|
# 1 (HA and active) | ON - OFF | Yes
|
# 2 (HA and standby) | no change (yes during RU) | no check (yes during
RU) |
# 3 (no-HA) | ON - OFF | Yes
|
-leave_safe_mode = False
+check_for_safemode_off
ambari git commit: AMBARI-11800. RU: Hive upgrade failed when conf.server is not available (ncole)
Repository: ambari
Updated Branches:
refs/heads/branch-2.1 bbd9dad57 - eccbd54b4
AMBARI-11800. RU: Hive upgrade failed when conf.server is not available (ncole)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/eccbd54b
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/eccbd54b
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/eccbd54b
Branch: refs/heads/branch-2.1
Commit: eccbd54b4c0002770be959548ac8105fc0a295e1
Parents: bbd9dad
Author: Nate Cole nc...@hortonworks.com
Authored: Mon Jun 8 19:34:41 2015 -0400
Committer: Nate Cole nc...@hortonworks.com
Committed: Mon Jun 8 19:34:57 2015 -0400
--
.../package/scripts/hive_server_upgrade.py | 6 +
.../stacks/2.0.6/HIVE/test_hive_server.py | 23
2 files changed, 29 insertions(+)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/eccbd54b/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/hive_server_upgrade.py
--
diff --git
a/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/hive_server_upgrade.py
b/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/hive_server_upgrade.py
index 0b29d6f..d676304 100644
---
a/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/hive_server_upgrade.py
+++
b/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/hive_server_upgrade.py
@@ -17,6 +17,7 @@ limitations under the License.
+import os
import re
from resource_management.core.logger import Logger
from resource_management.core.exceptions import Fail
@@ -49,6 +50,11 @@ def pre_upgrade_deregister():
if current_hiveserver_version is None:
raise Fail('Unable to determine the current HiveServer2 version to
deregister.')
+ # fallback when upgrading because
/usr/hdp/current/hive-server2/conf/conf.server may not exist
+ hive_server_conf_dir = params.hive_server_conf_dir
+ if not os.path.exists(hive_server_conf_dir):
+hive_server_conf_dir = /etc/hive/conf.server
+
# deregister
command = format('hive --config {hive_server_conf_dir} --service hiveserver2
--deregister ' + current_hiveserver_version)
Execute(command, user=params.hive_user, path=params.execute_path, tries=1 )
http://git-wip-us.apache.org/repos/asf/ambari/blob/eccbd54b/ambari-server/src/test/python/stacks/2.0.6/HIVE/test_hive_server.py
--
diff --git
a/ambari-server/src/test/python/stacks/2.0.6/HIVE/test_hive_server.py
b/ambari-server/src/test/python/stacks/2.0.6/HIVE/test_hive_server.py
index 6fcd0f1..43a99b9 100644
--- a/ambari-server/src/test/python/stacks/2.0.6/HIVE/test_hive_server.py
+++ b/ambari-server/src/test/python/stacks/2.0.6/HIVE/test_hive_server.py
@@ -655,7 +655,10 @@ class TestHiveServer(RMFTestCase):
@patch(resource_management.libraries.functions.copy_tarball.copy_to_hdfs)
@patch.object(Script, is_hdp_stack_greater_or_equal, new =
MagicMock(return_value=True))
+ @patch(os.path.exists, new = MagicMock(return_value=True))
+ @patch(platform.linux_distribution, new = MagicMock(return_value=Linux))
def test_stop_during_upgrade(self, copy_to_hdfs_mock):
+
call_side_effects = [(0, hive-server2 - 2.2.0.0-2041), (0, hive-server2
- 2.2.0.0-2041)] * 4
copy_to_hdfs_mock.return_value = True
@@ -672,6 +675,26 @@ class TestHiveServer(RMFTestCase):
self.assertResourceCalled('Execute', 'hdp-select set hive-server2
2.2.1.0-2065',)
+ @patch(resource_management.libraries.functions.copy_tarball.copy_to_hdfs)
+ @patch.object(Script, is_hdp_stack_greater_or_equal, new =
MagicMock(return_value=True))
+ def test_stop_during_upgrade_with_default_conf_server(self,
copy_to_hdfs_mock):
+
+call_side_effects = [(0, hive-server2 - 2.2.0.0-2041), (0, hive-server2
- 2.2.0.0-2041)] * 4
+copy_to_hdfs_mock.return_value = True
+
+self.executeScript(self.COMMON_SERVICES_PACKAGE_DIR +
/scripts/hive_server.py,
+ classname = HiveServer, command = restart, config_file =
hive-upgrade.json,
+ hdp_stack_version = self.UPGRADE_STACK_VERSION,
+ target = RMFTestCase.TARGET_COMMON_SERVICES,
+ call_mocks = call_side_effects
+)
+
+self.assertResourceCalled('Execute', 'hive --config /etc/hive/conf.server
--service hiveserver2 --deregister 2.2.0.0-2041',
+
path=['/bin:/usr/hdp/current/hive-server2/bin:/usr/hdp/current/hadoop-client/bin'],
+ tries=1, user='hive')
+
+self.assertResourceCalled('Execute', 'hdp-select set hive-server2
2.2.1.0-2065',)
+
def test_stop_during_upgrade_bad_hive_version(self):
try:
self.executeScript(self.COMMON_SERVICES_PACKAGE_DIR +
ambari git commit: AMBARI-11797. Atlas quick link URI is pointing to wrong path (Jon Maron via smohanty)
Repository: ambari
Updated Branches:
refs/heads/branch-2.1 886d0c441 - e1862e9b5
AMBARI-11797. Atlas quick link URI is pointing to wrong path (Jon Maron via
smohanty)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/e1862e9b
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/e1862e9b
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/e1862e9b
Branch: refs/heads/branch-2.1
Commit: e1862e9b548d5f587396c024095ca812f7811020
Parents: 886d0c4
Author: Sumit Mohanty smoha...@hortonworks.com
Authored: Mon Jun 8 16:44:13 2015 -0700
Committer: Sumit Mohanty smoha...@hortonworks.com
Committed: Mon Jun 8 16:44:13 2015 -0700
--
ambari-web/app/models/quick_links.js| 4 ++--
ambari-web/app/views/common/quick_view_link_view.js | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/e1862e9b/ambari-web/app/models/quick_links.js
--
diff --git a/ambari-web/app/models/quick_links.js
b/ambari-web/app/models/quick_links.js
index 76f385b..f4a86d4 100644
--- a/ambari-web/app/models/quick_links.js
+++ b/ambari-web/app/models/quick_links.js
@@ -328,9 +328,9 @@ App.QuickLinks.FIXTURES = [
{
id:36,
label:'Atlas Dashboard',
-url:'%@://%@:%@/',
+url:'%@://%@:%@/dashboard/index.html?user.name=%@',
service_id: 'ATLAS',
-template:'%@://%@:%@/',
+template:'%@://%@:%@/dashboard/index.html?user.name=%@',
http_config: 'metadata_port',
https_config: 'metadata_port',
site: 'metadata-env',
http://git-wip-us.apache.org/repos/asf/ambari/blob/e1862e9b/ambari-web/app/views/common/quick_view_link_view.js
--
diff --git a/ambari-web/app/views/common/quick_view_link_view.js
b/ambari-web/app/views/common/quick_view_link_view.js
index ff285a5..41b9483 100644
--- a/ambari-web/app/views/common/quick_view_link_view.js
+++ b/ambari-web/app/views/common/quick_view_link_view.js
@@ -137,7 +137,7 @@ App.QuickViewLinks = Em.View.extend({
var protocol = self.setProtocol(item.get('service_id'),
self.get('configProperties'), self.ambariProperties());
if (item.get('template')) {
var port = item.get('http_config') self.setPort(item, protocol);
- if (['FALCON', 'OOZIE'].contains(item.get('service_id'))) {
+ if (['FALCON', 'OOZIE', 'ATLAS'].contains(item.get('service_id'))) {
item.set('url', item.get('template').fmt(protocol, hosts[0], port,
App.router.get('loginName')));
} else {
item.set('url', item.get('template').fmt(protocol, hosts[0],
port));
ambari git commit: AMBARI-11798. PhoenixRpcSchedulerFactory should be set for HDP 2.3 stack (Ted Yu via srimanth)
Repository: ambari
Updated Branches:
refs/heads/branch-2.1 e1862e9b5 - 6301496e9
AMBARI-11798. PhoenixRpcSchedulerFactory should be set for HDP 2.3 stack (Ted
Yu via srimanth)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/6301496e
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/6301496e
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/6301496e
Branch: refs/heads/branch-2.1
Commit: 6301496e91f46749201cab29a01340835c9d12e4
Parents: e1862e9
Author: Srimanth Gunturi sgunt...@hortonworks.com
Authored: Mon Jun 8 16:44:35 2015 -0700
Committer: Srimanth Gunturi sgunt...@hortonworks.com
Committed: Mon Jun 8 16:44:40 2015 -0700
--
.../main/resources/stacks/HDP/2.2/services/stack_advisor.py| 2 --
.../main/resources/stacks/HDP/2.3/services/stack_advisor.py| 6 ++
.../src/test/python/stacks/2.2/common/test_stack_advisor.py| 3 ---
3 files changed, 6 insertions(+), 5 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/6301496e/ambari-server/src/main/resources/stacks/HDP/2.2/services/stack_advisor.py
--
diff --git
a/ambari-server/src/main/resources/stacks/HDP/2.2/services/stack_advisor.py
b/ambari-server/src/main/resources/stacks/HDP/2.2/services/stack_advisor.py
index 50ba3b7..9390dfd 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.2/services/stack_advisor.py
+++ b/ambari-server/src/main/resources/stacks/HDP/2.2/services/stack_advisor.py
@@ -456,13 +456,11 @@ class HDP22StackAdvisor(HDP21StackAdvisor):
if 'hbase-env' in services['configurations'] and 'phoenix_sql_enabled' in
services['configurations']['hbase-env']['properties']:
if 'true' ==
services['configurations']['hbase-env']['properties']['phoenix_sql_enabled'].lower():
-
putHbaseSiteProperty(hbase.region.server.rpc.scheduler.factory.class,
org.apache.hadoop.hbase.ipc.PhoenixRpcSchedulerFactory)
putHbaseSiteProperty(hbase.rpc.controllerfactory.class,
org.apache.hadoop.hbase.ipc.controller.ServerRpcControllerFactory)
putHbaseSiteProperty(hbase.regionserver.wal.codec,
'org.apache.hadoop.hbase.regionserver.wal.IndexedWALEditCodec')
putHbaseSiteProperty(phoenix.functions.allowUserDefinedFunctions,
'true')
else:
putHbaseSiteProperty(hbase.regionserver.wal.codec,
'org.apache.hadoop.hbase.regionserver.wal.WALCellCodec')
-
putHbaseSitePropertyAttributes('hbase.region.server.rpc.scheduler.factory.class',
'delete', 'true')
putHbaseSitePropertyAttributes('hbase.rpc.controllerfactory.class',
'delete', 'true')
putHbaseSitePropertyAttributes('phoenix.functions.allowUserDefinedFunctions',
'delete', 'true')
http://git-wip-us.apache.org/repos/asf/ambari/blob/6301496e/ambari-server/src/main/resources/stacks/HDP/2.3/services/stack_advisor.py
--
diff --git
a/ambari-server/src/main/resources/stacks/HDP/2.3/services/stack_advisor.py
b/ambari-server/src/main/resources/stacks/HDP/2.3/services/stack_advisor.py
index 327d918..e65736e 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.3/services/stack_advisor.py
+++ b/ambari-server/src/main/resources/stacks/HDP/2.3/services/stack_advisor.py
@@ -86,6 +86,12 @@ class HDP23StackAdvisor(HDP22StackAdvisor):
putHbaseEnvPropertyAttributes('hbase_max_direct_memory_size', 'delete',
'true')
+if 'hbase-env' in services['configurations'] and 'phoenix_sql_enabled' in
services['configurations']['hbase-env']['properties']:
+ if 'true' ==
services['configurations']['hbase-env']['properties']['phoenix_sql_enabled'].lower():
+
putHbaseSiteProperty(hbase.region.server.rpc.scheduler.factory.class,
org.apache.hadoop.hbase.ipc.PhoenixRpcSchedulerFactory)
+ else:
+
putHbaseSitePropertyAttributes('hbase.region.server.rpc.scheduler.factory.class',
'delete', 'true')
+
servicesList = [service[StackServices][service_name] for service in
services[services]]
if 'ranger-hbase-plugin-properties' in services['configurations'] and
('ranger-hbase-plugin-enabled' in
services['configurations']['ranger-hbase-plugin-properties']['properties']):
rangerPluginEnabled =
services['configurations']['ranger-hbase-plugin-properties']['properties']['ranger-hbase-plugin-enabled']
http://git-wip-us.apache.org/repos/asf/ambari/blob/6301496e/ambari-server/src/test/python/stacks/2.2/common/test_stack_advisor.py
--
diff --git
a/ambari-server/src/test/python/stacks/2.2/common/test_stack_advisor.py
b/ambari-server/src/test/python/stacks/2.2/common/test_stack_advisor.py
index d021f62..3c9844a 100644
---
ambari git commit: Update committer list. (yusaku)
Repository: ambari Updated Branches: refs/heads/trunk 757f07bb9 - 4abe8fbff Update committer list. (yusaku) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/4abe8fbf Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/4abe8fbf Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/4abe8fbf Branch: refs/heads/trunk Commit: 4abe8fbff8908f6de8277ef4ccd6ebf0724eb0df Parents: 757f07b Author: Yusaku Sako yus...@hortonworks.com Authored: Mon Jun 8 17:06:10 2015 -0700 Committer: Yusaku Sako yus...@hortonworks.com Committed: Mon Jun 8 17:06:10 2015 -0700 -- docs/pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -- http://git-wip-us.apache.org/repos/asf/ambari/blob/4abe8fbf/docs/pom.xml -- diff --git a/docs/pom.xml b/docs/pom.xml index 4788201..64bb3b3 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -458,12 +458,12 @@ idodiachenko/id nameOleksandr Diachenko/name emailodiache...@apache.org/email -timezone+2/timezone +timezone-8/timezone roles rolePMC/role /roles organization -Hortonworks +Pivotal /organization /developer developer
ambari git commit: AMBARI-11800. RU: Hive upgrade failed when conf.server is not available (ncole)
Repository: ambari
Updated Branches:
refs/heads/trunk 181699d2f - b12b16cf3
AMBARI-11800. RU: Hive upgrade failed when conf.server is not available (ncole)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/b12b16cf
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/b12b16cf
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/b12b16cf
Branch: refs/heads/trunk
Commit: b12b16cf35d60acdc5ee1b8818340ede3ca3fe94
Parents: 181699d
Author: Nate Cole nc...@hortonworks.com
Authored: Mon Jun 8 17:36:21 2015 -0400
Committer: Nate Cole nc...@hortonworks.com
Committed: Mon Jun 8 19:16:05 2015 -0400
--
.../package/scripts/hive_server_upgrade.py | 6 +
.../stacks/2.0.6/HIVE/test_hive_server.py | 23
2 files changed, 29 insertions(+)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/b12b16cf/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/hive_server_upgrade.py
--
diff --git
a/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/hive_server_upgrade.py
b/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/hive_server_upgrade.py
index 0b29d6f..d676304 100644
---
a/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/hive_server_upgrade.py
+++
b/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/hive_server_upgrade.py
@@ -17,6 +17,7 @@ limitations under the License.
+import os
import re
from resource_management.core.logger import Logger
from resource_management.core.exceptions import Fail
@@ -49,6 +50,11 @@ def pre_upgrade_deregister():
if current_hiveserver_version is None:
raise Fail('Unable to determine the current HiveServer2 version to
deregister.')
+ # fallback when upgrading because
/usr/hdp/current/hive-server2/conf/conf.server may not exist
+ hive_server_conf_dir = params.hive_server_conf_dir
+ if not os.path.exists(hive_server_conf_dir):
+hive_server_conf_dir = /etc/hive/conf.server
+
# deregister
command = format('hive --config {hive_server_conf_dir} --service hiveserver2
--deregister ' + current_hiveserver_version)
Execute(command, user=params.hive_user, path=params.execute_path, tries=1 )
http://git-wip-us.apache.org/repos/asf/ambari/blob/b12b16cf/ambari-server/src/test/python/stacks/2.0.6/HIVE/test_hive_server.py
--
diff --git
a/ambari-server/src/test/python/stacks/2.0.6/HIVE/test_hive_server.py
b/ambari-server/src/test/python/stacks/2.0.6/HIVE/test_hive_server.py
index 5800bf1..fc97130 100644
--- a/ambari-server/src/test/python/stacks/2.0.6/HIVE/test_hive_server.py
+++ b/ambari-server/src/test/python/stacks/2.0.6/HIVE/test_hive_server.py
@@ -666,7 +666,10 @@ class TestHiveServer(RMFTestCase):
@patch(resource_management.libraries.functions.copy_tarball.copy_to_hdfs)
@patch.object(Script, is_hdp_stack_greater_or_equal, new =
MagicMock(return_value=True))
+ @patch(os.path.exists, new = MagicMock(return_value=True))
+ @patch(platform.linux_distribution, new = MagicMock(return_value=Linux))
def test_stop_during_upgrade(self, copy_to_hdfs_mock):
+
call_side_effects = [(0, hive-server2 - 2.2.0.0-2041), (0, hive-server2
- 2.2.0.0-2041)] * 4
copy_to_hdfs_mock.return_value = True
@@ -683,6 +686,26 @@ class TestHiveServer(RMFTestCase):
self.assertResourceCalled('Execute', 'hdp-select set hive-server2
2.2.1.0-2065',)
+ @patch(resource_management.libraries.functions.copy_tarball.copy_to_hdfs)
+ @patch.object(Script, is_hdp_stack_greater_or_equal, new =
MagicMock(return_value=True))
+ def test_stop_during_upgrade_with_default_conf_server(self,
copy_to_hdfs_mock):
+
+call_side_effects = [(0, hive-server2 - 2.2.0.0-2041), (0, hive-server2
- 2.2.0.0-2041)] * 4
+copy_to_hdfs_mock.return_value = True
+
+self.executeScript(self.COMMON_SERVICES_PACKAGE_DIR +
/scripts/hive_server.py,
+ classname = HiveServer, command = restart, config_file =
hive-upgrade.json,
+ hdp_stack_version = self.UPGRADE_STACK_VERSION,
+ target = RMFTestCase.TARGET_COMMON_SERVICES,
+ call_mocks = call_side_effects
+)
+
+self.assertResourceCalled('Execute', 'hive --config /etc/hive/conf.server
--service hiveserver2 --deregister 2.2.0.0-2041',
+
path=['/bin:/usr/hdp/current/hive-server2/bin:/usr/hdp/current/hadoop-client/bin'],
+ tries=1, user='hive')
+
+self.assertResourceCalled('Execute', 'hdp-select set hive-server2
2.2.1.0-2065',)
+
def test_stop_during_upgrade_bad_hive_version(self):
try:
self.executeScript(self.COMMON_SERVICES_PACKAGE_DIR +
ambari git commit: AMBARI-11775 - Threading Can Cause Aggregate Alerts To Have Duplicate Alert Entries With Different States (jonathanhurley)
Repository: ambari
Updated Branches:
refs/heads/branch-2.1 eccbd54b4 - 886d0c441
AMBARI-11775 - Threading Can Cause Aggregate Alerts To Have Duplicate Alert
Entries With Different States (jonathanhurley)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/886d0c44
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/886d0c44
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/886d0c44
Branch: refs/heads/branch-2.1
Commit: 886d0c4419002bf22f80e47a7a0b6e0464088815
Parents: eccbd54
Author: Jonathan Hurley jhur...@hortonworks.com
Authored: Sun Jun 7 21:16:53 2015 -0400
Committer: Sumit Mohanty smoha...@hortonworks.com
Committed: Mon Jun 8 16:36:19 2015 -0700
--
.../alerts/AlertAggregateListener.java | 41 -
.../listeners/alerts/AlertReceivedListener.java | 7 -
.../ambari/server/orm/dao/AlertSummaryDTO.java | 50 ++
.../state/alert/AggregateDefinitionMapping.java | 2 +-
.../alerts/AggregateAlertListenerTest.java | 167 +++
5 files changed, 255 insertions(+), 12 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/886d0c44/ambari-server/src/main/java/org/apache/ambari/server/events/listeners/alerts/AlertAggregateListener.java
--
diff --git
a/ambari-server/src/main/java/org/apache/ambari/server/events/listeners/alerts/AlertAggregateListener.java
b/ambari-server/src/main/java/org/apache/ambari/server/events/listeners/alerts/AlertAggregateListener.java
index 4d2add1..ac2f907 100644
---
a/ambari-server/src/main/java/org/apache/ambari/server/events/listeners/alerts/AlertAggregateListener.java
+++
b/ambari-server/src/main/java/org/apache/ambari/server/events/listeners/alerts/AlertAggregateListener.java
@@ -19,6 +19,8 @@ package org.apache.ambari.server.events.listeners.alerts;
import java.text.MessageFormat;
import java.util.List;
+import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
import org.apache.ambari.server.EagerSingleton;
import org.apache.ambari.server.events.AggregateAlertRecalculateEvent;
@@ -35,9 +37,11 @@ import org.apache.ambari.server.state.alert.AggregateSource;
import org.apache.ambari.server.state.alert.AlertDefinition;
import org.apache.ambari.server.state.alert.Reporting;
import org.apache.ambari.server.state.alert.SourceType;
+import org.apache.commons.lang.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import com.google.common.eventbus.AllowConcurrentEvents;
import com.google.common.eventbus.Subscribe;
import com.google.inject.Inject;
import com.google.inject.Singleton;
@@ -70,6 +74,13 @@ public class AlertAggregateListener {
private final AlertEventPublisher m_publisher;
/**
+ * A cache used to store the last state and text of an aggregate alert. We
+ * shouldn't need to fire new aggregate alerts unless the state or text has
+ * changed.
+ */
+ private MapString, Alert m_alertCache = new ConcurrentHashMapString,
Alert();
+
+ /**
* Used for quick lookups of aggregate alerts.
*/
@Inject
@@ -122,6 +133,9 @@ public class AlertAggregateListener {
/**
* Calculates the aggregate alert state if there is an aggregate alert for
the
* specified alert.
+ * p/
+ * This method should not be decoratd with {@link AllowConcurrentEvents}
since
+ * it would need extra locking around {@link #m_alertCache}.
*
* @param clusterId
* the ID of the cluster.
@@ -187,10 +201,29 @@ public class AlertAggregateListener {
}
}
-// make a new event and allow others to consume it
-AlertReceivedEvent aggEvent = new AlertReceivedEvent(clusterId,
-aggregateAlert);
+// now that the alert has been created, see if we need to send it; only
send
+// alerts if the state or the text has changed
+boolean sendAlertEvent = true;
+Alert cachedAlert = m_alertCache.get(aggregateAlert.getName());
+if (null != cachedAlert) {
+ AlertState cachedState = cachedAlert.getState();
+ AlertState alertState = aggregateAlert.getState();
+ String cachedText = cachedAlert.getText();
+ String alertText = aggregateAlert.getText();
+
+ if (cachedState == alertState StringUtils.equals(cachedText,
alertText)) {
+sendAlertEvent = false;
+ }
+}
+
+// update the cache
+m_alertCache.put(aggregateAlert.getName(), aggregateAlert);
-m_publisher.publish(aggEvent);
+// make a new event and allow others to consume it, but only if the
+// aggregate has changed
+if (sendAlertEvent) {
+ AlertReceivedEvent aggEvent = new AlertReceivedEvent(clusterId,
aggregateAlert);
+ m_publisher.publish(aggEvent);
+}
}
}
\ No newline at end of file
ambari git commit: Updated committer list. (yusaku)
Repository: ambari Updated Branches: refs/heads/trunk 4abe8fbff - b14161906 Updated committer list. (yusaku) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/b1416190 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/b1416190 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/b1416190 Branch: refs/heads/trunk Commit: b14161906861b339108ee9494d41a41ddd16e0a4 Parents: 4abe8fb Author: Yusaku Sako yus...@hortonworks.com Authored: Mon Jun 8 17:13:12 2015 -0700 Committer: Yusaku Sako yus...@hortonworks.com Committed: Mon Jun 8 17:13:12 2015 -0700 -- docs/pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -- http://git-wip-us.apache.org/repos/asf/ambari/blob/b1416190/docs/pom.xml -- diff --git a/docs/pom.xml b/docs/pom.xml index 64bb3b3..4598634 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -427,7 +427,7 @@ roleCommitter/role /roles organization -SequenceIQ +Hortonworks /organization /developer developer @@ -762,7 +762,7 @@ /contributor contributor nameKrisztian Horvath/name - organizationSequenceIQ/organization + organizationHortonworks/organization /contributor contributor nameSaurabh Jain/name
ambari git commit: AMBARI-11798. PhoenixRpcSchedulerFactory should be set for HDP 2.3 stack (Ted Yu via srimanth)
Repository: ambari
Updated Branches:
refs/heads/trunk 3447a4780 - 757f07bb9
AMBARI-11798. PhoenixRpcSchedulerFactory should be set for HDP 2.3 stack (Ted
Yu via srimanth)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/757f07bb
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/757f07bb
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/757f07bb
Branch: refs/heads/trunk
Commit: 757f07bb9f6bd567158c1e3633bb7152608e9600
Parents: 3447a47
Author: Srimanth Gunturi sgunt...@hortonworks.com
Authored: Mon Jun 8 16:44:35 2015 -0700
Committer: Srimanth Gunturi sgunt...@hortonworks.com
Committed: Mon Jun 8 16:46:34 2015 -0700
--
.../main/resources/stacks/HDP/2.2/services/stack_advisor.py| 2 --
.../main/resources/stacks/HDP/2.3/services/stack_advisor.py| 6 ++
.../src/test/python/stacks/2.2/common/test_stack_advisor.py| 3 ---
3 files changed, 6 insertions(+), 5 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/757f07bb/ambari-server/src/main/resources/stacks/HDP/2.2/services/stack_advisor.py
--
diff --git
a/ambari-server/src/main/resources/stacks/HDP/2.2/services/stack_advisor.py
b/ambari-server/src/main/resources/stacks/HDP/2.2/services/stack_advisor.py
index 50ba3b7..9390dfd 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.2/services/stack_advisor.py
+++ b/ambari-server/src/main/resources/stacks/HDP/2.2/services/stack_advisor.py
@@ -456,13 +456,11 @@ class HDP22StackAdvisor(HDP21StackAdvisor):
if 'hbase-env' in services['configurations'] and 'phoenix_sql_enabled' in
services['configurations']['hbase-env']['properties']:
if 'true' ==
services['configurations']['hbase-env']['properties']['phoenix_sql_enabled'].lower():
-
putHbaseSiteProperty(hbase.region.server.rpc.scheduler.factory.class,
org.apache.hadoop.hbase.ipc.PhoenixRpcSchedulerFactory)
putHbaseSiteProperty(hbase.rpc.controllerfactory.class,
org.apache.hadoop.hbase.ipc.controller.ServerRpcControllerFactory)
putHbaseSiteProperty(hbase.regionserver.wal.codec,
'org.apache.hadoop.hbase.regionserver.wal.IndexedWALEditCodec')
putHbaseSiteProperty(phoenix.functions.allowUserDefinedFunctions,
'true')
else:
putHbaseSiteProperty(hbase.regionserver.wal.codec,
'org.apache.hadoop.hbase.regionserver.wal.WALCellCodec')
-
putHbaseSitePropertyAttributes('hbase.region.server.rpc.scheduler.factory.class',
'delete', 'true')
putHbaseSitePropertyAttributes('hbase.rpc.controllerfactory.class',
'delete', 'true')
putHbaseSitePropertyAttributes('phoenix.functions.allowUserDefinedFunctions',
'delete', 'true')
http://git-wip-us.apache.org/repos/asf/ambari/blob/757f07bb/ambari-server/src/main/resources/stacks/HDP/2.3/services/stack_advisor.py
--
diff --git
a/ambari-server/src/main/resources/stacks/HDP/2.3/services/stack_advisor.py
b/ambari-server/src/main/resources/stacks/HDP/2.3/services/stack_advisor.py
index 327d918..e65736e 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.3/services/stack_advisor.py
+++ b/ambari-server/src/main/resources/stacks/HDP/2.3/services/stack_advisor.py
@@ -86,6 +86,12 @@ class HDP23StackAdvisor(HDP22StackAdvisor):
putHbaseEnvPropertyAttributes('hbase_max_direct_memory_size', 'delete',
'true')
+if 'hbase-env' in services['configurations'] and 'phoenix_sql_enabled' in
services['configurations']['hbase-env']['properties']:
+ if 'true' ==
services['configurations']['hbase-env']['properties']['phoenix_sql_enabled'].lower():
+
putHbaseSiteProperty(hbase.region.server.rpc.scheduler.factory.class,
org.apache.hadoop.hbase.ipc.PhoenixRpcSchedulerFactory)
+ else:
+
putHbaseSitePropertyAttributes('hbase.region.server.rpc.scheduler.factory.class',
'delete', 'true')
+
servicesList = [service[StackServices][service_name] for service in
services[services]]
if 'ranger-hbase-plugin-properties' in services['configurations'] and
('ranger-hbase-plugin-enabled' in
services['configurations']['ranger-hbase-plugin-properties']['properties']):
rangerPluginEnabled =
services['configurations']['ranger-hbase-plugin-properties']['properties']['ranger-hbase-plugin-enabled']
http://git-wip-us.apache.org/repos/asf/ambari/blob/757f07bb/ambari-server/src/test/python/stacks/2.2/common/test_stack_advisor.py
--
diff --git
a/ambari-server/src/test/python/stacks/2.2/common/test_stack_advisor.py
b/ambari-server/src/test/python/stacks/2.2/common/test_stack_advisor.py
index d021f62..3c9844a 100644
---
[2/2] ambari git commit: AMBARI-11575. hive-site.xml property hive.security.metastore.authorization.manager becomes invalid when switching values in Choose Authorization widget (srimanth)
AMBARI-11575. hive-site.xml property hive.security.metastore.authorization.manager becomes invalid when switching values in Choose Authorization widget (srimanth) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/e90bb8f9 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/e90bb8f9 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/e90bb8f9 Branch: refs/heads/trunk Commit: e90bb8f916c79486ada2064c1858285d944e598f Parents: b12b16c Author: Srimanth Gunturi sgunt...@hortonworks.com Authored: Sun May 31 12:03:35 2015 -0700 Committer: Srimanth Gunturi sgunt...@hortonworks.com Committed: Mon Jun 8 16:36:32 2015 -0700 -- .../0.12.0.2.0/package/scripts/params_linux.py |2 +- .../services/HIVE/configuration/hive-site.xml | 35 +- .../HIVE/configuration/hive-site.xml.orig | 1691 -- .../HIVE/configuration/hiveserver2-site.xml | 84 +- .../ranger-hive-plugin-properties.xml |6 - .../HDP/2.2/services/HIVE/themes/theme.json | 16 +- .../stacks/HDP/2.2/services/stack_advisor.py| 64 +- .../stacks/HDP/2.3/services/stack_advisor.py| 21 +- .../services/HIVE/configuration/hive-site.xml | 25 +- .../HIVE/configuration/hiveserver2-site.xml | 93 +- .../HDPWIN/2.2/services/HIVE/themes/theme.json | 16 +- .../stacks/HDPWIN/2.2/services/stack_advisor.py | 43 +- .../stacks/2.2/common/test_stack_advisor.py | 36 +- .../controllers/main/service/info/summary.js|5 - ambari-web/app/data/HDP2.2/site_properties.js | 11 - .../utils/configs/modification_handlers/hive.js | 122 -- 16 files changed, 211 insertions(+), 2059 deletions(-) -- http://git-wip-us.apache.org/repos/asf/ambari/blob/e90bb8f9/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/params_linux.py -- 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 653f7a6..14c413f 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 @@ -455,7 +455,7 @@ if security_enabled: #For curl command in ranger plugin to get db connector if has_ranger_admin: - enable_ranger_hive = (config['configurations']['ranger-hive-plugin-properties']['ranger-hive-plugin-enabled'].lower() == 'yes') + enable_ranger_hive = (config['configurations']['hive-env']['hive_security_authorization'].lower() == 'ranger') repo_config_password = unicode(config['configurations']['ranger-hive-plugin-properties']['REPOSITORY_CONFIG_PASSWORD']) xa_audit_db_flavor = (config['configurations']['admin-properties']['DB_FLAVOR']).lower() http://git-wip-us.apache.org/repos/asf/ambari/blob/e90bb8f9/ambari-server/src/main/resources/stacks/HDP/2.2/services/HIVE/configuration/hive-site.xml -- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.2/services/HIVE/configuration/hive-site.xml b/ambari-server/src/main/resources/stacks/HDP/2.2/services/HIVE/configuration/hive-site.xml index 5f24e7c..9c53773 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.2/services/HIVE/configuration/hive-site.xml +++ b/ambari-server/src/main/resources/stacks/HDP/2.2/services/HIVE/configuration/hive-site.xml @@ -92,6 +92,12 @@ limitations under the License. The Hive client authorization manager class name. The user defined authorization class should implement interface org.apache.hadoop.hive.ql.security.authorization.HiveAuthorizationProvider. /description +depends-on + property +typehive-env/type +namehive_security_authorization/name + /property +/depends-on /property property @@ -983,11 +989,17 @@ limitations under the License. hive client authenticator manager class name. The user defined authenticator should implement interface org.apache.hadoop.hive.ql.security.HiveAuthenticationProvider. /description +depends-on + property +typehive-env/type +namehive_security_authorization/name + /property +/depends-on /property property namehive.security.metastore.authorization.manager/name display-nameHive Authorization Manager/display-name - valueorg.apache.hadoop.hive.ql.security.authorization.StorageBasedAuthorizationProvider,org.apache.hadoop.hive.ql.security.authorization.MetaStoreAuthzAPIAuthorizerEmbedOnly/value +
[1/2] ambari git commit: AMBARI-11575. hive-site.xml property hive.security.metastore.authorization.manager becomes invalid when switching values in Choose Authorization widget (srimanth)
Repository: ambari Updated Branches: refs/heads/trunk b12b16cf3 - e90bb8f91 http://git-wip-us.apache.org/repos/asf/ambari/blob/e90bb8f9/ambari-server/src/main/resources/stacks/HDPWIN/2.2/services/HIVE/configuration/hive-site.xml -- diff --git a/ambari-server/src/main/resources/stacks/HDPWIN/2.2/services/HIVE/configuration/hive-site.xml b/ambari-server/src/main/resources/stacks/HDPWIN/2.2/services/HIVE/configuration/hive-site.xml index e6421ee..ff14e4c 100644 --- a/ambari-server/src/main/resources/stacks/HDPWIN/2.2/services/HIVE/configuration/hive-site.xml +++ b/ambari-server/src/main/resources/stacks/HDPWIN/2.2/services/HIVE/configuration/hive-site.xml @@ -92,6 +92,12 @@ limitations under the License. The Hive client authorization manager class name. The user defined authorization class should implement interface org.apache.hadoop.hive.ql.security.authorization.HiveAuthorizationProvider. /description +depends-on + property +typehive-env/type +namehive_security_authorization/name + /property +/depends-on /property property @@ -968,11 +974,17 @@ limitations under the License. hive client authenticator manager class name. The user defined authenticator should implement interface org.apache.hadoop.hive.ql.security.HiveAuthenticationProvider. /description +depends-on + property +typehive-env/type +namehive_security_authorization/name + /property +/depends-on /property property namehive.security.metastore.authorization.manager/name display-nameHive Authorization Manager/display-name - valueorg.apache.hadoop.hive.ql.security.authorization.StorageBasedAuthorizationProvider,org.apache.hadoop.hive.ql.security.authorization.MetaStoreAuthzAPIAuthorizerEmbedOnly/value + valueorg.apache.hadoop.hive.ql.security.authorization.StorageBasedAuthorizationProvider/value description authorization manager class name to be used in the metastore for authorization. The user defined authorization class should implement interface @@ -1245,12 +1257,23 @@ limitations under the License. property namehive.server2.tez.default.queues/name +display-nameDefault query queues/display-name valuedefault/value description A list of comma separated values corresponding to YARN queues of the same name. When HiveServer2 is launched in Tez mode, this configuration needs to be set for multiple Tez sessions to run in parallel on the cluster. /description +value-attributes + typecombo/type + entries +entry + valuedefault/value + labelDefault/label +/entry + /entries + selection-cardinality1+/selection-cardinality +/value-attributes /property property http://git-wip-us.apache.org/repos/asf/ambari/blob/e90bb8f9/ambari-server/src/main/resources/stacks/HDPWIN/2.2/services/HIVE/configuration/hiveserver2-site.xml -- diff --git a/ambari-server/src/main/resources/stacks/HDPWIN/2.2/services/HIVE/configuration/hiveserver2-site.xml b/ambari-server/src/main/resources/stacks/HDPWIN/2.2/services/HIVE/configuration/hiveserver2-site.xml index c0cb31c..b68ddbe 100644 --- a/ambari-server/src/main/resources/stacks/HDPWIN/2.2/services/HIVE/configuration/hiveserver2-site.xml +++ b/ambari-server/src/main/resources/stacks/HDPWIN/2.2/services/HIVE/configuration/hiveserver2-site.xml @@ -23,6 +23,12 @@ limitations under the License. namehive.security.authenticator.manager/name valueorg.apache.hadoop.hive.ql.security.SessionStateUserAuthenticator/value descriptionHive client authenticator manager class name. The user-defined authenticator class should implement interface org.apache.hadoop.hive.ql.security.HiveAuthenticationProvider. /description +depends-on + property +typehive-env/type +namehive_security_authorization/name + /property +/depends-on /property property @@ -30,79 +36,19 @@ limitations under the License. valueorg.apache.hadoop.hive.ql.security.authorization.plugin.sqlstd.SQLStdHiveAuthorizerFactory/value descriptionthe hive client authorization manager class name. The user defined authorization class should implement interface org.apache.hadoop.hive.ql.security.authorization.HiveAuthorizationProvider. /description +depends-on + property +typehive-env/type +namehive_security_authorization/name + /property +/depends-on /property - - property -namehive.server2.enable.doAs/name -valuetrue/value -description - Setting this property to true will have HiveServer2 execute - Hive operations as the user making the calls to it. -/description -display-nameRun as end user instead of Hive user/display-name
svn commit: r1684298 - in /ambari/site: index.html install-0.9.html install.html irc.html issue-tracking.html license.html mail-lists.html privacy-policy.html project-info.html team-list.html whats-ne
Author: yusaku Date: Tue Jun 9 00:16:18 2015 New Revision: 1684298 URL: http://svn.apache.org/r1684298 Log: Updated committer list. (yusaku) Modified: ambari/site/index.html ambari/site/install-0.9.html ambari/site/install.html ambari/site/irc.html ambari/site/issue-tracking.html ambari/site/license.html ambari/site/mail-lists.html ambari/site/privacy-policy.html ambari/site/project-info.html ambari/site/team-list.html ambari/site/whats-new.html Modified: ambari/site/index.html URL: http://svn.apache.org/viewvc/ambari/site/index.html?rev=1684298r1=1684297r2=1684298view=diff == --- ambari/site/index.html (original) +++ ambari/site/index.html Tue Jun 9 00:16:18 2015 @@ -1,13 +1,13 @@ !DOCTYPE html !-- - | Generated by Apache Maven Doxia at May 22, 2015 + | Generated by Apache Maven Doxia at Jun 8, 2015 | Rendered using Apache Maven Fluido Skin 1.3.0 -- html xmlns=http://www.w3.org/1999/xhtml; xml:lang=en lang=en head meta charset=UTF-8 / meta name=viewport content=width=device-width, initial-scale=1.0 / -meta name=Date-Revision-mmdd content=20150522 / +meta name=Date-Revision-mmdd content=20150608 / meta http-equiv=Content-Language content=en / title/title link rel=stylesheet href=./css/apache-maven-fluido-1.3.0.min.css / @@ -275,7 +275,7 @@ - li id=publishDate class=pull-rightLast Published: 2015-05-22/li li class=divider pull-right|/li + li id=publishDate class=pull-rightLast Published: 2015-06-08/li li class=divider pull-right|/li li id=projectVersion class=pull-rightVersion: 2.0.1/li /ul Modified: ambari/site/install-0.9.html URL: http://svn.apache.org/viewvc/ambari/site/install-0.9.html?rev=1684298r1=1684297r2=1684298view=diff == --- ambari/site/install-0.9.html (original) +++ ambari/site/install-0.9.html Tue Jun 9 00:16:18 2015 @@ -1,13 +1,13 @@ !DOCTYPE html !-- - | Generated by Apache Maven Doxia at May 22, 2015 + | Generated by Apache Maven Doxia at Jun 8, 2015 | Rendered using Apache Maven Fluido Skin 1.3.0 -- html xmlns=http://www.w3.org/1999/xhtml; xml:lang=en lang=en head meta charset=UTF-8 / meta name=viewport content=width=device-width, initial-scale=1.0 / -meta name=Date-Revision-mmdd content=20150522 / +meta name=Date-Revision-mmdd content=20150608 / meta http-equiv=Content-Language content=en / title/title link rel=stylesheet href=./css/apache-maven-fluido-1.3.0.min.css / @@ -275,7 +275,7 @@ - li id=publishDate class=pull-rightLast Published: 2015-05-22/li li class=divider pull-right|/li + li id=publishDate class=pull-rightLast Published: 2015-06-08/li li class=divider pull-right|/li li id=projectVersion class=pull-rightVersion: 2.0.1/li /ul Modified: ambari/site/install.html URL: http://svn.apache.org/viewvc/ambari/site/install.html?rev=1684298r1=1684297r2=1684298view=diff == --- ambari/site/install.html (original) +++ ambari/site/install.html Tue Jun 9 00:16:18 2015 @@ -1,13 +1,13 @@ !DOCTYPE html !-- - | Generated by Apache Maven Doxia at May 22, 2015 + | Generated by Apache Maven Doxia at Jun 8, 2015 | Rendered using Apache Maven Fluido Skin 1.3.0 -- html xmlns=http://www.w3.org/1999/xhtml; xml:lang=en lang=en head meta charset=UTF-8 / meta name=viewport content=width=device-width, initial-scale=1.0 / -meta name=Date-Revision-mmdd content=20150522 / +meta name=Date-Revision-mmdd content=20150608 / meta http-equiv=Content-Language content=en / title/title link rel=stylesheet href=./css/apache-maven-fluido-1.3.0.min.css / @@ -275,7 +275,7 @@ - li id=publishDate class=pull-rightLast Published: 2015-05-22/li li class=divider pull-right|/li + li id=publishDate class=pull-rightLast Published: 2015-06-08/li li class=divider pull-right|/li li id=projectVersion class=pull-rightVersion: 2.0.1/li /ul Modified: ambari/site/irc.html URL: http://svn.apache.org/viewvc/ambari/site/irc.html?rev=1684298r1=1684297r2=1684298view=diff == --- ambari/site/irc.html (original) +++ ambari/site/irc.html Tue Jun 9 00:16:18 2015 @@ -1,13 +1,13 @@ !DOCTYPE html !-- - | Generated by Apache Maven Doxia at May 22, 2015 + | Generated by Apache Maven Doxia at Jun 8, 2015 | Rendered using
ambari git commit: AMBARI-11806. 500 errors for wigdet on HDP-2.3 stack installation. (jaimin)
Repository: ambari
Updated Branches:
refs/heads/trunk b14161906 - 125a823a2
AMBARI-11806. 500 errors for wigdet on HDP-2.3 stack installation. (jaimin)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/125a823a
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/125a823a
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/125a823a
Branch: refs/heads/trunk
Commit: 125a823a27066f44b57a5ef3abcdb311c4042b4d
Parents: b141619
Author: Jaimin Jetly jai...@hortonworks.com
Authored: Mon Jun 8 21:14:30 2015 -0700
Committer: Jaimin Jetly jai...@hortonworks.com
Committed: Mon Jun 8 21:15:27 2015 -0700
--
.../HDP/2.3/services/YARN/YARN_widgets.json | 676 +++
.../stacks/HDP/2.3/services/YARN/widgets.json | 676 ---
2 files changed, 676 insertions(+), 676 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/125a823a/ambari-server/src/main/resources/stacks/HDP/2.3/services/YARN/YARN_widgets.json
--
diff --git
a/ambari-server/src/main/resources/stacks/HDP/2.3/services/YARN/YARN_widgets.json
b/ambari-server/src/main/resources/stacks/HDP/2.3/services/YARN/YARN_widgets.json
new file mode 100644
index 000..5179470
--- /dev/null
+++
b/ambari-server/src/main/resources/stacks/HDP/2.3/services/YARN/YARN_widgets.json
@@ -0,0 +1,676 @@
+{
+ layouts: [
+{
+ layout_name: default_yarn_dashboard,
+ display_name: Standard YARN Dashboard,
+ section_name: YARN_SUMMARY,
+ widgetLayoutInfo: [
+{
+ widget_name: Memory Utilization,
+ description: Percentage of total memory allocated to containers
running in the cluster.,
+ widget_type: GRAPH,
+ is_visible: true,
+ metrics: [
+{
+ name: yarn.QueueMetrics.Queue=root.AllocatedMB,
+ metric_path: metrics/yarn/Queue/root/AllocatedMB,
+ service_name: YARN,
+ component_name: RESOURCEMANAGER,
+ host_component_criteria:
host_components/HostRoles/ha_state=ACTIVE
+},
+{
+ name: yarn.QueueMetrics.Queue=root.AvailableMB,
+ metric_path: metrics/yarn/Queue/root/AvailableMB,
+ service_name: YARN,
+ component_name: RESOURCEMANAGER,
+ host_component_criteria:
host_components/HostRoles/ha_state=ACTIVE
+}
+ ],
+ values: [
+{
+ name: Memory Utilization,
+ value: ${(yarn.QueueMetrics.Queue=root.AllocatedMB /
(yarn.QueueMetrics.Queue=root.AllocatedMB +
yarn.QueueMetrics.Queue=root.AvailableMB)) * 100}
+}
+ ],
+ properties: {
+display_unit: %,
+graph_type: LINE,
+time_range: 1
+ }
+},
+{
+ widget_name: CPU Utilization,
+ description: Percentage of total virtual cores allocated to
containers running in the cluster.,
+ widget_type: GRAPH,
+ is_visible: true,
+ metrics: [
+{
+ name: yarn.QueueMetrics.Queue=root.AllocatedVCores,
+ metric_path: metrics/yarn/Queue/root/AllocatedVCores,
+ service_name: YARN,
+ component_name: RESOURCEMANAGER,
+ host_component_criteria:
host_components/HostRoles/ha_state=ACTIVE
+},
+{
+ name: yarn.QueueMetrics.Queue=root.AvailableVCores,
+ metric_path: metrics/yarn/Queue/root/AvailableVCores,
+ service_name: YARN,
+ component_name: RESOURCEMANAGER,
+ host_component_criteria:
host_components/HostRoles/ha_state=ACTIVE
+}
+ ],
+ values: [
+{
+ name: Total Allocatable CPU Utilized across NodeManager,
+ value: ${(yarn.QueueMetrics.Queue=root.AllocatedVCores /
(yarn.QueueMetrics.Queue=root.AllocatedVCores +
yarn.QueueMetrics.Queue=root.AvailableVCores)) * 100}
+}
+ ],
+ properties: {
+display_unit: %,
+graph_type: LINE,
+time_range: 1
+ }
+},
+{
+ widget_name: Bad Local Disks,
+ description: Number of unhealthy local disks across all
NodeManagers.,
+ widget_type: NUMBER,
+ is_visible: true,
+ metrics: [
+{
+ name: yarn.NodeManagerMetrics.BadLocalDirs,
+ metric_path: metrics/yarn/BadLocalDirs,
+ service_name: YARN,
+ component_name: NODEMANAGER
+},
+{
+ name: yarn.NodeManagerMetrics.BadLogDirs,
+ metric_path:
ambari git commit: AMBARI-11806. 500 errors for wigdet on HDP-2.3 stack installation. (jaimin)
Repository: ambari
Updated Branches:
refs/heads/branch-2.1 3a273df10 - e1ac20931
AMBARI-11806. 500 errors for wigdet on HDP-2.3 stack installation. (jaimin)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/e1ac2093
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/e1ac2093
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/e1ac2093
Branch: refs/heads/branch-2.1
Commit: e1ac209319fa3c1fcbface46acc553ff46015b73
Parents: 3a273df
Author: Jaimin Jetly jai...@hortonworks.com
Authored: Mon Jun 8 21:14:30 2015 -0700
Committer: Jaimin Jetly jai...@hortonworks.com
Committed: Mon Jun 8 21:14:30 2015 -0700
--
.../HDP/2.3/services/YARN/YARN_widgets.json | 676 +++
.../stacks/HDP/2.3/services/YARN/widgets.json | 676 ---
2 files changed, 676 insertions(+), 676 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/e1ac2093/ambari-server/src/main/resources/stacks/HDP/2.3/services/YARN/YARN_widgets.json
--
diff --git
a/ambari-server/src/main/resources/stacks/HDP/2.3/services/YARN/YARN_widgets.json
b/ambari-server/src/main/resources/stacks/HDP/2.3/services/YARN/YARN_widgets.json
new file mode 100644
index 000..5179470
--- /dev/null
+++
b/ambari-server/src/main/resources/stacks/HDP/2.3/services/YARN/YARN_widgets.json
@@ -0,0 +1,676 @@
+{
+ layouts: [
+{
+ layout_name: default_yarn_dashboard,
+ display_name: Standard YARN Dashboard,
+ section_name: YARN_SUMMARY,
+ widgetLayoutInfo: [
+{
+ widget_name: Memory Utilization,
+ description: Percentage of total memory allocated to containers
running in the cluster.,
+ widget_type: GRAPH,
+ is_visible: true,
+ metrics: [
+{
+ name: yarn.QueueMetrics.Queue=root.AllocatedMB,
+ metric_path: metrics/yarn/Queue/root/AllocatedMB,
+ service_name: YARN,
+ component_name: RESOURCEMANAGER,
+ host_component_criteria:
host_components/HostRoles/ha_state=ACTIVE
+},
+{
+ name: yarn.QueueMetrics.Queue=root.AvailableMB,
+ metric_path: metrics/yarn/Queue/root/AvailableMB,
+ service_name: YARN,
+ component_name: RESOURCEMANAGER,
+ host_component_criteria:
host_components/HostRoles/ha_state=ACTIVE
+}
+ ],
+ values: [
+{
+ name: Memory Utilization,
+ value: ${(yarn.QueueMetrics.Queue=root.AllocatedMB /
(yarn.QueueMetrics.Queue=root.AllocatedMB +
yarn.QueueMetrics.Queue=root.AvailableMB)) * 100}
+}
+ ],
+ properties: {
+display_unit: %,
+graph_type: LINE,
+time_range: 1
+ }
+},
+{
+ widget_name: CPU Utilization,
+ description: Percentage of total virtual cores allocated to
containers running in the cluster.,
+ widget_type: GRAPH,
+ is_visible: true,
+ metrics: [
+{
+ name: yarn.QueueMetrics.Queue=root.AllocatedVCores,
+ metric_path: metrics/yarn/Queue/root/AllocatedVCores,
+ service_name: YARN,
+ component_name: RESOURCEMANAGER,
+ host_component_criteria:
host_components/HostRoles/ha_state=ACTIVE
+},
+{
+ name: yarn.QueueMetrics.Queue=root.AvailableVCores,
+ metric_path: metrics/yarn/Queue/root/AvailableVCores,
+ service_name: YARN,
+ component_name: RESOURCEMANAGER,
+ host_component_criteria:
host_components/HostRoles/ha_state=ACTIVE
+}
+ ],
+ values: [
+{
+ name: Total Allocatable CPU Utilized across NodeManager,
+ value: ${(yarn.QueueMetrics.Queue=root.AllocatedVCores /
(yarn.QueueMetrics.Queue=root.AllocatedVCores +
yarn.QueueMetrics.Queue=root.AvailableVCores)) * 100}
+}
+ ],
+ properties: {
+display_unit: %,
+graph_type: LINE,
+time_range: 1
+ }
+},
+{
+ widget_name: Bad Local Disks,
+ description: Number of unhealthy local disks across all
NodeManagers.,
+ widget_type: NUMBER,
+ is_visible: true,
+ metrics: [
+{
+ name: yarn.NodeManagerMetrics.BadLocalDirs,
+ metric_path: metrics/yarn/BadLocalDirs,
+ service_name: YARN,
+ component_name: NODEMANAGER
+},
+{
+ name: yarn.NodeManagerMetrics.BadLogDirs,
+ metric_path:
[2/2] ambari git commit: AMBARI-11777. Kerberos check failed on devdeploy (aonishuk)
AMBARI-11777. Kerberos check failed on devdeploy (aonishuk)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/4bd75792
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/4bd75792
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/4bd75792
Branch: refs/heads/branch-2.1
Commit: 4bd75792807cd358bef449f4c5aa5929e66d8c32
Parents: 9a38c3b
Author: Andrew Onishuk aonis...@hortonworks.com
Authored: Mon Jun 8 12:39:32 2015 +0300
Committer: Andrew Onishuk aonis...@hortonworks.com
Committed: Mon Jun 8 12:39:32 2015 +0300
--
ambari-agent/conf/unix/install-helper.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/4bd75792/ambari-agent/conf/unix/install-helper.sh
--
diff --git a/ambari-agent/conf/unix/install-helper.sh
b/ambari-agent/conf/unix/install-helper.sh
index 50bca1d..5552d3c 100644
--- a/ambari-agent/conf/unix/install-helper.sh
+++ b/ambari-agent/conf/unix/install-helper.sh
@@ -67,7 +67,7 @@ do_install(){
# which causes failures when hadoop users try to access tmp_dir
chmod a+x /var/lib/ambari-agent
chmod a+x /var/lib/ambari-agent/data
- chmod a+x /var/lib/ambari-agent/data/tmp
+ chmod 777 /var/lib/ambari-agent/data/tmp
}
do_remove(){
ambari git commit: AMBARI-11779 Customize Services - Config Group issues on the recommendations screen. (ababiichuk)
Repository: ambari
Updated Branches:
refs/heads/branch-2.1 75f183184 - 5e0ee82b1
AMBARI-11779 Customize Services - Config Group issues on the recommendations
screen. (ababiichuk)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/5e0ee82b
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/5e0ee82b
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/5e0ee82b
Branch: refs/heads/branch-2.1
Commit: 5e0ee82b11e388bf41f878176f37d0707567e7e8
Parents: 75f1831
Author: aBabiichuk ababiic...@cybervisiontech.com
Authored: Mon Jun 8 13:20:14 2015 +0300
Committer: aBabiichuk ababiic...@cybervisiontech.com
Committed: Mon Jun 8 13:22:00 2015 +0300
--
.../controllers/main/service/info/configs.js| 7 +-
.../app/controllers/wizard/step7_controller.js | 28 ++-
.../configs/stack_config_properties_mapper.js | 40
ambari-web/app/messages.js | 2 +
.../mixins/common/configs/enhanced_configs.js | 218 ---
.../service/configs/preload_requests_chain.js | 5 +
ambari-web/app/models/config_group.js | 7 +
.../models/configs/objects/service_config.js| 8 +-
ambari-web/app/models/stack_service.js | 7 +
.../templates/common/configs/service_config.hbs | 5 +
.../common/configs/services_config.hbs | 5 +
.../common/modal_popups/select_groups_popup.hbs | 4 +-
.../common/modal_popups/select_groups_popup.js | 85 ++--
.../main/service/info/config_test.js| 1 -
14 files changed, 260 insertions(+), 162 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/5e0ee82b/ambari-web/app/controllers/main/service/info/configs.js
--
diff --git a/ambari-web/app/controllers/main/service/info/configs.js
b/ambari-web/app/controllers/main/service/info/configs.js
index 5c3a27c..e1b8571 100644
--- a/ambari-web/app/controllers/main/service/info/configs.js
+++ b/ambari-web/app/controllers/main/service/info/configs.js
@@ -337,9 +337,9 @@ App.MainServiceInfoConfigsController =
Em.Controller.extend(App.ServerValidatorM
loadStep: function () {
console.log(TRACE: Loading configure for service);
var serviceName = this.get('content.serviceName');
+this.set('dependentServiceNames',
App.StackService.find(serviceName).get('dependentServiceNames'));
this.clearStep();
if (App.get('isClusterSupportsEnhancedConfigs')) {
- this.setDependentServices(serviceName);
this.loadConfigTheme(serviceName).always(function() {
App.themesMapper.generateAdvancedTabs([serviceName]);
});
@@ -830,6 +830,11 @@ App.MainServiceInfoConfigsController =
Em.Controller.extend(App.ServerValidatorM
var serviceNames = this.get('servicesToLoad');
serviceNames.forEach(function(serviceName) {
var serviceConfig = App.config.createServiceConfig(serviceName);
+ if (serviceName == this.get('content.serviceName')) {
+serviceConfig.set('configGroups', this.get('configGroups'));
+ } else {
+serviceConfig.set('configGroups',
this.get('dependentConfigGroups').filterProperty('serviceName', serviceName));
+ }
//Make SecondaryNameNode invisible on enabling namenode HA
var configsByService =
this.get('allConfigs').filterProperty('serviceName', serviceName);
databaseUtils.bootstrapDatabaseProperties(configsByService, serviceName);
http://git-wip-us.apache.org/repos/asf/ambari/blob/5e0ee82b/ambari-web/app/controllers/wizard/step7_controller.js
--
diff --git a/ambari-web/app/controllers/wizard/step7_controller.js
b/ambari-web/app/controllers/wizard/step7_controller.js
index 1bab581..b20bec0 100644
--- a/ambari-web/app/controllers/wizard/step7_controller.js
+++ b/ambari-web/app/controllers/wizard/step7_controller.js
@@ -667,11 +667,14 @@ App.WizardStep7Controller =
Em.Controller.extend(App.ServerValidatorMixin, App.E
}
}, this);
//STEP 6: Distribute configs by service and wrap each one in
App.ServiceConfigProperty (configs - serviceConfigs)
-var self = this;
-if (self.get('securityEnabled') self.get('wizardController.name') ==
'addServiceController') {
- self.addKerberosDescriptorConfigs(configs,
self.get('wizardController.kerberosDescriptorConfigs') || []);
+if (this.get('securityEnabled') self.get('wizardController.name') ==
'addServiceController') {
+ this.addKerberosDescriptorConfigs(configs,
self.get('wizardController.kerberosDescriptorConfigs') || []);
}
-self.setStepConfigs(configs, storedConfigs);
+this.setStepConfigs(configs, storedConfigs);
+this.checkHostOverrideInstaller();
+this.activateSpecialConfigs();
+
ambari git commit: AMBARI-11723 Configs: comparing versions does not show new props after Ambari Upgrade. (atkach)
Repository: ambari
Updated Branches:
refs/heads/branch-2.1 60f1b553b - 9a38c3b3f
AMBARI-11723 Configs: comparing versions does not show new props after Ambari
Upgrade. (atkach)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/9a38c3b3
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/9a38c3b3
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/9a38c3b3
Branch: refs/heads/branch-2.1
Commit: 9a38c3b3f8983016e1e5d0cb7af42817561a9ab7
Parents: 60f1b55
Author: Andrii Tkach atk...@hortonworks.com
Authored: Fri Jun 5 16:26:05 2015 +0300
Committer: Andrii Tkach atk...@hortonworks.com
Committed: Mon Jun 8 12:23:53 2015 +0300
--
ambari-web/app/controllers/main/service/info/configs.js | 4 +++-
.../test/controllers/main/service/info/config_test.js| 11 ---
2 files changed, 11 insertions(+), 4 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/9a38c3b3/ambari-web/app/controllers/main/service/info/configs.js
--
diff --git a/ambari-web/app/controllers/main/service/info/configs.js
b/ambari-web/app/controllers/main/service/info/configs.js
index f809c64..5c3a27c 100644
--- a/ambari-web/app/controllers/main/service/info/configs.js
+++ b/ambari-web/app/controllers/main/service/info/configs.js
@@ -677,6 +677,7 @@ App.MainServiceInfoConfigsController =
Em.Controller.extend(App.ServerValidatorM
*/
setCompareDefaultGroupConfig: function (serviceConfig, compareConfig) {
var compareObject = {};
+var isEmptyProp = App.isEmptyObject(serviceConfig);
serviceConfig.compareConfigs = [];
serviceConfig.isComparison = true;
@@ -686,7 +687,8 @@ App.MainServiceInfoConfigsController =
Em.Controller.extend(App.ServerValidatorM
compareObject = this.getComparisonConfig(serviceConfig, compareConfig);
serviceConfig.hasCompareDiffs = serviceConfig.isMock ||
this.hasCompareDiffs(serviceConfig, compareObject);
serviceConfig.compareConfigs.push(compareObject);
-} else if (serviceConfig.isUserProperty) {
+// user custom property or property that was added during upgrade
+} else if (serviceConfig.isUserProperty || (!isEmptyProp !compareConfig
Em.get(serviceConfig, 'isRequiredByAgent') !== false)) {
serviceConfig.compareConfigs.push(this.getMockComparisonConfig(serviceConfig,
this.get('compareServiceVersion.version')));
serviceConfig.hasCompareDiffs = true;
}
http://git-wip-us.apache.org/repos/asf/ambari/blob/9a38c3b3/ambari-web/test/controllers/main/service/info/config_test.js
--
diff --git a/ambari-web/test/controllers/main/service/info/config_test.js
b/ambari-web/test/controllers/main/service/info/config_test.js
index defdaf0..df62723 100644
--- a/ambari-web/test/controllers/main/service/info/config_test.js
+++ b/ambari-web/test/controllers/main/service/info/config_test.js
@@ -946,10 +946,10 @@ describe(App.MainServiceInfoConfigsController, function
() {
mainServiceInfoConfigsController.getMockComparisonConfig.restore();
mainServiceInfoConfigsController.hasCompareDiffs.restore();
});
-it(expect that setCompareDefaultGroupConfig will not run anything,
function() {
+it(empty service config passed, expect that setCompareDefaultGroupConfig
will not run anything, function() {
expect(mainServiceInfoConfigsController.setCompareDefaultGroupConfig({}).compareConfigs.length).to.equal(0);
});
-it(expect that setCompareDefaultGroupConfig will not run anything,
function() {
+it(empty service config and comparison passed, expect that
setCompareDefaultGroupConfig will not run anything, function() {
expect(mainServiceInfoConfigsController.setCompareDefaultGroupConfig({},{}).compareConfigs.length).to.equal(0);
});
it(expect that serviceConfig.compareConfigs will be
getMockComparisonConfig, function() {
@@ -964,7 +964,12 @@ describe(App.MainServiceInfoConfigsController, function
() {
it(expect that serviceConfig.compareConfigs will be getComparisonConfig,
function() {
expect(mainServiceInfoConfigsController.setCompareDefaultGroupConfig({isReconfigurable:
true, isMock: true}, {})).to.eql({compareConfigs: [compConfig],
isReconfigurable: true, isMock: true, isComparison: true, hasCompareDiffs:
true});
});
-
+it(property was created during upgrade and have no comparison, compare
with 'Undefined' value should be created, function() {
+
expect(mainServiceInfoConfigsController.setCompareDefaultGroupConfig({name:
'prop1', isUserProperty: false}, null)).to.eql({
+name: 'prop1', isUserProperty: false, compareConfigs: [mockConfig],
+isComparison: true, hasCompareDiffs: true
+
ambari git commit: AMBARI-11774 - Views : NPE accessing view that includes velocity. (tbeerbower)
Repository: ambari
Updated Branches:
refs/heads/branch-2.1 c8bfa4e8d - a34b112f9
AMBARI-11774 - Views : NPE accessing view that includes velocity. (tbeerbower)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/a34b112f
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/a34b112f
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/a34b112f
Branch: refs/heads/branch-2.1
Commit: a34b112f966502c285e3ef7d721f1fd5c6106818
Parents: c8bfa4e
Author: tbeerbower tbeerbo...@hortonworks.com
Authored: Mon Jun 8 06:00:55 2015 -0400
Committer: tbeerbower tbeerbo...@hortonworks.com
Committed: Mon Jun 8 10:07:45 2015 -0400
--
.../java/org/apache/ambari/server/view/ViewClassLoader.java| 1 +
.../org/apache/ambari/server/view/ViewClassLoaderTest.java | 6 ++
2 files changed, 7 insertions(+)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/a34b112f/ambari-server/src/main/java/org/apache/ambari/server/view/ViewClassLoader.java
--
diff --git
a/ambari-server/src/main/java/org/apache/ambari/server/view/ViewClassLoader.java
b/ambari-server/src/main/java/org/apache/ambari/server/view/ViewClassLoader.java
index c90bcaa..692f728 100644
---
a/ambari-server/src/main/java/org/apache/ambari/server/view/ViewClassLoader.java
+++
b/ambari-server/src/main/java/org/apache/ambari/server/view/ViewClassLoader.java
@@ -81,6 +81,7 @@ public class ViewClassLoader extends WebAppClassLoader {
// add as system classes to avoid conflicts and linkage errors
webAppContext.addSystemClass(org.slf4j.);
webAppContext.addSystemClass(com.sun.jersey.);
+webAppContext.addSystemClass(org.apache.velocity.);
// set the class loader settings from the configuration
if (viewConfig != null) {
http://git-wip-us.apache.org/repos/asf/ambari/blob/a34b112f/ambari-server/src/test/java/org/apache/ambari/server/view/ViewClassLoaderTest.java
--
diff --git
a/ambari-server/src/test/java/org/apache/ambari/server/view/ViewClassLoaderTest.java
b/ambari-server/src/test/java/org/apache/ambari/server/view/ViewClassLoaderTest.java
index f831989..d2f0c8f 100644
---
a/ambari-server/src/test/java/org/apache/ambari/server/view/ViewClassLoaderTest.java
+++
b/ambari-server/src/test/java/org/apache/ambari/server/view/ViewClassLoaderTest.java
@@ -80,6 +80,7 @@ public class ViewClassLoaderTest {
expect(parentClassLoader.loadClass(com.google.inject.AbstractModule)).andReturn(parentClass).once();
expect(parentClassLoader.loadClass(org.slf4j.LoggerFactory)).andReturn(parentClass).once();
expect(parentClassLoader.loadClass(com.sun.jersey.api.ConflictException)).andReturn(parentClass).once();
+
expect(parentClassLoader.loadClass(org.apache.velocity.VelocityContext)).andReturn(parentClass).once();
replay(parentClassLoader, viewConfig);
@@ -126,6 +127,11 @@ public class ViewClassLoaderTest {
Assert.assertNotNull(clazz);
Assert.assertSame(parentClass, clazz);
+clazz = classLoader.loadClass(org.apache.velocity.VelocityContext);
+
+Assert.assertNotNull(clazz);
+Assert.assertSame(parentClass, clazz);
+
verify(parentClassLoader, viewConfig);
}
ambari git commit: AMBARI-11730. When adding one host, the UI seems to be sending a request to add lot more (alexantonenko)
Repository: ambari
Updated Branches:
refs/heads/branch-2.1 1db33d21f - 5fb13c9ad
AMBARI-11730. When adding one host, the UI seems to be sending a request to add
lot more (alexantonenko)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/5fb13c9a
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/5fb13c9a
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/5fb13c9a
Branch: refs/heads/branch-2.1
Commit: 5fb13c9ad29b71827cfa39de2141f4bbc20c55aa
Parents: 1db33d2
Author: Alex Antonenko hiv...@gmail.com
Authored: Mon Jun 8 16:22:22 2015 +0300
Committer: Alex Antonenko hiv...@gmail.com
Committed: Mon Jun 8 16:24:06 2015 +0300
--
.../app/controllers/wizard/step3_controller.js| 18 --
1 file changed, 16 insertions(+), 2 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/5fb13c9a/ambari-web/app/controllers/wizard/step3_controller.js
--
diff --git a/ambari-web/app/controllers/wizard/step3_controller.js
b/ambari-web/app/controllers/wizard/step3_controller.js
index 8f89920..52c52ac 100644
--- a/ambari-web/app/controllers/wizard/step3_controller.js
+++ b/ambari-web/app/controllers/wizard/step3_controller.js
@@ -230,7 +230,7 @@ App.WizardStep3Controller =
Em.Controller.extend(App.ReloadPopupMixin, {
var bootStrapData = JSON.stringify({
'verbose': true,
'sshKey': this.get('content.installOptions.sshKey'),
-'hosts': Em.keys(this.get('content.hosts')),
+'hosts': this.getBootstrapHosts(),
'user': this.get('content.installOptions.sshUser'),
'userRunAs': App.get('supports.customizeAgentUserAccount') ?
this.get('content.installOptions.agentUser') : 'root'
});
@@ -245,6 +245,20 @@ App.WizardStep3Controller =
Em.Controller.extend(App.ReloadPopupMixin, {
});
},
+ getBootstrapHosts: function () {
+var hosts = this.get('content.hosts');
+var bootstrapHosts = [];
+for (var host in hosts) {
+ if (hosts.hasOwnProperty(host)) {
+if (!hosts[host].isInstalled) {
+ bootstrapHosts.push(host);
+}
+ }
+}
+
+return bootstrapHosts;
+ },
+
/**
* Make basic init steps
* @method loadStep
@@ -870,7 +884,7 @@ App.WizardStep3Controller =
Em.Controller.extend(App.ReloadPopupMixin, {
});
},
-
+
startHostcheck: function() {
this.set('isWarningsLoaded', false);
this.getHostNameResolution();
ambari git commit: AMBARI-11784. Perf Cluster: Save configurations of Config Group takes 40s. (mpapirkovskyy)
Repository: ambari
Updated Branches:
refs/heads/branch-2.1 5fb13c9ad - 64bc2473b
AMBARI-11784. Perf Cluster: Save configurations of Config Group takes 40s.
(mpapirkovskyy)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/64bc2473
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/64bc2473
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/64bc2473
Branch: refs/heads/branch-2.1
Commit: 64bc2473bf38a1e4e0a3dfd1b97ec1f91d5e285d
Parents: 5fb13c9
Author: Myroslav Papirkovskyy mpapyrkovs...@hortonworks.com
Authored: Tue Jun 2 23:23:00 2015 +0300
Committer: Myroslav Papirkovskyy mpapyrkovs...@hortonworks.com
Committed: Wed Jun 3 00:17:26 2015 +0300
--
.../internal/ConfigGroupResourceProvider.java | 4 +-
.../orm/dao/ConfigGroupHostMappingDAO.java | 53
.../state/configgroup/ConfigGroupImpl.java | 10 ++--
.../ConfigGroupResourceProviderTest.java| 12 +++--
4 files changed, 47 insertions(+), 32 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/64bc2473/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ConfigGroupResourceProvider.java
--
diff --git
a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ConfigGroupResourceProvider.java
b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ConfigGroupResourceProvider.java
index 2bbb9e7..30bcc86 100644
---
a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ConfigGroupResourceProvider.java
+++
b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ConfigGroupResourceProvider.java
@@ -582,8 +582,8 @@ public class ConfigGroupResourceProvider extends
if (request.getHosts() != null !request.getHosts().isEmpty()) {
for (String hostname : request.getHosts()) {
Host host = clusters.getHost(hostname);
- HostEntity hostEntity = hostDAO.findByName(hostname);
- if (host == null || hostEntity == null) {
+ HostEntity hostEntity = hostDAO.findById(host.getHostId());
+ if (hostEntity == null) {
throw new HostNotFoundException(hostname);
}
hosts.put(hostEntity.getHostId(), host);
http://git-wip-us.apache.org/repos/asf/ambari/blob/64bc2473/ambari-server/src/main/java/org/apache/ambari/server/orm/dao/ConfigGroupHostMappingDAO.java
--
diff --git
a/ambari-server/src/main/java/org/apache/ambari/server/orm/dao/ConfigGroupHostMappingDAO.java
b/ambari-server/src/main/java/org/apache/ambari/server/orm/dao/ConfigGroupHostMappingDAO.java
index 4628a4c..71d93cc 100644
---
a/ambari-server/src/main/java/org/apache/ambari/server/orm/dao/ConfigGroupHostMappingDAO.java
+++
b/ambari-server/src/main/java/org/apache/ambari/server/orm/dao/ConfigGroupHostMappingDAO.java
@@ -22,6 +22,7 @@ import com.google.inject.Provider;
import com.google.inject.Singleton;
import com.google.inject.persist.Transactional;
+import org.apache.ambari.server.AmbariException;
import org.apache.ambari.server.orm.RequiresSession;
import org.apache.ambari.server.orm.cache.ConfigGroupHostMapping;
import org.apache.ambari.server.orm.cache.ConfigGroupHostMappingImpl;
@@ -30,6 +31,7 @@ import
org.apache.ambari.server.orm.entities.ConfigGroupHostMappingEntity;
import org.apache.ambari.server.orm.entities.ConfigGroupHostMappingEntityPK;
import org.apache.ambari.server.orm.entities.HostEntity;
import org.apache.ambari.server.state.Cluster;
+import org.apache.ambari.server.state.Clusters;
import org.apache.ambari.server.state.Host;
import org.apache.ambari.server.state.cluster.ClusterFactory;
import org.apache.ambari.server.state.configgroup.ConfigGroup;
@@ -45,7 +47,7 @@ import java.util.HashSet;
import java.util.List;
import java.util.Map;
import java.util.Set;
-import java.util.WeakHashMap;
+import java.util.HashMap;
import java.util.concurrent.locks.ReadWriteLock;
import java.util.concurrent.locks.ReentrantReadWriteLock;
@@ -61,6 +63,8 @@ public class ConfigGroupHostMappingDAO {
private ClusterFactory clusterFactory;
@Inject
private HostFactory hostFactory;
+ @Inject
+ Clusters clusters;
private final ReadWriteLock gl = new ReentrantReadWriteLock();
@@ -74,33 +78,35 @@ public class ConfigGroupHostMappingDAO {
if (!cacheLoaded) {
gl.writeLock().lock();
try {
-if (configGroupHostMappingByHost == null) {
- configGroupHostMappingByHost = new WeakHashMapLong,
SetConfigGroupHostMapping();
-
- TypedQueryConfigGroupHostMappingEntity query =
entityManagerProvider.get().createQuery(
- SELECT entity
ambari git commit: AMBARI-11786 Configs: yarn is modifying scheduler. (ababiichuk)
Repository: ambari
Updated Branches:
refs/heads/trunk f3e633ce2 - 0eeac02e0
AMBARI-11786 Configs: yarn is modifying scheduler. (ababiichuk)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/0eeac02e
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/0eeac02e
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/0eeac02e
Branch: refs/heads/trunk
Commit: 0eeac02e0aa545b344eadcb7a0bf9bc40dfbb2b7
Parents: f3e633c
Author: aBabiichuk ababiic...@cybervisiontech.com
Authored: Mon Jun 8 13:20:14 2015 +0300
Committer: aBabiichuk ababiic...@cybervisiontech.com
Committed: Mon Jun 8 16:13:25 2015 +0300
--
.../app/controllers/main/service/info/configs.js | 14 +-
1 file changed, 13 insertions(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/0eeac02e/ambari-web/app/controllers/main/service/info/configs.js
--
diff --git a/ambari-web/app/controllers/main/service/info/configs.js
b/ambari-web/app/controllers/main/service/info/configs.js
index e1b8571..59e03ef 100644
--- a/ambari-web/app/controllers/main/service/info/configs.js
+++ b/ambari-web/app/controllers/main/service/info/configs.js
@@ -540,10 +540,22 @@ App.MainServiceInfoConfigsController =
Em.Controller.extend(App.ServerValidatorM
json.items.forEach(function (item) {
item.configurations.forEach(function (configuration) {
if (serviceName == 'YARN' configuration.type ==
'capacity-scheduler') {
+ var configsToSkip =
this.get('advancedConfigs').filterProperty('filename',
'capacity-scheduler.xml').filterProperty('subSection').mapProperty('name');
// put all properties in a single textarea for capacity-scheduler
var value = '';
for (var prop in configuration.properties) {
-value += prop + '=' + configuration.properties[prop] + '\n';
+if (configsToSkip.contains(prop)) {
+ serviceVersionMap[item.service_config_version][prop + '-' +
configuration.type] = {
+name: prop,
+value: configuration.properties[prop],
+type: configuration.type,
+tag: configuration.tag,
+version: configuration.version,
+service_config_version: item.service_config_version
+ };
+} else {
+ value += prop + '=' + configuration.properties[prop] + '\n';
+}
}
serviceVersionMap[item.service_config_version][configuration.type +
'-' + configuration.type] = {
name: configuration.type,
ambari git commit: AMBARI-11730. When adding one host, the UI seems to be sending a request to add lot more (alexantonenko)
Repository: ambari
Updated Branches:
refs/heads/trunk 3602b5835 - ef9e122df
AMBARI-11730. When adding one host, the UI seems to be sending a request to add
lot more (alexantonenko)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/ef9e122d
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/ef9e122d
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/ef9e122d
Branch: refs/heads/trunk
Commit: ef9e122df72e1b1c7303b988649484c4ab165b65
Parents: 3602b58
Author: Alex Antonenko hiv...@gmail.com
Authored: Mon Jun 8 16:22:22 2015 +0300
Committer: Alex Antonenko hiv...@gmail.com
Committed: Mon Jun 8 16:22:32 2015 +0300
--
.../app/controllers/wizard/step3_controller.js| 18 --
1 file changed, 16 insertions(+), 2 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/ef9e122d/ambari-web/app/controllers/wizard/step3_controller.js
--
diff --git a/ambari-web/app/controllers/wizard/step3_controller.js
b/ambari-web/app/controllers/wizard/step3_controller.js
index 8f89920..52c52ac 100644
--- a/ambari-web/app/controllers/wizard/step3_controller.js
+++ b/ambari-web/app/controllers/wizard/step3_controller.js
@@ -230,7 +230,7 @@ App.WizardStep3Controller =
Em.Controller.extend(App.ReloadPopupMixin, {
var bootStrapData = JSON.stringify({
'verbose': true,
'sshKey': this.get('content.installOptions.sshKey'),
-'hosts': Em.keys(this.get('content.hosts')),
+'hosts': this.getBootstrapHosts(),
'user': this.get('content.installOptions.sshUser'),
'userRunAs': App.get('supports.customizeAgentUserAccount') ?
this.get('content.installOptions.agentUser') : 'root'
});
@@ -245,6 +245,20 @@ App.WizardStep3Controller =
Em.Controller.extend(App.ReloadPopupMixin, {
});
},
+ getBootstrapHosts: function () {
+var hosts = this.get('content.hosts');
+var bootstrapHosts = [];
+for (var host in hosts) {
+ if (hosts.hasOwnProperty(host)) {
+if (!hosts[host].isInstalled) {
+ bootstrapHosts.push(host);
+}
+ }
+}
+
+return bootstrapHosts;
+ },
+
/**
* Make basic init steps
* @method loadStep
@@ -870,7 +884,7 @@ App.WizardStep3Controller =
Em.Controller.extend(App.ReloadPopupMixin, {
});
},
-
+
startHostcheck: function() {
this.set('isWarningsLoaded', false);
this.getHostNameResolution();
[1/2] ambari git commit: AMBARI-11128. Add EWMA to yarn log4j appenders in Dal (dlysnichenko)
Repository: ambari
Updated Branches:
refs/heads/branch-2.1 5e0ee82b1 - 226c791c1
refs/heads/trunk 7b41d3114 - efe8ee6a0
AMBARI-11128. Add EWMA to yarn log4j appenders in Dal (dlysnichenko)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/efe8ee6a
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/efe8ee6a
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/efe8ee6a
Branch: refs/heads/trunk
Commit: efe8ee6a0a3bbc253abb3a3a2afd6e879a39a4dc
Parents: 7b41d31
Author: Lisnichenko Dmitro dlysniche...@hortonworks.com
Authored: Mon Jun 8 14:57:10 2015 +0300
Committer: Lisnichenko Dmitro dlysniche...@hortonworks.com
Committed: Mon Jun 8 14:57:10 2015 +0300
--
.../services/YARN/configuration/yarn-env.xml| 1 +
.../services/YARN/configuration/yarn-log4j.xml | 80
2 files changed, 81 insertions(+)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/efe8ee6a/ambari-server/src/main/resources/stacks/HDP/2.3/services/YARN/configuration/yarn-env.xml
--
diff --git
a/ambari-server/src/main/resources/stacks/HDP/2.3/services/YARN/configuration/yarn-env.xml
b/ambari-server/src/main/resources/stacks/HDP/2.3/services/YARN/configuration/yarn-env.xml
index 3f41771..90dd108 100644
---
a/ambari-server/src/main/resources/stacks/HDP/2.3/services/YARN/configuration/yarn-env.xml
+++
b/ambari-server/src/main/resources/stacks/HDP/2.3/services/YARN/configuration/yarn-env.xml
@@ -35,6 +35,7 @@
export YARN_PID_DIR={{yarn_pid_dir_prefix}}/$USER
export HADOOP_LIBEXEC_DIR={{hadoop_libexec_dir}}
export JAVA_HOME={{java64_home}}
+ export YARN_ROOT_LOGGER=${YARN_ROOT_LOGGER:-INFO,EWMA,RFA}
# User for YARN daemons
export HADOOP_YARN_USER=${HADOOP_YARN_USER:-yarn}
http://git-wip-us.apache.org/repos/asf/ambari/blob/efe8ee6a/ambari-server/src/main/resources/stacks/HDP/2.3/services/YARN/configuration/yarn-log4j.xml
--
diff --git
a/ambari-server/src/main/resources/stacks/HDP/2.3/services/YARN/configuration/yarn-log4j.xml
b/ambari-server/src/main/resources/stacks/HDP/2.3/services/YARN/configuration/yarn-log4j.xml
new file mode 100644
index 000..28a4836
--- /dev/null
+++
b/ambari-server/src/main/resources/stacks/HDP/2.3/services/YARN/configuration/yarn-log4j.xml
@@ -0,0 +1,80 @@
+?xml version=1.0?
+?xml-stylesheet type=text/xsl href=configuration.xsl?
+!--
+/**
+ * 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.
+ */
+--
+
+configuration supports_final=false
+
+ property
+namecontent/name
+descriptionCustom log4j.properties/description
+value
+#Relative to Yarn Log Dir Prefix
+yarn.log.dir=.
+#
+# Job Summary Appender
+#
+# Use following logger to send summary to separate file defined by
+# hadoop.mapreduce.jobsummary.log.file rolled daily:
+# hadoop.mapreduce.jobsummary.logger=INFO,JSA
+#
+hadoop.mapreduce.jobsummary.logger=${hadoop.root.logger}
+hadoop.mapreduce.jobsummary.log.file=hadoop-mapreduce.jobsummary.log
+log4j.appender.JSA=org.apache.log4j.DailyRollingFileAppender
+# Set the ResourceManager summary log filename
+yarn.server.resourcemanager.appsummary.log.file=hadoop-mapreduce.jobsummary.log
+# Set the ResourceManager summary log level and appender
+yarn.server.resourcemanager.appsummary.logger=${hadoop.root.logger}
+#yarn.server.resourcemanager.appsummary.logger=INFO,RMSUMMARY
+
+# To enable AppSummaryLogging for the RM,
+# set yarn.server.resourcemanager.appsummary.logger to
+# LEVEL,RMSUMMARY in hadoop-env.sh
+
+# Appender for ResourceManager Application Summary Log
+# Requires the following properties to be set
+#- hadoop.log.dir (Hadoop Log directory)
+#- yarn.server.resourcemanager.appsummary.log.file (resource manager app
summary log filename)
+#- yarn.server.resourcemanager.appsummary.logger (resource manager app
summary log level and appender)
+log4j.appender.RMSUMMARY=org.apache.log4j.RollingFileAppender
ambari git commit: AMBARI-11781 Perf: Combine metrics requests on UI Host page. (atkach)
Repository: ambari
Updated Branches:
refs/heads/branch-2.1 6fdb2ea76 - 09b2d28e2
AMBARI-11781 Perf: Combine metrics requests on UI Host page. (atkach)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/09b2d28e
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/09b2d28e
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/09b2d28e
Branch: refs/heads/branch-2.1
Commit: 09b2d28e204c0a6039527659d8e145dcc229bfa9
Parents: 6fdb2ea
Author: Andrii Tkach atk...@hortonworks.com
Authored: Mon Jun 8 14:18:03 2015 +0300
Committer: Andrii Tkach atk...@hortonworks.com
Committed: Mon Jun 8 15:40:24 2015 +0300
--
ambari-web/app/utils/ajax/ajax.js | 9 ++
.../app/views/common/chart/linear_time.js | 156 ++-
ambari-web/app/views/main/host/metrics/cpu.js | 5 +
ambari-web/app/views/main/host/metrics/disk.js | 5 +
ambari-web/app/views/main/host/metrics/load.js | 5 +
.../app/views/main/host/metrics/memory.js | 11 ++
.../app/views/main/host/metrics/network.js | 10 ++
.../app/views/main/host/metrics/processes.js| 5 +
.../ambari_metrics/master_average_load.js | 5 +
.../regionserver_block_cache_hit_percent.js | 5 +
.../regionserver_compaction_queue_size.js | 5 +
.../ambari_metrics/regionserver_regions.js | 5 +
.../ambari_metrics/regionserver_requests.js | 5 +
.../ambari_metrics/regionserver_store_files.js | 6 +
.../app/views/main/service/info/summary.js | 3 -
.../test/views/common/chart/linear_time_test.js | 118 ++
16 files changed, 347 insertions(+), 11 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/09b2d28e/ambari-web/app/utils/ajax/ajax.js
--
diff --git a/ambari-web/app/utils/ajax/ajax.js
b/ambari-web/app/utils/ajax/ajax.js
index 3d432fa..3b71219 100644
--- a/ambari-web/app/utils/ajax/ajax.js
+++ b/ambari-web/app/utils/ajax/ajax.js
@@ -994,6 +994,11 @@ var urls = {
'mock':
'/data/services/metrics/ambari_metrics/regionserver_compaction_queue_size.json',
'testInProduction': true
},
+ 'service.metrics.ambari_metrics.aggregated': {
+'real':
'/clusters/{clusterName}/services/AMBARI_METRICS/components/METRICS_COLLECTOR?fields={fields}',
+'mock': '/data/services/metrics/ambari_metrics/master_average_load.json',
+'testInProduction': true
+ },
'service.metrics.hdfs.block_status': {
'real':
'/clusters/{clusterName}/hosts/{nameNodeName}/host_components/NAMENODE?fields=metrics/dfs/FSNamesystem/PendingReplicationBlocks[{fromSeconds},{toSeconds},{stepSeconds}],metrics/dfs/FSNamesystem/UnderReplicatedBlocks[{fromSeconds},{toSeconds},{stepSeconds}]',
'mock': '/data/services/metrics/hdfs/block_status.json',
@@ -1146,6 +1151,10 @@ var urls = {
'mock': '/data/cluster_metrics/network_1hr.json',
'testInProduction': true
},
+ 'host.metrics.aggregated': {
+'real': '/clusters/{clusterName}/hosts/{hostName}?fields={fields}',
+'mock': '/data/hosts/metrics/cpu.json'
+ },
'host.metrics.cpu': {
'real':
'/clusters/{clusterName}/hosts/{hostName}?fields=metrics/cpu/cpu_user[{fromSeconds},{toSeconds},{stepSeconds}],metrics/cpu/cpu_wio[{fromSeconds},{toSeconds},{stepSeconds}],metrics/cpu/cpu_nice[{fromSeconds},{toSeconds},{stepSeconds}],metrics/cpu/cpu_aidle[{fromSeconds},{toSeconds},{stepSeconds}],metrics/cpu/cpu_system[{fromSeconds},{toSeconds},{stepSeconds}],metrics/cpu/cpu_idle[{fromSeconds},{toSeconds},{stepSeconds}]',
'mock': '/data/hosts/metrics/cpu.json',
http://git-wip-us.apache.org/repos/asf/ambari/blob/09b2d28e/ambari-web/app/views/common/chart/linear_time.js
--
diff --git a/ambari-web/app/views/common/chart/linear_time.js
b/ambari-web/app/views/common/chart/linear_time.js
index 7737700..05a33a4 100644
--- a/ambari-web/app/views/common/chart/linear_time.js
+++ b/ambari-web/app/views/common/chart/linear_time.js
@@ -169,13 +169,17 @@ App.ChartLinearTimeView = Ember.View.extend({
},
loadData: function() {
-App.ajax.send({
- name: this.get('ajaxIndex'),
- sender: this,
- data: this.getDataForAjaxRequest(),
- success: '_refreshGraph',
- error: 'loadDataErrorCallback'
-});
+if (this.get('loadGroup')) {
+ App.ChartLinearTimeView.LoadAggregator.add(this, this.get('loadGroup'));
+} else {
+ App.ajax.send({
+name: this.get('ajaxIndex'),
+sender: this,
+data: this.getDataForAjaxRequest(),
+success: '_refreshGraph',
+error: 'loadDataErrorCallback'
+ });
+}
},
getDataForAjaxRequest: function() {
@@ -1030,4 +1034,140 @@
ambari git commit: AMBARI-11719. Pig View should support NN HA Cluster Association. (Erik Bergenholtz via rlevas)
Repository: ambari
Updated Branches:
refs/heads/branch-2.1 b1204c98c - 1db33d21f
AMBARI-11719. Pig View should support NN HA Cluster Association. (Erik
Bergenholtz via rlevas)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/1db33d21
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/1db33d21
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/1db33d21
Branch: refs/heads/branch-2.1
Commit: 1db33d21feb7efe222030e3d1e869cccac1e61dd
Parents: b1204c9
Author: Erik Bergenholtz ebergenho...@hortonworks.com
Authored: Mon Jun 8 09:20:46 2015 -0400
Committer: Robert Levas rle...@hortonworks.com
Committed: Mon Jun 8 09:20:55 2015 -0400
--
contrib/views/pig/pom.xml | 12 +-
.../ambari/view/pig/PropertyValidator.java | 114 ++
.../view/pig/resources/files/FileService.java | 4 +-
.../pig/resources/jobs/JobResourceManager.java | 103 ++---
.../scripts/ScriptResourceManager.java | 5 +-
.../ambari/view/pig/services/BaseService.java | 19 +-
.../view/pig/templeton/client/TempletonApi.java | 5 +-
.../templeton/client/TempletonApiFactory.java | 56 +++
.../ambari/view/pig/utils/FilePaginator.java| 9 +-
.../apache/ambari/view/pig/utils/HdfsApi.java | 393 ---
.../pig/utils/ServiceFormattedException.java| 46 ++-
.../ambari/view/pig/utils/UserLocalObjects.java | 81
.../resources/ui/pig-web/app/styles/style.less | 20 +-
contrib/views/pig/src/main/resources/view.xml | 91 -
.../org/apache/ambari/view/pig/BasePigTest.java | 3 +-
.../apache/ambari/view/pig/test/FileTest.java | 4 +-
.../apache/ambari/view/pig/test/HelpTest.java | 6 +-
.../ambari/view/pig/test/IntegrationalTest.java | 37 +-
.../apache/ambari/view/pig/test/JobTest.java| 81 ++--
.../apache/ambari/view/pig/test/ScriptTest.java | 7 +-
.../view/pig/test/ScriptTestHDFSUnmanaged.java | 12 +-
.../view/pig/test/ScriptTestUnmanaged.java | 10 +-
22 files changed, 521 insertions(+), 597 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/1db33d21/contrib/views/pig/pom.xml
--
diff --git a/contrib/views/pig/pom.xml b/contrib/views/pig/pom.xml
index 4bbc1c3..2a8dcc9 100644
--- a/contrib/views/pig/pom.xml
+++ b/contrib/views/pig/pom.xml
@@ -19,7 +19,7 @@
modelVersion4.0.0/modelVersion
groupIdorg.apache.ambari.contrib.views/groupId
artifactIdpig/artifactId
- version0.1.0-SNAPSHOT/version
+ version1.0.0-SNAPSHOT/version
namePig/name
parent
@@ -113,6 +113,16 @@
version${hadoop-version}/version
scopetest/scope
/dependency
+dependency
+ groupIdcommons-validator/groupId
+ artifactIdcommons-validator/artifactId
+ version1.4.0/version
+/dependency
+dependency
+ groupIdorg.apache.ambari.contrib.views/groupId
+ artifactIdambari-views-utils/artifactId
+ version0.0.1-SNAPSHOT/version
+/dependency
/dependencies
properties
http://git-wip-us.apache.org/repos/asf/ambari/blob/1db33d21/contrib/views/pig/src/main/java/org/apache/ambari/view/pig/PropertyValidator.java
--
diff --git
a/contrib/views/pig/src/main/java/org/apache/ambari/view/pig/PropertyValidator.java
b/contrib/views/pig/src/main/java/org/apache/ambari/view/pig/PropertyValidator.java
new file mode 100644
index 000..c36561f
--- /dev/null
+++
b/contrib/views/pig/src/main/java/org/apache/ambari/view/pig/PropertyValidator.java
@@ -0,0 +1,114 @@
+/**
+ * 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.view.pig;
+
+import org.apache.ambari.view.ViewInstanceDefinition;
+import org.apache.ambari.view.validation.ValidationResult;
+import org.apache.ambari.view.validation.Validator;
+import org.apache.commons.validator.routines.RegexValidator;
+import org.apache.commons.validator.routines.UrlValidator;
+
+public class PropertyValidator implements Validator {
+
ambari git commit: AMBARI-11784. Perf Cluster: Save configurations of Config Group takes 40s. (mpapirkovskyy)
Repository: ambari
Updated Branches:
refs/heads/trunk 73229f26e - 590a2e249
AMBARI-11784. Perf Cluster: Save configurations of Config Group takes 40s.
(mpapirkovskyy)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/590a2e24
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/590a2e24
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/590a2e24
Branch: refs/heads/trunk
Commit: 590a2e249c24d64d5864a24846436adc7575b72c
Parents: 73229f2
Author: Myroslav Papirkovskyy mpapyrkovs...@hortonworks.com
Authored: Tue Jun 2 23:23:00 2015 +0300
Committer: Myroslav Papirkovskyy mpapyrkovs...@hortonworks.com
Committed: Wed Jun 3 00:18:14 2015 +0300
--
.../internal/ConfigGroupResourceProvider.java | 4 +-
.../orm/dao/ConfigGroupHostMappingDAO.java | 53
.../state/configgroup/ConfigGroupImpl.java | 10 ++--
.../ConfigGroupResourceProviderTest.java| 12 +++--
4 files changed, 47 insertions(+), 32 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/590a2e24/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ConfigGroupResourceProvider.java
--
diff --git
a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ConfigGroupResourceProvider.java
b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ConfigGroupResourceProvider.java
index 2bbb9e7..30bcc86 100644
---
a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ConfigGroupResourceProvider.java
+++
b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ConfigGroupResourceProvider.java
@@ -582,8 +582,8 @@ public class ConfigGroupResourceProvider extends
if (request.getHosts() != null !request.getHosts().isEmpty()) {
for (String hostname : request.getHosts()) {
Host host = clusters.getHost(hostname);
- HostEntity hostEntity = hostDAO.findByName(hostname);
- if (host == null || hostEntity == null) {
+ HostEntity hostEntity = hostDAO.findById(host.getHostId());
+ if (hostEntity == null) {
throw new HostNotFoundException(hostname);
}
hosts.put(hostEntity.getHostId(), host);
http://git-wip-us.apache.org/repos/asf/ambari/blob/590a2e24/ambari-server/src/main/java/org/apache/ambari/server/orm/dao/ConfigGroupHostMappingDAO.java
--
diff --git
a/ambari-server/src/main/java/org/apache/ambari/server/orm/dao/ConfigGroupHostMappingDAO.java
b/ambari-server/src/main/java/org/apache/ambari/server/orm/dao/ConfigGroupHostMappingDAO.java
index 4628a4c..71d93cc 100644
---
a/ambari-server/src/main/java/org/apache/ambari/server/orm/dao/ConfigGroupHostMappingDAO.java
+++
b/ambari-server/src/main/java/org/apache/ambari/server/orm/dao/ConfigGroupHostMappingDAO.java
@@ -22,6 +22,7 @@ import com.google.inject.Provider;
import com.google.inject.Singleton;
import com.google.inject.persist.Transactional;
+import org.apache.ambari.server.AmbariException;
import org.apache.ambari.server.orm.RequiresSession;
import org.apache.ambari.server.orm.cache.ConfigGroupHostMapping;
import org.apache.ambari.server.orm.cache.ConfigGroupHostMappingImpl;
@@ -30,6 +31,7 @@ import
org.apache.ambari.server.orm.entities.ConfigGroupHostMappingEntity;
import org.apache.ambari.server.orm.entities.ConfigGroupHostMappingEntityPK;
import org.apache.ambari.server.orm.entities.HostEntity;
import org.apache.ambari.server.state.Cluster;
+import org.apache.ambari.server.state.Clusters;
import org.apache.ambari.server.state.Host;
import org.apache.ambari.server.state.cluster.ClusterFactory;
import org.apache.ambari.server.state.configgroup.ConfigGroup;
@@ -45,7 +47,7 @@ import java.util.HashSet;
import java.util.List;
import java.util.Map;
import java.util.Set;
-import java.util.WeakHashMap;
+import java.util.HashMap;
import java.util.concurrent.locks.ReadWriteLock;
import java.util.concurrent.locks.ReentrantReadWriteLock;
@@ -61,6 +63,8 @@ public class ConfigGroupHostMappingDAO {
private ClusterFactory clusterFactory;
@Inject
private HostFactory hostFactory;
+ @Inject
+ Clusters clusters;
private final ReadWriteLock gl = new ReentrantReadWriteLock();
@@ -74,33 +78,35 @@ public class ConfigGroupHostMappingDAO {
if (!cacheLoaded) {
gl.writeLock().lock();
try {
-if (configGroupHostMappingByHost == null) {
- configGroupHostMappingByHost = new WeakHashMapLong,
SetConfigGroupHostMapping();
-
- TypedQueryConfigGroupHostMappingEntity query =
entityManagerProvider.get().createQuery(
- SELECT entity FROM
ambari git commit: AMBARI-11785. Ambari upgrade to 2.1 hangs.(vbrodetskyi)
Repository: ambari
Updated Branches:
refs/heads/branch-2.1 64bc2473b - c8bfa4e8d
AMBARI-11785. Ambari upgrade to 2.1 hangs.(vbrodetskyi)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/c8bfa4e8
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/c8bfa4e8
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/c8bfa4e8
Branch: refs/heads/branch-2.1
Commit: c8bfa4e8dd2e640d3a8a1704c641b0e9fe54c06e
Parents: 64bc247
Author: Vitaly Brodetskyi vbrodets...@hortonworks.com
Authored: Mon Jun 8 08:10:16 2015 +0300
Committer: Vitaly Brodetskyi vbrodets...@hortonworks.com
Committed: Mon Jun 8 08:10:58 2015 +0300
--
.../server/upgrade/UpgradeCatalog210.java | 86 +---
1 file changed, 38 insertions(+), 48 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/c8bfa4e8/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog210.java
--
diff --git
a/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog210.java
b/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog210.java
index cd842fe..9b51d2d 100644
---
a/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog210.java
+++
b/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog210.java
@@ -18,24 +18,12 @@
package org.apache.ambari.server.upgrade;
-import java.net.URI;
-import java.net.URISyntaxException;
-import java.sql.ResultSet;
-import java.sql.SQLException;
-import java.text.MessageFormat;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
-import javax.persistence.EntityManager;
-import javax.persistence.Query;
-import javax.persistence.criteria.CriteriaBuilder;
-import javax.persistence.criteria.CriteriaDelete;
-import javax.persistence.criteria.Root;
-
+import com.google.gson.Gson;
+import com.google.gson.JsonObject;
+import com.google.gson.JsonParser;
+import com.google.inject.Inject;
+import com.google.inject.Injector;
+import com.google.inject.persist.Transactional;
import org.apache.ambari.server.AmbariException;
import org.apache.ambari.server.api.services.AmbariMetaInfo;
import org.apache.ambari.server.configuration.Configuration;
@@ -55,10 +43,7 @@ import org.apache.ambari.server.state.Cluster;
import org.apache.ambari.server.state.Clusters;
import org.apache.ambari.server.state.Service;
import org.apache.ambari.server.state.StackId;
-import org.apache.ambari.server.state.alert.AlertDefinition;
import org.apache.ambari.server.state.alert.AlertDefinitionFactory;
-import org.apache.ambari.server.state.alert.PortSource;
-import org.apache.ambari.server.state.alert.WebSource;
import org.apache.ambari.server.state.stack.OsFamily;
import org.apache.ambari.server.utils.VersionUtils;
import org.apache.commons.lang.StringUtils;
@@ -66,12 +51,22 @@ import
org.eclipse.persistence.internal.databaseaccess.FieldTypeDefinition;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import com.google.gson.Gson;
-import com.google.gson.JsonObject;
-import com.google.gson.JsonParser;
-import com.google.inject.Inject;
-import com.google.inject.Injector;
-import com.google.inject.persist.Transactional;
+import javax.persistence.EntityManager;
+import javax.persistence.Query;
+import javax.persistence.criteria.CriteriaBuilder;
+import javax.persistence.criteria.CriteriaDelete;
+import javax.persistence.criteria.Root;
+import java.net.URI;
+import java.net.URISyntaxException;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.text.MessageFormat;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
/**
@@ -1043,34 +1038,29 @@ public class UpgradeCatalog210 extends
AbstractUpgradeCatalog {
cluster.getClusterId(),
hdfs_zookeeper_failover_controller_process);
if (zkFailoverDefinitionEntity != null) {
-AlertDefinition zkfcAlertDefinition =
alertDefinitionFactory.coerce(zkFailoverDefinitionEntity);
-PortSource portSource = (PortSource)
zkfcAlertDefinition.getSource();
-portSource.setPort(8019);
-portSource.setUri({{hdfs-site/dfs.ha.zkfc.port}});
-
-// merge the definition back into the entity
-zkFailoverDefinitionEntity =
alertDefinitionFactory.merge(zkfcAlertDefinition,
-zkFailoverDefinitionEntity);
+String source = zkFailoverDefinitionEntity.getSource();
+JsonObject rootJson = new
JsonParser().parse(source).getAsJsonObject();
+rootJson.remove(uri);
ambari git commit: AMBARI-11781 Perf: Combine metrics requests on UI Host page. (atkach)
Repository: ambari
Updated Branches:
refs/heads/trunk 82ff8884c - f3e633ce2
AMBARI-11781 Perf: Combine metrics requests on UI Host page. (atkach)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/f3e633ce
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/f3e633ce
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/f3e633ce
Branch: refs/heads/trunk
Commit: f3e633ce2d8f52de6afc1bad992dafea07d444d9
Parents: 82ff888
Author: Andrii Tkach atk...@hortonworks.com
Authored: Mon Jun 8 14:18:03 2015 +0300
Committer: Andrii Tkach atk...@hortonworks.com
Committed: Mon Jun 8 15:42:17 2015 +0300
--
ambari-web/app/utils/ajax/ajax.js | 9 ++
.../app/views/common/chart/linear_time.js | 156 ++-
ambari-web/app/views/main/host/metrics/cpu.js | 5 +
ambari-web/app/views/main/host/metrics/disk.js | 5 +
ambari-web/app/views/main/host/metrics/load.js | 5 +
.../app/views/main/host/metrics/memory.js | 11 ++
.../app/views/main/host/metrics/network.js | 10 ++
.../app/views/main/host/metrics/processes.js| 5 +
.../ambari_metrics/master_average_load.js | 5 +
.../regionserver_block_cache_hit_percent.js | 5 +
.../regionserver_compaction_queue_size.js | 5 +
.../ambari_metrics/regionserver_regions.js | 5 +
.../ambari_metrics/regionserver_requests.js | 5 +
.../ambari_metrics/regionserver_store_files.js | 6 +
.../app/views/main/service/info/summary.js | 3 -
.../test/views/common/chart/linear_time_test.js | 118 ++
16 files changed, 347 insertions(+), 11 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/f3e633ce/ambari-web/app/utils/ajax/ajax.js
--
diff --git a/ambari-web/app/utils/ajax/ajax.js
b/ambari-web/app/utils/ajax/ajax.js
index 3d432fa..3b71219 100644
--- a/ambari-web/app/utils/ajax/ajax.js
+++ b/ambari-web/app/utils/ajax/ajax.js
@@ -994,6 +994,11 @@ var urls = {
'mock':
'/data/services/metrics/ambari_metrics/regionserver_compaction_queue_size.json',
'testInProduction': true
},
+ 'service.metrics.ambari_metrics.aggregated': {
+'real':
'/clusters/{clusterName}/services/AMBARI_METRICS/components/METRICS_COLLECTOR?fields={fields}',
+'mock': '/data/services/metrics/ambari_metrics/master_average_load.json',
+'testInProduction': true
+ },
'service.metrics.hdfs.block_status': {
'real':
'/clusters/{clusterName}/hosts/{nameNodeName}/host_components/NAMENODE?fields=metrics/dfs/FSNamesystem/PendingReplicationBlocks[{fromSeconds},{toSeconds},{stepSeconds}],metrics/dfs/FSNamesystem/UnderReplicatedBlocks[{fromSeconds},{toSeconds},{stepSeconds}]',
'mock': '/data/services/metrics/hdfs/block_status.json',
@@ -1146,6 +1151,10 @@ var urls = {
'mock': '/data/cluster_metrics/network_1hr.json',
'testInProduction': true
},
+ 'host.metrics.aggregated': {
+'real': '/clusters/{clusterName}/hosts/{hostName}?fields={fields}',
+'mock': '/data/hosts/metrics/cpu.json'
+ },
'host.metrics.cpu': {
'real':
'/clusters/{clusterName}/hosts/{hostName}?fields=metrics/cpu/cpu_user[{fromSeconds},{toSeconds},{stepSeconds}],metrics/cpu/cpu_wio[{fromSeconds},{toSeconds},{stepSeconds}],metrics/cpu/cpu_nice[{fromSeconds},{toSeconds},{stepSeconds}],metrics/cpu/cpu_aidle[{fromSeconds},{toSeconds},{stepSeconds}],metrics/cpu/cpu_system[{fromSeconds},{toSeconds},{stepSeconds}],metrics/cpu/cpu_idle[{fromSeconds},{toSeconds},{stepSeconds}]',
'mock': '/data/hosts/metrics/cpu.json',
http://git-wip-us.apache.org/repos/asf/ambari/blob/f3e633ce/ambari-web/app/views/common/chart/linear_time.js
--
diff --git a/ambari-web/app/views/common/chart/linear_time.js
b/ambari-web/app/views/common/chart/linear_time.js
index 7737700..05a33a4 100644
--- a/ambari-web/app/views/common/chart/linear_time.js
+++ b/ambari-web/app/views/common/chart/linear_time.js
@@ -169,13 +169,17 @@ App.ChartLinearTimeView = Ember.View.extend({
},
loadData: function() {
-App.ajax.send({
- name: this.get('ajaxIndex'),
- sender: this,
- data: this.getDataForAjaxRequest(),
- success: '_refreshGraph',
- error: 'loadDataErrorCallback'
-});
+if (this.get('loadGroup')) {
+ App.ChartLinearTimeView.LoadAggregator.add(this, this.get('loadGroup'));
+} else {
+ App.ajax.send({
+name: this.get('ajaxIndex'),
+sender: this,
+data: this.getDataForAjaxRequest(),
+success: '_refreshGraph',
+error: 'loadDataErrorCallback'
+ });
+}
},
getDataForAjaxRequest: function() {
@@ -1030,4 +1034,140 @@
ambari git commit: AMBARI-11786 Configs: yarn is modifying scheduler. (ababiichuk)
Repository: ambari
Updated Branches:
refs/heads/branch-2.1 09b2d28e2 - b1204c98c
AMBARI-11786 Configs: yarn is modifying scheduler. (ababiichuk)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/b1204c98
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/b1204c98
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/b1204c98
Branch: refs/heads/branch-2.1
Commit: b1204c98c7f208481d16d5120f88d44e5f7ba8b3
Parents: 09b2d28
Author: aBabiichuk ababiic...@cybervisiontech.com
Authored: Mon Jun 8 16:13:25 2015 +0300
Committer: aBabiichuk ababiic...@cybervisiontech.com
Committed: Mon Jun 8 16:17:57 2015 +0300
--
.../app/controllers/main/service/info/configs.js | 14 +-
1 file changed, 13 insertions(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/b1204c98/ambari-web/app/controllers/main/service/info/configs.js
--
diff --git a/ambari-web/app/controllers/main/service/info/configs.js
b/ambari-web/app/controllers/main/service/info/configs.js
index e1b8571..59e03ef 100644
--- a/ambari-web/app/controllers/main/service/info/configs.js
+++ b/ambari-web/app/controllers/main/service/info/configs.js
@@ -540,10 +540,22 @@ App.MainServiceInfoConfigsController =
Em.Controller.extend(App.ServerValidatorM
json.items.forEach(function (item) {
item.configurations.forEach(function (configuration) {
if (serviceName == 'YARN' configuration.type ==
'capacity-scheduler') {
+ var configsToSkip =
this.get('advancedConfigs').filterProperty('filename',
'capacity-scheduler.xml').filterProperty('subSection').mapProperty('name');
// put all properties in a single textarea for capacity-scheduler
var value = '';
for (var prop in configuration.properties) {
-value += prop + '=' + configuration.properties[prop] + '\n';
+if (configsToSkip.contains(prop)) {
+ serviceVersionMap[item.service_config_version][prop + '-' +
configuration.type] = {
+name: prop,
+value: configuration.properties[prop],
+type: configuration.type,
+tag: configuration.tag,
+version: configuration.version,
+service_config_version: item.service_config_version
+ };
+} else {
+ value += prop + '=' + configuration.properties[prop] + '\n';
+}
}
serviceVersionMap[item.service_config_version][configuration.type +
'-' + configuration.type] = {
name: configuration.type,
ambari git commit: AMBARI-11785. Ambari upgrade to 2.1 hangs.(vbrodetskyi)
Repository: ambari
Updated Branches:
refs/heads/trunk ef9e122df - 73229f26e
AMBARI-11785. Ambari upgrade to 2.1 hangs.(vbrodetskyi)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/73229f26
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/73229f26
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/73229f26
Branch: refs/heads/trunk
Commit: 73229f26e78d1efa859446e3d4efca6b3554d8bc
Parents: ef9e122
Author: Vitaly Brodetskyi vbrodets...@hortonworks.com
Authored: Mon Jun 8 08:04:50 2015 +0300
Committer: Vitaly Brodetskyi vbrodets...@hortonworks.com
Committed: Mon Jun 8 08:05:20 2015 +0300
--
.../server/upgrade/UpgradeCatalog210.java | 86 +---
1 file changed, 38 insertions(+), 48 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/73229f26/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog210.java
--
diff --git
a/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog210.java
b/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog210.java
index cd842fe..9b51d2d 100644
---
a/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog210.java
+++
b/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog210.java
@@ -18,24 +18,12 @@
package org.apache.ambari.server.upgrade;
-import java.net.URI;
-import java.net.URISyntaxException;
-import java.sql.ResultSet;
-import java.sql.SQLException;
-import java.text.MessageFormat;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
-import javax.persistence.EntityManager;
-import javax.persistence.Query;
-import javax.persistence.criteria.CriteriaBuilder;
-import javax.persistence.criteria.CriteriaDelete;
-import javax.persistence.criteria.Root;
-
+import com.google.gson.Gson;
+import com.google.gson.JsonObject;
+import com.google.gson.JsonParser;
+import com.google.inject.Inject;
+import com.google.inject.Injector;
+import com.google.inject.persist.Transactional;
import org.apache.ambari.server.AmbariException;
import org.apache.ambari.server.api.services.AmbariMetaInfo;
import org.apache.ambari.server.configuration.Configuration;
@@ -55,10 +43,7 @@ import org.apache.ambari.server.state.Cluster;
import org.apache.ambari.server.state.Clusters;
import org.apache.ambari.server.state.Service;
import org.apache.ambari.server.state.StackId;
-import org.apache.ambari.server.state.alert.AlertDefinition;
import org.apache.ambari.server.state.alert.AlertDefinitionFactory;
-import org.apache.ambari.server.state.alert.PortSource;
-import org.apache.ambari.server.state.alert.WebSource;
import org.apache.ambari.server.state.stack.OsFamily;
import org.apache.ambari.server.utils.VersionUtils;
import org.apache.commons.lang.StringUtils;
@@ -66,12 +51,22 @@ import
org.eclipse.persistence.internal.databaseaccess.FieldTypeDefinition;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import com.google.gson.Gson;
-import com.google.gson.JsonObject;
-import com.google.gson.JsonParser;
-import com.google.inject.Inject;
-import com.google.inject.Injector;
-import com.google.inject.persist.Transactional;
+import javax.persistence.EntityManager;
+import javax.persistence.Query;
+import javax.persistence.criteria.CriteriaBuilder;
+import javax.persistence.criteria.CriteriaDelete;
+import javax.persistence.criteria.Root;
+import java.net.URI;
+import java.net.URISyntaxException;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.text.MessageFormat;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
/**
@@ -1043,34 +1038,29 @@ public class UpgradeCatalog210 extends
AbstractUpgradeCatalog {
cluster.getClusterId(),
hdfs_zookeeper_failover_controller_process);
if (zkFailoverDefinitionEntity != null) {
-AlertDefinition zkfcAlertDefinition =
alertDefinitionFactory.coerce(zkFailoverDefinitionEntity);
-PortSource portSource = (PortSource)
zkfcAlertDefinition.getSource();
-portSource.setPort(8019);
-portSource.setUri({{hdfs-site/dfs.ha.zkfc.port}});
-
-// merge the definition back into the entity
-zkFailoverDefinitionEntity =
alertDefinitionFactory.merge(zkfcAlertDefinition,
-zkFailoverDefinitionEntity);
+String source = zkFailoverDefinitionEntity.getSource();
+JsonObject rootJson = new
JsonParser().parse(source).getAsJsonObject();
+rootJson.remove(uri);
+
[1/2] ambari git commit: AMBARI-11636. Flume log directory hard coded to /var/log/flume (aonishuk)
Repository: ambari
Updated Branches:
refs/heads/branch-2.1 0bad2efd4 - 5454e3541
refs/heads/trunk ecb2b05e0 - 0e6fc2409
AMBARI-11636. Flume log directory hard coded to /var/log/flume (aonishuk)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/0e6fc240
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/0e6fc240
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/0e6fc240
Branch: refs/heads/trunk
Commit: 0e6fc2409253df89eb2eb5fa581094a4a7db1959
Parents: ecb2b05
Author: Andrew Onishuk aonis...@hortonworks.com
Authored: Mon Jun 8 17:59:13 2015 +0300
Committer: Andrew Onishuk aonis...@hortonworks.com
Committed: Mon Jun 8 17:59:13 2015 +0300
--
.../common-services/FLUME/1.4.0.2.0/package/scripts/params.py | 2 +-
ambari-server/src/test/python/stacks/2.0.6/configs/default.json | 3 ++-
ambari-server/src/test/python/stacks/2.0.6/configs/flume_22.json | 3 ++-
.../src/test/python/stacks/2.0.6/configs/flume_target.json| 3 ++-
4 files changed, 7 insertions(+), 4 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/0e6fc240/ambari-server/src/main/resources/common-services/FLUME/1.4.0.2.0/package/scripts/params.py
--
diff --git
a/ambari-server/src/main/resources/common-services/FLUME/1.4.0.2.0/package/scripts/params.py
b/ambari-server/src/main/resources/common-services/FLUME/1.4.0.2.0/package/scripts/params.py
index 45902de..41a1b67 100644
---
a/ambari-server/src/main/resources/common-services/FLUME/1.4.0.2.0/package/scripts/params.py
+++
b/ambari-server/src/main/resources/common-services/FLUME/1.4.0.2.0/package/scripts/params.py
@@ -56,7 +56,7 @@ if Script.is_hdp_stack_greater_or_equal(2.2):
flume_hcat_home = '/usr/hdp/current/hive-webhcat'
java_home = config['hostLevelParams']['java_home']
-flume_log_dir = '/var/log/flume'
+flume_log_dir = config['configurations']['flume-env']['flume_log_dir']
flume_run_dir = '/var/run/flume'
ambari_state_file = format({flume_run_dir}/ambari-state.txt)
http://git-wip-us.apache.org/repos/asf/ambari/blob/0e6fc240/ambari-server/src/test/python/stacks/2.0.6/configs/default.json
--
diff --git a/ambari-server/src/test/python/stacks/2.0.6/configs/default.json
b/ambari-server/src/test/python/stacks/2.0.6/configs/default.json
index 2c09011..910885c 100644
--- a/ambari-server/src/test/python/stacks/2.0.6/configs/default.json
+++ b/ambari-server/src/test/python/stacks/2.0.6/configs/default.json
@@ -585,7 +585,8 @@
},
flume-env: {
content: export JAVA_HOME={{java64_home}}\nexport
HIVE_HOME={{flume_hive_home}},
- flume_user: flume
+ flume_user: flume,
+ flume_log_dir: /var/log/flume
},
storm-env: {
content: \n#!/bin/bash\n\n# Set Storm specific environment
variables here.\n\n# The java implementation to use.\nexport
JAVA_HOME={{java_home}}\n\n# export STORM_CONF_DIR=\\,
http://git-wip-us.apache.org/repos/asf/ambari/blob/0e6fc240/ambari-server/src/test/python/stacks/2.0.6/configs/flume_22.json
--
diff --git a/ambari-server/src/test/python/stacks/2.0.6/configs/flume_22.json
b/ambari-server/src/test/python/stacks/2.0.6/configs/flume_22.json
index 4c05aa3..5ef39f7 100644
--- a/ambari-server/src/test/python/stacks/2.0.6/configs/flume_22.json
+++ b/ambari-server/src/test/python/stacks/2.0.6/configs/flume_22.json
@@ -512,7 +512,8 @@
},
flume-env: {
content: export JAVA_HOME={{java64_home}}\nexport
HIVE_HOME={{flume_hive_home}},
- flume_user: flume
+ flume_user: flume,
+ flume_log_dir: /var/log/flume
},
storm-env: {
content: \n#!/bin/bash\n\n# Set Storm specific environment
variables here.\n\n# The java implementation to use.\nexport
JAVA_HOME={{java_home}}\n\n# export STORM_CONF_DIR=\\,
http://git-wip-us.apache.org/repos/asf/ambari/blob/0e6fc240/ambari-server/src/test/python/stacks/2.0.6/configs/flume_target.json
--
diff --git
a/ambari-server/src/test/python/stacks/2.0.6/configs/flume_target.json
b/ambari-server/src/test/python/stacks/2.0.6/configs/flume_target.json
index 4ef43ae..edea649 100644
--- a/ambari-server/src/test/python/stacks/2.0.6/configs/flume_target.json
+++ b/ambari-server/src/test/python/stacks/2.0.6/configs/flume_target.json
@@ -485,7 +485,8 @@
},
flume-env: {
content: export JAVA_HOME={{java64_home}},
- flume_user: flume
+ flume_user: flume,
+ flume_log_dir: /var/log/flume
},
