ambari git commit: AMBARI-9745. Storm JAVA_HOME not updating after config change in Ambari (aonishuk)
Repository: ambari
Updated Branches:
refs/heads/trunk 6eb571c2b - ef040d68a
AMBARI-9745. Storm JAVA_HOME not updating after config change in Ambari
(aonishuk)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/ef040d68
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/ef040d68
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/ef040d68
Branch: refs/heads/trunk
Commit: ef040d68a727aa766eda662e6d75bdd862c89366
Parents: 6eb571c
Author: Andrew Onishuk aonis...@hortonworks.com
Authored: Mon Feb 23 15:14:54 2015 +0200
Committer: Andrew Onishuk aonis...@hortonworks.com
Committed: Mon Feb 23 15:14:54 2015 +0200
--
.../STORM/0.9.1.2.1/package/scripts/service.py | 5 ++--
.../0.9.1.2.1/package/scripts/service_check.py | 4 ++--
.../stacks/2.1/STORM/test_service_check.py | 4 ++--
.../stacks/2.1/STORM/test_storm_drpc_server.py | 20
.../stacks/2.1/STORM/test_storm_nimbus.py | 20
.../2.1/STORM/test_storm_rest_api_service.py| 22 -
.../stacks/2.1/STORM/test_storm_supervisor.py | 25 ++--
.../2.1/STORM/test_storm_supervisor_prod.py | 20
.../stacks/2.1/STORM/test_storm_ui_server.py| 21
9 files changed, 70 insertions(+), 71 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/ef040d68/ambari-server/src/main/resources/common-services/STORM/0.9.1.2.1/package/scripts/service.py
--
diff --git
a/ambari-server/src/main/resources/common-services/STORM/0.9.1.2.1/package/scripts/service.py
b/ambari-server/src/main/resources/common-services/STORM/0.9.1.2.1/package/scripts/service.py
index 781c7ef..2822ef6 100644
---
a/ambari-server/src/main/resources/common-services/STORM/0.9.1.2.1/package/scripts/service.py
+++
b/ambari-server/src/main/resources/common-services/STORM/0.9.1.2.1/package/scripts/service.py
@@ -49,13 +49,14 @@ def service(
find_proc = format({jps_binary} -l | grep {process_grep})
write_pid = format({find_proc} | awk {{'print $1'}} {pid_file})
crt_pid_cmd = format({find_proc} {write_pid})
+ storm_env = format(source {conf_dir}/storm-env.sh ; export
PATH=$PATH:$JAVA_HOME/bin)
if action == start:
if name == rest_api:
- process_cmd = format({java64_home}/bin/java -jar {rest_lib_dir}/`ls
{rest_lib_dir} | grep -wE storm-rest-[0-9.-]+\.jar` server)
+ process_cmd = format({storm_env} ; java -jar {rest_lib_dir}/`ls
{rest_lib_dir} | grep -wE storm-rest-[0-9.-]+\.jar` server)
cmd = format({process_cmd} {rest_api_conf_file} {log_dir}/restapi.log
21)
else:
- cmd = format(env JAVA_HOME={java64_home} PATH=$PATH:{java64_home}/bin
storm {name} {log_dir}/{name}.out 21)
+ cmd = format({storm_env} ; storm {name} {log_dir}/{name}.out 21)
Execute(cmd,
not_if=no_op_test,
http://git-wip-us.apache.org/repos/asf/ambari/blob/ef040d68/ambari-server/src/main/resources/common-services/STORM/0.9.1.2.1/package/scripts/service_check.py
--
diff --git
a/ambari-server/src/main/resources/common-services/STORM/0.9.1.2.1/package/scripts/service_check.py
b/ambari-server/src/main/resources/common-services/STORM/0.9.1.2.1/package/scripts/service_check.py
index 6f953d1..4eec899 100644
---
a/ambari-server/src/main/resources/common-services/STORM/0.9.1.2.1/package/scripts/service_check.py
+++
b/ambari-server/src/main/resources/common-services/STORM/0.9.1.2.1/package/scripts/service_check.py
@@ -36,7 +36,7 @@ class ServiceCheck(Script):
content=StaticFile(wordCount.jar)
)
-cmd = format(env JAVA_HOME={java64_home} storm jar /tmp/wordCount.jar
storm.starter.WordCountTopology WordCount{unique} -c nimbus.host={nimbus_host})
+cmd = format(storm jar /tmp/wordCount.jar storm.starter.WordCountTopology
WordCount{unique} -c nimbus.host={nimbus_host})
Execute(cmd,
logoutput=True,
@@ -44,7 +44,7 @@ class ServiceCheck(Script):
user=params.storm_user
)
-Execute(format(env JAVA_HOME={java64_home} storm kill WordCount{unique}),
+Execute(format(storm kill WordCount{unique}),
path=params.storm_bin_dir,
user=params.storm_user
)
http://git-wip-us.apache.org/repos/asf/ambari/blob/ef040d68/ambari-server/src/test/python/stacks/2.1/STORM/test_service_check.py
--
diff --git
a/ambari-server/src/test/python/stacks/2.1/STORM/test_service_check.py
b/ambari-server/src/test/python/stacks/2.1/STORM/test_service_check.py
index 5686196..93561ff 100644
--- a/ambari-server/src/test/python/stacks/2.1/STORM/test_service_check.py
ambari git commit: AMBARI-9727 Move Master Wizard: Previous steps enabled. (atkach)
Repository: ambari
Updated Branches:
refs/heads/trunk ef040d68a - f704351be
AMBARI-9727 Move Master Wizard: Previous steps enabled. (atkach)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/f704351b
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/f704351b
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/f704351b
Branch: refs/heads/trunk
Commit: f704351befd57cfa585be214337c141b06dac4f3
Parents: ef040d6
Author: Andrii Tkach atk...@hortonworks.com
Authored: Mon Feb 23 13:51:49 2015 +0200
Committer: Andrii Tkach atk...@hortonworks.com
Committed: Mon Feb 23 15:17:31 2015 +0200
--
ambari-web/app/routes/reassign_master_routes.js | 11 ++-
1 file changed, 6 insertions(+), 5 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/f704351b/ambari-web/app/routes/reassign_master_routes.js
--
diff --git a/ambari-web/app/routes/reassign_master_routes.js
b/ambari-web/app/routes/reassign_master_routes.js
index 7632a4a..bb52fab 100644
--- a/ambari-web/app/routes/reassign_master_routes.js
+++ b/ambari-web/app/routes/reassign_master_routes.js
@@ -40,6 +40,8 @@ module.exports = App.WizardRoute.extend({
console.log('in /service/reassign:enter');
var context = this;
var reassignMasterController = router.get('reassignMasterController');
+var currStep = reassignMasterController.get('currentStep');
+
reassignMasterController.dataLoading().done(function () {
if (App.router.get('mainHostController.hostsCountMap.TOTAL') 1) {
Em.run.next(function () {
@@ -60,9 +62,6 @@ module.exports = App.WizardRoute.extend({
App.router.transitionTo('main.services.index');
},
onClose: function () {
- var reassignMasterController =
router.get('reassignMasterController');
- var currStep = reassignMasterController.get('currentStep');
-
if (parseInt(currStep) 3) {
var self = this;
@@ -97,11 +96,13 @@ module.exports = App.WizardRoute.extend({
if (currentClusterStatus) {
switch (currentClusterStatus.clusterState) {
case 'REASSIGN_MASTER_INSTALLING' :
-
reassignMasterController.setCurrentStep(currentClusterStatus.localdb.ReassignMaster.currentStep);
+if (currentClusterStatus.localdb.ReassignMaster.currentStep
!== currStep) {
+
reassignMasterController.setCurrentStep(currentClusterStatus.localdb.ReassignMaster.currentStep);
+}
break;
}
}
- router.transitionTo('step' +
reassignMasterController.get('currentStep'));
+ router.transitionTo('step' + currStep);
});
} else {
App.showAlertPopup(Em.I18n.t('common.error'),
Em.I18n.t('services.reassign.error.fewHosts'), function () {
ambari git commit: AMBARI-9743. Storm service check failed after enabling security with existing AD (rlevas)
Repository: ambari
Updated Branches:
refs/heads/trunk f704351be - 913bf4ed6
AMBARI-9743. Storm service check failed after enabling security with existing
AD (rlevas)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/913bf4ed
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/913bf4ed
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/913bf4ed
Branch: refs/heads/trunk
Commit: 913bf4ed6cfeb7c5f2884f54feb266849905bef6
Parents: f704351
Author: Robert Levas rle...@hortonworks.com
Authored: Mon Feb 23 09:50:37 2015 -0500
Committer: Robert Levas rle...@hortonworks.com
Committed: Mon Feb 23 09:50:37 2015 -0500
--
.../STORM/0.9.1.2.1/package/scripts/params.py | 32 +++-
1 file changed, 24 insertions(+), 8 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/913bf4ed/ambari-server/src/main/resources/common-services/STORM/0.9.1.2.1/package/scripts/params.py
--
diff --git
a/ambari-server/src/main/resources/common-services/STORM/0.9.1.2.1/package/scripts/params.py
b/ambari-server/src/main/resources/common-services/STORM/0.9.1.2.1/package/scripts/params.py
index 887132d..8ad95cc 100644
---
a/ambari-server/src/main/resources/common-services/STORM/0.9.1.2.1/package/scripts/params.py
+++
b/ambari-server/src/main/resources/common-services/STORM/0.9.1.2.1/package/scripts/params.py
@@ -17,12 +17,31 @@ See the License for the specific language governing
permissions and
limitations under the License.
-
from resource_management.libraries.functions.version import
format_hdp_stack_version, compare_versions
from resource_management.libraries.functions.default import default
from resource_management.libraries.script import Script
from resource_management.libraries.functions import default, format
import status_params
+import re
+
+def get_bare_principal(normalized_principal_name):
+
+ Given a normalized principal name
(nimbus/c6501.ambari.apache@example.com) returns just the
+ primary component (nimbus)
+ :param normalized_principal_name: a string containing the principal name to
process
+ :return: a string containing the primary component value or None if not valid
+
+
+ bare_principal = None
+
+ if normalized_principal_name:
+match = re.match(r([^/@]+)(?:/[^@])?(?:@.*)?, normalized_principal_name)
+
+if match:
+ bare_principal = match.group(1)
+
+ return bare_principal
+
# server configurations
config = Script.get_config()
@@ -73,24 +92,21 @@ security_enabled =
config['configurations']['cluster-env']['security_enabled']
if security_enabled:
_hostname_lowercase = config['hostname'].lower()
- kerberos_domain = config['configurations']['cluster-env']['kerberos_domain']
_storm_principal_name =
config['configurations']['storm-env']['storm_principal_name']
storm_jaas_principal =
_storm_principal_name.replace('_HOST',_hostname_lowercase)
storm_keytab_path = config['configurations']['storm-env']['storm_keytab']
-
+
if hdp_stack_version != and compare_versions(hdp_stack_version, '2.2') =
0:
storm_ui_keytab_path =
config['configurations']['storm-env']['storm_ui_keytab']
_storm_ui_jaas_principal_name =
config['configurations']['storm-env']['storm_ui_principal_name']
storm_ui_host = default(/clusterHostInfo/storm_ui_server_hosts, [])
storm_ui_jaas_principal =
_storm_ui_jaas_principal_name.replace('_HOST',storm_ui_host[0].lower())
-storm_bare_jaas_principal =
_storm_principal_name.replace('_HOST','').replace('@'+kerberos_domain,'')
-
-
-
+storm_bare_jaas_principal = get_bare_principal(_storm_principal_name)
+
_nimbus_principal_name =
config['configurations']['storm-env']['nimbus_principal_name']
nimbus_jaas_principal = _nimbus_principal_name.replace('_HOST',
_hostname_lowercase)
-nimbus_bare_jaas_principal =
_nimbus_principal_name.replace('/_HOST','').replace('@'+kerberos_domain,'')
+nimbus_bare_jaas_principal = get_bare_principal(_nimbus_principal_name)
nimbus_keytab_path = config['configurations']['storm-env']['nimbus_keytab']
ams_collector_hosts = default(/clusterHostInfo/metrics_collector_hosts, [])
ambari git commit: AMBARI-9738 - Ambari Server Deadlocks During Cluster Provisioning (jonathanhurley)
Repository: ambari
Updated Branches:
refs/heads/trunk 913bf4ed6 - 923bf81ae
AMBARI-9738 - Ambari Server Deadlocks During Cluster Provisioning
(jonathanhurley)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/923bf81a
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/923bf81a
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/923bf81a
Branch: refs/heads/trunk
Commit: 923bf81ae125ac6581cef053aa2c31baca1dcb65
Parents: 913bf4e
Author: Jonathan Hurley jhur...@hortonworks.com
Authored: Sat Feb 21 16:55:24 2015 -0500
Committer: Jonathan Hurley jhur...@hortonworks.com
Committed: Mon Feb 23 10:14:29 2015 -0500
--
.../server/state/cluster/ClusterImpl.java | 105
.../server/state/cluster/ClustersImpl.java | 151 ++--
.../state/cluster/ClustersDeadlockTest.java | 239 +++
3 files changed, 374 insertions(+), 121 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/923bf81a/ambari-server/src/main/java/org/apache/ambari/server/state/cluster/ClusterImpl.java
--
diff --git
a/ambari-server/src/main/java/org/apache/ambari/server/state/cluster/ClusterImpl.java
b/ambari-server/src/main/java/org/apache/ambari/server/state/cluster/ClusterImpl.java
index 8589182..c609b0a 100644
---
a/ambari-server/src/main/java/org/apache/ambari/server/state/cluster/ClusterImpl.java
+++
b/ambari-server/src/main/java/org/apache/ambari/server/state/cluster/ClusterImpl.java
@@ -92,9 +92,7 @@ import org.apache.ambari.server.state.ConfigVersionHelper;
import org.apache.ambari.server.state.DesiredConfig;
import org.apache.ambari.server.state.Host;
import org.apache.ambari.server.state.HostHealthStatus;
-import org.apache.ambari.server.state.HostState;
import org.apache.ambari.server.state.MaintenanceState;
-import org.apache.ambari.server.state.PropertyInfo;
import org.apache.ambari.server.state.RepositoryVersionState;
import org.apache.ambari.server.state.SecurityType;
import org.apache.ambari.server.state.Service;
@@ -616,23 +614,25 @@ public class ClusterImpl implements Cluster {
}
}
- public void addServiceComponentHost(
-ServiceComponentHost svcCompHost) throws AmbariException {
+ public void addServiceComponentHost(ServiceComponentHost svcCompHost)
+ throws AmbariException {
+if (LOG.isDebugEnabled()) {
+ LOG.debug(Trying to add component {} of service {} on {} to the cache,
+ svcCompHost.getServiceComponentName(), svcCompHost.getServiceName(),
+ svcCompHost.getHostName());
+}
+
loadServiceHostComponents();
+
+final String hostname = svcCompHost.getHostName();
+final String serviceName = svcCompHost.getServiceName();
+final String componentName = svcCompHost.getServiceComponentName();
+
+SetCluster cs = clusters.getClustersForHost(hostname);
+
clusterGlobalLock.writeLock().lock();
try {
- if (LOG.isDebugEnabled()) {
-LOG.debug(Trying to add ServiceComponentHost to ClusterHostMap cache
-+ , serviceName= + svcCompHost.getServiceName()
-+ , componentName= + svcCompHost.getServiceComponentName()
-+ , hostname= + svcCompHost.getHostName());
- }
-
- final String hostname = svcCompHost.getHostName();
- final String serviceName = svcCompHost.getServiceName();
- final String componentName = svcCompHost.getServiceComponentName();
- SetCluster cs = clusters.getClustersForHost(hostname);
boolean clusterFound = false;
IteratorCluster iter = cs.iterator();
while (iter.hasNext()) {
@@ -642,6 +642,7 @@ public class ClusterImpl implements Cluster {
break;
}
}
+
if (!clusterFound) {
throw new AmbariException(Host does not belong this cluster
+ , hostname= + hostname + , clusterName= + getClusterName()
@@ -652,6 +653,7 @@ public class ClusterImpl implements Cluster {
serviceComponentHosts.put(serviceName,
new HashMapString, MapString, ServiceComponentHost());
}
+
if (!serviceComponentHosts.get(serviceName).containsKey(componentName)) {
serviceComponentHosts.get(serviceName).put(componentName,
new HashMapString, ServiceComponentHost());
@@ -687,22 +689,22 @@ public class ClusterImpl implements Cluster {
@Override
public void removeServiceComponentHost(ServiceComponentHost svcCompHost)
throws AmbariException {
+if (LOG.isDebugEnabled()) {
+ LOG.debug(
+ Trying to remove component {} of service {} on {} from the cache,
+ svcCompHost.getServiceComponentName(), svcCompHost.getServiceName(),
+ svcCompHost.getHostName());
+}
+
loadServiceHostComponents();
+
+
[1/2] ambari git commit: AMBARI-9747 Duplicate Custom properties to be removed and missing properties to be added - Ranger-Ambari. (ababiichuk)
Repository: ambari
Updated Branches:
refs/heads/trunk 923bf81ae - 1ef3c74b7
AMBARI-9747 Duplicate Custom properties to be removed and missing properties to
be added - Ranger-Ambari. (ababiichuk)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/c4bbc30e
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/c4bbc30e
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/c4bbc30e
Branch: refs/heads/trunk
Commit: c4bbc30e5d2e3b1fed5384fefb0ec8219e69ec44
Parents: 923bf81
Author: aBabiichuk ababiic...@cybervisiontech.com
Authored: Mon Feb 23 16:20:46 2015 +0200
Committer: aBabiichuk ababiic...@cybervisiontech.com
Committed: Mon Feb 23 19:02:35 2015 +0200
--
ambari-web/app/data/HDP2.2/site_properties.js | 24 +++---
1 file changed, 12 insertions(+), 12 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/c4bbc30e/ambari-web/app/data/HDP2.2/site_properties.js
--
diff --git a/ambari-web/app/data/HDP2.2/site_properties.js
b/ambari-web/app/data/HDP2.2/site_properties.js
index 8ce4c0d..e34c289 100644
--- a/ambari-web/app/data/HDP2.2/site_properties.js
+++ b/ambari-web/app/data/HDP2.2/site_properties.js
@@ -138,7 +138,7 @@ hdp22properties.push(
},
{
id: site property,
-name: POLICY_USER,
+name: policy_user,
value: ambari-qa,
defaultValue: ambari-qa,
displayName: policy User for HDFS,
@@ -195,7 +195,7 @@ hdp22properties.push(
},
{
id: site property,
-name: POLICY_USER,
+name: policy_user,
value: ambari-qa,
defaultValue: ambari-qa,
displayName: policy User for HIVE,
@@ -262,7 +262,7 @@ hdp22properties.push(
},
{
id: site property,
-name: POLICY_USER,
+name: policy_user,
value: ambari-qa,
defaultValue: ambari-qa,
displayName: policy User for HBASE,
@@ -283,7 +283,7 @@ hdp22properties.push(
name: REPOSITORY_CONFIG_USERNAME,
displayName: Ranger repository config user,
filename: ranger-hbase-plugin-properties.xml,
-category: RepositoryConfigs,
+category: Advanced ranger-hbase-plugin-properties,
serviceName: HBASE
},
{
@@ -329,7 +329,7 @@ hdp22properties.push(
},
{
id: site property,
-name: POLICY_USER,
+name: policy_user,
value: ambari-qa,
defaultValue: ambari-qa,
displayName: policy User for STORM,
@@ -386,7 +386,7 @@ hdp22properties.push(
},
{
id: site property,
-name: POLICY_USER,
+name: policy_user,
value: ambari-qa,
defaultValue: ambari-qa,
displayName: policy User for KNOX,
@@ -434,7 +434,7 @@ hdp22properties.push(
/**RANGER***/
{
id: site property,
-name: ambari_user_password,
+name: ranger_admin_password,
displayName: Ranger Admin user's password for Ambari,
defaultValue: ambari,
isReconfigurable: true,
@@ -442,7 +442,7 @@ hdp22properties.push(
isOverridable: false,
isVisible: true,
serviceName: RANGER,
-filename: admin-properties.xml,
+filename: ranger-env.xml,
category: AdminSettings
},
{
@@ -640,7 +640,7 @@ hdp22properties.push(
},
{
id: puppet var,
-name: unix_user,
+name: ranger_user,
displayName: Used to create user and assign permission,
defaultValue: ranger,
isReconfigurable: true,
@@ -648,12 +648,12 @@ hdp22properties.push(
isOverridable: false,
isVisible: true,
serviceName: RANGER,
-filename: admin-properties.xml,
+filename: ranger-env.xml,
category: RangerSettings
},
{
id: puppet var,
-name: unix_group,
+name: ranger_group,
displayName: Used to create group and assign permission,
defaultValue: ranger,
isReconfigurable: true,
@@ -661,7 +661,7 @@ hdp22properties.push(
isOverridable: false,
isVisible: true,
serviceName: RANGER,
-filename: admin-properties.xml,
+filename: ranger-env.xml,
category: RangerSettings
},
{
[2/2] ambari git commit: AMBARI-9746 Security : Via fast clicking few times on next button on 2 step we can reach 4 step with 500 error instantly (ababiichuk)
AMBARI-9746 Security : Via fast clicking few times on next button on 2 step
we can reach 4 step with 500 error instantly (ababiichuk)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/1ef3c74b
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/1ef3c74b
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/1ef3c74b
Branch: refs/heads/trunk
Commit: 1ef3c74b7b6f3b1df32f7af71d5debc86a8d8673
Parents: c4bbc30
Author: aBabiichuk ababiic...@cybervisiontech.com
Authored: Mon Feb 23 16:22:49 2015 +0200
Committer: aBabiichuk ababiic...@cybervisiontech.com
Committed: Mon Feb 23 19:02:37 2015 +0200
--
ambari-web/app/controllers/main/admin/kerberos/step2_controller.js | 1 +
1 file changed, 1 insertion(+)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/1ef3c74b/ambari-web/app/controllers/main/admin/kerberos/step2_controller.js
--
diff --git a/ambari-web/app/controllers/main/admin/kerberos/step2_controller.js
b/ambari-web/app/controllers/main/admin/kerberos/step2_controller.js
index 87ba550..f32879f 100644
--- a/ambari-web/app/controllers/main/admin/kerberos/step2_controller.js
+++ b/ambari-web/app/controllers/main/admin/kerberos/step2_controller.js
@@ -109,6 +109,7 @@ App.KerberosWizardStep2Controller =
App.WizardStep7Controller.extend({
},
submit: function () {
+if (this.get('isSubmitDisabled')) return false;
this.set('isSubmitDisabled', true);
var self = this;
this.deleteKerberosService().always(function (data) {
[2/2] ambari git commit: AMBARI-9751. Ambari Views: Kerberos support in Pig View (alexantonenko)
AMBARI-9751. Ambari Views: Kerberos support in Pig View (alexantonenko)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/57645a81
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/57645a81
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/57645a81
Branch: refs/heads/trunk
Commit: 57645a814fea816eeea09e37d392d37988823f79
Parents: 3716c55
Author: Alex Antonenko hiv...@gmail.com
Authored: Mon Feb 23 19:01:49 2015 +0200
Committer: Alex Antonenko hiv...@gmail.com
Committed: Mon Feb 23 19:40:49 2015 +0200
--
.../pig/resources/jobs/JobResourceManager.java | 2 +-
.../view/pig/templeton/client/JSONRequest.java | 278 +++
.../pig/templeton/client/RequestWrapper.java| 271 --
.../view/pig/templeton/client/TempletonApi.java | 31 +--
.../pig/templeton/client/TempletonRequest.java | 99 ---
.../apache/ambari/view/pig/utils/HdfsApi.java | 56 +++-
contrib/views/pig/src/main/resources/view.xml | 7 +
.../org/apache/ambari/view/pig/BasePigTest.java | 1 +
.../org/apache/ambari/view/pig/HDFSTest.java| 9 +
.../view/pig/test/ScriptTestHDFSUnmanaged.java | 5 +-
10 files changed, 361 insertions(+), 398 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/57645a81/contrib/views/pig/src/main/java/org/apache/ambari/view/pig/resources/jobs/JobResourceManager.java
--
diff --git
a/contrib/views/pig/src/main/java/org/apache/ambari/view/pig/resources/jobs/JobResourceManager.java
b/contrib/views/pig/src/main/java/org/apache/ambari/view/pig/resources/jobs/JobResourceManager.java
index 0230625..19cf69f 100644
---
a/contrib/views/pig/src/main/java/org/apache/ambari/view/pig/resources/jobs/JobResourceManager.java
+++
b/contrib/views/pig/src/main/java/org/apache/ambari/view/pig/resources/jobs/JobResourceManager.java
@@ -332,7 +332,7 @@ public class JobResourceManager extends
PersonalCRUDResourceManagerPigJob {
throw new MisconfigurationFormattedException(webhcat.url);
}
return new TempletonApi(context.getProperties().get(webhcat.url),
-getTempletonUser(context), getTempletonUser(context), context);
+getTempletonUser(context), context);
}
/**
http://git-wip-us.apache.org/repos/asf/ambari/blob/57645a81/contrib/views/pig/src/main/java/org/apache/ambari/view/pig/templeton/client/JSONRequest.java
--
diff --git
a/contrib/views/pig/src/main/java/org/apache/ambari/view/pig/templeton/client/JSONRequest.java
b/contrib/views/pig/src/main/java/org/apache/ambari/view/pig/templeton/client/JSONRequest.java
new file mode 100644
index 000..39a595b
--- /dev/null
+++
b/contrib/views/pig/src/main/java/org/apache/ambari/view/pig/templeton/client/JSONRequest.java
@@ -0,0 +1,278 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * License); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an AS IS BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.ambari.view.pig.templeton.client;
+
+import com.google.gson.Gson;
+import com.sun.jersey.api.client.WebResource;
+import com.sun.jersey.core.util.MultivaluedMapImpl;
+import org.apache.ambari.view.ViewContext;
+import org.apache.commons.io.IOUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import javax.ws.rs.core.UriBuilder;
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * Request handler, supports GET, POST, PUT, DELETE methods
+ * @param RESPONSE data type to deserialize response from JSON
+ */
+public class JSONRequestRESPONSE {
+ protected final ClassRESPONSE responseClass;
+ protected final ViewContext context;
+ protected final WebResource resource;
+ private String username;
+ private String doAs;
+
+ protected final Gson gson = new Gson();
+
+ protected final static Logger LOG =
+ LoggerFactory.getLogger(JSONRequest.class);
+
+ /**
+ * Constructor
+ * @param resource object that represents resource
+ * @param responseClass model class
+ * @param
[1/2] ambari git commit: AMBARI-9750. Ambari Views: Kerberos support in Files View (alexantonenko)
Repository: ambari
Updated Branches:
refs/heads/trunk 1ef3c74b7 - 57645a814
AMBARI-9750. Ambari Views: Kerberos support in Files View (alexantonenko)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/3716c553
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/3716c553
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/3716c553
Branch: refs/heads/trunk
Commit: 3716c553a9234304d343fab8a1d4250ef9f59786
Parents: 1ef3c74
Author: Alex Antonenko hiv...@gmail.com
Authored: Mon Feb 23 18:52:36 2015 +0200
Committer: Alex Antonenko hiv...@gmail.com
Committed: Mon Feb 23 19:40:48 2015 +0200
--
.../apache/ambari/view/filebrowser/HdfsApi.java | 40 ++---
.../ambari/view/filebrowser/HdfsService.java| 46 ++--
contrib/views/files/src/main/resources/view.xml | 13 +++---
.../view/filebrowser/FilebrowserTest.java | 9 ++--
4 files changed, 89 insertions(+), 19 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/3716c553/contrib/views/files/src/main/java/org/apache/ambari/view/filebrowser/HdfsApi.java
--
diff --git
a/contrib/views/files/src/main/java/org/apache/ambari/view/filebrowser/HdfsApi.java
b/contrib/views/files/src/main/java/org/apache/ambari/view/filebrowser/HdfsApi.java
index 1c21e58..ef87001 100644
---
a/contrib/views/files/src/main/java/org/apache/ambari/view/filebrowser/HdfsApi.java
+++
b/contrib/views/files/src/main/java/org/apache/ambari/view/filebrowser/HdfsApi.java
@@ -20,7 +20,6 @@ package org.apache.ambari.view.filebrowser;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.fs.*;
-import org.apache.hadoop.fs.permission.AccessControlException;
import org.apache.hadoop.fs.permission.FsAction;
import org.apache.hadoop.fs.permission.FsPermission;
@@ -42,6 +41,7 @@ import java.util.LinkedHashMap;
*/
public class HdfsApi {
private final Configuration conf = new Configuration();
+ private final MapString, String params;
private FileSystem fs;
private UserGroupInformation ugi;
@@ -49,18 +49,46 @@ public class HdfsApi {
/**
* Constructor
* @param defaultFs hdfs uri
- * @param username user.name
+ * @param params map of parameters
* @throws IOException
* @throws InterruptedException
*/
- public HdfsApi(String defaultFs, String username) throws IOException,
+ public HdfsApi(final String defaultFs, String username, MapString, String
params) throws IOException,
InterruptedException {
+this.params = params;
conf.set(fs.hdfs.impl, org.apache.hadoop.hdfs.DistributedFileSystem);
conf.set(fs.webhdfs.impl,
org.apache.hadoop.hdfs.web.WebHdfsFileSystem);
conf.set(fs.file.impl, org.apache.hadoop.fs.LocalFileSystem);
-fs = FileSystem.get(URI.create(defaultFs), conf, username);
-ugi = UserGroupInformation.createProxyUser(username,
-UserGroupInformation.getLoginUser());
+
+ugi = UserGroupInformation.createProxyUser(username, getProxyUser());
+
+fs = ugi.doAs(new PrivilegedExceptionActionFileSystem() {
+ public FileSystem run() throws IOException {
+return FileSystem.get(URI.create(defaultFs), conf);
+ }
+});
+ }
+
+ private UserGroupInformation getProxyUser() throws IOException {
+UserGroupInformation proxyuser;
+if (params.containsKey(proxyuser)) {
+ proxyuser =
UserGroupInformation.createRemoteUser(params.get(proxyuser));
+} else {
+ proxyuser = UserGroupInformation.getCurrentUser();
+}
+
+proxyuser.setAuthenticationMethod(getAuthenticationMethod());
+return proxyuser;
+ }
+
+ private UserGroupInformation.AuthenticationMethod getAuthenticationMethod() {
+UserGroupInformation.AuthenticationMethod authMethod;
+if (params.containsKey(auth)) {
+ authMethod =
UserGroupInformation.AuthenticationMethod.valueOf(params.get(auth));
+} else {
+ authMethod = UserGroupInformation.AuthenticationMethod.SIMPLE;
+}
+return authMethod;
}
/**
http://git-wip-us.apache.org/repos/asf/ambari/blob/3716c553/contrib/views/files/src/main/java/org/apache/ambari/view/filebrowser/HdfsService.java
--
diff --git
a/contrib/views/files/src/main/java/org/apache/ambari/view/filebrowser/HdfsService.java
b/contrib/views/files/src/main/java/org/apache/ambari/view/filebrowser/HdfsService.java
index 1fd5719..765cb79 100644
---
a/contrib/views/files/src/main/java/org/apache/ambari/view/filebrowser/HdfsService.java
+++
b/contrib/views/files/src/main/java/org/apache/ambari/view/filebrowser/HdfsService.java
@@ -23,9 +23,14 @@ import javax.xml.bind.annotation.XmlRootElement;
import org.apache.ambari.view.ViewContext;
import
[1/2] ambari git commit: AMBARI-9753. Commit upgrade catalog for HDP2.0/2.1 to 2.2.2 stack (dlysnichenko)
Repository: ambari
Updated Branches:
refs/heads/trunk 57645a814 - 99411c411
http://git-wip-us.apache.org/repos/asf/ambari/blob/99411c41/ambari-server/src/main/resources/upgrade/catalog/UpgradeCatalog_2.1_to_2.2.2.json
--
diff --git
a/ambari-server/src/main/resources/upgrade/catalog/UpgradeCatalog_2.1_to_2.2.2.json
b/ambari-server/src/main/resources/upgrade/catalog/UpgradeCatalog_2.1_to_2.2.2.json
new file mode 100644
index 000..e4bf30f
--- /dev/null
+++
b/ambari-server/src/main/resources/upgrade/catalog/UpgradeCatalog_2.1_to_2.2.2.json
@@ -0,0 +1,480 @@
+{
+ version: 1.0,
+ stacks: [
+{
+ name: HDP,
+ old-version: 2.1,
+ target-version: 2.2.2,
+ options: {
+config-types: {
+ capacity-scheduler: {
+merged-copy: yes
+ },
+ cluster-env: {
+merged-copy: yes
+ },
+ core-site: {
+merged-copy: yes
+ },
+ falcon-startup.properties: {
+merged-copy: yes
+ },
+ hadoop-env: {
+merged-copy: yes
+ },
+ hbase-env: {
+merged-copy: yes
+ },
+ hbase-site: {
+merged-copy: yes
+ },
+ hdfs-log4j: {
+merged-copy: yes
+ },
+ hdfs-site: {
+merged-copy: yes
+ },
+ hive-env: {
+merged-copy: yes
+ },
+ hive-site: {
+merged-copy: yes
+ },
+ mapred-env: {
+merged-copy: yes
+ },
+ mapred-site: {
+merged-copy: yes
+ },
+ oozie-env: {
+merged-copy: yes
+ },
+ oozie-site: {
+merged-copy: yes
+ },
+ storm-env: {
+merged-copy: yes
+ },
+ storm-site: {
+merged-copy: yes
+ },
+ tez-site: {
+merged-copy: yes
+ },
+ webhcat-site: {
+merged-copy: yes
+ },
+ yarn-site: {
+merged-copy: yes
+ }
+}
+ },
+ properties: {
+capacity-scheduler: {
+ yarn.scheduler.capacity.resource-calculator:
org.apache.hadoop.yarn.util.resource.DefaultResourceCalculator,
+ yarn.scheduler.capacity.root.accessible-node-labels: *,
+
yarn.scheduler.capacity.root.accessible-node-labels.default.capacity: -1,
+
yarn.scheduler.capacity.root.accessible-node-labels.default.maximum-capacity:
-1,
+ yarn.scheduler.capacity.root.default-node-label-expression:
+},
+ cluster-env: {
+ hadoop-streaming_tar_destination_folder: hdfs:///hdp/apps/{{
hdp_stack_version }}/mapreduce/,
+ hadoop-streaming_tar_source:
/usr/hdp/current/hadoop-mapreduce-client/hadoop-streaming.jar,
+ hive_tar_destination_folder: hdfs:///hdp/apps/{{
hdp_stack_version }}/hive/,
+ hive_tar_source: /usr/hdp/current/hive-client/hive.tar.gz,
+ mapreduce_tar_destination_folder: hdfs:///hdp/apps/{{
hdp_stack_version }}/mapreduce/,
+ mapreduce_tar_source:
/usr/hdp/current/hadoop-client/mapreduce.tar.gz,
+ pig_tar_destination_folder: hdfs:///hdp/apps/{{ hdp_stack_version
}}/pig/,
+ pig_tar_source: /usr/hdp/current/pig-client/pig.tar.gz,
+ sqoop_tar_destination_folder: hdfs:///hdp/apps/{{
hdp_stack_version }}/sqoop/,
+ sqoop_tar_source: /usr/hdp/current/sqoop-client/sqoop.tar.gz,
+ tez_tar_destination_folder: hdfs:///hdp/apps/{{ hdp_stack_version
}}/tez/,
+ tez_tar_source: /usr/hdp/current/tez-client/lib/tez.tar.gz
+},
+ core-site: {
+ hadoop.http.authentication.simple.anonymous.allowed: true
+ },
+ falcon-startup.properties: {
+ *.application.services:
org.apache.falcon.security.AuthenticationInitializationService,\\\n
org.apache.falcon.workflow.WorkflowJobEndNotificationService, \\\n
org.apache.falcon.service.ProcessSubscriberService,\\\n
org.apache.falcon.entity.store.ConfigurationStore,\\\n
org.apache.falcon.rerun.service.RetryService,\\\n
org.apache.falcon.rerun.service.LateRunService,\\\n
org.apache.falcon.service.LogCleanupService,\\\n
org.apache.falcon.metadata.MetadataMappingService,
+ *.falcon.enableTLS: false,
+ *.falcon.graph.blueprints.graph:
com.thinkaurelius.titan.core.TitanFactory,
+ *.falcon.graph.storage.backend: berkeleyje,
+ *.falcon.security.authorization.admin.groups: falcon,
+ *.falcon.security.authorization.admin.users: falcon,ambari-qa,
+
ambari git commit: AMBARI-9752. Increase Install New Stack Version timeout (dlysnichenko)
Repository: ambari
Updated Branches:
refs/heads/trunk 99411c411 - 46f1ffbec
AMBARI-9752. Increase Install New Stack Version timeout (dlysnichenko)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/46f1ffbe
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/46f1ffbe
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/46f1ffbe
Branch: refs/heads/trunk
Commit: 46f1ffbec1c2cbeabedfbfd39db281ac58708769
Parents: 99411c4
Author: Lisnichenko Dmitro dlysniche...@hortonworks.com
Authored: Mon Feb 23 20:37:39 2015 +0200
Committer: Lisnichenko Dmitro dlysniche...@hortonworks.com
Committed: Mon Feb 23 20:37:39 2015 +0200
--
ambari-server/conf/unix/ambari.properties| 2 ++
ambari-server/conf/windows/ambari.properties | 2 ++
.../ambari/server/agent/HeartbeatMonitor.java| 2 +-
.../server/configuration/Configuration.java | 13 +
.../AmbariCustomCommandExecutionHelper.java | 6 --
.../AmbariManagementControllerImpl.java | 3 ++-
.../ClusterStackVersionResourceProvider.java | 2 +-
.../HostStackVersionResourceProvider.java| 2 +-
.../internal/UpgradeResourceProvider.java| 6 +++---
.../server/configuration/ConfigurationTest.java | 19 +++
10 files changed, 44 insertions(+), 13 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/46f1ffbe/ambari-server/conf/unix/ambari.properties
--
diff --git a/ambari-server/conf/unix/ambari.properties
b/ambari-server/conf/unix/ambari.properties
index 29bc3ac..ec51278 100644
--- a/ambari-server/conf/unix/ambari.properties
+++ b/ambari-server/conf/unix/ambari.properties
@@ -68,6 +68,8 @@ server.execution.scheduler.misfire.toleration.minutes=480
# Default timeout in seconds before task is killed
agent.task.timeout=900
+# Default timeout in seconds before package installation task is killed
+agent.package.install.task.timeout=1800
# thread pool maximums
client.threadpool.size.max=25
http://git-wip-us.apache.org/repos/asf/ambari/blob/46f1ffbe/ambari-server/conf/windows/ambari.properties
--
diff --git a/ambari-server/conf/windows/ambari.properties
b/ambari-server/conf/windows/ambari.properties
index 3f0ed4e..ff69f67 100644
--- a/ambari-server/conf/windows/ambari.properties
+++ b/ambari-server/conf/windows/ambari.properties
@@ -58,6 +58,8 @@ ambari.python.wrap=python.exe
# Default timeout in seconds before task is killed
agent.task.timeout=600
+# Default timeout in seconds before package installation task is killed
+agent.package.install.task.timeout=1800
# thread pool maximums
client.threadpool.size.max=25
http://git-wip-us.apache.org/repos/asf/ambari/blob/46f1ffbe/ambari-server/src/main/java/org/apache/ambari/server/agent/HeartbeatMonitor.java
--
diff --git
a/ambari-server/src/main/java/org/apache/ambari/server/agent/HeartbeatMonitor.java
b/ambari-server/src/main/java/org/apache/ambari/server/agent/HeartbeatMonitor.java
index c8b780b..ce6a0b8 100644
---
a/ambari-server/src/main/java/org/apache/ambari/server/agent/HeartbeatMonitor.java
+++
b/ambari-server/src/main/java/org/apache/ambari/server/agent/HeartbeatMonitor.java
@@ -297,7 +297,7 @@ public class HeartbeatMonitor implements Runnable {
// Fill command params
MapString, String commandParams = statusCmd.getCommandParams();
-String commandTimeout = configuration.getDefaultAgentTaskTimeout();
+String commandTimeout = configuration.getDefaultAgentTaskTimeout(false);
CommandScriptDefinition script = componentInfo.getCommandScript();
if
(serviceInfo.getSchemaVersion().equals(AmbariMetaInfo.SCHEMA_VERSION_2)) {
if (script != null) {
http://git-wip-us.apache.org/repos/asf/ambari/blob/46f1ffbe/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 e6f4125..d859523 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
@@ -240,7 +240,9 @@ public class Configuration {
*/
public static final String PARALLEL_STAGE_EXECUTION_KEY =
server.stages.parallel;
public static final String AGENT_TASK_TIMEOUT_KEY = agent.task.timeout;
+ public static final String AGENT_PACKAGE_INSTALL_TASK_TIMEOUT_KEY =
[2/2] ambari git commit: AMBARI-9753. Commit upgrade catalog for HDP2.0/2.1 to 2.2.2 stack (dlysnichenko)
AMBARI-9753. Commit upgrade catalog for HDP2.0/2.1 to 2.2.2 stack (dlysnichenko)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/99411c41
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/99411c41
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/99411c41
Branch: refs/heads/trunk
Commit: 99411c4110ae8ec5d72b7ba2e60e3f803d9a6b45
Parents: 57645a8
Author: Lisnichenko Dmitro dlysniche...@hortonworks.com
Authored: Mon Feb 23 20:24:31 2015 +0200
Committer: Lisnichenko Dmitro dlysniche...@hortonworks.com
Committed: Mon Feb 23 20:24:31 2015 +0200
--
.../catalog/UpgradeCatalog_2.0_to_2.2.2.json| 422
.../catalog/UpgradeCatalog_2.1_to_2.2.2.json| 480 +++
2 files changed, 902 insertions(+)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/99411c41/ambari-server/src/main/resources/upgrade/catalog/UpgradeCatalog_2.0_to_2.2.2.json
--
diff --git
a/ambari-server/src/main/resources/upgrade/catalog/UpgradeCatalog_2.0_to_2.2.2.json
b/ambari-server/src/main/resources/upgrade/catalog/UpgradeCatalog_2.0_to_2.2.2.json
new file mode 100644
index 000..b533f52
--- /dev/null
+++
b/ambari-server/src/main/resources/upgrade/catalog/UpgradeCatalog_2.0_to_2.2.2.json
@@ -0,0 +1,422 @@
+{
+version: 1.0,
+stacks: [
+{
+name: HDP,
+old-version: 2.0,
+target-version: 2.2.2,
+options: {
+config-types: {
+capacity-scheduler: {
+merged-copy: yes
+},
+cluster-env: {
+merged-copy: yes
+},
+core-site: {
+merged-copy: yes
+},
+hadoop-env: {
+merged-copy: yes
+},
+hbase-env: {
+merged-copy: yes
+},
+hbase-site: {
+merged-copy: yes
+},
+hdfs-log4j: {
+merged-copy: yes
+},
+hdfs-site: {
+merged-copy: yes
+},
+hive-env: {
+merged-copy: yes
+},
+hive-site: {
+merged-copy: yes
+},
+mapred-env: {
+merged-copy: yes
+},
+mapred-site: {
+merged-copy: yes
+},
+oozie-env: {
+merged-copy: yes
+},
+oozie-site: {
+merged-copy: yes
+},
+webhcat-site: {
+merged-copy: yes
+},
+yarn-site: {
+merged-copy: yes
+}
+}
+},
+properties: {
+capacity-scheduler: {
+yarn.scheduler.capacity.resource-calculator:
org.apache.hadoop.yarn.util.resource.DefaultResourceCalculator,
+yarn.scheduler.capacity.root.accessible-node-labels: *,
+
yarn.scheduler.capacity.root.accessible-node-labels.default.capacity: -1,
+
yarn.scheduler.capacity.root.accessible-node-labels.default.maximum-capacity:
-1,
+
yarn.scheduler.capacity.root.default-node-label-expression:
+},
+cluster-env: {
+hadoop-streaming_tar_destination_folder:
hdfs:///hdp/apps/{{ hdp_stack_version }}/mapreduce/,
+hadoop-streaming_tar_source:
/usr/hdp/current/hadoop-mapreduce-client/hadoop-streaming.jar,
+hive_tar_destination_folder: hdfs:///hdp/apps/{{
hdp_stack_version }}/hive/,
+hive_tar_source:
/usr/hdp/current/hive-client/hive.tar.gz,
+mapreduce_tar_destination_folder: hdfs:///hdp/apps/{{
hdp_stack_version }}/mapreduce/,
+mapreduce_tar_source:
/usr/hdp/current/hadoop-client/mapreduce.tar.gz,
+pig_tar_destination_folder: hdfs:///hdp/apps/{{
hdp_stack_version }}/pig/,
+pig_tar_source: /usr/hdp/current/pig-client/pig.tar.gz,
+sqoop_tar_destination_folder: hdfs:///hdp/apps/{{
hdp_stack_version }}/sqoop/,
+sqoop_tar_source:
/usr/hdp/current/sqoop-client/sqoop.tar.gz,
+
ambari git commit: AMBARI-9439. Kerberos: regenerate keytabs not handled for all hosts (rlevas)
Repository: ambari
Updated Branches:
refs/heads/trunk 46f1ffbec - 575097117
AMBARI-9439. Kerberos: regenerate keytabs not handled for all hosts (rlevas)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/57509711
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/57509711
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/57509711
Branch: refs/heads/trunk
Commit: 575097117230f5111dd9171efbf632eff3f58d1e
Parents: 46f1ffb
Author: Robert Levas rle...@hortonworks.com
Authored: Mon Feb 23 14:13:24 2015 -0500
Committer: Robert Levas rle...@hortonworks.com
Committed: Mon Feb 23 14:13:30 2015 -0500
--
.../server/controller/KerberosHelper.java | 31 +++-
.../org/apache/ambari/server/state/Service.java | 3 +-
.../server/controller/KerberosHelperTest.java | 150 +--
3 files changed, 170 insertions(+), 14 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/57509711/ambari-server/src/main/java/org/apache/ambari/server/controller/KerberosHelper.java
--
diff --git
a/ambari-server/src/main/java/org/apache/ambari/server/controller/KerberosHelper.java
b/ambari-server/src/main/java/org/apache/ambari/server/controller/KerberosHelper.java
index 7a0a374..e562497 100644
---
a/ambari-server/src/main/java/org/apache/ambari/server/controller/KerberosHelper.java
+++
b/ambari-server/src/main/java/org/apache/ambari/server/controller/KerberosHelper.java
@@ -81,6 +81,7 @@ import org.apache.ambari.server.state.Service;
import org.apache.ambari.server.state.ServiceComponent;
import org.apache.ambari.server.state.ServiceComponentHost;
import org.apache.ambari.server.state.StackId;
+import org.apache.ambari.server.state.State;
import org.apache.ambari.server.state.kerberos.KerberosComponentDescriptor;
import org.apache.ambari.server.state.kerberos.KerberosConfigurationDescriptor;
import org.apache.ambari.server.state.kerberos.KerberosDescriptor;
@@ -103,6 +104,7 @@ import java.util.Collection;
import java.util.Collections;
import java.util.HashMap;
import java.util.HashSet;
+import java.util.Iterator;
import java.util.List;
import java.util.Map;
import java.util.Set;
@@ -509,6 +511,11 @@ public class KerberosHelper {
MapString, String kerberosDescriptorProperties =
kerberosDescriptor.getProperties();
MapString, MapString, String kerberosConfigurations = new
HashMapString, MapString, String();
+// While iterating over all the ServiceComponentHosts find hosts that
have KERBEROS_CLIENT
+// components in the INSTALLED state and add them to the
hostsWithValidKerberosClient Set.
+// This is needed to help determine which hosts to perform actions for
and create tasks for.
+SetString hostsWithValidKerberosClient = new HashSetString();
+
// Create a temporary directory to store metadata needed to complete
this task. Information
// such as which principals and keytabs files to create as well as
what configurations need
// to be update are stored in data files in this directory. Any keytab
files are stored in
@@ -545,6 +552,16 @@ public class KerberosHelper {
// keytab files, and configurations need to be created or
updated.
for (ServiceComponentHost sch : serviceComponentHosts) {
String serviceName = sch.getServiceName();
+String componentName = sch.getServiceComponentName();
+
+// If the current ServiceComponentHost represents the
KERBEROS/KERBEROS_CLIENT and
+// indicates that the KERBEROS_CLIENT component is in the
INSTALLED state, add the
+// current host to the set of hosts that should be handled...
+if(Service.Type.KERBEROS.name().equals(serviceName)
+Role.KERBEROS_CLIENT.name().equals(componentName)
+(sch.getState() == State.INSTALLED)) {
+ hostsWithValidKerberosClient.add(hostname);
+}
// If there is no filter or the filter contains the current
service name...
if ((serviceComponentFilter == null) ||
serviceComponentFilter.containsKey(serviceName)) {
@@ -552,7 +569,6 @@ public class KerberosHelper {
KerberosServiceDescriptor serviceDescriptor =
kerberosDescriptor.getService(serviceName);
if (serviceDescriptor != null) {
-String componentName = sch.getServiceComponentName();
int identitiesAdded = 0;
ListKerberosIdentityDescriptor serviceIdentities =
serviceDescriptor.getIdentities(true);
@@ -607,6 +623,17 @@ public class KerberosHelper {
}
}
+
ambari git commit: AMBARI-9742. Kerberos: fails when entering admin principal with blank password (rlevas)
Repository: ambari
Updated Branches:
refs/heads/trunk 575097117 - 7b73e225b
AMBARI-9742. Kerberos: fails when entering admin principal with blank password
(rlevas)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/7b73e225
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/7b73e225
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/7b73e225
Branch: refs/heads/trunk
Commit: 7b73e225b4b82f195286f3610f191cc196ae7071
Parents: 5750971
Author: Robert Levas rle...@hortonworks.com
Authored: Mon Feb 23 14:54:27 2015 -0500
Committer: Robert Levas rle...@hortonworks.com
Committed: Mon Feb 23 14:54:27 2015 -0500
--
.../kerberos/KerberosOperationHandler.java | 40 +++-
.../kerberos/KerberosOperationHandlerTest.java | 39 +++
2 files changed, 78 insertions(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/7b73e225/ambari-server/src/main/java/org/apache/ambari/server/serveraction/kerberos/KerberosOperationHandler.java
--
diff --git
a/ambari-server/src/main/java/org/apache/ambari/server/serveraction/kerberos/KerberosOperationHandler.java
b/ambari-server/src/main/java/org/apache/ambari/server/serveraction/kerberos/KerberosOperationHandler.java
index 9d41691..b62f6f9 100644
---
a/ambari-server/src/main/java/org/apache/ambari/server/serveraction/kerberos/KerberosOperationHandler.java
+++
b/ambari-server/src/main/java/org/apache/ambari/server/serveraction/kerberos/KerberosOperationHandler.java
@@ -411,7 +411,45 @@ public abstract class KerberosOperationHandler {
return administratorCredentials;
}
- public void setAdministratorCredentials(KerberosCredential
administratorCredentials) {
+ /**
+ * Sets the administrator credentials for this KerberosOperationHandler.
+ * p/
+ * If the supplied {@link KerberosCredential} is not codenull/code,
validates that the administrator
+ * principal is not codenull/code or empty and that either the password
or the keytab value
+ * is not codenull/code or empty. If the credential value does not
validate, then a
+ * {@link KerberosAdminAuthenticationException} will be thrown.
+ *
+ * @param administratorCredentials the relevant KerberosCredential
+ * @throws KerberosAdminAuthenticationException if the non-null
KerberosCredential fails contain
+ * a non-empty principal and a
non-empty password or
+ * keytab value.
+ */
+ public void setAdministratorCredentials(KerberosCredential
administratorCredentials)
+ throws KerberosAdminAuthenticationException {
+
+// Ensure the KerberosCredential is not null
+if (administratorCredentials == null) {
+ throw new KerberosAdminAuthenticationException(The administrator
credential must not be null);
+}
+
+String value;
+
+// Ensure the principal is not null or empty
+value = administratorCredentials.getPrincipal();
+if ((value == null) || value.isEmpty()) {
+ throw new KerberosAdminAuthenticationException(Must specify a principal
but it is null or empty);
+}
+
+// Ensure either the password or the keytab value is not null or empty
+value = administratorCredentials.getPassword();
+if ((value == null) || value.isEmpty()) {
+ value = administratorCredentials.getKeytab();
+
+ if ((value == null) || value.isEmpty()) {
+throw new KerberosAdminAuthenticationException(Must specify either a
password or a keytab but both are null or empty);
+ }
+}
+
this.administratorCredentials = administratorCredentials;
}
http://git-wip-us.apache.org/repos/asf/ambari/blob/7b73e225/ambari-server/src/test/java/org/apache/ambari/server/serveraction/kerberos/KerberosOperationHandlerTest.java
--
diff --git
a/ambari-server/src/test/java/org/apache/ambari/server/serveraction/kerberos/KerberosOperationHandlerTest.java
b/ambari-server/src/test/java/org/apache/ambari/server/serveraction/kerberos/KerberosOperationHandlerTest.java
index f4551d2..e1d5fce 100644
---
a/ambari-server/src/test/java/org/apache/ambari/server/serveraction/kerberos/KerberosOperationHandlerTest.java
+++
b/ambari-server/src/test/java/org/apache/ambari/server/serveraction/kerberos/KerberosOperationHandlerTest.java
@@ -278,6 +278,45 @@ public abstract class KerberosOperationHandlerTest extends
EasyMockSupport {
Assert.assertEquals(\\A's are special!, handler.escapeCharacters(A's
are special!, Collections.singleton('A'), '\\'));
}
+ @Test(expected = KerberosAdminAuthenticationException.class)
+ public void testAdminCredentialsNullPrincipal() throws
ambari git commit: AMBARI-9755. After cluster install one host doesn't have any stack version (ncole)
Repository: ambari
Updated Branches:
refs/heads/trunk 1d4959442 - 52f34cc7a
AMBARI-9755. After cluster install one host doesn't have any stack version
(ncole)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/52f34cc7
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/52f34cc7
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/52f34cc7
Branch: refs/heads/trunk
Commit: 52f34cc7a7f824caffbf54d8e61a23dd3406a45b
Parents: 1d49594
Author: Nate Cole nc...@hortonworks.com
Authored: Mon Feb 23 14:47:11 2015 -0500
Committer: Nate Cole nc...@hortonworks.com
Committed: Mon Feb 23 17:43:22 2015 -0500
--
.../server/state/cluster/ClusterImpl.java | 74 ++
.../package/scripts/zookeeper_server.py | 5 +-
.../server/state/cluster/ClusterTest.java | 79 ++--
.../HDP/2.0.5/services/ZOOKEEPER/metainfo.xml | 1 +
4 files changed, 149 insertions(+), 10 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/52f34cc7/ambari-server/src/main/java/org/apache/ambari/server/state/cluster/ClusterImpl.java
--
diff --git
a/ambari-server/src/main/java/org/apache/ambari/server/state/cluster/ClusterImpl.java
b/ambari-server/src/main/java/org/apache/ambari/server/state/cluster/ClusterImpl.java
index c609b0a..b2ba43b 100644
---
a/ambari-server/src/main/java/org/apache/ambari/server/state/cluster/ClusterImpl.java
+++
b/ambari-server/src/main/java/org/apache/ambari/server/state/cluster/ClusterImpl.java
@@ -1500,6 +1500,53 @@ public class ClusterImpl implements Cluster {
existingClusterVersion.setState(state);
existingClusterVersion.setEndTime(System.currentTimeMillis());
clusterVersionDAO.merge(existingClusterVersion);
+
+if (RepositoryVersionState.CURRENT == state) {
+ for (HostEntity he : clusterEntity.getHostEntities()) {
+if
(hostHasReportables(existingClusterVersion.getRepositoryVersion(), he)) {
+ continue;
+}
+
+CollectionHostVersionEntity versions = hostVersionDAO.findByHost(
+he.getHostName());
+
+if (null == versions || versions.isEmpty()) {
+ // no versions whatsoever
+ HostVersionEntity hve = new HostVersionEntity();
+ hve.setHostEntity(he);
+ hve.setHostName(he.getHostName());
+
hve.setRepositoryVersion(existingClusterVersion.getRepositoryVersion());
+ hve.setState(state);
+ hostVersionDAO.create(hve);
+} else {
+ HostVersionEntity target = null;
+ // set anything that is marked current as installed
+ for (HostVersionEntity entity : versions) {
+if (entity.getRepositoryVersion().getId().equals(
+existingClusterVersion.getRepositoryVersion().getId())) {
+ target = entity;
+ target.setState(state);
+ hostVersionDAO.merge(target);
+} else if (entity.getState() == state) {
+ entity.setState(RepositoryVersionState.INSTALLED);
+ hostVersionDAO.merge(entity);
+}
+ }
+ if (null == target) {
+// not found in existing list, make one
+HostVersionEntity hve = new HostVersionEntity();
+hve.setHostEntity(he);
+hve.setHostName(he.getHostName());
+
hve.setRepositoryVersion(existingClusterVersion.getRepositoryVersion());
+hve.setState(state);
+hostVersionDAO.create(hve);
+ }
+
+}
+ }
+}
+
+
}
} catch (RollbackException e) {
String message = Unable to transition stack + stack + at version
@@ -1511,6 +1558,33 @@ public class ClusterImpl implements Cluster {
}
}
+ /**
+ * Checks if the host has any components reporting version information.
+ * @param repoVersion the repo version
+ * @param hostthe host entity
+ * @return {@code true} if the host has any component that report version
+ * @throws AmbariException
+ */
+ private boolean hostHasReportables(RepositoryVersionEntity repoVersion,
HostEntity host)
+ throws AmbariException {
+
+for (HostComponentStateEntity hcse : host.getHostComponentStateEntities())
{
+ ComponentInfo ci = ambariMetaInfo.getComponent(
+ repoVersion.getStackName(),
+ repoVersion.getStackVersion(),
+ hcse.getServiceName(),
+ hcse.getComponentName());
+
+ if (ci.isVersionAdvertised()) {
+return true;
+ }
+}
+
+
+return false;
+ }
+
+
@Override
ambari git commit: AMBARI-9757. When toggling Ranger HBase plugin, UI gives incorrect recommendations (srimanth)
Repository: ambari
Updated Branches:
refs/heads/trunk 7b73e225b - 1d4959442
AMBARI-9757. When toggling Ranger HBase plugin, UI gives incorrect
recommendations (srimanth)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/1d495944
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/1d495944
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/1d495944
Branch: refs/heads/trunk
Commit: 1d495944291077fe69e62c692f21e9e8223bcbd5
Parents: 7b73e22
Author: Srimanth Gunturi sgunt...@hortonworks.com
Authored: Mon Feb 23 14:01:00 2015 -0800
Committer: Srimanth Gunturi sgunt...@hortonworks.com
Committed: Mon Feb 23 14:01:06 2015 -0800
--
ambari-web/app/utils/configs/modification_handlers/hbase.js | 8
1 file changed, 4 insertions(+), 4 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/1d495944/ambari-web/app/utils/configs/modification_handlers/hbase.js
--
diff --git a/ambari-web/app/utils/configs/modification_handlers/hbase.js
b/ambari-web/app/utils/configs/modification_handlers/hbase.js
index 1fb6b29..b5a342f 100644
--- a/ambari-web/app/utils/configs/modification_handlers/hbase.js
+++ b/ambari-web/app/utils/configs/modification_handlers/hbase.js
@@ -37,7 +37,7 @@ module.exports = App.ServiceConfigModificationHandler.create({
if (authEnabled) {
var nonXaClassIndex = currentClassesList.indexOf(nonXAClass);
if (nonXaClassIndex -1) {
- currentClassesList = currentClassesList.splice(nonXaClassIndex,
nonXaClassIndex);
+ currentClassesList.splice(nonXaClassIndex, 1);
newClassesList = currentClassesList;
}
var xaClassIndex = currentClassesList.indexOf(xaAuthCoProcessorClass);
@@ -48,7 +48,7 @@ module.exports = App.ServiceConfigModificationHandler.create({
} else {
var xaClassIndex = currentClassesList.indexOf(xaAuthCoProcessorClass);
if (xaClassIndex -1) {
- currentClassesList = currentClassesList.splice(xaClassIndex,
xaClassIndex);
+ currentClassesList.splice(xaClassIndex, 1);
newClassesList = currentClassesList;
}
if (addOldValue) {
@@ -92,8 +92,8 @@ module.exports = App.ServiceConfigModificationHandler.create({
var newRpcProtectionValue = authEnabled ? privacy : authentication;
// Add Hive-Ranger configs
- this.updateConfigClasses(configMasterClasses, authEnabled,
affectedProperties, configAuthEnabled.get('value') != 'true');
- this.updateConfigClasses(configRegionClasses, authEnabled,
affectedProperties, configAuthEnabled.get('value') != 'true');
+ this.updateConfigClasses(configMasterClasses, authEnabled,
affectedProperties, configAuthEnabled.get('value') == 'true');
+ this.updateConfigClasses(configRegionClasses, authEnabled,
affectedProperties, configAuthEnabled.get('value') == 'true');
if (newRpcProtectionValue !== configRpcProtection.get('value')) {
affectedProperties.push({
serviceName : HBASE,
ambari git commit: AMBARI-9756 - Oozie Service Check Fails During Upgrade Due To Incorrect Example Directory (jonathanhurley)
Repository: ambari
Updated Branches:
refs/heads/branch-2.0.0 804e18de4 - 060aedeaa
AMBARI-9756 - Oozie Service Check Fails During Upgrade Due To Incorrect Example
Directory (jonathanhurley)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/060aedea
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/060aedea
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/060aedea
Branch: refs/heads/branch-2.0.0
Commit: 060aedeaa95c0330052d252fac04ac332eebf6b3
Parents: 804e18d
Author: Jonathan Hurley jhur...@hortonworks.com
Authored: Mon Feb 23 16:16:28 2015 -0500
Committer: Jonathan Hurley jhur...@hortonworks.com
Committed: Mon Feb 23 21:40:55 2015 -0500
--
.../4.0.0.2.0/package/files/oozieSmoke2.sh | 35 +---
.../OOZIE/4.0.0.2.0/package/scripts/oozie.py| 22
.../OOZIE/4.0.0.2.0/package/scripts/params.py | 4 +--
.../4.0.0.2.0/package/scripts/service_check.py | 21 ++--
.../stacks/2.0.6/OOZIE/test_oozie_server.py | 4 +--
.../stacks/2.0.6/OOZIE/test_service_check.py| 2 +-
6 files changed, 47 insertions(+), 41 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/060aedea/ambari-server/src/main/resources/common-services/OOZIE/4.0.0.2.0/package/files/oozieSmoke2.sh
--
diff --git
a/ambari-server/src/main/resources/common-services/OOZIE/4.0.0.2.0/package/files/oozieSmoke2.sh
b/ambari-server/src/main/resources/common-services/OOZIE/4.0.0.2.0/package/files/oozieSmoke2.sh
index bdd4e26..0695701 100644
---
a/ambari-server/src/main/resources/common-services/OOZIE/4.0.0.2.0/package/files/oozieSmoke2.sh
+++
b/ambari-server/src/main/resources/common-services/OOZIE/4.0.0.2.0/package/files/oozieSmoke2.sh
@@ -20,8 +20,16 @@
#
#
-os_family=$1
-shift
+export oozie_lib_dir=$1
+export oozie_conf_dir=$2
+export oozie_bin_dir=$3
+export hadoop_conf_dir=$4
+export hadoop_bin_dir=$5
+export smoke_test_user=$6
+export security_enabled=$7
+export smoke_user_keytab=$8
+export kinit_path_local=$9
+export smokeuser_principal=$10
function getValueFromField {
xmllint $1 | grep name$2/name -C 2 | grep 'value' | cut -d -f2 |
cut -d -f1
@@ -57,32 +65,19 @@ function checkOozieJobStatus {
return $rc
}
-export oozie_conf_dir=$1
-export oozie_bin_dir=$2
-export hadoop_conf_dir=$3
-export hadoop_bin_dir=$4
-export smoke_test_user=$5
-export security_enabled=$6
-export smoke_user_keytab=$7
-export kinit_path_local=$8
-export smokeuser_principal=$9
-
export OOZIE_EXIT_CODE=0
export JOBTRACKER=`getValueFromField ${hadoop_conf_dir}/yarn-site.xml
yarn.resourcemanager.address`
export NAMENODE=`getValueFromField ${hadoop_conf_dir}/core-site.xml
fs.defaultFS`
export OOZIE_SERVER=`getValueFromField ${oozie_conf_dir}/oozie-site.xml
oozie.base.url | tr '[:upper:]' '[:lower:]'`
-if [ $os_family == ubuntu ] ; then
- LIST_PACKAGE_FILES_CMD='dpkg-query -L'
-else
- LIST_PACKAGE_FILES_CMD='rpm -ql'
-fi
-
-
-export OOZIE_EXAMPLES_DIR=`$LIST_PACKAGE_FILES_CMD oozie-client | grep
'oozie-examples.tar.gz$' | xargs dirname`
+# search for the oozie examples JAR and, if found, store the directory name
+export OOZIE_EXAMPLES_DIR=`find ${oozie_lib_dir}/ -name
oozie-examples.tar.gz | xargs dirname`
if [[ -z $OOZIE_EXAMPLES_DIR ]] ; then
export OOZIE_EXAMPLES_DIR='/usr/hdp/current/oozie-client/doc/'
+else
+ echo Located Oozie examples JAR at $OOZIE_EXAMPLES_DIR
fi
+
cd $OOZIE_EXAMPLES_DIR
sudo tar -zxf oozie-examples.tar.gz
http://git-wip-us.apache.org/repos/asf/ambari/blob/060aedea/ambari-server/src/main/resources/common-services/OOZIE/4.0.0.2.0/package/scripts/oozie.py
--
diff --git
a/ambari-server/src/main/resources/common-services/OOZIE/4.0.0.2.0/package/scripts/oozie.py
b/ambari-server/src/main/resources/common-services/OOZIE/4.0.0.2.0/package/scripts/oozie.py
index 7d8322c..2065f4a 100644
---
a/ambari-server/src/main/resources/common-services/OOZIE/4.0.0.2.0/package/scripts/oozie.py
+++
b/ambari-server/src/main/resources/common-services/OOZIE/4.0.0.2.0/package/scripts/oozie.py
@@ -19,10 +19,20 @@ limitations under the License.
import os
-from resource_management import *
-
-def oozie(is_server=False # TODO: see if see can remove this
- ):
+from resource_management.core.resources import Directory
+from resource_management.core.resources import File
+from resource_management.core.resources.system import Execute
+from resource_management.core.source import DownloadSource
+from resource_management.core.source import InlineTemplate
+from resource_management.core.source import Template
+from resource_management.libraries.functions import format
+from
ambari git commit: AMABRI-9759. Alerts table: clear filters link doesn't work for alert groups. (xiwang via yusaku)
Repository: ambari
Updated Branches:
refs/heads/trunk 92b75ea44 - 150a7118f
AMABRI-9759. Alerts table: clear filters link doesn't work for alert groups.
(xiwang via yusaku)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/150a7118
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/150a7118
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/150a7118
Branch: refs/heads/trunk
Commit: 150a7118f12af2e87e6a187e0360b2e561fdd734
Parents: 92b75ea
Author: Yusaku Sako yus...@hortonworks.com
Authored: Mon Feb 23 19:34:48 2015 -0800
Committer: Yusaku Sako yus...@hortonworks.com
Committed: Mon Feb 23 19:34:48 2015 -0800
--
ambari-web/app/views/main/alert_definitions_view.js | 3 +++
1 file changed, 3 insertions(+)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/150a7118/ambari-web/app/views/main/alert_definitions_view.js
--
diff --git a/ambari-web/app/views/main/alert_definitions_view.js
b/ambari-web/app/views/main/alert_definitions_view.js
index 05d4186..6b0cecd 100644
--- a/ambari-web/app/views/main/alert_definitions_view.js
+++ b/ambari-web/app/views/main/alert_definitions_view.js
@@ -401,6 +401,8 @@ App.MainAlertDefinitionsView = App.TableView.extend({
this.set('value', '');
},
+emptyValue: '',
+
/**
* Update list of codeApp.AlertGroup/code used in the filter
* @method updateContent
@@ -446,6 +448,7 @@ App.MainAlertDefinitionsView = App.TableView.extend({
if (selectEntry) {
selectEntry.set('selected', true);
}
+this.get('parentView').updateFilter(this.get('column'), value,
'alert_group');
} else {
this.set('value', '');
this.get('parentView').updateFilter(this.get('column'), '',
'alert_group');
ambari git commit: AMBARI-9760. Host Alerts table: clear filters link doesn't work. (xiwang via yusaku)
Repository: ambari
Updated Branches:
refs/heads/branch-2.0.0 c988a4398 - d6a67cfb9
AMBARI-9760. Host Alerts table: clear filters link doesn't work. (xiwang via
yusaku)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/d6a67cfb
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/d6a67cfb
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/d6a67cfb
Branch: refs/heads/branch-2.0.0
Commit: d6a67cfb935eef1d3a7fed83825ee93cbc6c410d
Parents: c988a43
Author: Yusaku Sako yus...@hortonworks.com
Authored: Mon Feb 23 19:36:36 2015 -0800
Committer: Yusaku Sako yus...@hortonworks.com
Committed: Mon Feb 23 19:37:11 2015 -0800
--
ambari-web/app/views/main/host/host_alerts_view.js | 14 +-
1 file changed, 13 insertions(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/d6a67cfb/ambari-web/app/views/main/host/host_alerts_view.js
--
diff --git a/ambari-web/app/views/main/host/host_alerts_view.js
b/ambari-web/app/views/main/host/host_alerts_view.js
index dc88232..80731a7 100644
--- a/ambari-web/app/views/main/host/host_alerts_view.js
+++ b/ambari-web/app/views/main/host/host_alerts_view.js
@@ -236,6 +236,18 @@ App.MainHostAlertsView = App.TableView.extend({
Em.run.next(this, function () {
App.tooltip($(.enable-disable-button, .timeago, .alert-text));
});
- }.observes('pageContent.@each')
+ }.observes('pageContent.@each'),
+
+ /**
+ * Run codeclearFilter/code in the each child filterView
+ */
+ clearFilters: function() {
+this.set('filterConditions', []);
+this.get('childViews').forEach(function(childView) {
+ if (childView['clearFilter']) {
+childView.clearFilter();
+ }
+});
+ }
});
ambari git commit: AMABRI-9759. Alerts table: clear filters link doesn't work for alert groups. (xiwang via yusaku)
Repository: ambari
Updated Branches:
refs/heads/branch-2.0.0 060aedeaa - c988a4398
AMABRI-9759. Alerts table: clear filters link doesn't work for alert groups.
(xiwang via yusaku)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/c988a439
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/c988a439
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/c988a439
Branch: refs/heads/branch-2.0.0
Commit: c988a4398d3b92080f2a579badef9c3899b408eb
Parents: 060aede
Author: Yusaku Sako yus...@hortonworks.com
Authored: Mon Feb 23 19:34:48 2015 -0800
Committer: Yusaku Sako yus...@hortonworks.com
Committed: Mon Feb 23 19:35:19 2015 -0800
--
ambari-web/app/views/main/alert_definitions_view.js | 3 +++
1 file changed, 3 insertions(+)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/c988a439/ambari-web/app/views/main/alert_definitions_view.js
--
diff --git a/ambari-web/app/views/main/alert_definitions_view.js
b/ambari-web/app/views/main/alert_definitions_view.js
index 05d4186..6b0cecd 100644
--- a/ambari-web/app/views/main/alert_definitions_view.js
+++ b/ambari-web/app/views/main/alert_definitions_view.js
@@ -401,6 +401,8 @@ App.MainAlertDefinitionsView = App.TableView.extend({
this.set('value', '');
},
+emptyValue: '',
+
/**
* Update list of codeApp.AlertGroup/code used in the filter
* @method updateContent
@@ -446,6 +448,7 @@ App.MainAlertDefinitionsView = App.TableView.extend({
if (selectEntry) {
selectEntry.set('selected', true);
}
+this.get('parentView').updateFilter(this.get('column'), value,
'alert_group');
} else {
this.set('value', '');
this.get('parentView').updateFilter(this.get('column'), '',
'alert_group');
ambari git commit: AMBARI-9760. Host Alerts table: clear filters link doesn't work. (xiwang via yusaku)
Repository: ambari
Updated Branches:
refs/heads/trunk 150a7118f - f80eb83fa
AMBARI-9760. Host Alerts table: clear filters link doesn't work. (xiwang via
yusaku)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/f80eb83f
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/f80eb83f
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/f80eb83f
Branch: refs/heads/trunk
Commit: f80eb83fa66e24bebc3bbd2a112cfd343bb3d44e
Parents: 150a711
Author: Yusaku Sako yus...@hortonworks.com
Authored: Mon Feb 23 19:36:36 2015 -0800
Committer: Yusaku Sako yus...@hortonworks.com
Committed: Mon Feb 23 19:36:36 2015 -0800
--
ambari-web/app/views/main/host/host_alerts_view.js | 14 +-
1 file changed, 13 insertions(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/f80eb83f/ambari-web/app/views/main/host/host_alerts_view.js
--
diff --git a/ambari-web/app/views/main/host/host_alerts_view.js
b/ambari-web/app/views/main/host/host_alerts_view.js
index dc88232..80731a7 100644
--- a/ambari-web/app/views/main/host/host_alerts_view.js
+++ b/ambari-web/app/views/main/host/host_alerts_view.js
@@ -236,6 +236,18 @@ App.MainHostAlertsView = App.TableView.extend({
Em.run.next(this, function () {
App.tooltip($(.enable-disable-button, .timeago, .alert-text));
});
- }.observes('pageContent.@each')
+ }.observes('pageContent.@each'),
+
+ /**
+ * Run codeclearFilter/code in the each child filterView
+ */
+ clearFilters: function() {
+this.set('filterConditions', []);
+this.get('childViews').forEach(function(childView) {
+ if (childView['clearFilter']) {
+childView.clearFilter();
+ }
+});
+ }
});
ambari git commit: AMBARI-9756 - Oozie Service Check Fails During Upgrade Due To Incorrect Example Directory (jonathanhurley)
Repository: ambari
Updated Branches:
refs/heads/trunk c903e0f70 - 92b75ea44
AMBARI-9756 - Oozie Service Check Fails During Upgrade Due To Incorrect Example
Directory (jonathanhurley)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/92b75ea4
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/92b75ea4
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/92b75ea4
Branch: refs/heads/trunk
Commit: 92b75ea44e811db7a807e30d97b185178ebacc8c
Parents: c903e0f
Author: Jonathan Hurley jhur...@hortonworks.com
Authored: Mon Feb 23 16:16:28 2015 -0500
Committer: Jonathan Hurley jhur...@hortonworks.com
Committed: Mon Feb 23 21:38:21 2015 -0500
--
.../4.0.0.2.0/package/files/oozieSmoke2.sh | 35 +---
.../OOZIE/4.0.0.2.0/package/scripts/oozie.py| 22
.../OOZIE/4.0.0.2.0/package/scripts/params.py | 4 +--
.../4.0.0.2.0/package/scripts/service_check.py | 21 ++--
.../stacks/2.0.6/OOZIE/test_oozie_server.py | 4 +--
.../stacks/2.0.6/OOZIE/test_service_check.py| 2 +-
6 files changed, 47 insertions(+), 41 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/92b75ea4/ambari-server/src/main/resources/common-services/OOZIE/4.0.0.2.0/package/files/oozieSmoke2.sh
--
diff --git
a/ambari-server/src/main/resources/common-services/OOZIE/4.0.0.2.0/package/files/oozieSmoke2.sh
b/ambari-server/src/main/resources/common-services/OOZIE/4.0.0.2.0/package/files/oozieSmoke2.sh
index bdd4e26..0695701 100644
---
a/ambari-server/src/main/resources/common-services/OOZIE/4.0.0.2.0/package/files/oozieSmoke2.sh
+++
b/ambari-server/src/main/resources/common-services/OOZIE/4.0.0.2.0/package/files/oozieSmoke2.sh
@@ -20,8 +20,16 @@
#
#
-os_family=$1
-shift
+export oozie_lib_dir=$1
+export oozie_conf_dir=$2
+export oozie_bin_dir=$3
+export hadoop_conf_dir=$4
+export hadoop_bin_dir=$5
+export smoke_test_user=$6
+export security_enabled=$7
+export smoke_user_keytab=$8
+export kinit_path_local=$9
+export smokeuser_principal=$10
function getValueFromField {
xmllint $1 | grep name$2/name -C 2 | grep 'value' | cut -d -f2 |
cut -d -f1
@@ -57,32 +65,19 @@ function checkOozieJobStatus {
return $rc
}
-export oozie_conf_dir=$1
-export oozie_bin_dir=$2
-export hadoop_conf_dir=$3
-export hadoop_bin_dir=$4
-export smoke_test_user=$5
-export security_enabled=$6
-export smoke_user_keytab=$7
-export kinit_path_local=$8
-export smokeuser_principal=$9
-
export OOZIE_EXIT_CODE=0
export JOBTRACKER=`getValueFromField ${hadoop_conf_dir}/yarn-site.xml
yarn.resourcemanager.address`
export NAMENODE=`getValueFromField ${hadoop_conf_dir}/core-site.xml
fs.defaultFS`
export OOZIE_SERVER=`getValueFromField ${oozie_conf_dir}/oozie-site.xml
oozie.base.url | tr '[:upper:]' '[:lower:]'`
-if [ $os_family == ubuntu ] ; then
- LIST_PACKAGE_FILES_CMD='dpkg-query -L'
-else
- LIST_PACKAGE_FILES_CMD='rpm -ql'
-fi
-
-
-export OOZIE_EXAMPLES_DIR=`$LIST_PACKAGE_FILES_CMD oozie-client | grep
'oozie-examples.tar.gz$' | xargs dirname`
+# search for the oozie examples JAR and, if found, store the directory name
+export OOZIE_EXAMPLES_DIR=`find ${oozie_lib_dir}/ -name
oozie-examples.tar.gz | xargs dirname`
if [[ -z $OOZIE_EXAMPLES_DIR ]] ; then
export OOZIE_EXAMPLES_DIR='/usr/hdp/current/oozie-client/doc/'
+else
+ echo Located Oozie examples JAR at $OOZIE_EXAMPLES_DIR
fi
+
cd $OOZIE_EXAMPLES_DIR
sudo tar -zxf oozie-examples.tar.gz
http://git-wip-us.apache.org/repos/asf/ambari/blob/92b75ea4/ambari-server/src/main/resources/common-services/OOZIE/4.0.0.2.0/package/scripts/oozie.py
--
diff --git
a/ambari-server/src/main/resources/common-services/OOZIE/4.0.0.2.0/package/scripts/oozie.py
b/ambari-server/src/main/resources/common-services/OOZIE/4.0.0.2.0/package/scripts/oozie.py
index 7d8322c..2065f4a 100644
---
a/ambari-server/src/main/resources/common-services/OOZIE/4.0.0.2.0/package/scripts/oozie.py
+++
b/ambari-server/src/main/resources/common-services/OOZIE/4.0.0.2.0/package/scripts/oozie.py
@@ -19,10 +19,20 @@ limitations under the License.
import os
-from resource_management import *
-
-def oozie(is_server=False # TODO: see if see can remove this
- ):
+from resource_management.core.resources import Directory
+from resource_management.core.resources import File
+from resource_management.core.resources.system import Execute
+from resource_management.core.source import DownloadSource
+from resource_management.core.source import InlineTemplate
+from resource_management.core.source import Template
+from resource_management.libraries.functions import format
+from resource_management.libraries.functions
Git Push Summary
Repository: ambari Updated Branches: refs/heads/branch-2.0.0 [created] 52f34cc7a
ambari git commit: AMBARI-9744. Spark UI: Add descriptions to Spark Default configuration and fix label in Quick links. (Gautam Borad via yusaku)
Repository: ambari Updated Branches: refs/heads/branch-2.0.0 52f34cc7a - 804e18de4 AMBARI-9744. Spark UI: Add descriptions to Spark Default configuration and fix label in Quick links. (Gautam Borad via yusaku) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/804e18de Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/804e18de Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/804e18de Branch: refs/heads/branch-2.0.0 Commit: 804e18de4ab90ce664d1f8434afe73947bf4b17c Parents: 52f34cc Author: Yusaku Sako yus...@hortonworks.com Authored: Mon Feb 23 18:28:08 2015 -0800 Committer: Yusaku Sako yus...@hortonworks.com Committed: Mon Feb 23 18:28:49 2015 -0800 -- .../1.2.0.2.2/configuration/spark-defaults.xml | 52 ambari-web/app/models/quick_links.js| 2 +- 2 files changed, 53 insertions(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/ambari/blob/804e18de/ambari-server/src/main/resources/common-services/SPARK/1.2.0.2.2/configuration/spark-defaults.xml -- diff --git a/ambari-server/src/main/resources/common-services/SPARK/1.2.0.2.2/configuration/spark-defaults.xml b/ambari-server/src/main/resources/common-services/SPARK/1.2.0.2.2/configuration/spark-defaults.xml index 20989b3..2aa2b4e 100644 --- a/ambari-server/src/main/resources/common-services/SPARK/1.2.0.2.2/configuration/spark-defaults.xml +++ b/ambari-server/src/main/resources/common-services/SPARK/1.2.0.2.2/configuration/spark-defaults.xml @@ -24,76 +24,128 @@ property namespark.yarn.executor.memoryOverhead/name value384/value +description + The amount of off heap memory (in megabytes) to be allocated per executor. + This is memory that accounts for things like VM overheads, interned strings, + other native overheads, etc. +/description /property property namespark.yarn.driver.memoryOverhead/name value384/value +description + The amount of off heap memory (in megabytes) to be allocated per driver. + This is memory that accounts for things like VM overheads, interned strings, + other native overheads, etc. +/description /property property namespark.yarn.applicationMaster.waitTries/name value10/value +description + Set the number of times the ApplicationMaster waits for the the Spark master and then + also the number of tries it waits for the SparkContext to be initialized. +/description /property property namespark.yarn.scheduler.heartbeat.interval-ms/name value5000/value +description + The interval in ms in which the Spark application master heartbeats into the YARN ResourceManager. +/description /property property namespark.yarn.max.executor.failures/name value3/value +description + The maximum number of executor failures before failing the application. +/description /property property namespark.yarn.queue/name valuedefault/value +description + The name of the YARN queue to which the application is submitted. +/description /property property namespark.yarn.containerLauncherMaxThreads/name value25/value +description + The maximum number of threads to use in the application master for launching executor containers. +/description /property property namespark.yarn.submit.file.replication/name value3/value +description + HDFS replication level for the files uploaded into HDFS for the application. + These include things like the Spark jar, the app jar, and any distributed cache files/archives. +/description /property property namespark.yarn.preserve.staging.files/name valuefalse/value +description + Set to true to preserve the staged files (Spark jar, app jar, distributed cache files) at the + end of the job rather then delete them. +/description /property property namespark.history.provider/name valueorg.apache.spark.deploy.yarn.history.YarnHistoryProvider/value +description + Name of the class implementing the application history backend which publishes to YARN Application Timeline Service. +/description /property property namespark.history.ui.port/name value18080/value +description + The port to which the web interface of the History Server binds. +/description /property property namespark.driver.extraJavaOptions/name value/value +description + Specifies parameters that are passed to the JVM of the Spark driver. +/description /property property namespark.yarn.am.extraJavaOptions/name
ambari git commit: AMBARI-9744. Spark UI: Add descriptions to Spark Default configuration and fix label in Quick links. (Gautam Borad via yusaku)
Repository: ambari Updated Branches: refs/heads/trunk 52f34cc7a - c903e0f70 AMBARI-9744. Spark UI: Add descriptions to Spark Default configuration and fix label in Quick links. (Gautam Borad via yusaku) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/c903e0f7 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/c903e0f7 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/c903e0f7 Branch: refs/heads/trunk Commit: c903e0f703ac7678b38c75c536cd1a3c0d139eca Parents: 52f34cc Author: Yusaku Sako yus...@hortonworks.com Authored: Mon Feb 23 18:28:08 2015 -0800 Committer: Yusaku Sako yus...@hortonworks.com Committed: Mon Feb 23 18:28:08 2015 -0800 -- .../1.2.0.2.2/configuration/spark-defaults.xml | 52 ambari-web/app/models/quick_links.js| 2 +- 2 files changed, 53 insertions(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/ambari/blob/c903e0f7/ambari-server/src/main/resources/common-services/SPARK/1.2.0.2.2/configuration/spark-defaults.xml -- diff --git a/ambari-server/src/main/resources/common-services/SPARK/1.2.0.2.2/configuration/spark-defaults.xml b/ambari-server/src/main/resources/common-services/SPARK/1.2.0.2.2/configuration/spark-defaults.xml index 20989b3..2aa2b4e 100644 --- a/ambari-server/src/main/resources/common-services/SPARK/1.2.0.2.2/configuration/spark-defaults.xml +++ b/ambari-server/src/main/resources/common-services/SPARK/1.2.0.2.2/configuration/spark-defaults.xml @@ -24,76 +24,128 @@ property namespark.yarn.executor.memoryOverhead/name value384/value +description + The amount of off heap memory (in megabytes) to be allocated per executor. + This is memory that accounts for things like VM overheads, interned strings, + other native overheads, etc. +/description /property property namespark.yarn.driver.memoryOverhead/name value384/value +description + The amount of off heap memory (in megabytes) to be allocated per driver. + This is memory that accounts for things like VM overheads, interned strings, + other native overheads, etc. +/description /property property namespark.yarn.applicationMaster.waitTries/name value10/value +description + Set the number of times the ApplicationMaster waits for the the Spark master and then + also the number of tries it waits for the SparkContext to be initialized. +/description /property property namespark.yarn.scheduler.heartbeat.interval-ms/name value5000/value +description + The interval in ms in which the Spark application master heartbeats into the YARN ResourceManager. +/description /property property namespark.yarn.max.executor.failures/name value3/value +description + The maximum number of executor failures before failing the application. +/description /property property namespark.yarn.queue/name valuedefault/value +description + The name of the YARN queue to which the application is submitted. +/description /property property namespark.yarn.containerLauncherMaxThreads/name value25/value +description + The maximum number of threads to use in the application master for launching executor containers. +/description /property property namespark.yarn.submit.file.replication/name value3/value +description + HDFS replication level for the files uploaded into HDFS for the application. + These include things like the Spark jar, the app jar, and any distributed cache files/archives. +/description /property property namespark.yarn.preserve.staging.files/name valuefalse/value +description + Set to true to preserve the staged files (Spark jar, app jar, distributed cache files) at the + end of the job rather then delete them. +/description /property property namespark.history.provider/name valueorg.apache.spark.deploy.yarn.history.YarnHistoryProvider/value +description + Name of the class implementing the application history backend which publishes to YARN Application Timeline Service. +/description /property property namespark.history.ui.port/name value18080/value +description + The port to which the web interface of the History Server binds. +/description /property property namespark.driver.extraJavaOptions/name value/value +description + Specifies parameters that are passed to the JVM of the Spark driver. +/description /property property namespark.yarn.am.extraJavaOptions/name value/value +
