[ambari] branch trunk updated: AMBARI-22290: HDP + HDF installation fails (jluniya) (#1304)

[jluniya]

This is an automated email from the ASF dual-hosted git repository.

jluniya pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/ambari.git


The following commit(s) were added to refs/heads/trunk by this push:
 new c2239a1  AMBARI-22290: HDP + HDF installation fails (jluniya) (#1304)
c2239a1 is described below

commit c2239a1fa5a9193df61c4fb062355870b4f4fb4b
Author: jayush 
AuthorDate: Thu May 17 22:18:21 2018 -0700

AMBARI-22290: HDP + HDF installation fails (jluniya) (#1304)

* AMBARI-22290: HDP + HDF installation fails (jluniya)

Change-Id: I8d30b30aa1c0b0e49f9e45fadac127e6a05ac90b

* AMBARI-22290: HDP + HDF installation fails - fix unit tests (jluniya)

Change-Id: I1f319b5881b0803723f6f4799338de9c3d3e646f
---
 .../libraries/functions/repository_util.py |  2 +-
 .../resource_management/libraries/script/script.py | 13 +-
 .../ambari/annotations/ExperimentalFeature.java|  7 -
 .../ambari/server/agent/CommandRepository.java | 26 ++-
 .../controller/AmbariManagementControllerImpl.java |  6 +++--
 .../server/controller/RepositoryResponse.java  | 29 -
 .../internal/RepositoryResourceProvider.java   |  7 +
 .../VersionDefinitionResourceProvider.java | 15 +++
 .../server/orm/entities/RepoDefinitionEntity.java  | 30 --
 .../org/apache/ambari/server/stack/RepoUtil.java   | 11 +++-
 .../apache/ambari/server/stack/StackModule.java| 26 ++-
 .../ambari/server/stack/StackServiceDirectory.java |  8 ++
 .../stack/UpdateActiveRepoVersionOnStartup.java|  4 +++
 .../apache/ambari/server/state/RepositoryInfo.java | 24 -
 .../stack/upgrade/RepositoryVersionHelper.java | 10 
 .../ambari/server/upgrade/UpgradeCatalog270.java   | 26 +++
 .../src/main/resources/Ambari-DDL-Derby-CREATE.sql |  5 
 .../src/main/resources/Ambari-DDL-MySQL-CREATE.sql |  5 
 .../main/resources/Ambari-DDL-Oracle-CREATE.sql|  5 
 .../main/resources/Ambari-DDL-Postgres-CREATE.sql  |  5 
 .../resources/Ambari-DDL-SQLAnywhere-CREATE.sql|  5 
 .../main/resources/Ambari-DDL-SQLServer-CREATE.sql |  5 
 .../custom_actions/scripts/install_packages.py |  1 +
 .../internal/RepositoryResourceProviderTest.java   |  6 +++--
 .../server/upgrade/UpgradeCatalog270Test.java  | 12 -
 ambari-web/app/controllers/installer.js|  3 ++-
 .../app/mappers/repository_version_mapper.js   |  3 ++-
 ambari-web/app/mappers/stack_mapper.js |  3 ++-
 ambari-web/app/models/repository.js|  1 +
 29 files changed, 273 insertions(+), 30 deletions(-)

diff --git 
a/ambari-common/src/main/python/resource_management/libraries/functions/repository_util.py
 
b/ambari-common/src/main/python/resource_management/libraries/functions/repository_util.py
index 7faa33f..684e3dc 100644
--- 
a/ambari-common/src/main/python/resource_management/libraries/functions/repository_util.py
+++ 
b/ambari-common/src/main/python/resource_management/libraries/functions/repository_util.py
@@ -173,7 +173,7 @@ class CommandRepositoryItem(object):
 
 self.ubuntu_components = [self.distribution if self.distribution else 
self.repo_name] + \
  [self.components.replace(",", " ") if 
self.components else UBUNTU_REPO_COMPONENTS_POSTFIX]
-
+self.applicable_services = _find_value(json_dict, 'applicableServices')
 
 
 
diff --git 
a/ambari-common/src/main/python/resource_management/libraries/script/script.py 
b/ambari-common/src/main/python/resource_management/libraries/script/script.py
index 1ddc49a..556412a 100644
--- 
a/ambari-common/src/main/python/resource_management/libraries/script/script.py
+++ 
b/ambari-common/src/main/python/resource_management/libraries/script/script.py
@@ -776,9 +776,20 @@ class Script(object):
 if self.available_packages_in_repos:
   return self.available_packages_in_repos
 
+config = self.get_config()
+
+service_name = config['serviceName'] if 'serviceName' in config else None
+repos = CommandRepository(config['repositoryFile'])
+repo_ids = [repo.repo_id for repo in repos.items]
+Logger.info("Command repositories: {0}".format(", ".join(repo_ids)))
+repos.items = [x for x in repos.items if (not x.applicable_services or 
service_name in x.applicable_services) ]
+applicable_repo_ids = [repo.repo_id for repo in repos.items]
+Logger.info("Applicable repositories: {0}".format(", 
".join(applicable_repo_ids)))
+
+
 pkg_provider = ManagerFactory.get()
 try:
-  self.available_packages_in_repos = 
pkg_provider.get_available_packages_in_repos(CommandRepository(self.get_config()['repositoryFile']))
+  self.available_packages_in_repos = 
pkg_provider.get_available_packages_in_repos(repos)
 except Exception as err:
   Logger.exception("Unable to load 

[ambari] branch trunk updated: [AMBARI-23884] Remove webhcat server as co-hosted component for Hive.

[ishanbha]

This is an automated email from the ASF dual-hosted git repository.

ishanbha pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/ambari.git


The following commit(s) were added to refs/heads/trunk by this push:
 new d11c2b6  [AMBARI-23884] Remove webhcat server as co-hosted component 
for Hive.
d11c2b6 is described below

commit d11c2b6c36bb1b45cc1aebf43faa3aab41dd9bf4
Author: Ishan Bhatt 
AuthorDate: Thu May 17 12:42:46 2018 -0700

[AMBARI-23884] Remove webhcat server as co-hosted component for Hive.
---
 ambari-web/app/models/stack_service_component.js   | 4 +---
 ambari-web/test/models/stack_service_component_test.js | 4 ++--
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/ambari-web/app/models/stack_service_component.js 
b/ambari-web/app/models/stack_service_component.js
index 9b029ea..29f06a2 100644
--- a/ambari-web/app/models/stack_service_component.js
+++ b/ambari-web/app/models/stack_service_component.js
@@ -234,6 +234,4 @@ App.StackServiceComponent = DS.Model.extend({
 
 App.StackServiceComponent.FIXTURES = [];
 
-App.StackServiceComponent.coHost = {
-  'WEBHCAT_SERVER': 'HIVE_SERVER'
-};
+App.StackServiceComponent.coHost = {};
diff --git a/ambari-web/test/models/stack_service_component_test.js 
b/ambari-web/test/models/stack_service_component_test.js
index 6182c0a..69613e2 100644
--- a/ambari-web/test/models/stack_service_component_test.js
+++ b/ambari-web/test/models/stack_service_component_test.js
@@ -249,8 +249,8 @@ var componentPropertiesValidationTests = [
   isMasterAddableInstallerWizard: false,
   isHAComponentOnly: false,
   isRequiredOnAllHosts: false,
-  coHostedComponents: ['WEBHCAT_SERVER'],
-  isOtherComponentCoHosted: true,
+  coHostedComponents: [],
+  isOtherComponentCoHosted: false,
   isCoHostedComponent: false
 }
   },

-- 
To stop receiving notification emails like this one, please contact
ishan...@apache.org.

[ambari] branch trunk updated: [AMBARI-23883] Log Feeder: ambari services should be able to generate … (#1309)

[oleewere]

This is an automated email from the ASF dual-hosted git repository.

oleewere pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/ambari.git


The following commit(s) were added to refs/heads/trunk by this push:
 new 5e67052  [AMBARI-23883] Log Feeder: ambari services should be able to 
generate … (#1309)
5e67052 is described below

commit 5e6705292e55f80fea054b341ce6c76adfebc0bb
Author: Olivér Szabó 
AuthorDate: Fri May 18 00:27:20 2018 +0200

[AMBARI-23883] Log Feeder: ambari services should be able to generate … 
(#1309)

* AMBARI-23883. Log Feeder: ambari services should be able to generate 
logfeeder configs outside of after-INSTALL hook.

* AMBARI-23883. Add docs.

* AMBARI-23883. Add logsearch + infra-solr input patterns and remove env 
from method params

* AMBARI-23883. Support pattern generation for logfeeder itself.
---
 .../src/main/python/ambari_commons/constants.py|  2 +
 .../functions/generate_logfeeder_input_config.py   | 44 ++
 .../0.1.0/package/scripts/infra_solr.py|  5 +++
 .../0.5.0/package/scripts/setup_logfeeder.py   |  2 +
 .../0.5.0/package/scripts/setup_logsearch.py   |  3 ++
 .../stack-hooks/after-INSTALL/scripts/params.py|  3 +-
 .../stacks/2.4/AMBARI_INFRA/test_infra_solr.py | 11 ++
 .../python/stacks/2.4/LOGSEARCH/test_logfeeder.py  | 10 +
 .../python/stacks/2.4/LOGSEARCH/test_logsearch.py  | 13 +++
 9 files changed, 92 insertions(+), 1 deletion(-)

diff --git a/ambari-common/src/main/python/ambari_commons/constants.py 
b/ambari-common/src/main/python/ambari_commons/constants.py
index f1ab4a2..abb07da 100644
--- a/ambari-common/src/main/python/ambari_commons/constants.py
+++ b/ambari-common/src/main/python/ambari_commons/constants.py
@@ -26,6 +26,8 @@ UPGRADE_TYPE_HOST_ORDERED = "host_ordered"
 
 AGENT_TMP_DIR = "/var/lib/ambari-agent/tmp"
 
+LOGFEEDER_CONF_DIR = "/usr/lib/ambari-logsearch-logfeeder/conf"
+
 class SERVICE:
   """
   Constants for service names to avoid hardcoding strings.
diff --git 
a/ambari-common/src/main/python/resource_management/libraries/functions/generate_logfeeder_input_config.py
 
b/ambari-common/src/main/python/resource_management/libraries/functions/generate_logfeeder_input_config.py
new file mode 100755
index 000..84ab492
--- /dev/null
+++ 
b/ambari-common/src/main/python/resource_management/libraries/functions/generate_logfeeder_input_config.py
@@ -0,0 +1,44 @@
+#!/usr/bin/env python
+"""
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements.  See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership.  The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License.  You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+
+"""
+import os
+from resource_management.core.logger import Logger
+from ambari_commons.constants import LOGFEEDER_CONF_DIR
+from resource_management.core.resources import File, Directory
+
+__all__ = ["generate_logfeeder_input_config"]
+
+def generate_logfeeder_input_config(type, content):
+  """
+  :param type: type of the logfeeder input config (most likely a service name: 
hdfs),
+  it will be generated as input.config-.json in logfeeder config folder
+  :param content: generated template for the input config json file (you can 
use Template or InlineTemplate)
+  """
+  import params
+  Directory(LOGFEEDER_CONF_DIR,
+mode=0755,
+cd_access='a',
+create_parents=True
+)
+  input_file_name = 'input.config-' + type + '.json'
+  Logger.info("Generate Log Feeder config file: " + 
os.path.join(LOGFEEDER_CONF_DIR, input_file_name))
+  File(os.path.join(LOGFEEDER_CONF_DIR, input_file_name),
+   content=content,
+   mode=0644
+   )
\ No newline at end of file
diff --git 
a/ambari-server/src/main/resources/common-services/AMBARI_INFRA_SOLR/0.1.0/package/scripts/infra_solr.py
 
b/ambari-server/src/main/resources/common-services/AMBARI_INFRA_SOLR/0.1.0/package/scripts/infra_solr.py
index 363f8f4..a11f207 100644
--- 
a/ambari-server/src/main/resources/common-services/AMBARI_INFRA_SOLR/0.1.0/package/scripts/infra_solr.py
+++ 
b/ambari-server/src/main/resources/common-services/AMBARI_INFRA_SOLR/0.1.0/package/scripts/infra_solr.py
@@ -19,13 +19,16 @@ limitations under the License.
 
 import sys
 from resource_management.core.logger import Logger
+from resource_management.core.source import Template
 

[ambari] branch branch-feature-AMBARI-14714 updated: Fixed validations request to use correct stack.

[jgolieb]

This is an automated email from the ASF dual-hosted git repository.

jgolieb pushed a commit to branch branch-feature-AMBARI-14714
in repository https://gitbox.apache.org/repos/asf/ambari.git


The following commit(s) were added to refs/heads/branch-feature-AMBARI-14714 by 
this push:
 new 303e58f  Fixed validations request to use correct stack.
303e58f is described below

commit 303e58f30b375c2be833199b27e820224ce23a27
Author: Jason Golieb 
AuthorDate: Thu May 17 13:50:07 2018 -0700

Fixed validations request to use correct stack.
---
 ambari-web/app/mixins/wizard/assign_master_components.js | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/ambari-web/app/mixins/wizard/assign_master_components.js 
b/ambari-web/app/mixins/wizard/assign_master_components.js
index b7506c6..35ede31 100644
--- a/ambari-web/app/mixins/wizard/assign_master_components.js
+++ b/ambari-web/app/mixins/wizard/assign_master_components.js
@@ -1186,6 +1186,8 @@ App.AssignMasterComponents = 
Em.Mixin.create(App.HostComponentValidationMixin, A
 }).then(function() {
   self.validateSelectedHostComponents({
 hosts: hostNames,
+stackName: selectedMpacks[0].name,
+stackVersion: selectedMpacks[0].version,  
 blueprint: self.get('recommendations')
   }).then(function() {
 if (callback) {

-- 
To stop receiving notification emails like this one, please contact
jgol...@apache.org.

[ambari] branch branch-feature-AMBARI-14714 updated (b8fef94 -> 1b269e5)

[mradhakrishnan]

This is an automated email from the ASF dual-hosted git repository.

mradhakrishnan pushed a change to branch branch-feature-AMBARI-14714
in repository https://gitbox.apache.org/repos/asf/ambari.git.


from b8fef94  Fix constant declaration.
 add 320da2b  [AMBARI-23746] Use serviceGroupName to fetch services and 
components
 new 1b269e5  Merge pull request #1308 from mradha25/AMBARI-23746

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 .../ambari/server/controller/AmbariManagementControllerImpl.java  | 8 
 .../server/controller/internal/HostComponentResourceProvider.java | 2 +-
 .../ambari/server/state/svccomphost/ServiceComponentHostImpl.java | 3 ++-
 3 files changed, 7 insertions(+), 6 deletions(-)

-- 
To stop receiving notification emails like this one, please contact
mradhakrish...@apache.org.

[ambari] 01/01: Merge pull request #1308 from mradha25/AMBARI-23746

[mradhakrishnan]

This is an automated email from the ASF dual-hosted git repository.

mradhakrishnan pushed a commit to branch branch-feature-AMBARI-14714
in repository https://gitbox.apache.org/repos/asf/ambari.git

commit 1b269e5fddbc6cccf47c301a1725a8df98cd33af
Merge: b8fef94 320da2b
Author: mradha25 
AuthorDate: Thu May 17 13:14:29 2018 -0700

Merge pull request #1308 from mradha25/AMBARI-23746

[AMBARI-23746] Use serviceGroupName to fetch services and components

 .../ambari/server/controller/AmbariManagementControllerImpl.java  | 8 
 .../server/controller/internal/HostComponentResourceProvider.java | 2 +-
 .../ambari/server/state/svccomphost/ServiceComponentHostImpl.java | 3 ++-
 3 files changed, 7 insertions(+), 6 deletions(-)

-- 
To stop receiving notification emails like this one, please contact
mradhakrish...@apache.org.

[ambari] branch trunk updated: [AMBARI-23869] Remove insecure dependencies from Ambari Server

[rlevas]

This is an automated email from the ASF dual-hosted git repository.

rlevas pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/ambari.git


The following commit(s) were added to refs/heads/trunk by this push:
 new 63688f9  [AMBARI-23869] Remove insecure dependencies from Ambari Server
63688f9 is described below

commit 63688f93ca82a545a071b2d475054e631b061fe8
Author: Robert Levas 
AuthorDate: Thu May 17 08:10:41 2018 -0700

[AMBARI-23869] Remove insecure dependencies from Ambari Server
---
 ambari-agent/pom.xml  | 4 
 ambari-server/pom.xml | 4 
 2 files changed, 8 insertions(+)

diff --git a/ambari-agent/pom.xml b/ambari-agent/pom.xml
index 945b672..3dfb385 100644
--- a/ambari-agent/pom.xml
+++ b/ambari-agent/pom.xml
@@ -104,6 +104,10 @@
 jetty-util
 
 
+  org.mortbay.jetty
+  jetty
+
+
 commons-httpclient
 commons-httpclient
 
diff --git a/ambari-server/pom.xml b/ambari-server/pom.xml
index 1c05d94..a29e57f 100644
--- a/ambari-server/pom.xml
+++ b/ambari-server/pom.xml
@@ -1721,6 +1721,10 @@
   jetty-util
 
 
+  org.mortbay.jetty
+  jetty
+
+
   org.apache.zookeeper
   zookeeper
 

-- 
To stop receiving notification emails like this one, please contact
rle...@apache.org.

[ambari] branch trunk updated: AMBARI-23881 Remove dependency on marked.js 0.3.2 in Ambari Web. (ababiichuk)

[ababiichuk]

This is an automated email from the ASF dual-hosted git repository.

ababiichuk pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/ambari.git


The following commit(s) were added to refs/heads/trunk by this push:
 new 0460f44  AMBARI-23881 Remove dependency on marked.js 0.3.2 in Ambari 
Web. (ababiichuk)
0460f44 is described below

commit 0460f442618255d057627e9595d7561cd30af15b
Author: ababiichuk 
AuthorDate: Thu May 17 18:40:08 2018 +0300

AMBARI-23881 Remove dependency on marked.js 0.3.2 in Ambari Web. 
(ababiichuk)
---
 ambari-web/api-docs/lib/marked.js | 464 --
 1 file changed, 290 insertions(+), 174 deletions(-)

diff --git a/ambari-web/api-docs/lib/marked.js 
b/ambari-web/api-docs/lib/marked.js
index c2a678d..5552616 100644
--- a/ambari-web/api-docs/lib/marked.js
+++ b/ambari-web/api-docs/lib/marked.js
@@ -1,10 +1,11 @@
 /**
  * marked - a markdown parser
  * Copyright (c) 2011-2014, Christopher Jeffrey. (MIT Licensed)
- * https://github.com/chjj/marked
+ * https://github.com/markedjs/marked
  */
 
-;(function() {
+;(function(root) {
+'use strict';
 
 /**
  * Block-Level Grammar
@@ -14,55 +15,60 @@ var block = {
   newline: /^\n+/,
   code: /^( {4}[^\n]+\n*)+/,
   fences: noop,
-  hr: /^( *[-*_]){3,} *(?:\n+|$)/,
+  hr: /^ {0,3}((?:- *){3,}|(?:_ *){3,}|(?:\* *){3,})(?:\n+|$)/,
   heading: /^ *(#{1,6}) *([^\n]+?) *#* *(?:\n+|$)/,
   nptable: noop,
-  lheading: /^([^\n]+)\n *(=|-){2,} *(?:\n+|$)/,
-  blockquote: /^( *>[^\n]+(\n(?!def)[^\n]+)*\n*)+/,
+  blockquote: /^( {0,3}> ?(paragraph|[^\n]*)(?:\n|$))+/,
   list: /^( *)(bull) [\s\S]+?(?:hr|def|\n{2,}(?! )(?!\1bull )\n*|\s*$)/,
   html: /^ *(?:comment *(?:\n|\s*$)|closed *(?:\n{2,}|\s*$)|closing 
*(?:\n{2,}|\s*$))/,
-  def: /^ *\[([^\]]+)\]: *]+)>?(?: +["(]([^\n]+)[")])? *(?:\n+|$)/,
+  def: /^ {0,3}\[(label)\]: *\n? *]+)>?(?:(?: +\n? *| *\n *)(title))? 
*(?:\n+|$)/,
   table: noop,
-  paragraph: /^((?:[^\n]+\n?(?!hr|heading|lheading|blockquote|tag|def))+)\n*/,
+  lheading: /^([^\n]+)\n *(=|-){2,} *(?:\n+|$)/,
+  paragraph: /^([^\n]+(?:\n?(?!hr|heading|lheading| {0,3}>|tag)[^\n]+)+)/,
   text: /^[^\n]+/
 };
 
+block._label = /(?:\\[\[\]]|[^\[\]])+/;
+block._title = /(?:"(?:\\"|[^"]|"[^"\n]*")*"|'\n?(?:[^'\n]+\n?)*'|\([^()]*\))/;
+block.def = edit(block.def)
+  .replace('label', block._label)
+  .replace('title', block._title)
+  .getRegex();
+
 block.bullet = /(?:[*+-]|\d+\.)/;
 block.item = /^( *)(bull) [^\n]*(?:\n(?!\1bull )[^\n]*)*/;
-block.item = replace(block.item, 'gm')
-  (/bull/g, block.bullet)
-  ();
+block.item = edit(block.item, 'gm')
+  .replace(/bull/g, block.bullet)
+  .getRegex();
 
-block.list = replace(block.list)
-  (/bull/g, block.bullet)
-  ('hr', '\\n+(?=\\1?(?:[-*_] *){3,}(?:\\n+|$))')
-  ('def', '\\n+(?=' + block.def.source + ')')
-  ();
-
-block.blockquote = replace(block.blockquote)
-  ('def', block.def)
-  ();
+block.list = edit(block.list)
+  .replace(/bull/g, block.bullet)
+  .replace('hr', '\\n+(?=\\1?(?:(?:- *){3,}|(?:_ *){3,}|(?:\\* 
*){3,})(?:\\n+|$))')
+  .replace('def', '\\n+(?=' + block.def.source + ')')
+  .getRegex();
 
 block._tag = '(?!(?:'
   + 'a|em|strong|small|s|cite|q|dfn|abbr|data|time|code'
   + '|var|samp|kbd|sub|sup|i|b|u|mark|ruby|rt|rp|bdi|bdo'
-  + '|span|br|wbr|ins|del|img)\\b)\\w+(?!:/|[^\\w\\s@]*@)\\b';
-
-block.html = replace(block.html)
-  ('comment', //)
-  ('closed', /<(tag)[\s\S]+?<\/\1>/)
-  ('closing', /])*?>/)
-  (/tag/g, block._tag)
-  ();
-
-block.paragraph = replace(block.paragraph)
-  ('hr', block.hr)
-  ('heading', block.heading)
-  ('lheading', block.lheading)
-  ('blockquote', block.blockquote)
-  ('tag', '<' + block._tag)
-  ('def', block.def)
-  ();
+  + '|span|br|wbr|ins|del|img)\\b)\\w+(?!:|[^\\w\\s@]*@)\\b';
+
+block.html = edit(block.html)
+  .replace('comment', //)
+  .replace('closed', /<(tag)[\s\S]+?<\/\1>/)
+  .replace('closing', /\s]*)*?\/?>/)
+  .replace(/tag/g, block._tag)
+  .getRegex();
+
+block.paragraph = edit(block.paragraph)
+  .replace('hr', block.hr)
+  .replace('heading', block.heading)
+  .replace('lheading', block.lheading)
+  .replace('tag', '<' + block._tag)
+  .getRegex();
+
+block.blockquote = edit(block.blockquote)
+  .replace('paragraph', block.paragraph)
+  .getRegex();
 
 /**
  * Normal Block Grammar
@@ -75,15 +81,16 @@ block.normal = merge({}, block);
  */
 
 block.gfm = merge({}, block.normal, {
-  fences: /^ *(`{3,}|~{3,}) *(\S+)? *\n([\s\S]+?)\s*\1 *(?:\n+|$)/,
-  paragraph: /^/
+  fences: /^ *(`{3,}|~{3,})[ \.]*(\S+)? *\n([\s\S]*?)\n? *\1 *(?:\n+|$)/,
+  paragraph: /^/,
+  heading: /^ *(#{1,6}) +([^\n]+?) *#* *(?:\n+|$)/
 });
 
-block.gfm.paragraph = replace(block.paragraph)
-  ('(?!', '(?!'
+block.gfm.paragraph = edit(block.paragraph)
+  .replace('(?!', '(?!'
 + block.gfm.fences.source.replace('\\1', '\\2') + '|'
 + block.list.source.replace('\\1', '\\3') + '|')
-  ();
+  

[ambari] branch trunk updated: AMBARI-23880 Install Wizard: fix markup issues

[atkach]

This is an automated email from the ASF dual-hosted git repository.

atkach pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/ambari.git


The following commit(s) were added to refs/heads/trunk by this push:
 new 69150f7  AMBARI-23880 Install Wizard: fix markup issues
69150f7 is described below

commit 69150f7ff7ae90cfb220624b7a72777fdac2fc32
Author: Andrii Tkach 
AuthorDate: Thu May 17 17:24:03 2018 +0300

AMBARI-23880 Install Wizard: fix markup issues
---
 .../app/controllers/wizard/step7_controller.js |  2 +-
 .../app/controllers/wizard/step8_controller.js |  2 +-
 ambari-web/app/messages.js |  1 +
 ambari-web/app/styles/application.less |  2 +-
 ambari-web/app/styles/wizard.less  | 49 +++-
 .../templates/common/configs/services_config.hbs   | 54 +++---
 ambari-web/app/templates/wizard/step3.hbs  |  4 ++
 ambari-web/app/templates/wizard/step6.hbs  | 12 ++---
 .../app/templates/wizard/step7/directories_tab.hbs |  2 +-
 ambari-web/app/templates/wizard/step9.hbs  | 10 ++--
 .../app/views/common/configs/services_config.js| 30 
 ambari-web/app/views/wizard/step6_view.js  | 10 
 12 files changed, 123 insertions(+), 55 deletions(-)

diff --git a/ambari-web/app/controllers/wizard/step7_controller.js 
b/ambari-web/app/controllers/wizard/step7_controller.js
index 8c52163..c408e7c 100644
--- a/ambari-web/app/controllers/wizard/step7_controller.js
+++ b/ambari-web/app/controllers/wizard/step7_controller.js
@@ -2071,7 +2071,7 @@ App.WizardStep7Controller = 
Em.Controller.extend(App.ServerValidatorMixin, App.E
 var validations = 
this.get('stepConfigs').mapProperty('configsWithErrors.length').reduce(Em.sum, 
0);
 var configErrorList = this.get('configErrorList');
 this.set('issuesCounter', recommendations + validations + 
configErrorList.get('issues.length') + 
configErrorList.get('criticalIssues.length'));
-if (validations > this.get('validationsCounter')) {
+if (validations !== this.get('validationsCounter')) {
   this.ringBell();
 }
 this.set('hasErrors', !!validations);
diff --git a/ambari-web/app/controllers/wizard/step8_controller.js 
b/ambari-web/app/controllers/wizard/step8_controller.js
index afba6bd..578c337 100644
--- a/ambari-web/app/controllers/wizard/step8_controller.js
+++ b/ambari-web/app/controllers/wizard/step8_controller.js
@@ -1709,7 +1709,7 @@ App.WizardStep8Controller = 
Em.Controller.extend(App.AddSecurityConfigs, App.wiz
   showLoadingIndicator: function () {
 return App.ModalPopup.show({
 
-  header: '',
+  header: Em.I18n.t('installer.step8.deployPopup.header'),
 
   showFooter: false,
 
diff --git a/ambari-web/app/messages.js b/ambari-web/app/messages.js
index 532766c..e38c522 100644
--- a/ambari-web/app/messages.js
+++ b/ambari-web/app/messages.js
@@ -1021,6 +1021,7 @@ Em.I18n.translations = {
   'installer.step8.kerberors.warning': 'Because Kerberos has been 
manually installed on the cluster, you will have to create/distribute 
principals and keytabs when this operation is finished.',
   'installer.step8.generateBlueprint.popup.msg': 'You will be 
downloading blueprint.json and clustertemplate.json to your local 
machine.  You can use them to deploy a cluster via AMBARI REST API. 
 Update clustertemplate.json with a custom cluster name if you do not want 
to use name {0}. If you want to use custom repo URLs, make 
sure to update them via Ambari REST API before deploying the cluster.',
   'installer.step8.deployPopup.message':'Preparing to Deploy: {0} of {1} tasks 
completed.',
+  'installer.step8.deployPopup.header':'Initializing Tasks',
   'installer.step8.hosts':' hosts',
   'installer.step8.host':' host',
   'installer.step8.other':'and {0} other hosts',
diff --git a/ambari-web/app/styles/application.less 
b/ambari-web/app/styles/application.less
index 0c6d524..c54f5e1 100644
--- a/ambari-web/app/styles/application.less
+++ b/ambari-web/app/styles/application.less
@@ -378,7 +378,7 @@ footer {
 }
 
 .badge-warning {
-  background-color: #e98a41!important;
+  background-color: #666 !important;
 }
 
 table.diff {
diff --git a/ambari-web/app/styles/wizard.less 
b/ambari-web/app/styles/wizard.less
index d0308e9..3be7652 100644
--- a/ambari-web/app/styles/wizard.less
+++ b/ambari-web/app/styles/wizard.less
@@ -123,6 +123,9 @@
 
 .compact-panel-heading {
   padding: 10px;
+  .button-section {
+min-height: 34px;
+  }
 }
 .hosts-panel {
   padding-left: 0;
@@ -189,7 +192,10 @@
 }
 #confirm-hosts-table {
   th:first-of-type {
-width: 25px;
+width: 20px;
+label {
+  top: 2px;
+}
   }
   th:nth-of-type(2) {
 width: 42%;
@@ -215,10 +221,8 @@
   #display-action {
 visibility:visible;
   }
-  .step3-table-checkbox {
-label 

[ambari] branch branch-feature-AMBARI-14714 updated (fbdfeb6 -> b8fef94)

[jgolieb]

This is an automated email from the ASF dual-hosted git repository.

jgolieb pushed a change to branch branch-feature-AMBARI-14714
in repository https://gitbox.apache.org/repos/asf/ambari.git.


from fbdfeb6  AMBARI-23746. Distinguish componentId and hostComponentId 
(#1288)
 new 3e07779  Remove unused code.
 new b8fef94  Fix constant declaration.

The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 .../app/controllers/wizard/step8_controller.js |  83 
 ambari-web/app/utils/ajax/ajax.js  |  13 --
 ambari-web/app/utils/constants.js  |  18 +-
 ambari-web/test/controllers/wizard/step8_test.js   | 216 -
 4 files changed, 10 insertions(+), 320 deletions(-)

-- 
To stop receiving notification emails like this one, please contact
jgol...@apache.org.

[ambari] 01/02: Remove unused code.

[jgolieb]

This is an automated email from the ASF dual-hosted git repository.

jgolieb pushed a commit to branch branch-feature-AMBARI-14714
in repository https://gitbox.apache.org/repos/asf/ambari.git

commit 3e07779c6959e29fbef23a67a453009a39f79663
Author: Jason Golieb 
AuthorDate: Wed May 16 11:10:24 2018 -0700

Remove unused code.
---
 .../app/controllers/wizard/step8_controller.js |  83 
 ambari-web/app/utils/ajax/ajax.js  |  13 --
 ambari-web/test/controllers/wizard/step8_test.js   | 216 -
 3 files changed, 312 deletions(-)

diff --git a/ambari-web/app/controllers/wizard/step8_controller.js 
b/ambari-web/app/controllers/wizard/step8_controller.js
index 0ba11c9..80a352c 100644
--- a/ambari-web/app/controllers/wizard/step8_controller.js
+++ b/ambari-web/app/controllers/wizard/step8_controller.js
@@ -365,47 +365,6 @@ App.WizardStep8Controller = 
App.WizardStepController.extend(App.AddSecurityConfi
   },
 
   /**
-   * Load repo info for add Service/Host wizard review page
-   * @return {$.ajax|null}
-   * @method loadRepoInfo
-   */
-  loadRepoInfo: function () {
-var stackName = App.get('currentStackName');
-var currentStackVersionNumber = App.get('currentStackVersionNumber');
-var currentStackVersion = App.StackVersion.find().filterProperty('stack', 
stackName).findProperty('version', currentStackVersionNumber);
-var currentRepoVersion = 
currentStackVersion.get('repositoryVersion.repositoryVersion');
-
-return App.ajax.send({
-  name: 'cluster.load_repo_version',
-  sender: this,
-  data: {
-stackName: stackName,
-repositoryVersion: currentRepoVersion
-  },
-  success: 'loadRepoInfoSuccessCallback',
-  error: 'loadRepoInfoErrorCallback'
-});
-  },
-
-  /**
-   * Save all repo base URL of all OS type to repoInfo
-   * @param {object} data
-   * @method loadRepoInfoSuccessCallback
-   */
-  loadRepoInfoSuccessCallback: function (data) {
-Em.assert('Current repo-version may be only one', data.items.length === 1);
-if (data.items.length) {
-  var allRepos = this.generateRepoInfo(Em.getWithDefault(data, 
'items.0.repository_versions.0.operating_systems', []));
-  allRepos.set('display_name', 
Em.I18n.t("installer.step8.repoInfo.displayName"));
-  this.get('clusterInfo').set('repoInfo', allRepos);
-  //if the property is missing, set as false
-  this.get('clusterInfo').set('useRedhatSatellite', 
data.items[0].repository_versions[0].operating_systems[0].OperatingSystems.ambari_managed_repositories
 === false);
-} else {
-  this.loadDefaultRepoInfo();
-}
-  },
-
-  /**
* Generate list regarding info about OS versions and repositories.
*
* @param {Object{}} oses - OS array
@@ -424,48 +383,6 @@ App.WizardStep8Controller = 
App.WizardStepController.extend(App.AddSecurityConfi
   },
 
   /**
-   * Load repo info from stack. Used if installed stack doesn't have upgrade 
info.
-   *
-   * @returns {$.Deferred}
-   * @method loadDefaultRepoInfo
-   */
-  loadDefaultRepoInfo: function() {
-var nameVersionCombo = App.get('currentStackVersion').split('-');
-
-return App.ajax.send({
-  name: 'cluster.load_repositories',
-  sender: this,
-  data: {
-stackName: nameVersionCombo[0],
-stackVersion: nameVersionCombo[1]
-  },
-  success: 'loadDefaultRepoInfoSuccessCallback',
-  error: 'loadRepoInfoErrorCallback'
-});
-  },
-
-  /**
-   * @param {Object} data - JSON data from server
-   * @method loadDefaultRepoInfoSuccessCallback
-   */
-  loadDefaultRepoInfoSuccessCallback: function (data) {
-var allRepos = this.generateRepoInfo(Em.getWithDefault(data, 'items', []));
-allRepos.set('display_name', 
Em.I18n.t("installer.step8.repoInfo.displayName"));
-this.get('clusterInfo').set('repoInfo', allRepos);
-//if the property is missing, set as false
-this.get('clusterInfo').set('useRedhatSatellite', 
data.items[0].OperatingSystems.ambari_managed_repositories === false);
-  },
-
-  /**
-   * @method loadRepoInfoErrorCallback
-   */
-  loadRepoInfoErrorCallback: function () {
-var allRepos = [];
-allRepos.set('display_name', 
Em.I18n.t("installer.step8.repoInfo.displayName"));
-this.get('clusterInfo').set('repoInfo', allRepos);
-  },
-
-  /**
* Load all info about services to services variable
* @method loadServices
*/
diff --git a/ambari-web/app/utils/ajax/ajax.js 
b/ambari-web/app/utils/ajax/ajax.js
index d288030..9223787 100644
--- a/ambari-web/app/utils/ajax/ajax.js
+++ b/ambari-web/app/utils/ajax/ajax.js
@@ -1418,19 +1418,6 @@ var urls = {
   };
 }
   },
-  'cluster.load_repositories': {
-'real': 
'/stacks/{stackName}/versions/{stackVersion}/operating_systems?fields=repositories/*,OperatingSystems/*',
-'mock': '/data/stacks/HDP-2.1/operating_systems.json',
-'format': function (data) {
-  return {
-data: data.data
-  

[ambari] 02/02: Fix constant declaration.

[jgolieb]

This is an automated email from the ASF dual-hosted git repository.

jgolieb pushed a commit to branch branch-feature-AMBARI-14714
in repository https://gitbox.apache.org/repos/asf/ambari.git

commit b8fef94c6abf9ebc0df34cf3e3e08760442fb7f4
Author: Jason Golieb 
AuthorDate: Wed May 16 16:34:54 2018 -0700

Fix constant declaration.
---
 ambari-web/app/utils/constants.js | 18 ++
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/ambari-web/app/utils/constants.js 
b/ambari-web/app/utils/constants.js
index 0695d3e..06defe9 100644
--- a/ambari-web/app/utils/constants.js
+++ b/ambari-web/app/utils/constants.js
@@ -28,11 +28,13 @@ App.False = false;
 App.True = true;
 
 //upgrade process states
-App.UpgradeState.NotRequired = 'NOT_REQUIRED';
-App.UpgradeState.Pending = 'PENDING';
-App.UpgradeState.InProgress = 'IN_PROGRESS';
-App.UpgradeState.Holding = 'HOLDING';
-App.UpgradeState.Completed = 'COMPLETED';
-App.UpgradeState.Aborted = 'ABORTED';
-App.UpgradeState.Failed = 'HOLDING_FAILED';
-App.UpgradeState.Timeout = 'HOLDING_TIMEDOUT';
\ No newline at end of file
+App.UpgradeState = {
+  NotRequired: 'NOT_REQUIRED',
+  Pending: 'PENDING',
+  InProgress: 'IN_PROGRESS',
+  Holding: 'HOLDING',
+  Completed: 'COMPLETED',
+  Aborted: 'ABORTED',
+  Failed: 'HOLDING_FAILED',
+  Timeout: 'HOLDING_TIMEDOUT'
+}
\ No newline at end of file

-- 
To stop receiving notification emails like this one, please contact
jgol...@apache.org.

[ambari] branch trunk updated: AMBARI-23838. Ambari Server NPE due to Agent failure during registration (#1285)

[adoroszlai]

This is an automated email from the ASF dual-hosted git repository.

adoroszlai pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/ambari.git


The following commit(s) were added to refs/heads/trunk by this push:
 new d9bfcac  AMBARI-23838. Ambari Server NPE due to Agent failure during 
registration (#1285)
d9bfcac is described below

commit d9bfcac2c53fc44ffb9a45c5ea29c592153ad069
Author: kasakrisz <33458261+kasakr...@users.noreply.github.com>
AuthorDate: Thu May 17 17:59:42 2018 +0200

AMBARI-23838. Ambari Server NPE due to Agent failure during registration 
(#1285)
---
 .../java/org/apache/ambari/server/state/host/HostImpl.java | 14 ++
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/state/host/HostImpl.java 
b/ambari-server/src/main/java/org/apache/ambari/server/state/host/HostImpl.java
index 94a0dc0..cb7af46 100644
--- 
a/ambari-server/src/main/java/org/apache/ambari/server/state/host/HostImpl.java
+++ 
b/ambari-server/src/main/java/org/apache/ambari/server/state/host/HostImpl.java
@@ -22,6 +22,7 @@ import java.util.Collection;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.Objects;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ConcurrentMap;
 import java.util.concurrent.CopyOnWriteArrayList;
@@ -1254,16 +1255,21 @@ public class HostImpl implements Host {
   String status = scHost.getState().name();
 
   String category = componentInfo.getCategory();
+  if (category == null) {
+LOG.warn("In stack {}-{} service {} component {} category is null!",
+stackId.getStackName(), stackId.getStackVersion(), 
scHost.getServiceName(), scHost.getServiceComponentName());
+continue;
+  }
 
   if (MaintenanceState.OFF == 
maintenanceStateHelper.getEffectiveState(scHost, this)) {
-if (category.equals("MASTER")) {
+if (Objects.equals("MASTER", category)) {
   ++masterCount;
-  if (status.equals("STARTED")) {
+  if (Objects.equals("STARTED", status)) {
 ++mastersRunning;
   }
-} else if (category.equals("SLAVE")) {
+} else if (Objects.equals("SLAVE", category)) {
   ++slaveCount;
-  if (status.equals("STARTED")) {
+  if (Objects.equals("STARTED", status)) {
 ++slavesRunning;
   }
 }

-- 
To stop receiving notification emails like this one, please contact
adorosz...@apache.org.

[ambari] branch trunk updated: AMBARI-23879 Redo the Manage Journalnodes wizard in the context of federation changes. (ababiichuk)

[ababiichuk]

This is an automated email from the ASF dual-hosted git repository.

ababiichuk pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/ambari.git


The following commit(s) were added to refs/heads/trunk by this push:
 new 9671dd1  AMBARI-23879 Redo the Manage Journalnodes wizard in the 
context of federation changes. (ababiichuk)
9671dd1 is described below

commit 9671dd17d83d39589cb05e830ecaffcf2a025086
Author: aBabiichuk 
AuthorDate: Thu May 17 17:38:09 2018 +0300

AMBARI-23879 Redo the Manage Journalnodes wizard in the context of 
federation changes. (ababiichuk)
---
 ambari-web/app/assets/test/tests.js|  1 -
 ambari-web/app/controllers.js  |  1 -
 .../journalNode/step1_controller.js| 12 +
 .../journalNode/step4_controller.js|  7 +--
 .../journalNode/step5_controller.js| 11 +++-
 .../journalNode/step6_controller.js| 13 ++---
 .../journalNode/step7_controller.js| 13 ++---
 .../journalNode/step8_controller.js| 35 -
 .../journalNode/wizard_controller.js   |  2 +-
 ambari-web/app/messages.js | 47 +
 ambari-web/app/routes/manage_journalnode_routes.js | 24 +
 .../admin/highAvailability/journalNode/step3.hbs   |  8 +--
 .../admin/highAvailability/journalNode/step5.hbs   | 13 +++--
 .../admin/highAvailability/journalNode/step7.hbs   | 12 +
 .../admin/highAvailability/journalNode/step8.hbs   | 18 ---
 .../admin/highAvailability/journalNode/wizard.hbs  |  5 +-
 ambari-web/app/views.js|  1 -
 .../highAvailability/journalNode/step5_view.js | 33 +---
 .../highAvailability/journalNode/step7_view.js |  9 ++--
 .../highAvailability/journalNode/step8_view.js | 29 --
 .../journalNode/step4_controller_test.js   | 22 
 .../journalNode/step6_controller_test.js   | 55 +++
 .../journalNode/step7_controller_test.js   | 14 +++--
 .../journalNode/step8_controller_test.js   | 61 --
 24 files changed, 107 insertions(+), 339 deletions(-)

diff --git a/ambari-web/app/assets/test/tests.js 
b/ambari-web/app/assets/test/tests.js
index 482f046..b8c34de 100644
--- a/ambari-web/app/assets/test/tests.js
+++ b/ambari-web/app/assets/test/tests.js
@@ -94,7 +94,6 @@ var files = [
   
'test/controllers/main/admin/highAvailability/journalNode/step4_controller_test',
   
'test/controllers/main/admin/highAvailability/journalNode/step6_controller_test',
   
'test/controllers/main/admin/highAvailability/journalNode/step7_controller_test',
-  
'test/controllers/main/admin/highAvailability/journalNode/step8_controller_test',
   
'test/controllers/main/admin/highAvailability/journalNode/wizard_controller_test',
   
'test/controllers/main/admin/highAvailability/rangerAdmin/step3_controller_test',
   'test/controllers/main/dashboard/config_history_controller_test',
diff --git a/ambari-web/app/controllers.js b/ambari-web/app/controllers.js
index c68d306..bd858a5 100644
--- a/ambari-web/app/controllers.js
+++ b/ambari-web/app/controllers.js
@@ -88,7 +88,6 @@ 
require('controllers/main/admin/highAvailability/journalNode/step4_controller');
 
require('controllers/main/admin/highAvailability/journalNode/step5_controller');
 
require('controllers/main/admin/highAvailability/journalNode/step6_controller');
 
require('controllers/main/admin/highAvailability/journalNode/step7_controller');
-require('controllers/main/admin/highAvailability/journalNode/step8_controller');
 require('controllers/main/admin/stack_and_upgrade_controller');
 require('controllers/main/admin/stack_upgrade_history_controller');
 require('controllers/main/admin/serviceAccounts_controller');
diff --git 
a/ambari-web/app/controllers/main/admin/highAvailability/journalNode/step1_controller.js
 
b/ambari-web/app/controllers/main/admin/highAvailability/journalNode/step1_controller.js
index 197596c..8f914cd 100644
--- 
a/ambari-web/app/controllers/main/admin/highAvailability/journalNode/step1_controller.js
+++ 
b/ambari-web/app/controllers/main/admin/highAvailability/journalNode/step1_controller.js
@@ -65,6 +65,18 @@ App.ManageJournalNodeWizardStep1Controller = 
Em.Controller.extend(App.BlueprintM
   },
 
   /**
+   * Override of method from App.AssignMasterComponents
+   * Added to satisfy the requirement that maximum number of new JournalNodes 
to be added
+   * should be 1 less that total of the existing JournalNodes
+   * @returns {number}
+   */
+  getMaxNumberOfMasters: function () {
+const defaultLimitation = this._super('JOURNALNODE'),
+  installedJournalNodesCount = 
App.HostComponent.find().filterProperty('componentName', 'JOURNALNODE').length;
+return Math.min(defaultLimitation, installedJournalNodesCount * 2 - 1);
+  },
+
+  /**
* Enable/Disable show/hide operation 

[ambari] branch trunk updated: AMBARI-23862. STOMP alert update was not sent when maintenance mode changed. (#1289)

[mpapirkovskyy]

This is an automated email from the ASF dual-hosted git repository.

mpapirkovskyy pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/ambari.git


The following commit(s) were added to refs/heads/trunk by this push:
 new 6d413e3  AMBARI-23862. STOMP alert update was not sent when 
maintenance mode changed. (#1289)
6d413e3 is described below

commit 6d413e39ca4ab43f48feba785f08c1638b847b62
Author: Myroslav Papirkovskyi 
AuthorDate: Thu May 17 15:58:32 2018 +0300

AMBARI-23862. STOMP alert update was not sent when maintenance mode 
changed. (#1289)

* AMBARI-23862. STOMP alert update was not sent when maintenance mode 
changed. (mpapirkovskyy)

* AMBARI-23862. STOMP alert update was not sent when maintenance mode 
changed. (mpapirkovskyy)
---
 .../server/agent/stomp/AlertDefinitionsHolder.java |  2 +-
 .../alerts/AlertMaintenanceModeListener.java   | 35 +---
 .../upgrade/AlertMaintenanceModeListenerTest.java  | 63 --
 3 files changed, 89 insertions(+), 11 deletions(-)

diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/agent/stomp/AlertDefinitionsHolder.java
 
b/ambari-server/src/main/java/org/apache/ambari/server/agent/stomp/AlertDefinitionsHolder.java
index c20d6a4..703cd82 100644
--- 
a/ambari-server/src/main/java/org/apache/ambari/server/agent/stomp/AlertDefinitionsHolder.java
+++ 
b/ambari-server/src/main/java/org/apache/ambari/server/agent/stomp/AlertDefinitionsHolder.java
@@ -125,7 +125,7 @@ public class AlertDefinitionsHolder extends 
AgentHostDataHolder e : updateClusters.entrySet()) {
-  if (CollectionUtils.isEmpty(e.getValue().getAlertDefinitions())) {
+  if (update.getEventType().equals(DELETE) && 
CollectionUtils.isEmpty(e.getValue().getAlertDefinitions())) {
 existingClusters.remove(e.getKey());
 changed = true;
   } else {
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/events/listeners/alerts/AlertMaintenanceModeListener.java
 
b/ambari-server/src/main/java/org/apache/ambari/server/events/listeners/alerts/AlertMaintenanceModeListener.java
index f73d7c9..167e8ad 100644
--- 
a/ambari-server/src/main/java/org/apache/ambari/server/events/listeners/alerts/AlertMaintenanceModeListener.java
+++ 
b/ambari-server/src/main/java/org/apache/ambari/server/events/listeners/alerts/AlertMaintenanceModeListener.java
@@ -17,14 +17,19 @@
  */
 package org.apache.ambari.server.events.listeners.alerts;
 
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 import org.apache.ambari.server.EagerSingleton;
+import org.apache.ambari.server.api.query.render.AlertSummaryGroupedRenderer;
 import org.apache.ambari.server.events.AggregateAlertRecalculateEvent;
 import org.apache.ambari.server.events.AlertEvent;
+import org.apache.ambari.server.events.AlertUpdateEvent;
 import org.apache.ambari.server.events.MaintenanceModeEvent;
 import org.apache.ambari.server.events.publishers.AlertEventPublisher;
 import org.apache.ambari.server.events.publishers.AmbariEventPublisher;
+import org.apache.ambari.server.events.publishers.STOMPUpdatePublisher;
 import org.apache.ambari.server.orm.dao.AlertsDAO;
 import org.apache.ambari.server.orm.entities.AlertCurrentEntity;
 import org.apache.ambari.server.orm.entities.AlertDefinitionEntity;
@@ -74,6 +79,9 @@ public class AlertMaintenanceModeListener {
   @Inject
   private AggregateDefinitionMapping m_aggregateMapping;
 
+  @Inject
+  private STOMPUpdatePublisher  STOMPUpdatePublisher;
+
   private long clusterId = -1;
 
   /**
@@ -107,7 +115,7 @@ public class AlertMaintenanceModeListener {
 if (event.getMaintenanceState() != MaintenanceState.OFF) {
   newMaintenanceState = MaintenanceState.ON;
 }
-
+Map> 
alertUpdates = new HashMap<>();
 for( AlertCurrentEntity currentAlert : currentAlerts ){
   AlertHistoryEntity history = currentAlert.getAlertHistory();
 
@@ -124,7 +132,7 @@ public class AlertMaintenanceModeListener {
 if( null != host ){
   String hostName = host.getHostName();
   if( hostName.equals( alertHostName ) ){
-if (updateMaintenanceStateAndRecalculateAggregateAlert(history, 
currentAlert, newMaintenanceState))
+if (updateMaintenanceStateAndRecalculateAggregateAlert(history, 
currentAlert, newMaintenanceState, alertUpdates))
   recalculateAggregateAlert = true;
 continue;
   }
@@ -132,7 +140,7 @@ public class AlertMaintenanceModeListener {
   // service level maintenance
   String serviceName = service.getName();
   if( serviceName.equals(alertServiceName)){
-if (updateMaintenanceStateAndRecalculateAggregateAlert(history, 
currentAlert, newMaintenanceState))
+if (updateMaintenanceStateAndRecalculateAggregateAlert(history, 
currentAlert, 

[ambari] branch trunk updated (15909de -> ea078dd)

[alexantonenko]

This is an automated email from the ASF dual-hosted git repository.

alexantonenko pushed a change to branch trunk
in repository https://gitbox.apache.org/repos/asf/ambari.git.


from 15909de  Merge pull request #1300 from hiveww/AMBARI-23875-trunk
 add da4733d  AMBARI-23873. Upgrade history arrow does not indicate 
downwards when expanded
 add 1c56307  AMBARI-23873. Upgrade history arrow does not indicate 
downwards when expanded (bootsrap migration fix)
 new ea078dd  Merge pull request #1299 from hiveww/AMBARI-23873-trunk

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 ambari-web/app/views/main/admin/stack_upgrade/upgrade_history_view.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

-- 
To stop receiving notification emails like this one, please contact
alexantone...@apache.org.

[ambari] 01/01: Merge pull request #1299 from hiveww/AMBARI-23873-trunk

[alexantonenko]

This is an automated email from the ASF dual-hosted git repository.

alexantonenko pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/ambari.git

commit ea078dd7d1c674143326d9a6c98439cbf81342ce
Merge: 15909de 1c56307
Author: Alexander Antonenko 
AuthorDate: Thu May 17 15:07:16 2018 +0300

Merge pull request #1299 from hiveww/AMBARI-23873-trunk

AMBARI-23873. Upgrade history arrow does not indicate downwards when …

 ambari-web/app/views/main/admin/stack_upgrade/upgrade_history_view.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

-- 
To stop receiving notification emails like this one, please contact
alexantone...@apache.org.

[ambari] 01/01: Merge pull request #1300 from hiveww/AMBARI-23875-trunk

[alexantonenko]

This is an automated email from the ASF dual-hosted git repository.

alexantonenko pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/ambari.git

commit 15909dea795dcdcb19049f07f35d04d9c56ccd0c
Merge: d8e400c 4116774
Author: Alexander Antonenko 
AuthorDate: Thu May 17 15:07:04 2018 +0300

Merge pull request #1300 from hiveww/AMBARI-23875-trunk

AMBARI-23875. Unnecessary popup appears while clicking Complete in Su…

 ambari-web/app/routes/add_service_routes.js | 30 -
 1 file changed, 17 insertions(+), 13 deletions(-)

-- 
To stop receiving notification emails like this one, please contact
alexantone...@apache.org.

[ambari] branch trunk updated (d8e400c -> 15909de)

[alexantonenko]

This is an automated email from the ASF dual-hosted git repository.

alexantonenko pushed a change to branch trunk
in repository https://gitbox.apache.org/repos/asf/ambari.git.


from d8e400c  AMBARI-23872. New Alert JSON Is Invalid When Sent To Agents 
(aonishuk)
 add ee2aa4f  AMBARI-23875. Unnecessary popup appears while clicking 
Complete in Summary Page after add service completion
 add 4116774  AMBARI-23875. Unnecessary popup appears while clicking 
Complete in Summary Page after add service completion (close dialog fix)
 new 15909de  Merge pull request #1300 from hiveww/AMBARI-23875-trunk

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 ambari-web/app/routes/add_service_routes.js | 30 -
 1 file changed, 17 insertions(+), 13 deletions(-)

-- 
To stop receiving notification emails like this one, please contact
alexantone...@apache.org.

[ambari] branch branch-2.6 updated: AMBARI-23604 : Hive View : handled table buckets specification in upload table (nitirajrathore) (#1297)

[nitiraj]

This is an automated email from the ASF dual-hosted git repository.

nitiraj pushed a commit to branch branch-2.6
in repository https://gitbox.apache.org/repos/asf/ambari.git


The following commit(s) were added to refs/heads/branch-2.6 by this push:
 new 0b1f8c1  AMBARI-23604 : Hive View : handled table buckets 
specification in upload table (nitirajrathore) (#1297)
0b1f8c1 is described below

commit 0b1f8c18f14c196bf0304a4a273361be2aa051d4
Author: nitirajrathore 
AuthorDate: Thu May 17 14:02:41 2018 +0530

AMBARI-23604 : Hive View : handled table buckets specification in upload 
table (nitirajrathore) (#1297)
---
 .../internal/query/generators/InsertFromQueryGenerator.java   | 4 +++-
 .../org/apache/ambari/view/hive20/resources/jobs/JobService.java  | 2 +-
 .../ui/app/routes/databases/database/tables/upload-table.js   | 1 +
 contrib/views/pig/pom.xml | 8 
 4 files changed, 13 insertions(+), 2 deletions(-)

diff --git 
a/contrib/views/hive20/src/main/java/org/apache/ambari/view/hive20/internal/query/generators/InsertFromQueryGenerator.java
 
b/contrib/views/hive20/src/main/java/org/apache/ambari/view/hive20/internal/query/generators/InsertFromQueryGenerator.java
index e761425..2d2930a 100644
--- 
a/contrib/views/hive20/src/main/java/org/apache/ambari/view/hive20/internal/query/generators/InsertFromQueryGenerator.java
+++ 
b/contrib/views/hive20/src/main/java/org/apache/ambari/view/hive20/internal/query/generators/InsertFromQueryGenerator.java
@@ -47,7 +47,9 @@ public class InsertFromQueryGenerator implements 
QueryGenerator{
   public Optional getQuery() throws ServiceException {
 StringBuilder insertQuery = new StringBuilder();
 //Dynamic partition strict mode requires at least one static partition 
column. To turn this off set hive.exec.dynamic.partition.mode=nonstrict
-insertQuery.append("set 
hive.exec.dynamic.partition.mode=nonstrict;").append("\n");
+insertQuery.append("SET 
hive.exec.dynamic.partition.mode=nonstrict;").append("\n");
+insertQuery.append("SET hive.support.concurrency=true;").append("\n");
+insertQuery.append("SET 
hive.txn.manager=org.apache.hadoop.hive.ql.lockmgr.DbTxnManager;").append("\n");
 
 insertQuery.append(" FROM 
").append("`").append(insertFromQueryInput.getFromDatabase()).append("`.`")
 .append(insertFromQueryInput.getFromTable()).append("` tempTable");
diff --git 
a/contrib/views/hive20/src/main/java/org/apache/ambari/view/hive20/resources/jobs/JobService.java
 
b/contrib/views/hive20/src/main/java/org/apache/ambari/view/hive20/resources/jobs/JobService.java
index d99938f..94e330c 100644
--- 
a/contrib/views/hive20/src/main/java/org/apache/ambari/view/hive20/resources/jobs/JobService.java
+++ 
b/contrib/views/hive20/src/main/java/org/apache/ambari/view/hive20/resources/jobs/JobService.java
@@ -141,7 +141,7 @@ public class JobService extends BaseService {
   Throwable th = error.get().getError();
   if(th instanceof SQLException){
 SQLException sqlException = (SQLException) th;
-if(sqlException.getSQLState().equals("AUTHFAIL") && 
ConnectionFactory.isLdapEnabled(context))
+if(sqlException.getSQLState() != null && 
sqlException.getSQLState().equals("AUTHFAIL") && 
ConnectionFactory.isLdapEnabled(context))
   throw new ServiceFormattedException("Hive Authentication 
failed", sqlException, 401);
   }
   throw new Exception(th);
diff --git 
a/contrib/views/hive20/src/main/resources/ui/app/routes/databases/database/tables/upload-table.js
 
b/contrib/views/hive20/src/main/resources/ui/app/routes/databases/database/tables/upload-table.js
index 54acc22..1baafa1 100644
--- 
a/contrib/views/hive20/src/main/resources/ui/app/routes/databases/database/tables/upload-table.js
+++ 
b/contrib/views/hive20/src/main/resources/ui/app/routes/databases/database/tables/upload-table.js
@@ -307,6 +307,7 @@ export default NewTable.extend(UILoggerMixin, {
 column.set("precision");
   }
   column.set("isPartitioned", false); // remove all partitioning 
information from temp table.
+  column.set("isClustered", false); // remove all clustering information 
from temp table.
   return column;
 });
 
diff --git a/contrib/views/pig/pom.xml b/contrib/views/pig/pom.xml
index 4698f23..0725cbe 100644
--- a/contrib/views/pig/pom.xml
+++ b/contrib/views/pig/pom.xml
@@ -155,6 +155,14 @@
   
 
   
+
+org.apache.maven.plugins
+maven-surefire-plugin
+
+  0
+
+  
+  
 
 org.apache.maven.plugins
 maven-clean-plugin

-- 
To stop receiving notification emails like this one, please contact
niti...@apache.org.

[ambari] branch trunk updated: AMBARI-23872. New Alert JSON Is Invalid When Sent To Agents (aonishuk)

[aonishuk]

This is an automated email from the ASF dual-hosted git repository.

aonishuk pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/ambari.git


The following commit(s) were added to refs/heads/trunk by this push:
 new d8e400c  AMBARI-23872. New Alert JSON Is Invalid When Sent To Agents 
(aonishuk)
d8e400c is described below

commit d8e400c9250b081f19b4f694ab33b61d17a368f7
Author: Andrew Onishuk 
AuthorDate: Thu May 17 10:27:56 2018 +0300

AMBARI-23872. New Alert JSON Is Invalid When Sent To Agents (aonishuk)
---
 .../main/java/org/apache/ambari/server/state/alert/MetricSource.java| 2 ++
 1 file changed, 2 insertions(+)

diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/state/alert/MetricSource.java
 
b/ambari-server/src/main/java/org/apache/ambari/server/state/alert/MetricSource.java
index e6fc6f3..cb6fd3b 100644
--- 
a/ambari-server/src/main/java/org/apache/ambari/server/state/alert/MetricSource.java
+++ 
b/ambari-server/src/main/java/org/apache/ambari/server/state/alert/MetricSource.java
@@ -108,12 +108,14 @@ public class MetricSource extends Source {
   @JsonInclude(JsonInclude.Include.NON_EMPTY)
   @JsonAutoDetect(fieldVisibility = JsonAutoDetect.Visibility.ANY, 
getterVisibility = JsonAutoDetect.Visibility.NONE, setterVisibility = 
JsonAutoDetect.Visibility.NONE)
   public static class JmxInfo {
+@JsonProperty("property_list")
 @SerializedName("property_list")
 private List propertyList;
 
 @SerializedName("value")
 private String value = "{0}";
 
+@JsonProperty("url_suffix")
 @SerializedName("url_suffix")
 private String urlSuffix = "/jmx";
 

-- 
To stop receiving notification emails like this one, please contact
aonis...@apache.org.