date:20151013

ambari git commit: AMBARI-13417. Add Ranger Audit tab to Ranger Smart config. (jaimin)

2015-10-13 Thread jaimin

Repository: ambari
Updated Branches:
  refs/heads/trunk 31542ae31 -> 7a38f385e


AMBARI-13417. Add Ranger Audit tab to Ranger Smart config. (jaimin)


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

Branch: refs/heads/trunk
Commit: 7a38f385e61be17de7dc9366b536d10293fe6c8f
Parents: 31542ae
Author: Jaimin Jetly 
Authored: Tue Oct 13 21:47:14 2015 -0700
Committer: Jaimin Jetly 
Committed: Tue Oct 13 21:50:15 2015 -0700

--
 .../RANGER/0.4.0/configuration/ranger-env.xml   |  45 ---
 .../stacks/HDP/2.2/services/stack_advisor.py|  18 +-
 .../RANGER/configuration/ranger-admin-site.xml  |   8 +-
 .../RANGER/configuration/ranger-env.xml | 139 +
 .../RANGER/configuration/ranger-ugsync-site.xml |   4 +-
 .../services/RANGER/themes/theme_version_2.json | 304 +++
 .../configs/service_config_layout_tab_view.js   |  16 +-
 .../configs/widgets/config_widget_view.js   |  42 ++-
 8 files changed, 505 insertions(+), 71 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/7a38f385/ambari-server/src/main/resources/common-services/RANGER/0.4.0/configuration/ranger-env.xml
--
diff --git 
a/ambari-server/src/main/resources/common-services/RANGER/0.4.0/configuration/ranger-env.xml
 
b/ambari-server/src/main/resources/common-services/RANGER/0.4.0/configuration/ranger-env.xml
index b691def..0a2a3db 100644
--- 
a/ambari-server/src/main/resources/common-services/RANGER/0.4.0/configuration/ranger-env.xml
+++ 
b/ambari-server/src/main/resources/common-services/RANGER/0.4.0/configuration/ranger-env.xml
@@ -194,28 +194,6 @@
   
 
   
-ranger-kafka-plugin-enabled
-No
-Kafka Ranger Plugin
-Enable Kafka Ranger plugin
-
-  false
-  value-list
-  
-
-  Yes
-  Enabled
-
-
-  No
-  Disabled
-
-  
-  1
-
-  
-
-  
 ranger-knox-plugin-enabled
 No
 Knox Ranger Plugin
@@ -236,27 +214,4 @@
   1
 
   
-
-  
-ranger-yarn-plugin-enabled
-No
-YARN Ranger Plugin
-Enable YARN Ranger plugin
-
-  false
-  value-list
-  
-
-  Yes
-  Enabled
-
-
-  No
-  Disabled
-
-  
-  1
-
-  
-
 

http://git-wip-us.apache.org/repos/asf/ambari/blob/7a38f385/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 71fa5ab..3192ca2 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
@@ -389,11 +389,11 @@ class HDP22StackAdvisor(HDP21StackAdvisor):
 
 
 # Recommend Ranger Hive authorization as per Ranger Hive plugin property
-if "ranger-env" in services["configurations"] and 
"ranger-hive-plugin-properties" in services["configurations"] and \
+if "ranger-env" in services["configurations"] and "hive-env" in 
services["configurations"] and \
 "ranger-hive-plugin-enabled" in 
services["configurations"]["ranger-env"]["properties"]:
-  putHiveRangerPluginProperty = self.putProperty(configurations, 
"ranger-hive-plugin-properties", services)
   rangerEnvHivePluginProperty = 
services["configurations"]["ranger-env"]["properties"]["ranger-hive-plugin-enabled"]
-  putHiveRangerPluginProperty("ranger-hive-plugin-enabled", 
rangerEnvHivePluginProperty)
+  if (rangerEnvHivePluginProperty.lower() == "yes"):
+putHiveEnvProperty("hive_security_authorization", "RANGER")
 
 # Security
 if ("configurations" not in services) or ("hive-env" not in 
services["configurations"]) or \
@@ -403,6 +403,18 @@ class HDP22StackAdvisor(HDP21StackAdvisor):
   putHiveEnvProperty("hive_security_authorization", "None")
 else:
   putHiveEnvProperty("hive_security_authorization", 
services["configurations"]["hive-env"]["properties"]["hive_security_authorization"])
+
+
+# Recommend Ranger Hive authorization as per Ranger Hive plugin property
+if "ranger-env" in services["configurations"] and "hive-env" in 
services["configurations"] and \
+"ranger-hive-plugin-enabled" in 
services["configurations"]["ranger-env"]["properties"]:
+  rangerEnvHivePluginProperty =

ambari git commit: AMBARI-13351. Security-related HTTP headers should be set separately for Ambari Views then for Ambari server UI (rlevas)

2015-10-13 Thread rlevas

Repository: ambari
Updated Branches:
  refs/heads/trunk 92915952a -> 31542ae31


AMBARI-13351. Security-related HTTP headers should be set separately for Ambari 
Views then for Ambari server UI (rlevas)


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

Branch: refs/heads/trunk
Commit: 31542ae31be265e0fa309e3a33bc91b4cb90
Parents: 9291595
Author: Robert Levas 
Authored: Tue Oct 13 22:23:25 2015 -0400
Committer: Robert Levas 
Committed: Tue Oct 13 22:25:15 2015 -0400

--
 ambari-server/conf/unix/ambari.properties   |   9 +-
 ambari-server/conf/windows/ambari.properties|   9 +-
 .../server/configuration/Configuration.java |  65 +++-
 .../server/controller/AmbariHandlerList.java|   8 +-
 .../ambari/server/controller/AmbariServer.java  |   4 +-
 .../security/AbstractSecurityHeaderFilter.java  | 143 
 .../AmbariServerSecurityHeaderFilter.java   |  37 +++
 .../AmbariViewsSecurityHeaderFilter.java|  37 +++
 .../server/security/SecurityHeaderFilter.java   | 121 ---
 .../controller/AmbariHandlerListTest.java   |   8 +-
 .../AbstractSecurityHeaderFilterTest.java   | 329 +++
 .../AmbariServerSecurityHeaderFilterTest.java   |  51 +++
 .../AmbariViewsSecurityHeaderFilterTest.java|  52 +++
 .../security/SecurityHeaderFilterTest.java  | 318 --
 14 files changed, 734 insertions(+), 457 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/31542ae3/ambari-server/conf/unix/ambari.properties
--
diff --git a/ambari-server/conf/unix/ambari.properties 
b/ambari-server/conf/unix/ambari.properties
index 68cbf65..53af453 100644
--- a/ambari-server/conf/unix/ambari.properties
+++ b/ambari-server/conf/unix/ambari.properties
@@ -97,7 +97,12 @@ skip.service.checks=false
 rolling.upgrade.min.stack=HDP-2.2
 rolling.upgrade.max.stack=
 
-# HTTP Header settings
+# HTTP Header settings for Ambari Server UI
 http.strict-transport-security=max-age=31536000
 http.x-xss-protection=1; mode=block
-http.x-frame-options=DENY
\ No newline at end of file
+http.x-frame-options=DENY
+
+# HTTP Header settings for Ambari Views
+views.http.strict-transport-security=max-age=31536000
+views.http.x-xss-protection=1; mode=block
+views.http.x-frame-options=SAMEORIGIN
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ambari/blob/31542ae3/ambari-server/conf/windows/ambari.properties
--
diff --git a/ambari-server/conf/windows/ambari.properties 
b/ambari-server/conf/windows/ambari.properties
index 6a98a63..570e904 100644
--- a/ambari-server/conf/windows/ambari.properties
+++ b/ambari-server/conf/windows/ambari.properties
@@ -87,7 +87,12 @@ ulimit.open.files=1
 ##server.jdbc.user.passwd=etc\\ambari-server\\conf\\password.dat
 ##server.jdbc.user.name=ambari
 
-# HTTP Header settings
+# HTTP Header settings for Ambari Server UI
 http.strict-transport-security=max-age=31536000
 http.x-xss-protection=1; mode=block
-http.x-frame-options=DENY
\ No newline at end of file
+http.x-frame-options=DENY
+
+# HTTP Header settings for Ambari Views
+views.http.strict-transport-security=max-age=31536000
+views.http.x-xss-protection=1; mode=block
+views.http.x-frame-options=SAMEORIGIN
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ambari/blob/31542ae3/ambari-server/src/main/java/org/apache/ambari/server/configuration/Configuration.java
--
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/configuration/Configuration.java
 
b/ambari-server/src/main/java/org/apache/ambari/server/configuration/Configuration.java
index c653e1b..23f9803fe 100644
--- 
a/ambari-server/src/main/java/org/apache/ambari/server/configuration/Configuration.java
+++ 
b/ambari-server/src/main/java/org/apache/ambari/server/configuration/Configuration.java
@@ -458,7 +458,7 @@ public class Configuration {
   public static final String ALERTS_EXECUTION_SCHEDULER_THREADS_DEFAULT = "2";
 
   /**
-   *   For HTTP Response header configuration
+   *   For HTTP Response header configuration for Ambari Server UI
*/
   public static final String HTTP_STRICT_TRANSPORT_HEADER_VALUE_KEY = 
"http.strict-transport-security";
   public static final String HTTP_STRICT_TRANSPORT_HEADER_VALUE_DEFAULT = 
"max-age=31536000";
@@ -467,6 +467,16 @@ public class Configuration {
   public static final String HTTP_X_XSS_PROTECTION_HEADER_VALUE_KEY = 
"http.x-xss-protection";

ambari git commit: AMBARI-13417. Add Ranger Audit tab to Ranger Smart config. (jaimin)

2015-10-13 Thread jaimin

Repository: ambari
Updated Branches:
  refs/heads/branch-2.1 8708118c0 -> 5c9182fd7


AMBARI-13417. Add Ranger Audit tab to Ranger Smart config. (jaimin)


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

Branch: refs/heads/branch-2.1
Commit: 5c9182fd7e1df25314c7622faba750c4040cb22b
Parents: 8708118
Author: Jaimin Jetly 
Authored: Tue Oct 13 21:47:14 2015 -0700
Committer: Jaimin Jetly 
Committed: Tue Oct 13 21:48:15 2015 -0700

--
 .../RANGER/0.4.0/configuration/ranger-env.xml   |  45 ---
 .../stacks/HDP/2.2/services/stack_advisor.py|  18 +-
 .../RANGER/configuration/ranger-admin-site.xml  |   8 +-
 .../RANGER/configuration/ranger-env.xml | 139 +
 .../RANGER/configuration/ranger-ugsync-site.xml |   4 +-
 .../services/RANGER/themes/theme_version_2.json | 304 +++
 .../configs/service_config_layout_tab_view.js   |  16 +-
 .../configs/widgets/config_widget_view.js   |  42 ++-
 8 files changed, 505 insertions(+), 71 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/5c9182fd/ambari-server/src/main/resources/common-services/RANGER/0.4.0/configuration/ranger-env.xml
--
diff --git 
a/ambari-server/src/main/resources/common-services/RANGER/0.4.0/configuration/ranger-env.xml
 
b/ambari-server/src/main/resources/common-services/RANGER/0.4.0/configuration/ranger-env.xml
index b691def..0a2a3db 100644
--- 
a/ambari-server/src/main/resources/common-services/RANGER/0.4.0/configuration/ranger-env.xml
+++ 
b/ambari-server/src/main/resources/common-services/RANGER/0.4.0/configuration/ranger-env.xml
@@ -194,28 +194,6 @@
   
 
   
-ranger-kafka-plugin-enabled
-No
-Kafka Ranger Plugin
-Enable Kafka Ranger plugin
-
-  false
-  value-list
-  
-
-  Yes
-  Enabled
-
-
-  No
-  Disabled
-
-  
-  1
-
-  
-
-  
 ranger-knox-plugin-enabled
 No
 Knox Ranger Plugin
@@ -236,27 +214,4 @@
   1
 
   
-
-  
-ranger-yarn-plugin-enabled
-No
-YARN Ranger Plugin
-Enable YARN Ranger plugin
-
-  false
-  value-list
-  
-
-  Yes
-  Enabled
-
-
-  No
-  Disabled
-
-  
-  1
-
-  
-
 

http://git-wip-us.apache.org/repos/asf/ambari/blob/5c9182fd/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 71fa5ab..3192ca2 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
@@ -389,11 +389,11 @@ class HDP22StackAdvisor(HDP21StackAdvisor):
 
 
 # Recommend Ranger Hive authorization as per Ranger Hive plugin property
-if "ranger-env" in services["configurations"] and 
"ranger-hive-plugin-properties" in services["configurations"] and \
+if "ranger-env" in services["configurations"] and "hive-env" in 
services["configurations"] and \
 "ranger-hive-plugin-enabled" in 
services["configurations"]["ranger-env"]["properties"]:
-  putHiveRangerPluginProperty = self.putProperty(configurations, 
"ranger-hive-plugin-properties", services)
   rangerEnvHivePluginProperty = 
services["configurations"]["ranger-env"]["properties"]["ranger-hive-plugin-enabled"]
-  putHiveRangerPluginProperty("ranger-hive-plugin-enabled", 
rangerEnvHivePluginProperty)
+  if (rangerEnvHivePluginProperty.lower() == "yes"):
+putHiveEnvProperty("hive_security_authorization", "RANGER")
 
 # Security
 if ("configurations" not in services) or ("hive-env" not in 
services["configurations"]) or \
@@ -403,6 +403,18 @@ class HDP22StackAdvisor(HDP21StackAdvisor):
   putHiveEnvProperty("hive_security_authorization", "None")
 else:
   putHiveEnvProperty("hive_security_authorization", 
services["configurations"]["hive-env"]["properties"]["hive_security_authorization"])
+
+
+# Recommend Ranger Hive authorization as per Ranger Hive plugin property
+if "ranger-env" in services["configurations"] and "hive-env" in 
services["configurations"] and \
+"ranger-hive-plugin-enabled" in 
services["configurations"]["ranger-env"]["properties"]:
+  rangerEnvHivePluginProperty =

ambari git commit: AMBARI-13351. Security-related HTTP headers should be set separately for Ambari Views then for Ambari server UI (rlevas)

2015-10-13 Thread rlevas

Repository: ambari
Updated Branches:
  refs/heads/branch-2.1 c04518272 -> 8708118c0


AMBARI-13351. Security-related HTTP headers should be set separately for Ambari 
Views then for Ambari server UI (rlevas)


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

Branch: refs/heads/branch-2.1
Commit: 8708118c0b34c7561f64816940b0149b01c84204
Parents: c045182
Author: Robert Levas 
Authored: Tue Oct 13 23:56:43 2015 -0400
Committer: Robert Levas 
Committed: Tue Oct 13 23:56:43 2015 -0400

--
 ambari-server/conf/unix/ambari.properties   |   9 +-
 ambari-server/conf/windows/ambari.properties|   9 +-
 .../server/configuration/Configuration.java |  65 +++-
 .../server/controller/AmbariHandlerList.java|   8 +-
 .../ambari/server/controller/AmbariServer.java  |   4 +-
 .../security/AbstractSecurityHeaderFilter.java  | 143 
 .../AmbariServerSecurityHeaderFilter.java   |  37 +++
 .../AmbariViewsSecurityHeaderFilter.java|  37 +++
 .../server/security/SecurityHeaderFilter.java   | 121 ---
 .../controller/AmbariHandlerListTest.java   |   8 +-
 .../AbstractSecurityHeaderFilterTest.java   | 329 +++
 .../AmbariServerSecurityHeaderFilterTest.java   |  51 +++
 .../AmbariViewsSecurityHeaderFilterTest.java|  52 +++
 .../security/SecurityHeaderFilterTest.java  | 318 --
 14 files changed, 734 insertions(+), 457 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/8708118c/ambari-server/conf/unix/ambari.properties
--
diff --git a/ambari-server/conf/unix/ambari.properties 
b/ambari-server/conf/unix/ambari.properties
index 68cbf65..53af453 100644
--- a/ambari-server/conf/unix/ambari.properties
+++ b/ambari-server/conf/unix/ambari.properties
@@ -97,7 +97,12 @@ skip.service.checks=false
 rolling.upgrade.min.stack=HDP-2.2
 rolling.upgrade.max.stack=
 
-# HTTP Header settings
+# HTTP Header settings for Ambari Server UI
 http.strict-transport-security=max-age=31536000
 http.x-xss-protection=1; mode=block
-http.x-frame-options=DENY
\ No newline at end of file
+http.x-frame-options=DENY
+
+# HTTP Header settings for Ambari Views
+views.http.strict-transport-security=max-age=31536000
+views.http.x-xss-protection=1; mode=block
+views.http.x-frame-options=SAMEORIGIN
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ambari/blob/8708118c/ambari-server/conf/windows/ambari.properties
--
diff --git a/ambari-server/conf/windows/ambari.properties 
b/ambari-server/conf/windows/ambari.properties
index 6a98a63..570e904 100644
--- a/ambari-server/conf/windows/ambari.properties
+++ b/ambari-server/conf/windows/ambari.properties
@@ -87,7 +87,12 @@ ulimit.open.files=1
 ##server.jdbc.user.passwd=etc\\ambari-server\\conf\\password.dat
 ##server.jdbc.user.name=ambari
 
-# HTTP Header settings
+# HTTP Header settings for Ambari Server UI
 http.strict-transport-security=max-age=31536000
 http.x-xss-protection=1; mode=block
-http.x-frame-options=DENY
\ No newline at end of file
+http.x-frame-options=DENY
+
+# HTTP Header settings for Ambari Views
+views.http.strict-transport-security=max-age=31536000
+views.http.x-xss-protection=1; mode=block
+views.http.x-frame-options=SAMEORIGIN
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ambari/blob/8708118c/ambari-server/src/main/java/org/apache/ambari/server/configuration/Configuration.java
--
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/configuration/Configuration.java
 
b/ambari-server/src/main/java/org/apache/ambari/server/configuration/Configuration.java
index c653e1b..23f9803fe 100644
--- 
a/ambari-server/src/main/java/org/apache/ambari/server/configuration/Configuration.java
+++ 
b/ambari-server/src/main/java/org/apache/ambari/server/configuration/Configuration.java
@@ -458,7 +458,7 @@ public class Configuration {
   public static final String ALERTS_EXECUTION_SCHEDULER_THREADS_DEFAULT = "2";
 
   /**
-   *   For HTTP Response header configuration
+   *   For HTTP Response header configuration for Ambari Server UI
*/
   public static final String HTTP_STRICT_TRANSPORT_HEADER_VALUE_KEY = 
"http.strict-transport-security";
   public static final String HTTP_STRICT_TRANSPORT_HEADER_VALUE_DEFAULT = 
"max-age=31536000";
@@ -467,6 +467,16 @@ public class Configuration {
   public static final String HTTP_X_XSS_PROTECTION_HEADER_VALUE_KEY =

ambari git commit: AMBARI-13345. Views: HDFS API utility needs to work with WASB (Gaurav Nagar via smohanty)

2015-10-13 Thread smohanty

Repository: ambari
Updated Branches:
  refs/heads/branch-2.1.2 3ed04f55c -> 420b733c1


AMBARI-13345. Views: HDFS API utility needs to work with WASB (Gaurav Nagar via 
smohanty)


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

Branch: refs/heads/branch-2.1.2
Commit: 420b733c10b5b139366747eb00ec86eb4374e8d9
Parents: 3ed04f5
Author: Sumit Mohanty 
Authored: Tue Oct 13 06:52:33 2015 -0700
Committer: Sumit Mohanty 
Committed: Tue Oct 13 06:54:40 2015 -0700

--
 .../view/hive/resources/files/FileService.java  |  3 ++
 contrib/views/utils/pom.xml |  5 +++
 .../view/utils/hdfs/ConfigurationBuilder.java   | 45 ++--
 3 files changed, 50 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/420b733c/contrib/views/hive/src/main/java/org/apache/ambari/view/hive/resources/files/FileService.java
--
diff --git 
a/contrib/views/hive/src/main/java/org/apache/ambari/view/hive/resources/files/FileService.java
 
b/contrib/views/hive/src/main/java/org/apache/ambari/view/hive/resources/files/FileService.java
index 6718093..1b8d7cc 100644
--- 
a/contrib/views/hive/src/main/java/org/apache/ambari/view/hive/resources/files/FileService.java
+++ 
b/contrib/views/hive/src/main/java/org/apache/ambari/view/hive/resources/files/FileService.java
@@ -75,6 +75,9 @@ public class FileService extends BaseService {
   @Path("{filePath:.*}")
   @Produces(MediaType.APPLICATION_JSON)
   public Response getFilePage(@PathParam("filePath") String filePath, 
@QueryParam("page") Long page) throws IOException, InterruptedException {
+if (!filePath.startsWith("/") && !filePath.startsWith(".")) {
+  filePath = "/" + filePath;  // some servers strip double slashes in URL
+}
 LOG.debug("Reading file " + filePath);
 try {
   FileResource file = new FileResource();

http://git-wip-us.apache.org/repos/asf/ambari/blob/420b733c/contrib/views/utils/pom.xml
--
diff --git a/contrib/views/utils/pom.xml b/contrib/views/utils/pom.xml
index f930061..70a2f27 100644
--- a/contrib/views/utils/pom.xml
+++ b/contrib/views/utils/pom.xml
@@ -121,6 +121,11 @@
   commons-io
   2.4
 
+
+  org.apache.hadoop
+  hadoop-azure
+  ${hadoop-version}
+
   
 
   

http://git-wip-us.apache.org/repos/asf/ambari/blob/420b733c/contrib/views/utils/src/main/java/org/apache/ambari/view/utils/hdfs/ConfigurationBuilder.java
--
diff --git 
a/contrib/views/utils/src/main/java/org/apache/ambari/view/utils/hdfs/ConfigurationBuilder.java
 
b/contrib/views/utils/src/main/java/org/apache/ambari/view/utils/hdfs/ConfigurationBuilder.java
index d992c2e..a739c84 100644
--- 
a/contrib/views/utils/src/main/java/org/apache/ambari/view/utils/hdfs/ConfigurationBuilder.java
+++ 
b/contrib/views/utils/src/main/java/org/apache/ambari/view/utils/hdfs/ConfigurationBuilder.java
@@ -23,6 +23,8 @@ import org.apache.ambari.view.utils.ambari.AmbariApi;
 import org.apache.ambari.view.utils.ambari.NoClusterAssociatedException;
 import org.apache.hadoop.conf.Configuration;
 import org.apache.hadoop.fs.LocalFileSystem;
+import org.apache.hadoop.fs.azure.NativeAzureFileSystem;
+import org.apache.hadoop.fs.azure.Wasb;
 import org.apache.hadoop.hdfs.DistributedFileSystem;
 import org.apache.hadoop.hdfs.web.WebHdfsFileSystem;
 import org.slf4j.Logger;
@@ -66,7 +68,7 @@ public class ConfigurationBuilder {
   private AmbariApi ambariApi = null;
   private AuthConfigurationBuilder authParamsBuilder;
   private Map authParams;
-
+  private URI defaultFsUri;
   /**
* Constructor of ConfigurationBuilder based on ViewContext
* @param context ViewContext
@@ -87,12 +89,14 @@ public class ConfigurationBuilder {
 
 LOG.info("HA HDFS cluster found.");
   } else {
-if (!hasPort(defaultFS)) {
+if (defaultFS.startsWith("hdfs://") && !hasPort(defaultFS)) {
   defaultFS = addPortIfMissing(defaultFS);
 }
   }
 
-  } catch (URISyntaxException e) {
+  defaultFsUri = new URI(defaultFS);
+
+} catch (URISyntaxException e) {
   throw new HdfsApiException("HDFS060 Invalid " + 
DEFAULT_FS_INSTANCE_PROPERTY +
   "='" + defaultFS + "' URI", e);
 }
@@ -121,6 +125,21 @@ public class ConfigurationBuilder {
 return value;
   }
 
+  private void copyPropertyIfExists(String type, String key) {
+String value;
+try {
+  value =

ambari git commit: AMBARI-13345. Views: HDFS API utility needs to work with WASB (Gaurav Nagar via smohanty)

2015-10-13 Thread smohanty

Repository: ambari
Updated Branches:
  refs/heads/branch-2.1 600d1dc6d -> e9263e486


AMBARI-13345. Views: HDFS API utility needs to work with WASB (Gaurav Nagar via 
smohanty)


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

Branch: refs/heads/branch-2.1
Commit: e9263e486a0068dba1430ea76190cb91778f0473
Parents: 600d1dc
Author: Sumit Mohanty 
Authored: Tue Oct 13 06:52:33 2015 -0700
Committer: Sumit Mohanty 
Committed: Tue Oct 13 06:53:58 2015 -0700

--
 .../view/hive/resources/files/FileService.java  |  3 ++
 contrib/views/utils/pom.xml |  5 +++
 .../view/utils/hdfs/ConfigurationBuilder.java   | 45 ++--
 3 files changed, 50 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/e9263e48/contrib/views/hive/src/main/java/org/apache/ambari/view/hive/resources/files/FileService.java
--
diff --git 
a/contrib/views/hive/src/main/java/org/apache/ambari/view/hive/resources/files/FileService.java
 
b/contrib/views/hive/src/main/java/org/apache/ambari/view/hive/resources/files/FileService.java
index 6718093..1b8d7cc 100644
--- 
a/contrib/views/hive/src/main/java/org/apache/ambari/view/hive/resources/files/FileService.java
+++ 
b/contrib/views/hive/src/main/java/org/apache/ambari/view/hive/resources/files/FileService.java
@@ -75,6 +75,9 @@ public class FileService extends BaseService {
   @Path("{filePath:.*}")
   @Produces(MediaType.APPLICATION_JSON)
   public Response getFilePage(@PathParam("filePath") String filePath, 
@QueryParam("page") Long page) throws IOException, InterruptedException {
+if (!filePath.startsWith("/") && !filePath.startsWith(".")) {
+  filePath = "/" + filePath;  // some servers strip double slashes in URL
+}
 LOG.debug("Reading file " + filePath);
 try {
   FileResource file = new FileResource();

http://git-wip-us.apache.org/repos/asf/ambari/blob/e9263e48/contrib/views/utils/pom.xml
--
diff --git a/contrib/views/utils/pom.xml b/contrib/views/utils/pom.xml
index dee0a7c..c28c380 100644
--- a/contrib/views/utils/pom.xml
+++ b/contrib/views/utils/pom.xml
@@ -133,6 +133,11 @@
   commons-io
   2.4
 
+
+  org.apache.hadoop
+  hadoop-azure
+  ${hadoop-version}
+
   
 
   

http://git-wip-us.apache.org/repos/asf/ambari/blob/e9263e48/contrib/views/utils/src/main/java/org/apache/ambari/view/utils/hdfs/ConfigurationBuilder.java
--
diff --git 
a/contrib/views/utils/src/main/java/org/apache/ambari/view/utils/hdfs/ConfigurationBuilder.java
 
b/contrib/views/utils/src/main/java/org/apache/ambari/view/utils/hdfs/ConfigurationBuilder.java
index d992c2e..a739c84 100644
--- 
a/contrib/views/utils/src/main/java/org/apache/ambari/view/utils/hdfs/ConfigurationBuilder.java
+++ 
b/contrib/views/utils/src/main/java/org/apache/ambari/view/utils/hdfs/ConfigurationBuilder.java
@@ -23,6 +23,8 @@ import org.apache.ambari.view.utils.ambari.AmbariApi;
 import org.apache.ambari.view.utils.ambari.NoClusterAssociatedException;
 import org.apache.hadoop.conf.Configuration;
 import org.apache.hadoop.fs.LocalFileSystem;
+import org.apache.hadoop.fs.azure.NativeAzureFileSystem;
+import org.apache.hadoop.fs.azure.Wasb;
 import org.apache.hadoop.hdfs.DistributedFileSystem;
 import org.apache.hadoop.hdfs.web.WebHdfsFileSystem;
 import org.slf4j.Logger;
@@ -66,7 +68,7 @@ public class ConfigurationBuilder {
   private AmbariApi ambariApi = null;
   private AuthConfigurationBuilder authParamsBuilder;
   private Map authParams;
-
+  private URI defaultFsUri;
   /**
* Constructor of ConfigurationBuilder based on ViewContext
* @param context ViewContext
@@ -87,12 +89,14 @@ public class ConfigurationBuilder {
 
 LOG.info("HA HDFS cluster found.");
   } else {
-if (!hasPort(defaultFS)) {
+if (defaultFS.startsWith("hdfs://") && !hasPort(defaultFS)) {
   defaultFS = addPortIfMissing(defaultFS);
 }
   }
 
-  } catch (URISyntaxException e) {
+  defaultFsUri = new URI(defaultFS);
+
+} catch (URISyntaxException e) {
   throw new HdfsApiException("HDFS060 Invalid " + 
DEFAULT_FS_INSTANCE_PROPERTY +
   "='" + defaultFS + "' URI", e);
 }
@@ -121,6 +125,21 @@ public class ConfigurationBuilder {
 return value;
   }
 
+  private void copyPropertyIfExists(String type, String key) {
+String value;
+try {
+  value =

ambari git commit: AMBARI-13345. Views: HDFS API utility needs to work with WASB (Gaurav Nagar via smohanty)

2015-10-13 Thread smohanty

Repository: ambari
Updated Branches:
  refs/heads/trunk 0da6327ac -> 45ce79631


AMBARI-13345. Views: HDFS API utility needs to work with WASB (Gaurav Nagar via 
smohanty)


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

Branch: refs/heads/trunk
Commit: 45ce79631b9504e3a8a01661f1daa9739dd2
Parents: 0da6327
Author: Sumit Mohanty 
Authored: Tue Oct 13 06:52:33 2015 -0700
Committer: Sumit Mohanty 
Committed: Tue Oct 13 06:52:33 2015 -0700

--
 .../view/hive/resources/files/FileService.java  |  3 ++
 contrib/views/utils/pom.xml |  5 +++
 .../view/utils/hdfs/ConfigurationBuilder.java   | 45 ++--
 3 files changed, 50 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/45ce7963/contrib/views/hive/src/main/java/org/apache/ambari/view/hive/resources/files/FileService.java
--
diff --git 
a/contrib/views/hive/src/main/java/org/apache/ambari/view/hive/resources/files/FileService.java
 
b/contrib/views/hive/src/main/java/org/apache/ambari/view/hive/resources/files/FileService.java
index 6718093..1b8d7cc 100644
--- 
a/contrib/views/hive/src/main/java/org/apache/ambari/view/hive/resources/files/FileService.java
+++ 
b/contrib/views/hive/src/main/java/org/apache/ambari/view/hive/resources/files/FileService.java
@@ -75,6 +75,9 @@ public class FileService extends BaseService {
   @Path("{filePath:.*}")
   @Produces(MediaType.APPLICATION_JSON)
   public Response getFilePage(@PathParam("filePath") String filePath, 
@QueryParam("page") Long page) throws IOException, InterruptedException {
+if (!filePath.startsWith("/") && !filePath.startsWith(".")) {
+  filePath = "/" + filePath;  // some servers strip double slashes in URL
+}
 LOG.debug("Reading file " + filePath);
 try {
   FileResource file = new FileResource();

http://git-wip-us.apache.org/repos/asf/ambari/blob/45ce7963/contrib/views/utils/pom.xml
--
diff --git a/contrib/views/utils/pom.xml b/contrib/views/utils/pom.xml
index d9c3e4e..39ddc93 100644
--- a/contrib/views/utils/pom.xml
+++ b/contrib/views/utils/pom.xml
@@ -133,6 +133,11 @@
   commons-io
   2.4
 
+
+  org.apache.hadoop
+  hadoop-azure
+  ${hadoop-version}
+
   
 
   

http://git-wip-us.apache.org/repos/asf/ambari/blob/45ce7963/contrib/views/utils/src/main/java/org/apache/ambari/view/utils/hdfs/ConfigurationBuilder.java
--
diff --git 
a/contrib/views/utils/src/main/java/org/apache/ambari/view/utils/hdfs/ConfigurationBuilder.java
 
b/contrib/views/utils/src/main/java/org/apache/ambari/view/utils/hdfs/ConfigurationBuilder.java
index d992c2e..a739c84 100644
--- 
a/contrib/views/utils/src/main/java/org/apache/ambari/view/utils/hdfs/ConfigurationBuilder.java
+++ 
b/contrib/views/utils/src/main/java/org/apache/ambari/view/utils/hdfs/ConfigurationBuilder.java
@@ -23,6 +23,8 @@ import org.apache.ambari.view.utils.ambari.AmbariApi;
 import org.apache.ambari.view.utils.ambari.NoClusterAssociatedException;
 import org.apache.hadoop.conf.Configuration;
 import org.apache.hadoop.fs.LocalFileSystem;
+import org.apache.hadoop.fs.azure.NativeAzureFileSystem;
+import org.apache.hadoop.fs.azure.Wasb;
 import org.apache.hadoop.hdfs.DistributedFileSystem;
 import org.apache.hadoop.hdfs.web.WebHdfsFileSystem;
 import org.slf4j.Logger;
@@ -66,7 +68,7 @@ public class ConfigurationBuilder {
   private AmbariApi ambariApi = null;
   private AuthConfigurationBuilder authParamsBuilder;
   private Map authParams;
-
+  private URI defaultFsUri;
   /**
* Constructor of ConfigurationBuilder based on ViewContext
* @param context ViewContext
@@ -87,12 +89,14 @@ public class ConfigurationBuilder {
 
 LOG.info("HA HDFS cluster found.");
   } else {
-if (!hasPort(defaultFS)) {
+if (defaultFS.startsWith("hdfs://") && !hasPort(defaultFS)) {
   defaultFS = addPortIfMissing(defaultFS);
 }
   }
 
-  } catch (URISyntaxException e) {
+  defaultFsUri = new URI(defaultFS);
+
+} catch (URISyntaxException e) {
   throw new HdfsApiException("HDFS060 Invalid " + 
DEFAULT_FS_INSTANCE_PROPERTY +
   "='" + defaultFS + "' URI", e);
 }
@@ -121,6 +125,21 @@ public class ConfigurationBuilder {
 return value;
   }
 
+  private void copyPropertyIfExists(String type, String key) {
+String value;
+try {
+  value =

ambari git commit: AMBARI-13400 ambari does not redirect the user to the tez ui if log in is required. (atkach)

2015-10-13 Thread atkach

Repository: ambari
Updated Branches:
  refs/heads/branch-2.1 ba40d1024 -> 600d1dc6d


AMBARI-13400 ambari does not redirect the user to the tez ui if log in is 
required. (atkach)


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

Branch: refs/heads/branch-2.1
Commit: 600d1dc6d3646a746bd3b40b09553accd700185c
Parents: ba40d10
Author: Andrii Tkach 
Authored: Tue Oct 13 14:32:30 2015 +0300
Committer: Andrii Tkach 
Committed: Tue Oct 13 15:31:19 2015 +0300

--
 ambari-web/app/router.js   | 83 -
 ambari-web/app/routes/main.js  |  3 +-
 ambari-web/app/utils/db.js |  2 +-
 ambari-web/test/router_test.js | 46 
 4 files changed, 103 insertions(+), 31 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/600d1dc6/ambari-web/app/router.js
--
diff --git a/ambari-web/app/router.js b/ambari-web/app/router.js
index 5f11216..f6ffc41 100644
--- a/ambari-web/app/router.js
+++ b/ambari-web/app/router.js
@@ -122,7 +122,10 @@ App.Router = Em.Router.extend({
 return currentStep;
   },
 
-  loggedIn: !!App.db.getAuthenticated(),
+  /**
+   * @type {boolean}
+   */
+  loggedIn: App.db.getAuthenticated(),
 
   loginName: function() {
 return this.getLoginName();
@@ -140,7 +143,7 @@ App.Router = Em.Router.extend({
 }).complete(function (xhr) {
   if (xhr.isResolved()) {
 // if server knows the user and user authenticated by UI
-if (auth && auth === true) {
+if (auth) {
   dfd.resolve(self.get('loggedIn'));
   // if server knows the user but UI don't, check the response header
   // and try to authorize
@@ -160,6 +163,10 @@ App.Router = Em.Router.extend({
   self.setAuthenticated(false);
   dfd.resolve(false);
 }
+  } else {
+//if provisioning state unreachable then consider user as 
unauthenticated
+self.setAuthenticated(false);
+dfd.resolve(false);
   }
 });
 return dfd.promise();
@@ -345,26 +352,7 @@ App.Router = Em.Router.extend({
   }
   App.set('isPermissionDataLoaded', true);
   if (transitionToApp) {
-var preferredPath = router.get('preferedPath');
-// If the preferred path is relative, allow a redirect to it.
-// If the path is not relative, silently ignore it - if the path is an 
absolute URL, the user
-// may be routed to a different server where the [possibility exists 
for a phishing attack.
-if (!Em.isNone(preferredPath)) {
-  if (preferredPath.startsWith('/') || preferredPath.startsWith('#')) {
-console.log("INFO: Routing to preferred path: " + preferredPath);
-  }
-  else {
-console.log("WARNING: Ignoring preferred path since it is not a 
relative URL: " + preferredPath);
-preferredPath = null;
-  }
-
-  // Unset preferedPath
-  router.set('preferedPath', null);
-}
-
-if (!Em.isNone(preferredPath)) {
-  window.location = preferredPath;
-} else {
+if (!router.restorePreferedPath()) {
   router.getSection(function (route) {
 router.transitionTo(route);
 loginController.postLogin(true, true);
@@ -484,6 +472,47 @@ App.Router = Em.Router.extend({
   },
 
   /**
+   * save prefered path
+   * @param {string} path
+   * @param {string} key
+   */
+  savePreferedPath: function(path, key) {
+if (key) {
+  if (path.contains(key)) {
+this.set('preferedPath', path.slice(path.indexOf(key) + key.length));
+  }
+} else {
+  this.set('preferedPath', path);
+}
+  },
+
+  /**
+   * If path exist route to it, otherwise return false
+   * @returns {boolean}
+   */
+  restorePreferedPath: function() {
+var preferredPath = this.get('preferedPath');
+var isRestored = false;
+
+if (preferredPath) {
+  // If the preferred path is relative, allow a redirect to it.
+  // If the path is not relative, silently ignore it - if the path is an 
absolute URL, the user
+  // may be routed to a different server where the possibility exists for 
a phishing attack.
+  if ((preferredPath.startsWith('/') || preferredPath.startsWith('#')) && 
!preferredPath.contains('#/login')) {
+console.log("INFO: Routing to preferred path: " + preferredPath);
+window.location = preferredPath;
+isRestored = true;
+  } else {
+console.log("WARNING: Ignoring preferred path since it is not a 
relative URL: " +

ambari git commit: AMBARI-13390 Unable to set user value for kafka-broker/kafka.metrics.reporters (dsen)

2015-10-13 Thread dsen

Repository: ambari
Updated Branches:
  refs/heads/trunk 232829c50 -> 0da6327ac


AMBARI-13390 Unable to set user value for kafka-broker/kafka.metrics.reporters 
(dsen)


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

Branch: refs/heads/trunk
Commit: 0da6327ac2290dac608c86551cac485c59a7972d
Parents: 232829c
Author: Dmytro Sen 
Authored: Tue Oct 13 16:11:43 2015 +0300
Committer: Dmytro Sen 
Committed: Tue Oct 13 16:11:43 2015 +0300

--
 .../server/upgrade/UpgradeCatalog213.java   | 38 ++
 .../0.8.1.2.2/configuration/kafka-broker.xml|  2 +-
 .../KAFKA/0.8.1.2.2/package/scripts/kafka.py|  5 +-
 .../KAFKA/0.8.1.2.2/package/scripts/params.py   | 10 
 .../server/upgrade/UpgradeCatalog213Test.java   | 53 
 5 files changed, 93 insertions(+), 15 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/0da6327a/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog213.java
--
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog213.java
 
b/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog213.java
index c932d95..3eeb6b9 100644
--- 
a/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog213.java
+++ 
b/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog213.java
@@ -40,6 +40,7 @@ import java.sql.SQLException;
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.Map;
+import java.util.Set;
 import java.util.UUID;
 
 /**
@@ -48,6 +49,7 @@ import java.util.UUID;
 public class UpgradeCatalog213 extends AbstractUpgradeCatalog {
 
   private static final String STORM_SITE = "storm-site";
+  private static final String KAFKA_BROKER = "kafka-broker";
   private static final String AMS_ENV = "ams-env";
   private static final String AMS_HBASE_ENV = "ams-hbase-env";
   private static final String HBASE_ENV_CONFIG = "hbase-env";
@@ -118,6 +120,7 @@ public class UpgradeCatalog213 extends 
AbstractUpgradeCatalog {
 updateStormConfigs();
 updateAMSConfigs();
 updateHbaseEnvConfig();
+updateKafkaConfigs();
   }
 
   /**
@@ -280,6 +283,41 @@ public class UpgradeCatalog213 extends 
AbstractUpgradeCatalog {
 
   }
 
+  protected void updateKafkaConfigs() throws AmbariException {
+AmbariManagementController ambariManagementController = 
injector.getInstance(AmbariManagementController.class);
+Clusters clusters = ambariManagementController.getClusters();
+
+if (clusters != null) {
+  Map clusterMap = clusters.getClusters();
+  if (clusterMap != null && !clusterMap.isEmpty()) {
+for (final Cluster cluster : clusterMap.values()) {
+  Set installedServices =cluster.getServices().keySet();
+  Config kafkaBroker = cluster.getDesiredConfigByType(KAFKA_BROKER);
+  if (kafkaBroker != null) {
+Map newProperties = new HashMap<>();
+Map kafkaBrokerProperties = 
kafkaBroker.getProperties();
+String kafkaMetricsReporters = 
kafkaBrokerProperties.get("kafka.metrics.reporters");
+if (kafkaMetricsReporters == null ||
+  "{{kafka_metrics_reporters}}".equals(kafkaMetricsReporters)) {
+
+  if (installedServices.contains("AMBARI_METRICS")) {
+newProperties.put("kafka.metrics.reporters", 
"org.apache.hadoop.metrics2.sink.kafka.KafkaTimelineMetricsReporter");
+  } else if (installedServices.contains("GANGLIA")) {
+newProperties.put("kafka.metrics.reporters", 
"kafka.ganglia.KafkaGangliaMetricsReporter");
+  } else {
+newProperties.put("kafka.metrics.reporters", " ");
+  }
+
+}
+if (!newProperties.isEmpty()) {
+  updateConfigurationPropertiesForCluster(cluster, KAFKA_BROKER, 
newProperties, true, true);
+}
+  }
+}
+  }
+}
+  }
+
   protected String updateAmsEnvContent(String oldContent) {
 if (oldContent == null) {
   return null;

http://git-wip-us.apache.org/repos/asf/ambari/blob/0da6327a/ambari-server/src/main/resources/common-services/KAFKA/0.8.1.2.2/configuration/kafka-broker.xml
--
diff --git 
a/ambari-server/src/main/resources/common-services/KAFKA/0.8.1.2.2/configuration/kafka-broker.xml
 
b/ambari-server/src/main/resources/common-services/KAFKA/0.8.1.2.2/configuration/kafka-broker.xml

ambari git commit: AMBARI-13388. Update hbase-env config without removing custom changes.(vbrodetskyi)

2015-10-13 Thread vbrodetskyi

Repository: ambari
Updated Branches:
  refs/heads/trunk 879fc9b49 -> f32e65b08


AMBARI-13388. Update hbase-env config without removing custom 
changes.(vbrodetskyi)


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

Branch: refs/heads/trunk
Commit: f32e65b08ba5dbc3bca95d6ca1f295e24b9706a7
Parents: 879fc9b
Author: Vitaly Brodetskyi 
Authored: Tue Oct 13 15:08:29 2015 +0300
Committer: Vitaly Brodetskyi 
Committed: Tue Oct 13 15:08:29 2015 +0300

--
 .../server/upgrade/UpgradeCatalog213.java   |  38 +--
 .../services/HBASE/configuration/hbase-env.xml  |   7 +-
 .../services/HBASE/configuration/hbase-env.xml  |   9 +-
 .../server/upgrade/UpgradeCatalog213Test.java   | 101 ++-
 4 files changed, 115 insertions(+), 40 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/f32e65b0/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog213.java
--
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog213.java
 
b/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog213.java
index 2c152e4..c932d95 100644
--- 
a/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog213.java
+++ 
b/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog213.java
@@ -30,13 +30,14 @@ import 
org.apache.ambari.server.orm.entities.AlertDefinitionEntity;
 import org.apache.ambari.server.state.Cluster;
 import org.apache.ambari.server.state.Clusters;
 import org.apache.ambari.server.state.Config;
+import org.apache.ambari.server.state.StackId;
 import org.apache.ambari.server.state.alert.SourceType;
+import org.apache.ambari.server.utils.VersionUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import javax.persistence.EntityManager;
-import javax.persistence.Query;
 import java.sql.SQLException;
+import java.util.Collections;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.UUID;
@@ -49,6 +50,8 @@ public class UpgradeCatalog213 extends AbstractUpgradeCatalog 
{
   private static final String STORM_SITE = "storm-site";
   private static final String AMS_ENV = "ams-env";
   private static final String AMS_HBASE_ENV = "ams-hbase-env";
+  private static final String HBASE_ENV_CONFIG = "hbase-env";
+  private static final String CONTENT_PROPERTY = "content";
 
 
   /**
@@ -110,9 +113,11 @@ public class UpgradeCatalog213 extends 
AbstractUpgradeCatalog {
 
   @Override
   protected void executeDMLUpdates() throws AmbariException, SQLException {
-addMissingConfigs();
-updateAMSConfigs();
+addNewConfigurationsFromXml();
 updateAlertDefinitions();
+updateStormConfigs();
+updateAMSConfigs();
+updateHbaseEnvConfig();
   }
 
   /**
@@ -184,10 +189,6 @@ public class UpgradeCatalog213 extends 
AbstractUpgradeCatalog {
 return rootJson.toString();
   }
 
-  protected void addMissingConfigs() throws AmbariException {
-updateStormConfigs();
-  }
-
   protected void updateStormConfigs() throws AmbariException {
 AmbariManagementController ambariManagementController = 
injector.getInstance(AmbariManagementController.class);
 Clusters clusters = ambariManagementController.getClusters();
@@ -213,6 +214,27 @@ public class UpgradeCatalog213 extends 
AbstractUpgradeCatalog {
 }
   }
 
+  protected void updateHbaseEnvConfig() throws AmbariException {
+AmbariManagementController ambariManagementController = 
injector.getInstance(AmbariManagementController.class);
+
+for (final Cluster cluster : 
getCheckedClusterMap(ambariManagementController.getClusters()).values()) {
+  StackId stackId = cluster.getCurrentStackVersion();
+  if (stackId != null && stackId.getStackName().equals("HDP") &&
+   VersionUtils.compareVersions(stackId.getStackVersion(), "2.2") 
>= 0) {
+Config hbaseEnvConfig = 
cluster.getDesiredConfigByType(HBASE_ENV_CONFIG);
+if (hbaseEnvConfig != null) {
+  String content = 
hbaseEnvConfig.getProperties().get(CONTENT_PROPERTY);
+  if (content != null && 
content.indexOf("MaxDirectMemorySize={{hbase_max_direct_memory_size}}m") < 0) {
+String newPartOfContent = "\n\nexport 
HBASE_REGIONSERVER_OPTS=\"$HBASE_REGIONSERVER_OPTS {% if 
hbase_max_direct_memory_size %} 
-XX:MaxDirectMemorySize={{hbase_max_direct_memory_size}}m {% endif %}\"\n\n";
+content += newPartOfContent;
+Map updates = 
Collections.singletonMap(CONTENT_PROPERTY, content);
+

ambari git commit: AMBARI-13325. Ambari-server upgrade and RU update hbase bucket cache setting incorrectly.(vbrodetskyi)

2015-10-13 Thread vbrodetskyi

Repository: ambari
Updated Branches:
  refs/heads/branch-2.1.2 afe7fa365 -> 3ed04f55c


AMBARI-13325. Ambari-server upgrade and RU update hbase bucket cache setting 
incorrectly.(vbrodetskyi)


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

Branch: refs/heads/branch-2.1.2
Commit: 3ed04f55cb1aeacfc419e7631929e2134601f0d1
Parents: afe7fa3
Author: Vitaly Brodetskyi 
Authored: Tue Oct 13 15:41:43 2015 +0300
Committer: Vitaly Brodetskyi 
Committed: Tue Oct 13 15:41:43 2015 +0300

--
 .../server/upgrade/UpgradeCatalog210.java   | 131 ---
 .../server/upgrade/UpgradeCatalog210Test.java   |  80 +--
 2 files changed, 62 insertions(+), 149 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/3ed04f55/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 8fdf640..12a1f44 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
@@ -18,28 +18,13 @@
 
 package org.apache.ambari.server.upgrade;
 
-import java.net.URI;
-import java.net.URISyntaxException;
-import java.sql.ResultSet;
-import java.sql.SQLException;
-import java.sql.Statement;
-import java.text.MessageFormat;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.UUID;
-import java.util.regex.Matcher;
-
-import javax.persistence.EntityManager;
-import javax.persistence.Query;
-import javax.persistence.criteria.CriteriaBuilder;
-import javax.persistence.criteria.CriteriaDelete;
-import javax.persistence.criteria.Root;
-
+import com.google.gson.Gson;
+import com.google.gson.JsonElement;
+import com.google.gson.JsonObject;
+import com.google.gson.JsonParser;
+import com.google.inject.Inject;
+import com.google.inject.Injector;
+import com.google.inject.persist.Transactional;
 import org.apache.ambari.server.AmbariException;
 import org.apache.ambari.server.api.services.AmbariMetaInfo;
 import org.apache.ambari.server.configuration.Configuration;
@@ -60,7 +45,6 @@ import org.apache.ambari.server.orm.entities.StackEntity;
 import org.apache.ambari.server.state.Cluster;
 import org.apache.ambari.server.state.Clusters;
 import org.apache.ambari.server.state.Config;
-import org.apache.ambari.server.state.Host;
 import org.apache.ambari.server.state.Service;
 import org.apache.ambari.server.state.StackId;
 import 
org.apache.ambari.server.state.kerberos.AbstractKerberosDescriptorContainer;
@@ -76,13 +60,26 @@ import 
org.eclipse.persistence.internal.databaseaccess.FieldTypeDefinition;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import com.google.gson.Gson;
-import com.google.gson.JsonElement;
-import com.google.gson.JsonObject;
-import com.google.gson.JsonParser;
-import com.google.inject.Inject;
-import com.google.inject.Injector;
-import com.google.inject.persist.Transactional;
+import javax.persistence.EntityManager;
+import javax.persistence.Query;
+import javax.persistence.criteria.CriteriaBuilder;
+import javax.persistence.criteria.CriteriaDelete;
+import javax.persistence.criteria.Root;
+import java.net.URI;
+import java.net.URISyntaxException;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.sql.Statement;
+import java.text.MessageFormat;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.UUID;
+import java.util.regex.Matcher;
 
 
 /**
@@ -1507,43 +1504,6 @@ public class UpgradeCatalog210 extends 
AbstractUpgradeCatalog {
 }
   }
 
-  private int getHbaseRamRecomendations(int totalMem) {
-if (totalMem <= 4) {
-  return 1;
-}
-if (4 < totalMem && totalMem <= 8) {
-  return 1;
-}
-if (8 < totalMem && totalMem <= 16) {
-  return 2;
-}
-if (16 < totalMem && totalMem <= 24) {
-  return 4;
-}
-if (24 < totalMem && totalMem <= 48) {
-  return 8;
-}
-if (48 < totalMem && totalMem <= 64) {
-  return 8;
-}
-if (64 < totalMem && totalMem <= 72) {
-  return 8;
-}
-if (72 < totalMem && totalMem <=

ambari git commit: AMBARI-13388. Update hbase-env config without removing custom changes.(vbrodetskyi)

2015-10-13 Thread vbrodetskyi

Repository: ambari
Updated Branches:
  refs/heads/branch-2.1 cbd3f97af -> ba40d1024


AMBARI-13388. Update hbase-env config without removing custom 
changes.(vbrodetskyi)


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

Branch: refs/heads/branch-2.1
Commit: ba40d102454573147d0860ac4065534c1dfe274c
Parents: cbd3f97
Author: Vitaly Brodetskyi 
Authored: Tue Oct 13 14:49:13 2015 +0300
Committer: Vitaly Brodetskyi 
Committed: Tue Oct 13 14:49:13 2015 +0300

--
 .../server/upgrade/UpgradeCatalog213.java   | 33 +--
 .../services/HBASE/configuration/hbase-env.xml  |  7 ++-
 .../services/HBASE/configuration/hbase-env.xml  |  9 ++-
 .../server/upgrade/UpgradeCatalog213Test.java   | 59 ++--
 4 files changed, 94 insertions(+), 14 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/ba40d102/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog213.java
--
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog213.java
 
b/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog213.java
index 1455f05..b60404e 100644
--- 
a/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog213.java
+++ 
b/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog213.java
@@ -52,6 +52,7 @@ import org.apache.ambari.server.state.alert.SourceType;
 import org.apache.ambari.server.state.stack.upgrade.Direction;
 import org.apache.ambari.server.state.stack.upgrade.RepositoryVersionHelper;
 import org.apache.ambari.server.state.stack.upgrade.UpgradeType;
+import org.apache.ambari.server.utils.VersionUtils;
 import org.apache.commons.lang.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -61,6 +62,7 @@ import java.sql.SQLException;
 import java.sql.Statement;
 import java.text.MessageFormat;
 import java.util.Collection;
+import java.util.Collections;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.UUID;
@@ -73,6 +75,8 @@ public class UpgradeCatalog213 extends AbstractUpgradeCatalog 
{
   private static final String STORM_SITE = "storm-site";
   private static final String AMS_ENV = "ams-env";
   private static final String AMS_HBASE_ENV = "ams-hbase-env";
+  private static final String HBASE_ENV_CONFIG = "hbase-env";
+  private static final String CONTENT_PROPERTY = "content";
 
   public static final String UPGRADE_PACKAGE_COL = "upgrade_package";
   public static final String UPGRADE_TYPE_COL = "upgrade_type";
@@ -147,8 +151,10 @@ public class UpgradeCatalog213 extends 
AbstractUpgradeCatalog {
 executeStackUpgradeDDLUpdates();
 bootstrapRepoVersionForHDP21();
 
-addMissingConfigs();
+addNewConfigurationsFromXml();
+updateStormConfigs();
 updateAMSConfigs();
+updateHbaseEnvConfig();
 updateAlertDefinitions();
   }
 
@@ -546,10 +552,6 @@ public class UpgradeCatalog213 extends 
AbstractUpgradeCatalog {
 return rootJson.toString();
   }
 
-  protected void addMissingConfigs() throws AmbariException {
-updateStormConfigs();
-  }
-
   protected void updateStormConfigs() throws AmbariException {
 AmbariManagementController ambariManagementController = 
injector.getInstance(AmbariManagementController.class);
 Clusters clusters = ambariManagementController.getClusters();
@@ -575,6 +577,27 @@ public class UpgradeCatalog213 extends 
AbstractUpgradeCatalog {
 }
   }
 
+  protected void updateHbaseEnvConfig() throws AmbariException {
+AmbariManagementController ambariManagementController = 
injector.getInstance(AmbariManagementController.class);
+
+for (final Cluster cluster : 
getCheckedClusterMap(ambariManagementController.getClusters()).values()) {
+  StackId stackId = cluster.getCurrentStackVersion();
+  if (stackId != null && stackId.getStackName().equals("HDP") &&
+   VersionUtils.compareVersions(stackId.getStackVersion(), "2.2") 
>= 0) {
+Config hbaseEnvConfig = 
cluster.getDesiredConfigByType(HBASE_ENV_CONFIG);
+if (hbaseEnvConfig != null) {
+  String content = 
hbaseEnvConfig.getProperties().get(CONTENT_PROPERTY);
+  if (content != null && 
content.indexOf("MaxDirectMemorySize={{hbase_max_direct_memory_size}}m") < 0) {
+String newPartOfContent = "\n\nexport 
HBASE_REGIONSERVER_OPTS=\"$HBASE_REGIONSERVER_OPTS {% if 
hbase_max_direct_memory_size %} 
-XX:MaxDirectMemorySize={{hbase_max_direct_memory_size}}m {% endif %}\"\n\n";
+content +=

ambari git commit: AMBARI-13399. Fix UpgradeCatalog213 tests.(vbrodetskyi)

2015-10-13 Thread vbrodetskyi

Repository: ambari
Updated Branches:
  refs/heads/branch-2.1 0cdf7e020 -> cbd3f97af


AMBARI-13399. Fix UpgradeCatalog213 tests.(vbrodetskyi)


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

Branch: refs/heads/branch-2.1
Commit: cbd3f97af4d9643d9f06c8b96cf9a3054c8455c9
Parents: 0cdf7e0
Author: Vitaly Brodetskyi 
Authored: Tue Oct 13 14:23:31 2015 +0300
Committer: Vitaly Brodetskyi 
Committed: Tue Oct 13 14:23:31 2015 +0300

--
 .../server/upgrade/UpgradeCatalog213.java   | 15 ++--
 .../server/upgrade/UpgradeCatalog213Test.java   | 74 ++--
 2 files changed, 43 insertions(+), 46 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/cbd3f97a/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog213.java
--
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog213.java
 
b/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog213.java
index 3eac5ce..1455f05 100644
--- 
a/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog213.java
+++ 
b/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog213.java
@@ -26,8 +26,8 @@ import com.google.inject.persist.Transactional;
 import org.apache.ambari.server.AmbariException;
 import org.apache.ambari.server.api.services.AmbariMetaInfo;
 import org.apache.ambari.server.configuration.Configuration;
-import org.apache.ambari.server.orm.DBAccessor.DBColumnInfo;
 import org.apache.ambari.server.controller.AmbariManagementController;
+import org.apache.ambari.server.orm.DBAccessor.DBColumnInfo;
 import org.apache.ambari.server.orm.dao.AlertDefinitionDAO;
 import org.apache.ambari.server.orm.dao.ClusterDAO;
 import org.apache.ambari.server.orm.dao.ClusterVersionDAO;
@@ -36,29 +36,26 @@ import org.apache.ambari.server.orm.dao.HostVersionDAO;
 import org.apache.ambari.server.orm.dao.RepositoryVersionDAO;
 import org.apache.ambari.server.orm.dao.StackDAO;
 import org.apache.ambari.server.orm.entities.AlertDefinitionEntity;
+import org.apache.ambari.server.orm.entities.ClusterEntity;
 import org.apache.ambari.server.orm.entities.ClusterVersionEntity;
 import org.apache.ambari.server.orm.entities.HostEntity;
 import org.apache.ambari.server.orm.entities.HostVersionEntity;
+import org.apache.ambari.server.orm.entities.RepositoryVersionEntity;
+import org.apache.ambari.server.orm.entities.StackEntity;
 import org.apache.ambari.server.state.Cluster;
 import org.apache.ambari.server.state.Clusters;
 import org.apache.ambari.server.state.Config;
-import org.apache.ambari.server.state.alert.SourceType;
-import org.apache.ambari.server.orm.entities.ClusterEntity;
-import org.apache.ambari.server.orm.entities.RepositoryVersionEntity;
-import org.apache.ambari.server.orm.entities.StackEntity;
 import org.apache.ambari.server.state.RepositoryVersionState;
 import org.apache.ambari.server.state.StackId;
 import org.apache.ambari.server.state.StackInfo;
+import org.apache.ambari.server.state.alert.SourceType;
 import org.apache.ambari.server.state.stack.upgrade.Direction;
 import org.apache.ambari.server.state.stack.upgrade.RepositoryVersionHelper;
 import org.apache.ambari.server.state.stack.upgrade.UpgradeType;
 import org.apache.commons.lang.StringUtils;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import javax.persistence.EntityManager;
-import javax.persistence.Query;
 import java.sql.ResultSet;
 import java.sql.SQLException;
 import java.sql.Statement;
@@ -166,7 +163,7 @@ public class UpgradeCatalog213 extends 
AbstractUpgradeCatalog {
* @throws SQLException
*/
   @Transactional
-  private void executeStackUpgradeDDLUpdates() throws SQLException, 
AmbariException {
+  protected void executeStackUpgradeDDLUpdates() throws SQLException, 
AmbariException {
 final Configuration.DatabaseType databaseType = 
configuration.getDatabaseType();
 
 // Add columns

http://git-wip-us.apache.org/repos/asf/ambari/blob/cbd3f97a/ambari-server/src/test/java/org/apache/ambari/server/upgrade/UpgradeCatalog213Test.java
--
diff --git 
a/ambari-server/src/test/java/org/apache/ambari/server/upgrade/UpgradeCatalog213Test.java
 
b/ambari-server/src/test/java/org/apache/ambari/server/upgrade/UpgradeCatalog213Test.java
index b3c8543..1be1446 100644
--- 
a/ambari-server/src/test/java/org/apache/ambari/server/upgrade/UpgradeCatalog213Test.java
+++

ambari git commit: AMBARI-13254 Components filter works incorrectly on Hosts page. (atkach)

2015-10-13 Thread atkach

Repository: ambari
Updated Branches:
  refs/heads/branch-2.1.2 420b733c1 -> 37e15af34


AMBARI-13254 Components filter works incorrectly on Hosts page. (atkach)


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

Branch: refs/heads/branch-2.1.2
Commit: 37e15af34dcbf667745b17c06f98b7b1ab38565b
Parents: 420b733
Author: Andrii Tkach 
Authored: Mon Sep 28 14:04:47 2015 +0300
Committer: Andrii Tkach 
Committed: Tue Oct 13 17:36:33 2015 +0300

--
 ambari-web/app/controllers/global/update_controller.js | 6 --
 1 file changed, 6 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/37e15af3/ambari-web/app/controllers/global/update_controller.js
--
diff --git a/ambari-web/app/controllers/global/update_controller.js 
b/ambari-web/app/controllers/global/update_controller.js
index ac19d19..8eb7bd7 100644
--- a/ambari-web/app/controllers/global/update_controller.js
+++ b/ambari-web/app/controllers/global/update_controller.js
@@ -338,12 +338,6 @@ App.UpdateController = Em.Controller.extend({
 var hostNames = data.items.mapProperty('Hosts.host_name');
 var skipCall = hostNames.length === 0;
 
-/**
- * exclude pagination parameters as they were applied in previous call
- * to obtain hostnames of filtered hosts
- */
-preLoadKeys = preLoadKeys.concat(this.get('paginationKeys'));
-
 var itemTotal = parseInt(data.itemTotal);
 if (!isNaN(itemTotal)) {
   App.router.set('mainHostController.filteredCount', itemTotal);

[2/2] ambari git commit: AMBARI-13403. Ambari unable to build rpms with 4 digit versions (aonishuk)

2015-10-13 Thread aonishuk

AMBARI-13403. Ambari unable to build rpms with 4 digit versions (aonishuk)


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

Branch: refs/heads/branch-2.1
Commit: 3ba8c39c5ee67d0970d4529e18ce296e844c741d
Parents: e9263e4
Author: Andrew Onishuk 
Authored: Tue Oct 13 17:51:14 2015 +0300
Committer: Andrew Onishuk 
Committed: Tue Oct 13 17:51:14 2015 +0300

--
 ambari-admin/pom.xml  |  8 
 ambari-agent/pom.xml  |  8 
 ambari-client/groovy-client/pom.xml   |  4 ++--
 ambari-client/pom.xml |  4 ++--
 ambari-client/python-client/pom.xml   |  4 ++--
 ambari-metrics/ambari-metrics-assembly/pom.xml|  8 
 ambari-metrics/ambari-metrics-common/pom.xml  |  2 +-
 ambari-metrics/ambari-metrics-flume-sink/pom.xml  |  8 
 ambari-metrics/ambari-metrics-hadoop-sink/pom.xml |  8 
 ambari-metrics/ambari-metrics-host-monitoring/pom.xml |  8 
 ambari-metrics/ambari-metrics-kafka-sink/pom.xml  |  8 
 ambari-metrics/ambari-metrics-storm-sink/pom.xml  |  8 
 ambari-metrics/ambari-metrics-timelineservice/pom.xml | 10 +-
 ambari-metrics/pom.xml| 10 +-
 ambari-project/pom.xml|  4 ++--
 ambari-server/pom.xml |  8 
 ambari-shell/ambari-groovy-shell/pom.xml  |  6 +++---
 ambari-shell/ambari-python-shell/pom.xml  |  4 ++--
 ambari-shell/pom.xml  |  4 ++--
 ambari-views/pom.xml  |  8 
 ambari-web/pom.xml|  8 
 docs/pom.xml  |  2 +-
 pom.xml   | 10 +-
 23 files changed, 76 insertions(+), 76 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/3ba8c39c/ambari-admin/pom.xml
--
diff --git a/ambari-admin/pom.xml b/ambari-admin/pom.xml
index 8985c1e..43764b8 100644
--- a/ambari-admin/pom.xml
+++ b/ambari-admin/pom.xml
@@ -19,7 +19,7 @@
   
 org.apache.ambari
 ambari-project
-2.1.0.0
+2.1.2.1.0
 ../ambari-project
   
   4.0.0
@@ -27,7 +27,7 @@
   ambari-admin
   jar
   Ambari Admin View
-  2.1.0.0
+  2.1.2.1.0
   Admin control panel
   
 
@@ -51,8 +51,8 @@
 
   ambariVersion
   ${project.version}
-  ^([0-9]+)\.([0-9]+)\.([0-9]+)(\.|-).*
-  $1.$2.$3
+  ^([0-9]+)\.([0-9]+)\.([0-9]+)\.([0-9]+)(\.|-).*
+  $1.$2.$3.$4
   false
 
   

http://git-wip-us.apache.org/repos/asf/ambari/blob/3ba8c39c/ambari-agent/pom.xml
--
diff --git a/ambari-agent/pom.xml b/ambari-agent/pom.xml
index b544d75..83852cd 100644
--- a/ambari-agent/pom.xml
+++ b/ambari-agent/pom.xml
@@ -19,14 +19,14 @@
   
 org.apache.ambari
 ambari-project
-2.1.0.0
+2.1.2.1.0
 ../ambari-project
   
   4.0.0
   org.apache.ambari
   ambari-agent
   pom
-  2.1.0.0
+  2.1.2.1.0
   Ambari Agent
   Ambari Agent
   
@@ -77,8 +77,8 @@
 
   ambariVersion
   ${project.version}
-  ^([0-9]+)\.([0-9]+)\.([0-9]+)(\.|-).*
-  $1.$2.$3
+  ^([0-9]+)\.([0-9]+)\.([0-9]+)\.([0-9]+)(\.|-).*
+  $1.$2.$3.$4
   false
 
   

http://git-wip-us.apache.org/repos/asf/ambari/blob/3ba8c39c/ambari-client/groovy-client/pom.xml
--
diff --git a/ambari-client/groovy-client/pom.xml 
b/ambari-client/groovy-client/pom.xml
index 6b08bd0..1568c94 100644
--- a/ambari-client/groovy-client/pom.xml
+++ b/ambari-client/groovy-client/pom.xml
@@ -12,14 +12,14 @@
   
 ambari-client
 org.apache.ambari
-2.1.0.0
+2.1.2.1.0
 ../../ambari-client/
   
   4.0.0
   org.apache.ambari
   groovy-client
   jar
-  2.1.0.0
+  2.1.2.1.0
   Ambari Groovy Client
   Ambari Groovy client
   

http://git-wip-us.apache.org/repos/asf/ambari/blob/3ba8c39c/ambari-client/pom.xml
--
diff --git a/ambari-client/pom.xml b/ambari-client/pom.xml
index 4bba701..44b5948 100755
--- a/ambari-client/pom.xml
+++ b/ambari-client/pom.xml
@@ -20,14

[1/2] ambari git commit: AMBARI-13403. Ambari unable to build rpms with 4 digit versions (aonishuk)

2015-10-13 Thread aonishuk

Repository: ambari
Updated Branches:
  refs/heads/branch-2.1 e9263e486 -> 3ba8c39c5
  refs/heads/branch-2.1.2 99da5c68e -> 54823edf7


AMBARI-13403. Ambari unable to build rpms with 4 digit versions (aonishuk)


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

Branch: refs/heads/branch-2.1.2
Commit: 54823edf76578f966e79770c081340323653cf19
Parents: 99da5c6
Author: Andrew Onishuk 
Authored: Tue Oct 13 17:51:12 2015 +0300
Committer: Andrew Onishuk 
Committed: Tue Oct 13 17:51:12 2015 +0300

--
 ambari-admin/pom.xml  |  8 
 ambari-agent/pom.xml  |  8 
 ambari-client/groovy-client/pom.xml   |  4 ++--
 ambari-client/pom.xml |  4 ++--
 ambari-client/python-client/pom.xml   |  4 ++--
 ambari-metrics/ambari-metrics-assembly/pom.xml|  8 
 ambari-metrics/ambari-metrics-common/pom.xml  |  2 +-
 ambari-metrics/ambari-metrics-flume-sink/pom.xml  |  8 
 ambari-metrics/ambari-metrics-hadoop-sink/pom.xml |  8 
 ambari-metrics/ambari-metrics-host-monitoring/pom.xml |  8 
 ambari-metrics/ambari-metrics-kafka-sink/pom.xml  |  8 
 ambari-metrics/ambari-metrics-storm-sink/pom.xml  |  8 
 ambari-metrics/ambari-metrics-timelineservice/pom.xml | 10 +-
 ambari-metrics/pom.xml| 10 +-
 ambari-project/pom.xml|  4 ++--
 ambari-server/pom.xml |  8 
 ambari-shell/ambari-groovy-shell/pom.xml  |  6 +++---
 ambari-shell/ambari-python-shell/pom.xml  |  4 ++--
 ambari-shell/pom.xml  |  4 ++--
 ambari-views/pom.xml  |  8 
 ambari-web/pom.xml|  8 
 docs/pom.xml  |  2 +-
 pom.xml   | 10 +-
 23 files changed, 76 insertions(+), 76 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/54823edf/ambari-admin/pom.xml
--
diff --git a/ambari-admin/pom.xml b/ambari-admin/pom.xml
index 8985c1e..43764b8 100644
--- a/ambari-admin/pom.xml
+++ b/ambari-admin/pom.xml
@@ -19,7 +19,7 @@
   
 org.apache.ambari
 ambari-project
-2.1.0.0
+2.1.2.1.0
 ../ambari-project
   
   4.0.0
@@ -27,7 +27,7 @@
   ambari-admin
   jar
   Ambari Admin View
-  2.1.0.0
+  2.1.2.1.0
   Admin control panel
   
 
@@ -51,8 +51,8 @@
 
   ambariVersion
   ${project.version}
-  ^([0-9]+)\.([0-9]+)\.([0-9]+)(\.|-).*
-  $1.$2.$3
+  ^([0-9]+)\.([0-9]+)\.([0-9]+)\.([0-9]+)(\.|-).*
+  $1.$2.$3.$4
   false
 
   

http://git-wip-us.apache.org/repos/asf/ambari/blob/54823edf/ambari-agent/pom.xml
--
diff --git a/ambari-agent/pom.xml b/ambari-agent/pom.xml
index b544d75..83852cd 100644
--- a/ambari-agent/pom.xml
+++ b/ambari-agent/pom.xml
@@ -19,14 +19,14 @@
   
 org.apache.ambari
 ambari-project
-2.1.0.0
+2.1.2.1.0
 ../ambari-project
   
   4.0.0
   org.apache.ambari
   ambari-agent
   pom
-  2.1.0.0
+  2.1.2.1.0
   Ambari Agent
   Ambari Agent
   
@@ -77,8 +77,8 @@
 
   ambariVersion
   ${project.version}
-  ^([0-9]+)\.([0-9]+)\.([0-9]+)(\.|-).*
-  $1.$2.$3
+  ^([0-9]+)\.([0-9]+)\.([0-9]+)\.([0-9]+)(\.|-).*
+  $1.$2.$3.$4
   false
 
   

http://git-wip-us.apache.org/repos/asf/ambari/blob/54823edf/ambari-client/groovy-client/pom.xml
--
diff --git a/ambari-client/groovy-client/pom.xml 
b/ambari-client/groovy-client/pom.xml
index 6b08bd0..1568c94 100644
--- a/ambari-client/groovy-client/pom.xml
+++ b/ambari-client/groovy-client/pom.xml
@@ -12,14 +12,14 @@
   
 ambari-client
 org.apache.ambari
-2.1.0.0
+2.1.2.1.0
 ../../ambari-client/
   
   4.0.0
   org.apache.ambari
   groovy-client
   jar
-  2.1.0.0
+  2.1.2.1.0
   Ambari Groovy Client
   Ambari Groovy client
   

http://git-wip-us.apache.org/repos/asf/ambari/blob/54823edf/ambari-client/pom.xml
--
diff --git

ambari git commit: AMBARI-13371 Unable to add Nimbus components when HDFS or YARN is HA enabled. (atkach)

2015-10-13 Thread atkach

Repository: ambari
Updated Branches:
  refs/heads/branch-2.1.2 37e15af34 -> e45f61b01


AMBARI-13371 Unable to add Nimbus components when HDFS or YARN is HA enabled. 
(atkach)


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

Branch: refs/heads/branch-2.1.2
Commit: e45f61b01d46f44fcf9fac997ae0fc5443ce98ac
Parents: 37e15af
Author: Andrii Tkach 
Authored: Fri Oct 9 16:10:04 2015 +0300
Committer: Andrii Tkach 
Committed: Tue Oct 13 17:38:38 2015 +0300

--
 ambari-web/app/controllers/main/host/details.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/e45f61b0/ambari-web/app/controllers/main/host/details.js
--
diff --git a/ambari-web/app/controllers/main/host/details.js 
b/ambari-web/app/controllers/main/host/details.js
index 1230a38..cc069d9 100644
--- a/ambari-web/app/controllers/main/host/details.js
+++ b/ambari-web/app/controllers/main/host/details.js
@@ -1299,7 +1299,7 @@ App.MainHostDetailsController = Em.Controller.extend({
*/
   setZKConfigs: function (configs, zksWithPort, zks) {
 if (typeof configs !== 'object' || !Array.isArray(zks)) return false;
-if (App.get('isHaEnabled')) {
+if (App.get('isHaEnabled') && configs['core-site']) {
   App.config.updateHostsListValue(configs['core-site'], 
'ha.zookeeper.quorum', zksWithPort);
 }
 if (configs['hbase-site']) {
@@ -1317,7 +1317,7 @@ App.MainHostDetailsController = Em.Controller.extend({
 if (configs['storm-site']) {
   configs['storm-site']['storm.zookeeper.servers'] = 
JSON.stringify(zks).replace(/"/g, "'");
 }
-if (App.get('isRMHaEnabled')) {
+if (App.get('isRMHaEnabled') && configs['yarn-site']) {
   App.config.updateHostsListValue(configs['yarn-site'], 
'yarn.resourcemanager.zk-address', zksWithPort);
 }
 if (App.get('isHadoop22Stack')) {

ambari git commit: AMBARI-13391 Long API query should be made part of request body. (atkach)

2015-10-13 Thread atkach

Repository: ambari
Updated Branches:
  refs/heads/branch-2.1.2 e45f61b01 -> 99da5c68e


AMBARI-13391 Long API query should be made part of request body. (atkach)


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

Branch: refs/heads/branch-2.1.2
Commit: 99da5c68e7978af9ba3e65bcfcdd778c3d740711
Parents: e45f61b
Author: Andrii Tkach 
Authored: Mon Oct 12 19:17:40 2015 +0300
Committer: Andrii Tkach 
Committed: Tue Oct 13 17:40:29 2015 +0300

--
 ambari-web/app/utils/ajax/ajax.js   | 44 +++-
 ambari-web/test/utils/ajax/ajax_test.js | 33 +
 2 files changed, 76 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/99da5c68/ambari-web/app/utils/ajax/ajax.js
--
diff --git a/ambari-web/app/utils/ajax/ajax.js 
b/ambari-web/app/utils/ajax/ajax.js
index 10c7d89..e2074c2 100644
--- a/ambari-web/app/utils/ajax/ajax.js
+++ b/ambari-web/app/utils/ajax/ajax.js
@@ -2642,7 +2642,8 @@ var formatRequest = function (data) {
 type: this.type || 'GET',
 timeout: App.timeout,
 dataType: 'json',
-statusCode: require('data/statusCodes')
+statusCode: require('data/statusCodes'),
+headers: {}
   };
   if (App.get('testMode')) {
 opt.url = formatUrl(this.mock ? this.mock : '', data);
@@ -2660,12 +2661,39 @@ var formatRequest = function (data) {
 };
 
 /**
+ * transform GET to POST call
+ * @param {object} opt
+ * @returns {object} opt
+ */
+var doGetAsPost = function(opt) {
+  var delimiterPos = opt.url.indexOf('?');
+
+  opt.type = "POST";
+  opt.headers["X-Http-Method-Override"] = "GET";
+  if (delimiterPos !== -1) {
+opt.data = JSON.stringify({
+  "RequestInfo": {"query" : opt.url.substr(delimiterPos + 1, 
opt.url.length)}
+});
+opt.url = opt.url.substr(0, delimiterPos);
+  }
+  opt.url += '?_=' + App.dateTime();
+  return opt;
+};
+
+/**
  * Wrapper for all ajax requests
  *
  * @type {Object}
  */
 var ajax = Em.Object.extend({
   /**
+   * max number of symbols in URL of GET call
+   * @const
+   * @type {number}
+   */
+  MAX_GET_URL_LENGTH: 2048,
+
+  /**
* Send ajax request
*
* @param {Object} config
@@ -2704,6 +2732,10 @@ var ajax = Em.Object.extend({
 }
 opt = formatRequest.call(urls[config.name], params);
 
+if (opt.url && opt.url.length > this.get('MAX_GET_URL_LENGTH')) {
+  opt = doGetAsPost(opt);
+}
+
 opt.context = this;
 
 // object sender should be provided for processing beforeSend, success and 
error responses
@@ -2852,6 +2884,16 @@ if ($.mocho) {
  */
 fakeFormatRequest: function (urlObj, data) {
   return formatRequest.call(urlObj, data);
+},
+
+/**
+ * Don't use it anywhere except tests!
+ * @param urlObj
+ * @param data
+ * @returns {Object}
+ */
+fakeDoGetAsPost: function (urlObj, data) {
+  return doGetAsPost.call(urlObj, data);
 }
   });
 }

http://git-wip-us.apache.org/repos/asf/ambari/blob/99da5c68/ambari-web/test/utils/ajax/ajax_test.js
--
diff --git a/ambari-web/test/utils/ajax/ajax_test.js 
b/ambari-web/test/utils/ajax/ajax_test.js
index 1c5c5ab..5eaafc7 100644
--- a/ambari-web/test/utils/ajax/ajax_test.js
+++ b/ambari-web/test/utils/ajax/ajax_test.js
@@ -150,4 +150,37 @@ describe('App.ajax', function() {
 });
   });
 
+  describe("#doGetAsPost()", function () {
+beforeEach(function () {
+  sinon.stub(App, 'dateTime').returns(1);
+});
+afterEach(function () {
+  App.dateTime.restore();
+});
+it("url does not have '?'", function () {
+  var opt = {
+type: 'GET',
+url: '',
+headers: {}
+  };
+  expect(App.ajax.fakeDoGetAsPost({}, opt)).to.eql({
+type: 'POST',
+url: '?_=1',
+headers: {"X-Http-Method-Override": "GET"}
+  });
+});
+it("url has '?'", function () {
+  var opt = {
+type: 'GET',
+url: 'root?params',
+headers: {}
+  };
+  expect(App.ajax.fakeDoGetAsPost({}, opt)).to.eql({
+type: 'POST',
+url: 'root?_=1',
+headers: {"X-Http-Method-Override": "GET"},
+data: "{\"RequestInfo\":{\"query\":\"params\"}}"
+  });
+});
+  });
 });

ambari git commit: AMBARI-13354. Ambari is not able to run Oozie Server which configured with different username than oozie (dlysnichenko)

2015-10-13 Thread dmitriusan

Repository: ambari
Updated Branches:
  refs/heads/branch-2.1.2 54823edf7 -> febfc413f


AMBARI-13354. Ambari is not able to run Oozie Server which configured with 
different username than oozie (dlysnichenko)


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

Branch: refs/heads/branch-2.1.2
Commit: febfc413fd7ecc6dfac95930eef27d7e49ae8af1
Parents: 54823ed
Author: Lisnichenko Dmitro 
Authored: Tue Oct 13 18:05:33 2015 +0300
Committer: Lisnichenko Dmitro 
Committed: Tue Oct 13 18:05:33 2015 +0300

--
 .../OOZIE/4.0.0.2.0/package/scripts/params_linux.py| 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/febfc413/ambari-server/src/main/resources/common-services/OOZIE/4.0.0.2.0/package/scripts/params_linux.py
--
diff --git 
a/ambari-server/src/main/resources/common-services/OOZIE/4.0.0.2.0/package/scripts/params_linux.py
 
b/ambari-server/src/main/resources/common-services/OOZIE/4.0.0.2.0/package/scripts/params_linux.py
index 8b255fd..779c792 100644
--- 
a/ambari-server/src/main/resources/common-services/OOZIE/4.0.0.2.0/package/scripts/params_linux.py
+++ 
b/ambari-server/src/main/resources/common-services/OOZIE/4.0.0.2.0/package/scripts/params_linux.py
@@ -230,7 +230,7 @@ if sqla_db_used:
   libs_path_in_archive = format("{tmp_dir}/sqla-client-jdbc/native/lib64/*")
   downloaded_custom_connector = format("{tmp_dir}/sqla-client-jdbc.tar.gz")
 
-hdfs_share_dir = "/user/oozie/share"
+hdfs_share_dir = format("{oozie_hdfs_user_dir}/share")
 ambari_server_hostname = config['clusterHostInfo']['ambari_server_host'][0]
 falcon_host = default("/clusterHostInfo/falcon_server_hosts", [])
 has_falcon_host = not len(falcon_host)  == 0

ambari git commit: AMBARI-13403. Ambari unable to build rpms with 4 digit versions (aonishuk)

2015-10-13 Thread aonishuk

Repository: ambari
Updated Branches:
  refs/heads/branch-2.1.2 febfc413f -> 099096246


AMBARI-13403. Ambari unable to build rpms with 4 digit versions (aonishuk)


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

Branch: refs/heads/branch-2.1.2
Commit: 09909624689e36125134dd3026490440ff8f17ec
Parents: febfc41
Author: Andrew Onishuk 
Authored: Tue Oct 13 18:38:37 2015 +0300
Committer: Andrew Onishuk 
Committed: Tue Oct 13 18:38:37 2015 +0300

--
 ambari-admin/pom.xml  | 4 ++--
 ambari-agent/pom.xml  | 4 ++--
 ambari-client/groovy-client/pom.xml   | 4 ++--
 ambari-client/pom.xml | 4 ++--
 ambari-client/python-client/pom.xml   | 4 ++--
 ambari-metrics/ambari-metrics-assembly/pom.xml| 4 ++--
 ambari-metrics/ambari-metrics-common/pom.xml  | 2 +-
 ambari-metrics/ambari-metrics-flume-sink/pom.xml  | 4 ++--
 ambari-metrics/ambari-metrics-hadoop-sink/pom.xml | 4 ++--
 ambari-metrics/ambari-metrics-host-monitoring/pom.xml | 4 ++--
 ambari-metrics/ambari-metrics-kafka-sink/pom.xml  | 4 ++--
 ambari-metrics/ambari-metrics-storm-sink/pom.xml  | 4 ++--
 ambari-metrics/ambari-metrics-timelineservice/pom.xml | 6 +++---
 ambari-metrics/pom.xml| 2 +-
 ambari-project/pom.xml| 4 ++--
 ambari-server/pom.xml | 4 ++--
 ambari-shell/ambari-groovy-shell/pom.xml  | 6 +++---
 ambari-shell/ambari-python-shell/pom.xml  | 4 ++--
 ambari-shell/pom.xml  | 4 ++--
 ambari-views/pom.xml  | 4 ++--
 ambari-web/pom.xml| 4 ++--
 contrib/views/capacity-scheduler/pom.xml  | 2 +-
 contrib/views/files/pom.xml   | 2 +-
 contrib/views/hive/pom.xml| 2 +-
 contrib/views/jobs/pom.xml| 4 ++--
 contrib/views/pig/pom.xml | 2 +-
 contrib/views/pom.xml | 4 ++--
 contrib/views/slider/pom.xml  | 4 ++--
 contrib/views/storm/pom.xml   | 2 +-
 contrib/views/tez/pom.xml | 2 +-
 contrib/views/utils/pom.xml   | 2 +-
 pom.xml   | 2 +-
 32 files changed, 56 insertions(+), 56 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/09909624/ambari-admin/pom.xml
--
diff --git a/ambari-admin/pom.xml b/ambari-admin/pom.xml
index 43764b8..c80549c 100644
--- a/ambari-admin/pom.xml
+++ b/ambari-admin/pom.xml
@@ -19,7 +19,7 @@
   
 org.apache.ambari
 ambari-project
-2.1.2.1.0
+2.1.0.0.0
 ../ambari-project
   
   4.0.0
@@ -27,7 +27,7 @@
   ambari-admin
   jar
   Ambari Admin View
-  2.1.2.1.0
+  2.1.0.0.0
   Admin control panel
   
 

http://git-wip-us.apache.org/repos/asf/ambari/blob/09909624/ambari-agent/pom.xml
--
diff --git a/ambari-agent/pom.xml b/ambari-agent/pom.xml
index 83852cd..38f436e 100644
--- a/ambari-agent/pom.xml
+++ b/ambari-agent/pom.xml
@@ -19,14 +19,14 @@
   
 org.apache.ambari
 ambari-project
-2.1.2.1.0
+2.1.0.0.0
 ../ambari-project
   
   4.0.0
   org.apache.ambari
   ambari-agent
   pom
-  2.1.2.1.0
+  2.1.0.0.0
   Ambari Agent
   Ambari Agent
   

http://git-wip-us.apache.org/repos/asf/ambari/blob/09909624/ambari-client/groovy-client/pom.xml
--
diff --git a/ambari-client/groovy-client/pom.xml 
b/ambari-client/groovy-client/pom.xml
index 1568c94..3dbc78e 100644
--- a/ambari-client/groovy-client/pom.xml
+++ b/ambari-client/groovy-client/pom.xml
@@ -12,14 +12,14 @@
   
 ambari-client
 org.apache.ambari
-2.1.2.1.0
+2.1.0.0.0
 ../../ambari-client/
   
   4.0.0
   org.apache.ambari
   groovy-client
   jar
-  2.1.2.1.0
+  2.1.0.0.0
   Ambari Groovy Client
   Ambari Groovy client
   

http://git-wip-us.apache.org/repos/asf/ambari/blob/09909624/ambari-client/pom.xml
--
diff --git a/ambari-client/pom.xml b/ambari-client/pom.xml
index 44b5948..2f8f3fc 100755
--- a/ambari-client/pom.xml
+++ b/ambari-client/pom.xml
@@ -20,14 +20,14 @@
   
 org.apache.ambari

ambari git commit: AMBARI-13403. Ambari unable to build rpms with 4 digit versions (aonishuk)

2015-10-13 Thread aonishuk

Repository: ambari
Updated Branches:
  refs/heads/branch-2.1 3ba8c39c5 -> 2443d6bf5


AMBARI-13403. Ambari unable to build rpms with 4 digit versions (aonishuk)


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

Branch: refs/heads/branch-2.1
Commit: 2443d6bf5aebea8aa6382602cbabf8f29f99c3df
Parents: 3ba8c39
Author: Andrew Onishuk 
Authored: Tue Oct 13 18:41:32 2015 +0300
Committer: Andrew Onishuk 
Committed: Tue Oct 13 18:41:32 2015 +0300

--
 ambari-admin/pom.xml  | 4 ++--
 ambari-agent/pom.xml  | 4 ++--
 ambari-client/groovy-client/pom.xml   | 4 ++--
 ambari-client/pom.xml | 4 ++--
 ambari-client/python-client/pom.xml   | 4 ++--
 ambari-metrics/ambari-metrics-assembly/pom.xml| 4 ++--
 ambari-metrics/ambari-metrics-common/pom.xml  | 2 +-
 ambari-metrics/ambari-metrics-flume-sink/pom.xml  | 4 ++--
 ambari-metrics/ambari-metrics-hadoop-sink/pom.xml | 4 ++--
 ambari-metrics/ambari-metrics-host-monitoring/pom.xml | 4 ++--
 ambari-metrics/ambari-metrics-kafka-sink/pom.xml  | 4 ++--
 ambari-metrics/ambari-metrics-storm-sink/pom.xml  | 4 ++--
 ambari-metrics/ambari-metrics-timelineservice/pom.xml | 6 +++---
 ambari-metrics/pom.xml| 2 +-
 ambari-project/pom.xml| 4 ++--
 ambari-server/pom.xml | 4 ++--
 ambari-shell/ambari-groovy-shell/pom.xml  | 6 +++---
 ambari-shell/ambari-python-shell/pom.xml  | 4 ++--
 ambari-shell/pom.xml  | 4 ++--
 ambari-views/pom.xml  | 4 ++--
 ambari-web/pom.xml| 4 ++--
 contrib/views/capacity-scheduler/pom.xml  | 2 +-
 contrib/views/files/pom.xml   | 2 +-
 contrib/views/hive/pom.xml| 2 +-
 contrib/views/jobs/pom.xml| 4 ++--
 contrib/views/pig/pom.xml | 2 +-
 contrib/views/pom.xml | 4 ++--
 contrib/views/slider/pom.xml  | 4 ++--
 contrib/views/storm/pom.xml   | 2 +-
 contrib/views/tez/pom.xml | 2 +-
 contrib/views/utils/pom.xml   | 2 +-
 pom.xml   | 2 +-
 32 files changed, 56 insertions(+), 56 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/2443d6bf/ambari-admin/pom.xml
--
diff --git a/ambari-admin/pom.xml b/ambari-admin/pom.xml
index 43764b8..c80549c 100644
--- a/ambari-admin/pom.xml
+++ b/ambari-admin/pom.xml
@@ -19,7 +19,7 @@
   
 org.apache.ambari
 ambari-project
-2.1.2.1.0
+2.1.0.0.0
 ../ambari-project
   
   4.0.0
@@ -27,7 +27,7 @@
   ambari-admin
   jar
   Ambari Admin View
-  2.1.2.1.0
+  2.1.0.0.0
   Admin control panel
   
 

http://git-wip-us.apache.org/repos/asf/ambari/blob/2443d6bf/ambari-agent/pom.xml
--
diff --git a/ambari-agent/pom.xml b/ambari-agent/pom.xml
index 83852cd..38f436e 100644
--- a/ambari-agent/pom.xml
+++ b/ambari-agent/pom.xml
@@ -19,14 +19,14 @@
   
 org.apache.ambari
 ambari-project
-2.1.2.1.0
+2.1.0.0.0
 ../ambari-project
   
   4.0.0
   org.apache.ambari
   ambari-agent
   pom
-  2.1.2.1.0
+  2.1.0.0.0
   Ambari Agent
   Ambari Agent
   

http://git-wip-us.apache.org/repos/asf/ambari/blob/2443d6bf/ambari-client/groovy-client/pom.xml
--
diff --git a/ambari-client/groovy-client/pom.xml 
b/ambari-client/groovy-client/pom.xml
index 1568c94..3dbc78e 100644
--- a/ambari-client/groovy-client/pom.xml
+++ b/ambari-client/groovy-client/pom.xml
@@ -12,14 +12,14 @@
   
 ambari-client
 org.apache.ambari
-2.1.2.1.0
+2.1.0.0.0
 ../../ambari-client/
   
   4.0.0
   org.apache.ambari
   groovy-client
   jar
-  2.1.2.1.0
+  2.1.0.0.0
   Ambari Groovy Client
   Ambari Groovy client
   

http://git-wip-us.apache.org/repos/asf/ambari/blob/2443d6bf/ambari-client/pom.xml
--
diff --git a/ambari-client/pom.xml b/ambari-client/pom.xml
index 44b5948..2f8f3fc 100755
--- a/ambari-client/pom.xml
+++ b/ambari-client/pom.xml
@@ -20,14 +20,14 @@
   
 org.apache.ambari

ambari git commit: AMBARI-13330. [Hive View] UI issue with Hive View in old Firefox browser (Pallav Kulshreshtha via srimanth)

2015-10-13 Thread srimanth

Repository: ambari
Updated Branches:
  refs/heads/trunk 51c7688e8 -> 595a99611


AMBARI-13330. [Hive View] UI issue with Hive View in old Firefox browser 
(Pallav Kulshreshtha via srimanth)


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

Branch: refs/heads/trunk
Commit: 595a99611ff60c7fc54bbf756872706d501f7b7e
Parents: 51c7688
Author: Srimanth Gunturi 
Authored: Tue Oct 13 10:14:26 2015 -0700
Committer: Srimanth Gunturi 
Committed: Tue Oct 13 10:15:19 2015 -0700

--
 .../resources/ui/hive-web/app/components/typeahead-widget.js| 3 +++
 .../hive/src/main/resources/ui/hive-web/app/styles/app.scss | 5 +
 .../ui/hive-web/app/templates/components/navbar-widget.hbs  | 2 +-
 .../src/main/resources/ui/hive-web/app/templates/databases.hbs  | 4 ++--
 4 files changed, 11 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/595a9961/contrib/views/hive/src/main/resources/ui/hive-web/app/components/typeahead-widget.js
--
diff --git 
a/contrib/views/hive/src/main/resources/ui/hive-web/app/components/typeahead-widget.js
 
b/contrib/views/hive/src/main/resources/ui/hive-web/app/components/typeahead-widget.js
index b38c891..f9233a0 100644
--- 
a/contrib/views/hive/src/main/resources/ui/hive-web/app/components/typeahead-widget.js
+++ 
b/contrib/views/hive/src/main/resources/ui/hive-web/app/components/typeahead-widget.js
@@ -28,6 +28,9 @@ export default 
Typeahead.extend(Ember.I18n.TranslateableProperties, {
 }
 
 this.selectize.on('dropdown_close', Ember.$.proxy(this.onClose, this));
+
+if($('.selectize-input')) {$('.selectize-input').addClass( "mozBoxSizeFix" 
);}
+
   },
 
   removeExcludedObserver: function () {

http://git-wip-us.apache.org/repos/asf/ambari/blob/595a9961/contrib/views/hive/src/main/resources/ui/hive-web/app/styles/app.scss
--
diff --git 
a/contrib/views/hive/src/main/resources/ui/hive-web/app/styles/app.scss 
b/contrib/views/hive/src/main/resources/ui/hive-web/app/styles/app.scss
index 5283daf..bf271c4 100644
--- a/contrib/views/hive/src/main/resources/ui/hive-web/app/styles/app.scss
+++ b/contrib/views/hive/src/main/resources/ui/hive-web/app/styles/app.scss
@@ -254,6 +254,7 @@ dropdown .fa-remove {
 .query-container {
   position: relative;
   padding-right: 0;
+  -moz-box-sizing: border-box;
 
   &.col-md-9 {
 @include animate-width(0.25s);
@@ -575,3 +576,7 @@ tree-view ul li {
   float: right;
 }
 }
+
+.mozBoxSizeFix {
+  -moz-box-sizing: border-box;
+}

http://git-wip-us.apache.org/repos/asf/ambari/blob/595a9961/contrib/views/hive/src/main/resources/ui/hive-web/app/templates/components/navbar-widget.hbs
--
diff --git 
a/contrib/views/hive/src/main/resources/ui/hive-web/app/templates/components/navbar-widget.hbs
 
b/contrib/views/hive/src/main/resources/ui/hive-web/app/templates/components/navbar-widget.hbs
index f8f6bcb..f13f7b5 100644
--- 
a/contrib/views/hive/src/main/resources/ui/hive-web/app/templates/components/navbar-widget.hbs
+++ 
b/contrib/views/hive/src/main/resources/ui/hive-web/app/templates/components/navbar-widget.hbs
@@ -26,7 +26,7 @@
 
 
   
-  {{#link-to "index" classNames="navbar-brand"}}
+  {{#link-to "index" classNames="navbar-brand mozBoxSizeFix"}}
 {{view.title}}
   {{/link-to}}
 

http://git-wip-us.apache.org/repos/asf/ambari/blob/595a9961/contrib/views/hive/src/main/resources/ui/hive-web/app/templates/databases.hbs
--
diff --git 
a/contrib/views/hive/src/main/resources/ui/hive-web/app/templates/databases.hbs 
b/contrib/views/hive/src/main/resources/ui/hive-web/app/templates/databases.hbs
index 068478b..290cdac 100644
--- 
a/contrib/views/hive/src/main/resources/ui/hive-web/app/templates/databases.hbs
+++ 
b/contrib/views/hive/src/main/resources/ui/hive-web/app/templates/databases.hbs
@@ -29,7 +29,7 @@
 
 
 {{#if selectedDatabase}}
-  {{extended-input class="form-control input-sm"
+  {{extended-input class="form-control input-sm mozBoxSizeFix"
placeholderTranslation="placeholders.search.tables"
valueSearched="searchTables"
value=tableSearchTerm}}
@@ -39,7 +39,7 @@
 
 
 {{#if tableSearchResults.tables}}
-  {{extended-input class="form-control input-sm"
+  {{extended-input class="form-control input-sm

ambari git commit: AMBARI-13281. Hive View [Visualization] Enhancements (Pallav Kulshreshtha via srimanth)

2015-10-13 Thread srimanth

Repository: ambari
Updated Branches:
  refs/heads/branch-2.1 2443d6bf5 -> cc4eb83f4


AMBARI-13281. Hive View [Visualization] Enhancements (Pallav Kulshreshtha via 
srimanth)


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

Branch: refs/heads/branch-2.1
Commit: cc4eb83f4be29bdd14fc1e351e36261047b7381d
Parents: 2443d6b
Author: Srimanth Gunturi 
Authored: Tue Oct 13 10:11:27 2015 -0700
Committer: Srimanth Gunturi 
Committed: Tue Oct 13 10:11:27 2015 -0700

--
 .../ui/hive-web/app/controllers/query-tabs.js   |  5 
 .../ui/hive-web/app/templates/query-tabs.hbs| 31 +---
 .../ui/hive-web/app/utils/constants.js  |  2 +-
 3 files changed, 9 insertions(+), 29 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/cc4eb83f/contrib/views/hive/src/main/resources/ui/hive-web/app/controllers/query-tabs.js
--
diff --git 
a/contrib/views/hive/src/main/resources/ui/hive-web/app/controllers/query-tabs.js
 
b/contrib/views/hive/src/main/resources/ui/hive-web/app/controllers/query-tabs.js
index a636b29..5f31c19 100644
--- 
a/contrib/views/hive/src/main/resources/ui/hive-web/app/controllers/query-tabs.js
+++ 
b/contrib/views/hive/src/main/resources/ui/hive-web/app/controllers/query-tabs.js
@@ -48,7 +48,6 @@ export default Ember.Controller.extend({
 Ember.Object.create({
   iconClass: 'fa-area-chart',
   id: 'visualization-icon',
-  type: 'visualization',
   action: 'toggleOverlay',
   tooltip: Ember.I18n.t('tooltips.visualization'),
   into: 'index',
@@ -161,10 +160,6 @@ export default Ember.Controller.extend({
 }
   },
 
-  showVisulization: function () {
-return this.get('index.displayJobTabs');
-  }.property('index.content', 'index.jobSaveSucceeded'),
-
   actions: {
 toggleOverlay: function (tab) {
   if (tab !== this.get('default') && tab.get('active')) {

http://git-wip-us.apache.org/repos/asf/ambari/blob/cc4eb83f/contrib/views/hive/src/main/resources/ui/hive-web/app/templates/query-tabs.hbs
--
diff --git 
a/contrib/views/hive/src/main/resources/ui/hive-web/app/templates/query-tabs.hbs
 
b/contrib/views/hive/src/main/resources/ui/hive-web/app/templates/query-tabs.hbs
index 6b1f8f5..62b15c1 100644
--- 
a/contrib/views/hive/src/main/resources/ui/hive-web/app/templates/query-tabs.hbs
+++ 
b/contrib/views/hive/src/main/resources/ui/hive-web/app/templates/query-tabs.hbs
@@ -17,27 +17,12 @@
 }}
 
 {{#each tab in tabs}}
-  {{#if tab.type}}
-{{#if showVisulization}}
-
-  {{#if tab.badge}}
-{{tab.badge}}
-  {{/if}}
-
-  {{#if tab.text}}
-{{tab.text}}
-  {{/if}}
-
-{{/if}}
-{{else}}
-  
-{{#if tab.badge}}
-  {{tab.badge}}
-{{/if}}
-
-{{#if tab.text}}
-  {{tab.text}}
-{{/if}}
-  
-  {{/if}}
+
+  {{#if tab.badge}}
+{{tab.badge}}
+  {{/if}}
+  {{#if tab.text}}
+{{tab.text}}
+  {{/if}}
+
 {{/each}}

http://git-wip-us.apache.org/repos/asf/ambari/blob/cc4eb83f/contrib/views/hive/src/main/resources/ui/hive-web/app/utils/constants.js
--
diff --git 
a/contrib/views/hive/src/main/resources/ui/hive-web/app/utils/constants.js 
b/contrib/views/hive/src/main/resources/ui/hive-web/app/utils/constants.js
index 691..a349d51 100644
--- a/contrib/views/hive/src/main/resources/ui/hive-web/app/utils/constants.js
+++ b/contrib/views/hive/src/main/resources/ui/hive-web/app/utils/constants.js
@@ -222,6 +222,6 @@ export default Ember.Object.create({
 comment: "--Global Settings--\n\n"
   },
 
-  defaultVisualizationRowCount: 3
+  defaultVisualizationRowCount: 1
 
 });

ambari git commit: AMBARI-13281. Hive View [Visualization] Enhancements (Pallav Kulshreshtha via srimanth)

2015-10-13 Thread srimanth

Repository: ambari
Updated Branches:
  refs/heads/trunk c6c7f3955 -> 51c7688e8


AMBARI-13281. Hive View [Visualization] Enhancements (Pallav Kulshreshtha via 
srimanth)


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

Branch: refs/heads/trunk
Commit: 51c7688e840adb9799fbab101d8d12ed49713feb
Parents: c6c7f39
Author: Srimanth Gunturi 
Authored: Tue Oct 13 10:11:27 2015 -0700
Committer: Srimanth Gunturi 
Committed: Tue Oct 13 10:12:06 2015 -0700

--
 .../ui/hive-web/app/controllers/query-tabs.js   |  5 
 .../ui/hive-web/app/templates/query-tabs.hbs| 31 +---
 .../ui/hive-web/app/utils/constants.js  |  2 +-
 3 files changed, 9 insertions(+), 29 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/51c7688e/contrib/views/hive/src/main/resources/ui/hive-web/app/controllers/query-tabs.js
--
diff --git 
a/contrib/views/hive/src/main/resources/ui/hive-web/app/controllers/query-tabs.js
 
b/contrib/views/hive/src/main/resources/ui/hive-web/app/controllers/query-tabs.js
index a636b29..5f31c19 100644
--- 
a/contrib/views/hive/src/main/resources/ui/hive-web/app/controllers/query-tabs.js
+++ 
b/contrib/views/hive/src/main/resources/ui/hive-web/app/controllers/query-tabs.js
@@ -48,7 +48,6 @@ export default Ember.Controller.extend({
 Ember.Object.create({
   iconClass: 'fa-area-chart',
   id: 'visualization-icon',
-  type: 'visualization',
   action: 'toggleOverlay',
   tooltip: Ember.I18n.t('tooltips.visualization'),
   into: 'index',
@@ -161,10 +160,6 @@ export default Ember.Controller.extend({
 }
   },
 
-  showVisulization: function () {
-return this.get('index.displayJobTabs');
-  }.property('index.content', 'index.jobSaveSucceeded'),
-
   actions: {
 toggleOverlay: function (tab) {
   if (tab !== this.get('default') && tab.get('active')) {

http://git-wip-us.apache.org/repos/asf/ambari/blob/51c7688e/contrib/views/hive/src/main/resources/ui/hive-web/app/templates/query-tabs.hbs
--
diff --git 
a/contrib/views/hive/src/main/resources/ui/hive-web/app/templates/query-tabs.hbs
 
b/contrib/views/hive/src/main/resources/ui/hive-web/app/templates/query-tabs.hbs
index 6b1f8f5..62b15c1 100644
--- 
a/contrib/views/hive/src/main/resources/ui/hive-web/app/templates/query-tabs.hbs
+++ 
b/contrib/views/hive/src/main/resources/ui/hive-web/app/templates/query-tabs.hbs
@@ -17,27 +17,12 @@
 }}
 
 {{#each tab in tabs}}
-  {{#if tab.type}}
-{{#if showVisulization}}
-
-  {{#if tab.badge}}
-{{tab.badge}}
-  {{/if}}
-
-  {{#if tab.text}}
-{{tab.text}}
-  {{/if}}
-
-{{/if}}
-{{else}}
-  
-{{#if tab.badge}}
-  {{tab.badge}}
-{{/if}}
-
-{{#if tab.text}}
-  {{tab.text}}
-{{/if}}
-  
-  {{/if}}
+
+  {{#if tab.badge}}
+{{tab.badge}}
+  {{/if}}
+  {{#if tab.text}}
+{{tab.text}}
+  {{/if}}
+
 {{/each}}

http://git-wip-us.apache.org/repos/asf/ambari/blob/51c7688e/contrib/views/hive/src/main/resources/ui/hive-web/app/utils/constants.js
--
diff --git 
a/contrib/views/hive/src/main/resources/ui/hive-web/app/utils/constants.js 
b/contrib/views/hive/src/main/resources/ui/hive-web/app/utils/constants.js
index 691..a349d51 100644
--- a/contrib/views/hive/src/main/resources/ui/hive-web/app/utils/constants.js
+++ b/contrib/views/hive/src/main/resources/ui/hive-web/app/utils/constants.js
@@ -222,6 +222,6 @@ export default Ember.Object.create({
 comment: "--Global Settings--\n\n"
   },
 
-  defaultVisualizationRowCount: 3
+  defaultVisualizationRowCount: 1
 
 });

ambari git commit: AMBARI-13330. [Hive View] UI issue with Hive View in old Firefox browser (Pallav Kulshreshtha via srimanth)

2015-10-13 Thread srimanth

Repository: ambari
Updated Branches:
  refs/heads/branch-2.1 cc4eb83f4 -> d7b8dc907


AMBARI-13330. [Hive View] UI issue with Hive View in old Firefox browser 
(Pallav Kulshreshtha via srimanth)


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

Branch: refs/heads/branch-2.1
Commit: d7b8dc9070b0b05b6257adae8c80db2c11075df9
Parents: cc4eb83
Author: Srimanth Gunturi 
Authored: Tue Oct 13 10:14:26 2015 -0700
Committer: Srimanth Gunturi 
Committed: Tue Oct 13 10:14:26 2015 -0700

--
 .../resources/ui/hive-web/app/components/typeahead-widget.js| 3 +++
 .../hive/src/main/resources/ui/hive-web/app/styles/app.scss | 5 +
 .../ui/hive-web/app/templates/components/navbar-widget.hbs  | 2 +-
 .../src/main/resources/ui/hive-web/app/templates/databases.hbs  | 4 ++--
 4 files changed, 11 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/d7b8dc90/contrib/views/hive/src/main/resources/ui/hive-web/app/components/typeahead-widget.js
--
diff --git 
a/contrib/views/hive/src/main/resources/ui/hive-web/app/components/typeahead-widget.js
 
b/contrib/views/hive/src/main/resources/ui/hive-web/app/components/typeahead-widget.js
index b38c891..f9233a0 100644
--- 
a/contrib/views/hive/src/main/resources/ui/hive-web/app/components/typeahead-widget.js
+++ 
b/contrib/views/hive/src/main/resources/ui/hive-web/app/components/typeahead-widget.js
@@ -28,6 +28,9 @@ export default 
Typeahead.extend(Ember.I18n.TranslateableProperties, {
 }
 
 this.selectize.on('dropdown_close', Ember.$.proxy(this.onClose, this));
+
+if($('.selectize-input')) {$('.selectize-input').addClass( "mozBoxSizeFix" 
);}
+
   },
 
   removeExcludedObserver: function () {

http://git-wip-us.apache.org/repos/asf/ambari/blob/d7b8dc90/contrib/views/hive/src/main/resources/ui/hive-web/app/styles/app.scss
--
diff --git 
a/contrib/views/hive/src/main/resources/ui/hive-web/app/styles/app.scss 
b/contrib/views/hive/src/main/resources/ui/hive-web/app/styles/app.scss
index 5283daf..bf271c4 100644
--- a/contrib/views/hive/src/main/resources/ui/hive-web/app/styles/app.scss
+++ b/contrib/views/hive/src/main/resources/ui/hive-web/app/styles/app.scss
@@ -254,6 +254,7 @@ dropdown .fa-remove {
 .query-container {
   position: relative;
   padding-right: 0;
+  -moz-box-sizing: border-box;
 
   &.col-md-9 {
 @include animate-width(0.25s);
@@ -575,3 +576,7 @@ tree-view ul li {
   float: right;
 }
 }
+
+.mozBoxSizeFix {
+  -moz-box-sizing: border-box;
+}

http://git-wip-us.apache.org/repos/asf/ambari/blob/d7b8dc90/contrib/views/hive/src/main/resources/ui/hive-web/app/templates/components/navbar-widget.hbs
--
diff --git 
a/contrib/views/hive/src/main/resources/ui/hive-web/app/templates/components/navbar-widget.hbs
 
b/contrib/views/hive/src/main/resources/ui/hive-web/app/templates/components/navbar-widget.hbs
index f8f6bcb..f13f7b5 100644
--- 
a/contrib/views/hive/src/main/resources/ui/hive-web/app/templates/components/navbar-widget.hbs
+++ 
b/contrib/views/hive/src/main/resources/ui/hive-web/app/templates/components/navbar-widget.hbs
@@ -26,7 +26,7 @@
 
 
   
-  {{#link-to "index" classNames="navbar-brand"}}
+  {{#link-to "index" classNames="navbar-brand mozBoxSizeFix"}}
 {{view.title}}
   {{/link-to}}
 

http://git-wip-us.apache.org/repos/asf/ambari/blob/d7b8dc90/contrib/views/hive/src/main/resources/ui/hive-web/app/templates/databases.hbs
--
diff --git 
a/contrib/views/hive/src/main/resources/ui/hive-web/app/templates/databases.hbs 
b/contrib/views/hive/src/main/resources/ui/hive-web/app/templates/databases.hbs
index 068478b..290cdac 100644
--- 
a/contrib/views/hive/src/main/resources/ui/hive-web/app/templates/databases.hbs
+++ 
b/contrib/views/hive/src/main/resources/ui/hive-web/app/templates/databases.hbs
@@ -29,7 +29,7 @@
 
 
 {{#if selectedDatabase}}
-  {{extended-input class="form-control input-sm"
+  {{extended-input class="form-control input-sm mozBoxSizeFix"
placeholderTranslation="placeholders.search.tables"
valueSearched="searchTables"
value=tableSearchTerm}}
@@ -39,7 +39,7 @@
 
 
 {{#if tableSearchResults.tables}}
-  {{extended-input class="form-control input-sm"
+  {{extended-input class="form-control

ambari git commit: AMBARI-13410. Ambari-metrics-common rpm doesn't contain build number (aonishuk)

2015-10-13 Thread aonishuk

Repository: ambari
Updated Branches:
  refs/heads/branch-2.1.2 099096246 -> 8a800741e


AMBARI-13410. Ambari-metrics-common rpm doesn't contain build number (aonishuk)


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

Branch: refs/heads/branch-2.1.2
Commit: 8a800741e3fe676c3b5de5e031f523cc20017824
Parents: 0990962
Author: Andrew Onishuk 
Authored: Tue Oct 13 22:24:22 2015 +0300
Committer: Andrew Onishuk 
Committed: Tue Oct 13 22:24:22 2015 +0300

--
 ambari-metrics/pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/8a800741/ambari-metrics/pom.xml
--
diff --git a/ambari-metrics/pom.xml b/ambari-metrics/pom.xml
index c2da855..4a48897 100644
--- a/ambari-metrics/pom.xml
+++ b/ambari-metrics/pom.xml
@@ -198,9 +198,9 @@
   package-release
   ${project.version}
   
-
^([0-9]+)\.([0-9]+)\.([0-9]+)(\.|-)((([a-zA-Z]+)?([0-9]+))|(SNAPSHOT)).*
+
^([0-9]+)\.([0-9]+)\.([0-9]+)\.([0-9]+)(\.|-)((([a-zA-Z]+)?([0-9]+))|(SNAPSHOT)).*
   
-  $5
+  $7
   true

ambari git commit: AMBARI-13410. Ambari-metrics-common rpm doesn't contain build number (aonishuk)

2015-10-13 Thread aonishuk

Repository: ambari
Updated Branches:
  refs/heads/branch-2.1 d7b8dc907 -> 154c98b2c


AMBARI-13410. Ambari-metrics-common rpm doesn't contain build number (aonishuk)


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

Branch: refs/heads/branch-2.1
Commit: 154c98b2c075889d819c041bec90ff3c6ac57b13
Parents: d7b8dc9
Author: Andrew Onishuk 
Authored: Tue Oct 13 22:21:17 2015 +0300
Committer: Andrew Onishuk 
Committed: Tue Oct 13 22:21:17 2015 +0300

--
 ambari-metrics/pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/154c98b2/ambari-metrics/pom.xml
--
diff --git a/ambari-metrics/pom.xml b/ambari-metrics/pom.xml
index c2da855..4a48897 100644
--- a/ambari-metrics/pom.xml
+++ b/ambari-metrics/pom.xml
@@ -198,9 +198,9 @@
   package-release
   ${project.version}
   
-
^([0-9]+)\.([0-9]+)\.([0-9]+)(\.|-)((([a-zA-Z]+)?([0-9]+))|(SNAPSHOT)).*
+
^([0-9]+)\.([0-9]+)\.([0-9]+)\.([0-9]+)(\.|-)((([a-zA-Z]+)?([0-9]+))|(SNAPSHOT)).*
   
-  $5
+  $7
   true

ambari git commit: AMBARI-13410. Ambari-metrics-common rpm doesn't contain build number (aonishuk)

2015-10-13 Thread aonishuk

Repository: ambari
Updated Branches:
  refs/heads/trunk 81eff4e59 -> b33ad0791


AMBARI-13410. Ambari-metrics-common rpm doesn't contain build number (aonishuk)


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

Branch: refs/heads/trunk
Commit: b33ad0791e5e643b4c621898c18f48245514dea8
Parents: 81eff4e
Author: Andrew Onishuk 
Authored: Tue Oct 13 22:21:14 2015 +0300
Committer: Andrew Onishuk 
Committed: Tue Oct 13 22:21:14 2015 +0300

--
 ambari-metrics/pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/b33ad079/ambari-metrics/pom.xml
--
diff --git a/ambari-metrics/pom.xml b/ambari-metrics/pom.xml
index 8931340..da4712a 100644
--- a/ambari-metrics/pom.xml
+++ b/ambari-metrics/pom.xml
@@ -205,9 +205,9 @@
   package-release
   ${project.version}
   
-
^([0-9]+)\.([0-9]+)\.([0-9]+)(\.|-)((([a-zA-Z]+)?([0-9]+))|(SNAPSHOT)).*
+
^([0-9]+)\.([0-9]+)\.([0-9]+)\.([0-9]+)(\.|-)((([a-zA-Z]+)?([0-9]+))|(SNAPSHOT)).*
   
-  $5
+  $7
   true

[2/2] ambari git commit: AMBARI-13327. Agents to automatically communicate with Active Server (Nahappan Somasundaram via smohanty)

2015-10-13 Thread smohanty

AMBARI-13327. Agents to automatically communicate with Active Server (Nahappan 
Somasundaram via smohanty)


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

Branch: refs/heads/trunk
Commit: 6df37bba87c2951f564c00ee69fa2c385d1cf1ff
Parents: d7269e6
Author: Sumit Mohanty 
Authored: Tue Oct 13 10:56:16 2015 -0700
Committer: Sumit Mohanty 
Committed: Tue Oct 13 10:56:16 2015 -0700

--
 .../main/python/ambari_agent/AmbariConfig.py| 46 
 .../src/main/python/ambari_agent/Controller.py  |  6 +-
 .../src/main/python/ambari_agent/NetUtil.py |  2 +-
 .../src/main/python/ambari_agent/hostname.py| 29 +---
 .../src/main/python/ambari_agent/main.py| 73 ++--
 .../src/main/python/ambari_agent/security.py| 13 ++--
 .../python/ambari_agent/TestCertGeneration.py   |  3 +-
 .../test/python/ambari_agent/TestController.py  |  5 +-
 .../test/python/ambari_agent/TestHostname.py| 53 --
 .../src/test/python/ambari_agent/TestMain.py| 27 +++-
 .../src/test/python/ambari_agent/TestNetUtil.py |  6 +-
 .../test/python/ambari_agent/TestSecurity.py| 22 +++---
 12 files changed, 205 insertions(+), 80 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/6df37bba/ambari-agent/src/main/python/ambari_agent/AmbariConfig.py
--
diff --git a/ambari-agent/src/main/python/ambari_agent/AmbariConfig.py 
b/ambari-agent/src/main/python/ambari_agent/AmbariConfig.py
index 453d59c..03e14ad 100644
--- a/ambari-agent/src/main/python/ambari_agent/AmbariConfig.py
+++ b/ambari-agent/src/main/python/ambari_agent/AmbariConfig.py
@@ -240,13 +240,13 @@ class AmbariConfig:
 pass
 return default
 
-  def get_api_url(self):
+  def get_api_url(self, server_hostname):
 return "%s://%s:%s" % (self.CONNECTION_PROTOCOL,
-   hostname.server_hostname(self),
+   server_hostname,
self.get('server', 'url_port'))
 
-  def isTwoWaySSLConnection(self):
-req_url = self.get_api_url()
+  def isTwoWaySSLConnection(self, server_hostname):
+req_url = self.get_api_url(server_hostname)
 response = 
self.getServerOption(self.SERVER_CONNECTION_INFO.format(req_url), 
self.TWO_WAY_SSL_PROPERTY, 'false')
 if response is None:
   return False
@@ -267,17 +267,39 @@ class AmbariConfig:
 logger.info("Updating config property (%s) with value (%s)", k, v)
 pass
 
-def updateConfigServerHostname(configFile, new_host):
+def isSameHostList(hostlist1, hostlist2):
+  is_same = True
+
+  if (hostlist1 is not None and hostlist2 is not None):
+if (len(hostlist1) != len(hostlist2)):
+  is_same = False
+else:
+  host_lookup = {}
+  for item1 in hostlist1:
+host_lookup[item1.lower()] = True
+  for item2 in hostlist2:
+if item2.lower() in host_lookup:
+  del host_lookup[item2.lower()]
+else:
+  is_same = False
+  break
+pass
+  elif (hostlist1 is not None or hostlist2 is not None):
+is_same = False
+  return is_same
+
+def updateConfigServerHostname(configFile, new_hosts):
   # update agent config file
   agent_config = ConfigParser.ConfigParser()
   agent_config.read(configFile)
-  server_host = agent_config.get('server', 'hostname')
-  if new_host is not None and server_host != new_host:
-print "Updating server host from " + server_host + " to " + new_host
-agent_config.set('server', 'hostname', new_host)
-with (open(configFile, "wb")) as new_agent_config:
-  agent_config.write(new_agent_config)
-
+  server_hosts = agent_config.get('server', 'hostname')
+  if new_hosts is not None:
+  new_host_names = hostname.arrayFromCsvString(new_hosts)
+  if not isSameHostList(server_hosts, new_host_names):
+print "Updating server hostname from " + server_hosts + " to " + 
new_hosts
+agent_config.set('server', 'hostname', new_hosts)
+with (open(configFile, "wb")) as new_agent_config:
+  agent_config.write(new_agent_config)
 
 def main():
   print AmbariConfig().config

http://git-wip-us.apache.org/repos/asf/ambari/blob/6df37bba/ambari-agent/src/main/python/ambari_agent/Controller.py
--
diff --git a/ambari-agent/src/main/python/ambari_agent/Controller.py 
b/ambari-agent/src/main/python/ambari_agent/Controller.py
index 74a8eac..5a4bb00 100644
--- a/ambari-agent/src/main/python/ambari_agent/Controller.py
+++

[1/2] ambari git commit: AMBARI-13328. Enable skipSurefireTests for ambari-metrics project (Nahappan Somasundaram via smohanty)

2015-10-13 Thread smohanty

Repository: ambari
Updated Branches:
  refs/heads/trunk 595a99611 -> 6df37bba8


AMBARI-13328. Enable skipSurefireTests for ambari-metrics project (Nahappan 
Somasundaram via smohanty)


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

Branch: refs/heads/trunk
Commit: d7269e6e08d2b9e9de735c89277a889c8499b6a1
Parents: 595a996
Author: Sumit Mohanty 
Authored: Tue Oct 13 10:51:57 2015 -0700
Committer: Sumit Mohanty 
Committed: Tue Oct 13 10:51:57 2015 -0700

--
 ambari-metrics/pom.xml | 7 +++
 1 file changed, 7 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/d7269e6e/ambari-metrics/pom.xml
--
diff --git a/ambari-metrics/pom.xml b/ambari-metrics/pom.xml
index d08cc28..8931340 100644
--- a/ambari-metrics/pom.xml
+++ b/ambari-metrics/pom.xml
@@ -149,6 +149,13 @@
 
   
   
+org.apache.maven.plugins
+maven-surefire-plugin
+
+  ${skipSurefireTests}
+
+  
+  
 maven-compiler-plugin
 3.2

ambari git commit: AMBARI-13406 - Rolling Upgrade: Internal Server Error Due To XML Binding Tasks To Groupings (jonathanhurley)

2015-10-13 Thread jonathanhurley

Repository: ambari
Updated Branches:
  refs/heads/trunk 6df37bba8 -> 81eff4e59


AMBARI-13406 - Rolling Upgrade: Internal Server Error Due To XML Binding Tasks 
To Groupings (jonathanhurley)


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

Branch: refs/heads/trunk
Commit: 81eff4e59046bfd29737548527ede2a8ad391526
Parents: 6df37bb
Author: Jonathan Hurley 
Authored: Tue Oct 13 13:20:16 2015 -0400
Committer: Jonathan Hurley 
Committed: Tue Oct 13 14:13:16 2015 -0400

--
 .../stacks/HDP/2.2/upgrades/upgrade-2.2.xml |  84 ++---
 .../stacks/HDP/2.2/upgrades/upgrade-2.3.xml | 118 +--
 .../stacks/HDP/2.3/upgrades/upgrade-2.3.xml | 102 
 .../upgrades/upgrade_test_skip_failures.xml |   4 +-
 4 files changed, 154 insertions(+), 154 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/81eff4e5/ambari-server/src/main/resources/stacks/HDP/2.2/upgrades/upgrade-2.2.xml
--
diff --git 
a/ambari-server/src/main/resources/stacks/HDP/2.2/upgrades/upgrade-2.2.xml 
b/ambari-server/src/main/resources/stacks/HDP/2.2/upgrades/upgrade-2.2.xml
index 810423d..e54f0d8 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.2/upgrades/upgrade-2.2.xml
+++ b/ambari-server/src/main/resources/stacks/HDP/2.2/upgrades/upgrade-2.2.xml
@@ -21,7 +21,7 @@
   2.2.*.*
   false
   false
-  HDP-2.3
+  HDP-2.2
   ROLLING
   
 org.apache.ambari.server.checks.HiveMultipleMetastoreCheck
@@ -327,13 +327,13 @@
 
   
 
-  
+  
 
   
 
   
 
-  
+  
 
   
 
@@ -341,13 +341,13 @@
 
   
 
-  
+  
 
   
 
   
 
-  
+  
 
   
 
@@ -355,31 +355,31 @@
 
   
 
-  
+  
 
   
 
   
 
-  
+  
 
   
 
   
 
-  
+  
 
   
 
   
 
-  
+  
 
   
 
   
 
-  
+  
 
   
 
@@ -387,13 +387,13 @@
 
   
 
-  
+  
 
   
 
   
 
-  
+  
 
   
 
@@ -401,44 +401,44 @@
 
   
 
-  
+  
 
   
 
   
 
-  
+  
 
   
 
   
 
-  
+  
 
   
 
   
 
-  
+  
 
   
 
 
   
 
-  
+  
 
   
 
   
 
-  
+  
 
   
 
   
 
-  
+  
 
   
 
@@ -446,7 +446,7 @@
 
   
 
-  
+  
 
   
 
@@ -454,7 +454,7 @@
 
   
 
-  
+  
 
   
 
@@ -462,7 +462,7 @@
 
   
 
-  
+  
 
   
 
@@ -470,7 +470,7 @@
 
   
 
-  
+  
 
   
 
@@ -494,25 +494,25 @@
 
 
 
-  
+  
 
   
 
   
 
-  
+  
 
   
 
   
 
-  
+  
 
   
 
   
 
-  
+  
 
   
 
@@ -520,7 +520,7 @@
 
   
 
-  
+  
 
   
 
@@ -528,12 +528,12 @@
 
   
 
-  
+  
 
   
   
 
-  
+  
 
   
 
@@ -565,13 +565,13 @@
 
 
 
-  
+  
 
   
 
   
 
-  
+  
 
   
 
@@ -579,12 +579,12 @@
 
   
 
-  
+  
 
   
   
 
-  
+  
 
   
 
@@ -592,7 +592,7 @@
 
   
 
-  
+  
 
   
 
@@ -600,7 +600,7 @@
 
   
 
-  
+  
 
   
 
@@ -613,27 +613,27 @@
   
 
 
-  
+  
 
   
   
 
-  
+  
 
   
   
 
-  
+  
 
   
   
 
-  
+  
 
   
   
 
-  
+  
 
 
   
@@ -646,7 +646,7 @@
 
   
 
-  
+

ambari git commit: AMBARI-13393. Express Upgrade: UX changes for upgrade method selections window.(xiwang)

2015-10-13 Thread xiwang

Repository: ambari
Updated Branches:
  refs/heads/trunk b33ad0791 -> 92915952a


AMBARI-13393. Express Upgrade: UX changes for upgrade method selections 
window.(xiwang)


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

Branch: refs/heads/trunk
Commit: 92915952abe64e390b5ec348abc0768746b8be7b
Parents: b33ad07
Author: Xi Wang 
Authored: Fri Sep 18 15:09:03 2015 -0700
Committer: Xi Wang 
Committed: Tue Oct 13 18:10:12 2015 -0700

--
 .../main/admin/stack_and_upgrade_controller.js  | 282 ++-
 ambari-web/app/messages.js  |  17 +-
 ambari-web/app/routes/stack_upgrade_routes.js   |   2 +-
 ambari-web/app/styles/stack_versions.less   | 127 +
 .../stack_upgrade/stack_upgrade_wizard.hbs  |   3 +
 .../admin/stack_upgrade/upgrade_options.hbs |  49 
 ambari-web/app/utils/ajax/ajax.js   |  24 +-
 .../common/modal_popups/cluster_check_popup.js  |  55 
 .../admin/stack_and_upgrade_controller_test.js  |  64 -
 9 files changed, 595 insertions(+), 28 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/92915952/ambari-web/app/controllers/main/admin/stack_and_upgrade_controller.js
--
diff --git 
a/ambari-web/app/controllers/main/admin/stack_and_upgrade_controller.js 
b/ambari-web/app/controllers/main/admin/stack_and_upgrade_controller.js
index 880976f..8998055 100644
--- a/ambari-web/app/controllers/main/admin/stack_and_upgrade_controller.js
+++ b/ambari-web/app/controllers/main/admin/stack_and_upgrade_controller.js
@@ -46,6 +46,18 @@ App.MainAdminStackAndUpgradeController = 
Em.Controller.extend(App.LocalStorage,
   upgradeVersion: null,
 
   /**
+   * @type {string}
+   * @default null
+   */
+  upgradeTypeDisplayName: null,
+
+  /**
+   * @type {object}
+   * @default null
+   */
+  failuresTolerance: null,
+
+  /**
* @type {boolean}
* @default false
*/
@@ -65,6 +77,30 @@ App.MainAdminStackAndUpgradeController = 
Em.Controller.extend(App.LocalStorage,
   targetVersions: [],
 
   /**
+   * methods through which cluster could be upgraded, "allowed" indicated if 
the method is allowed
+   * by stack upgrade path
+   * @type {Array}
+   */
+  upgradeMethods: [
+Em.Object.create({
+  displayName: 
Em.I18n.t('admin.stackVersions.version.upgrade.upgradeOptions.RU.title'),
+  type: 'ROLLING',
+  icon: "icon-dashboard",
+  description: 
Em.I18n.t('admin.stackVersions.version.upgrade.upgradeOptions.RU.description'),
+  selected: false,
+  allowed: true
+}),
+Em.Object.create({
+  displayName: 
Em.I18n.t('admin.stackVersions.version.upgrade.upgradeOptions.EU.title'),
+  type: 'NON-ROLLING',
+  icon: "icon-bolt",
+  description: 
Em.I18n.t('admin.stackVersions.version.upgrade.upgradeOptions.EU.description'),
+  selected: false,
+  allowed: true
+})
+  ],
+
+  /**
* @type {boolean} true if some request that should disable actions is in 
progress
*/
   requestInProgress: false,
@@ -75,7 +111,7 @@ App.MainAdminStackAndUpgradeController = 
Em.Controller.extend(App.LocalStorage,
   /**
* properties that stored to localStorage to resume wizard progress
*/
-  wizardStorageProperties: ['upgradeId', 'upgradeVersion', 'currentVersion', 
'isDowngrade', 'isSuspended'],
+  wizardStorageProperties: ['upgradeId', 'upgradeVersion', 'currentVersion', 
'upgradeTypeDisplayName', 'failuresTolerance', 'isDowngrade', 'isSuspended'],
 
   /**
* mutable properties of Upgrade Task
@@ -472,11 +508,23 @@ App.MainAdminStackAndUpgradeController = 
Em.Controller.extend(App.LocalStorage,
 this.set('upgradeId', data.resources[0].Upgrade.request_id);
 this.set('upgradeVersion', params.label);
 this.set('isDowngrade', !!params.isDowngrade);
+var upgradeMethod = this.get('upgradeMethods').findProperty('type', 
params.type);
+var upgradeTypeDisplayName  = upgradeMethod ? 
upgradeMethod.get('displayName') : null;
+this.set('upgradeTypeDisplayName', upgradeTypeDisplayName);
+this.set('failuresTolerance', Em.Object.create({
+  skipComponentFailures: params.skipComponentFailures,
+  skipSCFailures: params.skipSCFailures
+}));
 this.setDBProperties({
   upgradeVersion: params.label,
   upgradeId: data.resources[0].Upgrade.request_id,
   upgradeState: 'PENDING',
-  isDowngrade: !!params.isDowngrade
+  isDowngrade: !!params.isDowngrade,
+  upgradeTypeDisplayName: upgradeTypeDisplayName,
+  failuresTolerance: Em.Object.create({
+skipComponentFailures:

ambari git commit: AMBARI-13393. Express Upgrade: UX changes for upgrade method selections window.(xiwang)

2015-10-13 Thread xiwang

Repository: ambari
Updated Branches:
  refs/heads/branch-2.1 154c98b2c -> c04518272


AMBARI-13393. Express Upgrade: UX changes for upgrade method selections 
window.(xiwang)


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

Branch: refs/heads/branch-2.1
Commit: c045182729f0b418b1ba55c1d92ceeb85338f8e6
Parents: 154c98b
Author: Xi Wang 
Authored: Fri Sep 18 15:09:03 2015 -0700
Committer: Xi Wang 
Committed: Tue Oct 13 18:23:31 2015 -0700

--
 .../main/admin/stack_and_upgrade_controller.js  | 282 ++-
 ambari-web/app/messages.js  |  17 +-
 ambari-web/app/routes/stack_upgrade_routes.js   |   2 +-
 ambari-web/app/styles/stack_versions.less   | 127 +
 .../stack_upgrade/stack_upgrade_wizard.hbs  |   3 +
 .../admin/stack_upgrade/upgrade_options.hbs |  49 
 ambari-web/app/utils/ajax/ajax.js   |  24 +-
 .../common/modal_popups/cluster_check_popup.js  |  55 
 .../admin/stack_and_upgrade_controller_test.js  |  64 -
 9 files changed, 595 insertions(+), 28 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/c0451827/ambari-web/app/controllers/main/admin/stack_and_upgrade_controller.js
--
diff --git 
a/ambari-web/app/controllers/main/admin/stack_and_upgrade_controller.js 
b/ambari-web/app/controllers/main/admin/stack_and_upgrade_controller.js
index 880976f..8998055 100644
--- a/ambari-web/app/controllers/main/admin/stack_and_upgrade_controller.js
+++ b/ambari-web/app/controllers/main/admin/stack_and_upgrade_controller.js
@@ -46,6 +46,18 @@ App.MainAdminStackAndUpgradeController = 
Em.Controller.extend(App.LocalStorage,
   upgradeVersion: null,
 
   /**
+   * @type {string}
+   * @default null
+   */
+  upgradeTypeDisplayName: null,
+
+  /**
+   * @type {object}
+   * @default null
+   */
+  failuresTolerance: null,
+
+  /**
* @type {boolean}
* @default false
*/
@@ -65,6 +77,30 @@ App.MainAdminStackAndUpgradeController = 
Em.Controller.extend(App.LocalStorage,
   targetVersions: [],
 
   /**
+   * methods through which cluster could be upgraded, "allowed" indicated if 
the method is allowed
+   * by stack upgrade path
+   * @type {Array}
+   */
+  upgradeMethods: [
+Em.Object.create({
+  displayName: 
Em.I18n.t('admin.stackVersions.version.upgrade.upgradeOptions.RU.title'),
+  type: 'ROLLING',
+  icon: "icon-dashboard",
+  description: 
Em.I18n.t('admin.stackVersions.version.upgrade.upgradeOptions.RU.description'),
+  selected: false,
+  allowed: true
+}),
+Em.Object.create({
+  displayName: 
Em.I18n.t('admin.stackVersions.version.upgrade.upgradeOptions.EU.title'),
+  type: 'NON-ROLLING',
+  icon: "icon-bolt",
+  description: 
Em.I18n.t('admin.stackVersions.version.upgrade.upgradeOptions.EU.description'),
+  selected: false,
+  allowed: true
+})
+  ],
+
+  /**
* @type {boolean} true if some request that should disable actions is in 
progress
*/
   requestInProgress: false,
@@ -75,7 +111,7 @@ App.MainAdminStackAndUpgradeController = 
Em.Controller.extend(App.LocalStorage,
   /**
* properties that stored to localStorage to resume wizard progress
*/
-  wizardStorageProperties: ['upgradeId', 'upgradeVersion', 'currentVersion', 
'isDowngrade', 'isSuspended'],
+  wizardStorageProperties: ['upgradeId', 'upgradeVersion', 'currentVersion', 
'upgradeTypeDisplayName', 'failuresTolerance', 'isDowngrade', 'isSuspended'],
 
   /**
* mutable properties of Upgrade Task
@@ -472,11 +508,23 @@ App.MainAdminStackAndUpgradeController = 
Em.Controller.extend(App.LocalStorage,
 this.set('upgradeId', data.resources[0].Upgrade.request_id);
 this.set('upgradeVersion', params.label);
 this.set('isDowngrade', !!params.isDowngrade);
+var upgradeMethod = this.get('upgradeMethods').findProperty('type', 
params.type);
+var upgradeTypeDisplayName  = upgradeMethod ? 
upgradeMethod.get('displayName') : null;
+this.set('upgradeTypeDisplayName', upgradeTypeDisplayName);
+this.set('failuresTolerance', Em.Object.create({
+  skipComponentFailures: params.skipComponentFailures,
+  skipSCFailures: params.skipSCFailures
+}));
 this.setDBProperties({
   upgradeVersion: params.label,
   upgradeId: data.resources[0].Upgrade.request_id,
   upgradeState: 'PENDING',
-  isDowngrade: !!params.isDowngrade
+  isDowngrade: !!params.isDowngrade,
+  upgradeTypeDisplayName: upgradeTypeDisplayName,
+  failuresTolerance: Em.Object.create({
+skipComponentFailures:

ambari git commit: AMBARI-13417. Add Ranger Audit tab to Ranger Smart config. (jaimin)

ambari git commit: AMBARI-13351. Security-related HTTP headers should be set separately for Ambari Views then for Ambari server UI (rlevas)

ambari git commit: AMBARI-13417. Add Ranger Audit tab to Ranger Smart config. (jaimin)

ambari git commit: AMBARI-13351. Security-related HTTP headers should be set separately for Ambari Views then for Ambari server UI (rlevas)

ambari git commit: AMBARI-13345. Views: HDFS API utility needs to work with WASB (Gaurav Nagar via smohanty)

ambari git commit: AMBARI-13345. Views: HDFS API utility needs to work with WASB (Gaurav Nagar via smohanty)

ambari git commit: AMBARI-13345. Views: HDFS API utility needs to work with WASB (Gaurav Nagar via smohanty)

ambari git commit: AMBARI-13400 ambari does not redirect the user to the tez ui if log in is required. (atkach)

ambari git commit: AMBARI-13390 Unable to set user value for kafka-broker/kafka.metrics.reporters (dsen)

ambari git commit: AMBARI-13388. Update hbase-env config without removing custom changes.(vbrodetskyi)

ambari git commit: AMBARI-13325. Ambari-server upgrade and RU update hbase bucket cache setting incorrectly.(vbrodetskyi)

ambari git commit: AMBARI-13388. Update hbase-env config without removing custom changes.(vbrodetskyi)

ambari git commit: AMBARI-13399. Fix UpgradeCatalog213 tests.(vbrodetskyi)

ambari git commit: AMBARI-13254 Components filter works incorrectly on Hosts page. (atkach)

[2/2] ambari git commit: AMBARI-13403. Ambari unable to build rpms with 4 digit versions (aonishuk)

[1/2] ambari git commit: AMBARI-13403. Ambari unable to build rpms with 4 digit versions (aonishuk)

ambari git commit: AMBARI-13371 Unable to add Nimbus components when HDFS or YARN is HA enabled. (atkach)

ambari git commit: AMBARI-13391 Long API query should be made part of request body. (atkach)

ambari git commit: AMBARI-13354. Ambari is not able to run Oozie Server which configured with different username than oozie (dlysnichenko)

ambari git commit: AMBARI-13403. Ambari unable to build rpms with 4 digit versions (aonishuk)

ambari git commit: AMBARI-13403. Ambari unable to build rpms with 4 digit versions (aonishuk)

ambari git commit: AMBARI-13330. [Hive View] UI issue with Hive View in old Firefox browser (Pallav Kulshreshtha via srimanth)

ambari git commit: AMBARI-13281. Hive View [Visualization] Enhancements (Pallav Kulshreshtha via srimanth)

ambari git commit: AMBARI-13281. Hive View [Visualization] Enhancements (Pallav Kulshreshtha via srimanth)

ambari git commit: AMBARI-13330. [Hive View] UI issue with Hive View in old Firefox browser (Pallav Kulshreshtha via srimanth)

ambari git commit: AMBARI-13410. Ambari-metrics-common rpm doesn't contain build number (aonishuk)

ambari git commit: AMBARI-13410. Ambari-metrics-common rpm doesn't contain build number (aonishuk)

ambari git commit: AMBARI-13410. Ambari-metrics-common rpm doesn't contain build number (aonishuk)

[2/2] ambari git commit: AMBARI-13327. Agents to automatically communicate with Active Server (Nahappan Somasundaram via smohanty)

[1/2] ambari git commit: AMBARI-13328. Enable skipSurefireTests for ambari-metrics project (Nahappan Somasundaram via smohanty)

ambari git commit: AMBARI-13406 - Rolling Upgrade: Internal Server Error Due To XML Binding Tasks To Groupings (jonathanhurley)

ambari git commit: AMBARI-13393. Express Upgrade: UX changes for upgrade method selections window.(xiwang)

ambari git commit: AMBARI-13393. Express Upgrade: UX changes for upgrade method selections window.(xiwang)

33 matches

Site Navigation

Mail list logo

Footer information