ambari git commit: AMBARI-21711. Seeing SQL errors in ambari server log when installing HDF 3.1 (smohanty)

2017-08-11 Thread smohanty 
Repository: ambari
Updated Branches:
  refs/heads/trunk bc6cbf359 -> d9c271ae6


AMBARI-21711. Seeing SQL errors in ambari server log when installing HDF 3.1 
(smohanty)


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

Branch: refs/heads/trunk
Commit: d9c271ae61c285e3b4e066616f057d857797fec9
Parents: bc6cbf3
Author: Sumit Mohanty 
Authored: Fri Aug 11 16:35:00 2017 -0700
Committer: Sumit Mohanty 
Committed: Fri Aug 11 16:36:41 2017 -0700

--
 ambari-server/src/main/resources/host_scripts/alert_disk_space.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/d9c271ae/ambari-server/src/main/resources/host_scripts/alert_disk_space.py
--
diff --git a/ambari-server/src/main/resources/host_scripts/alert_disk_space.py 
b/ambari-server/src/main/resources/host_scripts/alert_disk_space.py
index f3c6406..eb92781 100644
--- a/ambari-server/src/main/resources/host_scripts/alert_disk_space.py
+++ b/ambari-server/src/main/resources/host_scripts/alert_disk_space.py
@@ -67,7 +67,7 @@ def execute(configurations={}, parameters={}, host_name=None):
 return (('UNKNOWN', ['There were no configurations supplied to the 
script.']))
 
   if not STACK_NAME in configurations or not STACK_ROOT in configurations:
-return (('STACK_ROOT', ['cluster-env/stack_name and cluster-env/stack_root 
are required']))
+return (('UNKNOWN', ['cluster-env/stack_name and cluster-env/stack_root 
are required']))
 
   path = stack_tools.get_stack_root(configurations[STACK_NAME], 
configurations[STACK_ROOT])

ambari git commit: AMBARI-21711. Seeing SQL errors in ambari server log when installing HDF 3.1 (smohanty)

2017-08-11 Thread smohanty 
Repository: ambari
Updated Branches:
  refs/heads/branch-2.6 0630899ce -> 7ab587612


AMBARI-21711. Seeing SQL errors in ambari server log when installing HDF 3.1 
(smohanty)


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

Branch: refs/heads/branch-2.6
Commit: 7ab5876124db25cc111d80d82afb94b29e607485
Parents: 0630899
Author: Sumit Mohanty 
Authored: Fri Aug 11 16:35:00 2017 -0700
Committer: Sumit Mohanty 
Committed: Fri Aug 11 16:36:12 2017 -0700

--
 ambari-server/src/main/resources/host_scripts/alert_disk_space.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/7ab58761/ambari-server/src/main/resources/host_scripts/alert_disk_space.py
--
diff --git a/ambari-server/src/main/resources/host_scripts/alert_disk_space.py 
b/ambari-server/src/main/resources/host_scripts/alert_disk_space.py
index f3c6406..eb92781 100644
--- a/ambari-server/src/main/resources/host_scripts/alert_disk_space.py
+++ b/ambari-server/src/main/resources/host_scripts/alert_disk_space.py
@@ -67,7 +67,7 @@ def execute(configurations={}, parameters={}, host_name=None):
 return (('UNKNOWN', ['There were no configurations supplied to the 
script.']))
 
   if not STACK_NAME in configurations or not STACK_ROOT in configurations:
-return (('STACK_ROOT', ['cluster-env/stack_name and cluster-env/stack_root 
are required']))
+return (('UNKNOWN', ['cluster-env/stack_name and cluster-env/stack_root 
are required']))
 
   path = stack_tools.get_stack_root(configurations[STACK_NAME], 
configurations[STACK_ROOT])

ambari git commit: AMBARI-21711. Seeing SQL errors in ambari server log when installing HDF 3.1 (smohanty)

2017-08-11 Thread smohanty 
Repository: ambari
Updated Branches:
  refs/heads/branch-2.5 aa9d866e7 -> 5f750176f


AMBARI-21711. Seeing SQL errors in ambari server log when installing HDF 3.1 
(smohanty)


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

Branch: refs/heads/branch-2.5
Commit: 5f750176f0c1fb88b7577aa69d3054ded6382f93
Parents: aa9d866
Author: Sumit Mohanty 
Authored: Fri Aug 11 16:35:00 2017 -0700
Committer: Sumit Mohanty 
Committed: Fri Aug 11 16:35:00 2017 -0700

--
 ambari-server/src/main/resources/host_scripts/alert_disk_space.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/5f750176/ambari-server/src/main/resources/host_scripts/alert_disk_space.py
--
diff --git a/ambari-server/src/main/resources/host_scripts/alert_disk_space.py 
b/ambari-server/src/main/resources/host_scripts/alert_disk_space.py
index f3c6406..eb92781 100644
--- a/ambari-server/src/main/resources/host_scripts/alert_disk_space.py
+++ b/ambari-server/src/main/resources/host_scripts/alert_disk_space.py
@@ -67,7 +67,7 @@ def execute(configurations={}, parameters={}, host_name=None):
 return (('UNKNOWN', ['There were no configurations supplied to the 
script.']))
 
   if not STACK_NAME in configurations or not STACK_ROOT in configurations:
-return (('STACK_ROOT', ['cluster-env/stack_name and cluster-env/stack_root 
are required']))
+return (('UNKNOWN', ['cluster-env/stack_name and cluster-env/stack_root 
are required']))
 
   path = stack_tools.get_stack_root(configurations[STACK_NAME], 
configurations[STACK_ROOT])

ambari git commit: AMBARI-21706 : Fix exception messages whenever empty host list is passed in predicate. (avijayan)

2017-08-11 Thread avijayan 
Repository: ambari
Updated Branches:
  refs/heads/trunk 10b1efbc4 -> bc6cbf359


AMBARI-21706 : Fix exception messages whenever empty host list is passed in 
predicate. (avijayan)


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

Branch: refs/heads/trunk
Commit: bc6cbf3596247c79c6a2aad9047ebe6a2d1cf27b
Parents: 10b1efb
Author: Aravindan Vijayan 
Authored: Fri Aug 11 12:03:54 2017 -0700
Committer: Aravindan Vijayan 
Committed: Fri Aug 11 12:03:54 2017 -0700

--
 .../server/api/predicate/QueryParser.java   |  4 +++-
 .../api/predicate/operators/InOperator.java |  2 +-
 .../internal/StackAdvisorResourceProvider.java  | 20 +---
 .../server/api/predicate/QueryParserTest.java   | 18 ++
 .../StackAdvisorResourceProviderTest.java   | 25 
 5 files changed, 64 insertions(+), 5 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/bc6cbf35/ambari-server/src/main/java/org/apache/ambari/server/api/predicate/QueryParser.java
--
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/api/predicate/QueryParser.java
 
b/ambari-server/src/main/java/org/apache/ambari/server/api/predicate/QueryParser.java
index 3ce0958..005c151 100644
--- 
a/ambari-server/src/main/java/org/apache/ambari/server/api/predicate/QueryParser.java
+++ 
b/ambari-server/src/main/java/org/apache/ambari/server/api/predicate/QueryParser.java
@@ -107,7 +107,9 @@ public class QueryParser {
 if (keyObject != null) {
   String key = keyObject.toString();
   if (key.endsWith("/host_name")) {
-
expression.setRightOperand(expression.getRightOperand().toString().toLowerCase());
+if (expression.getRightOperand() != null) {
+  
expression.setRightOperand(expression.getRightOperand().toString().toLowerCase());
+}
   }
 }
   }

http://git-wip-us.apache.org/repos/asf/ambari/blob/bc6cbf35/ambari-server/src/main/java/org/apache/ambari/server/api/predicate/operators/InOperator.java
--
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/api/predicate/operators/InOperator.java
 
b/ambari-server/src/main/java/org/apache/ambari/server/api/predicate/operators/InOperator.java
index 75ae5de..1dc5a14 100644
--- 
a/ambari-server/src/main/java/org/apache/ambari/server/api/predicate/operators/InOperator.java
+++ 
b/ambari-server/src/main/java/org/apache/ambari/server/api/predicate/operators/InOperator.java
@@ -47,7 +47,7 @@ public class InOperator extends AbstractOperator implements 
RelationalOperator {
   public Predicate toPredicate(String prop, String val) throws 
InvalidQueryException {
 
 if (val == null) {
-  throw new InvalidQueryException("IN operator is missing a required right 
operand.");
+  throw new InvalidQueryException("IN operator is missing a required right 
operand for property " + prop);
 }
 
 String[] tokens = val.split(",");

http://git-wip-us.apache.org/repos/asf/ambari/blob/bc6cbf35/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/StackAdvisorResourceProvider.java
--
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/StackAdvisorResourceProvider.java
 
b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/StackAdvisorResourceProvider.java
index 2eed23d..a162097 100644
--- 
a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/StackAdvisorResourceProvider.java
+++ 
b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/StackAdvisorResourceProvider.java
@@ -21,6 +21,7 @@ package org.apache.ambari.server.controller.internal;
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.HashSet;
+import java.util.LinkedHashSet;
 import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
@@ -106,8 +107,22 @@ public abstract class StackAdvisorResourceProvider extends 
ReadOnlyResourceProvi
* 
* @see JsonRequestBodyParser for arrays parsing
*/
-  List hosts = (List) getRequestProperty(request, 
HOST_PROPERTY);
-  List services = (List) getRequestProperty(request, 
SERVICES_PROPERTY);
+  Object hostsObject = getRequestProperty(request, HOST_PROPERTY);
+  if (hostsObject instanceof LinkedHashSet) {
+if (((LinkedHashSet)hostsObject).isEmpty()) {
+  throw new

ambari git commit: AMBARI-21706 : Fix exception messages whenever empty host list is passed in predicate. (avijayan)

2017-08-11 Thread avijayan 
Repository: ambari
Updated Branches:
  refs/heads/branch-2.6 cfa299883 -> 0630899ce


AMBARI-21706 : Fix exception messages whenever empty host list is passed in 
predicate. (avijayan)


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

Branch: refs/heads/branch-2.6
Commit: 0630899ce80dcc2cbac76090480e33b592658f04
Parents: cfa2998
Author: Aravindan Vijayan 
Authored: Fri Aug 11 12:00:07 2017 -0700
Committer: Aravindan Vijayan 
Committed: Fri Aug 11 12:00:07 2017 -0700

--
 .../server/api/predicate/QueryParser.java   |  4 ++-
 .../api/predicate/operators/InOperator.java |  2 +-
 .../internal/StackAdvisorResourceProvider.java  | 20 ---
 .../server/api/predicate/QueryParserTest.java   | 18 ++
 .../StackAdvisorResourceProviderTest.java   | 26 
 5 files changed, 65 insertions(+), 5 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/0630899c/ambari-server/src/main/java/org/apache/ambari/server/api/predicate/QueryParser.java
--
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/api/predicate/QueryParser.java
 
b/ambari-server/src/main/java/org/apache/ambari/server/api/predicate/QueryParser.java
index 7386813..6e189c5 100644
--- 
a/ambari-server/src/main/java/org/apache/ambari/server/api/predicate/QueryParser.java
+++ 
b/ambari-server/src/main/java/org/apache/ambari/server/api/predicate/QueryParser.java
@@ -107,7 +107,9 @@ public class QueryParser {
 if (keyObject != null) {
   String key = keyObject.toString();
   if (key.endsWith("/host_name")) {
-
expression.setRightOperand(expression.getRightOperand().toString().toLowerCase());
+if (expression.getRightOperand() != null) {
+  
expression.setRightOperand(expression.getRightOperand().toString().toLowerCase());
+}
   }
 }
   }

http://git-wip-us.apache.org/repos/asf/ambari/blob/0630899c/ambari-server/src/main/java/org/apache/ambari/server/api/predicate/operators/InOperator.java
--
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/api/predicate/operators/InOperator.java
 
b/ambari-server/src/main/java/org/apache/ambari/server/api/predicate/operators/InOperator.java
index 629c3fc..eedf2bb 100644
--- 
a/ambari-server/src/main/java/org/apache/ambari/server/api/predicate/operators/InOperator.java
+++ 
b/ambari-server/src/main/java/org/apache/ambari/server/api/predicate/operators/InOperator.java
@@ -47,7 +47,7 @@ public class InOperator extends AbstractOperator implements 
RelationalOperator {
   public Predicate toPredicate(String prop, String val) throws 
InvalidQueryException {
 
 if (val == null) {
-  throw new InvalidQueryException("IN operator is missing a required right 
operand.");
+  throw new InvalidQueryException("IN operator is missing a required right 
operand for property " + prop);
 }
 
 String[] tokens = val.split(",");

http://git-wip-us.apache.org/repos/asf/ambari/blob/0630899c/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/StackAdvisorResourceProvider.java
--
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/StackAdvisorResourceProvider.java
 
b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/StackAdvisorResourceProvider.java
index 5bb52c2..dd32c6b 100644
--- 
a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/StackAdvisorResourceProvider.java
+++ 
b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/StackAdvisorResourceProvider.java
@@ -21,6 +21,7 @@ package org.apache.ambari.server.controller.internal;
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.HashSet;
+import java.util.LinkedHashSet;
 import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
@@ -107,8 +108,22 @@ public abstract class StackAdvisorResourceProvider extends 
ReadOnlyResourceProvi
* 
* @see JsonRequestBodyParser for arrays parsing
*/
-  List hosts = (List) getRequestProperty(request, 
HOST_PROPERTY);
-  List services = (List) getRequestProperty(request, 
SERVICES_PROPERTY);
+  Object hostsObject = getRequestProperty(request, HOST_PROPERTY);
+  if (hostsObject instanceof LinkedHashSet) {
+if (((LinkedHashSet)hostsObject).isEmpty()) {
+

ambari git commit: AMBARI-21709 Finalize Warns that it is Permanent Even For PATCH Upgrades. (atkach)

2017-08-11 Thread atkach 
Repository: ambari
Updated Branches:
  refs/heads/branch-feature-AMBARI-21450 fad21fb52 -> 0aba12139


AMBARI-21709 Finalize Warns that it is Permanent Even For PATCH Upgrades. 
(atkach)


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

Branch: refs/heads/branch-feature-AMBARI-21450
Commit: 0aba12139d749224f69529a30b57f88da7c9e1d6
Parents: fad21fb
Author: Andrii Tkach 
Authored: Fri Aug 11 16:48:47 2017 +0300
Committer: Andrii Tkach 
Committed: Fri Aug 11 16:48:47 2017 +0300

--
 ambari-web/app/messages.js  |  2 ++
 .../admin/stack_upgrade/stack_upgrade_wizard.hbs|  6 +-
 .../main/admin/stack_upgrade/upgrade_wizard_view.js | 16 
 3 files changed, 23 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/0aba1213/ambari-web/app/messages.js
--
diff --git a/ambari-web/app/messages.js b/ambari-web/app/messages.js
index 219438e..a0dcf8c 100644
--- a/ambari-web/app/messages.js
+++ b/ambari-web/app/messages.js
@@ -1812,6 +1812,8 @@ Em.I18n.translations = {
 "Click on Finalize when you are ready to finalize the downgrade and 
commit to the new version." +
 " You are strongly encouraged to run tests on your cluster to ensure it is 
fully operational before finalizing." +
 " You cannot go back to the original version once the downgrade is 
finalized.",
+  'admin.stackUpgrade.finalize.message.revertible': "The {0} upgrade to 
{1} is ready to be completed." +
+  " After finalization, the patch can be reverted from the Stacks and Versions 
page if it is no longer required.",
   'admin.stackUpgrade.finalize.message.autoStart': "Please remember to 
re-enable Auto Start if you disabled it for upgrade.",
   'admin.stackUpgrade.finalize.message.skippedServiceChecks': "During the 
upgrade, checks for the following services failed and were skipped:",
   'admin.stackUpgrade.finalize.message.testServices': "You are strongly 
recommended to test these services before finalizing upgrade.",

http://git-wip-us.apache.org/repos/asf/ambari/blob/0aba1213/ambari-web/app/templates/main/admin/stack_upgrade/stack_upgrade_wizard.hbs
--
diff --git 
a/ambari-web/app/templates/main/admin/stack_upgrade/stack_upgrade_wizard.hbs 
b/ambari-web/app/templates/main/admin/stack_upgrade/stack_upgrade_wizard.hbs
index 37727bb..693d5e4 100644
--- a/ambari-web/app/templates/main/admin/stack_upgrade/stack_upgrade_wizard.hbs
+++ b/ambari-web/app/templates/main/admin/stack_upgrade/stack_upgrade_wizard.hbs
@@ -128,7 +128,11 @@
 {{#if isDowngrade}}
   {{t 
admin.stackUpgrade.finalize.message.downgrade}}
 {{else}}
-  {{t 
admin.stackUpgrade.finalize.message.upgrade}}
+{{#if view.isRevertibleUpgrade}}
+  {{{view.revertibleFinalizeMessage}}}
+{{else}}
+  {{t 
admin.stackUpgrade.finalize.message.upgrade}}
+{{/if}}
 {{/if}}
   {{t 
admin.stackUpgrade.finalize.message.autoStart}}
 

http://git-wip-us.apache.org/repos/asf/ambari/blob/0aba1213/ambari-web/app/views/main/admin/stack_upgrade/upgrade_wizard_view.js
--
diff --git 
a/ambari-web/app/views/main/admin/stack_upgrade/upgrade_wizard_view.js 
b/ambari-web/app/views/main/admin/stack_upgrade/upgrade_wizard_view.js
index 3b269a0..e3f7cb7 100644
--- a/ambari-web/app/views/main/admin/stack_upgrade/upgrade_wizard_view.js
+++ b/ambari-web/app/views/main/admin/stack_upgrade/upgrade_wizard_view.js
@@ -208,6 +208,22 @@ App.upgradeWizardView = Em.View.extend({
   isFinalizeItem: Em.computed.equalProperties('manualItem.context', 
'controller.finalizeContext'),
 
   /**
+   * Upgrade of PATCH or MAINT version is revertible
+   */
+  isRevertibleUpgrade: function() {
+var associatedVersion = 
this.get('controller.upgradeData.Upgrade.associated_version');
+var upgradeVersion = 
App.RepositoryVersion.find().findProperty('repositoryVersion', 
associatedVersion);
+return ['PATCH', 'MAINT'].contains(upgradeVersion.get('type'));
+  }.property('controller.upgradeData.Upgrade.associated_version'),
+
+  revertibleFinalizeMessage: function() {
+var associatedVersion = 
this.get('controller.upgradeData.Upgrade.associated_version');
+var upgradeVersion = 
App.RepositoryVersion.find().findProperty('repositoryVersion', 
associatedVersion);
+return

ambari git commit: AMBARI-21692 dfs.include file is created on all datanode hosts when Ambari manages include/exclude file (dsen)

2017-08-11 Thread stoader 
Repository: ambari
Updated Branches:
  refs/heads/feature-improved-rack-awareness-handling faf5d9079 -> 10b1efbc4


AMBARI-21692 dfs.include file is created on all datanode hosts when Ambari 
manages include/exclude file (dsen)


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

Branch: refs/heads/feature-improved-rack-awareness-handling
Commit: 10b1efbc40b5d7dcd3d26e153f8e17125be747e8
Parents: faf5d90
Author: Dmytro Sen 
Authored: Fri Aug 11 13:36:46 2017 +0300
Committer: Dmytro Sen 
Committed: Fri Aug 11 13:36:46 2017 +0300

--
 .../2.1.0.2.0/package/scripts/hdfs_snamenode.py |  6 ++
 .../3.0.0.3.0/package/scripts/hdfs_snamenode.py |  6 ++
 .../before-START/scripts/shared_initialization.py   | 15 ---
 .../services/HDFS/package/scripts/hdfs_snamenode.py |  6 ++
 .../before-START/scripts/shared_initialization.py   | 16 +---
 .../before-START/scripts/shared_initialization.py   | 16 +---
 .../before-START/scripts/shared_initialization.py   | 14 --
 .../before-START/scripts/shared_initialization.py   | 14 --
 8 files changed, 20 insertions(+), 73 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/10b1efbc/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/package/scripts/hdfs_snamenode.py
--
diff --git 
a/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/package/scripts/hdfs_snamenode.py
 
b/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/package/scripts/hdfs_snamenode.py
index 8d4c40c..0eaeef4 100644
--- 
a/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/package/scripts/hdfs_snamenode.py
+++ 
b/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/package/scripts/hdfs_snamenode.py
@@ -39,6 +39,12 @@ def snamenode(action=None, format=False):
  content=Template("exclude_hosts_list.j2"),
  owner=params.hdfs_user,
  group=params.user_group)
+if params.hdfs_include_file:
+  File(params.include_file_path,
+ content=Template("include_hosts_list.j2"),
+ owner=params.hdfs_user,
+ group=params.user_group)
+  pass
   elif action == "start" or action == "stop":
 import params
 service(

http://git-wip-us.apache.org/repos/asf/ambari/blob/10b1efbc/ambari-server/src/main/resources/common-services/HDFS/3.0.0.3.0/package/scripts/hdfs_snamenode.py
--
diff --git 
a/ambari-server/src/main/resources/common-services/HDFS/3.0.0.3.0/package/scripts/hdfs_snamenode.py
 
b/ambari-server/src/main/resources/common-services/HDFS/3.0.0.3.0/package/scripts/hdfs_snamenode.py
index 8d4c40c..0eaeef4 100644
--- 
a/ambari-server/src/main/resources/common-services/HDFS/3.0.0.3.0/package/scripts/hdfs_snamenode.py
+++ 
b/ambari-server/src/main/resources/common-services/HDFS/3.0.0.3.0/package/scripts/hdfs_snamenode.py
@@ -39,6 +39,12 @@ def snamenode(action=None, format=False):
  content=Template("exclude_hosts_list.j2"),
  owner=params.hdfs_user,
  group=params.user_group)
+if params.hdfs_include_file:
+  File(params.include_file_path,
+ content=Template("include_hosts_list.j2"),
+ owner=params.hdfs_user,
+ group=params.user_group)
+  pass
   elif action == "start" or action == "stop":
 import params
 service(

http://git-wip-us.apache.org/repos/asf/ambari/blob/10b1efbc/ambari-server/src/main/resources/stacks/BIGTOP/0.8/hooks/before-START/scripts/shared_initialization.py
--
diff --git 
a/ambari-server/src/main/resources/stacks/BIGTOP/0.8/hooks/before-START/scripts/shared_initialization.py
 
b/ambari-server/src/main/resources/stacks/BIGTOP/0.8/hooks/before-START/scripts/shared_initialization.py
index 265502f..cba724a 100644
--- 
a/ambari-server/src/main/resources/stacks/BIGTOP/0.8/hooks/before-START/scripts/shared_initialization.py
+++ 
b/ambari-server/src/main/resources/stacks/BIGTOP/0.8/hooks/before-START/scripts/shared_initialization.py
@@ -137,21 +137,6 @@ def setup_configs():
 group=params.user_group
   )
 
-  generate_include_file()
-
-
-def generate_include_file():
-  import params
-
-  if params.has_namenode and params.dfs_hosts and params.has_slaves:
-include_hosts_list = params.slave_hosts
-File(params.dfs_hosts,
- content=Template("include_hosts_list.j2"),
- owner=params.hdfs_user,
- group=params.user_group
-

ambari git commit: AMBARI-21619. More ResourceManager HA host group placeholders in blueprints

2017-08-11 Thread adoroszlai 
Repository: ambari
Updated Branches:
  refs/heads/branch-2.6 9e8a039bc -> 78684fb7c


AMBARI-21619. More ResourceManager HA host group placeholders in blueprints


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

Branch: refs/heads/branch-2.6
Commit: 78684fb7cb5058eb5ada6ab8fc8bcf664c24df9e
Parents: 9e8a039
Author: Attila Doroszlai 
Authored: Tue Aug 1 14:22:37 2017 +0200
Committer: Attila Doroszlai 
Committed: Fri Aug 11 13:50:47 2017 +0200

--
 .../BlueprintConfigurationProcessor.java| 18 +--
 .../BlueprintConfigurationProcessorTest.java| 34 +---
 2 files changed, 31 insertions(+), 21 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/78684fb7/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/BlueprintConfigurationProcessor.java
--
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/BlueprintConfigurationProcessor.java
 
b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/BlueprintConfigurationProcessor.java
index 5fd2b5b..ab6a586 100644
--- 
a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/BlueprintConfigurationProcessor.java
+++ 
b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/BlueprintConfigurationProcessor.java
@@ -899,14 +899,14 @@ public class BlueprintConfigurationProcessor {
 Map yarnSiteConfig = 
clusterTopology.getConfiguration().getFullProperties().get("yarn-site");
 // generate the property names based on the current HA config for the 
ResourceManager deployments
 for (String resourceManager : parseResourceManagers(yarnSiteConfig)) {
-  final String rmHostPropertyName = "yarn.resourcemanager.hostname." + 
resourceManager;
-  yarnSiteUpdatersForAvailability.put(rmHostPropertyName, new 
SingleHostTopologyUpdater("RESOURCEMANAGER"));
-
-  final String rmHTTPAddress = "yarn.resourcemanager.webapp.address." + 
resourceManager;
-  yarnSiteUpdatersForAvailability.put(rmHTTPAddress, new 
SingleHostTopologyUpdater("RESOURCEMANAGER"));
-
-  final String rmHTTPSAddress = 
"yarn.resourcemanager.webapp.https.address." + resourceManager;
-  yarnSiteUpdatersForAvailability.put(rmHTTPSAddress, new 
SingleHostTopologyUpdater("RESOURCEMANAGER"));
+  SingleHostTopologyUpdater updater = new 
SingleHostTopologyUpdater("RESOURCEMANAGER");
+  yarnSiteUpdatersForAvailability.put("yarn.resourcemanager.hostname." + 
resourceManager, updater);
+  yarnSiteUpdatersForAvailability.put("yarn.resourcemanager.address." + 
resourceManager, updater);
+  
yarnSiteUpdatersForAvailability.put("yarn.resourcemanager.admin.address." + 
resourceManager, updater);
+  
yarnSiteUpdatersForAvailability.put("yarn.resourcemanager.resource-tracker.address."
 + resourceManager, updater);
+  
yarnSiteUpdatersForAvailability.put("yarn.resourcemanager.scheduler.address." + 
resourceManager, updater);
+  
yarnSiteUpdatersForAvailability.put("yarn.resourcemanager.webapp.address." + 
resourceManager, updater);
+  
yarnSiteUpdatersForAvailability.put("yarn.resourcemanager.webapp.https.address."
 + resourceManager, updater);
 }
 
 return highAvailabilityUpdaters;
@@ -1341,7 +1341,7 @@ public class BlueprintConfigurationProcessor {
 /**
  * Component name
  */
-private String component;
+private final String component;
 
 /**
  * Constructor.

http://git-wip-us.apache.org/repos/asf/ambari/blob/78684fb7/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/BlueprintConfigurationProcessorTest.java
--
diff --git 
a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/BlueprintConfigurationProcessorTest.java
 
b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/BlueprintConfigurationProcessorTest.java
index c5af0d9..1959610 100644
--- 
a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/BlueprintConfigurationProcessorTest.java
+++ 
b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/BlueprintConfigurationProcessorTest.java
@@ -3359,6 +3359,14 @@ public class BlueprintConfigurationProcessorTest extends 
EasyMockSupport {
 yarnSiteProperties.put("yarn.resourcemanager.ha.rm-ids", "rm1, rm2");
 yarnSiteProperties.put("yarn.resourcemanager.hostname.rm1", 
expectedHostName);

ambari git commit: AMBARI-21703. UI must consume API to show whether a service will be upgraded (alexantonenko)

2017-08-11 Thread alexantonenko 
Repository: ambari
Updated Branches:
  refs/heads/branch-feature-AMBARI-21450 9232f35cb -> fad21fb52


AMBARI-21703. UI must consume API to show whether a service will be upgraded 
(alexantonenko)


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

Branch: refs/heads/branch-feature-AMBARI-21450
Commit: fad21fb5261e05626a10003e06f21cb588018d7c
Parents: 9232f35
Author: Alex Antonenko 
Authored: Thu Aug 10 16:59:42 2017 +0300
Committer: Alex Antonenko 
Committed: Fri Aug 11 14:50:17 2017 +0300

--
 ambari-web/app/mappers/repository_version_mapper.js  | 3 ++-
 ambari-web/app/mappers/stack_version_mapper.js   | 5 -
 ambari-web/app/messages.js   | 2 ++
 ambari-web/app/models/stack_version/service_simple.js| 3 ++-
 ambari-web/app/styles/stack_versions.less| 8 
 .../main/admin/stack_upgrade/upgrade_version_column.hbs  | 3 +++
 .../main/admin/stack_upgrade/upgrade_version_column_view.js  | 6 +-
 7 files changed, 26 insertions(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/fad21fb5/ambari-web/app/mappers/repository_version_mapper.js
--
diff --git a/ambari-web/app/mappers/repository_version_mapper.js 
b/ambari-web/app/mappers/repository_version_mapper.js
index 704b24e..3a0a80a 100644
--- a/ambari-web/app/mappers/repository_version_mapper.js
+++ b/ambari-web/app/mappers/repository_version_mapper.js
@@ -121,7 +121,8 @@ App.repoVersionMapper = App.QuickDataMapper.create({
 name: service.name,
 display_name: service.display_name,
 latest_version: service.versions[0] ? service.versions[0] : '',
-is_available: 
item[repoVersionsKey].services.someProperty('name', service.name)
+is_available: 
item[repoVersionsKey].services.someProperty('name', service.name),
+is_upgradable: json.stackServices[service.name] && 
json.stackServices[service.name].upgrade
   };
   resultService.push(serviceObj);
 }, this);

http://git-wip-us.apache.org/repos/asf/ambari/blob/fad21fb5/ambari-web/app/mappers/stack_version_mapper.js
--
diff --git a/ambari-web/app/mappers/stack_version_mapper.js 
b/ambari-web/app/mappers/stack_version_mapper.js
index 62187b0..2b091a0 100644
--- a/ambari-web/app/mappers/stack_version_mapper.js
+++ b/ambari-web/app/mappers/stack_version_mapper.js
@@ -77,7 +77,10 @@ App.stackVersionMapper = App.QuickDataMapper.create({
 
 if (item.repository_versions && item.repository_versions[0]) {
   item.repository_versions[0].RepositoryVersions.stackVersionId = 
item.ClusterStackVersions.id;
-  App.repoVersionMapper.map({"items": item.repository_versions }, 
true, true);
+  App.repoVersionMapper.map({
+"items": item.repository_versions,
+"stackServices": 
item.ClusterStackVersions.repository_summary.services
+  }, true, true);
 }
 resultStack.push(this.parseIt(stack, this.get('modelStack')));
   }, this);

http://git-wip-us.apache.org/repos/asf/ambari/blob/fad21fb5/ambari-web/app/messages.js
--
diff --git a/ambari-web/app/messages.js b/ambari-web/app/messages.js
index 1e30536..219438e 100644
--- a/ambari-web/app/messages.js
+++ b/ambari-web/app/messages.js
@@ -1735,6 +1735,8 @@ Em.I18n.translations = {
   'admin.stackDowngrade.state.paused.fail.header': "Pause Downgrade failed",
   'admin.stackDowngrade.state.paused.fail.body': "Downgrade could not be 
paused. Try again later.",
 
+  'admin.stackVersions.version.service.notUpgradable': "Update available, but 
already installed.",
+
   'admin.stackVersions.version.upgrade.upgradeOptions.header': "Upgrade 
Options",
   'admin.stackVersions.version.upgrade.upgradeOptions.bodyMsg.version': "You 
are about to perform an upgrade to {0}.",
   'admin.stackVersions.version.upgrade.upgradeOptions.bodyMsg.method': "Choose 
the upgrade method:",

http://git-wip-us.apache.org/repos/asf/ambari/blob/fad21fb5/ambari-web/app/models/stack_version/service_simple.js
--
diff --git a/ambari-web/app/models/stack_version/service_simple.js 
b/ambari-web/app/models/stack_version/service_simple.js
index 0e5df14..e3e2f48 100644
--- a/ambari-web/app/models/stack_version/service_simple.js
+++

ambari git commit: AMBARI-21692 dfs.include file is created on all datanode hosts when Ambari manages include/exclude files (dsen)

2017-08-11 Thread dsen 
Repository: ambari
Updated Branches:
  refs/heads/branch-2.6 dba278bfb -> 9e8a039bc


AMBARI-21692 dfs.include file is created on all datanode hosts when Ambari 
manages include/exclude files (dsen)


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

Branch: refs/heads/branch-2.6
Commit: 9e8a039bc2bf559ab54a987315b2c6c749c2512b
Parents: dba278b
Author: Dmytro Sen 
Authored: Fri Aug 11 13:38:46 2017 +0300
Committer: Dmytro Sen 
Committed: Fri Aug 11 13:39:28 2017 +0300

--
 .../2.1.0.2.0/package/scripts/hdfs_snamenode.py |  6 ++
 .../before-START/scripts/shared_initialization.py   | 15 ---
 .../services/HDFS/package/scripts/hdfs_snamenode.py |  6 ++
 .../before-START/scripts/shared_initialization.py   | 16 +---
 .../before-START/scripts/shared_initialization.py   | 14 --
 5 files changed, 13 insertions(+), 44 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/9e8a039b/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/package/scripts/hdfs_snamenode.py
--
diff --git 
a/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/package/scripts/hdfs_snamenode.py
 
b/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/package/scripts/hdfs_snamenode.py
index 500ed15..ef6a2e2 100644
--- 
a/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/package/scripts/hdfs_snamenode.py
+++ 
b/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/package/scripts/hdfs_snamenode.py
@@ -37,6 +37,12 @@ def snamenode(action=None, format=False):
  content=Template("exclude_hosts_list.j2"),
  owner=params.hdfs_user,
  group=params.user_group)
+if params.hdfs_include_file:
+  File(params.include_file_path,
+ content=Template("include_hosts_list.j2"),
+ owner=params.hdfs_user,
+ group=params.user_group)
+  pass
   elif action == "start" or action == "stop":
 import params
 service(

http://git-wip-us.apache.org/repos/asf/ambari/blob/9e8a039b/ambari-server/src/main/resources/stacks/BIGTOP/0.8/hooks/before-START/scripts/shared_initialization.py
--
diff --git 
a/ambari-server/src/main/resources/stacks/BIGTOP/0.8/hooks/before-START/scripts/shared_initialization.py
 
b/ambari-server/src/main/resources/stacks/BIGTOP/0.8/hooks/before-START/scripts/shared_initialization.py
index 265502f..cba724a 100644
--- 
a/ambari-server/src/main/resources/stacks/BIGTOP/0.8/hooks/before-START/scripts/shared_initialization.py
+++ 
b/ambari-server/src/main/resources/stacks/BIGTOP/0.8/hooks/before-START/scripts/shared_initialization.py
@@ -137,21 +137,6 @@ def setup_configs():
 group=params.user_group
   )
 
-  generate_include_file()
-
-
-def generate_include_file():
-  import params
-
-  if params.has_namenode and params.dfs_hosts and params.has_slaves:
-include_hosts_list = params.slave_hosts
-File(params.dfs_hosts,
- content=Template("include_hosts_list.j2"),
- owner=params.hdfs_user,
- group=params.user_group
-)
-
-
 def install_snappy():
   import params
 

http://git-wip-us.apache.org/repos/asf/ambari/blob/9e8a039b/ambari-server/src/main/resources/stacks/BIGTOP/0.8/services/HDFS/package/scripts/hdfs_snamenode.py
--
diff --git 
a/ambari-server/src/main/resources/stacks/BIGTOP/0.8/services/HDFS/package/scripts/hdfs_snamenode.py
 
b/ambari-server/src/main/resources/stacks/BIGTOP/0.8/services/HDFS/package/scripts/hdfs_snamenode.py
index e734973..b7e4044 100644
--- 
a/ambari-server/src/main/resources/stacks/BIGTOP/0.8/services/HDFS/package/scripts/hdfs_snamenode.py
+++ 
b/ambari-server/src/main/resources/stacks/BIGTOP/0.8/services/HDFS/package/scripts/hdfs_snamenode.py
@@ -35,6 +35,12 @@ def snamenode(action=None, format=False):
  content=Template("exclude_hosts_list.j2"),
  owner=params.hdfs_user,
  group=params.user_group)
+if params.hdfs_include_file:
+  File(params.include_file_path,
+ content=Template("include_hosts_list.j2"),
+ owner=params.hdfs_user,
+ group=params.user_group)
+  pass
   elif action == "start" or action == "stop":
 service(
   action=action,

http://git-wip-us.apache.org/repos/asf/ambari/blob/9e8a039b/ambari-server/src/main/resources/stacks/HDP/2.0.6/hooks/before-START/scripts/shared_initialization.py

ambari git commit: AMBARI-21692 dfs.include file is created on all datanode hosts when Ambari manages include/exclude files (dsen)

2017-08-11 Thread dsen 
Repository: ambari
Updated Branches:
  refs/heads/branch-2.5 ee87b6ab6 -> aa9d866e7


AMBARI-21692 dfs.include file is created on all datanode hosts when Ambari 
manages include/exclude files (dsen)


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

Branch: refs/heads/branch-2.5
Commit: aa9d866e7c4df1bdff665bec3154e3731cd8f5a7
Parents: ee87b6a
Author: Dmytro Sen 
Authored: Fri Aug 11 13:38:46 2017 +0300
Committer: Dmytro Sen 
Committed: Fri Aug 11 13:38:46 2017 +0300

--
 .../2.1.0.2.0/package/scripts/hdfs_snamenode.py |  6 ++
 .../before-START/scripts/shared_initialization.py   | 15 ---
 .../services/HDFS/package/scripts/hdfs_snamenode.py |  6 ++
 .../before-START/scripts/shared_initialization.py   | 16 +---
 .../before-START/scripts/shared_initialization.py   | 14 --
 5 files changed, 13 insertions(+), 44 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/aa9d866e/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/package/scripts/hdfs_snamenode.py
--
diff --git 
a/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/package/scripts/hdfs_snamenode.py
 
b/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/package/scripts/hdfs_snamenode.py
index 500ed15..ef6a2e2 100644
--- 
a/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/package/scripts/hdfs_snamenode.py
+++ 
b/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/package/scripts/hdfs_snamenode.py
@@ -37,6 +37,12 @@ def snamenode(action=None, format=False):
  content=Template("exclude_hosts_list.j2"),
  owner=params.hdfs_user,
  group=params.user_group)
+if params.hdfs_include_file:
+  File(params.include_file_path,
+ content=Template("include_hosts_list.j2"),
+ owner=params.hdfs_user,
+ group=params.user_group)
+  pass
   elif action == "start" or action == "stop":
 import params
 service(

http://git-wip-us.apache.org/repos/asf/ambari/blob/aa9d866e/ambari-server/src/main/resources/stacks/BIGTOP/0.8/hooks/before-START/scripts/shared_initialization.py
--
diff --git 
a/ambari-server/src/main/resources/stacks/BIGTOP/0.8/hooks/before-START/scripts/shared_initialization.py
 
b/ambari-server/src/main/resources/stacks/BIGTOP/0.8/hooks/before-START/scripts/shared_initialization.py
index 265502f..cba724a 100644
--- 
a/ambari-server/src/main/resources/stacks/BIGTOP/0.8/hooks/before-START/scripts/shared_initialization.py
+++ 
b/ambari-server/src/main/resources/stacks/BIGTOP/0.8/hooks/before-START/scripts/shared_initialization.py
@@ -137,21 +137,6 @@ def setup_configs():
 group=params.user_group
   )
 
-  generate_include_file()
-
-
-def generate_include_file():
-  import params
-
-  if params.has_namenode and params.dfs_hosts and params.has_slaves:
-include_hosts_list = params.slave_hosts
-File(params.dfs_hosts,
- content=Template("include_hosts_list.j2"),
- owner=params.hdfs_user,
- group=params.user_group
-)
-
-
 def install_snappy():
   import params
 

http://git-wip-us.apache.org/repos/asf/ambari/blob/aa9d866e/ambari-server/src/main/resources/stacks/BIGTOP/0.8/services/HDFS/package/scripts/hdfs_snamenode.py
--
diff --git 
a/ambari-server/src/main/resources/stacks/BIGTOP/0.8/services/HDFS/package/scripts/hdfs_snamenode.py
 
b/ambari-server/src/main/resources/stacks/BIGTOP/0.8/services/HDFS/package/scripts/hdfs_snamenode.py
index e734973..b7e4044 100644
--- 
a/ambari-server/src/main/resources/stacks/BIGTOP/0.8/services/HDFS/package/scripts/hdfs_snamenode.py
+++ 
b/ambari-server/src/main/resources/stacks/BIGTOP/0.8/services/HDFS/package/scripts/hdfs_snamenode.py
@@ -35,6 +35,12 @@ def snamenode(action=None, format=False):
  content=Template("exclude_hosts_list.j2"),
  owner=params.hdfs_user,
  group=params.user_group)
+if params.hdfs_include_file:
+  File(params.include_file_path,
+ content=Template("include_hosts_list.j2"),
+ owner=params.hdfs_user,
+ group=params.user_group)
+  pass
   elif action == "start" or action == "stop":
 service(
   action=action,

http://git-wip-us.apache.org/repos/asf/ambari/blob/aa9d866e/ambari-server/src/main/resources/stacks/HDP/2.0.6/hooks/before-START/scripts/shared_initialization.py

ambari git commit: AMBARI-21692 dfs.include file is created on all datanode hosts when Ambari manages include/exclude file (dsen)

2017-08-11 Thread dsen 
Repository: ambari
Updated Branches:
  refs/heads/trunk faf5d9079 -> 10b1efbc4


AMBARI-21692 dfs.include file is created on all datanode hosts when Ambari 
manages include/exclude file (dsen)


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

Branch: refs/heads/trunk
Commit: 10b1efbc40b5d7dcd3d26e153f8e17125be747e8
Parents: faf5d90
Author: Dmytro Sen 
Authored: Fri Aug 11 13:36:46 2017 +0300
Committer: Dmytro Sen 
Committed: Fri Aug 11 13:36:46 2017 +0300

--
 .../2.1.0.2.0/package/scripts/hdfs_snamenode.py |  6 ++
 .../3.0.0.3.0/package/scripts/hdfs_snamenode.py |  6 ++
 .../before-START/scripts/shared_initialization.py   | 15 ---
 .../services/HDFS/package/scripts/hdfs_snamenode.py |  6 ++
 .../before-START/scripts/shared_initialization.py   | 16 +---
 .../before-START/scripts/shared_initialization.py   | 16 +---
 .../before-START/scripts/shared_initialization.py   | 14 --
 .../before-START/scripts/shared_initialization.py   | 14 --
 8 files changed, 20 insertions(+), 73 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/10b1efbc/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/package/scripts/hdfs_snamenode.py
--
diff --git 
a/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/package/scripts/hdfs_snamenode.py
 
b/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/package/scripts/hdfs_snamenode.py
index 8d4c40c..0eaeef4 100644
--- 
a/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/package/scripts/hdfs_snamenode.py
+++ 
b/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/package/scripts/hdfs_snamenode.py
@@ -39,6 +39,12 @@ def snamenode(action=None, format=False):
  content=Template("exclude_hosts_list.j2"),
  owner=params.hdfs_user,
  group=params.user_group)
+if params.hdfs_include_file:
+  File(params.include_file_path,
+ content=Template("include_hosts_list.j2"),
+ owner=params.hdfs_user,
+ group=params.user_group)
+  pass
   elif action == "start" or action == "stop":
 import params
 service(

http://git-wip-us.apache.org/repos/asf/ambari/blob/10b1efbc/ambari-server/src/main/resources/common-services/HDFS/3.0.0.3.0/package/scripts/hdfs_snamenode.py
--
diff --git 
a/ambari-server/src/main/resources/common-services/HDFS/3.0.0.3.0/package/scripts/hdfs_snamenode.py
 
b/ambari-server/src/main/resources/common-services/HDFS/3.0.0.3.0/package/scripts/hdfs_snamenode.py
index 8d4c40c..0eaeef4 100644
--- 
a/ambari-server/src/main/resources/common-services/HDFS/3.0.0.3.0/package/scripts/hdfs_snamenode.py
+++ 
b/ambari-server/src/main/resources/common-services/HDFS/3.0.0.3.0/package/scripts/hdfs_snamenode.py
@@ -39,6 +39,12 @@ def snamenode(action=None, format=False):
  content=Template("exclude_hosts_list.j2"),
  owner=params.hdfs_user,
  group=params.user_group)
+if params.hdfs_include_file:
+  File(params.include_file_path,
+ content=Template("include_hosts_list.j2"),
+ owner=params.hdfs_user,
+ group=params.user_group)
+  pass
   elif action == "start" or action == "stop":
 import params
 service(

http://git-wip-us.apache.org/repos/asf/ambari/blob/10b1efbc/ambari-server/src/main/resources/stacks/BIGTOP/0.8/hooks/before-START/scripts/shared_initialization.py
--
diff --git 
a/ambari-server/src/main/resources/stacks/BIGTOP/0.8/hooks/before-START/scripts/shared_initialization.py
 
b/ambari-server/src/main/resources/stacks/BIGTOP/0.8/hooks/before-START/scripts/shared_initialization.py
index 265502f..cba724a 100644
--- 
a/ambari-server/src/main/resources/stacks/BIGTOP/0.8/hooks/before-START/scripts/shared_initialization.py
+++ 
b/ambari-server/src/main/resources/stacks/BIGTOP/0.8/hooks/before-START/scripts/shared_initialization.py
@@ -137,21 +137,6 @@ def setup_configs():
 group=params.user_group
   )
 
-  generate_include_file()
-
-
-def generate_include_file():
-  import params
-
-  if params.has_namenode and params.dfs_hosts and params.has_slaves:
-include_hosts_list = params.slave_hosts
-File(params.dfs_hosts,
- content=Template("include_hosts_list.j2"),
- owner=params.hdfs_user,
- group=params.user_group
-)
-
-
 def install_snappy():
   import params

[ambari] Git Push Summary

2017-08-11 Thread stoader 
Repository: ambari
Updated Branches:
  refs/heads/feature-improved-rack-awareness-handling [created] faf5d9079

ambari git commit: AMBARI-21704 Upgrade Wizard Has Incorrect Title. (atkach)

2017-08-11 Thread atkach 
Repository: ambari
Updated Branches:
  refs/heads/branch-feature-AMBARI-21450 83e9d89f2 -> 9232f35cb


AMBARI-21704 Upgrade Wizard Has Incorrect Title. (atkach)


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

Branch: refs/heads/branch-feature-AMBARI-21450
Commit: 9232f35cb8d8223854abb988299c517af387fc92
Parents: 83e9d89
Author: Andrii Tkach 
Authored: Thu Aug 10 19:31:06 2017 +0300
Committer: Andrii Tkach 
Committed: Thu Aug 10 20:40:32 2017 +0300

--
 .../main/admin/stack_and_upgrade_controller.js  | 59 ++--
 ambari-web/app/messages.js  |  9 +--
 ambari-web/app/routes/stack_upgrade_routes.js   |  9 +--
 ambari-web/app/utils/ajax/ajax.js   |  2 +-
 .../stack_upgrade/upgrade_version_box_view.js   | 11 ++--
 .../admin/stack_and_upgrade_controller_test.js  | 39 +
 .../upgrade_version_box_view_test.js|  6 +-
 7 files changed, 87 insertions(+), 48 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/9232f35c/ambari-web/app/controllers/main/admin/stack_and_upgrade_controller.js
--
diff --git 
a/ambari-web/app/controllers/main/admin/stack_and_upgrade_controller.js 
b/ambari-web/app/controllers/main/admin/stack_and_upgrade_controller.js
index d3bcb45..740562c 100644
--- a/ambari-web/app/controllers/main/admin/stack_and_upgrade_controller.js
+++ b/ambari-web/app/controllers/main/admin/stack_and_upgrade_controller.js
@@ -133,12 +133,33 @@ App.MainAdminStackAndUpgradeController = 
Em.Controller.extend(App.LocalStorage,
* @type {string}
*/
   wizardModalTitle: function () {
-if (this.get('isDowngrade')) {
-  return 
Em.I18n.t('admin.stackUpgrade.dialog.downgrade.header').format(this.get('upgradeVersion'));
-}
-return 
Em.I18n.t('admin.stackUpgrade.dialog.header').format(this.get('upgradeVersion'));
+var repoVersion = 
App.RepositoryVersion.find().findProperty('repositoryVersion', 
this.get('toVersion'));
+return this.getUpgradeDowngradeHeader(
+  this.get('upgradeTypeDisplayName'),
+  this.get('upgradeVersion'),
+  this.get('isDowngrade'),
+  repoVersion && repoVersion.get('isPatch')
+);
   }.property('upgradeTypeDisplayName', 'upgradeVersion', 'isDowngrade'),
 
+
+  /**
+   * @param {string} upgradeType
+   * @param {string} upgradeVersion
+   * @param {boolean} isDowngrade
+   * @param {boolean} isPatch
+   * @returns {string}
+   */
+  getUpgradeDowngradeHeader: function(upgradeType, upgradeVersion, 
isDowngrade, isPatch) {
+if (isDowngrade) {
+  return 
Em.I18n.t('admin.stackUpgrade.dialog.downgrade.header').format(upgradeVersion);
+}
+if (isPatch) {
+  return 
Em.I18n.t('admin.stackUpgrade.dialog.upgrade.patch.header').format(upgradeType, 
upgradeVersion);
+}
+return 
Em.I18n.t('admin.stackUpgrade.dialog.upgrade.header').format(upgradeType, 
upgradeVersion);
+  },
+
   /**
* methods through which cluster could be upgraded, "allowed" indicated if 
the method is allowed
* by stack upgrade path
@@ -239,6 +260,7 @@ App.MainAdminStackAndUpgradeController = 
Em.Controller.extend(App.LocalStorage,
   wizardStorageProperties: [
 'upgradeId',
 'upgradeVersion',
+'toVersion',
 'currentVersion',
 'upgradeTypeDisplayName',
 'upgradeType',
@@ -665,7 +687,7 @@ App.MainAdminStackAndUpgradeController = 
Em.Controller.extend(App.LocalStorage,
   },
   
Em.I18n.t('admin.stackUpgrade.downgrade.body').format(currentVersion.repository_name),
   null,
-  
Em.I18n.t('admin.stackUpgrade.dialog.downgrade.header').format(currentVersion.repository_name),
+  
Em.I18n.t('admin.stackUpgrade.dialog.downgrade.header').format(this.get('upgradeVersion')),
   Em.I18n.t('admin.stackUpgrade.downgrade.proceed')
 );
   },
@@ -714,7 +736,7 @@ App.MainAdminStackAndUpgradeController = 
Em.Controller.extend(App.LocalStorage,
   sender: this,
   data: {
 value: currentVersion.repository_version,
-label: currentVersion.repository_name,
+label: this.get('upgradeVersion'),
 id: currentVersion.id,
 isDowngrade: true,
 upgradeType: this.get('upgradeType')
@@ -875,7 +897,7 @@ App.MainAdminStackAndUpgradeController = 
Em.Controller.extend(App.LocalStorage,
   upgradeSuccessCallback: function (data, opt, params) {
 this.set('upgradeData', null);
 this.set('upgradeId', data.resources[0].Upgrade.request_id);
-this.set('fromVersion', params.isDowngrade ? 
data.resources[0].Upgrade.associated_version : null);
+

ambari git commit: AMBARI-21648. Do not use 'dbo' schema name in idempotent Ambari DDL generator for AzureDB. (stoader)

2017-08-11 Thread stoader 
Repository: ambari
Updated Branches:
  refs/heads/branch-2.6 6ddd4ac76 -> dba278bfb


AMBARI-21648. Do not use 'dbo' schema name in idempotent Ambari DDL generator 
for AzureDB. (stoader)


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

Branch: refs/heads/branch-2.6
Commit: dba278bfbefad7c7c92e64cded3821f7bcf985b4
Parents: 6ddd4ac
Author: Toader, Sebastian 
Authored: Fri Aug 4 10:04:32 2017 +0200
Committer: Toader, Sebastian 
Committed: Fri Aug 11 09:52:07 2017 +0200

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


http://git-wip-us.apache.org/repos/asf/ambari/blob/dba278bf/ambari-server/src/main/python/azuredb_create_generator.py
--
diff --git a/ambari-server/src/main/python/azuredb_create_generator.py 
b/ambari-server/src/main/python/azuredb_create_generator.py
index 6ceaa90..1794d79 100755
--- a/ambari-server/src/main/python/azuredb_create_generator.py
+++ b/ambari-server/src/main/python/azuredb_create_generator.py
@@ -38,7 +38,7 @@ for statement in input_statements:
   statement = re.sub(
 create_table_re,
 dedent('''\
-  IF NOT EXISTS (SELECT 1 FROM sys.objects WHERE object_id = 
OBJECT_ID('dbo.\g<1>') AND type = 'U')
+  IF NOT EXISTS (SELECT 1 FROM sys.objects WHERE object_id = 
OBJECT_ID('\g<1>') AND type = 'U')
   BEGIN
   \g<0>
   END