summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVitaly Brodetskyi <vbrodetskyi@hortonworks.com>2016-11-01 01:20:25 +0200
committerVitaly Brodetskyi <vbrodetskyi@hortonworks.com>2016-11-01 01:20:25 +0200
commite4623cd9934f961c3121af02e35811847f18178d (patch)
tree7de5c95e92fff61e0e6052cfee80e994aa0c2c1b
parenta17c395a5847e57be6f59a4d10db8061127841ae (diff)
AMBARI-18748. ambari-server upgrade fail (from 2.2.2.0/2.4.0.0/2.4.0.1/2.4.1.0 to 2.4.2.0 ).(vbrodetskyi)
-rw-r--r--ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog242.java4
1 files changed, 3 insertions, 1 deletions
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog242.java b/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog242.java
index 31093f19b1..3f024fd808 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog242.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog242.java
@@ -41,6 +41,7 @@ import org.slf4j.LoggerFactory;
import com.google.inject.Inject;
import com.google.inject.Injector;
+import com.google.inject.persist.Transactional;
/**
* Upgrade catalog for version 2.4.2.
@@ -159,7 +160,8 @@ public class UpgradeCatalog242 extends AbstractUpgradeCatalog {
* Convert the previously set inherited privileges to the more generic inherited privileges model
* based on role-based principals rather than specialized principal types.
*/
- protected void convertRolePrincipals() {
+ @Transactional
+ void convertRolePrincipals() {
LOG.info("Converting pseudo principle types to role principals");
PermissionDAO permissionDAO = injector.getInstance(PermissionDAO.class);