[ambari] 01/01: Merge pull request #771 from dilica/AMBARI-23348-trunk
This is an automated email from the ASF dual-hosted git repository. dili pushed a commit to branch trunk in repository https://gitbox.apache.org/repos/asf/ambari.git commit 264bfa80056feb25a55afabcddd633465cf2f433 Merge: ff05ef6 68fdbef Author: Di Li <15253273+dil...@users.noreply.github.com> AuthorDate: Thu Mar 29 09:05:15 2018 -0400 Merge pull request #771 from dilica/AMBARI-23348-trunk AMBARI-23348 - service advisor has the option to calculate colocatSe… .../src/main/resources/stacks/service_advisor.py | 32 ++ .../src/main/resources/stacks/stack_advisor.py | 1 + 2 files changed, 21 insertions(+), 12 deletions(-) -- To stop receiving notification emails like this one, please contact d...@apache.org.
[ambari] branch trunk updated (ff05ef6 -> 264bfa8)
This is an automated email from the ASF dual-hosted git repository. dili pushed a change to branch trunk in repository https://gitbox.apache.org/repos/asf/ambari.git. from ff05ef6 AMBARI-23281 Enable Kerberos Wizard style edits add ae674b3 AMBARI-23348 - service advisor has the option to calculate colocatServices with more information from the services list (dili) add 68fdbef AMBARI-23348 service advisor has the option to calculate colocatServices with more information from the services list - fix unit test failures(dili) new 264bfa8 Merge pull request #771 from dilica/AMBARI-23348-trunk The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: .../src/main/resources/stacks/service_advisor.py | 32 ++ .../src/main/resources/stacks/stack_advisor.py | 1 + 2 files changed, 21 insertions(+), 12 deletions(-) -- To stop receiving notification emails like this one, please contact d...@apache.org.
[ambari] 01/01: Merge pull request #557 from dilica/trunk
This is an automated email from the ASF dual-hosted git repository. dili pushed a commit to branch trunk in repository https://gitbox.apache.org/repos/asf/ambari.git commit 5d7756873b51c66d383208f1d55b8c25e464 Merge: 7cea81a 4b5a010 Author: Di Li <15253273+dil...@users.noreply.github.com> AuthorDate: Tue Mar 6 13:35:45 2018 -0500 Merge pull request #557 from dilica/trunk [AMBARI-23152] Clean up dup vars in params in Slider (dili) .../common-services/SLIDER/0.60.0.2.2/package/scripts/params_linux.py | 2 -- 1 file changed, 2 deletions(-) -- To stop receiving notification emails like this one, please contact d...@apache.org.
[ambari] branch trunk updated (7cea81a -> 5d77568)
This is an automated email from the ASF dual-hosted git repository. dili pushed a change to branch trunk in repository https://gitbox.apache.org/repos/asf/ambari.git. from 7cea81a [AMBARI-23144] Remove obsolete modules from the Ambari source code add 4b5a010 Update params_linux.py new 5d77568 Merge pull request #557 from dilica/trunk The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: .../common-services/SLIDER/0.60.0.2.2/package/scripts/params_linux.py | 2 -- 1 file changed, 2 deletions(-) -- To stop receiving notification emails like this one, please contact d...@apache.org.
[ambari] 01/01: Merge pull request #379 from dilica/trunk
This is an automated email from the ASF dual-hosted git repository. dili pushed a commit to branch trunk in repository https://gitbox.apache.org/repos/asf/ambari.git commit 1846978a7289afc12375a025b3b023b5978f893b Merge: 8cb349f 0a33a07 Author: Di Li <15253273+dil...@users.noreply.github.com> AuthorDate: Fri Feb 16 15:29:19 2018 -0500 Merge pull request #379 from dilica/trunk [AMBARI-23005] Failed to Add Big SQL to HDP 3.0 due to a stack advisor error on calculating slave component dependencies ambari-server/src/main/resources/stacks/stack_advisor.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -- To stop receiving notification emails like this one, please contact d...@apache.org.
[ambari] branch trunk updated (8cb349f -> 1846978)
This is an automated email from the ASF dual-hosted git repository. dili pushed a change to branch trunk in repository https://gitbox.apache.org/repos/asf/ambari.git. from 8cb349f AMBARI-21158. Eliminate Maven warnings (#397) add 0a33a07 AMBARI-23005: Stack advisor error (dili) new 1846978 Merge pull request #379 from dilica/trunk The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: ambari-server/src/main/resources/stacks/stack_advisor.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -- To stop receiving notification emails like this one, please contact d...@apache.org.
ambari git commit: AMBARI-22685 Stack OS/repos removed from cluster installation UI showed up on the Versions tab after cluster is installed (dili)
Repository: ambari
Updated Branches:
refs/heads/trunk 8ea7b198f -> 32092da83
AMBARI-22685 Stack OS/repos removed from cluster installation UI showed up on
the Versions tab after cluster is installed (dili)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/32092da8
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/32092da8
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/32092da8
Branch: refs/heads/trunk
Commit: 32092da8377d7437d5b38e58ae58a9bebe05281a
Parents: 8ea7b19
Author: Di Li
Authored: Fri Dec 22 11:52:46 2017 -0500
Committer: Di Li
Committed: Fri Dec 22 11:52:46 2017 -0500
--
ambari-web/app/controllers/installer.js | 42 +++-
.../app/controllers/wizard/step8_controller.js | 2 +-
2 files changed, 24 insertions(+), 20 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/32092da8/ambari-web/app/controllers/installer.js
--
diff --git a/ambari-web/app/controllers/installer.js
b/ambari-web/app/controllers/installer.js
index f49fc11..4ecdc9b 100644
--- a/ambari-web/app/controllers/installer.js
+++ b/ambari-web/app/controllers/installer.js
@@ -800,26 +800,30 @@ App.InstallerController =
App.WizardController.extend(App.Persist, {
prepareRepoForSaving: function(repo) {
var repoVersion = { "operating_systems": [] };
var ambariManagedRepositories = !repo.get('useRedhatSatellite');
-repo.get('operatingSystems').forEach(function (os, k) {
- repoVersion.operating_systems.push({
-"OperatingSystems": {
- "os_type": os.get("osType"),
- "ambari_managed_repositories": ambariManagedRepositories
-},
-"repositories": []
- });
- os.get('repositories').forEach(function (repository) {
-repoVersion.operating_systems[k].repositories.push({
- "Repositories": {
-"base_url": repository.get('baseUrl'),
-"repo_id": repository.get('repoId'),
-"repo_name": repository.get('repoName'),
-"components": repository.get('components'),
-"tags": repository.get('tags'),
-"distribution": repository.get('distribution')
- }
+var k = 0;
+repo.get('operatingSystems').forEach(function (os) {
+ if (os.get('isSelected')) {
+repoVersion.operating_systems.push({
+ "OperatingSystems": {
+"os_type": os.get("osType"),
+"ambari_managed_repositories": ambariManagedRepositories
+ },
+ "repositories": []
});
- });
+os.get('repositories').forEach(function (repository) {
+ repoVersion.operating_systems[k].repositories.push({
+"Repositories": {
+ "base_url": repository.get('baseUrl'),
+ "repo_id": repository.get('repoId'),
+ "repo_name": repository.get('repoName'),
+ "components": repository.get('components'),
+ "tags": repository.get('tags'),
+ "distribution": repository.get('distribution')
+}
+ });
+});
+k++;
+ }
});
return repoVersion;
},
http://git-wip-us.apache.org/repos/asf/ambari/blob/32092da8/ambari-web/app/controllers/wizard/step8_controller.js
--
diff --git a/ambari-web/app/controllers/wizard/step8_controller.js
b/ambari-web/app/controllers/wizard/step8_controller.js
index e64a09a..bd3c36f 100644
--- a/ambari-web/app/controllers/wizard/step8_controller.js
+++ b/ambari-web/app/controllers/wizard/step8_controller.js
@@ -301,7 +301,7 @@ App.WizardStep8Controller =
Em.Controller.extend(App.AddSecurityConfigs, App.wiz
}
} else {
// from install wizard
- var selectedStack = App.Stack.find().findProperty('isSelected');
+ var selectedStack = App.Stack.find().findProperty('isSelected', true);
var allRepos = [];
if (selectedStack && selectedStack.get('operatingSystems')) {
selectedStack.get('operatingSystems').forEach(function (os) {
ambari git commit: AMBARI-22680 Ambari web UI does not fail an invalid repo base URL during cluster installation (dili)
Repository: ambari
Updated Branches:
refs/heads/trunk 6a37985bc -> a15fc7fc1
AMBARI-22680 Ambari web UI does not fail an invalid repo base URL during
cluster installation (dili)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/a15fc7fc
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/a15fc7fc
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/a15fc7fc
Branch: refs/heads/trunk
Commit: a15fc7fc1ac70d3399a1b4046c3124dcc8cdbb11
Parents: 6a37985
Author: Di Li
Authored: Thu Dec 21 15:44:22 2017 -0500
Committer: Di Li
Committed: Thu Dec 21 15:44:22 2017 -0500
--
.../internal/RepositoryResourceProvider.java | 14 --
.../internal/RepositoryResourceProviderTest.java | 2 ++
2 files changed, 14 insertions(+), 2 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/a15fc7fc/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/RepositoryResourceProvider.java
--
diff --git
a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/RepositoryResourceProvider.java
b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/RepositoryResourceProvider.java
index edec1ee..60dff69 100644
---
a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/RepositoryResourceProvider.java
+++
b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/RepositoryResourceProvider.java
@@ -117,15 +117,25 @@ public class RepositoryResourceProvider extends
AbstractControllerResourceProvid
throws SystemException, UnsupportedPropertyException,
NoSuchResourceException, NoSuchParentResourceException {
-final Set requests = new HashSet<>();
+final Set requestsToVerifyBaseURLs = new HashSet<>();
Iterator> iterator = request.getProperties().iterator();
if (iterator.hasNext()) {
for (Map propertyMap : getPropertyMaps(iterator.next(),
predicate)) {
-requests.add(getRequest(propertyMap));
+RepositoryRequest rr = getRequest(propertyMap);
+if(rr.isVerifyBaseUrl()) {
+ requestsToVerifyBaseURLs.add(rr);
+}
}
}
+//Validation only - used by the cluster installation
+try {
+ getManagementController().verifyRepositories(requestsToVerifyBaseURLs);
+} catch (AmbariException e) {
+ throw new SystemException("", e);
+}
+
return getRequestStatus(null);
}
http://git-wip-us.apache.org/repos/asf/ambari/blob/a15fc7fc/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/RepositoryResourceProviderTest.java
--
diff --git
a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/RepositoryResourceProviderTest.java
b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/RepositoryResourceProviderTest.java
index abdef9b..0d7813a 100644
---
a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/RepositoryResourceProviderTest.java
+++
b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/RepositoryResourceProviderTest.java
@@ -30,6 +30,7 @@ import java.util.Map;
import java.util.Set;
import org.apache.ambari.server.controller.AmbariManagementController;
+import org.apache.ambari.server.controller.RepositoryRequest;
import org.apache.ambari.server.controller.RepositoryResponse;
import org.apache.ambari.server.controller.spi.Predicate;
import org.apache.ambari.server.controller.spi.Request;
@@ -176,6 +177,7 @@ public class RepositoryResourceProviderTest {
// set expectations
expect(managementController.getRepositories(EasyMock.anyObject())).andReturn(allResponse).times(1);
+
managementController.verifyRepositories(EasyMock.>anyObject());
// replay
replay(managementController);
ambari git commit: AMBARI-22681 Ambari web UI failed to update stack repo directly from the Versions tab (dili)
Repository: ambari
Updated Branches:
refs/heads/trunk 67fc4a378 -> 26bcc97bc
AMBARI-22681 Ambari web UI failed to update stack repo directly from the
Versions tab (dili)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/26bcc97b
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/26bcc97b
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/26bcc97b
Branch: refs/heads/trunk
Commit: 26bcc97bcb4016948fd28d76943eb9ad23c7a4e6
Parents: 67fc4a3
Author: Di Li
Authored: Thu Dec 21 11:45:33 2017 -0500
Committer: Di Li
Committed: Thu Dec 21 11:45:33 2017 -0500
--
.../app/controllers/main/admin/stack_and_upgrade_controller.js| 1 +
ambari-web/app/utils/ajax/ajax.js | 3 ++-
2 files changed, 3 insertions(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/26bcc97b/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 2f0cb68..35041bf 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
@@ -1695,6 +1695,7 @@ App.MainAdminStackAndUpgradeController =
Em.Controller.extend(App.LocalStorage,
sender: this,
data: {
repo: repo,
+repoName: repo.get('repoName'),
repoId: repo.get('repoId'),
baseUrl: repo.get('baseUrl'),
osType: os.get('osType'),
http://git-wip-us.apache.org/repos/asf/ambari/blob/26bcc97b/ambari-web/app/utils/ajax/ajax.js
--
diff --git a/ambari-web/app/utils/ajax/ajax.js
b/ambari-web/app/utils/ajax/ajax.js
index 3f85dfdc..42bb974 100644
--- a/ambari-web/app/utils/ajax/ajax.js
+++ b/ambari-web/app/utils/ajax/ajax.js
@@ -1843,7 +1843,8 @@ var urls = {
return {
data: JSON.stringify({
"Repositories": {
-"base_url": data.baseUrl
+"base_url": data.baseUrl,
+"repo_name": data.repoName
}
})
}
ambari git commit: AMBARI-22589 Ambari web UI stack version page is empty due to NPE when target stack does not contain all services from the current stack (dili)
Repository: ambari
Updated Branches:
refs/heads/trunk 862b7d7b1 -> f4d27390f
AMBARI-22589 Ambari web UI stack version page is empty due to NPE when target
stack does not contain all services from the current stack (dili)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/f4d27390
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/f4d27390
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/f4d27390
Branch: refs/heads/trunk
Commit: f4d27390f0de5a0e85c143e783312d03f24adf54
Parents: 862b7d7
Author: Di Li
Authored: Thu Dec 7 14:05:45 2017 -0500
Committer: Di Li
Committed: Thu Dec 7 14:05:45 2017 -0500
--
.../admin/stack_upgrade/upgrade_version_column_view.js | 11 ++-
1 file changed, 10 insertions(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/f4d27390/ambari-web/app/views/main/admin/stack_upgrade/upgrade_version_column_view.js
--
diff --git
a/ambari-web/app/views/main/admin/stack_upgrade/upgrade_version_column_view.js
b/ambari-web/app/views/main/admin/stack_upgrade/upgrade_version_column_view.js
index 9ddb083..3a406d8 100644
---
a/ambari-web/app/views/main/admin/stack_upgrade/upgrade_version_column_view.js
+++
b/ambari-web/app/views/main/admin/stack_upgrade/upgrade_version_column_view.js
@@ -51,12 +51,21 @@ App.UpgradeVersionColumnView =
App.UpgradeVersionBoxView.extend({
var stackService = originalServices.findProperty('name',
service.get('serviceName'));
var isAvailable = this.isStackServiceAvailable(stackService);
+
+ var notUpgradable = false;
+ if (!stackService) {
+console.error(stackService + " definition does not exist in the
stack.")
+notUpgradable = true;
+ } else {
+notUpgradable = this.getNotUpgradable(isAvailable,
stackService.get('isUpgradable'));
+ }
+
return Em.Object.create({
displayName: service.get('displayName'),
name: service.get('serviceName'),
latestVersion: stackService ? stackService.get('latestVersion') : '',
isVersionInvisible: !stackService,
-notUpgradable: this.getNotUpgradable(isAvailable,
stackService.get('isUpgradable')),
+notUpgradable: notUpgradable,
isAvailable: isAvailable
});
}, this);
ambari git commit: AMBARI-22574 Failed to restart services on PPC cluster post Ambari upgrade for IOP/HDP migration (dili)
Repository: ambari
Updated Branches:
refs/heads/branch-2.6 dd00aa212 -> 6be9145ab
AMBARI-22574 Failed to restart services on PPC cluster post Ambari upgrade for
IOP/HDP migration (dili)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/6be9145a
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/6be9145a
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/6be9145a
Branch: refs/heads/branch-2.6
Commit: 6be9145abe15e78bdcb13b6b323633006c604e41
Parents: dd00aa2
Author: Di Li
Authored: Tue Dec 5 14:12:00 2017 -0500
Committer: Di Li
Committed: Tue Dec 5 14:12:00 2017 -0500
--
.../server/upgrade/UpgradeCatalog261.java | 74
1 file changed, 74 insertions(+)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/6be9145a/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog261.java
--
diff --git
a/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog261.java
b/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog261.java
index ba95833..48a3fd1 100644
---
a/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog261.java
+++
b/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog261.java
@@ -18,13 +18,20 @@
package org.apache.ambari.server.upgrade;
import java.sql.SQLException;
+import java.util.Collection;
+import java.util.List;
import java.util.Map;
import org.apache.ambari.server.AmbariException;
import org.apache.ambari.server.controller.AmbariManagementController;
+import org.apache.ambari.server.orm.dao.RepositoryVersionDAO;
+import org.apache.ambari.server.orm.entities.OperatingSystemEntity;
+import org.apache.ambari.server.orm.entities.RepositoryVersionEntity;
import org.apache.ambari.server.state.Cluster;
import org.apache.ambari.server.state.Clusters;
import org.apache.ambari.server.state.Config;
+import org.apache.ambari.server.state.Host;
+import org.apache.ambari.server.state.stack.upgrade.RepositoryVersionHelper;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -42,6 +49,9 @@ public class UpgradeCatalog261 extends AbstractUpgradeCatalog
{
private static final Logger LOG =
LoggerFactory.getLogger(UpgradeCatalog261.class);
+ @Inject
+ private RepositoryVersionHelper repositoryVersionHelper;
+
/**
* Constructor.
*
@@ -80,6 +90,7 @@ public class UpgradeCatalog261 extends AbstractUpgradeCatalog
{
*/
@Override
protected void executePreDMLUpdates() throws AmbariException, SQLException {
+updateRepoVersionOperatingSystem();
}
/**
@@ -116,4 +127,67 @@ public class UpgradeCatalog261 extends
AbstractUpgradeCatalog {
}
return false;
}
+
+ /**
+ * Update the redhat operating system type for PowerPC repos
+ * in case any uses redhat7 while the new Ambari version expects redhat-ppc7
+ * */
+ void updateRepoVersionOperatingSystem() throws AmbariException {
+AmbariManagementController ambariManagementController =
injector.getInstance(AmbariManagementController.class);
+Clusters clusters = ambariManagementController.getClusters();
+if (clusters != null) {
+ Map clusterMap = getCheckedClusterMap(clusters);
+ if (clusterMap != null && !clusterMap.isEmpty()) {
+for (final Cluster cluster : clusterMap.values()) {
+
+ Collection hosts = cluster.getHosts();
+ String osArch = null;
+ for (Host host: hosts) {
+osArch = host.getOsArch();
+break; //All hosts have the same os arch, use the os info from the
first host element.
+ }
+ if ("ppc64le".equals(osArch)){
+LOG.info("Current cluster is on PowerPC");
+
+RepositoryVersionDAO repositoryVersionDAO =
injector.getInstance(RepositoryVersionDAO.class);
+List repositoryVersions =
repositoryVersionDAO.findAll();
+
+for (RepositoryVersionEntity repositoryVersion :
repositoryVersions) {
+ OperatingSystemEntity operatingSystem = null;
+ List operatingSystems =
repositoryVersion.getOperatingSystems();
+
+ for(OperatingSystemEntity osEntity: operatingSystems) {
+String osType = osEntity.getOsType();
+LOG.debug(String.format("OS Type: %s" , osType));
+if ("redhat-ppc7".equals(osType)) {
+ // Found it, no need to fix anything
+ LOG.info("Repositories contain redhat-ppc7 already. No need
to fix anything. Discard changes yet to be applied.");
+ operatingSystem = null; // Discard local changes if there is
ambari git commit: AMBARI-22337 each service should be able to implement server actions, package them add a jar to be loaded during EU (port from trunk to branch-26)(dili)
Repository: ambari
Updated Branches:
refs/heads/branch-2.6 17f89c01f -> eecd8513a
AMBARI-22337 each service should be able to implement server actions, package
them add a jar to be loaded during EU (port from trunk to branch-26)(dili)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/eecd8513
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/eecd8513
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/eecd8513
Branch: refs/heads/branch-2.6
Commit: eecd8513a304641617cc8602f5805eee8aaf3c69
Parents: 17f89c0
Author: Di Li
Authored: Mon Nov 20 13:54:31 2017 -0500
Committer: Di Li
Committed: Mon Nov 20 13:54:31 2017 -0500
--
ambari-server/pom.xml | 12 ++
.../serveraction/ServerActionExecutor.java | 147 +--
.../ambari/server/stack/ServiceDirectory.java | 29
.../ambari/server/stack/ServiceModule.java | 8 +
.../apache/ambari/server/state/ServiceInfo.java | 14 ++
.../ambari/server/stack/ServiceModuleTest.java | 30
.../server/stack/StackManagerExtensionTest.java | 6 +
7 files changed, 232 insertions(+), 14 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/eecd8513/ambari-server/pom.xml
--
diff --git a/ambari-server/pom.xml b/ambari-server/pom.xml
index 342b3c0..eece739 100644
--- a/ambari-server/pom.xml
+++ b/ambari-server/pom.xml
@@ -165,6 +165,18 @@
+
+generate-test-oozie2-server-actions-dir
+process-test-classes
+
+ run
+
+
+
+
+
+
+
http://git-wip-us.apache.org/repos/asf/ambari/blob/eecd8513/ambari-server/src/main/java/org/apache/ambari/server/serveraction/ServerActionExecutor.java
--
diff --git
a/ambari-server/src/main/java/org/apache/ambari/server/serveraction/ServerActionExecutor.java
b/ambari-server/src/main/java/org/apache/ambari/server/serveraction/ServerActionExecutor.java
index 50e3cfe..e219dc3 100644
---
a/ambari-server/src/main/java/org/apache/ambari/server/serveraction/ServerActionExecutor.java
+++
b/ambari-server/src/main/java/org/apache/ambari/server/serveraction/ServerActionExecutor.java
@@ -18,10 +18,17 @@
package org.apache.ambari.server.serveraction;
+import java.io.File;
+import java.io.FilenameFilter;
+import java.net.URL;
+import java.net.URLClassLoader;
+import java.util.ArrayList;
+import java.util.HashMap;
import java.util.HashSet;
import java.util.List;
import java.util.Map;
import java.util.Set;
+import java.util.StringTokenizer;
import java.util.Timer;
import java.util.TimerTask;
import java.util.concurrent.ConcurrentHashMap;
@@ -38,11 +45,17 @@ import
org.apache.ambari.server.actionmanager.HostRoleStatus;
import org.apache.ambari.server.actionmanager.Stage;
import org.apache.ambari.server.agent.CommandReport;
import org.apache.ambari.server.agent.ExecutionCommand;
+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.security.authorization.internal.InternalAuthenticationToken;
+import org.apache.ambari.server.state.ServiceInfo;
+import org.apache.ambari.server.state.UpgradeContext.UpgradeServiceSummary;
+import org.apache.ambari.server.state.UpgradeContext.UpgradeSummary;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.security.core.context.SecurityContextHolder;
+import org.springframework.util.ClassUtils;
import com.google.inject.Inject;
import com.google.inject.Injector;
@@ -495,7 +508,6 @@ public class ServerActionExecutor {
throw new AmbariException("Missing ExecutionCommand data");
} else {
Map roleParams = executionCommand.getRoleParams();
-
if (roleParams == null) {
throw new AmbariException("Missing RoleParams data");
} else {
@@ -504,8 +516,30 @@ public class ServerActionExecutor {
if (actionClassname == null) {
throw new AmbariException("Missing action classname for server
action");
} else {
-ServerAction action = createServerAction(actionClassname);
-
+Map services = new HashMap();
+UpgradeSummary upgradeSummary =
executionCommand.getUpgradeSummary();
+if (upgradeSummary != null) {
+ Map upgradeServiceSummaries =
upgradeSummary.services;
+ LOG.debug("UpgradeServi
ambari git commit: AMBARI-22136 Enable server_action tasks defined in EU/RU upgrade pack xml files to take parameters (push to branch-2.6) (dili)
Repository: ambari
Updated Branches:
refs/heads/branch-2.6 a1d59b7dd -> fb65aab92
AMBARI-22136 Enable server_action tasks defined in EU/RU upgrade pack xml files
to take parameters (push to branch-2.6) (dili)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/fb65aab9
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/fb65aab9
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/fb65aab9
Branch: refs/heads/branch-2.6
Commit: fb65aab92ea3024728b2e100b0a90a8f6bbf13d9
Parents: a1d59b7
Author: Di Li
Authored: Fri Nov 17 15:43:02 2017 -0500
Committer: Di Li
Committed: Fri Nov 17 15:43:02 2017 -0500
--
.../ambari/server/actionmanager/Stage.java | 3 +-
.../internal/UpgradeResourceProvider.java | 2 +
.../stack/upgrade/ServerSideActionTask.java | 15 +++
.../state/stack/upgrade/TaskParameter.java | 41
.../src/main/resources/upgrade-pack.xsd | 9 +
5 files changed, 69 insertions(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/fb65aab9/ambari-server/src/main/java/org/apache/ambari/server/actionmanager/Stage.java
--
diff --git
a/ambari-server/src/main/java/org/apache/ambari/server/actionmanager/Stage.java
b/ambari-server/src/main/java/org/apache/ambari/server/actionmanager/Stage.java
index 1d6ceaf..0563bfd 100644
---
a/ambari-server/src/main/java/org/apache/ambari/server/actionmanager/Stage.java
+++
b/ambari-server/src/main/java/org/apache/ambari/server/actionmanager/Stage.java
@@ -443,7 +443,8 @@ public class Stage {
* @param retryAllowed
* indicates whether retry after failure is allowed
*/
- public synchronized void addServerActionCommand(String actionName, @Nullable
String userName,
+ public synchronized void addServerActionCommand(String actionName,
+ @Nullable String userName,
Role role, RoleCommand command, String clusterName,
ServiceComponentHostServerActionEvent event, @Nullable Map commandParams,
@Nullable String commandDetail, @Nullable Map> configTags,
http://git-wip-us.apache.org/repos/asf/ambari/blob/fb65aab9/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/UpgradeResourceProvider.java
--
diff --git
a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/UpgradeResourceProvider.java
b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/UpgradeResourceProvider.java
index b6846f7..ff326aa 100644
---
a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/UpgradeResourceProvider.java
+++
b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/UpgradeResourceProvider.java
@@ -1409,6 +1409,8 @@ public class UpgradeResourceProvider extends
AbstractControllerResourceProvider
stage.setStageId(stageId);
entity.setStageId(Long.valueOf(stageId));
+Map taskParameters = task.getParameters();
+commandParams.putAll(taskParameters);
stage.addServerActionCommand(task.getImplementationClass(),
getManagementController().getAuthName(), Role.AMBARI_SERVER_ACTION,
RoleCommand.EXECUTE,
cluster.getClusterName(),
http://git-wip-us.apache.org/repos/asf/ambari/blob/fb65aab9/ambari-server/src/main/java/org/apache/ambari/server/state/stack/upgrade/ServerSideActionTask.java
--
diff --git
a/ambari-server/src/main/java/org/apache/ambari/server/state/stack/upgrade/ServerSideActionTask.java
b/ambari-server/src/main/java/org/apache/ambari/server/state/stack/upgrade/ServerSideActionTask.java
index 045c9ac..ee16bf7 100644
---
a/ambari-server/src/main/java/org/apache/ambari/server/state/stack/upgrade/ServerSideActionTask.java
+++
b/ambari-server/src/main/java/org/apache/ambari/server/state/stack/upgrade/ServerSideActionTask.java
@@ -18,7 +18,9 @@
package org.apache.ambari.server.state.stack.upgrade;
import java.util.ArrayList;
+import java.util.HashMap;
import java.util.List;
+import java.util.Map;
import javax.xml.bind.annotation.XmlAttribute;
import javax.xml.bind.annotation.XmlElement;
@@ -31,6 +33,19 @@ public abstract class ServerSideActionTask extends Task {
@XmlAttribute(name="class")
protected String implClass;
+ @XmlElement(name = "parameter")
+ public List parameters;
+
+ public Map getParameters(){
+Map result = new HashMap();
+if (parameters != null) {
+ for (TaskParameter parameter : parameters) {
+result.put(parameter.name, parameter.value);
+ }
+}
+return result;
+ }
+
public static final String actionVerb = "
ambari git commit: AMBARI-22459 IOP/HDP migration NN HA restart post Ambari upgrade fails (dili)
Repository: ambari
Updated Branches:
refs/heads/branch-2.6 72785da88 -> 946356a9c
AMBARI-22459 IOP/HDP migration NN HA restart post Ambari upgrade fails (dili)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/946356a9
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/946356a9
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/946356a9
Branch: refs/heads/branch-2.6
Commit: 946356a9cc9cd1999c05888b1799b8e1ac703491
Parents: 72785da
Author: Di Li
Authored: Thu Nov 16 14:51:53 2017 -0500
Committer: Di Li
Committed: Thu Nov 16 14:51:53 2017 -0500
--
.../BigInsights/4.0/properties/stack_packages.json | 12
1 file changed, 12 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/946356a9/ambari-server/src/main/resources/stacks/BigInsights/4.0/properties/stack_packages.json
--
diff --git
a/ambari-server/src/main/resources/stacks/BigInsights/4.0/properties/stack_packages.json
b/ambari-server/src/main/resources/stacks/BigInsights/4.0/properties/stack_packages.json
index f890d66..7a12011 100644
---
a/ambari-server/src/main/resources/stacks/BigInsights/4.0/properties/stack_packages.json
+++
b/ambari-server/src/main/resources/stacks/BigInsights/4.0/properties/stack_packages.json
@@ -178,18 +178,6 @@
"STANDARD": [
"hadoop-hdfs-secondarynamenode"
]
-},
-"ZKFC": {
- "STACK-SELECT-PACKAGE": "hadoop-hdfs-zkfc",
- "INSTALL": [
-"hadoop-hdfs-zkfc"
- ],
- "PATCH": [
-"hadoop-hdfs-zkfc"
- ],
- "STANDARD": [
-"hadoop-hdfs-zkfc"
- ]
}
},
"HIVE": {
ambari git commit: AMBARI-22431 Able to add config type if EU/RU of the same stack (minor version upgrade) (dili)
Repository: ambari
Updated Branches:
refs/heads/trunk a393926c5 -> f51b1ccab
AMBARI-22431 Able to add config type if EU/RU of the same stack (minor version
upgrade) (dili)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/f51b1cca
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/f51b1cca
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/f51b1cca
Branch: refs/heads/trunk
Commit: f51b1ccabbd952316979a35f398561e962164aab
Parents: a393926
Author: Di Li
Authored: Thu Nov 16 13:47:56 2017 -0500
Committer: Di Li
Committed: Thu Nov 16 13:47:56 2017 -0500
--
.../internal/UpgradeResourceProvider.java | 36 ++
.../upgrades/CreateAndConfigureAction.java | 164 +
.../ambari/server/state/stack/UpgradePack.java | 3 +
.../state/stack/upgrade/ClusterGrouping.java| 2 +
.../stack/upgrade/CreateAndConfigureTask.java | 57 +++
.../ambari/server/state/stack/upgrade/Task.java | 6 +-
.../src/main/resources/upgrade-pack.xsd | 9 +-
.../upgrades/CreateAndConfigureActionTest.java | 357 +++
8 files changed, 632 insertions(+), 2 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/f51b1cca/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/UpgradeResourceProvider.java
--
diff --git
a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/UpgradeResourceProvider.java
b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/UpgradeResourceProvider.java
index d4111d6..e4dd441 100644
---
a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/UpgradeResourceProvider.java
+++
b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/UpgradeResourceProvider.java
@@ -93,6 +93,7 @@ import
org.apache.ambari.server.state.UpgradeHelper.UpgradeGroupHolder;
import org.apache.ambari.server.state.stack.ConfigUpgradePack;
import org.apache.ambari.server.state.stack.UpgradePack;
import org.apache.ambari.server.state.stack.upgrade.ConfigureTask;
+import org.apache.ambari.server.state.stack.upgrade.CreateAndConfigureTask;
import org.apache.ambari.server.state.stack.upgrade.Direction;
import org.apache.ambari.server.state.stack.upgrade.ManualTask;
import org.apache.ambari.server.state.stack.upgrade.ServerSideActionTask;
@@ -1341,6 +1342,41 @@ public class UpgradeResourceProvider extends
AbstractControllerResourceProvider
break;
}
+ case CREATE_AND_CONFIGURE: {
+CreateAndConfigureTask ct = (CreateAndConfigureTask) task;
+
+// !!! would prefer to do this in the sequence generator, but there's
too many
+// places to miss
+if (context.getOrchestrationType().isRevertable() &&
!ct.supportsPatch) {
+ process = false;
+}
+
+Map configurationChanges =
+ct.getConfigurationChanges(cluster, configUpgradePack);
+
+// add all configuration changes to the command params
+commandParams.putAll(configurationChanges);
+
+// extract the config type to build the summary
+String configType =
configurationChanges.get(CreateAndConfigureTask.PARAMETER_CONFIG_TYPE);
+if (null != configType) {
+ itemDetail = String.format("Updating configuration %s", configType);
+} else {
+ itemDetail = "Skipping Configuration Task "
+ + StringUtils.defaultString(ct.id, "(missing id)");
+}
+
+entity.setText(itemDetail);
+
+String configureTaskSummary = ct.getSummary(configUpgradePack);
+if (null != configureTaskSummary) {
+ stageText = configureTaskSummary;
+} else {
+ stageText = itemDetail;
+}
+
+break;
+ }
default:
break;
}
http://git-wip-us.apache.org/repos/asf/ambari/blob/f51b1cca/ambari-server/src/main/java/org/apache/ambari/server/serveraction/upgrades/CreateAndConfigureAction.java
--
diff --git
a/ambari-server/src/main/java/org/apache/ambari/server/serveraction/upgrades/CreateAndConfigureAction.java
b/ambari-server/src/main/java/org/apache/ambari/server/serveraction/upgrades/CreateAndConfigureAction.java
new file mode 100644
index 000..e60938a
--- /dev/null
+++
b/ambari-server/src/main/java/org/apache/ambari/server/serveraction/upgrades/CreateAndConfigureAction.java
@@ -0,0 +1,164 @@
+/*
+ * 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
ambari git commit: AMBARI-22431 Able to add config type if EU/RU of the same stack (minor version upgrade) (dili)
Repository: ambari
Updated Branches:
refs/heads/branch-2.6 3279bef52 -> 295125730
AMBARI-22431 Able to add config type if EU/RU of the same stack (minor version
upgrade) (dili)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/29512573
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/29512573
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/29512573
Branch: refs/heads/branch-2.6
Commit: 29512573090948e29d38bb0d259f72b0a5e42e99
Parents: 3279bef
Author: Di Li
Authored: Thu Nov 16 12:22:35 2017 -0500
Committer: Di Li
Committed: Thu Nov 16 12:22:35 2017 -0500
--
.../internal/UpgradeResourceProvider.java | 36 ++
.../upgrades/CreateAndConfigureAction.java | 164 +
.../ambari/server/state/stack/UpgradePack.java | 3 +
.../state/stack/upgrade/ClusterGrouping.java| 2 +
.../stack/upgrade/CreateAndConfigureTask.java | 57 +++
.../ambari/server/state/stack/upgrade/Task.java | 6 +-
.../src/main/resources/upgrade-pack.xsd | 9 +-
.../upgrades/CreateAndConfigureActionTest.java | 357 +++
8 files changed, 632 insertions(+), 2 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/29512573/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/UpgradeResourceProvider.java
--
diff --git
a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/UpgradeResourceProvider.java
b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/UpgradeResourceProvider.java
index 66f5bf9..b6846f7 100644
---
a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/UpgradeResourceProvider.java
+++
b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/UpgradeResourceProvider.java
@@ -92,6 +92,7 @@ import
org.apache.ambari.server.state.UpgradeHelper.UpgradeGroupHolder;
import org.apache.ambari.server.state.stack.ConfigUpgradePack;
import org.apache.ambari.server.state.stack.UpgradePack;
import org.apache.ambari.server.state.stack.upgrade.ConfigureTask;
+import org.apache.ambari.server.state.stack.upgrade.CreateAndConfigureTask;
import org.apache.ambari.server.state.stack.upgrade.Direction;
import org.apache.ambari.server.state.stack.upgrade.ManualTask;
import org.apache.ambari.server.state.stack.upgrade.ServerSideActionTask;
@@ -1336,6 +1337,41 @@ public class UpgradeResourceProvider extends
AbstractControllerResourceProvider
break;
}
+ case CREATE_AND_CONFIGURE: {
+CreateAndConfigureTask ct = (CreateAndConfigureTask) task;
+
+// !!! would prefer to do this in the sequence generator, but there's
too many
+// places to miss
+if (context.getOrchestrationType().isRevertable() &&
!ct.supportsPatch) {
+ process = false;
+}
+
+Map configurationChanges =
+ct.getConfigurationChanges(cluster, configUpgradePack);
+
+// add all configuration changes to the command params
+commandParams.putAll(configurationChanges);
+
+// extract the config type to build the summary
+String configType =
configurationChanges.get(CreateAndConfigureTask.PARAMETER_CONFIG_TYPE);
+if (null != configType) {
+ itemDetail = String.format("Updating configuration %s", configType);
+} else {
+ itemDetail = "Skipping Configuration Task "
+ + StringUtils.defaultString(ct.id, "(missing id)");
+}
+
+entity.setText(itemDetail);
+
+String configureTaskSummary = ct.getSummary(configUpgradePack);
+if (null != configureTaskSummary) {
+ stageText = configureTaskSummary;
+} else {
+ stageText = itemDetail;
+}
+
+break;
+ }
default:
break;
}
http://git-wip-us.apache.org/repos/asf/ambari/blob/29512573/ambari-server/src/main/java/org/apache/ambari/server/serveraction/upgrades/CreateAndConfigureAction.java
--
diff --git
a/ambari-server/src/main/java/org/apache/ambari/server/serveraction/upgrades/CreateAndConfigureAction.java
b/ambari-server/src/main/java/org/apache/ambari/server/serveraction/upgrades/CreateAndConfigureAction.java
new file mode 100644
index 000..e60938a
--- /dev/null
+++
b/ambari-server/src/main/java/org/apache/ambari/server/serveraction/upgrades/CreateAndConfigureAction.java
@@ -0,0 +1,164 @@
+/*
+ * 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
ambari git commit: AMBARI-22378 BI 4.2.5 repoinfo misses the redhat-ppc7 section (dili)
Repository: ambari Updated Branches: refs/heads/branch-2.6 6df336124 -> 450ec05a1 AMBARI-22378 BI 4.2.5 repoinfo misses the redhat-ppc7 section (dili) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/450ec05a Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/450ec05a Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/450ec05a Branch: refs/heads/branch-2.6 Commit: 450ec05a1086cd6b1ceed889b35373534d3bbec1 Parents: 6df3361 Author: Di Li Authored: Wed Nov 8 14:56:16 2017 -0500 Committer: Di Li Committed: Wed Nov 8 14:56:16 2017 -0500 -- .../stacks/BigInsights/4.2.5/repos/repoinfo.xml | 12 1 file changed, 12 insertions(+) -- http://git-wip-us.apache.org/repos/asf/ambari/blob/450ec05a/ambari-server/src/main/resources/stacks/BigInsights/4.2.5/repos/repoinfo.xml -- diff --git a/ambari-server/src/main/resources/stacks/BigInsights/4.2.5/repos/repoinfo.xml b/ambari-server/src/main/resources/stacks/BigInsights/4.2.5/repos/repoinfo.xml index d1b155d..ae6f979 100755 --- a/ambari-server/src/main/resources/stacks/BigInsights/4.2.5/repos/repoinfo.xml +++ b/ambari-server/src/main/resources/stacks/BigInsights/4.2.5/repos/repoinfo.xml @@ -41,4 +41,16 @@ IOP-UTILS + + + http://ibm-open-platform.ibm.com/repos/IOP/rhel/7/ppc64le/4.2.x/Updates/4.2.5.0 + IOP-4.2.5 + IOP + + + http://ibm-open-platform.ibm.com/repos/IOP-UTILS/rhel/7/ppc64le/1.3 + IOP-UTILS-1.3 + IOP-UTILS + +
ambari git commit: AMBARI-22337 each service should be able to implement server actions, package them add a jar to be loaded during EU (dili)
Repository: ambari
Updated Branches:
refs/heads/trunk 38f6740cd -> 063ba36ef
AMBARI-22337 each service should be able to implement server actions, package
them add a jar to be loaded during EU (dili)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/063ba36e
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/063ba36e
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/063ba36e
Branch: refs/heads/trunk
Commit: 063ba36ef5d2ae2f407b46aae3f993ab81eae310
Parents: 38f6740
Author: Di Li
Authored: Tue Nov 7 10:51:48 2017 -0500
Committer: Di Li
Committed: Tue Nov 7 10:51:48 2017 -0500
--
ambari-server/pom.xml | 12 ++
.../serveraction/ServerActionExecutor.java | 147 +--
.../ambari/server/stack/ServiceDirectory.java | 29
.../ambari/server/stack/ServiceModule.java | 8 +
.../apache/ambari/server/state/ServiceInfo.java | 14 ++
.../ambari/server/stack/ServiceModuleTest.java | 30
.../server/stack/StackManagerExtensionTest.java | 6 +
7 files changed, 232 insertions(+), 14 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/063ba36e/ambari-server/pom.xml
--
diff --git a/ambari-server/pom.xml b/ambari-server/pom.xml
index a86acf5..2ecf435 100644
--- a/ambari-server/pom.xml
+++ b/ambari-server/pom.xml
@@ -198,6 +198,18 @@
+
+generate-test-oozie2-server-actions-dir
+process-test-classes
+
+ run
+
+
+
+
+
+
+
http://git-wip-us.apache.org/repos/asf/ambari/blob/063ba36e/ambari-server/src/main/java/org/apache/ambari/server/serveraction/ServerActionExecutor.java
--
diff --git
a/ambari-server/src/main/java/org/apache/ambari/server/serveraction/ServerActionExecutor.java
b/ambari-server/src/main/java/org/apache/ambari/server/serveraction/ServerActionExecutor.java
index 50e3cfe..e219dc3 100644
---
a/ambari-server/src/main/java/org/apache/ambari/server/serveraction/ServerActionExecutor.java
+++
b/ambari-server/src/main/java/org/apache/ambari/server/serveraction/ServerActionExecutor.java
@@ -18,10 +18,17 @@
package org.apache.ambari.server.serveraction;
+import java.io.File;
+import java.io.FilenameFilter;
+import java.net.URL;
+import java.net.URLClassLoader;
+import java.util.ArrayList;
+import java.util.HashMap;
import java.util.HashSet;
import java.util.List;
import java.util.Map;
import java.util.Set;
+import java.util.StringTokenizer;
import java.util.Timer;
import java.util.TimerTask;
import java.util.concurrent.ConcurrentHashMap;
@@ -38,11 +45,17 @@ import
org.apache.ambari.server.actionmanager.HostRoleStatus;
import org.apache.ambari.server.actionmanager.Stage;
import org.apache.ambari.server.agent.CommandReport;
import org.apache.ambari.server.agent.ExecutionCommand;
+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.security.authorization.internal.InternalAuthenticationToken;
+import org.apache.ambari.server.state.ServiceInfo;
+import org.apache.ambari.server.state.UpgradeContext.UpgradeServiceSummary;
+import org.apache.ambari.server.state.UpgradeContext.UpgradeSummary;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.security.core.context.SecurityContextHolder;
+import org.springframework.util.ClassUtils;
import com.google.inject.Inject;
import com.google.inject.Injector;
@@ -495,7 +508,6 @@ public class ServerActionExecutor {
throw new AmbariException("Missing ExecutionCommand data");
} else {
Map roleParams = executionCommand.getRoleParams();
-
if (roleParams == null) {
throw new AmbariException("Missing RoleParams data");
} else {
@@ -504,8 +516,30 @@ public class ServerActionExecutor {
if (actionClassname == null) {
throw new AmbariException("Missing action classname for server
action");
} else {
-ServerAction action = createServerAction(actionClassname);
-
+Map services = new HashMap();
+UpgradeSummary upgradeSummary =
executionCommand.getUpgradeSummary();
+if (upgradeSummary != null) {
+ Map upgradeServiceSummaries =
upgradeSummary.services;
+ LOG.debug("UpgradeServiceSummary: " + upgradeServiceSummaries)
ambari git commit: AMBARI-22136 Enable server_action tasks defined in EU/RU upgrade pack xml files to take parameters (dili)
Repository: ambari
Updated Branches:
refs/heads/trunk 0ed128fb6 -> d5dd19389
AMBARI-22136 Enable server_action tasks defined in EU/RU upgrade pack xml files
to take parameters (dili)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/d5dd1938
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/d5dd1938
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/d5dd1938
Branch: refs/heads/trunk
Commit: d5dd19389bd4b43c587f72dd8ab8230e34b98bfc
Parents: 0ed128f
Author: Di Li
Authored: Thu Oct 5 13:53:46 2017 -0400
Committer: Di Li
Committed: Thu Oct 5 13:53:46 2017 -0400
--
.../ambari/server/actionmanager/Stage.java | 3 +-
.../internal/UpgradeResourceProvider.java | 2 +
.../stack/upgrade/ServerSideActionTask.java | 15 +++
.../state/stack/upgrade/TaskParameter.java | 41
.../src/main/resources/upgrade-pack.xsd | 9 +
5 files changed, 69 insertions(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/d5dd1938/ambari-server/src/main/java/org/apache/ambari/server/actionmanager/Stage.java
--
diff --git
a/ambari-server/src/main/java/org/apache/ambari/server/actionmanager/Stage.java
b/ambari-server/src/main/java/org/apache/ambari/server/actionmanager/Stage.java
index f466ce9..b88275a 100644
---
a/ambari-server/src/main/java/org/apache/ambari/server/actionmanager/Stage.java
+++
b/ambari-server/src/main/java/org/apache/ambari/server/actionmanager/Stage.java
@@ -465,7 +465,8 @@ public class Stage {
* @param retryAllowed
* indicates whether retry after failure is allowed
*/
- public synchronized void addServerActionCommand(String actionName, @Nullable
String userName,
+ public synchronized void addServerActionCommand(String actionName,
+ @Nullable String userName,
Role role, RoleCommand command, String clusterName,
ServiceComponentHostServerActionEvent event, @Nullable Map commandParams,
@Nullable String commandDetail, @Nullable Map> configTags,
http://git-wip-us.apache.org/repos/asf/ambari/blob/d5dd1938/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/UpgradeResourceProvider.java
--
diff --git
a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/UpgradeResourceProvider.java
b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/UpgradeResourceProvider.java
index 85f3a1b..a1ec98a 100644
---
a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/UpgradeResourceProvider.java
+++
b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/UpgradeResourceProvider.java
@@ -1378,6 +1378,8 @@ public class UpgradeResourceProvider extends
AbstractControllerResourceProvider
stage.setStageId(stageId);
entity.setStageId(Long.valueOf(stageId));
+Map taskParameters = task.getParameters();
+commandParams.putAll(taskParameters);
stage.addServerActionCommand(task.getImplementationClass(),
getManagementController().getAuthName(), Role.AMBARI_SERVER_ACTION,
RoleCommand.EXECUTE,
cluster.getClusterName(),
http://git-wip-us.apache.org/repos/asf/ambari/blob/d5dd1938/ambari-server/src/main/java/org/apache/ambari/server/state/stack/upgrade/ServerSideActionTask.java
--
diff --git
a/ambari-server/src/main/java/org/apache/ambari/server/state/stack/upgrade/ServerSideActionTask.java
b/ambari-server/src/main/java/org/apache/ambari/server/state/stack/upgrade/ServerSideActionTask.java
index c593c04..844ef24 100644
---
a/ambari-server/src/main/java/org/apache/ambari/server/state/stack/upgrade/ServerSideActionTask.java
+++
b/ambari-server/src/main/java/org/apache/ambari/server/state/stack/upgrade/ServerSideActionTask.java
@@ -18,7 +18,9 @@
package org.apache.ambari.server.state.stack.upgrade;
import java.util.ArrayList;
+import java.util.HashMap;
import java.util.List;
+import java.util.Map;
import javax.xml.bind.annotation.XmlAttribute;
import javax.xml.bind.annotation.XmlElement;
@@ -31,6 +33,19 @@ public abstract class ServerSideActionTask extends Task {
@XmlAttribute(name="class")
protected String implClass;
+ @XmlElement(name = "parameter")
+ public List parameters;
+
+ public Map getParameters(){
+Map result = new HashMap();
+if (parameters != null) {
+ for (TaskParameter parameter : parameters) {
+result.put(parameter.name, parameter.value);
+ }
+}
+return result;
+ }
+
public static final String actionVerb = "Executing";
public String getImp
ambari git commit: AMBARI-21830 PowerPC - IOP/HDP migration, service restart fails post Ambari upgrade (dili)
Repository: ambari Updated Branches: refs/heads/branch-2.5 27e00dde1 -> 909902cdf AMBARI-21830 PowerPC - IOP/HDP migration, service restart fails post Ambari upgrade (dili) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/909902cd Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/909902cd Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/909902cd Branch: refs/heads/branch-2.5 Commit: 909902cdf6496ae5863d76b169da16e2e5d7d55f Parents: 27e00dd Author: Di Li Authored: Mon Aug 28 12:16:14 2017 -0400 Committer: Di Li Committed: Mon Aug 28 12:16:14 2017 -0400 -- .../stacks/BigInsights/4.2.5/repos/repoinfo.xml | 12 1 file changed, 12 insertions(+) -- http://git-wip-us.apache.org/repos/asf/ambari/blob/909902cd/ambari-server/src/main/resources/stacks/BigInsights/4.2.5/repos/repoinfo.xml -- diff --git a/ambari-server/src/main/resources/stacks/BigInsights/4.2.5/repos/repoinfo.xml b/ambari-server/src/main/resources/stacks/BigInsights/4.2.5/repos/repoinfo.xml index d1b155d..b723f09 100755 --- a/ambari-server/src/main/resources/stacks/BigInsights/4.2.5/repos/repoinfo.xml +++ b/ambari-server/src/main/resources/stacks/BigInsights/4.2.5/repos/repoinfo.xml @@ -41,4 +41,16 @@ IOP-UTILS + + + http://ibm-open-platform.ibm.com/repos/IOP/rhel/7/ppc64le/4.2.x/Updates/4.2.5.0 + IOP-4.2.5 + IOP + + + http://ibm-open-platform.ibm.com/repos/IOP-UTILS/rhel/7/ppc64le/1.3 + IOP-UTILS-1.3 + IOP-UTILS + +
ambari git commit: AMBARI-21654 Post Ambari upgrade, BI value add 4.2 services should still be able to restart (dili)
Repository: ambari Updated Branches: refs/heads/branch-2.5 cb327a005 -> b9e16b97a AMBARI-21654 Post Ambari upgrade, BI value add 4.2 services should still be able to restart (dili) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/b9e16b97 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/b9e16b97 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/b9e16b97 Branch: refs/heads/branch-2.5 Commit: b9e16b97a6941a30dd33e2d4c4a1734e20a714a3 Parents: cb327a0 Author: Di Li Authored: Fri Aug 4 08:57:45 2017 -0400 Committer: Di Li Committed: Fri Aug 4 08:57:45 2017 -0400 -- .../python/resource_management/libraries/functions/version.py | 6 ++ 1 file changed, 6 insertions(+) -- http://git-wip-us.apache.org/repos/asf/ambari/blob/b9e16b97/ambari-common/src/main/python/resource_management/libraries/functions/version.py -- diff --git a/ambari-common/src/main/python/resource_management/libraries/functions/version.py b/ambari-common/src/main/python/resource_management/libraries/functions/version.py index 7dfa6b8..311f622 100644 --- a/ambari-common/src/main/python/resource_management/libraries/functions/version.py +++ b/ambari-common/src/main/python/resource_management/libraries/functions/version.py @@ -33,6 +33,12 @@ def _normalize(v, desired_segments=0): v_list = v_list + ((desired_segments - len(v_list)) * ["0", ]) return [int(x) for x in v_list] +""" +Ensure backword compatibility for older IOP services. +These services do not get updated service definitions so their Python API references are old. +""" +def format_hdp_stack_version(input): + return format_stack_version(input) def format_stack_version(input): """
ambari git commit: AMBARI-21611 Failed to install packages before EU on powerpc (dili)
Repository: ambari
Updated Branches:
refs/heads/branch-2.5 9e0a7fbe2 -> 85ba03b91
AMBARI-21611 Failed to install packages before EU on powerpc (dili)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/85ba03b9
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/85ba03b9
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/85ba03b9
Branch: refs/heads/branch-2.5
Commit: 85ba03b9152b51e85d8afc990638db7b1e1dabfc
Parents: 9e0a7fb
Author: Di Li
Authored: Mon Jul 31 17:09:24 2017 -0400
Committer: Di Li
Committed: Mon Jul 31 17:09:24 2017 -0400
--
.../ClusterStackVersionResourceProvider.java| 50 ++--
...ClusterStackVersionResourceProviderTest.java | 11 +++--
2 files changed, 53 insertions(+), 8 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/85ba03b9/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ClusterStackVersionResourceProvider.java
--
diff --git
a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ClusterStackVersionResourceProvider.java
b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ClusterStackVersionResourceProvider.java
index 633fe8c..b489d7f 100644
---
a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ClusterStackVersionResourceProvider.java
+++
b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ClusterStackVersionResourceProvider.java
@@ -506,15 +506,16 @@ public class ClusterStackVersionResourceProvider extends
AbstractControllerResou
final AmbariManagementController managementController =
getManagementController();
final AmbariMetaInfo ami = managementController.getAmbariMetaInfo();
+String osFamily = getPowerPCOsFamily(hosts);
// build the list of OS repos
List operatingSystems =
repoVersionEnt.getOperatingSystems();
Map> perOsRepos = new HashMap<>();
for (OperatingSystemEntity operatingSystem : operatingSystems) {
-
+ String osType = getOsTypeForRepo(operatingSystem, osFamily);
if (operatingSystem.isAmbariManagedRepos()) {
-perOsRepos.put(operatingSystem.getOsType(),
operatingSystem.getRepositories());
+perOsRepos.put(osType, operatingSystem.getRepositories());
} else {
-perOsRepos.put(operatingSystem.getOsType(),
Collections. emptyList());
+perOsRepos.put(osType, Collections. emptyList());
}
}
@@ -1088,4 +1089,47 @@ public class ClusterStackVersionResourceProvider extends
AbstractControllerResou
amc.getAuthName(), serviceNote);
}
}
+
+ /**
+ * Check one host is enough to tell the arch
+ * because all hosts should have the same arch.
+ * @param hosts List
+ * @return osFamily, null if hosts is empty or is X86_64
+
+ */
+ private String getPowerPCOsFamily(List hosts) {
+if (hosts.isEmpty()){
+ return null;
+} else {
+ Host host = hosts.get(0);
+ String osFamily = host.getHostAttributes().get("os_family");
+ if (null != osFamily && osFamily.endsWith("-ppc")){
+return osFamily;
+ } else {
+return null;
+ }
+}
+ }
+
+ /**
+ * Use os type with -ppc post fix for powerpc
+ * in order to have it consistent with the os information
+ * stored in the Hosts table
+ * No need to apply the change if os is x86_64
+ * */
+ private String getOsTypeForRepo(OperatingSystemEntity operatingSystem,
String osFamily) {
+if (null != osFamily){
+ String osType = operatingSystem.getOsType();
+ int pos = osFamily.indexOf("-ppc");
+ if (pos > 0){
+String os = osType.substring(0, pos);
+String majorVersion = osType.substring(os.length());
+return String.format("%s-ppc%s", os, majorVersion);
+ } else {
+return operatingSystem.getOsType();
+ }
+} else {
+ return operatingSystem.getOsType();
+}
+ }
}
http://git-wip-us.apache.org/repos/asf/ambari/blob/85ba03b9/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/ClusterStackVersionResourceProviderTest.java
--
diff --git
a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/ClusterStackVersionResourceProviderTest.java
b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/ClusterStackVersionResourceProviderTest.java
index 7018245..68596e0 100644
---
a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/ClusterStackVersionResourceProviderTest.java
+++
b/ambari-server/src/test/java/org/apache/ambari/server/controller/interna
ambari git commit: AMBARI-21555 Hive restart fails to restart MySQL after Ambari upgrade against IOP 4.2.5 (dili)
Repository: ambari
Updated Branches:
refs/heads/branch-2.5 f0b03147f -> 61df6972d
AMBARI-21555 Hive restart fails to restart MySQL after Ambari upgrade against
IOP 4.2.5 (dili)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/61df6972
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/61df6972
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/61df6972
Branch: refs/heads/branch-2.5
Commit: 61df6972d3105baf2dd7718fe0d26c711d23beed
Parents: f0b0314
Author: Di Li
Authored: Fri Jul 21 22:35:58 2017 -0400
Committer: Di Li
Committed: Fri Jul 21 22:35:58 2017 -0400
--
.../server/upgrade/UpgradeCatalog252.java | 31
1 file changed, 31 insertions(+)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/61df6972/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog252.java
--
diff --git
a/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog252.java
b/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog252.java
index ea1b034..ca7ab3f 100644
---
a/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog252.java
+++
b/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog252.java
@@ -27,6 +27,7 @@ import java.util.Map;
import java.util.Set;
import org.apache.ambari.server.AmbariException;
+import org.apache.ambari.server.controller.AmbariManagementController;
import org.apache.ambari.server.orm.DBAccessor.DBColumnInfo;
import org.apache.ambari.server.orm.dao.ClusterDAO;
import org.apache.ambari.server.orm.entities.ClusterConfigMappingEntity;
@@ -36,6 +37,7 @@ import org.apache.ambari.server.state.Clusters;
import org.apache.ambari.server.state.Config;
import org.apache.ambari.server.state.ConfigHelper;
import org.apache.ambari.server.state.PropertyInfo;
+import org.apache.ambari.server.state.StackId;
import org.apache.commons.lang.StringUtils;
import com.google.common.collect.Sets;
@@ -63,6 +65,9 @@ public class UpgradeCatalog252 extends AbstractUpgradeCatalog
{
private static final String CLUSTER_ENV = "cluster-env";
+ private static final String HIVE_ENV = "hive-env";
+ private static final String MARIADB_REDHAT_SUPPORT =
"mariadb_redhat_support";
+
private static final List configTypesToEnsureSelected =
Arrays.asList("spark2-javaopts-properties");
/**
@@ -119,6 +124,7 @@ public class UpgradeCatalog252 extends
AbstractUpgradeCatalog {
protected void executeDMLUpdates() throws AmbariException, SQLException {
resetStackToolsAndFeatures();
ensureConfigTypesHaveAtLeastOneVersionSelected();
+updateMariaDBRedHatSupportHive();
}
/**
@@ -296,4 +302,29 @@ public class UpgradeCatalog252 extends
AbstractUpgradeCatalog {
}
}
}
+
+ /**
+ * Insert mariadb_redhat_support to hive-env if the current stack is
BigInsights 4.2.5
+ * @throws AmbariException
+ * */
+ private void updateMariaDBRedHatSupportHive() throws AmbariException {
+AmbariManagementController ambariManagementController =
injector.getInstance(AmbariManagementController.class);
+Clusters clusters = ambariManagementController.getClusters();
+if (clusters != null) {
+ Map clusterMap = getCheckedClusterMap(clusters);
+ if (clusterMap != null && !clusterMap.isEmpty()) {
+for (final Cluster cluster : clusterMap.values()) {
+ Set installedServices = cluster.getServices().keySet();
+ if (installedServices.contains("HIVE")) {
+StackId currentStack = cluster.getCurrentStackVersion();
+if (currentStack.getStackName().equals("BigInsights") &&
currentStack.getStackVersion().equals("4.2.5")) {
+ Map newProperties = new HashMap<>();
+ newProperties.put(MARIADB_REDHAT_SUPPORT, "true");
+ updateConfigurationPropertiesForCluster(cluster, HIVE_ENV,
newProperties, true, false);
+}
+ }
+}
+ }
+}
+ }
}
ambari git commit: AMBARI-21553 Oozie server failed to restart post IOP 4.2 migration (dili)
Repository: ambari Updated Branches: refs/heads/branch-2.5 0ad9d587d -> 2441f68ab AMBARI-21553 Oozie server failed to restart post IOP 4.2 migration (dili) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/2441f68a Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/2441f68a Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/2441f68a Branch: refs/heads/branch-2.5 Commit: 2441f68ab6ea54c7ea30e0ae1a01ff9866d04106 Parents: 0ad9d58 Author: Di Li Authored: Fri Jul 21 16:08:31 2017 -0400 Committer: Di Li Committed: Fri Jul 21 16:08:31 2017 -0400 -- .../stacks/BigInsights/4.2.5/upgrades/config-upgrade.xml | 2 +- .../resources/stacks/BigInsights/4.2/upgrades/config-upgrade.xml | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) -- http://git-wip-us.apache.org/repos/asf/ambari/blob/2441f68a/ambari-server/src/main/resources/stacks/BigInsights/4.2.5/upgrades/config-upgrade.xml -- diff --git a/ambari-server/src/main/resources/stacks/BigInsights/4.2.5/upgrades/config-upgrade.xml b/ambari-server/src/main/resources/stacks/BigInsights/4.2.5/upgrades/config-upgrade.xml index c8549b3..13c0518 100644 --- a/ambari-server/src/main/resources/stacks/BigInsights/4.2.5/upgrades/config-upgrade.xml +++ b/ambari-server/src/main/resources/stacks/BigInsights/4.2.5/upgrades/config-upgrade.xml @@ -215,7 +215,7 @@ oozie-env - + oozie-env http://git-wip-us.apache.org/repos/asf/ambari/blob/2441f68a/ambari-server/src/main/resources/stacks/BigInsights/4.2/upgrades/config-upgrade.xml -- diff --git a/ambari-server/src/main/resources/stacks/BigInsights/4.2/upgrades/config-upgrade.xml b/ambari-server/src/main/resources/stacks/BigInsights/4.2/upgrades/config-upgrade.xml index bf6dd6b..297aebb 100644 --- a/ambari-server/src/main/resources/stacks/BigInsights/4.2/upgrades/config-upgrade.xml +++ b/ambari-server/src/main/resources/stacks/BigInsights/4.2/upgrades/config-upgrade.xml @@ -238,8 +238,9 @@ oozie-env + - + oozie-env
ambari git commit: AMBARI-21550 PHOENIX_QUERY_SERVER not upgraded in EU (dili)
Repository: ambari Updated Branches: refs/heads/branch-2.5 32f36a717 -> 421f3c6a2 AMBARI-21550 PHOENIX_QUERY_SERVER not upgraded in EU (dili) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/421f3c6a Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/421f3c6a Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/421f3c6a Branch: refs/heads/branch-2.5 Commit: 421f3c6a2bae95a78c1a5754ba75d0bb5d3fc772 Parents: 32f36a7 Author: Di Li Authored: Fri Jul 21 12:58:21 2017 -0400 Committer: Di Li Committed: Fri Jul 21 12:58:21 2017 -0400 -- .../BigInsights/4.2.5/upgrades/nonrolling-upgrade-to-hdp-2.6.xml | 2 ++ 1 file changed, 2 insertions(+) -- http://git-wip-us.apache.org/repos/asf/ambari/blob/421f3c6a/ambari-server/src/main/resources/stacks/BigInsights/4.2.5/upgrades/nonrolling-upgrade-to-hdp-2.6.xml -- diff --git a/ambari-server/src/main/resources/stacks/BigInsights/4.2.5/upgrades/nonrolling-upgrade-to-hdp-2.6.xml b/ambari-server/src/main/resources/stacks/BigInsights/4.2.5/upgrades/nonrolling-upgrade-to-hdp-2.6.xml index 57e731e..1932364 100644 --- a/ambari-server/src/main/resources/stacks/BigInsights/4.2.5/upgrades/nonrolling-upgrade-to-hdp-2.6.xml +++ b/ambari-server/src/main/resources/stacks/BigInsights/4.2.5/upgrades/nonrolling-upgrade-to-hdp-2.6.xml @@ -147,6 +147,7 @@ HBASE_REGIONSERVER HBASE_MASTER HBASE_REST_SERVER +PHOENIX_QUERY_SERVER @@ -456,6 +457,7 @@ HBASE_REGIONSERVER HBASE_CLIENT HBASE_REST_SERVER +PHOENIX_QUERY_SERVER
ambari git commit: AMBARI-21541 Restart services failed post Ambari Upgrade (dili)
Repository: ambari
Updated Branches:
refs/heads/branch-2.5 d4244f520 -> ab1d378d2
AMBARI-21541 Restart services failed post Ambari Upgrade (dili)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/ab1d378d
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/ab1d378d
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/ab1d378d
Branch: refs/heads/branch-2.5
Commit: ab1d378d2d2b244eec4fea6a87dca54b4d42073e
Parents: d4244f5
Author: Di Li
Authored: Thu Jul 20 20:46:09 2017 -0400
Committer: Di Li
Committed: Thu Jul 20 20:46:09 2017 -0400
--
.../4.0/hooks/before-ANY/scripts/shared_initialization.py | 2 +-
.../4.2.5/hooks/before-ANY/scripts/shared_initialization.py| 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/ab1d378d/ambari-server/src/main/resources/stacks/BigInsights/4.0/hooks/before-ANY/scripts/shared_initialization.py
--
diff --git
a/ambari-server/src/main/resources/stacks/BigInsights/4.0/hooks/before-ANY/scripts/shared_initialization.py
b/ambari-server/src/main/resources/stacks/BigInsights/4.0/hooks/before-ANY/scripts/shared_initialization.py
index 1c98fb8..ccb0293 100755
---
a/ambari-server/src/main/resources/stacks/BigInsights/4.0/hooks/before-ANY/scripts/shared_initialization.py
+++
b/ambari-server/src/main/resources/stacks/BigInsights/4.0/hooks/before-ANY/scripts/shared_initialization.py
@@ -147,7 +147,7 @@ def get_uid(user):
mode=0555)
ignore_groupsusers_create_str =
str(params.ignore_groupsusers_create).lower()
newUid=commands.getoutput(format("{tmp_dir}/changeUid.sh {user}"))
-return newUid
+return int(newUid)
def setup_hadoop_env():
import params
http://git-wip-us.apache.org/repos/asf/ambari/blob/ab1d378d/ambari-server/src/main/resources/stacks/BigInsights/4.2.5/hooks/before-ANY/scripts/shared_initialization.py
--
diff --git
a/ambari-server/src/main/resources/stacks/BigInsights/4.2.5/hooks/before-ANY/scripts/shared_initialization.py
b/ambari-server/src/main/resources/stacks/BigInsights/4.2.5/hooks/before-ANY/scripts/shared_initialization.py
index 930ed1f..9741397 100755
---
a/ambari-server/src/main/resources/stacks/BigInsights/4.2.5/hooks/before-ANY/scripts/shared_initialization.py
+++
b/ambari-server/src/main/resources/stacks/BigInsights/4.2.5/hooks/before-ANY/scripts/shared_initialization.py
@@ -160,7 +160,7 @@ def get_uid(user):
mode=0555)
ignore_groupsusers_create_str =
str(params.ignore_groupsusers_create).lower()
newUid=commands.getoutput(format("{tmp_dir}/changeUid.sh {user}"))
-return newUid
+return int(newUid)
def setup_hadoop_env():
import params
ambari git commit: AMBARI-21527 Restart of MR2 History Server failed due to wrong NameNode RPC address (dili)
Repository: ambari Updated Branches: refs/heads/branch-2.5 86787c37f -> 212ee1cb0 AMBARI-21527 Restart of MR2 History Server failed due to wrong NameNode RPC address (dili) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/212ee1cb Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/212ee1cb Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/212ee1cb Branch: refs/heads/branch-2.5 Commit: 212ee1cb04483a2cd7fafb4304a1c5879f2895dc Parents: 86787c3 Author: Di Li Authored: Thu Jul 20 14:21:57 2017 -0400 Committer: Di Li Committed: Thu Jul 20 14:21:57 2017 -0400 -- .../stacks/BigInsights/4.2.5/upgrades/config-upgrade.xml | 7 +++ .../4.2.5/upgrades/nonrolling-upgrade-to-hdp-2.6.xml | 5 + .../stacks/BigInsights/4.2/upgrades/config-upgrade.xml| 7 +++ .../4.2/upgrades/nonrolling-upgrade-to-hdp-2.6.xml| 5 + 4 files changed, 24 insertions(+) -- http://git-wip-us.apache.org/repos/asf/ambari/blob/212ee1cb/ambari-server/src/main/resources/stacks/BigInsights/4.2.5/upgrades/config-upgrade.xml -- diff --git a/ambari-server/src/main/resources/stacks/BigInsights/4.2.5/upgrades/config-upgrade.xml b/ambari-server/src/main/resources/stacks/BigInsights/4.2.5/upgrades/config-upgrade.xml index e476d57..c8549b3 100644 --- a/ambari-server/src/main/resources/stacks/BigInsights/4.2.5/upgrades/config-upgrade.xml +++ b/ambari-server/src/main/resources/stacks/BigInsights/4.2.5/upgrades/config-upgrade.xml @@ -26,6 +26,13 @@ + +hdfs-site + + + + + http://git-wip-us.apache.org/repos/asf/ambari/blob/212ee1cb/ambari-server/src/main/resources/stacks/BigInsights/4.2.5/upgrades/nonrolling-upgrade-to-hdp-2.6.xml -- diff --git a/ambari-server/src/main/resources/stacks/BigInsights/4.2.5/upgrades/nonrolling-upgrade-to-hdp-2.6.xml b/ambari-server/src/main/resources/stacks/BigInsights/4.2.5/upgrades/nonrolling-upgrade-to-hdp-2.6.xml index cbd0550..57e731e 100644 --- a/ambari-server/src/main/resources/stacks/BigInsights/4.2.5/upgrades/nonrolling-upgrade-to-hdp-2.6.xml +++ b/ambari-server/src/main/resources/stacks/BigInsights/4.2.5/upgrades/nonrolling-upgrade-to-hdp-2.6.xml @@ -200,6 +200,11 @@ + + + + + http://git-wip-us.apache.org/repos/asf/ambari/blob/212ee1cb/ambari-server/src/main/resources/stacks/BigInsights/4.2/upgrades/config-upgrade.xml -- diff --git a/ambari-server/src/main/resources/stacks/BigInsights/4.2/upgrades/config-upgrade.xml b/ambari-server/src/main/resources/stacks/BigInsights/4.2/upgrades/config-upgrade.xml index dada6e2..bf6dd6b 100644 --- a/ambari-server/src/main/resources/stacks/BigInsights/4.2/upgrades/config-upgrade.xml +++ b/ambari-server/src/main/resources/stacks/BigInsights/4.2/upgrades/config-upgrade.xml @@ -118,6 +118,13 @@ + +hdfs-site + + + + + http://git-wip-us.apache.org/repos/asf/ambari/blob/212ee1cb/ambari-server/src/main/resources/stacks/BigInsights/4.2/upgrades/nonrolling-upgrade-to-hdp-2.6.xml -- diff --git a/ambari-server/src/main/resources/stacks/BigInsights/4.2/upgrades/nonrolling-upgrade-to-hdp-2.6.xml b/ambari-server/src/main/resources/stacks/BigInsights/4.2/upgrades/nonrolling-upgrade-to-hdp-2.6.xml index 3ea20ed..b6d39ea 100644 --- a/ambari-server/src/main/resources/stacks/BigInsights/4.2/upgrades/nonrolling-upgrade-to-hdp-2.6.xml +++ b/ambari-server/src/main/resources/stacks/BigInsights/4.2/upgrades/nonrolling-upgrade-to-hdp-2.6.xml @@ -195,6 +195,11 @@ + + + + +
ambari git commit: AMBARI-21477: Remove Falcon proxy entries from Knox kerberos.json (dili)
Repository: ambari
Updated Branches:
refs/heads/branch-2.5 9f0bba698 -> ec3cf2285
AMBARI-21477: Remove Falcon proxy entries from Knox kerberos.json (dili)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/ec3cf228
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/ec3cf228
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/ec3cf228
Branch: refs/heads/branch-2.5
Commit: ec3cf228542f6d9c41ef63c119dd9284d4d19acf
Parents: 9f0bba6
Author: Di Li
Authored: Fri Jul 14 14:22:18 2017 -0400
Committer: Di Li
Committed: Fri Jul 14 14:22:18 2017 -0400
--
.../stacks/BigInsights/4.2/services/KNOX/kerberos.json | 6 --
1 file changed, 6 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/ec3cf228/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/KNOX/kerberos.json
--
diff --git
a/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/KNOX/kerberos.json
b/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/KNOX/kerberos.json
index 8ee2acc..6a89af6 100755
---
a/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/KNOX/kerberos.json
+++
b/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/KNOX/kerberos.json
@@ -53,12 +53,6 @@
"oozie.service.ProxyUserService.proxyuser.${knox-env/knox_user}.groups":
"${hadoop-env/proxyuser_group}",
"oozie.service.ProxyUserService.proxyuser.${knox-env/knox_user}.hosts":
"${clusterHostInfo/knox_gateway_hosts}"
}
-},
-{
- "falcon-runtime.properties": {
-"*.falcon.service.ProxyUserService.proxyuser.knox.groups":
"${hadoop-env/proxyuser_group}",
-"*.falcon.service.ProxyUserService.proxyuser.knox.hosts":
"${host}"
- }
}
]
}
ambari git commit: AMBARI-21461 Spark thrift server restart fails during migration EU (dili)
Repository: ambari
Updated Branches:
refs/heads/branch-2.5 65e57a12b -> 33c279cf2
AMBARI-21461 Spark thrift server restart fails during migration EU (dili)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/33c279cf
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/33c279cf
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/33c279cf
Branch: refs/heads/branch-2.5
Commit: 33c279cf272e824d1efdea1aec7bba667b618596
Parents: 65e57a1
Author: Di Li
Authored: Thu Jul 13 13:42:33 2017 -0400
Committer: Di Li
Committed: Thu Jul 13 13:42:33 2017 -0400
--
.../BigInsights/4.0/services/SPARK/metainfo.xml | 2 +-
.../package/scripts/spark_thrift_server.py | 125 +++
.../SPARK/package/scripts/thrift_server.py | 125 ---
.../BigInsights/4.2/services/SPARK/metainfo.xml | 2 +-
.../package/scripts/spark_thrift_server.py | 119 ++
.../SPARK/package/scripts/thrift_server.py | 119 --
6 files changed, 246 insertions(+), 246 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/33c279cf/ambari-server/src/main/resources/stacks/BigInsights/4.0/services/SPARK/metainfo.xml
--
diff --git
a/ambari-server/src/main/resources/stacks/BigInsights/4.0/services/SPARK/metainfo.xml
b/ambari-server/src/main/resources/stacks/BigInsights/4.0/services/SPARK/metainfo.xml
index 02abc62..ef89698 100755
---
a/ambari-server/src/main/resources/stacks/BigInsights/4.0/services/SPARK/metainfo.xml
+++
b/ambari-server/src/main/resources/stacks/BigInsights/4.0/services/SPARK/metainfo.xml
@@ -83,7 +83,7 @@
-scripts/thrift_server.py
+scripts/spark_thrift_server.py
PYTHON
600
http://git-wip-us.apache.org/repos/asf/ambari/blob/33c279cf/ambari-server/src/main/resources/stacks/BigInsights/4.0/services/SPARK/package/scripts/spark_thrift_server.py
--
diff --git
a/ambari-server/src/main/resources/stacks/BigInsights/4.0/services/SPARK/package/scripts/spark_thrift_server.py
b/ambari-server/src/main/resources/stacks/BigInsights/4.0/services/SPARK/package/scripts/spark_thrift_server.py
new file mode 100755
index 000..39e15d3
--- /dev/null
+++
b/ambari-server/src/main/resources/stacks/BigInsights/4.0/services/SPARK/package/scripts/spark_thrift_server.py
@@ -0,0 +1,125 @@
+#!/usr/bin/python
+"""
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License. You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+
+"""
+
+import sys
+import socket
+import os
+from resource_management import *
+from resource_management.libraries.functions import stack_select
+from resource_management.libraries.functions import conf_select
+from resource_management.core.exceptions import ComponentIsNotRunning
+from resource_management.core.logger import Logger
+from resource_management.core import shell
+from resource_management.libraries.functions import Direction
+from spark import *
+
+
+class ThriftServer(Script):
+
+ def get_component_name(self):
+return "spark-thriftserver"
+
+
+ def pre_upgrade_restart(self, env, upgrade_type=None):
+import params
+
+env.set_params(params)
+if params.version and
compare_versions(format_stack_version(params.version), '4.0.0.0') >= 0:
+ conf_select.select(params.stack_name, "spark", params.version)
+ stack_select.select("spark-thriftserver", params.version)
+
+ def install(self, env):
+self.install_packages(env)
+import params
+env.set_params(params)
+self.configure(env)
+
+ def stop(self, env, upgrade_type=None):
+import params
+
+env.set_params(params)
+self.configure(env)
+daemon_cmd = format('{spark_thrift_server_stop}')
+if params.security_enabled:
+ Execute(daemon_cmd,
+ user=params.hive_user,
+ environment={'JAVA_HOME&#
ambari git commit: AMBARI-21419 EU to auto switch to HDP tomcat for Oozie - updated config type (dili)
Repository: ambari Updated Branches: refs/heads/branch-feature-AMBARI-21348 c5f2efa0b -> 94eb0ddf5 AMBARI-21419 EU to auto switch to HDP tomcat for Oozie - updated config type (dili) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/94eb0ddf Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/94eb0ddf Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/94eb0ddf Branch: refs/heads/branch-feature-AMBARI-21348 Commit: 94eb0ddf5b3da68e239a9600bf5393f5de5677ec Parents: c5f2efa Author: Di Li Authored: Thu Jul 13 11:58:35 2017 -0400 Committer: Di Li Committed: Thu Jul 13 11:58:35 2017 -0400 -- .../resources/stacks/BigInsights/4.2.5/upgrades/config-upgrade.xml | 2 +- .../resources/stacks/BigInsights/4.2/upgrades/config-upgrade.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) -- http://git-wip-us.apache.org/repos/asf/ambari/blob/94eb0ddf/ambari-server/src/main/resources/stacks/BigInsights/4.2.5/upgrades/config-upgrade.xml -- diff --git a/ambari-server/src/main/resources/stacks/BigInsights/4.2.5/upgrades/config-upgrade.xml b/ambari-server/src/main/resources/stacks/BigInsights/4.2.5/upgrades/config-upgrade.xml index b51a744..8912322 100644 --- a/ambari-server/src/main/resources/stacks/BigInsights/4.2.5/upgrades/config-upgrade.xml +++ b/ambari-server/src/main/resources/stacks/BigInsights/4.2.5/upgrades/config-upgrade.xml @@ -136,7 +136,7 @@ -oozie-site +oozie-env http://git-wip-us.apache.org/repos/asf/ambari/blob/94eb0ddf/ambari-server/src/main/resources/stacks/BigInsights/4.2/upgrades/config-upgrade.xml -- diff --git a/ambari-server/src/main/resources/stacks/BigInsights/4.2/upgrades/config-upgrade.xml b/ambari-server/src/main/resources/stacks/BigInsights/4.2/upgrades/config-upgrade.xml index b46f476..3f6962b 100644 --- a/ambari-server/src/main/resources/stacks/BigInsights/4.2/upgrades/config-upgrade.xml +++ b/ambari-server/src/main/resources/stacks/BigInsights/4.2/upgrades/config-upgrade.xml @@ -136,7 +136,7 @@ -oozie-site +oozie-env
ambari git commit: AMBARI-21453 Restart Hive after Install Packages fails with err on Condition with name 'should_install_mysl_connector' (dili)
Repository: ambari Updated Branches: refs/heads/branch-feature-AMBARI-21348 267cd8b0c -> c5f2efa0b AMBARI-21453 Restart Hive after Install Packages fails with err on Condition with name 'should_install_mysl_connector' (dili) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/c5f2efa0 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/c5f2efa0 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/c5f2efa0 Branch: refs/heads/branch-feature-AMBARI-21348 Commit: c5f2efa0b870590aeb28baaefed2fac8d88bf38d Parents: 267cd8b Author: Di Li Authored: Wed Jul 12 16:38:47 2017 -0400 Committer: Di Li Committed: Wed Jul 12 16:38:47 2017 -0400 -- .../resources/stacks/BigInsights/4.0/services/HIVE/metainfo.xml| 2 +- .../resources/stacks/BigInsights/4.2.5/services/HIVE/metainfo.xml | 2 +- .../resources/stacks/BigInsights/4.2.5/services/SQOOP/metainfo.xml | 2 +- .../resources/stacks/BigInsights/4.2/services/HIVE/metainfo.xml| 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) -- http://git-wip-us.apache.org/repos/asf/ambari/blob/c5f2efa0/ambari-server/src/main/resources/stacks/BigInsights/4.0/services/HIVE/metainfo.xml -- diff --git a/ambari-server/src/main/resources/stacks/BigInsights/4.0/services/HIVE/metainfo.xml b/ambari-server/src/main/resources/stacks/BigInsights/4.0/services/HIVE/metainfo.xml index 44e63e7..dc1a5b4 100755 --- a/ambari-server/src/main/resources/stacks/BigInsights/4.0/services/HIVE/metainfo.xml +++ b/ambari-server/src/main/resources/stacks/BigInsights/4.0/services/HIVE/metainfo.xml @@ -267,7 +267,7 @@ mysql-connector-java - should_install_mysl_connector + should_install_mysql_connector http://git-wip-us.apache.org/repos/asf/ambari/blob/c5f2efa0/ambari-server/src/main/resources/stacks/BigInsights/4.2.5/services/HIVE/metainfo.xml -- diff --git a/ambari-server/src/main/resources/stacks/BigInsights/4.2.5/services/HIVE/metainfo.xml b/ambari-server/src/main/resources/stacks/BigInsights/4.2.5/services/HIVE/metainfo.xml index 8f703a5..ec75b4b 100755 --- a/ambari-server/src/main/resources/stacks/BigInsights/4.2.5/services/HIVE/metainfo.xml +++ b/ambari-server/src/main/resources/stacks/BigInsights/4.2.5/services/HIVE/metainfo.xml @@ -168,7 +168,7 @@ mysql-connector-java true - should_install_mysl_connector + should_install_mysql_connector http://git-wip-us.apache.org/repos/asf/ambari/blob/c5f2efa0/ambari-server/src/main/resources/stacks/BigInsights/4.2.5/services/SQOOP/metainfo.xml -- diff --git a/ambari-server/src/main/resources/stacks/BigInsights/4.2.5/services/SQOOP/metainfo.xml b/ambari-server/src/main/resources/stacks/BigInsights/4.2.5/services/SQOOP/metainfo.xml index 05856fd..87347eb 100755 --- a/ambari-server/src/main/resources/stacks/BigInsights/4.2.5/services/SQOOP/metainfo.xml +++ b/ambari-server/src/main/resources/stacks/BigInsights/4.2.5/services/SQOOP/metainfo.xml @@ -37,7 +37,7 @@ mysql-connector-java true - should_install_mysl_connector + should_install_mysql_connector http://git-wip-us.apache.org/repos/asf/ambari/blob/c5f2efa0/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/HIVE/metainfo.xml -- diff --git a/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/HIVE/metainfo.xml b/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/HIVE/metainfo.xml index d89a7d6..5eb51b7 100755 --- a/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/HIVE/metainfo.xml +++ b/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/HIVE/metainfo.xml @@ -271,7 +271,7 @@ mysql-connector-java true - should_install_mysl_connector + should_install_mysql_connector
ambari git commit: AMBARI-21420 HBase master crashed during/post EU on an IOP4.2.5/HDP2.6 migrated cluster (dili)
Repository: ambari
Updated Branches:
refs/heads/branch-2.5 83761d425 -> 1f54c6e27
AMBARI-21420 HBase master crashed during/post EU on an IOP4.2.5/HDP2.6 migrated
cluster (dili)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/1f54c6e2
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/1f54c6e2
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/1f54c6e2
Branch: refs/heads/branch-2.5
Commit: 1f54c6e272a5a2ad176619062b31ca18bbdf93ea
Parents: 83761d4
Author: Di Li
Authored: Wed Jul 12 15:59:35 2017 -0400
Committer: Di Li
Committed: Wed Jul 12 15:59:35 2017 -0400
--
.../0.96.0.2.0/package/scripts/hbase_service.py| 17 +
.../0.96.0.2.0/package/scripts/params_linux.py | 9 +
.../BigInsights/4.2.5/upgrades/config-upgrade.xml | 11 +++
.../upgrades/nonrolling-upgrade-to-hdp-2.6.xml | 5 +
.../BigInsights/4.2/upgrades/config-upgrade.xml| 11 +++
.../4.2/upgrades/nonrolling-upgrade-to-hdp-2.6.xml | 7 ++-
6 files changed, 59 insertions(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/1f54c6e2/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/package/scripts/hbase_service.py
--
diff --git
a/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/package/scripts/hbase_service.py
b/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/package/scripts/hbase_service.py
index a1003dc..3b8e494 100644
---
a/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/package/scripts/hbase_service.py
+++
b/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/package/scripts/hbase_service.py
@@ -19,6 +19,7 @@ limitations under the License.
"""
from resource_management import *
+from resource_management.core.logger import Logger
def hbase_service(
name,
@@ -32,6 +33,22 @@ def hbase_service(
pid_expression = as_sudo(["cat", pid_file])
no_op_test = as_sudo(["test", "-f", pid_file]) + format(" && ps -p
`{pid_expression}` >/dev/null 2>&1")
+# delete wal log if HBase version has moved down
+if params.to_backup_wal_dir:
+ wal_directory = params.wal_directory
+ timestamp = datetime.datetime.now()
+ timestamp_format = '%Y%m%d%H%M%S'
+ wal_directory_backup = '%s_%s' % (wal_directory,
timestamp.strftime(timestamp_format))
+
+ rm_cmd = format("hadoop fs -mv {wal_directory} {wal_directory_backup}")
+ try:
+Execute ( rm_cmd,
+ user = params.hbase_user
+)
+ except Exception, e:
+#Should still allow HBase Start/Stop to proceed
+Logger.error("Failed to backup HBase WAL directory, command: {0} .
Exception: {1}".format(rm_cmd, e.message))
+
if action == 'start':
daemon_cmd = format("{cmd} start {role}")
http://git-wip-us.apache.org/repos/asf/ambari/blob/1f54c6e2/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/package/scripts/params_linux.py
--
diff --git
a/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/package/scripts/params_linux.py
b/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/package/scripts/params_linux.py
index 1ee5248..6617a80 100644
---
a/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/package/scripts/params_linux.py
+++
b/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/package/scripts/params_linux.py
@@ -44,6 +44,7 @@ from resource_management.libraries.script.script import Script
from resource_management.libraries.functions.expect import expect
from ambari_commons.ambari_metrics_helper import
select_metric_collector_hosts_from_hostnames
from resource_management.libraries.functions.setup_ranger_plugin_xml import
get_audit_configs, generate_ranger_service_config
+from resource_management.libraries.functions.constants import Direction
# server configurations
config = Script.get_config()
@@ -440,3 +441,11 @@ if has_atlas:
atlas_with_managed_hbase = len(zk_hosts_matches) > 0
else:
atlas_with_managed_hbase = False
+
+wal_directory = "/apps/hbase/data/MasterProcWALs"
+
+backup_wal_dir = default('/configurations/hbase-env/backup_wal_dir', False)
+
+#Need to make sure not to keep removing WAL logs once EU is finalized.
+upgrade_direction = default("/commandParams/upgrade_direction", None)
+to_backup_wal_dir = upgrade_direction is not None and upgrade_direction ==
Direction.UPGR
ambari git commit: Revert "AMBARI-21420 HBase master crashed during/post EU on an IOP4.2.5/HDP2.6 migrated cluster (dili)"
Repository: ambari
Updated Branches:
refs/heads/branch-2.5 da44c5c1a -> c2b2210b3
Revert "AMBARI-21420 HBase master crashed during/post EU on an IOP4.2.5/HDP2.6
migrated cluster (dili)"
This reverts commit cb86bf06f878efeccdb38ec87eb160eac2e6ed57.
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/c2b2210b
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/c2b2210b
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/c2b2210b
Branch: refs/heads/branch-2.5
Commit: c2b2210b3635e800c17621dbdbadec7761a988c1
Parents: da44c5c
Author: Di Li
Authored: Wed Jul 12 14:50:55 2017 -0400
Committer: Di Li
Committed: Wed Jul 12 14:50:55 2017 -0400
--
.../0.96.0.2.0/package/scripts/hbase_service.py| 17 -
.../0.96.0.2.0/package/scripts/params_linux.py | 9 -
.../BigInsights/4.2.5/upgrades/config-upgrade.xml | 11 ---
.../upgrades/nonrolling-upgrade-to-hdp-2.6.xml | 5 -
.../BigInsights/4.2/upgrades/config-upgrade.xml| 11 ---
.../4.2/upgrades/nonrolling-upgrade-to-hdp-2.6.xml | 7 +--
6 files changed, 1 insertion(+), 59 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/c2b2210b/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/package/scripts/hbase_service.py
--
diff --git
a/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/package/scripts/hbase_service.py
b/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/package/scripts/hbase_service.py
index 2e2fa10..a1003dc 100644
---
a/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/package/scripts/hbase_service.py
+++
b/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/package/scripts/hbase_service.py
@@ -19,7 +19,6 @@ limitations under the License.
"""
from resource_management import *
-from resource_management.core.logger import Logger
def hbase_service(
name,
@@ -33,22 +32,6 @@ def hbase_service(
pid_expression = as_sudo(["cat", pid_file])
no_op_test = as_sudo(["test", "-f", pid_file]) + format(" && ps -p
`{pid_expression}` >/dev/null 2>&1")
-# delete wal log if HBase version has moved down
-if params.to_backup_wal_dir:
- wal_directory = params.wal_directory
- timestamp = datetime.datetime.now()
- format = '%Y%m%d%H%M%S'
- wal_directory_backup = '%s_%s' % (wal_directory,
timestamp.strftime(format))
-
- rm_cmd = format("hadoop fs -mv {wal_directory} {wal_directory_backup}")
- try:
-Execute ( rm_cmd,
- user = params.hbase_user
-)
- except Exception, e:
-#Should still allow HBase Start/Stop to proceed
-Logger.error("Failed to backup HBase WAL directory, command: {0} .
Exception: {1}".format(rm_cmd, e.message))
-
if action == 'start':
daemon_cmd = format("{cmd} start {role}")
http://git-wip-us.apache.org/repos/asf/ambari/blob/c2b2210b/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/package/scripts/params_linux.py
--
diff --git
a/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/package/scripts/params_linux.py
b/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/package/scripts/params_linux.py
index 6617a80..1ee5248 100644
---
a/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/package/scripts/params_linux.py
+++
b/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/package/scripts/params_linux.py
@@ -44,7 +44,6 @@ from resource_management.libraries.script.script import Script
from resource_management.libraries.functions.expect import expect
from ambari_commons.ambari_metrics_helper import
select_metric_collector_hosts_from_hostnames
from resource_management.libraries.functions.setup_ranger_plugin_xml import
get_audit_configs, generate_ranger_service_config
-from resource_management.libraries.functions.constants import Direction
# server configurations
config = Script.get_config()
@@ -441,11 +440,3 @@ if has_atlas:
atlas_with_managed_hbase = len(zk_hosts_matches) > 0
else:
atlas_with_managed_hbase = False
-
-wal_directory = "/apps/hbase/data/MasterProcWALs"
-
-backup_wal_dir = default('/configurations/hbase-env/backup_wal_dir', False)
-
-#Need to make sure not to keep removing WAL logs once EU is finalized.
-upgrade_direction = default("/commandParams/upgrade_direction", None)
-to_backup_wal_dir = upgrade_direction is not None and upgrade_direct
ambari git commit: AMBARI-21420 HBase master crashed during/post EU on an IOP4.2.5/HDP2.6 migrated cluster (dili)
Repository: ambari
Updated Branches:
refs/heads/branch-feature-AMBARI-21348 e69b35f6b -> cb86bf06f
AMBARI-21420 HBase master crashed during/post EU on an IOP4.2.5/HDP2.6 migrated
cluster (dili)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/cb86bf06
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/cb86bf06
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/cb86bf06
Branch: refs/heads/branch-feature-AMBARI-21348
Commit: cb86bf06f878efeccdb38ec87eb160eac2e6ed57
Parents: e69b35f
Author: Di Li
Authored: Wed Jul 12 11:33:00 2017 -0400
Committer: Di Li
Committed: Wed Jul 12 11:33:00 2017 -0400
--
.../0.96.0.2.0/package/scripts/hbase_service.py| 17 +
.../0.96.0.2.0/package/scripts/params_linux.py | 9 +
.../BigInsights/4.2.5/upgrades/config-upgrade.xml | 11 +++
.../upgrades/nonrolling-upgrade-to-hdp-2.6.xml | 5 +
.../BigInsights/4.2/upgrades/config-upgrade.xml| 11 +++
.../4.2/upgrades/nonrolling-upgrade-to-hdp-2.6.xml | 7 ++-
6 files changed, 59 insertions(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/cb86bf06/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/package/scripts/hbase_service.py
--
diff --git
a/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/package/scripts/hbase_service.py
b/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/package/scripts/hbase_service.py
index a1003dc..2e2fa10 100644
---
a/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/package/scripts/hbase_service.py
+++
b/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/package/scripts/hbase_service.py
@@ -19,6 +19,7 @@ limitations under the License.
"""
from resource_management import *
+from resource_management.core.logger import Logger
def hbase_service(
name,
@@ -32,6 +33,22 @@ def hbase_service(
pid_expression = as_sudo(["cat", pid_file])
no_op_test = as_sudo(["test", "-f", pid_file]) + format(" && ps -p
`{pid_expression}` >/dev/null 2>&1")
+# delete wal log if HBase version has moved down
+if params.to_backup_wal_dir:
+ wal_directory = params.wal_directory
+ timestamp = datetime.datetime.now()
+ format = '%Y%m%d%H%M%S'
+ wal_directory_backup = '%s_%s' % (wal_directory,
timestamp.strftime(format))
+
+ rm_cmd = format("hadoop fs -mv {wal_directory} {wal_directory_backup}")
+ try:
+Execute ( rm_cmd,
+ user = params.hbase_user
+)
+ except Exception, e:
+#Should still allow HBase Start/Stop to proceed
+Logger.error("Failed to backup HBase WAL directory, command: {0} .
Exception: {1}".format(rm_cmd, e.message))
+
if action == 'start':
daemon_cmd = format("{cmd} start {role}")
http://git-wip-us.apache.org/repos/asf/ambari/blob/cb86bf06/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/package/scripts/params_linux.py
--
diff --git
a/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/package/scripts/params_linux.py
b/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/package/scripts/params_linux.py
index 43c6036..23066ee 100644
---
a/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/package/scripts/params_linux.py
+++
b/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/package/scripts/params_linux.py
@@ -42,6 +42,7 @@ from resource_management.libraries.script.script import Script
from resource_management.libraries.functions.expect import expect
from ambari_commons.ambari_metrics_helper import
select_metric_collector_hosts_from_hostnames
from resource_management.libraries.functions.setup_ranger_plugin_xml import
get_audit_configs, generate_ranger_service_config
+from resource_management.libraries.functions.constants import Direction
# server configurations
config = Script.get_config()
@@ -437,3 +438,11 @@ if has_atlas:
atlas_with_managed_hbase = len(zk_hosts_matches) > 0
else:
atlas_with_managed_hbase = False
+
+wal_directory = "/apps/hbase/data/MasterProcWALs"
+
+backup_wal_dir = default('/configurations/hbase-env/backup_wal_dir', False)
+
+#Need to make sure not to keep removing WAL logs once EU is finalized.
+upgrade_direction = default("/commandParams/upgrade_direction", None)
+to_backup_wal_dir = upgrade_direction is not None and upgrade_direction ==
Direction.UPGR
ambari git commit: AMBARI-21439 Hive/MapRed2 restart fails after Ambari upgrade (dili)
Repository: ambari
Updated Branches:
refs/heads/branch-feature-AMBARI-21348 cea08809c -> 8e1af7a99
AMBARI-21439 Hive/MapRed2 restart fails after Ambari upgrade (dili)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/8e1af7a9
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/8e1af7a9
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/8e1af7a9
Branch: refs/heads/branch-feature-AMBARI-21348
Commit: 8e1af7a9952df46f7896e15d7228af9d2adde080
Parents: cea0880
Author: Di Li
Authored: Tue Jul 11 11:01:59 2017 -0400
Committer: Di Li
Committed: Tue Jul 11 11:01:59 2017 -0400
--
.../4.0/services/YARN/package/scripts/historyserver.py | 8
.../BigInsights/4.2/services/HIVE/package/scripts/hive.py| 8
.../4.2/services/HIVE/package/scripts/hive_server.py | 2 +-
.../4.2/services/SLIDER/package/scripts/service_check.py | 2 +-
.../4.2/services/YARN/package/scripts/historyserver.py | 8
5 files changed, 14 insertions(+), 14 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/8e1af7a9/ambari-server/src/main/resources/stacks/BigInsights/4.0/services/YARN/package/scripts/historyserver.py
--
diff --git
a/ambari-server/src/main/resources/stacks/BigInsights/4.0/services/YARN/package/scripts/historyserver.py
b/ambari-server/src/main/resources/stacks/BigInsights/4.0/services/YARN/package/scripts/historyserver.py
index bb384e4..20635a2 100755
---
a/ambari-server/src/main/resources/stacks/BigInsights/4.0/services/YARN/package/scripts/historyserver.py
+++
b/ambari-server/src/main/resources/stacks/BigInsights/4.0/services/YARN/package/scripts/historyserver.py
@@ -61,8 +61,8 @@ class HistoryServer(Script):
conf_select.select(params.stack_name, "hadoop", params.version)
stack_select.select("hadoop-mapreduce-historyserver", params.version)
# MC Hammer said, "Can't touch this"
- copy_to_hdfs("mapreduce", params.user_group, params.hdfs_user,
host_sys_prepped=params.host_sys_prepped)
- copy_to_hdfs("slider", params.user_group, params.hdfs_user,
host_sys_prepped=params.host_sys_prepped)
+ copy_to_hdfs("mapreduce", params.user_group, params.hdfs_user,
skip=params.host_sys_prepped)
+ copy_to_hdfs("slider", params.user_group, params.hdfs_user,
skip=params.host_sys_prepped)
params.HdfsResource(None, action="execute")
def start(self, env, upgrade_type=None):
@@ -75,12 +75,12 @@ class HistoryServer(Script):
"mapreduce",
params.user_group,
params.hdfs_user,
- host_sys_prepped=params.host_sys_prepped)
+ skip=params.host_sys_prepped)
resource_created = copy_to_hdfs(
"slider",
params.user_group,
params.hdfs_user,
- host_sys_prepped=params.host_sys_prepped) or resource_created
+ skip=params.host_sys_prepped) or resource_created
if resource_created:
params.HdfsResource(None, action="execute")
service('historyserver', action='start', serviceName='mapreduce')
http://git-wip-us.apache.org/repos/asf/ambari/blob/8e1af7a9/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/HIVE/package/scripts/hive.py
--
diff --git
a/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/HIVE/package/scripts/hive.py
b/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/HIVE/package/scripts/hive.py
index f6fddd0..0446e1c 100755
---
a/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/HIVE/package/scripts/hive.py
+++
b/ambari-server/src/main/resources/stacks/BigInsights/4.2/services/HIVE/package/scripts/hive.py
@@ -133,7 +133,7 @@ def hive(name=None):
# ** Begin Copy Tarballs **
# *
if params.stack_version != "" and compare_versions(params.stack_version,
'4.0.0.0') >= 0:
- copy_to_hdfs("mapreduce", params.user_group, params.hdfs_user,
host_sys_prepped=params.host_sys_prepped)
+ copy_to_hdfs("mapreduce", params.user_group, params.hdfs_user,
skip=params.host_sys_prepped)
# Always copy pig.tar.gz and hive.tar.gz using the appropriate mode.
copy_to_hdfs("pig",
@@ -142,14 +142,14 @@ def hive(name=None):
file_mode=params.tarballs_mode,
custom_source_file=params.pig_tar_source,
custom_dest_file=params.pig_tar_dest_file,
- host_sys_prepped=params.host_sys_prepped)
+ skip=params.ho
ambari git commit: AMBARI-21421 EU upgrade pack to update Hive and Yarn properties to remove IOP/BigSQL properties (dili)
Repository: ambari Updated Branches: refs/heads/branch-feature-AMBARI-21348 bad4e5c3c -> f3bcd4bcf AMBARI-21421 EU upgrade pack to update Hive and Yarn properties to remove IOP/BigSQL properties (dili) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/f3bcd4bc Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/f3bcd4bc Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/f3bcd4bc Branch: refs/heads/branch-feature-AMBARI-21348 Commit: f3bcd4bcfa683fb71d2cb139b61587cc37ee97bc Parents: bad4e5c Author: Di Li Authored: Mon Jul 10 14:40:08 2017 -0400 Committer: Di Li Committed: Mon Jul 10 14:40:08 2017 -0400 -- .../BigInsights/4.2.5/upgrades/config-upgrade.xml | 12 .../4.2.5/upgrades/nonrolling-upgrade-to-hdp-2.6.xml | 5 + .../BigInsights/4.2/upgrades/config-upgrade.xml | 14 +- .../4.2/upgrades/nonrolling-upgrade-to-hdp-2.6.xml| 5 + 4 files changed, 35 insertions(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/ambari/blob/f3bcd4bc/ambari-server/src/main/resources/stacks/BigInsights/4.2.5/upgrades/config-upgrade.xml -- diff --git a/ambari-server/src/main/resources/stacks/BigInsights/4.2.5/upgrades/config-upgrade.xml b/ambari-server/src/main/resources/stacks/BigInsights/4.2.5/upgrades/config-upgrade.xml index 6597055..42999b2 100644 --- a/ambari-server/src/main/resources/stacks/BigInsights/4.2.5/upgrades/config-upgrade.xml +++ b/ambari-server/src/main/resources/stacks/BigInsights/4.2.5/upgrades/config-upgrade.xml @@ -30,6 +30,17 @@ + + + + +yarn-site + + + + + + @@ -46,6 +57,7 @@ hive-site + http://git-wip-us.apache.org/repos/asf/ambari/blob/f3bcd4bc/ambari-server/src/main/resources/stacks/BigInsights/4.2.5/upgrades/nonrolling-upgrade-to-hdp-2.6.xml -- diff --git a/ambari-server/src/main/resources/stacks/BigInsights/4.2.5/upgrades/nonrolling-upgrade-to-hdp-2.6.xml b/ambari-server/src/main/resources/stacks/BigInsights/4.2.5/upgrades/nonrolling-upgrade-to-hdp-2.6.xml index 4626005..e9c8541 100644 --- a/ambari-server/src/main/resources/stacks/BigInsights/4.2.5/upgrades/nonrolling-upgrade-to-hdp-2.6.xml +++ b/ambari-server/src/main/resources/stacks/BigInsights/4.2.5/upgrades/nonrolling-upgrade-to-hdp-2.6.xml @@ -177,6 +177,11 @@ + + + + + http://git-wip-us.apache.org/repos/asf/ambari/blob/f3bcd4bc/ambari-server/src/main/resources/stacks/BigInsights/4.2/upgrades/config-upgrade.xml -- diff --git a/ambari-server/src/main/resources/stacks/BigInsights/4.2/upgrades/config-upgrade.xml b/ambari-server/src/main/resources/stacks/BigInsights/4.2/upgrades/config-upgrade.xml index 6597055..f9e3e15 100644 --- a/ambari-server/src/main/resources/stacks/BigInsights/4.2/upgrades/config-upgrade.xml +++ b/ambari-server/src/main/resources/stacks/BigInsights/4.2/upgrades/config-upgrade.xml @@ -29,7 +29,18 @@ - + + + + + +yarn-site + + + + + + @@ -46,6 +57,7 @@ hive-site + http://git-wip-us.apache.org/repos/asf/ambari/blob/f3bcd4bc/ambari-server/src/main/resources/stacks/BigInsights/4.2/upgrades/nonrolling-upgrade-to-hdp-2.6.xml -- diff --git a/ambari-server/src/main/resources/stacks/BigInsights/4.2/upgrades/nonrolling-upgrade-to-hdp-2.6.xml b/ambari-server/src/main/resources/stacks/BigInsights/4.2/upgrades/nonrolling-upgrade-to-hdp-2.6.xml index 4626005..e9c8541 100644 --- a/ambari-server/src/main/resources/stacks/BigInsights/4.2/upgrades/nonrolling-upgrade-to-hdp-2.6.xml +++ b/ambari-server/src/main/resources/stacks/BigInsights/4.2/upgrades/nonrolling-upgrade-to-hdp-2.6.xml @@ -177,6 +177,11 @@ + + + + +
ambari git commit: Revert "AMBARI-21421 EU upgrade pack to update Hive and Yarn properties to remove IOP/BigSQL properties (dili)"
Repository: ambari Updated Branches: refs/heads/branch-feature-AMBARI-21348 a42e2730e -> bad4e5c3c Revert "AMBARI-21421 EU upgrade pack to update Hive and Yarn properties to remove IOP/BigSQL properties (dili)" This reverts commit 78255d7689b04d776c013af7afe1e37e8fbf9671. Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/bad4e5c3 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/bad4e5c3 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/bad4e5c3 Branch: refs/heads/branch-feature-AMBARI-21348 Commit: bad4e5c3c52e824428d0031ecff9e6e03e28809e Parents: a42e273 Author: Di Li Authored: Mon Jul 10 13:41:34 2017 -0400 Committer: Di Li Committed: Mon Jul 10 13:41:34 2017 -0400 -- .../BigInsights/4.2.5/upgrades/config-upgrade.xml | 11 --- .../4.2.5/upgrades/nonrolling-upgrade-to-hdp-2.6.xml | 5 - .../BigInsights/4.2/upgrades/config-upgrade.xml | 14 +- .../4.2/upgrades/nonrolling-upgrade-to-hdp-2.6.xml| 5 - 4 files changed, 1 insertion(+), 34 deletions(-) -- http://git-wip-us.apache.org/repos/asf/ambari/blob/bad4e5c3/ambari-server/src/main/resources/stacks/BigInsights/4.2.5/upgrades/config-upgrade.xml -- diff --git a/ambari-server/src/main/resources/stacks/BigInsights/4.2.5/upgrades/config-upgrade.xml b/ambari-server/src/main/resources/stacks/BigInsights/4.2.5/upgrades/config-upgrade.xml index bff6672..6597055 100644 --- a/ambari-server/src/main/resources/stacks/BigInsights/4.2.5/upgrades/config-upgrade.xml +++ b/ambari-server/src/main/resources/stacks/BigInsights/4.2.5/upgrades/config-upgrade.xml @@ -30,17 +30,6 @@ - - - - -yarn-site - - - - - - http://git-wip-us.apache.org/repos/asf/ambari/blob/bad4e5c3/ambari-server/src/main/resources/stacks/BigInsights/4.2.5/upgrades/nonrolling-upgrade-to-hdp-2.6.xml -- diff --git a/ambari-server/src/main/resources/stacks/BigInsights/4.2.5/upgrades/nonrolling-upgrade-to-hdp-2.6.xml b/ambari-server/src/main/resources/stacks/BigInsights/4.2.5/upgrades/nonrolling-upgrade-to-hdp-2.6.xml index e9c8541..4626005 100644 --- a/ambari-server/src/main/resources/stacks/BigInsights/4.2.5/upgrades/nonrolling-upgrade-to-hdp-2.6.xml +++ b/ambari-server/src/main/resources/stacks/BigInsights/4.2.5/upgrades/nonrolling-upgrade-to-hdp-2.6.xml @@ -177,11 +177,6 @@ - - - - - http://git-wip-us.apache.org/repos/asf/ambari/blob/bad4e5c3/ambari-server/src/main/resources/stacks/BigInsights/4.2/upgrades/config-upgrade.xml -- diff --git a/ambari-server/src/main/resources/stacks/BigInsights/4.2/upgrades/config-upgrade.xml b/ambari-server/src/main/resources/stacks/BigInsights/4.2/upgrades/config-upgrade.xml index d931093..6597055 100644 --- a/ambari-server/src/main/resources/stacks/BigInsights/4.2/upgrades/config-upgrade.xml +++ b/ambari-server/src/main/resources/stacks/BigInsights/4.2/upgrades/config-upgrade.xml @@ -29,18 +29,7 @@ - - - - - -yarn-site - - - - - - + @@ -57,7 +46,6 @@ hive-site - http://git-wip-us.apache.org/repos/asf/ambari/blob/bad4e5c3/ambari-server/src/main/resources/stacks/BigInsights/4.2/upgrades/nonrolling-upgrade-to-hdp-2.6.xml -- diff --git a/ambari-server/src/main/resources/stacks/BigInsights/4.2/upgrades/nonrolling-upgrade-to-hdp-2.6.xml b/ambari-server/src/main/resources/stacks/BigInsights/4.2/upgrades/nonrolling-upgrade-to-hdp-2.6.xml index e9c8541..4626005 100644 --- a/ambari-server/src/main/resources/stacks/BigInsights/4.2/upgrades/nonrolling-upgrade-to-hdp-2.6.xml +++ b/ambari-server/src/main/resources/stacks/BigInsights/4.2/upgrades/nonrolling-upgrade-to-hdp-2.6.xml @@ -177,11 +177,6 @@ - - - - -
ambari git commit: AMBARI-21421 EU upgrade pack to update Hive and Yarn properties to remove IOP/BigSQL properties (dili)
Repository: ambari Updated Branches: refs/heads/branch-feature-AMBARI-21348 f01d4a3c2 -> 78255d768 AMBARI-21421 EU upgrade pack to update Hive and Yarn properties to remove IOP/BigSQL properties (dili) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/78255d76 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/78255d76 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/78255d76 Branch: refs/heads/branch-feature-AMBARI-21348 Commit: 78255d7689b04d776c013af7afe1e37e8fbf9671 Parents: f01d4a3 Author: Di Li Authored: Mon Jul 10 09:05:19 2017 -0400 Committer: Di Li Committed: Mon Jul 10 09:05:19 2017 -0400 -- .../BigInsights/4.2.5/upgrades/config-upgrade.xml | 11 +++ .../4.2.5/upgrades/nonrolling-upgrade-to-hdp-2.6.xml | 5 + .../BigInsights/4.2/upgrades/config-upgrade.xml | 14 +- .../4.2/upgrades/nonrolling-upgrade-to-hdp-2.6.xml| 5 + 4 files changed, 34 insertions(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/ambari/blob/78255d76/ambari-server/src/main/resources/stacks/BigInsights/4.2.5/upgrades/config-upgrade.xml -- diff --git a/ambari-server/src/main/resources/stacks/BigInsights/4.2.5/upgrades/config-upgrade.xml b/ambari-server/src/main/resources/stacks/BigInsights/4.2.5/upgrades/config-upgrade.xml index 6597055..bff6672 100644 --- a/ambari-server/src/main/resources/stacks/BigInsights/4.2.5/upgrades/config-upgrade.xml +++ b/ambari-server/src/main/resources/stacks/BigInsights/4.2.5/upgrades/config-upgrade.xml @@ -30,6 +30,17 @@ + + + + +yarn-site + + + + + + http://git-wip-us.apache.org/repos/asf/ambari/blob/78255d76/ambari-server/src/main/resources/stacks/BigInsights/4.2.5/upgrades/nonrolling-upgrade-to-hdp-2.6.xml -- diff --git a/ambari-server/src/main/resources/stacks/BigInsights/4.2.5/upgrades/nonrolling-upgrade-to-hdp-2.6.xml b/ambari-server/src/main/resources/stacks/BigInsights/4.2.5/upgrades/nonrolling-upgrade-to-hdp-2.6.xml index 4626005..e9c8541 100644 --- a/ambari-server/src/main/resources/stacks/BigInsights/4.2.5/upgrades/nonrolling-upgrade-to-hdp-2.6.xml +++ b/ambari-server/src/main/resources/stacks/BigInsights/4.2.5/upgrades/nonrolling-upgrade-to-hdp-2.6.xml @@ -177,6 +177,11 @@ + + + + + http://git-wip-us.apache.org/repos/asf/ambari/blob/78255d76/ambari-server/src/main/resources/stacks/BigInsights/4.2/upgrades/config-upgrade.xml -- diff --git a/ambari-server/src/main/resources/stacks/BigInsights/4.2/upgrades/config-upgrade.xml b/ambari-server/src/main/resources/stacks/BigInsights/4.2/upgrades/config-upgrade.xml index 6597055..d931093 100644 --- a/ambari-server/src/main/resources/stacks/BigInsights/4.2/upgrades/config-upgrade.xml +++ b/ambari-server/src/main/resources/stacks/BigInsights/4.2/upgrades/config-upgrade.xml @@ -29,7 +29,18 @@ - + + + + + +yarn-site + + + + + + @@ -46,6 +57,7 @@ hive-site + http://git-wip-us.apache.org/repos/asf/ambari/blob/78255d76/ambari-server/src/main/resources/stacks/BigInsights/4.2/upgrades/nonrolling-upgrade-to-hdp-2.6.xml -- diff --git a/ambari-server/src/main/resources/stacks/BigInsights/4.2/upgrades/nonrolling-upgrade-to-hdp-2.6.xml b/ambari-server/src/main/resources/stacks/BigInsights/4.2/upgrades/nonrolling-upgrade-to-hdp-2.6.xml index 4626005..e9c8541 100644 --- a/ambari-server/src/main/resources/stacks/BigInsights/4.2/upgrades/nonrolling-upgrade-to-hdp-2.6.xml +++ b/ambari-server/src/main/resources/stacks/BigInsights/4.2/upgrades/nonrolling-upgrade-to-hdp-2.6.xml @@ -177,6 +177,11 @@ + + + + +
ambari git commit: AMBARI-21419 EU to auto switch to HDP tomcat for Oozie (dili)
Repository: ambari Updated Branches: refs/heads/branch-feature-AMBARI-21348 e512d1032 -> 4302da150 AMBARI-21419 EU to auto switch to HDP tomcat for Oozie (dili) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/4302da15 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/4302da15 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/4302da15 Branch: refs/heads/branch-feature-AMBARI-21348 Commit: 4302da1500fb8c936d728a2b32937fb282f3c1d1 Parents: e512d10 Author: Di Li Authored: Thu Jul 6 16:51:23 2017 -0400 Committer: Di Li Committed: Thu Jul 6 16:51:23 2017 -0400 -- .../stacks/BigInsights/4.2.5/upgrades/config-upgrade.xml | 4 .../BigInsights/4.2.5/upgrades/nonrolling-upgrade-to-hdp-2.6.xml | 3 +++ .../resources/stacks/BigInsights/4.2/upgrades/config-upgrade.xml | 4 .../BigInsights/4.2/upgrades/nonrolling-upgrade-to-hdp-2.6.xml | 3 +++ 4 files changed, 14 insertions(+) -- http://git-wip-us.apache.org/repos/asf/ambari/blob/4302da15/ambari-server/src/main/resources/stacks/BigInsights/4.2.5/upgrades/config-upgrade.xml -- diff --git a/ambari-server/src/main/resources/stacks/BigInsights/4.2.5/upgrades/config-upgrade.xml b/ambari-server/src/main/resources/stacks/BigInsights/4.2.5/upgrades/config-upgrade.xml index 419e5dd..6597055 100644 --- a/ambari-server/src/main/resources/stacks/BigInsights/4.2.5/upgrades/config-upgrade.xml +++ b/ambari-server/src/main/resources/stacks/BigInsights/4.2.5/upgrades/config-upgrade.xml @@ -112,6 +112,10 @@ oozie-env + +oozie-site + + http://git-wip-us.apache.org/repos/asf/ambari/blob/4302da15/ambari-server/src/main/resources/stacks/BigInsights/4.2.5/upgrades/nonrolling-upgrade-to-hdp-2.6.xml -- diff --git a/ambari-server/src/main/resources/stacks/BigInsights/4.2.5/upgrades/nonrolling-upgrade-to-hdp-2.6.xml b/ambari-server/src/main/resources/stacks/BigInsights/4.2.5/upgrades/nonrolling-upgrade-to-hdp-2.6.xml index c4737c9..af87794 100644 --- a/ambari-server/src/main/resources/stacks/BigInsights/4.2.5/upgrades/nonrolling-upgrade-to-hdp-2.6.xml +++ b/ambari-server/src/main/resources/stacks/BigInsights/4.2.5/upgrades/nonrolling-upgrade-to-hdp-2.6.xml @@ -204,6 +204,9 @@ + + + http://git-wip-us.apache.org/repos/asf/ambari/blob/4302da15/ambari-server/src/main/resources/stacks/BigInsights/4.2/upgrades/config-upgrade.xml -- diff --git a/ambari-server/src/main/resources/stacks/BigInsights/4.2/upgrades/config-upgrade.xml b/ambari-server/src/main/resources/stacks/BigInsights/4.2/upgrades/config-upgrade.xml index 419e5dd..6597055 100644 --- a/ambari-server/src/main/resources/stacks/BigInsights/4.2/upgrades/config-upgrade.xml +++ b/ambari-server/src/main/resources/stacks/BigInsights/4.2/upgrades/config-upgrade.xml @@ -112,6 +112,10 @@ oozie-env + +oozie-site + + http://git-wip-us.apache.org/repos/asf/ambari/blob/4302da15/ambari-server/src/main/resources/stacks/BigInsights/4.2/upgrades/nonrolling-upgrade-to-hdp-2.6.xml -- diff --git a/ambari-server/src/main/resources/stacks/BigInsights/4.2/upgrades/nonrolling-upgrade-to-hdp-2.6.xml b/ambari-server/src/main/resources/stacks/BigInsights/4.2/upgrades/nonrolling-upgrade-to-hdp-2.6.xml index c4737c9..af87794 100644 --- a/ambari-server/src/main/resources/stacks/BigInsights/4.2/upgrades/nonrolling-upgrade-to-hdp-2.6.xml +++ b/ambari-server/src/main/resources/stacks/BigInsights/4.2/upgrades/nonrolling-upgrade-to-hdp-2.6.xml @@ -204,6 +204,9 @@ + + +
ambari git commit: AMBARI-21351 Add Support For MariaDB to Python Scripts update (dili)
Repository: ambari
Updated Branches:
refs/heads/branch-feature-AMBARI-21348 fa585fb4f -> e512d1032
AMBARI-21351 Add Support For MariaDB to Python Scripts update (dili)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/e512d103
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/e512d103
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/e512d103
Branch: refs/heads/branch-feature-AMBARI-21348
Commit: e512d1032ae173f8828353f94830566cf9b34dfa
Parents: fa585fb
Author: Di Li
Authored: Thu Jul 6 16:06:12 2017 -0400
Committer: Di Li
Committed: Thu Jul 6 16:06:12 2017 -0400
--
.../HIVE/0.12.0.2.0/package/scripts/status_params.py| 5 -
1 file changed, 4 insertions(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/e512d103/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/status_params.py
--
diff --git
a/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/status_params.py
b/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/status_params.py
index fd4fc64..f5b00ac 100644
---
a/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/status_params.py
+++
b/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/status_params.py
@@ -20,6 +20,7 @@ limitations under the License.
from ambari_commons import OSCheck
+from resource_management.core.logger import Logger
from resource_management.libraries.functions import conf_select
from resource_management.libraries.functions import stack_select
from resource_management.libraries.functions import format
@@ -68,7 +69,9 @@ else:
hcat_pid_dir = config['configurations']['hive-env']['hcat_pid_dir']
#hcat_pid_dir
webhcat_pid_file = format('{hcat_pid_dir}/webhcat.pid')
- mariadb_redhat_support =
default("/configurations/hive_env/mariadb_redhat_support", "false")
+ mariadb_redhat_support =
default("/configurations/hive-env/mariadb_redhat_support", "false")
+ mariadb_redhat_support = str(mariadb_redhat_support)
+ Logger.info('MariaDB RedHat Support: %s' % mariadb_redhat_support)
process_name = 'mysqld'
if OSCheck.is_suse_family() or OSCheck.is_ubuntu_family():
daemon_name = 'mysql'
ambari git commit: AMBARI-21383 Update upgrade pack to set mariadb support property for hive - BI 4.2.5 stack (dili)
Repository: ambari Updated Branches: refs/heads/branch-feature-AMBARI-21348 4e668ca68 -> 3cc61316c AMBARI-21383 Update upgrade pack to set mariadb support property for hive - BI 4.2.5 stack (dili) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/3cc61316 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/3cc61316 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/3cc61316 Branch: refs/heads/branch-feature-AMBARI-21348 Commit: 3cc61316cc04b3591223a1db18f3eaf02bb2d21e Parents: 4e668ca Author: Di Li Authored: Thu Jul 6 14:07:15 2017 -0400 Committer: Di Li Committed: Thu Jul 6 14:07:15 2017 -0400 -- .../stacks/BigInsights/4.2.5/upgrades/config-upgrade.xml | 4 .../BigInsights/4.2.5/upgrades/nonrolling-upgrade-to-hdp-2.6.xml | 3 +++ 2 files changed, 7 insertions(+) -- http://git-wip-us.apache.org/repos/asf/ambari/blob/3cc61316/ambari-server/src/main/resources/stacks/BigInsights/4.2.5/upgrades/config-upgrade.xml -- diff --git a/ambari-server/src/main/resources/stacks/BigInsights/4.2.5/upgrades/config-upgrade.xml b/ambari-server/src/main/resources/stacks/BigInsights/4.2.5/upgrades/config-upgrade.xml index d1cd81f..419e5dd 100644 --- a/ambari-server/src/main/resources/stacks/BigInsights/4.2.5/upgrades/config-upgrade.xml +++ b/ambari-server/src/main/resources/stacks/BigInsights/4.2.5/upgrades/config-upgrade.xml @@ -76,6 +76,10 @@ + +hive-env + + http://git-wip-us.apache.org/repos/asf/ambari/blob/3cc61316/ambari-server/src/main/resources/stacks/BigInsights/4.2.5/upgrades/nonrolling-upgrade-to-hdp-2.6.xml -- diff --git a/ambari-server/src/main/resources/stacks/BigInsights/4.2.5/upgrades/nonrolling-upgrade-to-hdp-2.6.xml b/ambari-server/src/main/resources/stacks/BigInsights/4.2.5/upgrades/nonrolling-upgrade-to-hdp-2.6.xml index 419bb5a..c4737c9 100644 --- a/ambari-server/src/main/resources/stacks/BigInsights/4.2.5/upgrades/nonrolling-upgrade-to-hdp-2.6.xml +++ b/ambari-server/src/main/resources/stacks/BigInsights/4.2.5/upgrades/nonrolling-upgrade-to-hdp-2.6.xml @@ -185,6 +185,9 @@ + + +
ambari git commit: AMBARI-21383: Update upgrade pack to set mariadb support property for hive (dili)
Repository: ambari Updated Branches: refs/heads/branch-feature-AMBARI-21348 a5ce6b427 -> d0c147973 AMBARI-21383: Update upgrade pack to set mariadb support property for hive (dili) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/d0c14797 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/d0c14797 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/d0c14797 Branch: refs/heads/branch-feature-AMBARI-21348 Commit: d0c14797322624fd2ff8238adb576645cb27a26d Parents: a5ce6b4 Author: Di Li Authored: Wed Jul 5 11:55:18 2017 -0400 Committer: Di Li Committed: Wed Jul 5 11:55:18 2017 -0400 -- .../resources/stacks/BigInsights/4.2/upgrades/config-upgrade.xml | 4 .../BigInsights/4.2/upgrades/nonrolling-upgrade-to-hdp-2.6.xml | 3 +++ 2 files changed, 7 insertions(+) -- http://git-wip-us.apache.org/repos/asf/ambari/blob/d0c14797/ambari-server/src/main/resources/stacks/BigInsights/4.2/upgrades/config-upgrade.xml -- diff --git a/ambari-server/src/main/resources/stacks/BigInsights/4.2/upgrades/config-upgrade.xml b/ambari-server/src/main/resources/stacks/BigInsights/4.2/upgrades/config-upgrade.xml index d1cd81f..419e5dd 100644 --- a/ambari-server/src/main/resources/stacks/BigInsights/4.2/upgrades/config-upgrade.xml +++ b/ambari-server/src/main/resources/stacks/BigInsights/4.2/upgrades/config-upgrade.xml @@ -76,6 +76,10 @@ + +hive-env + + http://git-wip-us.apache.org/repos/asf/ambari/blob/d0c14797/ambari-server/src/main/resources/stacks/BigInsights/4.2/upgrades/nonrolling-upgrade-to-hdp-2.6.xml -- diff --git a/ambari-server/src/main/resources/stacks/BigInsights/4.2/upgrades/nonrolling-upgrade-to-hdp-2.6.xml b/ambari-server/src/main/resources/stacks/BigInsights/4.2/upgrades/nonrolling-upgrade-to-hdp-2.6.xml index ac0f767..be54f84 100644 --- a/ambari-server/src/main/resources/stacks/BigInsights/4.2/upgrades/nonrolling-upgrade-to-hdp-2.6.xml +++ b/ambari-server/src/main/resources/stacks/BigInsights/4.2/upgrades/nonrolling-upgrade-to-hdp-2.6.xml @@ -185,6 +185,9 @@ + + +
ambari git commit: AMBARI-21351 Add Support For MariaDB to Python Scripts (dili)
Repository: ambari
Updated Branches:
refs/heads/branch-feature-AMBARI-21348 ccdc57dbb -> 49d76e1ed
AMBARI-21351 Add Support For MariaDB to Python Scripts (dili)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/49d76e1e
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/49d76e1e
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/49d76e1e
Branch: refs/heads/branch-feature-AMBARI-21348
Commit: 49d76e1edb1466c1cbe2c606f79e7e0750b41346
Parents: ccdc57d
Author: Di Li
Authored: Fri Jun 30 11:52:44 2017 -0400
Committer: Di Li
Committed: Fri Jun 30 11:52:44 2017 -0400
--
.../HIVE/0.12.0.2.0/package/scripts/status_params.py | 3 +++
1 file changed, 3 insertions(+)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/49d76e1e/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/status_params.py
--
diff --git
a/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/status_params.py
b/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/status_params.py
index b7cb148..fd4fc64 100644
---
a/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/status_params.py
+++
b/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/status_params.py
@@ -68,9 +68,12 @@ else:
hcat_pid_dir = config['configurations']['hive-env']['hcat_pid_dir']
#hcat_pid_dir
webhcat_pid_file = format('{hcat_pid_dir}/webhcat.pid')
+ mariadb_redhat_support =
default("/configurations/hive_env/mariadb_redhat_support", "false")
process_name = 'mysqld'
if OSCheck.is_suse_family() or OSCheck.is_ubuntu_family():
daemon_name = 'mysql'
+ elif OSCheck.is_redhat_family() and int(OSCheck.get_os_major_version()) >= 7
and mariadb_redhat_support.lower() == "true":
+daemon_name = 'mariadb'
else:
daemon_name = 'mysqld'
ambari git commit: AMBARI-21373 Remove clean repo logic not suitable for Apache Ambari Python API (dili)
Repository: ambari
Updated Branches:
refs/heads/branch-feature-AMBARI-21348 ab85eeb19 -> 98f77089c
AMBARI-21373 Remove clean repo logic not suitable for Apache Ambari Python API
(dili)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/98f77089
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/98f77089
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/98f77089
Branch: refs/heads/branch-feature-AMBARI-21348
Commit: 98f77089c97db7e49498107b9641d39cb0e6a527
Parents: ab85eeb
Author: Di Li
Authored: Thu Jun 29 13:13:16 2017 -0400
Committer: Di Li
Committed: Thu Jun 29 13:13:16 2017 -0400
--
.../scripts/repo_initialization.py | 27
.../scripts/repo_initialization.py | 27
2 files changed, 54 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/98f77089/ambari-server/src/main/resources/stacks/BigInsights/4.0/hooks/before-INSTALL/scripts/repo_initialization.py
--
diff --git
a/ambari-server/src/main/resources/stacks/BigInsights/4.0/hooks/before-INSTALL/scripts/repo_initialization.py
b/ambari-server/src/main/resources/stacks/BigInsights/4.0/hooks/before-INSTALL/scripts/repo_initialization.py
index 1b0f5c6..dffcc39 100755
---
a/ambari-server/src/main/resources/stacks/BigInsights/4.0/hooks/before-INSTALL/scripts/repo_initialization.py
+++
b/ambari-server/src/main/resources/stacks/BigInsights/4.0/hooks/before-INSTALL/scripts/repo_initialization.py
@@ -52,33 +52,6 @@ def _alter_repo(action, repo_string, repo_template):
components = ubuntu_components, # ubuntu specific
)
-if action == "create":
- #Attempt to clean cache against the given repo
- repo_id=repo['repoId']
- print "Clean cache against " + repo_id + "; file:" + repo['repoName']
- current_repo_ids = []
- current_repo_files = set()
-
- if OSCheck.is_ubuntu_family():
-current_repo_files.add("base")
-current_repo_files.add(repo['repoName'])
- elif OSCheck.is_suse_family():
-current_repo_ids.append("base")
-current_repo_ids.append(repo_id)
- else:
-current_repo_ids.append(repo_id)
-
- Repository(repo_id,
- action = "clearcache",
- base_url = repo['baseUrl'],
- mirror_list = repo['mirrorsList'],
- repo_file_name = repo['repoName'],
- repo_template = repo_template,
- components = ubuntu_components, # ubuntu specific
- use_repos=list(current_repo_files) if
OSCheck.is_ubuntu_family() else current_repo_ids,
- skip_repos=["*"] if OSCheck.is_redhat_family() else []
- )
-
def install_repos():
import params
if params.host_sys_prepped:
http://git-wip-us.apache.org/repos/asf/ambari/blob/98f77089/ambari-server/src/main/resources/stacks/BigInsights/4.2.5/hooks/before-INSTALL/scripts/repo_initialization.py
--
diff --git
a/ambari-server/src/main/resources/stacks/BigInsights/4.2.5/hooks/before-INSTALL/scripts/repo_initialization.py
b/ambari-server/src/main/resources/stacks/BigInsights/4.2.5/hooks/before-INSTALL/scripts/repo_initialization.py
index 98fa131..0de2f5b 100755
---
a/ambari-server/src/main/resources/stacks/BigInsights/4.2.5/hooks/before-INSTALL/scripts/repo_initialization.py
+++
b/ambari-server/src/main/resources/stacks/BigInsights/4.2.5/hooks/before-INSTALL/scripts/repo_initialization.py
@@ -59,33 +59,6 @@ def _alter_repo(action, repo_string, repo_template):
components = ubuntu_components, # ubuntu specific
)
-if action == "create":
- #Attempt to clean cache against the given repo
- repo_id=repo['repoId']
- print "Clean cache against " + repo_id + "; file:" + repo['repoName']
- current_repo_ids = []
- current_repo_files = set()
-
- if OSCheck.is_ubuntu_family():
-current_repo_files.add("base")
-current_repo_files.add(repo['repoName'])
- elif OSCheck.is_suse_family():
-current_repo_ids.append("base")
-current_repo_ids.append(repo_id)
- else:
-current_repo_ids.append(repo_id)
-
- Repository(repo_id,
- action = "clearcache",
- base_url = repo['baseUrl'],
- mirror_list = repo['mirrorsList'],
- repo_file_name
ambari git commit: AMBARI-21368 Update Ambari server rat exclude list with BI AMS files (dili)
Repository: ambari Updated Branches: refs/heads/branch-feature-AMBARI-21348 bb18f7fe0 -> b928e7aba AMBARI-21368 Update Ambari server rat exclude list with BI AMS files (dili) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/b928e7ab Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/b928e7ab Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/b928e7ab Branch: refs/heads/branch-feature-AMBARI-21348 Commit: b928e7aba03c7f19b63d4b135c8207da42538753 Parents: bb18f7f Author: Di Li Authored: Wed Jun 28 14:35:23 2017 -0400 Committer: Di Li Committed: Wed Jun 28 14:35:23 2017 -0400 -- ambari-server/pom.xml | 4 1 file changed, 4 insertions(+) -- http://git-wip-us.apache.org/repos/asf/ambari/blob/b928e7ab/ambari-server/pom.xml -- diff --git a/ambari-server/pom.xml b/ambari-server/pom.xml index 51759d4..63e704c 100644 --- a/ambari-server/pom.xml +++ b/ambari-server/pom.xml @@ -299,6 +299,10 @@ src/main/resources/stacks/BIGTOP/0.8/services/HDFS/package/scripts/balancer-emulator/balancer-err.log src/main/resources/stacks/PHD/3.0.0.0/services/HDFS/package/scripts/balancer-emulator/balancer.log src/main/resources/stacks/PHD/3.0.0.0/services/HDFS/package/scripts/balancer-emulator/balancer-err.log + src/main/resources/stacks/BigInsights/4.0/services/AMBARI_METRICS/package/templates/smoketest_metrics.json.j2 + src/main/resources/stacks/BigInsights/4.0/services/AMBARI_METRICS/package/files/service-metrics/*.txt + src/main/resources/stacks/BigInsights/4.2/services/AMBARI_METRICS/package/templates/smoketest_metrics.json.j2 + src/main/resources/stacks/BigInsights/4.2/services/AMBARI_METRICS/package/files/service-metrics/*.txt **/SMARTSENSE/** conf/unix/ca.config conf/unix/krb5JAASLogin.conf
ambari git commit: AMBARI-21359 Add JavaVersionCheck check (dili)
Repository: ambari
Updated Branches:
refs/heads/branch-feature-AMBARI-21348 77099797a -> bb18f7fe0
AMBARI-21359 Add JavaVersionCheck check (dili)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/bb18f7fe
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/bb18f7fe
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/bb18f7fe
Branch: refs/heads/branch-feature-AMBARI-21348
Commit: bb18f7fe0b2624e7f3022de4236983c695619bc2
Parents: 7709979
Author: Di Li
Authored: Wed Jun 28 14:24:21 2017 -0400
Committer: Di Li
Committed: Wed Jun 28 14:24:21 2017 -0400
--
.../ambari/server/checks/CheckDescription.java | 8 ++
.../ambari/server/checks/JavaVersionCheck.java | 102 +++
2 files changed, 110 insertions(+)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/bb18f7fe/ambari-server/src/main/java/org/apache/ambari/server/checks/CheckDescription.java
--
diff --git
a/ambari-server/src/main/java/org/apache/ambari/server/checks/CheckDescription.java
b/ambari-server/src/main/java/org/apache/ambari/server/checks/CheckDescription.java
index 71c5857..2be42fc 100644
---
a/ambari-server/src/main/java/org/apache/ambari/server/checks/CheckDescription.java
+++
b/ambari-server/src/main/java/org/apache/ambari/server/checks/CheckDescription.java
@@ -329,6 +329,14 @@ public class CheckDescription {
"As Ranger is SSL enabled, Ranger SSL configurations will need
to be changed from default value of /etc/ranger/*/conf folder to
/etc/ranger/security. " +
"Since the certificates/keystores/truststores in this path may
affect the upgrade/downgrade process, it is recommended to manually move the
certificates/keystores/truststores out of the conf folders and change the
appropriate config values before proceeding.").build());
+ public static CheckDescription JAVA_VERSION = new
CheckDescription("JAVA_VERSION",
+ PrereqCheckType.CLUSTER,
+ "Verify Java version requirement",
+ new ImmutableMap.Builder()
+.put(AbstractCheckDescriptor.DEFAULT, "Ambari requires JDK with
minimum version %s. Reconfigure Ambari with a JDK that meets the version
requirement.")
+.build()
+);
+
private String m_name;
private PrereqCheckType m_type;
private String m_description;
http://git-wip-us.apache.org/repos/asf/ambari/blob/bb18f7fe/ambari-server/src/main/java/org/apache/ambari/server/checks/JavaVersionCheck.java
--
diff --git
a/ambari-server/src/main/java/org/apache/ambari/server/checks/JavaVersionCheck.java
b/ambari-server/src/main/java/org/apache/ambari/server/checks/JavaVersionCheck.java
new file mode 100644
index 000..882749f
--- /dev/null
+++
b/ambari-server/src/main/java/org/apache/ambari/server/checks/JavaVersionCheck.java
@@ -0,0 +1,102 @@
+/*
+ * 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.checks;
+
+import java.util.Map;
+
+import org.apache.ambari.server.AmbariException;
+import org.apache.ambari.server.configuration.Configuration;
+import org.apache.ambari.server.controller.PrereqCheckRequest;
+import org.apache.ambari.server.state.stack.PrereqCheckStatus;
+import org.apache.ambari.server.state.stack.PrerequisiteCheck;
+import
org.apache.ambari.server.state.stack.UpgradePack.PrerequisiteCheckConfig;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.google.inject.Singleton;
+
+/**
+ * The {@link JavaVersionCheck} checks that JDK version used by Ambari meets
the minimal version requirement
+ */
+@Singleton
+@UpgradeCheck(group = UpgradeCheckGroup.DEFAULT)
+public class JavaVersionCheck extends AbstractCheckDescriptor {
+
+ private static final Logger LOG =
LoggerFactory.getLogger(JavaVersionCheck.class);
+ static final String JAVA_VERSION_PROPERTY_NAME = "java-version&
ambari git commit: AMBARI-21327 Ambari server to print error messages if NN HA namenode services properties use diff FQDN (dual network cards) than FQDN in the HostComponentState table (dili)
Repository: ambari
Updated Branches:
refs/heads/trunk 40e6352b0 -> 2f4025050
AMBARI-21327 Ambari server to print error messages if NN HA namenode services
properties use diff FQDN (dual network cards) than FQDN in the
HostComponentState table (dili)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/2f402505
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/2f402505
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/2f402505
Branch: refs/heads/trunk
Commit: 2f402505060354e8c71d24879c47a3850cc04009
Parents: 40e6352
Author: Di Li
Authored: Tue Jun 27 15:56:53 2017 -0400
Committer: Di Li
Committed: Tue Jun 27 15:56:53 2017 -0400
--
.../apache/ambari/server/stack/MasterHostResolver.java | 11 +--
1 file changed, 9 insertions(+), 2 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/2f402505/ambari-server/src/main/java/org/apache/ambari/server/stack/MasterHostResolver.java
--
diff --git
a/ambari-server/src/main/java/org/apache/ambari/server/stack/MasterHostResolver.java
b/ambari-server/src/main/java/org/apache/ambari/server/stack/MasterHostResolver.java
index 427a5f5..fc657c1 100644
---
a/ambari-server/src/main/java/org/apache/ambari/server/stack/MasterHostResolver.java
+++
b/ambari-server/src/main/java/org/apache/ambari/server/stack/MasterHostResolver.java
@@ -132,7 +132,7 @@ public class MasterHostResolver {
return filterHosts(hostsType, serviceName, componentName);
}
-Map pair = getNameNodePair();
+Map pair = getNameNodePair(componentHosts);
if (pair != null) {
hostsType.master = pair.containsKey(Status.ACTIVE) ?
pair.get(Status.ACTIVE) : null;
hostsType.secondary = pair.containsKey(Status.STANDBY) ?
pair.get(Status.STANDBY) : null;
@@ -273,7 +273,7 @@ public class MasterHostResolver {
* one active and one standby host were found, otherwise, return null.
* The hostnames are returned in lowercase.
*/
- private Map getNameNodePair() {
+ private Map getNameNodePair(Set componentHosts)
throws AmbariException {
Map stateToHost = new HashMap<>();
Cluster cluster = getCluster();
@@ -307,6 +307,13 @@ public class MasterHostResolver {
throw new MalformedURLException("Could not parse host and port from
" + value);
}
+if (!componentHosts.contains(hp.host)){
+ //This may happen when NN HA is configured on dual network card
machines with public/private FQDNs.
+ LOG.error(
+ String.format(
+ "Hadoop NameNode HA configuration {0} contains host {1} that
does not exist in the NameNode hosts list {3}",
+ key, hp.host, componentHosts.toString()));
+}
String state = queryJmxBeanValue(hp.host, hp.port,
"Hadoop:service=NameNode,name=NameNodeStatus", "State", true, encrypted);
if (null != state && (state.equalsIgnoreCase(Status.ACTIVE.toString())
|| state.equalsIgnoreCase(Status.STANDBY.toString( {
ambari git commit: AMBARI-21281 Code refactoring: rename RU_TASKS Stagewrapper type to upgrade tasks (dili)
Repository: ambari
Updated Branches:
refs/heads/trunk 597d003d4 -> 34b1e5f4b
AMBARI-21281 Code refactoring: rename RU_TASKS Stagewrapper type to upgrade
tasks (dili)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/34b1e5f4
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/34b1e5f4
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/34b1e5f4
Branch: refs/heads/trunk
Commit: 34b1e5f4bb1a3aee03cee31dfd51f57e6480b4ce
Parents: 597d003
Author: Di Li
Authored: Tue Jun 20 08:56:23 2017 -0400
Committer: Di Li
Committed: Tue Jun 20 08:56:23 2017 -0400
--
.../server/controller/internal/UpgradeResourceProvider.java | 4 ++--
.../ambari/server/state/stack/upgrade/ClusterGrouping.java | 4 ++--
.../apache/ambari/server/state/stack/upgrade/ExecuteTask.java| 2 +-
.../org/apache/ambari/server/state/stack/upgrade/Grouping.java | 2 +-
.../apache/ambari/server/state/stack/upgrade/StageWrapper.java | 2 +-
.../server/controller/internal/UpgradeResourceProviderTest.java | 2 +-
6 files changed, 8 insertions(+), 8 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/34b1e5f4/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/UpgradeResourceProvider.java
--
diff --git
a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/UpgradeResourceProvider.java
b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/UpgradeResourceProvider.java
index 2f6ffc1..22858dd 100644
---
a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/UpgradeResourceProvider.java
+++
b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/UpgradeResourceProvider.java
@@ -176,7 +176,7 @@ public class UpgradeResourceProvider extends
AbstractControllerResourceProvider
/**
* The role that will be used when creating HRC's for the type
- * {@link StageWrapper.Type#RU_TASKS}.
+ * {@link StageWrapper.Type#UPGRADE_TASKS}.
*/
protected static final String EXECUTE_TASK_ROLE = "ru_execute_tasks";
@@ -828,7 +828,7 @@ public class UpgradeResourceProvider extends
AbstractControllerResourceProvider
makeCommandStage(context, request, effectiveRepositoryVersion, entity,
wrapper, skippable,
supportsAutoSkipOnFailure, allowRetry);
break;
- case RU_TASKS:
+ case UPGRADE_TASKS:
makeActionStage(context, request, effectiveRepositoryVersion, entity,
wrapper, skippable,
supportsAutoSkipOnFailure, allowRetry);
break;
http://git-wip-us.apache.org/repos/asf/ambari/blob/34b1e5f4/ambari-server/src/main/java/org/apache/ambari/server/state/stack/upgrade/ClusterGrouping.java
--
diff --git
a/ambari-server/src/main/java/org/apache/ambari/server/state/stack/upgrade/ClusterGrouping.java
b/ambari-server/src/main/java/org/apache/ambari/server/state/stack/upgrade/ClusterGrouping.java
index 8e59602..fa988c3 100644
---
a/ambari-server/src/main/java/org/apache/ambari/server/state/stack/upgrade/ClusterGrouping.java
+++
b/ambari-server/src/main/java/org/apache/ambari/server/state/stack/upgrade/ClusterGrouping.java
@@ -296,7 +296,7 @@ public class ClusterGrouping extends Grouping {
}
return new StageWrapper(
-StageWrapper.Type.RU_TASKS,
+StageWrapper.Type.UPGRADE_TASKS,
execution.title,
new TaskWrapper(service, component, realHosts, et));
}
@@ -313,7 +313,7 @@ public class ClusterGrouping extends Grouping {
}
return new StageWrapper(
- StageWrapper.Type.RU_TASKS,
+ StageWrapper.Type.UPGRADE_TASKS,
execution.title,
new TaskWrapper(service, component, hostNames, et));
}
http://git-wip-us.apache.org/repos/asf/ambari/blob/34b1e5f4/ambari-server/src/main/java/org/apache/ambari/server/state/stack/upgrade/ExecuteTask.java
--
diff --git
a/ambari-server/src/main/java/org/apache/ambari/server/state/stack/upgrade/ExecuteTask.java
b/ambari-server/src/main/java/org/apache/ambari/server/state/stack/upgrade/ExecuteTask.java
index 960a04c..11c42c2 100644
---
a/ambari-server/src/main/java/org/apache/ambari/server/state/stack/upgrade/ExecuteTask.java
+++
b/ambari-server/src/main/java/org/apache/ambari/server/state/stack/upgrade/ExecuteTask.java
@@ -68,7 +68,7 @@ public class ExecuteTask extends Task {
@Override
public StageWrapper.Type getStageWrapperType() {
-return StageWrapper.Type.RU_TASKS;
+return StageWrapper.Type.UPGRADE_TASKS;
}
@Override
http://git-wip-us.ap
ambari git commit: AMBARI-21218 Enable Kerberos UI is blank the first time opens it (dili)
Repository: ambari
Updated Branches:
refs/heads/trunk d97aa1dfc -> 2bea1205e
AMBARI-21218 Enable Kerberos UI is blank the first time opens it (dili)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/2bea1205
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/2bea1205
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/2bea1205
Branch: refs/heads/trunk
Commit: 2bea1205e213db7fc35fc9a0aac0453bbdeaa417
Parents: d97aa1d
Author: Di Li
Authored: Fri Jun 9 16:37:40 2017 -0400
Committer: Di Li
Committed: Fri Jun 9 16:37:40 2017 -0400
--
.../app/controllers/main/admin/stack_and_upgrade_controller.js | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/2bea1205/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 a676f7429..3483b29 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
@@ -1863,7 +1863,7 @@ App.MainAdminStackAndUpgradeController =
Em.Controller.extend(App.LocalStorage,
* get the installed repositories of HDP from server
*/
loadRepositories: function () {
-if (App.router.get('clusterController.isLoaded')) {
+if (App.router.get('clusterController.isLoaded') &&
App.get('currentStackVersion')) {
var nameVersionCombo = App.get('currentStackVersion');
var stackName = nameVersionCombo.split('-')[0];
var stackVersion = nameVersionCombo.split('-')[1];
ambari git commit: AMBARI-21213 Consolidate UI for the "Loading..." text (dili)
Repository: ambari
Updated Branches:
refs/heads/trunk 29f750894 -> d97aa1dfc
AMBARI-21213 Consolidate UI for the "Loading..." text (dili)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/d97aa1df
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/d97aa1df
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/d97aa1df
Branch: refs/heads/trunk
Commit: d97aa1dfc5c238544b65fcd67534de64aff556a2
Parents: 29f7508
Author: Di Li
Authored: Fri Jun 9 15:43:57 2017 -0400
Committer: Di Li
Committed: Fri Jun 9 15:43:57 2017 -0400
--
.../main/admin/highAvailability/progress_popup_controller.js | 2 +-
ambari-web/app/messages.js| 3 ---
ambari-web/app/templates/main.hbs | 2 +-
ambari-web/app/utils/ajax/ajax.js | 2 +-
.../app/views/common/configs/service_config_container_view.js | 2 +-
ambari-web/app/views/loading.js | 2 +-
ambari-web/app/views/main/alerts/definition_details_view.js | 2 +-
ambari-web/test/views/main/alerts/definition_details_view_test.js | 2 +-
8 files changed, 7 insertions(+), 10 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/d97aa1df/ambari-web/app/controllers/main/admin/highAvailability/progress_popup_controller.js
--
diff --git
a/ambari-web/app/controllers/main/admin/highAvailability/progress_popup_controller.js
b/ambari-web/app/controllers/main/admin/highAvailability/progress_popup_controller.js
index 7231e5c..4cbe59b 100644
---
a/ambari-web/app/controllers/main/admin/highAvailability/progress_popup_controller.js
+++
b/ambari-web/app/controllers/main/admin/highAvailability/progress_popup_controller.js
@@ -83,7 +83,7 @@ App.HighAvailabilityProgressPopupController =
Ember.Controller.extend({
initPopup: function (popupTitle, requestIds, progressController,
showSpinner, stageId) {
if (showSpinner) {
var loadingPopup = App.ModalPopup.show({
-header: Em.I18n.t('jobs.loadingTasks'),
+header: Em.I18n.t('common.loading.eclipses'),
primary: false,
secondary: false,
bodyClass: Ember.View.extend({
http://git-wip-us.apache.org/repos/asf/ambari/blob/d97aa1df/ambari-web/app/messages.js
--
diff --git a/ambari-web/app/messages.js b/ambari-web/app/messages.js
index 6f317a3..faad84c 100644
--- a/ambari-web/app/messages.js
+++ b/ambari-web/app/messages.js
@@ -30,7 +30,6 @@ Em.I18n.translations = {
'Alternatively login as an Ambari local user using the local login
page.' +
'{0}',
- 'app.loadingPlaceholder': 'Loading...',
'app.versionMismatchAlert.title': 'Ambari Server / Web Client Version
Mismatch',
'app.versionMismatchAlert.body': 'Ambari Server and Web Client versions do
not match: ' +
'Ambari Server: {0}' +
@@ -3169,9 +3168,7 @@ Em.I18n.translations = {
'menu.item.views':'',
'menu.item.views.noViews':'No Views',
- 'bulkOperation.loading': 'Loading...',
'jobs.nothingToShow': 'No jobs to display',
- 'jobs.loadingTasks': 'Loading...',
'jobs.error.ats.down': 'Jobs data cannot be shown since YARN App Timeline
Server is not running.',
'jobs.error.400': 'Unable to load data.',
'jobs.table.custom.date.am':'AM',
http://git-wip-us.apache.org/repos/asf/ambari/blob/d97aa1df/ambari-web/app/templates/main.hbs
--
diff --git a/ambari-web/app/templates/main.hbs
b/ambari-web/app/templates/main.hbs
index bf6fa56..a1ba86a 100644
--- a/ambari-web/app/templates/main.hbs
+++ b/ambari-web/app/templates/main.hbs
@@ -22,7 +22,7 @@
{{else}}
{{#unless isClusterDataLoaded}}
-{{t app.loadingPlaceholder}}
+{{t common.loading.eclipses}}
http://git-wip-us.apache.org/repos/asf/ambari/blob/d97aa1df/ambari-web/app/utils/ajax/ajax.js
--
diff --git a/ambari-web/app/utils/ajax/ajax.js
b/ambari-web/app/utils/ajax/ajax.js
index 492a216..c595181 100644
--- a/ambari-web/app/utils/ajax/ajax.js
+++ b/ambari-web/app/utils/ajax/ajax.js
@@ -3131,7 +3131,7 @@ var ajax = Em.Object.extend({
if(config.hasOwnProperty("showLoadingPopup") && config.showLoadingPopup
=== true) {
loadingPopupTimeout = setTimeout(function() {
loadingPo
ambari git commit: AMBARI-21197 Disable Kerberos UI step by step panel misalign with the Complete button at the bottom of the page (dili)
Repository: ambari
Updated Branches:
refs/heads/trunk 7e3641eba -> 9c302dcd2
AMBARI-21197 Disable Kerberos UI step by step panel misalign with the Complete
button at the bottom of the page (dili)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/9c302dcd
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/9c302dcd
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/9c302dcd
Branch: refs/heads/trunk
Commit: 9c302dcd237af0ba9b5099ddc3bf7b94e29496cd
Parents: 7e3641e
Author: Di Li
Authored: Thu Jun 8 13:21:06 2017 -0400
Committer: Di Li
Committed: Thu Jun 8 13:21:06 2017 -0400
--
ambari-web/app/templates/common/progress.hbs | 4
ambari-web/app/views/main/admin/kerberos/disable_view.js | 3 ++-
2 files changed, 6 insertions(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/9c302dcd/ambari-web/app/templates/common/progress.hbs
--
diff --git a/ambari-web/app/templates/common/progress.hbs
b/ambari-web/app/templates/common/progress.hbs
index ab59328..417498a 100644
--- a/ambari-web/app/templates/common/progress.hbs
+++ b/ambari-web/app/templates/common/progress.hbs
@@ -15,7 +15,11 @@
* See the License for the specific language governing permissions and
* limitations under the License.
}}
+{{#if view.disableKerberos}}
+
+{{else}}
+{{/if}}
{{view.headerTitle}}
{{{view.notice}}}
http://git-wip-us.apache.org/repos/asf/ambari/blob/9c302dcd/ambari-web/app/views/main/admin/kerberos/disable_view.js
--
diff --git a/ambari-web/app/views/main/admin/kerberos/disable_view.js
b/ambari-web/app/views/main/admin/kerberos/disable_view.js
index f7b3527..c3f8902 100644
--- a/ambari-web/app/views/main/admin/kerberos/disable_view.js
+++ b/ambari-web/app/views/main/admin/kerberos/disable_view.js
@@ -37,6 +37,7 @@ App.KerberosDisableView =
App.KerberosProgressPageView.extend({
msgColor: 'alert-info',
- isSimpleModal: true
+ isSimpleModal: true,
+ disableKerberos: true
});
ambari git commit: AMBARI-21161 Able to safe guard Ambari server against circular dependencies in role command order (dili)
Repository: ambari
Updated Branches:
refs/heads/trunk 1586a1a92 -> acb2f9896
AMBARI-21161 Able to safe guard Ambari server against circular dependencies in
role command order (dili)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/acb2f989
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/acb2f989
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/acb2f989
Branch: refs/heads/trunk
Commit: acb2f9896e55db202f5b054565d09c0e598011ed
Parents: 1586a1a
Author: Di Li
Authored: Wed Jun 7 12:26:47 2017 -0400
Committer: Di Li
Committed: Wed Jun 7 12:26:47 2017 -0400
--
.../ambari/server/stageplanner/RoleGraph.java | 49 -
.../server/stageplanner/TestStagePlanner.java | 197 +--
.../stacks/HDP/2.0.6.1/role_command_order.json | 101 ++
3 files changed, 241 insertions(+), 106 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/acb2f989/ambari-server/src/main/java/org/apache/ambari/server/stageplanner/RoleGraph.java
--
diff --git
a/ambari-server/src/main/java/org/apache/ambari/server/stageplanner/RoleGraph.java
b/ambari-server/src/main/java/org/apache/ambari/server/stageplanner/RoleGraph.java
index 024a5e1..d6d26c9 100644
---
a/ambari-server/src/main/java/org/apache/ambari/server/stageplanner/RoleGraph.java
+++
b/ambari-server/src/main/java/org/apache/ambari/server/stageplanner/RoleGraph.java
@@ -19,10 +19,12 @@ package org.apache.ambari.server.stageplanner;
import java.util.ArrayList;
import java.util.HashMap;
+import java.util.Iterator;
import java.util.List;
import java.util.Map;
import java.util.TreeMap;
+import org.apache.ambari.server.AmbariException;
import org.apache.ambari.server.Role;
import org.apache.ambari.server.RoleCommand;
import org.apache.ambari.server.actionmanager.CommandExecutionType;
@@ -165,10 +167,15 @@ public class RoleGraph {
* Returns a list of stages that need to be executed one after another
* to execute the DAG generated in the last {@link #build(Stage)} call.
*/
- public List getStages() {
+ public List getStages() throws AmbariException {
long initialStageId = initialStage.getStageId();
List stageList = new ArrayList<>();
List firstStageNodes = new ArrayList<>();
+if(!graph.isEmpty()){
+ LOG.info("Detecting cycle graphs");
+ LOG.info(stringifyGraph());
+ breakCycleGraph();
+}
while (!graph.isEmpty()) {
if (LOG.isDebugEnabled()) {
LOG.debug(stringifyGraph());
@@ -313,4 +320,44 @@ public class RoleGraph {
}
return builder.toString();
}
+
+ /**
+ * Cycle graphs indicate circular dependencies such as the following example
+ * that can cause Ambari enter an infinite loop while building stages.
+ * (DATANODE, START, 2) --> (NAMENODE, START, 2) --> (SECONDARY_NAMENODE,
START, 3)
+ * (HDFS_CLIENT, INSTALL, 0) --> (DATANODE, START, 2) --> (NAMENODE,
START, 2) --> (SECONDARY_NAMENODE, START, 3)
+ * (NAMENODE, START, 2) --> (DATANODE, START, 2) --> (SECONDARY_NAMENODE,
START, 3)
+ * (SECONDARY_NAMENODE, START, 3)
+ * It is important to safe guard against cycle graphs,
+ * when Ambari supports mpacks, custom services and service level role
command order.
+ * */
+ public void breakCycleGraph() throws AmbariException{
+List edges = new ArrayList();
+for (String role : graph.keySet()){
+ RoleGraphNode fromNode = graph.get(role);
+ String fnRole = fromNode.getRole().name();
+ String fnCommand = fromNode.getCommand().name();
+
+ Iterator it = fromNode.getEdges().iterator();
+ while(it.hasNext()){
+RoleGraphNode toNode = it.next();
+String tnRole = toNode.getRole().name();
+String tnCommand = toNode.getCommand().name();
+//Check if the reversed edge exists in the list already
+//If the edit exists, print an error message and break the edge
+String format = "%s:%s --> %s:%s";
+String edge = String.format(format, fnRole, fnCommand, tnRole,
tnCommand);
+String reversedEdge = String.format(format, tnRole, tnCommand, fnRole,
fnCommand);
+if (edges.contains(reversedEdge)){
+ String msg = String.format(
+ "Circular dependencies detected between %s and %s for %s. "
+ + "%s already exists in the role command order.", fnRole,
tnRole, edge, reversedEdge);
+ LOG.error(msg);
+ throw new AmbariException(msg);
+} else {
+ edges.add(edge);
+}
+ }
+}
+ }
}
http://git-wip-us.apache.org/repos/asf/ambari/blob/acb2f989/ambari-s
ambari git commit: AMBARI-21130 Delete view privileges from the Users page (Anita Jebaraj via dili)
Repository: ambari
Updated Branches:
refs/heads/trunk dfb5d3920 -> 49605daef
AMBARI-21130 Delete view privileges from the Users page (Anita Jebaraj via dili)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/49605dae
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/49605dae
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/49605dae
Branch: refs/heads/trunk
Commit: 49605daef3f5404b6be59a051c268b56cb81b291
Parents: dfb5d39
Author: Di Li
Authored: Thu Jun 1 16:14:27 2017 -0400
Committer: Di Li
Committed: Thu Jun 1 16:14:27 2017 -0400
--
.../app/scripts/controllers/users/UsersShowCtrl.js | 13 +
.../resources/ui/admin-web/app/views/users/show.html | 5 -
2 files changed, 17 insertions(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/49605dae/ambari-admin/src/main/resources/ui/admin-web/app/scripts/controllers/users/UsersShowCtrl.js
--
diff --git
a/ambari-admin/src/main/resources/ui/admin-web/app/scripts/controllers/users/UsersShowCtrl.js
b/ambari-admin/src/main/resources/ui/admin-web/app/scripts/controllers/users/UsersShowCtrl.js
index 0706620..200872e 100644
---
a/ambari-admin/src/main/resources/ui/admin-web/app/scripts/controllers/users/UsersShowCtrl.js
+++
b/ambari-admin/src/main/resources/ui/admin-web/app/scripts/controllers/users/UsersShowCtrl.js
@@ -184,6 +184,18 @@ angular.module('ambariAdminConsole')
}
};
+ $scope.removePrivilege = function(name, privilege) {
+var privilegeObject = {
+id: privilege.privilege_id,
+view_name: privilege.view_name,
+version: privilege.version,
+instance_name: name
+};
+View.deletePrivilege(privilegeObject).then(function() {
+ loadPrivileges();
+});
+ };
+
$scope.deleteUser = function() {
ConfirmationModal.show(
$t('common.delete', {
@@ -257,6 +269,7 @@ angular.module('ambariAdminConsole')
privileges.views[privilege.instance_name] =
privileges.views[privilege.instance_name] || { privileges:[]};
privileges.views[privilege.instance_name].version =
privilege.version;
privileges.views[privilege.instance_name].view_name =
privilege.view_name;
+ privileges.views[privilege.instance_name].privilege_id =
privilege.privilege_id;
if
(privileges.views[privilege.instance_name].privileges.indexOf(privilege.permission_label)
== -1) {
privileges.views[privilege.instance_name].privileges.push(privilege.permission_label);
}
http://git-wip-us.apache.org/repos/asf/ambari/blob/49605dae/ambari-admin/src/main/resources/ui/admin-web/app/views/users/show.html
--
diff --git
a/ambari-admin/src/main/resources/ui/admin-web/app/views/users/show.html
b/ambari-admin/src/main/resources/ui/admin-web/app/views/users/show.html
index 7abdf05..f965c5d 100644
--- a/ambari-admin/src/main/resources/ui/admin-web/app/views/users/show.html
+++ b/ambari-admin/src/main/resources/ui/admin-web/app/views/users/show.html
@@ -105,6 +105,9 @@
{{item | translate}}{{$last ? '' : ',
'}}
+
+
+
{{'common.alerts.noPrivileges' |
translate: '{term: constants.view}'}}
@@ -116,4 +119,4 @@
-
\ No newline at end of file
+
ambari git commit: AMBARI-20984 Be able to include stack repos in blueprint (dili)
Repository: ambari
Updated Branches:
refs/heads/trunk 4fcdaae4c -> cd769e2e7
AMBARI-20984 Be able to include stack repos in blueprint (dili)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/cd769e2e
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/cd769e2e
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/cd769e2e
Branch: refs/heads/trunk
Commit: cd769e2e79de11519b333aa86c4c54e68be40996
Parents: 4fcdaae
Author: Di Li
Authored: Tue May 23 12:03:53 2017 -0400
Committer: Di Li
Committed: Tue May 23 12:03:53 2017 -0400
--
.../server/api/services/AmbariMetaInfo.java | 21
.../ambari/server/topology/Blueprint.java | 3 +
.../ambari/server/topology/BlueprintImpl.java | 33 +-
.../server/topology/RepositorySetting.java | 116 +++
.../apache/ambari/server/topology/Setting.java | 2 +
.../ambari/server/topology/TopologyManager.java | 49 +++-
.../ClusterDeployWithStartOnlyTest.java | 5 +-
...InstallWithoutStartOnComponentLevelTest.java | 5 +-
.../ClusterInstallWithoutStartTest.java | 7 +-
.../ambari/server/topology/SettingTest.java | 18 +++
.../server/topology/TopologyManagerTest.java| 5 +-
11 files changed, 250 insertions(+), 14 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/cd769e2e/ambari-server/src/main/java/org/apache/ambari/server/api/services/AmbariMetaInfo.java
--
diff --git
a/ambari-server/src/main/java/org/apache/ambari/server/api/services/AmbariMetaInfo.java
b/ambari-server/src/main/java/org/apache/ambari/server/api/services/AmbariMetaInfo.java
index c655c62..b509e97 100644
---
a/ambari-server/src/main/java/org/apache/ambari/server/api/services/AmbariMetaInfo.java
+++
b/ambari-server/src/main/java/org/apache/ambari/server/api/services/AmbariMetaInfo.java
@@ -934,6 +934,27 @@ public class AmbariMetaInfo {
}
}
+ public void createRepo(String stackName, String stackVersion, String osType,
String repoId, String baseUrl, String mirrorsList) throws AmbariException {
+if (!stackRoot.exists()) {
+ throw new StackAccessException("Create repo - Stack root does not
exist.");
+}
+
+if (null != baseUrl) {
+ createRepoInMetaInfo(stackName, stackVersion, osType, repoId, baseUrl,
REPOSITORY_XML_PROPERTY_BASEURL);
+} else if (null != mirrorsList) {
+ createRepoInMetaInfo(stackName, stackVersion, osType, repoId,
mirrorsList, REPOSITORY_XML_PROPERTY_MIRRORSLIST);
+}
+ }
+
+ private void createRepoInMetaInfo(String stackName, String stackVersion,
String osType, String repoId, String value, String repositoryXmlProperty) {
+String metaKey = generateRepoMetaKey(stackName, stackVersion, osType,
+repoId, repositoryXmlProperty);
+MetainfoEntity entity = new MetainfoEntity();
+entity.setMetainfoName(metaKey);
+entity.setMetainfoValue(value);
+metaInfoDAO.create(entity);
+ }
+
public File getStackRoot() {
return stackRoot;
}
http://git-wip-us.apache.org/repos/asf/ambari/blob/cd769e2e/ambari-server/src/main/java/org/apache/ambari/server/topology/Blueprint.java
--
diff --git
a/ambari-server/src/main/java/org/apache/ambari/server/topology/Blueprint.java
b/ambari-server/src/main/java/org/apache/ambari/server/topology/Blueprint.java
index 139a1ee..99e1c75 100644
---
a/ambari-server/src/main/java/org/apache/ambari/server/topology/Blueprint.java
+++
b/ambari-server/src/main/java/org/apache/ambari/server/topology/Blueprint.java
@@ -19,6 +19,7 @@
package org.apache.ambari.server.topology;
import java.util.Collection;
+import java.util.List;
import java.util.Map;
import org.apache.ambari.server.controller.internal.Stack;
@@ -167,4 +168,6 @@ public interface Blueprint {
* @return entity representation of the blueprint
*/
BlueprintEntity toEntity();
+
+ List getRepositorySettings();
}
http://git-wip-us.apache.org/repos/asf/ambari/blob/cd769e2e/ambari-server/src/main/java/org/apache/ambari/server/topology/BlueprintImpl.java
--
diff --git
a/ambari-server/src/main/java/org/apache/ambari/server/topology/BlueprintImpl.java
b/ambari-server/src/main/java/org/apache/ambari/server/topology/BlueprintImpl.java
index 826e4e5..415efd8 100644
---
a/ambari-server/src/main/java/org/apache/ambari/server/topology/BlueprintImpl.java
+++
b/ambari-server/src/main/java/org/apache/ambari/server/topology/BlueprintImpl.java
@@ -23,6 +23,7 @@ import java.util.ArrayList;
import java.util.Collection;
import java.util.HashMap;
import java.util.HashSet;
+import java.util.List;
import
ambari git commit: AMBARI-20903 RepoVersion parsing error should be more specific (dili)
Repository: ambari
Updated Branches:
refs/heads/trunk 2b146d9c4 -> 6e2d32196
AMBARI-20903 RepoVersion parsing error should be more specific (dili)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/6e2d3219
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/6e2d3219
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/6e2d3219
Branch: refs/heads/trunk
Commit: 6e2d32196b065530263b1468d50d710db8b8eca5
Parents: 2b146d9
Author: Di Li
Authored: Tue May 2 14:25:18 2017 -0400
Committer: Di Li
Committed: Tue May 2 14:25:18 2017 -0400
--
.../ambari/server/orm/entities/RepositoryVersionEntity.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/6e2d3219/ambari-server/src/main/java/org/apache/ambari/server/orm/entities/RepositoryVersionEntity.java
--
diff --git
a/ambari-server/src/main/java/org/apache/ambari/server/orm/entities/RepositoryVersionEntity.java
b/ambari-server/src/main/java/org/apache/ambari/server/orm/entities/RepositoryVersionEntity.java
index d3705f3..f5d669e 100644
---
a/ambari-server/src/main/java/org/apache/ambari/server/orm/entities/RepositoryVersionEntity.java
+++
b/ambari-server/src/main/java/org/apache/ambari/server/orm/entities/RepositoryVersionEntity.java
@@ -249,8 +249,8 @@ public class RepositoryVersionEntity {
try {
return
repositoryVersionHelperProvider.get().parseOperatingSystems(operatingSystems);
} catch (Exception ex) {
-// Should never happen as we validate json before storing it to DB
-LOG.error("Could not parse operating systems json stored in database:"
+ operatingSystems, ex);
+String msg = String.format("Failed to parse repository from OS/Repo
information in the database: %s. Required fields: repo_name, repo_id,
base_url", operatingSystems);
+LOG.error(msg, ex);
}
}
return Collections.emptyList();
ambari git commit: AMBARI-20822 Ambari Agent needs to handle custom version number like 1.2.3.4_Company in its Controller code (dili)
Repository: ambari
Updated Branches:
refs/heads/trunk 26484a8f7 -> 04a539279
AMBARI-20822 Ambari Agent needs to handle custom version number like
1.2.3.4_Company in its Controller code (dili)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/04a53927
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/04a53927
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/04a53927
Branch: refs/heads/trunk
Commit: 04a5392791548a5341b705f869094adc0b5f58fa
Parents: 26484a8
Author: Di Li
Authored: Tue Apr 25 12:01:01 2017 -0400
Committer: Di Li
Committed: Tue Apr 25 12:01:01 2017 -0400
--
.../src/main/python/ambari_agent/Controller.py| 18 ++
.../test/python/ambari_agent/TestController.py| 14 ++
2 files changed, 28 insertions(+), 4 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/04a53927/ambari-agent/src/main/python/ambari_agent/Controller.py
--
diff --git a/ambari-agent/src/main/python/ambari_agent/Controller.py
b/ambari-agent/src/main/python/ambari_agent/Controller.py
index 78b5c0c..0297f74 100644
--- a/ambari-agent/src/main/python/ambari_agent/Controller.py
+++ b/ambari-agent/src/main/python/ambari_agent/Controller.py
@@ -29,6 +29,7 @@ import threading
import urllib2
import pprint
from random import randint
+import re
import subprocess
import functools
@@ -587,7 +588,9 @@ class Controller(threading.Thread):
Stack Upgrade.
"""
try:
- if compare_versions(self.version, "2.1.2") >= 0:
+ version = self.get_version()
+ logger.debug("Ambari Agent version {0}".format(version))
+ if compare_versions(version, "2.1.2") >= 0:
source_file = "/etc/hadoop/conf/dfs_data_dir_mount.hist"
destination_file =
"/var/lib/ambari-agent/data/datanode/dfs_data_dir_mount.hist"
if os.path.exists(source_file) and not
os.path.exists(destination_file):
@@ -601,9 +604,16 @@ class Controller(threading.Thread):
return_code = subprocess.call(command, shell=True)
logger.info("Return code: %d" % return_code)
except Exception, e:
- logger.info("Exception in move_data_dir_mount_file(). Error:
{0}".format(str(e)))
-
-
+ logger.error("Exception in move_data_dir_mount_file(). Error:
{0}".format(str(e)))
+
+ def get_version(self):
+version = self.version
+matches = re.findall(r"[\d+.]+",version)
+if not matches:
+ logger.warning("No version match result, use original version
{0}".format(version))
+ return version
+else:
+ return matches[0]
def main(argv=None):
# Allow Ctrl-C
http://git-wip-us.apache.org/repos/asf/ambari/blob/04a53927/ambari-agent/src/test/python/ambari_agent/TestController.py
--
diff --git a/ambari-agent/src/test/python/ambari_agent/TestController.py
b/ambari-agent/src/test/python/ambari_agent/TestController.py
index 7f5d451..20da81f 100644
--- a/ambari-agent/src/test/python/ambari_agent/TestController.py
+++ b/ambari-agent/src/test/python/ambari_agent/TestController.py
@@ -416,6 +416,20 @@ class TestController(unittest.TestCase):
exceptionMessage, str(e))
+ def test_getVersion(self):
+self.controller.version = "1.2.3.4_MyAgent"
+version = self.controller.get_version()
+self.assertEquals('1.2.3.4', version)
+self.controller.version = "1.2.3-MyAgent"
+version = self.controller.get_version()
+self.assertEquals('1.2.3', version)
+self.controller.version = "11.2.3-MyAgent"
+version = self.controller.get_version()
+self.assertEquals('11.2.3', version)
+self.controller.version = "11.2.13.10_MyAgent"
+version = self.controller.get_version()
+self.assertEquals('11.2.13.10', version)
+
@patch.object(ExitHelper, "exit")
@patch.object(threading._Event, "wait")
@patch("time.sleep")
ambari git commit: AMBARI-20784 Able to hide the "Why public repo not selected" when no stacks have repoinfo.xml with the "latest" section (dili)
Repository: ambari
Updated Branches:
refs/heads/trunk cebbff057 -> f020edc85
AMBARI-20784 Able to hide the "Why public repo not selected" when no stacks
have repoinfo.xml with the "latest" section (dili)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/f020edc8
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/f020edc8
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/f020edc8
Branch: refs/heads/trunk
Commit: f020edc85ad7cb71d47a7eaabc2bc7361dee5d1f
Parents: cebbff0
Author: Di Li
Authored: Thu Apr 20 11:00:13 2017 -0400
Committer: Di Li
Committed: Thu Apr 20 11:00:13 2017 -0400
--
ambari-web/app/controllers/wizard/step1_controller.js | 7 +++
ambari-web/app/mappers/stack_mapper.js| 1 +
ambari-web/app/models/stack.js| 1 +
ambari-web/app/templates/wizard/step1.hbs | 6 --
ambari-web/app/utils/ajax/ajax.js | 2 +-
5 files changed, 14 insertions(+), 3 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/f020edc8/ambari-web/app/controllers/wizard/step1_controller.js
--
diff --git a/ambari-web/app/controllers/wizard/step1_controller.js
b/ambari-web/app/controllers/wizard/step1_controller.js
index 2ac295b..22456af 100644
--- a/ambari-web/app/controllers/wizard/step1_controller.js
+++ b/ambari-web/app/controllers/wizard/step1_controller.js
@@ -63,6 +63,13 @@ App.WizardStep1Controller = Em.Controller.extend({
*/
networkIssuesExist: Em.computed.everyBy('content.stacks', 'stackDefault',
true),
+ /**
+ * No stacks have repo update URL section (aka "latest") defined in
repoinfo.xml
+ *
+ * @type {boolean}
+ */
+ stackRepoUpdateLinkExists: Em.computed.someBy('content.stacks',
'stackRepoUpdateLinkExists', true),
+
optionsToSelect: {
'usePublicRepo': {
index: 0,
http://git-wip-us.apache.org/repos/asf/ambari/blob/f020edc8/ambari-web/app/mappers/stack_mapper.js
--
diff --git a/ambari-web/app/mappers/stack_mapper.js
b/ambari-web/app/mappers/stack_mapper.js
index 4b6a6f8..88ffc73 100644
--- a/ambari-web/app/mappers/stack_mapper.js
+++ b/ambari-web/app/mappers/stack_mapper.js
@@ -28,6 +28,7 @@ App.stackMapper = App.QuickDataMapper.create({
stack_name: 'stack_name',
stack_version: 'stack_version',
stack_default: 'stack_default',
+stack_repo_update_link_exists: 'stack_repo_update_link_exists',
show_available: 'show_available',
type: 'type',
repository_version: 'repository_version',
http://git-wip-us.apache.org/repos/asf/ambari/blob/f020edc8/ambari-web/app/models/stack.js
--
diff --git a/ambari-web/app/models/stack.js b/ambari-web/app/models/stack.js
index dbc2d72..47d1c44 100644
--- a/ambari-web/app/models/stack.js
+++ b/ambari-web/app/models/stack.js
@@ -23,6 +23,7 @@ App.Stack = DS.Model.extend({
stackName: DS.attr('string'),
stackVersion: DS.attr('string'),
stackDefault: DS.attr('boolean'),
+ stackRepoUpdateLinkExists: DS.attr('boolean'),
minJdkVersion: DS.attr('string'),
maxJdkVersion: DS.attr('string'),
repositoryVersion: DS.attr('string'),
http://git-wip-us.apache.org/repos/asf/ambari/blob/f020edc8/ambari-web/app/templates/wizard/step1.hbs
--
diff --git a/ambari-web/app/templates/wizard/step1.hbs
b/ambari-web/app/templates/wizard/step1.hbs
index 769aca3..5faf056 100644
--- a/ambari-web/app/templates/wizard/step1.hbs
+++ b/ambari-web/app/templates/wizard/step1.hbs
@@ -81,8 +81,10 @@
{{! Public Repository radio }}
{{view view.usePublicRepoRadioButton
classNames="display-inline-block" labelIdentifier="use-public-repo"}}
-{{#if networkIssuesExist}}
- {{t
installer.step1.selectUseRepoOptions.public.networkLost}}
+{{#if stackRepoUpdateLinkExists}}
+ {{#if networkIssuesExist}}
+{{t
installer.step1.selectUseRepoOptions.public.networkLost}}
+ {{/if}}
{{/if}}
{{!--Local repo radio--}}
http://git-wip-us.apache.org/repos/asf/ambari/blob/f020edc8/ambari-web/app/utils/ajax/ajax.js
--
diff --git a/ambari-web/app/utils/ajax/ajax.js
ambari git commit: AMBARI-20737 Able to hide the Use Public Repository option on Register Version page on Ambari Admin View (dili)
Repository: ambari
Updated Branches:
refs/heads/trunk 22b114def -> 1941eedb5
AMBARI-20737 Able to hide the Use Public Repository option on Register Version
page on Ambari Admin View (dili)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/1941eedb
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/1941eedb
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/1941eedb
Branch: refs/heads/trunk
Commit: 1941eedb5236013c7ce5477466bb42b837b7be3b
Parents: 22b114d
Author: Di Li
Authored: Mon Apr 17 12:17:27 2017 -0400
Committer: Di Li
Committed: Mon Apr 17 12:17:27 2017 -0400
--
.../stackVersions/StackVersionsCreateCtrl.js | 19 +++
.../ui/admin-web/app/scripts/services/Stack.js | 3 ++-
.../views/stackVersions/stackVersionPage.html| 3 +--
.../VersionDefinitionResourceProvider.java | 4
.../ambari/server/stack/StackManagerTest.java| 12
5 files changed, 38 insertions(+), 3 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/1941eedb/ambari-admin/src/main/resources/ui/admin-web/app/scripts/controllers/stackVersions/StackVersionsCreateCtrl.js
--
diff --git
a/ambari-admin/src/main/resources/ui/admin-web/app/scripts/controllers/stackVersions/StackVersionsCreateCtrl.js
b/ambari-admin/src/main/resources/ui/admin-web/app/scripts/controllers/stackVersions/StackVersionsCreateCtrl.js
index b3c27dc..69c35c0 100644
---
a/ambari-admin/src/main/resources/ui/admin-web/app/scripts/controllers/stackVersions/StackVersionsCreateCtrl.js
+++
b/ambari-admin/src/main/resources/ui/admin-web/app/scripts/controllers/stackVersions/StackVersionsCreateCtrl.js
@@ -29,6 +29,7 @@ angular.module('ambariAdminConsole')
$scope.stackIds = [];
$scope.allVersions = [];
$scope.networkLost = false;
+ $scope.stackRepoUpdateLinkExists = true;
$scope.skipValidation = false;
$scope.useRedhatSatellite = false;
@@ -543,6 +544,23 @@ angular.module('ambariAdminConsole')
})[0];
};
+ /**
+ * Return true if at least one stacks have the repo URL link in the
repoinfo.xml
+ * @return boolean
+ * */
+ $scope.setStackRepoUpdateLinkExists = function (versions) {
+var stackRepoUpdateLinkExists = versions.find(function(_version){
+ return _version.stackRepoUpdateLinkExists;
+});
+
+//Found at least one version with the stack repo update link
+if (stackRepoUpdateLinkExists){
+ $scope.stackRepoUpdateLinkExists = true;
+} else {
+ $scope.stackRepoUpdateLinkExists = false;
+}
+ };
+
$scope.setNetworkIssues = function (versions) {
$scope.networkLost = !versions.find(function(_version){
return !_version.stackDefault;
@@ -576,6 +594,7 @@ angular.module('ambariAdminConsole')
$scope.selectedPublicRepoVersion = $scope.activeStackVersion;
$scope.setVersionSelected($scope.activeStackVersion);
$scope.setNetworkIssues(versions);
+$scope.setStackRepoUpdateLinkExists(versions);
$scope.validateRepoUrl();
$scope.availableStackRepoList = versions.length == 1 ? [] : versions;
}
http://git-wip-us.apache.org/repos/asf/ambari/blob/1941eedb/ambari-admin/src/main/resources/ui/admin-web/app/scripts/services/Stack.js
--
diff --git
a/ambari-admin/src/main/resources/ui/admin-web/app/scripts/services/Stack.js
b/ambari-admin/src/main/resources/ui/admin-web/app/scripts/services/Stack.js
index e028906..b496987 100644
--- a/ambari-admin/src/main/resources/ui/admin-web/app/scripts/services/Stack.js
+++ b/ambari-admin/src/main/resources/ui/admin-web/app/scripts/services/Stack.js
@@ -88,7 +88,7 @@ angular.module('ambariAdminConsole')
},
allPublicStackVersions: function() {
- var url =
'/version_definitions?fields=VersionDefinition/stack_default,operating_systems/repositories/Repositories/*,VersionDefinition/stack_services,VersionDefinition/repository_version'
+
+ var url =
'/version_definitions?fields=VersionDefinition/stack_default,VersionDefinition/stack_repo_update_link_exists,operating_systems/repositories/Repositories/*,VersionDefinition/stack_services,VersionDefinition/repository_version'
+
'&VersionDefinition/show_available=true';
var deferred = $q.defer();
$http.get(Settings.baseUrl + url, {mock: 'version/versions.json'})
@@ -100,6 +100,7 @@ angular.module('ambariAdminConsole')
stackName: version.VersionDefinition.stack_name,
stackVersion: version.VersionDefinition.stack_version,
ambari git commit: AMBARI-20754 get_value_from_jmx constantly prints exception message in retry mechanism, which brings bad user experience (Yuanbo Liu via dili)
Repository: ambari
Updated Branches:
refs/heads/trunk dd3fdc220 -> 22b114def
AMBARI-20754 get_value_from_jmx constantly prints exception message in retry
mechanism, which brings bad user experience (Yuanbo Liu via dili)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/22b114de
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/22b114de
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/22b114de
Branch: refs/heads/trunk
Commit: 22b114defc43858798f6f20211c0d04b440ee7ce
Parents: dd3fdc2
Author: Di Li
Authored: Mon Apr 17 11:36:19 2017 -0400
Committer: Di Li
Committed: Mon Apr 17 11:36:19 2017 -0400
--
.../python/resource_management/libraries/functions/jmx.py | 7 ---
.../libraries/functions/namenode_ha_utils.py | 6 +++---
2 files changed, 7 insertions(+), 6 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/22b114de/ambari-common/src/main/python/resource_management/libraries/functions/jmx.py
--
diff --git
a/ambari-common/src/main/python/resource_management/libraries/functions/jmx.py
b/ambari-common/src/main/python/resource_management/libraries/functions/jmx.py
index 9a4ff5f..dbd0092 100644
---
a/ambari-common/src/main/python/resource_management/libraries/functions/jmx.py
+++
b/ambari-common/src/main/python/resource_management/libraries/functions/jmx.py
@@ -23,7 +23,7 @@ from resource_management.core import shell
from resource_management.core.logger import Logger
from resource_management.libraries.functions.get_user_call_output import
get_user_call_output
-def get_value_from_jmx(qry, property, security_enabled, run_user,
is_https_enabled):
+def get_value_from_jmx(qry, property, security_enabled, run_user,
is_https_enabled, last_retry=True):
try:
if security_enabled:
cmd = ['curl', '--negotiate', '-u', ':', '-s']
@@ -41,5 +41,6 @@ def get_value_from_jmx(qry, property, security_enabled,
run_user, is_https_enabl
data_dict = json.loads(data)
return data_dict["beans"][0][property]
except:
-Logger.logger.exception("Getting jmx metrics from NN failed. URL: " +
str(qry))
-return None
\ No newline at end of file
+if last_retry:
+ Logger.logger.exception("Getting jmx metrics from NN failed. URL: " +
str(qry))
+return None
http://git-wip-us.apache.org/repos/asf/ambari/blob/22b114de/ambari-common/src/main/python/resource_management/libraries/functions/namenode_ha_utils.py
--
diff --git
a/ambari-common/src/main/python/resource_management/libraries/functions/namenode_ha_utils.py
b/ambari-common/src/main/python/resource_management/libraries/functions/namenode_ha_utils.py
index 665a8e4..8a2ff25 100644
---
a/ambari-common/src/main/python/resource_management/libraries/functions/namenode_ha_utils.py
+++
b/ambari-common/src/main/python/resource_management/libraries/functions/namenode_ha_utils.py
@@ -51,7 +51,7 @@ def get_namenode_states(hdfs_site, security_enabled,
run_user, times=10, sleep_t
@retry(times=times, sleep_time=sleep_time, backoff_factor=backoff_factor,
err_class=Fail)
def doRetries(hdfs_site, security_enabled, run_user):
doRetries.attempt += 1
-active_namenodes, standby_namenodes, unknown_namenodes =
get_namenode_states_noretries(hdfs_site, security_enabled, run_user)
+active_namenodes, standby_namenodes, unknown_namenodes =
get_namenode_states_noretries(hdfs_site, security_enabled, run_user,
doRetries.attempt == times)
Logger.info(
"NameNode HA states: active_namenodes = {0}, standby_namenodes = {1},
unknown_namenodes = {2}".format(
active_namenodes, standby_namenodes, unknown_namenodes))
@@ -65,7 +65,7 @@ def get_namenode_states(hdfs_site, security_enabled,
run_user, times=10, sleep_t
doRetries.attempt = 0
return doRetries(hdfs_site, security_enabled, run_user)
-def get_namenode_states_noretries(hdfs_site, security_enabled, run_user):
+def get_namenode_states_noretries(hdfs_site, security_enabled, run_user,
last_retry=True):
"""
return format [('nn1', 'hdfs://hostname1:port1'), ('nn2',
'hdfs://hostname2:port2')] , [], []
"""
@@ -102,7 +102,7 @@ def get_namenode_states_noretries(hdfs_site,
security_enabled, run_user):
jmx_uri = JMX_URI_FRAGMENT.format(protocol, value)
- state = get_value_from_jmx(jmx_uri, 'tag.HAState', security_enabled,
run_user, is_https_enabled)
+ state = get_value_from_jmx(jmx_uri, 'tag.HAState', security_enabled,
run_user, is_ht
ambari git commit: AMBARI-20761 Update zookeeper.connect description (Bharat Viswanadham via dili)
Repository: ambari Updated Branches: refs/heads/trunk 103e49a89 -> dd3fdc220 AMBARI-20761 Update zookeeper.connect description (Bharat Viswanadham via dili) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/dd3fdc22 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/dd3fdc22 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/dd3fdc22 Branch: refs/heads/trunk Commit: dd3fdc220d9ad3b2b723a201ce7aa5d767850a58 Parents: 103e49a Author: Di Li Authored: Mon Apr 17 11:27:32 2017 -0400 Committer: Di Li Committed: Mon Apr 17 11:27:32 2017 -0400 -- .../common-services/KAFKA/0.8.1/configuration/kafka-broker.xml| 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) -- http://git-wip-us.apache.org/repos/asf/ambari/blob/dd3fdc22/ambari-server/src/main/resources/common-services/KAFKA/0.8.1/configuration/kafka-broker.xml -- diff --git a/ambari-server/src/main/resources/common-services/KAFKA/0.8.1/configuration/kafka-broker.xml b/ambari-server/src/main/resources/common-services/KAFKA/0.8.1/configuration/kafka-broker.xml index 96b7750..e270b84 100644 --- a/ambari-server/src/main/resources/common-services/KAFKA/0.8.1/configuration/kafka-broker.xml +++ b/ambari-server/src/main/resources/common-services/KAFKA/0.8.1/configuration/kafka-broker.xml @@ -50,8 +50,7 @@ Zookeeper also allows you to add a "chroot" path which will make all kafka data for this cluster appear under a particular path. This is a way to setup multiple Kafka clusters or other applications on the same zookeeper cluster. To do this give a connection string in the form hostname1:port1,hostname2:port2,hostname3:port3/chroot/path which would put all this cluster's data under the - path /chroot/path. Note that you must create this path yourself prior to starting the broker and consumers must use the - same connection string. + path /chroot/path. Note that consumers must use the same connection string.
ambari git commit: AMBARI-20697 Stack advisor code in 2.3 refactor logic for ranger Kafka Plugin (Bharat Viswanadham via dili)
Repository: ambari
Updated Branches:
refs/heads/trunk 14c1ffd32 -> cfde36c07
AMBARI-20697 Stack advisor code in 2.3 refactor logic for ranger Kafka Plugin
(Bharat Viswanadham via dili)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/cfde36c0
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/cfde36c0
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/cfde36c0
Branch: refs/heads/trunk
Commit: cfde36c077de31dda0802f983602f680afcbce29
Parents: 14c1ffd
Author: Di Li
Authored: Thu Apr 13 17:00:56 2017 -0400
Committer: Di Li
Committed: Thu Apr 13 17:00:56 2017 -0400
--
.../main/resources/stacks/HDP/2.3/services/stack_advisor.py| 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/cfde36c0/ambari-server/src/main/resources/stacks/HDP/2.3/services/stack_advisor.py
--
diff --git
a/ambari-server/src/main/resources/stacks/HDP/2.3/services/stack_advisor.py
b/ambari-server/src/main/resources/stacks/HDP/2.3/services/stack_advisor.py
index 67532c5..eb7389d 100644
--- a/ambari-server/src/main/resources/stacks/HDP/2.3/services/stack_advisor.py
+++ b/ambari-server/src/main/resources/stacks/HDP/2.3/services/stack_advisor.py
@@ -349,10 +349,10 @@ class HDP23StackAdvisor(HDP22StackAdvisor):
ranger_kafka_plugin_enabled =
services["configurations"]["ranger-env"]["properties"]["ranger-kafka-plugin-enabled"]
putKafkaRangerPluginProperty("ranger-kafka-plugin-enabled",
ranger_kafka_plugin_enabled)
-# Determine if the Ranger/Kafka Plugin is enabled
-ranger_plugin_enabled = "RANGER" in servicesList
+
+ranger_plugin_enabled = False
# Only if the RANGER service is installed
-if ranger_plugin_enabled:
+if "RANGER" in servicesList:
# If ranger-kafka-plugin-properties/ranger-kafka-plugin-enabled,
# determine if the Ranger/Kafka plug-in enabled enabled or not
if 'ranger-kafka-plugin-properties' in configurations and \
ambari git commit: AMBARI-19996 Perform Kinit on Kafka Start (Bharat Viswanadham via dili)
Repository: ambari
Updated Branches:
refs/heads/trunk 0c778e77a -> 14c1ffd32
AMBARI-19996 Perform Kinit on Kafka Start (Bharat Viswanadham via dili)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/14c1ffd3
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/14c1ffd3
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/14c1ffd3
Branch: refs/heads/trunk
Commit: 14c1ffd3288742354f17cbf49b6cebfee913a16f
Parents: 0c778e7
Author: Di Li
Authored: Thu Apr 13 16:54:34 2017 -0400
Committer: Di Li
Committed: Thu Apr 13 16:54:34 2017 -0400
--
.../KAFKA/0.8.1/package/scripts/kafka_broker.py| 6 ++
1 file changed, 6 insertions(+)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/14c1ffd3/ambari-server/src/main/resources/common-services/KAFKA/0.8.1/package/scripts/kafka_broker.py
--
diff --git
a/ambari-server/src/main/resources/common-services/KAFKA/0.8.1/package/scripts/kafka_broker.py
b/ambari-server/src/main/resources/common-services/KAFKA/0.8.1/package/scripts/kafka_broker.py
index 96a8293..81715f9 100644
---
a/ambari-server/src/main/resources/common-services/KAFKA/0.8.1/package/scripts/kafka_broker.py
+++
b/ambari-server/src/main/resources/common-services/KAFKA/0.8.1/package/scripts/kafka_broker.py
@@ -77,6 +77,12 @@ class KafkaBroker(Script):
import params
env.set_params(params)
self.configure(env, upgrade_type=upgrade_type)
+
+if params.security_enabled:
+ if params.version and check_stack_feature(StackFeature.KAFKA_KERBEROS,
params.version):
+kafka_kinit_cmd = format("{kinit_path_local} -kt {kafka_keytab_path}
{kafka_jaas_principal};")
+Execute(kafka_kinit_cmd, user=params.kafka_user)
+
if params.is_supported_kafka_ranger:
setup_ranger_kafka() #Ranger Kafka Plugin related call
daemon_cmd = format('source {params.conf_dir}/kafka-env.sh ;
{params.kafka_bin} start')
ambari git commit: AMBARI-20746 Change to warning log if Ambari doesn't have baseurls for Install Packages step before EU/RU (dili)
Repository: ambari
Updated Branches:
refs/heads/trunk 273dfcac0 -> b9c82add7
AMBARI-20746 Change to warning log if Ambari doesn't have baseurls for Install
Packages step before EU/RU (dili)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/b9c82add
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/b9c82add
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/b9c82add
Branch: refs/heads/trunk
Commit: b9c82add7fbe5ef652da1a47a0276b63a279470c
Parents: 273dfca
Author: Di Li
Authored: Thu Apr 13 13:15:56 2017 -0400
Committer: Di Li
Committed: Thu Apr 13 13:15:56 2017 -0400
--
.../internal/ClusterStackVersionResourceProvider.java | 3 +++
.../controller/internal/HostStackVersionResourceProvider.java | 5 +
.../main/resources/custom_actions/scripts/install_packages.py | 2 +-
3 files changed, 9 insertions(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/b9c82add/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ClusterStackVersionResourceProvider.java
--
diff --git
a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ClusterStackVersionResourceProvider.java
b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ClusterStackVersionResourceProvider.java
index 92e72ed..1d278d0 100644
---
a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ClusterStackVersionResourceProvider.java
+++
b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ClusterStackVersionResourceProvider.java
@@ -610,6 +610,9 @@ public class ClusterStackVersionResourceProvider extends
AbstractControllerResou
osFamily, repoVersion.getVersion(), stackId));
}
+if (repoInfo.isEmpty()){
+ LOG.error(String.format("Repository list is empty. Ambari may not be
managing the repositories for %s", osFamily));
+}
// determine packages for all services that are installed on host
List packages = new ArrayList<>();
http://git-wip-us.apache.org/repos/asf/ambari/blob/b9c82add/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/HostStackVersionResourceProvider.java
--
diff --git
a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/HostStackVersionResourceProvider.java
b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/HostStackVersionResourceProvider.java
index 8f2d4e6..811ce9b 100644
---
a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/HostStackVersionResourceProvider.java
+++
b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/HostStackVersionResourceProvider.java
@@ -398,6 +398,11 @@ public class HostStackVersionResourceProvider extends
AbstractControllerResource
"not defined. Repo version=%s, stackId=%s",
osFamily, desiredRepoVersion, stackId));
}
+
+if (repoInfo.isEmpty()){
+ LOG.error(String.format("Repository list is empty. Ambari may not be
managing the repositories for %s", osFamily));
+}
+
// For every host at cluster, determine packages for all installed services
List packages = new ArrayList<>();
Set servicesOnHost = new HashSet<>();
http://git-wip-us.apache.org/repos/asf/ambari/blob/b9c82add/ambari-server/src/main/resources/custom_actions/scripts/install_packages.py
--
diff --git
a/ambari-server/src/main/resources/custom_actions/scripts/install_packages.py
b/ambari-server/src/main/resources/custom_actions/scripts/install_packages.py
index 112abe3..33adce1 100644
---
a/ambari-server/src/main/resources/custom_actions/scripts/install_packages.py
+++
b/ambari-server/src/main/resources/custom_actions/scripts/install_packages.py
@@ -127,7 +127,7 @@ class InstallPackages(Script):
Logger.info("Will install packages for repository version
{0}".format(self.repository_version))
if 0 == len(base_urls):
- Logger.info("Repository list is empty. Ambari may not be managing the
repositories for {0}.".format(self.repository_version))
+ Logger.warning("Repository list is empty. Ambari may not be managing the
repositories for {0}.".format(self.repository_version))
try:
append_to_file = False
ambari git commit: AMBARI-20674 Able to hide the Delete menu item from UI for a given service (dili)
Repository: ambari
Updated Branches:
refs/heads/trunk 01e372770 -> 301896a12
AMBARI-20674 Able to hide the Delete menu item from UI for a given service
(dili)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/301896a1
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/301896a1
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/301896a1
Branch: refs/heads/trunk
Commit: 301896a12d7bb3b3a1402138ebf10667fc54a369
Parents: 01e3727
Author: Di Li
Authored: Thu Apr 6 16:58:57 2017 -0400
Committer: Di Li
Committed: Thu Apr 6 16:58:57 2017 -0400
--
.../server/controller/StackServiceResponse.java | 8
.../internal/StackServiceResourceProvider.java | 6 +++
.../ambari/server/stack/ServiceModule.java | 4 ++
.../apache/ambari/server/state/ServiceInfo.java | 26 +++
.../src/main/resources/properties.json | 1 +
.../ambari/server/state/ServiceInfoTest.java| 47
ambari-web/app/app.js | 4 ++
ambari-web/app/mappers/stack_service_mapper.js | 1 +
ambari-web/app/models/host_component.js | 3 +-
ambari-web/app/models/stack_service.js | 1 +
.../test/mappers/stack_service_mapper_test.js | 7 ++-
ambari-web/test/views/main/service/item_test.js | 3 ++
12 files changed, 109 insertions(+), 2 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/301896a1/ambari-server/src/main/java/org/apache/ambari/server/controller/StackServiceResponse.java
--
diff --git
a/ambari-server/src/main/java/org/apache/ambari/server/controller/StackServiceResponse.java
b/ambari-server/src/main/java/org/apache/ambari/server/controller/StackServiceResponse.java
index cbff300..8e4200d 100644
---
a/ambari-server/src/main/java/org/apache/ambari/server/controller/StackServiceResponse.java
+++
b/ambari-server/src/main/java/org/apache/ambari/server/controller/StackServiceResponse.java
@@ -75,6 +75,8 @@ public class StackServiceResponse {
*/
private boolean credentialStoreRequired;
+ private boolean isSupportDeleteViaUI;
+
/**
* Constructor.
*
@@ -112,6 +114,8 @@ public class StackServiceResponse {
credentialStoreSupported = service.isCredentialStoreSupported();
credentialStoreEnabled = service.isCredentialStoreEnabled();
+
+isSupportDeleteViaUI = service.isSupportDeleteViaUI();
}
public ServiceInfo.Selection getSelection() {
@@ -305,4 +309,8 @@ public class StackServiceResponse {
public void setCredentialStoreRequired(boolean credentialStoreRequired) {
this.credentialStoreRequired = credentialStoreRequired;
}
+
+ public boolean isSupportDeleteViaUI(){
+return isSupportDeleteViaUI;
+ }
}
http://git-wip-us.apache.org/repos/asf/ambari/blob/301896a1/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/StackServiceResourceProvider.java
--
diff --git
a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/StackServiceResourceProvider.java
b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/StackServiceResourceProvider.java
index a30d783..2964560 100644
---
a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/StackServiceResourceProvider.java
+++
b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/StackServiceResourceProvider.java
@@ -98,6 +98,9 @@ public class StackServiceResourceProvider extends
ReadOnlyResourceProvider {
private static final String CREDENTIAL_STORE_ENABLED =
PropertyHelper.getPropertyId(
"StackServices", "credential_store_enabled");
+ private static final String SUPPORT_DELETE_VIA_UI =
PropertyHelper.getPropertyId(
+ "StackServices", "support_delete_via_ui");
+
private static Set pkPropertyIds = new HashSet<>(
Arrays.asList(new String[]{STACK_NAME_PROPERTY_ID,
STACK_VERSION_PROPERTY_ID, SERVICE_NAME_PROPERTY_ID}));
@@ -206,6 +209,9 @@ public class StackServiceResourceProvider extends
ReadOnlyResourceProvider {
setResourceProperty(resource, CREDENTIAL_STORE_ENABLED,
response.isCredentialStoreEnabled(), requestedIds);
+setResourceProperty(resource, SUPPORT_DELETE_VIA_UI,
+response.isSupportDeleteViaUI(), requestedIds);
+
return resource;
}
http://git-wip-us.apache.org/repos/asf/ambari/blob/301896a1/ambari-server/src/main/java/org/apache/ambari/server/stack/ServiceModule.java
--
diff --git
a/ambari-server/src/main/java/org/apache/ambari/server/stack/ServiceModule.java
b/ambari-server/src/main/java/
ambari git commit: AMBARI-20592 ServicePresences check should also check for services dropped from a release (dili)
Repository: ambari
Updated Branches:
refs/heads/trunk 6ee881bcf -> 3ca41f262
AMBARI-20592 ServicePresences check should also check for services dropped from
a release (dili)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/3ca41f26
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/3ca41f26
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/3ca41f26
Branch: refs/heads/trunk
Commit: 3ca41f26205de3ac6c316dde749abcedf4082509
Parents: 6ee881b
Author: Di Li
Authored: Tue Apr 4 13:58:58 2017 -0400
Committer: Di Li
Committed: Tue Apr 4 13:58:58 2017 -0400
--
.../ambari/server/checks/CheckDescription.java | 5 +-
.../server/checks/ServicePresenceCheck.java | 52 +---
.../server/checks/ServicePresenceCheckTest.java | 41 ---
3 files changed, 83 insertions(+), 15 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/3ca41f26/ambari-server/src/main/java/org/apache/ambari/server/checks/CheckDescription.java
--
diff --git
a/ambari-server/src/main/java/org/apache/ambari/server/checks/CheckDescription.java
b/ambari-server/src/main/java/org/apache/ambari/server/checks/CheckDescription.java
index 71c5857..e17185f 100644
---
a/ambari-server/src/main/java/org/apache/ambari/server/checks/CheckDescription.java
+++
b/ambari-server/src/main/java/org/apache/ambari/server/checks/CheckDescription.java
@@ -280,9 +280,12 @@ public class CheckDescription {
"This service does not support upgrades and must be removed before
the upgrade can continue. " +
"After upgrading, %s can be reinstalled")
.put(ServicePresenceCheck.KEY_SERVICE_REMOVED,
+ "The %s service is currently installed on the cluster. " +
+ "This service is removed from the new release and must be removed
before the upgrade can continue.")
+.put(ServicePresenceCheck.KEY_SERVICE_REPLACED,
"The %s service is currently installed on the cluster. " +
"This service is removed from the new release and must be removed
before the upgrade can continue. " +
-"After upgrading, %s can be installed").build());
+"After upgrading, %s can be installed as the
replacement.").build());
public static CheckDescription RANGER_SERVICE_AUDIT_DB_CHECK = new
CheckDescription("RANGER_SERVICE_AUDIT_DB_CHECK",
PrereqCheckType.SERVICE,
http://git-wip-us.apache.org/repos/asf/ambari/blob/3ca41f26/ambari-server/src/main/java/org/apache/ambari/server/checks/ServicePresenceCheck.java
--
diff --git
a/ambari-server/src/main/java/org/apache/ambari/server/checks/ServicePresenceCheck.java
b/ambari-server/src/main/java/org/apache/ambari/server/checks/ServicePresenceCheck.java
index ed38882..5ff1f0b 100644
---
a/ambari-server/src/main/java/org/apache/ambari/server/checks/ServicePresenceCheck.java
+++
b/ambari-server/src/main/java/org/apache/ambari/server/checks/ServicePresenceCheck.java
@@ -46,7 +46,9 @@ public class ServicePresenceCheck extends
AbstractCheckDescriptor{
private static final Logger LOG =
LoggerFactory.getLogger(ServicePresenceCheck.class);
+ static final String KEY_SERVICE_REPLACED = "service_replaced";
static final String KEY_SERVICE_REMOVED = "service_removed";
+
/*
* List of services that do not support upgrade
* services must be removed before the stack upgrade
@@ -59,6 +61,11 @@ public class ServicePresenceCheck extends
AbstractCheckDescriptor{
static final String REMOVED_SERVICES_PROPERTY_NAME = "removed-service-names";
/*
+ * List of services replaced by other services in the new release
+ * */
+ static final String REPLACED_SERVICES_PROPERTY_NAME =
"replaced-service-names";
+
+ /*
* Such as Spark to Spark2
*/
static final String NEW_SERVICES_PROPERTY_NAME = "new-service-names";
@@ -73,7 +80,9 @@ public class ServicePresenceCheck extends
AbstractCheckDescriptor{
Set installedServices = cluster.getServices().keySet();
List noUpgradeSupportServices =
getNoUpgradeSupportServices(request);
-Map removedServices = getRemovedServices(request);
+Map replacedServices = getReplacedServices(request);
+List removedServices = getRemovedServices(request);
+
List failReasons = new ArrayList<>();
String reason = getFailReason(prerequisiteCheck, request);
@@ -85,8 +94,8 @@ public class ServicePresenceCheck extends
AbstractCheckDescriptor{
}
}
-reason = getFailReason(KEY_SERVICE_REMOVED, prerequisiteCh
ambari git commit: AMBARI-20546 EU/RU service check should skip services that do not have config types (dili)
Repository: ambari
Updated Branches:
refs/heads/trunk 8113f04a0 -> 25bfb9ec6
AMBARI-20546 EU/RU service check should skip services that do not have config
types (dili)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/25bfb9ec
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/25bfb9ec
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/25bfb9ec
Branch: refs/heads/trunk
Commit: 25bfb9ec62a44d525a19340d25276f3358f672e5
Parents: 8113f04
Author: Di Li
Authored: Thu Mar 30 15:35:20 2017 -0400
Committer: Di Li
Committed: Thu Mar 30 15:35:20 2017 -0400
--
.../server/api/services/AmbariMetaInfo.java | 6 +
.../checks/ServiceCheckValidityCheck.java | 13 +-
.../ambari/server/stack/ServiceModule.java | 18 +-
.../apache/ambari/server/stack/StackModule.java | 9 +
.../apache/ambari/server/state/StackInfo.java | 13 ++
.../server/api/services/AmbariMetaInfoTest.java | 7 +
.../checks/ServiceCheckValidityCheckTest.java | 20 ++-
.../ambari/server/stack/StackManagerTest.java | 20 ++-
.../ambari/server/stack/StackModuleTest.java| 11 ++
.../HDP/2.0.7/services/SYSTEMML/metainfo.xml| 39 +
.../stacks/HDP/2.0.8/services/HIVE/metainfo.xml | 174 +++
.../HDP/2.0.8/services/SYSTEMML/metainfo.xml| 39 +
12 files changed, 361 insertions(+), 8 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/25bfb9ec/ambari-server/src/main/java/org/apache/ambari/server/api/services/AmbariMetaInfo.java
--
diff --git
a/ambari-server/src/main/java/org/apache/ambari/server/api/services/AmbariMetaInfo.java
b/ambari-server/src/main/java/org/apache/ambari/server/api/services/AmbariMetaInfo.java
index 9f1d988..c655c62 100644
---
a/ambari-server/src/main/java/org/apache/ambari/server/api/services/AmbariMetaInfo.java
+++
b/ambari-server/src/main/java/org/apache/ambari/server/api/services/AmbariMetaInfo.java
@@ -555,6 +555,12 @@ public class AmbariMetaInfo {
return removedServices.contains(serviceName);
}
+ public boolean isServiceWithNoConfigs(String stackName, String version,
String serviceName) throws AmbariException{
+StackInfo stack = getStack(stackName, version);
+List servicesWithNoConfigs = stack.getServicesWithNoConfigs();
+return servicesWithNoConfigs.contains(serviceName);
+ }
+
public Collection getMonitoringServiceNames(String stackName, String
version)
throws AmbariException{
http://git-wip-us.apache.org/repos/asf/ambari/blob/25bfb9ec/ambari-server/src/main/java/org/apache/ambari/server/checks/ServiceCheckValidityCheck.java
--
diff --git
a/ambari-server/src/main/java/org/apache/ambari/server/checks/ServiceCheckValidityCheck.java
b/ambari-server/src/main/java/org/apache/ambari/server/checks/ServiceCheckValidityCheck.java
index 34b45bd..4ccdc0a 100644
---
a/ambari-server/src/main/java/org/apache/ambari/server/checks/ServiceCheckValidityCheck.java
+++
b/ambari-server/src/main/java/org/apache/ambari/server/checks/ServiceCheckValidityCheck.java
@@ -47,6 +47,7 @@ import org.apache.ambari.server.state.Cluster;
import org.apache.ambari.server.state.MaintenanceState;
import org.apache.ambari.server.state.Service;
import org.apache.ambari.server.state.ServiceComponent;
+import org.apache.ambari.server.state.StackId;
import org.apache.ambari.server.state.stack.PrereqCheckStatus;
import org.apache.ambari.server.state.stack.PrerequisiteCheck;
import org.apache.ambari.server.state.stack.upgrade.UpgradeType;
@@ -115,9 +116,15 @@ public class ServiceCheckValidityCheck extends
AbstractCheckDescriptor {
if (service.getMaintenanceState() != MaintenanceState.OFF ||
!hasAtLeastOneComponentVersionAdvertised(service)) {
continue;
}
-
- ServiceConfigEntity lastServiceConfig =
serviceConfigDAO.getLastServiceConfig(clusterId, service.getName());
- lastServiceConfigUpdates.put(service.getName(),
lastServiceConfig.getCreateTimestamp());
+ StackId stackId = cluster.getCurrentStackVersion();
+ boolean isServiceWitNoConfigs =
ambariMetaInfo.get().isServiceWithNoConfigs(stackId.getStackName(),
stackId.getStackVersion(), service.getName());
+ if (isServiceWitNoConfigs){
+LOG.info(String.format("%s in %s version %s does not have customizable
configurations. Skip checking service configuration history.",
service.getName(), stackId.getStackName(), stackId.getStackVersion()));
+ } else {
+LOG.info(String.format("%s in %s version %s has customizable
configurations. Check service configuration history.", service.getName(),
stackId.getStackName(),
ambari git commit: AMBARI-20400 Yarn should not copy Tez and Slider tar ball if Tez and Sliders are not installed on the cluster (dili)
Repository: ambari
Updated Branches:
refs/heads/trunk 982f9c626 -> be83a39eb
AMBARI-20400 Yarn should not copy Tez and Slider tar ball if Tez and Sliders
are not installed on the cluster (dili)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/be83a39e
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/be83a39e
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/be83a39e
Branch: refs/heads/trunk
Commit: be83a39eb9f5c91e1032e3d50c02c07543bcb84c
Parents: 982f9c6
Author: Di Li
Authored: Thu Mar 30 15:24:02 2017 -0400
Committer: Di Li
Committed: Thu Mar 30 15:24:02 2017 -0400
--
.../libraries/functions/copy_tarball.py | 24 +++-
.../python/stacks/2.0.6/configs/default.json| 24
2 files changed, 47 insertions(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/be83a39e/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 31a9be4..82a732b 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
@@ -64,6 +64,18 @@ TARBALL_MAP = {
"/{0}/apps/{1}/spark2/spark2-{0}-yarn-archive.tar.gz".format(STACK_NAME_PATTERN,
STACK_VERSION_PATTERN))
}
+SERVICE_MAP = {
+ "slider": "SLIDER",
+ "tez": "TEZ_CLIENT",
+ "pig": "PIG",
+ "sqoop": "SQOOP",
+ "hive": "HIVE_CLIENT",
+ "mapreduce": "HDFS_CLIENT",
+ "hadoop_streaming": "MAPREDUCE2_CLIENT",
+ "tez_hive2": "HIVE_CLIENT",
+ "spark": "SPARK_CLIENT",
+ "spark2": "SPARK2_CLIENT"
+}
def get_sysprep_skip_copy_tarballs_hdfs():
import params
@@ -199,7 +211,7 @@ def _get_single_version_from_stack_select():
def copy_to_hdfs(name, user_group, owner, file_mode=0444,
custom_source_file=None, custom_dest_file=None, force_execute=False,
- use_upgrading_version_during_upgrade=True,
replace_existing_files=False, skip=False):
+ use_upgrading_version_during_upgrade=True,
replace_existing_files=False, skip=False, skip_component_check=False):
"""
:param name: Tarball name, e.g., tez, hive, pig, sqoop.
:param user_group: Group to own the directory.
@@ -210,6 +222,8 @@ def copy_to_hdfs(name, user_group, owner, file_mode=0444,
custom_source_file=Non
:param force_execute: If true, will execute the HDFS commands immediately,
otherwise, will defer to the calling function.
:param use_upgrading_version_during_upgrade: If true, will use the version
going to during upgrade. Otherwise, use the CURRENT (source) version.
:param skip: If true, tarballs will not be copied as the cluster deployment
uses prepped VMs.
+ :param skip_component_check: If true, will skip checking if a given
component is installed on the node for a file under its dir to be copied.
+ This is in case the file is not mapped to a
component but rather to a specific location (JDK jar, Ambari jar, etc).
:return: Will return True if successful, otherwise, False.
"""
import params
@@ -226,6 +240,14 @@ def copy_to_hdfs(name, user_group, owner, file_mode=0444,
custom_source_file=Non
Logger.warning("Skipping copying {0} to {1} for {2} as it is a sys prepped
host.".format(str(source_file), str(dest_file), str(name)))
return True
+ if not skip_component_check:
+#Use components installed on the node to check if a file can be copied
into HDFS
+local_components = default("/localComponents", [])
+component = SERVICE_MAP.get(name)
+if component not in local_components:
+ Logger.info("{0} is not installed on the host. Skip copying
{1}".format(component, source_file))
+ return False
+
Logger.info("Source file: {0} , Dest file in HDFS: {1}".format(source_file,
dest_file))
if not os.path.exists(source_file):
http://git-wip-us.apache.org/repos/asf/ambari/blob/be83a39e/ambari-server/src/test/python/stacks/2.0.6/configs/default.json
--
diff --git a/ambari-server/src/test/python/stacks/2.0.6/configs/default.json
b/ambari-server/src/test/python/stacks/2.0.6/configs/default.json
index fa741
ambari git commit: Revert "AMBARI-20400 Yarn should not copy Tez and Slider tar ball if Tez and Sliders are not installed on the cluster (dili)"
Repository: ambari
Updated Branches:
refs/heads/trunk fe029913c -> 742fdff6b
Revert "AMBARI-20400 Yarn should not copy Tez and Slider tar ball if Tez and
Sliders are not installed on the cluster (dili)"
This reverts commit 3ab4c8d2ae0a7f28bc73d8438f79d2f18f96cc01.
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/742fdff6
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/742fdff6
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/742fdff6
Branch: refs/heads/trunk
Commit: 742fdff6b74d6324c2cc29d700ce96cbaa42786c
Parents: fe02991
Author: Di Li
Authored: Tue Mar 28 15:13:40 2017 -0400
Committer: Di Li
Committed: Tue Mar 28 15:13:40 2017 -0400
--
.../libraries/functions/copy_tarball.py | 24 +--
.../python/stacks/2.0.6/configs/default.json| 25
2 files changed, 1 insertion(+), 48 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/742fdff6/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 63b6926..31a9be4 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
@@ -64,18 +64,6 @@ TARBALL_MAP = {
"/{0}/apps/{1}/spark2/spark2-{0}-yarn-archive.tar.gz".format(STACK_NAME_PATTERN,
STACK_VERSION_PATTERN))
}
-SERVICE_MAP = {
- "slider": "SLIDER",
- "tez": "TEZ_CLIENT",
- "pig": "PIG",
- "sqoop": "SQOOP_CLIENT",
- "hive": "HIVE_CLIENT",
- "mapreduce": "HADOOP_CLIENT",
- "hadoop_streaming": "MAPREDUCE2_CLIENT",
- "tez_hive2": "HIVE_CLIENT",
- "spark": "SPARK_CLIENT",
- "spark2": "SPARK2_CLIENT"
-}
def get_sysprep_skip_copy_tarballs_hdfs():
import params
@@ -211,7 +199,7 @@ def _get_single_version_from_stack_select():
def copy_to_hdfs(name, user_group, owner, file_mode=0444,
custom_source_file=None, custom_dest_file=None, force_execute=False,
- use_upgrading_version_during_upgrade=True,
replace_existing_files=False, skip=False, skip_component_check=False):
+ use_upgrading_version_during_upgrade=True,
replace_existing_files=False, skip=False):
"""
:param name: Tarball name, e.g., tez, hive, pig, sqoop.
:param user_group: Group to own the directory.
@@ -222,8 +210,6 @@ def copy_to_hdfs(name, user_group, owner, file_mode=0444,
custom_source_file=Non
:param force_execute: If true, will execute the HDFS commands immediately,
otherwise, will defer to the calling function.
:param use_upgrading_version_during_upgrade: If true, will use the version
going to during upgrade. Otherwise, use the CURRENT (source) version.
:param skip: If true, tarballs will not be copied as the cluster deployment
uses prepped VMs.
- :param skip_component_check: If true, will skip checking if a given
component is installed on the node for a file under its dir to be copied.
- This is in case the file is not mapped to a
component but rather to a specific location (JDK jar, Ambari jar, etc).
:return: Will return True if successful, otherwise, False.
"""
import params
@@ -240,14 +226,6 @@ def copy_to_hdfs(name, user_group, owner, file_mode=0444,
custom_source_file=Non
Logger.warning("Skipping copying {0} to {1} for {2} as it is a sys prepped
host.".format(str(source_file), str(dest_file), str(name)))
return True
- if not skip_component_check:
-#Use components installed on the node to check if a file can be copied
into HDFS
-local_components = default("/localComponents", [])
-component = SERVICE_MAP.get(name)
-if component not in local_components:
- Logger.info("{0} is not installed on the host. Skip copying
{1}".format(component, source_file))
- return False
-
Logger.info("Source file: {0} , Dest file in HDFS: {1}".format(source_file,
dest_file))
if not os.path.exists(source_file):
http://git-wip-us.apache.org/repos/asf/ambari/blob/742fdff6/ambari-server/src/test/python/stacks/2.0.6/configs/default.json
--
diff --git a/ambari-server/src/test/python/stacks/2.0.6/config
ambari git commit: AMBARI-20461 override_uid should set to false when upgrading Ambari 2.1 to 2.2 or newer with custom stacks (dili)
Repository: ambari
Updated Branches:
refs/heads/trunk 53f5b63c7 -> fe029913c
AMBARI-20461 override_uid should set to false when upgrading Ambari 2.1 to 2.2
or newer with custom stacks (dili)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/fe029913
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/fe029913
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/fe029913
Branch: refs/heads/trunk
Commit: fe029913c51e5e1287e3a4e014c685f3a6bbf682
Parents: 53f5b63
Author: Di Li
Authored: Tue Mar 28 14:54:00 2017 -0400
Committer: Di Li
Committed: Tue Mar 28 14:54:00 2017 -0400
--
.../server/upgrade/UpgradeCatalog212.java | 16 +-
.../server/upgrade/UpgradeCatalog212Test.java | 148 +++
2 files changed, 163 insertions(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/fe029913/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog212.java
--
diff --git
a/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog212.java
b/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog212.java
index 499c726..810451d 100644
---
a/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog212.java
+++
b/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog212.java
@@ -264,7 +264,11 @@ public class UpgradeCatalog212 extends
AbstractUpgradeCatalog {
removes.add("override_hbase_uid");
updateConfigurationPropertiesForCluster(cluster, HBASE_ENV, new
HashMap(), removes, false, true);
updateConfigurationPropertiesForCluster(cluster, CLUSTER_ENV,
updates, true, false);
+} else {
+ updateOverrideUIDClusterConfig("false", cluster);
}
+ } else {
+updateOverrideUIDClusterConfig("false", cluster);
}
if (hbaseSiteProps != null) {
@@ -277,13 +281,23 @@ public class UpgradeCatalog212 extends
AbstractUpgradeCatalog {
updateConfigurationPropertiesForCluster(cluster, HBASE_SITE,
updates, true, false);
}
}
-
}
}
}
}
}
+ /**
+ * Set override_uid to false during the upgrade to retain UIDs already set
on the cluster
+ * This is necessary for upgrading a third party Ambari/stack distribution
from
+ * Ambari version 2.1.0 where HBase does not have override_hbase_uid.
+ * */
+ private void updateOverrideUIDClusterConfig(String toOverride, Cluster
cluster) throws AmbariException{
+Map updates = new HashMap();
+updates.put("override_uid", toOverride);
+updateConfigurationPropertiesForCluster(cluster, CLUSTER_ENV, updates,
true, false);
+ }
+
protected void updateHiveConfigs() throws AmbariException {
AmbariManagementController ambariManagementController =
injector.getInstance(
AmbariManagementController.class);
http://git-wip-us.apache.org/repos/asf/ambari/blob/fe029913/ambari-server/src/test/java/org/apache/ambari/server/upgrade/UpgradeCatalog212Test.java
--
diff --git
a/ambari-server/src/test/java/org/apache/ambari/server/upgrade/UpgradeCatalog212Test.java
b/ambari-server/src/test/java/org/apache/ambari/server/upgrade/UpgradeCatalog212Test.java
index 3f7bcc8..a60238a 100644
---
a/ambari-server/src/test/java/org/apache/ambari/server/upgrade/UpgradeCatalog212Test.java
+++
b/ambari-server/src/test/java/org/apache/ambari/server/upgrade/UpgradeCatalog212Test.java
@@ -298,7 +298,155 @@ public class UpgradeCatalog212Test {
easyMockSupport.replayAll();
mockInjector.getInstance(UpgradeCatalog212.class).updateHbaseAndClusterConfigurations();
easyMockSupport.verifyAll();
+ }
+
+ @Test
+ public void testUpdateHBaseAdnClusterConfigsTrue() throws Exception {
+setupIoCContext();
+EasyMockSupport easyMockSupport = new EasyMockSupport();
+final AmbariManagementController mockAmbariManagementController =
easyMockSupport.createNiceMock(AmbariManagementController.class);
+final ConfigHelper mockConfigHelper =
easyMockSupport.createMock(ConfigHelper.class);
+
+final Clusters mockClusters =
easyMockSupport.createStrictMock(Clusters.class);
+final Cluster mockClusterExpected =
easyMockSupport.createNiceMock(Cluster.class);
+
+final Map propertiesHbaseEnv = new HashMap() {
+ {
+put("override_hbase_uid", "true");
+ }
+};
+
+final Config mockHbaseEnv = easyMockSupport.createNiceMock(Config.class);
+expect(mockHbaseEnv.getProperties()).andRetu
ambari git commit: AMBARI-20400 Yarn should not copy Tez and Slider tar ball if Tez and Sliders are not installed on the cluster (dili)
Repository: ambari
Updated Branches:
refs/heads/trunk c5ccb1ab7 -> 3ab4c8d2a
AMBARI-20400 Yarn should not copy Tez and Slider tar ball if Tez and Sliders
are not installed on the cluster (dili)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/3ab4c8d2
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/3ab4c8d2
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/3ab4c8d2
Branch: refs/heads/trunk
Commit: 3ab4c8d2ae0a7f28bc73d8438f79d2f18f96cc01
Parents: c5ccb1a
Author: Di Li
Authored: Mon Mar 27 15:39:33 2017 -0400
Committer: Di Li
Committed: Mon Mar 27 15:39:33 2017 -0400
--
.../libraries/functions/copy_tarball.py | 24 ++-
.../python/stacks/2.0.6/configs/default.json| 25
2 files changed, 48 insertions(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/3ab4c8d2/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 31a9be4..63b6926 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
@@ -64,6 +64,18 @@ TARBALL_MAP = {
"/{0}/apps/{1}/spark2/spark2-{0}-yarn-archive.tar.gz".format(STACK_NAME_PATTERN,
STACK_VERSION_PATTERN))
}
+SERVICE_MAP = {
+ "slider": "SLIDER",
+ "tez": "TEZ_CLIENT",
+ "pig": "PIG",
+ "sqoop": "SQOOP_CLIENT",
+ "hive": "HIVE_CLIENT",
+ "mapreduce": "HADOOP_CLIENT",
+ "hadoop_streaming": "MAPREDUCE2_CLIENT",
+ "tez_hive2": "HIVE_CLIENT",
+ "spark": "SPARK_CLIENT",
+ "spark2": "SPARK2_CLIENT"
+}
def get_sysprep_skip_copy_tarballs_hdfs():
import params
@@ -199,7 +211,7 @@ def _get_single_version_from_stack_select():
def copy_to_hdfs(name, user_group, owner, file_mode=0444,
custom_source_file=None, custom_dest_file=None, force_execute=False,
- use_upgrading_version_during_upgrade=True,
replace_existing_files=False, skip=False):
+ use_upgrading_version_during_upgrade=True,
replace_existing_files=False, skip=False, skip_component_check=False):
"""
:param name: Tarball name, e.g., tez, hive, pig, sqoop.
:param user_group: Group to own the directory.
@@ -210,6 +222,8 @@ def copy_to_hdfs(name, user_group, owner, file_mode=0444,
custom_source_file=Non
:param force_execute: If true, will execute the HDFS commands immediately,
otherwise, will defer to the calling function.
:param use_upgrading_version_during_upgrade: If true, will use the version
going to during upgrade. Otherwise, use the CURRENT (source) version.
:param skip: If true, tarballs will not be copied as the cluster deployment
uses prepped VMs.
+ :param skip_component_check: If true, will skip checking if a given
component is installed on the node for a file under its dir to be copied.
+ This is in case the file is not mapped to a
component but rather to a specific location (JDK jar, Ambari jar, etc).
:return: Will return True if successful, otherwise, False.
"""
import params
@@ -226,6 +240,14 @@ def copy_to_hdfs(name, user_group, owner, file_mode=0444,
custom_source_file=Non
Logger.warning("Skipping copying {0} to {1} for {2} as it is a sys prepped
host.".format(str(source_file), str(dest_file), str(name)))
return True
+ if not skip_component_check:
+#Use components installed on the node to check if a file can be copied
into HDFS
+local_components = default("/localComponents", [])
+component = SERVICE_MAP.get(name)
+if component not in local_components:
+ Logger.info("{0} is not installed on the host. Skip copying
{1}".format(component, source_file))
+ return False
+
Logger.info("Source file: {0} , Dest file in HDFS: {1}".format(source_file,
dest_file))
if not os.path.exists(source_file):
http://git-wip-us.apache.org/repos/asf/ambari/blob/3ab4c8d2/ambari-server/src/test/python/stacks/2.0.6/configs/default.json
--
diff --git a/ambari-server/src/test/python/stacks/2.0.6/configs/default.json
b/ambari-server/src/test/python/stacks/2.0.6/configs/default.json
index fa741
ambari git commit: AMBARI-20472 MapRed History server start does not create directories in HDFS when WEBHDFS is disabled (dili)
Repository: ambari
Updated Branches:
refs/heads/branch-2.5 7cbad939f -> bc37bf748
AMBARI-20472 MapRed History server start does not create directories in HDFS
when WEBHDFS is disabled (dili)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/bc37bf74
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/bc37bf74
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/bc37bf74
Branch: refs/heads/branch-2.5
Commit: bc37bf748d43a823d67596d62c3b0b3e17db3128
Parents: 7cbad93
Author: Di Li
Authored: Mon Mar 20 12:17:59 2017 -0400
Committer: Di Li
Committed: Mon Mar 20 12:17:59 2017 -0400
--
.../before-START/files/fast-hdfs-resource.jar | Bin 19285850 -> 28296600
bytes
.../ambari/fast_hdfs_resource/Runner.java | 8 +---
2 files changed, 5 insertions(+), 3 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/bc37bf74/ambari-server/src/main/resources/stacks/HDP/2.0.6/hooks/before-START/files/fast-hdfs-resource.jar
--
diff --git
a/ambari-server/src/main/resources/stacks/HDP/2.0.6/hooks/before-START/files/fast-hdfs-resource.jar
b/ambari-server/src/main/resources/stacks/HDP/2.0.6/hooks/before-START/files/fast-hdfs-resource.jar
index c90890b..8629da3 100644
Binary files
a/ambari-server/src/main/resources/stacks/HDP/2.0.6/hooks/before-START/files/fast-hdfs-resource.jar
and
b/ambari-server/src/main/resources/stacks/HDP/2.0.6/hooks/before-START/files/fast-hdfs-resource.jar
differ
http://git-wip-us.apache.org/repos/asf/ambari/blob/bc37bf74/contrib/fast-hdfs-resource/src/main/java/org/apache/ambari/fast_hdfs_resource/Runner.java
--
diff --git
a/contrib/fast-hdfs-resource/src/main/java/org/apache/ambari/fast_hdfs_resource/Runner.java
b/contrib/fast-hdfs-resource/src/main/java/org/apache/ambari/fast_hdfs_resource/Runner.java
index e210876..98119b0 100644
---
a/contrib/fast-hdfs-resource/src/main/java/org/apache/ambari/fast_hdfs_resource/Runner.java
+++
b/contrib/fast-hdfs-resource/src/main/java/org/apache/ambari/fast_hdfs_resource/Runner.java
@@ -77,12 +77,14 @@ public class Runner {
pathHadoop = new Path(resource.getSource());
}
else {
+ String path = resource.getTarget();
+ pathHadoop = new Path(path);
if (!resource.isManageIfExists() && dfs.exists(pathHadoop)) {
-System.out.println("Skipping the operation for not managed DFS
directory " + resource.getTarget() +
- " since immutable_paths contains it.");
+System.out.println(
+String.format("Skipping the operation for not managed DFS
directory %s since immutable_paths contains it.", path)
+);
continue;
}
- pathHadoop = new Path(resource.getTarget());
}
if (resource.getAction().equals("create")) {
ambari git commit: AMBARI-20472 MapRed History server start does not create directories in HDFS when WEBHDFS is disabled (dili)
Repository: ambari
Updated Branches:
refs/heads/trunk 3a7a2d1b0 -> 395adf5af
AMBARI-20472 MapRed History server start does not create directories in HDFS
when WEBHDFS is disabled (dili)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/395adf5a
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/395adf5a
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/395adf5a
Branch: refs/heads/trunk
Commit: 395adf5af992fb43c13d1aa6092cca23c133ec66
Parents: 3a7a2d1
Author: Di Li
Authored: Mon Mar 20 11:17:15 2017 -0400
Committer: Di Li
Committed: Mon Mar 20 11:17:15 2017 -0400
--
.../before-START/files/fast-hdfs-resource.jar | Bin 19285850 -> 28296600
bytes
.../before-START/files/fast-hdfs-resource.jar | Bin 19285850 -> 28296600
bytes
.../ambari/fast_hdfs_resource/Runner.java | 8 +---
3 files changed, 5 insertions(+), 3 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/395adf5a/ambari-server/src/main/resources/stacks/HDP/2.0.6/hooks/before-START/files/fast-hdfs-resource.jar
--
diff --git
a/ambari-server/src/main/resources/stacks/HDP/2.0.6/hooks/before-START/files/fast-hdfs-resource.jar
b/ambari-server/src/main/resources/stacks/HDP/2.0.6/hooks/before-START/files/fast-hdfs-resource.jar
index c90890b..6c993bf 100644
Binary files
a/ambari-server/src/main/resources/stacks/HDP/2.0.6/hooks/before-START/files/fast-hdfs-resource.jar
and
b/ambari-server/src/main/resources/stacks/HDP/2.0.6/hooks/before-START/files/fast-hdfs-resource.jar
differ
http://git-wip-us.apache.org/repos/asf/ambari/blob/395adf5a/ambari-server/src/main/resources/stacks/HDP/3.0/hooks/before-START/files/fast-hdfs-resource.jar
--
diff --git
a/ambari-server/src/main/resources/stacks/HDP/3.0/hooks/before-START/files/fast-hdfs-resource.jar
b/ambari-server/src/main/resources/stacks/HDP/3.0/hooks/before-START/files/fast-hdfs-resource.jar
index c90890b..6c993bf 100644
Binary files
a/ambari-server/src/main/resources/stacks/HDP/3.0/hooks/before-START/files/fast-hdfs-resource.jar
and
b/ambari-server/src/main/resources/stacks/HDP/3.0/hooks/before-START/files/fast-hdfs-resource.jar
differ
http://git-wip-us.apache.org/repos/asf/ambari/blob/395adf5a/contrib/fast-hdfs-resource/src/main/java/org/apache/ambari/fast_hdfs_resource/Runner.java
--
diff --git
a/contrib/fast-hdfs-resource/src/main/java/org/apache/ambari/fast_hdfs_resource/Runner.java
b/contrib/fast-hdfs-resource/src/main/java/org/apache/ambari/fast_hdfs_resource/Runner.java
index e210876..98119b0 100644
---
a/contrib/fast-hdfs-resource/src/main/java/org/apache/ambari/fast_hdfs_resource/Runner.java
+++
b/contrib/fast-hdfs-resource/src/main/java/org/apache/ambari/fast_hdfs_resource/Runner.java
@@ -77,12 +77,14 @@ public class Runner {
pathHadoop = new Path(resource.getSource());
}
else {
+ String path = resource.getTarget();
+ pathHadoop = new Path(path);
if (!resource.isManageIfExists() && dfs.exists(pathHadoop)) {
-System.out.println("Skipping the operation for not managed DFS
directory " + resource.getTarget() +
- " since immutable_paths contains it.");
+System.out.println(
+String.format("Skipping the operation for not managed DFS
directory %s since immutable_paths contains it.", path)
+);
continue;
}
- pathHadoop = new Path(resource.getTarget());
}
if (resource.getAction().equals("create")) {
ambari git commit: AMBARI-20365 Display Ranger DB backup instruction in sections on the manual step during RU (dili)
Repository: ambari Updated Branches: refs/heads/trunk 528ac5c33 -> 971eaff1d AMBARI-20365 Display Ranger DB backup instruction in sections on the manual step during RU (dili) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/971eaff1 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/971eaff1 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/971eaff1 Branch: refs/heads/trunk Commit: 971eaff1d16949a38112eeb9d1869dec45affc44 Parents: 528ac5c Author: Di Li Authored: Fri Mar 10 12:50:50 2017 -0500 Committer: Di Li Committed: Fri Mar 10 12:50:50 2017 -0500 -- .../resources/stacks/HDP/2.3/upgrades/upgrade-2.3.xml| 11 ++- .../resources/stacks/HDP/2.3/upgrades/upgrade-2.4.xml| 11 ++- .../resources/stacks/HDP/2.3/upgrades/upgrade-2.5.xml| 9 - .../resources/stacks/HDP/2.3/upgrades/upgrade-2.6.xml| 9 - .../resources/stacks/HDP/2.4/upgrades/upgrade-2.4.xml| 10 +- .../resources/stacks/HDP/2.4/upgrades/upgrade-2.5.xml| 9 - .../resources/stacks/HDP/2.4/upgrades/upgrade-2.6.xml| 9 - 7 files changed, 33 insertions(+), 35 deletions(-) -- http://git-wip-us.apache.org/repos/asf/ambari/blob/971eaff1/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/upgrade-2.3.xml -- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/upgrade-2.3.xml b/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/upgrade-2.3.xml index 6bf2d4c..89b5126 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/upgrade-2.3.xml +++ b/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/upgrade-2.3.xml @@ -96,11 +96,12 @@ - Before continuing, please backup the Ranger Admin database and Ranger Audit database. -If audit database size is too large( > 3GB ) then follow the below instructions: -1. Backup the audit table from audit database. -2. Truncate audit table. -3. Follow upgrade process and once completed then restore audit data to audit table. + +Before continuing, please backup the Ranger Admin database and Ranger Audit database. If audit database size is too large( > 3GB ) then follow the below instructions: + + 1. Backup the audit table from audit database. + 2. Truncate audit table. + 3. Follow upgrade process and once completed then restore audit data to audit table. http://git-wip-us.apache.org/repos/asf/ambari/blob/971eaff1/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/upgrade-2.4.xml -- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/upgrade-2.4.xml b/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/upgrade-2.4.xml index 91c8cdf..4e897a0 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/upgrade-2.4.xml +++ b/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/upgrade-2.4.xml @@ -90,11 +90,12 @@ - Before continuing, please backup the Ranger Admin database and Ranger Audit database. -If audit database size is too large( > 3GB ) then follow the below instructions: -1. Backup the audit table from audit database. -2. Truncate audit table. -3. Follow upgrade process and once completed then restore audit data to audit table. + +Before continuing, please backup the Ranger Admin database and Ranger Audit database. If audit database size is too large( > 3GB ) then follow the below instructions: + + 1. Backup the audit table from audit database. + 2. Truncate audit table. + 3. Follow upgrade process and once completed then restore audit data to audit table. http://git-wip-us.apache.org/repos/asf/ambari/blob/971eaff1/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/upgrade-2.5.xml -- diff --git a/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/upgrade-2.5.xml b/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/upgrade-2.5.xml index fd93829..9396f80 100644 --- a/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/upgrade-2.5.xml +++ b/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/upgrade-2.5.xml @@ -102,11 +102,10 @@ - Before continuing, please backup the Ranger Admin database and Ranger Audit database. -If audit database size is too large( > 3GB ) then follow the
ambari git commit: AMBARI-20347 Display Ranger DB backup instruction in sections on the manual step during EU and RU (dili)
Repository: ambari
Updated Branches:
refs/heads/trunk 66c94e993 -> 621ff1533
AMBARI-20347 Display Ranger DB backup instruction in sections on the manual
step during EU and RU (dili)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/621ff153
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/621ff153
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/621ff153
Branch: refs/heads/trunk
Commit: 621ff153389d756001b09f30186c28e20178116a
Parents: 66c94e9
Author: Di Li
Authored: Wed Mar 8 14:37:46 2017 -0500
Committer: Di Li
Committed: Wed Mar 8 14:37:46 2017 -0500
--
.../stacks/HDP/2.3/upgrades/nonrolling-upgrade-2.3.xml| 10 ++
.../stacks/HDP/2.3/upgrades/nonrolling-upgrade-2.4.xml| 8
.../stacks/HDP/2.3/upgrades/nonrolling-upgrade-2.5.xml| 8
.../stacks/HDP/2.3/upgrades/nonrolling-upgrade-2.6.xml| 8
.../stacks/HDP/2.4/upgrades/nonrolling-upgrade-2.4.xml| 8
.../stacks/HDP/2.4/upgrades/nonrolling-upgrade-2.5.xml| 8
.../stacks/HDP/2.4/upgrades/nonrolling-upgrade-2.6.xml| 8
7 files changed, 30 insertions(+), 28 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/621ff153/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/nonrolling-upgrade-2.3.xml
--
diff --git
a/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/nonrolling-upgrade-2.3.xml
b/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/nonrolling-upgrade-2.3.xml
index 396bf30..28ca939 100644
---
a/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/nonrolling-upgrade-2.3.xml
+++
b/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/nonrolling-upgrade-2.3.xml
@@ -153,10 +153,12 @@
- Before continuing, please backup the Ranger Admin database
and Ranger Audit database on the following host(s): {{hosts.all}}. If audit
database size is too large (greater than 3GB) then follow the below
instructions:
-1. Backup the audit table from audit database.
-2. Truncate audit table.
-3. Follow upgrade process and once completed then restore audit
data to audit table.
+
+Before continuing, please backup the Ranger Admin database and
Ranger Audit database on the following host(s): {{hosts.all}}. If audit
database size is too large (greater than 3GB) then follow the below
instructions:
+
+ 1. Backup the audit table from audit database.
+ 2. Truncate audit table.
+ 3. Follow upgrade process and once completed then restore
audit data to audit table.
http://git-wip-us.apache.org/repos/asf/ambari/blob/621ff153/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/nonrolling-upgrade-2.4.xml
--
diff --git
a/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/nonrolling-upgrade-2.4.xml
b/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/nonrolling-upgrade-2.4.xml
index b95bae5..9aff1a9 100644
---
a/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/nonrolling-upgrade-2.4.xml
+++
b/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/nonrolling-upgrade-2.4.xml
@@ -154,10 +154,10 @@
- Before continuing, please backup the Ranger Admin database
and Ranger Audit database on the following host(s): {{hosts.all}}. If audit
database size is too large (greater than 3GB) then follow the below
instructions:
-1. Backup the audit table from audit database.
-2. Truncate audit table.
-3. Follow upgrade process and once completed then restore audit
data to audit table.
+ Before continuing, please backup the Ranger Admin database
and Ranger Audit database on the following host(s): {{hosts.all}}. If audit
database size is too large (greater than 3GB) then follow the below
instructions:
+ 1. Backup the audit table from audit database.
+ 2. Truncate audit table.
+ 3. Follow upgrade process and once completed then restore
audit data to audit table.
http://git-wip-us.apache.org/repos/asf/ambari/blob/621ff153/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/nonrolling-upgrade-2.5.xml
--
diff --git
a/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/nonrolling-upgrade-2.5.xml
b/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/nonrolling-upgrade-2.5.xml
index be2694e..adccac0 100644
---
a/ambari-server/src/main/resources/stacks/HDP/2.3/upgrades/nonrolling-upgrade-2.5.xml
+++
b/ambari-server/src/m
ambari git commit: AMBARI-20221 Ambari db schema update should be able to compare Ambari versions with build text (dili)
Repository: ambari
Updated Branches:
refs/heads/trunk eebca68f7 -> aeb5076ad
AMBARI-20221 Ambari db schema update should be able to compare Ambari versions
with build text (dili)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/aeb5076a
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/aeb5076a
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/aeb5076a
Branch: refs/heads/trunk
Commit: aeb5076ad66692a43af531c7c5377bdb72dc0f37
Parents: eebca68
Author: Di Li
Authored: Tue Feb 28 14:55:26 2017 -0500
Committer: Di Li
Committed: Tue Feb 28 14:55:26 2017 -0500
--
.../ambari/server/utils/VersionUtils.java | 6 ++-
.../ambari/server/utils/TestVersionUtils.java | 46
2 files changed, 50 insertions(+), 2 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/aeb5076a/ambari-server/src/main/java/org/apache/ambari/server/utils/VersionUtils.java
--
diff --git
a/ambari-server/src/main/java/org/apache/ambari/server/utils/VersionUtils.java
b/ambari-server/src/main/java/org/apache/ambari/server/utils/VersionUtils.java
index d3d8592..af0e030 100644
---
a/ambari-server/src/main/java/org/apache/ambari/server/utils/VersionUtils.java
+++
b/ambari-server/src/main/java/org/apache/ambari/server/utils/VersionUtils.java
@@ -80,8 +80,10 @@ public class VersionUtils {
return 0;
}
-String[] version1Parts = version1.split("\\.");
-String[] version2Parts = version2.split("\\.");
+//String pattern = "^([0-9]+)\\.([0-9]+)\\.([0-9]+)\\.([0-9]+).*";
+String pattern = "([0-9]+).([0-9]+).([0-9]+).([0-9]+)?.*";
+String[] version1Parts = version1.replaceAll(pattern,
"$1.$2.$3.$4").split("\\.");
+String[] version2Parts = version2.replaceAll(pattern,
"$1.$2.$3.$4").split("\\.");
int length = Math.max(version1Parts.length, version2Parts.length);
length = maxLengthToCompare == 0 || maxLengthToCompare > length ? length :
maxLengthToCompare;
http://git-wip-us.apache.org/repos/asf/ambari/blob/aeb5076a/ambari-server/src/test/java/org/apache/ambari/server/utils/TestVersionUtils.java
--
diff --git
a/ambari-server/src/test/java/org/apache/ambari/server/utils/TestVersionUtils.java
b/ambari-server/src/test/java/org/apache/ambari/server/utils/TestVersionUtils.java
index 821565e..ab55518 100644
---
a/ambari-server/src/test/java/org/apache/ambari/server/utils/TestVersionUtils.java
+++
b/ambari-server/src/test/java/org/apache/ambari/server/utils/TestVersionUtils.java
@@ -97,6 +97,52 @@ public class TestVersionUtils {
}
@Test
+ public void testVersionCompareSuccessCustomVersion() {
+Assert.assertTrue(VersionUtils.areVersionsEqual("1.2.3_MYAMBARI_00",
"1.2.3_MYAMBARI_00", false));
+Assert.assertTrue(VersionUtils.areVersionsEqual("1.2.3_MYAMBARI_00",
"1.2.3_MYAMBARI_00", true));
+Assert.assertTrue(VersionUtils.areVersionsEqual("", "", true));
+Assert.assertTrue(VersionUtils.areVersionsEqual(null, null, true));
+Assert.assertTrue(VersionUtils.areVersionsEqual(BootStrapImpl.DEV_VERSION,
"1.2.3_MYAMBARI_00", false));
+Assert.assertTrue(VersionUtils.areVersionsEqual(BootStrapImpl.DEV_VERSION,
"", true));
+Assert.assertTrue(VersionUtils.areVersionsEqual(BootStrapImpl.DEV_VERSION,
null, true));
+
+
Assert.assertFalse(VersionUtils.areVersionsEqual("1.2.3.1_MYAMBARI_00",
"1.2.3_MYAMBARI_00", false));
+Assert.assertFalse(VersionUtils.areVersionsEqual("2.1.3_MYAMBARI_00",
"1.2.3_MYAMBARI_00", false));
+
Assert.assertFalse(VersionUtils.areVersionsEqual("1.2.3.1_MYAMBARI_00",
"1.2.3_MYAMBARI_00", true));
+Assert.assertFalse(VersionUtils.areVersionsEqual("2.1.3_MYAMBARI_00",
"1.2.3_MYAMBARI_00", true));
+Assert.assertFalse(VersionUtils.areVersionsEqual("",
"1.2.3_MYAMBARI_00", true));
+Assert.assertFalse(VersionUtils.areVersionsEqual("", null, true));
+Assert.assertFalse(VersionUtils.areVersionsEqual(null, "", true));
+Assert.assertFalse(VersionUtils.areVersionsEqual(null,
"1.2.3_MYAMBARI_00", true));
+
+//Assert.assertEquals(-1,
VersionUtils.compareVersions("1.2.3_MYAMBARI_00", "1.2.4_MYAMBARI_00"));
+Assert.assertEquals(1,
VersionUtils.compareVersions("1.2.4_MYAMBARI_00", "1.2.3_MYAMBARI_00"));
+
ambari git commit: AMBARI-19911: When yarn-site.xml is changed, MapReduce related components should be required to restart(Yuanbo Liu via dili)
Repository: ambari Updated Branches: refs/heads/trunk 64389cca8 -> 9e5c57e3e AMBARI-19911: When yarn-site.xml is changed, MapReduce related components should be required to restart(Yuanbo Liu via dili) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/9e5c57e3 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/9e5c57e3 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/9e5c57e3 Branch: refs/heads/trunk Commit: 9e5c57e3e7ae4a8b3df51efcbddcdb97a1f7b398 Parents: 64389cc Author: Di Li Authored: Tue Feb 21 13:40:26 2017 -0500 Committer: Di Li Committed: Tue Feb 21 13:40:26 2017 -0500 -- .../src/main/resources/common-services/YARN/2.1.0.2.0/metainfo.xml | 1 + .../src/main/resources/common-services/YARN/3.0.0.3.0/metainfo.xml | 1 + 2 files changed, 2 insertions(+) -- http://git-wip-us.apache.org/repos/asf/ambari/blob/9e5c57e3/ambari-server/src/main/resources/common-services/YARN/2.1.0.2.0/metainfo.xml -- diff --git a/ambari-server/src/main/resources/common-services/YARN/2.1.0.2.0/metainfo.xml b/ambari-server/src/main/resources/common-services/YARN/2.1.0.2.0/metainfo.xml index 25e242b..22cc38d 100644 --- a/ambari-server/src/main/resources/common-services/YARN/2.1.0.2.0/metainfo.xml +++ b/ambari-server/src/main/resources/common-services/YARN/2.1.0.2.0/metainfo.xml @@ -301,6 +301,7 @@ ssl-client ssl-server ams-ssl-client +yarn-site true MAPREDUCE2_widgets.json http://git-wip-us.apache.org/repos/asf/ambari/blob/9e5c57e3/ambari-server/src/main/resources/common-services/YARN/3.0.0.3.0/metainfo.xml -- diff --git a/ambari-server/src/main/resources/common-services/YARN/3.0.0.3.0/metainfo.xml b/ambari-server/src/main/resources/common-services/YARN/3.0.0.3.0/metainfo.xml index b5b6d48..18186bd 100644 --- a/ambari-server/src/main/resources/common-services/YARN/3.0.0.3.0/metainfo.xml +++ b/ambari-server/src/main/resources/common-services/YARN/3.0.0.3.0/metainfo.xml @@ -386,6 +386,7 @@ ssl-client ssl-server ams-ssl-client +yarn-site true MAPREDUCE2_widgets.json
ambari git commit: AMBARI-19813: findLatestServiceConfigsByStack query returns deleted config group (Amruta Borkar via dili)
Repository: ambari
Updated Branches:
refs/heads/trunk e86dddad7 -> ecfc951b5
AMBARI-19813: findLatestServiceConfigsByStack query returns deleted config
group (Amruta Borkar via dili)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/ecfc951b
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/ecfc951b
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/ecfc951b
Branch: refs/heads/trunk
Commit: ecfc951b5c8589b9225684c3ad2660cdb4ef4445
Parents: e86ddda
Author: Di Li
Authored: Fri Feb 3 14:15:19 2017 -0500
Committer: Di Li
Committed: Fri Feb 3 14:15:19 2017 -0500
--
.../server/orm/entities/ServiceConfigEntity.java | 2 +-
.../ambari/server/orm/dao/ServiceConfigDAOTest.java| 13 -
2 files changed, 13 insertions(+), 2 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/ecfc951b/ambari-server/src/main/java/org/apache/ambari/server/orm/entities/ServiceConfigEntity.java
--
diff --git
a/ambari-server/src/main/java/org/apache/ambari/server/orm/entities/ServiceConfigEntity.java
b/ambari-server/src/main/java/org/apache/ambari/server/orm/entities/ServiceConfigEntity.java
index 8a1b316..dae7ef8 100644
---
a/ambari-server/src/main/java/org/apache/ambari/server/orm/entities/ServiceConfigEntity.java
+++
b/ambari-server/src/main/java/org/apache/ambari/server/orm/entities/ServiceConfigEntity.java
@@ -49,7 +49,7 @@ import javax.persistence.TableGenerator;
@NamedQuery(name = "ServiceConfigEntity.findAll", query = "SELECT
serviceConfig FROM ServiceConfigEntity serviceConfig WHERE
serviceConfig.clusterId=:clusterId ORDER BY serviceConfig.version DESC"),
@NamedQuery(name = "ServiceConfigEntity.findNextServiceConfigVersion",
query = "SELECT COALESCE(MAX(serviceConfig.version), 0) + 1 AS nextVersion FROM
ServiceConfigEntity serviceConfig WHERE serviceConfig.serviceName=:serviceName
AND serviceConfig.clusterId=:clusterId"),
@NamedQuery(name = "ServiceConfigEntity.findAllServiceConfigsByStack",
query = "SELECT serviceConfig FROM ServiceConfigEntity serviceConfig WHERE
serviceConfig.clusterId=:clusterId AND serviceConfig.stack=:stack"),
-@NamedQuery(name = "ServiceConfigEntity.findLatestServiceConfigsByStack",
query = "SELECT serviceConfig FROM ServiceConfigEntity serviceConfig WHERE
serviceConfig.clusterId = :clusterId AND serviceConfig.version = (SELECT
MAX(serviceConfig2.version) FROM ServiceConfigEntity serviceConfig2 WHERE
serviceConfig2.clusterId=:clusterId AND serviceConfig2.stack=:stack AND
serviceConfig2.serviceName = serviceConfig.serviceName)"),
+@NamedQuery(name = "ServiceConfigEntity.findLatestServiceConfigsByStack",
query = "SELECT serviceConfig FROM ServiceConfigEntity serviceConfig WHERE
serviceConfig.clusterId = :clusterId AND (serviceConfig.groupId = null OR
serviceConfig.groupId IN (SELECT cg.groupId from ConfigGroupEntity cg)) AND
serviceConfig.version = (SELECT MAX(serviceConfig2.version) FROM
ServiceConfigEntity serviceConfig2 WHERE serviceConfig2.clusterId= :clusterId
AND serviceConfig2.stack = :stack AND serviceConfig2.serviceName =
serviceConfig.serviceName)"),
@NamedQuery(name =
"ServiceConfigEntity.findLatestServiceConfigsByService", query = "SELECT scv
FROM ServiceConfigEntity scv WHERE scv.clusterId = :clusterId AND
scv.serviceName = :serviceName AND (scv.groupId = null OR scv.groupId IN
(SELECT cg.groupId from ConfigGroupEntity cg)) AND scv.version = (SELECT
MAX(scv2.version) FROM ServiceConfigEntity scv2 WHERE (scv2.serviceName =
:serviceName AND scv2.clusterId = :clusterId) AND (scv2.groupId = scv.groupId
OR (scv2.groupId IS NULL AND scv.groupId IS NULL)))"),
@NamedQuery(name =
"ServiceConfigEntity.findLatestServiceConfigsByCluster", query = "SELECT scv
FROM ServiceConfigEntity scv WHERE scv.clusterId = :clusterId AND
scv.serviceConfigId IN (SELECT MAX(scv1.serviceConfigId) FROM
ServiceConfigEntity scv1 WHERE (scv1.clusterId = :clusterId) AND (scv1.groupId
IS NULL) GROUP BY scv1.serviceName)")})
public class ServiceConfigEntity {
http://git-wip-us.apache.org/repos/asf/ambari/blob/ecfc951b/ambari-server/src/test/java/org/apache/ambari/server/orm/dao/ServiceConfigDAOTest.java
--
diff --git
a/ambari-server/src/test/java/org/apache/ambari/server/orm/dao/ServiceConfigDAOTest.java
b/ambari-server/src/test/java/org/apache/ambari/server/orm/dao/ServiceConfigDAOTest.java
index e29c276..a0732ab 100644
---
a/ambari-server/src/test/java/org/apache/ambari/server/orm/dao/ServiceConfigDAOTest.java
+++
ambari git commit: AMBARI-19804: Typo in preinstall_checker util script in the contrib project (dili)
Repository: ambari
Updated Branches:
refs/heads/trunk c8b347c9e -> 7c8931a5e
AMBARI-19804: Typo in preinstall_checker util script in the contrib project
(dili)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/7c8931a5
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/7c8931a5
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/7c8931a5
Branch: refs/heads/trunk
Commit: 7c8931a5e5a6320145867ea3bcd48a379c1c87a8
Parents: c8b347c
Author: Di Li
Authored: Thu Feb 2 10:57:39 2017 -0500
Committer: Di Li
Committed: Thu Feb 2 10:57:39 2017 -0500
--
.../utils/preinstall-check/src/main/python/preinstall_checker.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/7c8931a5/contrib/utils/preinstall-check/src/main/python/preinstall_checker.py
--
diff --git
a/contrib/utils/preinstall-check/src/main/python/preinstall_checker.py
b/contrib/utils/preinstall-check/src/main/python/preinstall_checker.py
index 5da3772..eddb738 100644
--- a/contrib/utils/preinstall-check/src/main/python/preinstall_checker.py
+++ b/contrib/utils/preinstall-check/src/main/python/preinstall_checker.py
@@ -128,7 +128,7 @@ def validate_options(options):
if not options.password:
errors.append("No Ambari admin user passsword provided.")
if not options.log:
- errors.append("No log patch provided.")
+ errors.append("No log home path provided.")
"""General check for operations"""
if not options.operation:
ambari git commit: AMBARI-19641: Deleted configuration groups are displayed along with active group (Amruta Borkar via dili)
Repository: ambari
Updated Branches:
refs/heads/trunk dcdf95b28 -> 6d02a7a5b
AMBARI-19641: Deleted configuration groups are displayed along with active
group (Amruta Borkar via dili)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/6d02a7a5
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/6d02a7a5
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/6d02a7a5
Branch: refs/heads/trunk
Commit: 6d02a7a5b3415a87b0cbcf21d360942719efcb9d
Parents: dcdf95b
Author: Di Li
Authored: Fri Jan 27 14:13:55 2017 -0500
Committer: Di Li
Committed: Fri Jan 27 14:13:55 2017 -0500
--
.../orm/entities/ServiceConfigEntity.java | 2 +-
.../server/orm/dao/ServiceConfigDAOTest.java| 66
2 files changed, 56 insertions(+), 12 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/6d02a7a5/ambari-server/src/main/java/org/apache/ambari/server/orm/entities/ServiceConfigEntity.java
--
diff --git
a/ambari-server/src/main/java/org/apache/ambari/server/orm/entities/ServiceConfigEntity.java
b/ambari-server/src/main/java/org/apache/ambari/server/orm/entities/ServiceConfigEntity.java
index 2d6ca20..8a1b316 100644
---
a/ambari-server/src/main/java/org/apache/ambari/server/orm/entities/ServiceConfigEntity.java
+++
b/ambari-server/src/main/java/org/apache/ambari/server/orm/entities/ServiceConfigEntity.java
@@ -50,7 +50,7 @@ import javax.persistence.TableGenerator;
@NamedQuery(name = "ServiceConfigEntity.findNextServiceConfigVersion",
query = "SELECT COALESCE(MAX(serviceConfig.version), 0) + 1 AS nextVersion FROM
ServiceConfigEntity serviceConfig WHERE serviceConfig.serviceName=:serviceName
AND serviceConfig.clusterId=:clusterId"),
@NamedQuery(name = "ServiceConfigEntity.findAllServiceConfigsByStack",
query = "SELECT serviceConfig FROM ServiceConfigEntity serviceConfig WHERE
serviceConfig.clusterId=:clusterId AND serviceConfig.stack=:stack"),
@NamedQuery(name = "ServiceConfigEntity.findLatestServiceConfigsByStack",
query = "SELECT serviceConfig FROM ServiceConfigEntity serviceConfig WHERE
serviceConfig.clusterId = :clusterId AND serviceConfig.version = (SELECT
MAX(serviceConfig2.version) FROM ServiceConfigEntity serviceConfig2 WHERE
serviceConfig2.clusterId=:clusterId AND serviceConfig2.stack=:stack AND
serviceConfig2.serviceName = serviceConfig.serviceName)"),
-@NamedQuery(name =
"ServiceConfigEntity.findLatestServiceConfigsByService", query = "SELECT scv
FROM ServiceConfigEntity scv WHERE scv.clusterId = :clusterId AND
scv.serviceName = :serviceName AND scv.version = (SELECT MAX(scv2.version) FROM
ServiceConfigEntity scv2 WHERE (scv2.serviceName = :serviceName AND
scv2.clusterId = :clusterId) AND (scv2.groupId = scv.groupId OR (scv2.groupId
IS NULL AND scv.groupId IS NULL)))"),
+@NamedQuery(name =
"ServiceConfigEntity.findLatestServiceConfigsByService", query = "SELECT scv
FROM ServiceConfigEntity scv WHERE scv.clusterId = :clusterId AND
scv.serviceName = :serviceName AND (scv.groupId = null OR scv.groupId IN
(SELECT cg.groupId from ConfigGroupEntity cg)) AND scv.version = (SELECT
MAX(scv2.version) FROM ServiceConfigEntity scv2 WHERE (scv2.serviceName =
:serviceName AND scv2.clusterId = :clusterId) AND (scv2.groupId = scv.groupId
OR (scv2.groupId IS NULL AND scv.groupId IS NULL)))"),
@NamedQuery(name =
"ServiceConfigEntity.findLatestServiceConfigsByCluster", query = "SELECT scv
FROM ServiceConfigEntity scv WHERE scv.clusterId = :clusterId AND
scv.serviceConfigId IN (SELECT MAX(scv1.serviceConfigId) FROM
ServiceConfigEntity scv1 WHERE (scv1.clusterId = :clusterId) AND (scv1.groupId
IS NULL) GROUP BY scv1.serviceName)")})
public class ServiceConfigEntity {
@Id
http://git-wip-us.apache.org/repos/asf/ambari/blob/6d02a7a5/ambari-server/src/test/java/org/apache/ambari/server/orm/dao/ServiceConfigDAOTest.java
--
diff --git
a/ambari-server/src/test/java/org/apache/ambari/server/orm/dao/ServiceConfigDAOTest.java
b/ambari-server/src/test/java/org/apache/ambari/server/orm/dao/ServiceConfigDAOTest.java
index aafe557..5890c35 100644
---
a/ambari-server/src/test/java/org/apache/ambari/server/orm/dao/ServiceConfigDAOTest.java
+++
b/ambari-server/src/test/java/org/apache/ambari/server/orm/dao/ServiceConfigDAOTest.java
@@ -262,23 +262,43 @@ public class ServiceConfigDAOTest {
@Test
public void testGetLastServiceConfigsForService() throws Exception {
String serviceName = "HDFS";
+Clusters clusters = injector.getInstance(Clusters.cl
ambari git commit: AMBARI-19728: Custom command name rendered incorrectly (dili)
Repository: ambari
Updated Branches:
refs/heads/trunk 34d029bf9 -> 77937e383
AMBARI-19728: Custom command name rendered incorrectly (dili)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/77937e38
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/77937e38
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/77937e38
Branch: refs/heads/trunk
Commit: 77937e383d6ed0e582192e3a75913f60a32dc0eb
Parents: 34d029b
Author: Di Li
Authored: Fri Jan 27 11:19:29 2017 -0500
Committer: Di Li
Committed: Fri Jan 27 11:19:29 2017 -0500
--
ambari-web/app/utils/helper.js | 1 +
ambari-web/test/utils/helper_test.js | 2 ++
2 files changed, 3 insertions(+)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/77937e38/ambari-web/app/utils/helper.js
--
diff --git a/ambari-web/app/utils/helper.js b/ambari-web/app/utils/helper.js
index 927f8a6..f6f2532 100644
--- a/ambari-web/app/utils/helper.js
+++ b/ambari-web/app/utils/helper.js
@@ -592,6 +592,7 @@ App.format = {
name = name.split(separator).map(function(singleName) {
return this.normalizeName(singleName.toUpperCase());
}, this).join(' ');
+break;
}
}
return name.capitalize();
http://git-wip-us.apache.org/repos/asf/ambari/blob/77937e38/ambari-web/test/utils/helper_test.js
--
diff --git a/ambari-web/test/utils/helper_test.js
b/ambari-web/test/utils/helper_test.js
index b438a7a..4b9ec36 100644
--- a/ambari-web/test/utils/helper_test.js
+++ b/ambari-web/test/utils/helper_test.js
@@ -298,6 +298,8 @@ describe('utils/helper', function() {
'app-timeline-server': 'App Timeline Server',
'APP TIMELINE SERVER': 'App Timeline Server',
'app timeline server': 'App Timeline Server',
+ 'run-hcat-sync': 'Run HCat Client Sync',
+ 'rUN_hCAt_syNc': 'Run HCat Client Sync',
'FALCON': 'Falcon',
'falcon': 'Falcon'
};
ambari git commit: AMBARI-19630: Ambari should accept stack version in format of x.x.x.x without the build level digits - new unit tests (dili)
Repository: ambari
Updated Branches:
refs/heads/trunk 9bc765ab0 -> b92b5f576
AMBARI-19630: Ambari should accept stack version in format of x.x.x.x without
the build level digits - new unit tests (dili)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/b92b5f57
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/b92b5f57
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/b92b5f57
Branch: refs/heads/trunk
Commit: b92b5f576300d0ab36005f35d7e9d0547be7c2e8
Parents: 9bc765a
Author: Di Li
Authored: Thu Jan 26 11:05:55 2017 -0500
Committer: Di Li
Committed: Thu Jan 26 11:05:55 2017 -0500
--
.../libraries/functions/get_stack_version.py| 2 +-
.../libraries/functions/version_select_util.py | 5 ++-
.../src/test/python/TestVersionSelectUtil.py| 40
3 files changed, 44 insertions(+), 3 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/b92b5f57/ambari-common/src/main/python/resource_management/libraries/functions/get_stack_version.py
--
diff --git
a/ambari-common/src/main/python/resource_management/libraries/functions/get_stack_version.py
b/ambari-common/src/main/python/resource_management/libraries/functions/get_stack_version.py
index 7274a59..463d61f 100644
---
a/ambari-common/src/main/python/resource_management/libraries/functions/get_stack_version.py
+++
b/ambari-common/src/main/python/resource_management/libraries/functions/get_stack_version.py
@@ -85,7 +85,7 @@ def get_stack_version(package_name):
stack_version = re.sub(package_name + ' - ', '', stack_output)
stack_version = stack_version.rstrip()
- match = re.match('[0-9]+.[0-9]+.[0-9]+.[0-9]+-[0-9]+', stack_version)
+ match = re.match('[0-9]+.[0-9]+.[0-9]+.[0-9]+(-[0-9]+)?', stack_version)
if match is None:
Logger.info('Failed to get extracted version with ' + stack_selector_path)
http://git-wip-us.apache.org/repos/asf/ambari/blob/b92b5f57/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 615a0cd..ff00a1f 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
@@ -67,8 +67,9 @@ def get_component_version(stack_name, component_name):
raise Exception("Code is nonzero or output is empty")
Logger.debug("Command: %s\nOutput: %s" % (get_stack_comp_version_cmd,
str(out)))
-matches = re.findall(r"([\d\.]+\-\d+)", out)
-version = matches[0] if matches and len(matches) > 0 else None
+matches = re.findall(r"( [\d\.]+(\-\d+)?)", out)
+version = matches[0][0].strip() if matches and len(matches) > 0 and
len(matches[0]) > 0 else None
+Logger.debug("Version for component %s: %s" % (component_name,
str(version)))
except Exception, e:
Logger.error("Could not determine stack version for component %s by
calling '%s'. Return Code: %s, Output: %s." %
(component_name, get_stack_comp_version_cmd, str(code),
str(out)))
http://git-wip-us.apache.org/repos/asf/ambari/blob/b92b5f57/ambari-server/src/test/python/TestVersionSelectUtil.py
--
diff --git a/ambari-server/src/test/python/TestVersionSelectUtil.py
b/ambari-server/src/test/python/TestVersionSelectUtil.py
index 38798e2..5097fac 100644
--- a/ambari-server/src/test/python/TestVersionSelectUtil.py
+++ b/ambari-server/src/test/python/TestVersionSelectUtil.py
@@ -97,3 +97,43 @@ class TestVersionSelectUtil(TestCase):
self.assertEquals(version, stack_expected_version)
version = self.module.get_component_version("HDP", "hadoop-hdfs-datanode")
self.assertEquals(version, stack_expected_version)
+
+ @patch('__builtin__.open')
+ @patch("resource_management.core.shell.call")
+ @patch('os.path.exists')
+ @patch("resource_management.libraries.functions.stack_tools.get_stack_tool")
+ def test_get_component_version_no_build_ids(self, get_stack_tool_mock,
os_path_exists_mock, call_mock, open_mock):
+stack_expected_version = "2.2.1.0"
+
+# Mock classes for reading from a file
+class MagicFile(object):
+ allowed
ambari git commit: AMBARI-19715: HostCleanup remove ambari.repo when ambari.repo has repo ID that doesn't begin with word AMBARI (dili)
Repository: ambari Updated Branches: refs/heads/trunk 8d390fa18 -> 9bc765ab0 AMBARI-19715: HostCleanup remove ambari.repo when ambari.repo has repo ID that doesn't begin with word AMBARI (dili) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/9bc765ab Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/9bc765ab Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/9bc765ab Branch: refs/heads/trunk Commit: 9bc765ab016d3cd0a2253ab6e28c9e27a6c77418 Parents: 8d390fa Author: Di Li Authored: Thu Jan 26 10:59:15 2017 -0500 Committer: Di Li Committed: Thu Jan 26 10:59:15 2017 -0500 -- .../resource_management/TestPackagesAnalyzer.py | 46 .../libraries/functions/packages_analyzer.py| 2 +- 2 files changed, 47 insertions(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/ambari/blob/9bc765ab/ambari-agent/src/test/python/resource_management/TestPackagesAnalyzer.py -- diff --git a/ambari-agent/src/test/python/resource_management/TestPackagesAnalyzer.py b/ambari-agent/src/test/python/resource_management/TestPackagesAnalyzer.py index f898919..e02e442 100644 --- a/ambari-agent/src/test/python/resource_management/TestPackagesAnalyzer.py +++ b/ambari-agent/src/test/python/resource_management/TestPackagesAnalyzer.py @@ -138,4 +138,50 @@ class TestPackagesAnalyzer(TestCase): self.assertEqual(7, len(allPackages)) expected = ["hadoop-a", "zk", "webhcat", "hadoop-b", "ganglia", "rrd", "def-def.x86"] for package in expected: + self.assertTrue(package in allPackages) + + def test_perform_package_analysis_custom_reponame(self): +installedPackages = [ + ["hadoop-a", "2.3", "HDP"], ["zk", "3.1", "HDP"], ["webhcat", "3.1", "HDP"], + ["hadoop-b", "2.3", "HDP-epel"], ["epel", "3.1", "HDP-epel"], ["epel-2", "3.1", "HDP-epel"], + ["hadoop-c", "2.3", "GITHUB_Ambari"], ["ambari-s", "3.1", "GITHUB_Ambari"], + ["ganglia", "2.3", "GANGLIA"], ["rrd", "3.1", "RRD"], + ["keeper-1", "2.3", "GANGLIA"], ["keeper-2", "3.1", "base"],["def-def.x86", "2.2", "DEF.3"], + ["def.1", "1.2", "NewDEF"] +] +availablePackages = [ + ["hadoop-d", "2.3", "HDP"], ["zk-2", "3.1", "HDP"], ["pig", "3.1", "HDP"], + ["epel-3", "2.3", "HDP-epel"], ["hadoop-e", "3.1", "HDP-epel"], + ["ambari-a", "3.1", "GITHUB_Ambari"], + ["keeper-3", "3.1", "base"] +] + +packagesToLook = ["^webhcat.*$", "^hadoop.*$", "^.+-def.*$"] +reposToIgnore = ["ambari"] +additionalPackages = ["ganglia", "rrd"] + +repos = [] +packages_analyzer.getInstalledRepos(packagesToLook, installedPackages + availablePackages, reposToIgnore, repos) +self.assertEqual(3, len(repos)) +expected = ["HDP", "HDP-epel", "DEF.3"] +for repo in expected: + self.assertTrue(repo in repos) + +packagesInstalled = packages_analyzer.getInstalledPkgsByRepo(repos, ["epel"], installedPackages) +self.assertEqual(5, len(packagesInstalled)) +expected = ["hadoop-a", "zk", "webhcat", "hadoop-b", "def-def.x86"] +for repo in expected: + self.assertTrue(repo in packagesInstalled) + +additionalPkgsInstalled = packages_analyzer.getInstalledPkgsByNames( + additionalPackages, installedPackages) +self.assertEqual(2, len(additionalPkgsInstalled)) +expected = ["ganglia", "rrd"] +for additionalPkg in expected: + self.assertTrue(additionalPkg in additionalPkgsInstalled) + +allPackages = list(set(packagesInstalled + additionalPkgsInstalled)) +self.assertEqual(7, len(allPackages)) +expected = ["hadoop-a", "zk", "webhcat", "hadoop-b", "ganglia", "rrd", "def-def.x86"] +for package in expected: self.assertTrue(package in allPackages) \ No newline at end of file http://git-wip-us.apache.org/repos/asf/ambari/blob/9bc765ab/ambari-common/src/main/python/resource_management/libraries/functions/packages_analyzer.py -- diff --git a/ambari-common/src/main/python/resource_management/libraries/functions/packages_analyzer.py b/ambari-common/src/main/python/resource_management/libraries/functions/packages_analyzer.py index 9df2b64..8a15ee5 100644 --- a/ambari-common/src/main/python/resource_management/libraries/functions/packages_analyzer.py +++ b/ambari-common/src/main/python/resource_management/libraries/functions/packages_analyzer.py @@ -186,7 +186,7 @@ def _lookUpZypperPackages(command, allPackages): def nameMatch(lookupName, actualName): tokens = actualName.strip().split() for token in tokens: -if token.lower().find(lookupName.lower()) == 0: +if lookupName.lower() in token.lower(): return True return False
ambari git commit: AMBARI-19630: Ambari should accept stack version in format of x.x.x.x without the build level digits (dili)
Repository: ambari
Updated Branches:
refs/heads/trunk 6a2aca64e -> 21c18a78b
AMBARI-19630: Ambari should accept stack version in format of x.x.x.x without
the build level digits (dili)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/21c18a78
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/21c18a78
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/21c18a78
Branch: refs/heads/trunk
Commit: 21c18a78beb397da324c80d6943d55038167d855
Parents: 6a2aca6
Author: Di Li
Authored: Wed Jan 25 14:16:56 2017 -0500
Committer: Di Li
Committed: Wed Jan 25 14:16:56 2017 -0500
--
.../libraries/functions/get_stack_version.py| 2 +-
.../libraries/functions/version_select_util.py | 5 ++-
.../src/test/python/TestVersionSelectUtil.py| 40
3 files changed, 44 insertions(+), 3 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/21c18a78/ambari-common/src/main/python/resource_management/libraries/functions/get_stack_version.py
--
diff --git
a/ambari-common/src/main/python/resource_management/libraries/functions/get_stack_version.py
b/ambari-common/src/main/python/resource_management/libraries/functions/get_stack_version.py
index 7274a59..463d61f 100644
---
a/ambari-common/src/main/python/resource_management/libraries/functions/get_stack_version.py
+++
b/ambari-common/src/main/python/resource_management/libraries/functions/get_stack_version.py
@@ -85,7 +85,7 @@ def get_stack_version(package_name):
stack_version = re.sub(package_name + ' - ', '', stack_output)
stack_version = stack_version.rstrip()
- match = re.match('[0-9]+.[0-9]+.[0-9]+.[0-9]+-[0-9]+', stack_version)
+ match = re.match('[0-9]+.[0-9]+.[0-9]+.[0-9]+(-[0-9]+)?', stack_version)
if match is None:
Logger.info('Failed to get extracted version with ' + stack_selector_path)
http://git-wip-us.apache.org/repos/asf/ambari/blob/21c18a78/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 615a0cd..ff00a1f 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
@@ -67,8 +67,9 @@ def get_component_version(stack_name, component_name):
raise Exception("Code is nonzero or output is empty")
Logger.debug("Command: %s\nOutput: %s" % (get_stack_comp_version_cmd,
str(out)))
-matches = re.findall(r"([\d\.]+\-\d+)", out)
-version = matches[0] if matches and len(matches) > 0 else None
+matches = re.findall(r"( [\d\.]+(\-\d+)?)", out)
+version = matches[0][0].strip() if matches and len(matches) > 0 and
len(matches[0]) > 0 else None
+Logger.debug("Version for component %s: %s" % (component_name,
str(version)))
except Exception, e:
Logger.error("Could not determine stack version for component %s by
calling '%s'. Return Code: %s, Output: %s." %
(component_name, get_stack_comp_version_cmd, str(code),
str(out)))
http://git-wip-us.apache.org/repos/asf/ambari/blob/21c18a78/ambari-server/src/test/python/TestVersionSelectUtil.py
--
diff --git a/ambari-server/src/test/python/TestVersionSelectUtil.py
b/ambari-server/src/test/python/TestVersionSelectUtil.py
index 38798e2..5facf31 100644
--- a/ambari-server/src/test/python/TestVersionSelectUtil.py
+++ b/ambari-server/src/test/python/TestVersionSelectUtil.py
@@ -97,3 +97,43 @@ class TestVersionSelectUtil(TestCase):
self.assertEquals(version, stack_expected_version)
version = self.module.get_component_version("HDP", "hadoop-hdfs-datanode")
self.assertEquals(version, stack_expected_version)
+
+ @patch('__builtin__.open')
+ @patch("resource_management.core.shell.call")
+ @patch('os.path.exists')
+ @patch("resource_management.libraries.functions.stack_tools.get_stack_tool")
+ def test_get_component_version_no_build_ids(self, get_stack_tool_mock,
os_path_exists_mock, call_mock, open_mock):
+stack_expected_version = "2.2.1.0"
+
+# Mock classes for reading from a file
+class MagicFile(object):
+ allowed_names = set([&qu
ambari git commit: AMBARI-13324 automate creating Flume Keytab and principal (Shi Wang via dili)
Repository: ambari
Updated Branches:
refs/heads/trunk ad0f4ecc6 -> d77f3a54f
AMBARI-13324 automate creating Flume Keytab and principal (Shi Wang via dili)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/d77f3a54
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/d77f3a54
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/d77f3a54
Branch: refs/heads/trunk
Commit: d77f3a54fcbb79e9a2518a56bb78b0468a8a8b4f
Parents: ad0f4ec
Author: Di Li
Authored: Tue Jan 24 15:19:41 2017 -0500
Committer: Di Li
Committed: Tue Jan 24 15:19:41 2017 -0500
--
.../FLUME/1.4.0.2.0/kerberos.json | 44
.../1.4.0.2.0/package/scripts/flume_check.py| 6 +--
.../FLUME/1.4.0.2.0/package/scripts/params.py | 12 +-
.../stacks/2.0.6/FLUME/test_service_check.py| 1 +
4 files changed, 59 insertions(+), 4 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/d77f3a54/ambari-server/src/main/resources/common-services/FLUME/1.4.0.2.0/kerberos.json
--
diff --git
a/ambari-server/src/main/resources/common-services/FLUME/1.4.0.2.0/kerberos.json
b/ambari-server/src/main/resources/common-services/FLUME/1.4.0.2.0/kerberos.json
new file mode 100644
index 000..ab46912
--- /dev/null
+++
b/ambari-server/src/main/resources/common-services/FLUME/1.4.0.2.0/kerberos.json
@@ -0,0 +1,44 @@
+{
+ "services": [
+{
+ "name": "FLUME",
+ "components": [
+{
+ "name": "FLUME_HANDLER",
+ "identities": [
+{
+ "name": "flume_principal",
+ "principal": {
+"value": "${flume-env/flume_user}/_HOST@${realm}",
+"type" : "service",
+"configuration": "flume-env/flume_principal_name",
+"local_username": "${flume-env/flume_user}"
+
+ },
+ "keytab": {
+"file": "${keytab_dir}/flume.service.keytab",
+"owner": {
+ "name": "${flume-env/flume_user}",
+ "access": "r"
+},
+"group": {
+ "name": "${cluster-env/user_group}",
+ "access": ""
+},
+"configuration": "flume-env/flume_keytab_path"
+ }
+}
+ ],
+ "configurations": [
+{
+ "core-site": {
+"hadoop.proxyuser.flume.groups":
"${hadoop-env/proxyuser_group}",
+"hadoop.proxyuser.flume.hosts": "*"
+ }
+}
+ ]
+}
+ ]
+}
+ ]
+}
http://git-wip-us.apache.org/repos/asf/ambari/blob/d77f3a54/ambari-server/src/main/resources/common-services/FLUME/1.4.0.2.0/package/scripts/flume_check.py
--
diff --git
a/ambari-server/src/main/resources/common-services/FLUME/1.4.0.2.0/package/scripts/flume_check.py
b/ambari-server/src/main/resources/common-services/FLUME/1.4.0.2.0/package/scripts/flume_check.py
index c5450bb..80f4de2 100644
---
a/ambari-server/src/main/resources/common-services/FLUME/1.4.0.2.0/package/scripts/flume_check.py
+++
b/ambari-server/src/main/resources/common-services/FLUME/1.4.0.2.0/package/scripts/flume_check.py
@@ -38,11 +38,11 @@ class FlumeServiceCheck(Script):
import params
env.set_params(params)
if params.security_enabled:
- principal_replaced = params.http_principal.replace("_HOST",
params.hostname)
- Execute(format("{kinit_path_local} -kt {http_keytab}
{principal_replaced}"),
- user=params.smoke_user)
+ Execute(format("{kinit_path_local} -kt {smoke_user_keytab}
{smokeuser_principal}"),
+ user=params.smokeuser)
Execute(format('env JAVA_HOME={java_home} {flume_bin} version'),
+user=params.smokeuser,
logoutput=True,
tries = 3,
try_sleep = 20)
http://git-wip-us.apache.org/repos/asf/ambari/blob/d77f3a54/ambari-server/src/main/resources/common-services/FLUME/1.4.0.2.0/package/scripts/params.py
--
diff --git
a/ambari-server/src/main/resources/common-services/FLUME/1.4.0.2.0/package/scripts/params.py
b/ambari-server/
ambari git commit: AMBARI-19657: Downgrade button does not work after restart Ambari server when upgrade wizard was left open (dili)
Repository: ambari
Updated Branches:
refs/heads/trunk a51ede848 -> 7b0ee28ef
AMBARI-19657: Downgrade button does not work after restart Ambari server when
upgrade wizard was left open (dili)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/7b0ee28e
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/7b0ee28e
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/7b0ee28e
Branch: refs/heads/trunk
Commit: 7b0ee28ef2a313335ff81ef62574c37ca6fe1347
Parents: a51ede8
Author: Di Li
Authored: Mon Jan 23 15:26:52 2017 -0500
Committer: Di Li
Committed: Mon Jan 23 15:26:52 2017 -0500
--
.../main/admin/stack_and_upgrade_controller.js | 21 +---
1 file changed, 14 insertions(+), 7 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/7b0ee28e/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 4f88d2f..a585615 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
@@ -385,13 +385,7 @@ App.MainAdminStackAndUpgradeController =
Em.Controller.extend(App.LocalStorage,
self.loadStackVersionsToModel(true).done(function () {
self.loadRepoVersionsToModel().done(function() {
self.loadCompatibleVersions().done(function() {
-var currentVersion = App.StackVersion.find().findProperty('state',
'CURRENT');
-if (currentVersion) {
- self.set('currentVersion', {
-repository_version:
currentVersion.get('repositoryVersion.repositoryVersion'),
-repository_name:
currentVersion.get('repositoryVersion.displayName')
- });
-}
+self.updateCurrentStackVersion();
dfd.resolve();
});
});
@@ -400,6 +394,16 @@ App.MainAdminStackAndUpgradeController =
Em.Controller.extend(App.LocalStorage,
return dfd.promise();
},
+ updateCurrentStackVersion: function(){
+var currentVersion = App.StackVersion.find().findProperty('state',
'CURRENT');
+if (currentVersion) {
+ this.set('currentVersion', {
+repository_version:
currentVersion.get('repositoryVersion.repositoryVersion'),
+repository_name: currentVersion.get('repositoryVersion.displayName')
+ });
+}
+ },
+
/**
* load upgrade tasks by upgrade id
* @return {$.Deferred}
@@ -656,6 +660,9 @@ App.MainAdminStackAndUpgradeController =
Em.Controller.extend(App.LocalStorage,
*/
confirmDowngrade: function (event) {
var self = this;
+if(!this.get('currentVersion')){
+ this.updateCurrentStackVersion();
+}
var currentVersion = this.get('currentVersion');
return App.showConfirmationPopup(
function() {
ambari git commit: AMBARI-19636: Provide default values for Kafka nofile and nproc limit properties (dili)
Repository: ambari
Updated Branches:
refs/heads/trunk 918fd597b -> b2d78ac5f
AMBARI-19636: Provide default values for Kafka nofile and nproc limit
properties (dili)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/b2d78ac5
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/b2d78ac5
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/b2d78ac5
Branch: refs/heads/trunk
Commit: b2d78ac5f3136bc9d55e3f8806726146278bd654
Parents: 918fd59
Author: Di Li
Authored: Mon Jan 23 12:03:55 2017 -0500
Committer: Di Li
Committed: Mon Jan 23 12:03:55 2017 -0500
--
.../common-services/KAFKA/0.8.1/package/scripts/params.py| 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/b2d78ac5/ambari-server/src/main/resources/common-services/KAFKA/0.8.1/package/scripts/params.py
--
diff --git
a/ambari-server/src/main/resources/common-services/KAFKA/0.8.1/package/scripts/params.py
b/ambari-server/src/main/resources/common-services/KAFKA/0.8.1/package/scripts/params.py
index 6c7ff69..1d3a195 100644
---
a/ambari-server/src/main/resources/common-services/KAFKA/0.8.1/package/scripts/params.py
+++
b/ambari-server/src/main/resources/common-services/KAFKA/0.8.1/package/scripts/params.py
@@ -76,8 +76,8 @@ limits_conf_dir = "/etc/security/limits.d"
# Used while upgrading the stack in a kerberized cluster and running
kafka-acls.sh
zookeeper_connect = default("/configurations/kafka-broker/zookeeper.connect",
None)
-kafka_user_nofile_limit =
config['configurations']['kafka-env']['kafka_user_nofile_limit']
-kafka_user_nproc_limit =
config['configurations']['kafka-env']['kafka_user_nproc_limit']
+kafka_user_nofile_limit =
default('/configurations/kafka-env/kafka_user_nofile_limit', 128000)
+kafka_user_nproc_limit =
default('/configurations/kafka-env/kafka_user_nproc_limit', 65536)
# parameters for 2.2+
if stack_version_formatted and
check_stack_feature(StackFeature.ROLLING_UPGRADE, stack_version_formatted):
ambari git commit: AMBARI-19615 clearer error messages for stack_select.py when a role doesn't have a select component name (dili)
Repository: ambari
Updated Branches:
refs/heads/trunk 7df6416e4 -> ab4bbb647
AMBARI-19615 clearer error messages for stack_select.py when a role doesn't
have a select component name (dili)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/ab4bbb64
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/ab4bbb64
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/ab4bbb64
Branch: refs/heads/trunk
Commit: ab4bbb647a0298207b25393056d610136e3593b9
Parents: 7df6416
Author: Di Li
Authored: Thu Jan 19 12:20:06 2017 -0500
Committer: Di Li
Committed: Thu Jan 19 12:20:06 2017 -0500
--
.../resource_management/libraries/functions/stack_select.py | 5 -
1 file changed, 4 insertions(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/ab4bbb64/ambari-common/src/main/python/resource_management/libraries/functions/stack_select.py
--
diff --git
a/ambari-common/src/main/python/resource_management/libraries/functions/stack_select.py
b/ambari-common/src/main/python/resource_management/libraries/functions/stack_select.py
index 4f6ccd2..f0cdc48 100644
---
a/ambari-common/src/main/python/resource_management/libraries/functions/stack_select.py
+++
b/ambari-common/src/main/python/resource_management/libraries/functions/stack_select.py
@@ -178,7 +178,10 @@ def get_role_component_current_stack_version():
stack_select_component = SERVICE_CHECK_DIRECTORY_MAP[role]
if stack_select_component is None:
-Logger.error("Mapping unavailable for role {0}. Skip checking its
version.".format(role))
+if not role:
+ Logger.error("No role information available.")
+elif not role.lower().endswith("client"):
+ Logger.error("Mapping unavailable for role {0}. Skip checking its
version.".format(role))
return None
current_stack_version = get_stack_version(stack_select_component)
ambari git commit: AMBARI-19537: Provide default value for yarn leveldb state store path (dili)
Repository: ambari
Updated Branches:
refs/heads/trunk e78b92b8d -> 7301a8031
AMBARI-19537: Provide default value for yarn leveldb state store path (dili)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/7301a803
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/7301a803
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/7301a803
Branch: refs/heads/trunk
Commit: 7301a803190261608769e232d2da7505f20aa9ae
Parents: e78b92b
Author: Di Li
Authored: Mon Jan 16 14:35:00 2017 -0500
Committer: Di Li
Committed: Mon Jan 16 14:35:00 2017 -0500
--
.../common-services/YARN/2.1.0.2.0/package/scripts/params_linux.py | 2 +-
.../common-services/YARN/3.0.0.3.0/package/scripts/params_linux.py | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/7301a803/ambari-server/src/main/resources/common-services/YARN/2.1.0.2.0/package/scripts/params_linux.py
--
diff --git
a/ambari-server/src/main/resources/common-services/YARN/2.1.0.2.0/package/scripts/params_linux.py
b/ambari-server/src/main/resources/common-services/YARN/2.1.0.2.0/package/scripts/params_linux.py
index 2fb7bff..177e0e0 100644
---
a/ambari-server/src/main/resources/common-services/YARN/2.1.0.2.0/package/scripts/params_linux.py
+++
b/ambari-server/src/main/resources/common-services/YARN/2.1.0.2.0/package/scripts/params_linux.py
@@ -119,7 +119,7 @@ if stack_supports_ru:
if stack_supports_timeline_state_store:
# Timeline Service property that was added timeline_state_store stack feature
- ats_leveldb_state_store_dir =
config['configurations']['yarn-site']['yarn.timeline-service.leveldb-state-store.path']
+ ats_leveldb_state_store_dir =
default('/configurations/yarn-site/yarn.timeline-service.leveldb-state-store.path',
'/hadoop/yarn/timeline')
# ats 1.5 properties
entity_groupfs_active_dir =
config['configurations']['yarn-site']['yarn.timeline-service.entity-group-fs-store.active-dir']
http://git-wip-us.apache.org/repos/asf/ambari/blob/7301a803/ambari-server/src/main/resources/common-services/YARN/3.0.0.3.0/package/scripts/params_linux.py
--
diff --git
a/ambari-server/src/main/resources/common-services/YARN/3.0.0.3.0/package/scripts/params_linux.py
b/ambari-server/src/main/resources/common-services/YARN/3.0.0.3.0/package/scripts/params_linux.py
index 23a25a0..236b132 100644
---
a/ambari-server/src/main/resources/common-services/YARN/3.0.0.3.0/package/scripts/params_linux.py
+++
b/ambari-server/src/main/resources/common-services/YARN/3.0.0.3.0/package/scripts/params_linux.py
@@ -119,7 +119,7 @@ if stack_supports_ru:
if stack_supports_timeline_state_store:
# Timeline Service property that was added timeline_state_store stack feature
- ats_leveldb_state_store_dir =
config['configurations']['yarn-site']['yarn.timeline-service.leveldb-state-store.path']
+ ats_leveldb_state_store_dir =
default('/configurations/yarn-site/yarn.timeline-service.leveldb-state-store.path',
'/hadoop/yarn/timeline')
# ats 1.5 properties
entity_groupfs_active_dir =
config['configurations']['yarn-site']['yarn.timeline-service.entity-group-fs-store.active-dir']
ambari git commit: AMBARI-19446: Able to skip writing configuration files when the config type doesn't exist in the command JSON file (dili
Repository: ambari
Updated Branches:
refs/heads/trunk 439372473 -> e78b92b8d
AMBARI-19446: Able to skip writing configuration files when the config type
doesn't exist in the command JSON file (dili
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/e78b92b8
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/e78b92b8
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/e78b92b8
Branch: refs/heads/trunk
Commit: e78b92b8da7e573848b26cae951195a46fed2cff
Parents: 4393724
Author: Di Li
Authored: Mon Jan 16 14:23:41 2017 -0500
Committer: Di Li
Committed: Mon Jan 16 14:23:41 2017 -0500
--
.../libraries/functions/get_config.py | 45
.../HIVE/0.12.0.2.0/package/scripts/hive.py | 17 +---
.../KNOX/0.5.0.2.2/package/scripts/knox.py | 35 +--
.../0.5.0.2.2/package/scripts/params_linux.py | 2 +-
.../0.5.0.2.2/package/scripts/params_windows.py | 2 +-
.../SQOOP/1.4.4.2.0/package/scripts/sqoop.py| 21 +
6 files changed, 90 insertions(+), 32 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/e78b92b8/ambari-common/src/main/python/resource_management/libraries/functions/get_config.py
--
diff --git
a/ambari-common/src/main/python/resource_management/libraries/functions/get_config.py
b/ambari-common/src/main/python/resource_management/libraries/functions/get_config.py
new file mode 100644
index 000..57af51f
--- /dev/null
+++
b/ambari-common/src/main/python/resource_management/libraries/functions/get_config.py
@@ -0,0 +1,45 @@
+#!/usr/bin/env python
+"""
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License. You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+
+Ambari Agent
+
+"""
+
+from resource_management.core.logger import Logger
+
+__all__ = ["get_config"]
+
+def get_config(config_type, default=None):
+ """
+ @param config_type: config_type
+ """
+
+ import params
+ if params.config:
+all_configurations = params.config.get('configurations', default)
+if all_configurations:
+ config = all_configurations.get(config_type, default)
+ if not config:
+Logger.warning("No configurations for config type {0}. Use default
instead.".format(config_type))
+ return config
+else:
+ Logger.warning("No service configurations available in the
\"configurations\" section. Use default instead.".format(config_type))
+ return default
+ else:
+Logger.warning("No service configurations available. Use default
instead.".format(config_type))
+return default
http://git-wip-us.apache.org/repos/asf/ambari/blob/e78b92b8/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/hive.py
--
diff --git
a/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/hive.py
b/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/hive.py
index 0db3faf..f825982 100644
---
a/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/hive.py
+++
b/ambari-server/src/main/resources/common-services/HIVE/0.12.0.2.0/package/scripts/hive.py
@@ -25,6 +25,7 @@ from urlparse import urlparse
from resource_management.libraries.script.script import Script
from resource_management.libraries.resources.hdfs_resource import HdfsResource
from resource_management.libraries.functions.copy_tarball import copy_to_hdfs
+from resource_management.libraries.functions.get_config import get_config
from resource_management.libraries.functions import StackFeature
from resource_management.libraries.functions.stack_features import
check_stack_feature
from resource_management.core.resources.service import ServiceConfig
@@ -270,13 +271,15 @@ def setup_metastore():
import params
if params.hive_metastore_site_supported:
-XmlConfig("hivemet
ambari git commit: AMBARI-19289 HDFS Service check fails if previous active NN is down (Weiwei Yang via dili)
Repository: ambari
Updated Branches:
refs/heads/trunk 0ee059daf -> fb50d88f1
AMBARI-19289 HDFS Service check fails if previous active NN is down (Weiwei
Yang via dili)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/fb50d88f
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/fb50d88f
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/fb50d88f
Branch: refs/heads/trunk
Commit: fb50d88f182d02c36a27185142cab6c9e4b3659c
Parents: 0ee059d
Author: Di Li
Authored: Fri Jan 13 10:50:15 2017 -0500
Committer: Di Li
Committed: Fri Jan 13 10:50:15 2017 -0500
--
.../2.1.0.2.0/package/scripts/service_check.py | 24
.../3.0.0.3.0/package/scripts/service_check.py | 24
.../stacks/2.0.6/HDFS/test_service_check.py | 16 ++---
3 files changed, 38 insertions(+), 26 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/fb50d88f/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/package/scripts/service_check.py
--
diff --git
a/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/package/scripts/service_check.py
b/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/package/scripts/service_check.py
index 47fc646..24497d0 100644
---
a/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/package/scripts/service_check.py
+++
b/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/package/scripts/service_check.py
@@ -43,20 +43,26 @@ class HdfsServiceCheckDefault(HdfsServiceCheck):
dir = params.hdfs_tmp_dir
tmp_file = format("{dir}/{unique}")
-safemode_command = format("dfsadmin -fs {namenode_address} -safemode get |
grep OFF")
+"""
+Ignore checking safemode, because this command is unable to get safemode
state
+when 1 namenode is down in an HA setup (see more in HDFS-8277). Directly
+test HDFS availability by file system operations is consistent in both HA
and
+non-HA environment.
+"""
+# safemode_command = format("dfsadmin -fs {namenode_address} -safemode get
| grep OFF")
if params.security_enabled:
Execute(format("{kinit_path_local} -kt {hdfs_user_keytab}
{hdfs_principal_name}"),
user=params.hdfs_user
)
-ExecuteHadoop(safemode_command,
- user=params.hdfs_user,
- logoutput=True,
- conf_dir=params.hadoop_conf_dir,
- try_sleep=3,
- tries=20,
- bin_dir=params.hadoop_bin_dir
-)
+#ExecuteHadoop(safemode_command,
+# user=params.hdfs_user,
+# logoutput=True,
+# conf_dir=params.hadoop_conf_dir,
+# try_sleep=3,
+# tries=20,
+# bin_dir=params.hadoop_bin_dir
+#)
params.HdfsResource(dir,
type="directory",
action="create_on_execute",
http://git-wip-us.apache.org/repos/asf/ambari/blob/fb50d88f/ambari-server/src/main/resources/common-services/HDFS/3.0.0.3.0/package/scripts/service_check.py
--
diff --git
a/ambari-server/src/main/resources/common-services/HDFS/3.0.0.3.0/package/scripts/service_check.py
b/ambari-server/src/main/resources/common-services/HDFS/3.0.0.3.0/package/scripts/service_check.py
index 981f002..4348c1e 100644
---
a/ambari-server/src/main/resources/common-services/HDFS/3.0.0.3.0/package/scripts/service_check.py
+++
b/ambari-server/src/main/resources/common-services/HDFS/3.0.0.3.0/package/scripts/service_check.py
@@ -43,20 +43,26 @@ class HdfsServiceCheckDefault(HdfsServiceCheck):
dir = params.hdfs_tmp_dir
tmp_file = format("{dir}/{unique}")
-safemode_command = format("dfsadmin -fs {namenode_address} -safemode get |
grep OFF")
+"""
+Ignore checking safemode, because this command is unable to get safemode
state
+when 1 namenode is down in an HA setup (see more in HDFS-8277). Directly
+test HDFS availability by file system operations is consistent in both HA
and
+non-HA environment.
+"""
+# safemode_command = format("dfsadmin -fs {namenode_address} -safemode get
| grep OFF")
if params.security_enabled:
Execute(format("{kinit_path_local} -kt {hdfs_user_keytab}
{hdfs_principal_name}"),
user=params.hdfs_user
)
-ExecuteHadoop(safemode_command,
- user=params.hdfs_user,
- logoutput=True,
- conf_d
ambari git commit: AMBARI-19250 Change default Spark configuration property in Oozie configuration settings (Ping Wang via dili)
Repository: ambari
Updated Branches:
refs/heads/trunk e5d17bc75 -> 0ee059daf
AMBARI-19250 Change default Spark configuration property in Oozie configuration
settings (Ping Wang via dili)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/0ee059da
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/0ee059da
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/0ee059da
Branch: refs/heads/trunk
Commit: 0ee059dafef75a757c0fb4c97b14cb1f66e1d486
Parents: e5d17bc
Author: Di Li
Authored: Fri Jan 13 10:42:15 2017 -0500
Committer: Di Li
Committed: Fri Jan 13 10:42:15 2017 -0500
--
.../OOZIE/4.0.0.2.0/package/scripts/params_linux.py | 3 +++
.../common-services/OOZIE/4.2.0.2.5/configuration/oozie-site.xml | 2 +-
2 files changed, 4 insertions(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/0ee059da/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 4d09d94..f9c608e 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
@@ -68,6 +68,9 @@ hadoop_conf_dir = conf_select.get_hadoop_conf_dir()
hadoop_bin_dir = stack_select.get_hadoop_dir("bin")
hadoop_lib_home = stack_select.get_hadoop_dir("lib")
+#spark_conf
+spark_conf_dir = format("{stack_root}/current/spark-client/conf")
+
#hadoop params
if stack_version_formatted and
check_stack_feature(StackFeature.ROLLING_UPGRADE,stack_version_formatted):
stack_version = None
http://git-wip-us.apache.org/repos/asf/ambari/blob/0ee059da/ambari-server/src/main/resources/common-services/OOZIE/4.2.0.2.5/configuration/oozie-site.xml
--
diff --git
a/ambari-server/src/main/resources/common-services/OOZIE/4.2.0.2.5/configuration/oozie-site.xml
b/ambari-server/src/main/resources/common-services/OOZIE/4.2.0.2.5/configuration/oozie-site.xml
index cdb6972..dd4cfc9 100644
---
a/ambari-server/src/main/resources/common-services/OOZIE/4.2.0.2.5/configuration/oozie-site.xml
+++
b/ambari-server/src/main/resources/common-services/OOZIE/4.2.0.2.5/configuration/oozie-site.xml
@@ -19,7 +19,7 @@
oozie.service.SparkConfigurationService.spark.configurations
-*=spark-conf
+*={{spark_conf_dir}}
Comma separated AUTHORITY=SPARK_CONF_DIR, where AUTHORITY is the
HOST:PORT of the ResourceManager of a YARN cluster. The wildcard '*'
ambari git commit: AMBARI-19407: Provide default values for oozie nproc_limit and nofile_limit configuration (dili)
Repository: ambari
Updated Branches:
refs/heads/trunk 8258cf893 -> c1acfac7e
AMBARI-19407: Provide default values for oozie nproc_limit and nofile_limit
configuration (dili)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/c1acfac7
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/c1acfac7
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/c1acfac7
Branch: refs/heads/trunk
Commit: c1acfac7e8b041cb9ddcb45c9a1115286b8a6b45
Parents: 8258cf8
Author: Di Li
Authored: Mon Jan 9 15:02:50 2017 -0500
Committer: Di Li
Committed: Mon Jan 9 15:02:50 2017 -0500
--
.../OOZIE/4.0.0.2.0/package/scripts/params_linux.py | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/c1acfac7/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 4cdd280..4d09d94 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
@@ -143,8 +143,8 @@ oozie_permsize =
config['configurations']['oozie-env']['oozie_permsize']
limits_conf_dir = "/etc/security/limits.d"
-oozie_user_nofile_limit =
config['configurations']['oozie-env']['oozie_user_nofile_limit']
-oozie_user_nproc_limit =
config['configurations']['oozie-env']['oozie_user_nproc_limit']
+oozie_user_nofile_limit =
default('/configurations/oozie-env/oozie_user_nofile_limit', 32000)
+oozie_user_nproc_limit =
default('/configurations/oozie-env/oozie_user_nproc_limit', 16000)
kinit_path_local =
get_kinit_path(default('/configurations/kerberos-env/executable_search_paths',
None))
oozie_service_keytab =
config['configurations']['oozie-site']['oozie.service.HadoopAccessorService.keytab.file']
ambari git commit: AMBARI-19406: Provide default value for hbase java io tmp dir (dili)
Repository: ambari
Updated Branches:
refs/heads/trunk 87fa076ec -> 6e9b4be25
AMBARI-19406: Provide default value for hbase java io tmp dir (dili)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/6e9b4be2
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/6e9b4be2
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/6e9b4be2
Branch: refs/heads/trunk
Commit: 6e9b4be25ece4d9023c98283f9a88051bf8e81ea
Parents: 87fa076
Author: Di Li
Authored: Mon Jan 9 14:45:36 2017 -0500
Committer: Di Li
Committed: Mon Jan 9 14:45:36 2017 -0500
--
.../HBASE/0.96.0.2.0/package/scripts/params_linux.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/6e9b4be2/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/package/scripts/params_linux.py
--
diff --git
a/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/package/scripts/params_linux.py
b/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/package/scripts/params_linux.py
index 8eed2d5..e27fd72 100644
---
a/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/package/scripts/params_linux.py
+++
b/ambari-server/src/main/resources/common-services/HBASE/0.96.0.2.0/package/scripts/params_linux.py
@@ -115,7 +115,7 @@ java64_home = config['hostLevelParams']['java_home']
java_version = expect("/hostLevelParams/java_version", int)
log_dir = config['configurations']['hbase-env']['hbase_log_dir']
-java_io_tmpdir = config['configurations']['hbase-env']['hbase_java_io_tmpdir']
+java_io_tmpdir = default("/configurations/hbase-env/hbase_java_io_tmpdir",
"/tmp")
master_heapsize =
ensure_unit_for_memory(config['configurations']['hbase-env']['hbase_master_heapsize'])
regionserver_heapsize =
ensure_unit_for_memory(config['configurations']['hbase-env']['hbase_regionserver_heapsize'])
ambari git commit: AMBARI-19247 Add log to stack_select for details on which role to get version info (dili)
Repository: ambari
Updated Branches:
refs/heads/trunk 688830c63 -> 51c4f92c1
AMBARI-19247 Add log to stack_select for details on which role to get version
info (dili)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/51c4f92c
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/51c4f92c
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/51c4f92c
Branch: refs/heads/trunk
Commit: 51c4f92c12c876119cca0f0fc0269597c004dba1
Parents: 688830c
Author: Di Li
Authored: Tue Dec 20 15:41:29 2016 -0500
Committer: Di Li
Committed: Tue Dec 20 15:41:29 2016 -0500
--
.../resource_management/libraries/functions/stack_select.py | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/51c4f92c/ambari-common/src/main/python/resource_management/libraries/functions/stack_select.py
--
diff --git
a/ambari-common/src/main/python/resource_management/libraries/functions/stack_select.py
b/ambari-common/src/main/python/resource_management/libraries/functions/stack_select.py
index 513ceac..4f6ccd2 100644
---
a/ambari-common/src/main/python/resource_management/libraries/functions/stack_select.py
+++
b/ambari-common/src/main/python/resource_management/libraries/functions/stack_select.py
@@ -171,13 +171,14 @@ def get_role_component_current_stack_version():
role = default("/role", "")
role_command = default("/roleCommand", "")
stack_selector_name =
stack_tools.get_stack_tool_name(stack_tools.STACK_SELECTOR_NAME)
-
+ Logger.info("Checking version for {0} via {1}".format(role,
stack_selector_name))
if role in SERVER_ROLE_DIRECTORY_MAP:
stack_select_component = SERVER_ROLE_DIRECTORY_MAP[role]
elif role_command == "SERVICE_CHECK" and role in SERVICE_CHECK_DIRECTORY_MAP:
stack_select_component = SERVICE_CHECK_DIRECTORY_MAP[role]
if stack_select_component is None:
+Logger.error("Mapping unavailable for role {0}. Skip checking its
version.".format(role))
return None
current_stack_version = get_stack_version(stack_select_component)
ambari git commit: AMBARI-19225 Ambari server should prints error messages to its log if it can't find property for given property attribute type (dili)
Repository: ambari
Updated Branches:
refs/heads/trunk 64f3b39ba -> c01f4d809
AMBARI-19225 Ambari server should prints error messages to its log if it can't
find property for given property attribute type (dili)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/c01f4d80
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/c01f4d80
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/c01f4d80
Branch: refs/heads/trunk
Commit: c01f4d809dfd4134fa789fd0496d73877117ba14
Parents: 64f3b39
Author: Di Li
Authored: Tue Dec 20 12:01:13 2016 -0500
Committer: Di Li
Committed: Tue Dec 20 12:01:13 2016 -0500
--
.../org/apache/ambari/server/state/ConfigHelper.java | 13 -
1 file changed, 12 insertions(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/c01f4d80/ambari-server/src/main/java/org/apache/ambari/server/state/ConfigHelper.java
--
diff --git
a/ambari-server/src/main/java/org/apache/ambari/server/state/ConfigHelper.java
b/ambari-server/src/main/java/org/apache/ambari/server/state/ConfigHelper.java
index 54752f9..7e75469 100644
---
a/ambari-server/src/main/java/org/apache/ambari/server/state/ConfigHelper.java
+++
b/ambari-server/src/main/java/org/apache/ambari/server/state/ConfigHelper.java
@@ -551,7 +551,18 @@ public class ConfigHelper {
if (serviceProperty.getPropertyTypes().contains(propertyType)) {
String stackPropertyConfigType =
fileNameToConfigType(serviceProperty.getFilename());
try {
-
result.add(actualConfigs.get(stackPropertyConfigType).getProperties().get(serviceProperty.getName()));
+String property =
actualConfigs.get(stackPropertyConfigType).getProperties().get(serviceProperty.getName());
+if (null == property){
+ LOG.error(String.format("Unable to obtain property values for %s
with property attribute %s. "
+ + "The property does not exist in version %s of %s
configuration.",
+ serviceProperty.getName(),
+ propertyType,
+ desiredConfigs.get(stackPropertyConfigType),
+ stackPropertyConfigType
+ ));
+} else {
+ result.add(property);
+}
} catch (Exception ignored) {
}
}
ambari git commit: AMBARI-19226: Provide default value for hdfs_tmp_dir parameter in params.py scripts (dili)
Repository: ambari
Updated Branches:
refs/heads/trunk d1317dfba -> 64f3b39ba
AMBARI-19226: Provide default value for hdfs_tmp_dir parameter in params.py
scripts (dili)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/64f3b39b
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/64f3b39b
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/64f3b39b
Branch: refs/heads/trunk
Commit: 64f3b39ba3bcef59cdca94b3b29dde37feb0e7f0
Parents: d1317df
Author: Di Li
Authored: Tue Dec 20 11:36:15 2016 -0500
Committer: Di Li
Committed: Tue Dec 20 11:36:15 2016 -0500
--
.../common-services/HDFS/2.1.0.2.0/package/scripts/params_linux.py | 2 +-
.../common-services/HDFS/3.0.0.3.0/package/scripts/params_linux.py | 2 +-
.../common-services/YARN/2.1.0.2.0/package/scripts/params_linux.py | 2 +-
.../common-services/YARN/3.0.0.3.0/package/scripts/params_linux.py | 2 +-
.../stacks/HDP/2.0.6/hooks/before-START/scripts/params.py | 2 +-
.../resources/stacks/HDP/3.0/hooks/before-START/scripts/params.py | 2 +-
6 files changed, 6 insertions(+), 6 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/64f3b39b/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/package/scripts/params_linux.py
--
diff --git
a/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/package/scripts/params_linux.py
b/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/package/scripts/params_linux.py
index 7567ab4..b04fce3 100644
---
a/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/package/scripts/params_linux.py
+++
b/ambari-server/src/main/resources/common-services/HDFS/2.1.0.2.0/package/scripts/params_linux.py
@@ -92,7 +92,7 @@ dfs_http_policy =
default('/configurations/hdfs-site/dfs.http.policy', None)
dfs_dn_ipc_address =
config['configurations']['hdfs-site']['dfs.datanode.ipc.address']
secure_dn_ports_are_in_use = False
-hdfs_tmp_dir = config['configurations']['hadoop-env']['hdfs_tmp_dir']
+hdfs_tmp_dir = default("/configurations/hadoop-env/hdfs_tmp_dir", "/tmp")
namenode_backup_dir =
default("/configurations/hadoop-env/namenode_backup_dir", "/tmp/upgrades")
# hadoop default parameters
http://git-wip-us.apache.org/repos/asf/ambari/blob/64f3b39b/ambari-server/src/main/resources/common-services/HDFS/3.0.0.3.0/package/scripts/params_linux.py
--
diff --git
a/ambari-server/src/main/resources/common-services/HDFS/3.0.0.3.0/package/scripts/params_linux.py
b/ambari-server/src/main/resources/common-services/HDFS/3.0.0.3.0/package/scripts/params_linux.py
index 55544e0..512ca27 100644
---
a/ambari-server/src/main/resources/common-services/HDFS/3.0.0.3.0/package/scripts/params_linux.py
+++
b/ambari-server/src/main/resources/common-services/HDFS/3.0.0.3.0/package/scripts/params_linux.py
@@ -89,7 +89,7 @@ dfs_http_policy =
default('/configurations/hdfs-site/dfs.http.policy', None)
dfs_dn_ipc_address =
config['configurations']['hdfs-site']['dfs.datanode.ipc.address']
secure_dn_ports_are_in_use = False
-hdfs_tmp_dir = config['configurations']['hadoop-env']['hdfs_tmp_dir']
+hdfs_tmp_dir = default("/configurations/hadoop-env/hdfs_tmp_dir", "/tmp")
namenode_backup_dir =
default("/configurations/hadoop-env/namenode_backup_dir", "/tmp/upgrades")
# hadoop default parameters
http://git-wip-us.apache.org/repos/asf/ambari/blob/64f3b39b/ambari-server/src/main/resources/common-services/YARN/2.1.0.2.0/package/scripts/params_linux.py
--
diff --git
a/ambari-server/src/main/resources/common-services/YARN/2.1.0.2.0/package/scripts/params_linux.py
b/ambari-server/src/main/resources/common-services/YARN/2.1.0.2.0/package/scripts/params_linux.py
index bebb375..6bf2927 100644
---
a/ambari-server/src/main/resources/common-services/YARN/2.1.0.2.0/package/scripts/params_linux.py
+++
b/ambari-server/src/main/resources/common-services/YARN/2.1.0.2.0/package/scripts/params_linux.py
@@ -143,7 +143,7 @@ ulimit_cmd = "ulimit -c unlimited;"
mapred_user = status_params.mapred_user
yarn_user = status_params.yarn_user
hdfs_user = config['configurations']['hadoop-env']['hdfs_user']
-hdfs_tmp_dir = config['configurations']['hadoop-env']['hdfs_tmp_dir']
+hdfs_tmp_dir = default("/configurations/hadoop-env/hdfs_tmp_dir", "/tmp")
ambari git commit: AMBARI-19156 Install Packages fails with the old stack has services removed in the new stack (dili)
Repository: ambari
Updated Branches:
refs/heads/branch-2.5 98c5d9844 -> a74bf6b2b
AMBARI-19156 Install Packages fails with the old stack has services removed in
the new stack (dili)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/a74bf6b2
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/a74bf6b2
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/a74bf6b2
Branch: refs/heads/branch-2.5
Commit: a74bf6b2b943642d579f497747adf385ae2340a1
Parents: 98c5d98
Author: Di Li
Authored: Wed Dec 14 15:08:13 2016 -0500
Committer: Di Li
Committed: Wed Dec 14 16:01:12 2016 -0500
--
.../server/api/services/AmbariMetaInfo.java | 6
.../ClusterStackVersionResourceProvider.java| 9 +
.../apache/ambari/server/stack/BaseModule.java | 2 +-
.../ambari/server/stack/ExtensionModule.java| 6 ++--
.../ambari/server/stack/ServiceModule.java | 6 ++--
.../apache/ambari/server/stack/StackModule.java | 20 ---
.../apache/ambari/server/state/StackInfo.java | 12 +++
.../AmbariManagementControllerTest.java | 2 +-
.../ambari/server/stack/StackManagerTest.java | 38 ++--
.../ambari/server/stack/StackModuleTest.java| 11 ++
.../HDP/2.0.6/services/SPARK/metainfo.xml | 33 +
.../HDP/2.0.7/services/SPARK/metainfo.xml | 34 ++
.../HDP/2.0.7/services/SPARK2/metainfo.xml | 33 +
.../HDP/2.0.8/services/SPARK2/metainfo.xml | 34 ++
.../HDP/2.0.8/services/SPARK3/metainfo.xml | 33 +
15 files changed, 265 insertions(+), 14 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/a74bf6b2/ambari-server/src/main/java/org/apache/ambari/server/api/services/AmbariMetaInfo.java
--
diff --git
a/ambari-server/src/main/java/org/apache/ambari/server/api/services/AmbariMetaInfo.java
b/ambari-server/src/main/java/org/apache/ambari/server/api/services/AmbariMetaInfo.java
index 92d47df..2d13cba 100644
---
a/ambari-server/src/main/java/org/apache/ambari/server/api/services/AmbariMetaInfo.java
+++
b/ambari-server/src/main/java/org/apache/ambari/server/api/services/AmbariMetaInfo.java
@@ -540,6 +540,12 @@ public class AmbariMetaInfo {
return service;
}
+ public boolean isServiceRemovedInStack(String stackName, String version,
String serviceName) throws AmbariException{
+StackInfo stack = getStack(stackName, version);
+List removedServices = stack.getRemovedServices();
+return removedServices.contains(serviceName);
+ }
+
public Collection getMonitoringServiceNames(String stackName, String
version)
throws AmbariException{
http://git-wip-us.apache.org/repos/asf/ambari/blob/a74bf6b2/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ClusterStackVersionResourceProvider.java
--
diff --git
a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ClusterStackVersionResourceProvider.java
b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ClusterStackVersionResourceProvider.java
index d417ec2..f2fd9ac 100644
---
a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ClusterStackVersionResourceProvider.java
+++
b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ClusterStackVersionResourceProvider.java
@@ -626,6 +626,15 @@ public class ClusterStackVersionResourceProvider extends
AbstractControllerResou
}
List blacklistedPackagePrefixes =
configuration.getRollingUpgradeSkipPackagesPrefixes();
for (String serviceName : servicesOnHost) {
+ try{
+if(ami.isServiceRemovedInStack(stackId.getStackName(),
stackId.getStackVersion(), serviceName)){
+ LOG.info(String.format("%s has been removed from stack %s-%s. Skip
calculating its installation packages", stackId.getStackName(),
stackId.getStackVersion(), serviceName));
+ continue; //No need to calculate install packages for removed
services
+}
+ } catch (AmbariException e1) {
+throw new SystemException(String.format("Cannot obtain stack
information for %s-%s", stackId.getStackName(), stackId.getStackVersion()), e1);
+ }
+
ServiceInfo info;
try {
info = ami.getService(stackId.getStackName(),
stackId.getStackVersion(), serviceName);
http://git-wip-us.apache.org/repos/asf/ambari/blob/a74bf6b2/ambari-server/src/main/java/org/apache/ambari/server/stack/BaseModule.java
--
diff --git
a/ambari-server/src/main/java/org/apache/ambari/server/s
ambari git commit: AMBARI-19156 Install Packages fails with the old stack has services removed in the new stack (dili)
Repository: ambari
Updated Branches:
refs/heads/trunk 7dcabf565 -> 162ee83c5
AMBARI-19156 Install Packages fails with the old stack has services removed in
the new stack (dili)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/162ee83c
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/162ee83c
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/162ee83c
Branch: refs/heads/trunk
Commit: 162ee83c552e2c418cc2ee97dbb3687ffc8e1ae3
Parents: 7dcabf5
Author: Di Li
Authored: Wed Dec 14 15:08:13 2016 -0500
Committer: Di Li
Committed: Wed Dec 14 15:08:13 2016 -0500
--
.../server/api/services/AmbariMetaInfo.java | 6
.../ClusterStackVersionResourceProvider.java| 9 +
.../apache/ambari/server/stack/BaseModule.java | 2 +-
.../ambari/server/stack/ExtensionModule.java| 6 ++--
.../ambari/server/stack/ServiceModule.java | 6 ++--
.../apache/ambari/server/stack/StackModule.java | 20 ---
.../apache/ambari/server/state/StackInfo.java | 12 +++
.../AmbariManagementControllerTest.java | 2 +-
.../ambari/server/stack/StackManagerTest.java | 38 ++--
.../ambari/server/stack/StackModuleTest.java| 11 ++
.../HDP/2.0.6/services/SPARK/metainfo.xml | 33 +
.../HDP/2.0.7/services/SPARK/metainfo.xml | 34 ++
.../HDP/2.0.7/services/SPARK2/metainfo.xml | 33 +
.../HDP/2.0.8/services/SPARK2/metainfo.xml | 34 ++
.../HDP/2.0.8/services/SPARK3/metainfo.xml | 33 +
15 files changed, 265 insertions(+), 14 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/162ee83c/ambari-server/src/main/java/org/apache/ambari/server/api/services/AmbariMetaInfo.java
--
diff --git
a/ambari-server/src/main/java/org/apache/ambari/server/api/services/AmbariMetaInfo.java
b/ambari-server/src/main/java/org/apache/ambari/server/api/services/AmbariMetaInfo.java
index 23a4a27..13f3b9a 100644
---
a/ambari-server/src/main/java/org/apache/ambari/server/api/services/AmbariMetaInfo.java
+++
b/ambari-server/src/main/java/org/apache/ambari/server/api/services/AmbariMetaInfo.java
@@ -549,6 +549,12 @@ public class AmbariMetaInfo {
return service;
}
+ public boolean isServiceRemovedInStack(String stackName, String version,
String serviceName) throws AmbariException{
+StackInfo stack = getStack(stackName, version);
+List removedServices = stack.getRemovedServices();
+return removedServices.contains(serviceName);
+ }
+
public Collection getMonitoringServiceNames(String stackName, String
version)
throws AmbariException{
http://git-wip-us.apache.org/repos/asf/ambari/blob/162ee83c/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ClusterStackVersionResourceProvider.java
--
diff --git
a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ClusterStackVersionResourceProvider.java
b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ClusterStackVersionResourceProvider.java
index d417ec2..f2fd9ac 100644
---
a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ClusterStackVersionResourceProvider.java
+++
b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ClusterStackVersionResourceProvider.java
@@ -626,6 +626,15 @@ public class ClusterStackVersionResourceProvider extends
AbstractControllerResou
}
List blacklistedPackagePrefixes =
configuration.getRollingUpgradeSkipPackagesPrefixes();
for (String serviceName : servicesOnHost) {
+ try{
+if(ami.isServiceRemovedInStack(stackId.getStackName(),
stackId.getStackVersion(), serviceName)){
+ LOG.info(String.format("%s has been removed from stack %s-%s. Skip
calculating its installation packages", stackId.getStackName(),
stackId.getStackVersion(), serviceName));
+ continue; //No need to calculate install packages for removed
services
+}
+ } catch (AmbariException e1) {
+throw new SystemException(String.format("Cannot obtain stack
information for %s-%s", stackId.getStackName(), stackId.getStackVersion()), e1);
+ }
+
ServiceInfo info;
try {
info = ami.getService(stackId.getStackName(),
stackId.getStackVersion(), serviceName);
http://git-wip-us.apache.org/repos/asf/ambari/blob/162ee83c/ambari-server/src/main/java/org/apache/ambari/server/stack/BaseModule.java
--
diff --git
a/ambari-server/src/main/java/org/apache/ambari/server/stack/BaseModul
ambari git commit: AMBARI-19178 HostCleanup can't list process details on RHEL7 (dili)
Repository: ambari
Updated Branches:
refs/heads/trunk 176a1c6ba -> 2fee4286b
AMBARI-19178 HostCleanup can't list process details on RHEL7 (dili)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/2fee4286
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/2fee4286
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/2fee4286
Branch: refs/heads/trunk
Commit: 2fee4286b69153b6f7727bc96bfe13764bebaadc
Parents: 176a1c6
Author: Di Li
Authored: Tue Dec 13 16:20:27 2016 -0500
Committer: Di Li
Committed: Tue Dec 13 16:20:27 2016 -0500
--
ambari-agent/src/main/python/ambari_agent/HostCleanup.py | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/2fee4286/ambari-agent/src/main/python/ambari_agent/HostCleanup.py
--
diff --git a/ambari-agent/src/main/python/ambari_agent/HostCleanup.py
b/ambari-agent/src/main/python/ambari_agent/HostCleanup.py
index 87cd1b0..7ee3b1c 100644
--- a/ambari-agent/src/main/python/ambari_agent/HostCleanup.py
+++ b/ambari-agent/src/main/python/ambari_agent/HostCleanup.py
@@ -373,8 +373,8 @@ class HostCleanup:
def do_kill_processes_by_identifier(self, identifierList):
pidList = []
-cmd = "ps aux"
-(returncode, stdoutdata, stderrdata) = self.run_os_command(cmd, True)
+cmd = "ps auxww"
+(returncode, stdoutdata, stderrdata) = self.run_os_command(cmd)
if 0 == returncode and stdoutdata:
lines = stdoutdata.split('\n')
ambari git commit: AMBARI-19140 Ambari Server symbolic links has double // when root dir is just / (dili)
Repository: ambari
Updated Branches:
refs/heads/branch-2.5 56271c8aa -> bb9200430
AMBARI-19140 Ambari Server symbolic links has double // when root dir is just /
(dili)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/bb920043
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/bb920043
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/bb920043
Branch: refs/heads/branch-2.5
Commit: bb920043077e67a7840fd264d2df306c6213f1e4
Parents: 56271c8
Author: Di Li
Authored: Tue Dec 13 11:53:56 2016 -0500
Committer: Di Li
Committed: Tue Dec 13 12:03:28 2016 -0500
--
ambari-server/conf/unix/install-helper.sh | 9 +
ambari-server/src/main/package/rpm/posttrans_server.sh | 3 +--
ambari-server/src/main/package/rpm/preinstall.sh | 2 +-
3 files changed, 7 insertions(+), 7 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/ambari/blob/bb920043/ambari-server/conf/unix/install-helper.sh
--
diff --git a/ambari-server/conf/unix/install-helper.sh
b/ambari-server/conf/unix/install-helper.sh
index 34ec0e9..8def27a 100644
--- a/ambari-server/conf/unix/install-helper.sh
+++ b/ambari-server/conf/unix/install-helper.sh
@@ -16,7 +16,8 @@
#postinstall.sh#
# SERVER INSTALL HELPER #
##
-ROOT="${RPM_INSTALL_PREFIX}" # Customized folder, which ambari-server files
are installed into ('/' or '' are default).
+ROOT_DIR_PATH="${RPM_INSTALL_PREFIX}"
+ROOT=`echo "${RPM_INSTALL_PREFIX}" | sed 's|/$||g'` # Customized folder, which
ambari-server files are installed into ('/' or '' are default).
COMMON_DIR="${ROOT}/usr/lib/python2.6/site-packages/ambari_commons"
RESOURCE_MANAGEMENT_DIR="${ROOT}/usr/lib/python2.6/site-packages/resource_management"
@@ -100,9 +101,9 @@ do_install(){
ln -s "$AMBARI_PYTHON" "$PYTHON_WRAPER_TARGET"
fi
- sed -i "s|ambari.root.dir\s*=\s*/|ambari.root.dir=${ROOT}|g" "$AMBARI_LOG4J"
- sed -i "s|root_dir\s*=\s*/|root_dir = ${ROOT}|g" "$CA_CONFIG"
- sed -i "s|^ROOT=\"/\"$|ROOT=\"${ROOT}\"|g" "$AMBARI_SERVER_EXECUTABLE"
+ sed -i "s|ambari.root.dir\s*=\s*/|ambari.root.dir=${ROOT_DIR_PATH}|g"
"$AMBARI_LOG4J"
+ sed -i "s|root_dir\s*=\s*/|root_dir = ${ROOT_DIR_PATH}|g" "$CA_CONFIG"
+ sed -i "s|^ROOT=\"/\"$|ROOT=\"${ROOT_DIR_PATH}\"|g"
"$AMBARI_SERVER_EXECUTABLE"
AUTOSTART_SERVER_CMD=""
which chkconfig > /dev/null 2>&1
http://git-wip-us.apache.org/repos/asf/ambari/blob/bb920043/ambari-server/src/main/package/rpm/posttrans_server.sh
--
diff --git a/ambari-server/src/main/package/rpm/posttrans_server.sh
b/ambari-server/src/main/package/rpm/posttrans_server.sh
index a719cae..1384eea 100644
--- a/ambari-server/src/main/package/rpm/posttrans_server.sh
+++ b/ambari-server/src/main/package/rpm/posttrans_server.sh
@@ -13,8 +13,7 @@
# See the License for the specific language governing permissions and
# limitations under the License
-
-ROOT="${RPM_INSTALL_PREFIX}"
+ROOT=`echo "${RPM_INSTALL_PREFIX}" | sed 's|/$||g'`
RESOURCE_MANAGEMENT_DIR="${ROOT}/usr/lib/python2.6/site-packages/resource_management"
RESOURCE_MANAGEMENT_DIR_SERVER="${ROOT}/usr/lib/ambari-server/lib/resource_management"
http://git-wip-us.apache.org/repos/asf/ambari/blob/bb920043/ambari-server/src/main/package/rpm/preinstall.sh
--
diff --git a/ambari-server/src/main/package/rpm/preinstall.sh
b/ambari-server/src/main/package/rpm/preinstall.sh
index b4c4da0..7977ab8 100644
--- a/ambari-server/src/main/package/rpm/preinstall.sh
+++ b/ambari-server/src/main/package/rpm/preinstall.sh
@@ -13,7 +13,7 @@
# See the License for the specific language governing permissions and
# limitations under the License
-ROOT="${RPM_INSTALL_PREFIX}"
+ROOT=`echo "${RPM_INSTALL_PREFIX}" | sed 's|/$||g'`
STACKS_FOLDER="${ROOT}/var/lib/ambari-server/resources/stacks"
STACKS_FOLDER_OLD="${ROOT}/var/lib/ambari-server/resources/stacks_$(date
'+%d_%m_%y_%H_%M').old"
