[1/2] ambari git commit: AMBARI-12963. Exceptions in ambari-server.log after ambari-server reset. (mpapirkovskyy)

[mpapirkovskyy]

Repository: ambari
Updated Branches:
  refs/heads/branch-2.1 7bcbab3d2 -> 7a4ca7eb9
  refs/heads/trunk 7680d7e74 -> c85f044ff


AMBARI-12963. Exceptions in ambari-server.log after ambari-server reset. 
(mpapirkovskyy)


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

Branch: refs/heads/trunk
Commit: c85f044ff2b2c7f8d13f727f91e230952d96ab17
Parents: 7680d7e
Author: Myroslav Papirkovskyy 
Authored: Tue Sep 1 21:32:10 2015 +0300
Committer: Myroslav Papirkovskyy 
Committed: Tue Sep 1 21:32:10 2015 +0300

--
 .../events/listeners/alerts/AlertReceivedListener.java  | 9 +++--
 1 file changed, 7 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/c85f044f/ambari-server/src/main/java/org/apache/ambari/server/events/listeners/alerts/AlertReceivedListener.java
--
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/events/listeners/alerts/AlertReceivedListener.java
 
b/ambari-server/src/main/java/org/apache/ambari/server/events/listeners/alerts/AlertReceivedListener.java
index b4d4302..e59f63e 100644
--- 
a/ambari-server/src/main/java/org/apache/ambari/server/events/listeners/alerts/AlertReceivedListener.java
+++ 
b/ambari-server/src/main/java/org/apache/ambari/server/events/listeners/alerts/AlertReceivedListener.java
@@ -322,8 +322,13 @@ public class AlertReceivedListener {
 return false;
   }
 } catch (AmbariException ambariException) {
-  LOG.error("Unable to process alert {} for an invalid cluster named {}",
-  alert.getName(), clusterName, ambariException);
+  if (LOG.isDebugEnabled()) {
+LOG.debug("Unable to process alert {} for an invalid cluster named {}",
+alert.getName(), clusterName, ambariException);
+  } else {
+LOG.error("Unable to process alert {} for an invalid cluster named {}",
+alert.getName(), clusterName);
+  }
 
   return false;
 }

[2/2] ambari git commit: AMBARI-12963. Exceptions in ambari-server.log after ambari-server reset. (mpapirkovskyy)

[mpapirkovskyy]

AMBARI-12963. Exceptions in ambari-server.log after ambari-server reset. 
(mpapirkovskyy)


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

Branch: refs/heads/branch-2.1
Commit: 7a4ca7eb9ab7e09bc6bdfc429e1dab16aee1e73e
Parents: 7bcbab3
Author: Myroslav Papirkovskyy 
Authored: Tue Sep 1 21:32:10 2015 +0300
Committer: Myroslav Papirkovskyy 
Committed: Tue Sep 1 21:34:47 2015 +0300

--
 .../events/listeners/alerts/AlertReceivedListener.java  | 9 +++--
 1 file changed, 7 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/7a4ca7eb/ambari-server/src/main/java/org/apache/ambari/server/events/listeners/alerts/AlertReceivedListener.java
--
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/events/listeners/alerts/AlertReceivedListener.java
 
b/ambari-server/src/main/java/org/apache/ambari/server/events/listeners/alerts/AlertReceivedListener.java
index b4d4302..e59f63e 100644
--- 
a/ambari-server/src/main/java/org/apache/ambari/server/events/listeners/alerts/AlertReceivedListener.java
+++ 
b/ambari-server/src/main/java/org/apache/ambari/server/events/listeners/alerts/AlertReceivedListener.java
@@ -322,8 +322,13 @@ public class AlertReceivedListener {
 return false;
   }
 } catch (AmbariException ambariException) {
-  LOG.error("Unable to process alert {} for an invalid cluster named {}",
-  alert.getName(), clusterName, ambariException);
+  if (LOG.isDebugEnabled()) {
+LOG.debug("Unable to process alert {} for an invalid cluster named {}",
+alert.getName(), clusterName, ambariException);
+  } else {
+LOG.error("Unable to process alert {} for an invalid cluster named {}",
+alert.getName(), clusterName);
+  }
 
   return false;
 }

ambari git commit: AMBARI-12476. Widget response differs when using ambarisessionid and basic auth.

[swagle]

Repository: ambari
Updated Branches:
  refs/heads/trunk 5cdf4e911 -> 25b0f3ea2


AMBARI-12476. Widget response differs when using ambarisessionid and basic auth.


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

Branch: refs/heads/trunk
Commit: 25b0f3ea2d36ead842990dc73de28155f708d233
Parents: 5cdf4e9
Author: Siddharth Wagle 
Authored: Tue Sep 1 17:07:33 2015 -0700
Committer: Siddharth Wagle 
Committed: Tue Sep 1 17:07:33 2015 -0700

--
 .../api/services/WidgetLayoutService.java   | 32 ++--
 1 file changed, 9 insertions(+), 23 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/25b0f3ea/ambari-server/src/main/java/org/apache/ambari/server/api/services/WidgetLayoutService.java
--
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/api/services/WidgetLayoutService.java
 
b/ambari-server/src/main/java/org/apache/ambari/server/api/services/WidgetLayoutService.java
index fad83cb..3902236 100644
--- 
a/ambari-server/src/main/java/org/apache/ambari/server/api/services/WidgetLayoutService.java
+++ 
b/ambari-server/src/main/java/org/apache/ambari/server/api/services/WidgetLayoutService.java
@@ -49,7 +49,7 @@ public class WidgetLayoutService extends BaseService {
  @PathParam("widgetLayoutId") String 
widgetLayoutId) {
 
 return handleRequest(headers, body, ui, Request.Type.GET,
-createResource(getUserName(headers), widgetLayoutId));
+createResource(widgetLayoutId));
   }
 
   /**
@@ -64,9 +64,9 @@ public class WidgetLayoutService extends BaseService {
   @GET
   @Produces("text/plain")
   public Response getServices(String body, @Context HttpHeaders headers, 
@Context UriInfo ui) {
-
+System.out.println("###");
 return handleRequest(headers, body, ui, Request.Type.GET,
-createResource(getUserName(headers), null));
+createResource(null));
   }
 
   @POST
@@ -75,7 +75,7 @@ public class WidgetLayoutService extends BaseService {
   public Response createService(String body, @Context HttpHeaders headers, 
@Context UriInfo ui,
 @PathParam("widgetLayoutId") String 
widgetLayoutId) {
 return handleRequest(headers, body, ui, Request.Type.POST,
-createResource(getUserName(headers), widgetLayoutId));
+createResource(widgetLayoutId));
   }
 
   @POST
@@ -83,7 +83,7 @@ public class WidgetLayoutService extends BaseService {
   public Response createServices(String body, @Context HttpHeaders headers, 
@Context UriInfo ui) {
 
 return handleRequest(headers, body, ui, Request.Type.POST,
-createResource(getUserName(headers), null));
+createResource(null));
   }
 
   @PUT
@@ -92,14 +92,14 @@ public class WidgetLayoutService extends BaseService {
   public Response updateService(String body, @Context HttpHeaders headers, 
@Context UriInfo ui,
 @PathParam("widgetLayoutId") String 
widgetLayoutId) {
 
-return handleRequest(headers, body, ui, Request.Type.PUT, 
createResource(getUserName(headers), widgetLayoutId));
+return handleRequest(headers, body, ui, Request.Type.PUT, 
createResource(widgetLayoutId));
   }
 
   @PUT
   @Produces("text/plain")
   public Response updateServices(String body, @Context HttpHeaders headers, 
@Context UriInfo ui) {
 
-return handleRequest(headers, body, ui, Request.Type.PUT, 
createResource(getUserName(headers), null));
+return handleRequest(headers, body, ui, Request.Type.PUT, 
createResource(null));
   }
 
   @DELETE
@@ -108,27 +108,13 @@ public class WidgetLayoutService extends BaseService {
   public Response deleteService(@Context HttpHeaders headers, @Context UriInfo 
ui,
 @PathParam("widgetLayoutId") String 
widgetLayoutId) {
 
-return handleRequest(headers, null, ui, Request.Type.DELETE, 
createResource(getUserName(headers), widgetLayoutId));
+return handleRequest(headers, null, ui, Request.Type.DELETE, 
createResource(widgetLayoutId));
   }
 
-  private ResourceInstance createResource(String userName, String 
widgetLayoutId) {
+  private ResourceInstance createResource(String widgetLayoutId) {
 Map mapIds = new HashMap();
-mapIds.put(Resource.Type.User, userName);
 mapIds.put(Resource.Type.WidgetLayout, widgetLayoutId);
 mapIds.put(Resource.Type.Cluster, clusterName);
 return createResource(Resource.Type.WidgetLayout, mapIds);
   }
-
-  private String 

ambari git commit: AMBARI-12965. Selection of SQLA should warn user that it is supported only for HDP-2.3.2 and beyond. (jaimin)

[jaimin]

Repository: ambari
Updated Branches:
  refs/heads/branch-2.1 5cbfb2a63 -> 30072598b


AMBARI-12965. Selection of SQLA should warn user that it is supported only for 
HDP-2.3.2 and beyond. (jaimin)


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

Branch: refs/heads/branch-2.1
Commit: 30072598bbe4d256d53ac61248125ae18f62cc6c
Parents: 5cbfb2a
Author: Jaimin Jetly 
Authored: Tue Sep 1 17:50:26 2015 -0700
Committer: Jaimin Jetly 
Committed: Tue Sep 1 17:51:18 2015 -0700

--
 ambari-web/app/messages.js   |  2 +-
 ambari-web/app/views/common/controls_view.js | 13 -
 2 files changed, 13 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/30072598/ambari-web/app/messages.js
--
diff --git a/ambari-web/app/messages.js b/ambari-web/app/messages.js
index 9b81c66..35f72c7 100644
--- a/ambari-web/app/messages.js
+++ b/ambari-web/app/messages.js
@@ -1805,7 +1805,7 @@ Em.I18n.translations = {
   'services.service.config.database.msg.jdbcSetup': 'Be sure you have 
run:' +
 'ambari-server setup --jdbc-db={0} --jdbc-driver=/path/to/{0}/{1} ' 
+
 'on the Ambari Server host to make the JDBC driver available and to enable 
testing the database connection.',
-
+  'stack.specific.sqla.support.msg': 'Please note that SQLA database option 
is only supported on HDP-2.3.2 or higher.',
   'services.service.config.configHistory.configGroup': 'Config Group',
   'services.service.config.configHistory.configGroup.name': 'Config Group 
Name',
   'services.service.config.configHistory.rightArrow.tooltip': 'Show earlier 
versions',

http://git-wip-us.apache.org/repos/asf/ambari/blob/30072598/ambari-web/app/views/common/controls_view.js
--
diff --git a/ambari-web/app/views/common/controls_view.js 
b/ambari-web/app/views/common/controls_view.js
index 76171b3..ac2fa9a 100644
--- a/ambari-web/app/views/common/controls_view.js
+++ b/ambari-web/app/views/common/controls_view.js
@@ -690,7 +690,18 @@ App.ServiceConfigRadioButtons = 
Ember.View.extend(App.ServiceConfigCalculateId,
   additionalView1 = shouldAdditionalViewsBeSet ? 
App.CheckDBConnectionView.extend({databaseName: dbType}) : null,
   additionalView2 = shouldAdditionalViewsBeSet ? Ember.View.extend({
 template: Ember.Handlebars.compile('{{{view.message}}}'),
-message: 
Em.I18n.t('services.service.config.database.msg.jdbcSetup').format(dbType, 
driver)
+message: function() {
+  var message;
+  var jdbcDriverSetupMsg = 
Em.I18n.t('services.service.config.database.msg.jdbcSetup').format(dbType, 
driver);
+  var isWizardPage =  ['addServiceController', 
'installerController'].contains(this.get('controller.wizardController.name'));
+  if (currentDBType === 'SQLA' && isWizardPage) {
+var sqlaDbSupportMsg = 
Em.I18n.t('stack.specific.sqla.support.msg');
+message = sqlaDbSupportMsg + jdbcDriverSetupMsg;
+  } else {
+message = jdbcDriverSetupMsg;
+  }
+  return message;
+}.property()
   }) : null;
 if (propertyAppendTo1) {
   Em.run.next(function () {

ambari git commit: AMBARI-12965. Selection of SQLA should warn user that it is supported only for HDP-2.3.2 and beyond. (jaimin)

[jaimin]

Repository: ambari
Updated Branches:
  refs/heads/trunk 25b0f3ea2 -> 205e45d53


AMBARI-12965. Selection of SQLA should warn user that it is supported only for 
HDP-2.3.2 and beyond. (jaimin)


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

Branch: refs/heads/trunk
Commit: 205e45d53f9baf79848fb6bf9a3d20136657a65f
Parents: 25b0f3e
Author: Jaimin Jetly 
Authored: Tue Sep 1 17:50:26 2015 -0700
Committer: Jaimin Jetly 
Committed: Tue Sep 1 17:51:50 2015 -0700

--
 ambari-web/app/messages.js   |  2 +-
 ambari-web/app/views/common/controls_view.js | 13 -
 2 files changed, 13 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/205e45d5/ambari-web/app/messages.js
--
diff --git a/ambari-web/app/messages.js b/ambari-web/app/messages.js
index f661fb9..bb42389 100644
--- a/ambari-web/app/messages.js
+++ b/ambari-web/app/messages.js
@@ -1779,7 +1779,7 @@ Em.I18n.translations = {
   'services.service.config.database.msg.jdbcSetup': 'Be sure you have 
run:' +
 'ambari-server setup --jdbc-db={0} --jdbc-driver=/path/to/{0}/{1} ' 
+
 'on the Ambari Server host to make the JDBC driver available and to enable 
testing the database connection.',
-
+  'stack.specific.sqla.support.msg': 'Please note that SQLA database option 
is only supported on HDP-2.3.2 or higher.',
   'services.service.config.configHistory.configGroup': 'Config Group',
   'services.service.config.configHistory.configGroup.name': 'Config Group 
Name',
   'services.service.config.configHistory.rightArrow.tooltip': 'Show earlier 
versions',

http://git-wip-us.apache.org/repos/asf/ambari/blob/205e45d5/ambari-web/app/views/common/controls_view.js
--
diff --git a/ambari-web/app/views/common/controls_view.js 
b/ambari-web/app/views/common/controls_view.js
index 4933a23..e052e31 100644
--- a/ambari-web/app/views/common/controls_view.js
+++ b/ambari-web/app/views/common/controls_view.js
@@ -691,7 +691,18 @@ App.ServiceConfigRadioButtons = 
Ember.View.extend(App.ServiceConfigCalculateId,
   additionalView1 = shouldAdditionalViewsBeSet ? 
App.CheckDBConnectionView.extend({databaseName: dbType}) : null,
   additionalView2 = shouldAdditionalViewsBeSet ? Ember.View.extend({
 template: Ember.Handlebars.compile('{{{view.message}}}'),
-message: 
Em.I18n.t('services.service.config.database.msg.jdbcSetup').format(dbType, 
driver)
+message: function() {
+  var message;
+  var jdbcDriverSetupMsg = 
Em.I18n.t('services.service.config.database.msg.jdbcSetup').format(dbType, 
driver);
+  var isWizardPage =  ['addServiceController', 
'installerController'].contains(this.get('controller.wizardController.name'));
+  if (currentDBType === 'SQLA' && isWizardPage) {
+var sqlaDbSupportMsg = 
Em.I18n.t('stack.specific.sqla.support.msg');
+message = sqlaDbSupportMsg + jdbcDriverSetupMsg;
+  } else {
+message = jdbcDriverSetupMsg;
+  }
+  return message;
+}.property()
   }) : null;
 if (propertyAppendTo1) {
   Em.run.next(function () {

ambari git commit: AMBARI-12476. Widget response differs when using ambarisessionid and basic auth.

[swagle]

Repository: ambari
Updated Branches:
  refs/heads/branch-2.1 2acaf832d -> 5cbfb2a63


AMBARI-12476. Widget response differs when using ambarisessionid and basic auth.


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

Branch: refs/heads/branch-2.1
Commit: 5cbfb2a6318d96dd1facb4ec081c9a35134a260e
Parents: 2acaf83
Author: Siddharth Wagle 
Authored: Tue Sep 1 17:03:44 2015 -0700
Committer: Siddharth Wagle 
Committed: Tue Sep 1 17:04:19 2015 -0700

--
 .../api/services/WidgetLayoutService.java   | 31 +++
 .../server/api/services/WidgetService.java  | 30 ---
 .../internal/WidgetResourceProvider.java| 10 +++-
 .../apache/ambari/server/orm/dao/WidgetDAO.java | 10 
 .../server/orm/entities/WidgetEntity.java   |  4 ++
 .../internal/WidgetResourceProviderTest.java| 57 +---
 6 files changed, 90 insertions(+), 52 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/5cbfb2a6/ambari-server/src/main/java/org/apache/ambari/server/api/services/WidgetLayoutService.java
--
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/api/services/WidgetLayoutService.java
 
b/ambari-server/src/main/java/org/apache/ambari/server/api/services/WidgetLayoutService.java
index fad83cb..7571396 100644
--- 
a/ambari-server/src/main/java/org/apache/ambari/server/api/services/WidgetLayoutService.java
+++ 
b/ambari-server/src/main/java/org/apache/ambari/server/api/services/WidgetLayoutService.java
@@ -49,7 +49,7 @@ public class WidgetLayoutService extends BaseService {
  @PathParam("widgetLayoutId") String 
widgetLayoutId) {
 
 return handleRequest(headers, body, ui, Request.Type.GET,
-createResource(getUserName(headers), widgetLayoutId));
+createResource(widgetLayoutId));
   }
 
   /**
@@ -64,9 +64,8 @@ public class WidgetLayoutService extends BaseService {
   @GET
   @Produces("text/plain")
   public Response getServices(String body, @Context HttpHeaders headers, 
@Context UriInfo ui) {
-
 return handleRequest(headers, body, ui, Request.Type.GET,
-createResource(getUserName(headers), null));
+createResource(null));
   }
 
   @POST
@@ -75,7 +74,7 @@ public class WidgetLayoutService extends BaseService {
   public Response createService(String body, @Context HttpHeaders headers, 
@Context UriInfo ui,
 @PathParam("widgetLayoutId") String 
widgetLayoutId) {
 return handleRequest(headers, body, ui, Request.Type.POST,
-createResource(getUserName(headers), widgetLayoutId));
+createResource(widgetLayoutId));
   }
 
   @POST
@@ -83,7 +82,7 @@ public class WidgetLayoutService extends BaseService {
   public Response createServices(String body, @Context HttpHeaders headers, 
@Context UriInfo ui) {
 
 return handleRequest(headers, body, ui, Request.Type.POST,
-createResource(getUserName(headers), null));
+createResource(null));
   }
 
   @PUT
@@ -92,14 +91,14 @@ public class WidgetLayoutService extends BaseService {
   public Response updateService(String body, @Context HttpHeaders headers, 
@Context UriInfo ui,
 @PathParam("widgetLayoutId") String 
widgetLayoutId) {
 
-return handleRequest(headers, body, ui, Request.Type.PUT, 
createResource(getUserName(headers), widgetLayoutId));
+return handleRequest(headers, body, ui, Request.Type.PUT, 
createResource(widgetLayoutId));
   }
 
   @PUT
   @Produces("text/plain")
   public Response updateServices(String body, @Context HttpHeaders headers, 
@Context UriInfo ui) {
 
-return handleRequest(headers, body, ui, Request.Type.PUT, 
createResource(getUserName(headers), null));
+return handleRequest(headers, body, ui, Request.Type.PUT, 
createResource(null));
   }
 
   @DELETE
@@ -108,27 +107,13 @@ public class WidgetLayoutService extends BaseService {
   public Response deleteService(@Context HttpHeaders headers, @Context UriInfo 
ui,
 @PathParam("widgetLayoutId") String 
widgetLayoutId) {
 
-return handleRequest(headers, null, ui, Request.Type.DELETE, 
createResource(getUserName(headers), widgetLayoutId));
+return handleRequest(headers, null, ui, Request.Type.DELETE, 
createResource(widgetLayoutId));
   }
 
-  private ResourceInstance createResource(String userName, String 
widgetLayoutId) {
+  private ResourceInstance createResource(String widgetLayoutId) {
 Map mapIds = new 

ambari git commit: AMBARI-12951. Prompt user to save checkpoint before shutdown if last checkpoint is too old. (xiwang via yusaku)

[yusaku]

Repository: ambari
Updated Branches:
  refs/heads/branch-2.1 7a4ca7eb9 -> 2acaf832d


AMBARI-12951. Prompt user to save checkpoint before shutdown if last checkpoint 
is too old. (xiwang via yusaku)


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

Branch: refs/heads/branch-2.1
Commit: 2acaf832dcbb156277bdb043c9f4d611f5d5e79e
Parents: 7a4ca7e
Author: Yusaku Sako 
Authored: Tue Sep 1 15:52:26 2015 -0700
Committer: Yusaku Sako 
Committed: Tue Sep 1 15:53:21 2015 -0700

--
 ambari-web/app/controllers/main/host.js |  87 ++---
 ambari-web/app/controllers/main/host/details.js | 130 +--
 ambari-web/app/controllers/main/service.js  |  14 +-
 .../controllers/main/service/info/configs.js|  27 +++-
 ambari-web/app/controllers/main/service/item.js | 119 -
 ambari-web/app/messages.js  |  10 ++
 ambari-web/app/utils/ajax/ajax.js   |  10 ++
 .../app/views/main/service/info/summary.js  |  27 +++-
 .../test/controllers/main/service/item_test.js  |  20 ++-
 9 files changed, 395 insertions(+), 49 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/2acaf832/ambari-web/app/controllers/main/host.js
--
diff --git a/ambari-web/app/controllers/main/host.js 
b/ambari-web/app/controllers/main/host.js
index 8bf9065..4a0a418 100644
--- a/ambari-web/app/controllers/main/host.js
+++ b/ambari-web/app/controllers/main/host.js
@@ -606,33 +606,76 @@ App.MainHostController = 
Em.ArrayController.extend(App.TableServerMixin, {
   });
 });
 
+var nn_hosts = [];
 for (var hostName in hostsMap) {
   var subQuery = '(HostRoles/component_name.in(%@)/host_name=' + 
hostName + ')';
   var components = hostsMap[hostName];
 
   if (components.length) {
+if (components.indexOf('NAMENODE') >= 0) {
+  nn_hosts.push(hostName);
+}
 query.push(subQuery.fmt(components.join(',')));
   }
   hostNames.push(hostName);
 }
 hostNames = hostNames.join(",");
-
 if (query.length) {
   query = query.join('|');
-  App.ajax.send({
-name: 'common.host_components.update',
-sender: this,
-data: {
-  query: query,
-  HostRoles: {
-state: operationData.action
+  var self = this;
+  // if NameNode included, check HDFS NameNode checkpoint before stop NN
+  if (nn_hosts.length == 1 && operationData.action === 'INSTALLED' && 
App.Service.find().filterProperty('serviceName', 
'HDFS').someProperty('workStatus', App.HostComponentStatus.started)) {
+var hostName = nn_hosts[0];
+
App.router.get('mainHostDetailsController').checkNnLastCheckpointTime(function 
() {
+  App.ajax.send({
+name: 'common.host_components.update',
+sender: self,
+data: {
+  query: query,
+  HostRoles: {
+state: operationData.action
+  },
+  context: operationData.message,
+  hostName: hostNames,
+  noOpsMessage: 
Em.I18n.t('hosts.host.maintainance.allComponents.context')
+},
+success: 'bulkOperationForHostComponentsSuccessCallback'
+  });
+}, hostName);
+  } else if (nn_hosts.length == 2 && operationData.action === 'INSTALLED' 
&& App.Service.find().filterProperty('serviceName', 
'HDFS').someProperty('workStatus', App.HostComponentStatus.started)) {
+// HA enabled
+
App.router.get('mainServiceItemController').checkNnLastCheckpointTime(function 
() {
+  App.ajax.send({
+name: 'common.host_components.update',
+sender: self,
+data: {
+  query: query,
+  HostRoles: {
+state: operationData.action
+  },
+  context: operationData.message,
+  hostName: hostNames,
+  noOpsMessage: 
Em.I18n.t('hosts.host.maintainance.allComponents.context')
+},
+success: 'bulkOperationForHostComponentsSuccessCallback'
+  });
+});
+  } else {
+App.ajax.send({
+  name: 'common.host_components.update',
+  sender: self,
+  data: {
+query: query,
+HostRoles: {
+  state: operationData.action
+},
+context: operationData.message,
+hostName: hostNames,
+noOpsMessage: 
Em.I18n.t('hosts.host.maintainance.allComponents.context')
   },
- 

ambari git commit: AMBARI-12954. upgradeHelper need to support Ambari 1.6.1 (backup functionality).(vbrodetskyi)

[vbrodetskyi]

Repository: ambari
Updated Branches:
  refs/heads/trunk d81c7de31 -> de21b29c2


AMBARI-12954. upgradeHelper need to support Ambari 1.6.1 (backup 
functionality).(vbrodetskyi)


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

Branch: refs/heads/trunk
Commit: de21b29c2e76d11a7e07561686e7e05235e76a2f
Parents: d81c7de
Author: Vitaly Brodetskyi 
Authored: Tue Sep 1 12:42:09 2015 +0300
Committer: Vitaly Brodetskyi 
Committed: Tue Sep 1 12:42:09 2015 +0300

--
 ambari-server/src/main/python/upgradeHelper.py | 79 -
 1 file changed, 62 insertions(+), 17 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/de21b29c/ambari-server/src/main/python/upgradeHelper.py
--
diff --git a/ambari-server/src/main/python/upgradeHelper.py 
b/ambari-server/src/main/python/upgradeHelper.py
index 5a24b6f..4189b95 100644
--- a/ambari-server/src/main/python/upgradeHelper.py
+++ b/ambari-server/src/main/python/upgradeHelper.py
@@ -225,6 +225,8 @@ class Options(Const):
   """:type : ServerConfigFactory"""
   stack_advisor = None
   """:type : StackAdvisor"""
+  ambari_server = None
+  """:type : AmbariServer"""
 
   # Api constants
   ROOT_URL = None
@@ -234,6 +236,7 @@ class Options(Const):
 
   # Curl options
   CURL_PRINT_ONLY = None
+  CURL_WRITE_ONLY = None
 
   ARGS = None
   OPTIONS = None
@@ -269,6 +272,16 @@ class Options(Const):
   cls.SERVICES = set(map(lambda x: x.upper(), get_cluster_services()))
 
 cls.ambari_server = AmbariServer()
+if not cls.isPropertyAttributesSupported():
+  cls.logger.warning("Property attributes not supported by current Ambari 
version")
+
+  @classmethod
+  def isPropertyAttributesSupported(cls):
+if cls.ambari_server.server_version[0] * 10 + 
cls.ambari_server.server_version[1] >= 17:
+  return True
+return False
+
+
 
   @classmethod
   def initialize_logger(cls, filename=None):
@@ -1203,7 +1216,7 @@ def delete_mr():
 def get_cluster_stackname():
   VERSION_URL_FORMAT = Options.CLUSTER_URL + '?fields=Clusters/version'
 
-  structured_resp = curl(VERSION_URL_FORMAT, simulate=False, validate=True, 
parse=True)
+  structured_resp = curl(VERSION_URL_FORMAT, validate=True, parse=True)
 
   if 'Clusters' in structured_resp:
 if 'version' in structured_resp['Clusters']:
@@ -1218,7 +1231,7 @@ def has_component_in_stack_def(stack_name, service_name, 
component_name):
 
   try:
 curl(STACK_COMPONENT_URL_FORMAT.format(stack, stack_version, service_name, 
component_name),
- validate=True, simulate=False)
+ validate=True)
 return True
   except FatalException:
 return False
@@ -1271,11 +1284,24 @@ def update_config(properties, config_type, 
attributes=None):
   curl(Options.CLUSTER_URL, request_type="PUT", data=properties_payload, 
validate=True, soft_validation=True)
 
 
+def build_all_options(desired_configs):
+  """
+  Get all configs in the old-fashion way ( versions below 1.7.0 doesn't 
support "properties" filter )
+  """
+  config_url_tpl = Options.CLUSTER_URL + "/configurations?type={0}={1}"
+  all_options = {CatConst.ITEMS_TAG: []}
+  for config in desired_configs:
+cfg_item = curl(config_url_tpl.format(config, 
desired_configs[config]["tag"]), parse=True, validate=True)
+if CatConst.ITEMS_TAG in cfg_item and len(cfg_item[CatConst.ITEMS_TAG]) == 
1:
+  all_options[CatConst.ITEMS_TAG].append(cfg_item[CatConst.ITEMS_TAG][0])
+
+  return all_options
+
+
 def get_config_resp_all():
   desired_configs = {}
-  config_all_properties_url = Options.CLUSTER_URL + 
"/configurations?fields=properties,properties_attributes"
-  desired_configs_resp = curl(Options.CLUSTER_URL + 
"?fields=Clusters/desired_configs", validate=True, parse=True, simulate=False)
-  all_options = curl(config_all_properties_url, validate=True, parse=True, 
simulate=False)
+  config_all_properties_url = Options.CLUSTER_URL + 
"/configurations?fields=properties"
+  desired_configs_resp = curl(Options.CLUSTER_URL + 
"?fields=Clusters/desired_configs", validate=True, parse=True)
 
   if 'Clusters' in desired_configs_resp:
 if 'desired_configs' in desired_configs_resp['Clusters']:
@@ -1285,6 +1311,12 @@ def get_config_resp_all():
   else:
 return None
 
+  if Options.isPropertyAttributesSupported():
+config_all_properties_url += ",properties_attributes"
+all_options = curl(config_all_properties_url, validate=True, parse=True)
+  else:
+all_options = build_all_options(desired_configs_resp)
+
   if CatConst.ITEMS_TAG in all_options:
 all_options = 

ambari git commit: AMBARI-12947. Change dependency for datanucleus.rdbms.datastoreAdapterClassName from jdbc class name to jdbc name.(vbrodetskyi)

[vbrodetskyi]

Repository: ambari
Updated Branches:
  refs/heads/branch-2.1 818deedec -> 9a7d9b94a


AMBARI-12947. Change dependency for datanucleus.rdbms.datastoreAdapterClassName 
from jdbc class name to jdbc name.(vbrodetskyi)


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

Branch: refs/heads/branch-2.1
Commit: 9a7d9b94a6e4c1ede59d1d00df3e2660f722af8e
Parents: 818deed
Author: Vitaly Brodetskyi 
Authored: Tue Sep 1 12:01:53 2015 +0300
Committer: Vitaly Brodetskyi 
Committed: Tue Sep 1 12:01:53 2015 +0300

--
 .../HDP/2.3/services/HIVE/configuration/hive-site.xml   | 4 ++--
 .../main/resources/stacks/HDP/2.3/services/stack_advisor.py | 9 +
 2 files changed, 7 insertions(+), 6 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/9a7d9b94/ambari-server/src/main/resources/stacks/HDP/2.3/services/HIVE/configuration/hive-site.xml
--
diff --git 
a/ambari-server/src/main/resources/stacks/HDP/2.3/services/HIVE/configuration/hive-site.xml
 
b/ambari-server/src/main/resources/stacks/HDP/2.3/services/HIVE/configuration/hive-site.xml
index e65c9ef..f6b3ce9 100644
--- 
a/ambari-server/src/main/resources/stacks/HDP/2.3/services/HIVE/configuration/hive-site.xml
+++ 
b/ambari-server/src/main/resources/stacks/HDP/2.3/services/HIVE/configuration/hive-site.xml
@@ -35,8 +35,8 @@ limitations under the License.
 Datanucleus Class, This property used only when hive db is 
SQLA
 
   
-hive-site
-javax.jdo.option.ConnectionDriverName
+hive-env
+hive_database
   
 
   

http://git-wip-us.apache.org/repos/asf/ambari/blob/9a7d9b94/ambari-server/src/main/resources/stacks/HDP/2.3/services/stack_advisor.py
--
diff --git 
a/ambari-server/src/main/resources/stacks/HDP/2.3/services/stack_advisor.py 
b/ambari-server/src/main/resources/stacks/HDP/2.3/services/stack_advisor.py
index 2d07726..c65e110 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.3/services/stack_advisor.py
+++ b/ambari-server/src/main/resources/stacks/HDP/2.3/services/stack_advisor.py
@@ -180,8 +180,8 @@ class HDP23StackAdvisor(HDP22StackAdvisor):
 putHiveSiteProperty('hive.tez.java.opts', "-server 
-Djava.net.preferIPv4Stack=true -XX:NewRatio=8 -XX:+UseNUMA " + jvmGCParams + " 
-XX:+PrintGCDetails -verbose:gc -XX:+PrintGCTimeStamps")
 
 # if hive using sqla db, then we should add DataNucleus property
-sqla_db_used = 'hive-site' in services['configurations'] and 
'javax.jdo.option.ConnectionDriverName' in 
services['configurations']['hive-site']['properties'] and \
-   
services['configurations']['hive-site']['properties']['javax.jdo.option.ConnectionDriverName']
 == 'sap.jdbc4.sqlanywhere.IDriver'
+sqla_db_used = 'hive-env' in services['configurations'] and 
'hive_database' in services['configurations']['hive-env']['properties'] and \
+   
services['configurations']['hive-env']['properties']['hive_database'] == 
'Existing SQLA Database'
 if sqla_db_used:
   
putHiveSiteProperty('datanucleus.rdbms.datastoreAdapterClassName','org.datanucleus.store.rdbms.adapter.SQLAnywhereAdapter')
 else:
@@ -239,9 +239,10 @@ class HDP23StackAdvisor(HDP22StackAdvisor):
   def validateHiveConfigurations(self, properties, recommendedDefaults, 
configurations, services, hosts):
 super(HDP23StackAdvisor, self).validateHiveConfigurations(properties, 
recommendedDefaults, configurations, services, hosts)
 hive_site = properties
+hive_env_properties = getSiteProperties(configurations, "hive-env")
 validationItems = []
-sqla_db_used = "javax.jdo.option.ConnectionDriverName" in hive_site and \
-   hive_site['javax.jdo.option.ConnectionDriverName'] == 
'sap.jdbc4.sqlanywhere.IDriver'
+sqla_db_used = "hive_database" in hive_env_properties and \
+   hive_env_properties['hive_database'] == 'Existing SQLA 
Database'
 prop_name = "datanucleus.rdbms.datastoreAdapterClassName"
 prop_value = "org.datanucleus.store.rdbms.adapter.SQLAnywhereAdapter"
 if sqla_db_used:

ambari git commit: AMBARI-12947. Change dependency for datanucleus.rdbms.datastoreAdapterClassName from jdbc class name to jdbc name.(vbrodetskyi)

[vbrodetskyi]

Repository: ambari
Updated Branches:
  refs/heads/trunk d145dd6dc -> d81c7de31


AMBARI-12947. Change dependency for datanucleus.rdbms.datastoreAdapterClassName 
from jdbc class name to jdbc name.(vbrodetskyi)


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

Branch: refs/heads/trunk
Commit: d81c7de319f78ebfcaceaac23acce5bebe8293a7
Parents: d145dd6
Author: Vitaly Brodetskyi 
Authored: Tue Sep 1 12:02:52 2015 +0300
Committer: Vitaly Brodetskyi 
Committed: Tue Sep 1 12:02:52 2015 +0300

--
 .../HDP/2.3/services/HIVE/configuration/hive-site.xml   | 4 ++--
 .../main/resources/stacks/HDP/2.3/services/stack_advisor.py | 9 +
 2 files changed, 7 insertions(+), 6 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/d81c7de3/ambari-server/src/main/resources/stacks/HDP/2.3/services/HIVE/configuration/hive-site.xml
--
diff --git 
a/ambari-server/src/main/resources/stacks/HDP/2.3/services/HIVE/configuration/hive-site.xml
 
b/ambari-server/src/main/resources/stacks/HDP/2.3/services/HIVE/configuration/hive-site.xml
index e65c9ef..f6b3ce9 100644
--- 
a/ambari-server/src/main/resources/stacks/HDP/2.3/services/HIVE/configuration/hive-site.xml
+++ 
b/ambari-server/src/main/resources/stacks/HDP/2.3/services/HIVE/configuration/hive-site.xml
@@ -35,8 +35,8 @@ limitations under the License.
 Datanucleus Class, This property used only when hive db is 
SQLA
 
   
-hive-site
-javax.jdo.option.ConnectionDriverName
+hive-env
+hive_database
   
 
   

http://git-wip-us.apache.org/repos/asf/ambari/blob/d81c7de3/ambari-server/src/main/resources/stacks/HDP/2.3/services/stack_advisor.py
--
diff --git 
a/ambari-server/src/main/resources/stacks/HDP/2.3/services/stack_advisor.py 
b/ambari-server/src/main/resources/stacks/HDP/2.3/services/stack_advisor.py
index 2d07726..c65e110 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.3/services/stack_advisor.py
+++ b/ambari-server/src/main/resources/stacks/HDP/2.3/services/stack_advisor.py
@@ -180,8 +180,8 @@ class HDP23StackAdvisor(HDP22StackAdvisor):
 putHiveSiteProperty('hive.tez.java.opts', "-server 
-Djava.net.preferIPv4Stack=true -XX:NewRatio=8 -XX:+UseNUMA " + jvmGCParams + " 
-XX:+PrintGCDetails -verbose:gc -XX:+PrintGCTimeStamps")
 
 # if hive using sqla db, then we should add DataNucleus property
-sqla_db_used = 'hive-site' in services['configurations'] and 
'javax.jdo.option.ConnectionDriverName' in 
services['configurations']['hive-site']['properties'] and \
-   
services['configurations']['hive-site']['properties']['javax.jdo.option.ConnectionDriverName']
 == 'sap.jdbc4.sqlanywhere.IDriver'
+sqla_db_used = 'hive-env' in services['configurations'] and 
'hive_database' in services['configurations']['hive-env']['properties'] and \
+   
services['configurations']['hive-env']['properties']['hive_database'] == 
'Existing SQLA Database'
 if sqla_db_used:
   
putHiveSiteProperty('datanucleus.rdbms.datastoreAdapterClassName','org.datanucleus.store.rdbms.adapter.SQLAnywhereAdapter')
 else:
@@ -239,9 +239,10 @@ class HDP23StackAdvisor(HDP22StackAdvisor):
   def validateHiveConfigurations(self, properties, recommendedDefaults, 
configurations, services, hosts):
 super(HDP23StackAdvisor, self).validateHiveConfigurations(properties, 
recommendedDefaults, configurations, services, hosts)
 hive_site = properties
+hive_env_properties = getSiteProperties(configurations, "hive-env")
 validationItems = []
-sqla_db_used = "javax.jdo.option.ConnectionDriverName" in hive_site and \
-   hive_site['javax.jdo.option.ConnectionDriverName'] == 
'sap.jdbc4.sqlanywhere.IDriver'
+sqla_db_used = "hive_database" in hive_env_properties and \
+   hive_env_properties['hive_database'] == 'Existing SQLA 
Database'
 prop_name = "datanucleus.rdbms.datastoreAdapterClassName"
 prop_value = "org.datanucleus.store.rdbms.adapter.SQLAnywhereAdapter"
 if sqla_db_used:

ambari git commit: AMBARI-12954. upgradeHelper need to support Ambari 1.6.1 (backup functionality).(vbrodetskyi)

[vbrodetskyi]

Repository: ambari
Updated Branches:
  refs/heads/branch-2.1 9a7d9b94a -> b6c07db16


AMBARI-12954. upgradeHelper need to support Ambari 1.6.1 (backup 
functionality).(vbrodetskyi)


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

Branch: refs/heads/branch-2.1
Commit: b6c07db1654c96336ea820f3ece795b968e20538
Parents: 9a7d9b9
Author: Vitaly Brodetskyi 
Authored: Tue Sep 1 12:44:12 2015 +0300
Committer: Vitaly Brodetskyi 
Committed: Tue Sep 1 12:44:12 2015 +0300

--
 ambari-server/src/main/python/upgradeHelper.py | 79 -
 1 file changed, 62 insertions(+), 17 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/b6c07db1/ambari-server/src/main/python/upgradeHelper.py
--
diff --git a/ambari-server/src/main/python/upgradeHelper.py 
b/ambari-server/src/main/python/upgradeHelper.py
index 5a24b6f..4189b95 100644
--- a/ambari-server/src/main/python/upgradeHelper.py
+++ b/ambari-server/src/main/python/upgradeHelper.py
@@ -225,6 +225,8 @@ class Options(Const):
   """:type : ServerConfigFactory"""
   stack_advisor = None
   """:type : StackAdvisor"""
+  ambari_server = None
+  """:type : AmbariServer"""
 
   # Api constants
   ROOT_URL = None
@@ -234,6 +236,7 @@ class Options(Const):
 
   # Curl options
   CURL_PRINT_ONLY = None
+  CURL_WRITE_ONLY = None
 
   ARGS = None
   OPTIONS = None
@@ -269,6 +272,16 @@ class Options(Const):
   cls.SERVICES = set(map(lambda x: x.upper(), get_cluster_services()))
 
 cls.ambari_server = AmbariServer()
+if not cls.isPropertyAttributesSupported():
+  cls.logger.warning("Property attributes not supported by current Ambari 
version")
+
+  @classmethod
+  def isPropertyAttributesSupported(cls):
+if cls.ambari_server.server_version[0] * 10 + 
cls.ambari_server.server_version[1] >= 17:
+  return True
+return False
+
+
 
   @classmethod
   def initialize_logger(cls, filename=None):
@@ -1203,7 +1216,7 @@ def delete_mr():
 def get_cluster_stackname():
   VERSION_URL_FORMAT = Options.CLUSTER_URL + '?fields=Clusters/version'
 
-  structured_resp = curl(VERSION_URL_FORMAT, simulate=False, validate=True, 
parse=True)
+  structured_resp = curl(VERSION_URL_FORMAT, validate=True, parse=True)
 
   if 'Clusters' in structured_resp:
 if 'version' in structured_resp['Clusters']:
@@ -1218,7 +1231,7 @@ def has_component_in_stack_def(stack_name, service_name, 
component_name):
 
   try:
 curl(STACK_COMPONENT_URL_FORMAT.format(stack, stack_version, service_name, 
component_name),
- validate=True, simulate=False)
+ validate=True)
 return True
   except FatalException:
 return False
@@ -1271,11 +1284,24 @@ def update_config(properties, config_type, 
attributes=None):
   curl(Options.CLUSTER_URL, request_type="PUT", data=properties_payload, 
validate=True, soft_validation=True)
 
 
+def build_all_options(desired_configs):
+  """
+  Get all configs in the old-fashion way ( versions below 1.7.0 doesn't 
support "properties" filter )
+  """
+  config_url_tpl = Options.CLUSTER_URL + "/configurations?type={0}={1}"
+  all_options = {CatConst.ITEMS_TAG: []}
+  for config in desired_configs:
+cfg_item = curl(config_url_tpl.format(config, 
desired_configs[config]["tag"]), parse=True, validate=True)
+if CatConst.ITEMS_TAG in cfg_item and len(cfg_item[CatConst.ITEMS_TAG]) == 
1:
+  all_options[CatConst.ITEMS_TAG].append(cfg_item[CatConst.ITEMS_TAG][0])
+
+  return all_options
+
+
 def get_config_resp_all():
   desired_configs = {}
-  config_all_properties_url = Options.CLUSTER_URL + 
"/configurations?fields=properties,properties_attributes"
-  desired_configs_resp = curl(Options.CLUSTER_URL + 
"?fields=Clusters/desired_configs", validate=True, parse=True, simulate=False)
-  all_options = curl(config_all_properties_url, validate=True, parse=True, 
simulate=False)
+  config_all_properties_url = Options.CLUSTER_URL + 
"/configurations?fields=properties"
+  desired_configs_resp = curl(Options.CLUSTER_URL + 
"?fields=Clusters/desired_configs", validate=True, parse=True)
 
   if 'Clusters' in desired_configs_resp:
 if 'desired_configs' in desired_configs_resp['Clusters']:
@@ -1285,6 +1311,12 @@ def get_config_resp_all():
   else:
 return None
 
+  if Options.isPropertyAttributesSupported():
+config_all_properties_url += ",properties_attributes"
+all_options = curl(config_all_properties_url, validate=True, parse=True)
+  else:
+all_options = build_all_options(desired_configs_resp)
+
   if CatConst.ITEMS_TAG in all_options:
 

ambari git commit: AMBARI-12955. First adding hosts to created host group is not possible - no any host is displayed (onechiporenko)

[onechiporenko]

Repository: ambari
Updated Branches:
  refs/heads/trunk de21b29c2 -> 4eb219b8a


AMBARI-12955. First adding hosts to created host group is not possible - no any 
host is displayed (onechiporenko)


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

Branch: refs/heads/trunk
Commit: 4eb219b8a9fbc4b086eb8c22fe4b6e22bcfb7e33
Parents: de21b29
Author: Oleg Nechiporenko 
Authored: Tue Sep 1 13:54:36 2015 +0300
Committer: Oleg Nechiporenko 
Committed: Tue Sep 1 14:07:33 2015 +0300

--
 ambari-web/app/utils/hosts.js | 5 +
 1 file changed, 5 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/4eb219b8/ambari-web/app/utils/hosts.js
--
diff --git a/ambari-web/app/utils/hosts.js b/ambari-web/app/utils/hosts.js
index e7ea98c..20acad5 100644
--- a/ambari-web/app/utils/hosts.js
+++ b/ambari-web/app/utils/hosts.js
@@ -135,6 +135,11 @@ module.exports = {
   this.filteredContentObsOnce();
 },
 
+/**
+ * Default filter-method isn't needed
+ */
+filter: Em.K,
+
 filterHosts: function () {
   var filterText = this.get('filterText');
   var showOnlySelectedHosts = this.get('showOnlySelectedHosts');

ambari git commit: AMBARI-12956. Host Checks: should not warn on nagios, ganglia or puppet packages (aonishuk)

[aonishuk]

Repository: ambari
Updated Branches:
  refs/heads/branch-2.1 9eb04ae6f -> df1d64fae


AMBARI-12956. Host Checks: should not warn on nagios, ganglia or puppet 
packages (aonishuk)


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

Branch: refs/heads/branch-2.1
Commit: df1d64fae1cbcc337fee2e7dae1820a7843603b4
Parents: 9eb04ae
Author: Andrew Onishuk 
Authored: Tue Sep 1 15:14:18 2015 +0300
Committer: Andrew Onishuk 
Committed: Tue Sep 1 15:14:18 2015 +0300

--
 ambari-agent/src/main/python/ambari_agent/HostInfo.py | 2 +-
 .../src/main/resources/custom_actions/scripts/check_host.py   | 7 ---
 2 files changed, 5 insertions(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/df1d64fa/ambari-agent/src/main/python/ambari_agent/HostInfo.py
--
diff --git a/ambari-agent/src/main/python/ambari_agent/HostInfo.py 
b/ambari-agent/src/main/python/ambari_agent/HostInfo.py
index 385c758..b979242 100644
--- a/ambari-agent/src/main/python/ambari_agent/HostInfo.py
+++ b/ambari-agent/src/main/python/ambari_agent/HostInfo.py
@@ -143,7 +143,7 @@ class HostInfoLinux(HostInfo):
   # Set of default users (need to be replaced with the configured user names)
   DEFAULT_USERS = [
 "hive", "ambari-qa", "oozie", "hbase", "hcat", "mapred",
-"hdfs", "rrdcached", "zookeeper", "flume", "sqoop", "sqoop2",
+"hdfs", "zookeeper", "flume", "sqoop", "sqoop2",
 "hue", "yarn", "tez", "storm", "falcon", "kafka", "knox"
   ]
 

http://git-wip-us.apache.org/repos/asf/ambari/blob/df1d64fa/ambari-server/src/main/resources/custom_actions/scripts/check_host.py
--
diff --git 
a/ambari-server/src/main/resources/custom_actions/scripts/check_host.py 
b/ambari-server/src/main/resources/custom_actions/scripts/check_host.py
index 08a391e..1e54180 100644
--- a/ambari-server/src/main/resources/custom_actions/scripts/check_host.py
+++ b/ambari-server/src/main/resources/custom_actions/scripts/check_host.py
@@ -85,14 +85,15 @@ class CheckHost(Script):
   ]
   
 
-  # ignore required packages
+  # ignore packages that start with below prefixes:
   IGNORE_PACKAGES = [
-"epel-release"
+"epel-release", "nagios",
+# ganglia related:
+"ganglia", "libganglia", "libconfuse", "perl", "rrdtool", 
"python-rrdtool", "gmetad", "librrd", "rrdcached"
   ]
   
   # Additional packages to look for (search packages that start with these)
   ADDITIONAL_PACKAGES = [
-"rrdtool", "rrdtool-python", "ganglia", "gmond", "gweb", "libconfuse",
 "ambari-log4j", "hadoop", "zookeeper", "oozie", "webhcat"
   ]
   

ambari git commit: AMBARI-12955. First adding hosts to created host group is not possible - no any host is displayed (onechiporenko)

[onechiporenko]

Repository: ambari
Updated Branches:
  refs/heads/branch-2.1 b6c07db16 -> 9eb04ae6f


AMBARI-12955. First adding hosts to created host group is not possible - no any 
host is displayed (onechiporenko)


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

Branch: refs/heads/branch-2.1
Commit: 9eb04ae6fd7eae3670118b7a309594ec547af3fe
Parents: b6c07db
Author: Oleg Nechiporenko 
Authored: Tue Sep 1 13:54:36 2015 +0300
Committer: Oleg Nechiporenko 
Committed: Tue Sep 1 13:54:36 2015 +0300

--
 ambari-web/app/utils/hosts.js | 5 +
 1 file changed, 5 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/9eb04ae6/ambari-web/app/utils/hosts.js
--
diff --git a/ambari-web/app/utils/hosts.js b/ambari-web/app/utils/hosts.js
index e7ea98c..20acad5 100644
--- a/ambari-web/app/utils/hosts.js
+++ b/ambari-web/app/utils/hosts.js
@@ -135,6 +135,11 @@ module.exports = {
   this.filteredContentObsOnce();
 },
 
+/**
+ * Default filter-method isn't needed
+ */
+filter: Em.K,
+
 filterHosts: function () {
   var filterText = this.get('filterText');
   var showOnlySelectedHosts = this.get('showOnlySelectedHosts');

ambari git commit: AMBARI-12956. Host Checks: should not warn on nagios, ganglia or puppet packages (aonishuk)

[aonishuk]

Repository: ambari
Updated Branches:
  refs/heads/trunk 4eb219b8a -> e6fb3934b


AMBARI-12956. Host Checks: should not warn on nagios, ganglia or puppet 
packages (aonishuk)


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

Branch: refs/heads/trunk
Commit: e6fb3934badaad9d3e93efbdff2bd77d0b025c1b
Parents: 4eb219b
Author: Andrew Onishuk 
Authored: Tue Sep 1 15:13:05 2015 +0300
Committer: Andrew Onishuk 
Committed: Tue Sep 1 15:13:05 2015 +0300

--
 ambari-agent/src/main/python/ambari_agent/HostInfo.py   | 2 +-
 .../src/main/resources/custom_actions/scripts/check_host.py | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/e6fb3934/ambari-agent/src/main/python/ambari_agent/HostInfo.py
--
diff --git a/ambari-agent/src/main/python/ambari_agent/HostInfo.py 
b/ambari-agent/src/main/python/ambari_agent/HostInfo.py
index b87b599..3d7125a 100644
--- a/ambari-agent/src/main/python/ambari_agent/HostInfo.py
+++ b/ambari-agent/src/main/python/ambari_agent/HostInfo.py
@@ -143,7 +143,7 @@ class HostInfoLinux(HostInfo):
   # Set of default users (need to be replaced with the configured user names)
   DEFAULT_USERS = [
 "hive", "ambari-qa", "oozie", "hbase", "hcat", "mapred",
-"hdfs", "rrdcached", "zookeeper", "flume", "sqoop", "sqoop2",
+"hdfs", "zookeeper", "flume", "sqoop", "sqoop2",
 "hue", "yarn", "tez", "storm", "falcon", "kafka", "knox", "ams",
 "hadoop", "spark", "accumulo", "atlas", "mahout", "ranger", "kms"
   ]

http://git-wip-us.apache.org/repos/asf/ambari/blob/e6fb3934/ambari-server/src/main/resources/custom_actions/scripts/check_host.py
--
diff --git 
a/ambari-server/src/main/resources/custom_actions/scripts/check_host.py 
b/ambari-server/src/main/resources/custom_actions/scripts/check_host.py
index c235c87..a1c93b1 100644
--- a/ambari-server/src/main/resources/custom_actions/scripts/check_host.py
+++ b/ambari-server/src/main/resources/custom_actions/scripts/check_host.py
@@ -89,12 +89,13 @@ class CheckHost(Script):
 
   # ignore required packages
   IGNORE_PACKAGES = [
-"epel-release", "ambari-server", "ambari-agent"
+"epel-release", "ambari-server", "ambari-agent", "nagios",
+# ganglia related:
+"ganglia", "libganglia", "libconfuse", "perl", "rrdtool", 
"python-rrdtool", "gmetad", "librrd", "rrdcached"
   ]
   
   # Additional packages to look for (search packages that start with these)
   ADDITIONAL_PACKAGES = [
-"rrdtool", "rrdtool-python", "ganglia", "gmond", "gweb", "libconfuse",
 "ambari-log4j"
   ]
   

ambari git commit: AMBARI-12839. “Customize Services” section during Add Service wizard stuck with a loading icon (alexantonenko)

[alexantonenko]

Repository: ambari
Updated Branches:
  refs/heads/trunk e6fb3934b -> 2e543abc6


AMBARI-12839. “Customize Services” section during Add Service wizard stuck 
with a loading icon (alexantonenko)


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

Branch: refs/heads/trunk
Commit: 2e543abc65f7f01c94ce8bde61aafd7a64b93f88
Parents: e6fb393
Author: Alex Antonenko 
Authored: Tue Sep 1 15:05:47 2015 +0300
Committer: Alex Antonenko 
Committed: Tue Sep 1 15:20:52 2015 +0300

--
 ambari-web/app/controllers/main/service/add_controller.js | 1 +
 1 file changed, 1 insertion(+)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/2e543abc/ambari-web/app/controllers/main/service/add_controller.js
--
diff --git a/ambari-web/app/controllers/main/service/add_controller.js 
b/ambari-web/app/controllers/main/service/add_controller.js
index 1bc293d..0eac9ad 100644
--- a/ambari-web/app/controllers/main/service/add_controller.js
+++ b/ambari-web/app/controllers/main/service/add_controller.js
@@ -127,6 +127,7 @@ App.AddServiceController = 
App.WizardController.extend(App.AddSecurityConfigs, {
   });
 }
 else {
+  self.set('stackConfigsLoaded', true);
   dfd.resolve();
 }
 self.loadServiceConfigGroups();

ambari git commit: AMBARI-12839. “Customize Services” section during Add Service wizard stuck with a loading icon (alexantonenko)

[alexantonenko]

Repository: ambari
Updated Branches:
  refs/heads/branch-2.1 df1d64fae -> f35431057


AMBARI-12839. “Customize Services” section during Add Service wizard stuck 
with a loading icon (alexantonenko)


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

Branch: refs/heads/branch-2.1
Commit: f35431057371b3d09bb1e26352410713876f4cdb
Parents: df1d64f
Author: Alex Antonenko 
Authored: Tue Sep 1 15:05:47 2015 +0300
Committer: Alex Antonenko 
Committed: Tue Sep 1 15:19:47 2015 +0300

--
 ambari-web/app/controllers/main/service/add_controller.js | 1 +
 1 file changed, 1 insertion(+)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/f3543105/ambari-web/app/controllers/main/service/add_controller.js
--
diff --git a/ambari-web/app/controllers/main/service/add_controller.js 
b/ambari-web/app/controllers/main/service/add_controller.js
index 1bc293d..0eac9ad 100644
--- a/ambari-web/app/controllers/main/service/add_controller.js
+++ b/ambari-web/app/controllers/main/service/add_controller.js
@@ -127,6 +127,7 @@ App.AddServiceController = 
App.WizardController.extend(App.AddSecurityConfigs, {
   });
 }
 else {
+  self.set('stackConfigsLoaded', true);
   dfd.resolve();
 }
 self.loadServiceConfigGroups();

ambari git commit: AMBARI-12957. FE: Do better handling for missed max or min jdk in stack definition. (alexantonenko)

[alexantonenko]

Repository: ambari
Updated Branches:
  refs/heads/trunk 2e543abc6 -> 7ffd863e4


AMBARI-12957. FE: Do better handling for missed max or min jdk in stack 
definition. (alexantonenko)


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

Branch: refs/heads/trunk
Commit: 7ffd863e4a6b40dfa0ce0b116acbc7961d7ba349
Parents: 2e543ab
Author: Alex Antonenko 
Authored: Tue Sep 1 15:26:17 2015 +0300
Committer: Alex Antonenko 
Committed: Tue Sep 1 15:26:17 2015 +0300

--
 ambari-web/app/controllers/installer.js   | 11 ++--
 ambari-web/test/controllers/installer_test.js | 70 ++
 2 files changed, 76 insertions(+), 5 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/7ffd863e/ambari-web/app/controllers/installer.js
--
diff --git a/ambari-web/app/controllers/installer.js 
b/ambari-web/app/controllers/installer.js
index 82e13f4..ef2d569 100644
--- a/ambari-web/app/controllers/installer.js
+++ b/ambari-web/app/controllers/installer.js
@@ -741,8 +741,9 @@ App.InstallerController = App.WizardController.extend({
   validateJDKVersion: function (successCallback, failCallback) {
 var selectedStack = App.Stack.find().findProperty('isSelected', true),
 currentJDKVersion = 
App.router.get('clusterController.ambariProperties')['java.version'],
-minJDKVersion = selectedStack.get('minJdkVersion'),
-maxJDKVersion = selectedStack.get('maxJdkVersion'),
+// use min as max, or max as min version, in case when some of them 
missed
+minJDKVersion = selectedStack.get('minJdkVersion') || 
selectedStack.get('maxJdkVersion'),
+maxJDKVersion = selectedStack.get('maxJdkVersion') || 
selectedStack.get('minJdkVersion'),
 t = Em.I18n.t,
 fCallback = failCallback || function() {},
 sCallback = successCallback || function() {};
@@ -754,9 +755,9 @@ App.InstallerController = App.WizardController.extend({
 }
 
 if (currentJDKVersion) {
-  if (stringUtils.compareVersions(currentJDKVersion, 
selectedStack.get('minJdkVersion')) < 0 ||
-  stringUtils.compareVersions(selectedStack.get('maxJdkVersion'), 
currentJDKVersion) < 0) {
-// checks and process only major part for now
+  if (stringUtils.compareVersions(currentJDKVersion, minJDKVersion) < 0 ||
+  stringUtils.compareVersions(maxJDKVersion, currentJDKVersion) < 0) {
+// checks and process only minor part for now
 var versionDistance = parseInt(maxJDKVersion.split('.')[1]) - 
parseInt(minJDKVersion.split('.')[1]);
 var versionsList = [minJDKVersion];
 for (var i = 1; i < (versionDistance + 1); i++) {

http://git-wip-us.apache.org/repos/asf/ambari/blob/7ffd863e/ambari-web/test/controllers/installer_test.js
--
diff --git a/ambari-web/test/controllers/installer_test.js 
b/ambari-web/test/controllers/installer_test.js
index 23c00a7..1f370d3 100644
--- a/ambari-web/test/controllers/installer_test.js
+++ b/ambari-web/test/controllers/installer_test.js
@@ -1018,6 +1018,76 @@ describe('App.InstallerController', function () {
   {
 isCustomJDK: false,
 ambariProperties: {
+  'java.version': '1.5'
+},
+successCallbackCalled: true,
+popupCalled: false,
+stacks: [Em.Object.create({
+  minJdkVersion: null,
+  maxJdkVersion: null,
+  isSelected: true
+})],
+m: 'JDK 1.5, stack supports max and min are null, procceed 
installation without warning'
+  },
+  {
+isCustomJDK: false,
+ambariProperties: {
+  'java.version': '1.5'
+},
+successCallbackCalled: true,
+popupCalled: false,
+stacks: [Em.Object.create({
+  minJdkVersion: '1.5',
+  maxJdkVersion: null,
+  isSelected: true
+})],
+m: 'JDK 1.5, stack supports max is missed and min is 1.5, procceed 
installation without warning'
+  },
+  {
+isCustomJDK: false,
+ambariProperties: {
+  'java.version': '1.6'
+},
+successCallbackCalled: false,
+popupCalled: true,
+stacks: [Em.Object.create({
+  minJdkVersion: '1.5',
+  maxJdkVersion: null,
+  isSelected: true
+})],
+m: 'JDK 1.6, stack supports max is missed and min is 1.5, popup should 
be displayed'
+  },
+  {
+isCustomJDK: false,
+ambariProperties: {
+  'java.version': '1.5'
+},
+

ambari git commit: AMBARI-12957. FE: Do better handling for missed max or min jdk in stack definition. (alexantonenko)

[alexantonenko]

Repository: ambari
Updated Branches:
  refs/heads/branch-2.1 f35431057 -> 4f574fbe2


AMBARI-12957. FE: Do better handling for missed max or min jdk in stack 
definition. (alexantonenko)


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

Branch: refs/heads/branch-2.1
Commit: 4f574fbe26cb3c75724d595bc45f1b751081938c
Parents: f354310
Author: Alex Antonenko 
Authored: Tue Sep 1 15:26:17 2015 +0300
Committer: Alex Antonenko 
Committed: Tue Sep 1 15:32:26 2015 +0300

--
 ambari-web/app/controllers/installer.js   | 11 ++--
 ambari-web/test/controllers/installer_test.js | 70 ++
 2 files changed, 76 insertions(+), 5 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/4f574fbe/ambari-web/app/controllers/installer.js
--
diff --git a/ambari-web/app/controllers/installer.js 
b/ambari-web/app/controllers/installer.js
index 82e13f4..ef2d569 100644
--- a/ambari-web/app/controllers/installer.js
+++ b/ambari-web/app/controllers/installer.js
@@ -741,8 +741,9 @@ App.InstallerController = App.WizardController.extend({
   validateJDKVersion: function (successCallback, failCallback) {
 var selectedStack = App.Stack.find().findProperty('isSelected', true),
 currentJDKVersion = 
App.router.get('clusterController.ambariProperties')['java.version'],
-minJDKVersion = selectedStack.get('minJdkVersion'),
-maxJDKVersion = selectedStack.get('maxJdkVersion'),
+// use min as max, or max as min version, in case when some of them 
missed
+minJDKVersion = selectedStack.get('minJdkVersion') || 
selectedStack.get('maxJdkVersion'),
+maxJDKVersion = selectedStack.get('maxJdkVersion') || 
selectedStack.get('minJdkVersion'),
 t = Em.I18n.t,
 fCallback = failCallback || function() {},
 sCallback = successCallback || function() {};
@@ -754,9 +755,9 @@ App.InstallerController = App.WizardController.extend({
 }
 
 if (currentJDKVersion) {
-  if (stringUtils.compareVersions(currentJDKVersion, 
selectedStack.get('minJdkVersion')) < 0 ||
-  stringUtils.compareVersions(selectedStack.get('maxJdkVersion'), 
currentJDKVersion) < 0) {
-// checks and process only major part for now
+  if (stringUtils.compareVersions(currentJDKVersion, minJDKVersion) < 0 ||
+  stringUtils.compareVersions(maxJDKVersion, currentJDKVersion) < 0) {
+// checks and process only minor part for now
 var versionDistance = parseInt(maxJDKVersion.split('.')[1]) - 
parseInt(minJDKVersion.split('.')[1]);
 var versionsList = [minJDKVersion];
 for (var i = 1; i < (versionDistance + 1); i++) {

http://git-wip-us.apache.org/repos/asf/ambari/blob/4f574fbe/ambari-web/test/controllers/installer_test.js
--
diff --git a/ambari-web/test/controllers/installer_test.js 
b/ambari-web/test/controllers/installer_test.js
index 23c00a7..1f370d3 100644
--- a/ambari-web/test/controllers/installer_test.js
+++ b/ambari-web/test/controllers/installer_test.js
@@ -1018,6 +1018,76 @@ describe('App.InstallerController', function () {
   {
 isCustomJDK: false,
 ambariProperties: {
+  'java.version': '1.5'
+},
+successCallbackCalled: true,
+popupCalled: false,
+stacks: [Em.Object.create({
+  minJdkVersion: null,
+  maxJdkVersion: null,
+  isSelected: true
+})],
+m: 'JDK 1.5, stack supports max and min are null, procceed 
installation without warning'
+  },
+  {
+isCustomJDK: false,
+ambariProperties: {
+  'java.version': '1.5'
+},
+successCallbackCalled: true,
+popupCalled: false,
+stacks: [Em.Object.create({
+  minJdkVersion: '1.5',
+  maxJdkVersion: null,
+  isSelected: true
+})],
+m: 'JDK 1.5, stack supports max is missed and min is 1.5, procceed 
installation without warning'
+  },
+  {
+isCustomJDK: false,
+ambariProperties: {
+  'java.version': '1.6'
+},
+successCallbackCalled: false,
+popupCalled: true,
+stacks: [Em.Object.create({
+  minJdkVersion: '1.5',
+  maxJdkVersion: null,
+  isSelected: true
+})],
+m: 'JDK 1.6, stack supports max is missed and min is 1.5, popup should 
be displayed'
+  },
+  {
+isCustomJDK: false,
+ambariProperties: {
+  'java.version': '1.5'
+},
+ 

ambari git commit: AMBARI-12961. Need a robust check for the existence of a package (aonishuk)

[aonishuk]

Repository: ambari
Updated Branches:
  refs/heads/trunk a7dfbfa45 -> ee53343d5


AMBARI-12961. Need a robust check for the existence of a package (aonishuk)


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

Branch: refs/heads/trunk
Commit: ee53343d507565e75238c984f794e821f37fd630
Parents: a7dfbfa
Author: Andrew Onishuk 
Authored: Tue Sep 1 17:45:41 2015 +0300
Committer: Andrew Onishuk 
Committed: Tue Sep 1 17:45:41 2015 +0300

--
 .../stacks/HDP/2.2/services/ZOOKEEPER/metainfo.xml  | 3 +++
 .../stacks/HDP/2.3/services/ZOOKEEPER/metainfo.xml  | 9 ++---
 .../stacks/HDP/2.4/services/ZOOKEEPER/metainfo.xml  | 6 ++
 3 files changed, 15 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/ee53343d/ambari-server/src/main/resources/stacks/HDP/2.2/services/ZOOKEEPER/metainfo.xml
--
diff --git 
a/ambari-server/src/main/resources/stacks/HDP/2.2/services/ZOOKEEPER/metainfo.xml
 
b/ambari-server/src/main/resources/stacks/HDP/2.2/services/ZOOKEEPER/metainfo.xml
index 2f92549..d0b37cf 100644
--- 
a/ambari-server/src/main/resources/stacks/HDP/2.2/services/ZOOKEEPER/metainfo.xml
+++ 
b/ambari-server/src/main/resources/stacks/HDP/2.2/services/ZOOKEEPER/metainfo.xml
@@ -40,6 +40,9 @@
 
   zookeeper-2-2-.*
 
+
+  zookeeper-2-2-.*-server
+
   
 
   

http://git-wip-us.apache.org/repos/asf/ambari/blob/ee53343d/ambari-server/src/main/resources/stacks/HDP/2.3/services/ZOOKEEPER/metainfo.xml
--
diff --git 
a/ambari-server/src/main/resources/stacks/HDP/2.3/services/ZOOKEEPER/metainfo.xml
 
b/ambari-server/src/main/resources/stacks/HDP/2.3/services/ZOOKEEPER/metainfo.xml
index fdce582..c2fe742 100644
--- 
a/ambari-server/src/main/resources/stacks/HDP/2.3/services/ZOOKEEPER/metainfo.xml
+++ 
b/ambari-server/src/main/resources/stacks/HDP/2.3/services/ZOOKEEPER/metainfo.xml
@@ -28,10 +28,10 @@
 
   zookeeper_2_3_*
 
+
+  zookeeper_2_3_*-server
+
   
-  
-zookeeper_2_3_*-server
-  
 
 
   debian7,ubuntu12,ubuntu14
@@ -39,6 +39,9 @@
 
   zookeeper-2-3-.*
 
+
+  zookeeper-2-3-.*-server
+
   
 
   

http://git-wip-us.apache.org/repos/asf/ambari/blob/ee53343d/ambari-server/src/main/resources/stacks/HDP/2.4/services/ZOOKEEPER/metainfo.xml
--
diff --git 
a/ambari-server/src/main/resources/stacks/HDP/2.4/services/ZOOKEEPER/metainfo.xml
 
b/ambari-server/src/main/resources/stacks/HDP/2.4/services/ZOOKEEPER/metainfo.xml
index 63e7574..4bf4198 100644
--- 
a/ambari-server/src/main/resources/stacks/HDP/2.4/services/ZOOKEEPER/metainfo.xml
+++ 
b/ambari-server/src/main/resources/stacks/HDP/2.4/services/ZOOKEEPER/metainfo.xml
@@ -28,6 +28,9 @@
 
   zookeeper_2_4_*
 
+   
+ zookeeper_2_4_*-server
+   
   
 
 
@@ -36,6 +39,9 @@
 
   zookeeper-2-4-.*
 
+
+  zookeeper-2-4-.*-server
+
   
 
   

ambari git commit: AMBARI-12960. UX: after click Override for property was opened another tab (Settings instead Advanced) (alexantonenko)

[alexantonenko]

Repository: ambari
Updated Branches:
  refs/heads/trunk 35bc58de3 -> 9b23a9b49


AMBARI-12960. UX: after click Override for property was opened another tab 
(Settings instead Advanced) (alexantonenko)


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

Branch: refs/heads/trunk
Commit: 9b23a9b49e5ee79b7a10b865557291d476bad468
Parents: 35bc58d
Author: Alex Antonenko 
Authored: Tue Sep 1 17:11:34 2015 +0300
Committer: Alex Antonenko 
Committed: Tue Sep 1 18:05:59 2015 +0300

--
 .../controllers/main/service/info/configs.js|  5 
 .../app/controllers/wizard/step7_controller.js  |  3 ++
 .../common/configs/service_config_tab_view.js   |  1 +
 .../views/common/configs/service_config_view.js |  2 +-
 .../test/controllers/wizard/step7_test.js   | 31 
 5 files changed, 41 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/9b23a9b4/ambari-web/app/controllers/main/service/info/configs.js
--
diff --git a/ambari-web/app/controllers/main/service/info/configs.js 
b/ambari-web/app/controllers/main/service/info/configs.js
index 087ef53..da2be95 100644
--- a/ambari-web/app/controllers/main/service/info/configs.js
+++ b/ambari-web/app/controllers/main/service/info/configs.js
@@ -39,6 +39,8 @@ App.MainServiceInfoConfigsController = 
Em.Controller.extend(App.ConfigsLoader, A
 
   selectedConfigGroup: null,
 
+  selectedServiceNameTrigger: null,
+
   requestsInProgress: [],
 
   groupsStore: App.ServiceConfigGroup.find(),
@@ -554,6 +556,9 @@ App.MainServiceInfoConfigsController = 
Em.Controller.extend(App.ConfigsLoader, A
 }, this);
 
 var selectedService = this.get('stepConfigs').findProperty('serviceName', 
this.get('content.serviceName'));
+if (this.get('selectedService.serviceName') != 
selectedService.get('serviceName')) {
+  this.propertyDidChange('selectedServiceNameTrigger');
+}
 this.set('selectedService', selectedService);
 this.checkOverrideProperty(selectedService);
 //this.checkDatabaseProperties(selectedService);

http://git-wip-us.apache.org/repos/asf/ambari/blob/9b23a9b4/ambari-web/app/controllers/wizard/step7_controller.js
--
diff --git a/ambari-web/app/controllers/wizard/step7_controller.js 
b/ambari-web/app/controllers/wizard/step7_controller.js
index daae837..8bf69f1 100644
--- a/ambari-web/app/controllers/wizard/step7_controller.js
+++ b/ambari-web/app/controllers/wizard/step7_controller.js
@@ -45,6 +45,8 @@ App.WizardStep7Controller = 
Em.Controller.extend(App.ServerValidatorMixin, App.E
 
   addMiscTabToPage: true,
 
+  selectedServiceNameTrigger: null,
+
   /**
* Is Submit-click processing now
* @type {bool}
@@ -1396,6 +1398,7 @@ App.WizardStep7Controller = 
Em.Controller.extend(App.ServerValidatorMixin, App.E
   {
 var service = errorServices[0];
 this.set('selectedService', service);
+this.propertyDidChange('selectedServiceNameTrigger');
 $('a[href="#' + service.serviceName + '"]').tab('show');
   }
 }

http://git-wip-us.apache.org/repos/asf/ambari/blob/9b23a9b4/ambari-web/app/views/common/configs/service_config_tab_view.js
--
diff --git a/ambari-web/app/views/common/configs/service_config_tab_view.js 
b/ambari-web/app/views/common/configs/service_config_tab_view.js
index 2cfa626..0998ba6 100644
--- a/ambari-web/app/views/common/configs/service_config_tab_view.js
+++ b/ambari-web/app/views/common/configs/service_config_tab_view.js
@@ -24,6 +24,7 @@ App.ServiceConfigTab = Em.View.extend({
 
   selectService: function (event) {
 this.set('controller.selectedService', event.context);
+this.get('controller').propertyDidChange('selectedServiceNameTrigger');
   },
 
   didInsertElement: function () {

http://git-wip-us.apache.org/repos/asf/ambari/blob/9b23a9b4/ambari-web/app/views/common/configs/service_config_view.js
--
diff --git a/ambari-web/app/views/common/configs/service_config_view.js 
b/ambari-web/app/views/common/configs/service_config_view.js
index 86fb2c8..2393b47 100644
--- a/ambari-web/app/views/common/configs/service_config_view.js
+++ b/ambari-web/app/views/common/configs/service_config_view.js
@@ -184,7 +184,7 @@ App.ServiceConfigView = Em.View.extend({
 this.processTabs(tabs);
 this.pickActiveTab(tabs);
 return tabs;
-  }.property('controller.selectedService.serviceName'),
+  

[1/2] ambari git commit: AMBARI-12962. New ambari-agent logging infra makes it difficult to attach a log4j appender (aonishuk)

[aonishuk]

Repository: ambari
Updated Branches:
  refs/heads/branch-2.1 052fe3392 -> 864a50f06
  refs/heads/trunk ee53343d5 -> 35bc58de3


AMBARI-12962. New ambari-agent logging infra makes it difficult to attach a 
log4j appender (aonishuk)


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

Branch: refs/heads/trunk
Commit: 35bc58de3e7e882e6607103fcc2f3ccd1b951ac5
Parents: ee53343
Author: Andrew Onishuk 
Authored: Tue Sep 1 18:02:49 2015 +0300
Committer: Andrew Onishuk 
Committed: Tue Sep 1 18:02:49 2015 +0300

--
 ambari-agent/src/main/python/ambari_agent/main.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/35bc58de/ambari-agent/src/main/python/ambari_agent/main.py
--
diff --git a/ambari-agent/src/main/python/ambari_agent/main.py 
b/ambari-agent/src/main/python/ambari_agent/main.py
index 3a3cd23..25f7fa0 100644
--- a/ambari-agent/src/main/python/ambari_agent/main.py
+++ b/ambari-agent/src/main/python/ambari_agent/main.py
@@ -45,7 +45,7 @@ from ambari_commons import shell
 import HeartbeatHandlers
 from HeartbeatHandlers import bind_signal_handlers
 from ambari_commons.constants import AMBARI_SUDO_BINARY
-logger = logging.getLogger(__name__)
+logger = logging.getLogger()
 
 formatstr = "%(levelname)s %(asctime)s %(filename)s:%(lineno)d - %(message)s"
 agentPid = os.getpid()

[2/2] ambari git commit: AMBARI-12962. New ambari-agent logging infra makes it difficult to attach a log4j appender (aonishuk)

[aonishuk]

AMBARI-12962. New ambari-agent logging infra makes it difficult to attach a 
log4j appender (aonishuk)


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

Branch: refs/heads/branch-2.1
Commit: 864a50f06eb9a54fd2d2561fff65372f822cc9de
Parents: 052fe33
Author: Andrew Onishuk 
Authored: Tue Sep 1 18:02:52 2015 +0300
Committer: Andrew Onishuk 
Committed: Tue Sep 1 18:02:52 2015 +0300

--
 ambari-agent/src/main/python/ambari_agent/main.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/864a50f0/ambari-agent/src/main/python/ambari_agent/main.py
--
diff --git a/ambari-agent/src/main/python/ambari_agent/main.py 
b/ambari-agent/src/main/python/ambari_agent/main.py
index 3c2933e..fb5b4b1 100644
--- a/ambari-agent/src/main/python/ambari_agent/main.py
+++ b/ambari-agent/src/main/python/ambari_agent/main.py
@@ -45,7 +45,7 @@ from ambari_commons import shell
 import HeartbeatHandlers
 from HeartbeatHandlers import bind_signal_handlers
 from ambari_commons.constants import AMBARI_SUDO_BINARY
-logger = logging.getLogger(__name__)
+logger = logging.getLogger()
 
 formatstr = "%(levelname)s %(asctime)s %(filename)s:%(lineno)d - %(message)s"
 agentPid = os.getpid()

ambari git commit: AMBARI-12960. UX: after click Override for property was opened another tab (Settings instead Advanced) (alexantonenko)

[alexantonenko]

Repository: ambari
Updated Branches:
  refs/heads/branch-2.1 864a50f06 -> 544824970


AMBARI-12960. UX: after click Override for property was opened another tab 
(Settings instead Advanced) (alexantonenko)


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

Branch: refs/heads/branch-2.1
Commit: 54482497068e136cb6eeda64453f5efca623f0fb
Parents: 864a50f
Author: Alex Antonenko 
Authored: Tue Sep 1 17:11:34 2015 +0300
Committer: Alex Antonenko 
Committed: Tue Sep 1 18:05:37 2015 +0300

--
 .../controllers/main/service/info/configs.js|  5 
 .../app/controllers/wizard/step7_controller.js  |  3 ++
 .../common/configs/service_config_tab_view.js   |  1 +
 .../views/common/configs/service_config_view.js |  2 +-
 .../test/controllers/wizard/step7_test.js   | 31 
 5 files changed, 41 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/54482497/ambari-web/app/controllers/main/service/info/configs.js
--
diff --git a/ambari-web/app/controllers/main/service/info/configs.js 
b/ambari-web/app/controllers/main/service/info/configs.js
index 087ef53..da2be95 100644
--- a/ambari-web/app/controllers/main/service/info/configs.js
+++ b/ambari-web/app/controllers/main/service/info/configs.js
@@ -39,6 +39,8 @@ App.MainServiceInfoConfigsController = 
Em.Controller.extend(App.ConfigsLoader, A
 
   selectedConfigGroup: null,
 
+  selectedServiceNameTrigger: null,
+
   requestsInProgress: [],
 
   groupsStore: App.ServiceConfigGroup.find(),
@@ -554,6 +556,9 @@ App.MainServiceInfoConfigsController = 
Em.Controller.extend(App.ConfigsLoader, A
 }, this);
 
 var selectedService = this.get('stepConfigs').findProperty('serviceName', 
this.get('content.serviceName'));
+if (this.get('selectedService.serviceName') != 
selectedService.get('serviceName')) {
+  this.propertyDidChange('selectedServiceNameTrigger');
+}
 this.set('selectedService', selectedService);
 this.checkOverrideProperty(selectedService);
 //this.checkDatabaseProperties(selectedService);

http://git-wip-us.apache.org/repos/asf/ambari/blob/54482497/ambari-web/app/controllers/wizard/step7_controller.js
--
diff --git a/ambari-web/app/controllers/wizard/step7_controller.js 
b/ambari-web/app/controllers/wizard/step7_controller.js
index 2607b89..b4c2197 100644
--- a/ambari-web/app/controllers/wizard/step7_controller.js
+++ b/ambari-web/app/controllers/wizard/step7_controller.js
@@ -45,6 +45,8 @@ App.WizardStep7Controller = 
Em.Controller.extend(App.ServerValidatorMixin, App.E
 
   addMiscTabToPage: true,
 
+  selectedServiceNameTrigger: null,
+
   /**
* Is Submit-click processing now
* @type {bool}
@@ -1422,6 +1424,7 @@ App.WizardStep7Controller = 
Em.Controller.extend(App.ServerValidatorMixin, App.E
   {
 var service = errorServices[0];
 this.set('selectedService', service);
+this.propertyDidChange('selectedServiceNameTrigger');
 $('a[href="#' + service.serviceName + '"]').tab('show');
   }
 }

http://git-wip-us.apache.org/repos/asf/ambari/blob/54482497/ambari-web/app/views/common/configs/service_config_tab_view.js
--
diff --git a/ambari-web/app/views/common/configs/service_config_tab_view.js 
b/ambari-web/app/views/common/configs/service_config_tab_view.js
index 2cfa626..0998ba6 100644
--- a/ambari-web/app/views/common/configs/service_config_tab_view.js
+++ b/ambari-web/app/views/common/configs/service_config_tab_view.js
@@ -24,6 +24,7 @@ App.ServiceConfigTab = Em.View.extend({
 
   selectService: function (event) {
 this.set('controller.selectedService', event.context);
+this.get('controller').propertyDidChange('selectedServiceNameTrigger');
   },
 
   didInsertElement: function () {

http://git-wip-us.apache.org/repos/asf/ambari/blob/54482497/ambari-web/app/views/common/configs/service_config_view.js
--
diff --git a/ambari-web/app/views/common/configs/service_config_view.js 
b/ambari-web/app/views/common/configs/service_config_view.js
index 86fb2c8..2393b47 100644
--- a/ambari-web/app/views/common/configs/service_config_view.js
+++ b/ambari-web/app/views/common/configs/service_config_view.js
@@ -184,7 +184,7 @@ App.ServiceConfigView = Em.View.extend({
 this.processTabs(tabs);
 this.pickActiveTab(tabs);
 return tabs;
-  

ambari git commit: AMBARI-12958 SQLA: when "db name" for hive/oozie changed, "jdbc class" changes too so recommendations should be called. (ababiichuk)

[ababiichuk]

Repository: ambari
Updated Branches:
  refs/heads/trunk 7ffd863e4 -> a7dfbfa45


AMBARI-12958 SQLA: when "db name" for hive/oozie changed, "jdbc class" changes 
too so recommendations should be called. (ababiichuk)


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

Branch: refs/heads/trunk
Commit: a7dfbfa45c274aec6d4bd24c676b8ec8b8c7a689
Parents: 7ffd863
Author: aBabiichuk 
Authored: Tue Sep 1 16:36:25 2015 +0300
Committer: aBabiichuk 
Committed: Tue Sep 1 16:36:25 2015 +0300

--
 ambari-web/app/views/common/controls_view.js   | 3 ++-
 ambari-web/test/views/common/controls_view_test.js | 2 ++
 2 files changed, 4 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/a7dfbfa4/ambari-web/app/views/common/controls_view.js
--
diff --git a/ambari-web/app/views/common/controls_view.js 
b/ambari-web/app/views/common/controls_view.js
index c37a60d..4933a23 100644
--- a/ambari-web/app/views/common/controls_view.js
+++ b/ambari-web/app/views/common/controls_view.js
@@ -90,7 +90,7 @@ App.SupportsDependentConfigs = Ember.Mixin.create({
* @returns {$.Deferred}
*/
   sendRequestRorDependentConfigs: function(config) {
-if (!config.get('isValid')) return $.Deferred().resolve().promise();
+if (!config || !config.get('isValid')) return 
$.Deferred().resolve().promise();
 if (App.get('isClusterSupportsEnhancedConfigs') && 
['mainServiceInfoConfigsController','wizardStep7Controller'].contains(this.get('controller.name')))
 {
   var name = config.get('name');
   var saveRecommended = (this.get('config.value') === 
this.get('config.recommendedValue'));
@@ -505,6 +505,7 @@ App.ServiceConfigRadioButtons = 
Ember.View.extend(App.ServiceConfigCalculateId,
   }.property('serviceConfig.serviceName', 'serviceConfig.value'),
 
   onOptionsChange: function () {
+this.sendRequestRorDependentConfigs(this.get('serviceConfig'));
 if (this.get('hostNameProperty') && 
!this.get('nonDBRadioButtons').contains(this.get('serviceConfig.name'))) {
   /** if new db is selected host name must be same as master of selected 
service (and can't be changed)**/
   if (this.get('isNewDb')) {

http://git-wip-us.apache.org/repos/asf/ambari/blob/a7dfbfa4/ambari-web/test/views/common/controls_view_test.js
--
diff --git a/ambari-web/test/views/common/controls_view_test.js 
b/ambari-web/test/views/common/controls_view_test.js
index a2df365..6e4315c 100644
--- a/ambari-web/test/views/common/controls_view_test.js
+++ b/ambari-web/test/views/common/controls_view_test.js
@@ -251,6 +251,7 @@ describe('App.ServiceConfigRadioButtons', function () {
 
 afterEach(function () {
   App.get.restore();
+  view.sendRequestRorDependentConfigs.restore();
 });
 
 after(function () {
@@ -261,6 +262,7 @@ describe('App.ServiceConfigRadioButtons', function () {
   it(item.title, function () {
 sinon.stub(App, 
'get').withArgs('currentStackName').returns('HDP').withArgs('currentStackVersion').returns(item.currentStackVersion);
 view = App.ServiceConfigRadioButtons.create({parentView: 
item.parentView});
+sinon.stub(view, 'sendRequestRorDependentConfigs', Em.K);
 view.setProperties({
   categoryConfigsAll: item.parentView.get('serviceConfigs'),
   serviceConfig: item.serviceConfig

ambari git commit: AMBARI-12958 SQLA: when "db name" for hive/oozie changed, "jdbc class" changes too so recommendations should be called. (ababiichuk)

[ababiichuk]

Repository: ambari
Updated Branches:
  refs/heads/branch-2.1 4f574fbe2 -> 052fe3392


AMBARI-12958 SQLA: when "db name" for hive/oozie changed, "jdbc class" changes 
too so recommendations should be called. (ababiichuk)


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

Branch: refs/heads/branch-2.1
Commit: 052fe33929ea4e5ddab168a7891bd29c6a90f4a3
Parents: 4f574fb
Author: aBabiichuk 
Authored: Tue Sep 1 16:36:25 2015 +0300
Committer: aBabiichuk 
Committed: Tue Sep 1 16:39:04 2015 +0300

--
 ambari-web/app/views/common/controls_view.js   | 3 ++-
 ambari-web/test/views/common/controls_view_test.js | 2 ++
 2 files changed, 4 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/052fe339/ambari-web/app/views/common/controls_view.js
--
diff --git a/ambari-web/app/views/common/controls_view.js 
b/ambari-web/app/views/common/controls_view.js
index 999ee7d..76171b3 100644
--- a/ambari-web/app/views/common/controls_view.js
+++ b/ambari-web/app/views/common/controls_view.js
@@ -89,7 +89,7 @@ App.SupportsDependentConfigs = Ember.Mixin.create({
* @returns {$.Deferred}
*/
   sendRequestRorDependentConfigs: function(config) {
-if (!config.get('isValid')) return $.Deferred().resolve().promise();
+if (!config || !config.get('isValid')) return 
$.Deferred().resolve().promise();
 if (App.get('isClusterSupportsEnhancedConfigs') && 
['mainServiceInfoConfigsController','wizardStep7Controller'].contains(this.get('controller.name')))
 {
   var name = config.get('name');
   var saveRecommended = (this.get('config.value') === 
this.get('config.recommendedValue'));
@@ -504,6 +504,7 @@ App.ServiceConfigRadioButtons = 
Ember.View.extend(App.ServiceConfigCalculateId,
   }.property('serviceConfig.serviceName', 'serviceConfig.value'),
 
   onOptionsChange: function () {
+this.sendRequestRorDependentConfigs(this.get('serviceConfig'));
 if (this.get('hostNameProperty') && 
!this.get('nonDBRadioButtons').contains(this.get('serviceConfig.name'))) {
   /** if new db is selected host name must be same as master of selected 
service (and can't be changed)**/
   if (this.get('isNewDb')) {

http://git-wip-us.apache.org/repos/asf/ambari/blob/052fe339/ambari-web/test/views/common/controls_view_test.js
--
diff --git a/ambari-web/test/views/common/controls_view_test.js 
b/ambari-web/test/views/common/controls_view_test.js
index c5fdad0..0e658c6 100644
--- a/ambari-web/test/views/common/controls_view_test.js
+++ b/ambari-web/test/views/common/controls_view_test.js
@@ -250,6 +250,7 @@ describe('App.ServiceConfigRadioButtons', function () {
 
 afterEach(function () {
   App.get.restore();
+  view.sendRequestRorDependentConfigs.restore();
 });
 
 after(function () {
@@ -260,6 +261,7 @@ describe('App.ServiceConfigRadioButtons', function () {
   it(item.title, function () {
 sinon.stub(App, 
'get').withArgs('currentStackName').returns('HDP').withArgs('currentStackVersion').returns(item.currentStackVersion);
 view = App.ServiceConfigRadioButtons.create({parentView: 
item.parentView});
+sinon.stub(view, 'sendRequestRorDependentConfigs', Em.K);
 view.setProperties({
   categoryConfigsAll: item.parentView.get('serviceConfigs'),
   serviceConfig: item.serviceConfig

ambari git commit: AMBARI-12920. “Oozie Quick links" in Ambari points to incorrect URL after enabling SSL. Additional fix (alexantonenko)

[alexantonenko]

Repository: ambari
Updated Branches:
  refs/heads/branch-2.1 544824970 -> abb437c18


AMBARI-12920. “Oozie Quick links" in Ambari points to incorrect URL after 
enabling SSL. Additional fix (alexantonenko)


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

Branch: refs/heads/branch-2.1
Commit: abb437c184f377ab8b83518291fe6f7e33c67e25
Parents: 5448249
Author: Alex Antonenko 
Authored: Tue Sep 1 18:24:27 2015 +0300
Committer: Alex Antonenko 
Committed: Tue Sep 1 18:24:27 2015 +0300

--
 ambari-web/app/views/common/quick_view_link_view.js | 10 ++
 1 file changed, 6 insertions(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/abb437c1/ambari-web/app/views/common/quick_view_link_view.js
--
diff --git a/ambari-web/app/views/common/quick_view_link_view.js 
b/ambari-web/app/views/common/quick_view_link_view.js
index 9fa2044..522837e 100644
--- a/ambari-web/app/views/common/quick_view_link_view.js
+++ b/ambari-web/app/views/common/quick_view_link_view.js
@@ -382,16 +382,18 @@ App.QuickViewLinks = Em.View.extend({
 break;
   case "OOZIE":
 var site = configProperties.findProperty('type', 'oozie-site');
-var url = site && site.properties && site.properties['oozie.base.url'];
+var properties = site && site.properties;
+var url = properties && properties['oozie.base.url'];
 var re = new RegExp(item.get('regex'));
 var portValue = url && url.match(re);
 var port = portValue && portValue.length && portValue[1];
 var protocol = 'http';
-
-if (port === '11443') {
+var isHttpsPropertiesEnabled = properties && 
(properties['oozie.https.port'] ||
+  
properties['oozie.https.keystore.file'] ||
+  
properties['oozie.https.keystore.pass']);
+if (port === '11443' || isHttpsPropertiesEnabled) {
   protocol = 'https';
 }
-
 return protocol;
 break;
   case "RANGER":

[2/2] ambari git commit: AMBARI-12944. Make it configurable to select which DB type is the default Ambari DB. (mpapirkovskyy)

[mpapirkovskyy]

AMBARI-12944. Make it configurable to select which DB type is the default 
Ambari DB. (mpapirkovskyy)


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

Branch: refs/heads/trunk
Commit: 7680d7e74dbb20ac7b40692d96f11206397ad4c9
Parents: 9a05ae6
Author: Myroslav Papirkovskyy 
Authored: Tue Sep 1 18:15:58 2015 +0300
Committer: Myroslav Papirkovskyy 
Committed: Tue Sep 1 18:42:40 2015 +0300

--
 .../GenerateStackDefinition.py  | 10 +
 .../configs/SAPHD.json  |  3 +-
 .../python/ambari_server/dbConfiguration.py | 29 ++--
 .../python/ambari_server/serverConfiguration.py |  2 +
 .../main/python/ambari_server/serverSetup.py| 46 +++-
 .../src/test/python/TestAmbariServer.py | 30 ++---
 6 files changed, 100 insertions(+), 20 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/7680d7e7/ambari-common/src/main/python/pluggable_stack_definition/GenerateStackDefinition.py
--
diff --git 
a/ambari-common/src/main/python/pluggable_stack_definition/GenerateStackDefinition.py
 
b/ambari-common/src/main/python/pluggable_stack_definition/GenerateStackDefinition.py
index 79cf362..f1f9381 100644
--- 
a/ambari-common/src/main/python/pluggable_stack_definition/GenerateStackDefinition.py
+++ 
b/ambari-common/src/main/python/pluggable_stack_definition/GenerateStackDefinition.py
@@ -583,14 +583,24 @@ class GeneratorHelper(object):
 
 with open(source_ambari_properties, 'r') as in_file:
   with open(target_ambari_properties, 'w') as out_file:
+replaced_properties = []
 for line in in_file:
   property = line.split('=')[0]
   if property in propertyMap:
 out_file.write('='.join([property, propertyMap[property]]))
 out_file.write(os.linesep)
+replaced_properties.append(property)
   else:
 out_file.write(line)
 
+if len(propertyMap) - len(replaced_properties) > 0:
+  out_file.write(os.linesep)  #make sure we don't break last entry 
from original properties
+
+for key in propertyMap:
+  if key not in replaced_properties:
+out_file.write('='.join([key, propertyMap[key]]))
+out_file.write(os.linesep)
+
   def copy_custom_actions(self):
 original_folder = os.path.join(self.resources_folder, 'custom_actions')
 target_folder = os.path.join(self.output_folder, 'custom_actions')

http://git-wip-us.apache.org/repos/asf/ambari/blob/7680d7e7/ambari-common/src/main/python/pluggable_stack_definition/configs/SAPHD.json
--
diff --git 
a/ambari-common/src/main/python/pluggable_stack_definition/configs/SAPHD.json 
b/ambari-common/src/main/python/pluggable_stack_definition/configs/SAPHD.json
index 176f4c5..37de54d 100644
--- 
a/ambari-common/src/main/python/pluggable_stack_definition/configs/SAPHD.json
+++ 
b/ambari-common/src/main/python/pluggable_stack_definition/configs/SAPHD.json
@@ -20,7 +20,8 @@
 "jdk1.8.url" : "http://DOWNLOAD_NOT_SUPPORTED;,
 "jdk1.7.jcpol-url" : "http://DOWNLOAD_NOT_SUPPORTED;,
 "jdk1.8.jcpol-url" : "http://DOWNLOAD_NOT_SUPPORTED;,
-"rolling.upgrade.min.stack" : "SAPHD-0.9"
+"rolling.upgrade.min.stack" : "SAPHD-0.9",
+"server.setup.default.dbms" : "sqlanywhere"
   },
   "common-services": [
 {

http://git-wip-us.apache.org/repos/asf/ambari/blob/7680d7e7/ambari-server/src/main/python/ambari_server/dbConfiguration.py
--
diff --git a/ambari-server/src/main/python/ambari_server/dbConfiguration.py 
b/ambari-server/src/main/python/ambari_server/dbConfiguration.py
index d870036..4b76781 100644
--- a/ambari-server/src/main/python/ambari_server/dbConfiguration.py
+++ b/ambari-server/src/main/python/ambari_server/dbConfiguration.py
@@ -27,7 +27,7 @@ from ambari_commons.os_family_impl import OsFamilyImpl
 from ambari_commons.str_utils import cbool
 from ambari_server.serverConfiguration import decrypt_password_for_alias, 
get_ambari_properties, get_is_secure, \
   get_resources_location, get_value_from_properties, is_alias_string, \
-  JDBC_PASSWORD_PROPERTY, JDBC_RCA_PASSWORD_ALIAS, PRESS_ENTER_MSG
+  JDBC_PASSWORD_PROPERTY, JDBC_RCA_PASSWORD_ALIAS, PRESS_ENTER_MSG, 
DEFAULT_DBMS_PROPERTY
 from ambari_server.userInput import get_validated_string_input
 
 
@@ -280,6 +280,12 @@ class DBMSConfigFactory(object):
   def 

[1/2] ambari git commit: AMBARI-12944. Make it configurable to select which DB type is the default Ambari DB. (mpapirkovskyy)

[mpapirkovskyy]

Repository: ambari
Updated Branches:
  refs/heads/branch-2.1 abb437c18 -> 7bcbab3d2
  refs/heads/trunk 9a05ae6a9 -> 7680d7e74


AMBARI-12944. Make it configurable to select which DB type is the default 
Ambari DB. (mpapirkovskyy)


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

Branch: refs/heads/branch-2.1
Commit: 7bcbab3d27a4aae1d7992ab6513bc88063a9584c
Parents: abb437c
Author: Myroslav Papirkovskyy 
Authored: Tue Sep 1 18:15:58 2015 +0300
Committer: Myroslav Papirkovskyy 
Committed: Tue Sep 1 18:42:27 2015 +0300

--
 .../GenerateStackDefinition.py  | 10 +
 .../configs/SAPHD.json  |  3 +-
 .../python/ambari_server/dbConfiguration.py | 29 ++--
 .../python/ambari_server/serverConfiguration.py |  2 +
 .../main/python/ambari_server/serverSetup.py| 46 +++-
 .../src/test/python/TestAmbariServer.py | 36 +++
 6 files changed, 104 insertions(+), 22 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/7bcbab3d/ambari-common/src/main/python/pluggable_stack_definition/GenerateStackDefinition.py
--
diff --git 
a/ambari-common/src/main/python/pluggable_stack_definition/GenerateStackDefinition.py
 
b/ambari-common/src/main/python/pluggable_stack_definition/GenerateStackDefinition.py
index 79cf362..f1f9381 100644
--- 
a/ambari-common/src/main/python/pluggable_stack_definition/GenerateStackDefinition.py
+++ 
b/ambari-common/src/main/python/pluggable_stack_definition/GenerateStackDefinition.py
@@ -583,14 +583,24 @@ class GeneratorHelper(object):
 
 with open(source_ambari_properties, 'r') as in_file:
   with open(target_ambari_properties, 'w') as out_file:
+replaced_properties = []
 for line in in_file:
   property = line.split('=')[0]
   if property in propertyMap:
 out_file.write('='.join([property, propertyMap[property]]))
 out_file.write(os.linesep)
+replaced_properties.append(property)
   else:
 out_file.write(line)
 
+if len(propertyMap) - len(replaced_properties) > 0:
+  out_file.write(os.linesep)  #make sure we don't break last entry 
from original properties
+
+for key in propertyMap:
+  if key not in replaced_properties:
+out_file.write('='.join([key, propertyMap[key]]))
+out_file.write(os.linesep)
+
   def copy_custom_actions(self):
 original_folder = os.path.join(self.resources_folder, 'custom_actions')
 target_folder = os.path.join(self.output_folder, 'custom_actions')

http://git-wip-us.apache.org/repos/asf/ambari/blob/7bcbab3d/ambari-common/src/main/python/pluggable_stack_definition/configs/SAPHD.json
--
diff --git 
a/ambari-common/src/main/python/pluggable_stack_definition/configs/SAPHD.json 
b/ambari-common/src/main/python/pluggable_stack_definition/configs/SAPHD.json
index 176f4c5..37de54d 100644
--- 
a/ambari-common/src/main/python/pluggable_stack_definition/configs/SAPHD.json
+++ 
b/ambari-common/src/main/python/pluggable_stack_definition/configs/SAPHD.json
@@ -20,7 +20,8 @@
 "jdk1.8.url" : "http://DOWNLOAD_NOT_SUPPORTED;,
 "jdk1.7.jcpol-url" : "http://DOWNLOAD_NOT_SUPPORTED;,
 "jdk1.8.jcpol-url" : "http://DOWNLOAD_NOT_SUPPORTED;,
-"rolling.upgrade.min.stack" : "SAPHD-0.9"
+"rolling.upgrade.min.stack" : "SAPHD-0.9",
+"server.setup.default.dbms" : "sqlanywhere"
   },
   "common-services": [
 {

http://git-wip-us.apache.org/repos/asf/ambari/blob/7bcbab3d/ambari-server/src/main/python/ambari_server/dbConfiguration.py
--
diff --git a/ambari-server/src/main/python/ambari_server/dbConfiguration.py 
b/ambari-server/src/main/python/ambari_server/dbConfiguration.py
index 7a11cdc..2d39c72 100644
--- a/ambari-server/src/main/python/ambari_server/dbConfiguration.py
+++ b/ambari-server/src/main/python/ambari_server/dbConfiguration.py
@@ -27,7 +27,7 @@ from ambari_commons.os_family_impl import OsFamilyImpl
 from ambari_commons.str_utils import cbool
 from ambari_server.serverConfiguration import decrypt_password_for_alias, 
get_ambari_properties, get_is_secure, \
   get_resources_location, get_value_from_properties, is_alias_string, \
-  JDBC_PASSWORD_PROPERTY, JDBC_RCA_PASSWORD_ALIAS, PRESS_ENTER_MSG
+  JDBC_PASSWORD_PROPERTY, JDBC_RCA_PASSWORD_ALIAS, PRESS_ENTER_MSG, 
DEFAULT_DBMS_PROPERTY
 from 

ambari git commit: AMBARI-12920. “Oozie Quick links" in Ambari points to incorrect URL after enabling SSL. Additional fix (alexantonenko)

[alexantonenko]

Repository: ambari
Updated Branches:
  refs/heads/trunk 9b23a9b49 -> 9a05ae6a9


AMBARI-12920. “Oozie Quick links" in Ambari points to incorrect URL after 
enabling SSL. Additional fix (alexantonenko)


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

Branch: refs/heads/trunk
Commit: 9a05ae6a9b630b3873784fa25e84b333c98ebbcf
Parents: 9b23a9b
Author: Alex Antonenko 
Authored: Tue Sep 1 18:24:27 2015 +0300
Committer: Alex Antonenko 
Committed: Tue Sep 1 18:31:10 2015 +0300

--
 ambari-web/app/views/common/quick_view_link_view.js | 10 ++
 1 file changed, 6 insertions(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/9a05ae6a/ambari-web/app/views/common/quick_view_link_view.js
--
diff --git a/ambari-web/app/views/common/quick_view_link_view.js 
b/ambari-web/app/views/common/quick_view_link_view.js
index 9fa2044..522837e 100644
--- a/ambari-web/app/views/common/quick_view_link_view.js
+++ b/ambari-web/app/views/common/quick_view_link_view.js
@@ -382,16 +382,18 @@ App.QuickViewLinks = Em.View.extend({
 break;
   case "OOZIE":
 var site = configProperties.findProperty('type', 'oozie-site');
-var url = site && site.properties && site.properties['oozie.base.url'];
+var properties = site && site.properties;
+var url = properties && properties['oozie.base.url'];
 var re = new RegExp(item.get('regex'));
 var portValue = url && url.match(re);
 var port = portValue && portValue.length && portValue[1];
 var protocol = 'http';
-
-if (port === '11443') {
+var isHttpsPropertiesEnabled = properties && 
(properties['oozie.https.port'] ||
+  
properties['oozie.https.keystore.file'] ||
+  
properties['oozie.https.keystore.pass']);
+if (port === '11443' || isHttpsPropertiesEnabled) {
   protocol = 'https';
 }
-
 return protocol;
 break;
   case "RANGER":