[31/50] [abbrv] ambari git commit: AMBARI-22035. Stack and Versions page is stuck while trying to install a new stack (alexantonenko)

[jluniya]

AMBARI-22035. Stack and Versions page is stuck while trying to install a new 
stack (alexantonenko)


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

Branch: refs/heads/branch-feature-AMBARI-14714
Commit: 19b16073c50556de666c17b3749ff6a0c1dae398
Parents: ea89244
Author: Alex Antonenko 
Authored: Fri Sep 22 19:25:38 2017 +0300
Committer: Alex Antonenko 
Committed: Fri Sep 22 19:25:38 2017 +0300

--
 ambari-web/app/mappers/repository_version_mapper.js | 2 +-
 ambari-web/app/mappers/stack_version_mapper.js  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/19b16073/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 746fc53..61056ae 100644
--- a/ambari-web/app/mappers/repository_version_mapper.js
+++ b/ambari-web/app/mappers/repository_version_mapper.js
@@ -123,7 +123,7 @@ App.repoVersionMapper = App.QuickDataMapper.create({
 display_name: service.display_name,
 latest_version: service.versions[0] ? service.versions[0] : '',
 is_available: 
item[repoVersionsKey].services.someProperty('name', service.name),
-is_upgradable: json.stackServices[service.name] && 
json.stackServices[service.name].upgrade
+is_upgradable: json.stackServices ? 
json.stackServices[service.name] && json.stackServices[service.name].upgrade : 
true
   };
   resultService.push(serviceObj);
 }, this);

http://git-wip-us.apache.org/repos/asf/ambari/blob/19b16073/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 9fa0b78..7612674 100644
--- a/ambari-web/app/mappers/stack_version_mapper.js
+++ b/ambari-web/app/mappers/stack_version_mapper.js
@@ -81,7 +81,7 @@ App.stackVersionMapper = App.QuickDataMapper.create({
   item.repository_versions[0].RepositoryVersions.stackVersionId = 
item.ClusterStackVersions.id;
   App.repoVersionMapper.map({
 "items": item.repository_versions,
-"stackServices": 
item.ClusterStackVersions.repository_summary.services
+"stackServices": item.ClusterStackVersions.repository_summary && 
item.ClusterStackVersions.repository_summary.services
   }, true, true);
 }
 resultStack.push(this.parseIt(stack, this.get('modelStack')));

[32/50] [abbrv] ambari git commit: AMBARI-22034. AMS: Add smart configs support for service. Addendum fix (swagle)

[jluniya]

AMBARI-22034. AMS: Add smart configs support for service. Addendum fix (swagle)


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

Branch: refs/heads/branch-feature-AMBARI-14714
Commit: 5d5cc4ff024965210aaa4fcccb17d694b69c9927
Parents: 19b1607
Author: Siddharth Wagle 
Authored: Fri Sep 22 14:19:31 2017 -0700
Committer: Siddharth Wagle 
Committed: Fri Sep 22 14:19:31 2017 -0700

--
 .../AMBARI_METRICS/0.1.0/configuration/ams-site.xml| 2 --
 1 file changed, 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/5d5cc4ff/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/configuration/ams-site.xml
--
diff --git 
a/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/configuration/ams-site.xml
 
b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/configuration/ams-site.xml
index ab14f18..b7ae456 100644
--- 
a/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/configuration/ams-site.xml
+++ 
b/ambari-server/src/main/resources/common-services/AMBARI_METRICS/0.1.0/configuration/ams-site.xml
@@ -31,8 +31,6 @@
   2) distributed: HBase daemons writing to HDFS
 
 
-Operation Mode
-Metrics service Operation mode
 
   false
   value-list

[50/50] [abbrv] ambari git commit: Merge remote-tracking branch 'origin/trunk' into branch-feature-AMBARI-14714

[jluniya]

Merge remote-tracking branch 'origin/trunk' into branch-feature-AMBARI-14714


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

Branch: refs/heads/branch-feature-AMBARI-14714
Commit: 530df165da444c3259f72d7e62339ba7654f5fe3
Parents: 986b3b1 84fed85
Author: Jayush Luniya 
Authored: Mon Sep 25 22:19:28 2017 -0700
Committer: Jayush Luniya 
Committed: Mon Sep 25 22:19:28 2017 -0700

--
 .../stackVersions/StackVersionsCreateCtrl.js|   6 +
 .../src/main/python/ambari_agent/HostInfo.py|  29 +-
 .../test/python/ambari_agent/TestHostInfo.py|  21 +-
 .../libraries/functions/copy_tarball.py | 103 ++-
 .../libraries/functions/curl_krb_request.py |   2 +-
 .../libraries/functions/repository_util.py  |   9 +-
 .../libraries/functions/stack_select.py |  65 +-
 .../libraries/functions/stack_tools.py  |  12 +-
 .../libraries/functions/upgrade_summary.py  |  16 +
 .../libraries/functions/version_select_util.py  |  64 +-
 .../libraries/script/script.py  |  39 +-
 .../HDP/2.0.8/services/HDFS/kerberos.json   |  12 +-
 ambari-infra/ambari-infra-manager/.gitignore|   2 +
 .../ambari-infra-manager/docker/bin/start.sh|   2 +-
 ambari-infra/ambari-infra-manager/pom.xml   | 172 +++--
 .../org/apache/ambari/infra/InfraManager.java   | 208 +-
 .../infra/common/InfraManagerConstants.java |  31 -
 .../infra/conf/InfraManagerDataConfig.java  |  37 +
 .../conf/InfraManagerJerseyResourceConfig.java  |  37 +
 .../infra/conf/InfraManagerServletConfig.java   |  83 +++
 .../infra/conf/StaticResourceConfiguration.java |  49 ++
 .../infra/doc/InfraManagerApiDocStorage.java|  90 +++
 .../ambari/infra/job/dummy/DummyItemWriter.java |  15 +-
 .../ambari/infra/rest/ApiDocResource.java   |  56 ++
 .../src/main/resources/infra-manager.properties |   4 +-
 .../src/main/resources/log4j.xml|  31 -
 .../src/main/resources/log4j2.xml   |  41 ++
 .../src/main/resources/static/index.html|  24 +
 .../src/main/resources/swagger/swagger.html |  36 +-
 .../src/main/resources/webapp/index.html|  24 -
 ambari-infra/ambari-infra-solr-client/build.xml |   1 +
 ambari-infra/ambari-infra-solr-client/pom.xml   |   5 +
 .../ambari/infra/solr/AmbariSolrCloudCLI.java   |  12 +-
 .../apache/ambari/infra/solr/S3Uploader.java|  64 ++
 .../src/main/python/solrDataManager.py  | 715 +++
 .../src/main/resources/log4j.properties |   6 +-
 .../src/main/resources/solrCloudCli.sh  |   8 +-
 .../src/main/resources/solrIndexHelper.sh   |  14 +-
 .../src/main/resources/grok-patterns|   2 +-
 .../ambari/logsearch/conf/SecurityConfig.java   |   9 -
 .../ambari-logsearch-web/.angular-cli.json  |  34 +-
 ambari-logsearch/ambari-logsearch-web/README.md |  10 +-
 .../ambari-logsearch-web/package.json   |  34 +-
 ambari-logsearch/ambari-logsearch-web/pom.xml   |   4 +-
 .../ambari-logsearch-web/src/app/app.module.ts  |  14 +-
 .../src/app/classes/list-item.class.ts  |  25 +
 .../queries/audit-logs-query-params.class.ts|   4 -
 ...service-logs-histogram-query-params.class.ts |   1 -
 .../queries/service-logs-query-params.class.ts  |   1 -
 .../date-picker/date-picker.component.html  |  25 +
 .../date-picker/date-picker.component.spec.ts   |  51 ++
 .../date-picker/date-picker.component.ts|  73 ++
 .../dropdown-button.component.html  |   9 +-
 .../dropdown-button.component.less  |   4 +
 .../dropdown-button.component.spec.ts   |  29 +-
 .../dropdown-button.component.ts|  14 +-
 .../dropdown-list/dropdown-list.component.html  |   5 +-
 .../dropdown-list/dropdown-list.component.ts|   7 +-
 .../filter-button.component.spec.ts |  29 +-
 .../filter-button/filter-button.component.ts|   3 +-
 .../filter-dropdown.component.spec.ts   |  26 +-
 .../filters-panel/filters-panel.component.html  |  24 +-
 .../filters-panel/filters-panel.component.less  |  10 +
 .../filters-panel.component.spec.ts |   6 +-
 .../filters-panel/filters-panel.component.ts|  27 +-
 .../logs-container.component.html   |   5 +
 .../logs-container.component.less   |   4 +
 .../logs-container.component.spec.ts|   4 +-
 .../logs-container/logs-container.component.ts  |  10 +
 .../logs-list/logs-list.component.html  |  57 +-
 .../logs-list/logs-list.component.less  |   5 +-
 .../components/logs-list/logs-list.component.ts |  72 +-
 .../menu-button/menu-button.component.html  |   2 +-
 

[25/50] [abbrv] ambari git commit: AMBARI-22039. File "hdfs.headless.keytab" has incorrect permission (aonishuk)

[jluniya]

AMBARI-22039. File "hdfs.headless.keytab" has incorrect permission  (aonishuk)


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

Branch: refs/heads/branch-feature-AMBARI-14714
Commit: e4cadbb15876e635b6831d2a488edda80d2d0554
Parents: d966298
Author: Andrew Onishuk 
Authored: Fri Sep 22 13:42:26 2017 +0300
Committer: Andrew Onishuk 
Committed: Fri Sep 22 13:42:26 2017 +0300

--
 .../common-services/ZEPPELIN/0.7.0/package/scripts/master.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/e4cadbb1/ambari-server/src/main/resources/common-services/ZEPPELIN/0.7.0/package/scripts/master.py
--
diff --git 
a/ambari-server/src/main/resources/common-services/ZEPPELIN/0.7.0/package/scripts/master.py
 
b/ambari-server/src/main/resources/common-services/ZEPPELIN/0.7.0/package/scripts/master.py
index 7d44d16..382566e 100644
--- 
a/ambari-server/src/main/resources/common-services/ZEPPELIN/0.7.0/package/scripts/master.py
+++ 
b/ambari-server/src/main/resources/common-services/ZEPPELIN/0.7.0/package/scripts/master.py
@@ -327,7 +327,7 @@ class Master(Script):
   action="download_on_execute",
   source=self.getZeppelinConfFS(params),
   group=params.zeppelin_group,
-  user=params.zeppelin_user)
+  owner=params.zeppelin_user)
 except Fail as fail:
   if "doesn't exist" not in fail.args[0]:
 print "Error getting interpreter.json from HDFS"
@@ -357,7 +357,7 @@ class Master(Script):
 action="create_on_execute",
 source=interpreter_config,
 group=params.zeppelin_group,
-user=params.zeppelin_user,
+owner=params.zeppelin_user,
 replace_existing_files=True)
 
   def update_kerberos_properties(self):

[19/50] [abbrv] ambari git commit: AMBARI-220334. AMS: Add smart configs support for service. (swagle)

[jluniya]

AMBARI-220334. AMS: Add smart configs support for service. (swagle)


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

Branch: refs/heads/branch-feature-AMBARI-14714
Commit: f095b9590afe5657b560defb3e3d5e9294c1e65d
Parents: f1b5300
Author: Siddharth Wagle 
Authored: Thu Sep 21 12:56:35 2017 -0700
Committer: Siddharth Wagle 
Committed: Thu Sep 21 13:03:21 2017 -0700

--
 .../timeline/TimelineMetricConfiguration.java   |  13 +
 .../metrics/timeline/TimelineMetricsFilter.java |  24 +-
 .../timeline/TimelineMetricsFilterTest.java |   3 +
 .../0.1.0/configuration/ams-env.xml |   4 +
 .../0.1.0/configuration/ams-hbase-env.xml   |  16 ++
 .../0.1.0/configuration/ams-hbase-site.xml  |  24 +-
 .../0.1.0/configuration/ams-site.xml|  70 -
 .../AMBARI_METRICS/0.1.0/metainfo.xml   |   7 +
 .../AMBARI_METRICS/0.1.0/themes/theme.json  | 288 +++
 9 files changed, 423 insertions(+), 26 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/f095b959/ambari-metrics/ambari-metrics-timelineservice/src/main/java/org/apache/hadoop/yarn/server/applicationhistoryservice/metrics/timeline/TimelineMetricConfiguration.java
--
diff --git 
a/ambari-metrics/ambari-metrics-timelineservice/src/main/java/org/apache/hadoop/yarn/server/applicationhistoryservice/metrics/timeline/TimelineMetricConfiguration.java
 
b/ambari-metrics/ambari-metrics-timelineservice/src/main/java/org/apache/hadoop/yarn/server/applicationhistoryservice/metrics/timeline/TimelineMetricConfiguration.java
index 44073ab..899928a 100644
--- 
a/ambari-metrics/ambari-metrics-timelineservice/src/main/java/org/apache/hadoop/yarn/server/applicationhistoryservice/metrics/timeline/TimelineMetricConfiguration.java
+++ 
b/ambari-metrics/ambari-metrics-timelineservice/src/main/java/org/apache/hadoop/yarn/server/applicationhistoryservice/metrics/timeline/TimelineMetricConfiguration.java
@@ -254,9 +254,15 @@ public class TimelineMetricConfiguration {
   public static final String TIMELINE_METRICS_AGGREGATE_TABLES_DURABILITY =
   "timeline.metrics.aggregate.tables.durability";
 
+  public static final String TIMELINE_METRICS_WHITELIST_ENABLED =
+"timeline.metrics.whitelisting.enabled";
+
   public static final String TIMELINE_METRICS_WHITELIST_FILE =
 "timeline.metrics.whitelist.file";
 
+  public static final String TIMELINE_METRICS_WHITELIST_FILE_LOCATION_DEFAULT =
+"/etc/ambari-metrics-collector/conf/metrics_whitelist";
+
   public static final String TIMELINE_METRIC_METADATA_FILTERS =
 "timeline.metrics.service.metadata.filters";
 
@@ -518,4 +524,11 @@ public class TimelineMetricConfiguration {
   return false;
 }
   }
+
+  public boolean isWhitelistingEnabled() {
+if (metricsConf != null) {
+  return 
Boolean.parseBoolean(metricsConf.get(TIMELINE_METRICS_WHITELIST_ENABLED, 
"false"));
+}
+return false;
+  }
 }

http://git-wip-us.apache.org/repos/asf/ambari/blob/f095b959/ambari-metrics/ambari-metrics-timelineservice/src/main/java/org/apache/hadoop/yarn/server/applicationhistoryservice/metrics/timeline/TimelineMetricsFilter.java
--
diff --git 
a/ambari-metrics/ambari-metrics-timelineservice/src/main/java/org/apache/hadoop/yarn/server/applicationhistoryservice/metrics/timeline/TimelineMetricsFilter.java
 
b/ambari-metrics/ambari-metrics-timelineservice/src/main/java/org/apache/hadoop/yarn/server/applicationhistoryservice/metrics/timeline/TimelineMetricsFilter.java
index 1446ec2..63cc510 100644
--- 
a/ambari-metrics/ambari-metrics-timelineservice/src/main/java/org/apache/hadoop/yarn/server/applicationhistoryservice/metrics/timeline/TimelineMetricsFilter.java
+++ 
b/ambari-metrics/ambari-metrics-timelineservice/src/main/java/org/apache/hadoop/yarn/server/applicationhistoryservice/metrics/timeline/TimelineMetricsFilter.java
@@ -18,17 +18,14 @@
 
 package 
org.apache.hadoop.yarn.server.applicationhistoryservice.metrics.timeline;
 
-import org.apache.commons.collections.CollectionUtils;
-import org.apache.commons.lang.StringUtils;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.apache.hadoop.conf.Configuration;
-import org.apache.hadoop.metrics2.sink.timeline.TimelineMetric;
+import static 
org.apache.hadoop.yarn.server.applicationhistoryservice.metrics.timeline.TimelineMetricConfiguration.TIMELINE_METRICS_APPS_BLACKLIST;
+import static 

[05/50] [abbrv] ambari git commit: AMBARI-21999 - Always Take Target Read-Only Properties On Stack Upgrade (jonathanhurley)

[jluniya]

AMBARI-21999 -  Always Take Target Read-Only Properties On Stack Upgrade 
(jonathanhurley)


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

Branch: refs/heads/branch-feature-AMBARI-14714
Commit: 56c3da7846cf2b30e5860cb5bc32d3c9ecb93424
Parents: 8b9370a
Author: Jonathan Hurley 
Authored: Tue Sep 19 13:36:07 2017 -0400
Committer: Jonathan Hurley 
Committed: Wed Sep 20 10:17:31 2017 -0400

--
 .../ambari/server/state/UpgradeHelper.java  |  84 ++--
 .../StackUpgradeConfigurationMergeTest.java | 136 +++
 2 files changed, 208 insertions(+), 12 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/56c3da78/ambari-server/src/main/java/org/apache/ambari/server/state/UpgradeHelper.java
--
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/state/UpgradeHelper.java 
b/ambari-server/src/main/java/org/apache/ambari/server/state/UpgradeHelper.java
index 087adc2..8f9d8e1 100644
--- 
a/ambari-server/src/main/java/org/apache/ambari/server/state/UpgradeHelper.java
+++ 
b/ambari-server/src/main/java/org/apache/ambari/server/state/UpgradeHelper.java
@@ -926,7 +926,8 @@ public class UpgradeHelper {
* stack and the target stack. If a value has changed between stacks, then 
the
* target stack value should be taken unless the cluster's value differs from
* the old stack. This can occur if a property has been customized after
-   * installation.
+   * installation. Read-only properties, however, are always taken from the new
+   * stack.
* Downgrade: Reset the latest configurations from the service's original
* stack. The new configurations that were created on upgrade must be left
* intact until all components have been reverted, otherwise heartbeats will
@@ -976,6 +977,11 @@ public class UpgradeHelper {
 continue;
   }
 
+  // the auto-merge must take read-only properties even if they have 
changed
+  // - if the properties was read-only in the source stack, then we must
+  // take the new stack's value
+  Map readOnlyProperties = 
getReadOnlyProperties(sourceStackId, serviceName);
+
   // upgrade is a bit harder - we have to merge new stack configurations in
 
   // populate a map of default configurations for the service on the old
@@ -1041,8 +1047,7 @@ public class UpgradeHelper {
 Map existingConfigurations = 
existingServiceConfig.getProperties();
 
 // get the new configurations
-Map newDefaultConfigurations = 
newServiceDefaultConfigsByType.get(
-configurationType);
+Map newDefaultConfigurations = 
newServiceDefaultConfigsByType.get(configurationType);
 
 // if the new stack configurations don't have the type, then simply add
 // all of the existing in
@@ -1061,8 +1066,7 @@ public class UpgradeHelper {
   }
 }
 
-// process every existing configuration property for this configuration
-// type
+// process every existing configuration property for this 
configuration type
 for (Map.Entry existingConfigurationEntry : 
existingConfigurations.entrySet()) {
   String existingConfigurationKey = 
existingConfigurationEntry.getKey();
   String existingConfigurationValue = 
existingConfigurationEntry.getValue();
@@ -1079,17 +1083,22 @@ public class UpgradeHelper {
   // from the original stack
   String oldDefaultValue = 
oldServiceDefaultConfigs.get(existingConfigurationKey);
 
-  if (!StringUtils.equals(existingConfigurationValue, 
oldDefaultValue)) {
-// at this point, we've determined that there is a
-// difference
-// between default values between stacks, but the value was
-// also customized, so keep the customized value
+  // see if this property is a read-only property which means that
+  // we shouldn't care if it was changed - we should take the new
+  // stack's value
+  Set readOnlyPropertiesForType = 
readOnlyProperties.get(configurationType);
+  boolean readOnly = (null != readOnlyPropertiesForType
+  && 
readOnlyPropertiesForType.contains(existingConfigurationKey));
+
+  if (!readOnly && !StringUtils.equals(existingConfigurationValue, 
oldDefaultValue)) {
+// at this point, we've determined that there is a difference
+// 

[45/50] [abbrv] ambari git commit: AMBARI-22046. Infra Manager: Integrate with Spring Boot (oleewere)

[jluniya]

AMBARI-22046. Infra Manager: Integrate with Spring Boot (oleewere)


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

Branch: refs/heads/branch-feature-AMBARI-14714
Commit: 6633a7bd44fcbc660956a7e188e2ac63472c6de3
Parents: 520d8fc
Author: Oliver Szabo 
Authored: Sun Sep 24 14:22:14 2017 +0200
Committer: Oliver Szabo 
Committed: Mon Sep 25 20:18:03 2017 +0200

--
 ambari-infra/ambari-infra-manager/.gitignore|   2 +
 .../ambari-infra-manager/docker/bin/start.sh|   2 +-
 ambari-infra/ambari-infra-manager/pom.xml   | 172 ---
 .../org/apache/ambari/infra/InfraManager.java   | 208 +++
 .../infra/common/InfraManagerConstants.java |  31 ---
 .../infra/conf/InfraManagerDataConfig.java  |  37 
 .../conf/InfraManagerJerseyResourceConfig.java  |  37 
 .../infra/conf/InfraManagerServletConfig.java   |  83 
 .../infra/conf/StaticResourceConfiguration.java |  49 +
 .../infra/doc/InfraManagerApiDocStorage.java|  90 
 .../ambari/infra/job/dummy/DummyItemWriter.java |  15 +-
 .../ambari/infra/rest/ApiDocResource.java   |  56 +
 .../src/main/resources/infra-manager.properties |   4 +-
 .../src/main/resources/log4j.xml|  31 ---
 .../src/main/resources/log4j2.xml   |  41 
 .../src/main/resources/static/index.html|  24 +++
 .../src/main/resources/swagger/swagger.html |  36 ++--
 .../src/main/resources/webapp/index.html|  24 ---
 18 files changed, 556 insertions(+), 386 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/6633a7bd/ambari-infra/ambari-infra-manager/.gitignore
--
diff --git a/ambari-infra/ambari-infra-manager/.gitignore 
b/ambari-infra/ambari-infra-manager/.gitignore
new file mode 100644
index 000..ba4e51d
--- /dev/null
+++ b/ambari-infra/ambari-infra-manager/.gitignore
@@ -0,0 +1,2 @@
+out/*
+*.pid
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ambari/blob/6633a7bd/ambari-infra/ambari-infra-manager/docker/bin/start.sh
--
diff --git a/ambari-infra/ambari-infra-manager/docker/bin/start.sh 
b/ambari-infra/ambari-infra-manager/docker/bin/start.sh
index 076c06f..2402778 100755
--- a/ambari-infra/ambari-infra-manager/docker/bin/start.sh
+++ b/ambari-infra/ambari-infra-manager/docker/bin/start.sh
@@ -16,6 +16,6 @@
 
 export INFRA_MANAGER_OPTS="-Xdebug 
-Xrunjdwp:transport=dt_socket,address=5007,server=y,suspend=n"
 touch /root/infra-manager.log
-/root/ambari-infra-manager/infraManager.sh --port 61890 > 
/root/infra-manager.log
+/root/ambari-infra-manager/infraManager.sh > /root/infra-manager.log
 tail -f /root/infra-manager.log
 

http://git-wip-us.apache.org/repos/asf/ambari/blob/6633a7bd/ambari-infra/ambari-infra-manager/pom.xml
--
diff --git a/ambari-infra/ambari-infra-manager/pom.xml 
b/ambari-infra/ambari-infra-manager/pom.xml
index b9f2a77..aa86da8 100644
--- a/ambari-infra/ambari-infra-manager/pom.xml
+++ b/ambari-infra/ambari-infra-manager/pom.xml
@@ -30,15 +30,17 @@
   ambari-infra-manager
 
   
-4.2.5.RELEASE
-4.0.4.RELEASE
-2.23.2
-9.2.11.v20150529
-1.5.8
-2.0.2.RELEASE
-0.6.0
+4.3.10.RELEASE
+4.2.3.RELEASE
+2.0.4.RELEASE
+2.25.1
+9.4.6.v20170531
 3.0.7.RELEASE
 3.8.11.2
+2.0.2.RELEASE
+1.5.6.RELEASE
+1.5.16
+0.6.0
   
 
   
@@ -69,6 +71,21 @@
 
   
   
+org.springframework.boot
+spring-boot-maven-plugin
+${spring-boot.version}
+
+  exec
+
+
+  
+
+  repackage
+
+  
+
+  
+  
 org.apache.maven.plugins
 maven-dependency-plugin
 2.8
@@ -161,53 +178,70 @@
   spring-security-ldap
   ${spring.security.version}
 
+
 
-  org.glassfish.jersey.ext
-  jersey-spring3
-  2.23.2
+  org.springframework.boot
+  spring-boot-starter
+  ${spring-boot.version}
   
 
-  org.springframework
-  *
+  org.springframework.boot
+  spring-boot-starter-logging
 
   
 
 
-  org.glassfish.jersey.connectors
-  jersey-apache-connector
-  ${jersey.version}
+  org.springframework.boot
+  spring-boot-starter-log4j2
+  ${spring-boot.version}
 
 
-  org.glassfish.jersey.core
-  jersey-client
-  

[43/50] [abbrv] ambari git commit: AMBARI-22054 Log Search UI: implement 'Capture' functionality. (ababiichuk)

[jluniya]

AMBARI-22054 Log Search UI: implement 'Capture' functionality. (ababiichuk)


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

Branch: refs/heads/branch-feature-AMBARI-14714
Commit: 653d2f260c05ea0e8efa4400b9d5accb5e5b39b7
Parents: 08da961
Author: ababiichuk 
Authored: Mon Sep 25 20:00:41 2017 +0300
Committer: ababiichuk 
Committed: Mon Sep 25 20:00:41 2017 +0300

--
 .../ambari-logsearch-web/src/app/app.module.ts  |  6 +-
 .../queries/audit-logs-query-params.class.ts|  2 -
 .../dropdown-button.component.spec.ts   | 21 ++-
 .../filter-button.component.spec.ts | 21 ++-
 .../filter-dropdown.component.spec.ts   | 26 +++-
 .../filters-panel/filters-panel.component.html  | 11 ++--
 .../filters-panel/filters-panel.component.less  |  4 ++
 .../filters-panel.component.spec.ts |  6 +-
 .../filters-panel/filters-panel.component.ts|  4 ++
 .../logs-container.component.html   |  5 ++
 .../logs-container.component.less   |  4 ++
 .../logs-container.component.spec.ts|  4 +-
 .../logs-container/logs-container.component.ts  | 10 
 .../menu-button/menu-button.component.html  |  2 +-
 .../menu-button/menu-button.component.spec.ts   | 22 ++-
 .../app/components/modal/modal.component.html   |  2 +-
 .../search-box/search-box.component.html|  2 +-
 .../time-range-picker.component.html|  4 +-
 .../time-range-picker.component.ts  | 13 ++--
 .../timezone-picker.component.spec.ts   | 21 ++-
 .../components/top-menu/top-menu.component.html |  2 +-
 .../top-menu/top-menu.component.spec.ts |  2 +
 .../src/app/components/variables.less   |  2 +-
 .../src/app/pipes/timer-seconds.pipe.spec.ts| 37 
 .../src/app/pipes/timer-seconds.pipe.ts | 41 +
 .../services/component-actions.service.spec.ts  | 21 ++-
 .../app/services/component-actions.service.ts   | 15 -
 .../src/app/services/filtering.service.ts   | 63 +---
 .../src/app/services/logs-container.service.ts  |  6 +-
 .../src/app/services/mock-api-data.service.ts   |  4 +-
 .../src/app/services/utils.service.ts   |  6 ++
 .../src/assets/i18n/en.json | 10 ++--
 32 files changed, 328 insertions(+), 71 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/653d2f26/ambari-logsearch/ambari-logsearch-web/src/app/app.module.ts
--
diff --git a/ambari-logsearch/ambari-logsearch-web/src/app/app.module.ts 
b/ambari-logsearch/ambari-logsearch-web/src/app/app.module.ts
index fca68b5..c4dc698 100644
--- a/ambari-logsearch/ambari-logsearch-web/src/app/app.module.ts
+++ b/ambari-logsearch/ambari-logsearch-web/src/app/app.module.ts
@@ -78,8 +78,9 @@ import {TimeRangePickerComponent} from 
'@app/components/time-range-picker/time-r
 import {DatePickerComponent} from 
'@app/components/date-picker/date-picker.component';
 
 import {TimeZoneAbbrPipe} from '@app/pipes/timezone-abbr.pipe';
+import {TimerSecondsPipe} from '@app/pipes/timer-seconds.pipe';
 
-export function HttpLoaderFactory(http: Http) {
+export function HttpLoaderFactory(http: Http): TranslateHttpLoader {
   // adding 'static' parameter to step over mock data request
   return new TranslateHttpLoader(http, 'resources/assets/i18n/', 
'.json?static=true');
 }
@@ -123,7 +124,8 @@ export function getXHRBackend(injector: Injector, browser: 
BrowserXhr, xsrf: XSR
 SearchBoxComponent,
 TimeRangePickerComponent,
 DatePickerComponent,
-TimeZoneAbbrPipe
+TimeZoneAbbrPipe,
+TimerSecondsPipe
   ],
   imports: [
 BrowserModule,

http://git-wip-us.apache.org/repos/asf/ambari/blob/653d2f26/ambari-logsearch/ambari-logsearch-web/src/app/classes/queries/audit-logs-query-params.class.ts
--
diff --git 
a/ambari-logsearch/ambari-logsearch-web/src/app/classes/queries/audit-logs-query-params.class.ts
 
b/ambari-logsearch/ambari-logsearch-web/src/app/classes/queries/audit-logs-query-params.class.ts
index d179376..e36bf18 100644
--- 
a/ambari-logsearch/ambari-logsearch-web/src/app/classes/queries/audit-logs-query-params.class.ts
+++ 
b/ambari-logsearch/ambari-logsearch-web/src/app/classes/queries/audit-logs-query-params.class.ts
@@ -36,8 +36,6 @@ export class AuditLogsQueryParams extends QueryParams {
   startIndex: string;
   sortBy?: string;
   sortType?: string;
-  start_time?: string;
-  end_time?: string;
   clusters?: string;
   

[08/50] [abbrv] ambari git commit: AMBARI-22010 - Incorrect symlink for storm after patch upgrade (jonathanhurley)

[jluniya]

AMBARI-22010 - Incorrect symlink for storm after patch upgrade (jonathanhurley)


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

Branch: refs/heads/branch-feature-AMBARI-14714
Commit: 25c1f211ef165611fcf52bd75b7a851c857f04a9
Parents: 73bd428
Author: Jonathan Hurley 
Authored: Wed Sep 20 15:51:38 2017 -0400
Committer: Jonathan Hurley 
Committed: Wed Sep 20 16:24:30 2017 -0400

--
 .../main/resources/stacks/HDP/2.0.6/properties/stack_packages.json | 2 ++
 .../main/resources/stacks/HDP/3.0/properties/stack_packages.json   | 2 ++
 2 files changed, 4 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/25c1f211/ambari-server/src/main/resources/stacks/HDP/2.0.6/properties/stack_packages.json
--
diff --git 
a/ambari-server/src/main/resources/stacks/HDP/2.0.6/properties/stack_packages.json
 
b/ambari-server/src/main/resources/stacks/HDP/2.0.6/properties/stack_packages.json
index ec35f2b..2db0a74 100644
--- 
a/ambari-server/src/main/resources/stacks/HDP/2.0.6/properties/stack_packages.json
+++ 
b/ambari-server/src/main/resources/stacks/HDP/2.0.6/properties/stack_packages.json
@@ -796,9 +796,11 @@
 "SUPERVISOR": {
   "STACK-SELECT-PACKAGE": "storm-supervisor",
   "INSTALL": [
+"storm-client",
 "storm-supervisor"
   ],
   "PATCH": [
+"storm-client",
 "storm-supervisor"
   ],
   "STANDARD": [

http://git-wip-us.apache.org/repos/asf/ambari/blob/25c1f211/ambari-server/src/main/resources/stacks/HDP/3.0/properties/stack_packages.json
--
diff --git 
a/ambari-server/src/main/resources/stacks/HDP/3.0/properties/stack_packages.json
 
b/ambari-server/src/main/resources/stacks/HDP/3.0/properties/stack_packages.json
index 9012e92..be4c718 100644
--- 
a/ambari-server/src/main/resources/stacks/HDP/3.0/properties/stack_packages.json
+++ 
b/ambari-server/src/main/resources/stacks/HDP/3.0/properties/stack_packages.json
@@ -716,9 +716,11 @@
 "SUPERVISOR": {
   "STACK-SELECT-PACKAGE": "storm-supervisor",
   "INSTALL": [
+"storm-client",
 "storm-supervisor"
   ],
   "PATCH": [
+"storm-client",
 "storm-supervisor"
   ],
   "STANDARD": [

[48/50] [abbrv] ambari git commit: AMBARI-22015. livy2 interpreter errors (unable to impersonate users/ LLAP or Hive CNF issue) due to missing proxy configs. (Mingjie Tang via Swapan Shridhar).

[jluniya]

AMBARI-22015. livy2 interpreter errors (unable to impersonate users/ LLAP or 
Hive CNF issue) due to missing proxy configs. (Mingjie Tang via Swapan 
Shridhar).


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

Branch: refs/heads/branch-feature-AMBARI-14714
Commit: 12c9ca7e2fafd092149081971bcfcbbb1e49adf4
Parents: 4c49b4b
Author: Swapan Shridhar 
Authored: Mon Sep 25 15:37:41 2017 -0700
Committer: Swapan Shridhar 
Committed: Mon Sep 25 15:37:41 2017 -0700

--
 .../main/resources/stacks/ODPi/2.0/services/stack_advisor.py  | 7 +++
 1 file changed, 7 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/12c9ca7e/contrib/management-packs/odpi-ambari-mpack/src/main/resources/stacks/ODPi/2.0/services/stack_advisor.py
--
diff --git 
a/contrib/management-packs/odpi-ambari-mpack/src/main/resources/stacks/ODPi/2.0/services/stack_advisor.py
 
b/contrib/management-packs/odpi-ambari-mpack/src/main/resources/stacks/ODPi/2.0/services/stack_advisor.py
index 5f70db2..418d0c0 100755
--- 
a/contrib/management-packs/odpi-ambari-mpack/src/main/resources/stacks/ODPi/2.0/services/stack_advisor.py
+++ 
b/contrib/management-packs/odpi-ambari-mpack/src/main/resources/stacks/ODPi/2.0/services/stack_advisor.py
@@ -271,6 +271,13 @@ class ODPi20StackAdvisor(DefaultStackAdvisor):
 if not livyUser in users and livyUser is not None:
   users[livyUser] = {"propertyHosts" : "*","propertyGroups" : "*", 
"config" : "livy-env", "propertyName" : "livy_user"}
 
+if "SPARK2" in servicesList:
+  livyUser = None
+  if "livy2-env" in services["configurations"] and "livy_user" in 
services["configurations"]["livy2-env"]["properties"]:
+livyUser = 
services["configurations"]["livy2-env"]["properties"]["livy_user"]
+if not livyUser in users and livyUser is not None:
+  users[livy2User] = {"propertyHosts" : "*","propertyGroups" : "*", 
"config" : "livy2-env", "propertyName" : "livy_user"}
+
 putCoreSiteProperty = self.putProperty(configurations, "core-site", 
services)
 putCoreSitePropertyAttribute = self.putPropertyAttribute(configurations, 
"core-site")
 

[02/50] [abbrv] ambari git commit: AMBARI-22002.Ambari Unit Tests Fail In trunk(Prabhjyot Singh via Venkata Sairam)

[jluniya]

AMBARI-22002.Ambari Unit Tests Fail In trunk(Prabhjyot Singh via Venkata Sairam)


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

Branch: refs/heads/branch-feature-AMBARI-14714
Commit: 8467a2048300ac54caf84ad785a8cc0a96f3cb65
Parents: c883272
Author: Venkata Sairam 
Authored: Wed Sep 20 15:21:27 2017 +0530
Committer: Venkata Sairam 
Committed: Wed Sep 20 15:21:27 2017 +0530

--
 .../stacks/2.6/ZEPPELIN/test_zeppelin_070.py| 135 +--
 1 file changed, 125 insertions(+), 10 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/8467a204/ambari-server/src/test/python/stacks/2.6/ZEPPELIN/test_zeppelin_070.py
--
diff --git 
a/ambari-server/src/test/python/stacks/2.6/ZEPPELIN/test_zeppelin_070.py 
b/ambari-server/src/test/python/stacks/2.6/ZEPPELIN/test_zeppelin_070.py
index 9a28e68..b9b34e8 100644
--- a/ambari-server/src/test/python/stacks/2.6/ZEPPELIN/test_zeppelin_070.py
+++ b/ambari-server/src/test/python/stacks/2.6/ZEPPELIN/test_zeppelin_070.py
@@ -21,8 +21,7 @@ from ambari_commons import OSCheck
 
 import glob
 
-import time
-from mock.mock import MagicMock, patch, call
+from mock.mock import MagicMock, patch
 from resource_management.core import sudo
 from stacks.utils.RMFTestCase import *
 
@@ -34,7 +33,7 @@ import interpreter_json_generated
   new=MagicMock(return_value=interpreter_json_generated.template))
 class TestZeppelin070(RMFTestCase):
   COMMON_SERVICES_PACKAGE_DIR = "ZEPPELIN/0.7.0/package"
-  STACK_VERSION = "2.5"
+  STACK_VERSION = "2.6"
 
   def assert_configure_default(self):
 self.assertResourceCalled('Directory', '/var/log/zeppelin',
@@ -59,7 +58,7 @@ class TestZeppelin070(RMFTestCase):
   cd_access='a',
   )
 self.assertResourceCalled('Execute', (
-'chown', '-R', u'zeppelin:zeppelin', '/var/run/zeppelin'), sudo=True)
+  'chown', '-R', u'zeppelin:zeppelin', '/var/run/zeppelin'), sudo=True)
 self.assertResourceCalled('XmlConfig', 'zeppelin-site.xml',
   owner='zeppelin',
   group='zeppelin',
@@ -118,7 +117,7 @@ class TestZeppelin070(RMFTestCase):
   cd_access='a',
   )
 self.assertResourceCalled('Execute', (
-'chown', '-R', u'zeppelin:zeppelin', '/var/run/zeppelin'), sudo=True)
+  'chown', '-R', u'zeppelin:zeppelin', '/var/run/zeppelin'), sudo=True)
 self.assertResourceCalled('XmlConfig', 'zeppelin-site.xml',
   owner='zeppelin',
   group='zeppelin',
@@ -181,7 +180,7 @@ class TestZeppelin070(RMFTestCase):
   cd_access='a',
   )
 self.assertResourceCalled('Execute', (
-'chown', '-R', u'zeppelin:zeppelin', '/var/run/zeppelin'),
+  'chown', '-R', u'zeppelin:zeppelin', '/var/run/zeppelin'),
   sudo=True,
   )
 self.assertResourceCalled('Execute',
@@ -200,7 +199,7 @@ class TestZeppelin070(RMFTestCase):
)
 self.assert_configure_default()
 self.assertResourceCalled('Execute', (
-'chown', '-R', u'zeppelin:zeppelin', '/etc/zeppelin'),
+  'chown', '-R', u'zeppelin:zeppelin', '/etc/zeppelin'),
   sudo=True,
   )
 
@@ -215,7 +214,7 @@ class TestZeppelin070(RMFTestCase):
)
 self.assert_configure_secured()
 self.assertResourceCalled('Execute', (
-'chown', '-R', u'zeppelin:zeppelin', '/etc/zeppelin'),
+  'chown', '-R', u'zeppelin:zeppelin', '/etc/zeppelin'),
   sudo=True,
   )
 self.assertResourceCalled('Execute', ('chown', '-R', 'zeppelin:zeppelin',
@@ -305,23 +304,139 @@ class TestZeppelin070(RMFTestCase):
   principal_name=UnknownConfigurationMock(),
   security_enabled=False,
   )
+
+self.assertResourceCalled('HdfsResource',
+  '/etc/zeppelin/conf/interpreter.json',
+  
hadoop_bin_dir='/usr/hdp/current/hadoop-client/bin',
+  
default_fs=u'hdfs://c6401.ambari.apache.org:8020',
+  
hdfs_resource_ignore_file='/var/lib/ambari-agent/data/.hdfs_resource_ignore',
+  hdfs_site={u'a': u'b'},
+   

[46/50] [abbrv] ambari git commit: AMBARI-22012. BP deploys failing intermittently with error (magyari_sandor)

[jluniya]

AMBARI-22012. BP deploys failing intermittently with error  (magyari_sandor)


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

Branch: refs/heads/branch-feature-AMBARI-14714
Commit: b653ee0a5967a8255f087f43a1cb6a878e765833
Parents: 6633a7b
Author: Sandor Magyari 
Authored: Fri Sep 22 17:48:54 2017 +0200
Committer: Sandor Magyari 
Committed: Mon Sep 25 21:19:53 2017 +0200

--
 .../events/ClusterConfigFinishedEvent.java  | 15 +++-
 .../ambari/server/topology/TopologyManager.java | 88 +---
 .../topology/tasks/ConfigureClusterTask.java| 13 ++-
 .../tasks/ConfigureClusterTaskFactory.java  |  3 +-
 .../server/utils/ManagedThreadPoolExecutor.java | 83 ++
 .../ClusterDeployWithStartOnlyTest.java |  2 +-
 ...InstallWithoutStartOnComponentLevelTest.java |  2 +-
 .../ClusterInstallWithoutStartTest.java |  2 +-
 .../topology/ConfigureClusterTaskTest.java  | 18 +++-
 .../utils/ManagedThreadPoolExecutorTest.java| 51 
 10 files changed, 236 insertions(+), 41 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/b653ee0a/ambari-server/src/main/java/org/apache/ambari/server/events/ClusterConfigFinishedEvent.java
--
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/events/ClusterConfigFinishedEvent.java
 
b/ambari-server/src/main/java/org/apache/ambari/server/events/ClusterConfigFinishedEvent.java
index cdb86ac..f0574d0 100644
--- 
a/ambari-server/src/main/java/org/apache/ambari/server/events/ClusterConfigFinishedEvent.java
+++ 
b/ambari-server/src/main/java/org/apache/ambari/server/events/ClusterConfigFinishedEvent.java
@@ -23,17 +23,27 @@ package org.apache.ambari.server.events;
  * cluster configuration is successfully updated.
  */
 public class ClusterConfigFinishedEvent extends AmbariEvent {
+
+  private final long clusterId;
   private final String clusterName;
 
 
-  public ClusterConfigFinishedEvent(String clusterName) {
+  public ClusterConfigFinishedEvent(long clusterId, String clusterName) {
 super(AmbariEventType.CLUSTER_CONFIG_FINISHED);
+this.clusterId = clusterId;
 this.clusterName = clusterName;
   }
 
   /**
+   * Get the cluster id
+   * @return
+   */
+  public long getClusterId() {
+return clusterId;
+  }
+
+  /**
* Get the cluster name
-   *
* @return
*/
   public String getClusterName() {
@@ -46,6 +56,7 @@ public class ClusterConfigFinishedEvent extends AmbariEvent {
   @Override
   public String toString() {
 StringBuilder buffer = new StringBuilder("ClusterConfigChangedEvent{");
+buffer.append("clusterId=").append(getClusterId());
 buffer.append("clusterName=").append(getClusterName());
 buffer.append("}");
 return buffer.toString();

http://git-wip-us.apache.org/repos/asf/ambari/blob/b653ee0a/ambari-server/src/main/java/org/apache/ambari/server/topology/TopologyManager.java
--
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/topology/TopologyManager.java
 
b/ambari-server/src/main/java/org/apache/ambari/server/topology/TopologyManager.java
index 3af62e8..9769fae 100644
--- 
a/ambari-server/src/main/java/org/apache/ambari/server/topology/TopologyManager.java
+++ 
b/ambari-server/src/main/java/org/apache/ambari/server/topology/TopologyManager.java
@@ -29,9 +29,10 @@ import java.util.List;
 import java.util.Map;
 import java.util.Set;
 import java.util.concurrent.Callable;
-import java.util.concurrent.Executor;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
+import java.util.concurrent.LinkedBlockingQueue;
+import java.util.concurrent.TimeUnit;
 
 import org.apache.ambari.server.AmbariException;
 import org.apache.ambari.server.actionmanager.HostRoleCommand;
@@ -73,6 +74,7 @@ import 
org.apache.ambari.server.state.quicklinksprofile.QuickLinksProfile;
 import org.apache.ambari.server.topology.tasks.ConfigureClusterTask;
 import org.apache.ambari.server.topology.tasks.ConfigureClusterTaskFactory;
 import org.apache.ambari.server.topology.validators.TopologyValidatorService;
+import org.apache.ambari.server.utils.ManagedThreadPoolExecutor;
 import org.apache.ambari.server.utils.RetryHelper;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -102,9 +104,23 @@ public class TopologyManager {
   private static final String 
CLUSTER_CONFIG_TASK_MAX_TIME_IN_MILLIS_PROPERTY_NAME = 
"cluster_configure_task_timeout";
 
   private PersistedState persistedState;

[11/50] [abbrv] ambari git commit: AMBARI-22022. NullPointerException in ActionScheduler when using DEPENDENCY_ORDERED execution (magyari_sandor)

[jluniya]

AMBARI-22022. NullPointerException in ActionScheduler when using 
DEPENDENCY_ORDERED execution (magyari_sandor)


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

Branch: refs/heads/branch-feature-AMBARI-14714
Commit: 3e5f60ab9d30761df08923c4e56dd518fc71d271
Parents: 1a5b494
Author: Sandor Magyari 
Authored: Thu Sep 21 14:35:51 2017 +0200
Committer: Sandor Magyari 
Committed: Thu Sep 21 15:44:54 2017 +0200

--
 .../ambari/server/actionmanager/ActionScheduler.java  | 10 ++
 1 file changed, 6 insertions(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/3e5f60ab/ambari-server/src/main/java/org/apache/ambari/server/actionmanager/ActionScheduler.java
--
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/actionmanager/ActionScheduler.java
 
b/ambari-server/src/main/java/org/apache/ambari/server/actionmanager/ActionScheduler.java
index 00e4184..0157f8b 100644
--- 
a/ambari-server/src/main/java/org/apache/ambari/server/actionmanager/ActionScheduler.java
+++ 
b/ambari-server/src/main/java/org/apache/ambari/server/actionmanager/ActionScheduler.java
@@ -921,12 +921,14 @@ class ActionScheduler implements Runnable {
   RoleCommandPair roleCommand = new
   RoleCommandPair(Role.valueOf(command.getRole()), 
command.getRoleCommand());
   Set roleCommandDependencies = 
rco.getDependencies().get(roleCommand);
-  // remove eventual references to the same RoleCommand
-  roleCommandDependencies.remove(roleCommand);
 
   // check if there are any dependencies IN_PROGRESS
-  if (roleCommandDependencies != null && 
CollectionUtils.containsAny(rolesCommandsInProgress, roleCommandDependencies)) {
-areCommandDependenciesFinished = false;
+  if (roleCommandDependencies != null) {
+// remove eventual references to the same RoleCommand
+roleCommandDependencies.remove(roleCommand);
+if (CollectionUtils.containsAny(rolesCommandsInProgress, 
roleCommandDependencies)) {
+  areCommandDependenciesFinished = false;
+}
   }
 }
 

[44/50] [abbrv] ambari git commit: AMBARI-22045. Infra Solr client cleanup: make infra-solr-client script usable with symlinks (oleewere)

[jluniya]

AMBARI-22045. Infra Solr client cleanup: make infra-solr-client script usable 
with symlinks (oleewere)


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

Branch: refs/heads/branch-feature-AMBARI-14714
Commit: 520d8fcce38e9c2edf8d972625d5a9aa4663c04b
Parents: 653d2f2
Author: Oliver Szabo 
Authored: Sun Sep 24 01:08:11 2017 +0200
Committer: Oliver Szabo 
Committed: Mon Sep 25 20:18:02 2017 +0200

--
 .../apache/ambari/infra/solr/AmbariSolrCloudCLI.java  | 12 ++--
 .../src/main/resources/log4j.properties   |  6 +-
 .../src/main/resources/solrCloudCli.sh|  8 +++-
 .../src/main/resources/solrIndexHelper.sh | 14 ++
 .../0.1.0/properties/solr-client-log4j.properties.j2  |  4 
 5 files changed, 32 insertions(+), 12 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/520d8fcc/ambari-infra/ambari-infra-solr-client/src/main/java/org/apache/ambari/infra/solr/AmbariSolrCloudCLI.java
--
diff --git 
a/ambari-infra/ambari-infra-solr-client/src/main/java/org/apache/ambari/infra/solr/AmbariSolrCloudCLI.java
 
b/ambari-infra/ambari-infra-solr-client/src/main/java/org/apache/ambari/infra/solr/AmbariSolrCloudCLI.java
index 70bc232..95708d7 100644
--- 
a/ambari-infra/ambari-infra-solr-client/src/main/java/org/apache/ambari/infra/solr/AmbariSolrCloudCLI.java
+++ 
b/ambari-infra/ambari-infra-solr-client/src/main/java/org/apache/ambari/infra/solr/AmbariSolrCloudCLI.java
@@ -66,7 +66,7 @@ public class AmbariSolrCloudCLI {
   + "\n./solrCloudCli.sh --secure-znode -z host1:2181,host2:2181 -zn 
/ambari-solr -su logsearch,atlas,ranger --jaas-file /etc/myconf/jaas_file"
   + "\n./solrCloudCli.sh --unsecure-znode -z host1:2181,host2:2181 -zn 
/ambari-solr --jaas-file /etc/myconf/jaas_file"
   + "\n./solrCloudCli.sh --secure-solr-znode -z host1:2181,host2:2181 -zn 
/ambari-solr -su logsearch,atlas,ranger --jaas-file /etc/myconf/jaas_file"
-  + "\n./solrCloudCli.sh --setup-kerberos-plugin -z host1:2181,host2:2181 
-zn /ambari-solr --security-json-location /etc/infra-solr/conf/security.json\n";
+  + "\n./solrCloudCli.sh --setup-kerberos-plugin -z host1:2181,host2:2181 
-zn /ambari-solr --security-json-location /etc/infra-solr/conf/security.json\n 
";
 
   public static void main(String[] args) {
 Options options = new Options();
@@ -126,22 +126,22 @@ public class AmbariSolrCloudCLI {
 
 final Option secureSolrZnodeOption = Option.builder("ssz")
   .longOpt(SECURE_SOLR_ZNODE_COMMAND)
-  .desc("Set acls for solr znode")
+  .desc("Set acls for solr znode (command)")
   .build();
 
 final Option secureZnodeOption = Option.builder("sz")
   .longOpt(SECURE_ZNODE_COMMAND)
-  .desc("Set acls for znode")
+  .desc("Set acls for znode (command)")
   .build();
 
 final Option unsecureZnodeOption = Option.builder("uz")
   .longOpt(UNSECURE_ZNODE_COMMAND)
-  .desc("Disable security for znode")
+  .desc("Disable security for znode (command)")
   .build();
 
 final Option removeAdminHandlerOption = Option.builder("rah")
   .longOpt(REMOVE_ADMIN_HANDLERS)
-  .desc("Remove AdminHandlers request handler from solrconfig.xml")
+  .desc("Remove AdminHandlers request handler from solrconfig.xml 
(command)")
   .build();
 
 final Option shardNameOption = Option.builder("sn")
@@ -428,7 +428,7 @@ public class AmbariSolrCloudCLI {
   } else {
 List commands = Arrays.asList(CREATE_COLLECTION_COMMAND, 
CREATE_SHARD_COMMAND, UPLOAD_CONFIG_COMMAND,
   DOWNLOAD_CONFIG_COMMAND, CONFIG_CHECK_COMMAND, SET_CLUSTER_PROP, 
CREATE_ZNODE, SECURE_ZNODE_COMMAND, UNSECURE_ZNODE_COMMAND,
-  SECURE_SOLR_ZNODE_COMMAND, CHECK_ZNODE, SETUP_KERBEROS_PLUGIN);
+  SECURE_SOLR_ZNODE_COMMAND, CHECK_ZNODE, SETUP_KERBEROS_PLUGIN, 
REMOVE_ADMIN_HANDLERS);
 helpFormatter.printHelp(CMD_LINE_SYNTAX, options);
 exit(1, String.format("One of the supported commands is required 
(%s)", StringUtils.join(commands, "|")));
   }

http://git-wip-us.apache.org/repos/asf/ambari/blob/520d8fcc/ambari-infra/ambari-infra-solr-client/src/main/resources/log4j.properties
--
diff --git 
a/ambari-infra/ambari-infra-solr-client/src/main/resources/log4j.properties 
b/ambari-infra/ambari-infra-solr-client/src/main/resources/log4j.properties
index e8dca12..4779596 100644
--- a/ambari-infra/ambari-infra-solr-client/src/main/resources/log4j.properties
+++ 

[49/50] [abbrv] ambari git commit: AMBARI-19135 : AMS build artifacts are not uploaded to maven central. (avijayan)

[jluniya]

AMBARI-19135 : AMS build artifacts are not uploaded to maven central. (avijayan)


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

Branch: refs/heads/branch-feature-AMBARI-14714
Commit: 84fed85ac9019a9b72d3db1619c7dbdf18e1d078
Parents: 12c9ca7
Author: Aravindan Vijayan 
Authored: Mon Sep 25 16:26:28 2017 -0700
Committer: Aravindan Vijayan 
Committed: Mon Sep 25 16:26:28 2017 -0700

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


http://git-wip-us.apache.org/repos/asf/ambari/blob/84fed85a/ambari-metrics/pom.xml
--
diff --git a/ambari-metrics/pom.xml b/ambari-metrics/pom.xml
index 560ef11..a14b8fd 100644
--- a/ambari-metrics/pom.xml
+++ b/ambari-metrics/pom.xml
@@ -317,5 +317,32 @@
 
   
 
+
+  sign-artifacts
+  
+
+  performRelease
+  true
+
+  
+  
+
+  
+org.apache.maven.plugins
+maven-gpg-plugin
+1.6
+
+  
+sign-artifacts
+verify
+
+  sign
+
+  
+
+  
+
+  
+
   
 

[34/50] [abbrv] ambari git commit: AMBARI-22040. configs.py does not work properly when dealing with files (aonishuk)

[jluniya]

AMBARI-22040. configs.py does not work properly when dealing with files 
(aonishuk)


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

Branch: refs/heads/branch-feature-AMBARI-14714
Commit: 12abba0b743ec198067001a64608ccbcc904a869
Parents: 50b6475
Author: Andrew Onishuk 
Authored: Mon Sep 25 12:38:39 2017 +0300
Committer: Andrew Onishuk 
Committed: Mon Sep 25 12:38:39 2017 +0300

--
 ambari-server/src/test/python/TestConfigs.py| 38 
 .../src/test/resources/TestConfigs-content.xml  | 28 +++
 2 files changed, 60 insertions(+), 6 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/12abba0b/ambari-server/src/test/python/TestConfigs.py
--
diff --git a/ambari-server/src/test/python/TestConfigs.py 
b/ambari-server/src/test/python/TestConfigs.py
index cc6cb31..6d2ab34 100644
--- a/ambari-server/src/test/python/TestConfigs.py
+++ b/ambari-server/src/test/python/TestConfigs.py
@@ -73,7 +73,7 @@ class TestConfigs(TestCase):
   self.assertEquals(config['properties'], {'config1': 'value1', 'config2': 
'value2'})
 urlopen_method.side_effect = 
self.get_url_open_side_effect(response_mapping)
 to_file_method.return_value = config_assertion
-sys.argv = ['configs.py', 'user', 'password', '8081', 'http', 'get', 
'localhost', 'cluster1', 'hdfs-site', '1.conf']
+sys.argv = ['configs.py', '-u', 'user', '-p', 'password', '-t', '8081', 
'-s', 'http', '-a', 'get', '-l','localhost','-n', 'cluster1', '-c','hdfs-site']
 configs.main()
 
   @patch.object(configs, 'output_to_file')
@@ -94,7 +94,7 @@ class TestConfigs(TestCase):
   }
 }
 urlopen_method.side_effect = 
self.get_url_open_side_effect(response_mapping)
-sys.argv = ['configs.py', 'user', 'password', '8081', 'https', 'set', 
'localhost', 'cluster1', 'hdfs-site', 'config1', 'value3']
+sys.argv = ['configs.py', '-u', 'user', '-p', 'password', '-t', '8081', 
'-s', 'https', '-a', 'set', '-l','localhost','-n', 'cluster1', 
'-c','hdfs-site', '-k', 'config1', '-v', 'value3']
 configs.main()
 
   @patch.object(configs, 'output_to_file')
@@ -115,7 +115,7 @@ class TestConfigs(TestCase):
   }
 }
 urlopen_method.side_effect = 
self.get_url_open_side_effect(response_mapping)
-sys.argv = ['configs.py', 'user', 'password', '8081', 'https', 'set', 
'localhost', 'cluster1', 'hdfs-site', 'config1', 'value3']
+sys.argv = ['configs.py', '-u', 'user', '-p', 'password', '-t', '8081', 
'-s', 'https', '-a', 'set', '-l','localhost','-n', 'cluster1', 
'-c','hdfs-site', '-k', 'config1', '-v', 'value3']
 configs.main()
 
   @patch.object(configs, 'output_to_file')
@@ -138,7 +138,7 @@ class TestConfigs(TestCase):
   }
 }
 urlopen_method.side_effect = 
self.get_url_open_side_effect(response_mapping)
-sys.argv = ['configs.py', 'user', 'password', '8081', 'https', 'set', 
'localhost', 'cluster2', 'hdfs-site', 'config1', 'value4']
+sys.argv = ['configs.py', '-u', 'user', '-p', 'password', '-t', '8081', 
'-s', 'https', '-a', 'set', '-l','localhost','-n', 'cluster2', 
'-c','hdfs-site', '-k', 'config1', '-v', 'value4']
 configs.main()
 
   @patch.object(configs, 'output_to_file')
@@ -159,7 +159,8 @@ class TestConfigs(TestCase):
   }
 }
 urlopen_method.side_effect = 
self.get_url_open_side_effect(response_mapping)
-sys.argv = ['configs.py', 'user', 'password', '8081', 'https', 'delete', 
'localhost', 'cluster1', 'hdfs-site', 'config1']
+
+sys.argv = ['configs.py', '-u', 'user', '-p', 'password', '-t', '8081', 
'-s', 'https', '-a', 'delete', '-l','localhost','-n', 'cluster1', 
'-c','hdfs-site', '-k', 'config1']
 configs.main()
 
   @patch.object(configs, 'output_to_file')
@@ -182,5 +183,30 @@ class TestConfigs(TestCase):
   }
 }
 urlopen_method.side_effect = 
self.get_url_open_side_effect(response_mapping)
-sys.argv = ['configs.py', 'user', 'password', '8081', 'https', 'delete', 
'localhost', 'cluster2', 'hdfs-site', 'config1']
+sys.argv = ['configs.py', '-u', 'user', '-p', 'password', '-t', '8081', 
'-s', 'https', '-a', 'delete', '-l','localhost','-n', 'cluster2', 
'-c','hdfs-site', '-k', 'config1']
+configs.main()
+
+  @patch.object(configs, 'output_to_file')
+  @patch('urllib2.urlopen')
+  def test_set_properties_from_xml(self, urlopen_method, to_file_method):
+response_mapping = {
+  'GET': {
+'body': {
+  
'https://localhost:8081/api/v1/clusters/cluster1?fields=Clusters/desired_configs'
 : 

[17/50] [abbrv] ambari git commit: AMBARI-21919. Kerberos identity references should use the "reference" attribute (rlevas)

[jluniya]

AMBARI-21919. Kerberos identity references should use the "reference" attribute 
(rlevas)


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

Branch: refs/heads/branch-feature-AMBARI-14714
Commit: 2a0602104f719d8dec7cc34f9a10fe885d55a551
Parents: 2e170e4
Author: Robert Levas 
Authored: Thu Sep 21 12:01:15 2017 -0400
Committer: Robert Levas 
Committed: Thu Sep 21 12:01:29 2017 -0400

--
 .../HDP/2.0.8/services/HDFS/kerberos.json   |  12 +-
 .../AbstractKerberosDescriptorContainer.java|   9 +-
 .../state/kerberos/KerberosDescriptor.java  |   2 +-
 .../server/upgrade/UpgradeCatalog260.java   | 220 +--
 .../ACCUMULO/1.6.1.2.2.0/kerberos.json  |   6 +-
 .../AMBARI_INFRA/0.1.0/kerberos.json|   6 +-
 .../AMBARI_METRICS/0.1.0/kerberos.json  |   6 +-
 .../ATLAS/0.1.0.2.3/kerberos.json   |   6 +-
 .../ATLAS/0.7.0.2.5/kerberos.json   |   9 +-
 .../ATLAS/0.7.0.3.0/kerberos.json   |   9 +-
 .../FALCON/0.5.0.2.1/kerberos.json  |  12 +-
 .../common-services/HAWQ/2.0.0/kerberos.json|   9 +-
 .../HBASE/0.96.0.2.0/kerberos.json  |   9 +-
 .../HBASE/2.0.0.3.0/kerberos.json   |  15 +-
 .../HDFS/2.1.0.2.0/kerberos.json|  18 +-
 .../HDFS/3.0.0.3.0/kerberos.json|  21 +-
 .../HIVE/0.12.0.2.0/kerberos.json   |  15 +-
 .../HIVE/2.1.0.3.0/kerberos.json|  30 ++-
 .../KAFKA/0.10.0.3.0/kerberos.json  |   9 +-
 .../common-services/KAFKA/0.10.0/kerberos.json  |   9 +-
 .../common-services/KAFKA/0.9.0/kerberos.json   |   6 +-
 .../KERBEROS/1.10.3-10/kerberos.json|   3 +-
 .../KERBEROS/1.10.3-30/kerberos.json|   3 +-
 .../KNOX/0.5.0.3.0/kerberos.json|   3 +-
 .../LOGSEARCH/0.5.0/kerberos.json   |   6 +-
 .../MAHOUT/1.0.0.2.3/kerberos.json  |   6 +-
 .../OOZIE/4.0.0.2.0/kerberos.json   |  12 +-
 .../OOZIE/4.2.0.2.3/kerberos.json   |  12 +-
 .../OOZIE/4.2.0.3.0/kerberos.json   |  12 +-
 .../PIG/0.12.0.2.0/kerberos.json|   3 +-
 .../PIG/0.16.1.3.0/kerberos.json|   3 +-
 .../common-services/RANGER/0.6.0/kerberos.json  |  18 +-
 .../RANGER/1.0.0.3.0/kerberos.json  |  18 +-
 .../RANGER_KMS/0.5.0.2.3/kerberos.json  |   6 +-
 .../RANGER_KMS/1.0.0.3.0/kerberos.json  |   9 +-
 .../SLIDER/0.60.0.2.2/kerberos.json |   3 +-
 .../SLIDER/0.91.0.3.0/kerberos.json |   3 +-
 .../common-services/SPARK/1.2.1/kerberos.json   |   6 +-
 .../common-services/SPARK/1.4.1/kerberos.json   |  12 +-
 .../common-services/SPARK/2.2.0/kerberos.json   |   3 +-
 .../common-services/SPARK2/2.0.0/kerberos.json  |  12 +-
 .../common-services/STORM/0.9.1/kerberos.json   |   9 +-
 .../STORM/1.0.1.3.0/kerberos.json   |  15 +-
 .../common-services/STORM/1.0.1/kerberos.json   |  15 +-
 .../common-services/STORM/1.1.0/kerberos.json   |  15 +-
 .../common-services/TEZ/0.4.0.2.1/kerberos.json |   3 +-
 .../common-services/TEZ/0.9.0.3.0/kerberos.json |   3 +-
 .../YARN/2.1.0.2.0/kerberos.json|  30 ++-
 .../YARN/3.0.0.3.0/kerberos.json|  36 ++-
 .../ZEPPELIN/0.6.0/kerberos.json|   3 +-
 .../ZEPPELIN/0.7.0/kerberos.json|   3 +-
 .../ZOOKEEPER/3.4.5/kerberos.json   |   3 +-
 .../resources/kerberos_descriptor_schema.json   |   5 +-
 .../stacks/HDP/2.2/services/YARN/kerberos.json  |  30 ++-
 .../HDP/2.3.ECS/services/ECS/kerberos.json  |   3 +-
 .../HDP/2.3.ECS/services/HBASE/kerberos.json|   9 +-
 .../HDP/2.3.ECS/services/YARN/kerberos.json |  33 ++-
 .../services/ACCUMULO/kerberos.json |  27 ++-
 .../HDP/2.3/services/ACCUMULO/kerberos.json |   6 +-
 .../stacks/HDP/2.3/services/TEZ/kerberos.json   |   3 +-
 .../stacks/HDP/2.3/services/YARN/kerberos.json  |  30 ++-
 .../HDP/2.5/services/FALCON/kerberos.json   |  15 +-
 .../stacks/HDP/2.5/services/HBASE/kerberos.json |  15 +-
 .../stacks/HDP/2.5/services/HDFS/kerberos.json  |  21 +-
 .../stacks/HDP/2.5/services/HIVE/kerberos.json  |  30 ++-
 .../stacks/HDP/2.5/services/KNOX/kerberos.json  |   3 +-
 .../HDP/2.5/services/RANGER_KMS/kerberos.json   |   9 +-
 .../stacks/HDP/2.5/services/SPARK/kerberos.json |  18 +-
 .../stacks/HDP/2.5/services/YARN/kerberos.json  |  36 ++-
 .../HDP/2.5/services/ZEPPELIN/kerberos.json |   3 +-
 .../stacks/HDP/2.6/services/ATLAS/kerberos.json |   9 +-
 .../stacks/HDP/2.6/services/DRUID/kerberos.json |  24 +-
 .../stacks/HDP/2.6/services/HDFS/kerberos.json  |  21 +-
 

[06/50] [abbrv] ambari git commit: AMBARI-22006 Log Search UI: implement grouping of service logs by day. (ababiichuk)

[jluniya]

AMBARI-22006 Log Search UI: implement grouping of service logs by day. 
(ababiichuk)


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

Branch: refs/heads/branch-feature-AMBARI-14714
Commit: 0f1099b9a9887c3a6b05753a00ce88c9d9c4f497
Parents: 56c3da7
Author: ababiichuk 
Authored: Wed Sep 20 17:07:36 2017 +0300
Committer: ababiichuk 
Committed: Wed Sep 20 17:37:42 2017 +0300

--
 .../logs-list/logs-list.component.html  | 52 +++-
 .../logs-list/logs-list.component.less  |  1 -
 .../components/logs-list/logs-list.component.ts | 11 -
 .../ambari-logsearch-web/src/app/mock-data.ts   |  2 +-
 .../src/app/services/filtering.service.ts   | 28 ---
 .../src/app/services/utils.service.ts   |  7 +++
 .../src/assets/i18n/en.json |  4 --
 7 files changed, 46 insertions(+), 59 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/0f1099b9/ambari-logsearch/ambari-logsearch-web/src/app/components/logs-list/logs-list.component.html
--
diff --git 
a/ambari-logsearch/ambari-logsearch-web/src/app/components/logs-list/logs-list.component.html
 
b/ambari-logsearch/ambari-logsearch-web/src/app/components/logs-list/logs-list.component.html
index 888c524..29a85c5 100644
--- 
a/ambari-logsearch/ambari-logsearch-web/src/app/components/logs-list/logs-list.component.html
+++ 
b/ambari-logsearch/ambari-logsearch-web/src/app/components/logs-list/logs-list.component.html
@@ -25,30 +25,36 @@
 {{'logs.details' | translate}}
   
 
-
-  
-
-{{log.level}}
-
-  {{log.type}}
-  
-{{log.logtime | amTz: timeZone | amDateFormat: timeFormat}}
-  
-
-
-  
-
-
-
+
+  
+{{log.logtime | amTz: timeZone | amDateFormat: 
dateFormat}}
+  
+  
+
+  
+  {{log.level}}
+  
+{{log.type}}
+
+  {{log.logtime | amTz: timeZone | amDateFormat: timeFormat}}
+
+  
+  
+
+  
+  
+  
+
+
+  {{log.log_message}}
+
   
-  
-{{log.log_message}}
+  
+
   
-
-
-  
-
-  
-
+
+  
+
 

http://git-wip-us.apache.org/repos/asf/ambari/blob/0f1099b9/ambari-logsearch/ambari-logsearch-web/src/app/components/logs-list/logs-list.component.less
--
diff --git 
a/ambari-logsearch/ambari-logsearch-web/src/app/components/logs-list/logs-list.component.less
 
b/ambari-logsearch/ambari-logsearch-web/src/app/components/logs-list/logs-list.component.less
index 91d796f..584c1a7 100644
--- 
a/ambari-logsearch/ambari-logsearch-web/src/app/components/logs-list/logs-list.component.less
+++ 
b/ambari-logsearch/ambari-logsearch-web/src/app/components/logs-list/logs-list.component.less
@@ -23,7 +23,6 @@
   padding: 5px 0;
   background-color: @list-header-background-color; // TODO implement actual 
color
   overflow: hidden;
-  text-transform: uppercase;
 }
 
 /deep/ filter-dropdown {

http://git-wip-us.apache.org/repos/asf/ambari/blob/0f1099b9/ambari-logsearch/ambari-logsearch-web/src/app/components/logs-list/logs-list.component.ts
--
diff --git 
a/ambari-logsearch/ambari-logsearch-web/src/app/components/logs-list/logs-list.component.ts
 
b/ambari-logsearch/ambari-logsearch-web/src/app/components/logs-list/logs-list.component.ts
index 6d73dcb..a081e1b 100644
--- 
a/ambari-logsearch/ambari-logsearch-web/src/app/components/logs-list/logs-list.component.ts
+++ 
b/ambari-logsearch/ambari-logsearch-web/src/app/components/logs-list/logs-list.component.ts
@@ -19,6 +19,7 @@ import {Component, Input} from '@angular/core';
 import {FormGroup} from '@angular/forms';
 import 'rxjs/add/operator/map';
 import {FilteringService} from '@app/services/filtering.service';
+import {UtilsService} from '@app/services/utils.service';
 
 @Component({
   selector: 'logs-list',
@@ -27,7 +28,7 @@ import {FilteringService} from 
'@app/services/filtering.service';
 })
 export class LogsListComponent {
 
-  constructor(private filtering: FilteringService) {
+  constructor(private filtering: FilteringService, private utils: 
UtilsService) {
   }
 
   @Input()
@@ -41,7 +42,9 @@ export class LogsListComponent {
 
   readonly customStyledColumns = ['level', 'type', 'logtime', 'log_message'];
 
-  timeFormat: string = 'DD/MM/ HH:mm:ss';
+  readonly dateFormat: string = ',  Do';
+
+  readonly 

[39/50] [abbrv] ambari git commit: AMBARI-22017 stack advisor recommends all components on single host for HDP-2.6 Ambari trunk build (dsen)

[jluniya]

AMBARI-22017 stack advisor recommends all components on single host for HDP-2.6 
Ambari trunk build (dsen)


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

Branch: refs/heads/branch-feature-AMBARI-14714
Commit: 999daefe0f09b92f42e50ff12f66dd95a112a003
Parents: 986a65d
Author: Dmytro Sen 
Authored: Mon Sep 25 16:39:09 2017 +0300
Committer: Dmytro Sen 
Committed: Mon Sep 25 16:39:09 2017 +0300

--
 .../stacks/HDP/2.1/services/stack_advisor.py|  4 +++
 .../stacks/2.1/common/test_stack_advisor.py | 28 
 2 files changed, 32 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/999daefe/ambari-server/src/main/resources/stacks/HDP/2.1/services/stack_advisor.py
--
diff --git 
a/ambari-server/src/main/resources/stacks/HDP/2.1/services/stack_advisor.py 
b/ambari-server/src/main/resources/stacks/HDP/2.1/services/stack_advisor.py
index ddd795f..aefb603 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.1/services/stack_advisor.py
+++ b/ambari-server/src/main/resources/stacks/HDP/2.1/services/stack_advisor.py
@@ -86,6 +86,10 @@ class HDP21StackAdvisor(HDP206StackAdvisor):
 
 Must be overriden in child class.
 """
+
+# since old stack advisors are extending each other they should call 
parent method first
+super(HDP21StackAdvisor, self).modifyComponentLayoutSchemes()
+
 self.componentLayoutSchemes.update({
   'APP_TIMELINE_SERVER': {31: 1, "else": 2},
   'FALCON_SERVER': {6: 1, 31: 2, "else": 3}

http://git-wip-us.apache.org/repos/asf/ambari/blob/999daefe/ambari-server/src/test/python/stacks/2.1/common/test_stack_advisor.py
--
diff --git 
a/ambari-server/src/test/python/stacks/2.1/common/test_stack_advisor.py 
b/ambari-server/src/test/python/stacks/2.1/common/test_stack_advisor.py
index bdd34fc..6bd02bf 100644
--- a/ambari-server/src/test/python/stacks/2.1/common/test_stack_advisor.py
+++ b/ambari-server/src/test/python/stacks/2.1/common/test_stack_advisor.py
@@ -557,3 +557,31 @@ class TestHDP21StackAdvisor(TestCase):
 
 res = self.stackAdvisor.validateHiveConfigurations(properties, 
recommendedDefaults, configurations, '', '')
 self.assertEquals(res, res_expected)
+
+  def test_modifyComponentLayoutSchemes(self):
+res_expected = {}
+res_expected.update({
+  'NAMENODE': {"else": 0},
+  'SECONDARY_NAMENODE': {"else": 1},
+  'HBASE_MASTER': {6: 0, 31: 2, "else": 3},
+
+  'HISTORYSERVER': {31: 1, "else": 2},
+  'RESOURCEMANAGER': {31: 1, "else": 2},
+
+  'OOZIE_SERVER': {6: 1, 31: 2, "else": 3},
+
+  'HIVE_SERVER': {6: 1, 31: 2, "else": 4},
+  'HIVE_METASTORE': {6: 1, 31: 2, "else": 4},
+  'WEBHCAT_SERVER': {6: 1, 31: 2, "else": 4},
+  'METRICS_COLLECTOR': {3: 2, 6: 2, 31: 3, "else": 5},
+})
+
+res_expected.update({
+  'APP_TIMELINE_SERVER': {31: 1, "else": 2},
+  'FALCON_SERVER': {6: 1, 31: 2, "else": 3}
+})
+
+self.stackAdvisor.modifyComponentLayoutSchemes()
+res = self.stackAdvisor.getComponentLayoutSchemes()
+
+self.assertEquals(res, res_expected)

[07/50] [abbrv] ambari git commit: AMBARI-21966. "Next" button on "Assign Masters" page gets disabled when installing Ambari. Patch 2. (akovalenko)

[jluniya]

AMBARI-21966. "Next" button on "Assign Masters" page gets disabled when 
installing Ambari. Patch 2.  (akovalenko)


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

Branch: refs/heads/branch-feature-AMBARI-14714
Commit: 73bd428de74c3a97fbcdc53e160a1d6346528ba2
Parents: 0f1099b
Author: Aleksandr Kovalenko 
Authored: Wed Sep 20 17:26:03 2017 +0300
Committer: Aleksandr Kovalenko 
Committed: Wed Sep 20 18:06:03 2017 +0300

--
 .../wizard/step7/assign_master_controller.js|  5 -
 .../step7/assign_master_controller_test.js  | 23 
 2 files changed, 27 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/73bd428d/ambari-web/app/controllers/wizard/step7/assign_master_controller.js
--
diff --git 
a/ambari-web/app/controllers/wizard/step7/assign_master_controller.js 
b/ambari-web/app/controllers/wizard/step7/assign_master_controller.js
index e8eaf47..a44aff4 100644
--- a/ambari-web/app/controllers/wizard/step7/assign_master_controller.js
+++ b/ambari-web/app/controllers/wizard/step7/assign_master_controller.js
@@ -297,8 +297,9 @@ App.AssignMasterOnStep7Controller = 
Em.Controller.extend(App.BlueprintMixin, App
   renderHostInfo: function () {
 var parentController = this.get('content.controllerName');
 if (parentController) {
-  this._super();
+  return this._super();
 } else {
+  var dfd = $.Deferred();
   var hosts = App.Host.find().toArray();
   var result = [];
   for (var p = 0; p < hosts.length; p++) {
@@ -315,6 +316,8 @@ App.AssignMasterOnStep7Controller = 
Em.Controller.extend(App.BlueprintMixin, App
   this.set("hosts", result);
   this.sortHosts(result);
   this.set('isHostsLoaded', true);
+  dfd.resolve();
+  return dfd.promise();
 }
   },
 

http://git-wip-us.apache.org/repos/asf/ambari/blob/73bd428d/ambari-web/test/controllers/wizard/step7/assign_master_controller_test.js
--
diff --git 
a/ambari-web/test/controllers/wizard/step7/assign_master_controller_test.js 
b/ambari-web/test/controllers/wizard/step7/assign_master_controller_test.js
index fd7637e..79dad59 100644
--- a/ambari-web/test/controllers/wizard/step7/assign_master_controller_test.js
+++ b/ambari-web/test/controllers/wizard/step7/assign_master_controller_test.js
@@ -250,6 +250,7 @@ describe('App.AssignMasterOnStep7Controller', function () {
 })
   ]);
   sinon.stub(view, 'sortHosts');
+  sinon.stub(view, 'getHosts').returns([]);
   sinon.stub(numberUtils, 'bytesToSize').returns(1);
 });
 
@@ -281,6 +282,28 @@ describe('App.AssignMasterOnStep7Controller', function () {
 host_info: Em.I18n.t('installer.step5.hostInfo').fmt('host1', 1, 1)
   })])).to.be.true;
 });
+
+it("should make general request to get hosts", function() {
+  view.reopen({
+content: Em.Object.create({
+  controllerName: 'name'
+})
+  });
+  view.renderHostInfo();
+  var args = testHelpers.findAjaxRequest('name', 
'hosts.high_availability.wizard');
+  expect(args).exists;
+});
+
+it("should make request for installer to get hosts", function() {
+  view.reopen({
+content: Em.Object.create({
+  controllerName: 'installerController'
+})
+  });
+  view.renderHostInfo();
+  var args = testHelpers.findAjaxRequest('name', 'hosts.info.install');
+  expect(args).exists;
+});
   });
 
   describe("#loadMasterComponentHosts()", function () {

[47/50] [abbrv] ambari git commit: AMBARI-22014. Patch upgrade is going into incorrect state during package installation with invalid VDF (ncole)

[jluniya]

AMBARI-22014. Patch upgrade is going into incorrect state during package 
installation with invalid VDF (ncole)


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

Branch: refs/heads/branch-feature-AMBARI-14714
Commit: 4c49b4bd006cdd3929f5e341552b200af608bc32
Parents: b653ee0
Author: Nate Cole 
Authored: Mon Sep 25 15:23:42 2017 -0400
Committer: Nate Cole 
Committed: Mon Sep 25 16:14:35 2017 -0400

--
 .../server/controller/ControllerModule.java |   2 +
 .../controller/ResourceProviderFactory.java |   6 +-
 .../AbstractControllerResourceProvider.java |   2 +-
 .../ClusterStackVersionResourceProvider.java|   9 +-
 .../internal/DefaultProviderModule.java |   2 -
 ...ClusterStackVersionResourceProviderTest.java | 223 ++-
 6 files changed, 87 insertions(+), 157 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/4c49b4bd/ambari-server/src/main/java/org/apache/ambari/server/controller/ControllerModule.java
--
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/controller/ControllerModule.java
 
b/ambari-server/src/main/java/org/apache/ambari/server/controller/ControllerModule.java
index e151e63..968e9b6 100644
--- 
a/ambari-server/src/main/java/org/apache/ambari/server/controller/ControllerModule.java
+++ 
b/ambari-server/src/main/java/org/apache/ambari/server/controller/ControllerModule.java
@@ -62,6 +62,7 @@ import org.apache.ambari.server.cleanup.ClasspathScannerUtils;
 import org.apache.ambari.server.configuration.Configuration;
 import org.apache.ambari.server.configuration.Configuration.ConnectionPoolType;
 import org.apache.ambari.server.configuration.Configuration.DatabaseType;
+import 
org.apache.ambari.server.controller.internal.ClusterStackVersionResourceProvider;
 import org.apache.ambari.server.controller.internal.ComponentResourceProvider;
 import org.apache.ambari.server.controller.internal.CredentialResourceProvider;
 import 
org.apache.ambari.server.controller.internal.HostComponentResourceProvider;
@@ -467,6 +468,7 @@ public class ControllerModule extends AbstractModule {
 .implement(ResourceProvider.class, Names.named("credential"), 
CredentialResourceProvider.class)
 .implement(ResourceProvider.class, Names.named("kerberosDescriptor"), 
KerberosDescriptorResourceProvider.class)
 .implement(ResourceProvider.class, Names.named("upgrade"), 
UpgradeResourceProvider.class)
+.implement(ResourceProvider.class, Names.named("clusterStackVersion"), 
ClusterStackVersionResourceProvider.class)
 .build(ResourceProviderFactory.class));
 
 install(new FactoryModuleBuilder().implement(

http://git-wip-us.apache.org/repos/asf/ambari/blob/4c49b4bd/ambari-server/src/main/java/org/apache/ambari/server/controller/ResourceProviderFactory.java
--
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/controller/ResourceProviderFactory.java
 
b/ambari-server/src/main/java/org/apache/ambari/server/controller/ResourceProviderFactory.java
index 3912138..9cd1d74 100644
--- 
a/ambari-server/src/main/java/org/apache/ambari/server/controller/ResourceProviderFactory.java
+++ 
b/ambari-server/src/main/java/org/apache/ambari/server/controller/ResourceProviderFactory.java
@@ -22,6 +22,7 @@ package org.apache.ambari.server.controller;
 import java.util.Map;
 import java.util.Set;
 
+import 
org.apache.ambari.server.controller.internal.ClusterStackVersionResourceProvider;
 import org.apache.ambari.server.controller.internal.UpgradeResourceProvider;
 import org.apache.ambari.server.controller.spi.Resource;
 import org.apache.ambari.server.controller.spi.Resource.Type;
@@ -68,4 +69,7 @@ public interface ResourceProviderFactory {
   @Named("upgrade")
   UpgradeResourceProvider 
getUpgradeResourceProvider(AmbariManagementController managementController);
 
-}
+  @Named("clusterStackVersion")
+  ClusterStackVersionResourceProvider 
getClusterStackVersionResourceProvider(AmbariManagementController 
managementController);
+
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ambari/blob/4c49b4bd/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/AbstractControllerResourceProvider.java
--
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/AbstractControllerResourceProvider.java
 

[35/50] [abbrv] ambari git commit: AMBARI-22047. Cannot upgrade stack due to 'Version XXXXX does not contain services that are installed' (alexantonenko)

[jluniya]

AMBARI-22047. Cannot upgrade stack due to 'Version X does not contain 
services that are installed' (alexantonenko)


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

Branch: refs/heads/branch-feature-AMBARI-14714
Commit: 06d21bb3850d2f8257c08064ab9d695d2a4c07c1
Parents: 12abba0
Author: Alex Antonenko 
Authored: Mon Sep 25 13:55:39 2017 +0300
Committer: Alex Antonenko 
Committed: Mon Sep 25 13:55:39 2017 +0300

--
 .../main/admin/stack_and_upgrade_controller.js  |  2 +-
 .../admin/stack_and_upgrade_controller_test.js  | 24 +---
 2 files changed, 22 insertions(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/06d21bb3/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 6d7560b..90a4db9 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
@@ -1513,7 +1513,7 @@ App.MainAdminStackAndUpgradeController = 
Em.Controller.extend(App.LocalStorage,
 var availableServices = repo.get('stackServices').filter(function(service) 
{
   return App.Service.find(service.get('name')).get('isLoaded') && 
service.get('isAvailable') && service.get('isUpgradable');
 }, this);
-if (!availableServices.length){
+if (!availableServices.length && !repo.get('isStandard')){
   return App.showAlertPopup( 
Em.I18n.t('admin.stackVersions.upgrade.installPackage.fail.title'), 
Em.I18n.t('admin.stackVersions.upgrade.installPackage.fail.noAvailableServices').format(repo.get('displayName'))
 );
 }
 var self = this;

http://git-wip-us.apache.org/repos/asf/ambari/blob/06d21bb3/ambari-web/test/controllers/main/admin/stack_and_upgrade_controller_test.js
--
diff --git 
a/ambari-web/test/controllers/main/admin/stack_and_upgrade_controller_test.js 
b/ambari-web/test/controllers/main/admin/stack_and_upgrade_controller_test.js
index d0671f9..1b04b17 100644
--- 
a/ambari-web/test/controllers/main/admin/stack_and_upgrade_controller_test.js
+++ 
b/ambari-web/test/controllers/main/admin/stack_and_upgrade_controller_test.js
@@ -1170,18 +1170,36 @@ describe('App.MainAdminStackAndUpgradeController', 
function() {
   describe("#installRepoVersionPopup()", function () {
 before(function () {
   sinon.stub(controller, 'installRepoVersion', Em.K);
-  sinon.stub(App.Service, 'find').returns({});
+  sinon.stub(App.Service, 'find').returns(Em.Object.create({
+isLoaded: true
+  }));
 });
 after(function () {
   controller.installRepoVersion.restore();
   App.Service.find.restore();
 });
-it("show popup", function () {
-  var repo = Em.Object.create({'displayName': 'HDP-2.2', stackServices: 
[]});
+it("show confirmation popup for non standart and available services", 
function () {
+  var repo = Em.Object.create({'displayName': 'HDP-2.2', isStandard: 
false, stackServices: [Em.Object.create({
+name: 'HDFS',
+isUpgradable: true,
+isAvailable: true
+  })]});
+  var popup = controller.installRepoVersionPopup(repo);
+  popup.onPrimary();
+  expect(controller.installRepoVersion.calledWith(repo)).to.be.true;
+});
+it("show pre-check popup for non standard and empty available services", 
function () {
+  var repo = Em.Object.create({'displayName': 'HDP-2.2', isStandard: 
false, stackServices: []});
   var popup = controller.installRepoVersionPopup(repo);
   popup.onPrimary();
   expect(controller.installRepoVersion.calledWith(repo)).to.be.false;
 });
+it("show confirmation popup for standart", function () {
+  var repo = Em.Object.create({'displayName': 'HDP-2.2', isStandard: true, 
stackServices: []});
+  var popup = controller.installRepoVersionPopup(repo);
+  popup.onPrimary();
+  expect(controller.installRepoVersion.calledWith(repo)).to.be.true;
+});
   });
 
   describe("#installRepoVersion()", function () {

[22/50] [abbrv] ambari git commit: AMBARI-22030. OOZIE/OOZIE_SERVER restart failed saying AttributeError: 'NoneType' object has no attribute 'upper' during EU [accidental commit] (ncole)

[jluniya]

AMBARI-22030. OOZIE/OOZIE_SERVER restart failed saying AttributeError: 
'NoneType' object has no attribute 'upper' during EU [accidental commit] (ncole)


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

Branch: refs/heads/branch-feature-AMBARI-14714
Commit: 5d5f9749e82bf815a1c8f82f090b769421d39949
Parents: 7c687bb
Author: Nate Cole 
Authored: Thu Sep 21 18:07:57 2017 -0400
Committer: Nate Cole 
Committed: Thu Sep 21 18:07:57 2017 -0400

--
 .../libraries/functions/copy_tarball.py.rej | 78 
 1 file changed, 78 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/5d5f9749/ambari-common/src/main/python/resource_management/libraries/functions/copy_tarball.py.rej
--
diff --git 
a/ambari-common/src/main/python/resource_management/libraries/functions/copy_tarball.py.rej
 
b/ambari-common/src/main/python/resource_management/libraries/functions/copy_tarball.py.rej
deleted file mode 100644
index b2c11fc..000
--- 
a/ambari-common/src/main/python/resource_management/libraries/functions/copy_tarball.py.rej
+++ /dev/null
@@ -1,78 +0,0 @@
-diff 
a/ambari-common/src/main/python/resource_management/libraries/functions/copy_tarball.py
 
b/ambari-common/src/main/python/resource_management/libraries/functions/copy_tarball.py
   (rejected hunks)
-@@ -41,26 +41,65 @@ STACK_VERSION_PATTERN = "{{ stack_version }}"
- # especially since it is an attribute of a stack and becomes
- # complicated to change during a Rolling/Express upgrade.
- TARBALL_MAP = {
--  "slider": ("{0}/{1}/slider/lib/slider.tar.gz".format(STACK_ROOT_PATTERN, 
STACK_VERSION_PATTERN),
-+  "slider": {
-+"dirs": ("{0}/{1}/slider/lib/slider.tar.gz".format(STACK_ROOT_PATTERN, 
STACK_VERSION_PATTERN),
-  "/{0}/apps/{1}/slider/slider.tar.gz".format(STACK_NAME_PATTERN, 
STACK_VERSION_PATTERN)),
--  "tez": ("{0}/{1}/tez/lib/tez.tar.gz".format(STACK_ROOT_PATTERN, 
STACK_VERSION_PATTERN),
-+"service": "SLIDER"
-+  },
-+
-+  "tez": {
-+"dirs": ("{0}/{1}/tez/lib/tez.tar.gz".format(STACK_ROOT_PATTERN, 
STACK_VERSION_PATTERN),
-   "/{0}/apps/{1}/tez/tez.tar.gz".format(STACK_NAME_PATTERN, 
STACK_VERSION_PATTERN)),
--  "tez_hive2": ("{0}/{1}/tez_hive2/lib/tez.tar.gz".format(STACK_ROOT_PATTERN, 
STACK_VERSION_PATTERN),
-+"service": "TEZ"
-+  },
-+
-+  "tez_hive2": {
-+"dirs": ("{0}/{1}/tez_hive2/lib/tez.tar.gz".format(STACK_ROOT_PATTERN, 
STACK_VERSION_PATTERN),
-   "/{0}/apps/{1}/tez_hive2/tez.tar.gz".format(STACK_NAME_PATTERN, 
STACK_VERSION_PATTERN)),
--  "hive": ("{0}/{1}/hive/hive.tar.gz".format(STACK_ROOT_PATTERN, 
STACK_VERSION_PATTERN),
-+"service": "HIVE"
-+  },
-+
-+  "hive": {
-+"dirs": ("{0}/{1}/hive/hive.tar.gz".format(STACK_ROOT_PATTERN, 
STACK_VERSION_PATTERN),
-"/{0}/apps/{1}/hive/hive.tar.gz".format(STACK_NAME_PATTERN, 
STACK_VERSION_PATTERN)),
--  "pig": ("{0}/{1}/pig/pig.tar.gz".format(STACK_ROOT_PATTERN, 
STACK_VERSION_PATTERN),
-+"service": "HIVE"
-+  },
-+
-+  "pig": {
-+"dirs": ("{0}/{1}/pig/pig.tar.gz".format(STACK_ROOT_PATTERN, 
STACK_VERSION_PATTERN),
-   "/{0}/apps/{1}/pig/pig.tar.gz".format(STACK_NAME_PATTERN, 
STACK_VERSION_PATTERN)),
--  "hadoop_streaming": 
("{0}/{1}/hadoop-mapreduce/hadoop-streaming.jar".format(STACK_ROOT_PATTERN, 
STACK_VERSION_PATTERN),
-+"service": "PIG"
-+  },
-+
-+  "hadoop_streaming": {
-+"dirs": 
("{0}/{1}/hadoop-mapreduce/hadoop-streaming.jar".format(STACK_ROOT_PATTERN, 
STACK_VERSION_PATTERN),
-
"/{0}/apps/{1}/mapreduce/hadoop-streaming.jar".format(STACK_NAME_PATTERN, 
STACK_VERSION_PATTERN)),
--  "sqoop": ("{0}/{1}/sqoop/sqoop.tar.gz".format(STACK_ROOT_PATTERN, 
STACK_VERSION_PATTERN),
-+"service": "MAPREDUCE2"
-+  },
-+
-+  "sqoop": {
-+"dirs": ("{0}/{1}/sqoop/sqoop.tar.gz".format(STACK_ROOT_PATTERN, 
STACK_VERSION_PATTERN),
- "/{0}/apps/{1}/sqoop/sqoop.tar.gz".format(STACK_NAME_PATTERN, 
STACK_VERSION_PATTERN)),
--  "mapreduce": ("{0}/{1}/hadoop/mapreduce.tar.gz".format(STACK_ROOT_PATTERN, 
STACK_VERSION_PATTERN),
-+"service": "SQOOP"
-+  },
-+
-+  "mapreduce": {
-+"dirs": ("{0}/{1}/hadoop/mapreduce.tar.gz".format(STACK_ROOT_PATTERN, 
STACK_VERSION_PATTERN),
- 
"/{0}/apps/{1}/mapreduce/mapreduce.tar.gz".format(STACK_NAME_PATTERN, 
STACK_VERSION_PATTERN)),
--  "spark": 
("{0}/{1}/spark/lib/spark-{2}-assembly.jar".format(STACK_ROOT_PATTERN, 
STACK_VERSION_PATTERN, STACK_NAME_PATTERN),
-+"service": "MAPREDUCE2"
-+  },
-+
-+  "spark": {
-+"dirs": 

[10/50] [abbrv] ambari git commit: AMBARI-22013. Add JMX enable/disable option to Infra Solr (oleewere)

[jluniya]

AMBARI-22013. Add JMX enable/disable option to Infra Solr (oleewere)


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

Branch: refs/heads/branch-feature-AMBARI-14714
Commit: 1a5b4943cbfa42d66d61e5cb29a09e1d3ad9acb7
Parents: 5c0a354
Author: Oliver Szabo 
Authored: Thu Sep 21 00:59:26 2017 +0200
Committer: Oliver Szabo 
Committed: Thu Sep 21 12:27:13 2017 +0200

--
 .../docker/test-config/solr/solr-env-ssl.sh |  1 +
 .../docker/test-config/solr/solr-env.sh |  1 +
 .../0.1.0/configuration/infra-solr-env.xml  | 12 +++-
 .../0.1.0/package/scripts/params.py |  4 +++
 .../0.1.0/properties/infra-solr-env.sh.j2   |  3 +-
 .../configs/services/ambari_infra_properties.js | 31 
 6 files changed, 38 insertions(+), 14 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/1a5b4943/ambari-logsearch/docker/test-config/solr/solr-env-ssl.sh
--
diff --git a/ambari-logsearch/docker/test-config/solr/solr-env-ssl.sh 
b/ambari-logsearch/docker/test-config/solr/solr-env-ssl.sh
index faaa6ff..6c78da0 100644
--- a/ambari-logsearch/docker/test-config/solr/solr-env-ssl.sh
+++ b/ambari-logsearch/docker/test-config/solr/solr-env-ssl.sh
@@ -71,6 +71,7 @@ RMI_PORT=18886
 #SOLR_OPTS="$SOLR_OPTS -Dsolr.autoSoftCommit.maxTime=3000"
 #SOLR_OPTS="$SOLR_OPTS -Dsolr.autoCommit.maxTime=6"
 #SOLR_OPTS="$SOLR_OPTS -Dsolr.clustering.enabled=true"
+SOLR_OPTS="$SOLR_OPTS -Djava.rmi.server.hostname=localhost"
 
 # Location where the bin/solr script will save PID files for running instances
 # If not set, the script will create PID files in $SOLR_TIP/bin

http://git-wip-us.apache.org/repos/asf/ambari/blob/1a5b4943/ambari-logsearch/docker/test-config/solr/solr-env.sh
--
diff --git a/ambari-logsearch/docker/test-config/solr/solr-env.sh 
b/ambari-logsearch/docker/test-config/solr/solr-env.sh
index 11b9fe0..89e3a4d 100644
--- a/ambari-logsearch/docker/test-config/solr/solr-env.sh
+++ b/ambari-logsearch/docker/test-config/solr/solr-env.sh
@@ -71,6 +71,7 @@ RMI_PORT=18886
 #SOLR_OPTS="$SOLR_OPTS -Dsolr.autoSoftCommit.maxTime=3000"
 #SOLR_OPTS="$SOLR_OPTS -Dsolr.autoCommit.maxTime=6"
 #SOLR_OPTS="$SOLR_OPTS -Dsolr.clustering.enabled=true"
+SOLR_OPTS="$SOLR_OPTS -Djava.rmi.server.hostname=localhost"
 
 # Location where the bin/solr script will save PID files for running instances
 # If not set, the script will create PID files in $SOLR_TIP/bin

http://git-wip-us.apache.org/repos/asf/ambari/blob/1a5b4943/ambari-server/src/main/resources/common-services/AMBARI_INFRA/0.1.0/configuration/infra-solr-env.xml
--
diff --git 
a/ambari-server/src/main/resources/common-services/AMBARI_INFRA/0.1.0/configuration/infra-solr-env.xml
 
b/ambari-server/src/main/resources/common-services/AMBARI_INFRA/0.1.0/configuration/infra-solr-env.xml
index 52a5e6a..2a76334 100644
--- 
a/ambari-server/src/main/resources/common-services/AMBARI_INFRA/0.1.0/configuration/infra-solr-env.xml
+++ 
b/ambari-server/src/main/resources/common-services/AMBARI_INFRA/0.1.0/configuration/infra-solr-env.xml
@@ -176,7 +176,17 @@
 
 
   
-
+  
+infra_solr_jmx_enabled
+false
+Enable JMX
+Set to true to activate the JMX RMI connector to allow remote 
JMX client applications to monitor the JVM hosting Solr
+
+
+  boolean
+
+
+  
   
 infra_solr_kerberos_keytab
 /etc/security/keytabs/infra_solr.service.keytab

http://git-wip-us.apache.org/repos/asf/ambari/blob/1a5b4943/ambari-server/src/main/resources/common-services/AMBARI_INFRA/0.1.0/package/scripts/params.py
--
diff --git 
a/ambari-server/src/main/resources/common-services/AMBARI_INFRA/0.1.0/package/scripts/params.py
 
b/ambari-server/src/main/resources/common-services/AMBARI_INFRA/0.1.0/package/scripts/params.py
index e4ea885..eba1db9 100644
--- 
a/ambari-server/src/main/resources/common-services/AMBARI_INFRA/0.1.0/package/scripts/params.py
+++ 
b/ambari-server/src/main/resources/common-services/AMBARI_INFRA/0.1.0/package/scripts/params.py
@@ -49,6 +49,8 @@ stack_version = default("/commandParams/version", None)
 sudo = AMBARI_SUDO_BINARY
 security_enabled = status_params.security_enabled
 
+hostname = config['hostname'].lower()
+
 infra_solr_conf = "/etc/ambari-infra-solr/conf"
 
 infra_solr_port = status_params.infra_solr_port
@@ -145,6 +147,8 @@ if security_enabled:
 

[09/50] [abbrv] ambari git commit: AMBARI-22007 - Addition of service component after patching a service still keeps the component at base version (jonathanhurley)

[jluniya]

AMBARI-22007 - Addition of service component after patching a service still 
keeps the component at base version (jonathanhurley)


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

Branch: refs/heads/branch-feature-AMBARI-14714
Commit: 5c0a3546e70e71366c51ef4e3b3ef9f2319865d8
Parents: 25c1f21
Author: Jonathan Hurley 
Authored: Wed Sep 20 16:59:48 2017 -0400
Committer: Jonathan Hurley 
Committed: Wed Sep 20 17:02:39 2017 -0400

--
 .../ambari/server/agent/CommandRepository.java  | 28 +++
 .../AmbariCustomCommandExecutionHelper.java |  1 +
 .../RepositoryVersionResourceProvider.java  |  6 ++--
 .../DistributeRepositoriesActionListener.java   |  1 +
 .../listeners/upgrade/StackVersionListener.java |  5 +--
 .../orm/entities/RepositoryVersionEntity.java   | 37 
 .../stack/upgrade/RepositoryVersionHelper.java  |  1 +
 .../server/upgrade/UpgradeCatalog260.java   | 29 +--
 .../main/resources/Ambari-DDL-Derby-CREATE.sql  |  1 +
 .../main/resources/Ambari-DDL-MySQL-CREATE.sql  |  1 +
 .../main/resources/Ambari-DDL-Oracle-CREATE.sql |  1 +
 .../resources/Ambari-DDL-Postgres-CREATE.sql|  1 +
 .../resources/Ambari-DDL-SQLAnywhere-CREATE.sql |  1 +
 .../resources/Ambari-DDL-SQLServer-CREATE.sql   |  1 +
 .../upgrade/StackVersionListenerTest.java   |  5 +++
 .../server/upgrade/UpgradeCatalog260Test.java   | 17 ++---
 .../src/test/python/TestVersionSelectUtil.py| 14 
 17 files changed, 133 insertions(+), 17 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/5c0a3546/ambari-server/src/main/java/org/apache/ambari/server/agent/CommandRepository.java
--
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/agent/CommandRepository.java
 
b/ambari-server/src/main/java/org/apache/ambari/server/agent/CommandRepository.java
index 1351713..301f475 100644
--- 
a/ambari-server/src/main/java/org/apache/ambari/server/agent/CommandRepository.java
+++ 
b/ambari-server/src/main/java/org/apache/ambari/server/agent/CommandRepository.java
@@ -46,6 +46,13 @@ public class CommandRepository {
   private String m_stackName;
 
   /**
+   * {@code true} if Ambari believes that this repository has reported back 
it's
+   * version after distribution.
+   */
+  @SerializedName("resolved")
+  private boolean m_resolved;
+
+  /**
* @param version the repo version
*/
   public void setRepositoryVersion(String version) {
@@ -119,6 +126,27 @@ public class CommandRepository {
   }
 
   /**
+   * Gets whether this repository has been marked as having its version
+   * resolved.
+   *
+   * @return {@code true} if this repository has been confirmed to have the
+   * right version.
+   */
+  public boolean isResolved() {
+return m_resolved;
+  }
+
+  /**
+   * Gets whether this repository has had its version resolved.
+   *
+   * @param resolved
+   *  {@code true} to mark this repository as being resolved.
+   */
+  public void setResolved(boolean resolved) {
+m_resolved = resolved;
+  }
+
+  /**
* Minimal information required to generate repo files on the agent.  These 
are copies
* of the repository objects from repo versions that can be changed for URL 
overrides, etc.
*/

http://git-wip-us.apache.org/repos/asf/ambari/blob/5c0a3546/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariCustomCommandExecutionHelper.java
--
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariCustomCommandExecutionHelper.java
 
b/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariCustomCommandExecutionHelper.java
index 822539f..38a02ef 100644
--- 
a/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariCustomCommandExecutionHelper.java
+++ 
b/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariCustomCommandExecutionHelper.java
@@ -1285,6 +1285,7 @@ public class AmbariCustomCommandExecutionHelper {
   public Void apply(RepositoryVersionEntity rve) {
 command.setRepositoryVersionId(rve.getId());
 command.setRepositoryVersion(rve.getVersion());
+command.setResolved(rve.isResolved());
 command.setStackName(rve.getStackName());
 
 // !!! a repository version entity has all the repos worked out.  We 
shouldn't use

[27/50] [abbrv] ambari git commit: AMBARI-22019. Enable logsearch-web unit tests and make them skippable (oleewere)

[jluniya]

AMBARI-22019. Enable logsearch-web unit tests and make them skippable (oleewere)


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

Branch: refs/heads/branch-feature-AMBARI-14714
Commit: 40f705a6654907014eae6a1981622ae404fda1e8
Parents: 9e93c47
Author: Oliver Szabo 
Authored: Thu Sep 21 12:52:45 2017 +0200
Committer: Oliver Szabo 
Committed: Fri Sep 22 13:11:15 2017 +0200

--
 ambari-logsearch/ambari-logsearch-web/pom.xml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/40f705a6/ambari-logsearch/ambari-logsearch-web/pom.xml
--
diff --git a/ambari-logsearch/ambari-logsearch-web/pom.xml 
b/ambari-logsearch/ambari-logsearch-web/pom.xml
index 7a6b02e..f27c2c6 100644
--- a/ambari-logsearch/ambari-logsearch-web/pom.xml
+++ b/ambari-logsearch/ambari-logsearch-web/pom.xml
@@ -78,7 +78,6 @@
   build-prod
 
   
-  
 
   
   

[33/50] [abbrv] ambari git commit: AMBARI-22039. File "hdfs.headless.keytab" has incorrect permission (aonishuk)

[jluniya]

AMBARI-22039. File "hdfs.headless.keytab" has incorrect permission  (aonishuk)


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

Branch: refs/heads/branch-feature-AMBARI-14714
Commit: 50b64758091a0df76419cbced4044e2689b5d4d1
Parents: 5d5cc4f
Author: Andrew Onishuk 
Authored: Mon Sep 25 12:27:24 2017 +0300
Committer: Andrew Onishuk 
Committed: Mon Sep 25 12:27:24 2017 +0300

--
 .../stacks/2.6/ZEPPELIN/test_zeppelin_070.py  | 18 --
 1 file changed, 12 insertions(+), 6 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/50b64758/ambari-server/src/test/python/stacks/2.6/ZEPPELIN/test_zeppelin_070.py
--
diff --git 
a/ambari-server/src/test/python/stacks/2.6/ZEPPELIN/test_zeppelin_070.py 
b/ambari-server/src/test/python/stacks/2.6/ZEPPELIN/test_zeppelin_070.py
index b9b34e8..f379f40 100644
--- a/ambari-server/src/test/python/stacks/2.6/ZEPPELIN/test_zeppelin_070.py
+++ b/ambari-server/src/test/python/stacks/2.6/ZEPPELIN/test_zeppelin_070.py
@@ -312,7 +312,8 @@ class TestZeppelin070(RMFTestCase):
   
hdfs_resource_ignore_file='/var/lib/ambari-agent/data/.hdfs_resource_ignore',
   hdfs_site={u'a': u'b'},
   kinit_path_local='/usr/bin/kinit',
-  user="zeppelin",
+  user="hdfs",
+  owner="zeppelin",
   group="zeppelin",
   type='file',
   action=['download_on_execute'],
@@ -336,7 +337,8 @@ class TestZeppelin070(RMFTestCase):
   
hdfs_resource_ignore_file='/var/lib/ambari-agent/data/.hdfs_resource_ignore',
   hdfs_site={u'a': u'b'},
   kinit_path_local='/usr/bin/kinit',
-  user="zeppelin",
+  user="hdfs",
+  owner="zeppelin",
   group="zeppelin",
   type='file',
   action=['create_on_execute'],
@@ -355,7 +357,8 @@ class TestZeppelin070(RMFTestCase):
   
hdfs_resource_ignore_file='/var/lib/ambari-agent/data/.hdfs_resource_ignore',
   hdfs_site={u'a': u'b'},
   kinit_path_local='/usr/bin/kinit',
-  user="zeppelin",
+  user="hdfs",
+  owner="zeppelin",
   group="zeppelin",
   type='file',
   action=['download_on_execute'],
@@ -379,7 +382,8 @@ class TestZeppelin070(RMFTestCase):
   
hdfs_resource_ignore_file='/var/lib/ambari-agent/data/.hdfs_resource_ignore',
   hdfs_site={u'a': u'b'},
   kinit_path_local='/usr/bin/kinit',
-  user="zeppelin",
+  user="hdfs",
+  owner="zeppelin",
   group="zeppelin",
   type='file',
   action=['create_on_execute'],
@@ -398,7 +402,8 @@ class TestZeppelin070(RMFTestCase):
   
hdfs_resource_ignore_file='/var/lib/ambari-agent/data/.hdfs_resource_ignore',
   hdfs_site={u'a': u'b'},
   kinit_path_local='/usr/bin/kinit',
-  user="zeppelin",
+  user="hdfs",
+  owner="zeppelin",
   group="zeppelin",
   type='file',
   action=['download_on_execute'],
@@ -422,7 +427,8 @@ class TestZeppelin070(RMFTestCase):
   
hdfs_resource_ignore_file='/var/lib/ambari-agent/data/.hdfs_resource_ignore',
   hdfs_site={u'a': u'b'},
   kinit_path_local='/usr/bin/kinit',
-  user="zeppelin",
+  user="hdfs",
+  owner="zeppelin",
   group="zeppelin",
   type='file',
   action=['create_on_execute'],

[01/50] [abbrv] ambari git commit: AMBARI-22003. Ambari schema upgrade failure as views destination path dir already exists (aonishuk)

[jluniya]

Repository: ambari
Updated Branches:
  refs/heads/branch-feature-AMBARI-14714 986b3b1fc -> 530df165d


AMBARI-22003. Ambari schema upgrade failure as views destination path dir 
already exists (aonishuk)


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

Branch: refs/heads/branch-feature-AMBARI-14714
Commit: c8832728ad0ebb545bd8795de23d0b859af23d1a
Parents: a90f3b3
Author: Andrew Onishuk 
Authored: Wed Sep 20 11:19:09 2017 +0300
Committer: Andrew Onishuk 
Committed: Wed Sep 20 11:19:09 2017 +0300

--
 ambari-server/src/main/python/ambari_server/serverUpgrade.py | 4 
 1 file changed, 4 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/c8832728/ambari-server/src/main/python/ambari_server/serverUpgrade.py
--
diff --git a/ambari-server/src/main/python/ambari_server/serverUpgrade.py 
b/ambari-server/src/main/python/ambari_server/serverUpgrade.py
index 8712da5..b0e0128 100644
--- a/ambari-server/src/main/python/ambari_server/serverUpgrade.py
+++ b/ambari-server/src/main/python/ambari_server/serverUpgrade.py
@@ -267,6 +267,10 @@ def upgrade(args):
   # Move files installed by package to default views directory to a custom one
   for views_dir in get_views_dir(properties):
 root_views_dir = views_dir + "/../"
+
+if os.path.samefile(root_views_dir, get_default_views_dir()):
+  continue
+
 for file in glob.glob(get_default_views_dir()+'/*'):
   shutil.move(file, root_views_dir)
 

[42/50] [abbrv] ambari git commit: AMBARI-22051 - VDFs Which Are Correct Never Get Resolved (jonathanhurley)

[jluniya]

AMBARI-22051 -  VDFs Which Are Correct Never Get Resolved (jonathanhurley)


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

Branch: refs/heads/branch-feature-AMBARI-14714
Commit: 08da9611188d9c4c246ee6d77894da5edf317860
Parents: 4b59ba8
Author: Jonathan Hurley 
Authored: Mon Sep 25 10:11:52 2017 -0400
Committer: Jonathan Hurley 
Committed: Mon Sep 25 12:36:44 2017 -0400

--
 .../DistributeRepositoriesActionListener.java   |  7 
 .../listeners/upgrade/StackVersionListener.java |  7 
 .../upgrade/StackVersionListenerTest.java   | 41 
 3 files changed, 55 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/08da9611/ambari-server/src/main/java/org/apache/ambari/server/events/listeners/upgrade/DistributeRepositoriesActionListener.java
--
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/events/listeners/upgrade/DistributeRepositoriesActionListener.java
 
b/ambari-server/src/main/java/org/apache/ambari/server/events/listeners/upgrade/DistributeRepositoriesActionListener.java
index 376e20d..1944761 100644
--- 
a/ambari-server/src/main/java/org/apache/ambari/server/events/listeners/upgrade/DistributeRepositoriesActionListener.java
+++ 
b/ambari-server/src/main/java/org/apache/ambari/server/events/listeners/upgrade/DistributeRepositoriesActionListener.java
@@ -127,6 +127,13 @@ public class DistributeRepositoriesActionListener {
 repoVersion.setResolved(true);
 repoVersionDAO.merge(repoVersion);
 repositoryVersion = actualVersion;
+  } else {
+// the reported versions are the same - we should ensure that the
+// repo is resolved
+if (!repoVersion.isResolved()) {
+  repoVersion.setResolved(true);
+  repoVersionDAO.merge(repoVersion);
+}
   }
 }
   }

http://git-wip-us.apache.org/repos/asf/ambari/blob/08da9611/ambari-server/src/main/java/org/apache/ambari/server/events/listeners/upgrade/StackVersionListener.java
--
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/events/listeners/upgrade/StackVersionListener.java
 
b/ambari-server/src/main/java/org/apache/ambari/server/events/listeners/upgrade/StackVersionListener.java
index 0ce64bf..e5298dc 100644
--- 
a/ambari-server/src/main/java/org/apache/ambari/server/events/listeners/upgrade/StackVersionListener.java
+++ 
b/ambari-server/src/main/java/org/apache/ambari/server/events/listeners/upgrade/StackVersionListener.java
@@ -101,6 +101,13 @@ public class StackVersionListener {
   rve.setVersion(newVersion);
   rve.setResolved(true);
   repositoryVersionDAO.merge(rve);
+} else {
+  // the reported versions are the same - we should ensure that the 
repo
+  // is resolved
+  if (!rve.isResolved()) {
+rve.setResolved(true);
+repositoryVersionDAO.merge(rve);
+  }
 }
   }
 }

http://git-wip-us.apache.org/repos/asf/ambari/blob/08da9611/ambari-server/src/test/java/org/apache/ambari/server/events/listeners/upgrade/StackVersionListenerTest.java
--
diff --git 
a/ambari-server/src/test/java/org/apache/ambari/server/events/listeners/upgrade/StackVersionListenerTest.java
 
b/ambari-server/src/test/java/org/apache/ambari/server/events/listeners/upgrade/StackVersionListenerTest.java
index 68d9c56..5e12cdf 100644
--- 
a/ambari-server/src/test/java/org/apache/ambari/server/events/listeners/upgrade/StackVersionListenerTest.java
+++ 
b/ambari-server/src/test/java/org/apache/ambari/server/events/listeners/upgrade/StackVersionListenerTest.java
@@ -330,6 +330,47 @@ public class StackVersionListenerTest extends 
EasyMockSupport {
   }
 
   /**
+   * Tests that if a component advertises a version and the repository already
+   * matches, that we ensure that it is marked as resolved.
+   *
+   * @throws Exception
+   */
+  @Test
+  public void testRepositoryResolvedWhenVersionsMatch() throws Exception {
+String version = "2.4.0.0";
+
+expect(sch.getVersion()).andReturn(version);
+expect(componentInfo.isVersionAdvertised()).andReturn(true).once();
+
+RepositoryVersionDAO dao = createNiceMock(RepositoryVersionDAO.class);
+RepositoryVersionEntity entity = 
createNiceMock(RepositoryVersionEntity.class);
+expect(entity.getVersion()).andReturn(version).once();
+

[24/50] [abbrv] ambari git commit: AMBARI-22037 Log Search UI: host filter should be performed using hostList parameter. (ababiichuk)

[jluniya]

AMBARI-22037 Log Search UI: host filter should be performed using hostList 
parameter. (ababiichuk)


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

Branch: refs/heads/branch-feature-AMBARI-14714
Commit: d9662987483c8e0d347c59f02e8e459427a90749
Parents: d221ab7
Author: ababiichuk 
Authored: Fri Sep 22 12:00:33 2017 +0300
Committer: ababiichuk 
Committed: Fri Sep 22 12:00:33 2017 +0300

--
 .../src/app/classes/queries/audit-logs-query-params.class.ts| 2 --
 .../queries/service-logs-histogram-query-params.class.ts| 1 -
 .../src/app/classes/queries/service-logs-query-params.class.ts  | 1 -
 .../ambari-logsearch-web/src/app/services/filtering.service.ts  | 4 
 .../src/app/services/logs-container.service.ts  | 5 ++---
 .../src/app/services/mock-api-data.service.ts   | 2 +-
 ambari-logsearch/ambari-logsearch-web/src/assets/i18n/en.json   | 1 -
 7 files changed, 3 insertions(+), 13 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/d9662987/ambari-logsearch/ambari-logsearch-web/src/app/classes/queries/audit-logs-query-params.class.ts
--
diff --git 
a/ambari-logsearch/ambari-logsearch-web/src/app/classes/queries/audit-logs-query-params.class.ts
 
b/ambari-logsearch/ambari-logsearch-web/src/app/classes/queries/audit-logs-query-params.class.ts
index ef8cf28..d179376 100644
--- 
a/ambari-logsearch/ambari-logsearch-web/src/app/classes/queries/audit-logs-query-params.class.ts
+++ 
b/ambari-logsearch/ambari-logsearch-web/src/app/classes/queries/audit-logs-query-params.class.ts
@@ -39,8 +39,6 @@ export class AuditLogsQueryParams extends QueryParams {
   start_time?: string;
   end_time?: string;
   clusters?: string;
-  iMessage?: string;
-  eMessage?: string;
   mustBe?: string;
   mustNot?: string;
   includeQuery?: string;

http://git-wip-us.apache.org/repos/asf/ambari/blob/d9662987/ambari-logsearch/ambari-logsearch-web/src/app/classes/queries/service-logs-histogram-query-params.class.ts
--
diff --git 
a/ambari-logsearch/ambari-logsearch-web/src/app/classes/queries/service-logs-histogram-query-params.class.ts
 
b/ambari-logsearch/ambari-logsearch-web/src/app/classes/queries/service-logs-histogram-query-params.class.ts
index 572af03..2e2113f 100644
--- 
a/ambari-logsearch/ambari-logsearch-web/src/app/classes/queries/service-logs-histogram-query-params.class.ts
+++ 
b/ambari-logsearch/ambari-logsearch-web/src/app/classes/queries/service-logs-histogram-query-params.class.ts
@@ -64,7 +64,6 @@ export class ServiceLogsHistogramQueryParams extends 
QueryParams {
   to: string;
   unit?: string;
   clusters?: string;
-  iMessage?: string;
   level?: string;
   includeQuery?: string;
   excludeQuery?: string;

http://git-wip-us.apache.org/repos/asf/ambari/blob/d9662987/ambari-logsearch/ambari-logsearch-web/src/app/classes/queries/service-logs-query-params.class.ts
--
diff --git 
a/ambari-logsearch/ambari-logsearch-web/src/app/classes/queries/service-logs-query-params.class.ts
 
b/ambari-logsearch/ambari-logsearch-web/src/app/classes/queries/service-logs-query-params.class.ts
index c88ec46..864b689 100644
--- 
a/ambari-logsearch/ambari-logsearch-web/src/app/classes/queries/service-logs-query-params.class.ts
+++ 
b/ambari-logsearch/ambari-logsearch-web/src/app/classes/queries/service-logs-query-params.class.ts
@@ -20,7 +20,6 @@ import {AuditLogsQueryParams} from 
'@app/classes/queries/audit-logs-query-params
 
 export class ServiceLogsQueryParams extends AuditLogsQueryParams {
   level?: string;
-  host_name?: string;
   file_name?: string;
   bundle_id?: string;
   hostList?: string;

http://git-wip-us.apache.org/repos/asf/ambari/blob/d9662987/ambari-logsearch/ambari-logsearch-web/src/app/services/filtering.service.ts
--
diff --git 
a/ambari-logsearch/ambari-logsearch-web/src/app/services/filtering.service.ts 
b/ambari-logsearch/ambari-logsearch-web/src/app/services/filtering.service.ts
index 718149e..627dc27 100644
--- 
a/ambari-logsearch/ambari-logsearch-web/src/app/services/filtering.service.ts
+++ 
b/ambari-logsearch/ambari-logsearch-web/src/app/services/filtering.service.ts
@@ -66,10 +66,6 @@ export class FilteringService {
   options: [],
   defaultValue: ''
 },
-text: {
-  label: 'filter.message',
-  defaultValue: ''
-},
 timeRange: {
   options: [
 

[20/50] [abbrv] ambari git commit: AMBARI-22030. OOZIE/OOZIE_SERVER restart failed saying AttributeError: 'NoneType' object has no attribute 'upper' during EU (ncole)

[jluniya]

AMBARI-22030. OOZIE/OOZIE_SERVER restart failed saying AttributeError: 
'NoneType' object has no attribute 'upper' during EU (ncole)


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

Branch: refs/heads/branch-feature-AMBARI-14714
Commit: f9c0c909be405ecfe3607ad4e07d3aa6eb6cf3df
Parents: f095b95
Author: Nate Cole 
Authored: Thu Sep 21 17:13:12 2017 -0400
Committer: Nate Cole 
Committed: Thu Sep 21 17:13:27 2017 -0400

--
 .../libraries/functions/upgrade_summary.py  | 16 +
 .../4.0.0.2.0/package/scripts/params_linux.py   | 18 +-
 .../stacks/2.0.6/OOZIE/test_oozie_server.py | 66 
 3 files changed, 98 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/f9c0c909/ambari-common/src/main/python/resource_management/libraries/functions/upgrade_summary.py
--
diff --git 
a/ambari-common/src/main/python/resource_management/libraries/functions/upgrade_summary.py
 
b/ambari-common/src/main/python/resource_management/libraries/functions/upgrade_summary.py
index 849ac8a..f8a46c0 100644
--- 
a/ambari-common/src/main/python/resource_management/libraries/functions/upgrade_summary.py
+++ 
b/ambari-common/src/main/python/resource_management/libraries/functions/upgrade_summary.py
@@ -25,6 +25,22 @@ from resource_management.libraries.functions.constants 
import Direction
 UpgradeSummary = namedtuple("UpgradeSummary", "type direction orchestration 
is_revert services")
 UpgradeServiceSummary = namedtuple("UpgradeServiceSummary", "service_name 
source_stack source_version target_stack target_version")
 
+
+def get_source_stack(service_name):
+  """
+  Gets the source stack (from) version of a service participating in an 
upgrade. If there is no
+  upgrade or the specific service is not participating, this will return None.
+  :param service_name:  the service name to check for, or None to extract it 
from the command
+  :return:  the stack that the service is upgrading from or None if there is 
no upgrade or
+  the service is not included in the upgrade.
+  """
+  service_summary = _get_service_summary(service_name)
+  if service_summary is None:
+return None
+
+  return service_summary.source_stack
+
+
 def get_source_version(service_name = None, default_version=None):
   """
   Gets the source (from) version of a service participating in an upgrade. If 
there is no

http://git-wip-us.apache.org/repos/asf/ambari/blob/f9c0c909/ambari-server/src/main/resources/common-services/OOZIE/4.0.0.2.0/package/scripts/params_linux.py
--
diff --git 
a/ambari-server/src/main/resources/common-services/OOZIE/4.0.0.2.0/package/scripts/params_linux.py
 
b/ambari-server/src/main/resources/common-services/OOZIE/4.0.0.2.0/package/scripts/params_linux.py
index 44c88b7..e856c01 100644
--- 
a/ambari-server/src/main/resources/common-services/OOZIE/4.0.0.2.0/package/scripts/params_linux.py
+++ 
b/ambari-server/src/main/resources/common-services/OOZIE/4.0.0.2.0/package/scripts/params_linux.py
@@ -19,8 +19,10 @@ limitations under the License.
 """
 from ambari_commons.constants import AMBARI_SUDO_BINARY
 from resource_management.libraries.functions import format
-from resource_management.libraries.functions import conf_select, stack_select
-from resource_management.libraries.functions.constants import StackFeature
+from resource_management.libraries.functions import conf_select
+from resource_management.libraries.functions import stack_select
+from resource_management.libraries.functions import StackFeature
+from resource_management.libraries.functions import upgrade_summary
 from resource_management.libraries.functions.stack_features import 
check_stack_feature
 from resource_management.libraries.functions.default import default
 from resource_management.libraries.functions import get_kinit_path
@@ -33,8 +35,10 @@ from resource_management.libraries.functions.expect import 
expect
 from resource_management.libraries.resources.hdfs_resource import HdfsResource
 from resource_management.libraries.functions.get_architecture import 
get_architecture
 from resource_management.libraries.functions.stack_features import 
get_stack_feature_version
+from resource_management.libraries.functions.stack_tools import get_stack_name
 from resource_management.libraries.functions.version import get_major_version
 
+
 from resource_management.core.utils import PasswordString
 from ambari_commons.credential_store_helper import 
get_password_from_credential_store
 from urlparse 

[21/50] [abbrv] ambari git commit: AMBARI-22025. Service auto start broken due to incomplete execution command

[jluniya]

AMBARI-22025. Service auto start broken due to incomplete execution command


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

Branch: refs/heads/branch-feature-AMBARI-14714
Commit: 7c687bbc226b19f85a6f6f292537760e5d6d8048
Parents: f9c0c90
Author: Attila Doroszlai 
Authored: Thu Sep 21 16:24:04 2017 +0200
Committer: Attila Doroszlai 
Committed: Thu Sep 21 23:22:19 2017 +0200

--
 .../actionmanager/ExecutionCommandWrapper.java  | 122 ++-
 .../AmbariManagementControllerImpl.java |   8 +-
 .../server/agent/TestHeartbeatMonitor.java  |  20 ++-
 3 files changed, 87 insertions(+), 63 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/7c687bbc/ambari-server/src/main/java/org/apache/ambari/server/actionmanager/ExecutionCommandWrapper.java
--
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/actionmanager/ExecutionCommandWrapper.java
 
b/ambari-server/src/main/java/org/apache/ambari/server/actionmanager/ExecutionCommandWrapper.java
index 5f9300a..47aa093 100644
--- 
a/ambari-server/src/main/java/org/apache/ambari/server/actionmanager/ExecutionCommandWrapper.java
+++ 
b/ambari-server/src/main/java/org/apache/ambari/server/actionmanager/ExecutionCommandWrapper.java
@@ -19,6 +19,7 @@ package org.apache.ambari.server.actionmanager;
 
 import static 
org.apache.ambari.server.agent.ExecutionCommand.KeyNames.HOOKS_FOLDER;
 import static 
org.apache.ambari.server.agent.ExecutionCommand.KeyNames.SERVICE_PACKAGE_FOLDER;
+import static org.apache.ambari.server.agent.ExecutionCommand.KeyNames.VERSION;
 
 import java.util.HashMap;
 import java.util.Map;
@@ -30,7 +31,6 @@ import org.apache.ambari.server.RoleCommand;
 import org.apache.ambari.server.ServiceNotFoundException;
 import org.apache.ambari.server.agent.AgentCommand.AgentCommandType;
 import org.apache.ambari.server.agent.ExecutionCommand;
-import org.apache.ambari.server.agent.ExecutionCommand.KeyNames;
 import org.apache.ambari.server.api.services.AmbariMetaInfo;
 import org.apache.ambari.server.orm.dao.HostRoleCommandDAO;
 import org.apache.ambari.server.orm.entities.RepositoryVersionEntity;
@@ -206,89 +206,93 @@ public class ExecutionCommandWrapper {
 }
   }
 
-  // set the repository version for the component this command is for -
-  // always use the current desired version
-  try {
-RepositoryVersionEntity repositoryVersion = null;
-String serviceName = executionCommand.getServiceName();
-if (!StringUtils.isEmpty(serviceName)) {
-  Service service = cluster.getService(serviceName);
-  if (null != service) {
-repositoryVersion = service.getDesiredRepositoryVersion();
-  }
+  setVersions(cluster);
+
+  // provide some basic information about a cluster upgrade if there is one
+  // in progress
+  UpgradeEntity upgrade = cluster.getUpgradeInProgress();
+  if (null != upgrade) {
+UpgradeContext upgradeContext = upgradeContextFactory.create(cluster, 
upgrade);
+UpgradeSummary upgradeSummary = upgradeContext.getUpgradeSummary();
+executionCommand.setUpgradeSummary(upgradeSummary);
+  }
+
+} catch (ClusterNotFoundException cnfe) {
+  // it's possible that there are commands without clusters; in such cases,
+  // just return the de-serialized command and don't try to read configs
+  LOG.warn(
+  "Unable to lookup the cluster by ID; assuming that there is no 
cluster and therefore no configs for this execution command: {}",
+  cnfe.getMessage());
+
+  return executionCommand;
+} catch (AmbariException e) {
+  throw new RuntimeException(e);
+}
+
+return executionCommand;
+  }
+
+  public void setVersions(Cluster cluster) {
+// set the repository version for the component this command is for -
+// always use the current desired version
+String serviceName = executionCommand.getServiceName();
+try {
+  RepositoryVersionEntity repositoryVersion = null;
+  if (!StringUtils.isEmpty(serviceName)) {
+Service service = cluster.getService(serviceName);
+if (null != service) {
+  repositoryVersion = service.getDesiredRepositoryVersion();
 
   String componentName = executionCommand.getComponentName();
   if (!StringUtils.isEmpty(componentName)) {
-ServiceComponent serviceComponent = service.getServiceComponent(
-executionCommand.getComponentName());
-
+ServiceComponent 

[12/50] [abbrv] ambari git commit: AMBARI-22011. Could not copy tez tarball to HDFS during prepare upgrade (EU) (ncole)

[jluniya]

AMBARI-22011. Could not copy tez tarball to HDFS during prepare upgrade (EU) 
(ncole)


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

Branch: refs/heads/branch-feature-AMBARI-14714
Commit: 001c77f5773e3ca778ee6ff78ba8c616f0e3007c
Parents: 3e5f60a
Author: Nate Cole 
Authored: Thu Sep 21 08:45:08 2017 -0400
Committer: Nate Cole 
Committed: Thu Sep 21 09:56:46 2017 -0400

--
 .../libraries/functions/copy_tarball.py | 103 ++-
 .../libraries/functions/copy_tarball.py.rej |  78 ++
 .../OOZIE/4.0.0.2.0/package/scripts/oozie.py|   2 +-
 3 files changed, 157 insertions(+), 26 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/001c77f5/ambari-common/src/main/python/resource_management/libraries/functions/copy_tarball.py
--
diff --git 
a/ambari-common/src/main/python/resource_management/libraries/functions/copy_tarball.py
 
b/ambari-common/src/main/python/resource_management/libraries/functions/copy_tarball.py
index 61b03ca..219430a 100644
--- 
a/ambari-common/src/main/python/resource_management/libraries/functions/copy_tarball.py
+++ 
b/ambari-common/src/main/python/resource_management/libraries/functions/copy_tarball.py
@@ -41,26 +41,65 @@ STACK_VERSION_PATTERN = "{{ stack_version }}"
 # especially since it is an attribute of a stack and becomes
 # complicated to change during a Rolling/Express upgrade.
 TARBALL_MAP = {
-  "slider": ("{0}/{1}/slider/lib/slider.tar.gz".format(STACK_ROOT_PATTERN, 
STACK_VERSION_PATTERN),
- "/{0}/apps/{1}/slider/slider.tar.gz".format(STACK_NAME_PATTERN, 
STACK_VERSION_PATTERN)),
-  "tez": ("{0}/{1}/tez/lib/tez.tar.gz".format(STACK_ROOT_PATTERN, 
STACK_VERSION_PATTERN),
-  "/{0}/apps/{1}/tez/tez.tar.gz".format(STACK_NAME_PATTERN, 
STACK_VERSION_PATTERN)),
-  "tez_hive2": ("{0}/{1}/tez_hive2/lib/tez.tar.gz".format(STACK_ROOT_PATTERN, 
STACK_VERSION_PATTERN),
-  "/{0}/apps/{1}/tez_hive2/tez.tar.gz".format(STACK_NAME_PATTERN, 
STACK_VERSION_PATTERN)),
-  "hive": ("{0}/{1}/hive/hive.tar.gz".format(STACK_ROOT_PATTERN, 
STACK_VERSION_PATTERN),
-   "/{0}/apps/{1}/hive/hive.tar.gz".format(STACK_NAME_PATTERN, 
STACK_VERSION_PATTERN)),
-  "pig": ("{0}/{1}/pig/pig.tar.gz".format(STACK_ROOT_PATTERN, 
STACK_VERSION_PATTERN),
-  "/{0}/apps/{1}/pig/pig.tar.gz".format(STACK_NAME_PATTERN, 
STACK_VERSION_PATTERN)),
-  "hadoop_streaming": 
("{0}/{1}/hadoop-mapreduce/hadoop-streaming.jar".format(STACK_ROOT_PATTERN, 
STACK_VERSION_PATTERN),
-   
"/{0}/apps/{1}/mapreduce/hadoop-streaming.jar".format(STACK_NAME_PATTERN, 
STACK_VERSION_PATTERN)),
-  "sqoop": ("{0}/{1}/sqoop/sqoop.tar.gz".format(STACK_ROOT_PATTERN, 
STACK_VERSION_PATTERN),
-"/{0}/apps/{1}/sqoop/sqoop.tar.gz".format(STACK_NAME_PATTERN, 
STACK_VERSION_PATTERN)),
-  "mapreduce": ("{0}/{1}/hadoop/mapreduce.tar.gz".format(STACK_ROOT_PATTERN, 
STACK_VERSION_PATTERN),
+  "slider": {
+"dirs": ("{0}/{1}/slider/lib/slider.tar.gz".format(STACK_ROOT_PATTERN, 
STACK_VERSION_PATTERN),
+  "/{0}/apps/{1}/slider/slider.tar.gz".format(STACK_NAME_PATTERN, 
STACK_VERSION_PATTERN)),
+"service": "SLIDER"
+  },
+
+  "tez": {
+"dirs": ("{0}/{1}/tez/lib/tez.tar.gz".format(STACK_ROOT_PATTERN, 
STACK_VERSION_PATTERN),
+   "/{0}/apps/{1}/tez/tez.tar.gz".format(STACK_NAME_PATTERN, 
STACK_VERSION_PATTERN)),
+"service": "TEZ"
+  },
+
+  "tez_hive2": {
+"dirs": ("{0}/{1}/tez_hive2/lib/tez.tar.gz".format(STACK_ROOT_PATTERN, 
STACK_VERSION_PATTERN),
+   "/{0}/apps/{1}/tez_hive2/tez.tar.gz".format(STACK_NAME_PATTERN, 
STACK_VERSION_PATTERN)),
+"service": "HIVE"
+  },
+
+  "hive": {
+"dirs": ("{0}/{1}/hive/hive.tar.gz".format(STACK_ROOT_PATTERN, 
STACK_VERSION_PATTERN),
+"/{0}/apps/{1}/hive/hive.tar.gz".format(STACK_NAME_PATTERN, 
STACK_VERSION_PATTERN)),
+"service": "HIVE"
+  },
+
+  "pig": {
+"dirs": ("{0}/{1}/pig/pig.tar.gz".format(STACK_ROOT_PATTERN, 
STACK_VERSION_PATTERN),
+   "/{0}/apps/{1}/pig/pig.tar.gz".format(STACK_NAME_PATTERN, 
STACK_VERSION_PATTERN)),
+"service": "PIG"
+  },
+
+  "hadoop_streaming": {
+"dirs": 
("{0}/{1}/hadoop-mapreduce/hadoop-streaming.jar".format(STACK_ROOT_PATTERN, 
STACK_VERSION_PATTERN),
+
"/{0}/apps/{1}/mapreduce/hadoop-streaming.jar".format(STACK_NAME_PATTERN, 
STACK_VERSION_PATTERN)),
+"service": "MAPREDUCE2"
+  },
+
+  "sqoop": {
+"dirs": ("{0}/{1}/sqoop/sqoop.tar.gz".format(STACK_ROOT_PATTERN, 
STACK_VERSION_PATTERN),
+   

[41/50] [abbrv] ambari git commit: AMBARI-22029. Download Client Configs fails. (mpapirkovskyy)

[jluniya]

AMBARI-22029. Download Client Configs fails. (mpapirkovskyy)


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

Branch: refs/heads/branch-feature-AMBARI-14714
Commit: 4b59ba8203abf46d2c5bfa766bbf968ab964cff4
Parents: 0393451
Author: Myroslav Papirkovskyi 
Authored: Mon Sep 25 19:09:44 2017 +0300
Committer: Myroslav Papirkovskyi 
Committed: Mon Sep 25 19:10:33 2017 +0300

--
 .../server/controller/internal/ClientConfigResourceProvider.java   | 2 ++
 .../OOZIE/4.0.0.2.0/package/scripts/params_linux.py| 2 ++
 2 files changed, 4 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/4b59ba82/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ClientConfigResourceProvider.java
--
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ClientConfigResourceProvider.java
 
b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ClientConfigResourceProvider.java
index 166fc5f..9f4a4a0 100644
--- 
a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ClientConfigResourceProvider.java
+++ 
b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ClientConfigResourceProvider.java
@@ -445,6 +445,8 @@ public class ClientConfigResourceProvider extends 
AbstractControllerResourceProv
 jsonContent.put("hostname", hostName);
 jsonContent.put("public_hostname", publicHostName);
 jsonContent.put("clusterName", cluster.getClusterName());
+jsonContent.put("serviceName", serviceName);
+jsonContent.put("role", componentName);
 jsonConfigurations = gson.toJson(jsonContent);
 
 File tmpDirectory = new File(TMP_PATH);

http://git-wip-us.apache.org/repos/asf/ambari/blob/4b59ba82/ambari-server/src/main/resources/common-services/OOZIE/4.0.0.2.0/package/scripts/params_linux.py
--
diff --git 
a/ambari-server/src/main/resources/common-services/OOZIE/4.0.0.2.0/package/scripts/params_linux.py
 
b/ambari-server/src/main/resources/common-services/OOZIE/4.0.0.2.0/package/scripts/params_linux.py
index e856c01..b66e157 100644
--- 
a/ambari-server/src/main/resources/common-services/OOZIE/4.0.0.2.0/package/scripts/params_linux.py
+++ 
b/ambari-server/src/main/resources/common-services/OOZIE/4.0.0.2.0/package/scripts/params_linux.py
@@ -57,6 +57,8 @@ architecture = get_architecture()
 
 # Needed since this writes out the Atlas Hive Hook config file.
 cluster_name = config['clusterName']
+serviceName = config['serviceName']
+role = config['role']
 
 hostname = config["hostname"]
 

[36/50] [abbrv] ambari git commit: AMBARI-22042 Final Properties filter does not work for Config Groups. (atkach)

[jluniya]

AMBARI-22042 Final Properties filter does not work for Config Groups. (atkach)


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

Branch: refs/heads/branch-feature-AMBARI-14714
Commit: eb5bcef3d4382ae059e572c45c799969c6cb7dde
Parents: 06d21bb
Author: Andrii Tkach 
Authored: Mon Sep 25 13:50:49 2017 +0300
Committer: Andrii Tkach 
Committed: Mon Sep 25 13:57:17 2017 +0300

--
 ambari-web/app/views/common/configs/service_config_view.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/eb5bcef3/ambari-web/app/views/common/configs/service_config_view.js
--
diff --git a/ambari-web/app/views/common/configs/service_config_view.js 
b/ambari-web/app/views/common/configs/service_config_view.js
index a53f6cd..fe45c79 100644
--- a/ambari-web/app/views/common/configs/service_config_view.js
+++ b/ambari-web/app/views/common/configs/service_config_view.js
@@ -272,7 +272,8 @@ App.ServiceConfigView = Em.View.extend({
 var passesFilters = true;
 
 selectedFilters.forEach(function (filter) {
-  if (config.get(filter.attributeName) !== filter.attributeValue) {
+  if (config.get(filter.attributeName) !== filter.attributeValue &&
+!(config.get('overrides') && 
config.get('overrides').someProperty(filter.attributeName, 
filter.attributeValue))) {
 passesFilters = false;
   }
 });

[37/50] [abbrv] ambari git commit: AMBARI-22007 - Addition of service component after patching a service still keeps the component at base version (part2) (jonathanhurley)

[jluniya]

AMBARI-22007 - Addition of service component after patching a service still 
keeps the component at base version (part2) (jonathanhurley)


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

Branch: refs/heads/branch-feature-AMBARI-14714
Commit: 311c7bbd8ee94b8964a7f1769b41efc40ecdcdc6
Parents: eb5bcef
Author: Jonathan Hurley 
Authored: Mon Sep 25 08:45:58 2017 -0400
Committer: Jonathan Hurley 
Committed: Mon Sep 25 08:51:38 2017 -0400

--
 .../libraries/functions/version_select_util.py  |  7 ++--
 .../libraries/script/script.py  | 36 
 .../src/test/python/TestVersionSelectUtil.py|  4 +--
 3 files changed, 35 insertions(+), 12 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/311c7bbd/ambari-common/src/main/python/resource_management/libraries/functions/version_select_util.py
--
diff --git 
a/ambari-common/src/main/python/resource_management/libraries/functions/version_select_util.py
 
b/ambari-common/src/main/python/resource_management/libraries/functions/version_select_util.py
index 9fbb42b..73b5dc1 100644
--- 
a/ambari-common/src/main/python/resource_management/libraries/functions/version_select_util.py
+++ 
b/ambari-common/src/main/python/resource_management/libraries/functions/version_select_util.py
@@ -28,10 +28,11 @@ from resource_management.core import shell
 from resource_management.libraries.functions import stack_tools
 
 
-def get_component_version(stack_name, component_name):
+def get_component_version_from_symlink(stack_name, component_name):
   """
-  For any stack name, returns the version currently installed for a given 
component.
-  Because each stack name may have different logic, the input is a generic 
dictionary.
+  Gets the version of the specified component by invoking the stack-select 
tool to query for the
+  version which is referenced by the symlink.
+
   :param stack_name: one of HDP, HDPWIN, BIGTOP, PHD, etc. usually retrieved 
from
   the command-#.json file's ["hostLevelParams"]["stack_name"]
   :param component_name: Component name as a string necessary to get the 
version

http://git-wip-us.apache.org/repos/asf/ambari/blob/311c7bbd/ambari-common/src/main/python/resource_management/libraries/script/script.py
--
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 303b640..e612638 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
@@ -47,7 +47,7 @@ from resource_management.core.environment import Environment
 from resource_management.core.logger import Logger
 from resource_management.core.exceptions import Fail, 
ClientComponentHasNoStatus, ComponentIsNotRunning
 from resource_management.core.resources.packaging import Package
-from resource_management.libraries.functions.version_select_util import 
get_component_version
+from resource_management.libraries.functions.version_select_util import 
get_component_version_from_symlink
 from resource_management.libraries.functions.version import compare_versions
 from resource_management.libraries.functions.version import 
format_stack_version
 from resource_management.libraries.functions import stack_tools
@@ -207,18 +207,40 @@ class Script(object):
   return os.path.realpath(config_path)
 return None
 
-  def save_component_version_to_structured_out(self):
+  def save_component_version_to_structured_out(self, command_name):
 """
-:param stack_name: One of HDP, HDPWIN, PHD, BIGTOP.
-:return: Append the version number to the structured out.
+Saves the version of the component for this command to the structured out 
file. If the
+command is an install command and the repository is trusted, then it will 
use the version of
+the repository. Otherwise, it will consult the stack-select tool to read 
the symlink version.
+:param command_name: command name
+:return: None
 """
+from resource_management.libraries.functions.default import default
 from resource_management.libraries.functions import stack_select
 
+repository_resolved = default("repositoryFile/resolved", False)
+repository_version = default("repositoryFile/repoVersion", None)
+is_install_command = command_name is not None and command_name.lower() == 
"install"
+
+# start out with no 

[23/50] [abbrv] ambari git commit: AMBARI-22021.Livy not working with the default configuration(Prabhjyot Singh via Venkata Sairam)

[jluniya]

AMBARI-22021.Livy not working with the default configuration(Prabhjyot Singh 
via Venkata Sairam)


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

Branch: refs/heads/branch-feature-AMBARI-14714
Commit: d221ab786277abf6d8e9e8dbc9442e37423484a4
Parents: 5d5f974
Author: Venkata Sairam 
Authored: Fri Sep 22 12:46:55 2017 +0530
Committer: Venkata Sairam 
Committed: Fri Sep 22 12:46:55 2017 +0530

--
 .../0.7.0/package/scripts/interpreter_json_template.py| 7 ++-
 .../ZEPPELIN/0.7.0/package/scripts/livy2_config_template.py   | 7 ++-
 2 files changed, 12 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/d221ab78/ambari-server/src/main/resources/common-services/ZEPPELIN/0.7.0/package/scripts/interpreter_json_template.py
--
diff --git 
a/ambari-server/src/main/resources/common-services/ZEPPELIN/0.7.0/package/scripts/interpreter_json_template.py
 
b/ambari-server/src/main/resources/common-services/ZEPPELIN/0.7.0/package/scripts/interpreter_json_template.py
index 6a98919..d5a70a7 100644
--- 
a/ambari-server/src/main/resources/common-services/ZEPPELIN/0.7.0/package/scripts/interpreter_json_template.py
+++ 
b/ambari-server/src/main/resources/common-services/ZEPPELIN/0.7.0/package/scripts/interpreter_json_template.py
@@ -182,7 +182,7 @@ template = '''
 "zeppelin.livy.concurrentSQL": "false",
 "zeppelin.livy.spark.sql.field.truncate": "true",
 "livy.spark.executor.cores": "",
-"zeppelin.livy.displayAppInfo": "false",
+"zeppelin.livy.displayAppInfo": "true",
 "zeppelin.livy.url": "http://localhost:8998;,
 "livy.spark.dynamicAllocation.minExecutors": "",
 "livy.spark.driver.cores": "",
@@ -240,6 +240,11 @@ template = '''
 "language": "r",
 "editOnDblClick": false
   }
+},
+{
+  "name": "shared",
+  "class": "org.apache.zeppelin.livy.LivySharedInterpreter",
+  "defaultInterpreter": false
 }
   ],
   "dependencies": [],

http://git-wip-us.apache.org/repos/asf/ambari/blob/d221ab78/ambari-server/src/main/resources/common-services/ZEPPELIN/0.7.0/package/scripts/livy2_config_template.py
--
diff --git 
a/ambari-server/src/main/resources/common-services/ZEPPELIN/0.7.0/package/scripts/livy2_config_template.py
 
b/ambari-server/src/main/resources/common-services/ZEPPELIN/0.7.0/package/scripts/livy2_config_template.py
index 71d3817..c9030bd 100644
--- 
a/ambari-server/src/main/resources/common-services/ZEPPELIN/0.7.0/package/scripts/livy2_config_template.py
+++ 
b/ambari-server/src/main/resources/common-services/ZEPPELIN/0.7.0/package/scripts/livy2_config_template.py
@@ -34,7 +34,7 @@ template = '''
 "livy.spark.dynamicAllocation.initialExecutors": "",
 "zeppelin.livy.session.create_timeout": "120",
 "livy.spark.driver.memory": "",
-"zeppelin.livy.displayAppInfo": "false",
+"zeppelin.livy.displayAppInfo": "true",
 "livy.spark.jars.packages": "",
 "livy.spark.dynamicAllocation.maxExecutors": "",
 "zeppelin.livy.concurrentSQL": "false",
@@ -90,6 +90,11 @@ template = '''
   },
   "name": "sparkr",
   "defaultInterpreter": false
+},
+{
+  "name": "shared",
+  "class": "org.apache.zeppelin.livy.LivySharedInterpreter",
+  "defaultInterpreter": false
 }
   ],
   "dependencies": [],

[04/50] [abbrv] ambari git commit: AMBARI-21970. Enable sticky bit for curl_krb_cache (echekanskiy)

[jluniya]

AMBARI-21970. Enable sticky bit for curl_krb_cache (echekanskiy)


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

Branch: refs/heads/branch-feature-AMBARI-14714
Commit: 8b9370a55207ecb6baccfd02337afe7c75532f7b
Parents: 260c75f
Author: Eugene Chekanskiy 
Authored: Wed Sep 20 16:28:11 2017 +0300
Committer: Eugene Chekanskiy 
Committed: Wed Sep 20 16:28:11 2017 +0300

--
 .../resource_management/libraries/functions/curl_krb_request.py| 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/8b9370a5/ambari-common/src/main/python/resource_management/libraries/functions/curl_krb_request.py
--
diff --git 
a/ambari-common/src/main/python/resource_management/libraries/functions/curl_krb_request.py
 
b/ambari-common/src/main/python/resource_management/libraries/functions/curl_krb_request.py
index 72bc5c6..95e8625 100644
--- 
a/ambari-common/src/main/python/resource_management/libraries/functions/curl_krb_request.py
+++ 
b/ambari-common/src/main/python/resource_management/libraries/functions/curl_krb_request.py
@@ -111,7 +111,7 @@ def curl_krb_request(tmp_dir, keytab, principal, url, 
cache_file_prefix,
   curl_krb_cache_path = os.path.join(tmp_dir, "curl_krb_cache")
   if not os.path.exists(curl_krb_cache_path):
 os.makedirs(curl_krb_cache_path)
-  os.chmod(curl_krb_cache_path, 0777)
+  os.chmod(curl_krb_cache_path, 01777)
 
   ccache_file_path = "{0}{1}{2}_{3}_cc_{4}".format(curl_krb_cache_path, 
os.sep, cache_file_prefix, user, ccache_file_name)
   kerberos_env = {'KRB5CCNAME': ccache_file_path}

[26/50] [abbrv] ambari git commit: AMBARI-22040. configs.py does not work properly when dealing with files (aonishuk)

[jluniya]

AMBARI-22040. configs.py does not work properly when dealing with files 
(aonishuk)


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

Branch: refs/heads/branch-feature-AMBARI-14714
Commit: 9e93c476ddd8d4397f550062fd1645ac5422ed2e
Parents: e4cadbb
Author: Andrew Onishuk 
Authored: Fri Sep 22 14:06:17 2017 +0300
Committer: Andrew Onishuk 
Committed: Fri Sep 22 14:06:17 2017 +0300

--
 .../src/main/resources/scripts/configs.py   | 219 +++
 .../src/main/resources/scripts/configs.sh   | 272 +--
 2 files changed, 168 insertions(+), 323 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/9e93c476/ambari-server/src/main/resources/scripts/configs.py
--
diff --git a/ambari-server/src/main/resources/scripts/configs.py 
b/ambari-server/src/main/resources/scripts/configs.py
index b524461..8d4de1c 100644
--- a/ambari-server/src/main/resources/scripts/configs.py
+++ b/ambari-server/src/main/resources/scripts/configs.py
@@ -18,11 +18,19 @@ See the License for the specific language governing 
permissions and
 limitations under the License.
 '''
 
+import optparse
+from optparse import OptionGroup
 import sys
 import urllib2
 import time
 import json
 import base64
+import xml
+import xml.etree.ElementTree as ET
+import os
+import logging
+
+logger = logging.getLogger('AmbariConfig')
 
 HTTP_PROTOCOL = 'http'
 HTTPS_PROTOCOL = 'https'
@@ -106,14 +114,14 @@ def create_new_desired_config(cluster, config_type, 
properties, attributes, acce
 new_config[CLUSTERS][DESIRED_CONFIGS][ATTRIBUTES] = attributes
   request_body = json.dumps(new_config)
   new_file = 'doSet_{0}.json'.format(new_tag)
-  print '### PUTting json into: {0}'.format(new_file)
+  logger.info('### PUTting json into: {0}'.format(new_file))
   output_to_file(new_file)(new_config)
   accessor(CLUSTERS_URL.format(cluster), PUT_REQUEST_TYPE, request_body)
-  print '### NEW Site:{0}, Tag:{1}'.format(config_type, new_tag)
+  logger.info('### NEW Site:{0}, Tag:{1}'.format(config_type, new_tag))
 
 def get_current_config(cluster, config_type, accessor):
   config_tag = get_config_tag(cluster, config_type, accessor)
-  print "### on (Site:{0}, Tag:{1})".format(config_type, config_tag)
+  logger.info("### on (Site:{0}, Tag:{1})".format(config_type, config_tag))
   response = accessor(CONFIGURATION_URL.format(cluster, config_type, 
config_tag))
   config_by_tag = json.loads(response)
   current_config = config_by_tag[ITEMS][0]
@@ -130,6 +138,41 @@ def update_specific_property(config_name, config_value):
 return properties, attributes
   return update
 
+def update_from_xml(config_file):
+  def update(cluster, config_type, accessor):
+return read_xml_data_to_map(config_file)
+  return update
+
+# Used DOM parser to read data into a map
+def read_xml_data_to_map(path):
+  configurations = {}
+  properties_attributes = {}
+  tree = ET.parse(path)
+  root = tree.getroot()
+  for properties in root.getiterator('property'):
+name = properties.find('name')
+value = properties.find('value')
+final = properties.find('final')
+
+if name != None:
+  name_text = name.text if name.text else ""
+else:
+  logger.warn("No name is found for one of the properties in {0}, ignoring 
it".format(path))
+  continue
+
+if value != None:
+  value_text = value.text if value.text else ""
+else:
+  logger.warn("No value is found for \"{0}\" in {1}, using empty string 
for it".format(name_text, path))
+  value_text = ""
+
+if final != None:
+  final_text = final.text if final.text else ""
+  properties_attributes[name_text] = final_text
+
+configurations[name_text] = value_text
+  return configurations, {"final" : properties_attributes}
+
 def update_from_file(config_file):
   def update(cluster, config_type, accessor):
 try:
@@ -138,12 +181,12 @@ def update_from_file(config_file):
 except Exception as e:
   raise Exception('Cannot find file "{0}" to PUT'.format(config_file))
 try:
-  file_properties = json.loads('{' + file_content + '}')
+  file_properties = json.loads(file_content)
 except Exception as e:
   raise Exception('File "{0}" should be in the following JSON format 
("properties_attributes" is optional):\n{1}'.format(config_file, FILE_FORMAT))
 new_properties = file_properties.get(PROPERTIES, {})
 new_attributes = file_properties.get(ATTRIBUTES, {})
-print '### PUTting file: "{0}"'.format(config_file)
+logger.info('### PUTting file: 

[15/50] [abbrv] ambari git commit: AMBARI-21919. Kerberos identity references should use the "reference" attribute (rlevas)

[jluniya]

http://git-wip-us.apache.org/repos/asf/ambari/blob/2a060210/ambari-server/src/test/java/org/apache/ambari/server/upgrade/UpgradeCatalog260Test.java
--
diff --git 
a/ambari-server/src/test/java/org/apache/ambari/server/upgrade/UpgradeCatalog260Test.java
 
b/ambari-server/src/test/java/org/apache/ambari/server/upgrade/UpgradeCatalog260Test.java
index c03b400..d0d5dac 100644
--- 
a/ambari-server/src/test/java/org/apache/ambari/server/upgrade/UpgradeCatalog260Test.java
+++ 
b/ambari-server/src/test/java/org/apache/ambari/server/upgrade/UpgradeCatalog260Test.java
@@ -55,8 +55,8 @@ import org.apache.ambari.server.api.services.AmbariMetaInfo;
 import org.apache.ambari.server.configuration.Configuration;
 import org.apache.ambari.server.controller.AmbariManagementController;
 import org.apache.ambari.server.controller.AmbariManagementControllerImpl;
-import org.apache.ambari.server.controller.KerberosHelper;
 import org.apache.ambari.server.controller.MaintenanceStateHelper;
+import org.apache.ambari.server.controller.ServiceConfigVersionResponse;
 import org.apache.ambari.server.orm.DBAccessor;
 import org.apache.ambari.server.orm.DBAccessor.DBColumnInfo;
 import org.apache.ambari.server.orm.dao.ArtifactDAO;
@@ -74,6 +74,7 @@ import org.apache.ambari.server.state.StackInfo;
 import org.apache.ambari.server.state.kerberos.KerberosComponentDescriptor;
 import org.apache.ambari.server.state.kerberos.KerberosDescriptor;
 import org.apache.ambari.server.state.kerberos.KerberosDescriptorFactory;
+import org.apache.ambari.server.state.kerberos.KerberosIdentityDescriptor;
 import org.apache.ambari.server.state.kerberos.KerberosServiceDescriptor;
 import org.apache.ambari.server.state.stack.OsFamily;
 import org.apache.commons.io.FileUtils;
@@ -131,41 +132,16 @@ public class UpgradeCatalog260Test {
   @Mock(type = MockType.NICE)
   private OsFamily osFamily;
 
-  @Mock(type = MockType.NICE)
-  private KerberosHelper kerberosHelper;
-
-  @Mock(type = MockType.NICE)
-  private ActionManager actionManager;
-
-  @Mock(type = MockType.NICE)
-  private Config config;
-
-  @Mock(type = MockType.STRICT)
-  private Service service;
-
-  @Mock(type = MockType.NICE)
-  private Clusters clusters;
-
-  @Mock(type = MockType.NICE)
-  private Cluster cluster;
-
-  @Mock(type = MockType.NICE)
-  private Injector injector;
-
   @Rule
   public TemporaryFolder temporaryFolder = new TemporaryFolder();
 
   @Before
   public void init() {
-reset(entityManagerProvider, injector);
+reset(entityManagerProvider);
 
 expect(entityManagerProvider.get()).andReturn(entityManager).anyTimes();
 
-expect(injector.getInstance(Gson.class)).andReturn(null).anyTimes();
-
expect(injector.getInstance(MaintenanceStateHelper.class)).andReturn(null).anyTimes();
-
expect(injector.getInstance(KerberosHelper.class)).andReturn(kerberosHelper).anyTimes();
-
-replay(entityManagerProvider, injector);
+replay(entityManagerProvider);
   }
 
   @After
@@ -227,17 +203,7 @@ public class UpgradeCatalog260Test {
 
 replay(dbAccessor, configuration, connection, statement, resultSet);
 
-Module module = new Module() {
-  @Override
-  public void configure(Binder binder) {
-binder.bind(DBAccessor.class).toInstance(dbAccessor);
-binder.bind(OsFamily.class).toInstance(osFamily);
-binder.bind(EntityManager.class).toInstance(entityManager);
-binder.bind(Configuration.class).toInstance(configuration);
-  }
-};
-
-Injector injector = Guice.createInjector(module);
+Injector injector = getInjector();
 UpgradeCatalog260 upgradeCatalog260 = 
injector.getInstance(UpgradeCatalog260.class);
 upgradeCatalog260.executeDDLUpdates();
 
@@ -261,7 +227,7 @@ public class UpgradeCatalog260Test {
 expectLastCall().once();
   }
 
-  public  void expectRenameServiceDeletedColumn(Capture 
unmapped) throws SQLException {
+  public void expectRenameServiceDeletedColumn(Capture unmapped) 
throws SQLException {
 dbAccessor.renameColumn(eq(UpgradeCatalog260.CLUSTER_CONFIG_TABLE), 
eq(UpgradeCatalog260.SERVICE_DELETED_COLUMN), capture(unmapped));
 expectLastCall().once();
   }
@@ -355,7 +321,7 @@ public class UpgradeCatalog260Test {
   }
 
   public void expectUpdateUpgradeTable(Capture rvid,
-  Capture orchestration, Capture revertAllowed)
+   Capture orchestration, 
Capture revertAllowed)
   throws SQLException {
 
 dbAccessor.clearTable(eq(UpgradeCatalog260.UPGRADE_TABLE));
@@ -557,17 +523,7 @@ public class UpgradeCatalog260Test {
 expectLastCall().once();
 replay(dbAccessor, configuration, connection, statement, resultSet);
 
-Module module = new Module() {
-  @Override
-  public void configure(Binder binder) {
-binder.bind(DBAccessor.class).toInstance(dbAccessor);
-binder.bind(OsFamily.class).toInstance(osFamily);
-

[29/50] [abbrv] ambari git commit: AMBARI-22038 Log Search UI: implement application of selected text to service logs filters. (ababiichuk)

[jluniya]

AMBARI-22038 Log Search UI: implement application of selected text to service 
logs filters. (ababiichuk)


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

Branch: refs/heads/branch-feature-AMBARI-14714
Commit: f067ec8c3aaeb596760db4c2bcb98ce81f75769a
Parents: eead09b
Author: ababiichuk 
Authored: Fri Sep 22 13:19:37 2017 +0300
Committer: ababiichuk 
Committed: Fri Sep 22 15:20:02 2017 +0300

--
 .../ambari-logsearch-web/src/app/app.module.ts  |  2 +-
 .../src/app/classes/list-item.class.ts  | 25 
 .../dropdown-button.component.ts|  5 +-
 .../dropdown-list/dropdown-list.component.html  |  5 +-
 .../dropdown-list/dropdown-list.component.ts|  7 ++-
 .../filter-button/filter-button.component.ts|  3 +-
 .../filters-panel/filters-panel.component.html  |  3 +-
 .../filters-panel/filters-panel.component.ts| 10 +++-
 .../logs-list/logs-list.component.html  |  7 ++-
 .../logs-list/logs-list.component.less  |  4 ++
 .../components/logs-list/logs-list.component.ts | 61 +++-
 .../menu-button/menu-button.component.spec.ts   | 19 +-
 .../menu-button/menu-button.component.ts|  5 +-
 .../search-box/search-box.component.ts  | 35 ---
 .../src/app/services/filtering.service.ts   |  5 +-
 .../src/assets/i18n/en.json |  4 +-
 .../ambari-logsearch-web/src/polyfills.ts   |  2 +-
 17 files changed, 173 insertions(+), 29 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/f067ec8c/ambari-logsearch/ambari-logsearch-web/src/app/app.module.ts
--
diff --git a/ambari-logsearch/ambari-logsearch-web/src/app/app.module.ts 
b/ambari-logsearch/ambari-logsearch-web/src/app/app.module.ts
index acf1b9f..fca68b5 100644
--- a/ambari-logsearch/ambari-logsearch-web/src/app/app.module.ts
+++ b/ambari-logsearch/ambari-logsearch-web/src/app/app.module.ts
@@ -84,7 +84,7 @@ export function HttpLoaderFactory(http: Http) {
   return new TranslateHttpLoader(http, 'resources/assets/i18n/', 
'.json?static=true');
 }
 
-export function getXHRBackend(injector: Injector, browser: BrowserXhr, xsrf: 
XSRFStrategy, options: ResponseOptions): any {
+export function getXHRBackend(injector: Injector, browser: BrowserXhr, xsrf: 
XSRFStrategy, options: ResponseOptions): XHRBackend | InMemoryBackendService {
   if (environment.production) {
 return new XHRBackend(browser, options, xsrf);
   } else {

http://git-wip-us.apache.org/repos/asf/ambari/blob/f067ec8c/ambari-logsearch/ambari-logsearch-web/src/app/classes/list-item.class.ts
--
diff --git 
a/ambari-logsearch/ambari-logsearch-web/src/app/classes/list-item.class.ts 
b/ambari-logsearch/ambari-logsearch-web/src/app/classes/list-item.class.ts
new file mode 100644
index 000..adb023b
--- /dev/null
+++ b/ambari-logsearch/ambari-logsearch-web/src/app/classes/list-item.class.ts
@@ -0,0 +1,25 @@
+/**
+ * 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.
+ */
+
+export interface ListItem {
+  id?: string;
+  label?: string;
+  value: any;
+  iconClass?: string;
+  isChecked?: boolean;
+}

http://git-wip-us.apache.org/repos/asf/ambari/blob/f067ec8c/ambari-logsearch/ambari-logsearch-web/src/app/components/dropdown-button/dropdown-button.component.ts
--
diff --git 
a/ambari-logsearch/ambari-logsearch-web/src/app/components/dropdown-button/dropdown-button.component.ts
 
b/ambari-logsearch/ambari-logsearch-web/src/app/components/dropdown-button/dropdown-button.component.ts
index 42b9451..43d79f8 100644
--- 
a/ambari-logsearch/ambari-logsearch-web/src/app/components/dropdown-button/dropdown-button.component.ts
+++ 

[14/50] [abbrv] ambari git commit: AMBARI-22024. Stack and versions view style issues (alexantonenko)

[jluniya]

AMBARI-22024. Stack and versions view style issues (alexantonenko)


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

Branch: refs/heads/branch-feature-AMBARI-14714
Commit: 2e170e4801794ddbbcd331585782a5f5b7e897a1
Parents: 37b8470
Author: Alex Antonenko 
Authored: Thu Sep 21 18:42:05 2017 +0300
Committer: Alex Antonenko 
Committed: Thu Sep 21 18:42:05 2017 +0300

--
 ambari-web/app/styles/stack_versions.less   |  1 +
 .../admin/stack_upgrade/upgrade_version_box_view.js |  4 ++--
 .../stack_upgrade/upgrade_version_box_view_test.js  | 12 ++--
 3 files changed, 9 insertions(+), 8 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/2e170e48/ambari-web/app/styles/stack_versions.less
--
diff --git a/ambari-web/app/styles/stack_versions.less 
b/ambari-web/app/styles/stack_versions.less
index 9d05d9b..2e4faff 100644
--- a/ambari-web/app/styles/stack_versions.less
+++ b/ambari-web/app/styles/stack_versions.less
@@ -211,6 +211,7 @@
   }
   .dropdown-menu {
 cursor: pointer;
+text-align: left;
   }
 }
 .installing {

http://git-wip-us.apache.org/repos/asf/ambari/blob/2e170e48/ambari-web/app/views/main/admin/stack_upgrade/upgrade_version_box_view.js
--
diff --git 
a/ambari-web/app/views/main/admin/stack_upgrade/upgrade_version_box_view.js 
b/ambari-web/app/views/main/admin/stack_upgrade/upgrade_version_box_view.js
index 6cf84fa..b37a094 100644
--- a/ambari-web/app/views/main/admin/stack_upgrade/upgrade_version_box_view.js
+++ b/ambari-web/app/views/main/admin/stack_upgrade/upgrade_version_box_view.js
@@ -299,7 +299,7 @@ App.UpgradeVersionBoxView = Em.View.extend({
 
   if (this.get('content.isPatch')) {
 element.get('buttons').pushObject({
-  text: Em.I18n.t('common.discard'),
+  text: Em.I18n.t('common.hide'),
   action: 'confirmDiscardRepoVersion',
   isDisabled: isDisabled
 });
@@ -329,7 +329,7 @@ App.UpgradeVersionBoxView = Em.View.extend({
 element.set('isButtonGroup', true);
 element.set('isButton', false);
 element.get('buttons').pushObject({
-  text: Em.I18n.t('common.discard'),
+  text: Em.I18n.t('common.hide'),
   action: 'confirmDiscardRepoVersion',
   isDisabled: isDisabledOnInit
 });

http://git-wip-us.apache.org/repos/asf/ambari/blob/2e170e48/ambari-web/test/views/main/admin/stack_upgrade/upgrade_version_box_view_test.js
--
diff --git 
a/ambari-web/test/views/main/admin/stack_upgrade/upgrade_version_box_view_test.js
 
b/ambari-web/test/views/main/admin/stack_upgrade/upgrade_version_box_view_test.js
index fbf72a2..174f51c 100644
--- 
a/ambari-web/test/views/main/admin/stack_upgrade/upgrade_version_box_view_test.js
+++ 
b/ambari-web/test/views/main/admin/stack_upgrade/upgrade_version_box_view_test.js
@@ -503,7 +503,7 @@ describe('App.UpgradeVersionBoxView', function () {
 {
   "action": "confirmDiscardRepoVersion",
   "isDisabled": false,
-  "text": "Discard"
+  "text": Em.I18n.t('common.hide')
 }
   ],
   isDisabled: true
@@ -532,7 +532,7 @@ describe('App.UpgradeVersionBoxView', function () {
 {
   "action": "confirmDiscardRepoVersion",
   "isDisabled": true,
-  "text": "Discard"
+  "text": Em.I18n.t('common.hide')
 }
   ],
   isDisabled: true
@@ -729,7 +729,7 @@ describe('App.UpgradeVersionBoxView', function () {
 {
   "action": "confirmDiscardRepoVersion",
   "isDisabled": true,
-  "text": "Discard"
+  "text": Em.I18n.t('common.hide')
 }
   ],
   isDisabled: true
@@ -1443,7 +1443,7 @@ describe('App.UpgradeVersionBoxView', function () {
 isDisabled: false
   },
   {
-"text": Em.I18n.t('common.discard'),
+"text": Em.I18n.t('common.hide'),
 "action": "confirmDiscardRepoVersion",
 "isDisabled": false
   }
@@ -1479,7 +1479,7 @@ describe('App.UpgradeVersionBoxView', function () {
   
expect(JSON.stringify(element)).to.be.equal(JSON.stringify(Em.Object.create({
 "buttons": [
   {
-"text": Em.I18n.t('common.discard'),
+"text": 

[30/50] [abbrv] ambari git commit: AMBARI-21910 Ranger Usersync config to support nested group evaluation for LDAP Sync source property (mugdha)

[jluniya]

AMBARI-21910 Ranger Usersync config to support nested group evaluation for LDAP 
Sync source property (mugdha)


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

Branch: refs/heads/branch-feature-AMBARI-14714
Commit: ea892443513fa730dad2ef3af06069ef618e0225
Parents: f067ec8
Author: Mugdha Varadkar 
Authored: Fri Sep 22 18:03:25 2017 +0530
Committer: Mugdha Varadkar 
Committed: Fri Sep 22 18:14:00 2017 +0530

--
 .../RangerUsersyncConfigCalculation.java|  96 ++
 .../RANGER/0.7.0/configuration/ranger-env.xml   |  23 
 .../0.7.0/configuration/ranger-ugsync-site.xml  |   7 ++
 .../RANGER/0.7.0/themes/theme_version_5.json|  40 ++
 .../1.0.0.3.0/configuration/ranger-env.xml  |  23 
 .../configuration/ranger-ugsync-site.xml|   7 ++
 .../1.0.0.3.0/themes/theme_version_1.json   |  40 ++
 .../HDP/2.6/upgrades/nonrolling-upgrade-2.6.xml |   7 ++
 .../stacks/HDP/2.6/upgrades/upgrade-2.6.xml |   8 ++
 .../RangerUsersyncConfigCalculationTest.java| 126 +++
 10 files changed, 377 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/ea892443/ambari-server/src/main/java/org/apache/ambari/server/serveraction/upgrades/RangerUsersyncConfigCalculation.java
--
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/serveraction/upgrades/RangerUsersyncConfigCalculation.java
 
b/ambari-server/src/main/java/org/apache/ambari/server/serveraction/upgrades/RangerUsersyncConfigCalculation.java
new file mode 100644
index 000..3573748
--- /dev/null
+++ 
b/ambari-server/src/main/java/org/apache/ambari/server/serveraction/upgrades/RangerUsersyncConfigCalculation.java
@@ -0,0 +1,96 @@
+/**
+ * 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.
+ */
+
+package org.apache.ambari.server.serveraction.upgrades;
+
+import java.text.MessageFormat;
+import java.util.Map;
+import java.util.concurrent.ConcurrentMap;
+
+import org.apache.ambari.server.AmbariException;
+import org.apache.ambari.server.actionmanager.HostRoleStatus;
+import org.apache.ambari.server.agent.CommandReport;
+import org.apache.ambari.server.serveraction.AbstractServerAction;
+import org.apache.ambari.server.state.Cluster;
+import org.apache.ambari.server.state.Clusters;
+import org.apache.ambari.server.state.Config;
+
+import com.google.inject.Inject;
+
+/**
+ * Computes Ranger Usersync ldap grouphierarchylevels property. This class is 
only used when upgrading from
+ * HDP-2.6.x to HDP-2.6.y.
+ */
+
+public class RangerUsersyncConfigCalculation extends AbstractServerAction {
+  private static final String RANGER_USERSYNC_CONFIG_TYPE = 
"ranger-ugsync-site";
+  private static final String RANGER_ENV_CONFIG_TYPE = "ranger-env";
+
+  @Inject
+  private Clusters m_clusters;
+
+  @Override
+  public CommandReport execute(ConcurrentMap 
requestSharedDataContext) throws AmbariException, InterruptedException {
+
+  String clusterName = getExecutionCommand().getClusterName();
+  Cluster cluster = m_clusters.getCluster(clusterName);
+  String outputMsg = "";
+
+  Config rangerUsersyncConfig = 
cluster.getDesiredConfigByType(RANGER_USERSYNC_CONFIG_TYPE);
+
+  if (null == rangerUsersyncConfig) {
+return createCommandReport(0, HostRoleStatus.COMPLETED, "{}",
+  MessageFormat.format("Config type {0} not found, skipping updating 
property in same.", RANGER_USERSYNC_CONFIG_TYPE), "");
+  }
+
+  String ldapGroupHierarchy = "0";
+
+  if 
(rangerUsersyncConfig.getProperties().containsKey("ranger.usersync.ldap.grouphierarchylevels"))
 {
+ldapGroupHierarchy = 
rangerUsersyncConfig.getProperties().get("ranger.usersync.ldap.grouphierarchylevels");
+  } else {
+Map targetRangerUsersyncConfig = 
rangerUsersyncConfig.getProperties();
+

[13/50] [abbrv] ambari git commit: AMBARI-22028 Downgrade button TypeError. (atkach)

[jluniya]

AMBARI-22028 Downgrade button TypeError. (atkach)


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

Branch: refs/heads/branch-feature-AMBARI-14714
Commit: 37b847069f1d2a07ed9deb5e580ba23e90b77ade
Parents: 001c77f
Author: Andrii Tkach 
Authored: Thu Sep 21 17:50:55 2017 +0300
Committer: Andrii Tkach 
Committed: Thu Sep 21 17:54:24 2017 +0300

--
 .../app/controllers/global/cluster_controller.js|  1 +
 .../controllers/global/cluster_controller_test.js   | 16 +++-
 2 files changed, 16 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/37b84706/ambari-web/app/controllers/global/cluster_controller.js
--
diff --git a/ambari-web/app/controllers/global/cluster_controller.js 
b/ambari-web/app/controllers/global/cluster_controller.js
index d61d61b..3689ba2 100644
--- a/ambari-web/app/controllers/global/cluster_controller.js
+++ b/ambari-web/app/controllers/global/cluster_controller.js
@@ -339,6 +339,7 @@ App.ClusterController = 
Em.Controller.extend(App.ReloadPopupMixin, {
   App.stackUpgradeHistoryMapper.map(data);
   upgradeController.loadStackVersionsToModel(true).done(function () {
 upgradeController.loadCompatibleVersions();
+upgradeController.updateCurrentStackVersion();
 App.set('stackVersionsAvailable', 
App.StackVersion.find().content.length > 0);
   });
 });

http://git-wip-us.apache.org/repos/asf/ambari/blob/37b84706/ambari-web/test/controllers/global/cluster_controller_test.js
--
diff --git a/ambari-web/test/controllers/global/cluster_controller_test.js 
b/ambari-web/test/controllers/global/cluster_controller_test.js
index 7f68efc..ff8e51c 100644
--- a/ambari-web/test/controllers/global/cluster_controller_test.js
+++ b/ambari-web/test/controllers/global/cluster_controller_test.js
@@ -445,8 +445,10 @@ describe('App.clusterController', function () {
   restoreLastUpgrade: Em.K,
   initDBProperties: Em.K,
   loadUpgradeData: Em.K,
+  loadCompatibleVersions: Em.K,
+  updateCurrentStackVersion: Em.K,
   loadStackVersionsToModel: function () {
-return {done: Em.K};
+return {done: Em.clb};
   }
 });
 
@@ -459,6 +461,8 @@ describe('App.clusterController', function () {
   sinon.spy(upgradeController, 'initDBProperties');
   sinon.spy(upgradeController, 'loadUpgradeData');
   sinon.spy(upgradeController, 'loadStackVersionsToModel');
+  sinon.spy(upgradeController, 'loadCompatibleVersions');
+  sinon.spy(upgradeController, 'updateCurrentStackVersion');
   sinon.stub(App.stackUpgradeHistoryMapper, 'map');
 });
 
@@ -471,6 +475,8 @@ describe('App.clusterController', function () {
   upgradeController.initDBProperties.restore();
   upgradeController.loadUpgradeData.restore();
   upgradeController.loadStackVersionsToModel.restore();
+  upgradeController.loadCompatibleVersions.restore();
+  upgradeController.updateCurrentStackVersion.restore();
   App.stackUpgradeHistoryMapper.map.restore();
 });
 
@@ -503,6 +509,14 @@ describe('App.clusterController', function () {
 
expect(upgradeController.loadStackVersionsToModel.calledWith(true)).to.be.true;
   });
 
+  it('loadCompatibleVersions should be called', function () {
+expect(upgradeController.loadCompatibleVersions.calledOnce).to.be.true;
+  });
+
+  it('updateCurrentStackVersion should be called', function () {
+
expect(upgradeController.updateCurrentStackVersion.calledOnce).to.be.true;
+  });
+
   it('initDBProperties is not called', function () {
 expect(upgradeController.initDBProperties.called).to.be.false;
   });

[16/50] [abbrv] ambari git commit: AMBARI-21919. Kerberos identity references should use the "reference" attribute (rlevas)

[jluniya]

http://git-wip-us.apache.org/repos/asf/ambari/blob/2a060210/ambari-server/src/main/resources/common-services/YARN/2.1.0.2.0/kerberos.json
--
diff --git 
a/ambari-server/src/main/resources/common-services/YARN/2.1.0.2.0/kerberos.json 
b/ambari-server/src/main/resources/common-services/YARN/2.1.0.2.0/kerberos.json
index 7315c09..8688753 100644
--- 
a/ambari-server/src/main/resources/common-services/YARN/2.1.0.2.0/kerberos.json
+++ 
b/ambari-server/src/main/resources/common-services/YARN/2.1.0.2.0/kerberos.json
@@ -4,10 +4,12 @@
   "name": "YARN",
   "identities": [
 {
-  "name": "/spnego"
+  "name": "yarn_spnego",
+  "reference": "/spnego"
 },
 {
-  "name": "/smokeuser"
+  "name": "yarn_smokeuser",
+  "reference": "/smokeuser"
 }
   ],
   "configurations": [
@@ -68,7 +70,8 @@
   }
 },
 {
-  "name": "/spnego",
+  "name": "yarn_nodemanager_spnego",
+  "reference": "/spnego",
   "principal": {
 "configuration": 
"yarn-site/yarn.nodemanager.webapp.spnego-principal"
   },
@@ -110,7 +113,8 @@
   }
 },
 {
-  "name": "/spnego",
+  "name": "yarn_resourcemanager_spnego",
+  "reference": "/spnego",
   "principal": {
 "configuration": 
"yarn-site/yarn.resourcemanager.webapp.spnego-principal"
   },
@@ -145,7 +149,8 @@
   }
 },
 {
-  "name": "/spnego",
+  "name": "yarn_app_timeline_server_spnego",
+  "reference": "/spnego",
   "principal": {
 "configuration": 
"yarn-site/yarn.timeline-service.http-authentication.kerberos.principal"
   },
@@ -154,7 +159,8 @@
   }
 },
 {
-  "name": "/HDFS/NAMENODE/hdfs"
+  "name": "yarn_app_timeline_server_hdfs",
+  "reference": "/HDFS/NAMENODE/hdfs"
 }
   ]
 }
@@ -164,10 +170,12 @@
   "name": "MAPREDUCE2",
   "identities": [
 {
-  "name": "/spnego"
+  "name": "mapreduce2_spnego",
+  "reference": "/spnego"
 },
 {
-  "name": "/smokeuser"
+  "name": "mapreduce2_smokeuser",
+  "reference": "/smokeuser"
 }
   ],
   "components": [
@@ -175,7 +183,8 @@
   "name": "HISTORYSERVER",
   "identities": [
 {
-  "name": "/HDFS/NAMENODE/hdfs"
+  "name": "mapreduce2_historyserver_hdfs",
+  "reference": "/HDFS/NAMENODE/hdfs"
 },
 {
   "name": "history_server_jhs",
@@ -199,7 +208,8 @@
   }
 },
 {
-  "name": "/spnego",
+  "name": "mapreduce2_historyserver_spnego",
+  "reference": "/spnego",
   "principal": {
 "configuration": 
"mapred-site/mapreduce.jobhistory.webapp.spnego-principal"
   },

http://git-wip-us.apache.org/repos/asf/ambari/blob/2a060210/ambari-server/src/main/resources/common-services/YARN/3.0.0.3.0/kerberos.json
--
diff --git 
a/ambari-server/src/main/resources/common-services/YARN/3.0.0.3.0/kerberos.json 
b/ambari-server/src/main/resources/common-services/YARN/3.0.0.3.0/kerberos.json
index b1501b8..a3cfaea 100644
--- 
a/ambari-server/src/main/resources/common-services/YARN/3.0.0.3.0/kerberos.json
+++ 
b/ambari-server/src/main/resources/common-services/YARN/3.0.0.3.0/kerberos.json
@@ -4,10 +4,12 @@
   "name": "YARN",
   "identities": [
 {
-  "name": "/spnego"
+  "name": "yarn_spnego",
+  "reference": "/spnego"
 },
 {
-  "name": "/smokeuser"
+  "name": "yarn_smokeuser",
+  "reference": "/smokeuser"
 }
   ],
   "configurations": [
@@ -91,7 +93,8 @@
   }
 },
 {
-  "name": "/HIVE/HIVE_SERVER/hive_server_hive",
+  "name": "yarn_nodemanager_hive_server_hive",
+  "reference": "/HIVE/HIVE_SERVER/hive_server_hive",
   "principal": {
 "configuration": 
"hive-interactive-site/hive.llap.daemon.service.principal"
   },
@@ -126,7 +129,8 @@
   }
 },
 {
-  "name": "/spnego",
+  "name": "yarn_nodemanager_spnego",
+  "reference": "/spnego",
   "principal": {
 "configuration": 
"yarn-site/yarn.nodemanager.webapp.spnego-principal"
   },
@@ -168,7 +172,8 @@
   }
 },
 {
-  "name": "/spnego",
+ 

[03/50] [abbrv] ambari git commit: AMBARI-22004 Log Search UI: implement 'Excluded' filter. (ababiichuk)

[jluniya]

AMBARI-22004 Log Search UI: implement 'Excluded' filter. (ababiichuk)


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

Branch: refs/heads/branch-feature-AMBARI-14714
Commit: 260c75fc81891d9df219e64ed9dbd3cc8bc5e140
Parents: 8467a20
Author: ababiichuk 
Authored: Wed Sep 20 13:11:48 2017 +0300
Committer: ababiichuk 
Committed: Wed Sep 20 13:11:48 2017 +0300

--
 .../dropdown-button.component.html  |  9 --
 .../dropdown-button.component.less  |  4 +++
 .../dropdown-button.component.spec.ts   | 12 +--
 .../dropdown-button.component.ts|  9 ++
 .../filter-button.component.spec.ts | 12 +--
 .../filters-panel/filters-panel.component.html  |  8 ++---
 .../filters-panel/filters-panel.component.ts| 15 -
 .../menu-button/menu-button.component.spec.ts   | 18 +--
 .../search-box/search-box.component.html|  3 +-
 .../search-box/search-box.component.less|  4 +++
 .../search-box/search-box.component.ts  | 33 ++--
 .../timezone-picker.component.spec.ts   | 20 ++--
 .../src/app/components/variables.less   |  3 +-
 .../services/component-actions.service.spec.ts  | 29 +++--
 .../app/services/component-actions.service.ts   |  8 -
 .../src/app/services/filtering.service.ts   |  3 ++
 16 files changed, 161 insertions(+), 29 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/260c75fc/ambari-logsearch/ambari-logsearch-web/src/app/components/dropdown-button/dropdown-button.component.html
--
diff --git 
a/ambari-logsearch/ambari-logsearch-web/src/app/components/dropdown-button/dropdown-button.component.html
 
b/ambari-logsearch/ambari-logsearch-web/src/app/components/dropdown-button/dropdown-button.component.html
index a16b205..9536573 100644
--- 
a/ambari-logsearch/ambari-logsearch-web/src/app/components/dropdown-button/dropdown-button.component.html
+++ 
b/ambari-logsearch/ambari-logsearch-web/src/app/components/dropdown-button/dropdown-button.component.html
@@ -15,10 +15,15 @@
   limitations under the License.
 -->
 
-{{label | translate}}
 
   
-{{selectedLabel | translate}} 
+
+  
+  {{label | translate}}
+
+{{selectedLabel | 
translate}}
+
   
   

http://git-wip-us.apache.org/repos/asf/ambari/blob/260c75fc/ambari-logsearch/ambari-logsearch-web/src/app/components/dropdown-button/dropdown-button.component.less
--
diff --git 
a/ambari-logsearch/ambari-logsearch-web/src/app/components/dropdown-button/dropdown-button.component.less
 
b/ambari-logsearch/ambari-logsearch-web/src/app/components/dropdown-button/dropdown-button.component.less
index 55699b4..a5da7f5 100644
--- 
a/ambari-logsearch/ambari-logsearch-web/src/app/components/dropdown-button/dropdown-button.component.less
+++ 
b/ambari-logsearch/ambari-logsearch-web/src/app/components/dropdown-button/dropdown-button.component.less
@@ -24,6 +24,10 @@
 
   .filter-label {
 padding: @input-group-addon-padding;
+
+&.plain {
+  color: initial;
+}
   }
 
   .btn {

http://git-wip-us.apache.org/repos/asf/ambari/blob/260c75fc/ambari-logsearch/ambari-logsearch-web/src/app/components/dropdown-button/dropdown-button.component.spec.ts
--
diff --git 
a/ambari-logsearch/ambari-logsearch-web/src/app/components/dropdown-button/dropdown-button.component.spec.ts
 
b/ambari-logsearch/ambari-logsearch-web/src/app/components/dropdown-button/dropdown-button.component.spec.ts
index c5845b3..04730ef 100644
--- 
a/ambari-logsearch/ambari-logsearch-web/src/app/components/dropdown-button/dropdown-button.component.spec.ts
+++ 
b/ambari-logsearch/ambari-logsearch-web/src/app/components/dropdown-button/dropdown-button.component.spec.ts
@@ -23,9 +23,12 @@ import {StoreModule} from '@ngrx/store';
 import {AppSettingsService, appSettings} from 
'@app/services/storage/app-settings.service';
 import {ClustersService, clusters} from 
'@app/services/storage/clusters.service';
 import {ComponentsService, components} from 
'@app/services/storage/components.service';
+import {AppStateService, appState} from 
'@app/services/storage/app-state.service';
+import {HostsService, hosts} from '@app/services/storage/hosts.service';
 import {FilteringService} from '@app/services/filtering.service';
 import {UtilsService} from '@app/services/utils.service';
 import 

[40/50] [abbrv] ambari git commit: AMBARI-22026. Restart of all components on host operation failed with 500 status code. (mpapirkovskyy)

[jluniya]

AMBARI-22026. Restart of all components on host operation failed with 500 
status code. (mpapirkovskyy)


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

Branch: refs/heads/branch-feature-AMBARI-14714
Commit: 0393451c43fe06b7cac72afebd2109d9298197a8
Parents: 999daef
Author: Myroslav Papirkovskyi 
Authored: Mon Sep 25 19:08:49 2017 +0300
Committer: Myroslav Papirkovskyi 
Committed: Mon Sep 25 19:10:24 2017 +0300

--
 .../AmbariCustomCommandExecutionHelper.java | 16 ++--
 1 file changed, 10 insertions(+), 6 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/0393451c/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariCustomCommandExecutionHelper.java
--
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariCustomCommandExecutionHelper.java
 
b/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariCustomCommandExecutionHelper.java
index 38a02ef..d0dd7e0 100644
--- 
a/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariCustomCommandExecutionHelper.java
+++ 
b/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariCustomCommandExecutionHelper.java
@@ -1524,14 +1524,18 @@ public class AmbariCustomCommandExecutionHelper {
 if (actionName.equals(START_COMMAND_NAME) || 
actionName.equals(RESTART_COMMAND_NAME)) {
   Cluster cluster = clusters.getCluster(clusterName);
   StackId stackId = null;
-  try {
-Service service = cluster.getService(serviceName);
-stackId = service.getDesiredStackId();
-  } catch (AmbariException e) {
-LOG.debug("Could not load service {}, skipping topology check", 
serviceName);
-stackId = cluster.getDesiredStackVersion();
+  if (serviceName != null) {
+try {
+  Service service = cluster.getService(serviceName);
+  stackId = service.getDesiredStackId();
+} catch (AmbariException e) {
+  LOG.debug("Could not load service {}, skipping topology check", 
serviceName);
+}
   }
 
+  if (stackId == null) {
+stackId = cluster.getDesiredStackVersion();
+  }
 
   AmbariMetaInfo ambariMetaInfo = managementController.getAmbariMetaInfo();
 

[18/50] [abbrv] ambari git commit: AMBARI-22027. Add UID/GID related issue with external users not listed in /etc/passwd (echekanskiy)

[jluniya]

AMBARI-22027. Add UID/GID related issue with external users not listed in 
/etc/passwd (echekanskiy)


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

Branch: refs/heads/branch-feature-AMBARI-14714
Commit: f1b53000c65a97ac7784d51c9a648e7e135acaab
Parents: 2a06021
Author: Eugene Chekanskiy 
Authored: Thu Sep 21 21:07:03 2017 +0300
Committer: Eugene Chekanskiy 
Committed: Thu Sep 21 21:07:03 2017 +0300

--
 .../before-ANY/scripts/shared_initialization.py | 29 +--
 .../2.0.6/hooks/before-ANY/test_before_any.py   | 85 
 2 files changed, 36 insertions(+), 78 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/f1b53000/ambari-server/src/main/resources/stacks/HDP/2.0.6/hooks/before-ANY/scripts/shared_initialization.py
--
diff --git 
a/ambari-server/src/main/resources/stacks/HDP/2.0.6/hooks/before-ANY/scripts/shared_initialization.py
 
b/ambari-server/src/main/resources/stacks/HDP/2.0.6/hooks/before-ANY/scripts/shared_initialization.py
index ee950e8..11593fe 100644
--- 
a/ambari-server/src/main/resources/stacks/HDP/2.0.6/hooks/before-ANY/scripts/shared_initialization.py
+++ 
b/ambari-server/src/main/resources/stacks/HDP/2.0.6/hooks/before-ANY/scripts/shared_initialization.py
@@ -139,11 +139,19 @@ def set_uid(user, user_dirs):
content=StaticFile("changeToSecureUid.sh"),
mode=0555)
   ignore_groupsusers_create_str = str(params.ignore_groupsusers_create).lower()
-  uid = get_uid(user)
+  uid = get_uid(user, return_existing=True)
   Execute(format("{tmp_dir}/changeUid.sh {user} {user_dirs} {new_uid}", 
new_uid=0 if uid is None else uid),
   not_if = format("(test $(id -u {user}) -gt 1000) || 
({ignore_groupsusers_create_str})"))
 
-def get_uid(user):
+def get_uid(user, return_existing=False):
+  """
+  Tries to get UID for username. It will try to find UID in custom properties 
in *cluster_env* and, if *return_existing=True*,
+  it will try to return UID of existing *user*.
+
+  :param user: username to get UID for
+  :param return_existing: return UID for existing user
+  :return:
+  """
   import params
   user_str = str(user) + "_uid"
   service_env = [ serviceEnv for serviceEnv in params.config['configurations'] 
if user_str in params.config['configurations'][serviceEnv]]
@@ -155,13 +163,18 @@ def get_uid(user):
   Logger.warning("Multiple values found for %s, using %s"  % (user_str, 
uid))
 return uid
   else:
-if user == params.smoke_user:
+if return_existing:
+  # pick up existing UID or try to find available UID in /etc/passwd, see 
changeToSecureUid.sh for more info
+  if user == params.smoke_user:
+return None
+  File(format("{tmp_dir}/changeUid.sh"),
+   content=StaticFile("changeToSecureUid.sh"),
+   mode=0555)
+  code, newUid = shell.call(format("{tmp_dir}/changeUid.sh {user}"))
+  return int(newUid)
+else:
+  # do not return UID for existing user, used in User resource call to let 
OS to choose UID for us
   return None
-File(format("{tmp_dir}/changeUid.sh"),
- content=StaticFile("changeToSecureUid.sh"),
- mode=0555)
-code, newUid = shell.call(format("{tmp_dir}/changeUid.sh {user}"))
-return int(newUid)
 
 def setup_hadoop_env():
   import params

http://git-wip-us.apache.org/repos/asf/ambari/blob/f1b53000/ambari-server/src/test/python/stacks/2.0.6/hooks/before-ANY/test_before_any.py
--
diff --git 
a/ambari-server/src/test/python/stacks/2.0.6/hooks/before-ANY/test_before_any.py
 
b/ambari-server/src/test/python/stacks/2.0.6/hooks/before-ANY/test_before_any.py
index a13ac24..9dceb69 100644
--- 
a/ambari-server/src/test/python/stacks/2.0.6/hooks/before-ANY/test_before_any.py
+++ 
b/ambari-server/src/test/python/stacks/2.0.6/hooks/before-ANY/test_before_any.py
@@ -52,33 +52,22 @@ class TestHookBeforeInstall(RMFTestCase):
 self.assertResourceCalled('Group', 'hadoop',)
 self.assertResourceCalled('Group', 'nobody',)
 self.assertResourceCalled('Group', 'users',)
-self.assertResourceCalled('File', '/tmp/changeUid.sh',
-  content = StaticFile('changeToSecureUid.sh'),
-  mode = 0555,
-  )
+
 self.assertResourceCalled('User', 'hive',
   gid = 'hadoop',
-  uid = 1000,
+  uid = None,
   groups = [u'hadoop'],
  

[38/50] [abbrv] ambari git commit: AMBARI-21996 Provide maintenance mode off count for components (dsen)

[jluniya]

AMBARI-21996 Provide maintenance mode off count for components (dsen)


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

Branch: refs/heads/branch-feature-AMBARI-14714
Commit: 986a65dbf4fbf36dac7073418ef368c2c207b123
Parents: 311c7bb
Author: Dmytro Sen 
Authored: Mon Sep 25 16:32:46 2017 +0300
Committer: Dmytro Sen 
Committed: Mon Sep 25 16:32:46 2017 +0300

--
 .../internal/ComponentResourceProvider.java |  4 
 .../server/state/ServiceComponentImpl.java  | 25 
 .../internal/ComponentResourceProviderTest.java |  6 +
 .../server/state/ServiceComponentTest.java  | 21 +---
 4 files changed, 53 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/986a65db/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ComponentResourceProvider.java
--
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ComponentResourceProvider.java
 
b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ComponentResourceProvider.java
index ebbf169..2e86b2d 100644
--- 
a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ComponentResourceProvider.java
+++ 
b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ComponentResourceProvider.java
@@ -85,6 +85,8 @@ public class ComponentResourceProvider extends 
AbstractControllerResourceProvide
   protected static final String COMPONENT_TOTAL_COUNT_PROPERTY_ID = 
"ServiceComponentInfo/total_count";
   protected static final String COMPONENT_STARTED_COUNT_PROPERTY_ID   = 
"ServiceComponentInfo/started_count";
   protected static final String COMPONENT_INSTALLED_COUNT_PROPERTY_ID = 
"ServiceComponentInfo/installed_count";
+  protected static final String 
COMPONENT_INSTALLED_AND_MAINTENANCE_OFF_COUNT_PROPERTY_ID
+  = 
"ServiceComponentInfo/installed_and_maintenance_off_count";
   protected static final String COMPONENT_INIT_COUNT_PROPERTY_ID  = 
"ServiceComponentInfo/init_count";
   protected static final String COMPONENT_UNKNOWN_COUNT_PROPERTY_ID   = 
"ServiceComponentInfo/unknown_count";
   protected static final String COMPONENT_INSTALL_FAILED_COUNT_PROPERTY_ID = 
"ServiceComponentInfo/install_failed_count";
@@ -124,6 +126,7 @@ public class ComponentResourceProvider extends 
AbstractControllerResourceProvide
 PROPERTY_IDS.add(COMPONENT_TOTAL_COUNT_PROPERTY_ID);
 PROPERTY_IDS.add(COMPONENT_STARTED_COUNT_PROPERTY_ID);
 PROPERTY_IDS.add(COMPONENT_INSTALLED_COUNT_PROPERTY_ID);
+
PROPERTY_IDS.add(COMPONENT_INSTALLED_AND_MAINTENANCE_OFF_COUNT_PROPERTY_ID);
 
 PROPERTY_IDS.add(COMPONENT_INIT_COUNT_PROPERTY_ID);
 PROPERTY_IDS.add(COMPONENT_UNKNOWN_COUNT_PROPERTY_ID);
@@ -220,6 +223,7 @@ public class ComponentResourceProvider extends 
AbstractControllerResourceProvide
   setResourceProperty(resource, COMPONENT_TOTAL_COUNT_PROPERTY_ID, 
response.getServiceComponentStateCount().get("totalCount"), requestedIds);
   setResourceProperty(resource, COMPONENT_STARTED_COUNT_PROPERTY_ID, 
response.getServiceComponentStateCount().get("startedCount"), requestedIds);
   setResourceProperty(resource, COMPONENT_INSTALLED_COUNT_PROPERTY_ID, 
response.getServiceComponentStateCount().get("installedCount"), requestedIds);
+  setResourceProperty(resource, 
COMPONENT_INSTALLED_AND_MAINTENANCE_OFF_COUNT_PROPERTY_ID, 
response.getServiceComponentStateCount().get("installedAndMaintenanceOffCount"),
 requestedIds);
   setResourceProperty(resource, 
COMPONENT_INSTALL_FAILED_COUNT_PROPERTY_ID, 
response.getServiceComponentStateCount().get("installFailedCount"), 
requestedIds);
   setResourceProperty(resource, COMPONENT_INIT_COUNT_PROPERTY_ID, 
response.getServiceComponentStateCount().get("initCount"), requestedIds);
   setResourceProperty(resource, COMPONENT_UNKNOWN_COUNT_PROPERTY_ID, 
response.getServiceComponentStateCount().get("unknownCount"), requestedIds);

http://git-wip-us.apache.org/repos/asf/ambari/blob/986a65db/ambari-server/src/main/java/org/apache/ambari/server/state/ServiceComponentImpl.java
--
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/state/ServiceComponentImpl.java
 
b/ambari-server/src/main/java/org/apache/ambari/server/state/ServiceComponentImpl.java
index 5f85e38..22c97ed 100644
--- 

[28/50] [abbrv] ambari git commit: AMBARI-22023 Upgrade dialog style issues.(atkach)

[jluniya]

AMBARI-22023 Upgrade dialog style issues.(atkach)


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

Branch: refs/heads/branch-feature-AMBARI-14714
Commit: eead09bebb0c1887c8dd8fe90aa8a6d50009e897
Parents: 40f705a
Author: Andrii Tkach 
Authored: Fri Sep 22 13:11:03 2017 +0300
Committer: Andrii Tkach 
Committed: Fri Sep 22 14:48:47 2017 +0300

--
 .../main/admin/stack_and_upgrade_controller.js  |   2 +-
 ambari-web/app/messages.js  |   2 +
 ambari-web/app/routes/stack_upgrade_routes.js   |  11 +-
 ambari-web/app/styles/stack_versions.less   |  77 ++---
 .../stack_upgrade/stack_upgrade_wizard.hbs  | 170 +++
 .../main/admin/stack_upgrade/upgrade_group.hbs  |  18 +-
 .../views/common/helpers/status_icon_view.js|   1 +
 .../admin/stack_upgrade/upgrade_wizard_view.js  |   3 +
 .../admin/stack_and_upgrade_controller_test.js  |   2 +-
 .../stack_upgrade/upgrade_wizard_view_test.js   |   2 +-
 10 files changed, 186 insertions(+), 102 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/eead09be/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 fba6ad6..6d7560b 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
@@ -391,7 +391,7 @@ App.MainAdminStackAndUpgradeController = 
Em.Controller.extend(App.LocalStorage,
 } else if (this.get('upgradeData.Upgrade')){
   return this.get('upgradeData.Upgrade.request_status');
 } else {
-  return '';
+  return 'INIT';
 }
   }.property('upgradeData.Upgrade.request_status', 'App.upgradeSuspended'),
 

http://git-wip-us.apache.org/repos/asf/ambari/blob/eead09be/ambari-web/app/messages.js
--
diff --git a/ambari-web/app/messages.js b/ambari-web/app/messages.js
index 113fb8f..db25104 100644
--- a/ambari-web/app/messages.js
+++ b/ambari-web/app/messages.js
@@ -1884,6 +1884,8 @@ Em.I18n.translations = {
   'admin.stackUpgrade.state.aborted': "Upgrade Aborted",
   'admin.stackUpgrade.state.completed': "Upgrade Finished",
   'admin.stackUpgrade.state.inProgress.downgrade': "Downgrade in Progress",
+  'admin.stackUpgrade.state.init': "Upgrade Initializing",
+  'admin.stackUpgrade.state.init.downgrade': "Downgrade Initializing",
   'admin.stackUpgrade.state.paused.downgrade': "Downgrade Paused",
   'admin.stackUpgrade.state.aborted.downgrade': "Downgrade Aborted",
   'admin.stackUpgrade.state.completed.downgrade': "Downgrade Finished",

http://git-wip-us.apache.org/repos/asf/ambari/blob/eead09be/ambari-web/app/routes/stack_upgrade_routes.js
--
diff --git a/ambari-web/app/routes/stack_upgrade_routes.js 
b/ambari-web/app/routes/stack_upgrade_routes.js
index 24fa5e8..d36253a 100644
--- a/ambari-web/app/routes/stack_upgrade_routes.js
+++ b/ambari-web/app/routes/stack_upgrade_routes.js
@@ -40,7 +40,16 @@ module.exports = App.WizardRoute.extend({
   return App.ModalPopup.show({
 classNames: ['upgrade-wizard-modal'],
 modalDialogClasses: ['modal-xlg'],
-header: 
Em.computed.alias('App.router.mainAdminStackAndUpgradeController.wizardModalTitle'),
+headerClass: Em.View.extend({
+  header: Em.computed.alias('controller.wizardModalTitle'),
+  controllerBinding: 
'App.router.mainAdminStackAndUpgradeController',
+  template: Ember.Handlebars.compile(
+'{{view.header}}' +
+'' +
+'{{t 
admin.stackVersions.version.upgrade.upgradeOptions.header}}' +
+''
+  )
+}),
 bodyClass: App.upgradeWizardView,
 primary: Em.I18n.t('common.dismiss'),
 secondary: null,

http://git-wip-us.apache.org/repos/asf/ambari/blob/eead09be/ambari-web/app/styles/stack_versions.less
--
diff --git a/ambari-web/app/styles/stack_versions.less 
b/ambari-web/app/styles/stack_versions.less
index 2e4faff..0221311 100644
--- a/ambari-web/app/styles/stack_versions.less
+++ b/ambari-web/app/styles/stack_versions.less
@@ -418,7 +418,6 @@
   }
   .details-box {
 padding: 5px;
-margin-right: 95px;
 

ambari git commit: AMBARI-22044 : Rate metrics should not have negative values whenever the underlying counter metric has been reset.(avijayan)

[avijayan]

Repository: ambari
Updated Branches:
  refs/heads/trunk 84fed85ac -> ced70f7db


AMBARI-22044 : Rate metrics should not have negative values whenever the 
underlying counter metric has been reset.(avijayan)


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

Branch: refs/heads/trunk
Commit: ced70f7db01384e11b1a7f52fa0f64924eea0ab8
Parents: 84fed85
Author: Aravindan Vijayan 
Authored: Mon Sep 25 22:16:20 2017 -0700
Committer: Aravindan Vijayan 
Committed: Mon Sep 25 22:16:20 2017 -0700

--
 .../timeline/HBaseTimelineMetricStore.java  |  8 +++--
 .../timeline/HBaseTimelineMetricStoreTest.java  | 36 +++-
 2 files changed, 26 insertions(+), 18 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/ced70f7d/ambari-metrics/ambari-metrics-timelineservice/src/main/java/org/apache/hadoop/yarn/server/applicationhistoryservice/metrics/timeline/HBaseTimelineMetricStore.java
--
diff --git 
a/ambari-metrics/ambari-metrics-timelineservice/src/main/java/org/apache/hadoop/yarn/server/applicationhistoryservice/metrics/timeline/HBaseTimelineMetricStore.java
 
b/ambari-metrics/ambari-metrics-timelineservice/src/main/java/org/apache/hadoop/yarn/server/applicationhistoryservice/metrics/timeline/HBaseTimelineMetricStore.java
index ad1fd67..2342bd8 100644
--- 
a/ambari-metrics/ambari-metrics-timelineservice/src/main/java/org/apache/hadoop/yarn/server/applicationhistoryservice/metrics/timeline/HBaseTimelineMetricStore.java
+++ 
b/ambari-metrics/ambari-metrics-timelineservice/src/main/java/org/apache/hadoop/yarn/server/applicationhistoryservice/metrics/timeline/HBaseTimelineMetricStore.java
@@ -312,8 +312,12 @@ public class HBaseTimelineMetricStore extends 
AbstractService implements Timelin
   if (prevTime != null) {
 step = currTime - prevTime;
 diff = currVal - prevVal;
-Double rate = isDiff ? diff : (diff / 
TimeUnit.MILLISECONDS.toSeconds(step));
-timeValueEntry.setValue(rate);
+if (diff < 0) {
+  it.remove(); //Discard calculating rate when the metric counter has 
been reset.
+} else {
+  Double rate = isDiff ? diff : (diff / 
TimeUnit.MILLISECONDS.toSeconds(step));
+  timeValueEntry.setValue(rate);
+}
   } else {
 it.remove();
   }

http://git-wip-us.apache.org/repos/asf/ambari/blob/ced70f7d/ambari-metrics/ambari-metrics-timelineservice/src/test/java/org/apache/hadoop/yarn/server/applicationhistoryservice/metrics/timeline/HBaseTimelineMetricStoreTest.java
--
diff --git 
a/ambari-metrics/ambari-metrics-timelineservice/src/test/java/org/apache/hadoop/yarn/server/applicationhistoryservice/metrics/timeline/HBaseTimelineMetricStoreTest.java
 
b/ambari-metrics/ambari-metrics-timelineservice/src/test/java/org/apache/hadoop/yarn/server/applicationhistoryservice/metrics/timeline/HBaseTimelineMetricStoreTest.java
index aae1d4b..70dd583 100644
--- 
a/ambari-metrics/ambari-metrics-timelineservice/src/test/java/org/apache/hadoop/yarn/server/applicationhistoryservice/metrics/timeline/HBaseTimelineMetricStoreTest.java
+++ 
b/ambari-metrics/ambari-metrics-timelineservice/src/test/java/org/apache/hadoop/yarn/server/applicationhistoryservice/metrics/timeline/HBaseTimelineMetricStoreTest.java
@@ -95,22 +95,26 @@ public class HBaseTimelineMetricStoreTest {
   @Test
   public void testRateCalculationOnMetricsWithEqualValues() throws Exception {
 Map metricValues = new TreeMap<>();
-metricValues.put(1454016368371L, 1011.25);
-metricValues.put(1454016428371L, 1011.25);
-metricValues.put(1454016488371L, 1011.25);
-metricValues.put(1454016548371L, 1011.25);
-metricValues.put(1454016608371L, 1011.25);
-metricValues.put(1454016668371L, 1011.25);
-metricValues.put(1454016728371L, 1011.25);
+metricValues.put(14540L, 1.0);
+metricValues.put(145401000L, 6.0);
+metricValues.put(145402000L, 0.0);
+metricValues.put(145403000L, 3.0);
+metricValues.put(145404000L, 4.0);
+metricValues.put(145405000L, 7.0);
 
 // Calculate rate
 Map rates = HBaseTimelineMetricStore.updateValuesAsRate(new 
TreeMap<>(metricValues), false);
 
 // Make sure rate is zero
-for (Map.Entry rateEntry : rates.entrySet()) {
-  Assert.assertEquals("Rate should be zero, key = " + rateEntry.getKey()
-  + ", value = " + rateEntry.getValue(), 0.0, rateEntry.getValue());
-}
+

ambari git commit: AMBARI-19135 : AMS build artifacts are not uploaded to maven central. (avijayan)

[avijayan]

Repository: ambari
Updated Branches:
  refs/heads/trunk 12c9ca7e2 -> 84fed85ac


AMBARI-19135 : AMS build artifacts are not uploaded to maven central. (avijayan)


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

Branch: refs/heads/trunk
Commit: 84fed85ac9019a9b72d3db1619c7dbdf18e1d078
Parents: 12c9ca7
Author: Aravindan Vijayan 
Authored: Mon Sep 25 16:26:28 2017 -0700
Committer: Aravindan Vijayan 
Committed: Mon Sep 25 16:26:28 2017 -0700

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


http://git-wip-us.apache.org/repos/asf/ambari/blob/84fed85a/ambari-metrics/pom.xml
--
diff --git a/ambari-metrics/pom.xml b/ambari-metrics/pom.xml
index 560ef11..a14b8fd 100644
--- a/ambari-metrics/pom.xml
+++ b/ambari-metrics/pom.xml
@@ -317,5 +317,32 @@
 
   
 
+
+  sign-artifacts
+  
+
+  performRelease
+  true
+
+  
+  
+
+  
+org.apache.maven.plugins
+maven-gpg-plugin
+1.6
+
+  
+sign-artifacts
+verify
+
+  sign
+
+  
+
+  
+
+  
+
   
 

ambari git commit: AMBARI-19135 : AMS build artifacts are not uploaded to maven central. (avijayan)

[avijayan]

Repository: ambari
Updated Branches:
  refs/heads/branch-2.6 97dc44b14 -> 8f87b4d9c


AMBARI-19135 : AMS build artifacts are not uploaded to maven central. (avijayan)


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

Branch: refs/heads/branch-2.6
Commit: 8f87b4d9c0df4c58b3e732daea7a85815eeb2fe3
Parents: 97dc44b
Author: Aravindan Vijayan 
Authored: Mon Sep 25 16:12:15 2017 -0700
Committer: Aravindan Vijayan 
Committed: Mon Sep 25 16:12:15 2017 -0700

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


http://git-wip-us.apache.org/repos/asf/ambari/blob/8f87b4d9/ambari-metrics/pom.xml
--
diff --git a/ambari-metrics/pom.xml b/ambari-metrics/pom.xml
index 835393a..c59de5f 100644
--- a/ambari-metrics/pom.xml
+++ b/ambari-metrics/pom.xml
@@ -325,5 +325,32 @@
 
   
 
+
+  sign-artifacts
+  
+
+  performRelease
+  true
+
+  
+  
+
+  
+org.apache.maven.plugins
+maven-gpg-plugin
+1.6
+
+  
+sign-artifacts
+verify
+
+  sign
+
+  
+
+  
+
+  
+
   
 

ambari git commit: AMBARI-22015. livy2 interpreter errors (unable to impersonate users/ LLAP or Hive CNF issue) due to missing proxy configs. (Mingjie Tang via Swapan Shridhar).

[swapan]

Repository: ambari
Updated Branches:
  refs/heads/branch-2.6 3b9db5cf1 -> 97dc44b14


AMBARI-22015. livy2 interpreter errors (unable to impersonate users/ LLAP or 
Hive CNF issue) due to missing proxy configs. (Mingjie Tang via Swapan 
Shridhar).


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

Branch: refs/heads/branch-2.6
Commit: 97dc44b14eda0affdebcbdda834656a8a0200d2b
Parents: 3b9db5c
Author: Swapan Shridhar 
Authored: Mon Sep 25 15:37:41 2017 -0700
Committer: Swapan Shridhar 
Committed: Mon Sep 25 15:41:48 2017 -0700

--
 .../main/resources/stacks/ODPi/2.0/services/stack_advisor.py  | 7 +++
 1 file changed, 7 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/97dc44b1/contrib/management-packs/odpi-ambari-mpack/src/main/resources/stacks/ODPi/2.0/services/stack_advisor.py
--
diff --git 
a/contrib/management-packs/odpi-ambari-mpack/src/main/resources/stacks/ODPi/2.0/services/stack_advisor.py
 
b/contrib/management-packs/odpi-ambari-mpack/src/main/resources/stacks/ODPi/2.0/services/stack_advisor.py
index 7a1e6bd..1a2fa0d 100755
--- 
a/contrib/management-packs/odpi-ambari-mpack/src/main/resources/stacks/ODPi/2.0/services/stack_advisor.py
+++ 
b/contrib/management-packs/odpi-ambari-mpack/src/main/resources/stacks/ODPi/2.0/services/stack_advisor.py
@@ -272,6 +272,13 @@ class ODPi20StackAdvisor(DefaultStackAdvisor):
 if not livyUser in users and livyUser is not None:
   users[livyUser] = {"propertyHosts" : "*","propertyGroups" : "*", 
"config" : "livy-env", "propertyName" : "livy_user"}
 
+if "SPARK2" in servicesList:
+  livyUser = None
+  if "livy2-env" in services["configurations"] and "livy_user" in 
services["configurations"]["livy2-env"]["properties"]:
+livyUser = 
services["configurations"]["livy2-env"]["properties"]["livy_user"]
+if not livyUser in users and livyUser is not None:
+  users[livy2User] = {"propertyHosts" : "*","propertyGroups" : "*", 
"config" : "livy2-env", "propertyName" : "livy_user"}
+
 putCoreSiteProperty = self.putProperty(configurations, "core-site", 
services)
 putCoreSitePropertyAttribute = self.putPropertyAttribute(configurations, 
"core-site")
 

ambari git commit: AMBARI-22015. livy2 interpreter errors (unable to impersonate users/ LLAP or Hive CNF issue) due to missing proxy configs. (Mingjie Tang via Swapan Shridhar).

[swapan]

Repository: ambari
Updated Branches:
  refs/heads/trunk 4c49b4bd0 -> 12c9ca7e2


AMBARI-22015. livy2 interpreter errors (unable to impersonate users/ LLAP or 
Hive CNF issue) due to missing proxy configs. (Mingjie Tang via Swapan 
Shridhar).


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

Branch: refs/heads/trunk
Commit: 12c9ca7e2fafd092149081971bcfcbbb1e49adf4
Parents: 4c49b4b
Author: Swapan Shridhar 
Authored: Mon Sep 25 15:37:41 2017 -0700
Committer: Swapan Shridhar 
Committed: Mon Sep 25 15:37:41 2017 -0700

--
 .../main/resources/stacks/ODPi/2.0/services/stack_advisor.py  | 7 +++
 1 file changed, 7 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/12c9ca7e/contrib/management-packs/odpi-ambari-mpack/src/main/resources/stacks/ODPi/2.0/services/stack_advisor.py
--
diff --git 
a/contrib/management-packs/odpi-ambari-mpack/src/main/resources/stacks/ODPi/2.0/services/stack_advisor.py
 
b/contrib/management-packs/odpi-ambari-mpack/src/main/resources/stacks/ODPi/2.0/services/stack_advisor.py
index 5f70db2..418d0c0 100755
--- 
a/contrib/management-packs/odpi-ambari-mpack/src/main/resources/stacks/ODPi/2.0/services/stack_advisor.py
+++ 
b/contrib/management-packs/odpi-ambari-mpack/src/main/resources/stacks/ODPi/2.0/services/stack_advisor.py
@@ -271,6 +271,13 @@ class ODPi20StackAdvisor(DefaultStackAdvisor):
 if not livyUser in users and livyUser is not None:
   users[livyUser] = {"propertyHosts" : "*","propertyGroups" : "*", 
"config" : "livy-env", "propertyName" : "livy_user"}
 
+if "SPARK2" in servicesList:
+  livyUser = None
+  if "livy2-env" in services["configurations"] and "livy_user" in 
services["configurations"]["livy2-env"]["properties"]:
+livyUser = 
services["configurations"]["livy2-env"]["properties"]["livy_user"]
+if not livyUser in users and livyUser is not None:
+  users[livy2User] = {"propertyHosts" : "*","propertyGroups" : "*", 
"config" : "livy2-env", "propertyName" : "livy_user"}
+
 putCoreSiteProperty = self.putProperty(configurations, "core-site", 
services)
 putCoreSitePropertyAttribute = self.putPropertyAttribute(configurations, 
"core-site")
 

ambari git commit: AMBARI-22014. Patch upgrade is going into incorrect state during package installation with invalid VDF (ncole)

[ncole]

Repository: ambari
Updated Branches:
  refs/heads/trunk b653ee0a5 -> 4c49b4bd0


AMBARI-22014. Patch upgrade is going into incorrect state during package 
installation with invalid VDF (ncole)


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

Branch: refs/heads/trunk
Commit: 4c49b4bd006cdd3929f5e341552b200af608bc32
Parents: b653ee0
Author: Nate Cole 
Authored: Mon Sep 25 15:23:42 2017 -0400
Committer: Nate Cole 
Committed: Mon Sep 25 16:14:35 2017 -0400

--
 .../server/controller/ControllerModule.java |   2 +
 .../controller/ResourceProviderFactory.java |   6 +-
 .../AbstractControllerResourceProvider.java |   2 +-
 .../ClusterStackVersionResourceProvider.java|   9 +-
 .../internal/DefaultProviderModule.java |   2 -
 ...ClusterStackVersionResourceProviderTest.java | 223 ++-
 6 files changed, 87 insertions(+), 157 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/4c49b4bd/ambari-server/src/main/java/org/apache/ambari/server/controller/ControllerModule.java
--
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/controller/ControllerModule.java
 
b/ambari-server/src/main/java/org/apache/ambari/server/controller/ControllerModule.java
index e151e63..968e9b6 100644
--- 
a/ambari-server/src/main/java/org/apache/ambari/server/controller/ControllerModule.java
+++ 
b/ambari-server/src/main/java/org/apache/ambari/server/controller/ControllerModule.java
@@ -62,6 +62,7 @@ import org.apache.ambari.server.cleanup.ClasspathScannerUtils;
 import org.apache.ambari.server.configuration.Configuration;
 import org.apache.ambari.server.configuration.Configuration.ConnectionPoolType;
 import org.apache.ambari.server.configuration.Configuration.DatabaseType;
+import 
org.apache.ambari.server.controller.internal.ClusterStackVersionResourceProvider;
 import org.apache.ambari.server.controller.internal.ComponentResourceProvider;
 import org.apache.ambari.server.controller.internal.CredentialResourceProvider;
 import 
org.apache.ambari.server.controller.internal.HostComponentResourceProvider;
@@ -467,6 +468,7 @@ public class ControllerModule extends AbstractModule {
 .implement(ResourceProvider.class, Names.named("credential"), 
CredentialResourceProvider.class)
 .implement(ResourceProvider.class, Names.named("kerberosDescriptor"), 
KerberosDescriptorResourceProvider.class)
 .implement(ResourceProvider.class, Names.named("upgrade"), 
UpgradeResourceProvider.class)
+.implement(ResourceProvider.class, Names.named("clusterStackVersion"), 
ClusterStackVersionResourceProvider.class)
 .build(ResourceProviderFactory.class));
 
 install(new FactoryModuleBuilder().implement(

http://git-wip-us.apache.org/repos/asf/ambari/blob/4c49b4bd/ambari-server/src/main/java/org/apache/ambari/server/controller/ResourceProviderFactory.java
--
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/controller/ResourceProviderFactory.java
 
b/ambari-server/src/main/java/org/apache/ambari/server/controller/ResourceProviderFactory.java
index 3912138..9cd1d74 100644
--- 
a/ambari-server/src/main/java/org/apache/ambari/server/controller/ResourceProviderFactory.java
+++ 
b/ambari-server/src/main/java/org/apache/ambari/server/controller/ResourceProviderFactory.java
@@ -22,6 +22,7 @@ package org.apache.ambari.server.controller;
 import java.util.Map;
 import java.util.Set;
 
+import 
org.apache.ambari.server.controller.internal.ClusterStackVersionResourceProvider;
 import org.apache.ambari.server.controller.internal.UpgradeResourceProvider;
 import org.apache.ambari.server.controller.spi.Resource;
 import org.apache.ambari.server.controller.spi.Resource.Type;
@@ -68,4 +69,7 @@ public interface ResourceProviderFactory {
   @Named("upgrade")
   UpgradeResourceProvider 
getUpgradeResourceProvider(AmbariManagementController managementController);
 
-}
+  @Named("clusterStackVersion")
+  ClusterStackVersionResourceProvider 
getClusterStackVersionResourceProvider(AmbariManagementController 
managementController);
+
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ambari/blob/4c49b4bd/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/AbstractControllerResourceProvider.java
--
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/AbstractControllerResourceProvider.java
 

ambari git commit: AMBARI-22012. BP deploys failing intermittently with error (magyari_sandor)

[magyari_sandor]

Repository: ambari
Updated Branches:
  refs/heads/branch-2.6 e09a3c8c2 -> 3b9db5cf1


AMBARI-22012. BP deploys failing intermittently with error  (magyari_sandor)


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

Branch: refs/heads/branch-2.6
Commit: 3b9db5cf16a8d950cc2229ecacf468dfb024e5b5
Parents: e09a3c8
Author: Sandor Magyari 
Authored: Fri Sep 22 17:48:54 2017 +0200
Committer: Sandor Magyari 
Committed: Mon Sep 25 21:32:17 2017 +0200

--
 .../events/ClusterConfigFinishedEvent.java  | 15 +++-
 .../ambari/server/topology/TopologyManager.java | 89 +---
 .../topology/tasks/ConfigureClusterTask.java| 13 ++-
 .../tasks/ConfigureClusterTaskFactory.java  |  3 +-
 .../server/utils/ManagedThreadPoolExecutor.java | 83 ++
 .../ClusterDeployWithStartOnlyTest.java |  2 +-
 ...InstallWithoutStartOnComponentLevelTest.java |  2 +-
 .../ClusterInstallWithoutStartTest.java |  2 +-
 .../topology/ConfigureClusterTaskTest.java  | 20 -
 .../utils/ManagedThreadPoolExecutorTest.java| 51 +++
 10 files changed, 238 insertions(+), 42 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/3b9db5cf/ambari-server/src/main/java/org/apache/ambari/server/events/ClusterConfigFinishedEvent.java
--
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/events/ClusterConfigFinishedEvent.java
 
b/ambari-server/src/main/java/org/apache/ambari/server/events/ClusterConfigFinishedEvent.java
index f0cac72..32c75f4 100644
--- 
a/ambari-server/src/main/java/org/apache/ambari/server/events/ClusterConfigFinishedEvent.java
+++ 
b/ambari-server/src/main/java/org/apache/ambari/server/events/ClusterConfigFinishedEvent.java
@@ -23,17 +23,27 @@ package org.apache.ambari.server.events;
  * cluster configuration is successfully updated.
  */
 public class ClusterConfigFinishedEvent extends AmbariEvent {
+
+  private final long clusterId;
   private final String clusterName;
 
 
-  public ClusterConfigFinishedEvent(String clusterName) {
+  public ClusterConfigFinishedEvent(long clusterId, String clusterName) {
 super(AmbariEventType.CLUSTER_CONFIG_FINISHED);
+this.clusterId = clusterId;
 this.clusterName = clusterName;
   }
 
   /**
+   * Get the cluster id
+   * @return
+   */
+  public long getClusterId() {
+return clusterId;
+  }
+
+  /**
* Get the cluster name
-   *
* @return
*/
   public String getClusterName() {
@@ -46,6 +56,7 @@ public class ClusterConfigFinishedEvent extends AmbariEvent {
   @Override
   public String toString() {
 StringBuilder buffer = new StringBuilder("ClusterConfigChangedEvent{");
+buffer.append("clusterId=").append(getClusterId());
 buffer.append("clusterName=").append(getClusterName());
 buffer.append("}");
 return buffer.toString();

http://git-wip-us.apache.org/repos/asf/ambari/blob/3b9db5cf/ambari-server/src/main/java/org/apache/ambari/server/topology/TopologyManager.java
--
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/topology/TopologyManager.java
 
b/ambari-server/src/main/java/org/apache/ambari/server/topology/TopologyManager.java
index 140bcb6..3029fff 100644
--- 
a/ambari-server/src/main/java/org/apache/ambari/server/topology/TopologyManager.java
+++ 
b/ambari-server/src/main/java/org/apache/ambari/server/topology/TopologyManager.java
@@ -29,9 +29,10 @@ import java.util.List;
 import java.util.Map;
 import java.util.Set;
 import java.util.concurrent.Callable;
-import java.util.concurrent.Executor;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
+import java.util.concurrent.LinkedBlockingQueue;
+import java.util.concurrent.TimeUnit;
 
 import javax.inject.Inject;
 
@@ -75,6 +76,7 @@ import 
org.apache.ambari.server.state.quicklinksprofile.QuickLinksProfile;
 import org.apache.ambari.server.topology.tasks.ConfigureClusterTask;
 import org.apache.ambari.server.topology.tasks.ConfigureClusterTaskFactory;
 import org.apache.ambari.server.topology.validators.TopologyValidatorService;
+import org.apache.ambari.server.utils.ManagedThreadPoolExecutor;
 import org.apache.ambari.server.utils.RetryHelper;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -103,9 +105,23 @@ public class TopologyManager {
   private static final String 
CLUSTER_CONFIG_TASK_MAX_TIME_IN_MILLIS_PROPERTY_NAME = 
"cluster_configure_task_timeout";
 
   private PersistedState persistedState;
+
+  /**
+   

ambari git commit: AMBARI-22012. BP deploys failing intermittently with error (magyari_sandor)

[magyari_sandor]

Repository: ambari
Updated Branches:
  refs/heads/trunk 6633a7bd4 -> b653ee0a5


AMBARI-22012. BP deploys failing intermittently with error  (magyari_sandor)


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

Branch: refs/heads/trunk
Commit: b653ee0a5967a8255f087f43a1cb6a878e765833
Parents: 6633a7b
Author: Sandor Magyari 
Authored: Fri Sep 22 17:48:54 2017 +0200
Committer: Sandor Magyari 
Committed: Mon Sep 25 21:19:53 2017 +0200

--
 .../events/ClusterConfigFinishedEvent.java  | 15 +++-
 .../ambari/server/topology/TopologyManager.java | 88 +---
 .../topology/tasks/ConfigureClusterTask.java| 13 ++-
 .../tasks/ConfigureClusterTaskFactory.java  |  3 +-
 .../server/utils/ManagedThreadPoolExecutor.java | 83 ++
 .../ClusterDeployWithStartOnlyTest.java |  2 +-
 ...InstallWithoutStartOnComponentLevelTest.java |  2 +-
 .../ClusterInstallWithoutStartTest.java |  2 +-
 .../topology/ConfigureClusterTaskTest.java  | 18 +++-
 .../utils/ManagedThreadPoolExecutorTest.java| 51 
 10 files changed, 236 insertions(+), 41 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/b653ee0a/ambari-server/src/main/java/org/apache/ambari/server/events/ClusterConfigFinishedEvent.java
--
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/events/ClusterConfigFinishedEvent.java
 
b/ambari-server/src/main/java/org/apache/ambari/server/events/ClusterConfigFinishedEvent.java
index cdb86ac..f0574d0 100644
--- 
a/ambari-server/src/main/java/org/apache/ambari/server/events/ClusterConfigFinishedEvent.java
+++ 
b/ambari-server/src/main/java/org/apache/ambari/server/events/ClusterConfigFinishedEvent.java
@@ -23,17 +23,27 @@ package org.apache.ambari.server.events;
  * cluster configuration is successfully updated.
  */
 public class ClusterConfigFinishedEvent extends AmbariEvent {
+
+  private final long clusterId;
   private final String clusterName;
 
 
-  public ClusterConfigFinishedEvent(String clusterName) {
+  public ClusterConfigFinishedEvent(long clusterId, String clusterName) {
 super(AmbariEventType.CLUSTER_CONFIG_FINISHED);
+this.clusterId = clusterId;
 this.clusterName = clusterName;
   }
 
   /**
+   * Get the cluster id
+   * @return
+   */
+  public long getClusterId() {
+return clusterId;
+  }
+
+  /**
* Get the cluster name
-   *
* @return
*/
   public String getClusterName() {
@@ -46,6 +56,7 @@ public class ClusterConfigFinishedEvent extends AmbariEvent {
   @Override
   public String toString() {
 StringBuilder buffer = new StringBuilder("ClusterConfigChangedEvent{");
+buffer.append("clusterId=").append(getClusterId());
 buffer.append("clusterName=").append(getClusterName());
 buffer.append("}");
 return buffer.toString();

http://git-wip-us.apache.org/repos/asf/ambari/blob/b653ee0a/ambari-server/src/main/java/org/apache/ambari/server/topology/TopologyManager.java
--
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/topology/TopologyManager.java
 
b/ambari-server/src/main/java/org/apache/ambari/server/topology/TopologyManager.java
index 3af62e8..9769fae 100644
--- 
a/ambari-server/src/main/java/org/apache/ambari/server/topology/TopologyManager.java
+++ 
b/ambari-server/src/main/java/org/apache/ambari/server/topology/TopologyManager.java
@@ -29,9 +29,10 @@ import java.util.List;
 import java.util.Map;
 import java.util.Set;
 import java.util.concurrent.Callable;
-import java.util.concurrent.Executor;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
+import java.util.concurrent.LinkedBlockingQueue;
+import java.util.concurrent.TimeUnit;
 
 import org.apache.ambari.server.AmbariException;
 import org.apache.ambari.server.actionmanager.HostRoleCommand;
@@ -73,6 +74,7 @@ import 
org.apache.ambari.server.state.quicklinksprofile.QuickLinksProfile;
 import org.apache.ambari.server.topology.tasks.ConfigureClusterTask;
 import org.apache.ambari.server.topology.tasks.ConfigureClusterTaskFactory;
 import org.apache.ambari.server.topology.validators.TopologyValidatorService;
+import org.apache.ambari.server.utils.ManagedThreadPoolExecutor;
 import org.apache.ambari.server.utils.RetryHelper;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -102,9 +104,23 @@ public class TopologyManager {
   private static final String 
CLUSTER_CONFIG_TASK_MAX_TIME_IN_MILLIS_PROPERTY_NAME = 

ambari git commit: AMBARI-22014. Patch upgrade is going into incorrect state during package installation with invalid VDF (ncole)

[ncole]

Repository: ambari
Updated Branches:
  refs/heads/branch-2.6 d7f1d9a09 -> e09a3c8c2


AMBARI-22014. Patch upgrade is going into incorrect state during package 
installation with invalid VDF (ncole)


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

Branch: refs/heads/branch-2.6
Commit: e09a3c8c22c4a287a050927b72bdc3948878bd16
Parents: d7f1d9a
Author: Nate Cole 
Authored: Mon Sep 25 14:13:50 2017 -0400
Committer: Nate Cole 
Committed: Mon Sep 25 14:14:06 2017 -0400

--
 .../server/controller/ControllerModule.java |   2 +
 .../controller/ResourceProviderFactory.java |   4 +
 .../AbstractControllerResourceProvider.java |   2 +-
 .../ClusterStackVersionResourceProvider.java|   9 +-
 .../internal/DefaultProviderModule.java |   2 -
 ...ClusterStackVersionResourceProviderTest.java | 219 ++-
 6 files changed, 84 insertions(+), 154 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/e09a3c8c/ambari-server/src/main/java/org/apache/ambari/server/controller/ControllerModule.java
--
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/controller/ControllerModule.java
 
b/ambari-server/src/main/java/org/apache/ambari/server/controller/ControllerModule.java
index 53c10c3..e3f1458 100644
--- 
a/ambari-server/src/main/java/org/apache/ambari/server/controller/ControllerModule.java
+++ 
b/ambari-server/src/main/java/org/apache/ambari/server/controller/ControllerModule.java
@@ -62,6 +62,7 @@ import org.apache.ambari.server.cleanup.ClasspathScannerUtils;
 import org.apache.ambari.server.configuration.Configuration;
 import org.apache.ambari.server.configuration.Configuration.ConnectionPoolType;
 import org.apache.ambari.server.configuration.Configuration.DatabaseType;
+import 
org.apache.ambari.server.controller.internal.ClusterStackVersionResourceProvider;
 import org.apache.ambari.server.controller.internal.ComponentResourceProvider;
 import org.apache.ambari.server.controller.internal.CredentialResourceProvider;
 import 
org.apache.ambari.server.controller.internal.HostComponentResourceProvider;
@@ -466,6 +467,7 @@ public class ControllerModule extends AbstractModule {
 .implement(ResourceProvider.class, Names.named("credential"), 
CredentialResourceProvider.class)
 .implement(ResourceProvider.class, Names.named("kerberosDescriptor"), 
KerberosDescriptorResourceProvider.class)
 .implement(ResourceProvider.class, Names.named("upgrade"), 
UpgradeResourceProvider.class)
+.implement(ResourceProvider.class, Names.named("clusterStackVersion"), 
ClusterStackVersionResourceProvider.class)
 .build(ResourceProviderFactory.class));
 
 install(new FactoryModuleBuilder().implement(

http://git-wip-us.apache.org/repos/asf/ambari/blob/e09a3c8c/ambari-server/src/main/java/org/apache/ambari/server/controller/ResourceProviderFactory.java
--
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/controller/ResourceProviderFactory.java
 
b/ambari-server/src/main/java/org/apache/ambari/server/controller/ResourceProviderFactory.java
index 9f9eaee..9cd1d74 100644
--- 
a/ambari-server/src/main/java/org/apache/ambari/server/controller/ResourceProviderFactory.java
+++ 
b/ambari-server/src/main/java/org/apache/ambari/server/controller/ResourceProviderFactory.java
@@ -22,6 +22,7 @@ package org.apache.ambari.server.controller;
 import java.util.Map;
 import java.util.Set;
 
+import 
org.apache.ambari.server.controller.internal.ClusterStackVersionResourceProvider;
 import org.apache.ambari.server.controller.internal.UpgradeResourceProvider;
 import org.apache.ambari.server.controller.spi.Resource;
 import org.apache.ambari.server.controller.spi.Resource.Type;
@@ -68,4 +69,7 @@ public interface ResourceProviderFactory {
   @Named("upgrade")
   UpgradeResourceProvider 
getUpgradeResourceProvider(AmbariManagementController managementController);
 
+  @Named("clusterStackVersion")
+  ClusterStackVersionResourceProvider 
getClusterStackVersionResourceProvider(AmbariManagementController 
managementController);
+
 }
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ambari/blob/e09a3c8c/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/AbstractControllerResourceProvider.java
--
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/AbstractControllerResourceProvider.java
 

[1/2] ambari git commit: AMBARI-22045. Infra Solr client cleanup: make infra-solr-client script usable with symlinks (oleewere)

[oleewere]

Repository: ambari
Updated Branches:
  refs/heads/trunk 653d2f260 -> 6633a7bd4


AMBARI-22045. Infra Solr client cleanup: make infra-solr-client script usable 
with symlinks (oleewere)


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

Branch: refs/heads/trunk
Commit: 520d8fcce38e9c2edf8d972625d5a9aa4663c04b
Parents: 653d2f2
Author: Oliver Szabo 
Authored: Sun Sep 24 01:08:11 2017 +0200
Committer: Oliver Szabo 
Committed: Mon Sep 25 20:18:02 2017 +0200

--
 .../apache/ambari/infra/solr/AmbariSolrCloudCLI.java  | 12 ++--
 .../src/main/resources/log4j.properties   |  6 +-
 .../src/main/resources/solrCloudCli.sh|  8 +++-
 .../src/main/resources/solrIndexHelper.sh | 14 ++
 .../0.1.0/properties/solr-client-log4j.properties.j2  |  4 
 5 files changed, 32 insertions(+), 12 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/520d8fcc/ambari-infra/ambari-infra-solr-client/src/main/java/org/apache/ambari/infra/solr/AmbariSolrCloudCLI.java
--
diff --git 
a/ambari-infra/ambari-infra-solr-client/src/main/java/org/apache/ambari/infra/solr/AmbariSolrCloudCLI.java
 
b/ambari-infra/ambari-infra-solr-client/src/main/java/org/apache/ambari/infra/solr/AmbariSolrCloudCLI.java
index 70bc232..95708d7 100644
--- 
a/ambari-infra/ambari-infra-solr-client/src/main/java/org/apache/ambari/infra/solr/AmbariSolrCloudCLI.java
+++ 
b/ambari-infra/ambari-infra-solr-client/src/main/java/org/apache/ambari/infra/solr/AmbariSolrCloudCLI.java
@@ -66,7 +66,7 @@ public class AmbariSolrCloudCLI {
   + "\n./solrCloudCli.sh --secure-znode -z host1:2181,host2:2181 -zn 
/ambari-solr -su logsearch,atlas,ranger --jaas-file /etc/myconf/jaas_file"
   + "\n./solrCloudCli.sh --unsecure-znode -z host1:2181,host2:2181 -zn 
/ambari-solr --jaas-file /etc/myconf/jaas_file"
   + "\n./solrCloudCli.sh --secure-solr-znode -z host1:2181,host2:2181 -zn 
/ambari-solr -su logsearch,atlas,ranger --jaas-file /etc/myconf/jaas_file"
-  + "\n./solrCloudCli.sh --setup-kerberos-plugin -z host1:2181,host2:2181 
-zn /ambari-solr --security-json-location /etc/infra-solr/conf/security.json\n";
+  + "\n./solrCloudCli.sh --setup-kerberos-plugin -z host1:2181,host2:2181 
-zn /ambari-solr --security-json-location /etc/infra-solr/conf/security.json\n 
";
 
   public static void main(String[] args) {
 Options options = new Options();
@@ -126,22 +126,22 @@ public class AmbariSolrCloudCLI {
 
 final Option secureSolrZnodeOption = Option.builder("ssz")
   .longOpt(SECURE_SOLR_ZNODE_COMMAND)
-  .desc("Set acls for solr znode")
+  .desc("Set acls for solr znode (command)")
   .build();
 
 final Option secureZnodeOption = Option.builder("sz")
   .longOpt(SECURE_ZNODE_COMMAND)
-  .desc("Set acls for znode")
+  .desc("Set acls for znode (command)")
   .build();
 
 final Option unsecureZnodeOption = Option.builder("uz")
   .longOpt(UNSECURE_ZNODE_COMMAND)
-  .desc("Disable security for znode")
+  .desc("Disable security for znode (command)")
   .build();
 
 final Option removeAdminHandlerOption = Option.builder("rah")
   .longOpt(REMOVE_ADMIN_HANDLERS)
-  .desc("Remove AdminHandlers request handler from solrconfig.xml")
+  .desc("Remove AdminHandlers request handler from solrconfig.xml 
(command)")
   .build();
 
 final Option shardNameOption = Option.builder("sn")
@@ -428,7 +428,7 @@ public class AmbariSolrCloudCLI {
   } else {
 List commands = Arrays.asList(CREATE_COLLECTION_COMMAND, 
CREATE_SHARD_COMMAND, UPLOAD_CONFIG_COMMAND,
   DOWNLOAD_CONFIG_COMMAND, CONFIG_CHECK_COMMAND, SET_CLUSTER_PROP, 
CREATE_ZNODE, SECURE_ZNODE_COMMAND, UNSECURE_ZNODE_COMMAND,
-  SECURE_SOLR_ZNODE_COMMAND, CHECK_ZNODE, SETUP_KERBEROS_PLUGIN);
+  SECURE_SOLR_ZNODE_COMMAND, CHECK_ZNODE, SETUP_KERBEROS_PLUGIN, 
REMOVE_ADMIN_HANDLERS);
 helpFormatter.printHelp(CMD_LINE_SYNTAX, options);
 exit(1, String.format("One of the supported commands is required 
(%s)", StringUtils.join(commands, "|")));
   }

http://git-wip-us.apache.org/repos/asf/ambari/blob/520d8fcc/ambari-infra/ambari-infra-solr-client/src/main/resources/log4j.properties
--
diff --git 
a/ambari-infra/ambari-infra-solr-client/src/main/resources/log4j.properties 
b/ambari-infra/ambari-infra-solr-client/src/main/resources/log4j.properties
index e8dca12..4779596 100644
--- 

[2/2] ambari git commit: AMBARI-22046. Infra Manager: Integrate with Spring Boot (oleewere)

[oleewere]

AMBARI-22046. Infra Manager: Integrate with Spring Boot (oleewere)


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

Branch: refs/heads/trunk
Commit: 6633a7bd44fcbc660956a7e188e2ac63472c6de3
Parents: 520d8fc
Author: Oliver Szabo 
Authored: Sun Sep 24 14:22:14 2017 +0200
Committer: Oliver Szabo 
Committed: Mon Sep 25 20:18:03 2017 +0200

--
 ambari-infra/ambari-infra-manager/.gitignore|   2 +
 .../ambari-infra-manager/docker/bin/start.sh|   2 +-
 ambari-infra/ambari-infra-manager/pom.xml   | 172 ---
 .../org/apache/ambari/infra/InfraManager.java   | 208 +++
 .../infra/common/InfraManagerConstants.java |  31 ---
 .../infra/conf/InfraManagerDataConfig.java  |  37 
 .../conf/InfraManagerJerseyResourceConfig.java  |  37 
 .../infra/conf/InfraManagerServletConfig.java   |  83 
 .../infra/conf/StaticResourceConfiguration.java |  49 +
 .../infra/doc/InfraManagerApiDocStorage.java|  90 
 .../ambari/infra/job/dummy/DummyItemWriter.java |  15 +-
 .../ambari/infra/rest/ApiDocResource.java   |  56 +
 .../src/main/resources/infra-manager.properties |   4 +-
 .../src/main/resources/log4j.xml|  31 ---
 .../src/main/resources/log4j2.xml   |  41 
 .../src/main/resources/static/index.html|  24 +++
 .../src/main/resources/swagger/swagger.html |  36 ++--
 .../src/main/resources/webapp/index.html|  24 ---
 18 files changed, 556 insertions(+), 386 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/6633a7bd/ambari-infra/ambari-infra-manager/.gitignore
--
diff --git a/ambari-infra/ambari-infra-manager/.gitignore 
b/ambari-infra/ambari-infra-manager/.gitignore
new file mode 100644
index 000..ba4e51d
--- /dev/null
+++ b/ambari-infra/ambari-infra-manager/.gitignore
@@ -0,0 +1,2 @@
+out/*
+*.pid
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ambari/blob/6633a7bd/ambari-infra/ambari-infra-manager/docker/bin/start.sh
--
diff --git a/ambari-infra/ambari-infra-manager/docker/bin/start.sh 
b/ambari-infra/ambari-infra-manager/docker/bin/start.sh
index 076c06f..2402778 100755
--- a/ambari-infra/ambari-infra-manager/docker/bin/start.sh
+++ b/ambari-infra/ambari-infra-manager/docker/bin/start.sh
@@ -16,6 +16,6 @@
 
 export INFRA_MANAGER_OPTS="-Xdebug 
-Xrunjdwp:transport=dt_socket,address=5007,server=y,suspend=n"
 touch /root/infra-manager.log
-/root/ambari-infra-manager/infraManager.sh --port 61890 > 
/root/infra-manager.log
+/root/ambari-infra-manager/infraManager.sh > /root/infra-manager.log
 tail -f /root/infra-manager.log
 

http://git-wip-us.apache.org/repos/asf/ambari/blob/6633a7bd/ambari-infra/ambari-infra-manager/pom.xml
--
diff --git a/ambari-infra/ambari-infra-manager/pom.xml 
b/ambari-infra/ambari-infra-manager/pom.xml
index b9f2a77..aa86da8 100644
--- a/ambari-infra/ambari-infra-manager/pom.xml
+++ b/ambari-infra/ambari-infra-manager/pom.xml
@@ -30,15 +30,17 @@
   ambari-infra-manager
 
   
-4.2.5.RELEASE
-4.0.4.RELEASE
-2.23.2
-9.2.11.v20150529
-1.5.8
-2.0.2.RELEASE
-0.6.0
+4.3.10.RELEASE
+4.2.3.RELEASE
+2.0.4.RELEASE
+2.25.1
+9.4.6.v20170531
 3.0.7.RELEASE
 3.8.11.2
+2.0.2.RELEASE
+1.5.6.RELEASE
+1.5.16
+0.6.0
   
 
   
@@ -69,6 +71,21 @@
 
   
   
+org.springframework.boot
+spring-boot-maven-plugin
+${spring-boot.version}
+
+  exec
+
+
+  
+
+  repackage
+
+  
+
+  
+  
 org.apache.maven.plugins
 maven-dependency-plugin
 2.8
@@ -161,53 +178,70 @@
   spring-security-ldap
   ${spring.security.version}
 
+
 
-  org.glassfish.jersey.ext
-  jersey-spring3
-  2.23.2
+  org.springframework.boot
+  spring-boot-starter
+  ${spring-boot.version}
   
 
-  org.springframework
-  *
+  org.springframework.boot
+  spring-boot-starter-logging
 
   
 
 
-  org.glassfish.jersey.connectors
-  jersey-apache-connector
-  ${jersey.version}
+  org.springframework.boot
+  spring-boot-starter-log4j2
+  ${spring-boot.version}
 
 
-  org.glassfish.jersey.core
-  jersey-client
-  ${jersey.version}
+  

ambari git commit: AMBARI-22054 Log Search UI: implement 'Capture' functionality. (ababiichuk)

[ababiichuk]

Repository: ambari
Updated Branches:
  refs/heads/trunk 08da96111 -> 653d2f260


AMBARI-22054 Log Search UI: implement 'Capture' functionality. (ababiichuk)


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

Branch: refs/heads/trunk
Commit: 653d2f260c05ea0e8efa4400b9d5accb5e5b39b7
Parents: 08da961
Author: ababiichuk 
Authored: Mon Sep 25 20:00:41 2017 +0300
Committer: ababiichuk 
Committed: Mon Sep 25 20:00:41 2017 +0300

--
 .../ambari-logsearch-web/src/app/app.module.ts  |  6 +-
 .../queries/audit-logs-query-params.class.ts|  2 -
 .../dropdown-button.component.spec.ts   | 21 ++-
 .../filter-button.component.spec.ts | 21 ++-
 .../filter-dropdown.component.spec.ts   | 26 +++-
 .../filters-panel/filters-panel.component.html  | 11 ++--
 .../filters-panel/filters-panel.component.less  |  4 ++
 .../filters-panel.component.spec.ts |  6 +-
 .../filters-panel/filters-panel.component.ts|  4 ++
 .../logs-container.component.html   |  5 ++
 .../logs-container.component.less   |  4 ++
 .../logs-container.component.spec.ts|  4 +-
 .../logs-container/logs-container.component.ts  | 10 
 .../menu-button/menu-button.component.html  |  2 +-
 .../menu-button/menu-button.component.spec.ts   | 22 ++-
 .../app/components/modal/modal.component.html   |  2 +-
 .../search-box/search-box.component.html|  2 +-
 .../time-range-picker.component.html|  4 +-
 .../time-range-picker.component.ts  | 13 ++--
 .../timezone-picker.component.spec.ts   | 21 ++-
 .../components/top-menu/top-menu.component.html |  2 +-
 .../top-menu/top-menu.component.spec.ts |  2 +
 .../src/app/components/variables.less   |  2 +-
 .../src/app/pipes/timer-seconds.pipe.spec.ts| 37 
 .../src/app/pipes/timer-seconds.pipe.ts | 41 +
 .../services/component-actions.service.spec.ts  | 21 ++-
 .../app/services/component-actions.service.ts   | 15 -
 .../src/app/services/filtering.service.ts   | 63 +---
 .../src/app/services/logs-container.service.ts  |  6 +-
 .../src/app/services/mock-api-data.service.ts   |  4 +-
 .../src/app/services/utils.service.ts   |  6 ++
 .../src/assets/i18n/en.json | 10 ++--
 32 files changed, 328 insertions(+), 71 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/653d2f26/ambari-logsearch/ambari-logsearch-web/src/app/app.module.ts
--
diff --git a/ambari-logsearch/ambari-logsearch-web/src/app/app.module.ts 
b/ambari-logsearch/ambari-logsearch-web/src/app/app.module.ts
index fca68b5..c4dc698 100644
--- a/ambari-logsearch/ambari-logsearch-web/src/app/app.module.ts
+++ b/ambari-logsearch/ambari-logsearch-web/src/app/app.module.ts
@@ -78,8 +78,9 @@ import {TimeRangePickerComponent} from 
'@app/components/time-range-picker/time-r
 import {DatePickerComponent} from 
'@app/components/date-picker/date-picker.component';
 
 import {TimeZoneAbbrPipe} from '@app/pipes/timezone-abbr.pipe';
+import {TimerSecondsPipe} from '@app/pipes/timer-seconds.pipe';
 
-export function HttpLoaderFactory(http: Http) {
+export function HttpLoaderFactory(http: Http): TranslateHttpLoader {
   // adding 'static' parameter to step over mock data request
   return new TranslateHttpLoader(http, 'resources/assets/i18n/', 
'.json?static=true');
 }
@@ -123,7 +124,8 @@ export function getXHRBackend(injector: Injector, browser: 
BrowserXhr, xsrf: XSR
 SearchBoxComponent,
 TimeRangePickerComponent,
 DatePickerComponent,
-TimeZoneAbbrPipe
+TimeZoneAbbrPipe,
+TimerSecondsPipe
   ],
   imports: [
 BrowserModule,

http://git-wip-us.apache.org/repos/asf/ambari/blob/653d2f26/ambari-logsearch/ambari-logsearch-web/src/app/classes/queries/audit-logs-query-params.class.ts
--
diff --git 
a/ambari-logsearch/ambari-logsearch-web/src/app/classes/queries/audit-logs-query-params.class.ts
 
b/ambari-logsearch/ambari-logsearch-web/src/app/classes/queries/audit-logs-query-params.class.ts
index d179376..e36bf18 100644
--- 
a/ambari-logsearch/ambari-logsearch-web/src/app/classes/queries/audit-logs-query-params.class.ts
+++ 
b/ambari-logsearch/ambari-logsearch-web/src/app/classes/queries/audit-logs-query-params.class.ts
@@ -36,8 +36,6 @@ export class AuditLogsQueryParams extends QueryParams {
   startIndex: string;
   sortBy?: string;
   sortType?: string;
-  start_time?: 

ambari git commit: AMBARI-22051 - VDFs Which Are Correct Never Get Resolved (jonathanhurley)

[jonathanhurley]

Repository: ambari
Updated Branches:
  refs/heads/trunk 4b59ba820 -> 08da96111


AMBARI-22051 -  VDFs Which Are Correct Never Get Resolved (jonathanhurley)


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

Branch: refs/heads/trunk
Commit: 08da9611188d9c4c246ee6d77894da5edf317860
Parents: 4b59ba8
Author: Jonathan Hurley 
Authored: Mon Sep 25 10:11:52 2017 -0400
Committer: Jonathan Hurley 
Committed: Mon Sep 25 12:36:44 2017 -0400

--
 .../DistributeRepositoriesActionListener.java   |  7 
 .../listeners/upgrade/StackVersionListener.java |  7 
 .../upgrade/StackVersionListenerTest.java   | 41 
 3 files changed, 55 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/08da9611/ambari-server/src/main/java/org/apache/ambari/server/events/listeners/upgrade/DistributeRepositoriesActionListener.java
--
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/events/listeners/upgrade/DistributeRepositoriesActionListener.java
 
b/ambari-server/src/main/java/org/apache/ambari/server/events/listeners/upgrade/DistributeRepositoriesActionListener.java
index 376e20d..1944761 100644
--- 
a/ambari-server/src/main/java/org/apache/ambari/server/events/listeners/upgrade/DistributeRepositoriesActionListener.java
+++ 
b/ambari-server/src/main/java/org/apache/ambari/server/events/listeners/upgrade/DistributeRepositoriesActionListener.java
@@ -127,6 +127,13 @@ public class DistributeRepositoriesActionListener {
 repoVersion.setResolved(true);
 repoVersionDAO.merge(repoVersion);
 repositoryVersion = actualVersion;
+  } else {
+// the reported versions are the same - we should ensure that the
+// repo is resolved
+if (!repoVersion.isResolved()) {
+  repoVersion.setResolved(true);
+  repoVersionDAO.merge(repoVersion);
+}
   }
 }
   }

http://git-wip-us.apache.org/repos/asf/ambari/blob/08da9611/ambari-server/src/main/java/org/apache/ambari/server/events/listeners/upgrade/StackVersionListener.java
--
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/events/listeners/upgrade/StackVersionListener.java
 
b/ambari-server/src/main/java/org/apache/ambari/server/events/listeners/upgrade/StackVersionListener.java
index 0ce64bf..e5298dc 100644
--- 
a/ambari-server/src/main/java/org/apache/ambari/server/events/listeners/upgrade/StackVersionListener.java
+++ 
b/ambari-server/src/main/java/org/apache/ambari/server/events/listeners/upgrade/StackVersionListener.java
@@ -101,6 +101,13 @@ public class StackVersionListener {
   rve.setVersion(newVersion);
   rve.setResolved(true);
   repositoryVersionDAO.merge(rve);
+} else {
+  // the reported versions are the same - we should ensure that the 
repo
+  // is resolved
+  if (!rve.isResolved()) {
+rve.setResolved(true);
+repositoryVersionDAO.merge(rve);
+  }
 }
   }
 }

http://git-wip-us.apache.org/repos/asf/ambari/blob/08da9611/ambari-server/src/test/java/org/apache/ambari/server/events/listeners/upgrade/StackVersionListenerTest.java
--
diff --git 
a/ambari-server/src/test/java/org/apache/ambari/server/events/listeners/upgrade/StackVersionListenerTest.java
 
b/ambari-server/src/test/java/org/apache/ambari/server/events/listeners/upgrade/StackVersionListenerTest.java
index 68d9c56..5e12cdf 100644
--- 
a/ambari-server/src/test/java/org/apache/ambari/server/events/listeners/upgrade/StackVersionListenerTest.java
+++ 
b/ambari-server/src/test/java/org/apache/ambari/server/events/listeners/upgrade/StackVersionListenerTest.java
@@ -330,6 +330,47 @@ public class StackVersionListenerTest extends 
EasyMockSupport {
   }
 
   /**
+   * Tests that if a component advertises a version and the repository already
+   * matches, that we ensure that it is marked as resolved.
+   *
+   * @throws Exception
+   */
+  @Test
+  public void testRepositoryResolvedWhenVersionsMatch() throws Exception {
+String version = "2.4.0.0";
+
+expect(sch.getVersion()).andReturn(version);
+expect(componentInfo.isVersionAdvertised()).andReturn(true).once();
+
+RepositoryVersionDAO dao = createNiceMock(RepositoryVersionDAO.class);
+RepositoryVersionEntity entity = 
createNiceMock(RepositoryVersionEntity.class);
+

ambari git commit: AMBARI-22051 - VDFs Which Are Correct Never Get Resolved (jonathanhurley)

[jonathanhurley]

Repository: ambari
Updated Branches:
  refs/heads/branch-2.6 1cf1a2cec -> d7f1d9a09


AMBARI-22051 -  VDFs Which Are Correct Never Get Resolved (jonathanhurley)


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

Branch: refs/heads/branch-2.6
Commit: d7f1d9a09c53b62ef3ac39ca6189edc2f2d2de3e
Parents: 1cf1a2c
Author: Jonathan Hurley 
Authored: Mon Sep 25 10:11:52 2017 -0400
Committer: Jonathan Hurley 
Committed: Mon Sep 25 12:26:21 2017 -0400

--
 .../DistributeRepositoriesActionListener.java   |  7 
 .../listeners/upgrade/StackVersionListener.java |  7 
 .../upgrade/StackVersionListenerTest.java   | 41 
 3 files changed, 55 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/d7f1d9a0/ambari-server/src/main/java/org/apache/ambari/server/events/listeners/upgrade/DistributeRepositoriesActionListener.java
--
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/events/listeners/upgrade/DistributeRepositoriesActionListener.java
 
b/ambari-server/src/main/java/org/apache/ambari/server/events/listeners/upgrade/DistributeRepositoriesActionListener.java
index 376e20d..1944761 100644
--- 
a/ambari-server/src/main/java/org/apache/ambari/server/events/listeners/upgrade/DistributeRepositoriesActionListener.java
+++ 
b/ambari-server/src/main/java/org/apache/ambari/server/events/listeners/upgrade/DistributeRepositoriesActionListener.java
@@ -127,6 +127,13 @@ public class DistributeRepositoriesActionListener {
 repoVersion.setResolved(true);
 repoVersionDAO.merge(repoVersion);
 repositoryVersion = actualVersion;
+  } else {
+// the reported versions are the same - we should ensure that the
+// repo is resolved
+if (!repoVersion.isResolved()) {
+  repoVersion.setResolved(true);
+  repoVersionDAO.merge(repoVersion);
+}
   }
 }
   }

http://git-wip-us.apache.org/repos/asf/ambari/blob/d7f1d9a0/ambari-server/src/main/java/org/apache/ambari/server/events/listeners/upgrade/StackVersionListener.java
--
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/events/listeners/upgrade/StackVersionListener.java
 
b/ambari-server/src/main/java/org/apache/ambari/server/events/listeners/upgrade/StackVersionListener.java
index 0ce64bf..e5298dc 100644
--- 
a/ambari-server/src/main/java/org/apache/ambari/server/events/listeners/upgrade/StackVersionListener.java
+++ 
b/ambari-server/src/main/java/org/apache/ambari/server/events/listeners/upgrade/StackVersionListener.java
@@ -101,6 +101,13 @@ public class StackVersionListener {
   rve.setVersion(newVersion);
   rve.setResolved(true);
   repositoryVersionDAO.merge(rve);
+} else {
+  // the reported versions are the same - we should ensure that the 
repo
+  // is resolved
+  if (!rve.isResolved()) {
+rve.setResolved(true);
+repositoryVersionDAO.merge(rve);
+  }
 }
   }
 }

http://git-wip-us.apache.org/repos/asf/ambari/blob/d7f1d9a0/ambari-server/src/test/java/org/apache/ambari/server/events/listeners/upgrade/StackVersionListenerTest.java
--
diff --git 
a/ambari-server/src/test/java/org/apache/ambari/server/events/listeners/upgrade/StackVersionListenerTest.java
 
b/ambari-server/src/test/java/org/apache/ambari/server/events/listeners/upgrade/StackVersionListenerTest.java
index 6548c08..3ea76cb 100644
--- 
a/ambari-server/src/test/java/org/apache/ambari/server/events/listeners/upgrade/StackVersionListenerTest.java
+++ 
b/ambari-server/src/test/java/org/apache/ambari/server/events/listeners/upgrade/StackVersionListenerTest.java
@@ -330,6 +330,47 @@ public class StackVersionListenerTest extends 
EasyMockSupport {
   }
 
   /**
+   * Tests that if a component advertises a version and the repository already
+   * matches, that we ensure that it is marked as resolved.
+   *
+   * @throws Exception
+   */
+  @Test
+  public void testRepositoryResolvedWhenVersionsMatch() throws Exception {
+String version = "2.4.0.0";
+
+expect(sch.getVersion()).andReturn(version);
+expect(componentInfo.isVersionAdvertised()).andReturn(true).once();
+
+RepositoryVersionDAO dao = createNiceMock(RepositoryVersionDAO.class);
+RepositoryVersionEntity entity = 

[4/4] ambari git commit: AMBARI-22029. Download Client Configs fails. (mpapirkovskyy)

[mpapirkovskyy]

AMBARI-22029. Download Client Configs fails. (mpapirkovskyy)


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

Branch: refs/heads/trunk
Commit: 4b59ba8203abf46d2c5bfa766bbf968ab964cff4
Parents: 0393451
Author: Myroslav Papirkovskyi 
Authored: Mon Sep 25 19:09:44 2017 +0300
Committer: Myroslav Papirkovskyi 
Committed: Mon Sep 25 19:10:33 2017 +0300

--
 .../server/controller/internal/ClientConfigResourceProvider.java   | 2 ++
 .../OOZIE/4.0.0.2.0/package/scripts/params_linux.py| 2 ++
 2 files changed, 4 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/4b59ba82/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ClientConfigResourceProvider.java
--
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ClientConfigResourceProvider.java
 
b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ClientConfigResourceProvider.java
index 166fc5f..9f4a4a0 100644
--- 
a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ClientConfigResourceProvider.java
+++ 
b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ClientConfigResourceProvider.java
@@ -445,6 +445,8 @@ public class ClientConfigResourceProvider extends 
AbstractControllerResourceProv
 jsonContent.put("hostname", hostName);
 jsonContent.put("public_hostname", publicHostName);
 jsonContent.put("clusterName", cluster.getClusterName());
+jsonContent.put("serviceName", serviceName);
+jsonContent.put("role", componentName);
 jsonConfigurations = gson.toJson(jsonContent);
 
 File tmpDirectory = new File(TMP_PATH);

http://git-wip-us.apache.org/repos/asf/ambari/blob/4b59ba82/ambari-server/src/main/resources/common-services/OOZIE/4.0.0.2.0/package/scripts/params_linux.py
--
diff --git 
a/ambari-server/src/main/resources/common-services/OOZIE/4.0.0.2.0/package/scripts/params_linux.py
 
b/ambari-server/src/main/resources/common-services/OOZIE/4.0.0.2.0/package/scripts/params_linux.py
index e856c01..b66e157 100644
--- 
a/ambari-server/src/main/resources/common-services/OOZIE/4.0.0.2.0/package/scripts/params_linux.py
+++ 
b/ambari-server/src/main/resources/common-services/OOZIE/4.0.0.2.0/package/scripts/params_linux.py
@@ -57,6 +57,8 @@ architecture = get_architecture()
 
 # Needed since this writes out the Atlas Hive Hook config file.
 cluster_name = config['clusterName']
+serviceName = config['serviceName']
+role = config['role']
 
 hostname = config["hostname"]
 

[2/4] ambari git commit: AMBARI-22029. Download Client Configs fails. (mpapirkovskyy)

[mpapirkovskyy]

AMBARI-22029. Download Client Configs fails. (mpapirkovskyy)


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

Branch: refs/heads/branch-2.6
Commit: 1cf1a2cecde6c229397e0568f8f9cf36599c6bc9
Parents: 1a86772
Author: Myroslav Papirkovskyi 
Authored: Mon Sep 25 19:09:44 2017 +0300
Committer: Myroslav Papirkovskyi 
Committed: Mon Sep 25 19:09:44 2017 +0300

--
 .../server/controller/internal/ClientConfigResourceProvider.java   | 2 ++
 .../OOZIE/4.0.0.2.0/package/scripts/params_linux.py| 2 ++
 2 files changed, 4 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/1cf1a2ce/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ClientConfigResourceProvider.java
--
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ClientConfigResourceProvider.java
 
b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ClientConfigResourceProvider.java
index fb90e15..9d2b39e 100644
--- 
a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ClientConfigResourceProvider.java
+++ 
b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ClientConfigResourceProvider.java
@@ -447,6 +447,8 @@ public class ClientConfigResourceProvider extends 
AbstractControllerResourceProv
 jsonContent.put("hostname", hostName);
 jsonContent.put("public_hostname", publicHostName);
 jsonContent.put("clusterName", cluster.getClusterName());
+jsonContent.put("serviceName", serviceName);
+jsonContent.put("role", componentName);
 jsonConfigurations = gson.toJson(jsonContent);
 
 File tmpDirectory = new File(TMP_PATH);

http://git-wip-us.apache.org/repos/asf/ambari/blob/1cf1a2ce/ambari-server/src/main/resources/common-services/OOZIE/4.0.0.2.0/package/scripts/params_linux.py
--
diff --git 
a/ambari-server/src/main/resources/common-services/OOZIE/4.0.0.2.0/package/scripts/params_linux.py
 
b/ambari-server/src/main/resources/common-services/OOZIE/4.0.0.2.0/package/scripts/params_linux.py
index 4326527..cd1f7ad 100644
--- 
a/ambari-server/src/main/resources/common-services/OOZIE/4.0.0.2.0/package/scripts/params_linux.py
+++ 
b/ambari-server/src/main/resources/common-services/OOZIE/4.0.0.2.0/package/scripts/params_linux.py
@@ -56,6 +56,8 @@ architecture = get_architecture()
 
 # Needed since this writes out the Atlas Hive Hook config file.
 cluster_name = config['clusterName']
+serviceName = config['serviceName']
+role = config['role']
 
 hostname = config["hostname"]
 

[3/4] ambari git commit: AMBARI-22026. Restart of all components on host operation failed with 500 status code. (mpapirkovskyy)

[mpapirkovskyy]

AMBARI-22026. Restart of all components on host operation failed with 500 
status code. (mpapirkovskyy)


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

Branch: refs/heads/trunk
Commit: 0393451c43fe06b7cac72afebd2109d9298197a8
Parents: 999daef
Author: Myroslav Papirkovskyi 
Authored: Mon Sep 25 19:08:49 2017 +0300
Committer: Myroslav Papirkovskyi 
Committed: Mon Sep 25 19:10:24 2017 +0300

--
 .../AmbariCustomCommandExecutionHelper.java | 16 ++--
 1 file changed, 10 insertions(+), 6 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/0393451c/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariCustomCommandExecutionHelper.java
--
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariCustomCommandExecutionHelper.java
 
b/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariCustomCommandExecutionHelper.java
index 38a02ef..d0dd7e0 100644
--- 
a/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariCustomCommandExecutionHelper.java
+++ 
b/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariCustomCommandExecutionHelper.java
@@ -1524,14 +1524,18 @@ public class AmbariCustomCommandExecutionHelper {
 if (actionName.equals(START_COMMAND_NAME) || 
actionName.equals(RESTART_COMMAND_NAME)) {
   Cluster cluster = clusters.getCluster(clusterName);
   StackId stackId = null;
-  try {
-Service service = cluster.getService(serviceName);
-stackId = service.getDesiredStackId();
-  } catch (AmbariException e) {
-LOG.debug("Could not load service {}, skipping topology check", 
serviceName);
-stackId = cluster.getDesiredStackVersion();
+  if (serviceName != null) {
+try {
+  Service service = cluster.getService(serviceName);
+  stackId = service.getDesiredStackId();
+} catch (AmbariException e) {
+  LOG.debug("Could not load service {}, skipping topology check", 
serviceName);
+}
   }
 
+  if (stackId == null) {
+stackId = cluster.getDesiredStackVersion();
+  }
 
   AmbariMetaInfo ambariMetaInfo = managementController.getAmbariMetaInfo();
 

[1/4] ambari git commit: AMBARI-22026. Restart of all components on host operation failed with 500 status code. (mpapirkovskyy)

[mpapirkovskyy]

Repository: ambari
Updated Branches:
  refs/heads/branch-2.6 68b31ac2c -> 1cf1a2cec
  refs/heads/trunk 999daefe0 -> 4b59ba820


AMBARI-22026. Restart of all components on host operation failed with 500 
status code. (mpapirkovskyy)


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

Branch: refs/heads/branch-2.6
Commit: 1a867723b62abd1706cc1d088502f1973c7ccfba
Parents: 68b31ac
Author: Myroslav Papirkovskyi 
Authored: Mon Sep 25 19:08:49 2017 +0300
Committer: Myroslav Papirkovskyi 
Committed: Mon Sep 25 19:08:49 2017 +0300

--
 .../AmbariCustomCommandExecutionHelper.java | 16 ++--
 1 file changed, 10 insertions(+), 6 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/1a867723/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariCustomCommandExecutionHelper.java
--
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariCustomCommandExecutionHelper.java
 
b/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariCustomCommandExecutionHelper.java
index 2b2144c..5f26565 100644
--- 
a/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariCustomCommandExecutionHelper.java
+++ 
b/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariCustomCommandExecutionHelper.java
@@ -1527,14 +1527,18 @@ public class AmbariCustomCommandExecutionHelper {
 if (actionName.equals(START_COMMAND_NAME) || 
actionName.equals(RESTART_COMMAND_NAME)) {
   Cluster cluster = clusters.getCluster(clusterName);
   StackId stackId = null;
-  try {
-Service service = cluster.getService(serviceName);
-stackId = service.getDesiredStackId();
-  } catch (AmbariException e) {
-LOG.debug("Could not load service {}, skipping topology check", 
serviceName);
-stackId = cluster.getDesiredStackVersion();
+  if (serviceName != null) {
+try {
+  Service service = cluster.getService(serviceName);
+  stackId = service.getDesiredStackId();
+} catch (AmbariException e) {
+  LOG.debug("Could not load service {}, skipping topology check", 
serviceName);
+}
   }
 
+  if (stackId == null) {
+stackId = cluster.getDesiredStackVersion();
+  }
 
   AmbariMetaInfo ambariMetaInfo = managementController.getAmbariMetaInfo();
 

ambari git commit: AMBARI-22017 stack advisor recommends all components on single host for HDP-2.6 Ambari trunk build (dsen)

[dsen]

Repository: ambari
Updated Branches:
  refs/heads/trunk 986a65dbf -> 999daefe0


AMBARI-22017 stack advisor recommends all components on single host for HDP-2.6 
Ambari trunk build (dsen)


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

Branch: refs/heads/trunk
Commit: 999daefe0f09b92f42e50ff12f66dd95a112a003
Parents: 986a65d
Author: Dmytro Sen 
Authored: Mon Sep 25 16:39:09 2017 +0300
Committer: Dmytro Sen 
Committed: Mon Sep 25 16:39:09 2017 +0300

--
 .../stacks/HDP/2.1/services/stack_advisor.py|  4 +++
 .../stacks/2.1/common/test_stack_advisor.py | 28 
 2 files changed, 32 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/999daefe/ambari-server/src/main/resources/stacks/HDP/2.1/services/stack_advisor.py
--
diff --git 
a/ambari-server/src/main/resources/stacks/HDP/2.1/services/stack_advisor.py 
b/ambari-server/src/main/resources/stacks/HDP/2.1/services/stack_advisor.py
index ddd795f..aefb603 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.1/services/stack_advisor.py
+++ b/ambari-server/src/main/resources/stacks/HDP/2.1/services/stack_advisor.py
@@ -86,6 +86,10 @@ class HDP21StackAdvisor(HDP206StackAdvisor):
 
 Must be overriden in child class.
 """
+
+# since old stack advisors are extending each other they should call 
parent method first
+super(HDP21StackAdvisor, self).modifyComponentLayoutSchemes()
+
 self.componentLayoutSchemes.update({
   'APP_TIMELINE_SERVER': {31: 1, "else": 2},
   'FALCON_SERVER': {6: 1, 31: 2, "else": 3}

http://git-wip-us.apache.org/repos/asf/ambari/blob/999daefe/ambari-server/src/test/python/stacks/2.1/common/test_stack_advisor.py
--
diff --git 
a/ambari-server/src/test/python/stacks/2.1/common/test_stack_advisor.py 
b/ambari-server/src/test/python/stacks/2.1/common/test_stack_advisor.py
index bdd34fc..6bd02bf 100644
--- a/ambari-server/src/test/python/stacks/2.1/common/test_stack_advisor.py
+++ b/ambari-server/src/test/python/stacks/2.1/common/test_stack_advisor.py
@@ -557,3 +557,31 @@ class TestHDP21StackAdvisor(TestCase):
 
 res = self.stackAdvisor.validateHiveConfigurations(properties, 
recommendedDefaults, configurations, '', '')
 self.assertEquals(res, res_expected)
+
+  def test_modifyComponentLayoutSchemes(self):
+res_expected = {}
+res_expected.update({
+  'NAMENODE': {"else": 0},
+  'SECONDARY_NAMENODE': {"else": 1},
+  'HBASE_MASTER': {6: 0, 31: 2, "else": 3},
+
+  'HISTORYSERVER': {31: 1, "else": 2},
+  'RESOURCEMANAGER': {31: 1, "else": 2},
+
+  'OOZIE_SERVER': {6: 1, 31: 2, "else": 3},
+
+  'HIVE_SERVER': {6: 1, 31: 2, "else": 4},
+  'HIVE_METASTORE': {6: 1, 31: 2, "else": 4},
+  'WEBHCAT_SERVER': {6: 1, 31: 2, "else": 4},
+  'METRICS_COLLECTOR': {3: 2, 6: 2, 31: 3, "else": 5},
+})
+
+res_expected.update({
+  'APP_TIMELINE_SERVER': {31: 1, "else": 2},
+  'FALCON_SERVER': {6: 1, 31: 2, "else": 3}
+})
+
+self.stackAdvisor.modifyComponentLayoutSchemes()
+res = self.stackAdvisor.getComponentLayoutSchemes()
+
+self.assertEquals(res, res_expected)

ambari git commit: AMBARI-21996 Provide maintenance mode off count for components (dsen)

[dsen]

Repository: ambari
Updated Branches:
  refs/heads/trunk 311c7bbd8 -> 986a65dbf


AMBARI-21996 Provide maintenance mode off count for components (dsen)


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

Branch: refs/heads/trunk
Commit: 986a65dbf4fbf36dac7073418ef368c2c207b123
Parents: 311c7bb
Author: Dmytro Sen 
Authored: Mon Sep 25 16:32:46 2017 +0300
Committer: Dmytro Sen 
Committed: Mon Sep 25 16:32:46 2017 +0300

--
 .../internal/ComponentResourceProvider.java |  4 
 .../server/state/ServiceComponentImpl.java  | 25 
 .../internal/ComponentResourceProviderTest.java |  6 +
 .../server/state/ServiceComponentTest.java  | 21 +---
 4 files changed, 53 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/986a65db/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ComponentResourceProvider.java
--
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ComponentResourceProvider.java
 
b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ComponentResourceProvider.java
index ebbf169..2e86b2d 100644
--- 
a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ComponentResourceProvider.java
+++ 
b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ComponentResourceProvider.java
@@ -85,6 +85,8 @@ public class ComponentResourceProvider extends 
AbstractControllerResourceProvide
   protected static final String COMPONENT_TOTAL_COUNT_PROPERTY_ID = 
"ServiceComponentInfo/total_count";
   protected static final String COMPONENT_STARTED_COUNT_PROPERTY_ID   = 
"ServiceComponentInfo/started_count";
   protected static final String COMPONENT_INSTALLED_COUNT_PROPERTY_ID = 
"ServiceComponentInfo/installed_count";
+  protected static final String 
COMPONENT_INSTALLED_AND_MAINTENANCE_OFF_COUNT_PROPERTY_ID
+  = 
"ServiceComponentInfo/installed_and_maintenance_off_count";
   protected static final String COMPONENT_INIT_COUNT_PROPERTY_ID  = 
"ServiceComponentInfo/init_count";
   protected static final String COMPONENT_UNKNOWN_COUNT_PROPERTY_ID   = 
"ServiceComponentInfo/unknown_count";
   protected static final String COMPONENT_INSTALL_FAILED_COUNT_PROPERTY_ID = 
"ServiceComponentInfo/install_failed_count";
@@ -124,6 +126,7 @@ public class ComponentResourceProvider extends 
AbstractControllerResourceProvide
 PROPERTY_IDS.add(COMPONENT_TOTAL_COUNT_PROPERTY_ID);
 PROPERTY_IDS.add(COMPONENT_STARTED_COUNT_PROPERTY_ID);
 PROPERTY_IDS.add(COMPONENT_INSTALLED_COUNT_PROPERTY_ID);
+
PROPERTY_IDS.add(COMPONENT_INSTALLED_AND_MAINTENANCE_OFF_COUNT_PROPERTY_ID);
 
 PROPERTY_IDS.add(COMPONENT_INIT_COUNT_PROPERTY_ID);
 PROPERTY_IDS.add(COMPONENT_UNKNOWN_COUNT_PROPERTY_ID);
@@ -220,6 +223,7 @@ public class ComponentResourceProvider extends 
AbstractControllerResourceProvide
   setResourceProperty(resource, COMPONENT_TOTAL_COUNT_PROPERTY_ID, 
response.getServiceComponentStateCount().get("totalCount"), requestedIds);
   setResourceProperty(resource, COMPONENT_STARTED_COUNT_PROPERTY_ID, 
response.getServiceComponentStateCount().get("startedCount"), requestedIds);
   setResourceProperty(resource, COMPONENT_INSTALLED_COUNT_PROPERTY_ID, 
response.getServiceComponentStateCount().get("installedCount"), requestedIds);
+  setResourceProperty(resource, 
COMPONENT_INSTALLED_AND_MAINTENANCE_OFF_COUNT_PROPERTY_ID, 
response.getServiceComponentStateCount().get("installedAndMaintenanceOffCount"),
 requestedIds);
   setResourceProperty(resource, 
COMPONENT_INSTALL_FAILED_COUNT_PROPERTY_ID, 
response.getServiceComponentStateCount().get("installFailedCount"), 
requestedIds);
   setResourceProperty(resource, COMPONENT_INIT_COUNT_PROPERTY_ID, 
response.getServiceComponentStateCount().get("initCount"), requestedIds);
   setResourceProperty(resource, COMPONENT_UNKNOWN_COUNT_PROPERTY_ID, 
response.getServiceComponentStateCount().get("unknownCount"), requestedIds);

http://git-wip-us.apache.org/repos/asf/ambari/blob/986a65db/ambari-server/src/main/java/org/apache/ambari/server/state/ServiceComponentImpl.java
--
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/state/ServiceComponentImpl.java
 
b/ambari-server/src/main/java/org/apache/ambari/server/state/ServiceComponentImpl.java
index 5f85e38..22c97ed 100644
--- 

ambari git commit: AMBARI-22007 - Addition of service component after patching a service still keeps the component at base version (part2) (jonathanhurley)

[jonathanhurley]

Repository: ambari
Updated Branches:
  refs/heads/trunk eb5bcef3d -> 311c7bbd8


AMBARI-22007 - Addition of service component after patching a service still 
keeps the component at base version (part2) (jonathanhurley)


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

Branch: refs/heads/trunk
Commit: 311c7bbd8ee94b8964a7f1769b41efc40ecdcdc6
Parents: eb5bcef
Author: Jonathan Hurley 
Authored: Mon Sep 25 08:45:58 2017 -0400
Committer: Jonathan Hurley 
Committed: Mon Sep 25 08:51:38 2017 -0400

--
 .../libraries/functions/version_select_util.py  |  7 ++--
 .../libraries/script/script.py  | 36 
 .../src/test/python/TestVersionSelectUtil.py|  4 +--
 3 files changed, 35 insertions(+), 12 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/311c7bbd/ambari-common/src/main/python/resource_management/libraries/functions/version_select_util.py
--
diff --git 
a/ambari-common/src/main/python/resource_management/libraries/functions/version_select_util.py
 
b/ambari-common/src/main/python/resource_management/libraries/functions/version_select_util.py
index 9fbb42b..73b5dc1 100644
--- 
a/ambari-common/src/main/python/resource_management/libraries/functions/version_select_util.py
+++ 
b/ambari-common/src/main/python/resource_management/libraries/functions/version_select_util.py
@@ -28,10 +28,11 @@ from resource_management.core import shell
 from resource_management.libraries.functions import stack_tools
 
 
-def get_component_version(stack_name, component_name):
+def get_component_version_from_symlink(stack_name, component_name):
   """
-  For any stack name, returns the version currently installed for a given 
component.
-  Because each stack name may have different logic, the input is a generic 
dictionary.
+  Gets the version of the specified component by invoking the stack-select 
tool to query for the
+  version which is referenced by the symlink.
+
   :param stack_name: one of HDP, HDPWIN, BIGTOP, PHD, etc. usually retrieved 
from
   the command-#.json file's ["hostLevelParams"]["stack_name"]
   :param component_name: Component name as a string necessary to get the 
version

http://git-wip-us.apache.org/repos/asf/ambari/blob/311c7bbd/ambari-common/src/main/python/resource_management/libraries/script/script.py
--
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 303b640..e612638 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
@@ -47,7 +47,7 @@ from resource_management.core.environment import Environment
 from resource_management.core.logger import Logger
 from resource_management.core.exceptions import Fail, 
ClientComponentHasNoStatus, ComponentIsNotRunning
 from resource_management.core.resources.packaging import Package
-from resource_management.libraries.functions.version_select_util import 
get_component_version
+from resource_management.libraries.functions.version_select_util import 
get_component_version_from_symlink
 from resource_management.libraries.functions.version import compare_versions
 from resource_management.libraries.functions.version import 
format_stack_version
 from resource_management.libraries.functions import stack_tools
@@ -207,18 +207,40 @@ class Script(object):
   return os.path.realpath(config_path)
 return None
 
-  def save_component_version_to_structured_out(self):
+  def save_component_version_to_structured_out(self, command_name):
 """
-:param stack_name: One of HDP, HDPWIN, PHD, BIGTOP.
-:return: Append the version number to the structured out.
+Saves the version of the component for this command to the structured out 
file. If the
+command is an install command and the repository is trusted, then it will 
use the version of
+the repository. Otherwise, it will consult the stack-select tool to read 
the symlink version.
+:param command_name: command name
+:return: None
 """
+from resource_management.libraries.functions.default import default
 from resource_management.libraries.functions import stack_select
 
+repository_resolved = default("repositoryFile/resolved", False)
+repository_version = default("repositoryFile/repoVersion", None)
+is_install_command = command_name is not None and 

ambari git commit: AMBARI-22007 - Addition of service component after patching a service still keeps the component at base version (part2) (jonathanhurley)

[jonathanhurley]

Repository: ambari
Updated Branches:
  refs/heads/branch-2.6 5e228910e -> 68b31ac2c


AMBARI-22007 - Addition of service component after patching a service still 
keeps the component at base version (part2) (jonathanhurley)


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

Branch: refs/heads/branch-2.6
Commit: 68b31ac2c5cd508cafb4e0f003840b47d75fa6d4
Parents: 5e22891
Author: Jonathan Hurley 
Authored: Mon Sep 25 08:45:58 2017 -0400
Committer: Jonathan Hurley 
Committed: Mon Sep 25 08:45:58 2017 -0400

--
 .../libraries/functions/version_select_util.py  |  7 ++--
 .../libraries/script/script.py  | 36 
 2 files changed, 33 insertions(+), 10 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/68b31ac2/ambari-common/src/main/python/resource_management/libraries/functions/version_select_util.py
--
diff --git 
a/ambari-common/src/main/python/resource_management/libraries/functions/version_select_util.py
 
b/ambari-common/src/main/python/resource_management/libraries/functions/version_select_util.py
index 9fbb42b..73b5dc1 100644
--- 
a/ambari-common/src/main/python/resource_management/libraries/functions/version_select_util.py
+++ 
b/ambari-common/src/main/python/resource_management/libraries/functions/version_select_util.py
@@ -28,10 +28,11 @@ from resource_management.core import shell
 from resource_management.libraries.functions import stack_tools
 
 
-def get_component_version(stack_name, component_name):
+def get_component_version_from_symlink(stack_name, component_name):
   """
-  For any stack name, returns the version currently installed for a given 
component.
-  Because each stack name may have different logic, the input is a generic 
dictionary.
+  Gets the version of the specified component by invoking the stack-select 
tool to query for the
+  version which is referenced by the symlink.
+
   :param stack_name: one of HDP, HDPWIN, BIGTOP, PHD, etc. usually retrieved 
from
   the command-#.json file's ["hostLevelParams"]["stack_name"]
   :param component_name: Component name as a string necessary to get the 
version

http://git-wip-us.apache.org/repos/asf/ambari/blob/68b31ac2/ambari-common/src/main/python/resource_management/libraries/script/script.py
--
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 5940166..829868e 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
@@ -46,7 +46,7 @@ from resource_management.core.environment import Environment
 from resource_management.core.logger import Logger
 from resource_management.core.exceptions import Fail, 
ClientComponentHasNoStatus, ComponentIsNotRunning
 from resource_management.core.resources.packaging import Package
-from resource_management.libraries.functions.version_select_util import 
get_component_version
+from resource_management.libraries.functions.version_select_util import 
get_component_version_from_symlink
 from resource_management.libraries.functions.version import compare_versions
 from resource_management.libraries.functions.version import 
format_stack_version
 from resource_management.libraries.functions import stack_tools
@@ -206,18 +206,40 @@ class Script(object):
   return os.path.realpath(config_path)
 return None
 
-  def save_component_version_to_structured_out(self):
+  def save_component_version_to_structured_out(self, command_name):
 """
-:param stack_name: One of HDP, HDPWIN, PHD, BIGTOP.
-:return: Append the version number to the structured out.
+Saves the version of the component for this command to the structured out 
file. If the
+command is an install command and the repository is trusted, then it will 
use the version of
+the repository. Otherwise, it will consult the stack-select tool to read 
the symlink version.
+:param command_name: command name
+:return: None
 """
+from resource_management.libraries.functions.default import default
 from resource_management.libraries.functions import stack_select
 
+repository_resolved = default("repositoryFile/resolved", False)
+repository_version = default("repositoryFile/repoVersion", None)
+is_install_command = command_name is not None and command_name.lower() == 
"install"
+
+# start 

ambari git commit: AMBARI-22042 Final Properties filter does not work for Config Groups. (atkach)

[atkach]

Repository: ambari
Updated Branches:
  refs/heads/branch-2.6 c9dd8fbee -> 5e228910e


AMBARI-22042 Final Properties filter does not work for Config Groups. (atkach)


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

Branch: refs/heads/branch-2.6
Commit: 5e228910e86c91eb94ee5124b5db92f16d452e6d
Parents: c9dd8fb
Author: Andrii Tkach 
Authored: Mon Sep 25 13:50:49 2017 +0300
Committer: Andrii Tkach 
Committed: Mon Sep 25 15:28:15 2017 +0300

--
 ambari-web/app/views/common/configs/service_config_view.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/5e228910/ambari-web/app/views/common/configs/service_config_view.js
--
diff --git a/ambari-web/app/views/common/configs/service_config_view.js 
b/ambari-web/app/views/common/configs/service_config_view.js
index d48ab16..6bded2c 100644
--- a/ambari-web/app/views/common/configs/service_config_view.js
+++ b/ambari-web/app/views/common/configs/service_config_view.js
@@ -271,7 +271,8 @@ App.ServiceConfigView = Em.View.extend({
 var passesFilters = true;
 
 selectedFilters.forEach(function (filter) {
-  if (config.get(filter.attributeName) !== filter.attributeValue) {
+  if (config.get(filter.attributeName) !== filter.attributeValue &&
+!(config.get('overrides') && 
config.get('overrides').someProperty(filter.attributeName, 
filter.attributeValue))) {
 passesFilters = false;
   }
 });

ambari git commit: AMBARI-22042 Final Properties filter does not work for Config Groups. (atkach)

[atkach]

Repository: ambari
Updated Branches:
  refs/heads/trunk 06d21bb38 -> eb5bcef3d


AMBARI-22042 Final Properties filter does not work for Config Groups. (atkach)


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

Branch: refs/heads/trunk
Commit: eb5bcef3d4382ae059e572c45c799969c6cb7dde
Parents: 06d21bb
Author: Andrii Tkach 
Authored: Mon Sep 25 13:50:49 2017 +0300
Committer: Andrii Tkach 
Committed: Mon Sep 25 13:57:17 2017 +0300

--
 ambari-web/app/views/common/configs/service_config_view.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/eb5bcef3/ambari-web/app/views/common/configs/service_config_view.js
--
diff --git a/ambari-web/app/views/common/configs/service_config_view.js 
b/ambari-web/app/views/common/configs/service_config_view.js
index a53f6cd..fe45c79 100644
--- a/ambari-web/app/views/common/configs/service_config_view.js
+++ b/ambari-web/app/views/common/configs/service_config_view.js
@@ -272,7 +272,8 @@ App.ServiceConfigView = Em.View.extend({
 var passesFilters = true;
 
 selectedFilters.forEach(function (filter) {
-  if (config.get(filter.attributeName) !== filter.attributeValue) {
+  if (config.get(filter.attributeName) !== filter.attributeValue &&
+!(config.get('overrides') && 
config.get('overrides').someProperty(filter.attributeName, 
filter.attributeValue))) {
 passesFilters = false;
   }
 });

ambari git commit: AMBARI-22047. Cannot upgrade stack due to 'Version XXXXX does not contain services that are installed' (alexantonenko)

[alexantonenko]

Repository: ambari
Updated Branches:
  refs/heads/branch-2.6 3ac67ff8f -> c9dd8fbee


AMBARI-22047. Cannot upgrade stack due to 'Version X does not contain 
services that are installed' (alexantonenko)


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

Branch: refs/heads/branch-2.6
Commit: c9dd8fbeec0861f059ed8e9f68b5a7dcb34f2a40
Parents: 3ac67ff
Author: Alex Antonenko 
Authored: Mon Sep 25 13:56:41 2017 +0300
Committer: Alex Antonenko 
Committed: Mon Sep 25 13:56:41 2017 +0300

--
 .../main/admin/stack_and_upgrade_controller.js  |  2 +-
 .../admin/stack_and_upgrade_controller_test.js  | 24 +---
 2 files changed, 22 insertions(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/c9dd8fbe/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 4e72128..28f534f 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
@@ -1461,7 +1461,7 @@ App.MainAdminStackAndUpgradeController = 
Em.Controller.extend(App.LocalStorage,
 var availableServices = repo.get('stackServices').filter(function(service) 
{
   return App.Service.find(service.get('name')).get('isLoaded') && 
service.get('isAvailable') && service.get('isUpgradable');
 }, this);
-if (!availableServices.length){
+if (!availableServices.length && !repo.get('isStandard')){
   return App.showAlertPopup( 
Em.I18n.t('admin.stackVersions.upgrade.installPackage.fail.title'), 
Em.I18n.t('admin.stackVersions.upgrade.installPackage.fail.noAvailableServices').format(repo.get('displayName'))
 );
 }
 var self = this;

http://git-wip-us.apache.org/repos/asf/ambari/blob/c9dd8fbe/ambari-web/test/controllers/main/admin/stack_and_upgrade_controller_test.js
--
diff --git 
a/ambari-web/test/controllers/main/admin/stack_and_upgrade_controller_test.js 
b/ambari-web/test/controllers/main/admin/stack_and_upgrade_controller_test.js
index 2920ae0..4414d91 100644
--- 
a/ambari-web/test/controllers/main/admin/stack_and_upgrade_controller_test.js
+++ 
b/ambari-web/test/controllers/main/admin/stack_and_upgrade_controller_test.js
@@ -1195,18 +1195,36 @@ describe('App.MainAdminStackAndUpgradeController', 
function() {
   describe("#installRepoVersionPopup()", function () {
 before(function () {
   sinon.stub(controller, 'installRepoVersion', Em.K);
-  sinon.stub(App.Service, 'find').returns({});
+  sinon.stub(App.Service, 'find').returns(Em.Object.create({
+isLoaded: true
+  }));
 });
 after(function () {
   controller.installRepoVersion.restore();
   App.Service.find.restore();
 });
-it("show popup", function () {
-  var repo = Em.Object.create({'displayName': 'HDP-2.2', stackServices: 
[]});
+it("show confirmation popup for non standart and available services", 
function () {
+  var repo = Em.Object.create({'displayName': 'HDP-2.2', isStandard: 
false, stackServices: [Em.Object.create({
+name: 'HDFS',
+isUpgradable: true,
+isAvailable: true
+  })]});
+  var popup = controller.installRepoVersionPopup(repo);
+  popup.onPrimary();
+  expect(controller.installRepoVersion.calledWith(repo)).to.be.true;
+});
+it("show pre-check popup for non standard and empty available services", 
function () {
+  var repo = Em.Object.create({'displayName': 'HDP-2.2', isStandard: 
false, stackServices: []});
   var popup = controller.installRepoVersionPopup(repo);
   popup.onPrimary();
   expect(controller.installRepoVersion.calledWith(repo)).to.be.false;
 });
+it("show confirmation popup for standart", function () {
+  var repo = Em.Object.create({'displayName': 'HDP-2.2', isStandard: true, 
stackServices: []});
+  var popup = controller.installRepoVersionPopup(repo);
+  popup.onPrimary();
+  expect(controller.installRepoVersion.calledWith(repo)).to.be.true;
+});
   });
 
   describe("#installRepoVersion()", function () {

ambari git commit: AMBARI-22047. Cannot upgrade stack due to 'Version XXXXX does not contain services that are installed' (alexantonenko)

[alexantonenko]

Repository: ambari
Updated Branches:
  refs/heads/trunk 12abba0b7 -> 06d21bb38


AMBARI-22047. Cannot upgrade stack due to 'Version X does not contain 
services that are installed' (alexantonenko)


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

Branch: refs/heads/trunk
Commit: 06d21bb3850d2f8257c08064ab9d695d2a4c07c1
Parents: 12abba0
Author: Alex Antonenko 
Authored: Mon Sep 25 13:55:39 2017 +0300
Committer: Alex Antonenko 
Committed: Mon Sep 25 13:55:39 2017 +0300

--
 .../main/admin/stack_and_upgrade_controller.js  |  2 +-
 .../admin/stack_and_upgrade_controller_test.js  | 24 +---
 2 files changed, 22 insertions(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/06d21bb3/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 6d7560b..90a4db9 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
@@ -1513,7 +1513,7 @@ App.MainAdminStackAndUpgradeController = 
Em.Controller.extend(App.LocalStorage,
 var availableServices = repo.get('stackServices').filter(function(service) 
{
   return App.Service.find(service.get('name')).get('isLoaded') && 
service.get('isAvailable') && service.get('isUpgradable');
 }, this);
-if (!availableServices.length){
+if (!availableServices.length && !repo.get('isStandard')){
   return App.showAlertPopup( 
Em.I18n.t('admin.stackVersions.upgrade.installPackage.fail.title'), 
Em.I18n.t('admin.stackVersions.upgrade.installPackage.fail.noAvailableServices').format(repo.get('displayName'))
 );
 }
 var self = this;

http://git-wip-us.apache.org/repos/asf/ambari/blob/06d21bb3/ambari-web/test/controllers/main/admin/stack_and_upgrade_controller_test.js
--
diff --git 
a/ambari-web/test/controllers/main/admin/stack_and_upgrade_controller_test.js 
b/ambari-web/test/controllers/main/admin/stack_and_upgrade_controller_test.js
index d0671f9..1b04b17 100644
--- 
a/ambari-web/test/controllers/main/admin/stack_and_upgrade_controller_test.js
+++ 
b/ambari-web/test/controllers/main/admin/stack_and_upgrade_controller_test.js
@@ -1170,18 +1170,36 @@ describe('App.MainAdminStackAndUpgradeController', 
function() {
   describe("#installRepoVersionPopup()", function () {
 before(function () {
   sinon.stub(controller, 'installRepoVersion', Em.K);
-  sinon.stub(App.Service, 'find').returns({});
+  sinon.stub(App.Service, 'find').returns(Em.Object.create({
+isLoaded: true
+  }));
 });
 after(function () {
   controller.installRepoVersion.restore();
   App.Service.find.restore();
 });
-it("show popup", function () {
-  var repo = Em.Object.create({'displayName': 'HDP-2.2', stackServices: 
[]});
+it("show confirmation popup for non standart and available services", 
function () {
+  var repo = Em.Object.create({'displayName': 'HDP-2.2', isStandard: 
false, stackServices: [Em.Object.create({
+name: 'HDFS',
+isUpgradable: true,
+isAvailable: true
+  })]});
+  var popup = controller.installRepoVersionPopup(repo);
+  popup.onPrimary();
+  expect(controller.installRepoVersion.calledWith(repo)).to.be.true;
+});
+it("show pre-check popup for non standard and empty available services", 
function () {
+  var repo = Em.Object.create({'displayName': 'HDP-2.2', isStandard: 
false, stackServices: []});
   var popup = controller.installRepoVersionPopup(repo);
   popup.onPrimary();
   expect(controller.installRepoVersion.calledWith(repo)).to.be.false;
 });
+it("show confirmation popup for standart", function () {
+  var repo = Em.Object.create({'displayName': 'HDP-2.2', isStandard: true, 
stackServices: []});
+  var popup = controller.installRepoVersionPopup(repo);
+  popup.onPrimary();
+  expect(controller.installRepoVersion.calledWith(repo)).to.be.true;
+});
   });
 
   describe("#installRepoVersion()", function () {

ambari git commit: AMBARI-22040. configs.py does not work properly when dealing with files (aonishuk)

[aonishuk]

Repository: ambari
Updated Branches:
  refs/heads/trunk 50b647580 -> 12abba0b7


AMBARI-22040. configs.py does not work properly when dealing with files 
(aonishuk)


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

Branch: refs/heads/trunk
Commit: 12abba0b743ec198067001a64608ccbcc904a869
Parents: 50b6475
Author: Andrew Onishuk 
Authored: Mon Sep 25 12:38:39 2017 +0300
Committer: Andrew Onishuk 
Committed: Mon Sep 25 12:38:39 2017 +0300

--
 ambari-server/src/test/python/TestConfigs.py| 38 
 .../src/test/resources/TestConfigs-content.xml  | 28 +++
 2 files changed, 60 insertions(+), 6 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/12abba0b/ambari-server/src/test/python/TestConfigs.py
--
diff --git a/ambari-server/src/test/python/TestConfigs.py 
b/ambari-server/src/test/python/TestConfigs.py
index cc6cb31..6d2ab34 100644
--- a/ambari-server/src/test/python/TestConfigs.py
+++ b/ambari-server/src/test/python/TestConfigs.py
@@ -73,7 +73,7 @@ class TestConfigs(TestCase):
   self.assertEquals(config['properties'], {'config1': 'value1', 'config2': 
'value2'})
 urlopen_method.side_effect = 
self.get_url_open_side_effect(response_mapping)
 to_file_method.return_value = config_assertion
-sys.argv = ['configs.py', 'user', 'password', '8081', 'http', 'get', 
'localhost', 'cluster1', 'hdfs-site', '1.conf']
+sys.argv = ['configs.py', '-u', 'user', '-p', 'password', '-t', '8081', 
'-s', 'http', '-a', 'get', '-l','localhost','-n', 'cluster1', '-c','hdfs-site']
 configs.main()
 
   @patch.object(configs, 'output_to_file')
@@ -94,7 +94,7 @@ class TestConfigs(TestCase):
   }
 }
 urlopen_method.side_effect = 
self.get_url_open_side_effect(response_mapping)
-sys.argv = ['configs.py', 'user', 'password', '8081', 'https', 'set', 
'localhost', 'cluster1', 'hdfs-site', 'config1', 'value3']
+sys.argv = ['configs.py', '-u', 'user', '-p', 'password', '-t', '8081', 
'-s', 'https', '-a', 'set', '-l','localhost','-n', 'cluster1', 
'-c','hdfs-site', '-k', 'config1', '-v', 'value3']
 configs.main()
 
   @patch.object(configs, 'output_to_file')
@@ -115,7 +115,7 @@ class TestConfigs(TestCase):
   }
 }
 urlopen_method.side_effect = 
self.get_url_open_side_effect(response_mapping)
-sys.argv = ['configs.py', 'user', 'password', '8081', 'https', 'set', 
'localhost', 'cluster1', 'hdfs-site', 'config1', 'value3']
+sys.argv = ['configs.py', '-u', 'user', '-p', 'password', '-t', '8081', 
'-s', 'https', '-a', 'set', '-l','localhost','-n', 'cluster1', 
'-c','hdfs-site', '-k', 'config1', '-v', 'value3']
 configs.main()
 
   @patch.object(configs, 'output_to_file')
@@ -138,7 +138,7 @@ class TestConfigs(TestCase):
   }
 }
 urlopen_method.side_effect = 
self.get_url_open_side_effect(response_mapping)
-sys.argv = ['configs.py', 'user', 'password', '8081', 'https', 'set', 
'localhost', 'cluster2', 'hdfs-site', 'config1', 'value4']
+sys.argv = ['configs.py', '-u', 'user', '-p', 'password', '-t', '8081', 
'-s', 'https', '-a', 'set', '-l','localhost','-n', 'cluster2', 
'-c','hdfs-site', '-k', 'config1', '-v', 'value4']
 configs.main()
 
   @patch.object(configs, 'output_to_file')
@@ -159,7 +159,8 @@ class TestConfigs(TestCase):
   }
 }
 urlopen_method.side_effect = 
self.get_url_open_side_effect(response_mapping)
-sys.argv = ['configs.py', 'user', 'password', '8081', 'https', 'delete', 
'localhost', 'cluster1', 'hdfs-site', 'config1']
+
+sys.argv = ['configs.py', '-u', 'user', '-p', 'password', '-t', '8081', 
'-s', 'https', '-a', 'delete', '-l','localhost','-n', 'cluster1', 
'-c','hdfs-site', '-k', 'config1']
 configs.main()
 
   @patch.object(configs, 'output_to_file')
@@ -182,5 +183,30 @@ class TestConfigs(TestCase):
   }
 }
 urlopen_method.side_effect = 
self.get_url_open_side_effect(response_mapping)
-sys.argv = ['configs.py', 'user', 'password', '8081', 'https', 'delete', 
'localhost', 'cluster2', 'hdfs-site', 'config1']
+sys.argv = ['configs.py', '-u', 'user', '-p', 'password', '-t', '8081', 
'-s', 'https', '-a', 'delete', '-l','localhost','-n', 'cluster2', 
'-c','hdfs-site', '-k', 'config1']
+configs.main()
+
+  @patch.object(configs, 'output_to_file')
+  @patch('urllib2.urlopen')
+  def test_set_properties_from_xml(self, urlopen_method, to_file_method):
+response_mapping = {
+  'GET': {
+'body': {
+  

ambari git commit: AMBARI-22039. File "hdfs.headless.keytab" has incorrect permission (aonishuk)

[aonishuk]

Repository: ambari
Updated Branches:
  refs/heads/trunk 5d5cc4ff0 -> 50b647580


AMBARI-22039. File "hdfs.headless.keytab" has incorrect permission  (aonishuk)


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

Branch: refs/heads/trunk
Commit: 50b64758091a0df76419cbced4044e2689b5d4d1
Parents: 5d5cc4f
Author: Andrew Onishuk 
Authored: Mon Sep 25 12:27:24 2017 +0300
Committer: Andrew Onishuk 
Committed: Mon Sep 25 12:27:24 2017 +0300

--
 .../stacks/2.6/ZEPPELIN/test_zeppelin_070.py  | 18 --
 1 file changed, 12 insertions(+), 6 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/50b64758/ambari-server/src/test/python/stacks/2.6/ZEPPELIN/test_zeppelin_070.py
--
diff --git 
a/ambari-server/src/test/python/stacks/2.6/ZEPPELIN/test_zeppelin_070.py 
b/ambari-server/src/test/python/stacks/2.6/ZEPPELIN/test_zeppelin_070.py
index b9b34e8..f379f40 100644
--- a/ambari-server/src/test/python/stacks/2.6/ZEPPELIN/test_zeppelin_070.py
+++ b/ambari-server/src/test/python/stacks/2.6/ZEPPELIN/test_zeppelin_070.py
@@ -312,7 +312,8 @@ class TestZeppelin070(RMFTestCase):
   
hdfs_resource_ignore_file='/var/lib/ambari-agent/data/.hdfs_resource_ignore',
   hdfs_site={u'a': u'b'},
   kinit_path_local='/usr/bin/kinit',
-  user="zeppelin",
+  user="hdfs",
+  owner="zeppelin",
   group="zeppelin",
   type='file',
   action=['download_on_execute'],
@@ -336,7 +337,8 @@ class TestZeppelin070(RMFTestCase):
   
hdfs_resource_ignore_file='/var/lib/ambari-agent/data/.hdfs_resource_ignore',
   hdfs_site={u'a': u'b'},
   kinit_path_local='/usr/bin/kinit',
-  user="zeppelin",
+  user="hdfs",
+  owner="zeppelin",
   group="zeppelin",
   type='file',
   action=['create_on_execute'],
@@ -355,7 +357,8 @@ class TestZeppelin070(RMFTestCase):
   
hdfs_resource_ignore_file='/var/lib/ambari-agent/data/.hdfs_resource_ignore',
   hdfs_site={u'a': u'b'},
   kinit_path_local='/usr/bin/kinit',
-  user="zeppelin",
+  user="hdfs",
+  owner="zeppelin",
   group="zeppelin",
   type='file',
   action=['download_on_execute'],
@@ -379,7 +382,8 @@ class TestZeppelin070(RMFTestCase):
   
hdfs_resource_ignore_file='/var/lib/ambari-agent/data/.hdfs_resource_ignore',
   hdfs_site={u'a': u'b'},
   kinit_path_local='/usr/bin/kinit',
-  user="zeppelin",
+  user="hdfs",
+  owner="zeppelin",
   group="zeppelin",
   type='file',
   action=['create_on_execute'],
@@ -398,7 +402,8 @@ class TestZeppelin070(RMFTestCase):
   
hdfs_resource_ignore_file='/var/lib/ambari-agent/data/.hdfs_resource_ignore',
   hdfs_site={u'a': u'b'},
   kinit_path_local='/usr/bin/kinit',
-  user="zeppelin",
+  user="hdfs",
+  owner="zeppelin",
   group="zeppelin",
   type='file',
   action=['download_on_execute'],
@@ -422,7 +427,8 @@ class TestZeppelin070(RMFTestCase):
   
hdfs_resource_ignore_file='/var/lib/ambari-agent/data/.hdfs_resource_ignore',
   hdfs_site={u'a': u'b'},
   kinit_path_local='/usr/bin/kinit',
-  user="zeppelin",
+  user="hdfs",
+  owner="zeppelin",
   group="zeppelin",
   type='file',