ambari-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From vbrodets...@apache.org
Subject ambari git commit: 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)
Date Tue, 01 Nov 2016 12:34:49 GMT
Repository: ambari
Updated Branches:
  refs/heads/branch-2.4 a17c395a5 -> e4623cd99


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)


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

Branch: refs/heads/branch-2.4
Commit: e4623cd9934f961c3121af02e35811847f18178d
Parents: a17c395
Author: Vitaly Brodetskyi <vbrodetskyi@hortonworks.com>
Authored: Tue Nov 1 01:20:25 2016 +0200
Committer: Vitaly Brodetskyi <vbrodetskyi@hortonworks.com>
Committed: Tue Nov 1 01:20:25 2016 +0200

----------------------------------------------------------------------
 .../java/org/apache/ambari/server/upgrade/UpgradeCatalog242.java | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/e4623cd9/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog242.java
----------------------------------------------------------------------
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 31093f1..3f024fd 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);


Mime
View raw message