ambari git commit: AMBARI-10630 Empty config category should be hidden on Advanced config tab. (ababiichuk)
Repository: ambari
Updated Branches:
refs/heads/trunk 55d06c3d7 -> 5ff0c8674
AMBARI-10630 Empty config category should be hidden on Advanced config tab.
(ababiichuk)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/5ff0c867
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/5ff0c867
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/5ff0c867
Branch: refs/heads/trunk
Commit: 5ff0c867447a311fd94ef605441215212c04b8d0
Parents: 55d06c3
Author: aBabiichuk
Authored: Tue Apr 21 21:40:23 2015 +0300
Committer: aBabiichuk
Committed: Wed Apr 22 08:36:06 2015 +0300
--
.../configs/service_config_layout_tab_view.js | 2 +-
.../configs/service_configs_by_category_view.js | 7 +-
.../service_configs_by_category_view_test.js| 90
3 files changed, 96 insertions(+), 3 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/5ff0c867/ambari-web/app/views/common/configs/service_config_layout_tab_view.js
--
diff --git
a/ambari-web/app/views/common/configs/service_config_layout_tab_view.js
b/ambari-web/app/views/common/configs/service_config_layout_tab_view.js
index 9e48ab0..c3c3762 100644
--- a/ambari-web/app/views/common/configs/service_config_layout_tab_view.js
+++ b/ambari-web/app/views/common/configs/service_config_layout_tab_view.js
@@ -192,7 +192,7 @@ App.ServiceConfigLayoutTabView =
Em.View.extend(App.ConfigOverridable, {
this.get('parentView').pickActiveTab(this.get('parentView.tabs'));
}.observes('parentView.filter', 'parentView.columns.@each.selected'),
- willInsertElement: function () {
+ didInsertElement: function () {
this._super();
this.prepareConfigProperties();
}
http://git-wip-us.apache.org/repos/asf/ambari/blob/5ff0c867/ambari-web/app/views/common/configs/service_configs_by_category_view.js
--
diff --git
a/ambari-web/app/views/common/configs/service_configs_by_category_view.js
b/ambari-web/app/views/common/configs/service_configs_by_category_view.js
index ca8a1e5..3153cf5 100644
--- a/ambari-web/app/views/common/configs/service_configs_by_category_view.js
+++ b/ambari-web/app/views/common/configs/service_configs_by_category_view.js
@@ -79,8 +79,11 @@ App.ServiceConfigsByCategoryView =
Em.View.extend(App.UserPref, App.ConfigOverri
* @type {boolean}
*/
isShowBlock: function () {
-return this.get('category.customCanAddProperty') ||
this.get('categoryConfigs').filterProperty('isHiddenByFilter', false).length >
0;
- }.property('category.customCanAddProperty',
'categoryConfigs.@each.isHiddenByFilter'),
+var isCustomPropertiesCategory = this.get('category.customCanAddProperty');
+var emptyFiltered =
this.get('categoryConfigs').filterProperty('isHiddenByFilter', false).length >
0;
+var isWidgetsOnlyCategory = this.get('categoryConfigs.length') ==
this.get('categoryConfigs').filterProperty('widget').length;
+return isCustomPropertiesCategory || (emptyFiltered &&
!isWidgetsOnlyCategory);
+ }.property('category.customCanAddProperty',
'categoryConfigs.@each.isHiddenByFilter', 'categoryConfigs.@each.widget'),
/**
* Re-order the configs to list content displayType properties at last in
the category
http://git-wip-us.apache.org/repos/asf/ambari/blob/5ff0c867/ambari-web/test/views/common/configs/service_configs_by_category_view_test.js
--
diff --git
a/ambari-web/test/views/common/configs/service_configs_by_category_view_test.js
b/ambari-web/test/views/common/configs/service_configs_by_category_view_test.js
index 16ea8b6..6505cf0 100644
---
a/ambari-web/test/views/common/configs/service_configs_by_category_view_test.js
+++
b/ambari-web/test/views/common/configs/service_configs_by_category_view_test.js
@@ -278,6 +278,96 @@ describe('App.ServiceConfigsByCategoryView', function () {
});
});
+describe('#isShowBlock', function() {
+ var tests = [
+{
+ categoryConfigs: Em.A([
+{ isHiddenByFilter: false }
+ ]),
+ category: {},
+ m: 'no configs with widget, filtered properties are visible. Panel
should be shown',
+ e: true
+},
+{
+ categoryConfigs: Em.A([]),
+ category: Em.Object.create({ customCanAddProperty: true}),
+ m: 'Category with custom properties. Panel should be shown',
+ e: true
+},
+{
+ categoryConfigs: Em.A([
+{ isHiddenByFilter: false }
+ ]),
+ category: Em.Object.create({ customCanAddProperty: true}),
+ m: 'Category with custom properties. Filtered configs are hidde
ambari git commit: AMBARI-10551 - Alerts for NFSGateways are absent (Brandon Li via Jonathan Hurley)
Repository: ambari
Updated Branches:
refs/heads/trunk 048c15840 -> 55d06c3d7
AMBARI-10551 - Alerts for NFSGateways are absent (Brandon Li via Jonathan
Hurley)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/55d06c3d
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/55d06c3d
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/55d06c3d
Branch: refs/heads/trunk
Commit: 55d06c3d7a8fd6c3b03d2b1332d6d96e2aeba986
Parents: 048c158
Author: Jonathan Hurley
Authored: Wed Apr 22 00:04:52 2015 -0400
Committer: Jonathan Hurley
Committed: Wed Apr 22 00:05:17 2015 -0400
--
.../common-services/HDFS/2.1.0.2.0/alerts.json | 30 +++-
1 file changed, 29 insertions(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/55d06c3d/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/alerts.json
--
diff --git
a/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/alerts.json
b/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/alerts.json
index 3f0a926..b67c306 100644
---
a/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/alerts.json
+++
b/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/alerts.json
@@ -432,6 +432,34 @@
}
}
],
+"NFS_GATEWAY": [
+ {
+"name": "nfsgateway_process",
+"label": "NFS Gateway Process",
+"description": "This host-level alert is triggered if the NFS Gateway
process cannot be confirmed to be up and listening on the network.",
+"interval": 1,
+"scope": "HOST",
+"enabled": true,
+"source": {
+ "type": "PORT",
+ "uri": "{{hdfs-site/nfs.server.port}}",
+ "default_port": 2049,
+ "reporting": {
+"ok": {
+ "text": "TCP OK - {0:.3f}s response on port {1}"
+},
+"warning": {
+ "text": "TCP OK - {0:.3f}s response on port {1}",
+ "value": 1.5
+},
+"critical": {
+ "text": "Connection failed: {0} to {1}:{2}",
+ "value": 5.0
+}
+ }
+}
+ }
+],
"JOURNALNODE": [
{
"name": "journalnode_process",
@@ -585,4 +613,4 @@
}
]
}
-}
\ No newline at end of file
+}
[1/2] ambari git commit: Ambari-10386. Support skipping install operations on hosts that are already sys-prepped
Repository: ambari
Updated Branches:
refs/heads/trunk 1a02c9cce -> 048c15840
http://git-wip-us.apache.org/repos/asf/ambari/blob/048c1584/ambari-server/src/test/python/stacks/2.0.6/configs/default_no_install.json
--
diff --git
a/ambari-server/src/test/python/stacks/2.0.6/configs/default_no_install.json
b/ambari-server/src/test/python/stacks/2.0.6/configs/default_no_install.json
new file mode 100644
index 000..41783c2
--- /dev/null
+++ b/ambari-server/src/test/python/stacks/2.0.6/configs/default_no_install.json
@@ -0,0 +1,834 @@
+{
+"roleCommand": "SERVICE_CHECK",
+"clusterName": "c1",
+"hostname": "c6401.ambari.apache.org",
+"hostLevelParams": {
+"jdk_location": "http://c6401.ambari.apache.org:8080/resources/";,
+"ambari_db_rca_password": "mapred",
+"ambari_db_rca_url":
"jdbc:postgresql://c6401.ambari.apache.org/ambarirca",
+"repo_info":
"[{\"baseUrl\":\"http://public-repo-1.hortonworks.com/HDP/centos6/2.x/updates/2.0.6.0\",\"osType\":\"centos6\",\"repoId\":\"HDP-2.0._\",\"repoName\":\"HDP\",\"defaultBaseUrl\":\"http://public-repo-1.hortonworks.com/HDP/centos6/2.x/updates/2.0.6.0\"}]";,
+"jce_name": "UnlimitedJCEPolicyJDK7.zip",
+"stack_version": "2.0",
+"stack_name": "HDP",
+"ambari_db_rca_driver": "org.postgresql.Driver",
+"jdk_name": "jdk-7u67-linux-x64.tar.gz",
+"ambari_db_rca_username": "mapred",
+"java_home": "/usr/jdk64/jdk1.7.0_45",
+"java_version": "8",
+"db_name": "ambari",
+"group_list": "[\"hadoop\",\"nobody\",\"users\"]",
+"user_list":
"[\"hive\",\"oozie\",\"nobody\",\"ambari-qa\",\"flume\",\"hdfs\",\"storm\",\"mapred\",\"hbase\",\"tez\",\"zookeeper\",\"falcon\",\"sqoop\",\"yarn\",\"hcat\"]",
+"host_sys_prepped": "true",
+"package_list": "[{\"name\":\"mysql-server\"}]"
+},
+"commandType": "EXECUTION_COMMAND",
+"roleParams": {},
+"serviceName": "HIVE",
+"role": "HIVE_SERVER",
+"commandParams": {
+"command_timeout": "300",
+"service_package_folder": "OOZIE",
+"script_type": "PYTHON",
+"script": "scripts/service_check.py",
+"excluded_hosts": "host1,host2",
+"mark_draining_only" : "false",
+"update_exclude_file_only" : "false",
+"xml_configs_list":[{"hdfs-site.xml":"hdfs-site"}],
+
"env_configs_list":[{"hadoop-env.sh":"hadoop-env"},{"log4j.properties":"hdfs-log4j,yarn-log4j"}],
+
"properties_configs_list":[{"runtime.properties":"falcon-runtime.properties"},{"startup.properties":"falcon-startup.properties"}],
+"output_file":"HDFS_CLIENT-configs.tar.gz",
+"refresh_topology": "True"
+},
+"taskId": 152,
+"public_hostname": "c6401.ambari.apache.org",
+"configurations": {
+"mapred-site": {
+"mapreduce.jobhistory.address": "c6402.ambari.apache.org:10020",
+"mapreduce.cluster.administrators": " hadoop",
+"mapreduce.reduce.input.buffer.percent": "0.0",
+"mapreduce.output.fileoutputformat.compress": "false",
+"mapreduce.framework.name": "yarn",
+"mapreduce.map.speculative": "false",
+"mapreduce.reduce.shuffle.merge.percent": "0.66",
+"yarn.app.mapreduce.am.resource.mb": "683",
+"mapreduce.map.java.opts": "-Xmx273m",
+"mapreduce.application.classpath":
"$HADOOP_MAPRED_HOME/share/hadoop/mapreduce/*,$HADOOP_MAPRED_HOME/share/hadoop/mapreduce/lib/*",
+"mapreduce.job.reduce.slowstart.completedmaps": "0.05",
+"mapreduce.output.fileoutputformat.compress.type": "BLOCK",
+"mapreduce.reduce.speculative": "false",
+"mapreduce.reduce.java.opts": "-Xmx546m",
+"mapreduce.am.max-attempts": "2",
+"yarn.app.mapreduce.am.admin-command-opts":
"-Djava.net.preferIPv4Stack=true -Dhadoop.metrics.log.level=WARN",
+"mapreduce.reduce.log.level": "INFO",
+"mapreduce.map.sort.spill.percent": "0.7",
+"mapreduce.task.timeout": "30",
+"mapreduce.map.memory.mb": "341",
+"mapreduce.task.io.sort.factor": "100",
+"mapreduce.jobhistory.intermediate-done-dir": "/mr-history/tmp",
+"mapreduce.reduce.memory.mb": "683",
+"yarn.app.mapreduce.am.log.level": "INFO",
+"mapreduce.map.log.level": "INFO",
+"mapreduce.shuffle.port": "13562",
+"mapreduce.admin.user.env":
"LD_LIBRARY_PATH=/usr/lib/hadoop/lib/native:/usr/lib/hadoop/lib/native/`$JAVA_HOME/bin/java
-d32 -version &> /dev/null;if [ $? -eq 0 ]; then echo Linux-i386-32;
else echo Linux-amd64-64;fi`",
+"mapreduce.map.output.compress": "false",
+"yarn.app.mapreduce.am.staging-dir": "/user",
+"mapreduce.reduce.shuffle.paralle
[2/2] ambari git commit: Ambari-10386. Support skipping install operations on hosts that are already sys-prepped
Ambari-10386. Support skipping install operations on hosts that are already
sys-prepped
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/048c1584
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/048c1584
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/048c1584
Branch: refs/heads/trunk
Commit: 048c158400ae06185b09dbafffd487f9ff5cc8fd
Parents: 1a02c9c
Author: Sumit Mohanty
Authored: Tue Apr 21 18:26:14 2015 -0700
Committer: Sumit Mohanty
Committed: Tue Apr 21 20:16:09 2015 -0700
--
.../core/providers/package/apt.py | 4 +-
.../core/providers/package/yumrpm.py| 4 +-
.../core/providers/package/zypper.py| 4 +-
.../dynamic_variable_interpretation.py | 7 +-
.../libraries/script/script.py | 6 +
.../ambari/server/agent/ExecutionCommand.java | 1 +
.../server/configuration/Configuration.java | 12 +
.../AmbariCustomCommandExecutionHelper.java | 2 +
.../internal/ClientConfigResourceProvider.java | 2 +
.../internal/UpgradeResourceProvider.java | 3 -
.../1.6.1.2.2.0/package/scripts/params.py | 2 +
.../0.1.0/package/scripts/params.py | 1 +
.../FALCON/0.5.0.2.1/package/scripts/params.py | 3 +
.../FLUME/1.4.0.2.0/package/scripts/params.py | 1 +
.../1.4.0.2.0/package/scripts/params_linux.py | 1 +
.../HBASE/0.96.0.2.0/package/scripts/params.py | 3 +
.../HDFS/2.1.0.2.0/package/scripts/params.py| 3 +
.../HIVE/0.12.0.2.0/package/scripts/params.py | 3 +
.../KAFKA/0.8.1.2.2/package/scripts/params.py | 1 +
.../1.10.3-10/package/scripts/params.py | 1 +
.../KNOX/0.5.0.2.2/package/scripts/params.py| 2 +
.../MAHOUT/1.0.0.2.3/package/scripts/params.py | 1 +
.../OOZIE/4.0.0.2.0/package/scripts/params.py | 3 +
.../PIG/0.12.0.2.0/package/scripts/params.py| 4 +
.../RANGER/0.4.0/package/scripts/params.py | 1 +
.../SLIDER/0.60.0.2.2/package/scripts/params.py | 2 +
.../SPARK/1.2.0.2.2/package/scripts/params.py | 1 +
.../SQOOP/1.4.4.2.0/package/scripts/params.py | 4 +
.../STORM/0.9.1.2.1/package/scripts/params.py | 4 +
.../TEZ/0.4.0.2.1/package/scripts/params.py | 4 +
.../YARN/2.1.0.2.0/package/scripts/params.py| 4 +
.../2.0.6/hooks/before-ANY/scripts/params.py| 1 +
.../before-ANY/scripts/shared_initialization.py | 52 +-
.../hooks/before-INSTALL/scripts/params.py | 1 +
.../scripts/repo_initialization.py | 3 +
.../scripts/shared_initialization.py| 3 +
.../AmbariManagementControllerImplTest.java | 7 +-
.../ClientConfigResourceProviderTest.java | 2 +
.../python/stacks/2.0.6/HDFS/test_namenode.py | 13 +
.../stacks/2.0.6/HIVE/test_hive_server.py | 36 +
.../python/stacks/2.0.6/configs/default.json| 4 +-
.../2.0.6/configs/default_no_install.json | 834 +++
.../src/test/python/stacks/utils/RMFTestCase.py | 36 +-
43 files changed, 1041 insertions(+), 45 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/048c1584/ambari-common/src/main/python/resource_management/core/providers/package/apt.py
--
diff --git
a/ambari-common/src/main/python/resource_management/core/providers/package/apt.py
b/ambari-common/src/main/python/resource_management/core/providers/package/apt.py
index ae271f0..76db791 100644
---
a/ambari-common/src/main/python/resource_management/core/providers/package/apt.py
+++
b/ambari-common/src/main/python/resource_management/core/providers/package/apt.py
@@ -101,7 +101,7 @@ class AptProvider(PackageProvider):
Logger.info("Removing temporal sources directory: %s" %
apt_sources_list_tmp_dir)
os.rmdir(apt_sources_list_tmp_dir)
else:
- Logger.info("Skipping installing existent package %s" % (name))
+ Logger.info("Skipping installation of existing package %s" % (name))
@replace_underscores
def upgrade_package(self, name, use_repos=[]):
@@ -114,7 +114,7 @@ class AptProvider(PackageProvider):
Logger.info("Removing package %s ('%s')" % (name,
string_cmd_from_args_list(cmd)))
shell.checked_call(cmd, sudo=True, logoutput=self.get_logoutput())
else:
- Logger.info("Skipping removing non-existent package %s" % (name))
+ Logger.info("Skipping removal of non-existing package %s" % (name))
@replace_underscores
def _check_existence(self, name):
http://git-wip-us.apache.org/repos/asf/ambari/blob/048c1584/ambari-common/src/main/python/resource_management/core/providers/package/yumrpm.py
--
diff --git
a/ambari-common/src/main/python/resource_management/core
ambari git commit: AMBARI-10646. HBase config UI: Eliminate hbase.client.scanner.caching setting (srimanth)
Repository: ambari Updated Branches: refs/heads/trunk 375266ddc -> 1a02c9cce AMBARI-10646. HBase config UI: Eliminate hbase.client.scanner.caching setting (srimanth) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/1a02c9cc Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/1a02c9cc Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/1a02c9cc Branch: refs/heads/trunk Commit: 1a02c9cce64124bb8994aa9fa8b1699a2d2c468f Parents: 375266d Author: Srimanth Gunturi Authored: Tue Apr 21 19:56:08 2015 -0700 Committer: Srimanth Gunturi Committed: Tue Apr 21 19:56:08 2015 -0700 -- .../0.96.0.2.0/configuration/hbase-env.xml | 4 +- .../0.96.0.2.0/configuration/hbase-site.xml | 20 +++--- .../HDFS/2.1.0.2.0/configuration/hdfs-site.xml | 4 +- .../services/HBASE/configuration/hbase-env.xml | 2 +- .../HDP/2.2/services/HBASE/themes/theme.json| 23 ++- .../stacks/HDP/2.2/services/stack_advisor.py| 17 +++-- .../stacks/2.2/common/test_stack_advisor.py | 68 7 files changed, 88 insertions(+), 50 deletions(-) -- http://git-wip-us.apache.org/repos/asf/ambari/blob/1a02c9cc/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/configuration/hbase-env.xml -- diff --git a/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/configuration/hbase-env.xml b/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/configuration/hbase-env.xml index 105bb40..24705e7 100644 --- a/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/configuration/hbase-env.xml +++ b/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/configuration/hbase-env.xml @@ -35,7 +35,7 @@ hbase_regionserver_heapsize 4096 HBase RegionServer Heap Size. -HBase RegionServer Maximum Memory +RegionServer Maximum Memory int 1024 @@ -62,7 +62,7 @@ and the -Xmn ratio (hbase_regionserver_xmn_ratio) exceeds this value. hbase_master_heapsize 4096 HBase Master Heap Size -HBase Master Maximum Memory +Master Maximum Memory int 1024 http://git-wip-us.apache.org/repos/asf/ambari/blob/1a02c9cc/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/configuration/hbase-site.xml -- diff --git a/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/configuration/hbase-site.xml b/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/configuration/hbase-site.xml index eda02ca..9e67bf6 100644 --- a/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/configuration/hbase-site.xml +++ b/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/configuration/hbase-site.xml @@ -89,6 +89,7 @@ float 0 0.8 + 0.01 @@ -188,7 +189,7 @@ hbase.hregion.max.filesize -1073741824 +10737418240 Maximum HStoreFile size. If any one of a column families' HStoreFiles has grown to exceed this value, the hosting HRegion is split in two. @@ -198,9 +199,9 @@ int 1073741824 - 10737418240 + 107374182400 B - 268435456 + 1073741824 @@ -268,7 +269,7 @@ is run to rewrite all HStoreFiles files as one. Larger numbers put off compaction but when it runs, it takes longer to complete. -Maximum Files in a Store before Compaction +Maximum Store Files before Minor Compaction int @@ -315,6 +316,7 @@ float 0 0.8 + 0.01 @@ -456,15 +458,15 @@ hbase.rpc.timeout -6 +9 This is for the RPC layer to define how long HBase client applications take for a remote call to time out. It uses pings to check connections but will eventually throw a TimeoutException. -HBase RPC Timeout +RPC Timeout int - 3 - 30 + 1 + 18 milliseconds 1 @@ -482,7 +484,7 @@ int 3 - 30 + 18 milliseconds 1 http://git-wip-us.apache.org/repos/asf/ambari/blob/1a02c9cc/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/configuration/hdfs-site.xml -- diff --git a/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/configuration/hdfs-site.xml b/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/configuration/hdfs-site.xml index c9d7172..0108b27 100644 --- a/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/configuration
ambari git commit: AMBARI-9993: Add support for management of Phoenix Query Server to HDP Stack - Addendum patch 2 (Nick Dimiduk via jluniya)
Repository: ambari
Updated Branches:
refs/heads/trunk 55c0f792f -> 375266ddc
AMBARI-9993: Add support for management of Phoenix Query Server to HDP Stack -
Addendum patch 2 (Nick Dimiduk via jluniya)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/375266dd
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/375266dd
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/375266dd
Branch: refs/heads/trunk
Commit: 375266ddc3aeed0ba849a87386b5b2166732f294
Parents: 55c0f79
Author: Jayush Luniya
Authored: Tue Apr 21 18:20:05 2015 -0700
Committer: Jayush Luniya
Committed: Tue Apr 21 18:20:05 2015 -0700
--
.../HBASE/0.96.0.2.0/package/scripts/hbase.py | 2 +-
.../2.0.6/HBASE/test_phoenix_queryserver.py | 62 +---
2 files changed, 2 insertions(+), 62 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/375266dd/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/package/scripts/hbase.py
--
diff --git
a/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/package/scripts/hbase.py
b/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/package/scripts/hbase.py
index c5f9e7e..2ddd137 100644
---
a/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/package/scripts/hbase.py
+++
b/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/package/scripts/hbase.py
@@ -155,7 +155,7 @@ def hbase(name=None):
group=params.user_group,
owner=params.hbase_user
)
- if name in ["master","regionserver", "queryserver"]:
+ if name in ["master","regionserver"]:
params.HdfsDirectory(params.hbase_hdfs_root_dir,
action="create_delayed",
owner=params.hbase_user
http://git-wip-us.apache.org/repos/asf/ambari/blob/375266dd/ambari-server/src/test/python/stacks/2.0.6/HBASE/test_phoenix_queryserver.py
--
diff --git
a/ambari-server/src/test/python/stacks/2.0.6/HBASE/test_phoenix_queryserver.py
b/ambari-server/src/test/python/stacks/2.0.6/HBASE/test_phoenix_queryserver.py
index 1568588..0427fe9 100644
---
a/ambari-server/src/test/python/stacks/2.0.6/HBASE/test_phoenix_queryserver.py
+++
b/ambari-server/src/test/python/stacks/2.0.6/HBASE/test_phoenix_queryserver.py
@@ -266,36 +266,6 @@ class TestPhoenixQueryServer(RMFTestCase):
owner='hbase',
content='log4jproperties\nline2'
)
-self.assertResourceCalled('HdfsDirectory',
'hdfs://c6405.ambari.apache.org:8020/apps/hbase/data',
- security_enabled = False,
- keytab = UnknownConfigurationMock(),
- conf_dir = '/etc/hadoop/conf',
- hdfs_user = 'hdfs',
- kinit_path_local = '/usr/bin/kinit',
- owner = 'hbase',
- bin_dir = '/usr/hdp/current/hadoop-client/bin',
- action = ['create_delayed'],
- )
-self.assertResourceCalled('HdfsDirectory', '/apps/hbase/staging',
- security_enabled = False,
- keytab = UnknownConfigurationMock(),
- conf_dir = '/etc/hadoop/conf',
- hdfs_user = 'hdfs',
- kinit_path_local = '/usr/bin/kinit',
- mode = 0711,
- owner = 'hbase',
- bin_dir = '/usr/hdp/current/hadoop-client/bin',
- action = ['create_delayed'],
- )
-self.assertResourceCalled('HdfsDirectory', None,
- security_enabled = False,
- keytab = UnknownConfigurationMock(),
- conf_dir = '/etc/hadoop/conf',
- hdfs_user = 'hdfs',
- kinit_path_local = '/usr/bin/kinit',
- bin_dir = '/usr/hdp/current/hadoop-client/bin',
- action = ['create'],
- )
def assert_configure_secured(self):
self.assertResourceCalled('Directory', '/etc/hbase',
@@ -389,34 +359,4 @@ class TestPhoenixQueryServer(RMFTestCase):
group='hadoop',
owner='hbase',
content='log4jproperties\nline2'
-)
-self.assertResourceCalled('HdfsDirectory',
'hdfs://c6405.ambari.apache.org:8020
ambari git commit: AMBARI-10643. Widget title need to utilize more horizontal space to prevent wrapping.(xiwang)
Repository: ambari
Updated Branches:
refs/heads/trunk f24531d1b -> 55c0f792f
AMBARI-10643. Widget title need to utilize more horizontal space to prevent
wrapping.(xiwang)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/55c0f792
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/55c0f792
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/55c0f792
Branch: refs/heads/trunk
Commit: 55c0f792f76e16abd252d63bbf27d0f77c91adb4
Parents: f24531d
Author: Xi Wang
Authored: Tue Apr 21 17:38:46 2015 -0700
Committer: Xi Wang
Committed: Tue Apr 21 17:38:54 2015 -0700
--
.../app/styles/enhanced_service_dashboard.less | 29 +---
.../templates/common/widget/gauge_widget.hbs| 6 ++--
.../templates/common/widget/graph_widget.hbs| 7 +++--
.../templates/common/widget/number_widget.hbs | 6 ++--
.../templates/common/widget/template_widget.hbs | 6 ++--
5 files changed, 32 insertions(+), 22 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/55c0f792/ambari-web/app/styles/enhanced_service_dashboard.less
--
diff --git a/ambari-web/app/styles/enhanced_service_dashboard.less
b/ambari-web/app/styles/enhanced_service_dashboard.less
index 78ea297..73ee1a3 100644
--- a/ambari-web/app/styles/enhanced_service_dashboard.less
+++ b/ambari-web/app/styles/enhanced_service_dashboard.less
@@ -60,22 +60,25 @@
margin: 5px 0 5px 5px;
}
.widget {
+.thumbnail {
+ position: relative;
+}
.spinner {
margin: 55px auto;
}
.title {
- padding: 5px 0 0 5px;
- height: 25px;
+ padding: 5px 0 0 1px;
font-weight: bold;
text-align: left;
- position: relative;
+ height: 45px;
+ overflow: hidden;
+ text-overflow: ellipsis;
}
.content {
text-align: center;
color: @health-status-green;
font-weight: bold;
font-size: 35px;
- position: relative;
}
.template-widget,
.number-widget {
@@ -133,20 +136,26 @@
.widget {
.thumbnail .corner-icon {
display: none;
- position: relative;
.icon-remove-sign{
color: #00;
text-shadow: #fff 0px 0px 15px;
-position: relative;
-left: -17px;
-top: -11px;
+position: absolute;
+left: -7px;
+top: -7px;
}
.icon-edit,.icon-copy{
color: #55;
-position: relative;
+font-weight: bold;
+text-shadow: #ff -8px 8px 10px;
+background-color: rgba(255,255,255,0.6);
+position: absolute;
+padding: 5px 5px;
+ }
+ .icon-copy {
+right: 25px;
}
.icon-edit {
-left: 2px;
+right: 5px;
}
}
.thumbnail:hover {
http://git-wip-us.apache.org/repos/asf/ambari/blob/55c0f792/ambari-web/app/templates/common/widget/gauge_widget.hbs
--
diff --git a/ambari-web/app/templates/common/widget/gauge_widget.hbs
b/ambari-web/app/templates/common/widget/gauge_widget.hbs
index 3dd54c1..7ba1600 100644
--- a/ambari-web/app/templates/common/widget/gauge_widget.hbs
+++ b/ambari-web/app/templates/common/widget/gauge_widget.hbs
@@ -21,11 +21,11 @@
-{{view.content.displayName}}
-
+{{view.content.displayName}}
+
-
+
{{view view.chartView}}
http://git-wip-us.apache.org/repos/asf/ambari/blob/55c0f792/ambari-web/app/templates/common/widget/graph_widget.hbs
--
diff --git a/ambari-web/app/templates/common/widget/graph_widget.hbs
b/ambari-web/app/templates/common/widget/graph_widget.hbs
index 9c1560f..6fffd92 100644
--- a/ambari-web/app/templates/common/widget/graph_widget.hbs
+++ b/ambari-web/app/templates/common/widget/graph_widget.hbs
@@ -21,13 +21,14 @@
-{{view.content.displayName}}
-
+{{view.content.displayName}}
+
-
+
+
{{view view.graphView}}
{{else}}
http://git-wip-us.apache.org/repos/asf/ambari/blob/55c0f792/ambari-web/app/templates/common/widget/number_widget.hbs
--
diff --git a/ambari-web/app/templates/common/widget/number_widget.hbs
b/ambari-web/app/templates/common/widget/number_widget.hbs
index d1bdc97..59c5420 100644
--- a/ambari-web/app/templates/common/widget/number_widget.hbs
+++ b/ambari-web/app/templates/common/widget/number_widget.hbs
@@ -21,11 +21,11 @@
-{{view.content.displayName}}
-
+{{view.content.displayName}}
+
-
+
ambari git commit: AMBARI-9993: Add support for management of Phoenix Query Server to HDP Stack - Addendum patch (Nick Dimiduk via jluniya)
Repository: ambari
Updated Branches:
refs/heads/trunk 9b2f26698 -> f24531d1b
AMBARI-9993: Add support for management of Phoenix Query Server to HDP Stack -
Addendum patch (Nick Dimiduk via jluniya)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/f24531d1
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/f24531d1
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/f24531d1
Branch: refs/heads/trunk
Commit: f24531d1bbab130fc89b09720c536f3c345bd038
Parents: 9b2f266
Author: Jayush Luniya
Authored: Tue Apr 21 17:34:47 2015 -0700
Committer: Jayush Luniya
Committed: Tue Apr 21 17:34:47 2015 -0700
--
.../HBASE/0.96.0.2.0/package/scripts/hbase.py | 4 +-
.../package/scripts/phoenix_queryserver.py | 6 +-
.../package/scripts/phoenix_service.py | 32 ++-
.../0.5.0.2.3/package/scripts/kms_service.py| 3 +-
.../2.0.6/HBASE/test_phoenix_queryserver.py | 266 ++-
5 files changed, 292 insertions(+), 19 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/f24531d1/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/package/scripts/hbase.py
--
diff --git
a/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/package/scripts/hbase.py
b/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/package/scripts/hbase.py
index eb62f92..c5f9e7e 100644
---
a/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/package/scripts/hbase.py
+++
b/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/package/scripts/hbase.py
@@ -33,7 +33,7 @@ def hbase(name=None):
configuration_attributes=params.config['configuration_attributes']['hbase-site']
)
-# name is 'master' or 'regionserver' or 'client'
+# name is 'master' or 'regionserver' or 'queryserver' or 'client'
@OsFamilyFuncImpl(os_family=OsFamilyImpl.DEFAULT)
def hbase(name=None):
import params
@@ -155,7 +155,7 @@ def hbase(name=None):
group=params.user_group,
owner=params.hbase_user
)
- if name in ["master","regionserver"]:
+ if name in ["master","regionserver", "queryserver"]:
params.HdfsDirectory(params.hbase_hdfs_root_dir,
action="create_delayed",
owner=params.hbase_user
http://git-wip-us.apache.org/repos/asf/ambari/blob/f24531d1/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/package/scripts/phoenix_queryserver.py
--
diff --git
a/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/package/scripts/phoenix_queryserver.py
b/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/package/scripts/phoenix_queryserver.py
index db2687f..c12231a 100644
---
a/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/package/scripts/phoenix_queryserver.py
+++
b/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/package/scripts/phoenix_queryserver.py
@@ -20,7 +20,9 @@ limitations under the License.
import sys
from resource_management.libraries.script import Script
from phoenix_service import phoenix_service
+from hbase import hbase
+# Note: Phoenix Query Server is only applicable to HDP-2.3 and above.
class PhoenixQueryServer(Script):
def install(self, env):
@@ -30,7 +32,9 @@ class PhoenixQueryServer(Script):
return {"HDP": "phoenix-server"}
def configure(self, env):
-pass
+import params
+env.set_params(params)
+hbase(name='queryserver')
def start(self, env, rolling_restart=False):
import params
http://git-wip-us.apache.org/repos/asf/ambari/blob/f24531d1/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/package/scripts/phoenix_service.py
--
diff --git
a/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/package/scripts/phoenix_service.py
b/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/package/scripts/phoenix_service.py
index 14132fb..8aa1994 100644
---
a/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/package/scripts/phoenix_service.py
+++
b/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/package/scripts/phoenix_service.py
@@ -21,19 +21,27 @@ limitations under the License.
from resource_management.core.resources.system import Execute
from resource_management.libraries.functions import check_process_status,
format
+# Note: Phoenix Query Server is only applicable to HDP-2.3 and above.
def phoenix_service(action = 'start'): # 'start', 'stop', 'status'
+# Note: params/status_params should already be imported before calling
phoe
ambari git commit: AMBARI-10617 - Views : Additional logging for view deployment
Repository: ambari
Updated Branches:
refs/heads/trunk c254db4b3 -> 9b2f26698
AMBARI-10617 - Views : Additional logging for view deployment
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/9b2f2669
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/9b2f2669
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/9b2f2669
Branch: refs/heads/trunk
Commit: 9b2f26698d964b0cb5eaccc8f394edc87f8d94d0
Parents: c254db4
Author: tbeerbower
Authored: Tue Apr 21 18:38:37 2015 -0400
Committer: tbeerbower
Committed: Tue Apr 21 18:38:51 2015 -0400
--
.../org/apache/ambari/server/view/ViewRegistry.java | 16 +++-
1 file changed, 15 insertions(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/9b2f2669/ambari-server/src/main/java/org/apache/ambari/server/view/ViewRegistry.java
--
diff --git
a/ambari-server/src/main/java/org/apache/ambari/server/view/ViewRegistry.java
b/ambari-server/src/main/java/org/apache/ambari/server/view/ViewRegistry.java
index f6b54ea..7395fa6 100644
---
a/ambari-server/src/main/java/org/apache/ambari/server/view/ViewRegistry.java
+++
b/ambari-server/src/main/java/org/apache/ambari/server/view/ViewRegistry.java
@@ -1287,16 +1287,23 @@ public class ViewRegistry {
ViewEntity persistedView = viewDAO.findByName(viewName);
ResourceTypeEntity resourceType = view.getResourceType();
+if (LOG.isDebugEnabled()) {
+ LOG.debug("Syncing view " + viewName + ".");
+}
+
// if the view is not yet persisted ...
if (persistedView == null) {
if (LOG.isDebugEnabled()) {
-LOG.debug("Creating View " + viewName + ".");
+LOG.debug("Creating view " + viewName + ".");
}
// get or create an admin resource type to represent this view
ResourceTypeEntity resourceTypeEntity =
resourceTypeDAO.findByName(viewName);
if (resourceTypeEntity == null) {
resourceTypeEntity = resourceType;
+if (LOG.isDebugEnabled()) {
+ LOG.debug("Creating resource type for " + viewName + ".");
+}
resourceTypeDAO.create(resourceTypeEntity);
}
@@ -1333,6 +1340,9 @@ public class ViewRegistry {
syncViewInstance(instance, persistedInstance);
}
}
+if (LOG.isDebugEnabled()) {
+ LOG.debug("Syncing view " + viewName + " complete.");
+}
}
// sync the given view instance entity to the matching view instance entity
in the registry
@@ -1521,6 +1531,8 @@ public class ViewRegistry {
String extractedArchiveDirPath = extractedArchiveDirFile.getAbsolutePath();
+LOG.info("Reading view archive " + archiveFile + ".");
+
try {
// extract the archive and get the class loader
ClassLoader cl = extractor.extractViewArchive(viewDefinition,
archiveFile, extractedArchiveDirFile);
@@ -1543,6 +1555,8 @@ public class ViewRegistry {
persistView(viewDefinition, instanceDefinitions);
setViewStatus(viewDefinition, ViewEntity.ViewStatus.DEPLOYED,
"Deployed " + extractedArchiveDirPath + ".");
+
+LOG.info("View deployed: " + viewDefinition.getName() + ".");
}
} catch (Exception e) {
String msg = "Caught exception loading view " + viewDefinition.getName();
ambari git commit: Ambari-10606. Ambari Agent needs to retry failed install/start operations
Repository: ambari
Updated Branches:
refs/heads/trunk 91eb6961e -> c254db4b3
Ambari-10606. Ambari Agent needs to retry failed install/start operations
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/c254db4b
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/c254db4b
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/c254db4b
Branch: refs/heads/trunk
Commit: c254db4b3592e910599ce25c7add8db2650ccfbb
Parents: 91eb696
Author: Sumit Mohanty
Authored: Tue Apr 21 13:29:52 2015 -0700
Committer: Sumit Mohanty
Committed: Tue Apr 21 13:29:52 2015 -0700
--
.../src/main/python/ambari_agent/ActionQueue.py | 49 +--
.../ambari_agent/CustomServiceOrchestrator.py | 8 +-
.../test/python/ambari_agent/TestActionQueue.py | 128 ++-
.../TestCustomServiceOrchestrator.py| 55
.../ambari/server/agent/ExecutionCommand.java | 4 +-
.../server/configuration/Configuration.java | 14 ++
.../AmbariCustomCommandExecutionHelper.java | 30 +++--
.../AmbariManagementControllerImpl.java | 4 +
8 files changed, 266 insertions(+), 26 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/c254db4b/ambari-agent/src/main/python/ambari_agent/ActionQueue.py
--
diff --git a/ambari-agent/src/main/python/ambari_agent/ActionQueue.py
b/ambari-agent/src/main/python/ambari_agent/ActionQueue.py
index c4e2c33..212226c 100644
--- a/ambari-agent/src/main/python/ambari_agent/ActionQueue.py
+++ b/ambari-agent/src/main/python/ambari_agent/ActionQueue.py
@@ -25,6 +25,8 @@ import threading
import pprint
import os
import json
+from random import randint
+import time
from AgentException import AgentException
from LiveStatus import LiveStatus
@@ -223,16 +225,40 @@ class ActionQueue(threading.Thread):
self.commandStatuses.put_command_status(command, in_progress_status)
-# running command
-commandresult = self.customServiceOrchestrator.runCommand(command,
- in_progress_status['tmpout'], in_progress_status['tmperr'])
+numAttempts = 0
+maxAttempts = 1
+retryAble = False
+delay = 1
+if 'commandParams' in command:
+ if 'command_retry_max_attempt_count' in command['commandParams']:
+maxAttempts =
int(command['commandParams']['command_retry_max_attempt_count'])
+ if 'command_retry_enabled' in command['commandParams']:
+retryAble = command['commandParams']['command_retry_enabled'] == "true"
+
+logger.debug("Command execution metadata - retry enabled = {retryAble},
max attempt count = {maxAttemptCount}".
+ format(retryAble = retryAble, maxAttemptCount = maxAttempts))
+while numAttempts < maxAttempts:
+ numAttempts += 1
+ # running command
+ commandresult = self.customServiceOrchestrator.runCommand(command,
+in_progress_status['tmpout'], in_progress_status['tmperr'],
+override_output_files=numAttempts == 1, retry=numAttempts > 1)
+
+
+ # dumping results
+ if isCommandBackground:
+return
+ else:
+status = self.COMPLETED_STATUS if commandresult['exitcode'] == 0 else
self.FAILED_STATUS
+ if status != self.COMPLETED_STATUS and retryAble == True and maxAttempts
> numAttempts:
+delay = self.get_retry_delay(delay)
+logger.info("Retrying command id {cid} after a wait of
{delay}".format(cid = taskId, delay=delay))
+time.sleep(delay)
+continue
+ else:
+break
-# dumping results
-if isCommandBackground:
- return
-else:
- status = self.COMPLETED_STATUS if commandresult['exitcode'] == 0 else
self.FAILED_STATUS
roleResult = self.commandStatuses.generate_report_template(command)
roleResult.update({
'stdout': commandresult['stdout'],
@@ -289,6 +315,13 @@ class ActionQueue(threading.Thread):
self.commandStatuses.put_command_status(command, roleResult)
+ def get_retry_delay(self, last_delay):
+"""
+Returns exponentially growing delay. The idea being if number of retries
is high then the reason to retry
+is probably a host or environment specific issue requiring longer waits
+"""
+return last_delay * 2
+
def command_was_canceled(self):
self.customServiceOrchestrator
def on_background_command_complete_callback(self, process_condenced_result,
handle):
http://git-wip-us.apache.org/repos/asf/ambari/blob/c254db4b/ambari-agent/src/main/python/ambari_agent/CustomServiceOrchestrator.py
--
diff --git
a/ambari-agent/src/main/python/ambari_agent/CustomServiceOrchestrator.py
b/ambari-agent/src/main/python/ambari_agent/CustomServiceOrchestrator.py
index 72fb0af..
ambari git commit: AMBARI-8320. configs.sh doConfigFileUpdate fails when multiple occurrences of word "properties" found (dlysnichenko)
Repository: ambari
Updated Branches:
refs/heads/trunk e1ccd2f11 -> 91eb6961e
AMBARI-8320. configs.sh doConfigFileUpdate fails when multiple occurrences of
word "properties" found (dlysnichenko)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/91eb6961
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/91eb6961
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/91eb6961
Branch: refs/heads/trunk
Commit: 91eb6961ef508a06659a5ce4c1acfd803e6502fd
Parents: e1ccd2f
Author: Lisnichenko Dmitro
Authored: Tue Apr 21 21:36:54 2015 +0300
Committer: Lisnichenko Dmitro
Committed: Tue Apr 21 21:36:54 2015 +0300
--
ambari-server/src/main/resources/scripts/configs.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/91eb6961/ambari-server/src/main/resources/scripts/configs.sh
--
diff --git a/ambari-server/src/main/resources/scripts/configs.sh
b/ambari-server/src/main/resources/scripts/configs.sh
index 0c5cbc0..a32ff42 100755
--- a/ambari-server/src/main/resources/scripts/configs.sh
+++ b/ambari-server/src/main/resources/scripts/configs.sh
@@ -178,7 +178,7 @@ doConfigUpdate () {
doConfigFileUpdate () {
FILENAME=$1
if [ -f $FILENAME ]; then
-if [ "1" == "`grep -n \"\\\"properties\\\"\" $FILENAME | cut -d : -f 1`"
]; then
+if [ "1" == "$(grep -En ^\"properties\" $FILENAME | cut -d : -f 1)" ]; then
newTag=`date "+%s%N"`
newTag="version${newTag}"
newProperties=`cat $FILENAME`;
ambari git commit: AMBARI-10633. Not possible to write xPath fo "Rack" element in "Summary" panel on hosts summary page. (akovalenko)
Repository: ambari
Updated Branches:
refs/heads/trunk 5d4fb3177 -> e1ccd2f11
AMBARI-10633. Not possible to write xPath fo "Rack" element in "Summary" panel
on hosts summary page. (akovalenko)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/e1ccd2f1
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/e1ccd2f1
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/e1ccd2f1
Branch: refs/heads/trunk
Commit: e1ccd2f11b5593b26e8339a4eeef0e2c678e4bd0
Parents: 5d4fb31
Author: Aleksandr Kovalenko
Authored: Tue Apr 21 19:52:10 2015 +0300
Committer: Aleksandr Kovalenko
Committed: Tue Apr 21 20:20:38 2015 +0300
--
ambari-web/app/templates/main/host/summary.hbs | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/e1ccd2f1/ambari-web/app/templates/main/host/summary.hbs
--
diff --git a/ambari-web/app/templates/main/host/summary.hbs
b/ambari-web/app/templates/main/host/summary.hbs
index abb67ba..28f2989 100644
--- a/ambari-web/app/templates/main/host/summary.hbs
+++ b/ambari-web/app/templates/main/host/summary.hbs
@@ -134,8 +134,8 @@
{{t
common.ipAddress}}:
{{view.content.ip}}
-{{t common.rack}}:
- {{view.content.rack}}
+{{t common.rack}}:
+ {{view.content.rack}}
{{t common.os}}:
{{view.content.osType}} ({{view.content.osArch}})
ambari git commit: AMBARI-10634 - service_config_versions endpoint returns invalid group_id for default config group (jonathanhurley)
Repository: ambari
Updated Branches:
refs/heads/trunk 6035a891c -> 5d4fb3177
AMBARI-10634 - service_config_versions endpoint returns invalid group_id for
default config group (jonathanhurley)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/5d4fb317
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/5d4fb317
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/5d4fb317
Branch: refs/heads/trunk
Commit: 5d4fb317764cfde48898377975f1df17b20e40a4
Parents: 6035a89
Author: Jonathan Hurley
Authored: Tue Apr 21 12:54:52 2015 -0400
Committer: Jonathan Hurley
Committed: Tue Apr 21 13:18:58 2015 -0400
--
.../ambari/server/controller/ServiceConfigVersionResponse.java | 2 +-
.../java/org/apache/ambari/server/state/cluster/ClusterTest.java | 2 ++
2 files changed, 3 insertions(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/5d4fb317/ambari-server/src/main/java/org/apache/ambari/server/controller/ServiceConfigVersionResponse.java
--
diff --git
a/ambari-server/src/main/java/org/apache/ambari/server/controller/ServiceConfigVersionResponse.java
b/ambari-server/src/main/java/org/apache/ambari/server/controller/ServiceConfigVersionResponse.java
index b478be8..486d349 100644
---
a/ambari-server/src/main/java/org/apache/ambari/server/controller/ServiceConfigVersionResponse.java
+++
b/ambari-server/src/main/java/org/apache/ambari/server/controller/ServiceConfigVersionResponse.java
@@ -89,7 +89,7 @@ public class ServiceConfigVersionResponse {
userName = serviceConfigEntity.getUser();
createTime = serviceConfigEntity.getCreateTimestamp();
note = serviceConfigEntity.getNote();
-groupId = serviceConfigEntity.getGroupId();
+groupId = (null != serviceConfigEntity.getGroupId() ?
serviceConfigEntity.getGroupId(): -1L);
groupName = configGroupName;
hosts = serviceConfigEntity.getHostNames();
http://git-wip-us.apache.org/repos/asf/ambari/blob/5d4fb317/ambari-server/src/test/java/org/apache/ambari/server/state/cluster/ClusterTest.java
--
diff --git
a/ambari-server/src/test/java/org/apache/ambari/server/state/cluster/ClusterTest.java
b/ambari-server/src/test/java/org/apache/ambari/server/state/cluster/ClusterTest.java
index 6cd50d8..e076d4e 100644
---
a/ambari-server/src/test/java/org/apache/ambari/server/state/cluster/ClusterTest.java
+++
b/ambari-server/src/test/java/org/apache/ambari/server/state/cluster/ClusterTest.java
@@ -964,6 +964,8 @@ public class ClusterTest {
Assert.assertEquals("HDFS", hdfsResponse.getServiceName());
Assert.assertEquals("c1", hdfsResponse.getClusterName());
Assert.assertEquals("admin", hdfsResponse.getUserName());
+Assert.assertEquals("default", hdfsResponse.getGroupName());
+Assert.assertEquals(Long.valueOf(-1), hdfsResponse.getGroupId());
Assert.assertEquals(Long.valueOf(1), hdfsResponse.getVersion());
c1.addDesiredConfig("admin", Collections.singleton(config2));
ambari git commit: AMBARI-10503: Ambari-Ranger Stack changes to add Solr audit db support (Gautam Borad via jluniya)
Repository: ambari
Updated Branches:
refs/heads/trunk b9662cef6 -> 6035a891c
AMBARI-10503: Ambari-Ranger Stack changes to add Solr audit db support (Gautam
Borad via jluniya)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/6035a891
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/6035a891
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/6035a891
Branch: refs/heads/trunk
Commit: 6035a891c2ea718c147e9304e6090d50a6e362d9
Parents: b9662ce
Author: Jayush Luniya
Authored: Tue Apr 21 10:15:16 2015 -0700
Committer: Jayush Luniya
Committed: Tue Apr 21 10:15:16 2015 -0700
--
.../0.96.0.2.0/package/scripts/params_linux.py | 7 +++
.../package/scripts/setup_ranger_hbase.py | 6 +++
.../2.1.0.2.0/package/scripts/params_linux.py | 6 +++
.../package/scripts/setup_ranger_hdfs.py| 8 +++-
.../0.12.0.2.0/package/scripts/params_linux.py | 6 +++
.../package/scripts/setup_ranger_hive.py| 7 +++
.../KNOX/0.5.0.2.2/package/scripts/params.py| 6 +++
.../package/scripts/setup_ranger_knox.py| 7 +++
.../0.9.1.2.1/package/scripts/params_linux.py | 6 +++
.../package/scripts/setup_ranger_storm.py | 7 +++
.../ranger-hbase-plugin-properties.xml | 47
.../ranger-hdfs-plugin-properties.xml | 47
.../ranger-hive-plugin-properties.xml | 47
.../ranger-knox-plugin-properties.xml | 47
.../RANGER/configuration/admin-properties.xml | 36 +++
.../ranger-storm-plugin-properties.xml | 47
16 files changed, 336 insertions(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/6035a891/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/package/scripts/params_linux.py
--
diff --git
a/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/package/scripts/params_linux.py
b/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/package/scripts/params_linux.py
index ab21537..eafcd89 100644
---
a/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/package/scripts/params_linux.py
+++
b/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/package/scripts/params_linux.py
@@ -253,3 +253,10 @@ downloaded_custom_connector =
format("{exec_tmp_dir}/{jdbc_jar_name}")
driver_curl_source = format("{jdk_location}/{jdbc_symlink_name}")
driver_curl_target = format("{java_share_dir}/{jdbc_jar_name}")
+
+#Solr properties added for HDP2.3 - Ranger
+solr_enabled =
default("/configurations/ranger-hbase-plugin-properties/XAAUDIT.SOLR.IS_ENABLED",
"false")
+solr_max_queue_size =
default("/configurations/ranger-hbase-plugin-properties/XAAUDIT.SOLR.MAX_QUEUE_SIZE",
"1")
+solr_max_flush_interval =
default("/configurations/ranger-hbase-plugin-properties/XAAUDIT.SOLR.MAX_FLUSH_INTERVAL_MS",
"1000")
+solr_url =
default("/configurations/ranger-hbase-plugin-properties/XAAUDIT.SOLR.SOLR_URL",
"http://localhost:6083/solr/ranger_audits";)
+
http://git-wip-us.apache.org/repos/asf/ambari/blob/6035a891/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/package/scripts/setup_ranger_hbase.py
--
diff --git
a/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/package/scripts/setup_ranger_hbase.py
b/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/package/scripts/setup_ranger_hbase.py
index 7626de8..5f7a830 100644
---
a/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/package/scripts/setup_ranger_hbase.py
+++
b/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/package/scripts/setup_ranger_hbase.py
@@ -26,6 +26,7 @@ import os
from resource_management import *
from resource_management.libraries.functions.ranger_functions import
Rangeradmin
from resource_management.core.logger import Logger
+from resource_management.libraries.functions.version import
format_hdp_stack_version, compare_versions
def setup_ranger_hbase():
import params
@@ -166,6 +167,11 @@ def ranger_hbase_properties():
ranger_hbase_properties['SSL_KEYSTORE_PASSWORD'] =
params.ssl_keystore_password
ranger_hbase_properties['SSL_TRUSTSTORE_FILE_PATH'] =
params.ssl_truststore_file
ranger_hbase_properties['SSL_TRUSTSTORE_PASSWORD'] =
params.ssl_truststore_password
+ if params.hdp_stack_version != "" and
compare_versions(params.hdp_stack_version, '2.3') >= 0:
+ranger_hbase_properties['XAAUDIT.SOLR.IS_ENABLED'] =
str(params.solr_enabled).lower()
+ranger_hbase_properties['XAAUDIT.SOLR.MAX_QUEUE_SIZE'] =
params.solr_max_queue_size
+
[1/2] ambari git commit: revert AMBARI-10630. Empty config category should be hidden on Advanced config tab.
Repository: ambari
Updated Branches:
refs/heads/trunk 67c425acf -> b9662cef6
revert AMBARI-10630. Empty config category should be hidden on Advanced config
tab.
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/e463d275
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/e463d275
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/e463d275
Branch: refs/heads/trunk
Commit: e463d2758874f8ec9ade547b0e302247c841ef0e
Parents: 0c428eb
Author: aBabiichuk
Authored: Tue Apr 21 19:54:51 2015 +0300
Committer: aBabiichuk
Committed: Tue Apr 21 19:54:51 2015 +0300
--
.../configs/service_configs_by_category_view.js | 7 +-
.../service_configs_by_category_view_test.js| 90
2 files changed, 2 insertions(+), 95 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/e463d275/ambari-web/app/views/common/configs/service_configs_by_category_view.js
--
diff --git
a/ambari-web/app/views/common/configs/service_configs_by_category_view.js
b/ambari-web/app/views/common/configs/service_configs_by_category_view.js
index 3153cf5..ca8a1e5 100644
--- a/ambari-web/app/views/common/configs/service_configs_by_category_view.js
+++ b/ambari-web/app/views/common/configs/service_configs_by_category_view.js
@@ -79,11 +79,8 @@ App.ServiceConfigsByCategoryView =
Em.View.extend(App.UserPref, App.ConfigOverri
* @type {boolean}
*/
isShowBlock: function () {
-var isCustomPropertiesCategory = this.get('category.customCanAddProperty');
-var emptyFiltered =
this.get('categoryConfigs').filterProperty('isHiddenByFilter', false).length >
0;
-var isWidgetsOnlyCategory = this.get('categoryConfigs.length') ==
this.get('categoryConfigs').filterProperty('widget').length;
-return isCustomPropertiesCategory || (emptyFiltered &&
!isWidgetsOnlyCategory);
- }.property('category.customCanAddProperty',
'categoryConfigs.@each.isHiddenByFilter', 'categoryConfigs.@each.widget'),
+return this.get('category.customCanAddProperty') ||
this.get('categoryConfigs').filterProperty('isHiddenByFilter', false).length >
0;
+ }.property('category.customCanAddProperty',
'categoryConfigs.@each.isHiddenByFilter'),
/**
* Re-order the configs to list content displayType properties at last in
the category
http://git-wip-us.apache.org/repos/asf/ambari/blob/e463d275/ambari-web/test/views/common/configs/service_configs_by_category_view_test.js
--
diff --git
a/ambari-web/test/views/common/configs/service_configs_by_category_view_test.js
b/ambari-web/test/views/common/configs/service_configs_by_category_view_test.js
index 6505cf0..16ea8b6 100644
---
a/ambari-web/test/views/common/configs/service_configs_by_category_view_test.js
+++
b/ambari-web/test/views/common/configs/service_configs_by_category_view_test.js
@@ -278,96 +278,6 @@ describe('App.ServiceConfigsByCategoryView', function () {
});
});
-describe('#isShowBlock', function() {
- var tests = [
-{
- categoryConfigs: Em.A([
-{ isHiddenByFilter: false }
- ]),
- category: {},
- m: 'no configs with widget, filtered properties are visible. Panel
should be shown',
- e: true
-},
-{
- categoryConfigs: Em.A([]),
- category: Em.Object.create({ customCanAddProperty: true}),
- m: 'Category with custom properties. Panel should be shown',
- e: true
-},
-{
- categoryConfigs: Em.A([
-{ isHiddenByFilter: false }
- ]),
- category: Em.Object.create({ customCanAddProperty: true}),
- m: 'Category with custom properties. Filtered configs are hidden.
Panel should be shown',
- e: true
-},
-{
- categoryConfigs: Em.A([
-{ isHiddenByFilter: true }
- ]),
- category: Em.Object.create({ customCanAddProperty: false }),
- m: 'Filtered configs are hidden. Category not for custom properties.
Panel should be hidden',
- e: false
-},
-{
- categoryConfigs: Em.A([]),
- category: Em.Object.create({ customCanAddProperty: false }),
- m: 'Category without properties and not for custom configurations.
Panel should be hidden',
- e: false
-},
-{
- categoryConfigs: Em.A([
-{ widget: {someProp: 'a'}},
-{ widget: {someProp: 'b'}}
- ]),
- category: Em.Object.create({ customCanAddProperty: false }),
- m: 'All properties have widgets and category is not custom. Panel
should be hidden',
- e: false
-},
-
[2/2] ambari git commit: Merge remote-tracking branch 'origin/trunk' into trunk
Merge remote-tracking branch 'origin/trunk' into trunk Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/b9662cef Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/b9662cef Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/b9662cef Branch: refs/heads/trunk Commit: b9662cef66d5e4a5b53405dab40e9d17eafeb966 Parents: e463d27 67c425a Author: aBabiichuk Authored: Tue Apr 21 19:55:14 2015 +0300 Committer: aBabiichuk Committed: Tue Apr 21 19:55:14 2015 +0300 -- .../ambari-metrics-timelineservice/pom.xml | 1 + .../timeline/HBaseTimelineMetricStore.java | 40 ++-- .../metrics/timeline/PhoenixHBaseAccessor.java | 144 ++-- .../metrics/timeline/Precision.java | 6 +- .../timeline/TimelineMetricConfiguration.java | 29 ++- .../aggregators/AbstractTimelineAggregator.java | 58 - .../TimelineClusterMetricReader.java| 42 .../aggregators/TimelineMetricAggregator.java | 151 ++-- .../TimelineMetricAggregatorFactory.java| 188 ++- .../TimelineMetricClusterAggregator.java| 235 ++- .../TimelineMetricClusterAggregatorHourly.java | 175 -- .../TimelineMetricClusterAggregatorMinute.java | 201 .../TimelineMetricHostAggregator.java | 113 + .../aggregators/TimelineMetricReadHelper.java | 36 +++ .../timeline/query/PhoenixTransactSQL.java | 82 --- .../timeline/AbstractMiniHBaseClusterTest.java | 5 +- .../metrics/timeline/ITClusterAggregator.java | 99 ++-- .../metrics/timeline/ITMetricAggregator.java| 82 ++- .../timeline/ITPhoenixHBaseAccessor.java| 34 ++- .../metrics/timeline/MetricTestHelper.java | 7 +- .../timeline/TestMetricHostAggregate.java | 4 +- .../0.1.0/configuration/ams-site.xml| 70 +- .../2.0.6/hooks/before-ANY/scripts/params.py| 2 + .../before-ANY/scripts/shared_initialization.py | 38 ++- .../2.3/services/TEZ/configuration/tez-site.xml | 28 +++ .../rangerAdmin/step1_controller.js | 26 +- .../rangerAdmin/wizard_controller.js| 2 + ambari-web/app/controllers/wizard.js| 30 ++- ambari-web/app/messages.js | 7 + .../app/routes/ra_high_availability_routes.js | 9 +- .../highAvailability/rangerAdmin/step1.hbs | 21 +- ambari-web/app/utils/validator.js | 10 + ambari-web/test/controllers/wizard_test.js | 45 ambari-web/test/utils/validator_test.js | 17 ++ 34 files changed, 1280 insertions(+), 757 deletions(-) --
[1/2] ambari git commit: AMBARI-10622. Add daily aggregation to AMS (useful for reporting over months of data). (swagle)
Repository: ambari
Updated Branches:
refs/heads/trunk 2557d9a8f -> 67c425acf
http://git-wip-us.apache.org/repos/asf/ambari/blob/67c425ac/ambari-metrics/ambari-metrics-timelineservice/src/main/java/org/apache/hadoop/yarn/server/applicationhistoryservice/metrics/timeline/aggregators/TimelineMetricClusterAggregatorMinute.java
--
diff --git
a/ambari-metrics/ambari-metrics-timelineservice/src/main/java/org/apache/hadoop/yarn/server/applicationhistoryservice/metrics/timeline/aggregators/TimelineMetricClusterAggregatorMinute.java
b/ambari-metrics/ambari-metrics-timelineservice/src/main/java/org/apache/hadoop/yarn/server/applicationhistoryservice/metrics/timeline/aggregators/TimelineMetricClusterAggregatorMinute.java
new file mode 100644
index 000..293608e
--- /dev/null
+++
b/ambari-metrics/ambari-metrics-timelineservice/src/main/java/org/apache/hadoop/yarn/server/applicationhistoryservice/metrics/timeline/aggregators/TimelineMetricClusterAggregatorMinute.java
@@ -0,0 +1,201 @@
+/**
+ * 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.hadoop.yarn.server.applicationhistoryservice.metrics.timeline.aggregators;
+
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.apache.hadoop.conf.Configuration;
+import org.apache.hadoop.metrics2.sink.timeline.TimelineMetric;
+import
org.apache.hadoop.yarn.server.applicationhistoryservice.metrics.timeline.PhoenixHBaseAccessor;
+import
org.apache.hadoop.yarn.server.applicationhistoryservice.metrics.timeline.query.Condition;
+import
org.apache.hadoop.yarn.server.applicationhistoryservice.metrics.timeline.query.DefaultCondition;
+import
org.apache.hadoop.yarn.server.applicationhistoryservice.metrics.timeline.query.PhoenixTransactSQL;
+import java.io.IOException;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import static
org.apache.hadoop.yarn.server.applicationhistoryservice.metrics.timeline.query.PhoenixTransactSQL.GET_METRIC_SQL;
+import static
org.apache.hadoop.yarn.server.applicationhistoryservice.metrics.timeline.query.PhoenixTransactSQL.METRICS_CLUSTER_AGGREGATE_TABLE_NAME;
+import static
org.apache.hadoop.yarn.server.applicationhistoryservice.metrics.timeline.query.PhoenixTransactSQL.METRICS_RECORD_TABLE_NAME;
+import static
org.apache.hadoop.yarn.server.applicationhistoryservice.metrics.timeline.query.PhoenixTransactSQL.NATIVE_TIME_RANGE_DELTA;
+
+/**
+ * Aggregates a metric across all hosts in the cluster. Reads metrics from
+ * the precision table and saves into the aggregate.
+ */
+public class TimelineMetricClusterAggregatorMinute extends
AbstractTimelineAggregator {
+ private static final Log LOG =
LogFactory.getLog(TimelineMetricClusterAggregatorMinute.class);
+ public Long timeSliceIntervalMillis;
+ private TimelineMetricReadHelper timelineMetricReadHelper = new
TimelineMetricReadHelper(true);
+ // Aggregator to perform app-level aggregates for host metrics
+ private final TimelineMetricAppAggregator appAggregator;
+
+ public TimelineMetricClusterAggregatorMinute(PhoenixHBaseAccessor
hBaseAccessor,
+ Configuration metricsConf,
+ String checkpointLocation,
+ Long sleepIntervalMillis,
+ Integer
checkpointCutOffMultiplier,
+ String aggregatorDisabledParam,
+ String tableName,
+ String outputTableName,
+ Long nativeTimeRangeDelay,
+ Long timeSliceInterval) {
+super(hBaseAccessor, metricsConf, checkpointLocation, sleepIntervalMillis,
+ checkpointCutOffMultiplier, aggregatorDisabledParam, tableName,
+ outputTableName, nativeTimeRangeDelay);
+
+appAggregator = new TimelineMetricAppAggregator(metricsConf);
+this.tim
[2/2] ambari git commit: AMBARI-10622. Add daily aggregation to AMS (useful for reporting over months of data). (swagle)
AMBARI-10622. Add daily aggregation to AMS (useful for reporting over months of data). (swagle) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/67c425ac Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/67c425ac Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/67c425ac Branch: refs/heads/trunk Commit: 67c425acfd22dcd701d05eab16f22d423db045dd Parents: 2557d9a Author: Siddharth Wagle Authored: Tue Apr 21 09:51:58 2015 -0700 Committer: Siddharth Wagle Committed: Tue Apr 21 09:51:58 2015 -0700 -- .../ambari-metrics-timelineservice/pom.xml | 1 + .../timeline/HBaseTimelineMetricStore.java | 40 ++-- .../metrics/timeline/PhoenixHBaseAccessor.java | 144 ++-- .../metrics/timeline/Precision.java | 6 +- .../timeline/TimelineMetricConfiguration.java | 29 ++- .../aggregators/AbstractTimelineAggregator.java | 58 - .../TimelineClusterMetricReader.java| 42 .../aggregators/TimelineMetricAggregator.java | 151 ++-- .../TimelineMetricAggregatorFactory.java| 188 ++- .../TimelineMetricClusterAggregator.java| 235 ++- .../TimelineMetricClusterAggregatorHourly.java | 175 -- .../TimelineMetricClusterAggregatorMinute.java | 201 .../TimelineMetricHostAggregator.java | 113 + .../aggregators/TimelineMetricReadHelper.java | 36 +++ .../timeline/query/PhoenixTransactSQL.java | 82 --- .../timeline/AbstractMiniHBaseClusterTest.java | 5 +- .../metrics/timeline/ITClusterAggregator.java | 99 ++-- .../metrics/timeline/ITMetricAggregator.java| 82 ++- .../timeline/ITPhoenixHBaseAccessor.java| 34 ++- .../metrics/timeline/MetricTestHelper.java | 7 +- .../timeline/TestMetricHostAggregate.java | 4 +- .../0.1.0/configuration/ams-site.xml| 70 +- 22 files changed, 1065 insertions(+), 737 deletions(-) -- http://git-wip-us.apache.org/repos/asf/ambari/blob/67c425ac/ambari-metrics/ambari-metrics-timelineservice/pom.xml -- diff --git a/ambari-metrics/ambari-metrics-timelineservice/pom.xml b/ambari-metrics/ambari-metrics-timelineservice/pom.xml index 4ec730e..2485661 100644 --- a/ambari-metrics/ambari-metrics-timelineservice/pom.xml +++ b/ambari-metrics/ambari-metrics-timelineservice/pom.xml @@ -249,6 +249,7 @@ true always + -XX:-UseSplitVerifier http://git-wip-us.apache.org/repos/asf/ambari/blob/67c425ac/ambari-metrics/ambari-metrics-timelineservice/src/main/java/org/apache/hadoop/yarn/server/applicationhistoryservice/metrics/timeline/HBaseTimelineMetricStore.java -- diff --git a/ambari-metrics/ambari-metrics-timelineservice/src/main/java/org/apache/hadoop/yarn/server/applicationhistoryservice/metrics/timeline/HBaseTimelineMetricStore.java b/ambari-metrics/ambari-metrics-timelineservice/src/main/java/org/apache/hadoop/yarn/server/applicationhistoryservice/metrics/timeline/HBaseTimelineMetricStore.java index 1fac404..447f6f9 100644 --- a/ambari-metrics/ambari-metrics-timelineservice/src/main/java/org/apache/hadoop/yarn/server/applicationhistoryservice/metrics/timeline/HBaseTimelineMetricStore.java +++ b/ambari-metrics/ambari-metrics-timelineservice/src/main/java/org/apache/hadoop/yarn/server/applicationhistoryservice/metrics/timeline/HBaseTimelineMetricStore.java @@ -28,8 +28,6 @@ import org.apache.hadoop.yarn.api.records.timeline.TimelinePutResponse; import org.apache.hadoop.yarn.server.applicationhistoryservice.metrics.timeline.aggregators.Function; import org.apache.hadoop.yarn.server.applicationhistoryservice.metrics.timeline.aggregators.TimelineMetricAggregator; import org.apache.hadoop.yarn.server.applicationhistoryservice.metrics.timeline.aggregators.TimelineMetricAggregatorFactory; -import org.apache.hadoop.yarn.server.applicationhistoryservice.metrics.timeline.aggregators.TimelineMetricClusterAggregator; -import org.apache.hadoop.yarn.server.applicationhistoryservice.metrics.timeline.aggregators.TimelineMetricClusterAggregatorHourly; import org.apache.hadoop.yarn.server.applicationhistoryservice.metrics.timeline.query.Condition; import org.apache.hadoop.yarn.server.applicationhistoryservice.metrics.timeline.query.DefaultCondition; @@ -69,39 +67,53 @@ public class HBaseTimelineMetricStore extends AbstractService hBaseAccessor = new PhoenixHBaseAccessor(hbaseConf, metricsConf); hBaseAccessor.initMetricSchema(); -// Start the cluster aggregator -TimelineMetricClusterAggregator minuteClusterAggregator = - new TimelineMetricClu
ambari git commit: AMBARI-10631. Add logic for handling configuration for tez acls in Ambari (aonishuk)
Repository: ambari
Updated Branches:
refs/heads/trunk 0c428ebae -> 2dd2548f3
AMBARI-10631. Add logic for handling configuration for tez acls in Ambari
(aonishuk)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/2dd2548f
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/2dd2548f
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/2dd2548f
Branch: refs/heads/trunk
Commit: 2dd2548f33c7befe09ea2d3275e2dea2eec8e957
Parents: 0c428eb
Author: Andrew Onishuk
Authored: Tue Apr 21 19:08:34 2015 +0300
Committer: Andrew Onishuk
Committed: Tue Apr 21 19:08:34 2015 +0300
--
.../2.0.6/hooks/before-ANY/scripts/params.py| 2 ++
.../before-ANY/scripts/shared_initialization.py | 38 ++--
.../2.3/services/TEZ/configuration/tez-site.xml | 28 +++
3 files changed, 57 insertions(+), 11 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/2dd2548f/ambari-server/src/main/resources/stacks/HDP/2.0.6/hooks/before-ANY/scripts/params.py
--
diff --git
a/ambari-server/src/main/resources/stacks/HDP/2.0.6/hooks/before-ANY/scripts/params.py
b/ambari-server/src/main/resources/stacks/HDP/2.0.6/hooks/before-ANY/scripts/params.py
index 83ffd64..6ccc1f8 100644
---
a/ambari-server/src/main/resources/stacks/HDP/2.0.6/hooks/before-ANY/scripts/params.py
+++
b/ambari-server/src/main/resources/stacks/HDP/2.0.6/hooks/before-ANY/scripts/params.py
@@ -180,3 +180,5 @@ user_to_gid_dict =
collections.defaultdict(lambda:user_group)
user_list = json.loads(config['hostLevelParams']['user_list'])
group_list = json.loads(config['hostLevelParams']['group_list'])
+
+tez_am_view_acls = config['configurations']['tez-site']["tez.am.view-acls"]
http://git-wip-us.apache.org/repos/asf/ambari/blob/2dd2548f/ambari-server/src/main/resources/stacks/HDP/2.0.6/hooks/before-ANY/scripts/shared_initialization.py
--
diff --git
a/ambari-server/src/main/resources/stacks/HDP/2.0.6/hooks/before-ANY/scripts/shared_initialization.py
b/ambari-server/src/main/resources/stacks/HDP/2.0.6/hooks/before-ANY/scripts/shared_initialization.py
index 652e232..10ed36e 100644
---
a/ambari-server/src/main/resources/stacks/HDP/2.0.6/hooks/before-ANY/scripts/shared_initialization.py
+++
b/ambari-server/src/main/resources/stacks/HDP/2.0.6/hooks/before-ANY/scripts/shared_initialization.py
@@ -20,7 +20,7 @@ limitations under the License.
import os
import re
from copy import copy
-
+from resource_management.libraries.functions.version import compare_versions
from resource_management import *
@@ -88,6 +88,8 @@ def setup_users():
if params.has_namenode:
create_dfs_cluster_admins()
+ if params.has_tez and params.hdp_stack_version != "" and
compare_versions(params.hdp_stack_version, '2.3') >= 0:
+ create_tez_am_view_acls()
def create_dfs_cluster_admins():
"""
@@ -95,7 +97,28 @@ def create_dfs_cluster_admins():
"""
import params
- parts = re.split('\s', params.dfs_cluster_administrators_group)
+ groups_list =
create_users_and_groups(params.dfs_cluster_administrators_group)
+
+ User(params.hdfs_user,
+groups = params.user_to_groups_dict[params.hdfs_user] + groups_list,
+ignore_failures = params.ignore_groupsusers_create
+ )
+
+def create_tez_am_view_acls():
+
+ """
+ tez.am.view-acls support format
+ """
+ import params
+
+ if not params.tez_am_view_acls.startswith("*"):
+create_users_and_groups(params.tez_am_view_acls)
+
+def create_users_and_groups(user_and_groups):
+
+ import params
+
+ parts = re.split('\s', user_and_groups)
if len(parts) == 1:
parts.append("")
@@ -109,16 +132,9 @@ def create_dfs_cluster_admins():
if groups_list:
Group(copy(groups_list),
- ignore_failures = params.ignore_groupsusers_create
+ ignore_failures = params.ignore_groupsusers_create
)
-
- User(params.hdfs_user,
-groups = params.user_to_groups_dict[params.hdfs_user] + groups_list,
-ignore_failures = params.ignore_groupsusers_create
- )
-
-
-
+ return groups_list
def set_uid(user, user_dirs):
"""
http://git-wip-us.apache.org/repos/asf/ambari/blob/2dd2548f/ambari-server/src/main/resources/stacks/HDP/2.3/services/TEZ/configuration/tez-site.xml
--
diff --git
a/ambari-server/src/main/resources/stacks/HDP/2.3/services/TEZ/configuration/tez-site.xml
b/ambari-server/src/main/resources/stacks/HDP/2.3/services/TEZ/configuration/tez-site.xml
new file mode 100644
index 000..660b44b
--- /dev/null
+++
b/ambari-server/src/main/resources/stacks/HDP/2.3/services/TEZ/configuration/tez-site.xml
@@ -0,0 +1,28 @@
+
+
+
+
+
+
ambari git commit: AMBARI-10632. Ranger Admin HA Wizard: Get Started step. (akovalenko)
Repository: ambari
Updated Branches:
refs/heads/trunk 2dd2548f3 -> 2557d9a8f
AMBARI-10632. Ranger Admin HA Wizard: Get Started step. (akovalenko)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/2557d9a8
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/2557d9a8
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/2557d9a8
Branch: refs/heads/trunk
Commit: 2557d9a8fb7d9e2f7fe3b2e0deb5b5bec0d14dc1
Parents: 2dd2548
Author: Aleksandr Kovalenko
Authored: Tue Apr 21 18:44:14 2015 +0300
Committer: Aleksandr Kovalenko
Committed: Tue Apr 21 19:11:19 2015 +0300
--
.../rangerAdmin/step1_controller.js | 26 ++-
.../rangerAdmin/wizard_controller.js| 2 +
ambari-web/app/controllers/wizard.js| 30 +++--
ambari-web/app/messages.js | 7 +++
.../app/routes/ra_high_availability_routes.js | 9 ++--
.../highAvailability/rangerAdmin/step1.hbs | 21 -
ambari-web/app/utils/validator.js | 10 +
ambari-web/test/controllers/wizard_test.js | 45
ambari-web/test/utils/validator_test.js | 17
9 files changed, 158 insertions(+), 9 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/2557d9a8/ambari-web/app/controllers/main/admin/highAvailability/rangerAdmin/step1_controller.js
--
diff --git
a/ambari-web/app/controllers/main/admin/highAvailability/rangerAdmin/step1_controller.js
b/ambari-web/app/controllers/main/admin/highAvailability/rangerAdmin/step1_controller.js
index d431ec9..32e0dff 100644
---
a/ambari-web/app/controllers/main/admin/highAvailability/rangerAdmin/step1_controller.js
+++
b/ambari-web/app/controllers/main/admin/highAvailability/rangerAdmin/step1_controller.js
@@ -17,8 +17,32 @@
*/
var App = require('app');
+var validator = require('utils/validator');
App.RAHighAvailabilityWizardStep1Controller = Em.Controller.extend({
- name: "rAHighAvailabilityWizardStep1Controller"
+ name: "rAHighAvailabilityWizardStep1Controller",
+
+ /**
+ * Define if typed load balancer URL is valid URL
+ * @type {Boolean}
+ */
+ isloadBalancerURLValid: function () {
+return validator.isValidURL(this.get('content.loadBalancerURL'));
+ }.property('content.loadBalancerURL'),
+
+ /**
+ * Define if show load balancer URL error
+ * do not show is input-field is empty
+ * @type {Boolean}
+ */
+ showloadBalancerURLError: function () {
+return this.get('content.loadBalancerURL') &&
!this.get('isloadBalancerURLValid');
+ }.property('isloadBalancerURLValid', 'content.loadBalancerURL'),
+
+ /**
+ * Define either Submit is disabled or enabled
+ * @type {Bolean}
+ */
+ isSubmitDisabled: Ember.computed.not('isloadBalancerURLValid')
});
http://git-wip-us.apache.org/repos/asf/ambari/blob/2557d9a8/ambari-web/app/controllers/main/admin/highAvailability/rangerAdmin/wizard_controller.js
--
diff --git
a/ambari-web/app/controllers/main/admin/highAvailability/rangerAdmin/wizard_controller.js
b/ambari-web/app/controllers/main/admin/highAvailability/rangerAdmin/wizard_controller.js
index ebfb2ee..5638c87 100644
---
a/ambari-web/app/controllers/main/admin/highAvailability/rangerAdmin/wizard_controller.js
+++
b/ambari-web/app/controllers/main/admin/highAvailability/rangerAdmin/wizard_controller.js
@@ -30,6 +30,7 @@ App.RAHighAvailabilityWizardController =
App.WizardController.extend({
content: Em.Object.create({
controllerName: 'rAHighAvailabilityWizardController',
cluster: null,
+loadBalancerURL: null,
hosts: null,
services: null,
masterComponentHosts: null
@@ -59,6 +60,7 @@ App.RAHighAvailabilityWizardController =
App.WizardController.extend({
type: 'sync',
callback: function () {
this.load('cluster');
+ this.load('loadBalancerURL');
}
}
],
http://git-wip-us.apache.org/repos/asf/ambari/blob/2557d9a8/ambari-web/app/controllers/wizard.js
--
diff --git a/ambari-web/app/controllers/wizard.js
b/ambari-web/app/controllers/wizard.js
index d1148a9..5e30777 100644
--- a/ambari-web/app/controllers/wizard.js
+++ b/ambari-web/app/controllers/wizard.js
@@ -307,6 +307,30 @@ App.WizardController =
Em.Controller.extend(App.LocalStorage, App.ThemesMappingM
},
/**
+ * Convert any object or array to pure JS instance without inherit properties
+ * It is used to convert Ember.Object to pure JS Object and Ember.Array to
pure JS Array
+ * @param originalInstance
+ * @returns {*}
+ */
+ toJSInstance: function (originalInstance) {
+
ambari git commit: AMBARI-10630. Empty config category should be hidden on Advanced config tab. (onechiporenko)
Repository: ambari
Updated Branches:
refs/heads/trunk c136edff1 -> 0c428ebae
AMBARI-10630. Empty config category should be hidden on Advanced config tab.
(onechiporenko)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/0c428eba
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/0c428eba
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/0c428eba
Branch: refs/heads/trunk
Commit: 0c428ebae5f9f2f6a0744df8b8485a2c267ab838
Parents: c136edf
Author: Oleg Nechiporenko
Authored: Tue Apr 21 18:14:55 2015 +0300
Committer: Oleg Nechiporenko
Committed: Tue Apr 21 18:14:55 2015 +0300
--
.../configs/service_configs_by_category_view.js | 7 +-
.../service_configs_by_category_view_test.js| 90
2 files changed, 95 insertions(+), 2 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/0c428eba/ambari-web/app/views/common/configs/service_configs_by_category_view.js
--
diff --git
a/ambari-web/app/views/common/configs/service_configs_by_category_view.js
b/ambari-web/app/views/common/configs/service_configs_by_category_view.js
index ca8a1e5..3153cf5 100644
--- a/ambari-web/app/views/common/configs/service_configs_by_category_view.js
+++ b/ambari-web/app/views/common/configs/service_configs_by_category_view.js
@@ -79,8 +79,11 @@ App.ServiceConfigsByCategoryView =
Em.View.extend(App.UserPref, App.ConfigOverri
* @type {boolean}
*/
isShowBlock: function () {
-return this.get('category.customCanAddProperty') ||
this.get('categoryConfigs').filterProperty('isHiddenByFilter', false).length >
0;
- }.property('category.customCanAddProperty',
'categoryConfigs.@each.isHiddenByFilter'),
+var isCustomPropertiesCategory = this.get('category.customCanAddProperty');
+var emptyFiltered =
this.get('categoryConfigs').filterProperty('isHiddenByFilter', false).length >
0;
+var isWidgetsOnlyCategory = this.get('categoryConfigs.length') ==
this.get('categoryConfigs').filterProperty('widget').length;
+return isCustomPropertiesCategory || (emptyFiltered &&
!isWidgetsOnlyCategory);
+ }.property('category.customCanAddProperty',
'categoryConfigs.@each.isHiddenByFilter', 'categoryConfigs.@each.widget'),
/**
* Re-order the configs to list content displayType properties at last in
the category
http://git-wip-us.apache.org/repos/asf/ambari/blob/0c428eba/ambari-web/test/views/common/configs/service_configs_by_category_view_test.js
--
diff --git
a/ambari-web/test/views/common/configs/service_configs_by_category_view_test.js
b/ambari-web/test/views/common/configs/service_configs_by_category_view_test.js
index 16ea8b6..6505cf0 100644
---
a/ambari-web/test/views/common/configs/service_configs_by_category_view_test.js
+++
b/ambari-web/test/views/common/configs/service_configs_by_category_view_test.js
@@ -278,6 +278,96 @@ describe('App.ServiceConfigsByCategoryView', function () {
});
});
+describe('#isShowBlock', function() {
+ var tests = [
+{
+ categoryConfigs: Em.A([
+{ isHiddenByFilter: false }
+ ]),
+ category: {},
+ m: 'no configs with widget, filtered properties are visible. Panel
should be shown',
+ e: true
+},
+{
+ categoryConfigs: Em.A([]),
+ category: Em.Object.create({ customCanAddProperty: true}),
+ m: 'Category with custom properties. Panel should be shown',
+ e: true
+},
+{
+ categoryConfigs: Em.A([
+{ isHiddenByFilter: false }
+ ]),
+ category: Em.Object.create({ customCanAddProperty: true}),
+ m: 'Category with custom properties. Filtered configs are hidden.
Panel should be shown',
+ e: true
+},
+{
+ categoryConfigs: Em.A([
+{ isHiddenByFilter: true }
+ ]),
+ category: Em.Object.create({ customCanAddProperty: false }),
+ m: 'Filtered configs are hidden. Category not for custom properties.
Panel should be hidden',
+ e: false
+},
+{
+ categoryConfigs: Em.A([]),
+ category: Em.Object.create({ customCanAddProperty: false }),
+ m: 'Category without properties and not for custom configurations.
Panel should be hidden',
+ e: false
+},
+{
+ categoryConfigs: Em.A([
+{ widget: {someProp: 'a'}},
+{ widget: {someProp: 'b'}}
+ ]),
+ category: Em.Object.create({ customCanAddProperty: false }),
+ m: 'All properties have widgets and category is not custom. Panel
should be hidden',
+ e: fa
ambari git commit: AMBARI-10629 'dtnode_heapsize' maximum not being used by the widget. (ababiichuk)
Repository: ambari
Updated Branches:
refs/heads/trunk 8de76e83c -> c136edff1
AMBARI-10629 'dtnode_heapsize' maximum not being used by the widget.
(ababiichuk)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/c136edff
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/c136edff
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/c136edff
Branch: refs/heads/trunk
Commit: c136edff173404c09f7174d85f680ae30d1efd0b
Parents: 8de76e8
Author: aBabiichuk
Authored: Tue Apr 21 17:40:49 2015 +0300
Committer: aBabiichuk
Committed: Tue Apr 21 17:51:55 2015 +0300
--
.../mixins/common/configs/enhanced_configs.js | 43 +++-
1 file changed, 24 insertions(+), 19 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/c136edff/ambari-web/app/mixins/common/configs/enhanced_configs.js
--
diff --git a/ambari-web/app/mixins/common/configs/enhanced_configs.js
b/ambari-web/app/mixins/common/configs/enhanced_configs.js
index 3bd54e8..d2e677e 100644
--- a/ambari-web/app/mixins/common/configs/enhanced_configs.js
+++ b/ambari-web/app/mixins/common/configs/enhanced_configs.js
@@ -444,26 +444,31 @@ App.EnhancedConfigsMixin = Em.Mixin.create({
}
}
}
-
-/**
- * saving new attribute values
- */
-if (configs[key].property_attributes &&
configs[key].property_attributes[propertyName]) {
-
- var stackProperty = App.StackConfigProperty.find(propertyName + '_'
+ key);
- if (stackProperty && stackProperty.get('valueAttributes')) {
-if (configs[key].property_attributes[propertyName].minimum) {
- stackProperty.set('valueAttributes.minimum',
configs[key].property_attributes[propertyName].minimum);
-}
-if (configs[key].property_attributes[propertyName].maximum) {
- stackProperty.set('valueAttributes.maximum',
configs[key].property_attributes[propertyName].maximum);
-}
-if (configs[key].property_attributes[propertyName].increment_step)
{
- stackProperty.set('valueAttributes.increment_step',
configs[key].property_attributes[propertyName].increment_step);
-}
- }
-}
}
+ this._saveRecommendedAttributes(configs);
}
+ },
+
+ /**
+ * Save property attributes recieved from recommendations. These attributes
are minimum, maximum,
+ * increment_step. Attributes are stored in
App.StackConfigProperty model.
+ *
+ * @param {Object[]} configs
+ */
+ _saveRecommendedAttributes: function(configs) {
+Em.keys(configs).forEach(function(siteName) {
+ var properties = configs[siteName].property_attributes || {};
+ Em.keys(properties).forEach(function(propertyName) {
+var stackProperty = App.StackConfigProperty.find().findProperty('id',
propertyName + '_' + siteName);
+if (stackProperty) {
+ var attributes = properties[propertyName] || {};
+ Em.keys(attributes).forEach(function(attributeName) {
+if (attributeName == 'delete') return;
+Em.set(stackProperty.get('valueAttributes'), attributeName,
attributes[attributeName]);
+ });
+}
+ });
+});
}
+
});
ambari git commit: AMBARI-10627. 'hive.server2.tez.default.queues' not shown in Hive theme (onechiporenko)
Repository: ambari
Updated Branches:
refs/heads/trunk 0136d8935 -> 8de76e83c
AMBARI-10627. 'hive.server2.tez.default.queues' not shown in Hive theme
(onechiporenko)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/8de76e83
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/8de76e83
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/8de76e83
Branch: refs/heads/trunk
Commit: 8de76e83c3a473ea24143fd22dc05402c042628a
Parents: 0136d89
Author: Oleg Nechiporenko
Authored: Tue Apr 21 17:28:08 2015 +0300
Committer: Oleg Nechiporenko
Committed: Tue Apr 21 17:28:08 2015 +0300
--
.../stacks/HDP/2.2/services/HIVE/themes/theme.json| 10 ++
1 file changed, 10 insertions(+)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/8de76e83/ambari-server/src/main/resources/stacks/HDP/2.2/services/HIVE/themes/theme.json
--
diff --git
a/ambari-server/src/main/resources/stacks/HDP/2.2/services/HIVE/themes/theme.json
b/ambari-server/src/main/resources/stacks/HDP/2.2/services/HIVE/themes/theme.json
index e8ad1a2..375fa20 100644
---
a/ambari-server/src/main/resources/stacks/HDP/2.2/services/HIVE/themes/theme.json
+++
b/ambari-server/src/main/resources/stacks/HDP/2.2/services/HIVE/themes/theme.json
@@ -316,6 +316,10 @@
"subsection-name": "performance-row2-col2"
},
{
+ "config": "hiveserver2-site/hive.server2.tez.default.queues",
+ "subsection-name": "interactive-query-row1-col1"
+},
+{
"config":
"hiveserver2-site/hive.server2.tez.initialize.default.sessions",
"subsection-name": "interactive-query-row1-col1"
},
@@ -621,6 +625,12 @@
"widget": {
"type": "toggle"
}
+ },
+ {
+"config": "hiveserver2-site/hive.server2.tez.default.queues",
+"widget": {
+ "type": "list"
+}
}
]
}
[5/5] ambari git commit: AMBARI-10626. Pheonix component is not visible in 2.3 stack (aonishuk)
AMBARI-10626. Pheonix component is not visible in 2.3 stack (aonishuk)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/0136d893
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/0136d893
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/0136d893
Branch: refs/heads/trunk
Commit: 0136d89350dec8e5602e33d23b3ba6c77804d3bb
Parents: 4894257
Author: Andrew Onishuk
Authored: Tue Apr 21 16:28:47 2015 +0300
Committer: Andrew Onishuk
Committed: Tue Apr 21 16:28:47 2015 +0300
--
.../0.96.0.2.0/package/scripts/params_linux.py | 3 +
.../package/scripts/phoenix_queryserver.py |55 +
.../package/scripts/phoenix_service.py |39 +
.../common-services/HBASE/1.1.0.2.3/alerts.json | 157 -
.../HBASE/1.1.0.2.3/configuration/hbase-env.xml | 155 -
.../1.1.0.2.3/configuration/hbase-log4j.xml | 143 -
.../1.1.0.2.3/configuration/hbase-policy.xml|53 -
.../1.1.0.2.3/configuration/hbase-site.xml | 502 -
.../HBASE/1.1.0.2.3/kerberos.json | 105 -
.../HBASE/1.1.0.2.3/metainfo.xml| 158 -
.../HBASE/1.1.0.2.3/metrics.json| 13564 -
.../1.1.0.2.3/package/files/draining_servers.rb | 164 -
.../1.1.0.2.3/package/files/hbaseSmokeVerify.sh |34 -
.../HBASE/1.1.0.2.3/package/scripts/__init__.py |19 -
.../1.1.0.2.3/package/scripts/functions.py |40 -
.../HBASE/1.1.0.2.3/package/scripts/hbase.py| 176 -
.../1.1.0.2.3/package/scripts/hbase_client.py |66 -
.../package/scripts/hbase_decommission.py |93 -
.../1.1.0.2.3/package/scripts/hbase_master.py | 148 -
.../package/scripts/hbase_regionserver.py | 156 -
.../1.1.0.2.3/package/scripts/hbase_service.py |51 -
.../1.1.0.2.3/package/scripts/hbase_upgrade.py |37 -
.../HBASE/1.1.0.2.3/package/scripts/params.py |25 -
.../1.1.0.2.3/package/scripts/params_linux.py | 255 -
.../1.1.0.2.3/package/scripts/params_windows.py |37 -
.../package/scripts/phoenix_queryserver.py |55 -
.../package/scripts/phoenix_service.py |44 -
.../1.1.0.2.3/package/scripts/service_check.py |97 -
.../package/scripts/setup_ranger_hbase.py | 202 -
.../1.1.0.2.3/package/scripts/status_params.py |41 -
.../HBASE/1.1.0.2.3/package/scripts/upgrade.py |49 -
...-metrics2-hbase.properties-GANGLIA-MASTER.j2 | 105 -
...doop-metrics2-hbase.properties-GANGLIA-RS.j2 | 104 -
.../package/templates/hbase-smoke.sh.j2 |44 -
.../package/templates/hbase_client_jaas.conf.j2 |23 -
.../templates/hbase_grant_permissions.j2|39 -
.../package/templates/hbase_master_jaas.conf.j2 |26 -
.../templates/hbase_regionserver_jaas.conf.j2 |26 -
.../package/templates/regionservers.j2 |20 -
.../HBASE/1.1.0.2.3/widgets.json| 434 -
.../stacks/HDP/2.3/services/HBASE/metainfo.xml |14 +
.../2.0.6/HBASE/test_phoenix_queryserver.py | 160 +
.../stacks/2.3/HBASE/test_hbase_client.py | 213 -
.../stacks/2.3/HBASE/test_hbase_master.py | 678 -
.../stacks/2.3/HBASE/test_hbase_regionserver.py | 601 -
.../2.3/HBASE/test_hbase_service_check.py | 131 -
.../2.3/HBASE/test_phoenix_queryserver.py | 160 -
47 files changed, 271 insertions(+), 19230 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/0136d893/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/package/scripts/params_linux.py
--
diff --git
a/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/package/scripts/params_linux.py
b/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/package/scripts/params_linux.py
index cabe713..ab21537 100644
---
a/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/package/scripts/params_linux.py
+++
b/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/package/scripts/params_linux.py
@@ -51,6 +51,9 @@ else:
region_drainer = "/usr/lib/hbase/bin/draining_servers.rb"
hbase_cmd = "/usr/lib/hbase/bin/hbase"
+# no symlink for phoenix-server at this point
+phx_daemon_script = '/usr/hdp/current/phoenix-server/bin/queryserver.py'
+
hadoop_conf_dir = "/etc/hadoop/conf"
hbase_conf_dir_prefix = "/etc/hbase"
hbase_conf_dir = format("{hbase_conf_dir_prefix}/conf")
http://git-wip-us.apache.org/repos/asf/ambari/blob/0136d893/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/package/scripts/phoenix_queryserver.py
--
diff --git
a/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/package/scripts/phoenix_queryserver.py
b/ambari-server/src/m
[1/5] ambari git commit: AMBARI-10626. Pheonix component is not visible in 2.3 stack (aonishuk)
Repository: ambari
Updated Branches:
refs/heads/trunk 48942574e -> 0136d8935
http://git-wip-us.apache.org/repos/asf/ambari/blob/0136d893/ambari-server/src/test/python/stacks/2.3/HBASE/test_hbase_regionserver.py
--
diff --git
a/ambari-server/src/test/python/stacks/2.3/HBASE/test_hbase_regionserver.py
b/ambari-server/src/test/python/stacks/2.3/HBASE/test_hbase_regionserver.py
deleted file mode 100644
index 153555e..000
--- a/ambari-server/src/test/python/stacks/2.3/HBASE/test_hbase_regionserver.py
+++ /dev/null
@@ -1,601 +0,0 @@
-#!/usr/bin/env python
-
-'''
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-'''
-from mock.mock import MagicMock, patch
-from stacks.utils.RMFTestCase import *
-from unittest import skip
-
-@patch("platform.linux_distribution", new = MagicMock(return_value="Linux"))
-@patch("os.path.exists", new = MagicMock(return_value=True))
-class TestHbaseRegionServer(RMFTestCase):
- COMMON_SERVICES_PACKAGE_DIR = "HBASE/1.1.0.2.3/package"
- STACK_VERSION = "2.3"
-
- def test_configure_default(self):
-self.executeScript(self.COMMON_SERVICES_PACKAGE_DIR +
"/scripts/hbase_regionserver.py",
- classname = "HbaseRegionServer",
- command = "configure",
- config_file="hbase_default.json",
- hdp_stack_version = self.STACK_VERSION,
- target = RMFTestCase.TARGET_COMMON_SERVICES
-)
-
-self.assert_configure_default()
-self.assertNoMoreResources()
-
- def test_start_default(self):
-self.executeScript(self.COMMON_SERVICES_PACKAGE_DIR +
"/scripts/hbase_regionserver.py",
- classname = "HbaseRegionServer",
- command = "start",
- config_file="hbase_default.json",
- hdp_stack_version = self.STACK_VERSION,
- target = RMFTestCase.TARGET_COMMON_SERVICES
-)
-
-self.assert_configure_default()
-self.assertResourceCalled('Execute',
'/usr/hdp/current/hbase-regionserver/bin/hbase-daemon.sh --config
/etc/hbase/conf start regionserver',
- not_if = 'ls /var/run/hbase/hbase-hbase-regionserver.pid >/dev/null 2>&1
&& ps -p `cat /var/run/hbase/hbase-hbase-regionserver.pid` >/dev/null 2>&1',
- user = 'hbase'
-)
-self.assertNoMoreResources()
-
- def test_stop_default(self):
-self.executeScript(self.COMMON_SERVICES_PACKAGE_DIR +
"/scripts/hbase_regionserver.py",
- classname = "HbaseRegionServer",
- command = "stop",
- config_file="hbase_default.json",
- hdp_stack_version = self.STACK_VERSION,
- target = RMFTestCase.TARGET_COMMON_SERVICES
-)
-
-self.assertResourceCalled('Execute',
'/usr/hdp/current/hbase-regionserver/bin/hbase-daemon.sh --config
/etc/hbase/conf stop regionserver',
-on_timeout = '! ( ls /var/run/hbase/hbase-hbase-regionserver.pid
>/dev/null 2>&1 && ps -p `cat /var/run/hbase/hbase-hbase-regionserver.pid`
>/dev/null 2>&1 ) || ambari-sudo.sh -H -E kill -9 `cat
/var/run/hbase/hbase-hbase-regionserver.pid`',
-timeout = 30,
-user = 'hbase',
-)
-
-self.assertResourceCalled('Execute', 'rm -f
/var/run/hbase/hbase-hbase-regionserver.pid',
-)
-self.assertNoMoreResources()
-
- def test_configure_secured(self):
-self.executeScript(self.COMMON_SERVICES_PACKAGE_DIR +
"/scripts/hbase_regionserver.py",
- classname = "HbaseRegionServer",
- command = "configure",
- config_file="hbase_secure.json",
- hdp_stack_version = self.STACK_VERSION,
- target = RMFTestCase.TARGET_COMMON_SERVICES
-)
-
-self.assert_configure_secured()
-self.assertNoMoreResources()
-
- def test_start_secured(self):
-self.executeScript(self.COMMON_SERVICES_PACKAGE_DIR +
"/scripts/hbase_regionserver.py",
- classname = "HbaseRegionServer",
- command = "start",
- config_file="hbase_secure.json",
- hdp_stack_version = self.STACK_VERSION,
- target = RMFTestCase.TARGET_CO
[4/5] ambari git commit: AMBARI-10626. Pheonix component is not visible in 2.3 stack (aonishuk)
http://git-wip-us.apache.org/repos/asf/ambari/blob/0136d893/ambari-server/src/main/resources/common-services/HBASE/1.1.0.2.3/metrics.json
--
diff --git
a/ambari-server/src/main/resources/common-services/HBASE/1.1.0.2.3/metrics.json
b/ambari-server/src/main/resources/common-services/HBASE/1.1.0.2.3/metrics.json
deleted file mode 100644
index 84efc2f..000
---
a/ambari-server/src/main/resources/common-services/HBASE/1.1.0.2.3/metrics.json
+++ /dev/null
@@ -1,13564 +0,0 @@
-{
- "HBASE_REGIONSERVER": {
-"Component": [
- {
-"type": "ganglia",
-"metrics": {
- "default": {
-"metrics/cpu/cpu_idle":{
- "metric":"cpu_idle",
- "pointInTime":true,
- "temporal":true
-},
-"metrics/cpu/cpu_nice":{
- "metric":"cpu_nice",
- "pointInTime":true,
- "temporal":true
-},
-"metrics/cpu/cpu_system":{
- "metric":"cpu_system",
- "pointInTime":true,
- "temporal":true
-},
-"metrics/cpu/cpu_user":{
- "metric":"cpu_user",
- "pointInTime":true,
- "temporal":true
-},
-"metrics/cpu/cpu_wio":{
- "metric":"cpu_wio",
- "pointInTime":true,
- "temporal":true
-},
-"metrics/disk/disk_free":{
- "metric":"disk_free",
- "pointInTime":true,
- "temporal":true
-},
-"metrics/disk/disk_total":{
- "metric":"disk_total",
- "pointInTime":true,
- "temporal":true
-},
-"metrics/load/load_fifteen":{
- "metric":"load_fifteen",
- "pointInTime":true,
- "temporal":true
-},
-"metrics/load/load_five":{
- "metric":"load_five",
- "pointInTime":true,
- "temporal":true
-},
-"metrics/load/load_one":{
- "metric":"load_one",
- "pointInTime":true,
- "temporal":true
-},
-"metrics/memory/mem_buffers":{
- "metric":"mem_buffers",
- "pointInTime":true,
- "temporal":true
-},
-"metrics/memory/mem_cached":{
- "metric":"mem_cached",
- "pointInTime":true,
- "temporal":true
-},
-"metrics/memory/mem_free":{
- "metric":"mem_free",
- "pointInTime":true,
- "temporal":true
-},
-"metrics/memory/mem_shared":{
- "metric":"mem_shared",
- "pointInTime":true,
- "temporal":true
-},
-"metrics/memory/mem_total":{
- "metric":"mem_total",
- "pointInTime":true,
- "temporal":true
-},
-"metrics/memory/swap_free":{
- "metric":"swap_free",
- "pointInTime":true,
- "temporal":true
-},
-"metrics/memory/swap_total":{
- "metric":"swap_total",
- "pointInTime":true,
- "temporal":true
-},
-"metrics/network/bytes_in":{
- "metric":"bytes_in",
- "pointInTime":true,
- "temporal":true
-},
-"metrics/network/bytes_out":{
- "metric":"bytes_out",
- "pointInTime":true,
- "temporal":true
-},
-"metrics/network/pkts_in":{
- "metric":"pkts_in",
- "pointInTime":true,
- "temporal":true
-},
-"metrics/network/pkts_out":{
- "metric":"pkts_out",
- "pointInTime":true,
- "temporal":true
-},
-"metrics/process/proc_run":{
- "metric":"proc_run",
- "pointInTime":true,
- "temporal":true
-},
-"metrics/process/proc_total":{
- "metric":"proc_total",
- "pointInTime":true,
- "temporal":true
-},
-"metrics/disk/read_count":{
- "metric":"read_count",
- "pointInTime":true,
- "temporal":true
-},
-"metrics/disk/write_count":{
- "metric":"write_count",
- "pointInTime":true,
- "temporal":true
-},
-"metrics/disk/read_bytes":{
- "metric":"read_bytes",
- "pointInTime":true,
- "temporal":true
-},
-"metrics/disk/write_bytes":{
- "metric":"write_bytes",
- "pointInTime":true,
- "temporal":true
-
[2/5] ambari git commit: AMBARI-10626. Pheonix component is not visible in 2.3 stack (aonishuk)
http://git-wip-us.apache.org/repos/asf/ambari/blob/0136d893/ambari-server/src/main/resources/common-services/HBASE/1.1.0.2.3/package/templates/hadoop-metrics2-hbase.properties-GANGLIA-RS.j2
--
diff --git
a/ambari-server/src/main/resources/common-services/HBASE/1.1.0.2.3/package/templates/hadoop-metrics2-hbase.properties-GANGLIA-RS.j2
b/ambari-server/src/main/resources/common-services/HBASE/1.1.0.2.3/package/templates/hadoop-metrics2-hbase.properties-GANGLIA-RS.j2
deleted file mode 100644
index 462bef4..000
---
a/ambari-server/src/main/resources/common-services/HBASE/1.1.0.2.3/package/templates/hadoop-metrics2-hbase.properties-GANGLIA-RS.j2
+++ /dev/null
@@ -1,104 +0,0 @@
-{#
-# 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.
-#}
-
-# 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.
-
-# See http://wiki.apache.org/hadoop/GangliaMetrics
-#
-# Make sure you know whether you are using ganglia 3.0 or 3.1.
-# If 3.1, you will have to patch your hadoop instance with HADOOP-4675
-# And, yes, this file is named hadoop-metrics.properties rather than
-# hbase-metrics.properties because we're leveraging the hadoop metrics
-# package and hadoop-metrics.properties is an hardcoded-name, at least
-# for the moment.
-#
-# See also http://hadoop.apache.org/hbase/docs/current/metrics.html
-
-# HBase-specific configuration to reset long-running stats (e.g. compactions)
-# If this variable is left out, then the default is no expiration.
-hbase.extendedperiod = 3600
-
-{% if has_metric_collector %}
-
-*.timeline.plugin.urls=file:///usr/lib/ambari-metrics-hadoop-sink/ambari-metrics-hadoop-sink.jar
-*.sink.timeline.slave.host.name={{hostname}}
-hbase.class=org.apache.hadoop.metrics2.sink.timeline.HadoopTimelineMetricsSink
-hbase.period=10
-hbase.collector={{metric_collector_host}}:{{metric_collector_port}}
-
-jvm.class=org.apache.hadoop.metrics2.sink.timeline.HadoopTimelineMetricsSink
-jvm.period=10
-jvm.collector={{metric_collector_host}}:{{metric_collector_port}}
-
-rpc.class=org.apache.hadoop.metrics2.sink.timeline.HadoopTimelineMetricsSink
-rpc.period=10
-rpc.collector={{metric_collector_host}}:{{metric_collector_port}}
-
-hbase.sink.timeline.class=org.apache.hadoop.metrics2.sink.timeline.HadoopTimelineMetricsSink
-hbase.sink.timeline.period=10
-hbase.sink.timeline.collector={{metric_collector_host}}:{{metric_collector_port}}
-
-{% else %}
-
-# Configuration of the "hbase" context for ganglia
-# Pick one: Ganglia 3.0 (former) or Ganglia 3.1 (latter)
-# hbase.class=org.apache.hadoop.metrics.ganglia.GangliaContext
-hbase.class=org.apache.hadoop.metrics.ganglia.GangliaContext31
-hbase.period=10
-hbase.servers={{ganglia_server_host}}:8656
-
-# Configuration of the "jvm" context for ganglia
-# Pick one: Ganglia 3.0 (former) or Ganglia 3.1 (latter)
-# jvm.class=org.apache.hadoop.metrics.ganglia.GangliaContext
-jvm.class=org.apache.hadoop.metrics.ganglia.GangliaContext31
-jvm.period=10
-jvm.servers={{ganglia_server_host}}:8656
-
-# Configuration of the "rpc" context for ganglia
-# Pick one: Ganglia 3.0 (former) or Ganglia 3.1 (latter)
-# rpc.class=org.apache.hadoop.metrics.ganglia.GangliaContext
-rpc.class=org.apache.hadoop.metrics.ganglia.GangliaContext31
-rpc.period=10
-rpc.servers={{ganglia_server_host}}:8656
-
-#Ganglia following hadoop example
-hbase.sink.ganglia.class=org.apache.hadoop.metrics2.sink.ganglia.GangliaSink31
-hbase.sink.ganglia.period=10
-
-# default for supportsparse is false
-*.sink.
[3/5] ambari git commit: AMBARI-10626. Pheonix component is not visible in 2.3 stack (aonishuk)
http://git-wip-us.apache.org/repos/asf/ambari/blob/0136d893/ambari-server/src/main/resources/common-services/HBASE/1.1.0.2.3/package/files/draining_servers.rb
--
diff --git
a/ambari-server/src/main/resources/common-services/HBASE/1.1.0.2.3/package/files/draining_servers.rb
b/ambari-server/src/main/resources/common-services/HBASE/1.1.0.2.3/package/files/draining_servers.rb
deleted file mode 100644
index 5bcb5b6..000
---
a/ambari-server/src/main/resources/common-services/HBASE/1.1.0.2.3/package/files/draining_servers.rb
+++ /dev/null
@@ -1,164 +0,0 @@
-#
-# 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.
-#
-
-# Add or remove servers from draining mode via zookeeper
-
-require 'optparse'
-include Java
-
-import org.apache.hadoop.hbase.HBaseConfiguration
-import org.apache.hadoop.hbase.client.HBaseAdmin
-import org.apache.hadoop.hbase.zookeeper.ZKUtil
-import org.apache.commons.logging.Log
-import org.apache.commons.logging.LogFactory
-
-# Name of this script
-NAME = "draining_servers"
-
-# Do command-line parsing
-options = {}
-optparse = OptionParser.new do |opts|
- opts.banner = "Usage: ./hbase org.jruby.Main #{NAME}.rb [options]
add|remove|list || ..."
- opts.separator 'Add remove or list servers in draining mode. Can accept
either hostname to drain all region servers' +
- 'in that host, a host:port pair or a host,port,startCode
triplet. More than one server can be given separated by space'
- opts.on('-h', '--help', 'Display usage information') do
-puts opts
-exit
- end
- options[:debug] = false
- opts.on('-d', '--debug', 'Display extra debug logging') do
-options[:debug] = true
- end
-end
-optparse.parse!
-
-# Return array of servernames where servername is hostname+port+startcode
-# comma-delimited
-def getServers(admin)
- serverInfos = admin.getClusterStatus().getServerInfo()
- servers = []
- for server in serverInfos
-servers << server.getServerName()
- end
- return servers
-end
-
-def getServerNames(hostOrServers, config)
- ret = []
-
- for hostOrServer in hostOrServers
-# check whether it is already serverName. No need to connect to cluster
-parts = hostOrServer.split(',')
-if parts.size() == 3
- ret << hostOrServer
-else
- admin = HBaseAdmin.new(config) if not admin
- servers = getServers(admin)
-
- hostOrServer = hostOrServer.gsub(/:/, ",")
- for server in servers
-ret << server if server.start_with?(hostOrServer)
- end
-end
- end
-
- admin.close() if admin
- return ret
-end
-
-def addServers(options, hostOrServers)
- config = HBaseConfiguration.create()
- servers = getServerNames(hostOrServers, config)
-
- zkw = org.apache.hadoop.hbase.zookeeper.ZooKeeperWatcher.new(config,
"draining_servers", nil)
- parentZnode = zkw.drainingZNode
-
- begin
-for server in servers
- node = ZKUtil.joinZNode(parentZnode, server)
- ZKUtil.createAndFailSilent(zkw, node)
-end
- ensure
-zkw.close()
- end
-end
-
-def removeServers(options, hostOrServers)
- config = HBaseConfiguration.create()
- servers = getServerNames(hostOrServers, config)
-
- zkw = org.apache.hadoop.hbase.zookeeper.ZooKeeperWatcher.new(config,
"draining_servers", nil)
- parentZnode = zkw.drainingZNode
-
- begin
-for server in servers
- node = ZKUtil.joinZNode(parentZnode, server)
- ZKUtil.deleteNodeFailSilent(zkw, node)
-end
- ensure
-zkw.close()
- end
-end
-
-# list servers in draining mode
-def listServers(options)
- config = HBaseConfiguration.create()
-
- zkw = org.apache.hadoop.hbase.zookeeper.ZooKeeperWatcher.new(config,
"draining_servers", nil)
- parentZnode = zkw.drainingZNode
-
- servers = ZKUtil.listChildrenNoWatch(zkw, parentZnode)
- servers.each {|server| puts server}
-end
-
-hostOrServers = ARGV[1..ARGV.size()]
-
-# Create a logger and disable the DEBUG-level annoying client logging
-def configureLogging(options)
- apacheLogger = LogFactory.getLog(NAME)
- # Configure log4j to not spew so much
- unless (options[:debug])
-logger = org.apache.log4j.Logger.getLogger("org.apache.hadoop.hbase")
-logger.setLevel(org.apache.log4j.Level:
ambari git commit: AMBARI-10625. UI Improvements For Server Side Alerts (alexantonenko)
Repository: ambari
Updated Branches:
refs/heads/trunk 26e376ae9 -> 48942574e
AMBARI-10625. UI Improvements For Server Side Alerts (alexantonenko)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/48942574
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/48942574
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/48942574
Branch: refs/heads/trunk
Commit: 48942574e16040c0dac6f393ad2a5fad2739107c
Parents: 26e376a
Author: Alex Antonenko
Authored: Tue Apr 21 15:15:39 2015 +0300
Committer: Alex Antonenko
Committed: Tue Apr 21 15:53:40 2015 +0300
--
.../main/alerts/add_alert_definition/step1_controller.js | 3 ++-
ambari-web/app/models/alert_definition.js | 3 ++-
ambari-web/app/views/main/alert_definitions_view.js| 6 +-
3 files changed, 9 insertions(+), 3 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/48942574/ambari-web/app/controllers/main/alerts/add_alert_definition/step1_controller.js
--
diff --git
a/ambari-web/app/controllers/main/alerts/add_alert_definition/step1_controller.js
b/ambari-web/app/controllers/main/alerts/add_alert_definition/step1_controller.js
index a00592f..addb120 100644
---
a/ambari-web/app/controllers/main/alerts/add_alert_definition/step1_controller.js
+++
b/ambari-web/app/controllers/main/alerts/add_alert_definition/step1_controller.js
@@ -31,7 +31,8 @@ App.AddAlertDefinitionStep1Controller = Em.Controller.extend({
Em.Object.create({value: 'METRIC', isActive: false, icon: 'icon-bolt'}),
Em.Object.create({value: 'WEB', isActive: false, icon: 'icon-globe'}),
Em.Object.create({value: 'AGGREGATE', isActive: false, icon:
'icon-plus-sign-alt'}),
-Em.Object.create({value: 'SCRIPT', isActive: false, icon: 'icon-code'})
+Em.Object.create({value: 'SCRIPT', isActive: false, icon: 'icon-code'}),
+Em.Object.create({value: 'SERVER', isActive: false, icon: 'icon-desktop'})
],
/**
http://git-wip-us.apache.org/repos/asf/ambari/blob/48942574/ambari-web/app/models/alert_definition.js
--
diff --git a/ambari-web/app/models/alert_definition.js
b/ambari-web/app/models/alert_definition.js
index d8b774f..d1310ff 100644
--- a/ambari-web/app/models/alert_definition.js
+++ b/ambari-web/app/models/alert_definition.js
@@ -272,7 +272,8 @@ App.AlertDefinition = DS.Model.extend({
'SCRIPT': 'icon-file-text',
'WEB': 'icon-globe',
'PORT': 'icon-signin',
-'AGGREGATE': 'icon-plus'
+'AGGREGATE': 'icon-plus',
+'SERVER': 'icon-desktop'
},
/**
http://git-wip-us.apache.org/repos/asf/ambari/blob/48942574/ambari-web/app/views/main/alert_definitions_view.js
--
diff --git a/ambari-web/app/views/main/alert_definitions_view.js
b/ambari-web/app/views/main/alert_definitions_view.js
index 28d15df..b20beb3 100644
--- a/ambari-web/app/views/main/alert_definitions_view.js
+++ b/ambari-web/app/views/main/alert_definitions_view.js
@@ -292,6 +292,10 @@ App.MainAlertDefinitionsView = App.TableView.extend({
{
value: 'AGGREGATE',
label: 'AGGREGATE'
+ },
+ {
+value: 'SERVER',
+label: 'SERVER'
}
],
onChangeValue: function(){
@@ -524,4 +528,4 @@ App.MainAlertDefinitionsView = App.TableView.extend({
this.tooltipsUpdater();
}
-});
\ No newline at end of file
+});
ambari git commit: AMBARI-10464 - Ambari Agent holding socket open on 50070 prevents NN from starting (jonathanhurley)
Repository: ambari
Updated Branches:
refs/heads/branch-2.0.maint d0f32d236 -> 138b8ec86
AMBARI-10464 - Ambari Agent holding socket open on 50070 prevents NN from
starting (jonathanhurley)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/138b8ec8
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/138b8ec8
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/138b8ec8
Branch: refs/heads/branch-2.0.maint
Commit: 138b8ec86c74d841bd6a7381aea727d0a05ea7c4
Parents: d0f32d2
Author: Jonathan Hurley
Authored: Tue Apr 14 11:00:59 2015 -0400
Committer: Jonathan Hurley
Committed: Tue Apr 21 08:30:33 2015 -0400
--
.../src/main/python/ambari_agent/alerts/metric_alert.py| 4 +++-
.../HDFS/2.1.0.2.0/package/alerts/alert_checkpoint_time.py | 4 +++-
.../HDFS/2.1.0.2.0/package/alerts/alert_ha_namenode_health.py | 4 +++-
.../HIVE/0.12.0.2.0/package/alerts/alert_webhcat_server.py | 5 +++--
.../YARN/2.1.0.2.0/package/alerts/alert_nodemanager_health.py | 4 +++-
.../2.1.0.2.0/package/alerts/alert_nodemanagers_summary.py | 6 --
.../0.8/services/HDFS/package/files/alert_checkpoint_time.py | 4 +++-
.../services/HDFS/package/files/alert_ha_namenode_health.py| 4 +++-
.../0.8/services/WEBHCAT/package/files/alert_webhcat_server.py | 5 +++--
.../services/YARN/package/files/alert_nodemanager_health.py| 4 +++-
10 files changed, 31 insertions(+), 13 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/138b8ec8/ambari-agent/src/main/python/ambari_agent/alerts/metric_alert.py
--
diff --git a/ambari-agent/src/main/python/ambari_agent/alerts/metric_alert.py
b/ambari-agent/src/main/python/ambari_agent/alerts/metric_alert.py
index 8b5f15d..33f7508 100644
--- a/ambari-agent/src/main/python/ambari_agent/alerts/metric_alert.py
+++ b/ambari-agent/src/main/python/ambari_agent/alerts/metric_alert.py
@@ -31,6 +31,8 @@ from
resource_management.libraries.functions.get_port_from_url import get_port_f
logger = logging.getLogger()
+CONNECTION_TIMEOUT = 5.0
+
class MetricAlert(BaseAlert):
def __init__(self, alert_meta, alert_source_meta):
@@ -157,7 +159,7 @@ class MetricAlert(BaseAlert):
response = None
try:
url_opener = urllib2.build_opener(RefreshHeaderProcessor())
-response = url_opener.open(url)
+response = url_opener.open(url, timeout=CONNECTION_TIMEOUT)
content = response.read()
finally:
# explicitely close the connection as we've seen python hold onto these
http://git-wip-us.apache.org/repos/asf/ambari/blob/138b8ec8/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/package/alerts/alert_checkpoint_time.py
--
diff --git
a/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/package/alerts/alert_checkpoint_time.py
b/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/package/alerts/alert_checkpoint_time.py
index 032310d..2455d3b 100644
---
a/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/package/alerts/alert_checkpoint_time.py
+++
b/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/package/alerts/alert_checkpoint_time.py
@@ -36,6 +36,8 @@ PERCENT_CRITICAL = 200
CHECKPOINT_TX_DEFAULT = 100
CHECKPOINT_PERIOD_DEFAULT = 21600
+CONNECTION_TIMEOUT = 5.0
+
def get_tokens():
"""
Returns a tuple of tokens in the format {{site/property}} that will be used
@@ -133,7 +135,7 @@ def get_value_from_jmx(query, jmx_property):
response = None
try:
-response = urllib2.urlopen(query)
+response = urllib2.urlopen(query, timeout=CONNECTION_TIMEOUT)
data = response.read()
data_dict = json.loads(data)
http://git-wip-us.apache.org/repos/asf/ambari/blob/138b8ec8/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/package/alerts/alert_ha_namenode_health.py
--
diff --git
a/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/package/alerts/alert_ha_namenode_health.py
b/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/package/alerts/alert_ha_namenode_health.py
index 058b7b2..2066d46 100644
---
a/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/package/alerts/alert_ha_namenode_health.py
+++
b/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/package/alerts/alert_ha_namenode_health.py
@@ -35,6 +35,8 @@ NN_HTTP_ADDRESS_KEY =
'{{hdfs-site/dfs.namenode.http-address}}'
NN_HTTPS_ADDRESS_KEY = '{{hdfs-site/dfs.namenode.https-address}}'
DFS_POLICY_KEY = '{{hdfs-site/dfs.http.policy}}'
+CONNECTION_TIMEOUT = 5.0
+
def get_tokens():
"""
ambari git commit: AMBARI-10614. Ranger functionality is broken (repos are not created) (aonishuk)
Repository: ambari
Updated Branches:
refs/heads/trunk c97446c58 -> 26e376ae9
AMBARI-10614. Ranger functionality is broken (repos are not created) (aonishuk)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/26e376ae
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/26e376ae
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/26e376ae
Branch: refs/heads/trunk
Commit: 26e376ae9ec015a546edcb61d3f1a316854b0fac
Parents: c97446c
Author: Andrew Onishuk
Authored: Tue Apr 21 13:32:47 2015 +0300
Committer: Andrew Onishuk
Committed: Tue Apr 21 14:45:35 2015 +0300
--
.../RANGER/0.4.0/configuration/usersync-properties.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/26e376ae/ambari-server/src/main/resources/common-services/RANGER/0.4.0/configuration/usersync-properties.xml
--
diff --git
a/ambari-server/src/main/resources/common-services/RANGER/0.4.0/configuration/usersync-properties.xml
b/ambari-server/src/main/resources/common-services/RANGER/0.4.0/configuration/usersync-properties.xml
index 79b9bb7..9f5aa6c 100644
---
a/ambari-server/src/main/resources/common-services/RANGER/0.4.0/configuration/usersync-properties.xml
+++
b/ambari-server/src/main/resources/common-services/RANGER/0.4.0/configuration/usersync-properties.xml
@@ -31,7 +31,7 @@
-policymanager.baseURL
+POLICY_MGR_URL
{{usersync_exturl}}
Policy Manager external url
ambari git commit: AMBARI-10624. Not apparent where the error is in Customize Services page (onechiporenko)
Repository: ambari
Updated Branches:
refs/heads/trunk c3e0771e4 -> c97446c58
AMBARI-10624. Not apparent where the error is in Customize Services page
(onechiporenko)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/c97446c5
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/c97446c5
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/c97446c5
Branch: refs/heads/trunk
Commit: c97446c5860f16261a0a19214c5a17c7cc23d4a4
Parents: c3e0771
Author: Oleg Nechiporenko
Authored: Tue Apr 21 14:21:33 2015 +0300
Committer: Oleg Nechiporenko
Committed: Tue Apr 21 14:21:33 2015 +0300
--
ambari-web/app/assets/test/tests.js | 2 +
.../controllers/main/service/info/configs.js| 10 +
.../app/controllers/wizard/step7_controller.js | 10 +
ambari-web/app/models/configs/section.js| 10 +
ambari-web/app/models/configs/sub_section.js| 10 +
ambari-web/app/models/configs/tab.js| 10 +
ambari-web/app/models/service_config.js | 2 +-
.../templates/common/configs/service_config.hbs | 15 ++-
.../common/configs/service_config_wizard.hbs| 15 ++-
.../main/service/info/config_test.js| 19 +
.../test/controllers/wizard/step7_test.js | 21 -
ambari-web/test/models/configs/section_test.js | 43 +++
.../test/models/configs/sub_section_test.js | 45
13 files changed, 208 insertions(+), 4 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/c97446c5/ambari-web/app/assets/test/tests.js
--
diff --git a/ambari-web/app/assets/test/tests.js
b/ambari-web/app/assets/test/tests.js
index 0e576bc..27aaf95 100644
--- a/ambari-web/app/assets/test/tests.js
+++ b/ambari-web/app/assets/test/tests.js
@@ -286,6 +286,8 @@ var files = ['test/init_model_test',
'test/models/user_test',
'test/models/host_stack_version_test',
'test/models/upgrade_entity_test',
+ 'test/models/configs/sub_section_test',
+ 'test/models/configs/section_test',
'test/models/configs/service_config_version_test',
'test/models/configs/config_property_test',
'test/routes/views_test',
http://git-wip-us.apache.org/repos/asf/ambari/blob/c97446c5/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 3628a7a..c6fc874 100644
--- a/ambari-web/app/controllers/main/service/info/configs.js
+++ b/ambari-web/app/controllers/main/service/info/configs.js
@@ -173,6 +173,16 @@ App.MainServiceInfoConfigsController =
Em.Controller.extend(App.ServerValidatorM
loadedClusterSiteToTagMap: {},
/**
+ * Number of errors in the configs in the selected service
+ * @type {number}
+ */
+ errorsCount: function () {
+return this.get('selectedService.configs').filter(function (config) {
+ return Em.isNone(config.get('widget'));
+}).filterProperty('isValid', false).length;
+ }.property('selectedService.configs.@each.isValid'),
+
+ /**
* Determines if Save-button should be disabled
* Disabled if some configs have invalid values or save-process currently in
progress
* @type {boolean}
http://git-wip-us.apache.org/repos/asf/ambari/blob/c97446c5/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 4eaa119..a0b58c4 100644
--- a/ambari-web/app/controllers/wizard/step7_controller.js
+++ b/ambari-web/app/controllers/wizard/step7_controller.js
@@ -133,6 +133,16 @@ App.WizardStep7Controller =
Em.Controller.extend(App.ServerValidatorMixin, App.E
}.property('isAdvancedConfigLoaded', 'isAppliedConfigLoaded'),
/**
+ * Number of errors in the configs in the selected service
+ * @type {number}
+ */
+ errorsCount: function () {
+return this.get('selectedService.configs').filter(function (config) {
+ return Em.isNone(config.get('widget'));
+}).filterProperty('isValid', false).length;
+ }.property('selectedService.configs.@each.isValid'),
+
+ /**
* Should Next-button be disabled
* @type {bool}
*/
http://git-wip-us.apache.org/repos/asf/ambari/blob/c97446c5/ambari-web/app/models/configs/section.js
--
diff --git a/ambari-web/app/models/configs/section.js
b/ambari-web/app/models/configs/section.js
index ee40b63..56bcf58 100644
--- a/ambari-web/app/models/configs/section.js
+++ b/ambari-web/app/models/config
ambari git commit: AMBARI-10602 HDFS namenode_opt_newsize and namenode_opt_maxnewsize not using number of datanodes in calculation (dsen)
Repository: ambari
Updated Branches:
refs/heads/trunk 766cb64ef -> c3e0771e4
AMBARI-10602 HDFS namenode_opt_newsize and namenode_opt_maxnewsize not using
number of datanodes in calculation (dsen)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/c3e0771e
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/c3e0771e
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/c3e0771e
Branch: refs/heads/trunk
Commit: c3e0771e40fb255ff69bb6cbc70495435486512e
Parents: 766cb64
Author: Dmytro Sen
Authored: Tue Apr 21 11:55:56 2015 +0300
Committer: Dmytro Sen
Committed: Tue Apr 21 11:55:56 2015 +0300
--
.../stacks/HDP/2.0.6/services/stack_advisor.py | 5 +-
.../stacks/HDP/2.2/services/stack_advisor.py| 59 ++--
.../stacks/2.0.6/common/test_stack_advisor.py | 149 +++
.../stacks/2.2/common/test_stack_advisor.py | 58
4 files changed, 233 insertions(+), 38 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/c3e0771e/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/stack_advisor.py
--
diff --git
a/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/stack_advisor.py
b/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/stack_advisor.py
index 7af01a4..0b54b38 100644
---
a/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/stack_advisor.py
+++
b/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/stack_advisor.py
@@ -213,9 +213,8 @@ class HDP206StackAdvisor(DefaultStackAdvisor):
service = [serviceEntry for serviceEntry in services["services"] if
serviceEntry["StackServices"]["service_name"] == serviceName][0]
components = [componentEntry for componentEntry in service["components"]
if componentEntry["StackServiceComponents"]["component_name"] == componentName]
if (len(components) > 0 and
len(components[0]["StackServiceComponents"]["hostnames"]) > 0):
-# component available - determine hosts and memory
-componentHostname =
components[0]["StackServiceComponents"]["hostnames"][0]
-componentHosts = [host for host in hosts["items"] if
host["Hosts"]["host_name"] == componentHostname]
+componentHostnames =
components[0]["StackServiceComponents"]["hostnames"]
+componentHosts = [host for host in hosts["items"] if
host["Hosts"]["host_name"] in componentHostnames]
return componentHosts
return []
http://git-wip-us.apache.org/repos/asf/ambari/blob/c3e0771e/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 7f163dd..6289e6a 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
@@ -98,26 +98,67 @@ class HDP22StackAdvisor(HDP21StackAdvisor):
putHdfsSiteProperty("dfs.namenode.safemode.threshold-pct", "0.99f" if
len(namenodeHosts) > 1 else "1.0f")
putHdfsEnvProperty = self.putProperty(configurations, "hadoop-env",
services)
-putHdfsEnvProperty('namenode_heapsize',
max(int(clusterData['totalAvailableRam'] / 2), 1024))
-putHdfsEnvProperty('namenode_opt_newsize',
max(int(clusterData['totalAvailableRam'] / 8), 128))
-putHdfsEnvProperty('namenode_opt_maxnewsize',
max(int(clusterData['totalAvailableRam'] / 8), 256))
-
-# Property Attributes
putHdfsEnvPropertyAttribute = self.putPropertyAttribute(configurations,
"hadoop-env")
+
+nn_max_heapsize=None
if (namenodeHosts is not None and len(namenodeHosts) > 0):
if len(namenodeHosts) > 1:
-namenode_heapsize = min(int(namenodeHosts[0]["Hosts"]["total_mem"]),
int(namenodeHosts[1]["Hosts"]["total_mem"])) / 1024
+nn_max_heapsize = min(int(namenodeHosts[0]["Hosts"]["total_mem"]),
int(namenodeHosts[1]["Hosts"]["total_mem"])) / 1024
else:
-namenode_heapsize = int(namenodeHosts[0]["Hosts"]["total_mem"] / 1024)
# total_mem in kb
+nn_max_heapsize = int(namenodeHosts[0]["Hosts"]["total_mem"] / 1024) #
total_mem in kb
- putHdfsEnvPropertyAttribute('namenode_heapsize', 'maximum',
namenode_heapsize)
+ putHdfsEnvPropertyAttribute('namenode_heapsize', 'maximum',
nn_max_heapsize)
+
+#Old fallback values
+putHdfsEnvProperty('namenode_heapsize',
max(int(clusterData['totalAvailableRam'] / 2), 1024))
+putHdfsEnvProperty('namenode_opt_newsize',
max(int(clusterData['totalAvailableRam'] / 8), 128))
+putHdfsEnvProperty('namenode_opt_maxnewsize',
max(int(clu
