ambari git commit: AMBARI-11501. AMS HBase does not start after Kerberization in distributed mode. (swagle)
Repository: ambari Updated Branches: refs/heads/trunk 025ca257a - 2bd0014a6 AMBARI-11501. AMS HBase does not start after Kerberization in distributed mode. (swagle) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/2bd0014a Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/2bd0014a Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/2bd0014a Branch: refs/heads/trunk Commit: 2bd0014a66082079a703d7ea2b43d97d7cb132a2 Parents: 025ca25 Author: Siddharth Wagle swa...@hortonworks.com Authored: Thu May 28 15:10:41 2015 -0700 Committer: Siddharth Wagle swa...@hortonworks.com Committed: Thu May 28 15:28:05 2015 -0700 -- .../common-services/AMBARI_METRICS/0.1.0/package/scripts/params.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/ambari/blob/2bd0014a/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/scripts/params.py -- diff --git a/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/scripts/params.py b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/scripts/params.py index 22fb894..47fd2dd 100644 --- a/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/scripts/params.py +++ b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/package/scripts/params.py @@ -176,8 +176,8 @@ else: hbase_env_sh_template = config['configurations']['ams-hbase-env']['content'] ams_env_sh_template = config['configurations']['ams-env']['content'] +hbase_staging_dir = default(/configurations/ams-hbase-site/hbase.bulkload.staging.dir, /amshbase/staging) -hbase_staging_dir = /apps/hbase/staging #for create_hdfs_directory hostname = config[hostname] hdfs_user_keytab = config['configurations']['hadoop-env']['hdfs_user_keytab']
ambari git commit: AMBARI-11433. Multiple perf issues with requests for host components. (mpapirkovskyy)
Repository: ambari
Updated Branches:
refs/heads/trunk 2bd0014a6 - 3d8e9acc9
AMBARI-11433. Multiple perf issues with requests for host components.
(mpapirkovskyy)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/3d8e9acc
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/3d8e9acc
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/3d8e9acc
Branch: refs/heads/trunk
Commit: 3d8e9acc978cdc68dc9e4088fc073be23b7c6961
Parents: 2bd0014
Author: Myroslav Papirkovskyy mpapyrkovs...@hortonworks.com
Authored: Wed May 27 19:23:01 2015 +0300
Committer: Myroslav Papirkovskyy mpapyrkovs...@hortonworks.com
Committed: Fri May 29 01:47:07 2015 +0300
--
.../internal/ComponentResourceProvider.java | 2 +-
.../apache/ambari/server/orm/dao/AlertsDAO.java | 9
.../server/state/ServiceComponentImpl.java | 2 +-
.../apache/ambari/server/state/ServiceImpl.java | 2 +-
.../server/state/cluster/ClusterImpl.java | 24
.../svccomphost/ServiceComponentHostImpl.java | 2 +-
6 files changed, 14 insertions(+), 27 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/3d8e9acc/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ComponentResourceProvider.java
--
diff --git
a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ComponentResourceProvider.java
b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ComponentResourceProvider.java
index 147ab8e..59b5fcf 100644
---
a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ComponentResourceProvider.java
+++
b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ComponentResourceProvider.java
@@ -442,7 +442,7 @@ public class ComponentResourceProvider extends
AbstractControllerResourceProvide
}
// Get the components for the given request.
- private synchronized SetServiceComponentResponse getComponents(
+ private SetServiceComponentResponse getComponents(
ServiceComponentRequest request) throws AmbariException {
if (request.getClusterName() == null
|| request.getClusterName().isEmpty()) {
http://git-wip-us.apache.org/repos/asf/ambari/blob/3d8e9acc/ambari-server/src/main/java/org/apache/ambari/server/orm/dao/AlertsDAO.java
--
diff --git
a/ambari-server/src/main/java/org/apache/ambari/server/orm/dao/AlertsDAO.java
b/ambari-server/src/main/java/org/apache/ambari/server/orm/dao/AlertsDAO.java
index ddfe2ab..c2bca06 100644
---
a/ambari-server/src/main/java/org/apache/ambari/server/orm/dao/AlertsDAO.java
+++
b/ambari-server/src/main/java/org/apache/ambari/server/orm/dao/AlertsDAO.java
@@ -255,8 +255,6 @@ public class AlertsDAO {
typedQuery.setMaxResults(request.Pagination.getPageSize());
}
-typedQuery = setQueryRefreshHint(typedQuery);
-
return daoUtils.selectList(typedQuery);
}
@@ -301,8 +299,6 @@ public class AlertsDAO {
typedQuery.setMaxResults(request.Pagination.getPageSize());
}
-typedQuery = setQueryRefreshHint(typedQuery);
-
return daoUtils.selectList(typedQuery);
}
@@ -358,7 +354,6 @@ public class AlertsDAO {
AlertCurrentEntity.findByDefinitionId, AlertCurrentEntity.class);
query.setParameter(definitionId, Long.valueOf(definitionId));
-query = setQueryRefreshHint(query);
return daoUtils.selectList(query);
}
@@ -375,7 +370,6 @@ public class AlertsDAO {
AlertCurrentEntity.findByCluster, AlertCurrentEntity.class);
query.setParameter(clusterId, Long.valueOf(clusterId));
-query = setQueryRefreshHint(query);
return daoUtils.selectList(query);
}
@@ -502,7 +496,6 @@ public class AlertsDAO {
query.setParameter(serviceName, serviceName);
query.setParameter(inlist, EnumSet.of(Scope.ANY, Scope.SERVICE));
-query = setQueryRefreshHint(query);
return daoUtils.selectList(query);
}
@@ -517,7 +510,6 @@ public class AlertsDAO {
query.setParameter(hostName, hostName);
query.setParameter(definitionName, alertName);
-query = setQueryRefreshHint(query);
return daoUtils.selectOne(query);
}
@@ -778,7 +770,6 @@ public class AlertsDAO {
query.setParameter(clusterId, Long.valueOf(clusterId));
query.setParameter(definitionName, alertName);
-query = setQueryRefreshHint(query);
return daoUtils.selectOne(query);
}
http://git-wip-us.apache.org/repos/asf/ambari/blob/3d8e9acc/ambari-server/src/main/java/org/apache/ambari/server/state/ServiceComponentImpl.java
--
diff --git
ambari git commit: AMBARI-11476. RU from Dal to Dal+ has failures in First Oozie Service Check, then Oozie Server Start, because yarn-site.xml missing from hadoop conf and conf folder is incorrect (al
Repository: ambari
Updated Branches:
refs/heads/trunk db09f15f9 - ce429e750
AMBARI-11476. RU from Dal to Dal+ has failures in First Oozie Service Check,
then Oozie Server Start, because yarn-site.xml missing from hadoop conf and
conf folder is incorrect (alejandro)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/ce429e75
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/ce429e75
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/ce429e75
Branch: refs/heads/trunk
Commit: ce429e75014edfb08ea20dbff3826127ab3a509a
Parents: db09f15
Author: Alejandro Fernandez afernan...@hortonworks.com
Authored: Wed May 27 19:49:11 2015 -0700
Committer: Alejandro Fernandez afernan...@hortonworks.com
Committed: Thu May 28 14:21:07 2015 -0700
--
.../libraries/functions/copy_tarball.py | 24 ++--
.../package/scripts/oozie_server_upgrade.py | 2 +-
.../4.0.0.2.0/package/scripts/service_check.py | 20 ++--
.../stacks/2.0.6/OOZIE/test_service_check.py| 21 +++--
.../stacks/2.0.6/YARN/test_resourcemanager.py | 4 ++--
5 files changed, 52 insertions(+), 19 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/ce429e75/ambari-common/src/main/python/resource_management/libraries/functions/copy_tarball.py
--
diff --git
a/ambari-common/src/main/python/resource_management/libraries/functions/copy_tarball.py
b/ambari-common/src/main/python/resource_management/libraries/functions/copy_tarball.py
index acb1e9f..f8a2570 100644
---
a/ambari-common/src/main/python/resource_management/libraries/functions/copy_tarball.py
+++
b/ambari-common/src/main/python/resource_management/libraries/functions/copy_tarball.py
@@ -31,23 +31,23 @@ STACK_VERSION_PATTERN = {{ stack_version }}
TARBALL_MAP = {
HDP: {
-tez: (/usr/hdp/%s/tez/lib/tez.tar.gz % STACK_VERSION_PATTERN,
- /hdp/apps/%s/tez/tez.tar.gz% STACK_VERSION_PATTERN),
+tez:
(/usr/hdp/{0}/tez/lib/tez.tar.gz.format(STACK_VERSION_PATTERN),
+
/hdp/apps/{0}/tez/tez.tar.gz.format(STACK_VERSION_PATTERN)),
-hive: (/usr/hdp/%s/hive/hive.tar.gz % STACK_VERSION_PATTERN,
- /hdp/apps/%s/hive/hive.tar.gz % STACK_VERSION_PATTERN),
+hive:
(/usr/hdp/{0}/hive/hive.tar.gz.format(STACK_VERSION_PATTERN),
+
/hdp/apps/{0}/hive/hive.tar.gz.format(STACK_VERSION_PATTERN)),
-pig: (/usr/hdp/%s/pig/pig.tar.gz % STACK_VERSION_PATTERN,
- /hdp/apps/%s/pig/pig.tar.gz% STACK_VERSION_PATTERN),
+pig: (/usr/hdp/{0}/pig/pig.tar.gz.format(STACK_VERSION_PATTERN),
+
/hdp/apps/{0}/pig/pig.tar.gz.format(STACK_VERSION_PATTERN)),
-hadoop_streaming: (/usr/hdp/%s/hadoop/hadoop-streaming.jar %
STACK_VERSION_PATTERN,
- /hdp/apps/%s/mapreduce/hadoop-streaming.jar %
STACK_VERSION_PATTERN),
+hadoop_streaming:
(/usr/hdp/{0}/hadoop-mapreduce/hadoop-streaming.jar.format(STACK_VERSION_PATTERN),
+
/hdp/apps/{0}/mapreduce/hadoop-streaming.jar.format(STACK_VERSION_PATTERN)),
-sqoop: (/usr/hdp/%s/sqoop/sqoop.tar.gz % STACK_VERSION_PATTERN,
- /hdp/apps/%s/sqoop/sqoop.tar.gz % STACK_VERSION_PATTERN),
+sqoop:
(/usr/hdp/{0}/sqoop/sqoop.tar.gz.format(STACK_VERSION_PATTERN),
+
/hdp/apps/{0}/sqoop/sqoop.tar.gz.format(STACK_VERSION_PATTERN)),
-mapreduce: (/usr/hdp/%s/hadoop/mapreduce.tar.gz %
STACK_VERSION_PATTERN,
- /hdp/apps/%s/mapreduce/mapreduce.tar.gz %
STACK_VERSION_PATTERN)
+mapreduce:
(/usr/hdp/{0}/hadoop/mapreduce.tar.gz.format(STACK_VERSION_PATTERN),
+
/hdp/apps/{0}/mapreduce/mapreduce.tar.gz.format(STACK_VERSION_PATTERN))
}
}
http://git-wip-us.apache.org/repos/asf/ambari/blob/ce429e75/ambari-server/src/main/resources/common-services/OOZIE/4.0.0.2.0/package/scripts/oozie_server_upgrade.py
--
diff --git
a/ambari-server/src/main/resources/common-services/OOZIE/4.0.0.2.0/package/scripts/oozie_server_upgrade.py
b/ambari-server/src/main/resources/common-services/OOZIE/4.0.0.2.0/package/scripts/oozie_server_upgrade.py
index 47361c4..1afae6a 100644
---
a/ambari-server/src/main/resources/common-services/OOZIE/4.0.0.2.0/package/scripts/oozie_server_upgrade.py
+++
b/ambari-server/src/main/resources/common-services/OOZIE/4.0.0.2.0/package/scripts/oozie_server_upgrade.py
@@ -222,4 +222,4 @@ def _get_directory_mappings():
import params
- return { params.conf_dir : BACKUP_CONF_ARCHIVE }
+ return { params.conf_dir + / : BACKUP_CONF_ARCHIVE } # the
ambari git commit: AMBARI-11511. Update unit and legend name for default widgets. (jaimin)
Repository: ambari
Updated Branches:
refs/heads/trunk 46e2d3e12 - 2975e5108
AMBARI-11511. Update unit and legend name for default widgets. (jaimin)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/2975e510
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/2975e510
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/2975e510
Branch: refs/heads/trunk
Commit: 2975e5108d5d20a136c3815cd552abd1c73c4b04
Parents: 46e2d3e
Author: Jaimin Jetly jai...@hortonworks.com
Authored: Thu May 28 14:47:39 2015 -0700
Committer: Jaimin Jetly jai...@hortonworks.com
Committed: Thu May 28 14:47:46 2015 -0700
--
.../HBASE/0.96.0.2.0/widgets.json | 6 +--
.../common-services/HDFS/2.1.0.2.0/widgets.json | 52 +---
.../YARN/2.1.0.2.0/YARN_metrics.json| 12 +
.../YARN/2.1.0.2.0/YARN_widgets.json| 45 +
.../stacks/HDP/2.3/services/HBASE/widgets.json | 8 ++-
5 files changed, 75 insertions(+), 48 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/2975e510/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/widgets.json
--
diff --git
a/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/widgets.json
b/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/widgets.json
index 3da4fbf..fee81ec 100644
---
a/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/widgets.json
+++
b/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/widgets.json
@@ -54,7 +54,6 @@
}
],
properties: {
-display_unit: Requests,
graph_type: LINE,
time_range: 1
}
@@ -163,7 +162,6 @@
}
],
properties: {
-display_unit: Connections,
graph_type: LINE,
time_range: 1
}
@@ -294,8 +292,8 @@
],
values: [
{
- name: RegionServer widget for CPU utilization,
- value: ${(cpu_system._sum + cpu_user._sum +
cpu_nice._sum)/(cpu_system._sum + cpu_user._sum + cpu_nice._sum + cpu_idle._sum
+ cpu_wio._sum)}
+ name: CPU utilization,
+ value: ${((cpu_system._sum + cpu_user._sum +
cpu_nice._sum)/(cpu_system._sum + cpu_user._sum + cpu_nice._sum + cpu_idle._sum
+ cpu_wio._sum)) * 100}
}
],
properties: {
http://git-wip-us.apache.org/repos/asf/ambari/blob/2975e510/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/widgets.json
--
diff --git
a/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/widgets.json
b/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/widgets.json
index e2fdcb0..5a12381 100644
---
a/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/widgets.json
+++
b/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/widgets.json
@@ -6,7 +6,7 @@
section_name: HDFS_SUMMARY,
widgetLayoutInfo: [
{
- widget_name: NameNode GC,
+ widget_name: NameNode GC count,
description: This widget shows JVM Garbage collection statistics
for Active NameNode,
widget_type: GRAPH,
is_visible: true,
@@ -19,13 +19,6 @@
host_component_criteria:
host_components/metrics/dfs/FSNamesystem/HAState=active
},
{
- name: jvm.JvmMetrics.GcTimeMillisConcurrentMarkSweep,
- metric_path: metrics/jvm/GcTimeMillisConcurrentMarkSweep,
- service_name: HDFS,
- component_name: NAMENODE,
- host_component_criteria:
host_components/metrics/dfs/FSNamesystem/HAState=active
-},
-{
name: jvm.JvmMetrics.GcCountConcurrentMarkSweep,
metric_path: metrics/jvm/GcCountConcurrentMarkSweep,
service_name: HDFS,
@@ -39,16 +32,37 @@
value: ${jvm.JvmMetrics.GcCount}
},
{
- name: GC time in major collection,
- value: ${jvm.JvmMetrics.GcTimeMillisConcurrentMarkSweep}
-},
-{
name: GC count of type major collection,
value: ${jvm.JvmMetrics.GcCountConcurrentMarkSweep}
}
],
properties: {
-display_unit: Requests,
+graph_type: LINE,
+time_range: 1
+ }
+},
+{
+ widget_name: NameNode GC time,
+ description: This widget shows JVM Garbage collection time in
major collection for Active NameNode,
+
ambari git commit: AMBARI-11505. Add logging to ClusterImpl.java processServiceComponentHostEvents() (alejandro)
Repository: ambari
Updated Branches:
refs/heads/trunk ce429e750 - 46e2d3e12
AMBARI-11505. Add logging to ClusterImpl.java
processServiceComponentHostEvents() (alejandro)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/46e2d3e1
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/46e2d3e1
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/46e2d3e1
Branch: refs/heads/trunk
Commit: 46e2d3e129d6876d3706fa234a3aebfc2c38c9e5
Parents: ce429e7
Author: Alejandro Fernandez afernan...@hortonworks.com
Authored: Thu May 28 12:25:24 2015 -0700
Committer: Alejandro Fernandez afernan...@hortonworks.com
Committed: Thu May 28 14:24:33 2015 -0700
--
.../server/actionmanager/ActionScheduler.java| 5 -
.../ambari/server/state/cluster/ClusterImpl.java | 19 +--
.../svccomphost/ServiceComponentHostImpl.java| 2 +-
3 files changed, 22 insertions(+), 4 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/46e2d3e1/ambari-server/src/main/java/org/apache/ambari/server/actionmanager/ActionScheduler.java
--
diff --git
a/ambari-server/src/main/java/org/apache/ambari/server/actionmanager/ActionScheduler.java
b/ambari-server/src/main/java/org/apache/ambari/server/actionmanager/ActionScheduler.java
index 4f51fbc..8ccf622 100644
---
a/ambari-server/src/main/java/org/apache/ambari/server/actionmanager/ActionScheduler.java
+++
b/ambari-server/src/main/java/org/apache/ambari/server/actionmanager/ActionScheduler.java
@@ -342,7 +342,10 @@ class ActionScheduler implements Runnable {
if (cluster != null) {
ListServiceComponentHostEvent failedEvents =
cluster.processServiceComponentHostEvents(eventMap);
-LOG.debug(== {} events failed., failedEvents.size());
+
+if (failedEvents.size() 0) {
+ LOG.error(== {} events failed., failedEvents.size());
+}
for (IteratorExecutionCommand iterator =
commandsToUpdate.iterator(); iterator.hasNext(); ) {
ExecutionCommand cmd = iterator.next();
http://git-wip-us.apache.org/repos/asf/ambari/blob/46e2d3e1/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 0d1bccd..2e45adc 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
@@ -43,6 +43,7 @@ import org.apache.ambari.server.DuplicateResourceException;
import org.apache.ambari.server.ObjectNotFoundException;
import org.apache.ambari.server.ParentObjectNotFoundException;
import org.apache.ambari.server.ServiceComponentHostNotFoundException;
+import org.apache.ambari.server.ServiceComponentNotFoundException;
import org.apache.ambari.server.ServiceNotFoundException;
import org.apache.ambari.server.api.services.AmbariMetaInfo;
import org.apache.ambari.server.configuration.Configuration;
@@ -2454,8 +2455,24 @@ public class ClusterImpl implements Cluster {
ServiceComponent serviceComponent =
service.getServiceComponent(event.getServiceComponentName());
ServiceComponentHost serviceComponentHost =
serviceComponent.getServiceComponentHost(event.getHostName());
serviceComponentHost.handleEvent(event);
+} catch (ServiceNotFoundException e) {
+ LOG.error(String.format(ServiceComponentHost lookup exception.
Service not found for Service: %s. Error: %s,
+ serviceName, e.getMessage()));
+ e.printStackTrace();
+ failedEvents.add(event);
+} catch (ServiceComponentNotFoundException e) {
+ LOG.error(String.format(ServiceComponentHost lookup exception.
Service Component not found for Service: %s, Component: %s. Error: %s,
+ serviceName, event.getServiceComponentName(), e.getMessage()));
+ e.printStackTrace();
+ failedEvents.add(event);
+} catch (ServiceComponentHostNotFoundException e) {
+ LOG.error(String.format(ServiceComponentHost lookup exception.
Service Component Host not found for Service: %s, Component: %s, Host: %s.
Error: %s,
+ serviceName, event.getServiceComponentName(),
event.getHostName(), e.getMessage()));
+ e.printStackTrace();
+ failedEvents.add(event);
} catch (AmbariException e) {
LOG.error(ServiceComponentHost lookup exception , e.getMessage());
+ e.printStackTrace();
ambari git commit: AMBARI-11489 - Views : URLStreamProvider HttpImpersonator do not inject doAs param correctly (tbeerbower)
Repository: ambari
Updated Branches:
refs/heads/trunk 872c62457 - db09f15f9
AMBARI-11489 - Views : URLStreamProvider HttpImpersonator do not inject doAs
param correctly (tbeerbower)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/db09f15f
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/db09f15f
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/db09f15f
Branch: refs/heads/trunk
Commit: db09f15f9eb9ea078c5b457af241fea11c3abed5
Parents: 872c624
Author: tbeerbower tbeerbo...@hortonworks.com
Authored: Thu May 28 16:47:07 2015 -0400
Committer: tbeerbower tbeerbo...@hortonworks.com
Committed: Thu May 28 16:47:21 2015 -0400
--
.../server/view/HttpImpersonatorImpl.java | 50
.../server/view/ViewURLStreamProvider.java | 23 ++--
.../server/view/HttpImpersonatorImplTest.java | 123 ---
.../server/view/ViewURLStreamProviderTest.java | 16 +--
4 files changed, 86 insertions(+), 126 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/db09f15f/ambari-server/src/main/java/org/apache/ambari/server/view/HttpImpersonatorImpl.java
--
diff --git
a/ambari-server/src/main/java/org/apache/ambari/server/view/HttpImpersonatorImpl.java
b/ambari-server/src/main/java/org/apache/ambari/server/view/HttpImpersonatorImpl.java
index 7dd4947..f95c0e7 100644
---
a/ambari-server/src/main/java/org/apache/ambari/server/view/HttpImpersonatorImpl.java
+++
b/ambari-server/src/main/java/org/apache/ambari/server/view/HttpImpersonatorImpl.java
@@ -24,16 +24,15 @@ import org.apache.ambari.server.proxy.ProxyService;
import org.apache.ambari.view.ImpersonatorSetting;
import org.apache.ambari.view.ViewContext;
import org.apache.ambari.view.HttpImpersonator;
+import org.apache.http.client.utils.URIBuilder;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import java.io.BufferedReader;
import java.io.IOException;
import java.io.InputStream;
import java.io.InputStreamReader;
import java.net.HttpURLConnection;
-import java.util.Map;
-import java.util.HashMap;
-import java.util.List;
-import java.util.ArrayList;
/**
@@ -44,25 +43,22 @@ import java.util.ArrayList;
*/
public class HttpImpersonatorImpl implements HttpImpersonator {
private ViewContext context;
- private FactoryHelper helper;
+ private final URLStreamProvider urlStreamProvider;
- /**
- * Helper class that is mocked during unit testing.
- */
- static class FactoryHelper{
-BufferedReader makeBR(InputStreamReader in){
- return new BufferedReader(in);
-}
- }
+ private static Logger LOG =
LoggerFactory.getLogger(HttpImpersonatorImpl.class);
public HttpImpersonatorImpl(ViewContext c) {
this.context = c;
-this.helper = new FactoryHelper();
+
+ComponentSSLConfiguration configuration =
ComponentSSLConfiguration.instance();
+this.urlStreamProvider = new
URLStreamProvider(ProxyService.URL_CONNECT_TIMEOUT,
+ProxyService.URL_READ_TIMEOUT, configuration.getTruststorePath(),
+configuration.getTruststorePassword(),
configuration.getTruststoreType());
}
- public HttpImpersonatorImpl(ViewContext c, FactoryHelper h) {
+ public HttpImpersonatorImpl(ViewContext c, URLStreamProvider
urlStreamProvider) {
this.context = c;
-this.helper = h;
+this.urlStreamProvider = urlStreamProvider;
}
public ViewContext getContext() {
@@ -128,16 +124,14 @@ public class HttpImpersonatorImpl implements
HttpImpersonator {
}
try {
+ String username = impersonatorSetting.getUsername();
+ if (username != null) {
+URIBuilder builder = new URIBuilder(url);
+builder.addParameter(impersonatorSetting.getDoAsParamName(), username);
+url = builder.build().toString();
+ }
- ComponentSSLConfiguration configuration =
ComponentSSLConfiguration.instance();
- URLStreamProvider urlStreamProvider = new
URLStreamProvider(ProxyService.URL_CONNECT_TIMEOUT,
- ProxyService.URL_READ_TIMEOUT, configuration.getTruststorePath(),
- configuration.getTruststorePassword(),
configuration.getTruststoreType());
-
- MapString, ListString headers = new HashMapString, ListString();
- headers.put(impersonatorSetting.getDoAsParamName(), new
ArrayListString() {{add(impersonatorSetting.getUsername()); }} );
-
- HttpURLConnection connection = urlStreamProvider.processURL(url,
requestType, (String) null, headers);
+ HttpURLConnection connection = urlStreamProvider.processURL(url,
requestType, (String) null, null);
int responseCode = connection.getResponseCode();
InputStream resultInputStream;
@@ -147,7 +141,7 @@ public class HttpImpersonatorImpl implements
ambari git commit: AMBARI-11515. Configs: increasing 'Memory allocated for all YARN containers on a node' slightly makes 'Maximum Container Size' go out of range (srimanth)
Repository: ambari
Updated Branches:
refs/heads/trunk 2975e5108 - 025ca257a
AMBARI-11515. Configs: increasing 'Memory allocated for all YARN containers on
a node' slightly makes 'Maximum Container Size' go out of range (srimanth)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/025ca257
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/025ca257
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/025ca257
Branch: refs/heads/trunk
Commit: 025ca257a4598ce05c4e1295a57ffa9cc03fea2b
Parents: 2975e51
Author: Srimanth Gunturi sgunt...@hortonworks.com
Authored: Thu May 28 14:58:48 2015 -0700
Committer: Srimanth Gunturi sgunt...@hortonworks.com
Committed: Thu May 28 14:58:55 2015 -0700
--
.../resources/stacks/HDP/2.2/services/stack_advisor.py| 10 ++
.../resources/stacks/HDPWIN/2.2/services/stack_advisor.py | 10 ++
.../test/python/stacks/2.2/common/test_stack_advisor.py | 10 ++
3 files changed, 30 insertions(+)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/025ca257/ambari-server/src/main/resources/stacks/HDP/2.2/services/stack_advisor.py
--
diff --git
a/ambari-server/src/main/resources/stacks/HDP/2.2/services/stack_advisor.py
b/ambari-server/src/main/resources/stacks/HDP/2.2/services/stack_advisor.py
index 5e78ee9..ec84818 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.2/services/stack_advisor.py
+++ b/ambari-server/src/main/resources/stacks/HDP/2.2/services/stack_advisor.py
@@ -59,6 +59,16 @@ class HDP22StackAdvisor(HDP21StackAdvisor):
putYarnPropertyAttribute('yarn.scheduler.maximum-allocation-vcores',
'maximum',
configurations[yarn-site][properties][yarn.nodemanager.resource.cpu-vcores])
putYarnPropertyAttribute('yarn.scheduler.minimum-allocation-mb',
'maximum',
configurations[yarn-site][properties][yarn.nodemanager.resource.memory-mb])
putYarnPropertyAttribute('yarn.scheduler.maximum-allocation-mb',
'maximum',
configurations[yarn-site][properties][yarn.nodemanager.resource.memory-mb])
+ # Above is the default calculated 'maximum' values derived purely from
hosts.
+ # However, there are 'maximum' and other attributes that actually change
based on the values
+ # of other configs. We need to update those values.
+ if (yarn-site in services[configurations]):
+if (yarn.nodemanager.resource.memory-mb in
services[configurations][yarn-site][properties]):
+ putYarnPropertyAttribute('yarn.scheduler.maximum-allocation-mb',
'maximum',
services[configurations][yarn-site][properties][yarn.nodemanager.resource.memory-mb])
+ putYarnPropertyAttribute('yarn.scheduler.minimum-allocation-mb',
'maximum',
services[configurations][yarn-site][properties][yarn.nodemanager.resource.memory-mb])
+if (yarn.nodemanager.resource.cpu-vcores in
services[configurations][yarn-site][properties]):
+ putYarnPropertyAttribute('yarn.scheduler.maximum-allocation-vcores',
'maximum',
services[configurations][yarn-site][properties][yarn.nodemanager.resource.cpu-vcores])
+ putYarnPropertyAttribute('yarn.scheduler.minimum-allocation-vcores',
'maximum',
services[configurations][yarn-site][properties][yarn.nodemanager.resource.cpu-vcores])
if yarn-env in services[configurations] and yarn_cgroups_enabled
in services[configurations][yarn-env][properties]:
yarn_cgroups_enabled =
services[configurations][yarn-env][properties][yarn_cgroups_enabled].lower()
== true
http://git-wip-us.apache.org/repos/asf/ambari/blob/025ca257/ambari-server/src/main/resources/stacks/HDPWIN/2.2/services/stack_advisor.py
--
diff --git
a/ambari-server/src/main/resources/stacks/HDPWIN/2.2/services/stack_advisor.py
b/ambari-server/src/main/resources/stacks/HDPWIN/2.2/services/stack_advisor.py
index 9ab1470..ce00471 100644
---
a/ambari-server/src/main/resources/stacks/HDPWIN/2.2/services/stack_advisor.py
+++
b/ambari-server/src/main/resources/stacks/HDPWIN/2.2/services/stack_advisor.py
@@ -196,6 +196,16 @@ class HDPWIN22StackAdvisor(HDPWIN21StackAdvisor):
putYarnPropertyAttribute('yarn.scheduler.maximum-allocation-vcores',
'maximum',
configurations[yarn-site][properties][yarn.nodemanager.resource.cpu-vcores])
putYarnPropertyAttribute('yarn.scheduler.minimum-allocation-mb',
'maximum',
configurations[yarn-site][properties][yarn.nodemanager.resource.memory-mb])
putYarnPropertyAttribute('yarn.scheduler.maximum-allocation-mb',
'maximum',
configurations[yarn-site][properties][yarn.nodemanager.resource.memory-mb])
+ # Above is the default calculated 'maximum' values derived purely from
hosts.
+ # However,
ambari git commit: AMBARI-11488. Need to pass JAVA_HOME to credential helper script for KMS (Goutam Borad via smohanty)
Repository: ambari
Updated Branches:
refs/heads/trunk 2cb335c47 - 3cfc2be31
AMBARI-11488. Need to pass JAVA_HOME to credential helper script for KMS
(Goutam Borad via smohanty)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/3cfc2be3
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/3cfc2be3
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/3cfc2be3
Branch: refs/heads/trunk
Commit: 3cfc2be315644e342b301d6144ada4ab012bc55c
Parents: 2cb335c
Author: Sumit Mohanty smoha...@hortonworks.com
Authored: Thu May 28 10:38:42 2015 -0700
Committer: Sumit Mohanty smoha...@hortonworks.com
Committed: Thu May 28 10:38:42 2015 -0700
--
.../RANGER_KMS/0.5.0.2.3/package/scripts/kms.py | 8
1 file changed, 4 insertions(+), 4 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/3cfc2be3/ambari-server/src/main/resources/common-services/RANGER_KMS/0.5.0.2.3/package/scripts/kms.py
--
diff --git
a/ambari-server/src/main/resources/common-services/RANGER_KMS/0.5.0.2.3/package/scripts/kms.py
b/ambari-server/src/main/resources/common-services/RANGER_KMS/0.5.0.2.3/package/scripts/kms.py
index 6fc8c99..9028800 100755
---
a/ambari-server/src/main/resources/common-services/RANGER_KMS/0.5.0.2.3/package/scripts/kms.py
+++
b/ambari-server/src/main/resources/common-services/RANGER_KMS/0.5.0.2.3/package/scripts/kms.py
@@ -101,7 +101,7 @@ def do_keystore_setup(cred_provider_path, credential_alias,
credential_password)
if cred_provider_path is not None:
cred_setup = format('{cred_setup_prefix} -f {cred_provider_path} -k
{credential_alias} -v {credential_password} -c 1')
-Execute(cred_setup, logoutput=True)
+Execute(cred_setup, environment={'JAVA_HOME': params.java_home},
logoutput=True)
File(cred_provider_path,
owner = params.kms_user,
@@ -268,13 +268,13 @@ def enable_kms_plugin():
if params.xa_audit_db_is_enabled:
cred_setup = format('{cred_setup_prefix} -f {credential_file} -k
auditDBCred -v {xa_audit_db_password} -c 1')
- Execute(cred_setup, logoutput=True)
+ Execute(cred_setup, environment={'JAVA_HOME': params.java_home},
logoutput=True)
cred_setup = format('{cred_setup_prefix} -f {credential_file} -k
sslKeyStore -v {ssl_keystore_password} -c 1')
-Execute(cred_setup, logoutput=True)
+Execute(cred_setup, environment={'JAVA_HOME': params.java_home},
logoutput=True)
cred_setup = format('{cred_setup_prefix} -f {credential_file} -k
sslTrustStore -v {ssl_truststore_password} -c 1')
-Execute(cred_setup, logoutput=True)
+Execute(cred_setup, environment={'JAVA_HOME': params.java_home},
logoutput=True)
File(params.credential_file,
owner = params.kms_user,
ambari git commit: AMBARI-11480 - Do not use ranger related configs until Ranger is installed
Repository: ambari Updated Branches: refs/heads/trunk cf4df7e6e - 869709914 AMBARI-11480 - Do not use ranger related configs until Ranger is installed Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/86970991 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/86970991 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/86970991 Branch: refs/heads/trunk Commit: 869709914977e5671cf7207dc5da18fe65bf2ad7 Parents: cf4df7e Author: Artem Baranchuk abaranc...@hortonworks.con Authored: Thu May 28 13:31:04 2015 +0300 Committer: Artem Baranchuk abaranc...@hortonworks.con Committed: Thu May 28 22:25:07 2015 +0300 -- .../0.96.0.2.0/package/scripts/params_linux.py | 3 +- .../0.12.0.2.0/package/scripts/params_linux.py | 5 +- .../2.1.0.2.0/package/scripts/params_linux.py | 135 ++- .../package/scripts/resourcemanager.py | 2 +- 4 files changed, 73 insertions(+), 72 deletions(-) -- http://git-wip-us.apache.org/repos/asf/ambari/blob/86970991/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/package/scripts/params_linux.py -- diff --git a/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/package/scripts/params_linux.py b/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/package/scripts/params_linux.py index ca8ac34..ee95493 100644 --- a/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/package/scripts/params_linux.py +++ b/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/package/scripts/params_linux.py @@ -226,8 +226,9 @@ policy_user = config['configurations']['ranger-hbase-plugin-properties']['policy #For curl command in ranger plugin to get db connector jdk_location = config['hostLevelParams']['jdk_location'] java_share_dir = '/usr/share/java' -enable_ranger_hbase = (config['configurations']['ranger-hbase-plugin-properties']['ranger-hbase-plugin-enabled'].lower() == 'yes') +enable_ranger_hbase = False if has_ranger_admin: + enable_ranger_hbase = (config['configurations']['ranger-hbase-plugin-properties']['ranger-hbase-plugin-enabled'].lower() == 'yes') xa_audit_db_password = unicode(config['configurations']['admin-properties']['audit_db_password']) repo_config_password = unicode(config['configurations']['ranger-hbase-plugin-properties']['REPOSITORY_CONFIG_PASSWORD']) xa_audit_db_flavor = (config['configurations']['admin-properties']['DB_FLAVOR']).lower() http://git-wip-us.apache.org/repos/asf/ambari/blob/86970991/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/params_linux.py -- diff --git a/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/params_linux.py b/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/params_linux.py index 3ee9dc4..6e12dd0 100644 --- a/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/params_linux.py +++ b/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/params_linux.py @@ -393,9 +393,7 @@ HdfsResource = functools.partial( # ranger host ranger_admin_hosts = default(/clusterHostInfo/ranger_admin_hosts, []) has_ranger_admin = not len(ranger_admin_hosts) == 0 -if Script.is_hdp_stack_greater_or_equal(2.2): - enable_ranger_hive = (config['configurations']['ranger-hive-plugin-properties']['ranger-hive-plugin-enabled'].lower() == 'yes') -xml_configurations_supported = config['configurations']['ranger-env']['xml_configurations_supported'] +xml_configurations_supported = config['configurations']['ranger-env']['xml_configurations_supported'] #ranger hive properties policymgr_mgr_url = config['configurations']['admin-properties']['policymgr_external_url'] @@ -419,6 +417,7 @@ if security_enabled: #For curl command in ranger plugin to get db connector if has_ranger_admin: + enable_ranger_hive = (config['configurations']['ranger-hive-plugin-properties']['ranger-hive-plugin-enabled'].lower() == 'yes') repo_config_password = unicode(config['configurations']['ranger-hive-plugin-properties']['REPOSITORY_CONFIG_PASSWORD']) xa_audit_db_flavor = (config['configurations']['admin-properties']['DB_FLAVOR']).lower() http://git-wip-us.apache.org/repos/asf/ambari/blob/86970991/ambari-server/src/main/resources/common-services/YARN/2.1.0.2.0/package/scripts/params_linux.py -- diff --git a/ambari-server/src/main/resources/common-services/YARN/2.1.0.2.0/package/scripts/params_linux.py
ambari git commit: AMBARI-11483. Ranger: Admin RU does not complete for HDP-2.2 - HDP-2.3 (part 2) (ncole)
Repository: ambari Updated Branches: refs/heads/trunk e7e350390 - cf4df7e6e AMBARI-11483. Ranger: Admin RU does not complete for HDP-2.2 - HDP-2.3 (part 2) (ncole) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/cf4df7e6 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/cf4df7e6 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/cf4df7e6 Branch: refs/heads/trunk Commit: cf4df7e6e660e07e2b873590557afecc73abd5fc Parents: e7e3503 Author: Nate Cole nc...@hortonworks.com Authored: Thu May 28 15:19:19 2015 -0400 Committer: Nate Cole nc...@hortonworks.com Committed: Thu May 28 15:19:19 2015 -0400 -- .../src/main/resources/stacks/HDP/2.2/upgrades/upgrade-2.3.xml| 3 --- 1 file changed, 3 deletions(-) -- http://git-wip-us.apache.org/repos/asf/ambari/blob/cf4df7e6/ambari-server/src/main/resources/stacks/HDP/2.2/upgrades/upgrade-2.3.xml -- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.2/upgrades/upgrade-2.3.xml b/ambari-server/src/main/resources/stacks/HDP/2.2/upgrades/upgrade-2.3.xml index 30d31c7..f2ca5a0 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.2/upgrades/upgrade-2.3.xml +++ b/ambari-server/src/main/resources/stacks/HDP/2.2/upgrades/upgrade-2.3.xml @@ -352,9 +352,6 @@ /task task xsi:type=server_action summary=Calculating Ranger Properties class=org.apache.ambari.server.serveraction.upgrades.RangerConfigCalculation / - task xsi:type=manual -messageASDFJASD;LFJKASD;LFJASD;FLKAS/message - /task task xsi:type=configure summary=Updating Ranger Usersync typeranger-ugsync-site/type
ambari git commit: AMBARI-11493. Config filter no longer works (alexantonenko)
Repository: ambari
Updated Branches:
refs/heads/trunk d4ec03f34 - 62bfe93cc
AMBARI-11493. Config filter no longer works (alexantonenko)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/62bfe93c
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/62bfe93c
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/62bfe93c
Branch: refs/heads/trunk
Commit: 62bfe93ccc8cbc3b1f857ff3979df26f59534152
Parents: d4ec03f
Author: Alex Antonenko hiv...@gmail.com
Authored: Thu May 28 21:08:59 2015 +0300
Committer: Alex Antonenko hiv...@gmail.com
Committed: Thu May 28 21:09:40 2015 +0300
--
ambari-web/app/styles/application.less | 1 +
1 file changed, 1 insertion(+)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/62bfe93c/ambari-web/app/styles/application.less
--
diff --git a/ambari-web/app/styles/application.less
b/ambari-web/app/styles/application.less
index 65241eb..710a363 100644
--- a/ambari-web/app/styles/application.less
+++ b/ambari-web/app/styles/application.less
@@ -5304,6 +5304,7 @@ i.icon-asterisks {
-webkit-border-radius: 4px 0 0 4px;
-moz-border-radius: 4px 0 0 4px;
border-radius: 4px 0 0 4px;
+padding-right: 20px;
}
.btn-group{
ambari git commit: AMBARI-11469. The explanation for 'Data per Reducer' could be more clear (Richard Zang via srimanth)
Repository: ambari Updated Branches: refs/heads/trunk 3cfc2be31 - c20d80b65 AMBARI-11469. The explanation for 'Data per Reducer' could be more clear (Richard Zang via srimanth) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/c20d80b6 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/c20d80b6 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/c20d80b6 Branch: refs/heads/trunk Commit: c20d80b658470ea2014b003f1f5b3ac60939f7da Parents: 3cfc2be Author: Srimanth Gunturi sgunt...@hortonworks.com Authored: Thu May 28 10:52:20 2015 -0700 Committer: Srimanth Gunturi sgunt...@hortonworks.com Committed: Thu May 28 10:52:27 2015 -0700 -- .../HDP/2.2.GlusterFS/services/HIVE/configuration/hive-site.xml| 2 +- .../stacks/HDP/2.2/services/HIVE/configuration/hive-site.xml | 2 +- .../stacks/HDPWIN/2.2/services/HIVE/configuration/hive-site.xml| 2 +- .../stacks/HDPWIN/2.3/services/HIVE/configuration/hive-site.xml| 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) -- http://git-wip-us.apache.org/repos/asf/ambari/blob/c20d80b6/ambari-server/src/main/resources/stacks/HDP/2.2.GlusterFS/services/HIVE/configuration/hive-site.xml -- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.2.GlusterFS/services/HIVE/configuration/hive-site.xml b/ambari-server/src/main/resources/stacks/HDP/2.2.GlusterFS/services/HIVE/configuration/hive-site.xml index fb6c0df..88fc999 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.2.GlusterFS/services/HIVE/configuration/hive-site.xml +++ b/ambari-server/src/main/resources/stacks/HDP/2.2.GlusterFS/services/HIVE/configuration/hive-site.xml @@ -159,7 +159,7 @@ limitations under the License. property namehive.exec.reducers.bytes.per.reducer/name value67108864/value -descriptionsize per reducer.The default is 256Mb, i.e if the input size is 1G, it will use 4 reducers./description +descriptionDefines the size per reducer. For example, if it is set to 64M, given 256M input size, 4 reducers will be used./description /property property http://git-wip-us.apache.org/repos/asf/ambari/blob/c20d80b6/ambari-server/src/main/resources/stacks/HDP/2.2/services/HIVE/configuration/hive-site.xml -- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.2/services/HIVE/configuration/hive-site.xml b/ambari-server/src/main/resources/stacks/HDP/2.2/services/HIVE/configuration/hive-site.xml index 34162d6..5e5c64f 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.2/services/HIVE/configuration/hive-site.xml +++ b/ambari-server/src/main/resources/stacks/HDP/2.2/services/HIVE/configuration/hive-site.xml @@ -174,7 +174,7 @@ limitations under the License. property namehive.exec.reducers.bytes.per.reducer/name value67108864/value -descriptionsize per reducer.The default is 256Mb, i.e if the input size is 1G, it will use 4 reducers./description +descriptionDefines the size per reducer. For example, if it is set to 64M, given 256M input size, 4 reducers will be used./description display-nameData per Reducer/display-name value-attributes typeint/type http://git-wip-us.apache.org/repos/asf/ambari/blob/c20d80b6/ambari-server/src/main/resources/stacks/HDPWIN/2.2/services/HIVE/configuration/hive-site.xml -- diff --git a/ambari-server/src/main/resources/stacks/HDPWIN/2.2/services/HIVE/configuration/hive-site.xml b/ambari-server/src/main/resources/stacks/HDPWIN/2.2/services/HIVE/configuration/hive-site.xml index 896268f..e6421ee 100644 --- a/ambari-server/src/main/resources/stacks/HDPWIN/2.2/services/HIVE/configuration/hive-site.xml +++ b/ambari-server/src/main/resources/stacks/HDPWIN/2.2/services/HIVE/configuration/hive-site.xml @@ -174,7 +174,7 @@ limitations under the License. property namehive.exec.reducers.bytes.per.reducer/name value67108864/value -descriptionsize per reducer.The default is 256Mb, i.e if the input size is 1G, it will use 4 reducers./description +descriptionDefines the size per reducer. For example, if it is set to 64M, given 256M input size, 4 reducers will be used./description display-nameData per Reducer/display-name value-attributes typeint/type http://git-wip-us.apache.org/repos/asf/ambari/blob/c20d80b6/ambari-server/src/main/resources/stacks/HDPWIN/2.3/services/HIVE/configuration/hive-site.xml -- diff --git a/ambari-server/src/main/resources/stacks/HDPWIN/2.3/services/HIVE/configuration/hive-site.xml
ambari git commit: AMBARI-11483. Ranger: Admin RU does not complete for HDP-2.2 - HDP-2.3 (ncole)
Repository: ambari Updated Branches: refs/heads/trunk 98586c0ce - e7e350390 AMBARI-11483. Ranger: Admin RU does not complete for HDP-2.2 - HDP-2.3 (ncole) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/e7e35039 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/e7e35039 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/e7e35039 Branch: refs/heads/trunk Commit: e7e350390a85f237e961f143c87953c42c29213e Parents: 98586c0 Author: Nate Cole nc...@hortonworks.com Authored: Thu May 28 10:45:32 2015 -0400 Committer: Nate Cole nc...@hortonworks.com Committed: Thu May 28 15:17:17 2015 -0400 -- .../functions/setup_ranger_plugin_xml.py| 5 +- .../upgrades/RangerConfigCalculation.java | 132 +++ .../0.96.0.2.0/package/scripts/hbase_master.py | 2 +- .../package/scripts/hbase_regionserver.py | 2 +- .../package/scripts/setup_ranger_hbase.py | 13 +- .../2.1.0.2.0/package/scripts/hdfs_namenode.py | 4 +- .../package/scripts/setup_ranger_hdfs.py| 11 +- .../RANGER/0.4.0/package/scripts/params.py | 3 +- .../0.4.0/package/scripts/ranger_admin.py | 7 + .../0.4.0/package/scripts/ranger_service.py | 6 +- .../0.4.0/package/scripts/setup_ranger_xml.py | 68 ++-- .../stacks/HDP/2.2/upgrades/upgrade-2.3.xml | 101 +++ .../upgrades/RangerConfigCalculationTest.java | 166 +++ 13 files changed, 490 insertions(+), 30 deletions(-) -- http://git-wip-us.apache.org/repos/asf/ambari/blob/e7e35039/ambari-common/src/main/python/resource_management/libraries/functions/setup_ranger_plugin_xml.py -- diff --git a/ambari-common/src/main/python/resource_management/libraries/functions/setup_ranger_plugin_xml.py b/ambari-common/src/main/python/resource_management/libraries/functions/setup_ranger_plugin_xml.py index e9ec4f5..cfa51da 100644 --- a/ambari-common/src/main/python/resource_management/libraries/functions/setup_ranger_plugin_xml.py +++ b/ambari-common/src/main/python/resource_management/libraries/functions/setup_ranger_plugin_xml.py @@ -44,7 +44,7 @@ def setup_ranger_plugin(component_select_name, service_name, plugin_policymgr_ssl_properties, plugin_policymgr_ssl_attributes, component_list, audit_db_is_enabled, credential_file, xa_audit_db_password, ssl_truststore_password, -ssl_keystore_password, api_version=None): +ssl_keystore_password, api_version=None, hdp_version_override = None): File(component_downloaded_custom_connector, content = DownloadSource(component_driver_curl_source) @@ -56,6 +56,9 @@ def setup_ranger_plugin(component_select_name, service_name, ) hdp_version = get_hdp_version(component_select_name) + if hdp_version_override is not None: +hdp_version = hdp_version_override + component_conf_dir = conf_dict if plugin_enabled: http://git-wip-us.apache.org/repos/asf/ambari/blob/e7e35039/ambari-server/src/main/java/org/apache/ambari/server/serveraction/upgrades/RangerConfigCalculation.java -- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/serveraction/upgrades/RangerConfigCalculation.java b/ambari-server/src/main/java/org/apache/ambari/server/serveraction/upgrades/RangerConfigCalculation.java new file mode 100644 index 000..ed41c8a --- /dev/null +++ b/ambari-server/src/main/java/org/apache/ambari/server/serveraction/upgrades/RangerConfigCalculation.java @@ -0,0 +1,132 @@ +/** + * 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.server.serveraction.upgrades; + +import java.text.MessageFormat; +import java.util.Map; +import java.util.concurrent.ConcurrentMap; + +import org.apache.ambari.server.AmbariException; +import org.apache.ambari.server.actionmanager.HostRoleStatus; +import
ambari git commit: AMBARI-11498 Perf: Skip calling hostVersionDAO by HostComponentResourceProvider if host_version isn't requested (dsen)
Repository: ambari
Updated Branches:
refs/heads/trunk f81b4f896 - 98586c0ce
AMBARI-11498 Perf: Skip calling hostVersionDAO by HostComponentResourceProvider
if host_version isn't requested (dsen)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/98586c0c
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/98586c0c
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/98586c0c
Branch: refs/heads/trunk
Commit: 98586c0ceccb94092b0f3698361ec3ac7b099eb4
Parents: f81b4f8
Author: Dmytro Sen d...@apache.org
Authored: Thu May 28 22:11:24 2015 +0300
Committer: Dmytro Sen d...@apache.org
Committed: Thu May 28 22:11:24 2015 +0300
--
.../internal/HostComponentResourceProvider.java | 18 ++
.../src/main/resources/META-INF/persistence.xml | 1 -
.../HostComponentResourceProviderTest.java| 8
3 files changed, 14 insertions(+), 13 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/98586c0c/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/HostComponentResourceProvider.java
--
diff --git
a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/HostComponentResourceProvider.java
b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/HostComponentResourceProvider.java
index 818147b..40e3d5f 100644
---
a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/HostComponentResourceProvider.java
+++
b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/HostComponentResourceProvider.java
@@ -101,9 +101,9 @@ public class HostComponentResourceProvider extends
AbstractControllerResourcePro
= PropertyHelper.getPropertyId(HostRoles, desired_admin_state);
protected static final String HOST_COMPONENT_MAINTENANCE_STATE_PROPERTY_ID
= HostRoles/maintenance_state;
- protected static final String HOST_COMPONENT_HDP_VERSION
+ protected static final String HOST_COMPONENT_HDP_VERSION_PROPERTY_ID
= PropertyHelper.getPropertyId(HostRoles, hdp_version);
- protected static final String HOST_COMPONENT_UPGRADE_STATE =
HostRoles/upgrade_state;
+ protected static final String HOST_COMPONENT_UPGRADE_STATE_PROPERTY_ID =
HostRoles/upgrade_state;
//Component name mappings
private final MapString, PropertyProvider
HOST_COMPONENT_PROPERTIES_PROVIDER = new HashMapString, PropertyProvider();
@@ -249,14 +249,16 @@ public class HostComponentResourceProvider extends
AbstractControllerResourcePro
response.getActualConfigs(), requestedIds);
setResourceProperty(resource, HOST_COMPONENT_STALE_CONFIGS_PROPERTY_ID,
response.isStaleConfig(), requestedIds);
- setResourceProperty(resource, HOST_COMPONENT_UPGRADE_STATE,
+ setResourceProperty(resource, HOST_COMPONENT_UPGRADE_STATE_PROPERTY_ID,
response.getUpgradeState(), requestedIds);
- HostVersionEntity versionEntity = hostVersionDAO.
- findByHostAndStateCurrent(response.getClusterName(),
response.getHostname());
- if (versionEntity != null) {
-setResourceProperty(resource, HOST_COMPONENT_HDP_VERSION,
-versionEntity.getRepositoryVersion().getDisplayName(),
requestedIds);
+ if (requestedIds.contains(HOST_COMPONENT_HDP_VERSION_PROPERTY_ID)) {
+HostVersionEntity versionEntity = hostVersionDAO.
+findByHostAndStateCurrent(response.getClusterName(),
response.getHostname());
+if (versionEntity != null) {
+ setResourceProperty(resource, HOST_COMPONENT_HDP_VERSION_PROPERTY_ID,
+ versionEntity.getRepositoryVersion().getDisplayName(),
requestedIds);
+}
}
if (response.getAdminState() != null) {
http://git-wip-us.apache.org/repos/asf/ambari/blob/98586c0c/ambari-server/src/main/resources/META-INF/persistence.xml
--
diff --git a/ambari-server/src/main/resources/META-INF/persistence.xml
b/ambari-server/src/main/resources/META-INF/persistence.xml
index 4b30c0c..deb30bb 100644
--- a/ambari-server/src/main/resources/META-INF/persistence.xml
+++ b/ambari-server/src/main/resources/META-INF/persistence.xml
@@ -63,7 +63,6 @@
classorg.apache.ambari.server.orm.entities.ResourceTypeEntity/class
classorg.apache.ambari.server.orm.entities.RoleSuccessCriteriaEntity/class
classorg.apache.ambari.server.orm.entities.ServiceComponentDesiredStateEntity/class
-
classorg.apache.ambari.server.orm.entities.ServiceConfigApplicationEntity/class
classorg.apache.ambari.server.orm.entities.ServiceConfigEntity/class
classorg.apache.ambari.server.orm.entities.ServiceDesiredStateEntity/class
ambari git commit: AMBARI-11503. JS error thrown on saving raw config value for list-value widget.
Repository: ambari
Updated Branches:
refs/heads/trunk 869709914 - 3af7d0147
AMBARI-11503. JS error thrown on saving raw config value for list-value widget.
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/3af7d014
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/3af7d014
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/3af7d014
Branch: refs/heads/trunk
Commit: 3af7d0147a1ac02948ed547d4b9edfb67758a4cc
Parents: 8697099
Author: Srimanth Gunturi sgunt...@hortonworks.com
Authored: Thu May 28 12:14:52 2015 -0700
Committer: Srimanth Gunturi sgunt...@hortonworks.com
Committed: Thu May 28 12:32:43 2015 -0700
--
.../configs/widgets/list_config_widget_view.js | 41 +++-
1 file changed, 31 insertions(+), 10 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/3af7d014/ambari-web/app/views/common/configs/widgets/list_config_widget_view.js
--
diff --git
a/ambari-web/app/views/common/configs/widgets/list_config_widget_view.js
b/ambari-web/app/views/common/configs/widgets/list_config_widget_view.js
index 41bc203..bc814c5 100644
--- a/ambari-web/app/views/common/configs/widgets/list_config_widget_view.js
+++ b/ambari-web/app/views/common/configs/widgets/list_config_widget_view.js
@@ -120,7 +120,9 @@ App.ListConfigWidgetView = App.ConfigWidgetView.extend({
this._super();
this.addObserver('options.@each.isSelected', this, this.calculateVal);
this.addObserver('options.@each.isSelected', this,
this.checkSelectedItemsCount);
-this.calculateVal();
+if (this.isValueCompatibleWithWidget()) {
+ this.calculateVal();
+}
this.checkSelectedItemsCount();
Em.run.next(function () {
App.tooltip(this.$('[rel=tooltip]'));
@@ -150,20 +152,19 @@ App.ListConfigWidgetView = App.ConfigWidgetView.extend({
* Used on codewillInsertElement/code and when user click on
Undo-button (to restore default value)
* @method calculateInitVal
*/
- calculateInitVal: function () {
+ calculateInitVal: function (configValue) {
var config = this.get('config'),
options = this.get('options'),
- value = config.get('value'),
+ value = configValue || config.get('value'),
self = this,
val = [];
-if (value !== '') {
+if (value !== '' this.isOptionExist(value)) {
if ('string' === Em.typeOf(value)) {
value = value.split(',');
}
options.invoke('setProperties', {isSelected: false, isDisabled: false});
val = value.map(function (v) {
var option = options.findProperty('value', v.trim());
-Em.assert('option with value `%@` is missing for config `%@`'.fmt(v,
config.get('name')), option);
option.setProperties({
order: self.get('orderCounter'),
isSelected: true
@@ -236,7 +237,7 @@ App.ListConfigWidgetView = App.ConfigWidgetView.extend({
*/
restoreValue: function() {
this._super();
-this.calculateInitVal();
+this.setValue(this.get('config.value'));
},
/**
@@ -244,7 +245,7 @@ App.ListConfigWidgetView = App.ConfigWidgetView.extend({
*/
setRecommendedValue: function () {
this._super();
-this.calculateInitVal();
+this.setValue(this.get('config.value'));
},
/**
@@ -264,12 +265,32 @@ App.ListConfigWidgetView = App.ConfigWidgetView.extend({
}
}),
- setValue: function() {
-this.calculateInitVal();
+ setValue: function(value) {
+if (value this.isOptionExist(value)) {
+ this.calculateInitVal(value);
+} else {
+ this.calculateInitVal();
+}
+if (!this.isValueCompatibleWithWidget()
!this.get('config.showAsTextBox')) {
+ this.set('config.showAsTextBox', true);
+}
},
isValueCompatibleWithWidget: function() {
-return this._super() this.get('options').someProperty('value',
this.get('config.value'));
+return this._super() this.isOptionExist(this.get('config.value'));
+ },
+
+ isOptionExist: function(value) {
+var isExist = false;
+if (value !== null value !== undefined) {
+ value = Em.typeOf(value) == 'string' ? value.split(',') : value;
+ value.forEach(function(item) {
+isExist = this.get('options').mapProperty('value').contains(item);
+ }, this);
+ return isExist;
+} else {
+ return false;
+}
}
});
ambari git commit: AMBARI-11472. Namenode Advanced settings - Documentation Improvement - NameNode new generation size (Richard Zang via srimanth)
Repository: ambari Updated Branches: refs/heads/trunk c20d80b65 - d4ec03f34 AMBARI-11472. Namenode Advanced settings - Documentation Improvement - NameNode new generation size (Richard Zang via srimanth) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/d4ec03f3 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/d4ec03f3 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/d4ec03f3 Branch: refs/heads/trunk Commit: d4ec03f345f44ebe01285c7a8cab5188d3048c4c Parents: c20d80b Author: Srimanth Gunturi sgunt...@hortonworks.com Authored: Thu May 28 11:05:06 2015 -0700 Committer: Srimanth Gunturi sgunt...@hortonworks.com Committed: Thu May 28 11:05:06 2015 -0700 -- .../common-services/HDFS/2.1.0.2.0/configuration/hadoop-env.xml| 2 +- .../stacks/HDP/0.2/services/HDFS/configuration/global.xml | 2 +- .../stacks/HDP/0.2/services/HDFS/configuration/hadoop-env.xml | 2 +- .../stacks/HDP/1.3.0/services/HDFS/configuration/global.xml| 2 +- .../stacks/HDP/2.0.1/services/HDFS/configuration/global.xml| 2 +- .../stacks/HDP/2.0.5/services/HDFS/configuration/global.xml| 2 +- .../stacks/HDP/2.0.7/services/HDFS/configuration/global.xml| 2 +- .../HDP/0.2/services/HDFS/configuration/global.xml | 2 +- .../HDP/0.2/services/HDFS/configuration/hadoop-env.xml | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) -- http://git-wip-us.apache.org/repos/asf/ambari/blob/d4ec03f3/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/configuration/hadoop-env.xml -- diff --git a/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/configuration/hadoop-env.xml b/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/configuration/hadoop-env.xml index 52a544f..1b5ddfa 100644 --- a/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/configuration/hadoop-env.xml +++ b/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/configuration/hadoop-env.xml @@ -63,7 +63,7 @@ property namenamenode_opt_newsize/name value200/value -descriptionNameNode new generation size/description +descriptionDefault size of Java new generation for NameNode (Java option -XX:NewSize) Note: The value of NameNode new generation size (default size of Java new generation for NameNode (Java option -XX:NewSize)) should be 1/8 of maximum heap size (-Xmx). Ensure that the value of the namenode_opt_newsize property is 1/8 the value of maximum heap size (-Xmx)./description display-nameNameNode new generation size/display-name depends-on property http://git-wip-us.apache.org/repos/asf/ambari/blob/d4ec03f3/ambari-server/src/test/resources/stacks/HDP/0.2/services/HDFS/configuration/global.xml -- diff --git a/ambari-server/src/test/resources/stacks/HDP/0.2/services/HDFS/configuration/global.xml b/ambari-server/src/test/resources/stacks/HDP/0.2/services/HDFS/configuration/global.xml index 9f4eae5..12f539c 100644 --- a/ambari-server/src/test/resources/stacks/HDP/0.2/services/HDFS/configuration/global.xml +++ b/ambari-server/src/test/resources/stacks/HDP/0.2/services/HDFS/configuration/global.xml @@ -79,7 +79,7 @@ property namenamenode_opt_newsize/name value200/value -descriptionNameNode new generation size/description +descriptionDefault size of Java new generation for NameNode (Java option -XX:NewSize) Note: The value of NameNode new generation size (default size of Java new generation for NameNode (Java option -XX:NewSize)) should be 1/8 of maximum heap size (-Xmx). Ensure that the value of the namenode_opt_newsize property is 1/8 the value of maximum heap size (-Xmx)./description /property property namenamenode_opt_maxnewsize/name http://git-wip-us.apache.org/repos/asf/ambari/blob/d4ec03f3/ambari-server/src/test/resources/stacks/HDP/0.2/services/HDFS/configuration/hadoop-env.xml -- diff --git a/ambari-server/src/test/resources/stacks/HDP/0.2/services/HDFS/configuration/hadoop-env.xml b/ambari-server/src/test/resources/stacks/HDP/0.2/services/HDFS/configuration/hadoop-env.xml index c1359df..b84e820 100644 --- a/ambari-server/src/test/resources/stacks/HDP/0.2/services/HDFS/configuration/hadoop-env.xml +++ b/ambari-server/src/test/resources/stacks/HDP/0.2/services/HDFS/configuration/hadoop-env.xml @@ -44,7 +44,7 @@ property namenamenode_opt_newsize/name value200/value -descriptionNameNode new generation size/description +descriptionDefault size of Java new generation for NameNode (Java option -XX:NewSize) Note: The
ambari git commit: AMBARI-11492. Need to enter configs again, no notification, regarding that your changes will be discarded on going back (alexantonenko)
Repository: ambari
Updated Branches:
refs/heads/trunk 70a59ef09 - 2cb335c47
AMBARI-11492. Need to enter configs again, no notification, regarding that your
changes will be discarded on going back (alexantonenko)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/2cb335c4
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/2cb335c4
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/2cb335c4
Branch: refs/heads/trunk
Commit: 2cb335c47b16c01457ec57c22eb826b739cf2bea
Parents: 70a59ef
Author: Alex Antonenko hiv...@gmail.com
Authored: Thu May 28 20:04:22 2015 +0300
Committer: Alex Antonenko hiv...@gmail.com
Committed: Thu May 28 20:08:18 2015 +0300
--
.../app/controllers/wizard/step7_controller.js | 57 +++-
ambari-web/app/messages.js | 1 +
ambari-web/app/routes/installer.js | 12 -
3 files changed, 67 insertions(+), 3 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/2cb335c4/ambari-web/app/controllers/wizard/step7_controller.js
--
diff --git a/ambari-web/app/controllers/wizard/step7_controller.js
b/ambari-web/app/controllers/wizard/step7_controller.js
index a3297ff..1eda0a6 100644
--- a/ambari-web/app/controllers/wizard/step7_controller.js
+++ b/ambari-web/app/controllers/wizard/step7_controller.js
@@ -37,6 +37,8 @@ App.WizardStep7Controller =
Em.Controller.extend(App.ServerValidatorMixin, App.E
*/
stepConfigs: [],
+ hash: null,
+
selectedService: null,
slaveHostToGroup: null,
@@ -279,6 +281,38 @@ App.WizardStep7Controller =
Em.Controller.extend(App.ServerValidatorMixin, App.E
},
/**
+ * Generate finger-print for current codestepConfigs[0]/code
+ * Used to determine, if user has some unsaved changes (comparing with
codehash/code)
+ * @returns {string|null}
+ * @method getHash
+ */
+ getHash: function () {
+if (!this.get('stepConfigs')[0]) {
+ return null;
+}
+var hash = {};
+this.get('stepConfigs').forEach(function(stepConfig){
+ stepConfig.configs.forEach(function (config) {
+hash[config.get('name')] = {value: config.get('value'), overrides: [],
isFinal: config.get('isFinal')};
+if (!config.get('overrides')) return;
+if (!config.get('overrides.length')) return;
+
+config.get('overrides').forEach(function (override) {
+ hash[config.get('name')].overrides.push(override.get('value'));
+});
+ });
+});
+return JSON.stringify(hash);
+ },
+
+ /**
+ * Are some changes available
+ */
+ hasChanges: function () {
+return this.get('hash') != this.getHash();
+ },
+
+ /**
* Load config groups for installed services
* One ajax-request for each service
* @param {string[]} servicesNames
@@ -657,6 +691,7 @@ App.WizardStep7Controller =
Em.Controller.extend(App.ServerValidatorMixin, App.E
if (self.get('content.skipConfigStep')) {
App.router.send('next');
}
+ self.set('hash', self.getHash());
});
},
@@ -772,7 +807,6 @@ App.WizardStep7Controller =
Em.Controller.extend(App.ServerValidatorMixin, App.E
miscService.configs = c;
}
}
-
this.set('stepConfigs', serviceConfigs);
},
@@ -1310,6 +1344,25 @@ App.WizardStep7Controller =
Em.Controller.extend(App.ServerValidatorMixin, App.E
return deferred;
},
+ showChangesWarningPopup: function(goToNextStep) {
+var self = this;
+return App.ModalPopup.show({
+ header: Em.I18n.t('common.warning'),
+ body: Em.I18n.t('services.service.config.exitChangesPopup.body'),
+ secondary: Em.I18n.t('common.cancel'),
+ primary: Em.I18n.t('yes'),
+ onPrimary: function () {
+if (goToNextStep) {
+ goToNextStep();
+ this.hide();
+}
+ },
+ onSecondary: function () {
+this.hide();
+ }
+});
+ },
+
showDatabaseConnectionWarningPopup: function (serviceNames, deferred) {
var self = this;
return App.ModalPopup.show({
@@ -1326,7 +1379,7 @@ App.WizardStep7Controller =
Em.Controller.extend(App.ServerValidatorMixin, App.E
deferred.reject();
this._super();
}
-})
+});
},
/**
* Proceed to the next step
http://git-wip-us.apache.org/repos/asf/ambari/blob/2cb335c4/ambari-web/app/messages.js
--
diff --git a/ambari-web/app/messages.js b/ambari-web/app/messages.js
index db05786..8548dca 100644
--- a/ambari-web/app/messages.js
+++ b/ambari-web/app/messages.js
@@ -1758,6 +1758,7 @@ Em.I18n.translations = {
'services.service.config.configOverride.head':'Config Override',
[1/3] ambari git commit: AMBARI-11494. Should HDFS ssl-client configs (passwords) have override and undo icons? (alexantonenko)
Repository: ambari
Updated Branches:
refs/heads/trunk 62bfe93cc - f81b4f896
AMBARI-11494. Should HDFS ssl-client configs (passwords) have override and
undo icons? (alexantonenko)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/7dfcbe27
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/7dfcbe27
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/7dfcbe27
Branch: refs/heads/trunk
Commit: 7dfcbe27b2373139f5da2d356d3b584b5b36c730
Parents: 62bfe93
Author: Alex Antonenko hiv...@gmail.com
Authored: Thu May 28 21:14:07 2015 +0300
Committer: Alex Antonenko hiv...@gmail.com
Committed: Thu May 28 21:14:07 2015 +0300
--
.../models/configs/objects/service_config_property.js | 9 +
ambari-web/app/utils/config.js | 2 +-
.../configs/objects/service_config_property_test.js | 12
3 files changed, 14 insertions(+), 9 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/7dfcbe27/ambari-web/app/models/configs/objects/service_config_property.js
--
diff --git a/ambari-web/app/models/configs/objects/service_config_property.js
b/ambari-web/app/models/configs/objects/service_config_property.js
index ad4de55..f7dcd2d 100644
--- a/ambari-web/app/models/configs/objects/service_config_property.js
+++ b/ambari-web/app/models/configs/objects/service_config_property.js
@@ -195,9 +195,6 @@ App.ServiceConfigProperty = Em.Object.extend({
}.property('isUserProperty', 'isOriginalSCP', 'overrides.length'),
init: function () {
-if(this.get(displayType)==password){
- this.set('retypedPassword', this.get('value'));
-}
if ((this.get('id') === 'puppet var') this.get('value') == '') {
if (this.get('savedValue')) {
this.set('value', this.get('savedValue'));
@@ -205,6 +202,10 @@ App.ServiceConfigProperty = Em.Object.extend({
this.set('value', this.get('recommendedValue'));
}
}
+if(this.get(displayType) === password){
+ this.set('retypedPassword', this.get('value'));
+ this.set('recommendedValue', '');
+}
this.set('initialValue', this.get('value'));
},
@@ -271,7 +272,7 @@ App.ServiceConfigProperty = Em.Object.extend({
* @type {boolean}
*/
overrideAvailable: function () {
-return !this.get('isComparison') this.get('isPropertyOverridable');
+return !this.get('isComparison') this.get('isPropertyOverridable')
(this.get('displayType') !== 'password');
}.property('isPropertyOverridable', 'isComparison'),
isValid: function () {
http://git-wip-us.apache.org/repos/asf/ambari/blob/7dfcbe27/ambari-web/app/utils/config.js
--
diff --git a/ambari-web/app/utils/config.js b/ambari-web/app/utils/config.js
index 353168b..32553e8 100644
--- a/ambari-web/app/utils/config.js
+++ b/ambari-web/app/utils/config.js
@@ -320,7 +320,7 @@ App.config = Em.Object.create({
name: index,
value: value,
savedValue: value,
- recommendedValue: advancedConfig ? Em.get(advancedConfig,
'recommencedValue') : null,
+ recommendedValue: advancedConfig ? Em.get(advancedConfig,
'recommendedValue') : null,
filename: filename,
isUserProperty: !advancedConfig,
isVisible: !!service,
http://git-wip-us.apache.org/repos/asf/ambari/blob/7dfcbe27/ambari-web/test/models/configs/objects/service_config_property_test.js
--
diff --git
a/ambari-web/test/models/configs/objects/service_config_property_test.js
b/ambari-web/test/models/configs/objects/service_config_property_test.js
index 5eb8c3e..08f9cb0 100644
--- a/ambari-web/test/models/configs/objects/service_config_property_test.js
+++ b/ambari-web/test/models/configs/objects/service_config_property_test.js
@@ -175,20 +175,24 @@ var serviceConfigProperty,
{
initial: {
displayType: 'password',
-value: 'value'
+value: 'value',
+recommendedValue: 'recommended'
},
result: {
-retypedPassword: 'value'
+retypedPassword: 'value',
+recommendedValue: ''
}
},
{
initial: {
id: 'puppet var',
value: '',
-savedValue: 'default'
+savedValue: 'default',
+recommendedValue: 'recommended'
},
result: {
-value: 'default'
+value: 'default',
+recommendedValue: 'recommended'
}
}
],
[2/3] ambari git commit: AMBARI-11496. No tooltip shown when configuration is in Edit (escape hatch) mode (alexantonenko)
AMBARI-11496. No tooltip shown when configuration is in Edit (escape hatch)
mode (alexantonenko)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/be7aa40d
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/be7aa40d
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/be7aa40d
Branch: refs/heads/trunk
Commit: be7aa40d5fbf267359c29209e66bc03fd184ad12
Parents: 7dfcbe2
Author: Alex Antonenko hiv...@gmail.com
Authored: Thu May 28 21:14:55 2015 +0300
Committer: Alex Antonenko hiv...@gmail.com
Committed: Thu May 28 21:14:55 2015 +0300
--
.../service/configs/widget_popover_support.js| 7 +--
.../common/configs/widgets/controls.hbs | 2 +-
.../configs/widgets/plain_config_text_field.js | 19 ---
3 files changed, 18 insertions(+), 10 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/be7aa40d/ambari-web/app/mixins/main/service/configs/widget_popover_support.js
--
diff --git
a/ambari-web/app/mixins/main/service/configs/widget_popover_support.js
b/ambari-web/app/mixins/main/service/configs/widget_popover_support.js
index ca381ce..3974465 100644
--- a/ambari-web/app/mixins/main/service/configs/widget_popover_support.js
+++ b/ambari-web/app/mixins/main/service/configs/widget_popover_support.js
@@ -48,8 +48,11 @@ App.WidgetPopoverSupport = Em.Mixin.create({
initPopover: function () {
if (this.get('isPopoverEnabled') !== false) {
- var leftPopoverTemplate = 'div class=popover
config-widget-left-popoverdiv class=arrow/divdiv
class=popover-innerh3 class=popover-title/h3div
class=popover-contentp/p/div/div/div';
- App.popover(this.$('.original-widget'), {
+ var leftPopoverTemplate = 'div class=popover
config-widget-left-popoverdiv class=arrow/divdiv
class=popover-innerh3 class=popover-title/h3div
class=popover-contentp/p/div/div/div',
+isWidget = !Em.isEmpty(this.$('.original-widget')),
+popoverSelector = isWidget ? this.$('.original-widget') :
this.$('.input-append');
+
+ App.popover(popoverSelector, {
template: this.get('popoverPlacement') == 'left'? leftPopoverTemplate
: undefined,
title:
Em.I18n.t('installer.controls.serviceConfigPopover.title').format(
this.get('configLabel'),
http://git-wip-us.apache.org/repos/asf/ambari/blob/be7aa40d/ambari-web/app/templates/common/configs/widgets/controls.hbs
--
diff --git a/ambari-web/app/templates/common/configs/widgets/controls.hbs
b/ambari-web/app/templates/common/configs/widgets/controls.hbs
index 4e634cb..da8e1ac 100644
--- a/ambari-web/app/templates/common/configs/widgets/controls.hbs
+++ b/ambari-web/app/templates/common/configs/widgets/controls.hbs
@@ -19,7 +19,7 @@
{{#if view.supportSwitchToCheckBox}}
div {{bindAttr class=view.config.showAsTextBox::hide :left
:widget-config-raw}}
-{{view App.PlainConfigTextField serviceConfigBinding=view.config
disabledBinding=view.canNotEdit}}
+{{view App.PlainConfigTextField sectionBinding=view.section
subSectionBinding=view.subSection configBinding=view.config
disabledBinding=view.canNotEdit}}
/div
{{/if}}
{{#if view.canEdit}}
http://git-wip-us.apache.org/repos/asf/ambari/blob/be7aa40d/ambari-web/app/views/common/configs/widgets/plain_config_text_field.js
--
diff --git
a/ambari-web/app/views/common/configs/widgets/plain_config_text_field.js
b/ambari-web/app/views/common/configs/widgets/plain_config_text_field.js
index 05f3584..e49bba0 100644
--- a/ambari-web/app/views/common/configs/widgets/plain_config_text_field.js
+++ b/ambari-web/app/views/common/configs/widgets/plain_config_text_field.js
@@ -24,15 +24,19 @@
var App = require('app');
require('views/common/controls_view');
-App.PlainConfigTextField = Ember.View.extend(App.SupportsDependentConfigs, {
+App.PlainConfigTextField = Ember.View.extend(App.SupportsDependentConfigs,
App.WidgetPopoverSupport, {
templateName:
require('templates/common/configs/widgets/plain_config_text_field'),
- valueBinding: 'serviceConfig.value',
+ valueBinding: 'config.value',
classNames: ['widget-config-plain-text-field'],
- placeholderBinding: 'serviceConfig.savedValue',
+ placeholderBinding: 'config.savedValue',
+
+ configLabel: function() {
+return this.get('config.stackConfigProperty.displayName') ||
this.get('config.displayName') || this.get('config.name');
+ }.property('config.name', 'config.displayName'),
unit: function() {
-return Em.getWithDefault(this,
'serviceConfig.stackConfigProperty.valueAttributes.unit', false);
-
[3/3] ambari git commit: AMBARI-11497. On HDFS config page Modify Minimum replicated blocks %ge to simply say Minimum replicated blocks % (alexantonenko)
AMBARI-11497. On HDFS config page Modify Minimum replicated blocks %ge to simply say Minimum replicated blocks % (alexantonenko) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/f81b4f89 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/f81b4f89 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/f81b4f89 Branch: refs/heads/trunk Commit: f81b4f8966d14b941d9f503ff386d39f996d9337 Parents: be7aa40 Author: Alex Antonenko hiv...@gmail.com Authored: Thu May 28 21:15:32 2015 +0300 Committer: Alex Antonenko hiv...@gmail.com Committed: Thu May 28 21:15:32 2015 +0300 -- .../common-services/HDFS/2.1.0.2.0/configuration/hdfs-site.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/ambari/blob/f81b4f89/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/configuration/hdfs-site.xml -- diff --git a/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/configuration/hdfs-site.xml b/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/configuration/hdfs-site.xml index 3c4f392..a34d8c0 100644 --- a/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/configuration/hdfs-site.xml +++ b/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/configuration/hdfs-site.xml @@ -174,7 +174,7 @@ Values less than or equal to 0 mean not to start in safe mode. Values greater than 1 will make safe mode permanent. /description -display-nameMinimum replicated blocks %ge/display-name +display-nameMinimum replicated blocks %/display-name value-attributes typefloat/type minimum0.990/minimum
ambari git commit: AMBARI-11518. All Yarn NodeManager widgets not getting displayed. (jaimin)
Repository: ambari
Updated Branches:
refs/heads/trunk 6c0f9acef - 4e7a135ed
AMBARI-11518. All Yarn NodeManager widgets not getting displayed. (jaimin)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/4e7a135e
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/4e7a135e
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/4e7a135e
Branch: refs/heads/trunk
Commit: 4e7a135edf02ee49088b7523b22f1a428511df8f
Parents: 6c0f9ac
Author: Jaimin Jetly jai...@hortonworks.com
Authored: Thu May 28 19:51:19 2015 -0700
Committer: Jaimin Jetly jai...@hortonworks.com
Committed: Thu May 28 19:51:25 2015 -0700
--
.../app/mixins/common/widgets/widget_mixin.js | 44 ++--
ambari-web/app/utils/array_utils.js | 36 +++
.../views/common/widget/graph_widget_view.js| 42 ++--
.../test/mixins/common/widget_mixin_test.js | 102 ++-
4 files changed, 154 insertions(+), 70 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/4e7a135e/ambari-web/app/mixins/common/widgets/widget_mixin.js
--
diff --git a/ambari-web/app/mixins/common/widgets/widget_mixin.js
b/ambari-web/app/mixins/common/widgets/widget_mixin.js
index 264d19f..7fa4936 100644
--- a/ambari-web/app/mixins/common/widgets/widget_mixin.js
+++ b/ambari-web/app/mixins/common/widgets/widget_mixin.js
@@ -21,6 +21,11 @@ var App = require('app');
App.WidgetMixin = Ember.Mixin.create({
/**
+ * type of metric query from which the widget is comprised
+ */
+
+ metricType: 'POINT_IN_TIME',
+ /**
* @type {RegExp}
* @const
*/
@@ -152,9 +157,18 @@ App.WidgetMixin = Ember.Mixin.create({
var requestMetric = $.extend({}, metric);
if (requestsData[key]) {
- requestsData[key][metric_paths].push(requestMetric[metric_path]);
+ requestsData[key][metric_paths].push({
+metric_path: requestMetric[metric_path],
+metric_type: this.get('metricType'),
+id: requestMetric[metric_path] + _ + this.get('metricType'),
+context: this
+ });
} else {
- requestMetric[metric_paths] = [requestMetric[metric_path]];
+ requestMetric[metric_paths] = [{
+metric_path: requestMetric[metric_path],
+metric_type: this.get('metricType'),
+id: requestMetric[metric_path] + _ + this.get('metricType'),
+context: this}];
delete requestMetric[metric_path];
requestsData[key] = requestMetric;
}
@@ -202,12 +216,28 @@ App.WidgetMixin = Ember.Mixin.create({
data: {
serviceName: request.service_name,
componentName: request.component_name,
-metricPaths: request.metric_paths.join(',')
+metricPaths: this.prepareMetricPaths(request.metric_paths)
}
});
},
/**
+ * aggregate all metric names in the query. Add time range and step to
temporal queries
+ */
+ prepareMetricPaths: function(metricPaths) {
+var temporalMetrics = metricPaths.filterProperty('metric_type',
'TEMPORAL');
+var pointInTimeMetrics = metricPaths.filterProperty('metric_type',
'POINT_IN_TIME');
+var result = temporalMetrics.length ?
temporalMetrics[0].context.addTimeProperties(temporalMetrics.mapProperty('metric_path'))
: [];
+
+if (pointInTimeMetrics.length) {
+ result = result.concat(pointInTimeMetrics.mapProperty('metric_path'));
+}
+
+return result.join(',');
+ },
+
+
+ /**
* make GET call to server in order to fetch specific host-component metrics
* @param {object} request
* @returns {$.ajax}
@@ -218,7 +248,7 @@ App.WidgetMixin = Ember.Mixin.create({
sender: this,
data: {
componentName: request.component_name,
-metricPaths: request.metric_paths.join(','),
+metricPaths: this.prepareMetricPaths(request.metric_paths),
hostComponentCriteria: this.computeHostComponentCriteria(request)
}
});
@@ -639,6 +669,8 @@ App.WidgetLoadAggregator = Em.Object.create({
*/
BULK_INTERVAL: 1000,
+ arrayUtils: require('utils/array_utils'),
+
/**
* add request
* every {{BULK_INTERVAL}} requests get collected, aggregated and sent to
server
@@ -699,10 +731,10 @@ App.WidgetLoadAggregator = Em.Object.create({
*/
runRequests: function (requests) {
var bulks = this.groupRequests(requests);
-
+var self = this;
for (var id in bulks) {
(function (_request) {
-_request.data.metric_paths = _request.data.metric_paths.uniq();
+_request.data.metric_paths =
self.arrayUtils.uniqObjectsbyId(_request.data.metric_paths, id);
_request.context[_request.startCallName].call(_request.context,
ambari git commit: AMBARI-11516 - Views : Add URLConnectionProvider interface (tbeerbower)
Repository: ambari
Updated Branches:
refs/heads/trunk c74ebac52 - 6c0f9acef
AMBARI-11516 - Views : Add URLConnectionProvider interface (tbeerbower)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/6c0f9ace
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/6c0f9ace
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/6c0f9ace
Branch: refs/heads/trunk
Commit: 6c0f9acef0f7ada38ebbd59a4fc2a70652050f4c
Parents: c74ebac
Author: tbeerbower tbeerbo...@hortonworks.com
Authored: Thu May 28 21:46:27 2015 -0400
Committer: tbeerbower tbeerbo...@hortonworks.com
Committed: Thu May 28 21:46:37 2015 -0400
--
.../ambari/server/view/ViewContextImpl.java | 7 +
.../server/view/ViewURLStreamProvider.java | 75 +--
.../ambari/server/view/ViewContextImplTest.java | 25
.../server/view/ViewURLStreamProviderTest.java | 81 +++-
ambari-views/pom.xml| 4 +-
.../ambari/view/URLConnectionProvider.java | 130 +++
.../org/apache/ambari/view/ViewContext.java | 7 +
7 files changed, 311 insertions(+), 18 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/6c0f9ace/ambari-server/src/main/java/org/apache/ambari/server/view/ViewContextImpl.java
--
diff --git
a/ambari-server/src/main/java/org/apache/ambari/server/view/ViewContextImpl.java
b/ambari-server/src/main/java/org/apache/ambari/server/view/ViewContextImpl.java
index 9a4aae2..8788346 100644
---
a/ambari-server/src/main/java/org/apache/ambari/server/view/ViewContextImpl.java
+++
b/ambari-server/src/main/java/org/apache/ambari/server/view/ViewContextImpl.java
@@ -38,6 +38,7 @@ import org.apache.ambari.view.Masker;
import org.apache.ambari.view.ResourceProvider;
import org.apache.ambari.view.SecurityException;
import org.apache.ambari.view.SystemException;
+import org.apache.ambari.view.URLConnectionProvider;
import org.apache.ambari.view.ViewContext;
import org.apache.ambari.view.ViewController;
import org.apache.ambari.view.ViewDefinition;
@@ -263,6 +264,12 @@ public class ViewContextImpl implements ViewContext,
ViewController {
}
@Override
+ public URLConnectionProvider getURLConnectionProvider() {
+ensureURLStreamProvider();
+return streamProvider;
+ }
+
+ @Override
public synchronized AmbariStreamProvider getAmbariStreamProvider() {
if (ambariStreamProvider == null) {
ambariStreamProvider = viewRegistry.createAmbariStreamProvider();
http://git-wip-us.apache.org/repos/asf/ambari/blob/6c0f9ace/ambari-server/src/main/java/org/apache/ambari/server/view/ViewURLStreamProvider.java
--
diff --git
a/ambari-server/src/main/java/org/apache/ambari/server/view/ViewURLStreamProvider.java
b/ambari-server/src/main/java/org/apache/ambari/server/view/ViewURLStreamProvider.java
index bb3b8aa..c8ee284 100644
---
a/ambari-server/src/main/java/org/apache/ambari/server/view/ViewURLStreamProvider.java
+++
b/ambari-server/src/main/java/org/apache/ambari/server/view/ViewURLStreamProvider.java
@@ -20,6 +20,7 @@ package org.apache.ambari.server.view;
import org.apache.ambari.server.controller.internal.URLStreamProvider;
import org.apache.ambari.server.proxy.ProxyService;
+import org.apache.ambari.view.URLConnectionProvider;
import org.apache.ambari.view.ViewContext;
import org.apache.commons.io.IOUtils;
@@ -36,7 +37,7 @@ import java.util.Map;
/**
* Wrapper around an internal URL stream provider.
*/
-public class ViewURLStreamProvider implements
org.apache.ambari.view.URLStreamProvider {
+public class ViewURLStreamProvider implements
org.apache.ambari.view.URLStreamProvider, URLConnectionProvider {
/**
* The key for the doAs header.
@@ -87,7 +88,6 @@ public class ViewURLStreamProvider implements
org.apache.ambari.view.URLStreamPr
public InputStream readAs(String spec, String requestMethod, String body,
MapString, String headers,
String userName)
throws IOException {
-
return readFrom(addDoAs(spec, userName), requestMethod, body, headers);
}
@@ -112,6 +112,55 @@ public class ViewURLStreamProvider implements
org.apache.ambari.view.URLStreamPr
return readAs(spec, requestMethod, body, headers,
viewContext.getUsername());
}
+ @Override
+ public HttpURLConnection getConnection(String spec,
+ String requestMethod,
+ String body,
+ MapString, String headers) throws
IOException {
+return getHttpURLConnection(spec, requestMethod, headers, body == null ?
null : body.getBytes());
+ }
+
+
ambari git commit: AMBARI-11500: [WinTP2] Include windows embedded hbase distribution into AMS collector (jluniya)
Repository: ambari
Updated Branches:
refs/heads/trunk 3d8e9acc9 - c74ebac52
AMBARI-11500: [WinTP2] Include windows embedded hbase distribution into AMS
collector (jluniya)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/c74ebac5
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/c74ebac5
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/c74ebac5
Branch: refs/heads/trunk
Commit: c74ebac528eadb0f6b4e0578a1188c60e4f99696
Parents: 3d8e9ac
Author: Jayush Luniya jlun...@hortonworks.com
Authored: Thu May 28 17:19:00 2015 -0700
Committer: Jayush Luniya jlun...@hortonworks.com
Committed: Thu May 28 17:19:00 2015 -0700
--
ambari-metrics/ambari-metrics-assembly/pom.xml | 164 +++
.../src/main/assembly/collector-windows.xml | 8 +
.../ambari-metrics-timelineservice/pom.xml | 115 +
ambari-metrics/pom.xml | 2 +
4 files changed, 197 insertions(+), 92 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/c74ebac5/ambari-metrics/ambari-metrics-assembly/pom.xml
--
diff --git a/ambari-metrics/ambari-metrics-assembly/pom.xml
b/ambari-metrics/ambari-metrics-assembly/pom.xml
index 56e8a38..6359c36 100644
--- a/ambari-metrics/ambari-metrics-assembly/pom.xml
+++ b/ambari-metrics/ambari-metrics-assembly/pom.xml
@@ -136,49 +136,6 @@
/execution
/executions
/plugin
- plugin
-groupIdorg.apache.maven.plugins/groupId
-artifactIdmaven-antrun-plugin/artifactId
-version1.7/version
-executions
- execution
-iddownload-hadoop/id
-phasegenerate-resources/phase
-goals
- goalrun/goal
-/goals
-configuration
- target name=Downloading Hadoop
-mkdir dir=${project.build.directory}/embedded /
-get
- src=${hadoop.tar}
- dest=${project.build.directory}/embedded/hadoop.tar.gz
- usetimestamp=true
- /
-untar
- src=${project.build.directory}/embedded/hadoop.tar.gz
- dest=${project.build.directory}/embedded
- compression=gzip
- /
-!-- Resolving symlinks--
-move
todir=${project.build.directory}/embedded/${hadoop.folder}/lib/native/
- fileset
dir=${project.build.directory}/embedded/${hadoop.folder}/lib/native//
- mapper type=regexp from=libsnappy.so.1.1.*
to=libsnappy.so.1/
-/move
-move
-
file=${project.build.directory}/embedded/${hadoop.folder}/lib/native/libhdfs.so.0.0.0
-
tofile=${project.build.directory}/embedded/${hadoop.folder}/lib/native/libhdfs.so
- /
-move
-
file=${project.build.directory}/embedded/${hadoop.folder}/lib/native/libhadoop.so.1.0.0
-
tofile=${project.build.directory}/embedded/${hadoop.folder}/lib/native/libhadoop.so
- /
-delete
file=${project.build.directory}/embedded/${hadoop.folder}/lib/native/libsnappy.so/
- /target
-/configuration
- /execution
-/executions
- /plugin
/plugins
/build
@@ -870,6 +827,74 @@
/build
/profile
profile
+ idlinux/id
+ activation
+os
+ familyunix/family
+/os
+ /activation
+ properties
+envClassifierlinux/envClassifier
+dirsep//dirsep
+pathsep:/pathsep
+
executable.python${project.basedir}/../ambari-common/src/main/unix/ambari-python-wrap/executable.python
+executable.shellsh/executable.shell
+fileextension.shellsh/fileextension.shell
+fileextension.dot.shell-default/fileextension.dot.shell-default
+
assemblydescriptor.collectorsrc/main/assembly/collector.xml/assemblydescriptor.collector
+
assemblydescriptor.monitorsrc/main/assembly/monitor.xml/assemblydescriptor.monitor
+
assemblydescriptor.sinksrc/main/assembly/sink.xml/assemblydescriptor.sink
+packagingFormatjar/packagingFormat
+ /properties
+ build
+plugins
+ plugin
+groupIdorg.apache.maven.plugins/groupId
+artifactIdmaven-antrun-plugin/artifactId
+version1.7/version
+executions
+ execution
+iddownload-hadoop/id
+phasegenerate-resources/phase
+goals
+ goalrun/goal
+/goals
+configuration
+ target
ambari git commit: AMBARI-11299 - Ambari stack changes for Ranger Kafka Plugin (Gautam Borad via jluniya)
Repository: ambari
Updated Branches:
refs/heads/trunk 8dd29ced1 - 46444b148
AMBARI-11299 - Ambari stack changes for Ranger Kafka Plugin (Gautam Borad via
jluniya)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/46444b14
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/46444b14
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/46444b14
Branch: refs/heads/trunk
Commit: 46444b14883a02e1618f4572b81b091a0f2aa7fc
Parents: 8dd29ce
Author: Jayush Luniya jlun...@hortonworks.com
Authored: Wed May 27 23:48:58 2015 -0700
Committer: Jayush Luniya jlun...@hortonworks.com
Committed: Wed May 27 23:48:58 2015 -0700
--
.../KAFKA/0.8.1.2.2/configuration/kafka-env.xml | 4 +
.../KAFKA/0.8.1.2.2/metainfo.xml| 4 +
.../0.8.1.2.2/package/scripts/kafka_broker.py | 3 +
.../KAFKA/0.8.1.2.2/package/scripts/params.py | 89 +++
.../package/scripts/setup_ranger_kafka.py | 41 +++
.../services/KAFKA/configuration/kafka-env.xml | 28 +
.../KAFKA/configuration/ranger-kafka-audit.xml | 113 +++
.../ranger-kafka-plugin-properties.xml | 66 +++
.../ranger-kafka-policymgr-ssl.xml | 59 ++
.../configuration/ranger-kafka-security.xml | 59 ++
ambari-web/app/data/HDP2.3/site_properties.js | 11 ++
11 files changed, 477 insertions(+)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/46444b14/ambari-server/src/main/resources/common-services/KAFKA/0.8.1.2.2/configuration/kafka-env.xml
--
diff --git
a/ambari-server/src/main/resources/common-services/KAFKA/0.8.1.2.2/configuration/kafka-env.xml
b/ambari-server/src/main/resources/common-services/KAFKA/0.8.1.2.2/configuration/kafka-env.xml
index ad7689e..362d316 100644
---
a/ambari-server/src/main/resources/common-services/KAFKA/0.8.1.2.2/configuration/kafka-env.xml
+++
b/ambari-server/src/main/resources/common-services/KAFKA/0.8.1.2.2/configuration/kafka-env.xml
@@ -60,4 +60,8 @@ if [ -e
/usr/lib/ambari-metrics-kafka-sink/ambari-metrics-kafka-sink.jar ]; th
fi
/value
/property
+ property
+nameis_supported_kafka_ranger/name
+valueFalse/value
+ /property
/configuration
http://git-wip-us.apache.org/repos/asf/ambari/blob/46444b14/ambari-server/src/main/resources/common-services/KAFKA/0.8.1.2.2/metainfo.xml
--
diff --git
a/ambari-server/src/main/resources/common-services/KAFKA/0.8.1.2.2/metainfo.xml
b/ambari-server/src/main/resources/common-services/KAFKA/0.8.1.2.2/metainfo.xml
index 5798b9e..bf5f51d 100644
---
a/ambari-server/src/main/resources/common-services/KAFKA/0.8.1.2.2/metainfo.xml
+++
b/ambari-server/src/main/resources/common-services/KAFKA/0.8.1.2.2/metainfo.xml
@@ -76,6 +76,10 @@
config-typekafka-broker/config-type
config-typekafka-env/config-type
config-typekafka-log4j/config-type
+config-typeranger-kafka-plugin-properties/config-type
+config-typeranger-kafka-audit/config-type
+config-typeranger-kafka-policymgr-ssl/config-type
+config-typeranger-kafka-security/config-type
/configuration-dependencies
restartRequiredAfterChangetrue/restartRequiredAfterChange
/service
http://git-wip-us.apache.org/repos/asf/ambari/blob/46444b14/ambari-server/src/main/resources/common-services/KAFKA/0.8.1.2.2/package/scripts/kafka_broker.py
--
diff --git
a/ambari-server/src/main/resources/common-services/KAFKA/0.8.1.2.2/package/scripts/kafka_broker.py
b/ambari-server/src/main/resources/common-services/KAFKA/0.8.1.2.2/package/scripts/kafka_broker.py
index 1b36f28..dd210b7 100644
---
a/ambari-server/src/main/resources/common-services/KAFKA/0.8.1.2.2/package/scripts/kafka_broker.py
+++
b/ambari-server/src/main/resources/common-services/KAFKA/0.8.1.2.2/package/scripts/kafka_broker.py
@@ -22,6 +22,7 @@ import sys
import upgrade
from kafka import kafka
+from setup_ranger_kafka import setup_ranger_kafka
class KafkaBroker(Script):
@@ -46,6 +47,8 @@ class KafkaBroker(Script):
import params
env.set_params(params)
self.configure(env)
+if params.is_supported_kafka_ranger:
+ setup_ranger_kafka() #Ranger Kafka Plugin related call
daemon_cmd = format('source {params.conf_dir}/kafka-env.sh ;
{params.kafka_bin} start')
no_op_test = format('ls {params.kafka_pid_file} /dev/null 21 ps -p
`cat {params.kafka_pid_file}` /dev/null 21')
Execute(daemon_cmd,
http://git-wip-us.apache.org/repos/asf/ambari/blob/46444b14/ambari-server/src/main/resources/common-services/KAFKA/0.8.1.2.2/package/scripts/params.py
ambari git commit: AMBARI-11426 Property enhancements and other fixes for Ranger (Gautam Borad via jluniya)
Repository: ambari
Updated Branches:
refs/heads/trunk 46444b148 - 8211d82c1
AMBARI-11426 Property enhancements and other fixes for Ranger (Gautam Borad via
jluniya)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/8211d82c
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/8211d82c
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/8211d82c
Branch: refs/heads/trunk
Commit: 8211d82c1152ff6e35cc2273ad763c3aecee40d3
Parents: 46444b1
Author: Jayush Luniya jlun...@hortonworks.com
Authored: Thu May 28 00:26:10 2015 -0700
Committer: Jayush Luniya jlun...@hortonworks.com
Committed: Thu May 28 00:26:10 2015 -0700
--
.../libraries/functions/ranger_functions.py | 2 +-
.../libraries/functions/ranger_functions_v2.py | 2 +-
.../HBASE/0.96.0.2.0/metainfo.xml | 3 ++
.../common-services/HDFS/2.1.0.2.0/metainfo.xml | 3 ++
.../HIVE/0.12.0.2.0/metainfo.xml| 3 ++
.../ranger-knox-plugin-properties.xml | 2 +-
.../common-services/KNOX/0.5.0.2.2/metainfo.xml | 3 ++
.../0.4.0/configuration/usersync-properties.xml | 2 +-
.../0.4.0/package/scripts/setup_ranger_xml.py | 5 ++
.../STORM/0.9.1.2.1/metainfo.xml| 3 ++
.../common-services/YARN/2.1.0.2.0/metainfo.xml | 4 ++
.../ranger-hbase-plugin-properties.xml | 2 +-
.../ranger-hdfs-plugin-properties.xml | 2 +-
.../ranger-hive-plugin-properties.xml | 2 +-
.../ranger-storm-plugin-properties.xml | 2 +-
.../HBASE/configuration/ranger-hbase-audit.xml | 2 +-
.../HDFS/configuration/ranger-hdfs-audit.xml| 2 +-
.../HIVE/configuration/ranger-hive-audit.xml| 2 +-
.../KNOX/configuration/ranger-knox-audit.xml| 2 +-
.../KNOX/configuration/ranger-knox-security.xml | 2 +-
.../RANGER/configuration/ranger-ugsync-site.xml | 2 +-
.../STORM/configuration/ranger-storm-audit.xml | 2 +-
.../YARN/configuration/ranger-yarn-audit.xml| 2 +-
.../ranger-yarn-plugin-properties.xml | 2 +-
ambari-web/app/data/HDP2.2/site_properties.js | 54
ambari-web/app/data/HDP2.3/site_properties.js | 18 +++
26 files changed, 113 insertions(+), 17 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/8211d82c/ambari-common/src/main/python/resource_management/libraries/functions/ranger_functions.py
--
diff --git
a/ambari-common/src/main/python/resource_management/libraries/functions/ranger_functions.py
b/ambari-common/src/main/python/resource_management/libraries/functions/ranger_functions.py
index 63e5df1..eab01ad 100644
---
a/ambari-common/src/main/python/resource_management/libraries/functions/ranger_functions.py
+++
b/ambari-common/src/main/python/resource_management/libraries/functions/ranger_functions.py
@@ -258,7 +258,7 @@ class Rangeradmin:
def create_ambari_admin_user(self,ambari_admin_username,
ambari_admin_password,usernamepassword):
try:
- url = self.urlUsers + '?startIndex=0'
+ url = self.urlUsers + '?name=' + str(ambari_admin_username)
request = urllib2.Request(url)
base64string = base64.encodestring(usernamepassword).replace('\n', '')
request.add_header(Content-Type, application/json)
http://git-wip-us.apache.org/repos/asf/ambari/blob/8211d82c/ambari-common/src/main/python/resource_management/libraries/functions/ranger_functions_v2.py
--
diff --git
a/ambari-common/src/main/python/resource_management/libraries/functions/ranger_functions_v2.py
b/ambari-common/src/main/python/resource_management/libraries/functions/ranger_functions_v2.py
index da05773..b6be4c2 100644
---
a/ambari-common/src/main/python/resource_management/libraries/functions/ranger_functions_v2.py
+++
b/ambari-common/src/main/python/resource_management/libraries/functions/ranger_functions_v2.py
@@ -178,7 +178,7 @@ class RangeradminV2:
:return: Returns user credentials if user exist otherwise rerutns
credentials of created user.
try:
- url = self.url_users + '?startIndex=0'
+ url = self.url_users + '?name=' + str(ambari_admin_username)
request = urllib2.Request(url)
base_64_string = base64.encodestring(usernamepassword).replace('\n', '')
request.add_header(Content-Type, application/json)
http://git-wip-us.apache.org/repos/asf/ambari/blob/8211d82c/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/metainfo.xml
--
diff --git
a/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/metainfo.xml
b/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/metainfo.xml
index
[2/2] ambari git commit: AMBARI-11479. Last version does not has restart icon on configs page (akovalenko)
AMBARI-11479. Last version does not has restart icon on configs page
(akovalenko)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/283ec21e
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/283ec21e
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/283ec21e
Branch: refs/heads/trunk
Commit: 283ec21ec3946713124a098e3a42a41cf7e110f0
Parents: da02aee
Author: Aleksandr Kovalenko akovale...@hortonworks.com
Authored: Thu May 28 14:01:23 2015 +0300
Committer: Aleksandr Kovalenko akovale...@hortonworks.com
Committed: Thu May 28 14:01:23 2015 +0300
--
ambari-web/app/templates/common/configs/service_version_box.hbs | 1 +
1 file changed, 1 insertion(+)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/283ec21e/ambari-web/app/templates/common/configs/service_version_box.hbs
--
diff --git a/ambari-web/app/templates/common/configs/service_version_box.hbs
b/ambari-web/app/templates/common/configs/service_version_box.hbs
index f2c769e..5177c8f 100644
--- a/ambari-web/app/templates/common/configs/service_version_box.hbs
+++ b/ambari-web/app/templates/common/configs/service_version_box.hbs
@@ -29,6 +29,7 @@
{{#if serviceVersion.isCurrent}}
div class=current-label
span class=label label-success label-current icon-ok
data-toggle=tooltip {{translateAttr title=common.current}}
+i {{bindAttr class=:icon-refresh :restart-required-service
serviceVersion.isRestartRequired::hidden}}/i
/span
/div
{{/if}}
[1/2] ambari git commit: AMBARI-11478. Configs saving popup is displayed if user navigates away before configs are loaded (akovalenko)
Repository: ambari
Updated Branches:
refs/heads/trunk da826636c - 283ec21ec
AMBARI-11478. Configs saving popup is displayed if user navigates away before
configs are loaded (akovalenko)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/da02aeef
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/da02aeef
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/da02aeef
Branch: refs/heads/trunk
Commit: da02aeef78008ed82b67132c1e3c4843883acff7
Parents: da82663
Author: Aleksandr Kovalenko akovale...@hortonworks.com
Authored: Thu May 28 13:58:53 2015 +0300
Committer: Aleksandr Kovalenko akovale...@hortonworks.com
Committed: Thu May 28 13:58:53 2015 +0300
--
.../app/mixins/common/configs/configs_saver.js | 2 +-
.../main/service/info/config_test.js| 31 +++-
2 files changed, 24 insertions(+), 9 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/da02aeef/ambari-web/app/mixins/common/configs/configs_saver.js
--
diff --git a/ambari-web/app/mixins/common/configs/configs_saver.js
b/ambari-web/app/mixins/common/configs/configs_saver.js
index 7b2af7a..4626c15 100644
--- a/ambari-web/app/mixins/common/configs/configs_saver.js
+++ b/ambari-web/app/mixins/common/configs/configs_saver.js
@@ -156,7 +156,7 @@ App.ConfigsSaverMixin = Em.Mixin.create({
* @method hasUnsavedChanges
*/
hasUnsavedChanges: function () {
-return this.get('hash') != this.getHash();
+return !Em.isNone(this.get('hash')) this.get('hash') != this.getHash();
},
/*** 1. PRE SAVE CHECKS
/
http://git-wip-us.apache.org/repos/asf/ambari/blob/da02aeef/ambari-web/test/controllers/main/service/info/config_test.js
--
diff --git a/ambari-web/test/controllers/main/service/info/config_test.js
b/ambari-web/test/controllers/main/service/info/config_test.js
index b895ed6..0fedc6d 100644
--- a/ambari-web/test/controllers/main/service/info/config_test.js
+++ b/ambari-web/test/controllers/main/service/info/config_test.js
@@ -148,6 +148,24 @@ describe(App.MainServiceInfoConfigsController, function
() {
});
describe(#hasUnsavedChanges, function () {
+var cases = [
+ {
+hash: null,
+hasUnsavedChanges: false,
+title: 'configs not rendered'
+ },
+ {
+hash: 'hash1',
+hasUnsavedChanges: true,
+title: 'with unsaved'
+ },
+ {
+hash: 'hash',
+hasUnsavedChanges: false,
+title: 'without unsaved'
+ }
+];
+
beforeEach(function () {
sinon.stub(mainServiceInfoConfigsController, getHash, function () {
return hash
@@ -157,14 +175,11 @@ describe(App.MainServiceInfoConfigsController, function
() {
mainServiceInfoConfigsController.getHash.restore();
});
-it(with unsaved, function () {
- mainServiceInfoConfigsController.set(hash, hash1);
-
expect(mainServiceInfoConfigsController.hasUnsavedChanges()).to.equal(true);
-});
-
-it(without unsaved, function () {
- mainServiceInfoConfigsController.set(hash, hash);
-
expect(mainServiceInfoConfigsController.hasUnsavedChanges()).to.equal(false);
+cases.forEach(function (item) {
+ it(item.title, function () {
+mainServiceInfoConfigsController.set('hash', item.hash);
+
expect(mainServiceInfoConfigsController.hasUnsavedChanges()).to.equal(item.hasUnsavedChanges);
+ });
});
});
ambari git commit: AMBARI-11482. Configs: compare versions not working (onechiporenko)
Repository: ambari
Updated Branches:
refs/heads/trunk 283ec21ec - 8775fe29c
AMBARI-11482. Configs: compare versions not working (onechiporenko)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/8775fe29
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/8775fe29
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/8775fe29
Branch: refs/heads/trunk
Commit: 8775fe29cd931e588df009a3ff25e77fc9aed40a
Parents: 283ec21
Author: Oleg Nechiporenko onechipore...@apache.org
Authored: Thu May 28 16:09:06 2015 +0300
Committer: Oleg Nechiporenko onechipore...@apache.org
Committed: Thu May 28 16:09:06 2015 +0300
--
.../controllers/main/service/info/configs.js| 16 +-
.../views/common/configs/service_config_view.js | 68 +++-
.../configs/service_configs_by_category_view.js | 83 ++---
.../app/views/common/filter_combo_cleanable.js | 7 +-
.../service_config_container_view_test.js | 13 +-
.../common/configs/service_config_view_test.js | 6 +-
.../service_configs_by_category_view_test.js| 347 +--
ambari-web/test/views/main/menu_test.js | 26 --
8 files changed, 210 insertions(+), 356 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/8775fe29/ambari-web/app/controllers/main/service/info/configs.js
--
diff --git a/ambari-web/app/controllers/main/service/info/configs.js
b/ambari-web/app/controllers/main/service/info/configs.js
index 1a5c39d..8e6386d 100644
--- a/ambari-web/app/controllers/main/service/info/configs.js
+++ b/ambari-web/app/controllers/main/service/info/configs.js
@@ -495,8 +495,10 @@ App.MainServiceInfoConfigsController =
Em.Controller.extend(App.ServerValidatorM
this.getCompareVersionConfigs(compareServiceVersions).done(function
(json) {
self.initCompareConfig(allConfigs, json);
-self.set('compareServiceVersion', null);
-self.set('isCompareMode', true);
+self.setProperties({
+ compareServiceVersion: null,
+ isCompareMode: true
+});
dfd.resolve(true);
}).fail(function () {
self.set('compareServiceVersion', null);
@@ -655,9 +657,11 @@ App.MainServiceInfoConfigsController =
Em.Controller.extend(App.ServerValidatorM
}
compareObject.serviceVersion =
App.ServiceConfigVersion.find(this.get('content.serviceName') + _ +
compareConfig.service_config_version);
compareObject = App.ServiceConfigProperty.create(compareObject);
- compareObject.set('isFinal', compareConfig.isFinal);
- compareObject.set('value', App.config.formatOverrideValue(serviceConfig,
compareConfig.value));
- compareObject.set('compareConfigs', null);
+ compareObject.setProperties({
+isFinal: compareConfig.isFinal,
+value: App.config.formatOverrideValue(serviceConfig,
compareConfig.value),
+compareConfigs: null
+ });
}
return compareObject;
},
@@ -688,7 +692,7 @@ App.MainServiceInfoConfigsController =
Em.Controller.extend(App.ServerValidatorM
},
/**
- * check value and final attribute of original and compare config for
differencies
+ * check value and final attribute of original and compare config for
differences
* @param originalConfig
* @param compareConfig
* @return {Boolean}
http://git-wip-us.apache.org/repos/asf/ambari/blob/8775fe29/ambari-web/app/views/common/configs/service_config_view.js
--
diff --git a/ambari-web/app/views/common/configs/service_config_view.js
b/ambari-web/app/views/common/configs/service_config_view.js
index a616df7..c9da165 100644
--- a/ambari-web/app/views/common/configs/service_config_view.js
+++ b/ambari-web/app/views/common/configs/service_config_view.js
@@ -19,12 +19,27 @@
var App = require('app');
App.ServiceConfigView = Em.View.extend({
+
templateName: require('templates/common/configs/service_config'),
+
isRestartMessageCollapsed: false,
- filter: '', //from template
- columns: [], //from template
+
+ /**
+ * Bound from parent view in the template
+ * @type {string}
+ */
+ filter: '',
+
+ /**
+ * Bound from parent view in the template
+ * @type {object[]}
+ */
+ columns: [],
+
propertyFilterPopover:
[Em.I18n.t('services.service.config.propertyFilterPopover.title'),
Em.I18n.t('services.service.config.propertyFilterPopover.content')],
+
canEdit: true, // View is editable or read-only?
+
supportsHostOverrides: function () {
switch (this.get('controller.name')) {
case 'wizardStep7Controller':
@@ -37,6 +52,10 @@ App.ServiceConfigView = Em.View.extend({
}
}.property('controller.name', 'controller.selectedService'),
+ /**
+ *
ambari git commit: AMBARI-11441. Provide better error message from BlueprintConfigurationProcessor when unable to match a property component token to a host group
Repository: ambari
Updated Branches:
refs/heads/trunk 087d9003e - b20dbb7fa
AMBARI-11441. Provide better error message from
BlueprintConfigurationProcessor when unable
to match a property component token to a host group
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/b20dbb7f
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/b20dbb7f
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/b20dbb7f
Branch: refs/heads/trunk
Commit: b20dbb7fae7fc029f353f4eddf280c5f53878421
Parents: 087d900
Author: John Speidel jspei...@hortonworks.com
Authored: Wed May 27 15:37:15 2015 -0400
Committer: John Speidel jspei...@hortonworks.com
Committed: Thu May 28 10:22:42 2015 -0400
--
.../BlueprintConfigurationProcessor.java| 142 +++
.../BlueprintConfigurationProcessorTest.java| 74 +-
2 files changed, 123 insertions(+), 93 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/b20dbb7f/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 a84bf3d..6fb4807 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
@@ -139,7 +139,7 @@ public class BlueprintConfigurationProcessor {
MapString, String typeMap = clusterProps.get(type);
if (typeMap != null typeMap.containsKey(propertyName)) {
requiredHostGroups.addAll(updater.getRequiredHostGroups(
-typeMap.get(propertyName), clusterProps, clusterTopology));
+propertyName, typeMap.get(propertyName), clusterProps,
clusterTopology));
}
// host group configs
@@ -148,7 +148,7 @@ public class BlueprintConfigurationProcessor {
MapString, String hgTypeMap = hgConfigProps.get(type);
if (hgTypeMap != null hgTypeMap.containsKey(propertyName)) {
requiredHostGroups.addAll(updater.getRequiredHostGroups(
- hgTypeMap.get(propertyName), hgConfigProps,
clusterTopology));
+ propertyName, hgTypeMap.get(propertyName), hgConfigProps,
clusterTopology));
}
}
}
@@ -857,7 +857,7 @@ public class BlueprintConfigurationProcessor {
/**
* Update a property value.
*
- * @param propertyNamename of
+ * @param propertyNameproperty name
* @param origValue original value of property
* @param properties all properties
* @param topologycluster topology
@@ -869,9 +869,20 @@ public class BlueprintConfigurationProcessor {
MapString, MapString, String
properties,
ClusterTopology topology);
-CollectionString getRequiredHostGroups(String origValue,
-MapString, MapString,
String properties,
-ClusterTopology topology);
+/**
+ * Determine the required host groups for the provided property.
+ *
+ * @param propertyNameproperty name
+ * @param origValue original value of property
+ * @param properties all properties
+ * @param topologycluster topology
+ *
+ * @return new property value
+ */
+CollectionString getRequiredHostGroups(String propertyName,
+ String origValue,
+ MapString, MapString, String
properties,
+ ClusterTopology topology);
}
/**
@@ -1001,16 +1012,17 @@ public class BlueprintConfigurationProcessor {
}
}
-
-throw new IllegalArgumentException(Unable to update configuration
property + ' + propertyName + '+ with topology information. +
- Component ' + component + ' is not mapped to any host group
or is mapped to multiple groups.);
+throw new IllegalArgumentException(
+String.format(Unable to update configuration property '%s'
with topology information. +
+Component '%s' is mapped to an invalid number of hosts
'%s'., propertyName, component, matchingGroupCount));
}
}
}
}
ambari git commit: AMBARI-11468 - Views : ClassLoader conflict with com.sun.jersey classes (tbeerbower)
Repository: ambari
Updated Branches:
refs/heads/trunk 8775fe29c - 087d9003e
AMBARI-11468 - Views : ClassLoader conflict with com.sun.jersey classes
(tbeerbower)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/087d9003
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/087d9003
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/087d9003
Branch: refs/heads/trunk
Commit: 087d9003ecf6af33890e4f48743d7237a30d6438
Parents: 8775fe2
Author: tbeerbower tbeerbo...@hortonworks.com
Authored: Thu May 28 09:44:23 2015 -0400
Committer: tbeerbower tbeerbo...@hortonworks.com
Committed: Thu May 28 09:44:37 2015 -0400
--
ambari-project/pom.xml | 18
.../ambari/server/view/ViewClassLoader.java | 8 ++-
.../ambari/server/view/ViewClassLoaderTest.java | 22 +++-
3 files changed, 33 insertions(+), 15 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/087d9003/ambari-project/pom.xml
--
diff --git a/ambari-project/pom.xml b/ambari-project/pom.xml
index b1db47b..528dbf4 100644
--- a/ambari-project/pom.xml
+++ b/ambari-project/pom.xml
@@ -301,12 +301,12 @@
dependency
groupIdcom.sun.jersey/groupId
artifactIdjersey-core/artifactId
-version1.11/version
+version1.18/version
/dependency
dependency
groupIdcom.sun.jersey/groupId
artifactIdjersey-grizzly/artifactId
-version1.11/version
+version1.18/version
/dependency
dependency
groupIdorg.codehaus.jackson/groupId
@@ -341,17 +341,17 @@
dependency
groupIdcom.sun.jersey/groupId
artifactIdjersey-bundle/artifactId
-version1.11/version
+version1.18/version
/dependency
dependency
groupIdcom.sun.jersey/groupId
artifactIdjersey-json/artifactId
-version1.11/version
+version1.18/version
/dependency
dependency
groupIdcom.sun.jersey/groupId
artifactIdjersey-server/artifactId
-version1.11/version
+version1.18/version
/dependency
dependency
groupIdcom.sun.jersey/groupId
@@ -361,23 +361,23 @@
dependency
groupIdcom.sun.jersey.contribs/groupId
artifactIdjersey-multipart/artifactId
-version1.11/version
+version1.18/version
/dependency
dependency
groupIdcom.sun.jersey.jersey-test-framework/groupId
artifactIdjersey-test-framework-core/artifactId
-version1.11/version
+version1.18/version
scopetest/scope
/dependency
dependency
groupIdcom.sun.jersey.jersey-test-framework/groupId
artifactIdjersey-test-framework-grizzly2/artifactId
-version1.11/version
+version1.18/version
/dependency
dependency
groupIdcom.sun.jersey.contribs/groupId
artifactIdjersey-guice/artifactId
-version1.11/version
+version1.18/version
/dependency
dependency
groupIdlog4j/groupId
http://git-wip-us.apache.org/repos/asf/ambari/blob/087d9003/ambari-server/src/main/java/org/apache/ambari/server/view/ViewClassLoader.java
--
diff --git
a/ambari-server/src/main/java/org/apache/ambari/server/view/ViewClassLoader.java
b/ambari-server/src/main/java/org/apache/ambari/server/view/ViewClassLoader.java
index f339b9a..c90bcaa 100644
---
a/ambari-server/src/main/java/org/apache/ambari/server/view/ViewClassLoader.java
+++
b/ambari-server/src/main/java/org/apache/ambari/server/view/ViewClassLoader.java
@@ -71,10 +71,16 @@ public class ViewClassLoader extends WebAppClassLoader {
WebAppContext webAppContext = new WebAppContext();
+// add ambari classes as system classes
+webAppContext.addSystemClass(org.apache.ambari.server.);
+webAppContext.addSystemClass(org.apache.ambari.view.);
+
// add com.google.inject as system classes to allow for injection in view
components using the google annotation
webAppContext.addSystemClass(com.google.inject.);
-// add org.slf4j as system classes to avoid linkage errors
+
+// add as system classes to avoid conflicts and linkage errors
webAppContext.addSystemClass(org.slf4j.);
+webAppContext.addSystemClass(com.sun.jersey.);
// set the class loader settings from the configuration
if (viewConfig != null) {
http://git-wip-us.apache.org/repos/asf/ambari/blob/087d9003/ambari-server/src/test/java/org/apache/ambari/server/view/ViewClassLoaderTest.java
--
diff --git
ambari git commit: AMBARI-11484. Configs: when doing override, it's hard to find config override (onechiporenko)
Repository: ambari
Updated Branches:
refs/heads/trunk aba28e05e - a52eb51d1
AMBARI-11484. Configs: when doing override, it's hard to find config override
(onechiporenko)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/a52eb51d
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/a52eb51d
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/a52eb51d
Branch: refs/heads/trunk
Commit: a52eb51d1af0edc9273a947535a2a36886e625da
Parents: aba28e0
Author: Oleg Nechiporenko onechipore...@apache.org
Authored: Thu May 28 18:02:28 2015 +0300
Committer: Oleg Nechiporenko onechipore...@apache.org
Committed: Thu May 28 18:02:28 2015 +0300
--
ambari-web/app/styles/widgets.less | 20
.../configs/widgets/config_widget_view.js | 2 +-
.../widgets/slider_config_widget_view.js| 2 ++
3 files changed, 23 insertions(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/a52eb51d/ambari-web/app/styles/widgets.less
--
diff --git a/ambari-web/app/styles/widgets.less
b/ambari-web/app/styles/widgets.less
index efaf7b7..897c6e5 100644
--- a/ambari-web/app/styles/widgets.less
+++ b/ambari-web/app/styles/widgets.less
@@ -20,6 +20,8 @@
@undo-btn-margin: 10px;
@controls-min-width: 55px;
@combo-widget-width: 100px;
+@overriden-property-bg-color: rgba(211, 237, 247, 0.39);
+@overriden-property-widget-padding: 8px;
@green: #6ebd45;
@slider-light-grey: #e6e6e6;
@slider-dark-grey: #aa;
@@ -113,6 +115,24 @@
margin-right: 0;
padding-left: 20px;
}
+ // background hack instead of increasing padding,
+ // because we have lack of space for widget container.
+ .overridden-property {
+background-color: @overriden-property-bg-color;
+position: relative;
+:before {
+ height: 100%;
+ width: @overriden-property-widget-padding;
+ content: '';
+ position: absolute;
+ top: 0;
+ display: block;
+ background-color: @overriden-property-bg-color;
+}
+:before {
+ left: -@overriden-property-widget-padding;
+}
+ }
}
.directory-textarea-wrapper {
http://git-wip-us.apache.org/repos/asf/ambari/blob/a52eb51d/ambari-web/app/views/common/configs/widgets/config_widget_view.js
--
diff --git a/ambari-web/app/views/common/configs/widgets/config_widget_view.js
b/ambari-web/app/views/common/configs/widgets/config_widget_view.js
index 92dc8c1..5d1dcab 100644
--- a/ambari-web/app/views/common/configs/widgets/config_widget_view.js
+++ b/ambari-web/app/views/common/configs/widgets/config_widget_view.js
@@ -117,7 +117,7 @@ App.ConfigWidgetView =
Em.View.extend(App.SupportsDependentConfigs, App.WidgetPo
*/
isComparisonBinding: 'config.isComparison',
- classNameBindings:['isComparison:compare-mode'],
+ classNameBindings:['isComparison:compare-mode',
'config.overrides.length:overridden-property'],
issueMessage: '',
http://git-wip-us.apache.org/repos/asf/ambari/blob/a52eb51d/ambari-web/app/views/common/configs/widgets/slider_config_widget_view.js
--
diff --git
a/ambari-web/app/views/common/configs/widgets/slider_config_widget_view.js
b/ambari-web/app/views/common/configs/widgets/slider_config_widget_view.js
index d8434b5..31d8aef 100644
--- a/ambari-web/app/views/common/configs/widgets/slider_config_widget_view.js
+++ b/ambari-web/app/views/common/configs/widgets/slider_config_widget_view.js
@@ -27,6 +27,8 @@ var validator = require('utils/validator');
*/
App.SliderConfigWidgetView = App.ConfigWidgetView.extend({
+ classNames: ['widget-config'],
+
templateName:
require('templates/common/configs/widgets/slider_config_widget'),
supportSwitchToCheckBox: true,
ambari git commit: AMBARI-11481. Kerberos Descriptor removal failure during cleanup should not be critical (Emil Anca via rlevas)
Repository: ambari
Updated Branches:
refs/heads/trunk a52eb51d1 - adbfa0933
AMBARI-11481. Kerberos Descriptor removal failure during cleanup should not be
critical (Emil Anca via rlevas)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/adbfa093
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/adbfa093
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/adbfa093
Branch: refs/heads/trunk
Commit: adbfa0933cf3ec854ea7274ad165353c4071ea9a
Parents: a52eb51
Author: Emil Anca ea...@hortonworks.com
Authored: Thu May 28 11:22:25 2015 -0400
Committer: Robert Levas rle...@hortonworks.com
Committed: Thu May 28 11:22:30 2015 -0400
--
.../server/serveraction/kerberos/CleanupServerAction.java | 7 ---
1 file changed, 4 insertions(+), 3 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/adbfa093/ambari-server/src/main/java/org/apache/ambari/server/serveraction/kerberos/CleanupServerAction.java
--
diff --git
a/ambari-server/src/main/java/org/apache/ambari/server/serveraction/kerberos/CleanupServerAction.java
b/ambari-server/src/main/java/org/apache/ambari/server/serveraction/kerberos/CleanupServerAction.java
index 64ebe0f..b6c2f12 100644
---
a/ambari-server/src/main/java/org/apache/ambari/server/serveraction/kerberos/CleanupServerAction.java
+++
b/ambari-server/src/main/java/org/apache/ambari/server/serveraction/kerberos/CleanupServerAction.java
@@ -77,8 +77,6 @@ public class CleanupServerAction extends KerberosServerAction
{
Cluster cluster = getCluster();
if (cluster.getSecurityType().equals(SecurityType.NONE)) { // double check
this is done in a non secure environment
removeKerberosArtifact(cluster);
- LOG.info(Kerberos descriptor removed successfully.);
- actionLog.writeStdOut(Kerberos descriptor removed successfully.);
}
return createCommandReport(0, HostRoleStatus.COMPLETED, {},
actionLog.getStdOut(), actionLog.getStdErr());
@@ -104,8 +102,11 @@ public class CleanupServerAction extends
KerberosServerAction {
try {
artifactProvider.deleteResources(predicate);
+ LOG.info(Kerberos descriptor removed successfully.);
+ actionLog.writeStdOut(Kerberos descriptor removed successfully.);
} catch (NoSuchResourceException e) {
- throw new AmbariException(Could not find the Kerberos descriptor to
delete, e);
+ LOG.warn(The Kerberos descriptor was not found in the database while
attempting to remove.);
+ actionLog.writeStdOut(The Kerberos descriptor was not found in the
database while attempting to remove.);
} catch (Exception e) {
throw new AmbariException(An unknown error occurred while trying to
delete the cluster Kerberos descriptor, e);
}
ambari git commit: AMBARI-11484. Configs: when doing override, it's hard to find config override (onechiporenko)
Repository: ambari
Updated Branches:
refs/heads/trunk b20dbb7fa - 1f1742b1d
AMBARI-11484. Configs: when doing override, it's hard to find config override
(onechiporenko)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/1f1742b1
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/1f1742b1
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/1f1742b1
Branch: refs/heads/trunk
Commit: 1f1742b1d7f2eb4f4e5bfd1b64c565fcdcf18553
Parents: b20dbb7
Author: Oleg Nechiporenko onechipore...@apache.org
Authored: Thu May 28 17:33:14 2015 +0300
Committer: Oleg Nechiporenko onechipore...@apache.org
Committed: Thu May 28 17:33:14 2015 +0300
--
ambari-web/app/styles/widgets.less | 20
.../configs/widgets/config_widget_view.js | 2 +-
.../widgets/slider_config_widget_view.js| 34
3 files changed, 48 insertions(+), 8 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/1f1742b1/ambari-web/app/styles/widgets.less
--
diff --git a/ambari-web/app/styles/widgets.less
b/ambari-web/app/styles/widgets.less
index efaf7b7..897c6e5 100644
--- a/ambari-web/app/styles/widgets.less
+++ b/ambari-web/app/styles/widgets.less
@@ -20,6 +20,8 @@
@undo-btn-margin: 10px;
@controls-min-width: 55px;
@combo-widget-width: 100px;
+@overriden-property-bg-color: rgba(211, 237, 247, 0.39);
+@overriden-property-widget-padding: 8px;
@green: #6ebd45;
@slider-light-grey: #e6e6e6;
@slider-dark-grey: #aa;
@@ -113,6 +115,24 @@
margin-right: 0;
padding-left: 20px;
}
+ // background hack instead of increasing padding,
+ // because we have lack of space for widget container.
+ .overridden-property {
+background-color: @overriden-property-bg-color;
+position: relative;
+:before {
+ height: 100%;
+ width: @overriden-property-widget-padding;
+ content: '';
+ position: absolute;
+ top: 0;
+ display: block;
+ background-color: @overriden-property-bg-color;
+}
+:before {
+ left: -@overriden-property-widget-padding;
+}
+ }
}
.directory-textarea-wrapper {
http://git-wip-us.apache.org/repos/asf/ambari/blob/1f1742b1/ambari-web/app/views/common/configs/widgets/config_widget_view.js
--
diff --git a/ambari-web/app/views/common/configs/widgets/config_widget_view.js
b/ambari-web/app/views/common/configs/widgets/config_widget_view.js
index 92dc8c1..5d1dcab 100644
--- a/ambari-web/app/views/common/configs/widgets/config_widget_view.js
+++ b/ambari-web/app/views/common/configs/widgets/config_widget_view.js
@@ -117,7 +117,7 @@ App.ConfigWidgetView =
Em.View.extend(App.SupportsDependentConfigs, App.WidgetPo
*/
isComparisonBinding: 'config.isComparison',
- classNameBindings:['isComparison:compare-mode'],
+ classNameBindings:['isComparison:compare-mode',
'config.overrides.length:overridden-property'],
issueMessage: '',
http://git-wip-us.apache.org/repos/asf/ambari/blob/1f1742b1/ambari-web/app/views/common/configs/widgets/slider_config_widget_view.js
--
diff --git
a/ambari-web/app/views/common/configs/widgets/slider_config_widget_view.js
b/ambari-web/app/views/common/configs/widgets/slider_config_widget_view.js
index d8434b5..7732026 100644
--- a/ambari-web/app/views/common/configs/widgets/slider_config_widget_view.js
+++ b/ambari-web/app/views/common/configs/widgets/slider_config_widget_view.js
@@ -27,6 +27,8 @@ var validator = require('utils/validator');
*/
App.SliderConfigWidgetView = App.ConfigWidgetView.extend({
+ classNames: ['widget-config'],
+
templateName:
require('templates/common/configs/widgets/slider_config_widget'),
supportSwitchToCheckBox: true,
@@ -274,7 +276,7 @@ App.SliderConfigWidgetView = App.ConfigWidgetView.extend({
config = this.get('config'),
valueAttributes = config.get('stackConfigProperty.valueAttributes'),
parseFunction = this.get('parseFunction'),
- ticks = [this.get('minMirrorValue')],
+ ticks = [this.valueForTick(this.get('minMirrorValue'), true)],
ticksLabels = [],
recommendedValue =
this.valueForTick(+this.get('widgetRecommendedValue')),
range = this.get('maxMirrorValue') - this.get('minMirrorValue'),
@@ -287,15 +289,24 @@ App.SliderConfigWidgetView = App.ConfigWidgetView.extend({
for (var i = 1; i = 3; i++) {
var val = this.get('minMirrorValue') + range * (i / (isSmallInt ? 3 :
4));
// if value's type is float, ticks may be float too
- ticks.push(this.valueForTick(val));
+ ticks.push(this.valueForTick(val, false));
}
-
ambari git commit: Revert AMBARI-11484. Configs: when doing override, it's hard to find config override (onechiporenko)
Repository: ambari
Updated Branches:
refs/heads/trunk 1f1742b1d - aba28e05e
Revert AMBARI-11484. Configs: when doing override, it's hard to find config
override (onechiporenko)
This reverts commit 1f1742b1d7f2eb4f4e5bfd1b64c565fcdcf18553.
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/aba28e05
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/aba28e05
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/aba28e05
Branch: refs/heads/trunk
Commit: aba28e05e975adedeb6f76a4e88b209d9b6f7397
Parents: 1f1742b
Author: Alex Antonenko hiv...@gmail.com
Authored: Thu May 28 17:52:11 2015 +0300
Committer: Alex Antonenko hiv...@gmail.com
Committed: Thu May 28 17:52:11 2015 +0300
--
ambari-web/app/styles/widgets.less | 20
.../configs/widgets/config_widget_view.js | 2 +-
.../widgets/slider_config_widget_view.js| 34
3 files changed, 8 insertions(+), 48 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/aba28e05/ambari-web/app/styles/widgets.less
--
diff --git a/ambari-web/app/styles/widgets.less
b/ambari-web/app/styles/widgets.less
index 897c6e5..efaf7b7 100644
--- a/ambari-web/app/styles/widgets.less
+++ b/ambari-web/app/styles/widgets.less
@@ -20,8 +20,6 @@
@undo-btn-margin: 10px;
@controls-min-width: 55px;
@combo-widget-width: 100px;
-@overriden-property-bg-color: rgba(211, 237, 247, 0.39);
-@overriden-property-widget-padding: 8px;
@green: #6ebd45;
@slider-light-grey: #e6e6e6;
@slider-dark-grey: #aa;
@@ -115,24 +113,6 @@
margin-right: 0;
padding-left: 20px;
}
- // background hack instead of increasing padding,
- // because we have lack of space for widget container.
- .overridden-property {
-background-color: @overriden-property-bg-color;
-position: relative;
-:before {
- height: 100%;
- width: @overriden-property-widget-padding;
- content: '';
- position: absolute;
- top: 0;
- display: block;
- background-color: @overriden-property-bg-color;
-}
-:before {
- left: -@overriden-property-widget-padding;
-}
- }
}
.directory-textarea-wrapper {
http://git-wip-us.apache.org/repos/asf/ambari/blob/aba28e05/ambari-web/app/views/common/configs/widgets/config_widget_view.js
--
diff --git a/ambari-web/app/views/common/configs/widgets/config_widget_view.js
b/ambari-web/app/views/common/configs/widgets/config_widget_view.js
index 5d1dcab..92dc8c1 100644
--- a/ambari-web/app/views/common/configs/widgets/config_widget_view.js
+++ b/ambari-web/app/views/common/configs/widgets/config_widget_view.js
@@ -117,7 +117,7 @@ App.ConfigWidgetView =
Em.View.extend(App.SupportsDependentConfigs, App.WidgetPo
*/
isComparisonBinding: 'config.isComparison',
- classNameBindings:['isComparison:compare-mode',
'config.overrides.length:overridden-property'],
+ classNameBindings:['isComparison:compare-mode'],
issueMessage: '',
http://git-wip-us.apache.org/repos/asf/ambari/blob/aba28e05/ambari-web/app/views/common/configs/widgets/slider_config_widget_view.js
--
diff --git
a/ambari-web/app/views/common/configs/widgets/slider_config_widget_view.js
b/ambari-web/app/views/common/configs/widgets/slider_config_widget_view.js
index 7732026..d8434b5 100644
--- a/ambari-web/app/views/common/configs/widgets/slider_config_widget_view.js
+++ b/ambari-web/app/views/common/configs/widgets/slider_config_widget_view.js
@@ -27,8 +27,6 @@ var validator = require('utils/validator');
*/
App.SliderConfigWidgetView = App.ConfigWidgetView.extend({
- classNames: ['widget-config'],
-
templateName:
require('templates/common/configs/widgets/slider_config_widget'),
supportSwitchToCheckBox: true,
@@ -276,7 +274,7 @@ App.SliderConfigWidgetView = App.ConfigWidgetView.extend({
config = this.get('config'),
valueAttributes = config.get('stackConfigProperty.valueAttributes'),
parseFunction = this.get('parseFunction'),
- ticks = [this.valueForTick(this.get('minMirrorValue'), true)],
+ ticks = [this.get('minMirrorValue')],
ticksLabels = [],
recommendedValue =
this.valueForTick(+this.get('widgetRecommendedValue')),
range = this.get('maxMirrorValue') - this.get('minMirrorValue'),
@@ -289,24 +287,15 @@ App.SliderConfigWidgetView = App.ConfigWidgetView.extend({
for (var i = 1; i = 3; i++) {
var val = this.get('minMirrorValue') + range * (i / (isSmallInt ? 3 :
4));
// if value's type is float, ticks may be float too
- ticks.push(this.valueForTick(val, false));
+
ambari git commit: AMBARI-11436. CapScheduler Auto-Create and Cluster association (Erik Bergenholtz via rlevas)
Repository: ambari
Updated Branches:
refs/heads/trunk adbfa0933 - e2b8a0e92
AMBARI-11436. CapScheduler Auto-Create and Cluster association (Erik
Bergenholtz via rlevas)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/e2b8a0e9
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/e2b8a0e9
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/e2b8a0e9
Branch: refs/heads/trunk
Commit: e2b8a0e92c8e73fd52050bb986238996b7b6cd94
Parents: adbfa09
Author: Erik Bergenholtz ebergenho...@hortonworks.com
Authored: Thu May 28 12:11:44 2015 -0400
Committer: Robert Levas rle...@hortonworks.com
Committed: Thu May 28 12:11:44 2015 -0400
--
contrib/views/capacity-scheduler/pom.xml| 15 +-
contrib/views/capacity-scheduler/readme.md | 10 +-
.../capacityscheduler/ConfigurationService.java | 183 +++
.../view/capacityscheduler/proxy/Proxy.java | 120
.../capacityscheduler/proxy/RequestBuilder.java | 160
.../proxy/ResponseTranslator.java | 100 --
.../ui/app/components/dropdownButtons.js| 2 +-
.../main/resources/ui/app/controllers/queue.js | 2 +-
.../main/resources/ui/app/controllers/queues.js | 6 +-
.../src/main/resources/ui/app/serializers.js| 29 ++-
.../resources/ui/app/styles/application.less| 22 ++-
.../app/templates/components/queueContainer.hbs | 2 +-
.../main/resources/ui/app/templates/queues.hbs | 4 +-
.../main/resources/ui/app/templates/refuse.hbs | 10 +-
.../src/main/resources/ui/config.coffee | 2 +-
.../ui/test/integration/serializers_test.js | 124 +
.../src/main/resources/view.xml | 20 +-
contrib/views/pom.xml | 1 +
.../ambari/view/utils/ambari/AmbariApi.java | 132 ++---
.../ambari/URLStreamProviderBasicAuth.java | 61 +--
20 files changed, 481 insertions(+), 524 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/e2b8a0e9/contrib/views/capacity-scheduler/pom.xml
--
diff --git a/contrib/views/capacity-scheduler/pom.xml
b/contrib/views/capacity-scheduler/pom.xml
index 2712953..23e5aee 100644
--- a/contrib/views/capacity-scheduler/pom.xml
+++ b/contrib/views/capacity-scheduler/pom.xml
@@ -19,7 +19,7 @@
modelVersion4.0.0/modelVersion
groupIdorg.apache.ambari.contrib.views/groupId
artifactIdcapacity-scheduler/artifactId
-version0.3.0-SNAPSHOT/version
+version0.4.0-SNAPSHOT/version
nameCapacity Scheduler/name
parent
@@ -37,12 +37,11 @@
dependency
groupIdorg.glassfish.jersey.containers/groupId
artifactIdjersey-container-servlet/artifactId
-version2.6/version !-- version --
/dependency
dependency
-groupIdorg.slf4j/groupId
-artifactIdslf4j-api/artifactId
-version1.7.5/version
+groupIdorg.apache.hadoop/groupId
+artifactIdhadoop-common/artifactId
+version${hadoop-version}/version
/dependency
dependency
groupIdcommons-io/groupId
@@ -68,9 +67,15 @@
artifactIdambari-views/artifactId
scopeprovided/scope
/dependency
+dependency
+groupIdorg.apache.ambari.contrib.views/groupId
+artifactIdambari-views-utils/artifactId
+version0.0.1-SNAPSHOT/version
+/dependency
/dependencies
properties
+ hadoop-version2.6.0/hadoop-version
ambari.dir${project.parent.parent.parent.basedir}/ambari.dir
ui.directory${basedir}/src/main/resources/ui/ui.directory
/properties
http://git-wip-us.apache.org/repos/asf/ambari/blob/e2b8a0e9/contrib/views/capacity-scheduler/readme.md
--
diff --git a/contrib/views/capacity-scheduler/readme.md
b/contrib/views/capacity-scheduler/readme.md
index e772508..4e5db9d 100644
--- a/contrib/views/capacity-scheduler/readme.md
+++ b/contrib/views/capacity-scheduler/readme.md
@@ -23,7 +23,7 @@ This View provides a UI to manage queues for the YARN
Capacity Scheduler.
Requirements
-
-- Ambari 1.7.0 or later
+- Ambari 2.1.0 or later
- YARN
Build
@@ -35,11 +35,11 @@ The view can be built as a maven project.
The build will produce the view archive.
-target/capacity-scheduler-0.3.0-SNAPSHOT.jar
+target/capacity-scheduler-???-SNAPSHOT.jar
Place the view archive on the Ambari Server and restart to deploy.
-cp capacity-scheduler-0.3.0-SNAPSHOT
/var/lib/ambari-server/resources/views/
+cp capacity-scheduler-???-SNAPSHOT /var/lib/ambari-server/resources/views/
ambari-server
ambari git commit: AMBARI-11487 - Changed Configurations During Upgrade Are Reverted During Finalize (jonathanhurley)
Repository: ambari
Updated Branches:
refs/heads/trunk e2b8a0e92 - b04fb769a
AMBARI-11487 - Changed Configurations During Upgrade Are Reverted During
Finalize (jonathanhurley)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/b04fb769
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/b04fb769
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/b04fb769
Branch: refs/heads/trunk
Commit: b04fb769a3bd6ef7a3968f01a374bd08490502a6
Parents: e2b8a0e
Author: Jonathan Hurley jhur...@hortonworks.com
Authored: Thu May 28 10:53:02 2015 -0400
Committer: Jonathan Hurley jhur...@hortonworks.com
Committed: Thu May 28 12:12:21 2015 -0400
--
.../ambari/server/orm/dao/ClusterDAO.java | 40 ++--
.../apache/ambari/server/state/ConfigImpl.java | 11 +-
.../server/state/cluster/ClusterImpl.java | 15
.../server/state/cluster/ClusterTest.java | 11 ++
4 files changed, 63 insertions(+), 14 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/b04fb769/ambari-server/src/main/java/org/apache/ambari/server/orm/dao/ClusterDAO.java
--
diff --git
a/ambari-server/src/main/java/org/apache/ambari/server/orm/dao/ClusterDAO.java
b/ambari-server/src/main/java/org/apache/ambari/server/orm/dao/ClusterDAO.java
index 0ac952c..6e55128 100644
---
a/ambari-server/src/main/java/org/apache/ambari/server/orm/dao/ClusterDAO.java
+++
b/ambari-server/src/main/java/org/apache/ambari/server/orm/dao/ClusterDAO.java
@@ -18,7 +18,6 @@
package org.apache.ambari.server.orm.dao;
-import java.math.BigDecimal;
import java.util.List;
import javax.persistence.EntityManager;
@@ -238,7 +237,7 @@ public class ClusterDAO {
/**
* Retrieve entity data from DB
- *
+ *
* @param clusterEntity
* entity to refresh
*/
@@ -247,11 +246,44 @@ public class ClusterDAO {
entityManagerProvider.get().refresh(clusterEntity);
}
- @Transactional
+ /**
+ * Merge the specified entity into the current persistence context.
+ *
+ * @param clusterEntity
+ * the entity to merge (not {@code null}).
+ * @return the managed entity which was merged (never {@code null}).
+ */
public ClusterEntity merge(ClusterEntity clusterEntity) {
-return entityManagerProvider.get().merge(clusterEntity);
+return merge(clusterEntity, false);
+ }
+
+ /**
+ * Merge the specified entity into the current persistence context,
optionally
+ * instructing the {@link EntityManager} to write any queued persist/merges
+ * into the database immediately.
+ *
+ * @param clusterEntity
+ * the entity to merge (not {@code null}).
+ * @param flush
+ * if {@code true} then {@link EntityManager#flush()} will be
invoked
+ * immediately after the merge.
+ * @return the managed entity which was merged (never {@code null}).
+ */
+ @Transactional
+ public ClusterEntity merge(ClusterEntity clusterEntity, boolean flush) {
+EntityManager entityManager = entityManagerProvider.get();
+clusterEntity = entityManager.merge(clusterEntity);
+
+// force any queued persist/merges to be written to the database, including
+// the merge from above
+if (flush) {
+ entityManager.flush();
+}
+
+return clusterEntity;
}
+
@Transactional
public void remove(ClusterEntity clusterEntity) {
entityManagerProvider.get().remove(merge(clusterEntity));
http://git-wip-us.apache.org/repos/asf/ambari/blob/b04fb769/ambari-server/src/main/java/org/apache/ambari/server/state/ConfigImpl.java
--
diff --git
a/ambari-server/src/main/java/org/apache/ambari/server/state/ConfigImpl.java
b/ambari-server/src/main/java/org/apache/ambari/server/state/ConfigImpl.java
index 1543ad7..71604c1 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/state/ConfigImpl.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/state/ConfigImpl.java
@@ -221,7 +221,10 @@ public class ConfigImpl implements Config {
clusterDAO.createConfig(entity);
clusterEntity.getClusterConfigEntities().add(entity);
- clusterDAO.merge(clusterEntity);
+
+ // save the entity, forcing a flush to ensure the refresh picks up the
+ // newest data
+ clusterDAO.merge(clusterEntity, true);
cluster.refresh();
} else {
// only supporting changes to the properties
@@ -244,7 +247,11 @@ public class ConfigImpl implements Config {
getType(), getVersion());
entity.setData(gson.toJson(getProperties()));
-clusterDAO.merge(clusterEntity);
+
+// save the entity, forcing a flush to ensure the refresh picks up
[2/2] ambari git commit: AMBARI-11474. Hive View Should Support NameNode HA Cluster association (Erik Bergenholtz via rlevas)
AMBARI-11474. Hive View Should Support NameNode HA Cluster association (Erik
Bergenholtz via rlevas)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/b0634464
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/b0634464
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/b0634464
Branch: refs/heads/trunk
Commit: b0634464e625fe80fbe693905a46d2555088afec
Parents: b04fb76
Author: Erik Bergenholtz ebergenho...@hortonworks.com
Authored: Thu May 28 12:54:20 2015 -0400
Committer: Robert Levas rle...@hortonworks.com
Committed: Thu May 28 12:54:29 2015 -0400
--
contrib/views/hive/pom.xml | 11 +
.../ambari/view/hive/PropertyValidator.java | 69 ++--
.../backgroundjobs/BackgroundJobController.java | 12 +-
.../ambari/view/hive/client/Connection.java | 3 +-
.../view/hive/client/ConnectionFactory.java | 21 +
.../resources/PersonalCRUDResourceManager.java | 3 +-
.../view/hive/resources/files/FileService.java | 4 +-
.../resources/jobs/JobResourceProvider.java | 5 +-
.../view/hive/resources/jobs/JobService.java| 4 +-
.../view/hive/resources/jobs/LogParser.java | 3 +-
.../jobs/ResultsPaginationController.java | 6 +-
.../hive/resources/jobs/atsJobs/ATSParser.java | 3 +
.../jobs/atsJobs/ATSRequestsDelegateImpl.java | 12 +-
.../view/hive/resources/jobs/rm/RMParser.java | 51 ++-
.../hive/resources/jobs/rm/RMParserFactory.java | 54 ++-
.../jobs/rm/RMRequestsDelegateImpl.java | 1 +
.../jobs/viewJobs/JobControllerImpl.java| 25 +-
.../resources/FileResourceResourceProvider.java | 5 +-
.../savedQueries/SavedQueryResourceManager.java | 27 +-
.../SavedQueryResourceProvider.java | 5 +-
.../savedQueries/SavedQueryService.java | 6 +-
.../resources/udfs/UDFResourceProvider.java | 5 +-
.../ambari/view/hive/utils/FilePaginator.java | 2 +-
.../apache/ambari/view/hive/utils/HdfsApi.java | 380 ---
.../apache/ambari/view/hive/utils/HdfsUtil.java | 103 -
.../hive/utils/ServiceFormattedException.java | 17 +-
.../view/hive/utils/SharedObjectsFactory.java | 19 +-
.../ui/hive-web/app/adapters/application.js | 3 +-
.../app/components/column-filter-widget.js | 2 +-
.../hive-web/app/components/progress-widget.js | 2 +-
.../ui/hive-web/app/controllers/history.js | 21 +-
.../ui/hive-web/app/controllers/index.js| 9 +-
.../app/controllers/index/history-query/logs.js | 15 +-
.../controllers/index/history-query/results.js | 2 +-
.../ui/hive-web/app/controllers/job-progress.js | 6 +-
.../ui/hive-web/app/initializers/i18n.js| 1 +
.../ui/hive-web/app/mixins/filterable.js| 4 +
.../resources/ui/hive-web/app/routes/history.js | 10 +-
.../resources/ui/hive-web/app/routes/queries.js | 8 +-
.../resources/ui/hive-web/app/routes/udfs.js| 4 +-
.../resources/ui/hive-web/app/styles/app.scss | 15 +-
.../ui/hive-web/app/templates/history.hbs | 9 +-
.../ui/hive-web/app/utils/constants.js | 4 +-
.../ui/hive-web/app/views/visual-explain.js | 2 +-
.../resources/ui/hive-web/config/environment.js | 5 +
contrib/views/hive/src/main/resources/view.xml | 128 +--
.../apache/ambari/view/hive/BaseHiveTest.java | 2 +
.../hive/resources/files/FileServiceTest.java | 2 +-
.../hive/resources/jobs/AggregatorTest.java | 3 +-
.../hive/resources/jobs/JobServiceTest.java | 9 +-
.../SavedQueryResourceManagerTest.java | 55 +++
.../savedQueries/SavedQueryServiceTest.java | 2 -
.../ambari/view/hive/utils/HdfsApiMock.java | 6 +-
53 files changed, 555 insertions(+), 630 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/b0634464/contrib/views/hive/pom.xml
--
diff --git a/contrib/views/hive/pom.xml b/contrib/views/hive/pom.xml
index da7e1a1..9638e96 100644
--- a/contrib/views/hive/pom.xml
+++ b/contrib/views/hive/pom.xml
@@ -61,6 +61,7 @@
dependency
groupIdcom.googlecode.json-simple/groupId
artifactIdjson-simple/artifactId
+ version1.1.1/version
/dependency
dependency
groupIdcommons-configuration/groupId
@@ -183,6 +184,16 @@
version${hadoop-version}/version
scopetest/scope
/dependency
+dependency
+ groupIdorg.apache.ambari.contrib.views/groupId
+ artifactIdambari-views-utils/artifactId
+ version0.0.1-SNAPSHOT/version
+/dependency
+dependency
+ groupIdcommons-validator/groupId
+ artifactIdcommons-validator/artifactId
+ version1.4.0/version
+/dependency
/dependencies
properties
[1/2] ambari git commit: AMBARI-11474. Hive View Should Support NameNode HA Cluster association (Erik Bergenholtz via rlevas)
Repository: ambari Updated Branches: refs/heads/trunk b04fb769a - b0634464e http://git-wip-us.apache.org/repos/asf/ambari/blob/b0634464/contrib/views/hive/src/main/resources/view.xml -- diff --git a/contrib/views/hive/src/main/resources/view.xml b/contrib/views/hive/src/main/resources/view.xml index 56967d2..8e1b4c5 100644 --- a/contrib/views/hive/src/main/resources/view.xml +++ b/contrib/views/hive/src/main/resources/view.xml @@ -23,19 +23,106 @@ validator-classorg.apache.ambari.view.hive.PropertyValidator/validator-class +!-- Hive Configs -- +parameter + namehive.host/name + descriptionEnter the HiveServer2 host. Host must be accessible from Ambari Server./description + labelHiveServer2 Host/label + placeholder127.0.0.1/placeholder + cluster-configfake/cluster-config + requiredtrue/required +/parameter + +parameter + namehive.port/name + descriptionHiveServer2 Thrift port (example: 1)./description + labelHiveServer2 Thrift port/label + placeholder1/placeholder + default-value1/default-value + cluster-confighive-site/hive.server2.thrift.port/cluster-config + requiredtrue/required +/parameter + +parameter + namehive.auth/name + descriptionSemicolon-separated authentication configs./description + labelHive Authentication/label + placeholderauth=NONE/placeholder + default-valueauth=NONE/default-value + requiredfalse/required +/parameter + !-- HDFS Configs -- parameter namewebhdfs.url/name -descriptionEnter the WebHDFS FileSystem URI. Typically this is the dfs.namenode.http-address property in the hdfs-site.xml configuration. URL must be accessible from Ambari Server./description +descriptionEnter the WebHDFS FileSystem URI. Typically this is the dfs.namenode.http-address +property in the hdfs-site.xml configuration. URL must be accessible from Ambari Server./description labelWebHDFS FileSystem URI/label placeholderwebhdfs://namenode:50070/placeholder requiredtrue/required +cluster-configcore-site/fs.defaultFS/cluster-config +/parameter +parameter +namewebhdfs.nameservices/name +descriptionComma-separated list of nameservices. Value of hdfs-site/dfs.nameservices property/description +labelLogical name of the NameNode cluster/label +requiredfalse/required +cluster-confighdfs-site/dfs.nameservices/cluster-config +/parameter +parameter +namewebhdfs.ha.namenodes.list/name +descriptionComma-separated list of namenodes for a given nameservice. + Value of hdfs-site/dfs.ha.namenodes.[nameservice] property/description +labelList of NameNodes/label +requiredfalse/required +cluster-configfake/cluster-config +/parameter +parameter +namewebhdfs.ha.namenode.rpc-address.nn1/name +descriptionRPC address for first name node. + Value of hdfs-site/dfs.namenode.rpc-address.[nameservice].[namenode1] property/description +labelFirst NameNode RPC Address/label +requiredfalse/required +cluster-configfake/cluster-config +/parameter +parameter +namewebhdfs.ha.namenode.rpc-address.nn2/name +descriptionRPC address for second name node. + Value of hdfs-site/dfs.namenode.rpc-address.[nameservice].[namenode2] property/description +labelSecond NameNode RPC Address/label +requiredfalse/required +cluster-configfake/cluster-config +/parameter +parameter +namewebhdfs.ha.namenode.http-address.nn1/name +descriptionWebHDFS address for first name node. + Value of hdfs-site/dfs.namenode.http-address.[nameservice].[namenode1] property/description +labelFirst NameNode HTTP (WebHDFS) Address/label +requiredfalse/required +cluster-configfake/cluster-config +/parameter +parameter +namewebhdfs.ha.namenode.http-address.nn2/name +descriptionWebHDFS address for second name node. + Value of hdfs-site/dfs.namenode.http-address.[nameservice].[namenode2] property/description +labelSecond NameNode HTTP (WebHDFS) Address/label +requiredfalse/required +cluster-configfake/cluster-config +/parameter +parameter +namewebhdfs.client.failover.proxy.provider/name +descriptionThe Java class that HDFS clients use to contact the Active NameNode + Value of hdfs-site/dfs.client.failover.proxy.provider.[nameservice] property/description +labelFailover Proxy Provider/label +requiredfalse/required +cluster-configfake/cluster-config /parameter parameter namewebhdfs.username/name descriptiondoAs for proxy user for HDFS. By default, uses the currently
ambari git commit: AMBARI-11491. Decommission of NM fails.(vbrodetskyi)
Repository: ambari Updated Branches: refs/heads/trunk b0634464e - 27a376734 AMBARI-11491. Decommission of NM fails.(vbrodetskyi) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/27a37673 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/27a37673 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/27a37673 Branch: refs/heads/trunk Commit: 27a376734fe95fb3055f5e21e00c071a00bc10ff Parents: b063446 Author: Vitaly Brodetskyi vbrodets...@hortonworks.com Authored: Thu May 28 19:54:23 2015 +0300 Committer: Vitaly Brodetskyi vbrodets...@hortonworks.com Committed: Thu May 28 19:54:49 2015 +0300 -- .../YARN/2.1.0.2.0/package/scripts/resourcemanager.py | 1 + 1 file changed, 1 insertion(+) -- http://git-wip-us.apache.org/repos/asf/ambari/blob/27a37673/ambari-server/src/main/resources/common-services/YARN/2.1.0.2.0/package/scripts/resourcemanager.py -- diff --git a/ambari-server/src/main/resources/common-services/YARN/2.1.0.2.0/package/scripts/resourcemanager.py b/ambari-server/src/main/resources/common-services/YARN/2.1.0.2.0/package/scripts/resourcemanager.py index 456d7bf..4ddab8c 100644 --- a/ambari-server/src/main/resources/common-services/YARN/2.1.0.2.0/package/scripts/resourcemanager.py +++ b/ambari-server/src/main/resources/common-services/YARN/2.1.0.2.0/package/scripts/resourcemanager.py @@ -25,6 +25,7 @@ from resource_management.libraries.functions import conf_select from resource_management.libraries.functions import hdp_select from resource_management.libraries.functions.check_process_status import check_process_status from resource_management.libraries.functions.copy_tarball import copy_to_hdfs +from resource_management.libraries.functions.format import format from resource_management.libraries.functions.version import compare_versions, format_hdp_stack_version from resource_management.libraries.functions.security_commons import build_expectations, \ cached_kinit_executor, get_params_from_filesystem, validate_security_config_properties, \
ambari git commit: AMBARI-11490. Files View: Copy dependencies during generate-resources phase (Erik Bergenholtz via rlevas)
Repository: ambari Updated Branches: refs/heads/trunk 27a376734 - 70a59ef09 AMBARI-11490. Files View: Copy dependencies during generate-resources phase (Erik Bergenholtz via rlevas) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/70a59ef0 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/70a59ef0 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/70a59ef0 Branch: refs/heads/trunk Commit: 70a59ef0904dc2229381be5fb9809243e7bc6b47 Parents: 27a3767 Author: Erik Bergenholtz ebergenho...@hortonworks.com Authored: Thu May 28 13:00:49 2015 -0400 Committer: Robert Levas rle...@hortonworks.com Committed: Thu May 28 13:00:57 2015 -0400 -- contrib/views/files/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/ambari/blob/70a59ef0/contrib/views/files/pom.xml -- diff --git a/contrib/views/files/pom.xml b/contrib/views/files/pom.xml index d0960a8..1cac902 100644 --- a/contrib/views/files/pom.xml +++ b/contrib/views/files/pom.xml @@ -203,7 +203,7 @@ artifactIdmaven-dependency-plugin/artifactId executions execution -phaseprepare-package/phase +phasegenerate-resources/phase goals goalcopy-dependencies/goal /goals
