git commit: AMBARI-7897. Slider view is not displayed in IE10. (akovalenko)
Repository: ambari
Updated Branches:
refs/heads/trunk 5e5e715b6 - 0a638f3cf
AMBARI-7897. Slider view is not displayed in IE10. (akovalenko)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/0a638f3c
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/0a638f3c
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/0a638f3c
Branch: refs/heads/trunk
Commit: 0a638f3cfb9cc6ca2f8989a309f91a46009303ad
Parents: 5e5e715
Author: Aleksandr Kovalenko akovale...@hortonworks.com
Authored: Wed Oct 22 15:26:29 2014 +0300
Committer: Aleksandr Kovalenko akovale...@hortonworks.com
Committed: Wed Oct 22 15:26:29 2014 +0300
--
ambari-web/app/assets/img/ambari-view-default.png | Bin 4158 - 665 bytes
ambari-web/app/views/main/views/details.js| 3 ++-
2 files changed, 2 insertions(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/0a638f3c/ambari-web/app/assets/img/ambari-view-default.png
--
diff --git a/ambari-web/app/assets/img/ambari-view-default.png
b/ambari-web/app/assets/img/ambari-view-default.png
index 8a12842..6f14605 100644
Binary files a/ambari-web/app/assets/img/ambari-view-default.png and
b/ambari-web/app/assets/img/ambari-view-default.png differ
http://git-wip-us.apache.org/repos/asf/ambari/blob/0a638f3c/ambari-web/app/views/main/views/details.js
--
diff --git a/ambari-web/app/views/main/views/details.js
b/ambari-web/app/views/main/views/details.js
index cf82dbe..48b6783 100644
--- a/ambari-web/app/views/main/views/details.js
+++ b/ambari-web/app/views/main/views/details.js
@@ -84,7 +84,8 @@ App.MainViewsDetailsView = Em.View.extend({
},
src: function() {
-return window.location.origin + this.get('controller.content.href');
+// can't use window.location.origin because IE doesn't support it
+return window.location.protocol + '//' + window.location.host +
this.get('controller.content.href');
}.property('controller.content')
});
[2/2] git commit: AMBARI-7900. Incorrect ntp warning on Confirm hosts page (aonishuk)
AMBARI-7900. Incorrect ntp warning on Confirm hosts page (aonishuk)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/3b7dbb06
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/3b7dbb06
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/3b7dbb06
Branch: refs/heads/branch-1.7.0
Commit: 3b7dbb06ad50e185945ccd433673c1b0d96df915
Parents: e6d76c0
Author: Andrew Onishuk aonis...@hortonworks.com
Authored: Wed Oct 22 17:07:00 2014 +0300
Committer: Andrew Onishuk aonis...@hortonworks.com
Committed: Wed Oct 22 17:07:00 2014 +0300
--
ambari-agent/src/main/python/ambari_agent/HostInfo.py | 2 +-
ambari-agent/src/test/python/ambari_agent/TestHostInfo.py | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/3b7dbb06/ambari-agent/src/main/python/ambari_agent/HostInfo.py
--
diff --git a/ambari-agent/src/main/python/ambari_agent/HostInfo.py
b/ambari-agent/src/main/python/ambari_agent/HostInfo.py
index 4b7647d..9a02027 100644
--- a/ambari-agent/src/main/python/ambari_agent/HostInfo.py
+++ b/ambari-agent/src/main/python/ambari_agent/HostInfo.py
@@ -38,7 +38,7 @@ import socket
logger = logging.getLogger()
# service cmd
-SERVICE_CMD = /sbin/service
+SERVICE_CMD = service
class HostInfo:
http://git-wip-us.apache.org/repos/asf/ambari/blob/3b7dbb06/ambari-agent/src/test/python/ambari_agent/TestHostInfo.py
--
diff --git a/ambari-agent/src/test/python/ambari_agent/TestHostInfo.py
b/ambari-agent/src/test/python/ambari_agent/TestHostInfo.py
index 71129c7..271f2cf 100644
--- a/ambari-agent/src/test/python/ambari_agent/TestHostInfo.py
+++ b/ambari-agent/src/test/python/ambari_agent/TestHostInfo.py
@@ -466,7 +466,7 @@ class TestHostInfo(TestCase):
self.assertEquals(result[0]['name'], 'service1')
self.assertEquals(result[0]['desc'], '')
self.assertEquals(str(subproc_popen.call_args_list),
- [call(['/sbin/service', 'service1', 'status'],
stderr=-1, stdout=-1)])
+ [call(['service', 'service1', 'status'], stderr=-1,
stdout=-1)])
p.returncode = 1
p.communicate.return_value = ('out', 'err')
[1/2] git commit: AMBARI-7900. Incorrect ntp warning on Confirm hosts page (aonishuk)
Repository: ambari
Updated Branches:
refs/heads/branch-1.7.0 e6d76c09c - 3b7dbb06a
refs/heads/trunk 0a638f3cf - fd045a4d9
AMBARI-7900. Incorrect ntp warning on Confirm hosts page (aonishuk)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/fd045a4d
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/fd045a4d
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/fd045a4d
Branch: refs/heads/trunk
Commit: fd045a4d97010f241252508ac82a7efdbf11a20e
Parents: 0a638f3
Author: Andrew Onishuk aonis...@hortonworks.com
Authored: Wed Oct 22 17:06:57 2014 +0300
Committer: Andrew Onishuk aonis...@hortonworks.com
Committed: Wed Oct 22 17:06:57 2014 +0300
--
ambari-agent/src/main/python/ambari_agent/HostInfo.py | 2 +-
ambari-agent/src/test/python/ambari_agent/TestHostInfo.py | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/fd045a4d/ambari-agent/src/main/python/ambari_agent/HostInfo.py
--
diff --git a/ambari-agent/src/main/python/ambari_agent/HostInfo.py
b/ambari-agent/src/main/python/ambari_agent/HostInfo.py
index 4b7647d..9a02027 100644
--- a/ambari-agent/src/main/python/ambari_agent/HostInfo.py
+++ b/ambari-agent/src/main/python/ambari_agent/HostInfo.py
@@ -38,7 +38,7 @@ import socket
logger = logging.getLogger()
# service cmd
-SERVICE_CMD = /sbin/service
+SERVICE_CMD = service
class HostInfo:
http://git-wip-us.apache.org/repos/asf/ambari/blob/fd045a4d/ambari-agent/src/test/python/ambari_agent/TestHostInfo.py
--
diff --git a/ambari-agent/src/test/python/ambari_agent/TestHostInfo.py
b/ambari-agent/src/test/python/ambari_agent/TestHostInfo.py
index 1f682dd..8cf9220 100644
--- a/ambari-agent/src/test/python/ambari_agent/TestHostInfo.py
+++ b/ambari-agent/src/test/python/ambari_agent/TestHostInfo.py
@@ -469,7 +469,7 @@ class TestHostInfo(TestCase):
self.assertEquals(result[0]['name'], 'service1')
self.assertEquals(result[0]['desc'], '')
self.assertEquals(str(subproc_popen.call_args_list),
- [call(['/sbin/service', 'service1', 'status'],
stderr=-1, stdout=-1)])
+ [call(['service', 'service1', 'status'], stderr=-1,
stdout=-1)])
p.returncode = 1
p.communicate.return_value = ('out', 'err')
git commit: AMBARI-7899. Base URLs for SUSE and Ubuntu in Select stack page fails validation(HDP2.2) (aonishuk)
Repository: ambari
Updated Branches:
refs/heads/trunk fd045a4d9 - e5f9fbb04
AMBARI-7899. Base URLs for SUSE and Ubuntu in Select stack page fails
validation(HDP2.2) (aonishuk)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/e5f9fbb0
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/e5f9fbb0
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/e5f9fbb0
Branch: refs/heads/trunk
Commit: e5f9fbb0420f51d5871e7b722945a9dc26cb6947
Parents: fd045a4
Author: Andrew Onishuk aonis...@hortonworks.com
Authored: Wed Oct 22 17:25:46 2014 +0300
Committer: Andrew Onishuk aonis...@hortonworks.com
Committed: Wed Oct 22 17:25:46 2014 +0300
--
.../org/apache/ambari/server/configuration/Configuration.java| 2 +-
.../src/main/resources/stacks/HDP/2.2/repos/repoinfo.xml | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/e5f9fbb0/ambari-server/src/main/java/org/apache/ambari/server/configuration/Configuration.java
--
diff --git
a/ambari-server/src/main/java/org/apache/ambari/server/configuration/Configuration.java
b/ambari-server/src/main/java/org/apache/ambari/server/configuration/Configuration.java
index b3573f6..535e569 100644
---
a/ambari-server/src/main/java/org/apache/ambari/server/configuration/Configuration.java
+++
b/ambari-server/src/main/java/org/apache/ambari/server/configuration/Configuration.java
@@ -296,7 +296,7 @@ public class Configuration {
* Default for repo validation suffixes.
*/
private static final String REPO_SUFFIX_DEFAULT = /repodata/repomd.xml;
- private static final String REPO_SUFFIX_UBUNTU =
/dists/%s/Release.gpg,/dists/%s/Release;
+ private static final String REPO_SUFFIX_UBUNTU = /dists/%s/Release;
private static final String PARALLEL_STAGE_EXECUTION_DEFAULT = true;
http://git-wip-us.apache.org/repos/asf/ambari/blob/e5f9fbb0/ambari-server/src/main/resources/stacks/HDP/2.2/repos/repoinfo.xml
--
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.2/repos/repoinfo.xml
b/ambari-server/src/main/resources/stacks/HDP/2.2/repos/repoinfo.xml
index e9bc3d7..773fe0b 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.2/repos/repoinfo.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.2/repos/repoinfo.xml
@@ -48,14 +48,14 @@
reponameHDP/reponame
/repo
repo
-
baseurlhttp://s3.amazonaws.com/dev.hortonworks.com/HDP-UTILS-1.1.0.20/repos/suse11sp1/baseurl
+
baseurlhttp://s3.amazonaws.com/dev.hortonworks.com/HDP-UTILS-1.1.0.20/repos/sles11sp1/baseurl
repoidHDP-UTILS-1.1.0.20/repoid
reponameHDP-UTILS/reponame
/repo
/os
os family=ubuntu12
repo
-
baseurlhttp://s3.amazonaws.com/dev.hortonworks.com/HDP/ubuntu12/2.x/updates/2.2.0.0/baseurl
+
baseurlhttp://s3.amazonaws.com/dev.hortonworks.com/HDP/ubuntu12/2.x/BUILDS/2.2.0.0-962/baseurl
repoidHDP-2.2/repoid
reponameHDP/reponame
/repo
git commit: AMBARI-7893 Slider View: Updating view params in UI breaks masked params. (atkach)
Repository: ambari
Updated Branches:
refs/heads/trunk e5f9fbb04 - 4fb2a8e02
AMBARI-7893 Slider View: Updating view params in UI breaks masked params.
(atkach)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/4fb2a8e0
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/4fb2a8e0
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/4fb2a8e0
Branch: refs/heads/trunk
Commit: 4fb2a8e021d65f5a7b5dfc4b26ca007226ceb6d1
Parents: e5f9fbb
Author: atkach atk...@hortonworks.com
Authored: Wed Oct 22 17:54:59 2014 +0300
Committer: atkach atk...@hortonworks.com
Committed: Wed Oct 22 17:54:59 2014 +0300
--
.../controllers/ambariViews/ViewsEditCtrl.js| 32 +---
1 file changed, 21 insertions(+), 11 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/4fb2a8e0/ambari-admin/src/main/resources/ui/admin-web/app/scripts/controllers/ambariViews/ViewsEditCtrl.js
--
diff --git
a/ambari-admin/src/main/resources/ui/admin-web/app/scripts/controllers/ambariViews/ViewsEditCtrl.js
b/ambari-admin/src/main/resources/ui/admin-web/app/scripts/controllers/ambariViews/ViewsEditCtrl.js
index b179a70..cbd235c 100644
---
a/ambari-admin/src/main/resources/ui/admin-web/app/scripts/controllers/ambariViews/ViewsEditCtrl.js
+++
b/ambari-admin/src/main/resources/ui/admin-web/app/scripts/controllers/ambariViews/ViewsEditCtrl.js
@@ -33,19 +33,22 @@ angular.module('ambariAdminConsole')
'description': $scope.instance.ViewInstanceInfo.description
};
- $scope.configuration =
angular.copy($scope.instance.ViewInstanceInfo.properties);
- for(var confName in $scope.configuration){
-if( $scope.configuration.hasOwnProperty(confName) ){
- $scope.configuration[confName] = $scope.configuration[confName] ===
'null' ? '' : $scope.configuration[confName];
-}
- }
- $scope.isConfigurationEmpty = angular.equals({}, $scope.configuration);
+initConfigurations();
+$scope.isConfigurationEmpty = angular.equals({}, $scope.configuration);
})
.catch(function(data) {
Alert.error('Cannot load instance info', data.data.message);
});
}
+ function initConfigurations() {
+$scope.configuration =
angular.copy($scope.instance.ViewInstanceInfo.properties);
+for (var confName in $scope.configuration) {
+ if ($scope.configuration.hasOwnProperty(confName)) {
+$scope.configuration[confName] = $scope.configuration[confName] ===
'null' ? '' : $scope.configuration[confName];
+ }
+}
+ }
// Get META for properties
View.getMeta($routeParams.viewId, $routeParams.version).then(function(data) {
@@ -114,9 +117,16 @@ angular.module('ambariAdminConsole')
$scope.editConfigurationDisabled = true;
- $scope.togglePropertiesEditing = function() {
- $scope.editConfigurationDisabled = !$scope.editConfigurationDisabled;
- }
+ $scope.togglePropertiesEditing = function () {
+$scope.editConfigurationDisabled = !$scope.editConfigurationDisabled;
+if (!$scope.editConfigurationDisabled) {
+ $scope.configurationMeta.forEach(function (element) {
+if (element.masked) {
+ $scope.configuration[element.name] = '';
+}
+ });
+}
+ };
$scope.saveConfiguration = function() {
if( $scope.propertiesForm.$valid ){
return View.updateInstance($routeParams.viewId, $routeParams.version,
$routeParams.instanceId, {
@@ -134,7 +144,7 @@ angular.module('ambariAdminConsole')
}
};
$scope.cancelConfiguration = function() {
-$scope.configuration =
angular.copy($scope.instance.ViewInstanceInfo.properties);
+initConfigurations();
$scope.editConfigurationDisabled = true;
$scope.propertiesForm.$setPristine();
};
[2/2] git commit: AMBARI-7903. Difference in hadoop-env.sh from host and UI (aonishuk)
AMBARI-7903. Difference in hadoop-env.sh from host and UI (aonishuk)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/c0aa26a8
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/c0aa26a8
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/c0aa26a8
Branch: refs/heads/branch-1.7.0
Commit: c0aa26a85d69516f275ba86cdd30a5bf27b3361a
Parents: e112f7b
Author: Andrew Onishuk aonis...@hortonworks.com
Authored: Wed Oct 22 17:55:28 2014 +0300
Committer: Andrew Onishuk aonis...@hortonworks.com
Committed: Wed Oct 22 17:55:28 2014 +0300
--
.../stacks/HDP/1.3.2/services/HDFS/configuration/hadoop-env.xml | 5 -
1 file changed, 5 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/c0aa26a8/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/HDFS/configuration/hadoop-env.xml
--
diff --git
a/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/HDFS/configuration/hadoop-env.xml
b/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/HDFS/configuration/hadoop-env.xml
index a2954b7..c06ed20 100644
---
a/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/HDFS/configuration/hadoop-env.xml
+++
b/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/HDFS/configuration/hadoop-env.xml
@@ -112,11 +112,6 @@ export
HADOOP_CONF_DIR=${HADOOP_CONF_DIR:-{{hadoop_conf_dir}}}
# Hadoop home directory
export HADOOP_HOME=${HADOOP_HOME:-/usr/lib/hadoop}
-# this is different for HDP1 #
-# Path to jsvc required by secure HDP 2.0 datanode
-# export JSVC_HOME={{jsvc_path}}
-
-
# The maximum amount of heap to use, in MB. Default is 1000.
export HADOOP_HEAPSIZE={{hadoop_heapsize}}
[1/2] git commit: AMBARI-7903. Difference in hadoop-env.sh from host and UI (aonishuk)
Repository: ambari
Updated Branches:
refs/heads/branch-1.7.0 e112f7b53 - c0aa26a85
refs/heads/trunk 4fb2a8e02 - dfe352adb
AMBARI-7903. Difference in hadoop-env.sh from host and UI (aonishuk)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/dfe352ad
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/dfe352ad
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/dfe352ad
Branch: refs/heads/trunk
Commit: dfe352adb527d92602bd39bd1d7dbaaa1fa0821c
Parents: 4fb2a8e
Author: Andrew Onishuk aonis...@hortonworks.com
Authored: Wed Oct 22 17:55:25 2014 +0300
Committer: Andrew Onishuk aonis...@hortonworks.com
Committed: Wed Oct 22 17:55:25 2014 +0300
--
.../stacks/HDP/1.3.2/services/HDFS/configuration/hadoop-env.xml | 5 -
1 file changed, 5 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/dfe352ad/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/HDFS/configuration/hadoop-env.xml
--
diff --git
a/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/HDFS/configuration/hadoop-env.xml
b/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/HDFS/configuration/hadoop-env.xml
index a2954b7..c06ed20 100644
---
a/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/HDFS/configuration/hadoop-env.xml
+++
b/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/HDFS/configuration/hadoop-env.xml
@@ -112,11 +112,6 @@ export
HADOOP_CONF_DIR=${HADOOP_CONF_DIR:-{{hadoop_conf_dir}}}
# Hadoop home directory
export HADOOP_HOME=${HADOOP_HOME:-/usr/lib/hadoop}
-# this is different for HDP1 #
-# Path to jsvc required by secure HDP 2.0 datanode
-# export JSVC_HOME={{jsvc_path}}
-
-
# The maximum amount of heap to use, in MB. Default is 1000.
export HADOOP_HEAPSIZE={{hadoop_heapsize}}
git commit: AMBARI-7898 Missing /usr/hdp/current dir when Knox is installed (dsen)
Repository: ambari
Updated Branches:
refs/heads/branch-1.7.0 c0aa26a85 - 1cf012bc4
AMBARI-7898 Missing /usr/hdp/current dir when Knox is installed (dsen)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/1cf012bc
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/1cf012bc
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/1cf012bc
Branch: refs/heads/branch-1.7.0
Commit: 1cf012bc4795a2fbe90a0abd21f39d0673ff5899
Parents: c0aa26a
Author: Dmytro Sen d...@hortonworks.com
Authored: Wed Oct 22 18:11:39 2014 +0300
Committer: Dmytro Sen d...@hortonworks.com
Committed: Wed Oct 22 18:11:54 2014 +0300
--
.../resource_management/TestExecuteResource.py | 20
.../core/providers/system.py| 6 +-
.../python/resource_management/core/shell.py| 6 ++
.../2.2/services/KNOX/package/scripts/knox.py | 9 -
.../KNOX/package/scripts/knox_gateway.py| 8
.../2.2/services/KNOX/package/scripts/params.py | 7 +--
.../python/stacks/2.2/KNOX/test_knox_gateway.py | 5 +
7 files changed, 53 insertions(+), 8 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/1cf012bc/ambari-agent/src/test/python/resource_management/TestExecuteResource.py
--
diff --git
a/ambari-agent/src/test/python/resource_management/TestExecuteResource.py
b/ambari-agent/src/test/python/resource_management/TestExecuteResource.py
index 93d7064..f974b92 100644
--- a/ambari-agent/src/test/python/resource_management/TestExecuteResource.py
+++ b/ambari-agent/src/test/python/resource_management/TestExecuteResource.py
@@ -162,6 +162,26 @@ class TestExecuteResource(TestCase):
pass
@patch.object(subprocess, Popen)
+ def test_attribute_environment_non_root(self, popen_mock):
+expected_user = 'test_user'
+
+subproc_mock = MagicMock()
+subproc_mock.returncode = 0
+subproc_mock.communicate.side_effect = [[1]]
+popen_mock.return_value = subproc_mock
+
+with Environment(/) as env:
+ execute_resource = Execute('echo 1',
+ user=expected_user,
+ environment={'JAVA_HOME': '/test/java/home',
+ 'PATH': /bin}
+ )
+expected_command = 'export PATH=$PATH:/bin JAVA_HOME=/test/java/home ;
echo 1'
+self.assertEqual(popen_mock.call_args_list[0][0][0][4], expected_user)
+self.assertEqual(popen_mock.call_args_list[0][0][0][6], expected_command)
+
+
+ @patch.object(subprocess, Popen)
def test_attribute_cwd(self, popen_mock):
expected_cwd = /test/work/directory
http://git-wip-us.apache.org/repos/asf/ambari/blob/1cf012bc/ambari-common/src/main/python/resource_management/core/providers/system.py
--
diff --git
a/ambari-common/src/main/python/resource_management/core/providers/system.py
b/ambari-common/src/main/python/resource_management/core/providers/system.py
index 61194bb..0844775 100644
--- a/ambari-common/src/main/python/resource_management/core/providers/system.py
+++ b/ambari-common/src/main/python/resource_management/core/providers/system.py
@@ -225,8 +225,12 @@ class ExecuteProvider(Provider):
for i in range (0, self.resource.tries):
try:
+env=self.resource.environment
+if env and 'PATH' in env.keys():
+ env['PATH'] = $PATH + os.pathsep + env['PATH']
+
shell.checked_call(self.resource.command,
logoutput=self.resource.logoutput,
-cwd=self.resource.cwd,
env=self.resource.environment,
+cwd=self.resource.cwd, env=env,
preexec_fn=_preexec_fn(self.resource),
user=self.resource.user,
wait_for_finish=self.resource.wait_for_finish,
timeout=self.resource.timeout,
http://git-wip-us.apache.org/repos/asf/ambari/blob/1cf012bc/ambari-common/src/main/python/resource_management/core/shell.py
--
diff --git a/ambari-common/src/main/python/resource_management/core/shell.py
b/ambari-common/src/main/python/resource_management/core/shell.py
index ce3ae97..f0a9d2d 100644
--- a/ambari-common/src/main/python/resource_management/core/shell.py
+++ b/ambari-common/src/main/python/resource_management/core/shell.py
@@ -61,6 +61,12 @@ def _call(command, logoutput=False, throw_on_failure=True,
export_path_command =
if user:
+if env:
+ export_path_command += export
+ for var in env:
+export_path_command += + var + = + env[var]
+ export_path_command += ;
+
subprocess_command =
git commit: AMBARI-7898 Missing /usr/hdp/current dir when Knox is installed (dsen)
Repository: ambari
Updated Branches:
refs/heads/trunk dfe352adb - 06ff32dcd
AMBARI-7898 Missing /usr/hdp/current dir when Knox is installed (dsen)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/06ff32dc
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/06ff32dc
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/06ff32dc
Branch: refs/heads/trunk
Commit: 06ff32dcd13959efcdca5a89353e2e425474b84f
Parents: dfe352a
Author: Dmytro Sen d...@hortonworks.com
Authored: Wed Oct 22 18:13:44 2014 +0300
Committer: Dmytro Sen d...@hortonworks.com
Committed: Wed Oct 22 18:13:44 2014 +0300
--
.../resource_management/TestExecuteResource.py | 20
.../core/providers/system.py| 6 +-
.../python/resource_management/core/shell.py| 8 +++-
.../2.2/services/KNOX/package/scripts/knox.py | 9 -
.../KNOX/package/scripts/knox_gateway.py| 8
.../2.2/services/KNOX/package/scripts/params.py | 7 +--
.../python/stacks/2.2/KNOX/test_knox_gateway.py | 5 +
7 files changed, 54 insertions(+), 9 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/06ff32dc/ambari-agent/src/test/python/resource_management/TestExecuteResource.py
--
diff --git
a/ambari-agent/src/test/python/resource_management/TestExecuteResource.py
b/ambari-agent/src/test/python/resource_management/TestExecuteResource.py
index 93d7064..f974b92 100644
--- a/ambari-agent/src/test/python/resource_management/TestExecuteResource.py
+++ b/ambari-agent/src/test/python/resource_management/TestExecuteResource.py
@@ -162,6 +162,26 @@ class TestExecuteResource(TestCase):
pass
@patch.object(subprocess, Popen)
+ def test_attribute_environment_non_root(self, popen_mock):
+expected_user = 'test_user'
+
+subproc_mock = MagicMock()
+subproc_mock.returncode = 0
+subproc_mock.communicate.side_effect = [[1]]
+popen_mock.return_value = subproc_mock
+
+with Environment(/) as env:
+ execute_resource = Execute('echo 1',
+ user=expected_user,
+ environment={'JAVA_HOME': '/test/java/home',
+ 'PATH': /bin}
+ )
+expected_command = 'export PATH=$PATH:/bin JAVA_HOME=/test/java/home ;
echo 1'
+self.assertEqual(popen_mock.call_args_list[0][0][0][4], expected_user)
+self.assertEqual(popen_mock.call_args_list[0][0][0][6], expected_command)
+
+
+ @patch.object(subprocess, Popen)
def test_attribute_cwd(self, popen_mock):
expected_cwd = /test/work/directory
http://git-wip-us.apache.org/repos/asf/ambari/blob/06ff32dc/ambari-common/src/main/python/resource_management/core/providers/system.py
--
diff --git
a/ambari-common/src/main/python/resource_management/core/providers/system.py
b/ambari-common/src/main/python/resource_management/core/providers/system.py
index 61194bb..0844775 100644
--- a/ambari-common/src/main/python/resource_management/core/providers/system.py
+++ b/ambari-common/src/main/python/resource_management/core/providers/system.py
@@ -225,8 +225,12 @@ class ExecuteProvider(Provider):
for i in range (0, self.resource.tries):
try:
+env=self.resource.environment
+if env and 'PATH' in env.keys():
+ env['PATH'] = $PATH + os.pathsep + env['PATH']
+
shell.checked_call(self.resource.command,
logoutput=self.resource.logoutput,
-cwd=self.resource.cwd,
env=self.resource.environment,
+cwd=self.resource.cwd, env=env,
preexec_fn=_preexec_fn(self.resource),
user=self.resource.user,
wait_for_finish=self.resource.wait_for_finish,
timeout=self.resource.timeout,
http://git-wip-us.apache.org/repos/asf/ambari/blob/06ff32dc/ambari-common/src/main/python/resource_management/core/shell.py
--
diff --git a/ambari-common/src/main/python/resource_management/core/shell.py
b/ambari-common/src/main/python/resource_management/core/shell.py
index ce3ae97..3f5b8bc 100644
--- a/ambari-common/src/main/python/resource_management/core/shell.py
+++ b/ambari-common/src/main/python/resource_management/core/shell.py
@@ -61,6 +61,12 @@ def _call(command, logoutput=False, throw_on_failure=True,
export_path_command =
if user:
+if env:
+ export_path_command += export
+ for var in env:
+export_path_command += + var + = + env[var]
+ export_path_command += ;
+
subprocess_command = [su, -s,
git commit: AMBARI-7901 Slider View: When metrics are being shown, page keeps jumping to the top. (atkach)
Repository: ambari
Updated Branches:
refs/heads/trunk 06ff32dcd - 4e003e581
AMBARI-7901 Slider View: When metrics are being shown, page keeps jumping to
the top. (atkach)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/4e003e58
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/4e003e58
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/4e003e58
Branch: refs/heads/trunk
Commit: 4e003e581ae6797b93ab6b94cba7750465b8c738
Parents: 06ff32d
Author: atkach atk...@hortonworks.com
Authored: Wed Oct 22 18:15:53 2014 +0300
Committer: atkach atk...@hortonworks.com
Committed: Wed Oct 22 18:15:53 2014 +0300
--
.../src/main/resources/ui/app/views/common/chart_view.js | 5 -
.../ui/test/unit/controllers/slider_controller_test.js | 6 ++
2 files changed, 6 insertions(+), 5 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/4e003e58/contrib/views/slider/src/main/resources/ui/app/views/common/chart_view.js
--
diff --git
a/contrib/views/slider/src/main/resources/ui/app/views/common/chart_view.js
b/contrib/views/slider/src/main/resources/ui/app/views/common/chart_view.js
index 7874dca..021117c 100644
--- a/contrib/views/slider/src/main/resources/ui/app/views/common/chart_view.js
+++ b/contrib/views/slider/src/main/resources/ui/app/views/common/chart_view.js
@@ -350,6 +350,8 @@ App.ChartView = Ember.View.extend({
this.set('isPopup', true);
}
else {
+ //set height for empty container while graph drawing to avoid viewport
shrinking by height
+ graph_container.css('height', graph_container.css('height'));
graph_container.children().each(function (index, value) {
$(value).children().remove();
});
@@ -371,6 +373,7 @@ App.ChartView = Ember.View.extend({
}
this.set('isPopup', false);
}
+graph_container.css('height', 'auto');
},
/**
@@ -908,4 +911,4 @@ App.ChartView.CreateRateFormatter = function (unitsPrefix,
valueFormatter) {
value = valueFormatter(value) + suffix;
return value;
};
-};
\ No newline at end of file
+};
http://git-wip-us.apache.org/repos/asf/ambari/blob/4e003e58/contrib/views/slider/src/main/resources/ui/test/unit/controllers/slider_controller_test.js
--
diff --git
a/contrib/views/slider/src/main/resources/ui/test/unit/controllers/slider_controller_test.js
b/contrib/views/slider/src/main/resources/ui/test/unit/controllers/slider_controller_test.js
index 871130a..0ec84c8 100644
---
a/contrib/views/slider/src/main/resources/ui/test/unit/controllers/slider_controller_test.js
+++
b/contrib/views/slider/src/main/resources/ui/test/unit/controllers/slider_controller_test.js
@@ -27,9 +27,7 @@ test('getViewDisplayParametersSuccessCallback', function () {
description : description s1,
label : display s1,
instance_data: {
- java.home: /usr/jdk64/jdk1.7.0_45
-},
-properties: {
+ java.home: /usr/jdk64/jdk1.7.0_45,
slider.user: admin
}
}
@@ -40,4 +38,4 @@ test('getViewDisplayParametersSuccessCallback', function () {
equal(App.get('javaHome'), '/usr/jdk64/jdk1.7.0_45', 'valid default
java_home property is set');
equal(App.get('sliderUser'), 'admin', 'valid sliderUser is set');
-});
\ No newline at end of file
+});
git commit: AMBARI-7901 Slider View: When metrics are being shown, page keeps jumping to the top. (atkach)
Repository: ambari
Updated Branches:
refs/heads/branch-1.7.0 1cf012bc4 - 1e237fc58
AMBARI-7901 Slider View: When metrics are being shown, page keeps jumping to
the top. (atkach)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/1e237fc5
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/1e237fc5
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/1e237fc5
Branch: refs/heads/branch-1.7.0
Commit: 1e237fc5820c700f45af0f78c5c9a4b21bd20e2a
Parents: 1cf012b
Author: atkach atk...@hortonworks.com
Authored: Wed Oct 22 18:16:43 2014 +0300
Committer: atkach atk...@hortonworks.com
Committed: Wed Oct 22 18:16:58 2014 +0300
--
.../slider/src/main/resources/ui/app/views/common/chart_view.js | 5 -
.../ui/test/unit/controllers/slider_controller_test.js | 4 +---
2 files changed, 5 insertions(+), 4 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/1e237fc5/contrib/views/slider/src/main/resources/ui/app/views/common/chart_view.js
--
diff --git
a/contrib/views/slider/src/main/resources/ui/app/views/common/chart_view.js
b/contrib/views/slider/src/main/resources/ui/app/views/common/chart_view.js
index 037e413..f25d1fa 100644
--- a/contrib/views/slider/src/main/resources/ui/app/views/common/chart_view.js
+++ b/contrib/views/slider/src/main/resources/ui/app/views/common/chart_view.js
@@ -350,6 +350,8 @@ App.ChartView = Ember.View.extend({
this.set('isPopup', true);
}
else {
+ //set height for empty container while graph drawing to avoid viewport
shrinking by height
+ graph_container.css('height', graph_container.css('height'));
graph_container.children().each(function (index, value) {
$(value).children().remove();
});
@@ -371,6 +373,7 @@ App.ChartView = Ember.View.extend({
}
this.set('isPopup', false);
}
+graph_container.css('height', 'auto');
},
/**
@@ -908,4 +911,4 @@ App.ChartView.CreateRateFormatter = function (unitsPrefix,
valueFormatter) {
value = valueFormatter(value) + suffix;
return value;
};
-};
+};
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/ambari/blob/1e237fc5/contrib/views/slider/src/main/resources/ui/test/unit/controllers/slider_controller_test.js
--
diff --git
a/contrib/views/slider/src/main/resources/ui/test/unit/controllers/slider_controller_test.js
b/contrib/views/slider/src/main/resources/ui/test/unit/controllers/slider_controller_test.js
index 8310256..0ec84c8 100644
---
a/contrib/views/slider/src/main/resources/ui/test/unit/controllers/slider_controller_test.js
+++
b/contrib/views/slider/src/main/resources/ui/test/unit/controllers/slider_controller_test.js
@@ -27,9 +27,7 @@ test('getViewDisplayParametersSuccessCallback', function () {
description : description s1,
label : display s1,
instance_data: {
- java.home: /usr/jdk64/jdk1.7.0_45
-},
-properties: {
+ java.home: /usr/jdk64/jdk1.7.0_45,
slider.user: admin
}
}
git commit: AMBARI-7884 HDP-2.2 stack should not hard code rpm version to 2.2.0.0 in cluster-env.xml (dsen)
Repository: ambari Updated Branches: refs/heads/trunk 4e003e581 - b2740331a AMBARI-7884 HDP-2.2 stack should not hard code rpm version to 2.2.0.0 in cluster-env.xml (dsen) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/b2740331 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/b2740331 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/b2740331 Branch: refs/heads/trunk Commit: b2740331a514cb7289384d201a10c289e9beba9b Parents: 4e003e5 Author: Dmytro Sen d...@hortonworks.com Authored: Wed Oct 22 18:17:47 2014 +0300 Committer: Dmytro Sen d...@hortonworks.com Committed: Wed Oct 22 18:18:12 2014 +0300 -- .../1.3.2/hooks/before-ANY/scripts/params.py| 22 +++- .../2.0.6/hooks/after-INSTALL/scripts/params.py | 6 +++--- .../scripts/shared_initialization.py| 6 +++--- .../2.0.6/hooks/before-ANY/scripts/params.py| 6 +++--- .../hooks/before-INSTALL/scripts/params.py | 4 ++-- .../scripts/shared_initialization.py| 2 +- .../2.0.6/hooks/before-START/scripts/params.py | 6 +++--- .../services/FLUME/package/scripts/params.py| 6 +++--- .../services/HBASE/package/scripts/params.py| 6 +++--- .../services/HDFS/package/scripts/params.py | 11 -- .../services/HIVE/package/scripts/params.py | 9 .../services/OOZIE/package/scripts/params.py| 11 +++--- .../services/PIG/package/scripts/params.py | 11 -- .../services/SQOOP/package/scripts/params.py| 6 +++--- .../services/YARN/package/scripts/params.py | 6 +++--- .../ZOOKEEPER/package/scripts/params.py | 6 +++--- .../services/FALCON/package/scripts/params.py | 6 +++--- .../services/STORM/package/scripts/params.py| 6 +++--- .../2.1/services/TEZ/package/scripts/params.py | 7 +-- .../stacks/HDP/2.2/services/FALCON/metainfo.xml | 4 ++-- .../stacks/HDP/2.2/services/FLUME/metainfo.xml | 4 ++-- .../stacks/HDP/2.2/services/HBASE/metainfo.xml | 4 ++-- .../stacks/HDP/2.2/services/HDFS/metainfo.xml | 18 .../stacks/HDP/2.2/services/HIVE/metainfo.xml | 12 +-- .../stacks/HDP/2.2/services/KAFKA/metainfo.xml | 4 ++-- .../services/KAFKA/package/scripts/params.py| 6 +++--- .../stacks/HDP/2.2/services/KNOX/metainfo.xml | 4 ++-- .../stacks/HDP/2.2/services/OOZIE/metainfo.xml | 8 +++ .../stacks/HDP/2.2/services/PIG/metainfo.xml| 4 ++-- .../stacks/HDP/2.2/services/SLIDER/metainfo.xml | 4 ++-- .../services/SLIDER/package/scripts/params.py | 6 +++--- .../stacks/HDP/2.2/services/SQOOP/metainfo.xml | 4 ++-- .../stacks/HDP/2.2/services/STORM/metainfo.xml | 4 ++-- .../stacks/HDP/2.2/services/TEZ/metainfo.xml| 4 ++-- .../stacks/HDP/2.2/services/YARN/metainfo.xml | 12 +-- .../HDP/2.2/services/ZOOKEEPER/metainfo.xml | 4 ++-- .../python/stacks/2.0.6/HDFS/test_datanode.py | 8 +++ .../stacks/2.1/configs/default-storm-start.json | 1 - .../stacks/2.1/configs/secured-storm-start.json | 1 - .../stacks/2.2/SLIDER/test_slider_client.py | 2 +- .../test/python/stacks/2.2/configs/default.json | 1 - 41 files changed, 117 insertions(+), 145 deletions(-) -- http://git-wip-us.apache.org/repos/asf/ambari/blob/b2740331/ambari-server/src/main/resources/stacks/HDP/1.3.2/hooks/before-ANY/scripts/params.py -- diff --git a/ambari-server/src/main/resources/stacks/HDP/1.3.2/hooks/before-ANY/scripts/params.py b/ambari-server/src/main/resources/stacks/HDP/1.3.2/hooks/before-ANY/scripts/params.py index 84d19dc..2fa05df 100644 --- a/ambari-server/src/main/resources/stacks/HDP/1.3.2/hooks/before-ANY/scripts/params.py +++ b/ambari-server/src/main/resources/stacks/HDP/1.3.2/hooks/before-ANY/scripts/params.py @@ -34,33 +34,18 @@ java_home = config['hostLevelParams']['java_home'] ambari_server_hostname = config['clusterHostInfo']['ambari_server_host'][0] - -#RPM versioning support -rpm_version = default(/configurations/cluster-env/rpm_version, None) - -#hadoop params -if rpm_version: - mapreduce_libs_path = /usr/hdp/current/hadoop-mapreduce/* - hadoop_libexec_dir = /usr/hdp/current/hadoop/libexec -else: - mapreduce_libs_path = /usr/lib/hadoop-mapreduce/* - hadoop_libexec_dir = /usr/lib/hadoop/libexec +mapreduce_libs_path = /usr/lib/hadoop-mapreduce/* +hadoop_libexec_dir = /usr/lib/hadoop/libexec hadoop_conf_dir = /etc/hadoop/conf hadoop_conf_empty_dir = /etc/hadoop/conf.empty versioned_hdp_root = '/usr/hdp/current' -#security params -security_enabled = config['configurations']['cluster-env']['security_enabled'] -#java params -java_home = config['hostLevelParams']['java_home'] + #hadoop params hdfs_log_dir_prefix =
git commit: AMBARI-7884 HDP-2.2 stack should not hard code rpm version to 2.2.0.0 in cluster-env.xml (dsen)
Repository: ambari Updated Branches: refs/heads/branch-1.7.0 1e237fc58 - 02f6df323 AMBARI-7884 HDP-2.2 stack should not hard code rpm version to 2.2.0.0 in cluster-env.xml (dsen) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/02f6df32 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/02f6df32 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/02f6df32 Branch: refs/heads/branch-1.7.0 Commit: 02f6df32314735e2ec5863c4165d26feed9934b0 Parents: 1e237fc Author: Dmytro Sen d...@hortonworks.com Authored: Wed Oct 22 18:19:41 2014 +0300 Committer: Dmytro Sen d...@hortonworks.com Committed: Wed Oct 22 18:19:41 2014 +0300 -- .../1.3.2/hooks/before-ANY/scripts/params.py| 22 +++- .../2.0.6/hooks/after-INSTALL/scripts/params.py | 6 +++--- .../scripts/shared_initialization.py| 6 +++--- .../2.0.6/hooks/before-ANY/scripts/params.py| 6 +++--- .../hooks/before-INSTALL/scripts/params.py | 4 ++-- .../scripts/shared_initialization.py| 2 +- .../2.0.6/hooks/before-START/scripts/params.py | 6 +++--- .../services/FLUME/package/scripts/params.py| 6 +++--- .../services/HBASE/package/scripts/params.py| 6 +++--- .../services/HDFS/package/scripts/params.py | 11 -- .../services/HIVE/package/scripts/params.py | 9 .../services/OOZIE/package/scripts/params.py| 11 +++--- .../services/PIG/package/scripts/params.py | 11 -- .../services/SQOOP/package/scripts/params.py| 6 +++--- .../services/YARN/package/scripts/params.py | 6 +++--- .../ZOOKEEPER/package/scripts/params.py | 6 +++--- .../services/FALCON/package/scripts/params.py | 6 +++--- .../services/STORM/package/scripts/params.py| 6 +++--- .../2.1/services/TEZ/package/scripts/params.py | 7 +-- .../stacks/HDP/2.2/services/FALCON/metainfo.xml | 4 ++-- .../stacks/HDP/2.2/services/FLUME/metainfo.xml | 4 ++-- .../stacks/HDP/2.2/services/HBASE/metainfo.xml | 4 ++-- .../stacks/HDP/2.2/services/HDFS/metainfo.xml | 18 .../stacks/HDP/2.2/services/HIVE/metainfo.xml | 12 +-- .../stacks/HDP/2.2/services/KAFKA/metainfo.xml | 4 ++-- .../services/KAFKA/package/scripts/params.py| 6 +++--- .../stacks/HDP/2.2/services/KNOX/metainfo.xml | 4 ++-- .../stacks/HDP/2.2/services/OOZIE/metainfo.xml | 8 +++ .../stacks/HDP/2.2/services/PIG/metainfo.xml| 4 ++-- .../stacks/HDP/2.2/services/SLIDER/metainfo.xml | 4 ++-- .../services/SLIDER/package/scripts/params.py | 6 +++--- .../stacks/HDP/2.2/services/SQOOP/metainfo.xml | 4 ++-- .../stacks/HDP/2.2/services/STORM/metainfo.xml | 4 ++-- .../stacks/HDP/2.2/services/TEZ/metainfo.xml| 4 ++-- .../stacks/HDP/2.2/services/YARN/metainfo.xml | 12 +-- .../HDP/2.2/services/ZOOKEEPER/metainfo.xml | 4 ++-- .../python/stacks/2.0.6/HDFS/test_datanode.py | 8 +++ .../stacks/2.1/configs/default-storm-start.json | 1 - .../stacks/2.1/configs/secured-storm-start.json | 1 - .../stacks/2.2/SLIDER/test_slider_client.py | 2 +- .../test/python/stacks/2.2/configs/default.json | 1 - 41 files changed, 117 insertions(+), 145 deletions(-) -- http://git-wip-us.apache.org/repos/asf/ambari/blob/02f6df32/ambari-server/src/main/resources/stacks/HDP/1.3.2/hooks/before-ANY/scripts/params.py -- diff --git a/ambari-server/src/main/resources/stacks/HDP/1.3.2/hooks/before-ANY/scripts/params.py b/ambari-server/src/main/resources/stacks/HDP/1.3.2/hooks/before-ANY/scripts/params.py index 84d19dc..2fa05df 100644 --- a/ambari-server/src/main/resources/stacks/HDP/1.3.2/hooks/before-ANY/scripts/params.py +++ b/ambari-server/src/main/resources/stacks/HDP/1.3.2/hooks/before-ANY/scripts/params.py @@ -34,33 +34,18 @@ java_home = config['hostLevelParams']['java_home'] ambari_server_hostname = config['clusterHostInfo']['ambari_server_host'][0] - -#RPM versioning support -rpm_version = default(/configurations/cluster-env/rpm_version, None) - -#hadoop params -if rpm_version: - mapreduce_libs_path = /usr/hdp/current/hadoop-mapreduce/* - hadoop_libexec_dir = /usr/hdp/current/hadoop/libexec -else: - mapreduce_libs_path = /usr/lib/hadoop-mapreduce/* - hadoop_libexec_dir = /usr/lib/hadoop/libexec +mapreduce_libs_path = /usr/lib/hadoop-mapreduce/* +hadoop_libexec_dir = /usr/lib/hadoop/libexec hadoop_conf_dir = /etc/hadoop/conf hadoop_conf_empty_dir = /etc/hadoop/conf.empty versioned_hdp_root = '/usr/hdp/current' -#security params -security_enabled = config['configurations']['cluster-env']['security_enabled'] -#java params -java_home = config['hostLevelParams']['java_home'] + #hadoop params hdfs_log_dir_prefix =
git commit: AMBARI-7904. Flume agent button is hidden. (onechiporenko)
Repository: ambari
Updated Branches:
refs/heads/trunk b2740331a - 147955bb3
AMBARI-7904. Flume agent button is hidden. (onechiporenko)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/147955bb
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/147955bb
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/147955bb
Branch: refs/heads/trunk
Commit: 147955bb3be297ecbb1665cff45cb75e97d05420
Parents: b274033
Author: Oleg Nechiporenko onechipore...@apache.org
Authored: Wed Oct 22 18:08:21 2014 +0300
Committer: Oleg Nechiporenko onechipore...@apache.org
Committed: Wed Oct 22 18:34:07 2014 +0300
--
ambari-web/app/styles/application.less | 6 ++-
.../templates/main/service/services/flume.hbs | 46 +++-
2 files changed, 30 insertions(+), 22 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/147955bb/ambari-web/app/styles/application.less
--
diff --git a/ambari-web/app/styles/application.less
b/ambari-web/app/styles/application.less
index 4847eaa..5c64bb2 100644
--- a/ambari-web/app/styles/application.less
+++ b/ambari-web/app/styles/application.less
@@ -6982,9 +6982,13 @@ i.icon-asterisks {
.wrapp-flume-status{
text-align: left;
}
- .flume-agents-actions {
+ .btn-wrapper {
margin: 0 5px 5px 0;
float: right;
+width:60px;
+ }
+ .flume-agents-actions {
+position: absolute;
a {
text-decoration: none;
}
http://git-wip-us.apache.org/repos/asf/ambari/blob/147955bb/ambari-web/app/templates/main/service/services/flume.hbs
--
diff --git a/ambari-web/app/templates/main/service/services/flume.hbs
b/ambari-web/app/templates/main/service/services/flume.hbs
index ecbbf46..5bdf242 100644
--- a/ambari-web/app/templates/main/service/services/flume.hbs
+++ b/ambari-web/app/templates/main/service/services/flume.hbs
@@ -42,26 +42,28 @@
/td
td class=agent-status
div class=wrapp-flume-status
- span {{bindAttr
class=host.firtstAgent.healthClass}}/span {{host.firtstAgent.name}}
- div class=btn-group display-inline-block
flume-agents-actions
- a {{bindAttr class=:btn :dropdown-toggle}}
data-toggle=dropdown
href=javascript:void(null){{host.firtstAgent.displayStatus}}
- span class=caret/span
- /a
- ul class=pull-left dropdown-menu
- li {{bindAttr
class=host.firtstAgent.isStartAgentDisabled:disabled}}
- a href=javascript:void(null)
-{{bindAttr
class=host.firtstAgent.isStartAgentDisabled:disabled}}
-{{action startFlumeAgent host.firtstAgent
target=controller}}
-{{t
services.service.summary.flume.startAgent}}/a
- /li
- li {{bindAttr
class=host.firtstAgent.isStopAgentDisabled:disabled}}
- a href=javascript:void(null)
-{{bindAttr
class=host.firtstAgent.isStopAgentDisabled:disabled}}
-{{action stopFlumeAgent host.firtstAgent
target=controller}}
-{{t
services.service.summary.flume.stopAgent}}/a
- /li
- /ul
- /div
+ div class=pull-leftspan {{bindAttr
class=host.firtstAgent.healthClass}}/span {{host.firtstAgent.name}}/div
+ div class=btn-wrapper
+div class=btn-group display-inline-block
flume-agents-actions
+a {{bindAttr class=:btn :dropdown-toggle}}
data-toggle=dropdown
href=javascript:void(null){{host.firtstAgent.displayStatus}}
+span class=caret/span
+/a
+ul class=pull-left dropdown-menu
+li {{bindAttr
class=host.firtstAgent.isStartAgentDisabled:disabled}}
+a href=javascript:void(null)
+ {{bindAttr
class=host.firtstAgent.isStartAgentDisabled:disabled}}
+ {{action startFlumeAgent
host.firtstAgent target=controller}}
+ {{t
services.service.summary.flume.startAgent}}/a
+/li
+li {{bindAttr
git commit: AMBARI-7904. Flume agent button is hidden. (onechiporenko)
Repository: ambari
Updated Branches:
refs/heads/branch-1.7.0 02f6df323 - c7bd58dde
AMBARI-7904. Flume agent button is hidden. (onechiporenko)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/c7bd58dd
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/c7bd58dd
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/c7bd58dd
Branch: refs/heads/branch-1.7.0
Commit: c7bd58dde979005ecf2a5d70fac49c22b2787445
Parents: 02f6df3
Author: Oleg Nechiporenko onechipore...@apache.org
Authored: Wed Oct 22 18:07:08 2014 +0300
Committer: Oleg Nechiporenko onechipore...@apache.org
Committed: Wed Oct 22 18:34:47 2014 +0300
--
ambari-web/app/styles/application.less | 6 ++-
.../templates/main/service/services/flume.hbs | 46 +++-
2 files changed, 30 insertions(+), 22 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/c7bd58dd/ambari-web/app/styles/application.less
--
diff --git a/ambari-web/app/styles/application.less
b/ambari-web/app/styles/application.less
index 4847eaa..5c64bb2 100644
--- a/ambari-web/app/styles/application.less
+++ b/ambari-web/app/styles/application.less
@@ -6982,9 +6982,13 @@ i.icon-asterisks {
.wrapp-flume-status{
text-align: left;
}
- .flume-agents-actions {
+ .btn-wrapper {
margin: 0 5px 5px 0;
float: right;
+width:60px;
+ }
+ .flume-agents-actions {
+position: absolute;
a {
text-decoration: none;
}
http://git-wip-us.apache.org/repos/asf/ambari/blob/c7bd58dd/ambari-web/app/templates/main/service/services/flume.hbs
--
diff --git a/ambari-web/app/templates/main/service/services/flume.hbs
b/ambari-web/app/templates/main/service/services/flume.hbs
index ecbbf46..5bdf242 100644
--- a/ambari-web/app/templates/main/service/services/flume.hbs
+++ b/ambari-web/app/templates/main/service/services/flume.hbs
@@ -42,26 +42,28 @@
/td
td class=agent-status
div class=wrapp-flume-status
- span {{bindAttr
class=host.firtstAgent.healthClass}}/span {{host.firtstAgent.name}}
- div class=btn-group display-inline-block
flume-agents-actions
- a {{bindAttr class=:btn :dropdown-toggle}}
data-toggle=dropdown
href=javascript:void(null){{host.firtstAgent.displayStatus}}
- span class=caret/span
- /a
- ul class=pull-left dropdown-menu
- li {{bindAttr
class=host.firtstAgent.isStartAgentDisabled:disabled}}
- a href=javascript:void(null)
-{{bindAttr
class=host.firtstAgent.isStartAgentDisabled:disabled}}
-{{action startFlumeAgent host.firtstAgent
target=controller}}
-{{t
services.service.summary.flume.startAgent}}/a
- /li
- li {{bindAttr
class=host.firtstAgent.isStopAgentDisabled:disabled}}
- a href=javascript:void(null)
-{{bindAttr
class=host.firtstAgent.isStopAgentDisabled:disabled}}
-{{action stopFlumeAgent host.firtstAgent
target=controller}}
-{{t
services.service.summary.flume.stopAgent}}/a
- /li
- /ul
- /div
+ div class=pull-leftspan {{bindAttr
class=host.firtstAgent.healthClass}}/span {{host.firtstAgent.name}}/div
+ div class=btn-wrapper
+div class=btn-group display-inline-block
flume-agents-actions
+a {{bindAttr class=:btn :dropdown-toggle}}
data-toggle=dropdown
href=javascript:void(null){{host.firtstAgent.displayStatus}}
+span class=caret/span
+/a
+ul class=pull-left dropdown-menu
+li {{bindAttr
class=host.firtstAgent.isStartAgentDisabled:disabled}}
+a href=javascript:void(null)
+ {{bindAttr
class=host.firtstAgent.isStartAgentDisabled:disabled}}
+ {{action startFlumeAgent
host.firtstAgent target=controller}}
+ {{t
services.service.summary.flume.startAgent}}/a
+/li
+li {{bindAttr
git commit: AMBARI-7902 Admin View: Provide identical cluster name validation in Manage. (ababiichuk)
Repository: ambari Updated Branches: refs/heads/trunk 147955bb3 - a64a37055 AMBARI-7902 Admin View: Provide identical cluster name validation in Manage. (ababiichuk) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/a64a3705 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/a64a3705 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/a64a3705 Branch: refs/heads/trunk Commit: a64a370551f128c7230d26f23081aeb7b642485b Parents: 147955b Author: aBabiichuk ababiic...@cybervisiontech.com Authored: Wed Oct 22 17:36:58 2014 +0300 Committer: aBabiichuk ababiic...@cybervisiontech.com Committed: Wed Oct 22 18:50:49 2014 +0300 -- .../src/main/resources/ui/admin-web/app/views/leftNavbar.html | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/ambari/blob/a64a3705/ambari-admin/src/main/resources/ui/admin-web/app/views/leftNavbar.html -- diff --git a/ambari-admin/src/main/resources/ui/admin-web/app/views/leftNavbar.html b/ambari-admin/src/main/resources/ui/admin-web/app/views/leftNavbar.html index af09f57..8bc1472 100644 --- a/ambari-admin/src/main/resources/ui/admin-web/app/views/leftNavbar.html +++ b/ambari-admin/src/main/resources/ui/admin-web/app/views/leftNavbar.html @@ -33,7 +33,8 @@ type=text name=newClusterName ng-required=true - ng-pattern=/^[a-zA-Z0-9]*$/ + ng-pattern=/^\w*$/ + ng-trim=false ng-model=editCluster.name class=form-control input-sm tooltip=Only alpha-numeric characters.
git commit: AMBARI-7902 Admin View: Provide identical cluster name validation in Manage. (ababiichuk)
Repository: ambari Updated Branches: refs/heads/branch-1.7.0 c7bd58dde - de49f5e28 AMBARI-7902 Admin View: Provide identical cluster name validation in Manage. (ababiichuk) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/de49f5e2 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/de49f5e2 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/de49f5e2 Branch: refs/heads/branch-1.7.0 Commit: de49f5e2841a21c9ec486fc7f793f19eaede6b15 Parents: c7bd58d Author: aBabiichuk ababiic...@cybervisiontech.com Authored: Wed Oct 22 17:35:55 2014 +0300 Committer: aBabiichuk ababiic...@cybervisiontech.com Committed: Wed Oct 22 18:52:36 2014 +0300 -- .../src/main/resources/ui/admin-web/app/views/leftNavbar.html | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/ambari/blob/de49f5e2/ambari-admin/src/main/resources/ui/admin-web/app/views/leftNavbar.html -- diff --git a/ambari-admin/src/main/resources/ui/admin-web/app/views/leftNavbar.html b/ambari-admin/src/main/resources/ui/admin-web/app/views/leftNavbar.html index af09f57..8bc1472 100644 --- a/ambari-admin/src/main/resources/ui/admin-web/app/views/leftNavbar.html +++ b/ambari-admin/src/main/resources/ui/admin-web/app/views/leftNavbar.html @@ -33,7 +33,8 @@ type=text name=newClusterName ng-required=true - ng-pattern=/^[a-zA-Z0-9]*$/ + ng-pattern=/^\w*$/ + ng-trim=false ng-model=editCluster.name class=form-control input-sm tooltip=Only alpha-numeric characters.
git commit: AMBARI-7869. Added export handling for new Hive/Zookeeper config property in HDP 2.2
Repository: ambari
Updated Branches:
refs/heads/trunk a64a37055 - 2e3658194
AMBARI-7869. Added export handling for new Hive/Zookeeper config property in
HDP 2.2
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/2e365819
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/2e365819
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/2e365819
Branch: refs/heads/trunk
Commit: 2e3658194b7c5d7a41588931aff35754ac261ac4
Parents: a64a370
Author: Robert Nettleton rnettle...@hortonworks.com
Authored: Wed Oct 22 13:19:41 2014 -0400
Committer: John Speidel jspei...@hortonworks.com
Committed: Wed Oct 22 13:19:41 2014 -0400
--
.../controller/internal/BlueprintConfigurationProcessor.java| 1 +
.../internal/BlueprintConfigurationProcessorTest.java | 5 +
2 files changed, 6 insertions(+)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/2e365819/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/BlueprintConfigurationProcessor.java
--
diff --git
a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/BlueprintConfigurationProcessor.java
b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/BlueprintConfigurationProcessor.java
index 0b58c8d..10cc016 100644
---
a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/BlueprintConfigurationProcessor.java
+++
b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/BlueprintConfigurationProcessor.java
@@ -940,6 +940,7 @@ public class BlueprintConfigurationProcessor {
multiWebhcatSiteMap.put(templeton.kerberos.principal, new
MultipleHostTopologyUpdater(WEBHCAT_SERVER));
hiveEnvMap.put(hive_hostname, new
SingleHostTopologyUpdater(HIVE_SERVER));
multiHiveSiteMap.put(hive.zookeeper.quorum, new
MultipleHostTopologyUpdater(ZOOKEEPER_SERVER));
+
multiHiveSiteMap.put(hive.cluster.delegation.token.store.zookeeper.connectString,
new MultipleHostTopologyUpdater(ZOOKEEPER_SERVER));
// OOZIE_SERVER
oozieSiteMap.put(oozie.base.url, new
SingleHostTopologyUpdater(OOZIE_SERVER));
http://git-wip-us.apache.org/repos/asf/ambari/blob/2e365819/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/BlueprintConfigurationProcessorTest.java
--
diff --git
a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/BlueprintConfigurationProcessorTest.java
b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/BlueprintConfigurationProcessorTest.java
index a57bacb..260d043 100644
---
a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/BlueprintConfigurationProcessorTest.java
+++
b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/BlueprintConfigurationProcessorTest.java
@@ -1641,6 +1641,7 @@ public class BlueprintConfigurationProcessorTest {
hiveSiteProperties.put(hive.metastore.uris, expectedHostName + : +
expectedPortNum);
hiveSiteProperties.put(javax.jdo.option.ConnectionURL, expectedHostName
+ : + expectedPortNum);
hiveSiteProperties.put(hive.zookeeper.quorum, expectedHostName + : +
expectedPortNum + , + expectedHostNameTwo + : + expectedPortNum);
+
hiveSiteProperties.put(hive.cluster.delegation.token.store.zookeeper.connectString,
expectedHostName + : + expectedPortNum + , + expectedHostNameTwo + : +
expectedPortNum);
hiveEnvProperties.put(hive_hostname, expectedHostName);
@@ -1683,6 +1684,10 @@ public class BlueprintConfigurationProcessorTest {
createExportedAddress(expectedPortNum, expectedHostGroupName) + , +
createExportedAddress(expectedPortNum, expectedHostGroupNameTwo),
hiveSiteProperties.get(hive.zookeeper.quorum));
+assertEquals(hive zookeeper connectString property not properly exported,
+ createExportedAddress(expectedPortNum, expectedHostGroupName) + , +
createExportedAddress(expectedPortNum, expectedHostGroupNameTwo),
+
hiveSiteProperties.get(hive.cluster.delegation.token.store.zookeeper.connectString));
+
mockSupport.verifyAll();
}
git commit: AMBARI-7869. Added export handling for new Hive/Zookeeper config property in HDP 2.2
Repository: ambari
Updated Branches:
refs/heads/branch-1.7.0 de49f5e28 - 14302687e
AMBARI-7869. Added export handling for new Hive/Zookeeper config property in
HDP 2.2
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/14302687
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/14302687
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/14302687
Branch: refs/heads/branch-1.7.0
Commit: 14302687e811a4a17dd261d7ff95a68c4afb6e07
Parents: de49f5e
Author: Robert Nettleton rnettle...@hortonworks.com
Authored: Wed Oct 22 13:19:41 2014 -0400
Committer: John Speidel jspei...@hortonworks.com
Committed: Wed Oct 22 13:21:24 2014 -0400
--
.../controller/internal/BlueprintConfigurationProcessor.java| 1 +
.../internal/BlueprintConfigurationProcessorTest.java | 5 +
2 files changed, 6 insertions(+)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/14302687/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/BlueprintConfigurationProcessor.java
--
diff --git
a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/BlueprintConfigurationProcessor.java
b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/BlueprintConfigurationProcessor.java
index 0b58c8d..10cc016 100644
---
a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/BlueprintConfigurationProcessor.java
+++
b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/BlueprintConfigurationProcessor.java
@@ -940,6 +940,7 @@ public class BlueprintConfigurationProcessor {
multiWebhcatSiteMap.put(templeton.kerberos.principal, new
MultipleHostTopologyUpdater(WEBHCAT_SERVER));
hiveEnvMap.put(hive_hostname, new
SingleHostTopologyUpdater(HIVE_SERVER));
multiHiveSiteMap.put(hive.zookeeper.quorum, new
MultipleHostTopologyUpdater(ZOOKEEPER_SERVER));
+
multiHiveSiteMap.put(hive.cluster.delegation.token.store.zookeeper.connectString,
new MultipleHostTopologyUpdater(ZOOKEEPER_SERVER));
// OOZIE_SERVER
oozieSiteMap.put(oozie.base.url, new
SingleHostTopologyUpdater(OOZIE_SERVER));
http://git-wip-us.apache.org/repos/asf/ambari/blob/14302687/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/BlueprintConfigurationProcessorTest.java
--
diff --git
a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/BlueprintConfigurationProcessorTest.java
b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/BlueprintConfigurationProcessorTest.java
index a57bacb..260d043 100644
---
a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/BlueprintConfigurationProcessorTest.java
+++
b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/BlueprintConfigurationProcessorTest.java
@@ -1641,6 +1641,7 @@ public class BlueprintConfigurationProcessorTest {
hiveSiteProperties.put(hive.metastore.uris, expectedHostName + : +
expectedPortNum);
hiveSiteProperties.put(javax.jdo.option.ConnectionURL, expectedHostName
+ : + expectedPortNum);
hiveSiteProperties.put(hive.zookeeper.quorum, expectedHostName + : +
expectedPortNum + , + expectedHostNameTwo + : + expectedPortNum);
+
hiveSiteProperties.put(hive.cluster.delegation.token.store.zookeeper.connectString,
expectedHostName + : + expectedPortNum + , + expectedHostNameTwo + : +
expectedPortNum);
hiveEnvProperties.put(hive_hostname, expectedHostName);
@@ -1683,6 +1684,10 @@ public class BlueprintConfigurationProcessorTest {
createExportedAddress(expectedPortNum, expectedHostGroupName) + , +
createExportedAddress(expectedPortNum, expectedHostGroupNameTwo),
hiveSiteProperties.get(hive.zookeeper.quorum));
+assertEquals(hive zookeeper connectString property not properly exported,
+ createExportedAddress(expectedPortNum, expectedHostGroupName) + , +
createExportedAddress(expectedPortNum, expectedHostGroupNameTwo),
+
hiveSiteProperties.get(hive.cluster.delegation.token.store.zookeeper.connectString));
+
mockSupport.verifyAll();
}
git commit: AMBARI-7906. Slider apps: It is not possible to correct invalid allocation of resources without wizard close (alexantonenko)
Repository: ambari
Updated Branches:
refs/heads/trunk 2e3658194 - 72799ea18
AMBARI-7906. Slider apps: It is not possible to correct invalid allocation of
resources without wizard close (alexantonenko)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/72799ea1
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/72799ea1
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/72799ea1
Branch: refs/heads/trunk
Commit: 72799ea18894a1f87aa9b38f9ef1fde1076fdeef
Parents: 2e36581
Author: Alex Antonenko hiv...@gmail.com
Authored: Wed Oct 22 19:52:02 2014 +0300
Committer: Alex Antonenko hiv...@gmail.com
Committed: Wed Oct 22 21:03:14 2014 +0300
--
.../createAppWizard/step4_controller.js | 2 +-
.../createAppWizard/step4_controller_test.js| 74
2 files changed, 75 insertions(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/72799ea1/contrib/views/slider/src/main/resources/ui/app/controllers/createAppWizard/step4_controller.js
--
diff --git
a/contrib/views/slider/src/main/resources/ui/app/controllers/createAppWizard/step4_controller.js
b/contrib/views/slider/src/main/resources/ui/app/controllers/createAppWizard/step4_controller.js
index d19801b..1089fe9 100644
---
a/contrib/views/slider/src/main/resources/ui/app/controllers/createAppWizard/step4_controller.js
+++
b/contrib/views/slider/src/main/resources/ui/app/controllers/createAppWizard/step4_controller.js
@@ -98,7 +98,7 @@ App.CreateAppWizardStep4Controller =
Ember.ObjectController.extend(App.AjaxError
});
}
return resources;
- }.property('newApp.components.@each'),
+ }.property('newApp.components.@each.numInstances',
'newApp.components.@each.yarnMemory', 'newApp.components.@each.yarnCPU',
'newApp.components.@each.priority', 'newApp.components.@each.yarnLabelChecked',
'newApp.components.@each.yarnLabel'),
/**
* Load all required data for step
http://git-wip-us.apache.org/repos/asf/ambari/blob/72799ea1/contrib/views/slider/src/main/resources/ui/test/unit/controllers/createAppWizard/step4_controller_test.js
--
diff --git
a/contrib/views/slider/src/main/resources/ui/test/unit/controllers/createAppWizard/step4_controller_test.js
b/contrib/views/slider/src/main/resources/ui/test/unit/controllers/createAppWizard/step4_controller_test.js
index 9532883..627e726 100644
---
a/contrib/views/slider/src/main/resources/ui/test/unit/controllers/createAppWizard/step4_controller_test.js
+++
b/contrib/views/slider/src/main/resources/ui/test/unit/controllers/createAppWizard/step4_controller_test.js
@@ -56,4 +56,78 @@ test('isSubmitDisabled', function () {
controller.sendAppDataToServerCompleteCallback();
equal(controller.get('isSubmitDisabled'), false, 'should be false after
sendAppDataToServerCompleteCallback call');
+});
+
+test('resourcesFormatted', function () {
+
+ var cases = [
+ {
+propertyName: 'numInstances',
+expectedPropertyName: 'instanceCount',
+value: '1'
+ },
+ {
+propertyName: 'yarnMemory',
+expectedPropertyName: 'yarnMemory',
+value: '256'
+ },
+ {
+propertyName: 'yarnCPU',
+expectedPropertyName: 'yarnCpuCores',
+value: '2'
+ },
+ {
+propertyName: 'priority',
+expectedPropertyName: 'priority',
+value: 2
+ }
+],
+title = '{0} should be {1}',
+label = 'label';
+
+ var controller = this.subject({
+newApp: Em.Object.create({
+ components: [
+Em.Object.create({
+ name: 'c',
+ numInstances: '0',
+ yarnMemory: '512',
+ yarnCPU: '1',
+ priority: 1
+})
+ ]
+})
+ });
+
+ cases.forEach(function (item) {
+
+Em.run(function () {
+ controller.get('newApp.components')[0].set(item.propertyName,
item.value);
+});
+
+
equal(controller.get('resourcesFormatted.components')[0][item.expectedPropertyName],
item.value, title.format(item.expectedPropertyName, item.value));
+
+ });
+
+ Em.run(function () {
+controller.get('newApp.components')[0].setProperties({
+ yarnLabelChecked: false,
+ yarnLabel: label
+});
+ });
+
+ ok(!controller.get('resourcesFormatted.components')[0].yarnLabel, 'yarnLabel
shouldn\'t be set');
+
+ Em.run(function () {
+controller.get('newApp.components')[0].set('yarnLabelChecked', true);
+ });
+
+ equal(controller.get('resourcesFormatted.components')[0].yarnLabel, label,
title.format('yarnLabel', '\'' + label + '\''));
+
+ Em.run(function () {
+controller.get('newApp.components')[0].set('yarnLabel', ' ' + label +
'\n');
+
git commit: AMBARI-7906. Slider apps: It is not possible to correct invalid allocation of resources without wizard close (alexantonenko)
Repository: ambari
Updated Branches:
refs/heads/branch-1.7.0 14302687e - 6ea772b29
AMBARI-7906. Slider apps: It is not possible to correct invalid allocation of
resources without wizard close (alexantonenko)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/6ea772b2
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/6ea772b2
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/6ea772b2
Branch: refs/heads/branch-1.7.0
Commit: 6ea772b29c9c1d14e12ff87c0436795e26ca5e5d
Parents: 1430268
Author: Alex Antonenko hiv...@gmail.com
Authored: Wed Oct 22 19:08:33 2014 +0300
Committer: Alex Antonenko hiv...@gmail.com
Committed: Wed Oct 22 21:04:58 2014 +0300
--
.../createAppWizard/step4_controller.js | 2 +-
.../createAppWizard/step4_controller_test.js| 74
2 files changed, 75 insertions(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/6ea772b2/contrib/views/slider/src/main/resources/ui/app/controllers/createAppWizard/step4_controller.js
--
diff --git
a/contrib/views/slider/src/main/resources/ui/app/controllers/createAppWizard/step4_controller.js
b/contrib/views/slider/src/main/resources/ui/app/controllers/createAppWizard/step4_controller.js
index d19801b..1089fe9 100644
---
a/contrib/views/slider/src/main/resources/ui/app/controllers/createAppWizard/step4_controller.js
+++
b/contrib/views/slider/src/main/resources/ui/app/controllers/createAppWizard/step4_controller.js
@@ -98,7 +98,7 @@ App.CreateAppWizardStep4Controller =
Ember.ObjectController.extend(App.AjaxError
});
}
return resources;
- }.property('newApp.components.@each'),
+ }.property('newApp.components.@each.numInstances',
'newApp.components.@each.yarnMemory', 'newApp.components.@each.yarnCPU',
'newApp.components.@each.priority', 'newApp.components.@each.yarnLabelChecked',
'newApp.components.@each.yarnLabel'),
/**
* Load all required data for step
http://git-wip-us.apache.org/repos/asf/ambari/blob/6ea772b2/contrib/views/slider/src/main/resources/ui/test/unit/controllers/createAppWizard/step4_controller_test.js
--
diff --git
a/contrib/views/slider/src/main/resources/ui/test/unit/controllers/createAppWizard/step4_controller_test.js
b/contrib/views/slider/src/main/resources/ui/test/unit/controllers/createAppWizard/step4_controller_test.js
index 72162b5..627e726 100644
---
a/contrib/views/slider/src/main/resources/ui/test/unit/controllers/createAppWizard/step4_controller_test.js
+++
b/contrib/views/slider/src/main/resources/ui/test/unit/controllers/createAppWizard/step4_controller_test.js
@@ -57,3 +57,77 @@ test('isSubmitDisabled', function () {
equal(controller.get('isSubmitDisabled'), false, 'should be false after
sendAppDataToServerCompleteCallback call');
});
+
+test('resourcesFormatted', function () {
+
+ var cases = [
+ {
+propertyName: 'numInstances',
+expectedPropertyName: 'instanceCount',
+value: '1'
+ },
+ {
+propertyName: 'yarnMemory',
+expectedPropertyName: 'yarnMemory',
+value: '256'
+ },
+ {
+propertyName: 'yarnCPU',
+expectedPropertyName: 'yarnCpuCores',
+value: '2'
+ },
+ {
+propertyName: 'priority',
+expectedPropertyName: 'priority',
+value: 2
+ }
+],
+title = '{0} should be {1}',
+label = 'label';
+
+ var controller = this.subject({
+newApp: Em.Object.create({
+ components: [
+Em.Object.create({
+ name: 'c',
+ numInstances: '0',
+ yarnMemory: '512',
+ yarnCPU: '1',
+ priority: 1
+})
+ ]
+})
+ });
+
+ cases.forEach(function (item) {
+
+Em.run(function () {
+ controller.get('newApp.components')[0].set(item.propertyName,
item.value);
+});
+
+
equal(controller.get('resourcesFormatted.components')[0][item.expectedPropertyName],
item.value, title.format(item.expectedPropertyName, item.value));
+
+ });
+
+ Em.run(function () {
+controller.get('newApp.components')[0].setProperties({
+ yarnLabelChecked: false,
+ yarnLabel: label
+});
+ });
+
+ ok(!controller.get('resourcesFormatted.components')[0].yarnLabel, 'yarnLabel
shouldn\'t be set');
+
+ Em.run(function () {
+controller.get('newApp.components')[0].set('yarnLabelChecked', true);
+ });
+
+ equal(controller.get('resourcesFormatted.components')[0].yarnLabel, label,
title.format('yarnLabel', '\'' + label + '\''));
+
+ Em.run(function () {
+controller.get('newApp.components')[0].set('yarnLabel', ' ' + label +
'\n');
+ });
+
+
[1/2] AMBARI-7818. Create Metrics Load Simulator.
Repository: ambari Updated Branches: refs/heads/branch-metrics-dev d2c2a60b8 - 55bc69d65 http://git-wip-us.apache.org/repos/asf/ambari/blob/55bc69d6/ambari-metrics/ambari-metrics-hadoop-timelineservice/src/main/resources/metrics_def/RESOURCEMANAGER.dat -- diff --git a/ambari-metrics/ambari-metrics-hadoop-timelineservice/src/main/resources/metrics_def/RESOURCEMANAGER.dat b/ambari-metrics/ambari-metrics-hadoop-timelineservice/src/main/resources/metrics_def/RESOURCEMANAGER.dat new file mode 100644 index 000..ec698db --- /dev/null +++ b/ambari-metrics/ambari-metrics-hadoop-timelineservice/src/main/resources/metrics_def/RESOURCEMANAGER.dat @@ -0,0 +1,88 @@ +jvm.JvmMetrics.GcCount +jvm.JvmMetrics.GcCountPS MarkSweep +jvm.JvmMetrics.GcCountPS Scavenge +jvm.JvmMetrics.GcTimeMillis +jvm.JvmMetrics.GcTimeMillisPS MarkSweep +jvm.JvmMetrics.GcTimeMillisPS Scavenge +jvm.JvmMetrics.LogError +jvm.JvmMetrics.LogFatal +jvm.JvmMetrics.LogInfo +jvm.JvmMetrics.LogWarn +jvm.JvmMetrics.MemHeapCommittedM +jvm.JvmMetrics.MemHeapMaxM +jvm.JvmMetrics.MemHeapUsedM +jvm.JvmMetrics.MemMaxM +jvm.JvmMetrics.MemNonHeapCommittedM +jvm.JvmMetrics.MemNonHeapMaxM +jvm.JvmMetrics.MemNonHeapUsedM +jvm.JvmMetrics.ThreadsBlocked +jvm.JvmMetrics.ThreadsNew +jvm.JvmMetrics.ThreadsRunnable +jvm.JvmMetrics.ThreadsTerminated +jvm.JvmMetrics.ThreadsTimedWaiting +jvm.JvmMetrics.ThreadsWaiting +metricssystem.MetricsSystem.DroppedPubAll +metricssystem.MetricsSystem.NumActiveSinks +metricssystem.MetricsSystem.NumActiveSources +metricssystem.MetricsSystem.NumAllSinks +metricssystem.MetricsSystem.NumAllSources +metricssystem.MetricsSystem.PublishAvgTime +metricssystem.MetricsSystem.PublishNumOps +metricssystem.MetricsSystem.Sink_timelineAvgTime +metricssystem.MetricsSystem.Sink_timelineDropped +metricssystem.MetricsSystem.Sink_timelineNumOps +metricssystem.MetricsSystem.Sink_timelineQsize +metricssystem.MetricsSystem.SnapshotAvgTime +metricssystem.MetricsSystem.SnapshotNumOps +rpc.rpc.CallQueueLength +rpc.rpc.NumOpenConnections +rpc.rpc.ReceivedBytes +rpc.rpc.RpcAuthenticationFailures +rpc.rpc.RpcAuthenticationSuccesses +rpc.rpc.RpcAuthorizationFailures +rpc.rpc.RpcAuthorizationSuccesses +rpc.rpc.RpcProcessingTimeAvgTime +rpc.rpc.RpcProcessingTimeNumOps +rpc.rpc.RpcQueueTimeAvgTime +rpc.rpc.RpcQueueTimeNumOps +rpc.rpc.SentBytes +rpcdetailed.rpcdetailed.NodeHeartbeatAvgTime +rpcdetailed.rpcdetailed.NodeHeartbeatNumOps +rpcdetailed.rpcdetailed.RegisterNodeManagerAvgTime +rpcdetailed.rpcdetailed.RegisterNodeManagerNumOps +ugi.UgiMetrics.GetGroupsAvgTime +ugi.UgiMetrics.GetGroupsNumOps +ugi.UgiMetrics.LoginFailureAvgTime +ugi.UgiMetrics.LoginFailureNumOps +ugi.UgiMetrics.LoginSuccessAvgTime +ugi.UgiMetrics.LoginSuccessNumOps +yarn.ClusterMetrics.NumActiveNMs +yarn.ClusterMetrics.NumDecommissionedNMs +yarn.ClusterMetrics.NumLostNMs +yarn.ClusterMetrics.NumRebootedNMs +yarn.ClusterMetrics.NumUnhealthyNMs +yarn.QueueMetrics.ActiveApplications +yarn.QueueMetrics.ActiveUsers +yarn.QueueMetrics.AggregateContainersAllocated +yarn.QueueMetrics.AggregateContainersReleased +yarn.QueueMetrics.AllocatedContainers +yarn.QueueMetrics.AllocatedMB +yarn.QueueMetrics.AllocatedVCores +yarn.QueueMetrics.AppsCompleted +yarn.QueueMetrics.AppsFailed +yarn.QueueMetrics.AppsKilled +yarn.QueueMetrics.AppsPending +yarn.QueueMetrics.AppsRunning +yarn.QueueMetrics.AppsSubmitted +yarn.QueueMetrics.AvailableMB +yarn.QueueMetrics.AvailableVCores +yarn.QueueMetrics.PendingContainers +yarn.QueueMetrics.PendingMB +yarn.QueueMetrics.PendingVCores +yarn.QueueMetrics.ReservedContainers +yarn.QueueMetrics.ReservedMB +yarn.QueueMetrics.ReservedVCores +yarn.QueueMetrics.running_0 +yarn.QueueMetrics.running_1440 +yarn.QueueMetrics.running_300 +yarn.QueueMetrics.running_60 http://git-wip-us.apache.org/repos/asf/ambari/blob/55bc69d6/ambari-metrics/ambari-metrics-hadoop-timelineservice/src/main/resources/metrics_def/SLAVE_HBASE.dat -- diff --git a/ambari-metrics/ambari-metrics-hadoop-timelineservice/src/main/resources/metrics_def/SLAVE_HBASE.dat b/ambari-metrics/ambari-metrics-hadoop-timelineservice/src/main/resources/metrics_def/SLAVE_HBASE.dat new file mode 100644 index 000..38b870f --- /dev/null +++ b/ambari-metrics/ambari-metrics-hadoop-timelineservice/src/main/resources/metrics_def/SLAVE_HBASE.dat @@ -0,0 +1,178 @@ +ipc.IPC.authenticationFailures +ipc.IPC.authenticationSuccesses +ipc.IPC.authorizationFailures +ipc.IPC.authorizationSuccesses +ipc.IPC.numCallsInGeneralQueue +ipc.IPC.numCallsInPriorityQueue +ipc.IPC.numCallsInReplicationQueue +ipc.IPC.numOpenConnections +ipc.IPC.ProcessCallTime_75th_percentile +ipc.IPC.ProcessCallTime_95th_percentile +ipc.IPC.ProcessCallTime_99th_percentile +ipc.IPC.ProcessCallTime_max +ipc.IPC.ProcessCallTime_mean
git commit: AMBARI-7899. Base URLs for SUSE and Ubuntu in Select stack page fails validation(HDP2.2) (aonishuk)
Repository: ambari
Updated Branches:
refs/heads/branch-1.7.0 6ea772b29 - 47390e18b
AMBARI-7899. Base URLs for SUSE and Ubuntu in Select stack page fails
validation(HDP2.2) (aonishuk)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/47390e18
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/47390e18
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/47390e18
Branch: refs/heads/branch-1.7.0
Commit: 47390e18b30c8bf2f632d8382a768e53380999e8
Parents: 6ea772b
Author: Andrew Onishuk aonis...@hortonworks.com
Authored: Wed Oct 22 21:24:10 2014 +0300
Committer: Andrew Onishuk aonis...@hortonworks.com
Committed: Wed Oct 22 21:24:59 2014 +0300
--
.../org/apache/ambari/server/configuration/Configuration.java| 2 +-
.../src/main/resources/stacks/HDP/2.2/repos/repoinfo.xml | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/47390e18/ambari-server/src/main/java/org/apache/ambari/server/configuration/Configuration.java
--
diff --git
a/ambari-server/src/main/java/org/apache/ambari/server/configuration/Configuration.java
b/ambari-server/src/main/java/org/apache/ambari/server/configuration/Configuration.java
index 64eb105..c3172f2 100644
---
a/ambari-server/src/main/java/org/apache/ambari/server/configuration/Configuration.java
+++
b/ambari-server/src/main/java/org/apache/ambari/server/configuration/Configuration.java
@@ -294,7 +294,7 @@ public class Configuration {
* Default for repo validation suffixes.
*/
private static final String REPO_SUFFIX_DEFAULT = /repodata/repomd.xml;
- private static final String REPO_SUFFIX_UBUNTU =
/dists/%s/Release.gpg,/dists/%s/Release;
+ private static final String REPO_SUFFIX_UBUNTU = /dists/%s/Release;
private static final String PARALLEL_STAGE_EXECUTION_DEFAULT = true;
http://git-wip-us.apache.org/repos/asf/ambari/blob/47390e18/ambari-server/src/main/resources/stacks/HDP/2.2/repos/repoinfo.xml
--
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.2/repos/repoinfo.xml
b/ambari-server/src/main/resources/stacks/HDP/2.2/repos/repoinfo.xml
index a9f99bc..8511665 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.2/repos/repoinfo.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.2/repos/repoinfo.xml
@@ -48,14 +48,14 @@
reponameHDP/reponame
/repo
repo
-
baseurlhttp://s3.amazonaws.com/dev.hortonworks.com/HDP-UTILS-1.1.0.20/repos/suse11sp1/baseurl
+
baseurlhttp://s3.amazonaws.com/dev.hortonworks.com/HDP-UTILS-1.1.0.20/repos/sles11sp1/baseurl
repoidHDP-UTILS-1.1.0.20/repoid
reponameHDP-UTILS/reponame
/repo
/os
os type=ubuntu12
repo
-
baseurlhttp://s3.amazonaws.com/dev.hortonworks.com/HDP/ubuntu12/2.x/updates/2.2.0.0/baseurl
+
baseurlhttp://s3.amazonaws.com/dev.hortonworks.com/HDP/ubuntu12/2.x/BUILDS/2.2.0.0-962/baseurl
repoidHDP-2.2/repoid
reponameHDP/reponame
/repo
git commit: AMBARI-7892. WebHCat to support versioned rpms in Ambari (alejandro)
Repository: ambari
Updated Branches:
refs/heads/trunk 72799ea18 - 58f5fcb4b
AMBARI-7892. WebHCat to support versioned rpms in Ambari (alejandro)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/58f5fcb4
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/58f5fcb4
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/58f5fcb4
Branch: refs/heads/trunk
Commit: 58f5fcb4b19e5c082b69bdd80c7f4af0d29ccdce
Parents: 72799ea
Author: Alejandro Fernandez afernan...@hortonworks.com
Authored: Mon Oct 20 18:10:38 2014 -0700
Committer: Alejandro Fernandez afernan...@hortonworks.com
Committed: Wed Oct 22 11:58:22 2014 -0700
--
.../dynamic_variable_interpretation.py | 54
.../libraries/functions/version.py | 63 +
.../HIVE/configuration/webhcat-site.xml | 15 +--
.../services/HIVE/package/scripts/params.py | 26 ++--
.../services/HIVE/package/scripts/webhcat.py| 132 ---
.../2.1/services/TEZ/package/scripts/params.py | 9 +-
.../HDP/2.2/configuration/cluster-env.xml | 57 +++-
.../HIVE/configuration/webhcat-site.xml | 22 +++-
ambari-server/src/test/python/TestVersion.py| 61 +
.../stacks/2.0.6/HIVE/test_webhcat_server.py| 50 +++
.../python/stacks/2.0.6/configs/default.json| 3 +-
.../python/stacks/2.0.6/configs/secured.json| 3 +-
.../test/python/stacks/2.2/configs/default.json | 7 +
.../test/python/stacks/2.2/configs/secured.json | 7 +
14 files changed, 373 insertions(+), 136 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/58f5fcb4/ambari-common/src/main/python/resource_management/libraries/functions/dynamic_variable_interpretation.py
--
diff --git
a/ambari-common/src/main/python/resource_management/libraries/functions/dynamic_variable_interpretation.py
b/ambari-common/src/main/python/resource_management/libraries/functions/dynamic_variable_interpretation.py
index efe7e63..5112c45 100644
---
a/ambari-common/src/main/python/resource_management/libraries/functions/dynamic_variable_interpretation.py
+++
b/ambari-common/src/main/python/resource_management/libraries/functions/dynamic_variable_interpretation.py
@@ -36,6 +36,7 @@ variables cannot be determined ahead of time, but rather,
depends on what files
It assumes that {{ hdp_stack_version }} is constructed as
${major.minor.patch.rev}-${build_number}
E.g., 998.2.2.1.0-998
+Please note that -${build_number} is optional.
Whereas {{ component_version }} is up to the Component to define, may be 3.0.1
or 301.
@@ -81,10 +82,10 @@ def __get_tar_source_and_dest_folder(tarball_prefix):
return component_tar_source_file, component_tar_destination_folder
-def __create_regex_pattern(file_path, rpm_version):
+def __create_regex_pattern(file_path, hdp_stack_version):
:param file_path: Input file path
- :param rpm_version: HDP rpm version, such as 2.2.0.0
+ :param hdp_stack_version: Stack version, such as 2.2.0.0
:return: Returns an expression that uses file system regex that can be used
with ls and hadoop fs -ls
# Perform the variable interpretation
@@ -94,16 +95,16 @@ def __create_regex_pattern(file_path, rpm_version):
# IMPORTANT, the build version was used in HDP 2.2, but may not be needed in
future versions.
if {{ hdp_stack_version }} in file_path_pattern:
-file_path_pattern = file_path_pattern.replace({{ hdp_stack_version }},
rpm_version + -*) # the trailing -* is the build number
+file_path_pattern = file_path_pattern.replace({{ hdp_stack_version }},
hdp_stack_version + *) # the trailing * is the optional build number
return file_path_pattern
-def __populate_source_and_dests(tarball_prefix, source_file_pattern,
component_tar_destination_folder, rpm_version):
+def __populate_source_and_dests(tarball_prefix, source_file_pattern,
component_tar_destination_folder, hdp_stack_version):
:param tarball_prefix: Prefix of the tarball must be one of tez, hive, mr,
pig
:param source_file_pattern: Regex pattern of the source file from the local
file system
:param component_tar_destination_folder: Destination folder to copy the file
to in HDFS
- :param rpm_version: Stack version number without the build version. E.g.,
2.2.0.0
+ :param hdp_stack_version: Stack version number without the build version.
E.g., 2.2.0.0
:return: Returns a list of tuples (x, y), where x is the source file in the
local file system,
and y is the destination file path in HDFS
@@ -115,12 +116,12 @@ def __populate_source_and_dests(tarball_prefix,
source_file_pattern, component_t
hdp_build_version = None
# Attempt to retrieve the hdp_build_version and
git commit: AMBARI-7892. WebHCat to support versioned rpms in Ambari (alejandro)
Repository: ambari
Updated Branches:
refs/heads/branch-1.7.0 47390e18b - 6734c40ab
AMBARI-7892. WebHCat to support versioned rpms in Ambari (alejandro)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/6734c40a
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/6734c40a
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/6734c40a
Branch: refs/heads/branch-1.7.0
Commit: 6734c40abd51930a5b6e2b54998d42a5bee97f9c
Parents: 47390e1
Author: Alejandro Fernandez afernan...@hortonworks.com
Authored: Wed Oct 22 12:02:01 2014 -0700
Committer: Alejandro Fernandez afernan...@hortonworks.com
Committed: Wed Oct 22 12:02:01 2014 -0700
--
.../dynamic_variable_interpretation.py | 54
.../libraries/functions/version.py | 63 +
.../HIVE/configuration/webhcat-site.xml | 15 +--
.../services/HIVE/package/scripts/params.py | 26 ++--
.../services/HIVE/package/scripts/webhcat.py| 132 ---
.../2.1/services/TEZ/package/scripts/params.py | 9 +-
.../HDP/2.2/configuration/cluster-env.xml | 57 +++-
.../HIVE/configuration/webhcat-site.xml | 22 +++-
ambari-server/src/test/python/TestVersion.py| 61 +
.../stacks/2.0.6/HIVE/test_webhcat_server.py| 50 +++
.../python/stacks/2.0.6/configs/default.json| 3 +-
.../python/stacks/2.0.6/configs/secured.json| 3 +-
.../test/python/stacks/2.2/configs/default.json | 7 +
.../test/python/stacks/2.2/configs/secured.json | 7 +
14 files changed, 373 insertions(+), 136 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/6734c40a/ambari-common/src/main/python/resource_management/libraries/functions/dynamic_variable_interpretation.py
--
diff --git
a/ambari-common/src/main/python/resource_management/libraries/functions/dynamic_variable_interpretation.py
b/ambari-common/src/main/python/resource_management/libraries/functions/dynamic_variable_interpretation.py
index efe7e63..5112c45 100644
---
a/ambari-common/src/main/python/resource_management/libraries/functions/dynamic_variable_interpretation.py
+++
b/ambari-common/src/main/python/resource_management/libraries/functions/dynamic_variable_interpretation.py
@@ -36,6 +36,7 @@ variables cannot be determined ahead of time, but rather,
depends on what files
It assumes that {{ hdp_stack_version }} is constructed as
${major.minor.patch.rev}-${build_number}
E.g., 998.2.2.1.0-998
+Please note that -${build_number} is optional.
Whereas {{ component_version }} is up to the Component to define, may be 3.0.1
or 301.
@@ -81,10 +82,10 @@ def __get_tar_source_and_dest_folder(tarball_prefix):
return component_tar_source_file, component_tar_destination_folder
-def __create_regex_pattern(file_path, rpm_version):
+def __create_regex_pattern(file_path, hdp_stack_version):
:param file_path: Input file path
- :param rpm_version: HDP rpm version, such as 2.2.0.0
+ :param hdp_stack_version: Stack version, such as 2.2.0.0
:return: Returns an expression that uses file system regex that can be used
with ls and hadoop fs -ls
# Perform the variable interpretation
@@ -94,16 +95,16 @@ def __create_regex_pattern(file_path, rpm_version):
# IMPORTANT, the build version was used in HDP 2.2, but may not be needed in
future versions.
if {{ hdp_stack_version }} in file_path_pattern:
-file_path_pattern = file_path_pattern.replace({{ hdp_stack_version }},
rpm_version + -*) # the trailing -* is the build number
+file_path_pattern = file_path_pattern.replace({{ hdp_stack_version }},
hdp_stack_version + *) # the trailing * is the optional build number
return file_path_pattern
-def __populate_source_and_dests(tarball_prefix, source_file_pattern,
component_tar_destination_folder, rpm_version):
+def __populate_source_and_dests(tarball_prefix, source_file_pattern,
component_tar_destination_folder, hdp_stack_version):
:param tarball_prefix: Prefix of the tarball must be one of tez, hive, mr,
pig
:param source_file_pattern: Regex pattern of the source file from the local
file system
:param component_tar_destination_folder: Destination folder to copy the file
to in HDFS
- :param rpm_version: Stack version number without the build version. E.g.,
2.2.0.0
+ :param hdp_stack_version: Stack version number without the build version.
E.g., 2.2.0.0
:return: Returns a list of tuples (x, y), where x is the source file in the
local file system,
and y is the destination file path in HDFS
@@ -115,12 +116,12 @@ def __populate_source_and_dests(tarball_prefix,
source_file_pattern, component_t
hdp_build_version = None
# Attempt to retrieve the hdp_build_version
git commit: AMBARI-7909. Slider View: tolerate Slider app packages that do not contain required artifacts (srimanth)
Repository: ambari
Updated Branches:
refs/heads/branch-1.7.0 6734c40ab - 67d140a37
AMBARI-7909. Slider View: tolerate Slider app packages that do not contain
required artifacts (srimanth)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/67d140a3
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/67d140a3
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/67d140a3
Branch: refs/heads/branch-1.7.0
Commit: 67d140a379b762b793910caa6f6e763d7bc23abb
Parents: 6734c40
Author: Srimanth Gunturi sgunt...@hortonworks.com
Authored: Wed Oct 22 12:36:21 2014 -0700
Committer: Srimanth Gunturi sgunt...@hortonworks.com
Committed: Wed Oct 22 12:36:29 2014 -0700
--
.../slider/SliderAppsViewControllerImpl.java | 19 +++
1 file changed, 15 insertions(+), 4 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/67d140a3/contrib/views/slider/src/main/java/org/apache/ambari/view/slider/SliderAppsViewControllerImpl.java
--
diff --git
a/contrib/views/slider/src/main/java/org/apache/ambari/view/slider/SliderAppsViewControllerImpl.java
b/contrib/views/slider/src/main/java/org/apache/ambari/view/slider/SliderAppsViewControllerImpl.java
index 7a5a69a..c1ad34b 100644
---
a/contrib/views/slider/src/main/java/org/apache/ambari/view/slider/SliderAppsViewControllerImpl.java
+++
b/contrib/views/slider/src/main/java/org/apache/ambari/view/slider/SliderAppsViewControllerImpl.java
@@ -76,6 +76,7 @@ import
org.apache.slider.providers.agent.application.metadata.Application;
import org.apache.slider.providers.agent.application.metadata.Component;
import org.apache.slider.providers.agent.application.metadata.Metainfo;
import org.apache.slider.providers.agent.application.metadata.MetainfoParser;
+import org.apache.tools.zip.ZipEntry;
import org.apache.tools.zip.ZipFile;
import org.codehaus.jackson.map.ObjectMapper;
import org.codehaus.jackson.type.TypeReference;
@@ -916,11 +917,19 @@ public class SliderAppsViewControllerImpl implements
SliderAppsViewController {
// Create app type object
if (metainfo.getApplication() != null) {
Application application = metainfo.getApplication();
+ ZipEntry appConfigZipEntry =
zipFile.getEntry(appConfig-default.json);
+ if (appConfigZipEntry == null) {
+throw new IllegalStateException(Slider App package ' +
appZip.getName() + ' does not contain 'appConfig-default.json' file);
+ }
+ ZipEntry resourcesZipEntry =
zipFile.getEntry(resources-default.json);
+ if (resourcesZipEntry == null) {
+throw new IllegalStateException(Slider App package ' +
appZip.getName() + ' does not contain 'resources-default.json' file);
+ }
String appConfigJsonString = IOUtils.toString(
-
zipFile.getInputStream(zipFile.getEntry(appConfig-default.json)),
+ zipFile.getInputStream(appConfigZipEntry),
UTF-8);
String resourcesJsonString = IOUtils.toString(
-
zipFile.getInputStream(zipFile.getEntry(resources-default.json)),
+ zipFile.getInputStream(resourcesZipEntry),
UTF-8);
JsonElement appConfigJson = new JsonParser()
.parse(appConfigJsonString);
@@ -994,9 +1003,11 @@ public class SliderAppsViewControllerImpl implements
SliderAppsViewController {
appTypes.add(appType);
}
} catch (ZipException e) {
-logger.warn(Unable to parse app + appZip.getAbsolutePath(), e);
+logger.warn(Unable to parse Slider App package +
appZip.getAbsolutePath(), e);
} catch (IOException e) {
-logger.warn(Unable to parse app + appZip.getAbsolutePath(), e);
+logger.warn(Unable to parse Slider App package +
appZip.getAbsolutePath(), e);
+ } catch (Throwable e) {
+logger.warn(Unable to parse Slider App package +
appZip.getAbsolutePath(), e);
}
}
}
git commit: AMBARI-7909. Slider View: tolerate Slider app packages that do not contain required artifacts (srimanth)
Repository: ambari
Updated Branches:
refs/heads/trunk 58f5fcb4b - 0a51444de
AMBARI-7909. Slider View: tolerate Slider app packages that do not contain
required artifacts (srimanth)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/0a51444d
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/0a51444d
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/0a51444d
Branch: refs/heads/trunk
Commit: 0a51444deb1efc1de816394c1f716bf94d6f2b4c
Parents: 58f5fcb
Author: Srimanth Gunturi sgunt...@hortonworks.com
Authored: Wed Oct 22 12:36:21 2014 -0700
Committer: Srimanth Gunturi sgunt...@hortonworks.com
Committed: Wed Oct 22 13:07:34 2014 -0700
--
.../slider/SliderAppsViewControllerImpl.java | 19 +++
1 file changed, 15 insertions(+), 4 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/0a51444d/contrib/views/slider/src/main/java/org/apache/ambari/view/slider/SliderAppsViewControllerImpl.java
--
diff --git
a/contrib/views/slider/src/main/java/org/apache/ambari/view/slider/SliderAppsViewControllerImpl.java
b/contrib/views/slider/src/main/java/org/apache/ambari/view/slider/SliderAppsViewControllerImpl.java
index 7a5a69a..c1ad34b 100644
---
a/contrib/views/slider/src/main/java/org/apache/ambari/view/slider/SliderAppsViewControllerImpl.java
+++
b/contrib/views/slider/src/main/java/org/apache/ambari/view/slider/SliderAppsViewControllerImpl.java
@@ -76,6 +76,7 @@ import
org.apache.slider.providers.agent.application.metadata.Application;
import org.apache.slider.providers.agent.application.metadata.Component;
import org.apache.slider.providers.agent.application.metadata.Metainfo;
import org.apache.slider.providers.agent.application.metadata.MetainfoParser;
+import org.apache.tools.zip.ZipEntry;
import org.apache.tools.zip.ZipFile;
import org.codehaus.jackson.map.ObjectMapper;
import org.codehaus.jackson.type.TypeReference;
@@ -916,11 +917,19 @@ public class SliderAppsViewControllerImpl implements
SliderAppsViewController {
// Create app type object
if (metainfo.getApplication() != null) {
Application application = metainfo.getApplication();
+ ZipEntry appConfigZipEntry =
zipFile.getEntry(appConfig-default.json);
+ if (appConfigZipEntry == null) {
+throw new IllegalStateException(Slider App package ' +
appZip.getName() + ' does not contain 'appConfig-default.json' file);
+ }
+ ZipEntry resourcesZipEntry =
zipFile.getEntry(resources-default.json);
+ if (resourcesZipEntry == null) {
+throw new IllegalStateException(Slider App package ' +
appZip.getName() + ' does not contain 'resources-default.json' file);
+ }
String appConfigJsonString = IOUtils.toString(
-
zipFile.getInputStream(zipFile.getEntry(appConfig-default.json)),
+ zipFile.getInputStream(appConfigZipEntry),
UTF-8);
String resourcesJsonString = IOUtils.toString(
-
zipFile.getInputStream(zipFile.getEntry(resources-default.json)),
+ zipFile.getInputStream(resourcesZipEntry),
UTF-8);
JsonElement appConfigJson = new JsonParser()
.parse(appConfigJsonString);
@@ -994,9 +1003,11 @@ public class SliderAppsViewControllerImpl implements
SliderAppsViewController {
appTypes.add(appType);
}
} catch (ZipException e) {
-logger.warn(Unable to parse app + appZip.getAbsolutePath(), e);
+logger.warn(Unable to parse Slider App package +
appZip.getAbsolutePath(), e);
} catch (IOException e) {
-logger.warn(Unable to parse app + appZip.getAbsolutePath(), e);
+logger.warn(Unable to parse Slider App package +
appZip.getAbsolutePath(), e);
+ } catch (Throwable e) {
+logger.warn(Unable to parse Slider App package +
appZip.getAbsolutePath(), e);
}
}
}
Git Push Summary
Repository: ambari Updated Branches: refs/heads/branch-kerb-dev [created] 58f5fcb4b
[1/2] git commit: AMBARI-7910. Lzo package missing (aonishuk)
Repository: ambari
Updated Branches:
refs/heads/branch-1.7.0 67d140a37 - 0aaeece55
refs/heads/trunk 0a51444de - 5db075bf5
AMBARI-7910. Lzo package missing (aonishuk)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/5db075bf
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/5db075bf
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/5db075bf
Branch: refs/heads/trunk
Commit: 5db075bf5053ee8540a55d0ddc430f73034df7e1
Parents: 0a51444
Author: Andrew Onishuk aonis...@hortonworks.com
Authored: Wed Oct 22 23:26:45 2014 +0300
Committer: Andrew Onishuk aonis...@hortonworks.com
Committed: Wed Oct 22 23:26:45 2014 +0300
--
.../services/HDFS/configuration/core-site.xml | 10 +-
.../1.3.2/services/HDFS/package/scripts/hdfs.py | 3 +++
.../services/HDFS/package/scripts/params.py | 20 +++-
.../services/HDFS/configuration/core-site.xml | 2 +-
.../2.0.6/services/HDFS/package/scripts/hdfs.py | 3 +++
.../services/HDFS/package/scripts/params.py | 20
.../python/stacks/1.3.2/configs/default.json| 3 +--
.../python/stacks/1.3.2/configs/secured.json| 3 +--
8 files changed, 41 insertions(+), 23 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/5db075bf/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/HDFS/configuration/core-site.xml
--
diff --git
a/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/HDFS/configuration/core-site.xml
b/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/HDFS/configuration/core-site.xml
index f9d6ebe..76215b9 100644
---
a/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/HDFS/configuration/core-site.xml
+++
b/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/HDFS/configuration/core-site.xml
@@ -42,19 +42,11 @@
property
nameio.compression.codecs/name
-
valueorg.apache.hadoop.io.compress.GzipCodec,org.apache.hadoop.io.compress.DefaultCodec,com.hadoop.compression.lzo.LzoCodec,com.hadoop.compression.lzo.LzopCodec,org.apache.hadoop.io.compress.SnappyCodec/value
+
valueorg.apache.hadoop.io.compress.GzipCodec,org.apache.hadoop.io.compress.DefaultCodec,org.apache.hadoop.io.compress.SnappyCodec/value
descriptionA list of the compression codec classes that can be used
for compression/decompression./description
/property
-
- property
-nameio.compression.codec.lzo.class/name
-valuecom.hadoop.compression.lzo.LzoCodec/value
-descriptionThe implementation for lzo codec./description
- /property
-
-
!-- file system properties --
property
http://git-wip-us.apache.org/repos/asf/ambari/blob/5db075bf/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/HDFS/package/scripts/hdfs.py
--
diff --git
a/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/HDFS/package/scripts/hdfs.py
b/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/HDFS/package/scripts/hdfs.py
index 6f24f8e..751ed9a 100644
---
a/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/HDFS/package/scripts/hdfs.py
+++
b/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/HDFS/package/scripts/hdfs.py
@@ -69,3 +69,6 @@ def hdfs(name=None):
owner=tc_owner,
content=Template(slaves.j2)
)
+ if params.lzo_enabled:
+Package(params.lzo_packages_for_current_host)
+
http://git-wip-us.apache.org/repos/asf/ambari/blob/5db075bf/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/HDFS/package/scripts/params.py
--
diff --git
a/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/HDFS/package/scripts/params.py
b/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/HDFS/package/scripts/params.py
index 504e6ac..376a466 100644
---
a/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/HDFS/package/scripts/params.py
+++
b/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/HDFS/package/scripts/params.py
@@ -20,6 +20,7 @@ limitations under the License.
from resource_management import *
import status_params
import os
+import itertools
config = Script.get_config()
tmp_dir = Script.get_tmp_dir()
@@ -145,11 +146,20 @@ HdfsDirectory = functools.partial(
limits_conf_dir = /etc/security/limits.d
io_compression_codecs =
config['configurations']['core-site']['io.compression.codecs']
-if not com.hadoop.compression.lzo in io_compression_codecs:
- exclude_packages = [lzo, hadoop-lzo, hadoop-lzo-native]
-else:
- exclude_packages = []
-
+lzo_enabled = com.hadoop.compression.lzo in io_compression_codecs
+
+lzo_packages_to_family = {
+ any: [hadoop-lzo],
[2/2] git commit: AMBARI-7910. Lzo package missing (aonishuk)
AMBARI-7910. Lzo package missing (aonishuk)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/0aaeece5
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/0aaeece5
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/0aaeece5
Branch: refs/heads/branch-1.7.0
Commit: 0aaeece551e149ea12979aa4b7e1f93697e8813d
Parents: 67d140a
Author: Andrew Onishuk aonis...@hortonworks.com
Authored: Wed Oct 22 23:26:49 2014 +0300
Committer: Andrew Onishuk aonis...@hortonworks.com
Committed: Wed Oct 22 23:26:49 2014 +0300
--
.../services/HDFS/configuration/core-site.xml | 10 +-
.../1.3.2/services/HDFS/package/scripts/hdfs.py | 3 +++
.../services/HDFS/package/scripts/params.py | 20 +++-
.../services/HDFS/configuration/core-site.xml | 2 +-
.../2.0.6/services/HDFS/package/scripts/hdfs.py | 3 +++
.../services/HDFS/package/scripts/params.py | 20
.../python/stacks/1.3.2/configs/default.json| 3 +--
.../python/stacks/1.3.2/configs/secured.json| 3 +--
8 files changed, 41 insertions(+), 23 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/0aaeece5/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/HDFS/configuration/core-site.xml
--
diff --git
a/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/HDFS/configuration/core-site.xml
b/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/HDFS/configuration/core-site.xml
index f9d6ebe..76215b9 100644
---
a/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/HDFS/configuration/core-site.xml
+++
b/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/HDFS/configuration/core-site.xml
@@ -42,19 +42,11 @@
property
nameio.compression.codecs/name
-
valueorg.apache.hadoop.io.compress.GzipCodec,org.apache.hadoop.io.compress.DefaultCodec,com.hadoop.compression.lzo.LzoCodec,com.hadoop.compression.lzo.LzopCodec,org.apache.hadoop.io.compress.SnappyCodec/value
+
valueorg.apache.hadoop.io.compress.GzipCodec,org.apache.hadoop.io.compress.DefaultCodec,org.apache.hadoop.io.compress.SnappyCodec/value
descriptionA list of the compression codec classes that can be used
for compression/decompression./description
/property
-
- property
-nameio.compression.codec.lzo.class/name
-valuecom.hadoop.compression.lzo.LzoCodec/value
-descriptionThe implementation for lzo codec./description
- /property
-
-
!-- file system properties --
property
http://git-wip-us.apache.org/repos/asf/ambari/blob/0aaeece5/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/HDFS/package/scripts/hdfs.py
--
diff --git
a/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/HDFS/package/scripts/hdfs.py
b/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/HDFS/package/scripts/hdfs.py
index 6f24f8e..751ed9a 100644
---
a/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/HDFS/package/scripts/hdfs.py
+++
b/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/HDFS/package/scripts/hdfs.py
@@ -69,3 +69,6 @@ def hdfs(name=None):
owner=tc_owner,
content=Template(slaves.j2)
)
+ if params.lzo_enabled:
+Package(params.lzo_packages_for_current_host)
+
http://git-wip-us.apache.org/repos/asf/ambari/blob/0aaeece5/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/HDFS/package/scripts/params.py
--
diff --git
a/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/HDFS/package/scripts/params.py
b/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/HDFS/package/scripts/params.py
index 504e6ac..376a466 100644
---
a/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/HDFS/package/scripts/params.py
+++
b/ambari-server/src/main/resources/stacks/HDP/1.3.2/services/HDFS/package/scripts/params.py
@@ -20,6 +20,7 @@ limitations under the License.
from resource_management import *
import status_params
import os
+import itertools
config = Script.get_config()
tmp_dir = Script.get_tmp_dir()
@@ -145,11 +146,20 @@ HdfsDirectory = functools.partial(
limits_conf_dir = /etc/security/limits.d
io_compression_codecs =
config['configurations']['core-site']['io.compression.codecs']
-if not com.hadoop.compression.lzo in io_compression_codecs:
- exclude_packages = [lzo, hadoop-lzo, hadoop-lzo-native]
-else:
- exclude_packages = []
-
+lzo_enabled = com.hadoop.compression.lzo in io_compression_codecs
+
+lzo_packages_to_family = {
+ any: [hadoop-lzo],
+ redhat: [lzo, hadoop-lzo-native],
+ suse: [lzo, hadoop-lzo-native],
+ ubuntu: [liblzo2-2]
+}
git commit: AMBARI-7880. Recommendations API works too slow for 400 node cluster - extra Hosts information
Repository: ambari Updated Branches: refs/heads/branch-1.7.0 0aaeece55 - a4bc020e1 AMBARI-7880. Recommendations API works too slow for 400 node cluster - extra Hosts information Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/a4bc020e Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/a4bc020e Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/a4bc020e Branch: refs/heads/branch-1.7.0 Commit: a4bc020e16571babbb06e3c42f0ec284616a9d0e Parents: 0aaeece Author: Srimanth Gunturi sgunt...@hortonworks.com Authored: Wed Oct 22 14:27:21 2014 -0700 Committer: Srimanth Gunturi sgunt...@hortonworks.com Committed: Wed Oct 22 14:27:21 2014 -0700 -- .../api/services/stackadvisor/commands/StackAdvisorCommand.java| 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/ambari/blob/a4bc020e/ambari-server/src/main/java/org/apache/ambari/server/api/services/stackadvisor/commands/StackAdvisorCommand.java -- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/api/services/stackadvisor/commands/StackAdvisorCommand.java b/ambari-server/src/main/java/org/apache/ambari/server/api/services/stackadvisor/commands/StackAdvisorCommand.java index eceefef..63ec0ed 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/api/services/stackadvisor/commands/StackAdvisorCommand.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/api/services/stackadvisor/commands/StackAdvisorCommand.java @@ -70,7 +70,7 @@ public abstract class StackAdvisorCommandT extends StackAdvisorResponse extend protected static Log LOG = LogFactory.getLog(StackAdvisorCommand.class); private static final String GET_HOSTS_INFO_URI = /api/v1/hosts - + ?fields=Hosts/host_name,Hosts/total_mem,Hosts/cpu_count,Hosts/disk_infoHosts/host_name.in(%s); + + ?fields=HostsHosts/host_name.in(%s); private static final String GET_SERVICES_INFO_URI = /api/v1/stacks/%s/versions/%s + ?fields=Versions/stack_name,Versions/stack_version,Versions/parent_stack_version + ,services/StackServices/service_name,services/StackServices/service_version
git commit: AMBARI-7880. Recommendations API works too slow for 400 node cluster - extra Hosts information
Repository: ambari Updated Branches: refs/heads/trunk 5db075bf5 - 093cfd639 AMBARI-7880. Recommendations API works too slow for 400 node cluster - extra Hosts information Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/093cfd63 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/093cfd63 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/093cfd63 Branch: refs/heads/trunk Commit: 093cfd639a0c4397f70cb538256ad1f923b5f986 Parents: 5db075b Author: Srimanth Gunturi sgunt...@hortonworks.com Authored: Wed Oct 22 14:27:21 2014 -0700 Committer: Srimanth Gunturi sgunt...@hortonworks.com Committed: Wed Oct 22 14:28:19 2014 -0700 -- .../api/services/stackadvisor/commands/StackAdvisorCommand.java| 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/ambari/blob/093cfd63/ambari-server/src/main/java/org/apache/ambari/server/api/services/stackadvisor/commands/StackAdvisorCommand.java -- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/api/services/stackadvisor/commands/StackAdvisorCommand.java b/ambari-server/src/main/java/org/apache/ambari/server/api/services/stackadvisor/commands/StackAdvisorCommand.java index eceefef..63ec0ed 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/api/services/stackadvisor/commands/StackAdvisorCommand.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/api/services/stackadvisor/commands/StackAdvisorCommand.java @@ -70,7 +70,7 @@ public abstract class StackAdvisorCommandT extends StackAdvisorResponse extend protected static Log LOG = LogFactory.getLog(StackAdvisorCommand.class); private static final String GET_HOSTS_INFO_URI = /api/v1/hosts - + ?fields=Hosts/host_name,Hosts/total_mem,Hosts/cpu_count,Hosts/disk_infoHosts/host_name.in(%s); + + ?fields=HostsHosts/host_name.in(%s); private static final String GET_SERVICES_INFO_URI = /api/v1/stacks/%s/versions/%s + ?fields=Versions/stack_name,Versions/stack_version,Versions/parent_stack_version + ,services/StackServices/service_name,services/StackServices/service_version
git commit: AMBARI-5707. Disable TEMP table creation and support Windows. (swagle)
Repository: ambari
Updated Branches:
refs/heads/branch-metrics-dev 55bc69d65 - e78210d58
AMBARI-5707. Disable TEMP table creation and support Windows. (swagle)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/e78210d5
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/e78210d5
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/e78210d5
Branch: refs/heads/branch-metrics-dev
Commit: e78210d58b73b1c3ef544d0d083c316ac1506089
Parents: 55bc69d
Author: Siddharth Wagle swa...@hortonworks.com
Authored: Wed Oct 22 14:30:00 2014 -0700
Committer: Siddharth Wagle swa...@hortonworks.com
Committed: Wed Oct 22 14:30:00 2014 -0700
--
.../timeline/HBaseTimelineMetricStore.java | 2 +-
.../metrics/timeline/PhoenixHBaseAccessor.java | 32 ++--
.../metrics/timeline/PhoenixTransactSQL.java| 12
.../TimelineMetricAggregatorMinute.java | 2 +-
.../TimelineMetricClusterAggregator.java| 4 +--
5 files changed, 26 insertions(+), 26 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/e78210d5/ambari-metrics/ambari-metrics-hadoop-timelineservice/src/main/java/org/apache/hadoop/yarn/server/applicationhistoryservice/metrics/timeline/HBaseTimelineMetricStore.java
--
diff --git
a/ambari-metrics/ambari-metrics-hadoop-timelineservice/src/main/java/org/apache/hadoop/yarn/server/applicationhistoryservice/metrics/timeline/HBaseTimelineMetricStore.java
b/ambari-metrics/ambari-metrics-hadoop-timelineservice/src/main/java/org/apache/hadoop/yarn/server/applicationhistoryservice/metrics/timeline/HBaseTimelineMetricStore.java
index 7a495ca..bc1fcf5 100644
---
a/ambari-metrics/ambari-metrics-hadoop-timelineservice/src/main/java/org/apache/hadoop/yarn/server/applicationhistoryservice/metrics/timeline/HBaseTimelineMetricStore.java
+++
b/ambari-metrics/ambari-metrics-hadoop-timelineservice/src/main/java/org/apache/hadoop/yarn/server/applicationhistoryservice/metrics/timeline/HBaseTimelineMetricStore.java
@@ -41,7 +41,7 @@ public class HBaseTimelineMetricStore extends AbstractService
static final Log LOG = LogFactory.getLog(HBaseTimelineMetricStore.class);
static final String HBASE_CONF = hbase-site.xml;
- static final String DEFAULT_CHECKPOINT_LOCATION = /tmp;
+ static final String DEFAULT_CHECKPOINT_LOCATION =
System.getProperty(java.io.tmpdir);
static final String AGGREGATOR_CHECKPOINT_FILE =
timeline-metrics-aggregator-checkpoint;
static final String MINUTE_AGGREGATE_ROLLUP_CHECKPOINT_FILE =
http://git-wip-us.apache.org/repos/asf/ambari/blob/e78210d5/ambari-metrics/ambari-metrics-hadoop-timelineservice/src/main/java/org/apache/hadoop/yarn/server/applicationhistoryservice/metrics/timeline/PhoenixHBaseAccessor.java
--
diff --git
a/ambari-metrics/ambari-metrics-hadoop-timelineservice/src/main/java/org/apache/hadoop/yarn/server/applicationhistoryservice/metrics/timeline/PhoenixHBaseAccessor.java
b/ambari-metrics/ambari-metrics-hadoop-timelineservice/src/main/java/org/apache/hadoop/yarn/server/applicationhistoryservice/metrics/timeline/PhoenixHBaseAccessor.java
index f782308..19f41b5 100644
---
a/ambari-metrics/ambari-metrics-hadoop-timelineservice/src/main/java/org/apache/hadoop/yarn/server/applicationhistoryservice/metrics/timeline/PhoenixHBaseAccessor.java
+++
b/ambari-metrics/ambari-metrics-hadoop-timelineservice/src/main/java/org/apache/hadoop/yarn/server/applicationhistoryservice/metrics/timeline/PhoenixHBaseAccessor.java
@@ -161,9 +161,9 @@ public class PhoenixHBaseAccessor {
stmt.executeUpdate(String.format(CREATE_METRICS_TABLE_SQL,
METRICS_RECORD_TABLE_NAME, METRICS_RECORD_TABLE_TTL,
DEFAULT_TABLE_COMPRESSION));
- stmt.executeUpdate(String.format(CREATE_METRICS_TABLE_SQL,
+ /*stmt.executeUpdate(String.format(CREATE_METRICS_TABLE_SQL,
METRICS_RECORD_CACHE_TABLE_NAME, METRICS_RECORD_CACHE_TABLE_TTL,
-NONE));
+NONE));*/
stmt.executeUpdate(CREATE_METRICS_AGGREGATE_HOURLY_TABLE_SQL);
stmt.executeUpdate(CREATE_METRICS_AGGREGATE_MINUTE_TABLE_SQL);
stmt.executeUpdate(CREATE_METRICS_CLUSTER_AGGREGATE_TABLE_SQL);
@@ -206,8 +206,8 @@ public class PhoenixHBaseAccessor {
try {
metricRecordStmt = conn.prepareStatement(String.format(
UPSERT_METRICS_SQL, METRICS_RECORD_TABLE_NAME));
- metricRecordTmpStmt = conn.prepareStatement(String.format
-(UPSERT_METRICS_SQL, METRICS_RECORD_CACHE_TABLE_NAME));
+ /*metricRecordTmpStmt = conn.prepareStatement(String.format
+(UPSERT_METRICS_SQL, METRICS_RECORD_CACHE_TABLE_NAME));*/
for (TimelineMetric metric : timelineMetrics) {
git commit: (AMBARI-7700, 7701, 7703) - Ambari alerts for Hive metastore, Oozie, and ZK not right
Repository: ambari
Updated Branches:
refs/heads/branch-1.7.0 a4bc020e1 - b0dfa7d9e
(AMBARI-7700, 7701, 7703) - Ambari alerts for Hive metastore, Oozie, and ZK not
right
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/b0dfa7d9
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/b0dfa7d9
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/b0dfa7d9
Branch: refs/heads/branch-1.7.0
Commit: b0dfa7d9ef00e4c376ec2902da8d6c4d4097f50e
Parents: a4bc020
Author: Artem Baranchuk abaranc...@hortonworks.com
Authored: Thu Oct 23 00:33:44 2014 +0300
Committer: Artem Baranchuk abaranc...@hortonworks.com
Committed: Thu Oct 23 00:37:58 2014 +0300
--
.../services/NAGIOS/package/files/sys_logger.py | 5 +-
.../src/addOns/nagios/plugins/sys_logger.py | 81 +++-
.../test/nagios/plugins/test_sys_logger.py | 20 +++--
3 files changed, 63 insertions(+), 43 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/b0dfa7d9/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/NAGIOS/package/files/sys_logger.py
--
diff --git
a/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/NAGIOS/package/files/sys_logger.py
b/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/NAGIOS/package/files/sys_logger.py
index e86a8fb..6683342 100644
---
a/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/NAGIOS/package/files/sys_logger.py
+++
b/ambari-server/src/main/resources/stacks/HDP/2.0.6/services/NAGIOS/package/files/sys_logger.py
@@ -82,6 +82,7 @@ msg_ids = {'Host::Ping':'host_down',
'REGIONSERVER::RegionServer process
down':'regionserver_process_down',
'HBASE::Percent RegionServers down':'regionservers_down',
'HIVE-METASTORE::Hive Metastore status
check':'hive_metastore_process_down',
+ 'HIVE-METASTORE::Hive Metastore
process':'hive_metastore_process_down',
'ZOOKEEPER::Percent ZooKeeper Servers down':'zookeepers_down',
'ZOOKEEPER::ZooKeeper Server process down':'zookeeper_process_down',
'OOZIE::Oozie Server status check':'oozie_down',
@@ -103,7 +104,7 @@ msg_ids = {'Host::Ping':'host_down',
'NAMENODE::NameNode process':'namenode_process',
'NAMENODE::Secondary NameNode process':'secondary_namenode_process',
'JOURNALNODE::JournalNode process':'journalnode_process',
- 'ZOOKEEPER::ZooKeeper Server process':'zookeeper_server_process',
+ 'ZOOKEEPER::ZooKeeper Server process':'zookeeper_process_down',
'JOBTRACKER::JobTracker process':'jobtracker_process',
'TASKTRACKER::TaskTracker process':'tasktracker_process',
'GANGLIA::Ganglia Server process':'ganglia_server_process',
@@ -118,7 +119,7 @@ msg_ids = {'Host::Ping':'host_down',
'REGIONSERVER::RegionServer process':'regionserver_process',
'NAGIOS::Nagios status log freshness':'nagios_process',
'FLUME::Flume Agent process':'flume_agent_process',
- 'OOZIE::Oozie Server status':'oozie_server_process',
+ 'OOZIE::Oozie Server status':'oozie_down',
'HIVE-METASTORE::Hive Metastore status':'hive_metastore_process',
'WEBHCAT::WebHCat Server status':'webhcat_down',
'RESOURCEMANAGER::ResourceManager
process':'resourcemanager_process_down',
http://git-wip-us.apache.org/repos/asf/ambari/blob/b0dfa7d9/contrib/addons/src/addOns/nagios/plugins/sys_logger.py
--
diff --git a/contrib/addons/src/addOns/nagios/plugins/sys_logger.py
b/contrib/addons/src/addOns/nagios/plugins/sys_logger.py
index 8f0a415..2e353f4 100644
--- a/contrib/addons/src/addOns/nagios/plugins/sys_logger.py
+++ b/contrib/addons/src/addOns/nagios/plugins/sys_logger.py
@@ -82,6 +82,7 @@ msg_ids = {'Host::Ping':'host_down',
'REGIONSERVER::RegionServer process
down':'regionserver_process_down',
'HBASE::Percent RegionServers down':'regionservers_down',
'HIVE-METASTORE::Hive Metastore status
check':'hive_metastore_process_down',
+ 'HIVE-METASTORE::Hive Metastore
process':'hive_metastore_process_down',
'ZOOKEEPER::Percent ZooKeeper Servers down':'zookeepers_down',
'ZOOKEEPER::ZooKeeper Server process down':'zookeeper_process_down',
'OOZIE::Oozie Server status check':'oozie_down',
@@ -103,7 +104,7 @@ msg_ids = {'Host::Ping':'host_down',
'NAMENODE::NameNode process':'namenode_process',
'NAMENODE::Secondary NameNode process':'secondary_namenode_process',
'JOURNALNODE::JournalNode process':'journalnode_process',
- 'ZOOKEEPER::ZooKeeper Server
git commit: AMBARI-7894. Update tez config for HDP-2.2
Repository: ambari
Updated Branches:
refs/heads/trunk 093cfd639 - a7adbe275
AMBARI-7894. Update tez config for HDP-2.2
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/a7adbe27
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/a7adbe27
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/a7adbe27
Branch: refs/heads/trunk
Commit: a7adbe275cec758257dc98c0d60ac12af30935f6
Parents: 093cfd6
Author: Sumit Mohanty smoha...@hortonworks.com
Authored: Wed Oct 22 15:14:00 2014 -0700
Committer: Sumit Mohanty smoha...@hortonworks.com
Committed: Wed Oct 22 15:14:48 2014 -0700
--
.../2.2/services/TEZ/configuration/tez-site.xml | 263 ++-
1 file changed, 262 insertions(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/a7adbe27/ambari-server/src/main/resources/stacks/HDP/2.2/services/TEZ/configuration/tez-site.xml
--
diff --git
a/ambari-server/src/main/resources/stacks/HDP/2.2/services/TEZ/configuration/tez-site.xml
b/ambari-server/src/main/resources/stacks/HDP/2.2/services/TEZ/configuration/tez-site.xml
index 98c8c49..34e63d7 100644
---
a/ambari-server/src/main/resources/stacks/HDP/2.2/services/TEZ/configuration/tez-site.xml
+++
b/ambari-server/src/main/resources/stacks/HDP/2.2/services/TEZ/configuration/tez-site.xml
@@ -34,5 +34,266 @@
description/description
/property
-/configuration
+ property
+nametez.am.log.level/name
+valueINFO/value
+descriptionRoot Logging level passed to the Tez app master/description
+ /property
+
+ property
+nametez.generate.debug.artifacts/name
+valuefalse/value
+descriptionGenerate debug artifacts such as a text representation of the
submitted DAG plan/description
+ /property
+
+ property
+nametez.staging-dir/name
+value/tmp/${user.name}/staging/value
+descriptionThe staging dir used while submitting DAGs/description
+ /property
+
+ property
+nametez.am.resource.memory.mb/name
+value1536/value
+descriptionThe amount of memory to be used by the AppMaster.
+ Used only if the value is not specified explicitly by the DAG definition.
+/description
+ /property
+
+ property
+nametez.am.launch.cmd-opts/name
+value-server -Djava.net.preferIPv4Stack=true -XX:+PrintGCDetails
-verbose:gc -XX:+PrintGCTimeStamps -XX:+UseNUMA -XX:+UseParallelGC/value
+descriptionJava options for the Tez AppMaster process. The Xmx value is
derived based on tez.am.resource.memory.mb and is 80% of the value by default.
+ Used only if the value is not specified explicitly by the DAG definition.
+/description
+ /property
+ property
+nametez.am.launch.env/name
+
valueLD_LIBRARY_PATH=/usr/lib/hadoop/lib/native:/usr/lib/hadoop/lib/native/Linux-amd64-64/value
+description
+Additional execution environment entries for tez. This is not an
additive property. You must preserve the original value if
+you want to have access to native libraries.
+ Used only if the value is not specified explicitly by the DAG definition.
+/description
+ /property
+
+ property
+nametez.task.resource.memory.mb/name
+value1536/value
+descriptionThe amount of memory to be used by launched tasks.
+ Used only if the value is not specified explicitly by the DAG definition.
+/description
+ /property
+
+ property
+nametez.task.launch.cmd-opts/name
+value-server -Djava.net.preferIPv4Stack=true -XX:+PrintGCDetails
-verbose:gc -XX:+PrintGCTimeStamps -XX:+UseNUMA -XX:+UseParallelGC/value
+descriptionJava options for tasks. The Xmx value is derived based on
tez.task.resource.memory.mb and is 80% of this value by default.
+ Used only if the value is not specified explicitly by the DAG definition.
+/description
+ /property
+
+ property
+nametez.task.launch.env/name
+
valueLD_LIBRARY_PATH=/usr/lib/hadoop/lib/native:/usr/lib/hadoop/lib/native/Linux-amd64-64/value
+description
+ Additional execution environment entries for tez. This is not an
additive property. You must preserve the original value if
+ you want to have access to native libraries.
+ Used only if the value is not specified explicitly by the DAG definition.
+/description
+ /property
+
+ property
+nametez.shuffle-vertex-manager.min-src-fraction/name
+value0.2/value
+descriptionIn case of a ScatterGather connection, the fraction of source
tasks which should
+ complete before tasks for the current vertex are schedule
+/description
+ /property
+
+ property
+nametez.shuffle-vertex-manager.max-src-fraction/name
+value0.4/value
+descriptionIn case of a ScatterGather connection, once this fraction of
source tasks have
+
git commit: AMBARI-7912. Slider View: 'application.def' should be calculated dynamically when app created (srimanth)
Repository: ambari
Updated Branches:
refs/heads/trunk a7adbe275 - e463a1670
AMBARI-7912. Slider View: 'application.def' should be calculated dynamically
when app created (srimanth)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/e463a167
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/e463a167
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/e463a167
Branch: refs/heads/trunk
Commit: e463a1670564890e4dd7a9237caa2bfb49ece49d
Parents: a7adbe2
Author: Srimanth Gunturi sgunt...@hortonworks.com
Authored: Wed Oct 22 16:32:30 2014 -0700
Committer: Srimanth Gunturi sgunt...@hortonworks.com
Committed: Wed Oct 22 16:32:35 2014 -0700
--
.../ambari/view/slider/SliderAppsViewControllerImpl.java | 7 ++-
1 file changed, 6 insertions(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/e463a167/contrib/views/slider/src/main/java/org/apache/ambari/view/slider/SliderAppsViewControllerImpl.java
--
diff --git
a/contrib/views/slider/src/main/java/org/apache/ambari/view/slider/SliderAppsViewControllerImpl.java
b/contrib/views/slider/src/main/java/org/apache/ambari/view/slider/SliderAppsViewControllerImpl.java
index c1ad34b..88afbb8 100644
---
a/contrib/views/slider/src/main/java/org/apache/ambari/view/slider/SliderAppsViewControllerImpl.java
+++
b/contrib/views/slider/src/main/java/org/apache/ambari/view/slider/SliderAppsViewControllerImpl.java
@@ -946,7 +946,12 @@ public class SliderAppsViewControllerImpl implements
SliderAppsViewController {
JsonObject appTypeGlobalJson = appConfigJson.getAsJsonObject()
.get(global).getAsJsonObject();
for (EntryString, JsonElement e :
appTypeGlobalJson.entrySet()) {
-configsMap.put(e.getKey(), e.getValue().getAsString());
+String key = e.getKey();
+String valueString = e.getValue().getAsString();
+if (application.def.equals(key)) {
+ valueString = String.format(.slider/package/%1$s/%2$s,
application.getName(), appZip.getName());
+}
+configsMap.put(key, valueString);
}
appType.setTypeConfigs(configsMap);
// Components
git commit: AMBARI-7912. Slider View: 'application.def' should be calculated dynamically when app created (srimanth)
Repository: ambari
Updated Branches:
refs/heads/branch-1.7.0 17cfb9916 - 4b2c827c5
AMBARI-7912. Slider View: 'application.def' should be calculated dynamically
when app created (srimanth)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/4b2c827c
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/4b2c827c
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/4b2c827c
Branch: refs/heads/branch-1.7.0
Commit: 4b2c827c50a79b56e551ff75bb9a844d7cdeefe0
Parents: 17cfb99
Author: Srimanth Gunturi sgunt...@hortonworks.com
Authored: Wed Oct 22 16:32:30 2014 -0700
Committer: Srimanth Gunturi sgunt...@hortonworks.com
Committed: Wed Oct 22 16:45:34 2014 -0700
--
.../ambari/view/slider/SliderAppsViewControllerImpl.java | 7 ++-
1 file changed, 6 insertions(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/4b2c827c/contrib/views/slider/src/main/java/org/apache/ambari/view/slider/SliderAppsViewControllerImpl.java
--
diff --git
a/contrib/views/slider/src/main/java/org/apache/ambari/view/slider/SliderAppsViewControllerImpl.java
b/contrib/views/slider/src/main/java/org/apache/ambari/view/slider/SliderAppsViewControllerImpl.java
index c1ad34b..88afbb8 100644
---
a/contrib/views/slider/src/main/java/org/apache/ambari/view/slider/SliderAppsViewControllerImpl.java
+++
b/contrib/views/slider/src/main/java/org/apache/ambari/view/slider/SliderAppsViewControllerImpl.java
@@ -946,7 +946,12 @@ public class SliderAppsViewControllerImpl implements
SliderAppsViewController {
JsonObject appTypeGlobalJson = appConfigJson.getAsJsonObject()
.get(global).getAsJsonObject();
for (EntryString, JsonElement e :
appTypeGlobalJson.entrySet()) {
-configsMap.put(e.getKey(), e.getValue().getAsString());
+String key = e.getKey();
+String valueString = e.getValue().getAsString();
+if (application.def.equals(key)) {
+ valueString = String.format(.slider/package/%1$s/%2$s,
application.getName(), appZip.getName());
+}
+configsMap.put(key, valueString);
}
appType.setTypeConfigs(configsMap);
// Components
git commit: AMBARI-7914. Slider View: Need API to verify using slider-client if application name can be used (srimanth)
Repository: ambari
Updated Branches:
refs/heads/branch-1.7.0 4b2c827c5 - fbb17091e
AMBARI-7914. Slider View: Need API to verify using slider-client if application
name can be used (srimanth)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/fbb17091
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/fbb17091
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/fbb17091
Branch: refs/heads/branch-1.7.0
Commit: fbb17091ee83de2d8cb9ea22d93d7798347446f4
Parents: 4b2c827
Author: Srimanth Gunturi sgunt...@hortonworks.com
Authored: Wed Oct 22 19:43:19 2014 -0700
Committer: Srimanth Gunturi sgunt...@hortonworks.com
Committed: Wed Oct 22 19:43:19 2014 -0700
--
.../view/slider/SliderAppsViewController.java | 2 ++
.../slider/SliderAppsViewControllerImpl.java| 19 +-
.../view/slider/rest/SliderAppsResource.java| 21
3 files changed, 41 insertions(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/fbb17091/contrib/views/slider/src/main/java/org/apache/ambari/view/slider/SliderAppsViewController.java
--
diff --git
a/contrib/views/slider/src/main/java/org/apache/ambari/view/slider/SliderAppsViewController.java
b/contrib/views/slider/src/main/java/org/apache/ambari/view/slider/SliderAppsViewController.java
index 2d82bfb..4cdecf7 100644
---
a/contrib/views/slider/src/main/java/org/apache/ambari/view/slider/SliderAppsViewController.java
+++
b/contrib/views/slider/src/main/java/org/apache/ambari/view/slider/SliderAppsViewController.java
@@ -104,4 +104,6 @@ public interface SliderAppsViewController {
public void flexApp(String appId, MapString, Integer componentsMap)
throws YarnException, IOException, InterruptedException;
+
+ public boolean appExists(String string) throws IOException,
InterruptedException, YarnException;
}
http://git-wip-us.apache.org/repos/asf/ambari/blob/fbb17091/contrib/views/slider/src/main/java/org/apache/ambari/view/slider/SliderAppsViewControllerImpl.java
--
diff --git
a/contrib/views/slider/src/main/java/org/apache/ambari/view/slider/SliderAppsViewControllerImpl.java
b/contrib/views/slider/src/main/java/org/apache/ambari/view/slider/SliderAppsViewControllerImpl.java
index 88afbb8..1c87d57 100644
---
a/contrib/views/slider/src/main/java/org/apache/ambari/view/slider/SliderAppsViewControllerImpl.java
+++
b/contrib/views/slider/src/main/java/org/apache/ambari/view/slider/SliderAppsViewControllerImpl.java
@@ -506,6 +506,23 @@ public class SliderAppsViewControllerImpl implements
SliderAppsViewController {
}
@Override
+ public boolean appExists(final String appName) throws IOException,
InterruptedException, YarnException {
+return invokeSliderClientRunnable(new
SliderClientContextRunnableBoolean() {
+ @Override
+ public Boolean run(SliderClient sliderClient) throws YarnException,
IOException {
+if (appName != null) {
+ try {
+return sliderClient.actionExists(appName, false) ==
SliderClient.EXIT_SUCCESS;
+ } catch (UnknownApplicationInstanceException e) {
+return Boolean.FALSE;
+ }
+}
+return Boolean.FALSE;
+ }
+});
+ }
+
+ @Override
public SliderApp getSliderApp(final String applicationId, final SetString
properties)
throws YarnException, IOException, InterruptedException {
return invokeSliderClientRunnable(new
SliderClientContextRunnableSliderApp() {
@@ -949,7 +966,7 @@ public class SliderAppsViewControllerImpl implements
SliderAppsViewController {
String key = e.getKey();
String valueString = e.getValue().getAsString();
if (application.def.equals(key)) {
- valueString = String.format(.slider/package/%1$s/%2$s,
application.getName(), appZip.getName());
+ valueString = String.format(.slider/package/%s/%s,
application.getName(), appZip.getName());
}
configsMap.put(key, valueString);
}
http://git-wip-us.apache.org/repos/asf/ambari/blob/fbb17091/contrib/views/slider/src/main/java/org/apache/ambari/view/slider/rest/SliderAppsResource.java
--
diff --git
a/contrib/views/slider/src/main/java/org/apache/ambari/view/slider/rest/SliderAppsResource.java
b/contrib/views/slider/src/main/java/org/apache/ambari/view/slider/rest/SliderAppsResource.java
index 39f3184..9d17bce 100644
---
a/contrib/views/slider/src/main/java/org/apache/ambari/view/slider/rest/SliderAppsResource.java
+++
git commit: AMBARI-7914. Slider View: Need API to verify using slider-client if application name can be used (srimanth)
Repository: ambari
Updated Branches:
refs/heads/trunk e463a1670 - 2bcc5d12b
AMBARI-7914. Slider View: Need API to verify using slider-client if application
name can be used (srimanth)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/2bcc5d12
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/2bcc5d12
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/2bcc5d12
Branch: refs/heads/trunk
Commit: 2bcc5d12ba1ffcaa60ce672ba746afcae237a8c6
Parents: e463a16
Author: Srimanth Gunturi sgunt...@hortonworks.com
Authored: Wed Oct 22 19:43:19 2014 -0700
Committer: Srimanth Gunturi sgunt...@hortonworks.com
Committed: Wed Oct 22 22:33:39 2014 -0700
--
.../view/slider/SliderAppsViewController.java | 2 ++
.../slider/SliderAppsViewControllerImpl.java| 19 +-
.../view/slider/rest/SliderAppsResource.java| 21
3 files changed, 41 insertions(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/2bcc5d12/contrib/views/slider/src/main/java/org/apache/ambari/view/slider/SliderAppsViewController.java
--
diff --git
a/contrib/views/slider/src/main/java/org/apache/ambari/view/slider/SliderAppsViewController.java
b/contrib/views/slider/src/main/java/org/apache/ambari/view/slider/SliderAppsViewController.java
index 2d82bfb..4cdecf7 100644
---
a/contrib/views/slider/src/main/java/org/apache/ambari/view/slider/SliderAppsViewController.java
+++
b/contrib/views/slider/src/main/java/org/apache/ambari/view/slider/SliderAppsViewController.java
@@ -104,4 +104,6 @@ public interface SliderAppsViewController {
public void flexApp(String appId, MapString, Integer componentsMap)
throws YarnException, IOException, InterruptedException;
+
+ public boolean appExists(String string) throws IOException,
InterruptedException, YarnException;
}
http://git-wip-us.apache.org/repos/asf/ambari/blob/2bcc5d12/contrib/views/slider/src/main/java/org/apache/ambari/view/slider/SliderAppsViewControllerImpl.java
--
diff --git
a/contrib/views/slider/src/main/java/org/apache/ambari/view/slider/SliderAppsViewControllerImpl.java
b/contrib/views/slider/src/main/java/org/apache/ambari/view/slider/SliderAppsViewControllerImpl.java
index 88afbb8..1c87d57 100644
---
a/contrib/views/slider/src/main/java/org/apache/ambari/view/slider/SliderAppsViewControllerImpl.java
+++
b/contrib/views/slider/src/main/java/org/apache/ambari/view/slider/SliderAppsViewControllerImpl.java
@@ -506,6 +506,23 @@ public class SliderAppsViewControllerImpl implements
SliderAppsViewController {
}
@Override
+ public boolean appExists(final String appName) throws IOException,
InterruptedException, YarnException {
+return invokeSliderClientRunnable(new
SliderClientContextRunnableBoolean() {
+ @Override
+ public Boolean run(SliderClient sliderClient) throws YarnException,
IOException {
+if (appName != null) {
+ try {
+return sliderClient.actionExists(appName, false) ==
SliderClient.EXIT_SUCCESS;
+ } catch (UnknownApplicationInstanceException e) {
+return Boolean.FALSE;
+ }
+}
+return Boolean.FALSE;
+ }
+});
+ }
+
+ @Override
public SliderApp getSliderApp(final String applicationId, final SetString
properties)
throws YarnException, IOException, InterruptedException {
return invokeSliderClientRunnable(new
SliderClientContextRunnableSliderApp() {
@@ -949,7 +966,7 @@ public class SliderAppsViewControllerImpl implements
SliderAppsViewController {
String key = e.getKey();
String valueString = e.getValue().getAsString();
if (application.def.equals(key)) {
- valueString = String.format(.slider/package/%1$s/%2$s,
application.getName(), appZip.getName());
+ valueString = String.format(.slider/package/%s/%s,
application.getName(), appZip.getName());
}
configsMap.put(key, valueString);
}
http://git-wip-us.apache.org/repos/asf/ambari/blob/2bcc5d12/contrib/views/slider/src/main/java/org/apache/ambari/view/slider/rest/SliderAppsResource.java
--
diff --git
a/contrib/views/slider/src/main/java/org/apache/ambari/view/slider/rest/SliderAppsResource.java
b/contrib/views/slider/src/main/java/org/apache/ambari/view/slider/rest/SliderAppsResource.java
index 39f3184..9d17bce 100644
---
a/contrib/views/slider/src/main/java/org/apache/ambari/view/slider/rest/SliderAppsResource.java
+++
