date:20150614

ambari git commit: AMBARI-11917: [WinTP2] Windows build should use hbase and hadoop winpkg for embedded hbase (jluniya)

2015-06-14 Thread jluniya

Repository: ambari
Updated Branches:
  refs/heads/branch-2.1 ed319385a -> 4e54ac7fd


AMBARI-11917: [WinTP2] Windows build should use hbase and hadoop winpkg for 
embedded hbase (jluniya)


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/4e54ac7f
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/4e54ac7f
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/4e54ac7f

Branch: refs/heads/branch-2.1
Commit: 4e54ac7fdb0008ec83429bccfb665a56a6a574f1
Parents: ed31938
Author: Jayush Luniya 
Authored: Sun Jun 14 22:15:07 2015 -0700
Committer: Jayush Luniya 
Committed: Sun Jun 14 22:16:52 2015 -0700

--
 .../src/main/assembly/collector-windows.xml| 4 ++--
 ambari-metrics/ambari-metrics-timelineservice/pom.xml  | 4 ++--
 ambari-metrics/pom.xml | 6 --
 3 files changed, 8 insertions(+), 6 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/4e54ac7f/ambari-metrics/ambari-metrics-assembly/src/main/assembly/collector-windows.xml
--
diff --git 
a/ambari-metrics/ambari-metrics-assembly/src/main/assembly/collector-windows.xml
 
b/ambari-metrics/ambari-metrics-assembly/src/main/assembly/collector-windows.xml
index 67dd5c0..4f1ad47 100644
--- 
a/ambari-metrics/ambari-metrics-assembly/src/main/assembly/collector-windows.xml
+++ 
b/ambari-metrics/ambari-metrics-assembly/src/main/assembly/collector-windows.xml
@@ -27,7 +27,7 @@
   false
   
 
-  ${collector.dir}/target/embedded/${hbase.folder}
+  
${collector.dir}/target/embedded/${hbase.winpkg.folder}
   hbase
 
 
@@ -80,7 +80,7 @@
   
 
 
-  
${project.build.directory}/embedded/hadoop.temp/resources/${hadoop.folder}/bin
+  
${project.build.directory}/embedded/hadoop.temp/resources/${hadoop.winpkg.folder}/bin
   hbase/bin
   
 *.dll

http://git-wip-us.apache.org/repos/asf/ambari/blob/4e54ac7f/ambari-metrics/ambari-metrics-timelineservice/pom.xml
--
diff --git a/ambari-metrics/ambari-metrics-timelineservice/pom.xml 
b/ambari-metrics/ambari-metrics-timelineservice/pom.xml
index 91fa887..3500669 100644
--- a/ambari-metrics/ambari-metrics-timelineservice/pom.xml
+++ b/ambari-metrics/ambari-metrics-timelineservice/pom.xml
@@ -586,12 +586,12 @@
   dest="${project.build.directory}/embedded/hbase.temp"
   />
 
 
   
 

http://git-wip-us.apache.org/repos/asf/ambari/blob/4e54ac7f/ambari-metrics/pom.xml
--
diff --git a/ambari-metrics/pom.xml b/ambari-metrics/pom.xml
index 89ceb84..c1dfa98 100644
--- a/ambari-metrics/pom.xml
+++ b/ambari-metrics/pom.xml
@@ -40,8 +40,10 @@
 hbase-0.98.4.2.2.0.0-2041-hadoop2
 
http://public-repo-1.hortonworks.com/HDP/centos6/2.x/GA/2.2.0.0/tars/hadoop-2.6.0.2.2.0.0-2041.tar.gz
 hadoop-2.6.0.2.2.0.0-2041
-
file:///c:/hbase_embedded/hbase-0.98.4.2.2.0.0-2041-hadoop2.winpkg.zip
-
file:///c:/hbase_embedded/hadoop-2.6.0.2.2.0.0-2041.winpkg.zip
+
https://msibuilds.blob.core.windows.net/hdp/2.x/2.2.4.2/2/hbase-0.98.4.2.2.4.2-0002-hadoop2.winpkg.zip
+
hbase-0.98.4.2.2.4.2-0002-hadoop2
+
https://msibuilds.blob.core.windows.net/hdp/2.x/2.2.4.2/2/hadoop-2.6.0.2.2.4.2-0002.winpkg.zip
+hadoop-2.6.0.2.2.4.2-0002
 
   /usr/lib/python2.6/site-packages/resource_monitoring

ambari git commit: AMBARI-11917: [WinTP2] Windows build should use hbase and hadoop winpkg for embedded hbase (jluniya)

2015-06-14 Thread jluniya

Repository: ambari
Updated Branches:
  refs/heads/trunk 18ef979bd -> a0a2524a5


AMBARI-11917: [WinTP2] Windows build should use hbase and hadoop winpkg for 
embedded hbase (jluniya)


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/a0a2524a
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/a0a2524a
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/a0a2524a

Branch: refs/heads/trunk
Commit: a0a2524a50ea80ef7ec49f3a705de860bcc1cfec
Parents: 18ef979
Author: Jayush Luniya 
Authored: Sun Jun 14 22:15:07 2015 -0700
Committer: Jayush Luniya 
Committed: Sun Jun 14 22:15:07 2015 -0700

--
 .../src/main/assembly/collector-windows.xml| 4 ++--
 ambari-metrics/ambari-metrics-timelineservice/pom.xml  | 4 ++--
 ambari-metrics/pom.xml | 6 --
 3 files changed, 8 insertions(+), 6 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/a0a2524a/ambari-metrics/ambari-metrics-assembly/src/main/assembly/collector-windows.xml
--
diff --git 
a/ambari-metrics/ambari-metrics-assembly/src/main/assembly/collector-windows.xml
 
b/ambari-metrics/ambari-metrics-assembly/src/main/assembly/collector-windows.xml
index 67dd5c0..4f1ad47 100644
--- 
a/ambari-metrics/ambari-metrics-assembly/src/main/assembly/collector-windows.xml
+++ 
b/ambari-metrics/ambari-metrics-assembly/src/main/assembly/collector-windows.xml
@@ -27,7 +27,7 @@
   false
   
 
-  ${collector.dir}/target/embedded/${hbase.folder}
+  
${collector.dir}/target/embedded/${hbase.winpkg.folder}
   hbase
 
 
@@ -80,7 +80,7 @@
   
 
 
-  
${project.build.directory}/embedded/hadoop.temp/resources/${hadoop.folder}/bin
+  
${project.build.directory}/embedded/hadoop.temp/resources/${hadoop.winpkg.folder}/bin
   hbase/bin
   
 *.dll

http://git-wip-us.apache.org/repos/asf/ambari/blob/a0a2524a/ambari-metrics/ambari-metrics-timelineservice/pom.xml
--
diff --git a/ambari-metrics/ambari-metrics-timelineservice/pom.xml 
b/ambari-metrics/ambari-metrics-timelineservice/pom.xml
index 3c79190..999005a 100644
--- a/ambari-metrics/ambari-metrics-timelineservice/pom.xml
+++ b/ambari-metrics/ambari-metrics-timelineservice/pom.xml
@@ -586,12 +586,12 @@
   dest="${project.build.directory}/embedded/hbase.temp"
   />
 
 
   
 

http://git-wip-us.apache.org/repos/asf/ambari/blob/a0a2524a/ambari-metrics/pom.xml
--
diff --git a/ambari-metrics/pom.xml b/ambari-metrics/pom.xml
index 106f79b..b4f4ed3 100644
--- a/ambari-metrics/pom.xml
+++ b/ambari-metrics/pom.xml
@@ -40,8 +40,10 @@
 hbase-0.98.4.2.2.0.0-2041-hadoop2
 
http://public-repo-1.hortonworks.com/HDP/centos6/2.x/GA/2.2.0.0/tars/hadoop-2.6.0.2.2.0.0-2041.tar.gz
 hadoop-2.6.0.2.2.0.0-2041
-
file:///c:/hbase_embedded/hbase-0.98.4.2.2.0.0-2041-hadoop2.winpkg.zip
-
file:///c:/hbase_embedded/hadoop-2.6.0.2.2.0.0-2041.winpkg.zip
+
https://msibuilds.blob.core.windows.net/hdp/2.x/2.2.4.2/2/hbase-0.98.4.2.2.4.2-0002-hadoop2.winpkg.zip
+
hbase-0.98.4.2.2.4.2-0002-hadoop2
+
https://msibuilds.blob.core.windows.net/hdp/2.x/2.2.4.2/2/hadoop-2.6.0.2.2.4.2-0002.winpkg.zip
+hadoop-2.6.0.2.2.4.2-0002
 
   /usr/lib/python2.6/site-packages/resource_monitoring

ambari git commit: AMBARI-11909. some old settings from previous configurations still existed in kerberos.json file (Jonathan Maron via rlevas)

2015-06-14 Thread rlevas

Repository: ambari
Updated Branches:
  refs/heads/branch-2.1 aec3e708f -> ed319385a


AMBARI-11909. some old settings from previous configurations still existed in 
kerberos.json file (Jonathan Maron via rlevas)


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/ed319385
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/ed319385
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/ed319385

Branch: refs/heads/branch-2.1
Commit: ed319385a6cc0a97a9cb113100c63ff28a402fe0
Parents: aec3e70
Author: Jonathan Maron 
Authored: Sun Jun 14 23:02:14 2015 -0400
Committer: Robert Levas 
Committed: Sun Jun 14 23:02:14 2015 -0400

--
 .../main/resources/common-services/ATLAS/0.1.0.2.3/kerberos.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/ed319385/ambari-server/src/main/resources/common-services/ATLAS/0.1.0.2.3/kerberos.json
--
diff --git 
a/ambari-server/src/main/resources/common-services/ATLAS/0.1.0.2.3/kerberos.json
 
b/ambari-server/src/main/resources/common-services/ATLAS/0.1.0.2.3/kerberos.json
index ff82d52..087fc93 100644
--- 
a/ambari-server/src/main/resources/common-services/ATLAS/0.1.0.2.3/kerberos.json
+++ 
b/ambari-server/src/main/resources/common-services/ATLAS/0.1.0.2.3/kerberos.json
@@ -24,12 +24,12 @@
 "value": "atlas/_HOST@${realm}",
 "type" : "service",
 "configuration": 
"application-properties/atlas.authentication.principal",
-"local_username" : "${metadata-env/metadata_user}"
+"local_username" : "${atlas-env/metadata_user}"
   },
   "keytab": {
 "file": "${keytab_dir}/atlas.service.keytab",
 "owner": {
-  "name": "${metadata-env/metadata_user}",
+  "name": "${atlas-env/metadata_user}",
   "access": "r"
 },
 "group": {

ambari git commit: AMBARI-11909. some old settings from previous configurations still existed in kerberos.json file (Jonathan Maron via rlevas)

2015-06-14 Thread rlevas

Repository: ambari
Updated Branches:
  refs/heads/trunk b8ddd2341 -> 18ef979bd


AMBARI-11909. some old settings from previous configurations still existed in 
kerberos.json file (Jonathan Maron via rlevas)


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/18ef979b
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/18ef979b
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/18ef979b

Branch: refs/heads/trunk
Commit: 18ef979bdc18dc10063edea1e002a127ef62b447
Parents: b8ddd23
Author: Jonathan Maron 
Authored: Sun Jun 14 23:00:10 2015 -0400
Committer: Robert Levas 
Committed: Sun Jun 14 23:00:10 2015 -0400

--
 .../main/resources/common-services/ATLAS/0.1.0.2.3/kerberos.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/18ef979b/ambari-server/src/main/resources/common-services/ATLAS/0.1.0.2.3/kerberos.json
--
diff --git 
a/ambari-server/src/main/resources/common-services/ATLAS/0.1.0.2.3/kerberos.json
 
b/ambari-server/src/main/resources/common-services/ATLAS/0.1.0.2.3/kerberos.json
index ff82d52..087fc93 100644
--- 
a/ambari-server/src/main/resources/common-services/ATLAS/0.1.0.2.3/kerberos.json
+++ 
b/ambari-server/src/main/resources/common-services/ATLAS/0.1.0.2.3/kerberos.json
@@ -24,12 +24,12 @@
 "value": "atlas/_HOST@${realm}",
 "type" : "service",
 "configuration": 
"application-properties/atlas.authentication.principal",
-"local_username" : "${metadata-env/metadata_user}"
+"local_username" : "${atlas-env/metadata_user}"
   },
   "keytab": {
 "file": "${keytab_dir}/atlas.service.keytab",
 "owner": {
-  "name": "${metadata-env/metadata_user}",
+  "name": "${atlas-env/metadata_user}",
   "access": "r"
 },
 "group": {

ambari git commit: AMBARI-11913. Hive, Hbase have required empty properties after ambari only upgrade to 2.1.0.(vbrodetskyi)

2015-06-14 Thread vbrodetskyi

Repository: ambari
Updated Branches:
  refs/heads/branch-2.1 25e531d37 -> aec3e708f


AMBARI-11913. Hive,Hbase have required empty properties after ambari only 
upgrade to 2.1.0.(vbrodetskyi)


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/aec3e708
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/aec3e708
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/aec3e708

Branch: refs/heads/branch-2.1
Commit: aec3e708fd6d9d842a99eb78776c4c22ea800846
Parents: 25e531d
Author: Vitaly Brodetskyi 
Authored: Mon Jun 15 02:03:06 2015 +0300
Committer: Vitaly Brodetskyi 
Committed: Mon Jun 15 02:03:06 2015 +0300

--
 .../server/upgrade/AbstractUpgradeCatalog.java  | 43 
 .../server/upgrade/UpgradeCatalog210.java   | 38 +
 2 files changed, 63 insertions(+), 18 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/aec3e708/ambari-server/src/main/java/org/apache/ambari/server/upgrade/AbstractUpgradeCatalog.java
--
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/upgrade/AbstractUpgradeCatalog.java
 
b/ambari-server/src/main/java/org/apache/ambari/server/upgrade/AbstractUpgradeCatalog.java
index 3b62c76..3fec278 100644
--- 
a/ambari-server/src/main/java/org/apache/ambari/server/upgrade/AbstractUpgradeCatalog.java
+++ 
b/ambari-server/src/main/java/org/apache/ambari/server/upgrade/AbstractUpgradeCatalog.java
@@ -17,19 +17,11 @@
  */
 package org.apache.ambari.server.upgrade;
 
-import java.sql.ResultSet;
-import java.sql.SQLException;
-import java.util.Collections;
-import java.util.Comparator;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Map.Entry;
-import java.util.Set;
-
-import javax.persistence.EntityManager;
-
+import com.google.common.collect.Maps;
+import com.google.inject.Inject;
+import com.google.inject.Injector;
+import com.google.inject.Provider;
+import com.google.inject.persist.Transactional;
 import org.apache.ambari.server.AmbariException;
 import org.apache.ambari.server.configuration.Configuration;
 import org.apache.ambari.server.configuration.Configuration.DatabaseType;
@@ -48,11 +40,17 @@ import org.apache.ambari.server.utils.VersionUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import com.google.common.collect.Maps;
-import com.google.inject.Inject;
-import com.google.inject.Injector;
-import com.google.inject.Provider;
-import com.google.inject.persist.Transactional;
+import javax.persistence.EntityManager;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.Set;
 
 public abstract class AbstractUpgradeCatalog implements UpgradeCatalog {
   @Inject
@@ -249,6 +247,10 @@ public abstract class AbstractUpgradeCatalog implements 
UpgradeCatalog {
 String configType = 
ConfigHelper.fileNameToConfigType(property.getFilename());
 Config clusterConfigs = cluster.getDesiredConfigByType(configType);
 if(clusterConfigs == null || 
!clusterConfigs.getProperties().containsKey(property.getName())) {
+  if (!checkAccordingToStackAdvisor(property, cluster)) {
+continue;
+  }
+
   LOG.info("Config " + property.getName() + " from " + configType 
+ " from xml configurations" +
   " is not found on the cluster. Adding it...");
 
@@ -269,6 +271,11 @@ public abstract class AbstractUpgradeCatalog implements 
UpgradeCatalog {
 }
   }
 
+  protected boolean checkAccordingToStackAdvisor(PropertyInfo property, 
Cluster cluster) {
+//TODO: in future, we can add here general filters
+return true;
+  }
+
   /**
* Create a new cluster scoped configuration with the new properties added
* with the values from the coresponding xml files.

http://git-wip-us.apache.org/repos/asf/ambari/blob/aec3e708/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 9a22aa6..22e80a3 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
@@ -41,6 +41,8 @@ import 
org.apache.ambari.server.orm.entities.ServiceComponentDesiredStateEntityP
 import org.a

ambari git commit: AMBARI-11913. Hive, Hbase have required empty properties after ambari only upgrade to 2.1.0.(vbrodetskyi)

2015-06-14 Thread vbrodetskyi

Repository: ambari
Updated Branches:
  refs/heads/trunk 08cd5d041 -> b8ddd2341


AMBARI-11913. Hive,Hbase have required empty properties after ambari only 
upgrade to 2.1.0.(vbrodetskyi)


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/b8ddd234
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/b8ddd234
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/b8ddd234

Branch: refs/heads/trunk
Commit: b8ddd2341bdd64005143ed663d03a9057c0b6f93
Parents: 08cd5d0
Author: Vitaly Brodetskyi 
Authored: Mon Jun 15 02:01:03 2015 +0300
Committer: Vitaly Brodetskyi 
Committed: Mon Jun 15 02:01:03 2015 +0300

--
 .../server/upgrade/AbstractUpgradeCatalog.java  | 43 
 .../server/upgrade/UpgradeCatalog210.java   | 38 +
 2 files changed, 63 insertions(+), 18 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/b8ddd234/ambari-server/src/main/java/org/apache/ambari/server/upgrade/AbstractUpgradeCatalog.java
--
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/upgrade/AbstractUpgradeCatalog.java
 
b/ambari-server/src/main/java/org/apache/ambari/server/upgrade/AbstractUpgradeCatalog.java
index 3b62c76..3fec278 100644
--- 
a/ambari-server/src/main/java/org/apache/ambari/server/upgrade/AbstractUpgradeCatalog.java
+++ 
b/ambari-server/src/main/java/org/apache/ambari/server/upgrade/AbstractUpgradeCatalog.java
@@ -17,19 +17,11 @@
  */
 package org.apache.ambari.server.upgrade;
 
-import java.sql.ResultSet;
-import java.sql.SQLException;
-import java.util.Collections;
-import java.util.Comparator;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Map.Entry;
-import java.util.Set;
-
-import javax.persistence.EntityManager;
-
+import com.google.common.collect.Maps;
+import com.google.inject.Inject;
+import com.google.inject.Injector;
+import com.google.inject.Provider;
+import com.google.inject.persist.Transactional;
 import org.apache.ambari.server.AmbariException;
 import org.apache.ambari.server.configuration.Configuration;
 import org.apache.ambari.server.configuration.Configuration.DatabaseType;
@@ -48,11 +40,17 @@ import org.apache.ambari.server.utils.VersionUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import com.google.common.collect.Maps;
-import com.google.inject.Inject;
-import com.google.inject.Injector;
-import com.google.inject.Provider;
-import com.google.inject.persist.Transactional;
+import javax.persistence.EntityManager;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.Set;
 
 public abstract class AbstractUpgradeCatalog implements UpgradeCatalog {
   @Inject
@@ -249,6 +247,10 @@ public abstract class AbstractUpgradeCatalog implements 
UpgradeCatalog {
 String configType = 
ConfigHelper.fileNameToConfigType(property.getFilename());
 Config clusterConfigs = cluster.getDesiredConfigByType(configType);
 if(clusterConfigs == null || 
!clusterConfigs.getProperties().containsKey(property.getName())) {
+  if (!checkAccordingToStackAdvisor(property, cluster)) {
+continue;
+  }
+
   LOG.info("Config " + property.getName() + " from " + configType 
+ " from xml configurations" +
   " is not found on the cluster. Adding it...");
 
@@ -269,6 +271,11 @@ public abstract class AbstractUpgradeCatalog implements 
UpgradeCatalog {
 }
   }
 
+  protected boolean checkAccordingToStackAdvisor(PropertyInfo property, 
Cluster cluster) {
+//TODO: in future, we can add here general filters
+return true;
+  }
+
   /**
* Create a new cluster scoped configuration with the new properties added
* with the values from the coresponding xml files.

http://git-wip-us.apache.org/repos/asf/ambari/blob/b8ddd234/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 9a22aa6..22e80a3 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
@@ -41,6 +41,8 @@ import 
org.apache.ambari.server.orm.entities.ServiceComponentDesiredStateEntityP
 import org.apache.amba

ambari git commit: AMBARI-11916. HBASE stopped after security enabling HDP-2.2.4. (Ted Yu, swagle via swagle)

2015-06-14 Thread swagle

Repository: ambari
Updated Branches:
  refs/heads/trunk 899705d07 -> 08cd5d041


AMBARI-11916. HBASE stopped after security enabling HDP-2.2.4. (Ted Yu, swagle 
via swagle)


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/08cd5d04
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/08cd5d04
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/08cd5d04

Branch: refs/heads/trunk
Commit: 08cd5d0417290a42d7acba6208ec8c85eb269a94
Parents: 899705d
Author: Siddharth Wagle 
Authored: Sun Jun 14 12:05:42 2015 -0700
Committer: Siddharth Wagle 
Committed: Sun Jun 14 12:05:42 2015 -0700

--
 .../stacks/HDP/2.2/services/stack_advisor.py|  1 -
 .../stacks/HDP/2.3/services/stack_advisor.py|  1 +
 .../python/stacks/2.2/common/test_stack_advisor.py  |  1 -
 .../python/stacks/2.3/common/test_stack_advisor.py  | 16 +---
 4 files changed, 14 insertions(+), 5 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/08cd5d04/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 9390dfd..2380f2e 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
@@ -456,7 +456,6 @@ class HDP22StackAdvisor(HDP21StackAdvisor):
 
 if 'hbase-env' in services['configurations'] and 'phoenix_sql_enabled' in 
services['configurations']['hbase-env']['properties']:
   if 'true' == 
services['configurations']['hbase-env']['properties']['phoenix_sql_enabled'].lower():
-putHbaseSiteProperty("hbase.rpc.controllerfactory.class", 
"org.apache.hadoop.hbase.ipc.controller.ServerRpcControllerFactory")
 putHbaseSiteProperty("hbase.regionserver.wal.codec", 
'org.apache.hadoop.hbase.regionserver.wal.IndexedWALEditCodec')
 putHbaseSiteProperty("phoenix.functions.allowUserDefinedFunctions", 
'true')
   else:

http://git-wip-us.apache.org/repos/asf/ambari/blob/08cd5d04/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 076c202..e97dcce 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
@@ -124,6 +124,7 @@ class HDP23StackAdvisor(HDP22StackAdvisor):
 
 if 'hbase-env' in services['configurations'] and 'phoenix_sql_enabled' in 
services['configurations']['hbase-env']['properties']:
   if 'true' == 
services['configurations']['hbase-env']['properties']['phoenix_sql_enabled'].lower():
+putHbaseSiteProperty("hbase.rpc.controllerfactory.class", 
"org.apache.hadoop.hbase.ipc.controller.ServerRpcControllerFactory")
 
putHbaseSiteProperty("hbase.region.server.rpc.scheduler.factory.class", 
"org.apache.hadoop.hbase.ipc.PhoenixRpcSchedulerFactory")
   else:
 
putHbaseSitePropertyAttributes('hbase.region.server.rpc.scheduler.factory.class',
 'delete', 'true')

http://git-wip-us.apache.org/repos/asf/ambari/blob/08cd5d04/ambari-server/src/test/python/stacks/2.2/common/test_stack_advisor.py
--
diff --git 
a/ambari-server/src/test/python/stacks/2.2/common/test_stack_advisor.py 
b/ambari-server/src/test/python/stacks/2.2/common/test_stack_advisor.py
index 3c9844a..9e5a3c0 100644
--- a/ambari-server/src/test/python/stacks/2.2/common/test_stack_advisor.py
+++ b/ambari-server/src/test/python/stacks/2.2/common/test_stack_advisor.py
@@ -1801,7 +1801,6 @@ class TestHDP22StackAdvisor(TestCase):
   "hbase-site": {
 "properties": {
   "hbase.regionserver.wal.codec": 
"org.apache.hadoop.hbase.regionserver.wal.IndexedWALEditCodec",
-  "hbase.rpc.controllerfactory.class": 
"org.apache.hadoop.hbase.ipc.controller.ServerRpcControllerFactory",
   "phoenix.functions.allowUserDefinedFunctions": "true",
   "hbase.regionserver.global.memstore.size": "0.4",
   "hbase.coprocessor.region.classes": 
"org.apache.hadoop.hbase.security.access.SecureBulkLoadEndpoint"

http://git-wip-us.apache.org/repos/asf/ambari/blob/08cd5d04/ambari-server/src/test/python/stacks/2.3/common/test_stack_advisor.py
--
diff --git 
a/ambari-server/src/test/python/stacks/2.3/common/t

ambari git commit: AMBARI-11916. HBASE stopped after security enabling HDP-2.2.4. (Ted Yu, swagle via swagle)

2015-06-14 Thread swagle

Repository: ambari
Updated Branches:
  refs/heads/branch-2.1 3131ad828 -> 25e531d37


AMBARI-11916. HBASE stopped after security enabling HDP-2.2.4. (Ted Yu, swagle 
via swagle)


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/25e531d3
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/25e531d3
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/25e531d3

Branch: refs/heads/branch-2.1
Commit: 25e531d3744db85b1b9a4494ad0c767bd197bf2e
Parents: 3131ad8
Author: Siddharth Wagle 
Authored: Sun Jun 14 11:44:59 2015 -0700
Committer: Siddharth Wagle 
Committed: Sun Jun 14 11:50:25 2015 -0700

--
 .../stacks/HDP/2.2/services/stack_advisor.py|  1 -
 .../stacks/HDP/2.3/services/stack_advisor.py|  1 +
 .../python/stacks/2.2/common/test_stack_advisor.py  |  1 -
 .../python/stacks/2.3/common/test_stack_advisor.py  | 16 +---
 4 files changed, 14 insertions(+), 5 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/25e531d3/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 9390dfd..2380f2e 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
@@ -456,7 +456,6 @@ class HDP22StackAdvisor(HDP21StackAdvisor):
 
 if 'hbase-env' in services['configurations'] and 'phoenix_sql_enabled' in 
services['configurations']['hbase-env']['properties']:
   if 'true' == 
services['configurations']['hbase-env']['properties']['phoenix_sql_enabled'].lower():
-putHbaseSiteProperty("hbase.rpc.controllerfactory.class", 
"org.apache.hadoop.hbase.ipc.controller.ServerRpcControllerFactory")
 putHbaseSiteProperty("hbase.regionserver.wal.codec", 
'org.apache.hadoop.hbase.regionserver.wal.IndexedWALEditCodec')
 putHbaseSiteProperty("phoenix.functions.allowUserDefinedFunctions", 
'true')
   else:

http://git-wip-us.apache.org/repos/asf/ambari/blob/25e531d3/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 076c202..e97dcce 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
@@ -124,6 +124,7 @@ class HDP23StackAdvisor(HDP22StackAdvisor):
 
 if 'hbase-env' in services['configurations'] and 'phoenix_sql_enabled' in 
services['configurations']['hbase-env']['properties']:
   if 'true' == 
services['configurations']['hbase-env']['properties']['phoenix_sql_enabled'].lower():
+putHbaseSiteProperty("hbase.rpc.controllerfactory.class", 
"org.apache.hadoop.hbase.ipc.controller.ServerRpcControllerFactory")
 
putHbaseSiteProperty("hbase.region.server.rpc.scheduler.factory.class", 
"org.apache.hadoop.hbase.ipc.PhoenixRpcSchedulerFactory")
   else:
 
putHbaseSitePropertyAttributes('hbase.region.server.rpc.scheduler.factory.class',
 'delete', 'true')

http://git-wip-us.apache.org/repos/asf/ambari/blob/25e531d3/ambari-server/src/test/python/stacks/2.2/common/test_stack_advisor.py
--
diff --git 
a/ambari-server/src/test/python/stacks/2.2/common/test_stack_advisor.py 
b/ambari-server/src/test/python/stacks/2.2/common/test_stack_advisor.py
index 3c9844a..9e5a3c0 100644
--- a/ambari-server/src/test/python/stacks/2.2/common/test_stack_advisor.py
+++ b/ambari-server/src/test/python/stacks/2.2/common/test_stack_advisor.py
@@ -1801,7 +1801,6 @@ class TestHDP22StackAdvisor(TestCase):
   "hbase-site": {
 "properties": {
   "hbase.regionserver.wal.codec": 
"org.apache.hadoop.hbase.regionserver.wal.IndexedWALEditCodec",
-  "hbase.rpc.controllerfactory.class": 
"org.apache.hadoop.hbase.ipc.controller.ServerRpcControllerFactory",
   "phoenix.functions.allowUserDefinedFunctions": "true",
   "hbase.regionserver.global.memstore.size": "0.4",
   "hbase.coprocessor.region.classes": 
"org.apache.hadoop.hbase.security.access.SecureBulkLoadEndpoint"

http://git-wip-us.apache.org/repos/asf/ambari/blob/25e531d3/ambari-server/src/test/python/stacks/2.3/common/test_stack_advisor.py
--
diff --git 
a/ambari-server/src/test/python/stacks/2.

ambari git commit: AMBARI-11899 Perf Cluster: Heatmaps page not loading (dsen)

2015-06-14 Thread dsen

Repository: ambari
Updated Branches:
  refs/heads/trunk 5ce9314f6 -> 899705d07


AMBARI-11899 Perf Cluster: Heatmaps page not loading (dsen)


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/899705d0
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/899705d0
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/899705d0

Branch: refs/heads/trunk
Commit: 899705d074836918f25f500a7e895aaba993e760
Parents: 5ce9314
Author: Dmytro Sen 
Authored: Sun Jun 14 21:48:16 2015 +0300
Committer: Dmytro Sen 
Committed: Sun Jun 14 21:50:56 2015 +0300

--
 .../ApplicationHistoryManagerImpl.java  |   1 -
 .../ApplicationHistoryServer.java   |   1 -
 .../metrics/loadsimulator/LoadRunner.java   |   2 -
 .../loadsimulator/MetricsSenderWorker.java  |   2 +-
 .../timeline/HBaseTimelineMetricStore.java  |  22 +--
 .../metrics/timeline/PhoenixHBaseAccessor.java  |  37 +++--
 .../metrics/timeline/Precision.java |   1 -
 .../timeline/TimelineMetricConfiguration.java   |   1 -
 .../metrics/timeline/TimelineMetricStore.java   |   6 +-
 .../metrics/timeline/query/Condition.java   |   2 +-
 .../timeline/query/DefaultCondition.java|  30 ++--
 .../timeline/query/PhoenixTransactSQL.java  |  93 
 .../query/SplitByMetricNamesCondition.java  |  25 +++-
 .../webapp/TimelineWebServices.java |  11 +-
 .../metrics/timeline/ITClusterAggregator.java   |   4 +-
 .../metrics/timeline/ITMetricAggregator.java|   6 +-
 .../timeline/ITPhoenixHBaseAccessor.java|  12 +-
 .../timeline/TestPhoenixTransactSQL.java|  48 ---
 .../timeline/TestTimelineMetricStore.java   |   4 +-
 .../metrics/timeline/AMSPropertyProvider.java   | 140 +++
 .../timeline/AMSPropertyProviderTest.java   |   8 +-
 .../ams/multiple_component_regexp_metrics.json  |   2 -
 .../resources/ams/multiple_host_metrics.json|   4 +-
 .../resources/ams/single_component_metrics.json |   3 +-
 .../ams/single_host_component_metrics.json  |   4 +-
 .../test/resources/ams/single_host_metric.json  |   4 +-
 26 files changed, 273 insertions(+), 200 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/899705d0/ambari-metrics/ambari-metrics-timelineservice/src/main/java/org/apache/hadoop/yarn/server/applicationhistoryservice/ApplicationHistoryManagerImpl.java
--
diff --git 
a/ambari-metrics/ambari-metrics-timelineservice/src/main/java/org/apache/hadoop/yarn/server/applicationhistoryservice/ApplicationHistoryManagerImpl.java
 
b/ambari-metrics/ambari-metrics-timelineservice/src/main/java/org/apache/hadoop/yarn/server/applicationhistoryservice/ApplicationHistoryManagerImpl.java
index 84e9a39..386a9f1 100644
--- 
a/ambari-metrics/ambari-metrics-timelineservice/src/main/java/org/apache/hadoop/yarn/server/applicationhistoryservice/ApplicationHistoryManagerImpl.java
+++ 
b/ambari-metrics/ambari-metrics-timelineservice/src/main/java/org/apache/hadoop/yarn/server/applicationhistoryservice/ApplicationHistoryManagerImpl.java
@@ -39,7 +39,6 @@ import org.apache.hadoop.yarn.conf.YarnConfiguration;
 import 
org.apache.hadoop.yarn.server.applicationhistoryservice.records.ApplicationAttemptHistoryData;
 import 
org.apache.hadoop.yarn.server.applicationhistoryservice.records.ApplicationHistoryData;
 import 
org.apache.hadoop.yarn.server.applicationhistoryservice.records.ContainerHistoryData;
-import 
org.apache.hadoop.yarn.server.applicationhistoryservice.timeline.MemoryTimelineStore;
 import org.apache.hadoop.yarn.webapp.util.WebAppUtils;
 
 import com.google.common.annotations.VisibleForTesting;

http://git-wip-us.apache.org/repos/asf/ambari/blob/899705d0/ambari-metrics/ambari-metrics-timelineservice/src/main/java/org/apache/hadoop/yarn/server/applicationhistoryservice/ApplicationHistoryServer.java
--
diff --git 
a/ambari-metrics/ambari-metrics-timelineservice/src/main/java/org/apache/hadoop/yarn/server/applicationhistoryservice/ApplicationHistoryServer.java
 
b/ambari-metrics/ambari-metrics-timelineservice/src/main/java/org/apache/hadoop/yarn/server/applicationhistoryservice/ApplicationHistoryServer.java
index ed4d057..24223a5 100644
--- 
a/ambari-metrics/ambari-metrics-timelineservice/src/main/java/org/apache/hadoop/yarn/server/applicationhistoryservice/ApplicationHistoryServer.java
+++ 
b/ambari-metrics/ambari-metrics-timelineservice/src/main/java/org/apache/hadoop/yarn/server/applicationhistoryservice/ApplicationHistoryServer.java
@@ -42,7 +42,6 @@ import 
org.apache.hadoop.yarn.server.applicationhistoryservice.timeline.LeveldbT
 import 
org.apache.hadoop.yarn.server.applicationhistoryservice.webapp.AHSWebApp;

ambari git commit: AMBARI-11899 Perf Cluster: Heatmaps page not loading (dsen)

2015-06-14 Thread dsen

Repository: ambari
Updated Branches:
  refs/heads/branch-2.1 3390b8c32 -> 3131ad828


AMBARI-11899 Perf Cluster: Heatmaps page not loading (dsen)


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/3131ad82
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/3131ad82
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/3131ad82

Branch: refs/heads/branch-2.1
Commit: 3131ad828ff52e72fa5b05f16f71d195d6c79bff
Parents: 3390b8c
Author: Dmytro Sen 
Authored: Sun Jun 14 21:48:16 2015 +0300
Committer: Dmytro Sen 
Committed: Sun Jun 14 21:48:16 2015 +0300

--
 .../ApplicationHistoryManagerImpl.java  |   1 -
 .../ApplicationHistoryServer.java   |   1 -
 .../metrics/loadsimulator/LoadRunner.java   |   2 -
 .../loadsimulator/MetricsSenderWorker.java  |   2 +-
 .../timeline/HBaseTimelineMetricStore.java  |  22 +--
 .../metrics/timeline/PhoenixHBaseAccessor.java  |  37 +++--
 .../metrics/timeline/Precision.java |   1 -
 .../timeline/TimelineMetricConfiguration.java   |   1 -
 .../metrics/timeline/TimelineMetricStore.java   |   6 +-
 .../metrics/timeline/query/Condition.java   |   2 +-
 .../timeline/query/DefaultCondition.java|  30 ++--
 .../timeline/query/PhoenixTransactSQL.java  |  93 
 .../query/SplitByMetricNamesCondition.java  |  25 +++-
 .../webapp/TimelineWebServices.java |  11 +-
 .../metrics/timeline/ITClusterAggregator.java   |   4 +-
 .../metrics/timeline/ITMetricAggregator.java|   6 +-
 .../timeline/ITPhoenixHBaseAccessor.java|  12 +-
 .../timeline/TestPhoenixTransactSQL.java|  48 ---
 .../timeline/TestTimelineMetricStore.java   |   4 +-
 .../metrics/timeline/AMSPropertyProvider.java   | 140 +++
 .../timeline/AMSPropertyProviderTest.java   |   8 +-
 .../ams/multiple_component_regexp_metrics.json  |   2 -
 .../resources/ams/multiple_host_metrics.json|   4 +-
 .../resources/ams/single_component_metrics.json |   3 +-
 .../ams/single_host_component_metrics.json  |   4 +-
 .../test/resources/ams/single_host_metric.json  |   4 +-
 26 files changed, 273 insertions(+), 200 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/3131ad82/ambari-metrics/ambari-metrics-timelineservice/src/main/java/org/apache/hadoop/yarn/server/applicationhistoryservice/ApplicationHistoryManagerImpl.java
--
diff --git 
a/ambari-metrics/ambari-metrics-timelineservice/src/main/java/org/apache/hadoop/yarn/server/applicationhistoryservice/ApplicationHistoryManagerImpl.java
 
b/ambari-metrics/ambari-metrics-timelineservice/src/main/java/org/apache/hadoop/yarn/server/applicationhistoryservice/ApplicationHistoryManagerImpl.java
index 84e9a39..386a9f1 100644
--- 
a/ambari-metrics/ambari-metrics-timelineservice/src/main/java/org/apache/hadoop/yarn/server/applicationhistoryservice/ApplicationHistoryManagerImpl.java
+++ 
b/ambari-metrics/ambari-metrics-timelineservice/src/main/java/org/apache/hadoop/yarn/server/applicationhistoryservice/ApplicationHistoryManagerImpl.java
@@ -39,7 +39,6 @@ import org.apache.hadoop.yarn.conf.YarnConfiguration;
 import 
org.apache.hadoop.yarn.server.applicationhistoryservice.records.ApplicationAttemptHistoryData;
 import 
org.apache.hadoop.yarn.server.applicationhistoryservice.records.ApplicationHistoryData;
 import 
org.apache.hadoop.yarn.server.applicationhistoryservice.records.ContainerHistoryData;
-import 
org.apache.hadoop.yarn.server.applicationhistoryservice.timeline.MemoryTimelineStore;
 import org.apache.hadoop.yarn.webapp.util.WebAppUtils;
 
 import com.google.common.annotations.VisibleForTesting;

http://git-wip-us.apache.org/repos/asf/ambari/blob/3131ad82/ambari-metrics/ambari-metrics-timelineservice/src/main/java/org/apache/hadoop/yarn/server/applicationhistoryservice/ApplicationHistoryServer.java
--
diff --git 
a/ambari-metrics/ambari-metrics-timelineservice/src/main/java/org/apache/hadoop/yarn/server/applicationhistoryservice/ApplicationHistoryServer.java
 
b/ambari-metrics/ambari-metrics-timelineservice/src/main/java/org/apache/hadoop/yarn/server/applicationhistoryservice/ApplicationHistoryServer.java
index ed4d057..24223a5 100644
--- 
a/ambari-metrics/ambari-metrics-timelineservice/src/main/java/org/apache/hadoop/yarn/server/applicationhistoryservice/ApplicationHistoryServer.java
+++ 
b/ambari-metrics/ambari-metrics-timelineservice/src/main/java/org/apache/hadoop/yarn/server/applicationhistoryservice/ApplicationHistoryServer.java
@@ -42,7 +42,6 @@ import 
org.apache.hadoop.yarn.server.applicationhistoryservice.timeline.LeveldbT
 import 
org.apache.hadoop.yarn.server.applicationhistoryservice.webapp.AH

ambari git commit: AMBARI-11914 Enable NameNode HA fails while stopping RegionServer (dsen)

2015-06-14 Thread dsen

Repository: ambari
Updated Branches:
  refs/heads/branch-2.1 a9b5d4579 -> 3390b8c32


AMBARI-11914 Enable NameNode HA fails while stopping RegionServer (dsen)


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/3390b8c3
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/3390b8c3
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/3390b8c3

Branch: refs/heads/branch-2.1
Commit: 3390b8c3267458d490ce44ec086eff6986b0a27b
Parents: a9b5d45
Author: Dmytro Sen 
Authored: Sun Jun 14 20:59:01 2015 +0300
Committer: Dmytro Sen 
Committed: Sun Jun 14 20:59:01 2015 +0300

--
 .../python/resource_management/core/shell.py| 34 ++--
 1 file changed, 17 insertions(+), 17 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/3390b8c3/ambari-common/src/main/python/resource_management/core/shell.py
--
diff --git a/ambari-common/src/main/python/resource_management/core/shell.py 
b/ambari-common/src/main/python/resource_management/core/shell.py
index 1ea27f8..75b5fcf 100644
--- a/ambari-common/src/main/python/resource_management/core/shell.py
+++ b/ambari-common/src/main/python/resource_management/core/shell.py
@@ -142,7 +142,7 @@ def _call_wrapper(command, **kwargs):
   except ExecuteTimeoutException as ex: 
 if on_timeout:
   Logger.info("Executing '%s'. Reason: %s" % (on_timeout, str(ex)))
-  checked_call(on_timeout)
+  result = checked_call(on_timeout)
 else:
   raise
 except Fail as ex:
@@ -212,9 +212,9 @@ def _call(command, logoutput=None, throw_on_failure=True, 
stdout=subprocess.PIPE
 preexec_fn=preexec_fn)
 
 if timeout:
-  timeout_event = threading.Event()
-  t = threading.Timer( timeout, _on_timeout, [proc, timeout_event] )
-  t.start()
+  timeout_happened=False
+  start = time.time()
+  end = start+timeout
   
 if not wait_for_finish:
   return proc
@@ -235,6 +235,10 @@ def _call(command, logoutput=None, throw_on_failure=True, 
stdout=subprocess.PIPE
 all_output = ""
   
 while read_set:
+  if timeout and time.time()> end:
+timeout_happened=True
+proc.kill()
+break
   ready, _, _ = select.select(read_set, [], [])
   for out_fd in read_set:
 if out_fd in ready:
@@ -258,7 +262,14 @@ def _call(command, logoutput=None, throw_on_failure=True, 
stdout=subprocess.PIPE
   if logoutput:
 _print(line)
   
-proc.wait()
+# Wait for process to terminate
+while proc.poll() == None:
+  if timeout and time.time()> end:
+timeout_happened=True
+proc.kill()
+break
+  time.sleep(1)
+
   finally:
 for fp in files_to_close:
   fp.close()
@@ -268,10 +279,7 @@ def _call(command, logoutput=None, throw_on_failure=True, 
stdout=subprocess.PIPE
   all_output = all_output.strip('\n')
   
   if timeout: 
-if not timeout_event.is_set():
-  t.cancel()
-# timeout occurred
-else:
+if timeout_happened:
   err_msg = ("Execution of '%s' was killed due timeout after %d seconds") 
% (command, timeout)
   raise ExecuteTimeoutException(err_msg)

@@ -350,14 +358,6 @@ def string_cmd_from_args_list(command, auto_escape=True):
   escape_func = lambda x:quote_bash_args(x) if auto_escape else lambda x:x
   return ' '.join(escape_func(x) for x in command)
 
-def _on_timeout(proc, timeout_event):
-  timeout_event.set()
-  if proc.poll() == None:
-try:
-  proc.terminate()
-except:
-  pass
-
 def _print(line):
   sys.stdout.write(line)
   sys.stdout.flush()
\ No newline at end of file

ambari git commit: AMBARI-11915. Falcon version is incorrect for HDP 2.3 Stack.

2015-06-14 Thread swagle

Repository: ambari
Updated Branches:
  refs/heads/trunk 9ad9dcc25 -> 5ce9314f6


AMBARI-11915. Falcon version is incorrect for HDP 2.3 Stack.


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/5ce9314f
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/5ce9314f
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/5ce9314f

Branch: refs/heads/trunk
Commit: 5ce9314f6df8cec9ddc7bf78b4001fd8871f87c6
Parents: 9ad9dcc
Author: Siddharth Wagle 
Authored: Sun Jun 14 10:36:59 2015 -0700
Committer: Siddharth Wagle 
Committed: Sun Jun 14 10:36:59 2015 -0700

--
 .../src/main/resources/stacks/HDP/2.3/services/FALCON/metainfo.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/5ce9314f/ambari-server/src/main/resources/stacks/HDP/2.3/services/FALCON/metainfo.xml
--
diff --git 
a/ambari-server/src/main/resources/stacks/HDP/2.3/services/FALCON/metainfo.xml 
b/ambari-server/src/main/resources/stacks/HDP/2.3/services/FALCON/metainfo.xml
index 3d6341c..eba0e58 100644
--- 
a/ambari-server/src/main/resources/stacks/HDP/2.3/services/FALCON/metainfo.xml
+++ 
b/ambari-server/src/main/resources/stacks/HDP/2.3/services/FALCON/metainfo.xml
@@ -20,7 +20,7 @@
   
 
   FALCON
-  0.7.0.2.3
+  0.6.1
   
 
   redhat7,redhat6,suse11

ambari git commit: AMBARI-11915. Falcon version is incorrect for HDP 2.3 Stack.

2015-06-14 Thread swagle

Repository: ambari
Updated Branches:
  refs/heads/branch-2.1 dc77c647f -> a9b5d4579


AMBARI-11915. Falcon version is incorrect for HDP 2.3 Stack.


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/a9b5d457
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/a9b5d457
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/a9b5d457

Branch: refs/heads/branch-2.1
Commit: a9b5d4579eb63323b2392fc337a724102a416a7e
Parents: dc77c64
Author: Siddharth Wagle 
Authored: Sun Jun 14 10:32:16 2015 -0700
Committer: Siddharth Wagle 
Committed: Sun Jun 14 10:33:41 2015 -0700

--
 .../src/main/resources/stacks/HDP/2.3/services/FALCON/metainfo.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/a9b5d457/ambari-server/src/main/resources/stacks/HDP/2.3/services/FALCON/metainfo.xml
--
diff --git 
a/ambari-server/src/main/resources/stacks/HDP/2.3/services/FALCON/metainfo.xml 
b/ambari-server/src/main/resources/stacks/HDP/2.3/services/FALCON/metainfo.xml
index 3d6341c..eba0e58 100644
--- 
a/ambari-server/src/main/resources/stacks/HDP/2.3/services/FALCON/metainfo.xml
+++ 
b/ambari-server/src/main/resources/stacks/HDP/2.3/services/FALCON/metainfo.xml
@@ -20,7 +20,7 @@
   
 
   FALCON
-  0.7.0.2.3
+  0.6.1
   
 
   redhat7,redhat6,suse11

ambari git commit: AMBARI-11914 Enable NameNode HA fails while stopping RegionServer (dsen)

2015-06-14 Thread dsen

Repository: ambari
Updated Branches:
  refs/heads/trunk 094245f31 -> 9ad9dcc25


AMBARI-11914 Enable NameNode HA fails while stopping RegionServer (dsen)


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/9ad9dcc2
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/9ad9dcc2
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/9ad9dcc2

Branch: refs/heads/trunk
Commit: 9ad9dcc25cf26a269637db8d3ffc26be205bc5eb
Parents: 094245f
Author: Dmytro Sen 
Authored: Sun Jun 14 20:31:49 2015 +0300
Committer: Dmytro Sen 
Committed: Sun Jun 14 20:31:49 2015 +0300

--
 .../python/resource_management/core/shell.py| 34 ++--
 1 file changed, 17 insertions(+), 17 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/9ad9dcc2/ambari-common/src/main/python/resource_management/core/shell.py
--
diff --git a/ambari-common/src/main/python/resource_management/core/shell.py 
b/ambari-common/src/main/python/resource_management/core/shell.py
index 1ea27f8..75b5fcf 100644
--- a/ambari-common/src/main/python/resource_management/core/shell.py
+++ b/ambari-common/src/main/python/resource_management/core/shell.py
@@ -142,7 +142,7 @@ def _call_wrapper(command, **kwargs):
   except ExecuteTimeoutException as ex: 
 if on_timeout:
   Logger.info("Executing '%s'. Reason: %s" % (on_timeout, str(ex)))
-  checked_call(on_timeout)
+  result = checked_call(on_timeout)
 else:
   raise
 except Fail as ex:
@@ -212,9 +212,9 @@ def _call(command, logoutput=None, throw_on_failure=True, 
stdout=subprocess.PIPE
 preexec_fn=preexec_fn)
 
 if timeout:
-  timeout_event = threading.Event()
-  t = threading.Timer( timeout, _on_timeout, [proc, timeout_event] )
-  t.start()
+  timeout_happened=False
+  start = time.time()
+  end = start+timeout
   
 if not wait_for_finish:
   return proc
@@ -235,6 +235,10 @@ def _call(command, logoutput=None, throw_on_failure=True, 
stdout=subprocess.PIPE
 all_output = ""
   
 while read_set:
+  if timeout and time.time()> end:
+timeout_happened=True
+proc.kill()
+break
   ready, _, _ = select.select(read_set, [], [])
   for out_fd in read_set:
 if out_fd in ready:
@@ -258,7 +262,14 @@ def _call(command, logoutput=None, throw_on_failure=True, 
stdout=subprocess.PIPE
   if logoutput:
 _print(line)
   
-proc.wait()
+# Wait for process to terminate
+while proc.poll() == None:
+  if timeout and time.time()> end:
+timeout_happened=True
+proc.kill()
+break
+  time.sleep(1)
+
   finally:
 for fp in files_to_close:
   fp.close()
@@ -268,10 +279,7 @@ def _call(command, logoutput=None, throw_on_failure=True, 
stdout=subprocess.PIPE
   all_output = all_output.strip('\n')
   
   if timeout: 
-if not timeout_event.is_set():
-  t.cancel()
-# timeout occurred
-else:
+if timeout_happened:
   err_msg = ("Execution of '%s' was killed due timeout after %d seconds") 
% (command, timeout)
   raise ExecuteTimeoutException(err_msg)

@@ -350,14 +358,6 @@ def string_cmd_from_args_list(command, auto_escape=True):
   escape_func = lambda x:quote_bash_args(x) if auto_escape else lambda x:x
   return ' '.join(escape_func(x) for x in command)
 
-def _on_timeout(proc, timeout_event):
-  timeout_event.set()
-  if proc.poll() == None:
-try:
-  proc.terminate()
-except:
-  pass
-
 def _print(line):
   sys.stdout.write(line)
   sys.stdout.flush()
\ No newline at end of file

ambari git commit: AMBARI-11911 [WinTP2] Falcon service check fails after installation

2015-06-14 Thread fbarca

Repository: ambari
Updated Branches:
  refs/heads/branch-2.1 b7b72065a -> dc77c647f


AMBARI-11911 [WinTP2] Falcon service check fails after installation

Retrying smoke test to cover for Falcon startup slowness


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/dc77c647
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/dc77c647
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/dc77c647

Branch: refs/heads/branch-2.1
Commit: dc77c647f6a8f326d146efbe4820c7416cdd0f63
Parents: b7b7206
Author: Florian Barca 
Authored: Sun Jun 14 09:49:00 2015 -0700
Committer: Florian Barca 
Committed: Sun Jun 14 09:49:00 2015 -0700

--
 .../FALCON/0.5.0.2.1/package/scripts/service_check.py  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/dc77c647/ambari-server/src/main/resources/common-services/FALCON/0.5.0.2.1/package/scripts/service_check.py
--
diff --git 
a/ambari-server/src/main/resources/common-services/FALCON/0.5.0.2.1/package/scripts/service_check.py
 
b/ambari-server/src/main/resources/common-services/FALCON/0.5.0.2.1/package/scripts/service_check.py
index 1e48d6a..e633dcb 100644
--- 
a/ambari-server/src/main/resources/common-services/FALCON/0.5.0.2.1/package/scripts/service_check.py
+++ 
b/ambari-server/src/main/resources/common-services/FALCON/0.5.0.2.1/package/scripts/service_check.py
@@ -47,7 +47,7 @@ class FalconServiceCheckWindows(FalconServiceCheck):
 env.set_params(params)
 smoke_cmd = os.path.join(params.hdp_root,"Run-SmokeTests.cmd")
 service = "FALCON"
-Execute(format("cmd /C {smoke_cmd} {service}"), user=params.falcon_user, 
logoutput=True)
+Execute(format("cmd /C {smoke_cmd} {service}"), user=params.falcon_user, 
logoutput=True, tries = 3, try_sleep = 20)
 
 if __name__ == "__main__":
   FalconServiceCheck().execute()

ambari git commit: AMBARI-11911 [WinTP2] Falcon service check fails after installation

2015-06-14 Thread fbarca

Repository: ambari
Updated Branches:
  refs/heads/trunk aea31f740 -> 094245f31


AMBARI-11911 [WinTP2] Falcon service check fails after installation

Retrying smoke test to cover for Falcon startup slowness


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/094245f3
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/094245f3
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/094245f3

Branch: refs/heads/trunk
Commit: 094245f3192345ce6bead138f1b8b5687b1cf6ad
Parents: aea31f7
Author: Florian Barca 
Authored: Sun Jun 14 09:47:05 2015 -0700
Committer: Florian Barca 
Committed: Sun Jun 14 09:47:05 2015 -0700

--
 .../FALCON/0.5.0.2.1/package/scripts/service_check.py  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/094245f3/ambari-server/src/main/resources/common-services/FALCON/0.5.0.2.1/package/scripts/service_check.py
--
diff --git 
a/ambari-server/src/main/resources/common-services/FALCON/0.5.0.2.1/package/scripts/service_check.py
 
b/ambari-server/src/main/resources/common-services/FALCON/0.5.0.2.1/package/scripts/service_check.py
index 1e48d6a..e633dcb 100644
--- 
a/ambari-server/src/main/resources/common-services/FALCON/0.5.0.2.1/package/scripts/service_check.py
+++ 
b/ambari-server/src/main/resources/common-services/FALCON/0.5.0.2.1/package/scripts/service_check.py
@@ -47,7 +47,7 @@ class FalconServiceCheckWindows(FalconServiceCheck):
 env.set_params(params)
 smoke_cmd = os.path.join(params.hdp_root,"Run-SmokeTests.cmd")
 service = "FALCON"
-Execute(format("cmd /C {smoke_cmd} {service}"), user=params.falcon_user, 
logoutput=True)
+Execute(format("cmd /C {smoke_cmd} {service}"), user=params.falcon_user, 
logoutput=True, tries = 3, try_sleep = 20)
 
 if __name__ == "__main__":
   FalconServiceCheck().execute()

[2/2] ambari git commit: AMBARI-11912. Ambari removing ranger group from ranger user after installation (aonishuk)

2015-06-14 Thread aonishuk

AMBARI-11912. Ambari removing ranger group from ranger user after installation 
(aonishuk)


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/172d251d
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/172d251d
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/172d251d

Branch: refs/heads/branch-2.1
Commit: 172d251d634c4484059110f11ea40340ec36e2d5
Parents: 9a332b8
Author: Andrew Onishuk 
Authored: Sun Jun 14 13:06:15 2015 +0300
Committer: Andrew Onishuk 
Committed: Sun Jun 14 13:06:15 2015 +0300

--
 .../stacks/HDP/2.0.6/hooks/before-ANY/scripts/params.py  | 8 +++-
 1 file changed, 7 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/172d251d/ambari-server/src/main/resources/stacks/HDP/2.0.6/hooks/before-ANY/scripts/params.py
--
diff --git 
a/ambari-server/src/main/resources/stacks/HDP/2.0.6/hooks/before-ANY/scripts/params.py
 
b/ambari-server/src/main/resources/stacks/HDP/2.0.6/hooks/before-ANY/scripts/params.py
index 1c7b2b7..5b5829d 100644
--- 
a/ambari-server/src/main/resources/stacks/HDP/2.0.6/hooks/before-ANY/scripts/params.py
+++ 
b/ambari-server/src/main/resources/stacks/HDP/2.0.6/hooks/before-ANY/scripts/params.py
@@ -151,6 +151,7 @@ gmond_user = 
config['configurations']['ganglia-env']["gmond_user"]
 tez_user = config['configurations']['tez-env']["tez_user"]
 oozie_user = config['configurations']['oozie-env']["oozie_user"]
 falcon_user = config['configurations']['falcon-env']["falcon_user"]
+ranger_user = config['configurations']['ranger-env']["ranger_user"]
 
 user_group = config['configurations']['cluster-env']['user_group']
 
@@ -159,6 +160,7 @@ namenode_host = default("/clusterHostInfo/namenode_host", 
[])
 hbase_master_hosts = default("/clusterHostInfo/hbase_master_hosts", [])
 oozie_servers = default("/clusterHostInfo/oozie_server", [])
 falcon_server_hosts = default("/clusterHostInfo/falcon_server_hosts", [])
+ranger_admin_hosts = default("/clusterHostInfo/ranger_admin_hosts", [])
 
 has_namenode = not len(namenode_host) == 0
 has_ganglia_server = not len(ganglia_server_hosts) == 0
@@ -166,10 +168,12 @@ has_tez = 'tez-site' in config['configurations']
 has_hbase_masters = not len(hbase_master_hosts) == 0
 has_oozie_server = not len(oozie_servers) == 0
 has_falcon_server_hosts = not len(falcon_server_hosts) == 0
+has_ranger_admin = not len(ranger_admin_hosts) == 0
 
 hbase_tmp_dir = "/tmp/hbase-hbase"
 
-proxyuser_group = default("/configurations/hadoop-env/proxyuser_group","users")
+proxyuser_group = config['configurations']['hadoop-env']['proxyuser_group']
+ranger_group = config['configurations']['ranger-env']['ranger_group']
 dfs_cluster_administrators_group = 
config['configurations']['hdfs-site']["dfs.cluster.administrators"]
 
 ignore_groupsusers_create = 
default("/configurations/cluster-env/ignore_groupsusers_create", False)
@@ -192,6 +196,8 @@ if has_oozie_server:
   user_to_groups_dict[oozie_user] = [proxyuser_group]
 if has_falcon_server_hosts:
   user_to_groups_dict[falcon_user] = [proxyuser_group]
+if has_ranger_admin:
+  user_to_groups_dict[ranger_user] = [ranger_group]
 
 user_to_gid_dict = collections.defaultdict(lambda:user_group)

ambari git commit: AMBARI-11906. Install Wizard: Moving from review step to customize services page cause js error. (alexantonenko)

2015-06-14 Thread alexantonenko

Repository: ambari
Updated Branches:
  refs/heads/branch-2.1 e50fac36e -> b7b72065a


AMBARI-11906. Install Wizard: Moving from review step to customize services 
page cause js error. (alexantonenko)


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/b7b72065
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/b7b72065
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/b7b72065

Branch: refs/heads/branch-2.1
Commit: b7b72065ac699a79606d6423823c380841b84f98
Parents: e50fac3
Author: Alex Antonenko 
Authored: Sun Jun 14 01:24:57 2015 +0300
Committer: Alex Antonenko 
Committed: Sun Jun 14 16:07:59 2015 +0300

--
 ambari-web/app/controllers/wizard/step7_controller.js | 12 +++-
 1 file changed, 7 insertions(+), 5 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/b7b72065/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 d20cee5..3cf8f56 100644
--- a/ambari-web/app/controllers/wizard/step7_controller.js
+++ b/ambari-web/app/controllers/wizard/step7_controller.js
@@ -677,12 +677,14 @@ App.WizardStep7Controller = 
Em.Controller.extend(App.ServerValidatorMixin, App.E
 var self = this;
 this.loadServerSideConfigsRecommendations().always(function () {
   // format descriptor configs
-  var serviceConfigProperties = 
(self.get('content.serviceConfigProperties') || []).mapProperty('name');
-  var recommendedToDelete = 
self.get('_dependentConfigValues').filterProperty('toDelete');
+  var serviceConfigPropertiesNames = 
(self.get('content.serviceConfigProperties') || []).mapProperty('name'),
+   serviceConfigPropertiesFileNames = 
(self.get('content.serviceConfigProperties') || []).mapProperty('filename'),
+   recommendedToDelete = 
self.get('_dependentConfigValues').filterProperty('toDelete');
   recommendedToDelete.forEach(function (c) {
-var name = Em.get(c, 'propertyName');
-if (serviceConfigProperties.contains(name)) {
-  
Em.set(self.get('_dependentConfigValues').findProperty('propertyName', 
name).findProperty('fileName', serviceConfigProperties.get('filename')), 
'toDelete', false);
+var name = Em.get(c, 'propertyName'),
+ filename = Em.get(c, 'fileName');
+if (serviceConfigPropertiesNames.contains(name) && 
serviceConfigPropertiesFileNames.contains(filename)) {
+  Em.set(c, 'toDelete', false);
 }
   });

ambari git commit: AMBARI-11906. Install Wizard: Moving from review step to customize services page cause js error. (alexantonenko)

2015-06-14 Thread alexantonenko

Repository: ambari
Updated Branches:
  refs/heads/trunk e7a4ce323 -> aea31f740


AMBARI-11906. Install Wizard: Moving from review step to customize services 
page cause js error. (alexantonenko)


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/aea31f74
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/aea31f74
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/aea31f74

Branch: refs/heads/trunk
Commit: aea31f7407c135d41842b02c86218ad8ed8a9e69
Parents: e7a4ce3
Author: Alex Antonenko 
Authored: Sun Jun 14 01:24:57 2015 +0300
Committer: Alex Antonenko 
Committed: Sun Jun 14 16:03:45 2015 +0300

--
 ambari-web/app/controllers/wizard/step7_controller.js | 12 +++-
 1 file changed, 7 insertions(+), 5 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/aea31f74/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 d20cee5..3cf8f56 100644
--- a/ambari-web/app/controllers/wizard/step7_controller.js
+++ b/ambari-web/app/controllers/wizard/step7_controller.js
@@ -677,12 +677,14 @@ App.WizardStep7Controller = 
Em.Controller.extend(App.ServerValidatorMixin, App.E
 var self = this;
 this.loadServerSideConfigsRecommendations().always(function () {
   // format descriptor configs
-  var serviceConfigProperties = 
(self.get('content.serviceConfigProperties') || []).mapProperty('name');
-  var recommendedToDelete = 
self.get('_dependentConfigValues').filterProperty('toDelete');
+  var serviceConfigPropertiesNames = 
(self.get('content.serviceConfigProperties') || []).mapProperty('name'),
+   serviceConfigPropertiesFileNames = 
(self.get('content.serviceConfigProperties') || []).mapProperty('filename'),
+   recommendedToDelete = 
self.get('_dependentConfigValues').filterProperty('toDelete');
   recommendedToDelete.forEach(function (c) {
-var name = Em.get(c, 'propertyName');
-if (serviceConfigProperties.contains(name)) {
-  
Em.set(self.get('_dependentConfigValues').findProperty('propertyName', 
name).findProperty('fileName', serviceConfigProperties.get('filename')), 
'toDelete', false);
+var name = Em.get(c, 'propertyName'),
+ filename = Em.get(c, 'fileName');
+if (serviceConfigPropertiesNames.contains(name) && 
serviceConfigPropertiesFileNames.contains(filename)) {
+  Em.set(c, 'toDelete', false);
 }
   });

ambari git commit: AMBARI-11891. Add Service fails after successful RU due to yum cache (ncole)

2015-06-14 Thread ncole

Repository: ambari
Updated Branches:
  refs/heads/branch-2.1 172d251d6 -> e50fac36e


AMBARI-11891. Add Service fails after successful RU due to yum cache (ncole)


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/e50fac36
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/e50fac36
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/e50fac36

Branch: refs/heads/branch-2.1
Commit: e50fac36eac9c4cb8ab1d5f5f86eb0fe098d24dd
Parents: 172d251
Author: Nate Cole 
Authored: Sun Jun 14 07:13:03 2015 -0400
Committer: Nate Cole 
Committed: Sun Jun 14 07:13:03 2015 -0400

--
 .../internal/UpgradeResourceProvider.java   | 13 +--
 .../ambari/server/state/UpgradeHelper.java  |  9 ++
 .../state/stack/upgrade/ClusterGrouping.java| 20 -
 .../state/stack/upgrade/StageWrapper.java   |  7 ++
 .../custom_actions/scripts/ru_execute_tasks.py  | 22 +++--
 .../custom_actions/scripts/ru_set_all.py| 62 +
 .../stacks/HDP/2.2/upgrades/upgrade-2.2.xml |  8 ++
 .../stacks/HDP/2.2/upgrades/upgrade-2.3.xml | 36 +++-
 .../stacks/HDP/2.3/upgrades/upgrade-2.3.xml |  8 ++
 .../ambari/server/state/UpgradeHelperTest.java  | 80 +
 .../custom_actions/test_ru_execute_tasks.py | 52 ++-
 .../python/custom_actions/test_ru_set_all.py| 94 
 .../HDP/2.1.1/upgrades/upgrade_to_new_stack.xml |  9 ++
 13 files changed, 400 insertions(+), 20 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/e50fac36/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/UpgradeResourceProvider.java
--
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/UpgradeResourceProvider.java
 
b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/UpgradeResourceProvider.java
index b5c998a..41cccea 100644
--- 
a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/UpgradeResourceProvider.java
+++ 
b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/UpgradeResourceProvider.java
@@ -399,7 +399,7 @@ public class UpgradeResourceProvider extends 
AbstractControllerResourceProvider
   List taskIds = new ArrayList();
 
   for (HostRoleCommand hrc : internalRequest.getCommands()) {
-if (HostRoleStatus.ABORTED == hrc.getStatus()) {
+if (HostRoleStatus.ABORTED == hrc.getStatus() || 
HostRoleStatus.TIMEDOUT == hrc.getStatus()) {
   taskIds.add(hrc.getTaskId());
 }
   }
@@ -556,7 +556,7 @@ public class UpgradeResourceProvider extends 
AbstractControllerResourceProvider
 StackId sourceStackId = null;
 StackId targetStackId = null;
 
-switch( direction ){
+switch (direction) {
   case UPGRADE:
 sourceStackId = cluster.getCurrentStackVersion();
 
@@ -850,12 +850,15 @@ public class UpgradeResourceProvider extends 
AbstractControllerResourceProvider
 // service_package_folder and hooks_folder params.
 AmbariMetaInfo ambariMetaInfo = s_metaProvider.get();
 StackId stackId = cluster.getDesiredStackVersion();
+
+
 StackInfo stackInfo = ambariMetaInfo.getStack(stackId.getStackName(), 
stackId.getStackVersion());
-if (wrapper.getTasks() != null && wrapper.getTasks().size() > 0) {
+if (wrapper.getTasks() != null &&
+wrapper.getTasks().size() > 0 &&
+wrapper.getTasks().get(0).getService() != null) {
   String serviceName = wrapper.getTasks().get(0).getService();
   ServiceInfo serviceInfo = 
ambariMetaInfo.getService(stackId.getStackName(), stackId.getStackVersion(), 
serviceName);
-  params.put(SERVICE_PACKAGE_FOLDER,
-  serviceInfo.getServicePackageFolder());
+  params.put(SERVICE_PACKAGE_FOLDER, 
serviceInfo.getServicePackageFolder());
   params.put(HOOKS_FOLDER, stackInfo.getStackHooksFolder());
 }
 

http://git-wip-us.apache.org/repos/asf/ambari/blob/e50fac36/ambari-server/src/main/java/org/apache/ambari/server/state/UpgradeHelper.java
--
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/state/UpgradeHelper.java 
b/ambari-server/src/main/java/org/apache/ambari/server/state/UpgradeHelper.java
index 0964335..5e63744 100644
--- 
a/ambari-server/src/main/java/org/apache/ambari/server/state/UpgradeHelper.java
+++ 
b/ambari-server/src/main/java/org/apache/ambari/server/state/UpgradeHelper.java
@@ -305,8 +305,17 @@ public class UpgradeHelper {
 holder.title = tokenReplace(ctx, holder.title, null, null);
 
 for (StageWrapper stageWrapper : holder.items) {
+  if (null != stageWrapper.getText()) {
+stageWrapper.setText(tokenReplace(ctx, stageWrapper.ge

ambari git commit: AMBARI-11891. Add Service fails after successful RU due to yum cache (ncole)

2015-06-14 Thread ncole

Repository: ambari
Updated Branches:
  refs/heads/trunk 478b77ef3 -> e7a4ce323


AMBARI-11891. Add Service fails after successful RU due to yum cache (ncole)


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/e7a4ce32
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/e7a4ce32
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/e7a4ce32

Branch: refs/heads/trunk
Commit: e7a4ce3236c3f52d5baf5e331a263b28d3ea0940
Parents: 478b77e
Author: Nate Cole 
Authored: Fri Jun 12 15:07:40 2015 -0400
Committer: Nate Cole 
Committed: Sun Jun 14 07:07:13 2015 -0400

--
 .../internal/UpgradeResourceProvider.java   | 13 +--
 .../ambari/server/state/UpgradeHelper.java  |  9 ++
 .../state/stack/upgrade/ClusterGrouping.java| 20 -
 .../state/stack/upgrade/StageWrapper.java   |  7 ++
 .../custom_actions/scripts/ru_execute_tasks.py  | 22 +++--
 .../custom_actions/scripts/ru_set_all.py| 62 +
 .../stacks/HDP/2.2/upgrades/upgrade-2.2.xml |  8 ++
 .../stacks/HDP/2.2/upgrades/upgrade-2.3.xml | 36 +++-
 .../stacks/HDP/2.3/upgrades/upgrade-2.3.xml |  8 ++
 .../ambari/server/state/UpgradeHelperTest.java  | 80 +
 .../custom_actions/test_ru_execute_tasks.py | 52 ++-
 .../python/custom_actions/test_ru_set_all.py| 94 
 .../HDP/2.1.1/upgrades/upgrade_to_new_stack.xml |  9 ++
 13 files changed, 400 insertions(+), 20 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/e7a4ce32/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/UpgradeResourceProvider.java
--
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/UpgradeResourceProvider.java
 
b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/UpgradeResourceProvider.java
index b5c998a..41cccea 100644
--- 
a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/UpgradeResourceProvider.java
+++ 
b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/UpgradeResourceProvider.java
@@ -399,7 +399,7 @@ public class UpgradeResourceProvider extends 
AbstractControllerResourceProvider
   List taskIds = new ArrayList();
 
   for (HostRoleCommand hrc : internalRequest.getCommands()) {
-if (HostRoleStatus.ABORTED == hrc.getStatus()) {
+if (HostRoleStatus.ABORTED == hrc.getStatus() || 
HostRoleStatus.TIMEDOUT == hrc.getStatus()) {
   taskIds.add(hrc.getTaskId());
 }
   }
@@ -556,7 +556,7 @@ public class UpgradeResourceProvider extends 
AbstractControllerResourceProvider
 StackId sourceStackId = null;
 StackId targetStackId = null;
 
-switch( direction ){
+switch (direction) {
   case UPGRADE:
 sourceStackId = cluster.getCurrentStackVersion();
 
@@ -850,12 +850,15 @@ public class UpgradeResourceProvider extends 
AbstractControllerResourceProvider
 // service_package_folder and hooks_folder params.
 AmbariMetaInfo ambariMetaInfo = s_metaProvider.get();
 StackId stackId = cluster.getDesiredStackVersion();
+
+
 StackInfo stackInfo = ambariMetaInfo.getStack(stackId.getStackName(), 
stackId.getStackVersion());
-if (wrapper.getTasks() != null && wrapper.getTasks().size() > 0) {
+if (wrapper.getTasks() != null &&
+wrapper.getTasks().size() > 0 &&
+wrapper.getTasks().get(0).getService() != null) {
   String serviceName = wrapper.getTasks().get(0).getService();
   ServiceInfo serviceInfo = 
ambariMetaInfo.getService(stackId.getStackName(), stackId.getStackVersion(), 
serviceName);
-  params.put(SERVICE_PACKAGE_FOLDER,
-  serviceInfo.getServicePackageFolder());
+  params.put(SERVICE_PACKAGE_FOLDER, 
serviceInfo.getServicePackageFolder());
   params.put(HOOKS_FOLDER, stackInfo.getStackHooksFolder());
 }
 

http://git-wip-us.apache.org/repos/asf/ambari/blob/e7a4ce32/ambari-server/src/main/java/org/apache/ambari/server/state/UpgradeHelper.java
--
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/state/UpgradeHelper.java 
b/ambari-server/src/main/java/org/apache/ambari/server/state/UpgradeHelper.java
index 0964335..5e63744 100644
--- 
a/ambari-server/src/main/java/org/apache/ambari/server/state/UpgradeHelper.java
+++ 
b/ambari-server/src/main/java/org/apache/ambari/server/state/UpgradeHelper.java
@@ -305,8 +305,17 @@ public class UpgradeHelper {
 holder.title = tokenReplace(ctx, holder.title, null, null);
 
 for (StageWrapper stageWrapper : holder.items) {
+  if (null != stageWrapper.getText()) {
+stageWrapper.setText(tokenReplace(ctx, stageWrapper.getText(),
+

[1/2] ambari git commit: AMBARI-11912. Ambari removing ranger group from ranger user after installation (aonishuk)

2015-06-14 Thread aonishuk

Repository: ambari
Updated Branches:
  refs/heads/branch-2.1 9a332b893 -> 172d251d6
  refs/heads/trunk 93a93c1ef -> 478b77ef3


AMBARI-11912. Ambari removing ranger group from ranger user after installation 
(aonishuk)


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/478b77ef
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/478b77ef
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/478b77ef

Branch: refs/heads/trunk
Commit: 478b77ef3a0b1c3b40b1bba16b9176faf6e4fb41
Parents: 93a93c1
Author: Andrew Onishuk 
Authored: Sun Jun 14 13:06:12 2015 +0300
Committer: Andrew Onishuk 
Committed: Sun Jun 14 13:06:12 2015 +0300

--
 .../stacks/HDP/2.0.6/hooks/before-ANY/scripts/params.py  | 8 +++-
 1 file changed, 7 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/478b77ef/ambari-server/src/main/resources/stacks/HDP/2.0.6/hooks/before-ANY/scripts/params.py
--
diff --git 
a/ambari-server/src/main/resources/stacks/HDP/2.0.6/hooks/before-ANY/scripts/params.py
 
b/ambari-server/src/main/resources/stacks/HDP/2.0.6/hooks/before-ANY/scripts/params.py
index 1c7b2b7..5b5829d 100644
--- 
a/ambari-server/src/main/resources/stacks/HDP/2.0.6/hooks/before-ANY/scripts/params.py
+++ 
b/ambari-server/src/main/resources/stacks/HDP/2.0.6/hooks/before-ANY/scripts/params.py
@@ -151,6 +151,7 @@ gmond_user = 
config['configurations']['ganglia-env']["gmond_user"]
 tez_user = config['configurations']['tez-env']["tez_user"]
 oozie_user = config['configurations']['oozie-env']["oozie_user"]
 falcon_user = config['configurations']['falcon-env']["falcon_user"]
+ranger_user = config['configurations']['ranger-env']["ranger_user"]
 
 user_group = config['configurations']['cluster-env']['user_group']
 
@@ -159,6 +160,7 @@ namenode_host = default("/clusterHostInfo/namenode_host", 
[])
 hbase_master_hosts = default("/clusterHostInfo/hbase_master_hosts", [])
 oozie_servers = default("/clusterHostInfo/oozie_server", [])
 falcon_server_hosts = default("/clusterHostInfo/falcon_server_hosts", [])
+ranger_admin_hosts = default("/clusterHostInfo/ranger_admin_hosts", [])
 
 has_namenode = not len(namenode_host) == 0
 has_ganglia_server = not len(ganglia_server_hosts) == 0
@@ -166,10 +168,12 @@ has_tez = 'tez-site' in config['configurations']
 has_hbase_masters = not len(hbase_master_hosts) == 0
 has_oozie_server = not len(oozie_servers) == 0
 has_falcon_server_hosts = not len(falcon_server_hosts) == 0
+has_ranger_admin = not len(ranger_admin_hosts) == 0
 
 hbase_tmp_dir = "/tmp/hbase-hbase"
 
-proxyuser_group = default("/configurations/hadoop-env/proxyuser_group","users")
+proxyuser_group = config['configurations']['hadoop-env']['proxyuser_group']
+ranger_group = config['configurations']['ranger-env']['ranger_group']
 dfs_cluster_administrators_group = 
config['configurations']['hdfs-site']["dfs.cluster.administrators"]
 
 ignore_groupsusers_create = 
default("/configurations/cluster-env/ignore_groupsusers_create", False)
@@ -192,6 +196,8 @@ if has_oozie_server:
   user_to_groups_dict[oozie_user] = [proxyuser_group]
 if has_falcon_server_hosts:
   user_to_groups_dict[falcon_user] = [proxyuser_group]
+if has_ranger_admin:
+  user_to_groups_dict[ranger_user] = [ranger_group]
 
 user_to_gid_dict = collections.defaultdict(lambda:user_group)

ambari git commit: AMBARI-11905. Fix idempotent issue for Oracle.(vbrodetskyi)

2015-06-14 Thread vbrodetskyi

Repository: ambari
Updated Branches:
  refs/heads/branch-2.1 d537d4a48 -> 9a332b893


AMBARI-11905. Fix idempotent issue for Oracle.(vbrodetskyi)


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/9a332b89
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/9a332b89
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/9a332b89

Branch: refs/heads/branch-2.1
Commit: 9a332b8938be2cbb7fad2999bf3927a099acec8a
Parents: d537d4a
Author: Vitaly Brodetskyi 
Authored: Sun Jun 14 12:11:55 2015 +0300
Committer: Vitaly Brodetskyi 
Committed: Sun Jun 14 12:11:55 2015 +0300

--
 .../apache/ambari/server/orm/DBAccessor.java| 44 ++
 .../ambari/server/orm/DBAccessorImpl.java   | 84 +---
 .../server/orm/helpers/dbms/OracleHelper.java   | 11 +++
 .../server/upgrade/UpgradeCatalog210.java   |  6 +-
 .../server/upgrade/UpgradeCatalog210Test.java   | 68 +---
 5 files changed, 172 insertions(+), 41 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/9a332b89/ambari-server/src/main/java/org/apache/ambari/server/orm/DBAccessor.java
--
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/orm/DBAccessor.java 
b/ambari-server/src/main/java/org/apache/ambari/server/orm/DBAccessor.java
index 27dd320..997aeb8 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/orm/DBAccessor.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/orm/DBAccessor.java
@@ -239,6 +239,23 @@ public interface DBAccessor {
   void executeScript(String filePath) throws SQLException, IOException;
 
   /**
+   *
+   * @param query update query
+   * @return same like {@code java.sql.Statement}
+   * @throws SQLException
+   */
+  int executeUpdate(String query) throws SQLException;
+
+  /**
+   *
+   * @param query update query
+   * @param ignoreErrors true to ignore errors
+   * @return same like {@code java.sql.Statement}
+   * @throws SQLException
+   */
+  int executeUpdate(String query, boolean ignoreErrors) throws SQLException;
+
+  /**
* Conditional ad-hoc query on DB
* @param query
* @param tableName
@@ -488,9 +505,26 @@ public interface DBAccessor {
   int getColumnType(String tableName, String columnName)
   throws SQLException;
 
+  /**
+   * Get type class of the column
+   * @param tableName name of the table
+   * @param columnName name of the column
+   * @return
+   * @throws SQLException
+   * @throws ClassNotFoundException
+   */
   Class getColumnClass(String tableName, String columnName) throws 
SQLException, ClassNotFoundException;
 
   /**
+   * Check if column could be nullable
+   * @param tableName name of the table
+   * @param columnName name of the column
+   * @return true if column could be nullable
+   * @throws SQLException
+   */
+  boolean isColumnNullable(String tableName, String columnName) throws 
SQLException;
+
+  /**
* Sets the specified column to either allow or prohibit {@code NULL}.
* 
* @param tableName
@@ -508,6 +542,16 @@ public interface DBAccessor {
   void setColumnNullable(String tableName, String columnName, boolean nullable)
 throws SQLException;
 
+  /**
+   * Alter column wrapper, which handle DB specific type conversion
+   * @param tableName name of the table
+   * @param columnName name of the column
+   * @param fromType previous type
+   * @param toType new desired type
+   * @throws SQLException
+   */
+  void changeColumnType(String tableName, String columnName, Class fromType, 
Class toType) throws SQLException;
+
   enum DbType {
 ORACLE,
 MYSQL,

http://git-wip-us.apache.org/repos/asf/ambari/blob/9a332b89/ambari-server/src/main/java/org/apache/ambari/server/orm/DBAccessorImpl.java
--
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/orm/DBAccessorImpl.java 
b/ambari-server/src/main/java/org/apache/ambari/server/orm/DBAccessorImpl.java
index 4823179..c891691 100644
--- 
a/ambari-server/src/main/java/org/apache/ambari/server/orm/DBAccessorImpl.java
+++ 
b/ambari-server/src/main/java/org/apache/ambari/server/orm/DBAccessorImpl.java
@@ -611,6 +611,26 @@ public class DBAccessorImpl implements DBAccessor {
   }
 
   @Override
+  public int executeUpdate(String query) throws SQLException{
+return  executeUpdate(query, false);
+  }
+
+  @Override
+  public int executeUpdate(String query, boolean ignoreErrors) throws 
SQLException{
+Statement statement = getConnection().createStatement();
+try {
+  return statement.executeUpdate(query);
+} catch (SQLException e){
+  LOG.warn("Error executing query: " + query + ", " +
+ "errorCode = " + e.getErrorCode() + ", message = "

ambari git commit: AMBARI-11905. Fix idempotent issue for Oracle.(vbrodetskyi)

2015-06-14 Thread vbrodetskyi

Repository: ambari
Updated Branches:
  refs/heads/trunk 458e7094e -> 93a93c1ef


AMBARI-11905. Fix idempotent issue for Oracle.(vbrodetskyi)


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/93a93c1e
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/93a93c1e
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/93a93c1e

Branch: refs/heads/trunk
Commit: 93a93c1ef71d30c274d31b9eda5c83b926b34fb8
Parents: 458e709
Author: Vitaly Brodetskyi 
Authored: Sun Jun 14 12:10:41 2015 +0300
Committer: Vitaly Brodetskyi 
Committed: Sun Jun 14 12:10:41 2015 +0300

--
 .../apache/ambari/server/orm/DBAccessor.java| 44 ++
 .../ambari/server/orm/DBAccessorImpl.java   | 84 +---
 .../server/orm/helpers/dbms/OracleHelper.java   | 11 +++
 .../server/upgrade/UpgradeCatalog210.java   |  6 +-
 .../server/upgrade/UpgradeCatalog210Test.java   | 68 +---
 5 files changed, 172 insertions(+), 41 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/93a93c1e/ambari-server/src/main/java/org/apache/ambari/server/orm/DBAccessor.java
--
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/orm/DBAccessor.java 
b/ambari-server/src/main/java/org/apache/ambari/server/orm/DBAccessor.java
index 27dd320..997aeb8 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/orm/DBAccessor.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/orm/DBAccessor.java
@@ -239,6 +239,23 @@ public interface DBAccessor {
   void executeScript(String filePath) throws SQLException, IOException;
 
   /**
+   *
+   * @param query update query
+   * @return same like {@code java.sql.Statement}
+   * @throws SQLException
+   */
+  int executeUpdate(String query) throws SQLException;
+
+  /**
+   *
+   * @param query update query
+   * @param ignoreErrors true to ignore errors
+   * @return same like {@code java.sql.Statement}
+   * @throws SQLException
+   */
+  int executeUpdate(String query, boolean ignoreErrors) throws SQLException;
+
+  /**
* Conditional ad-hoc query on DB
* @param query
* @param tableName
@@ -488,9 +505,26 @@ public interface DBAccessor {
   int getColumnType(String tableName, String columnName)
   throws SQLException;
 
+  /**
+   * Get type class of the column
+   * @param tableName name of the table
+   * @param columnName name of the column
+   * @return
+   * @throws SQLException
+   * @throws ClassNotFoundException
+   */
   Class getColumnClass(String tableName, String columnName) throws 
SQLException, ClassNotFoundException;
 
   /**
+   * Check if column could be nullable
+   * @param tableName name of the table
+   * @param columnName name of the column
+   * @return true if column could be nullable
+   * @throws SQLException
+   */
+  boolean isColumnNullable(String tableName, String columnName) throws 
SQLException;
+
+  /**
* Sets the specified column to either allow or prohibit {@code NULL}.
* 
* @param tableName
@@ -508,6 +542,16 @@ public interface DBAccessor {
   void setColumnNullable(String tableName, String columnName, boolean nullable)
 throws SQLException;
 
+  /**
+   * Alter column wrapper, which handle DB specific type conversion
+   * @param tableName name of the table
+   * @param columnName name of the column
+   * @param fromType previous type
+   * @param toType new desired type
+   * @throws SQLException
+   */
+  void changeColumnType(String tableName, String columnName, Class fromType, 
Class toType) throws SQLException;
+
   enum DbType {
 ORACLE,
 MYSQL,

http://git-wip-us.apache.org/repos/asf/ambari/blob/93a93c1e/ambari-server/src/main/java/org/apache/ambari/server/orm/DBAccessorImpl.java
--
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/orm/DBAccessorImpl.java 
b/ambari-server/src/main/java/org/apache/ambari/server/orm/DBAccessorImpl.java
index 4823179..c891691 100644
--- 
a/ambari-server/src/main/java/org/apache/ambari/server/orm/DBAccessorImpl.java
+++ 
b/ambari-server/src/main/java/org/apache/ambari/server/orm/DBAccessorImpl.java
@@ -611,6 +611,26 @@ public class DBAccessorImpl implements DBAccessor {
   }
 
   @Override
+  public int executeUpdate(String query) throws SQLException{
+return  executeUpdate(query, false);
+  }
+
+  @Override
+  public int executeUpdate(String query, boolean ignoreErrors) throws 
SQLException{
+Statement statement = getConnection().createStatement();
+try {
+  return statement.executeUpdate(query);
+} catch (SQLException e){
+  LOG.warn("Error executing query: " + query + ", " +
+ "errorCode = " + e.getErrorCode() + ", message = " + 
e.getM

ambari git commit: AMBARI-11917: [WinTP2] Windows build should use hbase and hadoop winpkg for embedded hbase (jluniya)

ambari git commit: AMBARI-11917: [WinTP2] Windows build should use hbase and hadoop winpkg for embedded hbase (jluniya)

ambari git commit: AMBARI-11909. some old settings from previous configurations still existed in kerberos.json file (Jonathan Maron via rlevas)

ambari git commit: AMBARI-11909. some old settings from previous configurations still existed in kerberos.json file (Jonathan Maron via rlevas)

ambari git commit: AMBARI-11913. Hive, Hbase have required empty properties after ambari only upgrade to 2.1.0.(vbrodetskyi)

ambari git commit: AMBARI-11913. Hive, Hbase have required empty properties after ambari only upgrade to 2.1.0.(vbrodetskyi)

ambari git commit: AMBARI-11916. HBASE stopped after security enabling HDP-2.2.4. (Ted Yu, swagle via swagle)

ambari git commit: AMBARI-11916. HBASE stopped after security enabling HDP-2.2.4. (Ted Yu, swagle via swagle)

ambari git commit: AMBARI-11899 Perf Cluster: Heatmaps page not loading (dsen)

ambari git commit: AMBARI-11899 Perf Cluster: Heatmaps page not loading (dsen)

ambari git commit: AMBARI-11914 Enable NameNode HA fails while stopping RegionServer (dsen)

ambari git commit: AMBARI-11915. Falcon version is incorrect for HDP 2.3 Stack.

ambari git commit: AMBARI-11915. Falcon version is incorrect for HDP 2.3 Stack.

ambari git commit: AMBARI-11914 Enable NameNode HA fails while stopping RegionServer (dsen)

ambari git commit: AMBARI-11911 [WinTP2] Falcon service check fails after installation

ambari git commit: AMBARI-11911 [WinTP2] Falcon service check fails after installation

[2/2] ambari git commit: AMBARI-11912. Ambari removing ranger group from ranger user after installation (aonishuk)

ambari git commit: AMBARI-11906. Install Wizard: Moving from review step to customize services page cause js error. (alexantonenko)

ambari git commit: AMBARI-11906. Install Wizard: Moving from review step to customize services page cause js error. (alexantonenko)

ambari git commit: AMBARI-11891. Add Service fails after successful RU due to yum cache (ncole)

ambari git commit: AMBARI-11891. Add Service fails after successful RU due to yum cache (ncole)

[1/2] ambari git commit: AMBARI-11912. Ambari removing ranger group from ranger user after installation (aonishuk)

ambari git commit: AMBARI-11905. Fix idempotent issue for Oracle.(vbrodetskyi)

ambari git commit: AMBARI-11905. Fix idempotent issue for Oracle.(vbrodetskyi)

24 matches

Site Navigation

Mail list logo

Footer information