You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by ol...@apache.org on 2018/08/20 23:02:37 UTC
[ambari] branch branch-2.7 updated: AMBARI-24506. Upgrade: Infra
Solr service is not renamed in Upgrade History table (#2120)
This is an automated email from the ASF dual-hosted git repository.
oleewere pushed a commit to branch branch-2.7
in repository https://gitbox.apache.org/repos/asf/ambari.git
The following commit(s) were added to refs/heads/branch-2.7 by this push:
new f72d088 AMBARI-24506. Upgrade: Infra Solr service is not renamed in Upgrade History table (#2120)
f72d088 is described below
commit f72d08875d131ee1c9aff8a7a303e5264a087553
Author: Olivér Szabó <ol...@gmail.com>
AuthorDate: Tue Aug 21 01:02:34 2018 +0200
AMBARI-24506. Upgrade: Infra Solr service is not renamed in Upgrade History table (#2120)
* AMBARI-24506. Upgrade: Infra Solr service is not renamed in Upgrade History table.
* AMBARI-24506. Simplify name.
---
.../org/apache/ambari/server/upgrade/UpgradeCatalog271.java | 13 +++++++++++--
.../apache/ambari/server/upgrade/UpgradeCatalog271Test.java | 4 ++--
2 files changed, 13 insertions(+), 4 deletions(-)
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog271.java b/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog271.java
index ddb7541..8a30951 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog271.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog271.java
@@ -37,6 +37,7 @@ import org.apache.ambari.server.controller.AmbariManagementController;
import org.apache.ambari.server.orm.DBAccessor;
import org.apache.ambari.server.orm.dao.DaoUtils;
import org.apache.ambari.server.orm.entities.ServiceConfigEntity;
+import org.apache.ambari.server.orm.entities.UpgradeHistoryEntity;
import org.apache.ambari.server.state.BlueprintProvisioningState;
import org.apache.ambari.server.state.Cluster;
import org.apache.ambari.server.state.Clusters;
@@ -172,7 +173,7 @@ public class UpgradeCatalog271 extends AbstractUpgradeCatalog {
addNewConfigurationsFromXml();
updateRangerLogDirConfigs();
updateRangerKmsDbUrl();
- renameAmbariInfraInConfigGroups();
+ renameAmbariInfraService();
removeLogSearchPatternConfigs();
updateSolrConfigurations();
}
@@ -273,7 +274,7 @@ public class UpgradeCatalog271 extends AbstractUpgradeCatalog {
}
}
- protected void renameAmbariInfraInConfigGroups() {
+ protected void renameAmbariInfraService() {
LOG.info("Renaming service AMBARI_INFRA to AMBARI_INFRA_SOLR in config group records");
AmbariManagementController ambariManagementController = injector.getInstance(AmbariManagementController.class);
Clusters clusters = ambariManagementController.getClusters();
@@ -302,6 +303,14 @@ public class UpgradeCatalog271 extends AbstractUpgradeCatalog {
serviceConfigUpdate.executeUpdate();
});
+ executeInTransaction(() -> {
+ TypedQuery<UpgradeHistoryEntity> upgradeHistoryUpdate = entityManager.createQuery(
+ "UPDATE UpgradeHistoryEntity SET service_name = :newServiceName WHERE service_name = :oldServiceName", UpgradeHistoryEntity.class);
+ upgradeHistoryUpdate.setParameter("newServiceName", AMBARI_INFRA_NEW_NAME);
+ upgradeHistoryUpdate.setParameter("oldServiceName", AMBARI_INFRA_OLD_NAME);
+ upgradeHistoryUpdate.executeUpdate();
+ });
+
// Force the clusters object to reload to ensure the renamed service is accounted for
entityManager.getEntityManagerFactory().getCache().evictAll();
diff --git a/ambari-server/src/test/java/org/apache/ambari/server/upgrade/UpgradeCatalog271Test.java b/ambari-server/src/test/java/org/apache/ambari/server/upgrade/UpgradeCatalog271Test.java
index 5bf1317..63fe72a 100644
--- a/ambari-server/src/test/java/org/apache/ambari/server/upgrade/UpgradeCatalog271Test.java
+++ b/ambari-server/src/test/java/org/apache/ambari/server/upgrade/UpgradeCatalog271Test.java
@@ -92,7 +92,7 @@ public class UpgradeCatalog271Test {
Method addNewConfigurationsFromXml = AbstractUpgradeCatalog.class.getDeclaredMethod("addNewConfigurationsFromXml");
Method updateRangerLogDirConfigs = UpgradeCatalog271.class.getDeclaredMethod("updateRangerLogDirConfigs");
Method updateRangerKmsDbUrl = UpgradeCatalog271.class.getDeclaredMethod("updateRangerKmsDbUrl");
- Method renameAmbariInfraInConfigGroups = UpgradeCatalog271.class.getDeclaredMethod("renameAmbariInfraInConfigGroups");
+ Method renameAmbariInfraInConfigGroups = UpgradeCatalog271.class.getDeclaredMethod("renameAmbariInfraService");
Method removeLogSearchPatternConfigs = UpgradeCatalog271.class.getDeclaredMethod("removeLogSearchPatternConfigs");
Method updateSolrConfigurations = UpgradeCatalog271.class.getDeclaredMethod("updateSolrConfigurations");
@@ -114,7 +114,7 @@ public class UpgradeCatalog271Test {
upgradeCatalog271.updateRangerKmsDbUrl();
expectLastCall().once();
- upgradeCatalog271.renameAmbariInfraInConfigGroups();
+ upgradeCatalog271.renameAmbariInfraService();
expectLastCall().once();
upgradeCatalog271.removeLogSearchPatternConfigs();