AMBARI-14046. Refactor code that breaks transaction chaining. (mpapir…

…kovskyy)
kasakrisz · Nov 24, 2015 · 59c8885 · 59c8885
1 parent dffd776
commit 59c8885
Show file tree

Hide file tree

Showing 17 changed files with 22 additions and 23 deletions.
diff --git a/...ver/src/main/java/org/apache/ambari/server/controller/AmbariManagementControllerImpl.java b/...ver/src/main/java/org/apache/ambari/server/controller/AmbariManagementControllerImpl.java
@@ -4326,7 +4326,7 @@ private WidgetEntity addIfNotExistsWidgetEntity(WidgetLayoutInfo layoutInfo, Clu
   }
 
   @Transactional
-  private void createWidgetsAndLayouts(Cluster cluster, List<WidgetLayout> widgetLayouts) {
+  void createWidgetsAndLayouts(Cluster cluster, List<WidgetLayout> widgetLayouts) {
     String user = "ambari";
     Long clusterId = cluster.getClusterId();
     ClusterEntity clusterEntity = clusterDAO.findById(clusterId);

diff --git a/ambari-server/src/main/java/org/apache/ambari/server/controller/KerberosHelperImpl.java b/ambari-server/src/main/java/org/apache/ambari/server/controller/KerberosHelperImpl.java
@@ -1050,7 +1050,7 @@ private void validateKDCCredentials(KerberosDetails kerberosDetails, Cluster clu
    *                                               Kerberos-specific configuration details
    */
   @Transactional
-  private RequestStageContainer handle(Cluster cluster,
+  RequestStageContainer handle(Cluster cluster,
                                        KerberosDetails kerberosDetails,
                                        Map<String, ? extends Collection<String>> serviceComponentFilter,
                                        Set<String> hostFilter, Collection<String> identityFilter,

diff --git a/...src/main/java/org/apache/ambari/server/events/listeners/alerts/AlertReceivedListener.java b/...src/main/java/org/apache/ambari/server/events/listeners/alerts/AlertReceivedListener.java
@@ -268,7 +268,7 @@ private Long getClusterIdByName(String clusterName) {
    * @param toCreateHistoryAndMerge - create new history, merge alert
    */
   @Transactional
-  private void saveEntities(Map<Alert, AlertCurrentEntity> toCreate,
+  void saveEntities(Map<Alert, AlertCurrentEntity> toCreate,
       Map<Alert, AlertCurrentEntity> toMerge,
       Map<Alert, AlertCurrentEntity> toCreateHistoryAndMerge) {
     for (Map.Entry<Alert, AlertCurrentEntity> entry : toCreate.entrySet()) {

diff --git a/ambari-server/src/main/java/org/apache/ambari/server/state/ServiceComponentImpl.java b/ambari-server/src/main/java/org/apache/ambari/server/state/ServiceComponentImpl.java
@@ -564,7 +564,7 @@ public void refresh() {
    * has already been acquired from {@link #readWriteLock}.
    */
   @Transactional
-  private void saveIfPersisted() {
+  void saveIfPersisted() {
     if (isPersisted()) {
       serviceComponentDesiredStateDAO.merge(desiredStateEntity);
     }

diff --git a/ambari-server/src/main/java/org/apache/ambari/server/state/ServiceImpl.java b/ambari-server/src/main/java/org/apache/ambari/server/state/ServiceImpl.java
@@ -506,7 +506,7 @@ protected void persistEntities() {
   }
 
   @Transactional
-  private void saveIfPersisted() {
+  void saveIfPersisted() {
     if (isPersisted()) {
       clusterServiceDAO.merge(serviceEntity);
       serviceDesiredStateDAO.merge(serviceDesiredStateEntity);

diff --git a/ambari-server/src/main/java/org/apache/ambari/server/state/cluster/ClustersImpl.java b/ambari-server/src/main/java/org/apache/ambari/server/state/cluster/ClustersImpl.java
@@ -180,7 +180,7 @@ private void checkLoaded() {
   }
 
   @Transactional
-  private void loadClustersAndHosts() {
+  void loadClustersAndHosts() {
     for (ClusterEntity clusterEntity : clusterDAO.findAll()) {
       Cluster currentCluster = clusterFactory.create(clusterEntity);
       clusters.put(clusterEntity.getClusterName(), currentCluster);
@@ -588,7 +588,7 @@ public void mapHostToCluster(String hostname, String clusterName)
   }
 
   @Transactional
-  private void mapHostClusterEntities(String hostName, Long clusterId) {
+  void mapHostClusterEntities(String hostName, Long clusterId) {
     HostEntity hostEntity = hostDAO.findByName(hostName);
     ClusterEntity clusterEntity = clusterDAO.findById(clusterId);
 

diff --git a/ambari-server/src/main/java/org/apache/ambari/server/state/configgroup/ConfigGroupImpl.java b/ambari-server/src/main/java/org/apache/ambari/server/state/configgroup/ConfigGroupImpl.java
@@ -458,13 +458,12 @@ void saveIfPersisted() {
   }
 
   @Transactional
-  private void save(ClusterEntity clusterEntity) {
+  void save(ClusterEntity clusterEntity) {
     persistHostMapping();
     persistConfigMapping(clusterEntity);
   }
 
   @Override
-  @Transactional
   public void delete() {
     cluster.getClusterGlobalLock().writeLock().lock();
     try {

diff --git a/...i-server/src/main/java/org/apache/ambari/server/state/scheduler/RequestExecutionImpl.java b/...i-server/src/main/java/org/apache/ambari/server/state/scheduler/RequestExecutionImpl.java
@@ -247,7 +247,7 @@ public String getDescription() {
    * Persist @RequestScheduleEntity with @RequestScheduleBatchHostEntity
    */
   @Transactional
-  private void persistEntities() {
+  void persistEntities() {
     ClusterEntity clusterEntity = clusterDAO.findById(cluster.getClusterId());
     requestScheduleEntity.setClusterEntity(clusterEntity);
     requestScheduleEntity.setCreateTimestamp(System.currentTimeMillis());
@@ -258,7 +258,7 @@ private void persistEntities() {
   }
 
   @Transactional
-  private void persistRequestMapping() {
+  void persistRequestMapping() {
     // Delete existing mappings to support updates
     if (isPersisted) {
       batchRequestDAO.removeByScheduleId(requestScheduleEntity.getScheduleId());
@@ -293,7 +293,7 @@ private void persistRequestMapping() {
   }
 
   @Transactional
-  private void saveIfPersisted() {
+  void saveIfPersisted() {
     if (isPersisted) {
       requestScheduleEntity.setUpdateTimestamp(System.currentTimeMillis());
       // Update the Entity object with new settings

diff --git a/...er/src/main/java/org/apache/ambari/server/state/svccomphost/ServiceComponentHostImpl.java b/...er/src/main/java/org/apache/ambari/server/state/svccomphost/ServiceComponentHostImpl.java
@@ -1466,7 +1466,7 @@ public void refresh() {
    * from {@link #readWriteLock}.
    */
   @Transactional
-  private void saveIfPersisted() {
+  void saveIfPersisted() {
     if (isPersisted()) {
       hostComponentStateDAO.merge(stateEntity);
       hostComponentDesiredStateDAO.merge(desiredStateEntity);
@@ -1705,7 +1705,7 @@ public void setRestartRequired(boolean restartRequired) {
   }
 
   @Transactional
-  private RepositoryVersionEntity createRepositoryVersion(String version, final StackId stackId, final StackInfo stackInfo) throws AmbariException {
+  RepositoryVersionEntity createRepositoryVersion(String version, final StackId stackId, final StackInfo stackInfo) throws AmbariException {
     // During an Ambari Upgrade from 1.7.0 -> 2.0.0, the Repo Version will not exist, so bootstrap it.
     LOG.info("Creating new repository version " + stackId.getStackName() + "-" + version);
 

diff --git a/ambari-server/src/main/java/org/apache/ambari/server/upgrade/StackUpgradeHelper.java b/ambari-server/src/main/java/org/apache/ambari/server/upgrade/StackUpgradeHelper.java
@@ -71,7 +71,7 @@ private void stopPersistenceService() {
    * @throws SQLException
    */
   @Transactional
-  private void updateMetaInfo(Map<String, String> data) throws SQLException {
+  void updateMetaInfo(Map<String, String> data) throws SQLException {
     if (data != null && !data.isEmpty()) {
       for (Map.Entry<String, String> entry : data.entrySet()) {
         MetainfoEntity metainfoEntity = metainfoDAO.findByKey(entry.getKey());

diff --git a/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog210.java b/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog210.java
@@ -840,7 +840,7 @@ protected void initializeClusterAndServiceWidgets() throws AmbariException {
    * @throws SQLException
    */
   @Transactional
-  private Long populateHostsId(ResultSet resultSet) throws SQLException {
+  Long populateHostsId(ResultSet resultSet) throws SQLException {
     Long hostId = 0L;
     if (resultSet != null) {
       try {

diff --git a/ambari-server/src/main/java/org/apache/ambari/server/view/ViewRegistry.java b/ambari-server/src/main/java/org/apache/ambari/server/view/ViewRegistry.java
@@ -1355,7 +1355,7 @@ private void syncViewInstance(ViewInstanceEntity instance1, ViewInstanceEntity i
 
   // create an admin resource for the given view instance entity and merge it
   @Transactional
-  private ViewInstanceEntity mergeViewInstance(ViewInstanceEntity instanceEntity, ResourceTypeEntity resourceTypeEntity) {
+  ViewInstanceEntity mergeViewInstance(ViewInstanceEntity instanceEntity, ResourceTypeEntity resourceTypeEntity) {
     // create an admin resource to represent this view instance
     instanceEntity.setResource(createViewInstanceResource(resourceTypeEntity));
 
@@ -1610,7 +1610,7 @@ private boolean checkViewVersion(ViewEntity view, String version, String serverV
 
   // persist the given view and its instances
   @Transactional
-  private void persistView(ViewEntity viewDefinition, Set<ViewInstanceEntity> instanceDefinitions) throws Exception {
+  void persistView(ViewEntity viewDefinition, Set<ViewInstanceEntity> instanceDefinitions) throws Exception {
     // ensure that the view entity matches the db
     syncView(viewDefinition, instanceDefinitions);
 

diff --git a/...server/src/test/java/org/apache/ambari/server/scheduler/ExecutionScheduleManagerTest.java b/...server/src/test/java/org/apache/ambari/server/scheduler/ExecutionScheduleManagerTest.java
@@ -163,7 +163,7 @@ public void configure(Binder binder) {
   }
 
   @Transactional
-  private RequestExecution createRequestExecution(boolean addSchedule)
+  RequestExecution createRequestExecution(boolean addSchedule)
       throws Exception {
     Batch batches = new Batch();
     Schedule schedule = new Schedule();

diff --git a/ambari-server/src/test/java/org/apache/ambari/server/state/ConfigGroupTest.java b/ambari-server/src/test/java/org/apache/ambari/server/state/ConfigGroupTest.java
@@ -85,7 +85,7 @@ public void teardown() throws AmbariException {
   }
 
   @Transactional
-  private ConfigGroup createConfigGroup() throws AmbariException {
+  ConfigGroup createConfigGroup() throws AmbariException {
     // Create config without persisting and save group
     Map<String, String> properties = new HashMap<String, String>();
     properties.put("a", "b");

diff --git a/ambari-server/src/test/java/org/apache/ambari/server/state/ConfigHelperTest.java b/ambari-server/src/test/java/org/apache/ambari/server/state/ConfigHelperTest.java
@@ -192,7 +192,7 @@ public void tearDown() {
     }
 
     @Transactional
-    private Long addConfigGroup(String name, String tag, List<String> hosts,
+    Long addConfigGroup(String name, String tag, List<String> hosts,
                                 List<Config> configs) throws AmbariException {
 
       Map<Long, Host> hostMap = new HashMap<Long, Host>();

diff --git a/ambari-server/src/test/java/org/apache/ambari/server/state/RequestExecutionTest.java b/ambari-server/src/test/java/org/apache/ambari/server/state/RequestExecutionTest.java
@@ -85,7 +85,7 @@ public void teardown() throws Exception {
   }
 
   @Transactional
-  private RequestExecution createRequestSchedule() throws Exception {
+  RequestExecution createRequestSchedule() throws Exception {
     Batch batches = new Batch();
     Schedule schedule = new Schedule();
 

diff --git a/...rib/ambari-scom/ambari-scom-server/src/main/java/org/apache/ambari/scom/AmbariServer.java b/...rib/ambari-scom/ambari-scom-server/src/main/java/org/apache/ambari/scom/AmbariServer.java
@@ -305,7 +305,7 @@ private void run() throws Exception {
 
   // Creates default users and roles if in-memory database is used
   @Transactional
-  private void addInMemoryUsers() {
+  void addInMemoryUsers() {
     if (getPersistenceType(configuration) == PersistenceType.IN_MEMORY &&
         configuration.getApiAuthentication()) {
       LOG.info("In-memory database is used - creating default users");