ambari git commit: AMBARI-12895 After upgrading Ambari to 2.1, hbase.bucketcache.size value has an m added to it preventing region servers from starting (dsen)
Repository: ambari
Updated Branches:
refs/heads/trunk b0137be7a - 6e8d00cff
AMBARI-12895 After upgrading Ambari to 2.1, hbase.bucketcache.size value has an
m added to it preventing region servers from starting (dsen)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/6e8d00cf
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/6e8d00cf
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/6e8d00cf
Branch: refs/heads/trunk
Commit: 6e8d00cffba54e3983b4a0c251b6ff88424998c2
Parents: b0137be
Author: Dmytro Sen d...@apache.org
Authored: Thu Aug 27 15:53:18 2015 +0300
Committer: Dmytro Sen d...@apache.org
Committed: Thu Aug 27 15:53:18 2015 +0300
--
.../server/upgrade/UpgradeCatalog210.java | 2 +-
.../server/upgrade/UpgradeCatalog212.java | 27
.../server/upgrade/UpgradeCatalog212Test.java | 17 +++-
3 files changed, 39 insertions(+), 7 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/6e8d00cf/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog210.java
--
diff --git
a/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog210.java
b/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog210.java
index f5a4d28..1981514 100644
---
a/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog210.java
+++
b/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog210.java
@@ -1680,7 +1680,7 @@ public class UpgradeCatalog210 extends
AbstractUpgradeCatalog {
final int regionserver_max_direct_memory_size =
regionserver_total_ram - regionserver_heap_size;
final int bucketcache_offheap_memory =
regionserver_max_direct_memory_size - reserved_offheap_memory;
-hbaseSiteProps.put(hbase.bucketcache.size, block_cache_heap
+ bucketcache_offheap_memory + m);
+hbaseSiteProps.put(hbase.bucketcache.size,
String.valueOf(block_cache_heap + bucketcache_offheap_memory));
hbaseSiteProps.put(hbase.bucketcache.ioengine, offheap);
hbaseEnvProps.put(hbase_max_direct_memory_size,
String.valueOf(regionserver_max_direct_memory_size));
} else {
http://git-wip-us.apache.org/repos/asf/ambari/blob/6e8d00cf/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog212.java
--
diff --git
a/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog212.java
b/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog212.java
index 51ea8f7..02df181 100644
---
a/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog212.java
+++
b/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog212.java
@@ -53,6 +53,9 @@ import java.util.regex.Matcher;
public class UpgradeCatalog212 extends AbstractUpgradeCatalog {
private static final String HIVE_SITE = hive-site;
private static final String HIVE_ENV = hive-env;
+ private static final String HBASE_ENV = hbase-env;
+ private static final String HBASE_SITE = hbase-site;
+ private static final String CLUSTER_ENV = cluster-env;
/**
* Logger.
@@ -134,20 +137,34 @@ public class UpgradeCatalog212 extends
AbstractUpgradeCatalog {
if ((clusterMap != null) !clusterMap.isEmpty()) {
// Iterate through the clusters and perform any configuration updates
for (final Cluster cluster : clusterMap.values()) {
- Config config = cluster.getDesiredConfigByType(hbase-env);
+ Config hbaseEnvProps = cluster.getDesiredConfigByType(HBASE_ENV);
+ Config hbaseSiteProps = cluster.getDesiredConfigByType(HBASE_SITE);
- if (config != null) {
+ if (hbaseEnvProps != null) {
// Remove override_hbase_uid from hbase-env and add override_uid
to cluster-env
-String value = config.getProperties().get(override_hbase_uid);
+String value =
hbaseEnvProps.getProperties().get(override_hbase_uid);
if (value != null) {
MapString, String updates = new HashMapString, String();
SetString removes = new HashSetString();
updates.put(override_uid, value);
removes.add(override_hbase_uid);
- updateConfigurationPropertiesForCluster(cluster, hbase-env,
new HashMapString, String(), removes, false, true);
- updateConfigurationPropertiesForCluster(cluster, cluster-env,
updates, true, false);
+ updateConfigurationPropertiesForCluster(cluster, HBASE_ENV, new
HashMapString, String(), removes, false,
ambari git commit: AMBARI-12902 Stack meta for JDK support on back-end (dsen)
Repository: ambari
Updated Branches:
refs/heads/branch-2.1 3d4cc38a6 - fbb6a14a0
AMBARI-12902 Stack meta for JDK support on back-end (dsen)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/fbb6a14a
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/fbb6a14a
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/fbb6a14a
Branch: refs/heads/branch-2.1
Commit: fbb6a14a03e38fd12ce4c58657da61e9475a881c
Parents: 3d4cc38
Author: Dmytro Sen d...@apache.org
Authored: Thu Aug 27 16:48:18 2015 +0300
Committer: Dmytro Sen d...@apache.org
Committed: Thu Aug 27 16:48:18 2015 +0300
--
.../controller/RootServiceResponseFactory.java | 1 +
.../server/controller/StackVersionResponse.java | 23 +++-
.../internal/StackVersionResourceProvider.java | 8 +++
.../apache/ambari/server/stack/StackModule.java | 2 ++
.../apache/ambari/server/state/StackInfo.java | 21 +-
.../server/state/stack/StackMetainfoXml.java| 16 +-
.../main/resources/stacks/HDP/2.0/metainfo.xml | 2 ++
.../main/resources/stacks/HDP/2.1/metainfo.xml | 2 ++
.../main/resources/stacks/HDP/2.2/metainfo.xml | 2 ++
.../main/resources/stacks/HDP/2.3/metainfo.xml | 2 ++
.../RootServiceResponseFactoryTest.java | 5 +++--
11 files changed, 79 insertions(+), 5 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/fbb6a14a/ambari-server/src/main/java/org/apache/ambari/server/controller/RootServiceResponseFactory.java
--
diff --git
a/ambari-server/src/main/java/org/apache/ambari/server/controller/RootServiceResponseFactory.java
b/ambari-server/src/main/java/org/apache/ambari/server/controller/RootServiceResponseFactory.java
index e0dbe2c..6bb68b6 100644
---
a/ambari-server/src/main/java/org/apache/ambari/server/controller/RootServiceResponseFactory.java
+++
b/ambari-server/src/main/java/org/apache/ambari/server/controller/RootServiceResponseFactory.java
@@ -158,6 +158,7 @@ public class RootServiceResponseFactory extends
case AMBARI_SERVER:
response = configs.getAmbariProperties();
response.put(JDK_LOCATION, managementController.getJdkResourceUrl());
+response.put(java.version,
System.getProperty(java.specification.version));
break;
default:
http://git-wip-us.apache.org/repos/asf/ambari/blob/fbb6a14a/ambari-server/src/main/java/org/apache/ambari/server/controller/StackVersionResponse.java
--
diff --git
a/ambari-server/src/main/java/org/apache/ambari/server/controller/StackVersionResponse.java
b/ambari-server/src/main/java/org/apache/ambari/server/controller/StackVersionResponse.java
index 005b8a1..b14826a 100644
---
a/ambari-server/src/main/java/org/apache/ambari/server/controller/StackVersionResponse.java
+++
b/ambari-server/src/main/java/org/apache/ambari/server/controller/StackVersionResponse.java
@@ -29,6 +29,25 @@ import org.apache.ambari.server.stack.Validable;
public class StackVersionResponse implements Validable{
+ private String minJdk;
+ private String maxJdk;
+
+ public String getMinJdk() {
+return minJdk;
+ }
+
+ public void setMinJdk(String minJdk) {
+this.minJdk = minJdk;
+ }
+
+ public String getMaxJdk() {
+return maxJdk;
+ }
+
+ public void setMaxJdk(String maxJdk) {
+this.maxJdk = maxJdk;
+ }
+
private String stackName;
private String stackVersion;
private String minUpgradeVersion;
@@ -57,7 +76,7 @@ public class StackVersionResponse implements Validable{
MapString, MapString, MapString, String
configTypes,
File stackKerberosDescriptorFile,
CollectionFile serviceKerberosDescriptorFiles,
- SetString upgradePacks, boolean valid,
Collection errorSet) {
+ SetString upgradePacks, boolean valid,
Collection errorSet, String minJdk, String maxJdk) {
setStackVersion(stackVersion);
setMinUpgradeVersion(minUpgradeVersion);
setActive(active);
@@ -68,6 +87,8 @@ public class StackVersionResponse implements Validable{
setUpgradePacks(upgradePacks);
setValid(valid);
setErrors(errorSet);
+setMinJdk(minJdk);
+setMaxJdk(maxJdk);
}
@Override
http://git-wip-us.apache.org/repos/asf/ambari/blob/fbb6a14a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/StackVersionResourceProvider.java
--
diff --git
a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/StackVersionResourceProvider.java
[2/2] ambari git commit: AMBARI-12898. Configure dfs.content-summary.limit to 5000 by default. (aonishuk)
AMBARI-12898. Configure dfs.content-summary.limit to 5000 by default. (aonishuk) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/69307276 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/69307276 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/69307276 Branch: refs/heads/branch-2.1 Commit: 69307276b73225adc868b313f53a100a38ac40b3 Parents: 8579b7b Author: Andrew Onishuk aonis...@hortonworks.com Authored: Thu Aug 27 15:38:51 2015 +0300 Committer: Andrew Onishuk aonis...@hortonworks.com Committed: Thu Aug 27 15:38:51 2015 +0300 -- .../stacks/HDP/2.2/services/HDFS/configuration/hdfs-site.xml | 6 ++ 1 file changed, 6 insertions(+) -- http://git-wip-us.apache.org/repos/asf/ambari/blob/69307276/ambari-server/src/main/resources/stacks/HDP/2.2/services/HDFS/configuration/hdfs-site.xml -- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.2/services/HDFS/configuration/hdfs-site.xml b/ambari-server/src/main/resources/stacks/HDP/2.2/services/HDFS/configuration/hdfs-site.xml index ee5566b..c1ff588 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.2/services/HDFS/configuration/hdfs-site.xml +++ b/ambari-server/src/main/resources/stacks/HDP/2.2/services/HDFS/configuration/hdfs-site.xml @@ -41,6 +41,12 @@ /property property +namedfs.content-summary.limit/name +value5000/value +descriptionDfs content summary limit./description + /property + + property namedfs.encryption.key.provider.uri/name value/value depends-on
[1/2] ambari git commit: AMBARI-12898. Configure dfs.content-summary.limit to 5000 by default. (aonishuk)
Repository: ambari Updated Branches: refs/heads/branch-2.1 8579b7bf9 - 69307276b refs/heads/trunk a54812b44 - 2ec1f8558 AMBARI-12898. Configure dfs.content-summary.limit to 5000 by default. (aonishuk) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/2ec1f855 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/2ec1f855 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/2ec1f855 Branch: refs/heads/trunk Commit: 2ec1f8558283f64cde6bab32032bdf07778d3255 Parents: a54812b Author: Andrew Onishuk aonis...@hortonworks.com Authored: Thu Aug 27 15:38:47 2015 +0300 Committer: Andrew Onishuk aonis...@hortonworks.com Committed: Thu Aug 27 15:38:47 2015 +0300 -- .../stacks/HDP/2.2/services/HDFS/configuration/hdfs-site.xml | 6 ++ 1 file changed, 6 insertions(+) -- http://git-wip-us.apache.org/repos/asf/ambari/blob/2ec1f855/ambari-server/src/main/resources/stacks/HDP/2.2/services/HDFS/configuration/hdfs-site.xml -- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.2/services/HDFS/configuration/hdfs-site.xml b/ambari-server/src/main/resources/stacks/HDP/2.2/services/HDFS/configuration/hdfs-site.xml index ee5566b..c1ff588 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.2/services/HDFS/configuration/hdfs-site.xml +++ b/ambari-server/src/main/resources/stacks/HDP/2.2/services/HDFS/configuration/hdfs-site.xml @@ -41,6 +41,12 @@ /property property +namedfs.content-summary.limit/name +value5000/value +descriptionDfs content summary limit./description + /property + + property namedfs.encryption.key.provider.uri/name value/value depends-on
[2/2] ambari git commit: AMBARI-12901. Ambari Headless principal for Storm should include cluster-name (aonishuk)
AMBARI-12901. Ambari Headless principal for Storm should include cluster-name
(aonishuk)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/3d4cc38a
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/3d4cc38a
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/3d4cc38a
Branch: refs/heads/branch-2.1
Commit: 3d4cc38a646de6b70bbfadeabb0a512484286f89
Parents: 25ed4ef
Author: Andrew Onishuk aonis...@hortonworks.com
Authored: Thu Aug 27 15:58:07 2015 +0300
Committer: Andrew Onishuk aonis...@hortonworks.com
Committed: Thu Aug 27 15:58:07 2015 +0300
--
.../main/resources/common-services/STORM/0.9.1.2.1/kerberos.json | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/3d4cc38a/ambari-server/src/main/resources/common-services/STORM/0.9.1.2.1/kerberos.json
--
diff --git
a/ambari-server/src/main/resources/common-services/STORM/0.9.1.2.1/kerberos.json
b/ambari-server/src/main/resources/common-services/STORM/0.9.1.2.1/kerberos.json
index c96d7e7..db21f51 100644
---
a/ambari-server/src/main/resources/common-services/STORM/0.9.1.2.1/kerberos.json
+++
b/ambari-server/src/main/resources/common-services/STORM/0.9.1.2.1/kerberos.json
@@ -40,8 +40,8 @@
supervisor.enable: true,
storm.zookeeper.superACL: sasl:{{storm_bare_jaas_principal}},
java.security.auth.login.config: {{conf_dir}}/storm_jaas.conf,
-nimbus.admins: ['{{storm_user}}'],
-nimbus.supervisor.users: ['{{storm_user}}'],
+nimbus.admins: ['{{storm_bare_jaas_principal}}'],
+nimbus.supervisor.users: ['{{storm_bare_jaas_principal}}'],
ui.filter.params: {'type': 'kerberos', 'kerberos.principal':
'{{storm_ui_jaas_principal}}', 'kerberos.keytab': '{{storm_ui_keytab_path}}',
'kerberos.name.rules': 'DEFAULT'}
}
}
ambari git commit: AMBARI-12895 After upgrading Ambari to 2.1, hbase.bucketcache.size value has an m added to it preventing region servers from starting (dsen)
Repository: ambari
Updated Branches:
refs/heads/branch-2.1 7184571c3 - 25ed4efcc
AMBARI-12895 After upgrading Ambari to 2.1, hbase.bucketcache.size value has an
m added to it preventing region servers from starting (dsen)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/25ed4efc
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/25ed4efc
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/25ed4efc
Branch: refs/heads/branch-2.1
Commit: 25ed4efcca5479b4768d34b2203891212acd3b85
Parents: 7184571
Author: Dmytro Sen d...@apache.org
Authored: Thu Aug 27 15:53:18 2015 +0300
Committer: Dmytro Sen d...@apache.org
Committed: Thu Aug 27 15:55:32 2015 +0300
--
.../server/upgrade/UpgradeCatalog210.java | 2 +-
.../server/upgrade/UpgradeCatalog212.java | 27
.../server/upgrade/UpgradeCatalog212Test.java | 17 +++-
3 files changed, 39 insertions(+), 7 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/25ed4efc/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog210.java
--
diff --git
a/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog210.java
b/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog210.java
index f5a4d28..1981514 100644
---
a/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog210.java
+++
b/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog210.java
@@ -1680,7 +1680,7 @@ public class UpgradeCatalog210 extends
AbstractUpgradeCatalog {
final int regionserver_max_direct_memory_size =
regionserver_total_ram - regionserver_heap_size;
final int bucketcache_offheap_memory =
regionserver_max_direct_memory_size - reserved_offheap_memory;
-hbaseSiteProps.put(hbase.bucketcache.size, block_cache_heap
+ bucketcache_offheap_memory + m);
+hbaseSiteProps.put(hbase.bucketcache.size,
String.valueOf(block_cache_heap + bucketcache_offheap_memory));
hbaseSiteProps.put(hbase.bucketcache.ioengine, offheap);
hbaseEnvProps.put(hbase_max_direct_memory_size,
String.valueOf(regionserver_max_direct_memory_size));
} else {
http://git-wip-us.apache.org/repos/asf/ambari/blob/25ed4efc/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog212.java
--
diff --git
a/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog212.java
b/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog212.java
index 51ea8f7..02df181 100644
---
a/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog212.java
+++
b/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog212.java
@@ -53,6 +53,9 @@ import java.util.regex.Matcher;
public class UpgradeCatalog212 extends AbstractUpgradeCatalog {
private static final String HIVE_SITE = hive-site;
private static final String HIVE_ENV = hive-env;
+ private static final String HBASE_ENV = hbase-env;
+ private static final String HBASE_SITE = hbase-site;
+ private static final String CLUSTER_ENV = cluster-env;
/**
* Logger.
@@ -134,20 +137,34 @@ public class UpgradeCatalog212 extends
AbstractUpgradeCatalog {
if ((clusterMap != null) !clusterMap.isEmpty()) {
// Iterate through the clusters and perform any configuration updates
for (final Cluster cluster : clusterMap.values()) {
- Config config = cluster.getDesiredConfigByType(hbase-env);
+ Config hbaseEnvProps = cluster.getDesiredConfigByType(HBASE_ENV);
+ Config hbaseSiteProps = cluster.getDesiredConfigByType(HBASE_SITE);
- if (config != null) {
+ if (hbaseEnvProps != null) {
// Remove override_hbase_uid from hbase-env and add override_uid
to cluster-env
-String value = config.getProperties().get(override_hbase_uid);
+String value =
hbaseEnvProps.getProperties().get(override_hbase_uid);
if (value != null) {
MapString, String updates = new HashMapString, String();
SetString removes = new HashSetString();
updates.put(override_uid, value);
removes.add(override_hbase_uid);
- updateConfigurationPropertiesForCluster(cluster, hbase-env,
new HashMapString, String(), removes, false, true);
- updateConfigurationPropertiesForCluster(cluster, cluster-env,
updates, true, false);
+ updateConfigurationPropertiesForCluster(cluster, HBASE_ENV, new
HashMapString, String(),
ambari git commit: AMBARI-12902 Stack meta for JDK support on back-end (dsen)
Repository: ambari
Updated Branches:
refs/heads/trunk e0a78028b - d02fa7616
AMBARI-12902 Stack meta for JDK support on back-end (dsen)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/d02fa761
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/d02fa761
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/d02fa761
Branch: refs/heads/trunk
Commit: d02fa761665b896d87751294471c3054d5a294f2
Parents: e0a7802
Author: Dmytro Sen d...@apache.org
Authored: Thu Aug 27 16:46:00 2015 +0300
Committer: Dmytro Sen d...@apache.org
Committed: Thu Aug 27 16:46:00 2015 +0300
--
.../controller/RootServiceResponseFactory.java | 1 +
.../server/controller/StackVersionResponse.java | 23 +++-
.../internal/StackVersionResourceProvider.java | 8 +++
.../apache/ambari/server/stack/StackModule.java | 2 ++
.../apache/ambari/server/state/StackInfo.java | 21 +-
.../server/state/stack/StackMetainfoXml.java| 16 +-
.../main/resources/stacks/HDP/2.0/metainfo.xml | 2 ++
.../main/resources/stacks/HDP/2.1/metainfo.xml | 2 ++
.../main/resources/stacks/HDP/2.2/metainfo.xml | 2 ++
.../main/resources/stacks/HDP/2.3/metainfo.xml | 2 ++
.../main/resources/stacks/HDP/2.4/metainfo.xml | 2 ++
.../RootServiceResponseFactoryTest.java | 5 +++--
12 files changed, 81 insertions(+), 5 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/d02fa761/ambari-server/src/main/java/org/apache/ambari/server/controller/RootServiceResponseFactory.java
--
diff --git
a/ambari-server/src/main/java/org/apache/ambari/server/controller/RootServiceResponseFactory.java
b/ambari-server/src/main/java/org/apache/ambari/server/controller/RootServiceResponseFactory.java
index e0dbe2c..6bb68b6 100644
---
a/ambari-server/src/main/java/org/apache/ambari/server/controller/RootServiceResponseFactory.java
+++
b/ambari-server/src/main/java/org/apache/ambari/server/controller/RootServiceResponseFactory.java
@@ -158,6 +158,7 @@ public class RootServiceResponseFactory extends
case AMBARI_SERVER:
response = configs.getAmbariProperties();
response.put(JDK_LOCATION, managementController.getJdkResourceUrl());
+response.put(java.version,
System.getProperty(java.specification.version));
break;
default:
http://git-wip-us.apache.org/repos/asf/ambari/blob/d02fa761/ambari-server/src/main/java/org/apache/ambari/server/controller/StackVersionResponse.java
--
diff --git
a/ambari-server/src/main/java/org/apache/ambari/server/controller/StackVersionResponse.java
b/ambari-server/src/main/java/org/apache/ambari/server/controller/StackVersionResponse.java
index 005b8a1..b14826a 100644
---
a/ambari-server/src/main/java/org/apache/ambari/server/controller/StackVersionResponse.java
+++
b/ambari-server/src/main/java/org/apache/ambari/server/controller/StackVersionResponse.java
@@ -29,6 +29,25 @@ import org.apache.ambari.server.stack.Validable;
public class StackVersionResponse implements Validable{
+ private String minJdk;
+ private String maxJdk;
+
+ public String getMinJdk() {
+return minJdk;
+ }
+
+ public void setMinJdk(String minJdk) {
+this.minJdk = minJdk;
+ }
+
+ public String getMaxJdk() {
+return maxJdk;
+ }
+
+ public void setMaxJdk(String maxJdk) {
+this.maxJdk = maxJdk;
+ }
+
private String stackName;
private String stackVersion;
private String minUpgradeVersion;
@@ -57,7 +76,7 @@ public class StackVersionResponse implements Validable{
MapString, MapString, MapString, String
configTypes,
File stackKerberosDescriptorFile,
CollectionFile serviceKerberosDescriptorFiles,
- SetString upgradePacks, boolean valid,
Collection errorSet) {
+ SetString upgradePacks, boolean valid,
Collection errorSet, String minJdk, String maxJdk) {
setStackVersion(stackVersion);
setMinUpgradeVersion(minUpgradeVersion);
setActive(active);
@@ -68,6 +87,8 @@ public class StackVersionResponse implements Validable{
setUpgradePacks(upgradePacks);
setValid(valid);
setErrors(errorSet);
+setMinJdk(minJdk);
+setMaxJdk(maxJdk);
}
@Override
http://git-wip-us.apache.org/repos/asf/ambari/blob/d02fa761/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/StackVersionResourceProvider.java
--
diff --git
[1/2] ambari git commit: AMBARI-12900. Ambari overrides hot-fixed tez tarball on HDFS everytime HiveServer is restarted (aonishuk)
Repository: ambari
Updated Branches:
refs/heads/branch-2.1 69307276b - 7184571c3
refs/heads/trunk 2ec1f8558 - b0137be7a
AMBARI-12900. Ambari overrides hot-fixed tez tarball on HDFS everytime
HiveServer is restarted (aonishuk)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/b0137be7
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/b0137be7
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/b0137be7
Branch: refs/heads/trunk
Commit: b0137be7ab9e0388e6266b1911976ec253747ac9
Parents: 2ec1f85
Author: Andrew Onishuk aonis...@hortonworks.com
Authored: Thu Aug 27 15:45:57 2015 +0300
Committer: Andrew Onishuk aonis...@hortonworks.com
Committed: Thu Aug 27 15:45:57 2015 +0300
--
.../resource_management/libraries/functions/copy_tarball.py | 5 +++--
.../resource_management/libraries/providers/hdfs_resource.py| 3 +++
.../resource_management/libraries/resources/hdfs_resource.py| 4
3 files changed, 10 insertions(+), 2 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/b0137be7/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 ad4aadc..792f019 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
@@ -96,7 +96,7 @@ def _get_single_version_from_hdp_select():
return hdp_version
def copy_to_hdfs(name, user_group, owner, file_mode=0444,
custom_source_file=None, custom_dest_file=None, force_execute=False,
- use_ru_version_during_ru=True):
+ use_ru_version_during_ru=True, replace_existing_files=False):
:param name: Tarball name, e.g., tez, hive, pig, sqoop.
:param user_group: Group to own the directory.
@@ -190,7 +190,8 @@ def copy_to_hdfs(name, user_group, owner, file_mode=0444,
custom_source_file=Non
source=source_file,
group=user_group,
owner=owner,
- mode=0444
+ mode=0444,
+ replace_existing_files=replace_existing_files,
)
Logger.info(Will attempt to copy {0} tarball from {1} to DFS at
{2}..format(name, source_file, dest_file))
http://git-wip-us.apache.org/repos/asf/ambari/blob/b0137be7/ambari-common/src/main/python/resource_management/libraries/providers/hdfs_resource.py
--
diff --git
a/ambari-common/src/main/python/resource_management/libraries/providers/hdfs_resource.py
b/ambari-common/src/main/python/resource_management/libraries/providers/hdfs_resource.py
index cb6fb21..1d1aeba 100644
---
a/ambari-common/src/main/python/resource_management/libraries/providers/hdfs_resource.py
+++
b/ambari-common/src/main/python/resource_management/libraries/providers/hdfs_resource.py
@@ -301,6 +301,9 @@ class HdfsResourceWebHDFS:
if local_file_size == length:
Logger.info(format(DFS file {target} is identical to {source},
skipping the copying))
return
+elif not self.main_resource.resource.replace_existing_files:
+ Logger.info(format(Not replacing existing DFS file {target} which
is different from {source}, due to replace_existing_files=False))
+ return
else:
Logger.info(format(File {target} already exists in DFS, skipping the
creation))
return
http://git-wip-us.apache.org/repos/asf/ambari/blob/b0137be7/ambari-common/src/main/python/resource_management/libraries/resources/hdfs_resource.py
--
diff --git
a/ambari-common/src/main/python/resource_management/libraries/resources/hdfs_resource.py
b/ambari-common/src/main/python/resource_management/libraries/resources/hdfs_resource.py
index 3a991b0..69aeab0 100644
---
a/ambari-common/src/main/python/resource_management/libraries/resources/hdfs_resource.py
+++
b/ambari-common/src/main/python/resource_management/libraries/resources/hdfs_resource.py
@@ -63,6 +63,10 @@ class HdfsResource(Resource):
recursive_chown = BooleanArgument(default=False)
recursive_chmod = BooleanArgument(default=False)
change_permissions_for_parents = BooleanArgument(default=False)
+
+ If a file present in HDFS is different from source, should it be replaced?
+
+ replace_existing_files = BooleanArgument(default=True)
security_enabled = BooleanArgument(default=False)
principal_name =
[2/2] ambari git commit: AMBARI-12900. Ambari overrides hot-fixed tez tarball on HDFS everytime HiveServer is restarted (aonishuk)
AMBARI-12900. Ambari overrides hot-fixed tez tarball on HDFS everytime
HiveServer is restarted (aonishuk)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/7184571c
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/7184571c
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/7184571c
Branch: refs/heads/branch-2.1
Commit: 7184571c3dff60c85fd7983c27dc638f0eb80c84
Parents: 6930727
Author: Andrew Onishuk aonis...@hortonworks.com
Authored: Thu Aug 27 15:45:59 2015 +0300
Committer: Andrew Onishuk aonis...@hortonworks.com
Committed: Thu Aug 27 15:45:59 2015 +0300
--
.../resource_management/libraries/functions/copy_tarball.py | 5 +++--
.../resource_management/libraries/providers/hdfs_resource.py| 3 +++
.../resource_management/libraries/resources/hdfs_resource.py| 4
3 files changed, 10 insertions(+), 2 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/7184571c/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 ad4aadc..792f019 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
@@ -96,7 +96,7 @@ def _get_single_version_from_hdp_select():
return hdp_version
def copy_to_hdfs(name, user_group, owner, file_mode=0444,
custom_source_file=None, custom_dest_file=None, force_execute=False,
- use_ru_version_during_ru=True):
+ use_ru_version_during_ru=True, replace_existing_files=False):
:param name: Tarball name, e.g., tez, hive, pig, sqoop.
:param user_group: Group to own the directory.
@@ -190,7 +190,8 @@ def copy_to_hdfs(name, user_group, owner, file_mode=0444,
custom_source_file=Non
source=source_file,
group=user_group,
owner=owner,
- mode=0444
+ mode=0444,
+ replace_existing_files=replace_existing_files,
)
Logger.info(Will attempt to copy {0} tarball from {1} to DFS at
{2}..format(name, source_file, dest_file))
http://git-wip-us.apache.org/repos/asf/ambari/blob/7184571c/ambari-common/src/main/python/resource_management/libraries/providers/hdfs_resource.py
--
diff --git
a/ambari-common/src/main/python/resource_management/libraries/providers/hdfs_resource.py
b/ambari-common/src/main/python/resource_management/libraries/providers/hdfs_resource.py
index cb6fb21..1d1aeba 100644
---
a/ambari-common/src/main/python/resource_management/libraries/providers/hdfs_resource.py
+++
b/ambari-common/src/main/python/resource_management/libraries/providers/hdfs_resource.py
@@ -301,6 +301,9 @@ class HdfsResourceWebHDFS:
if local_file_size == length:
Logger.info(format(DFS file {target} is identical to {source},
skipping the copying))
return
+elif not self.main_resource.resource.replace_existing_files:
+ Logger.info(format(Not replacing existing DFS file {target} which
is different from {source}, due to replace_existing_files=False))
+ return
else:
Logger.info(format(File {target} already exists in DFS, skipping the
creation))
return
http://git-wip-us.apache.org/repos/asf/ambari/blob/7184571c/ambari-common/src/main/python/resource_management/libraries/resources/hdfs_resource.py
--
diff --git
a/ambari-common/src/main/python/resource_management/libraries/resources/hdfs_resource.py
b/ambari-common/src/main/python/resource_management/libraries/resources/hdfs_resource.py
index 3a991b0..69aeab0 100644
---
a/ambari-common/src/main/python/resource_management/libraries/resources/hdfs_resource.py
+++
b/ambari-common/src/main/python/resource_management/libraries/resources/hdfs_resource.py
@@ -63,6 +63,10 @@ class HdfsResource(Resource):
recursive_chown = BooleanArgument(default=False)
recursive_chmod = BooleanArgument(default=False)
change_permissions_for_parents = BooleanArgument(default=False)
+
+ If a file present in HDFS is different from source, should it be replaced?
+
+ replace_existing_files = BooleanArgument(default=True)
security_enabled = BooleanArgument(default=False)
principal_name = ResourceArgument()
ambari git commit: AMBARI-12897. SQLA: Hive Metastore fails after start + stack advisor potential problem.(vbrodetskyi)
Repository: ambari
Updated Branches:
refs/heads/trunk d02fa7616 - a71c52838
AMBARI-12897. SQLA: Hive Metastore fails after start + stack advisor potential
problem.(vbrodetskyi)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/a71c5283
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/a71c5283
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/a71c5283
Branch: refs/heads/trunk
Commit: a71c52838207b2846cb04e02ce34d80aea44a206
Parents: d02fa76
Author: Vitaly Brodetskyi vbrodets...@hortonworks.com
Authored: Thu Aug 27 21:15:42 2015 +0300
Committer: Vitaly Brodetskyi vbrodets...@hortonworks.com
Committed: Thu Aug 27 21:15:42 2015 +0300
--
.../src/main/resources/stacks/HDP/2.3/services/stack_advisor.py | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/a71c5283/ambari-server/src/main/resources/stacks/HDP/2.3/services/stack_advisor.py
--
diff --git
a/ambari-server/src/main/resources/stacks/HDP/2.3/services/stack_advisor.py
b/ambari-server/src/main/resources/stacks/HDP/2.3/services/stack_advisor.py
index 9a6602a..2d07726 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.3/services/stack_advisor.py
+++ b/ambari-server/src/main/resources/stacks/HDP/2.3/services/stack_advisor.py
@@ -161,7 +161,6 @@ class HDP23StackAdvisor(HDP22StackAdvisor):
super(HDP23StackAdvisor, self).recommendHIVEConfigurations(configurations,
clusterData, services, hosts)
putHiveSiteProperty = self.putProperty(configurations, hive-site,
services)
putHiveServerProperty = self.putProperty(configurations,
hiveserver2-site, services)
-hive_site_properties = getSiteProperties(configurations, hive-site)
putHiveSitePropertyAttribute = self.putPropertyAttribute(configurations,
hive-site)
servicesList = [service[StackServices][service_name] for service in
services[services]]
# hive_security_authorization == 'ranger'
@@ -181,8 +180,8 @@ class HDP23StackAdvisor(HDP22StackAdvisor):
putHiveSiteProperty('hive.tez.java.opts', -server
-Djava.net.preferIPv4Stack=true -XX:NewRatio=8 -XX:+UseNUMA + jvmGCParams +
-XX:+PrintGCDetails -verbose:gc -XX:+PrintGCTimeStamps)
# if hive using sqla db, then we should add DataNucleus property
-sqla_db_used = 'javax.jdo.option.ConnectionDriverName' in
hive_site_properties and \
-
hive_site_properties['javax.jdo.option.ConnectionDriverName'] ==
'sap.jdbc4.sqlanywhere.IDriver'
+sqla_db_used = 'hive-site' in services['configurations'] and
'javax.jdo.option.ConnectionDriverName' in
services['configurations']['hive-site']['properties'] and \
+
services['configurations']['hive-site']['properties']['javax.jdo.option.ConnectionDriverName']
== 'sap.jdbc4.sqlanywhere.IDriver'
if sqla_db_used:
putHiveSiteProperty('datanucleus.rdbms.datastoreAdapterClassName','org.datanucleus.store.rdbms.adapter.SQLAnywhereAdapter')
else:
ambari git commit: AMBARI-12897. SQLA: Hive Metastore fails after start + stack advisor potential problem.(vbrodetskyi)
Repository: ambari
Updated Branches:
refs/heads/branch-2.1 fbb6a14a0 - 21076cf31
AMBARI-12897. SQLA: Hive Metastore fails after start + stack advisor potential
problem.(vbrodetskyi)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/21076cf3
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/21076cf3
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/21076cf3
Branch: refs/heads/branch-2.1
Commit: 21076cf317dfb0563a6aa86c4ee4d46850f0024b
Parents: fbb6a14
Author: Vitaly Brodetskyi vbrodets...@hortonworks.com
Authored: Thu Aug 27 21:14:45 2015 +0300
Committer: Vitaly Brodetskyi vbrodets...@hortonworks.com
Committed: Thu Aug 27 21:14:45 2015 +0300
--
.../src/main/resources/stacks/HDP/2.3/services/stack_advisor.py | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/21076cf3/ambari-server/src/main/resources/stacks/HDP/2.3/services/stack_advisor.py
--
diff --git
a/ambari-server/src/main/resources/stacks/HDP/2.3/services/stack_advisor.py
b/ambari-server/src/main/resources/stacks/HDP/2.3/services/stack_advisor.py
index 9a6602a..2d07726 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.3/services/stack_advisor.py
+++ b/ambari-server/src/main/resources/stacks/HDP/2.3/services/stack_advisor.py
@@ -161,7 +161,6 @@ class HDP23StackAdvisor(HDP22StackAdvisor):
super(HDP23StackAdvisor, self).recommendHIVEConfigurations(configurations,
clusterData, services, hosts)
putHiveSiteProperty = self.putProperty(configurations, hive-site,
services)
putHiveServerProperty = self.putProperty(configurations,
hiveserver2-site, services)
-hive_site_properties = getSiteProperties(configurations, hive-site)
putHiveSitePropertyAttribute = self.putPropertyAttribute(configurations,
hive-site)
servicesList = [service[StackServices][service_name] for service in
services[services]]
# hive_security_authorization == 'ranger'
@@ -181,8 +180,8 @@ class HDP23StackAdvisor(HDP22StackAdvisor):
putHiveSiteProperty('hive.tez.java.opts', -server
-Djava.net.preferIPv4Stack=true -XX:NewRatio=8 -XX:+UseNUMA + jvmGCParams +
-XX:+PrintGCDetails -verbose:gc -XX:+PrintGCTimeStamps)
# if hive using sqla db, then we should add DataNucleus property
-sqla_db_used = 'javax.jdo.option.ConnectionDriverName' in
hive_site_properties and \
-
hive_site_properties['javax.jdo.option.ConnectionDriverName'] ==
'sap.jdbc4.sqlanywhere.IDriver'
+sqla_db_used = 'hive-site' in services['configurations'] and
'javax.jdo.option.ConnectionDriverName' in
services['configurations']['hive-site']['properties'] and \
+
services['configurations']['hive-site']['properties']['javax.jdo.option.ConnectionDriverName']
== 'sap.jdbc4.sqlanywhere.IDriver'
if sqla_db_used:
putHiveSiteProperty('datanucleus.rdbms.datastoreAdapterClassName','org.datanucleus.store.rdbms.adapter.SQLAnywhereAdapter')
else:
[1/2] ambari git commit: AMBARI-12889 - Distribute Repository For Upgrade With Unhealthy Hosts (jonathanhurley)
Repository: ambari
Updated Branches:
refs/heads/trunk a71c52838 - 59dd207c3
AMBARI-12889 - Distribute Repository For Upgrade With Unhealthy Hosts
(jonathanhurley)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/3b5efe48
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/3b5efe48
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/3b5efe48
Branch: refs/heads/trunk
Commit: 3b5efe48706f34ad5f89290d45ae16980237d5ce
Parents: a71c528
Author: Jonathan Hurley jhur...@hortonworks.com
Authored: Wed Aug 26 17:10:45 2015 -0400
Committer: Jonathan Hurley jhur...@hortonworks.com
Committed: Thu Aug 27 15:22:57 2015 -0400
--
.../ClusterStackVersionResourceProvider.java| 74 ++--
.../org/apache/ambari/server/state/Cluster.java | 24 +--
.../server/state/cluster/ClusterImpl.java | 42 +--
...ClusterStackVersionResourceProviderTest.java | 10 ++-
.../server/state/cluster/ClusterTest.java | 71 +--
5 files changed, 164 insertions(+), 57 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/3b5efe48/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ClusterStackVersionResourceProvider.java
--
diff --git
a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ClusterStackVersionResourceProvider.java
b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ClusterStackVersionResourceProvider.java
index 2f3e959..a942c93 100644
---
a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ClusterStackVersionResourceProvider.java
+++
b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ClusterStackVersionResourceProvider.java
@@ -20,6 +20,7 @@ package org.apache.ambari.server.controller.internal;
import static
org.apache.ambari.server.agent.ExecutionCommand.KeyNames.JDK_LOCATION;
import java.util.ArrayList;
+import java.util.Collection;
import java.util.Collections;
import java.util.HashMap;
import java.util.HashSet;
@@ -69,8 +70,10 @@ import
org.apache.ambari.server.orm.entities.RepositoryVersionEntity;
import org.apache.ambari.server.orm.entities.StackEntity;
import org.apache.ambari.server.serveraction.upgrades.FinalizeUpgradeAction;
import org.apache.ambari.server.state.Cluster;
+import org.apache.ambari.server.state.Clusters;
import org.apache.ambari.server.state.ComponentInfo;
import org.apache.ambari.server.state.Host;
+import org.apache.ambari.server.state.MaintenanceState;
import org.apache.ambari.server.state.RepositoryVersionState;
import org.apache.ambari.server.state.ServiceComponentHost;
import org.apache.ambari.server.state.ServiceInfo;
@@ -300,17 +303,19 @@ public class ClusterStackVersionResourceProvider extends
AbstractControllerResou
desiredRepoVersion = (String)
propertyMap.get(CLUSTER_STACK_VERSION_REPOSITORY_VERSION_PROPERTY_ID);
Cluster cluster;
-MapString, Host hostsForCluster;
-
AmbariManagementController managementController =
getManagementController();
AmbariMetaInfo ami = managementController.getAmbariMetaInfo();
+
try {
- cluster = managementController.getClusters().getCluster(clName);
- hostsForCluster =
managementController.getClusters().getHostsForCluster(clName);
+ Clusters clusters = managementController.getClusters();
+ cluster = clusters.getCluster(clName);
} catch (AmbariException e) {
throw new NoSuchParentResourceException(e.getMessage(), e);
}
+// get all of the host eligible for stack distribution
+ListHost hosts = getHostsForStackDistribution(cluster);
+
final StackId stackId;
if (propertyMap.containsKey(CLUSTER_STACK_VERSION_STACK_PROPERTY_ID)
propertyMap.containsKey(CLUSTER_STACK_VERSION_VERSION_PROPERTY_ID)) {
@@ -350,13 +355,13 @@ public class ClusterStackVersionResourceProvider extends
AbstractControllerResou
RequestStageContainer req = createRequest();
-IteratorHost hostsForClusterIter = hostsForCluster.values().iterator();
+IteratorHost hostIterator = hosts.iterator();
MapString, String hostLevelParams = new HashMapString, String();
hostLevelParams.put(JDK_LOCATION,
getManagementController().getJdkResourceUrl());
String hostParamsJson = StageUtils.getGson().toJson(hostLevelParams);
int maxTasks = configuration.getAgentPackageParallelCommandsLimit();
-int hostCount = hostsForCluster.size();
+int hostCount = hosts.size();
int batchCount = (int) (Math.ceil((double)hostCount / maxTasks));
ArrayListHost directTransitions = new ArrayListHost();
@@ -394,8 +399,8 @@ public class ClusterStackVersionResourceProvider extends
[2/2] ambari git commit: AMBARI-12903 - Pre-Req Checks Should Only Warn On Unhealthy Slave Hosts Not In MM (jonathanhurley)
AMBARI-12903 - Pre-Req Checks Should Only Warn On Unhealthy Slave Hosts Not In
MM (jonathanhurley)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/59dd207c
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/59dd207c
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/59dd207c
Branch: refs/heads/trunk
Commit: 59dd207c39968df161341568f7538b9e3a990de2
Parents: 3b5efe4
Author: Jonathan Hurley jhur...@hortonworks.com
Authored: Thu Aug 27 12:04:24 2015 -0400
Committer: Jonathan Hurley jhur...@hortonworks.com
Committed: Thu Aug 27 15:22:58 2015 -0400
--
.../ambari/server/checks/CheckDescription.java | 4 +-
.../server/checks/HostsHeartbeatCheck.java | 58 +---
.../checks/HostsRepositoryVersionCheck.java | 73 +++-
.../server/checks/HostsHeartbeatCheckTest.java | 27 ++--
4 files changed, 111 insertions(+), 51 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/59dd207c/ambari-server/src/main/java/org/apache/ambari/server/checks/CheckDescription.java
--
diff --git
a/ambari-server/src/main/java/org/apache/ambari/server/checks/CheckDescription.java
b/ambari-server/src/main/java/org/apache/ambari/server/checks/CheckDescription.java
index 5cfbb47..7151b0e 100644
---
a/ambari-server/src/main/java/org/apache/ambari/server/checks/CheckDescription.java
+++
b/ambari-server/src/main/java/org/apache/ambari/server/checks/CheckDescription.java
@@ -41,7 +41,9 @@ public enum CheckDescription {
All hosts must be heartbeating with the Ambari Server unless they are
in Maintenance Mode,
new HashMapString, String() {{
put(AbstractCheckDescriptor.DEFAULT,
-The following hosts must be heartbeating to the Ambari Server:
{{fails}}.);
+The following hosts must be heartbeating to the Ambari Server or
be put into maintenance mode.);
+put(HostsHeartbeatCheck.KEY_HOSTS_IN_MM_WARNING,
+The following hosts are in maintenance mode and will not be a
part of the upgrade.);
}}),
HOSTS_MASTER_MAINTENANCE(PrereqCheckType.HOST,
http://git-wip-us.apache.org/repos/asf/ambari/blob/59dd207c/ambari-server/src/main/java/org/apache/ambari/server/checks/HostsHeartbeatCheck.java
--
diff --git
a/ambari-server/src/main/java/org/apache/ambari/server/checks/HostsHeartbeatCheck.java
b/ambari-server/src/main/java/org/apache/ambari/server/checks/HostsHeartbeatCheck.java
index 6076a32..a8600c4 100644
---
a/ambari-server/src/main/java/org/apache/ambari/server/checks/HostsHeartbeatCheck.java
+++
b/ambari-server/src/main/java/org/apache/ambari/server/checks/HostsHeartbeatCheck.java
@@ -17,13 +17,13 @@
*/
package org.apache.ambari.server.checks;
-import java.util.Map;
+import java.util.Collection;
import org.apache.ambari.server.AmbariException;
import org.apache.ambari.server.controller.PrereqCheckRequest;
import org.apache.ambari.server.state.Cluster;
import org.apache.ambari.server.state.Host;
-import org.apache.ambari.server.state.HostHealthStatus;
+import org.apache.ambari.server.state.HostHealthStatus.HealthStatus;
import org.apache.ambari.server.state.MaintenanceState;
import org.apache.ambari.server.state.stack.PrereqCheckStatus;
import org.apache.ambari.server.state.stack.PrerequisiteCheck;
@@ -31,12 +31,23 @@ import
org.apache.ambari.server.state.stack.PrerequisiteCheck;
import com.google.inject.Singleton;
/**
- * Checks that all hosts are either in maintenance mode or heartbeating with
the server.
+ * Checks that all hosts are heartbeating with the Ambari Server. If there is a
+ * host which is not heartbeating, then it must be in maintenance mode to
+ * prevent a failure of this check.
+ * p/
+ * Hosts that are in maintenance mode will be added to a warning that they will
+ * not be included in the upgrade.
+ * p/
+ * This check will return {@link PrereqCheckStatus#FAIL} if there are hosts not
+ * heartbeating and not in maintenance mode. Otherwise, it will return
+ * {@link PrereqCheckStatus#WARNING} for any hosts in maintenance mode.
*/
@Singleton
@UpgradeCheck(group = UpgradeCheckGroup.LIVELINESS, order = 1.0f)
public class HostsHeartbeatCheck extends AbstractCheckDescriptor {
+ static final String KEY_HOSTS_IN_MM_WARNING = key.hosts.in.mm.warning;
+
/**
* Constructor.
*/
@@ -45,19 +56,48 @@ public class HostsHeartbeatCheck extends
AbstractCheckDescriptor {
}
@Override
- public void perform(PrerequisiteCheck prerequisiteCheck, PrereqCheckRequest
request) throws AmbariException {
+ public void perform(PrerequisiteCheck prerequisiteCheck, PrereqCheckRequest
request)
+ throws AmbariException {
ambari git commit: AMBARI-12908. Add Service wizard: Config changes for installed services does not happen. (jaimin)
Repository: ambari
Updated Branches:
refs/heads/branch-2.1 21076cf31 - 8fd52b286
AMBARI-12908. Add Service wizard: Config changes for installed services does
not happen. (jaimin)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/8fd52b28
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/8fd52b28
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/8fd52b28
Branch: refs/heads/branch-2.1
Commit: 8fd52b286c9b54db92c12a5a4217dbee07253c32
Parents: 21076cf
Author: Jaimin Jetly jai...@hortonworks.com
Authored: Thu Aug 27 16:23:05 2015 -0700
Committer: Jaimin Jetly jai...@hortonworks.com
Committed: Thu Aug 27 16:23:05 2015 -0700
--
ambari-web/app/controllers/wizard.js | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/8fd52b28/ambari-web/app/controllers/wizard.js
--
diff --git a/ambari-web/app/controllers/wizard.js
b/ambari-web/app/controllers/wizard.js
index 883746a..0ce3e95 100644
--- a/ambari-web/app/controllers/wizard.js
+++ b/ambari-web/app/controllers/wizard.js
@@ -883,7 +883,7 @@ App.WizardController =
Em.Controller.extend(App.LocalStorage, App.ThemesMappingM
serviceConfigProperties.push(configProperty);
}, this);
// check for configs that need to update for installed services
- if (installedServiceNames[_content.get('serviceName')]) {
+ if (installedServiceNamesMap[_content.get('serviceName')]) {
// get only modified configs
var configs = _content.get('configs').filter(function (config) {
if (config.get('isNotDefaultValue') || (config.get('savedValue') ===
null)) {
ambari git commit: AMBARI-12908. Add Service wizard: Config changes for installed services does not happen. (jaimin)
Repository: ambari
Updated Branches:
refs/heads/trunk 59dd207c3 - a19c92581
AMBARI-12908. Add Service wizard: Config changes for installed services does
not happen. (jaimin)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/a19c9258
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/a19c9258
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/a19c9258
Branch: refs/heads/trunk
Commit: a19c9258104f6fa767dfc7af2c17872d17d2cb85
Parents: 59dd207
Author: Jaimin Jetly jai...@hortonworks.com
Authored: Thu Aug 27 16:23:05 2015 -0700
Committer: Jaimin Jetly jai...@hortonworks.com
Committed: Thu Aug 27 16:26:08 2015 -0700
--
ambari-web/app/controllers/wizard.js | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/a19c9258/ambari-web/app/controllers/wizard.js
--
diff --git a/ambari-web/app/controllers/wizard.js
b/ambari-web/app/controllers/wizard.js
index 98e8078..5c4ef30 100644
--- a/ambari-web/app/controllers/wizard.js
+++ b/ambari-web/app/controllers/wizard.js
@@ -911,7 +911,7 @@ App.WizardController =
Em.Controller.extend(App.LocalStorage, App.ThemesMappingM
serviceConfigProperties.push(configProperty);
}, this);
// check for configs that need to update for installed services
- if (installedServiceNames[_content.get('serviceName')]) {
+ if (installedServiceNamesMap[_content.get('serviceName')]) {
// get only modified configs
var configs = _content.get('configs').filter(function (config) {
if (config.get('isNotDefaultValue') || (config.get('savedValue') ===
null)) {
ambari git commit: AMBARI-12907: [PluggableStackDefinition] Add support for overriding stack config properties (jluniya)
Repository: ambari
Updated Branches:
refs/heads/trunk 60d3a7613 - b39288aab
AMBARI-12907: [PluggableStackDefinition] Add support for overriding stack
config properties (jluniya)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/b39288aa
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/b39288aa
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/b39288aa
Branch: refs/heads/trunk
Commit: b39288aab9a8d92e35360c376f4b9da97d934c72
Parents: 60d3a76
Author: Jayush Luniya jlun...@hortonworks.com
Authored: Thu Aug 27 20:14:16 2015 -0700
Committer: Jayush Luniya jlun...@hortonworks.com
Committed: Thu Aug 27 20:14:16 2015 -0700
--
.../GenerateStackDefinition.py | 91 +
.../configs/SAPHD.json | 386 +++
2 files changed, 477 insertions(+)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/b39288aa/ambari-common/src/main/python/pluggable_stack_definition/GenerateStackDefinition.py
--
diff --git
a/ambari-common/src/main/python/pluggable_stack_definition/GenerateStackDefinition.py
b/ambari-common/src/main/python/pluggable_stack_definition/GenerateStackDefinition.py
index c09c788..275501d 100644
---
a/ambari-common/src/main/python/pluggable_stack_definition/GenerateStackDefinition.py
+++
b/ambari-common/src/main/python/pluggable_stack_definition/GenerateStackDefinition.py
@@ -375,6 +375,91 @@ def process_py_files(file_path, config_data,
stack_version_changes):
def process_xml_files(file_path, config_data, stack_version_changes):
return process_replacements(file_path, config_data, stack_version_changes)
+def process_config_xml(file_path, config_data):
+ tree = ET.parse(file_path)
+ root = tree.getroot()
+
#
+ #
resource_dir/common-services/service_name/service_version/configuration/config.xml
+
#
+ COMMON_SERVICES_CONFIG_PATH_REGEX =
r'common-services/([A-Za-z_-]+)/([0-9\.]+)/configuration/([A-Za-z0-9_-]+).xml'
+
#
+ #
resource_dir/stacks/stack_name/stack_version/services/service_name/configuration/config.xml
+
#
+ STACK_SERVICE_CONFIG_PATH_REGEX =
r'stacks/([A-Za-z_-]+)/([0-9\.]+)/services/([A-Za-z_-]+)/configuration/([A-Za-z0-9_-]+).xml'
+
#
+ #
resource_dir/stacks/stack_name/stack_version/configuration/config.xml
+
#
+ STACK_CONFIG_PATH_REGEX =
r'stacks/([A-Za-z_-]+)/([0-9\.]+)/configuration/([A-Za-z0-9_-]+).xml'
+
+
#
+ # Override stack config properties
+
#
+ match = re.search(COMMON_SERVICES_CONFIG_PATH_REGEX, file_path)
+ if match:
+
#
+# Config file path in common services
+
#
+path_service_name = match.group(1)
+path_service_version = match.group(2)
+path_config_name = match.group(3)
+if 'common-services' in config_data:
+ for service in config_data['common-services']:
+if service.name == path_service_name:
+ for serviceVersion in service.versions:
+if serviceVersion.version == path_service_version:
+ if 'configurations' in serviceVersion:
+for conf in serviceVersion['configurations']:
+ if conf.name == path_config_name:
+for property_tag in root.findall('property'):
+ property_name = property_tag.find('name').text
+ if property_name in conf.properties:
+value_tag = property_tag.find('value')
+value_tag.text = conf.properties[property_name]
+ else:
+match = re.search(STACK_SERVICE_CONFIG_PATH_REGEX, file_path)
+if match:
+
#
+ # Config file path for a service in stack
+
#
+ path_stack_name =
ambari git commit: AMBARI-12907: [PluggableStackDefinition] Add support for overriding stack config properties (jluniya)
Repository: ambari
Updated Branches:
refs/heads/branch-2.1 ae56a56f8 - 2d9612e9f
AMBARI-12907: [PluggableStackDefinition] Add support for overriding stack
config properties (jluniya)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/2d9612e9
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/2d9612e9
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/2d9612e9
Branch: refs/heads/branch-2.1
Commit: 2d9612e9f446c8df97bcc79369328566b14e264a
Parents: ae56a56
Author: Jayush Luniya jlun...@hortonworks.com
Authored: Thu Aug 27 20:14:16 2015 -0700
Committer: Jayush Luniya jlun...@hortonworks.com
Committed: Thu Aug 27 20:15:13 2015 -0700
--
.../GenerateStackDefinition.py | 91 +
.../configs/SAPHD.json | 386 +++
2 files changed, 477 insertions(+)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/2d9612e9/ambari-common/src/main/python/pluggable_stack_definition/GenerateStackDefinition.py
--
diff --git
a/ambari-common/src/main/python/pluggable_stack_definition/GenerateStackDefinition.py
b/ambari-common/src/main/python/pluggable_stack_definition/GenerateStackDefinition.py
index c09c788..275501d 100644
---
a/ambari-common/src/main/python/pluggable_stack_definition/GenerateStackDefinition.py
+++
b/ambari-common/src/main/python/pluggable_stack_definition/GenerateStackDefinition.py
@@ -375,6 +375,91 @@ def process_py_files(file_path, config_data,
stack_version_changes):
def process_xml_files(file_path, config_data, stack_version_changes):
return process_replacements(file_path, config_data, stack_version_changes)
+def process_config_xml(file_path, config_data):
+ tree = ET.parse(file_path)
+ root = tree.getroot()
+
#
+ #
resource_dir/common-services/service_name/service_version/configuration/config.xml
+
#
+ COMMON_SERVICES_CONFIG_PATH_REGEX =
r'common-services/([A-Za-z_-]+)/([0-9\.]+)/configuration/([A-Za-z0-9_-]+).xml'
+
#
+ #
resource_dir/stacks/stack_name/stack_version/services/service_name/configuration/config.xml
+
#
+ STACK_SERVICE_CONFIG_PATH_REGEX =
r'stacks/([A-Za-z_-]+)/([0-9\.]+)/services/([A-Za-z_-]+)/configuration/([A-Za-z0-9_-]+).xml'
+
#
+ #
resource_dir/stacks/stack_name/stack_version/configuration/config.xml
+
#
+ STACK_CONFIG_PATH_REGEX =
r'stacks/([A-Za-z_-]+)/([0-9\.]+)/configuration/([A-Za-z0-9_-]+).xml'
+
+
#
+ # Override stack config properties
+
#
+ match = re.search(COMMON_SERVICES_CONFIG_PATH_REGEX, file_path)
+ if match:
+
#
+# Config file path in common services
+
#
+path_service_name = match.group(1)
+path_service_version = match.group(2)
+path_config_name = match.group(3)
+if 'common-services' in config_data:
+ for service in config_data['common-services']:
+if service.name == path_service_name:
+ for serviceVersion in service.versions:
+if serviceVersion.version == path_service_version:
+ if 'configurations' in serviceVersion:
+for conf in serviceVersion['configurations']:
+ if conf.name == path_config_name:
+for property_tag in root.findall('property'):
+ property_name = property_tag.find('name').text
+ if property_name in conf.properties:
+value_tag = property_tag.find('value')
+value_tag.text = conf.properties[property_name]
+ else:
+match = re.search(STACK_SERVICE_CONFIG_PATH_REGEX, file_path)
+if match:
+
#
+ # Config file path for a service in stack
+
#
+
ambari git commit: AMBARI-12881 Ambari metrics shows data sparsely. (dsen)
Repository: ambari
Updated Branches:
refs/heads/trunk 34b4f9e26 - a54812b44
AMBARI-12881 Ambari metrics shows data sparsely. (dsen)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/a54812b4
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/a54812b4
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/a54812b4
Branch: refs/heads/trunk
Commit: a54812b44bc38ae9e96f9d7fa654abcfb8aefb34
Parents: 34b4f9e
Author: Dmytro Sen d...@apache.org
Authored: Thu Aug 27 13:23:31 2015 +0300
Committer: Dmytro Sen d...@apache.org
Committed: Thu Aug 27 13:23:31 2015 +0300
--
.../timeline/query/PhoenixTransactSQL.java | 4 +-
.../timeline/TestPhoenixTransactSQL.java| 137 ++-
2 files changed, 137 insertions(+), 4 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/a54812b4/ambari-metrics/ambari-metrics-timelineservice/src/main/java/org/apache/hadoop/yarn/server/applicationhistoryservice/metrics/timeline/query/PhoenixTransactSQL.java
--
diff --git
a/ambari-metrics/ambari-metrics-timelineservice/src/main/java/org/apache/hadoop/yarn/server/applicationhistoryservice/metrics/timeline/query/PhoenixTransactSQL.java
b/ambari-metrics/ambari-metrics-timelineservice/src/main/java/org/apache/hadoop/yarn/server/applicationhistoryservice/metrics/timeline/query/PhoenixTransactSQL.java
index 1aa6204..ef0f4ce 100644
---
a/ambari-metrics/ambari-metrics-timelineservice/src/main/java/org/apache/hadoop/yarn/server/applicationhistoryservice/metrics/timeline/query/PhoenixTransactSQL.java
+++
b/ambari-metrics/ambari-metrics-timelineservice/src/main/java/org/apache/hadoop/yarn/server/applicationhistoryservice/metrics/timeline/query/PhoenixTransactSQL.java
@@ -284,7 +284,7 @@ public class PhoenixTransactSQL {
metricsTable = METRICS_AGGREGATE_DAILY_TABLE_NAME;
query = GET_METRIC_AGGREGATE_ONLY_SQL;
condition.setPrecision(Precision.DAYS);
-} else if (timeRange 7 * DAY timeRange DAY) {
+} else if (timeRange DAY) {
metricsTable = METRICS_AGGREGATE_HOURLY_TABLE_NAME;
query = GET_METRIC_AGGREGATE_ONLY_SQL;
condition.setPrecision(Precision.HOURS);
@@ -534,7 +534,7 @@ public class PhoenixTransactSQL {
metricsAggregateTable = METRICS_CLUSTER_AGGREGATE_DAILY_TABLE_NAME;
queryStmt = GET_CLUSTER_AGGREGATE_TIME_SQL;
condition.setPrecision(Precision.DAYS);
- } else if (timeRange 7 * DAY timeRange DAY) {
+ } else if (timeRange DAY) {
metricsAggregateTable = METRICS_CLUSTER_AGGREGATE_HOURLY_TABLE_NAME;
queryStmt = GET_CLUSTER_AGGREGATE_TIME_SQL;
condition.setPrecision(Precision.HOURS);
http://git-wip-us.apache.org/repos/asf/ambari/blob/a54812b4/ambari-metrics/ambari-metrics-timelineservice/src/test/java/org/apache/hadoop/yarn/server/applicationhistoryservice/metrics/timeline/TestPhoenixTransactSQL.java
--
diff --git
a/ambari-metrics/ambari-metrics-timelineservice/src/test/java/org/apache/hadoop/yarn/server/applicationhistoryservice/metrics/timeline/TestPhoenixTransactSQL.java
b/ambari-metrics/ambari-metrics-timelineservice/src/test/java/org/apache/hadoop/yarn/server/applicationhistoryservice/metrics/timeline/TestPhoenixTransactSQL.java
index cf64e4e..8693a21 100644
---
a/ambari-metrics/ambari-metrics-timelineservice/src/test/java/org/apache/hadoop/yarn/server/applicationhistoryservice/metrics/timeline/TestPhoenixTransactSQL.java
+++
b/ambari-metrics/ambari-metrics-timelineservice/src/test/java/org/apache/hadoop/yarn/server/applicationhistoryservice/metrics/timeline/TestPhoenixTransactSQL.java
@@ -33,6 +33,7 @@ import java.util.Collections;
import static org.easymock.EasyMock.createNiceMock;
import static org.easymock.EasyMock.expect;
import static org.easymock.EasyMock.replay;
+import static org.easymock.EasyMock.reset;
import static org.easymock.EasyMock.verify;
import org.easymock.EasyMock;
@@ -152,9 +153,12 @@ public class TestPhoenixTransactSQL {
@Test
public void testPrepareGetAggregateNoPrecision() throws SQLException {
+Long endTime = 1407959918L;
+Long startTime = 1407959718L;
+//SECONDS precision
Condition condition = new DefaultCondition(
Arrays.asList(cpu_user, mem_free), Collections.singletonList(h1),
- a1, i1, 1407959718L, 1407959918L, null, null, false);
+ a1, i1, startTime, endTime, null, null, false);
Connection connection = createNiceMock(Connection.class);
PreparedStatement preparedStatement =
createNiceMock(PreparedStatement.class);
CaptureString stmtCapture = new CaptureString();
@@ -165,6 +169,61 @@ public class
ambari git commit: AMBARI-12881 Ambari metrics shows data sparsely. (dsen)
Repository: ambari
Updated Branches:
refs/heads/branch-2.1 247433ac8 - 8579b7bf9
AMBARI-12881 Ambari metrics shows data sparsely. (dsen)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/8579b7bf
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/8579b7bf
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/8579b7bf
Branch: refs/heads/branch-2.1
Commit: 8579b7bf95a740ed0cac26032e2106566f5c172e
Parents: 247433a
Author: Dmytro Sen d...@apache.org
Authored: Thu Aug 27 13:23:31 2015 +0300
Committer: Dmytro Sen d...@apache.org
Committed: Thu Aug 27 13:24:40 2015 +0300
--
.../timeline/query/PhoenixTransactSQL.java | 4 +-
.../timeline/TestPhoenixTransactSQL.java| 137 ++-
2 files changed, 137 insertions(+), 4 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/8579b7bf/ambari-metrics/ambari-metrics-timelineservice/src/main/java/org/apache/hadoop/yarn/server/applicationhistoryservice/metrics/timeline/query/PhoenixTransactSQL.java
--
diff --git
a/ambari-metrics/ambari-metrics-timelineservice/src/main/java/org/apache/hadoop/yarn/server/applicationhistoryservice/metrics/timeline/query/PhoenixTransactSQL.java
b/ambari-metrics/ambari-metrics-timelineservice/src/main/java/org/apache/hadoop/yarn/server/applicationhistoryservice/metrics/timeline/query/PhoenixTransactSQL.java
index 1aa6204..ef0f4ce 100644
---
a/ambari-metrics/ambari-metrics-timelineservice/src/main/java/org/apache/hadoop/yarn/server/applicationhistoryservice/metrics/timeline/query/PhoenixTransactSQL.java
+++
b/ambari-metrics/ambari-metrics-timelineservice/src/main/java/org/apache/hadoop/yarn/server/applicationhistoryservice/metrics/timeline/query/PhoenixTransactSQL.java
@@ -284,7 +284,7 @@ public class PhoenixTransactSQL {
metricsTable = METRICS_AGGREGATE_DAILY_TABLE_NAME;
query = GET_METRIC_AGGREGATE_ONLY_SQL;
condition.setPrecision(Precision.DAYS);
-} else if (timeRange 7 * DAY timeRange DAY) {
+} else if (timeRange DAY) {
metricsTable = METRICS_AGGREGATE_HOURLY_TABLE_NAME;
query = GET_METRIC_AGGREGATE_ONLY_SQL;
condition.setPrecision(Precision.HOURS);
@@ -534,7 +534,7 @@ public class PhoenixTransactSQL {
metricsAggregateTable = METRICS_CLUSTER_AGGREGATE_DAILY_TABLE_NAME;
queryStmt = GET_CLUSTER_AGGREGATE_TIME_SQL;
condition.setPrecision(Precision.DAYS);
- } else if (timeRange 7 * DAY timeRange DAY) {
+ } else if (timeRange DAY) {
metricsAggregateTable = METRICS_CLUSTER_AGGREGATE_HOURLY_TABLE_NAME;
queryStmt = GET_CLUSTER_AGGREGATE_TIME_SQL;
condition.setPrecision(Precision.HOURS);
http://git-wip-us.apache.org/repos/asf/ambari/blob/8579b7bf/ambari-metrics/ambari-metrics-timelineservice/src/test/java/org/apache/hadoop/yarn/server/applicationhistoryservice/metrics/timeline/TestPhoenixTransactSQL.java
--
diff --git
a/ambari-metrics/ambari-metrics-timelineservice/src/test/java/org/apache/hadoop/yarn/server/applicationhistoryservice/metrics/timeline/TestPhoenixTransactSQL.java
b/ambari-metrics/ambari-metrics-timelineservice/src/test/java/org/apache/hadoop/yarn/server/applicationhistoryservice/metrics/timeline/TestPhoenixTransactSQL.java
index cf64e4e..8693a21 100644
---
a/ambari-metrics/ambari-metrics-timelineservice/src/test/java/org/apache/hadoop/yarn/server/applicationhistoryservice/metrics/timeline/TestPhoenixTransactSQL.java
+++
b/ambari-metrics/ambari-metrics-timelineservice/src/test/java/org/apache/hadoop/yarn/server/applicationhistoryservice/metrics/timeline/TestPhoenixTransactSQL.java
@@ -33,6 +33,7 @@ import java.util.Collections;
import static org.easymock.EasyMock.createNiceMock;
import static org.easymock.EasyMock.expect;
import static org.easymock.EasyMock.replay;
+import static org.easymock.EasyMock.reset;
import static org.easymock.EasyMock.verify;
import org.easymock.EasyMock;
@@ -152,9 +153,12 @@ public class TestPhoenixTransactSQL {
@Test
public void testPrepareGetAggregateNoPrecision() throws SQLException {
+Long endTime = 1407959918L;
+Long startTime = 1407959718L;
+//SECONDS precision
Condition condition = new DefaultCondition(
Arrays.asList(cpu_user, mem_free), Collections.singletonList(h1),
- a1, i1, 1407959718L, 1407959918L, null, null, false);
+ a1, i1, startTime, endTime, null, null, false);
Connection connection = createNiceMock(Connection.class);
PreparedStatement preparedStatement =
createNiceMock(PreparedStatement.class);
CaptureString stmtCapture = new CaptureString();
@@ -165,6 +169,61 @@ public
ambari git commit: AMBARI-12894 Changing mapreduce.application.classpath via Ambari doesn't prompt for Hive Restart (dsen)
Repository: ambari Updated Branches: refs/heads/trunk 89ca3be22 - 34b4f9e26 AMBARI-12894 Changing mapreduce.application.classpath via Ambari doesn't prompt for Hive Restart (dsen) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/34b4f9e2 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/34b4f9e2 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/34b4f9e2 Branch: refs/heads/trunk Commit: 34b4f9e267b9502c69ce84c0deca279a2b624bc4 Parents: 89ca3be Author: Dmytro Sen d...@apache.org Authored: Thu Aug 27 12:22:13 2015 +0300 Committer: Dmytro Sen d...@apache.org Committed: Thu Aug 27 12:22:13 2015 +0300 -- .../src/main/resources/common-services/HIVE/0.12.0.2.0/metainfo.xml | 1 + 1 file changed, 1 insertion(+) -- http://git-wip-us.apache.org/repos/asf/ambari/blob/34b4f9e2/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/metainfo.xml -- diff --git a/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/metainfo.xml b/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/metainfo.xml index ee55fda..8a8abf9 100644 --- a/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/metainfo.xml +++ b/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/metainfo.xml @@ -315,6 +315,7 @@ config-typeranger-hive-audit/config-type config-typeranger-hive-policymgr-ssl/config-type config-typeranger-hive-security/config-type +config-typemapred-site/config-type /configuration-dependencies /service /services
ambari git commit: AMBARI-12894 Changing mapreduce.application.classpath via Ambari doesn't prompt for Hive Restart (dsen)
Repository: ambari Updated Branches: refs/heads/branch-2.1 6f6d8f2d1 - 247433ac8 AMBARI-12894 Changing mapreduce.application.classpath via Ambari doesn't prompt for Hive Restart (dsen) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/247433ac Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/247433ac Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/247433ac Branch: refs/heads/branch-2.1 Commit: 247433ac8a0d6e7ed3cd262bdb1015d6f2269932 Parents: 6f6d8f2 Author: Dmytro Sen d...@apache.org Authored: Thu Aug 27 12:22:13 2015 +0300 Committer: Dmytro Sen d...@apache.org Committed: Thu Aug 27 12:24:21 2015 +0300 -- .../src/main/resources/common-services/HIVE/0.12.0.2.0/metainfo.xml | 1 + 1 file changed, 1 insertion(+) -- http://git-wip-us.apache.org/repos/asf/ambari/blob/247433ac/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/metainfo.xml -- diff --git a/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/metainfo.xml b/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/metainfo.xml index ee55fda..8a8abf9 100644 --- a/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/metainfo.xml +++ b/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/metainfo.xml @@ -315,6 +315,7 @@ config-typeranger-hive-audit/config-type config-typeranger-hive-policymgr-ssl/config-type config-typeranger-hive-security/config-type +config-typemapred-site/config-type /configuration-dependencies /service /services
ambari git commit: AMBARI-12882 Selected Config Group doesn't get updated. (atkach)
Repository: ambari
Updated Branches:
refs/heads/trunk 4c73ea906 - 89ca3be22
AMBARI-12882 Selected Config Group doesn't get updated. (atkach)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/89ca3be2
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/89ca3be2
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/89ca3be2
Branch: refs/heads/trunk
Commit: 89ca3be22aaecd466a537259a2f73bc85525f18a
Parents: 4c73ea9
Author: Andrii Tkach atk...@hortonworks.com
Authored: Thu Aug 27 10:41:36 2015 +0300
Committer: Andrii Tkach atk...@hortonworks.com
Committed: Thu Aug 27 10:41:36 2015 +0300
--
ambari-web/app/views/common/configs/service_config_view.js | 4
1 file changed, 4 insertions(+)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/89ca3be2/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 29bd226..86fb2c8 100644
--- a/ambari-web/app/views/common/configs/service_config_view.js
+++ b/ambari-web/app/views/common/configs/service_config_view.js
@@ -357,6 +357,10 @@ App.ConfigGroupDropdownView = Ember.TextField.extend({
});
},
+ updateSelectedGroup: function () {
+
$(this.get('element')).val(this.get('controller.selectedConfigGroup.displayNameHosts'));
+ }.observes('controller.selectedConfigGroup.displayNameHosts'),
+
updateConfigGroupsList: function() {
if ($(this.get('element'))) {
$(this.get('element')).data('typeahead').source =
this.get('controller.configGroups').mapProperty('displayNameHosts');
ambari git commit: AMBARI-12882 Selected Config Group doesn't get updated. (atkach)
Repository: ambari
Updated Branches:
refs/heads/branch-2.1 83ee68809 - 6f6d8f2d1
AMBARI-12882 Selected Config Group doesn't get updated. (atkach)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/6f6d8f2d
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/6f6d8f2d
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/6f6d8f2d
Branch: refs/heads/branch-2.1
Commit: 6f6d8f2d164bbe124497643c9822d5eb553123c0
Parents: 83ee688
Author: Andrii Tkach atk...@hortonworks.com
Authored: Thu Aug 27 10:15:09 2015 +0300
Committer: Andrii Tkach atk...@hortonworks.com
Committed: Thu Aug 27 10:15:09 2015 +0300
--
ambari-web/app/views/common/configs/service_config_view.js | 4
1 file changed, 4 insertions(+)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/6f6d8f2d/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 29bd226..86fb2c8 100644
--- a/ambari-web/app/views/common/configs/service_config_view.js
+++ b/ambari-web/app/views/common/configs/service_config_view.js
@@ -357,6 +357,10 @@ App.ConfigGroupDropdownView = Ember.TextField.extend({
});
},
+ updateSelectedGroup: function () {
+
$(this.get('element')).val(this.get('controller.selectedConfigGroup.displayNameHosts'));
+ }.observes('controller.selectedConfigGroup.displayNameHosts'),
+
updateConfigGroupsList: function() {
if ($(this.get('element'))) {
$(this.get('element')).data('typeahead').source =
this.get('controller.configGroups').mapProperty('displayNameHosts');
ambari git commit: AMBARI-12892. Choose Service page: Add SQL Anywhere in the Ranger Requirements popup message. (jaimin)
Repository: ambari
Updated Branches:
refs/heads/branch-2.1 8fd52b286 - ea50e37a6
AMBARI-12892. Choose Service page: Add SQL Anywhere in the Ranger Requirements
popup message. (jaimin)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/ea50e37a
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/ea50e37a
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/ea50e37a
Branch: refs/heads/branch-2.1
Commit: ea50e37a628a3fff8dfe8319f72c87d1df1445bf
Parents: 8fd52b2
Author: Jaimin Jetly jai...@hortonworks.com
Authored: Thu Aug 27 16:50:21 2015 -0700
Committer: Jaimin Jetly jai...@hortonworks.com
Committed: Thu Aug 27 16:50:21 2015 -0700
--
ambari-web/app/messages.js | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/ea50e37a/ambari-web/app/messages.js
--
diff --git a/ambari-web/app/messages.js b/ambari-web/app/messages.js
index 1113e4a..c0852d4 100644
--- a/ambari-web/app/messages.js
+++ b/ambari-web/app/messages.js
@@ -721,10 +721,10 @@ Em.I18n.translations = {
'installer.step4.ambariMetricsCheck.popup.header':'Limited Functionality
Warning',
'installer.step4.ambariMetricsCheck.popup.body':'Ambari Metrics collects
metrics from the cluster and makes them available to Ambari. If you do not
install Ambari Metrics service, metrics will not be accessible from Ambari.
Are you sure you want to proceed without Ambari Metrics?',
'installer.step4.rangerRequirements.popup.header': 'Ranger Requirements',
- 'installer.step4.rangerRequirements.popup.body.requirements': 'olliYou
must have an strongMySQL/Oracle/Postgres/MSSQL Server/strong database
instance running to be used by Ranger./li' +
-'liIn Assign Masters step of this wizard, you will be prompted to
specify which host for the Ranger Admin. On that host, you strongmust have DB
Client installed/strong for Ranger to access to the database. (Note: This is
only applicable for only Ranger 0.4.0)/li' +
+ 'installer.step4.rangerRequirements.popup.body.requirements': 'olliYou
must have an strongMySQL/Oracle/Postgres/MSSQL/SQLA Server/strong database
instance running to be used by Ranger./li' +
+'liIn Assign Masters step of this wizard, you will be prompted to
specify which host for the Ranger Admin. On that host, you strongmust have DB
Client installed/strong for Ranger to access to the database. (Note: This is
applicable for only Ranger 0.4.0)/li' +
'liEnsure that the access for the DB Admin user is enabled in DB server
from any host./li' +
-'liExecute the following command on the Ambari Server host. Replace
codedatabase-type/code with strongmysql|oracle|postgres|mssql/strong
and code/jdbc/driver/path/code based on the location of corresponding JDBC
driver:' +
+'liExecute the following command on the Ambari Server host. Replace
codedatabase-type/code with
strongmysql|oracle|postgres|mssql|sqlanywhere/strong and
code/jdbc/driver/path/code based on the location of corresponding JDBC
driver:' +
'preambari-server setup --jdbc-db={database-type}
--jdbc-driver={/jdbc/driver/path}/pre/li/ol',
'installer.step4.rangerRequirements.popup.body.confirmation': 'I have met
all the requirements above.',
'installer.step4.sparkWarning.popup.body': 'Spark requires HDP 2.2.2 or
later. Attempting to install Spark to a HDP 2.2.0 cluster will fail. Confirm
you are using HDP 2.2.2 or later packages. Are you sure you want to proceed?',
ambari git commit: AMBARI-12872. Add SQL Anywhere database support for Ranger and Ranger KMS (Gautam Borad via alejandro)
Repository: ambari
Updated Branches:
refs/heads/branch-2.1 ea50e37a6 - ae56a56f8
AMBARI-12872. Add SQL Anywhere database support for Ranger and Ranger KMS
(Gautam Borad via alejandro)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/ae56a56f
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/ae56a56f
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/ae56a56f
Branch: refs/heads/branch-2.1
Commit: ae56a56f8bb7c58748bc455e360eacad778d7a7d
Parents: ea50e37
Author: Alejandro Fernandez afernan...@hortonworks.com
Authored: Thu Aug 27 17:08:34 2015 -0700
Committer: Alejandro Fernandez afernan...@hortonworks.com
Committed: Thu Aug 27 17:08:34 2015 -0700
--
.../functions/setup_ranger_plugin_xml.py| 19 +++---
.../0.96.0.2.0/package/scripts/params_linux.py | 12 +++-
.../2.1.0.2.0/package/scripts/params_linux.py | 11 +++-
.../0.12.0.2.0/package/scripts/params_linux.py | 11 +++-
.../KAFKA/0.8.1.2.2/package/scripts/params.py | 11 +++-
.../0.5.0.2.2/package/scripts/params_linux.py | 11 +++-
.../RANGER/0.4.0/package/scripts/params.py | 14 +++-
.../0.4.0/package/scripts/ranger_service.py | 10 ++-
.../0.4.0/package/scripts/setup_ranger_xml.py | 61 ++
.../RANGER_KMS/0.5.0.2.3/package/scripts/kms.py | 68 ++--
.../0.5.0.2.3/package/scripts/kms_server.py | 7 +-
.../0.5.0.2.3/package/scripts/kms_service.py| 18 +++---
.../0.5.0.2.3/package/scripts/params.py | 24 ++-
.../0.9.1.2.1/package/scripts/params_linux.py | 11 +++-
.../2.1.0.2.0/package/scripts/params_linux.py | 11 +++-
.../RANGER/configuration/ranger-admin-site.xml | 2 +-
16 files changed, 238 insertions(+), 63 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/ae56a56f/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 cf40a75..0b404a9 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
@@ -46,17 +46,18 @@ def setup_ranger_plugin(component_select_name, service_name,
xa_audit_db_password, ssl_truststore_password,
ssl_keystore_password, api_version=None,
hdp_version_override = None):
- File(component_downloaded_custom_connector,
-content = DownloadSource(component_driver_curl_source),
-mode = 0644
- )
+ if audit_db_is_enabled:
+File(component_downloaded_custom_connector,
+ content = DownloadSource(component_driver_curl_source),
+ mode = 0644
+)
- Execute(('cp', '--remove-destination',
component_downloaded_custom_connector, component_driver_curl_target),
-path=[/bin, /usr/bin/],
-sudo=True
- )
+Execute(('cp', '--remove-destination',
component_downloaded_custom_connector, component_driver_curl_target),
+ path=[/bin, /usr/bin/],
+ sudo=True
+)
- File(component_driver_curl_target, mode=0644)
+File(component_driver_curl_target, mode=0644)
hdp_version = get_hdp_version(component_select_name)
if hdp_version_override is not None:
http://git-wip-us.apache.org/repos/asf/ambari/blob/ae56a56f/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 d515dad..ae4dcda 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
@@ -240,7 +240,7 @@ if has_ranger_admin:
elif xa_audit_db_flavor == 'oracle':
jdbc_jar_name = ojdbc6.jar
jdbc_symlink_name = oracle-jdbc-driver.jar
-audit_jdbc_url = format('jdbc:oracle:thin:\@//{xa_db_host}')
+audit_jdbc_url = format('jdbc:oracle:thin:@//{xa_db_host}')
jdbc_driver = oracle.jdbc.OracleDriver
elif xa_audit_db_flavor == 'postgres':
jdbc_jar_name = postgresql.jar
@@ -252,6 +252,11 @@ if has_ranger_admin:
jdbc_symlink_name = mssql-jdbc-driver.jar
audit_jdbc_url =
format('jdbc:sqlserver://{xa_db_host};databaseName={xa_audit_db_name}')
jdbc_driver =
ambari git commit: AMBARI-12872. Add SQL Anywhere database support for Ranger and Ranger KMS (Gautam Borad via alejandro)
Repository: ambari
Updated Branches:
refs/heads/trunk 97c4bc5ec - 60d3a7613
AMBARI-12872. Add SQL Anywhere database support for Ranger and Ranger KMS
(Gautam Borad via alejandro)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/60d3a761
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/60d3a761
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/60d3a761
Branch: refs/heads/trunk
Commit: 60d3a7613b0c011f987a6c18aa6ee376a40f5461
Parents: 97c4bc5
Author: Alejandro Fernandez afernan...@hortonworks.com
Authored: Thu Aug 27 17:05:24 2015 -0700
Committer: Alejandro Fernandez afernan...@hortonworks.com
Committed: Thu Aug 27 17:05:24 2015 -0700
--
.../functions/setup_ranger_plugin_xml.py| 19 +++---
.../0.96.0.2.0/package/scripts/params_linux.py | 12 +++-
.../2.1.0.2.0/package/scripts/params_linux.py | 11 +++-
.../0.12.0.2.0/package/scripts/params_linux.py | 11 +++-
.../KAFKA/0.8.1.2.2/package/scripts/params.py | 11 +++-
.../0.5.0.2.2/package/scripts/params_linux.py | 11 +++-
.../RANGER/0.4.0/package/scripts/params.py | 14 +++-
.../0.4.0/package/scripts/ranger_service.py | 10 ++-
.../0.4.0/package/scripts/setup_ranger_xml.py | 61 ++
.../RANGER_KMS/0.5.0.2.3/package/scripts/kms.py | 68 ++--
.../0.5.0.2.3/package/scripts/kms_server.py | 7 +-
.../0.5.0.2.3/package/scripts/kms_service.py| 18 +++---
.../0.5.0.2.3/package/scripts/params.py | 24 ++-
.../0.9.1.2.1/package/scripts/params_linux.py | 11 +++-
.../2.1.0.2.0/package/scripts/params_linux.py | 11 +++-
.../RANGER/configuration/ranger-admin-site.xml | 2 +-
16 files changed, 238 insertions(+), 63 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/60d3a761/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 cf40a75..0b404a9 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
@@ -46,17 +46,18 @@ def setup_ranger_plugin(component_select_name, service_name,
xa_audit_db_password, ssl_truststore_password,
ssl_keystore_password, api_version=None,
hdp_version_override = None):
- File(component_downloaded_custom_connector,
-content = DownloadSource(component_driver_curl_source),
-mode = 0644
- )
+ if audit_db_is_enabled:
+File(component_downloaded_custom_connector,
+ content = DownloadSource(component_driver_curl_source),
+ mode = 0644
+)
- Execute(('cp', '--remove-destination',
component_downloaded_custom_connector, component_driver_curl_target),
-path=[/bin, /usr/bin/],
-sudo=True
- )
+Execute(('cp', '--remove-destination',
component_downloaded_custom_connector, component_driver_curl_target),
+ path=[/bin, /usr/bin/],
+ sudo=True
+)
- File(component_driver_curl_target, mode=0644)
+File(component_driver_curl_target, mode=0644)
hdp_version = get_hdp_version(component_select_name)
if hdp_version_override is not None:
http://git-wip-us.apache.org/repos/asf/ambari/blob/60d3a761/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 d515dad..ae4dcda 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
@@ -240,7 +240,7 @@ if has_ranger_admin:
elif xa_audit_db_flavor == 'oracle':
jdbc_jar_name = ojdbc6.jar
jdbc_symlink_name = oracle-jdbc-driver.jar
-audit_jdbc_url = format('jdbc:oracle:thin:\@//{xa_db_host}')
+audit_jdbc_url = format('jdbc:oracle:thin:@//{xa_db_host}')
jdbc_driver = oracle.jdbc.OracleDriver
elif xa_audit_db_flavor == 'postgres':
jdbc_jar_name = postgresql.jar
@@ -252,6 +252,11 @@ if has_ranger_admin:
jdbc_symlink_name = mssql-jdbc-driver.jar
audit_jdbc_url =
format('jdbc:sqlserver://{xa_db_host};databaseName={xa_audit_db_name}')
jdbc_driver =
ambari git commit: AMBARI-12892. Choose Service page: Add SQL Anywhere in the Ranger Requirements popup message. (jaimin)
Repository: ambari
Updated Branches:
refs/heads/trunk a19c92581 - 97c4bc5ec
AMBARI-12892. Choose Service page: Add SQL Anywhere in the Ranger Requirements
popup message. (jaimin)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/97c4bc5e
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/97c4bc5e
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/97c4bc5e
Branch: refs/heads/trunk
Commit: 97c4bc5ec4877c7b516ee4d921254c5f694b3506
Parents: a19c925
Author: Jaimin Jetly jai...@hortonworks.com
Authored: Thu Aug 27 16:50:21 2015 -0700
Committer: Jaimin Jetly jai...@hortonworks.com
Committed: Thu Aug 27 16:51:15 2015 -0700
--
ambari-web/app/messages.js | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/97c4bc5e/ambari-web/app/messages.js
--
diff --git a/ambari-web/app/messages.js b/ambari-web/app/messages.js
index 3b613e7..e407623 100644
--- a/ambari-web/app/messages.js
+++ b/ambari-web/app/messages.js
@@ -721,10 +721,10 @@ Em.I18n.translations = {
'installer.step4.ambariMetricsCheck.popup.header':'Limited Functionality
Warning',
'installer.step4.ambariMetricsCheck.popup.body':'Ambari Metrics collects
metrics from the cluster and makes them available to Ambari. If you do not
install Ambari Metrics service, metrics will not be accessible from Ambari.
Are you sure you want to proceed without Ambari Metrics?',
'installer.step4.rangerRequirements.popup.header': 'Ranger Requirements',
- 'installer.step4.rangerRequirements.popup.body.requirements': 'olliYou
must have an strongMySQL/Oracle/Postgres/MSSQL Server/strong database
instance running to be used by Ranger./li' +
-'liIn Assign Masters step of this wizard, you will be prompted to
specify which host for the Ranger Admin. On that host, you strongmust have DB
Client installed/strong for Ranger to access to the database. (Note: This is
only applicable for only Ranger 0.4.0)/li' +
+ 'installer.step4.rangerRequirements.popup.body.requirements': 'olliYou
must have an strongMySQL/Oracle/Postgres/MSSQL/SQLA Server/strong database
instance running to be used by Ranger./li' +
+'liIn Assign Masters step of this wizard, you will be prompted to
specify which host for the Ranger Admin. On that host, you strongmust have DB
Client installed/strong for Ranger to access to the database. (Note: This is
applicable for only Ranger 0.4.0)/li' +
'liEnsure that the access for the DB Admin user is enabled in DB server
from any host./li' +
-'liExecute the following command on the Ambari Server host. Replace
codedatabase-type/code with strongmysql|oracle|postgres|mssql/strong
and code/jdbc/driver/path/code based on the location of corresponding JDBC
driver:' +
+'liExecute the following command on the Ambari Server host. Replace
codedatabase-type/code with
strongmysql|oracle|postgres|mssql|sqlanywhere/strong and
code/jdbc/driver/path/code based on the location of corresponding JDBC
driver:' +
'preambari-server setup --jdbc-db={database-type}
--jdbc-driver={/jdbc/driver/path}/pre/li/ol',
'installer.step4.rangerRequirements.popup.body.confirmation': 'I have met
all the requirements above.',
'installer.step4.sparkWarning.popup.body': 'Spark requires HDP 2.2.2 or
later. Attempting to install Spark to a HDP 2.2.0 cluster will fail. Confirm
you are using HDP 2.2.2 or later packages. Are you sure you want to proceed?',
