[ambari] branch branch-2.7 updated: [AMBARI-24791] Node Managers fail to start after RM is moved to a different host as 'resource-tracker.address' config is not updated.
This is an automated email from the ASF dual-hosted git repository.
ishanbha pushed a commit to branch branch-2.7
in repository https://gitbox.apache.org/repos/asf/ambari.git
The following commit(s) were added to refs/heads/branch-2.7 by this push:
new c69aa74 [AMBARI-24791] Node Managers fail to start after RM is moved
to a different host as 'resource-tracker.address' config is not updated.
c69aa74 is described below
commit c69aa741611bfb5bd23bbf4391f6ad75932750a7
Author: Ishan Bhatt
AuthorDate: Tue Oct 16 15:01:31 2018 -0700
[AMBARI-24791] Node Managers fail to start after RM is moved to a different
host as 'resource-tracker.address' config is not updated.
---
.../resourceManager/step3_controller.js| 2 ++
.../app/data/configs/wizards/rm_ha_properties.js | 23 +-
.../utils/configs/move_rm_config_initializer.js| 1 +
.../app/utils/configs/rm_ha_config_initializer.js | 2 ++
4 files changed, 27 insertions(+), 1 deletion(-)
diff --git
a/ambari-web/app/controllers/main/admin/highAvailability/resourceManager/step3_controller.js
b/ambari-web/app/controllers/main/admin/highAvailability/resourceManager/step3_controller.js
index 179193f..7d6a34a 100644
---
a/ambari-web/app/controllers/main/admin/highAvailability/resourceManager/step3_controller.js
+++
b/ambari-web/app/controllers/main/admin/highAvailability/resourceManager/step3_controller.js
@@ -126,9 +126,11 @@ App.RMHighAvailabilityWizardStep3Controller =
Em.Controller.extend(App.Blueprint
var portValue = zooCfg && Em.get(zooCfg, 'properties.clientPort');
var webAddressPort = yarnSite && yarnSite.properties ?
yarnSite.properties['yarn.resourcemanager.webapp.address'] : '';
var httpsWebAddressPort = yarnSite && yarnSite.properties ? yarnSite.
properties['yarn.resourcemanager.webapp.https.address'] : '';
+const trackerAddressPort = yarnSite && yarnSite.properties ?
yarnSite.properties['yarn.resourcemanager.resource-tracker.address'] : '';
ret.webAddressPort = webAddressPort && webAddressPort.contains(':') ?
webAddressPort.split(':')[1] : '8088';
ret.httpsWebAddressPort = httpsWebAddressPort &&
httpsWebAddressPort.contains(':') ? httpsWebAddressPort.split(':')[1] : '8090';
+ret.trackerAddressPort = trackerAddressPort &&
trackerAddressPort.contains(':') ? trackerAddressPort.split(':')[1]: '8025';
ret.zkClientPort = portValue ? portValue : '2181';
return ret;
},
diff --git a/ambari-web/app/data/configs/wizards/rm_ha_properties.js
b/ambari-web/app/data/configs/wizards/rm_ha_properties.js
index fb1bd13..a6fc73f 100644
--- a/ambari-web/app/data/configs/wizards/rm_ha_properties.js
+++ b/ambari-web/app/data/configs/wizards/rm_ha_properties.js
@@ -63,7 +63,28 @@ module.exports =
"filename": "yarn-site",
serviceName: 'MISC'
},
-
+ {
+"name": "yarn.resourcemanager.resource-tracker.address.rm1",
+"displayName": "yarn.resourcemanager.resource-tracker.address.rm1",
+"isReconfigurable": false,
+"recommendedValue": "",
+"isOverridable": false,
+"value": "",
+"category": "YARN",
+"filename": "yarn-site",
+serviceName: 'MISC'
+ },
+ {
+"name": "yarn.resourcemanager.resource-tracker.address.rm2",
+"displayName": "yarn.resourcemanager.resource-tracker.address.rm2",
+"isReconfigurable": false,
+"recommendedValue": "",
+"isOverridable": false,
+"value": "",
+"category": "YARN",
+"filename": "yarn-site",
+serviceName: 'MISC'
+ },
{
"name": "yarn.resourcemanager.webapp.address.rm1",
"displayName": "yarn.resourcemanager.webapp.address.rm1",
diff --git a/ambari-web/app/utils/configs/move_rm_config_initializer.js
b/ambari-web/app/utils/configs/move_rm_config_initializer.js
index 5388224..120185e 100644
--- a/ambari-web/app/utils/configs/move_rm_config_initializer.js
+++ b/ambari-web/app/utils/configs/move_rm_config_initializer.js
@@ -57,6 +57,7 @@ App.MoveRmConfigInitializer =
App.MoveComponentConfigInitializerClass.create({
'yarn.resourcemanager.hostname.{{suffix}}': getRmHaDependedConfig(true),
'yarn.resourcemanager.webapp.address.{{suffix}}':
getRmHaDependedConfig(true),
'yarn.resourcemanager.webapp.https.address.{{suffix}}':
getRmHaDependedConfig(true),
+'yarn.resourcemanager.resource-tracker.address.{{suffix}}':
getRmHaDependedConfig(true),
'yarn.resourcemanager.ha': getRmHaHawqConfig(true),
'yarn.resourcemanager.scheduler.ha': getRmHaHawqConfig(true)
},
diff --git a/ambari-web/app/utils/configs/rm_ha_config_initializer.js
b/ambari-web/app/utils/configs/rm_ha_config_initializer.js
index dac68d9..a176df3 100644
--- a/ambari-web/app/utils/configs/rm_ha_config_initializer.js
+++ b/ambari-web/app/utils/configs/rm_ha_config_initializer.js
@@ -47,6 +47,8 @@ App.RmHaConfigInitializer =
[ambari] branch trunk updated: [AMBARI-24791] Node Managers fail to start after RM is moved to a different host as 'resource-tracker.address' config is not updated.
This is an automated email from the ASF dual-hosted git repository.
ishanbha pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/ambari.git
The following commit(s) were added to refs/heads/trunk by this push:
new 7110d4d [AMBARI-24791] Node Managers fail to start after RM is moved
to a different host as 'resource-tracker.address' config is not updated.
7110d4d is described below
commit 7110d4d965767e1bc98eb79bb12d1d42f65676d4
Author: Ishan Bhatt
AuthorDate: Tue Oct 16 15:01:31 2018 -0700
[AMBARI-24791] Node Managers fail to start after RM is moved to a different
host as 'resource-tracker.address' config is not updated.
---
.../resourceManager/step3_controller.js| 2 ++
.../app/data/configs/wizards/rm_ha_properties.js | 23 +-
.../utils/configs/move_rm_config_initializer.js| 1 +
.../app/utils/configs/rm_ha_config_initializer.js | 2 ++
4 files changed, 27 insertions(+), 1 deletion(-)
diff --git
a/ambari-web/app/controllers/main/admin/highAvailability/resourceManager/step3_controller.js
b/ambari-web/app/controllers/main/admin/highAvailability/resourceManager/step3_controller.js
index 179193f..7d6a34a 100644
---
a/ambari-web/app/controllers/main/admin/highAvailability/resourceManager/step3_controller.js
+++
b/ambari-web/app/controllers/main/admin/highAvailability/resourceManager/step3_controller.js
@@ -126,9 +126,11 @@ App.RMHighAvailabilityWizardStep3Controller =
Em.Controller.extend(App.Blueprint
var portValue = zooCfg && Em.get(zooCfg, 'properties.clientPort');
var webAddressPort = yarnSite && yarnSite.properties ?
yarnSite.properties['yarn.resourcemanager.webapp.address'] : '';
var httpsWebAddressPort = yarnSite && yarnSite.properties ? yarnSite.
properties['yarn.resourcemanager.webapp.https.address'] : '';
+const trackerAddressPort = yarnSite && yarnSite.properties ?
yarnSite.properties['yarn.resourcemanager.resource-tracker.address'] : '';
ret.webAddressPort = webAddressPort && webAddressPort.contains(':') ?
webAddressPort.split(':')[1] : '8088';
ret.httpsWebAddressPort = httpsWebAddressPort &&
httpsWebAddressPort.contains(':') ? httpsWebAddressPort.split(':')[1] : '8090';
+ret.trackerAddressPort = trackerAddressPort &&
trackerAddressPort.contains(':') ? trackerAddressPort.split(':')[1]: '8025';
ret.zkClientPort = portValue ? portValue : '2181';
return ret;
},
diff --git a/ambari-web/app/data/configs/wizards/rm_ha_properties.js
b/ambari-web/app/data/configs/wizards/rm_ha_properties.js
index fb1bd13..a6fc73f 100644
--- a/ambari-web/app/data/configs/wizards/rm_ha_properties.js
+++ b/ambari-web/app/data/configs/wizards/rm_ha_properties.js
@@ -63,7 +63,28 @@ module.exports =
"filename": "yarn-site",
serviceName: 'MISC'
},
-
+ {
+"name": "yarn.resourcemanager.resource-tracker.address.rm1",
+"displayName": "yarn.resourcemanager.resource-tracker.address.rm1",
+"isReconfigurable": false,
+"recommendedValue": "",
+"isOverridable": false,
+"value": "",
+"category": "YARN",
+"filename": "yarn-site",
+serviceName: 'MISC'
+ },
+ {
+"name": "yarn.resourcemanager.resource-tracker.address.rm2",
+"displayName": "yarn.resourcemanager.resource-tracker.address.rm2",
+"isReconfigurable": false,
+"recommendedValue": "",
+"isOverridable": false,
+"value": "",
+"category": "YARN",
+"filename": "yarn-site",
+serviceName: 'MISC'
+ },
{
"name": "yarn.resourcemanager.webapp.address.rm1",
"displayName": "yarn.resourcemanager.webapp.address.rm1",
diff --git a/ambari-web/app/utils/configs/move_rm_config_initializer.js
b/ambari-web/app/utils/configs/move_rm_config_initializer.js
index 5388224..120185e 100644
--- a/ambari-web/app/utils/configs/move_rm_config_initializer.js
+++ b/ambari-web/app/utils/configs/move_rm_config_initializer.js
@@ -57,6 +57,7 @@ App.MoveRmConfigInitializer =
App.MoveComponentConfigInitializerClass.create({
'yarn.resourcemanager.hostname.{{suffix}}': getRmHaDependedConfig(true),
'yarn.resourcemanager.webapp.address.{{suffix}}':
getRmHaDependedConfig(true),
'yarn.resourcemanager.webapp.https.address.{{suffix}}':
getRmHaDependedConfig(true),
+'yarn.resourcemanager.resource-tracker.address.{{suffix}}':
getRmHaDependedConfig(true),
'yarn.resourcemanager.ha': getRmHaHawqConfig(true),
'yarn.resourcemanager.scheduler.ha': getRmHaHawqConfig(true)
},
diff --git a/ambari-web/app/utils/configs/rm_ha_config_initializer.js
b/ambari-web/app/utils/configs/rm_ha_config_initializer.js
index dac68d9..a176df3 100644
--- a/ambari-web/app/utils/configs/rm_ha_config_initializer.js
+++ b/ambari-web/app/utils/configs/rm_ha_config_initializer.js
@@ -47,6 +47,8 @@ App.RmHaConfigInitializer =
[ambari] branch trunk updated: [AMBARI-24790] Restart Masters for Service Restart.
This is an automated email from the ASF dual-hosted git repository.
ishanbha pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/ambari.git
The following commit(s) were added to refs/heads/trunk by this push:
new b2bbc85 [AMBARI-24790] Restart Masters for Service Restart.
b2bbc85 is described below
commit b2bbc8536b2fd5f3f8a211c53f42b46467810229
Author: Ishan Bhatt
AuthorDate: Tue Oct 16 09:23:56 2018 -0700
[AMBARI-24790] Restart Masters for Service Restart.
---
ambari-web/app/controllers/main/service/item.js| 68 +-
ambari-web/app/utils/batch_scheduled_requests.js | 58 +-
.../app/views/common/service_restart_view.js | 1 -
3 files changed, 122 insertions(+), 5 deletions(-)
diff --git a/ambari-web/app/controllers/main/service/item.js
b/ambari-web/app/controllers/main/service/item.js
index 6fb0522..d615548 100644
--- a/ambari-web/app/controllers/main/service/item.js
+++ b/ambari-web/app/controllers/main/service/item.js
@@ -967,8 +967,72 @@ App.MainServiceItemController =
Em.Controller.extend(App.SupportClientConfigsDow
},
chooseAndRestartHostComponents: function () {
-let serviceName = this.get('serviceName');
-batchUtils.showServicRestartPopup(serviceName);
+let serviceName = this.get('content.serviceName');
+const mastersForRestart = serviceName === 'HDFS' ?
this.getMastersForHdfsRestart(): this.getMastersForRestart(serviceName);
+batchUtils.showServiceRestartPopup(serviceName, mastersForRestart);
+ },
+
+ getMastersForRestart: function (serviceName) {
+return this.get('content.hostComponents').filter((component) =>{
+ return component.get('service.serviceName') === serviceName &&
component.get('isMaster');
+});
+ },
+
+ getMastersForHdfsRestart: function () {
+const self = this;
+let hostCompOrdered = [];
+const hdfsService = App.HDFSService.find().toArray()[0];
+
+if (App.get('isHAEnabled')) {
+ let journalNodes =
this.get('content.hostComponents').filterProperty('componentName',
'JOURNALNODE');
+ //Restart journal nodes one by one
+ if (journalNodes && journalNodes.length) {
+journalNodes.forEach((journalNode) =>
hostCompOrdered.push(journalNode));
+ }
+
+ //Restart Standby NN and then Standby ZKFC
+ const standbyNameNodes = hdfsService.get('standbyNameNodes').toArray();
+ if (standbyNameNodes.length > 0) {
+hdfsService.get('standbyNameNodes').forEach(function (snn) {
+ hostCompOrdered.push(snn);
+ const snnHostName = snn.get('hostName');
+ const zkfcForSnn =
self.get('content.hostComponents').filter((component) => {
+return component.get('componentName') === 'ZKFC' &&
component.get('hostName') === snnHostName;
+ });
+ if (zkfcForSnn) {
+hostCompOrdered.push(zkfcForSnn[0]);
+ }
+});
+ }
+
+ //Restart Active NN and then Active ZKFC
+ const activeNameNodes = hdfsService.get('activeNameNodes').toArray();
+ if (activeNameNodes.length > 0) {
+hdfsService.get('activeNameNodes').forEach(function (ann) {
+ hostCompOrdered.push(ann);
+ const annHostName = ann.get('hostName');
+ const zkfcForAnn =
self.get('content.hostComponents').filter((component) => {
+return component.get('componentName') === 'ZKFC' &&
component.get('hostName') === annHostName;
+ });
+ if (zkfcForAnn) {
+hostCompOrdered.push(zkfcForAnn[0]);
+ }
+});
+ }
+} else {
+
+ //Add SNamenode
+ if (!standbyNameNodes.length > 0 && hdfsService.get('snameNode')) {
+hostCompOrdered.push(hdfsService.get('snameNode'));
+ }
+ const sNameNode = hdfsService.get('snameNode') ||
App.HostComponent.find().findProperty('componentName', 'SECONDARY_NAMENODE')
+ if (sNameNode) hostCompOrdered.push(sNameNode);
+
+ //Add NameNode
+ const namenode = hdfsService.get('namenode') ||
App.HostComponent.find().findProperty('componentName', 'SECONDARY_NAMENODE');
+ if (namenode) hostCompOrdered.push(namenode);
+}
+return hostCompOrdered;
},
restartCertainHostComponents: function (context) {
diff --git a/ambari-web/app/utils/batch_scheduled_requests.js
b/ambari-web/app/utils/batch_scheduled_requests.js
index 33173cc..1ab73df 100644
--- a/ambari-web/app/utils/batch_scheduled_requests.js
+++ b/ambari-web/app/utils/batch_scheduled_requests.js
@@ -500,7 +500,9 @@ module.exports = {
},
- showServicRestartPopup: function (serviceName) {
+ showServiceRestartPopup: function (serviceName, masterComponents,
slaveComponents) {
+
+let self = this;
App.ModalPopup.show({
header: Em.I18n.t('common.configure.restart'),
@@ -510,11 +512,63 @@ module.exports = {
primary: Em.I18n.t('common.restart'),
primaryClass: 'btn-warning',
classNames:
[ambari] branch branch-feature-AMBARI-14714 updated: [AMBARI-24788] Fix async bug in installer config page initial load
This is an automated email from the ASF dual-hosted git repository.
jgolieb pushed a commit to branch branch-feature-AMBARI-14714
in repository https://gitbox.apache.org/repos/asf/ambari.git
The following commit(s) were added to refs/heads/branch-feature-AMBARI-14714 by
this push:
new 05ffef5 [AMBARI-24788] Fix async bug in installer config page initial
load
05ffef5 is described below
commit 05ffef5b6640a4adcc7af7fff1bec774539a55ae
Author: Jason Golieb
AuthorDate: Tue Oct 16 10:53:20 2018 -0400
[AMBARI-24788] Fix async bug in installer config page initial load
---
ambari-web/app/controllers/installer.js | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/ambari-web/app/controllers/installer.js
b/ambari-web/app/controllers/installer.js
index 83c8d7c..6fc0329 100644
--- a/ambari-web/app/controllers/installer.js
+++ b/ambari-web/app/controllers/installer.js
@@ -1402,9 +1402,7 @@ App.InstallerController =
App.WizardController.extend(App.Persist, {
if (!this.get('stackConfigsLoaded')) {
// Load stack configs before loading themes
-
App.config.loadClusterConfigsFromStack().always(self.loadServiceConfigs.bind(self)).always(()
=> {
-dfd.resolve();
- });
+ App.config.loadClusterConfigsFromStack().always(() =>
self.loadServiceConfigs().always(() => dfd.resolve()));
} else {
dfd.resolve();
}
[ambari] branch trunk updated: AMBARI-24785. Removed double 'sudo' invocation (#2470)
This is an automated email from the ASF dual-hosted git repository. smolnar pushed a commit to branch trunk in repository https://gitbox.apache.org/repos/asf/ambari.git The following commit(s) were added to refs/heads/trunk by this push: new 42c8385 AMBARI-24785. Removed double 'sudo' invocation (#2470) 42c8385 is described below commit 42c8385734fc943e8db3f19b208b3a08e0c09e94 Author: Sandor Molnar AuthorDate: Tue Oct 16 19:57:28 2018 +0200 AMBARI-24785. Removed double 'sudo' invocation (#2470) --- ambari-common/src/main/python/resource_management/core/sudo.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ambari-common/src/main/python/resource_management/core/sudo.py b/ambari-common/src/main/python/resource_management/core/sudo.py index 990b293..8a9481a 100644 --- a/ambari-common/src/main/python/resource_management/core/sudo.py +++ b/ambari-common/src/main/python/resource_management/core/sudo.py @@ -310,7 +310,7 @@ else: # shutil.copy replacement def copy(src, dst): -shell.checked_call(["sudo", "cp", "-r", src, dst], sudo=True) +shell.checked_call(["cp", "-r", src, dst], sudo=True) # os.listdir replacement def listdir(path):
[ambari-logsearch] branch master updated: AMBARI-24789. LogFeeder: fix CVE-2018-11771 - upgrade commons-compress lib (#9)
This is an automated email from the ASF dual-hosted git repository. oleewere pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/ambari-logsearch.git The following commit(s) were added to refs/heads/master by this push: new efb573c AMBARI-24789. LogFeeder: fix CVE-2018-11771 - upgrade commons-compress lib (#9) efb573c is described below commit efb573ca9d4770eabaab6915ad26727ac16786f5 Author: Olivér Szabó AuthorDate: Tue Oct 16 19:32:48 2018 +0200 AMBARI-24789. LogFeeder: fix CVE-2018-11771 - upgrade commons-compress lib (#9) --- ambari-logsearch-logfeeder/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ambari-logsearch-logfeeder/pom.xml b/ambari-logsearch-logfeeder/pom.xml index 8b89ff6..1f8a20c 100644 --- a/ambari-logsearch-logfeeder/pom.xml +++ b/ambari-logsearch-logfeeder/pom.xml @@ -152,7 +152,7 @@ org.apache.commons commons-compress - 1.16.1 + 1.18 com.fasterxml.jackson.dataformat
[GitHub] oleewere closed pull request #9: AMBARI-24789. LogFeeder: fix CVE-2018-11771 - upgrade commons-compress lib
oleewere closed pull request #9: AMBARI-24789. LogFeeder: fix CVE-2018-11771 - upgrade commons-compress lib URL: https://github.com/apache/ambari-logsearch/pull/9 This is a PR merged from a forked repository. As GitHub hides the original diff on merge, it is displayed below for the sake of provenance: As this is a foreign pull request (from a fork), the diff is supplied below (as it won't show otherwise due to GitHub magic): diff --git a/ambari-logsearch-logfeeder/pom.xml b/ambari-logsearch-logfeeder/pom.xml index 8b89ff686c..1f8a20c2a5 100644 --- a/ambari-logsearch-logfeeder/pom.xml +++ b/ambari-logsearch-logfeeder/pom.xml @@ -152,7 +152,7 @@ org.apache.commons commons-compress - 1.16.1 + 1.18 com.fasterxml.jackson.dataformat This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[ambari] branch branch-2.7 updated: AMBARI-24789. LogFeeder: fix CVE-2018-11771 - upgrade commons-compress lib. (#2473)
This is an automated email from the ASF dual-hosted git repository. oleewere pushed a commit to branch branch-2.7 in repository https://gitbox.apache.org/repos/asf/ambari.git The following commit(s) were added to refs/heads/branch-2.7 by this push: new 337f57a AMBARI-24789. LogFeeder: fix CVE-2018-11771 - upgrade commons-compress lib. (#2473) 337f57a is described below commit 337f57ac8f1c3e4073e692818cfbfb5596dff74e Author: Olivér Szabó AuthorDate: Tue Oct 16 18:43:10 2018 +0200 AMBARI-24789. LogFeeder: fix CVE-2018-11771 - upgrade commons-compress lib. (#2473) --- ambari-logsearch/ambari-logsearch-logfeeder/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ambari-logsearch/ambari-logsearch-logfeeder/pom.xml b/ambari-logsearch/ambari-logsearch-logfeeder/pom.xml index c11faa9..aa9bbff 100644 --- a/ambari-logsearch/ambari-logsearch-logfeeder/pom.xml +++ b/ambari-logsearch/ambari-logsearch-logfeeder/pom.xml @@ -147,7 +147,7 @@ org.apache.commons commons-compress - 1.16.1 + 1.18 com.amazonaws
[ambari] branch trunk updated: [AMBARI-24780] Add Hotfix to VDF Release Element (#2469)
This is an automated email from the ASF dual-hosted git repository.
ncole pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/ambari.git
The following commit(s) were added to refs/heads/trunk by this push:
new 26bb2eb [AMBARI-24780] Add Hotfix to VDF Release Element (#2469)
26bb2eb is described below
commit 26bb2ebc342c9f9b56088280e2f852eb1cfa1fa4
Author: ncole
AuthorDate: Tue Oct 16 12:31:32 2018 -0400
[AMBARI-24780] Add Hotfix to VDF Release Element (#2469)
---
.../apache/ambari/spi/stack/StackReleaseInfo.java | 65 +++
.../ambari/spi/stack/StackReleaseVersion.java | 47 ++
.../checks/RequiredServicesInRepositoryCheck.java | 3 +-
.../server/controller/StackVersionResponse.java| 27 +++-
.../ClusterStackVersionResourceProvider.java | 8 ++-
.../internal/StackVersionResourceProvider.java | 3 -
.../VersionDefinitionResourceProvider.java | 17 +++--
.../orm/entities/RepositoryVersionEntity.java | 13
.../apache/ambari/server/stack/StackModule.java| 2 +-
.../stack/upgrade/RepositoryVersionHelper.java | 2 +-
.../stack/upgrade/orchestrate/UpgradeContext.java | 3 +-
.../stack/upgrade/orchestrate/UpgradeHelper.java | 2 +-
.../apache/ambari/server/state/CheckHelper.java| 7 +-
.../org/apache/ambari/server/state/StackInfo.java | 52 ---
.../ambari/server/state/cluster/ClusterImpl.java | 3 +-
.../state/repository/DefaultStackVersion.java | 74 ++
.../ambari/server/state/repository/Release.java| 25 +---
.../state/repository/VersionDefinitionXml.java | 31 ++---
.../server/state/stack/StackMetainfoXml.java | 34 +-
.../src/main/resources/version_definition.xsd | 5 +-
.../server/api/services/AmbariMetaInfoTest.java| 1 -
.../AmbariMetricsHadoopSinkVersionCheckTest.java | 3 +-
.../ambari/server/checks/ClusterCheckTest.java | 27 ++--
.../checks/ComponentsInstallationCheckTest.java| 11 +++-
.../checks/HostsMasterMaintenanceCheckTest.java| 2 +-
.../checks/HostsRepositoryVersionCheckTest.java| 3 +-
.../ambari/server/checks/MockCheckHelper.java | 8 +++
.../RequiredServicesInRepositoryCheckTest.java | 13 +++-
.../checks/ServicesMaintenanceModeCheckTest.java | 4 +-
.../ambari/server/checks/ServicesUpCheckTest.java | 3 +-
.../upgrade/orchestrate/UpgradeContextTest.java| 2 +-
.../ambari/server/state/CheckHelperTest.java | 11 +++-
.../state/repository/VersionDefinitionTest.java| 29 +++--
33 files changed, 422 insertions(+), 118 deletions(-)
diff --git
a/ambari-server-spi/src/main/java/org/apache/ambari/spi/stack/StackReleaseInfo.java
b/ambari-server-spi/src/main/java/org/apache/ambari/spi/stack/StackReleaseInfo.java
new file mode 100644
index 000..63299fe
--- /dev/null
+++
b/ambari-server-spi/src/main/java/org/apache/ambari/spi/stack/StackReleaseInfo.java
@@ -0,0 +1,65 @@
+/*
+ * 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.spi.stack;
+
+/**
+ * Provides information about a version's release. Ambari provides instances
+ * for consumption.
+ */
+public class StackReleaseInfo {
+
+ private String m_version;
+ private String m_hotfix;
+ private String m_build;
+
+ /**
+ * @param version
+ * the version string
+ * @param hotfix
+ * the hotfix string
+ * @param build
+ * the build string
+ */
+ public StackReleaseInfo(String version, String hotfix, String build) {
+m_version = version;
+m_hotfix = hotfix;
+m_build = build;
+ }
+
+ /**
+ * @return the version string
+ */
+ public String getVersion() {
+return m_version;
+ }
+
+ /**
+ * @return the hotfix string
+ */
+ public String getHotfix() {
+return m_hotfix;
+ }
+
+ /**
+ * @return the build string
+ */
+ public String getBuild() {
+return m_build;
+ }
+
+}
diff --git
a/ambari-server-spi/src/main/java/org/apache/ambari/spi/stack/StackReleaseVersion.java
b/ambari-server-spi/src/main/java/org/apache/ambari/spi/stack/StackReleaseVersion.java
new file mode 100644
index 000..e61252e
---
[GitHub] asfgit commented on issue #9: AMBARI-24789. LogFeeder: fix CVE-2018-11771 - upgrade commons-compress lib
asfgit commented on issue #9: AMBARI-24789. LogFeeder: fix CVE-2018-11771 - upgrade commons-compress lib URL: https://github.com/apache/ambari-logsearch/pull/9#issuecomment-430294887 Refer to this link for build results (access rights to CI server needed): https://builds.apache.org/job/Ambari-LogSearch-Github-PR-Builder/14/ Test PASSed. This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[ambari] branch branch-feature-AMBARI-14714 updated: [AMBARI-24747] Fix Add Component to host functionality (#2431)
This is an automated email from the ASF dual-hosted git repository.
jgolieb pushed a commit to branch branch-feature-AMBARI-14714
in repository https://gitbox.apache.org/repos/asf/ambari.git
The following commit(s) were added to refs/heads/branch-feature-AMBARI-14714 by
this push:
new 34d2c00 [AMBARI-24747] Fix Add Component to host functionality (#2431)
34d2c00 is described below
commit 34d2c00b3808fd59be21d0e98cbfcd05c8390ae8
Author: Jason Golieb
AuthorDate: Tue Oct 16 11:54:55 2018 -0400
[AMBARI-24747] Fix Add Component to host functionality (#2431)
* [AMBARI-24747] Fix Add Component to host functionality
* Unit test fixes.
---
.../app/controllers/global/cluster_controller.js | 6 +--
.../main/admin/kerberos/wizard_controller.js | 19 +++--
.../app/controllers/main/service/info/configs.js | 6 ++-
.../app/controllers/wizard/step7_controller.js | 6 ++-
ambari-web/app/mappers/service_metrics_mapper.js | 11 ++---
ambari-web/app/mixins/common/blueprint.js | 2 +-
.../details/host_components/install_component.js | 47 +-
.../mixins/wizard/wizardProgressPageController.js | 23 +++
ambari-web/app/models/service.js | 8 +++-
ambari-web/app/utils/ajax/ajax.js | 2 +-
ambari-web/app/views/main/host/summary.js | 8 ++--
.../controllers/global/cluster_controller_test.js | 16 +++-
.../kerberos/kerberos_wizard_controler_test.js | 16 ++--
.../host_components/install_component_test.js | 35 +---
.../wizard/wizardProgressPageController_test.js| 4 +-
ambari-web/test/views/main/host/summary_test.js| 23 +++
16 files changed, 145 insertions(+), 87 deletions(-)
diff --git a/ambari-web/app/controllers/global/cluster_controller.js
b/ambari-web/app/controllers/global/cluster_controller.js
index 9d50594..23e04ce 100644
--- a/ambari-web/app/controllers/global/cluster_controller.js
+++ b/ambari-web/app/controllers/global/cluster_controller.js
@@ -288,11 +288,7 @@ App.ClusterController =
Em.Controller.extend(App.ReloadPopupMixin, {
},
loadComponentWithStaleConfigsSuccessCallback: function(json) {
-json.items.forEach((item) => {
- const componentName = item.ServiceComponentInfo.component_name;
- const hosts = item.host_components.mapProperty('HostRoles.host_name') ||
[];
- App.componentsStateMapper.updateStaleConfigsHosts(componentName, hosts);
-});
+json.items.forEach(item =>
App.componentsStateMapper.updateStaleConfigsHosts(item.HostRoles.component_name,
item.HostRoles.host_name));
},
loadConfigProperties: function() {
diff --git
a/ambari-web/app/controllers/main/admin/kerberos/wizard_controller.js
b/ambari-web/app/controllers/main/admin/kerberos/wizard_controller.js
index cb5beea..8896f7a 100644
--- a/ambari-web/app/controllers/main/admin/kerberos/wizard_controller.js
+++ b/ambari-web/app/controllers/main/admin/kerberos/wizard_controller.js
@@ -193,7 +193,12 @@ App.KerberosWizardController =
App.WizardController.extend(App.InstallComponent,
createKerberosResources: function (callback) {
var self = this;
this.createKerberosService().done(function () {
- self.updateAndCreateServiceComponent('KERBEROS_CLIENT').done(function ()
{
+ self.updateAndCreateServiceComponent(Em.Object.create({
+componentName: 'KERBEROS_CLIENT',
+serviceName: 'KERBEROS',
+displayName: 'Kerberos Client',
+serviceGroupName: 'KERBEROS' //TODO: mpacks - service group hard coded
for now; no idea how this will work for Kerberos service
+ })).done(function () {
self.createKerberosHostComponents().done(callback);
});
});
@@ -204,7 +209,13 @@ App.KerberosWizardController =
App.WizardController.extend(App.InstallComponent,
name: 'wizard.step8.create_selected_services',
sender: this,
data: {
-data: '{"ServiceInfo": { "service_name": "KERBEROS"}}',
+data: JSON.stringify({
+ 'ServiceInfo': {
+'service_name': 'KERBEROS',
+'service_type': 'KERBEROS',
+'service_group_name': 'KERBEROS' //TODO: mpacks - needs to be
revisited when we are no longer hard coding service groups to be named for
mpacks
+ }
+}),
cluster: App.get('clusterName')
}
});
@@ -264,7 +275,9 @@ App.KerberosWizardController =
App.WizardController.extend(App.InstallComponent,
"host_components": [
{
"HostRoles": {
- "component_name": 'KERBEROS_CLIENT'
+ "component_name": 'KERBEROS_CLIENT',
+ "service_name": 'KERBEROS',
+ "service_group_name": 'KERBEROS' //TODO: mpacks - hard coded for
now
}
}
]
diff --git a/ambari-web/app/controllers/main/service/info/configs.js
b/ambari-web/app/controllers/main/service/info/configs.js
index 113d738..6c9ba0a
[GitHub] oleewere opened a new pull request #9: AMBARI-24789. LogFeeder: fix CVE-2018-11771 - upgrade commons-compress lib
oleewere opened a new pull request #9: AMBARI-24789. LogFeeder: fix CVE-2018-11771 - upgrade commons-compress lib URL: https://github.com/apache/ambari-logsearch/pull/9 # What changes were proposed in this pull request? upgrade commons compress libraries ## How was this patch tested? waiting to UT result This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[ambari] branch branch-2.7 updated: AMBARI-24782. Introduce support for Ubuntu 18 LTS (aonishuk)
This is an automated email from the ASF dual-hosted git repository.
aonishuk pushed a commit to branch branch-2.7
in repository https://gitbox.apache.org/repos/asf/ambari.git
The following commit(s) were added to refs/heads/branch-2.7 by this push:
new 347c61a AMBARI-24782. Introduce support for Ubuntu 18 LTS (aonishuk)
347c61a is described below
commit 347c61a71bcab605b1c05f7f95e5704ac27527f9
Author: Andrew Onishuk
AuthorDate: Tue Oct 16 13:35:41 2018 +0300
AMBARI-24782. Introduce support for Ubuntu 18 LTS (aonishuk)
---
.../src/main/package/dependencies.properties | 2 +-
.../resource_management/TestRepositoryResource.py | 16 +++
.../python/ambari_commons/resources/os_family.json | 3 +-
.../libraries/providers/repository.py | 49 --
.../resource_management/libraries/script/script.py | 7 +++-
.../src/main/resources/version_definition.xsd | 1 +
6 files changed, 54 insertions(+), 24 deletions(-)
diff --git a/ambari-agent/src/main/package/dependencies.properties
b/ambari-agent/src/main/package/dependencies.properties
index 07b0b68..ec64264 100644
--- a/ambari-agent/src/main/package/dependencies.properties
+++ b/ambari-agent/src/main/package/dependencies.properties
@@ -29,4 +29,4 @@
# however should be encouraged manually in pom.xml.
rpm.dependency.list=openssl,\nRequires: rpm-python,\nRequires:
zlib,\nRequires: python >= 2.6
-deb.dependency.list=openssl, zlibc, python (>= 2.6)
\ No newline at end of file
+deb.dependency.list=openssl, python (>= 2.6)
\ No newline at end of file
diff --git
a/ambari-agent/src/test/python/resource_management/TestRepositoryResource.py
b/ambari-agent/src/test/python/resource_management/TestRepositoryResource.py
index a69b57b..b1a4757 100644
--- a/ambari-agent/src/test/python/resource_management/TestRepositoryResource.py
+++ b/ambari-agent/src/test/python/resource_management/TestRepositoryResource.py
@@ -188,7 +188,7 @@ class TestRepositoryResource(TestCase):
@patch.object(OSCheck, "is_suse_family")
@patch.object(OSCheck, "is_ubuntu_family")
@patch.object(OSCheck, "is_redhat_family")
-@patch("resource_management.libraries.providers.repository.checked_call")
+@patch("resource_management.libraries.providers.repository.call")
@patch.object(tempfile, "NamedTemporaryFile")
@patch("resource_management.libraries.providers.repository.Execute")
@patch("resource_management.libraries.providers.repository.File")
@@ -197,13 +197,13 @@ class TestRepositoryResource(TestCase):
@patch.object(System, "os_release_name", new='precise')
@patch.object(System, "os_family", new='ubuntu')
def test_create_repo_ubuntu_repo_exists(self, file_mock, execute_mock,
-tempfile_mock, checked_call_mock,
is_redhat_family, is_ubuntu_family, is_suse_family):
+tempfile_mock, call_mock,
is_redhat_family, is_ubuntu_family, is_suse_family):
is_redhat_family.return_value = False
is_ubuntu_family.return_value = True
is_suse_family.return_value = False
tempfile_mock.return_value = MagicMock(spec=file)
tempfile_mock.return_value.__enter__.return_value.name = "/tmp/1.txt"
- checked_call_mock.return_value = 0, "The following signatures couldn't
be verified because the public key is not available: NO_PUBKEY 123ABCD"
+ call_mock.return_value = 0, "The following signatures couldn't be
verified because the public key is not available: NO_PUBKEY 123ABCD"
with Environment('/') as env:
with patch.object(repository, "__file__",
new='/ambari/test/repo/dummy/path/file'):
@@ -228,10 +228,10 @@ class TestRepositoryResource(TestCase):
#'apt-get update -qq -o Dir::Etc::sourcelist="sources.list.d/HDP.list"
-o APT::Get::List-Cleanup="0"')
execute_command_item = execute_mock.call_args_list[0][0][0]
- self.assertEqual(checked_call_mock.call_args_list[0][0][0], ['apt-get',
'update', '-qq', '-o', 'Dir::Etc::sourcelist=sources.list.d/HDP.list', '-o',
'Dir::Etc::sourceparts=-', '-o', 'APT::Get::List-Cleanup=0'])
+ self.assertEqual(call_mock.call_args_list[0][0][0], ['apt-get',
'update', '-qq', '-o', 'Dir::Etc::sourcelist=sources.list.d/HDP.list', '-o',
'Dir::Etc::sourceparts=-', '-o', 'APT::Get::List-Cleanup=0'])
self.assertEqual(execute_command_item, ('apt-key', 'adv', '--recv-keys',
'--keyserver', 'keyserver.ubuntu.com', '123ABCD'))
-@patch("resource_management.libraries.providers.repository.checked_call")
+@patch("resource_management.libraries.providers.repository.call")
@patch.object(tempfile, "NamedTemporaryFile")
@patch("resource_management.libraries.providers.repository.Execute")
@patch("resource_management.libraries.providers.repository.File")
@@ -240,13 +240,13 @@ class TestRepositoryResource(TestCase):
@patch.object(System, "os_release_name", new='precise')
[ambari] branch trunk updated: AMBARI-24784. Ambari-agent cannot register sometimes (aonishuk)
This is an automated email from the ASF dual-hosted git repository. aonishuk pushed a commit to branch trunk in repository https://gitbox.apache.org/repos/asf/ambari.git The following commit(s) were added to refs/heads/trunk by this push: new 345da1a AMBARI-24784. Ambari-agent cannot register sometimes (aonishuk) 345da1a is described below commit 345da1abed7c55b6b26c921a0a2ab6b92b37db8d Author: Andrew Onishuk AuthorDate: Tue Oct 16 15:04:32 2018 +0300 AMBARI-24784. Ambari-agent cannot register sometimes (aonishuk) --- .../src/main/python/ambari_agent/CustomServiceOrchestrator.py | 6 -- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/ambari-agent/src/main/python/ambari_agent/CustomServiceOrchestrator.py b/ambari-agent/src/main/python/ambari_agent/CustomServiceOrchestrator.py index 74b7d92..8abb479 100644 --- a/ambari-agent/src/main/python/ambari_agent/CustomServiceOrchestrator.py +++ b/ambari-agent/src/main/python/ambari_agent/CustomServiceOrchestrator.py @@ -417,8 +417,10 @@ class CustomServiceOrchestrator(object): self.commands_for_component_in_progress[cluster_id][command['role']] += 1 incremented_commands_for_component = True -# reset status which was reported, so agent re-reports it after command finished - self.initializer_module.component_status_executor.reported_component_status[cluster_id][command['role']]['STATUS'] = None +if 'serviceName' in command: + service_component_name = command['serviceName'] + "/" + command['role'] + # reset status which was reported, so agent re-reports it after command finished + self.initializer_module.component_status_executor.reported_component_status[cluster_id][service_component_name]['STATUS'] = None for py_file, current_base_dir in filtered_py_file_list: log_info_on_failure = command_name not in self.DONT_DEBUG_FAILURES_FOR_COMMANDS
[ambari] branch trunk updated: [AMBARI-24768] - Load Upgrade Checks Dynamically From Stacks (#2451)
This is an automated email from the ASF dual-hosted git repository.
jonathanhurley pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/ambari.git
The following commit(s) were added to refs/heads/trunk by this push:
new 6f2622c [AMBARI-24768] - Load Upgrade Checks Dynamically From Stacks
(#2451)
6f2622c is described below
commit 6f2622c76d63a49f9bf06cb062b939836a8a96b7
Author: Jonathan Hurley
AuthorDate: Tue Oct 16 10:24:21 2018 -0400
[AMBARI-24768] - Load Upgrade Checks Dynamically From Stacks (#2451)
---
.../ambari/annotations/UpgradeCheckInfo.java | 2 -
.../apache/ambari/spi/upgrade/UpgradeCheck.java| 6 +-
ambari-server/docs/configuration/index.md | 1 +
.../ambari/server/api/services/AmbariMetaInfo.java | 7 -
.../ambari/server/checks/UpgradeCheckRegistry.java | 217 -
.../checks/UpgradeCheckRegistryProvider.java | 109 +++
.../server/checks/UpgradeTypeQualification.java| 65 ++
.../server/cleanup/ClasspathScannerUtils.java | 32 ++-
.../ambari/server/controller/ControllerModule.java | 62 +-
.../internal/PreUpgradeCheckResourceProvider.java | 33 ++--
.../apache/ambari/server/stack/StackDirectory.java | 102 +-
.../apache/ambari/server/stack/StackModule.java| 12 +-
.../ambari/server/stack/upgrade/UpgradePack.java | 34
.../stack/upgrade/orchestrate/UpgradeHelper.java | 2 +-
.../apache/ambari/server/state/CheckHelper.java| 8 +-
.../org/apache/ambari/server/state/StackInfo.java | 63 --
.../server/api/services/AmbariMetaInfoTest.java| 11 +-
.../server/checks/AutoStartDisabledCheckTest.java | 2 +-
.../ambari/server/checks/ClusterCheckTest.java | 22 ---
.../server/checks/UpgradeCheckOrderTest.java | 5 +-
.../checks/UpgradeTypeQualificationTest.java | 121
.../PreUpgradeCheckResourceProviderTest.java | 205 ---
.../server/orm/InMemoryDefaultTestModule.java | 10 -
.../ambari/server/state/CheckHelperTest.java | 36 +++-
24 files changed, 821 insertions(+), 346 deletions(-)
diff --git
a/ambari-server-spi/src/main/java/org/apache/ambari/annotations/UpgradeCheckInfo.java
b/ambari-server-spi/src/main/java/org/apache/ambari/annotations/UpgradeCheckInfo.java
index 3c3ce36..d72e1a0 100644
---
a/ambari-server-spi/src/main/java/org/apache/ambari/annotations/UpgradeCheckInfo.java
+++
b/ambari-server-spi/src/main/java/org/apache/ambari/annotations/UpgradeCheckInfo.java
@@ -27,7 +27,6 @@ import org.apache.ambari.spi.RepositoryType;
import org.apache.ambari.spi.upgrade.UpgradeCheckGroup;
import org.apache.ambari.spi.upgrade.UpgradeType;
-import com.google.inject.ScopeAnnotation;
import com.google.inject.Singleton;
/**
@@ -40,7 +39,6 @@ import com.google.inject.Singleton;
*/
@Target({ ElementType.TYPE })
@Retention(RUNTIME)
-@ScopeAnnotation
public @interface UpgradeCheckInfo {
/**
diff --git
a/ambari-server-spi/src/main/java/org/apache/ambari/spi/upgrade/UpgradeCheck.java
b/ambari-server-spi/src/main/java/org/apache/ambari/spi/upgrade/UpgradeCheck.java
index 2ac42dc..d887bd0 100644
---
a/ambari-server-spi/src/main/java/org/apache/ambari/spi/upgrade/UpgradeCheck.java
+++
b/ambari-server-spi/src/main/java/org/apache/ambari/spi/upgrade/UpgradeCheck.java
@@ -20,11 +20,15 @@ package org.apache.ambari.spi.upgrade;
import java.util.List;
import java.util.Set;
+import org.apache.ambari.annotations.UpgradeCheckInfo;
import org.apache.ambari.server.AmbariException;
/**
* The {@link UpgradeCheck} is used before an upgrade in order to present the
- * administrator with a warning or a failure about an upgrade.
+ * administrator with a warning or a failure about an upgrade. All
+ * implementations of this class should used the {@link UpgradeCheckInfo}
+ * annotation to specify information about the check, such as its associated
+ * upgrade type(s) and ordering.
*/
public interface UpgradeCheck {
diff --git a/ambari-server/docs/configuration/index.md
b/ambari-server/docs/configuration/index.md
index a0c2d04..2c9d05e 100644
--- a/ambari-server/docs/configuration/index.md
+++ b/ambari-server/docs/configuration/index.md
@@ -289,6 +289,7 @@ The following are the properties which can be used to
configure Ambari.
| view.extraction.threadpool.timeout | The time, in milliseconds, that
non-core threads will live when extraction views on Ambari Server startup.
|`10` |
| view.request.threadpool.size.max | The maximum number of threads which will
be allocated to handling REST API requests from embedded views. This value
should be smaller than `agent.threadpool.size.max` This property is
related to `agent.threadpool.size.max`. |`0` |
| view.request.threadpool.timeout | The time, milliseconds, that REST API
requests from embedded views can wait if there are no threads available to
service the view's request. Setting this too low can cause
[ambari] 02/02: Delete repository.py.rej
This is an automated email from the ASF dual-hosted git repository. aonishuk pushed a commit to branch trunk in repository https://gitbox.apache.org/repos/asf/ambari.git commit f4a520f25d6cb3e06b93634e37d9a6798c038094 Author: aonishuk AuthorDate: Tue Oct 16 13:03:56 2018 +0300 Delete repository.py.rej --- .../libraries/providers/repository.py.rej | 45 -- 1 file changed, 45 deletions(-) diff --git a/ambari-common/src/main/python/resource_management/libraries/providers/repository.py.rej b/ambari-common/src/main/python/resource_management/libraries/providers/repository.py.rej deleted file mode 100644 index 37b977c..000 --- a/ambari-common/src/main/python/resource_management/libraries/providers/repository.py.rej +++ /dev/null @@ -1,45 +0,0 @@ ambari-common/src/main/python/resource_management/libraries/providers/repository.py -+++ ambari-common/src/main/python/resource_management/libraries/providers/repository.py -@@ -65,7 +66,14 @@ class RepositoryProvider(Provider): - content = StaticFile(tmpf.name) - ) - --self.update(repo_file_path) -+try: -+ self.update(repo_file_path) -+except: -+ # remove created file or else ambari will consider that update was successful and skip repository operations -+ File(repo_file_path, -+ action = "delete", -+ ) -+ raise - - RepositoryProvider.repo_files_content.clear() - -@@ -136,12 +144,23 @@ class UbuntuRepositoryProvider(RepositoryProvider): - def update(self, repo_file_path): - repo_file_name = os.path.basename(repo_file_path) - update_cmd_formatted = [format(x) for x in self.update_cmd] --# this is time expensive --retcode, out = checked_call(update_cmd_formatted, sudo=True, quiet=False) -+update_failed_exception = None -+ -+try: -+ # this is time expensive -+ retcode, out = call(update_cmd_formatted, sudo=True, quiet=False) -+except ExecutionFailed as ex: -+ out = ex.out -+ update_failed_exception = ex - --# add public keys for new repos - missing_pkeys = set(re.findall(self.missing_pkey_regex, out)) -+ -+# failed but NOT due to missing pubkey -+if update_failed_exception and not missing_pkeys: -+ raise update_failed_exception -+ - for pkey in missing_pkeys: -+ # add public keys for new repos - Execute(self.app_pkey_cmd_prefix + (pkey,), - timeout = 15, # in case we are on the host w/o internet (using localrepo), we should ignore hanging - ignore_failures = True,
[ambari] 01/02: AMBARI-24782. Introduce support for Ubuntu 18 LTS (aonishuk)
This is an automated email from the ASF dual-hosted git repository.
aonishuk pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/ambari.git
commit ecaba72046455efae8ac99a8c8eed723b614e3e9
Author: Andrew Onishuk
AuthorDate: Tue Oct 16 12:45:49 2018 +0300
AMBARI-24782. Introduce support for Ubuntu 18 LTS (aonishuk)
---
.../src/main/package/dependencies.properties | 2 +-
.../resource_management/TestRepositoryResource.py | 16
.../python/ambari_commons/resources/os_family.json | 3 +-
.../libraries/providers/repository.py | 29 +++---
.../libraries/providers/repository.py.rej | 45 ++
.../resource_management/libraries/script/script.py | 7 +++-
.../src/main/resources/version_definition.xsd | 1 +
7 files changed, 86 insertions(+), 17 deletions(-)
diff --git a/ambari-agent/src/main/package/dependencies.properties
b/ambari-agent/src/main/package/dependencies.properties
index 07b0b68..ec64264 100644
--- a/ambari-agent/src/main/package/dependencies.properties
+++ b/ambari-agent/src/main/package/dependencies.properties
@@ -29,4 +29,4 @@
# however should be encouraged manually in pom.xml.
rpm.dependency.list=openssl,\nRequires: rpm-python,\nRequires:
zlib,\nRequires: python >= 2.6
-deb.dependency.list=openssl, zlibc, python (>= 2.6)
\ No newline at end of file
+deb.dependency.list=openssl, python (>= 2.6)
\ No newline at end of file
diff --git
a/ambari-agent/src/test/python/resource_management/TestRepositoryResource.py
b/ambari-agent/src/test/python/resource_management/TestRepositoryResource.py
index 91d4939..3bb91e8 100644
--- a/ambari-agent/src/test/python/resource_management/TestRepositoryResource.py
+++ b/ambari-agent/src/test/python/resource_management/TestRepositoryResource.py
@@ -188,7 +188,7 @@ class TestRepositoryResource(TestCase):
@patch.object(OSCheck, "is_suse_family")
@patch.object(OSCheck, "is_ubuntu_family")
@patch.object(OSCheck, "is_redhat_family")
-@patch("resource_management.libraries.providers.repository.checked_call")
+@patch("resource_management.libraries.providers.repository.call")
@patch.object(tempfile, "NamedTemporaryFile")
@patch("resource_management.libraries.providers.repository.Execute")
@patch("resource_management.libraries.providers.repository.File")
@@ -197,13 +197,13 @@ class TestRepositoryResource(TestCase):
@patch.object(System, "os_release_name", new='precise')
@patch.object(System, "os_family", new='ubuntu')
def test_create_repo_ubuntu_repo_exists(self, file_mock, execute_mock,
-tempfile_mock, checked_call_mock,
is_redhat_family, is_ubuntu_family, is_suse_family):
+tempfile_mock, call_mock,
is_redhat_family, is_ubuntu_family, is_suse_family):
is_redhat_family.return_value = False
is_ubuntu_family.return_value = True
is_suse_family.return_value = False
tempfile_mock.return_value = MagicMock(spec=file)
tempfile_mock.return_value.__enter__.return_value.name = "/tmp/1.txt"
- checked_call_mock.return_value = 0, "The following signatures couldn't
be verified because the public key is not available: NO_PUBKEY 123ABCD"
+ call_mock.return_value = 0, "The following signatures couldn't be
verified because the public key is not available: NO_PUBKEY 123ABCD"
with Environment('/') as env:
with patch.object(repository, "__file__",
new='/ambari/test/repo/dummy/path/file'):
@@ -229,10 +229,10 @@ class TestRepositoryResource(TestCase):
#'apt-get update -qq -o Dir::Etc::sourcelist="sources.list.d/HDP.list"
-o APT::Get::List-Cleanup="0"')
execute_command_item = execute_mock.call_args_list[0][0][0]
- self.assertEqual(checked_call_mock.call_args_list[0][0][0], ['apt-get',
'update', '-qq', '-o', 'Dir::Etc::sourcelist=sources.list.d/HDP.list', '-o',
'Dir::Etc::sourceparts=-', '-o', 'APT::Get::List-Cleanup=0'])
+ self.assertEqual(call_mock.call_args_list[0][0][0], ['apt-get',
'update', '-qq', '-o', 'Dir::Etc::sourcelist=sources.list.d/HDP.list', '-o',
'Dir::Etc::sourceparts=-', '-o', 'APT::Get::List-Cleanup=0'])
self.assertEqual(execute_command_item, ('apt-key', 'adv', '--recv-keys',
'--keyserver', 'keyserver.ubuntu.com', '123ABCD'))
-@patch("resource_management.libraries.providers.repository.checked_call")
+@patch("resource_management.libraries.providers.repository.call")
@patch.object(tempfile, "NamedTemporaryFile")
@patch("resource_management.libraries.providers.repository.Execute")
@patch("resource_management.libraries.providers.repository.File")
@@ -241,13 +241,13 @@ class TestRepositoryResource(TestCase):
@patch.object(System, "os_release_name", new='precise')
@patch.object(System, "os_family", new='ubuntu')
def test_create_repo_ubuntu_gpg_key_wrong_output(self, file_mock,
[ambari] branch trunk updated (3adfe2e -> f4a520f)
This is an automated email from the ASF dual-hosted git repository. aonishuk pushed a change to branch trunk in repository https://gitbox.apache.org/repos/asf/ambari.git. from 3adfe2e AMBARI-24677. Directory resource cannot work with symlinks if link target is a relative path (aonishuk) new ecaba72 AMBARI-24782. Introduce support for Ubuntu 18 LTS (aonishuk) new f4a520f Delete repository.py.rej The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: .../src/main/package/dependencies.properties | 2 +- .../resource_management/TestRepositoryResource.py | 16 ++-- .../python/ambari_commons/resources/os_family.json | 3 ++- .../libraries/providers/repository.py | 29 ++ .../resource_management/libraries/script/script.py | 7 -- .../src/main/resources/version_definition.xsd | 1 + 6 files changed, 41 insertions(+), 17 deletions(-)
[ambari] branch trunk updated: AMBARI-24677. Directory resource cannot work with symlinks if link target is a relative path (aonishuk)
This is an automated email from the ASF dual-hosted git repository.
aonishuk pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/ambari.git
The following commit(s) were added to refs/heads/trunk by this push:
new 3adfe2e AMBARI-24677. Directory resource cannot work with symlinks if
link target is a relative path (aonishuk)
3adfe2e is described below
commit 3adfe2e72e5dda0bbfd7e27e6aadd537f3efff3d
Author: Andrew Onishuk
AuthorDate: Mon Sep 24 13:11:44 2018 +0300
AMBARI-24677. Directory resource cannot work with symlinks if link target
is a relative path (aonishuk)
---
.../src/main/python/resource_management/core/providers/system.py | 4
1 file changed, 4 insertions(+)
diff --git
a/ambari-common/src/main/python/resource_management/core/providers/system.py
b/ambari-common/src/main/python/resource_management/core/providers/system.py
index 95c12ad..acb19d4 100644
--- a/ambari-common/src/main/python/resource_management/core/providers/system.py
+++ b/ambari-common/src/main/python/resource_management/core/providers/system.py
@@ -176,8 +176,12 @@ class DirectoryProvider(Provider):
if path in followed_links:
raise Fail("Applying %s failed, looped symbolic links found while
resolving %s" % (self.resource, path))
followed_links.add(path)
+ prev_path = path
path = sudo.readlink(path)
+ if not os.path.isabs(path):
+path = os.path.join(os.path.dirname(prev_path), path)
+
if path != self.resource.path:
Logger.info("Following the link {0} to {1} to create the
directory".format(self.resource.path, path))
[ambari] branch branch-2.7 updated: AMBARI-24778. Removed CVE issues from ambari-server (#2462)
This is an automated email from the ASF dual-hosted git repository.
smolnar pushed a commit to branch branch-2.7
in repository https://gitbox.apache.org/repos/asf/ambari.git
The following commit(s) were added to refs/heads/branch-2.7 by this push:
new d7f13ba AMBARI-24778. Removed CVE issues from ambari-server (#2462)
d7f13ba is described below
commit d7f13babdd0893d91d82a691a027d6fbda226ebe
Author: Sandor Molnar
AuthorDate: Tue Oct 16 12:50:52 2018 +0200
AMBARI-24778. Removed CVE issues from ambari-server (#2462)
---
ambari-project/pom.xml | 4 ++--
ambari-web/api-docs/index.html | 2 +-
ambari-web/api-docs/lib/jquery-1.8.3.min.js | 2 --
ambari-web/api-docs/lib/jquery-1.9.0.min.js | 5 +
4 files changed, 8 insertions(+), 5 deletions(-)
diff --git a/ambari-project/pom.xml b/ambari-project/pom.xml
index 455feea..e30e12b 100644
--- a/ambari-project/pom.xml
+++ b/ambari-project/pom.xml
@@ -30,14 +30,14 @@
5.5.2
${project.parent.basedir}
1.6.3
-9.4.11.v20180605
+9.4.12.v20180830
1.0.0
6.19
1.5.19
3.1.4
1.7.20
4.1.0
-4.3.17.RELEASE
+4.3.18.RELEASE
4.2.7.RELEASE
2.9.5
42.2.2
diff --git a/ambari-web/api-docs/index.html b/ambari-web/api-docs/index.html
index a067d95..1df8f01 100644
--- a/ambari-web/api-docs/index.html
+++ b/ambari-web/api-docs/index.html
@@ -14,7 +14,7 @@
-
+
diff --git a/ambari-web/api-docs/lib/jquery-1.8.3.min.js
b/ambari-web/api-docs/lib/jquery-1.8.3.min.js
deleted file mode 100644
index 3883779..000
--- a/ambari-web/api-docs/lib/jquery-1.8.3.min.js
+++ /dev/null
@@ -1,2 +0,0 @@
-/*! jQuery v1.8.3 jquery.com | jquery.org/license */
-(function(e,t){function _(e){var t=M[e]={};return
v.each(e.split(y),function(e,n){t[n]=!0}),t}function
H(e,n,r){if(r===t&===1){var
i="data-"+n.replace(P,"-$1").toLowerCase();r=e.getAttribute(i);if(typeof
r=="string"){try{r=r==="true"?!0:r==="false"?!1:r==="null"?null:+r+""===r?+r:D.test(r)?v.parseJSON(r):r}catch(s){}v.data(e,n,r)}else
r=t}return r}function B(e){var t;for(t in
e){if(t==="data"&(e[t]))continue;if(t!=="toJSON")return!1}return!0}function
et(){retur [...]
\ No newline at end of file
diff --git a/ambari-web/api-docs/lib/jquery-1.9.0.min.js
b/ambari-web/api-docs/lib/jquery-1.9.0.min.js
new file mode 100644
index 000..fd86897
--- /dev/null
+++ b/ambari-web/api-docs/lib/jquery-1.9.0.min.js
@@ -0,0 +1,5 @@
+/*! jQuery v1.9.0 | (c) 2005, 2012 jQuery Foundation, Inc. |
jquery.org/license */
+(function(e,t){"use strict";function n(e){var t=e.length,n=st.type(e);return
st.isWindow(e)?!1:1===e.nodeType&?!0:"array"===n||"function"!==n&&(0===t||"number"==typeof
t&>0& in e)}function r(e){var t=Tt[e]={};return
st.each(e.match(lt)||[],function(e,n){t[n]=!0}),t}function
i(e,n,r,i){if(st.acceptData(e)){var o,a,s=st.expando,u="string"==typeof
n,l=e.nodeType,c=l?st.cache:e,f=l?e[s]:e[s]&if(f&[f]&&(i||c[f].data)||!u||r!==t)return
f||(l?e[s]=f=K.pop()||st.guid++:f=s),c[f]||(c [...]
+},set:function(e,n,r){return
st.nodeName(e,"input")?(e.defaultValue=n,t):Ct&(e,n,r)}}),Ht||(Ct=st.valHooks.button={get:function(e,n){var
r=e.getAttributeNode(n);return
r&&("id"===n||"name"===n||"coords"===n?""!==r.value:r.specified)?r.value:t},set:function(e,n,r){var
i=e.getAttributeNode(r);return
i||e.setAttributeNode(i=e.ownerDocument.createAttribute(r)),i.value=n+="","value"===r||n===e.getAttribute(r)?n:t}},st.attrHooks.contenteditable={get:Ct.get,set:function(e,t,n){Ct.set(e,"
[...]
+},nextAll:function(e){return
st.dir(e,"nextSibling")},prevAll:function(e){return
st.dir(e,"previousSibling")},nextUntil:function(e,t,n){return
st.dir(e,"nextSibling",n)},prevUntil:function(e,t,n){return
st.dir(e,"previousSibling",n)},siblings:function(e){return
st.sibling((e.parentNode||{}).firstChild,e)},children:function(e){return
st.sibling(e.firstChild)},contents:function(e){return
st.nodeName(e,"iframe")?e.contentDocument||e.contentWindow.document:st.merge([],e.childNodes)}},functio
[...]
+//@ sourceMappingURL=jquery.min.map
\ No newline at end of file
[ambari] branch trunk updated: AMBARI-24778. Removed CVE issues from ambari-server (#2459)
This is an automated email from the ASF dual-hosted git repository.
smolnar pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/ambari.git
The following commit(s) were added to refs/heads/trunk by this push:
new 3b50cb6 AMBARI-24778. Removed CVE issues from ambari-server (#2459)
3b50cb6 is described below
commit 3b50cb6a1a2cfb2bfc45869d4c9609b3ef87932b
Author: Sandor Molnar
AuthorDate: Tue Oct 16 09:28:33 2018 +0200
AMBARI-24778. Removed CVE issues from ambari-server (#2459)
---
ambari-project/pom.xml | 4 ++--
ambari-web/api-docs/index.html | 2 +-
ambari-web/api-docs/lib/jquery-1.8.3.min.js | 2 --
ambari-web/api-docs/lib/jquery-1.9.0.min.js | 5 +
4 files changed, 8 insertions(+), 5 deletions(-)
diff --git a/ambari-project/pom.xml b/ambari-project/pom.xml
index 3c568fe..53addad 100644
--- a/ambari-project/pom.xml
+++ b/ambari-project/pom.xml
@@ -30,14 +30,14 @@
5.5.2
${project.parent.basedir}
1.6.3
-9.4.11.v20180605
+9.4.12.v20180830
1.0.0
8.9
1.5.19
3.1.4
1.7.20
4.1.0
-4.3.17.RELEASE
+4.3.18.RELEASE
4.2.7.RELEASE
2.9.5
42.2.2
diff --git a/ambari-web/api-docs/index.html b/ambari-web/api-docs/index.html
index a067d95..1df8f01 100644
--- a/ambari-web/api-docs/index.html
+++ b/ambari-web/api-docs/index.html
@@ -14,7 +14,7 @@
-
+
diff --git a/ambari-web/api-docs/lib/jquery-1.8.3.min.js
b/ambari-web/api-docs/lib/jquery-1.8.3.min.js
deleted file mode 100644
index 3883779..000
--- a/ambari-web/api-docs/lib/jquery-1.8.3.min.js
+++ /dev/null
@@ -1,2 +0,0 @@
-/*! jQuery v1.8.3 jquery.com | jquery.org/license */
-(function(e,t){function _(e){var t=M[e]={};return
v.each(e.split(y),function(e,n){t[n]=!0}),t}function
H(e,n,r){if(r===t&===1){var
i="data-"+n.replace(P,"-$1").toLowerCase();r=e.getAttribute(i);if(typeof
r=="string"){try{r=r==="true"?!0:r==="false"?!1:r==="null"?null:+r+""===r?+r:D.test(r)?v.parseJSON(r):r}catch(s){}v.data(e,n,r)}else
r=t}return r}function B(e){var t;for(t in
e){if(t==="data"&(e[t]))continue;if(t!=="toJSON")return!1}return!0}function
et(){retur [...]
\ No newline at end of file
diff --git a/ambari-web/api-docs/lib/jquery-1.9.0.min.js
b/ambari-web/api-docs/lib/jquery-1.9.0.min.js
new file mode 100644
index 000..fd86897
--- /dev/null
+++ b/ambari-web/api-docs/lib/jquery-1.9.0.min.js
@@ -0,0 +1,5 @@
+/*! jQuery v1.9.0 | (c) 2005, 2012 jQuery Foundation, Inc. |
jquery.org/license */
+(function(e,t){"use strict";function n(e){var t=e.length,n=st.type(e);return
st.isWindow(e)?!1:1===e.nodeType&?!0:"array"===n||"function"!==n&&(0===t||"number"==typeof
t&>0& in e)}function r(e){var t=Tt[e]={};return
st.each(e.match(lt)||[],function(e,n){t[n]=!0}),t}function
i(e,n,r,i){if(st.acceptData(e)){var o,a,s=st.expando,u="string"==typeof
n,l=e.nodeType,c=l?st.cache:e,f=l?e[s]:e[s]&if(f&[f]&&(i||c[f].data)||!u||r!==t)return
f||(l?e[s]=f=K.pop()||st.guid++:f=s),c[f]||(c [...]
+},set:function(e,n,r){return
st.nodeName(e,"input")?(e.defaultValue=n,t):Ct&(e,n,r)}}),Ht||(Ct=st.valHooks.button={get:function(e,n){var
r=e.getAttributeNode(n);return
r&&("id"===n||"name"===n||"coords"===n?""!==r.value:r.specified)?r.value:t},set:function(e,n,r){var
i=e.getAttributeNode(r);return
i||e.setAttributeNode(i=e.ownerDocument.createAttribute(r)),i.value=n+="","value"===r||n===e.getAttribute(r)?n:t}},st.attrHooks.contenteditable={get:Ct.get,set:function(e,t,n){Ct.set(e,"
[...]
+},nextAll:function(e){return
st.dir(e,"nextSibling")},prevAll:function(e){return
st.dir(e,"previousSibling")},nextUntil:function(e,t,n){return
st.dir(e,"nextSibling",n)},prevUntil:function(e,t,n){return
st.dir(e,"previousSibling",n)},siblings:function(e){return
st.sibling((e.parentNode||{}).firstChild,e)},children:function(e){return
st.sibling(e.firstChild)},contents:function(e){return
st.nodeName(e,"iframe")?e.contentDocument||e.contentWindow.document:st.merge([],e.childNodes)}},functio
[...]
+//@ sourceMappingURL=jquery.min.map
\ No newline at end of file
