[eclipse-hawkbit#1651] Implement skip DistributionSet implicit lock o…

…n DS tags

Signed-off-by: Marinov Avgustin <Avgustin.Marinov@bosch.com>

hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/DistributionSetManagement.java

@@ -505,7 +505,7 @@ Slice<DistributionSet> findByDistributionSetFilterOrderByLinkedTarget(@NotNull P
      *             if set or tag with given ID does not exist
      */
     @PreAuthorize(SpringEvalExpressions.HAS_AUTH_UPDATE_REPOSITORY)
-    DistributionSet unAssignTag(long id, long tagId);
+    DistributionSet unassignTag(long id, long tagId);
 
     /**
      * Updates a distribution set meta data value if corresponding entry exists.

hawkbit-repository/hawkbit-repository-api/src/main/java/org/eclipse/hawkbit/repository/RepositoryProperties.java

@@ -9,6 +9,7 @@
  */
 package org.eclipse.hawkbit.repository;
 
+import java.util.List;
 import java.util.concurrent.TimeUnit;
 
 import lombok.Data;
@@ -68,4 +69,7 @@ public class RepositoryProperties {
     private long dsInvalidationLockTimeout = 5;
 
     private boolean implicitTenantCreateAllowed;
+
+    private List<String> skipImplicitLockForTags =
+            List.of("skip-implicit-lock", "skip_implicit_lock", "SKIP_IMPLICIT_LOCK", "SKIP-IMPLICIT-LOCK");
 }

hawkbit-repository/hawkbit-repository-core/src/main/resources/hawkbit-repository-defaults.properties

@@ -107,7 +107,7 @@ hawkbit.server.tenant.configuration.user-confirmation-enabled.defaultValue=false
 hawkbit.server.tenant.configuration.user-confirmation-enabled.dataType=java.lang.Boolean
 hawkbit.server.tenant.configuration.user-confirmation-enabled.validator=org.eclipse.hawkbit.tenancy.configuration.validator.TenantConfigurationBooleanValidator
 
-hawkbit.server.tenant.configuration.implicit-lock-enabled.keyName=user.confirmation.flow.enabled
+hawkbit.server.tenant.configuration.implicit-lock-enabled.keyName=implicit.lock.enabled
 hawkbit.server.tenant.configuration.implicit-lock-enabled.defaultValue=true
 hawkbit.server.tenant.configuration.implicit-lock-enabled.dataType=java.lang.Boolean
 hawkbit.server.tenant.configuration.implicit-lock-enabled.validator=org.eclipse.hawkbit.tenancy.configuration.validator.TenantConfigurationBooleanValidator

hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/RepositoryApplicationConfiguration.java

@@ -164,6 +164,7 @@
 import org.eclipse.hawkbit.security.SystemSecurityContext;
 import org.eclipse.hawkbit.tenancy.TenantAware;
 import org.eclipse.hawkbit.tenancy.UserAuthoritiesResolver;
+import org.eclipse.hawkbit.utils.TenantConfigHelper;
 import org.eclipse.persistence.config.PersistenceUnitProperties;
 import org.hibernate.validator.BaseHibernateValidatorConfiguration;
 import org.springframework.beans.BeansException;
@@ -532,25 +533,26 @@ SystemManagement systemManagement(final JpaProperties properties) {
      */
     @Bean
     @ConditionalOnMissingBean
-    DistributionSetManagement distributionSetManagement(final EntityManager entityManager,
-                                                        final DistributionSetRepository distributionSetRepository,
-                                                        final DistributionSetTagManagement distributionSetTagManagement, final SystemManagement systemManagement,
-                                                        final DistributionSetTypeManagement distributionSetTypeManagement, final QuotaManagement quotaManagement,
-                                                        final DistributionSetMetadataRepository distributionSetMetadataRepository,
-                                                        final TargetRepository targetRepository,
-                                                        final TargetFilterQueryRepository targetFilterQueryRepository, final ActionRepository actionRepository,
-                                                        final EventPublisherHolder eventPublisherHolder, final TenantAware tenantAware,
-                                                        final VirtualPropertyReplacer virtualPropertyReplacer,
-                                                        final SoftwareModuleRepository softwareModuleRepository,
-                                                        final DistributionSetTagRepository distributionSetTagRepository,
-                                                        final AfterTransactionCommitExecutor afterCommit,
-                                                        final JpaProperties properties) {
+    DistributionSetManagement distributionSetManagement(
+            final EntityManager entityManager,
+            final DistributionSetRepository distributionSetRepository,
+            final DistributionSetTagManagement distributionSetTagManagement, final SystemManagement systemManagement,
+            final DistributionSetTypeManagement distributionSetTypeManagement, final QuotaManagement quotaManagement,
+            final DistributionSetMetadataRepository distributionSetMetadataRepository,
+            final TargetRepository targetRepository,
+            final TargetFilterQueryRepository targetFilterQueryRepository, final ActionRepository actionRepository,
+            final SystemSecurityContext systemSecurityContext, final TenantConfigurationManagement tenantConfigurationManagement,
+            final VirtualPropertyReplacer virtualPropertyReplacer,
+            final PlatformTransactionManager txManager,
+            final SoftwareModuleRepository softwareModuleRepository,
+            final DistributionSetTagRepository distributionSetTagRepository,
+            final JpaProperties properties, final RepositoryProperties repositoryProperties) {
         return new JpaDistributionSetManagement(entityManager, distributionSetRepository, distributionSetTagManagement,
                 systemManagement, distributionSetTypeManagement, quotaManagement, distributionSetMetadataRepository,
-                targetRepository, targetFilterQueryRepository, actionRepository, eventPublisherHolder, tenantAware,
-                virtualPropertyReplacer, softwareModuleRepository, distributionSetTagRepository, afterCommit,
-                properties.getDatabase());
-
+                targetRepository, targetFilterQueryRepository, actionRepository,
+                TenantConfigHelper.usingContext(systemSecurityContext, tenantConfigurationManagement),
+                virtualPropertyReplacer, txManager, softwareModuleRepository, distributionSetTagRepository,
+                properties.getDatabase(), repositoryProperties);
     }
 
     /**

hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/management/JpaDeploymentManagement.java

@@ -9,7 +9,6 @@
  */
 package org.eclipse.hawkbit.repository.jpa.management;
 
-import static org.eclipse.hawkbit.tenancy.configuration.TenantConfigurationProperties.TenantConfigurationKey.IMPLICIT_LOCK_ENABLED;
 import static org.eclipse.hawkbit.tenancy.configuration.TenantConfigurationProperties.TenantConfigurationKey.REPOSITORY_ACTIONS_AUTOCLOSE_ENABLED;
 
 import java.io.Serializable;
@@ -373,14 +372,7 @@ private DistributionSetAssignmentResult assignDistributionSetToTargets(final Str
         final JpaDistributionSet distributionSet =
                 (JpaDistributionSet) distributionSetManagement.getValidAndComplete(dsId);
 
-        // implicit lock
-        if (!distributionSet.isLocked() && getConfigValue(IMPLICIT_LOCK_ENABLED, Boolean.class)) {
-            // without new transaction DS changed event is not thrown
-            DeploymentHelper.runInNewTransaction(txManager, "Implicit lock", status -> {
-                distributionSetManagement.lock(distributionSet.getId());
-                return null;
-            });
-        }
+        ((JpaDistributionSetManagement)distributionSetManagement).implicitLock(distributionSet, true);
 
         final List<String> providedTargetIds = targetsWithActionType.stream().map(TargetWithActionType::getControllerId)
                 .distinct().toList();

hawkbit-repository/hawkbit-repository-jpa/src/main/java/org/eclipse/hawkbit/repository/jpa/management/JpaDistributionSetManagement.java

@@ -15,6 +15,7 @@
 import java.util.Collections;
 import java.util.List;
 import java.util.Optional;
+import java.util.Set;
 import java.util.function.BiFunction;
 import java.util.function.Supplier;
 import java.util.stream.Collectors;
@@ -29,11 +30,11 @@
 import org.eclipse.hawkbit.repository.DistributionSetTypeManagement;
 import org.eclipse.hawkbit.repository.OffsetBasedPageRequest;
 import org.eclipse.hawkbit.repository.QuotaManagement;
+import org.eclipse.hawkbit.repository.RepositoryProperties;
 import org.eclipse.hawkbit.repository.SystemManagement;
 import org.eclipse.hawkbit.repository.builder.DistributionSetCreate;
 import org.eclipse.hawkbit.repository.builder.DistributionSetUpdate;
 import org.eclipse.hawkbit.repository.builder.GenericDistributionSetUpdate;
-import org.eclipse.hawkbit.repository.event.remote.DistributionSetDeletedEvent;
 import org.eclipse.hawkbit.repository.exception.DeletedException;
 import org.eclipse.hawkbit.repository.exception.EntityAlreadyExistsException;
 import org.eclipse.hawkbit.repository.exception.EntityNotFoundException;
@@ -45,7 +46,6 @@
 import org.eclipse.hawkbit.repository.jpa.acm.AccessController;
 import org.eclipse.hawkbit.repository.jpa.builder.JpaDistributionSetCreate;
 import org.eclipse.hawkbit.repository.jpa.configuration.Constants;
-import org.eclipse.hawkbit.repository.jpa.executor.AfterTransactionCommitExecutor;
 import org.eclipse.hawkbit.repository.jpa.model.DsMetadataCompositeKey;
 import org.eclipse.hawkbit.repository.jpa.model.JpaDistributionSet;
 import org.eclipse.hawkbit.repository.jpa.model.JpaDistributionSetMetadata;
@@ -62,6 +62,7 @@
 import org.eclipse.hawkbit.repository.jpa.rsql.RSQLUtility;
 import org.eclipse.hawkbit.repository.jpa.specifications.DistributionSetSpecification;
 import org.eclipse.hawkbit.repository.jpa.specifications.TargetSpecifications;
+import org.eclipse.hawkbit.repository.jpa.utils.DeploymentHelper;
 import org.eclipse.hawkbit.repository.jpa.utils.QuotaHelper;
 import org.eclipse.hawkbit.repository.model.Action;
 import org.eclipse.hawkbit.repository.model.DistributionSet;
@@ -73,9 +74,8 @@
 import org.eclipse.hawkbit.repository.model.MetaData;
 import org.eclipse.hawkbit.repository.model.SoftwareModule;
 import org.eclipse.hawkbit.repository.model.Statistic;
-import org.eclipse.hawkbit.repository.model.helper.EventPublisherHolder;
 import org.eclipse.hawkbit.repository.rsql.VirtualPropertyReplacer;
-import org.eclipse.hawkbit.tenancy.TenantAware;
+import org.eclipse.hawkbit.utils.TenantConfigHelper;
 import org.springframework.dao.ConcurrencyFailureException;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
@@ -85,11 +85,14 @@
 import org.springframework.orm.jpa.vendor.Database;
 import org.springframework.retry.annotation.Backoff;
 import org.springframework.retry.annotation.Retryable;
+import org.springframework.transaction.PlatformTransactionManager;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.CollectionUtils;
 import org.springframework.util.ObjectUtils;
 import org.springframework.validation.annotation.Validated;
 
+import static org.eclipse.hawkbit.tenancy.configuration.TenantConfigurationProperties.TenantConfigurationKey.IMPLICIT_LOCK_ENABLED;
+
 /**
  * JPA implementation of {@link DistributionSetManagement}.
  *
@@ -99,51 +102,38 @@
 public class JpaDistributionSetManagement implements DistributionSetManagement {
 
     private final EntityManager entityManager;
-
     private final DistributionSetRepository distributionSetRepository;
-
     private final DistributionSetTagManagement distributionSetTagManagement;
-
     private final SystemManagement systemManagement;
-
     private final DistributionSetTypeManagement distributionSetTypeManagement;
-
     private final QuotaManagement quotaManagement;
-
     private final DistributionSetMetadataRepository distributionSetMetadataRepository;
     private final TargetRepository targetRepository;
-
     private final TargetFilterQueryRepository targetFilterQueryRepository;
-
     private final ActionRepository actionRepository;
-
-    private final EventPublisherHolder eventPublisherHolder;
-
-    private final TenantAware tenantAware;
-
+    private final TenantConfigHelper tenantConfigHelper;
     private final VirtualPropertyReplacer virtualPropertyReplacer;
-
+    private final PlatformTransactionManager txManager;
     private final SoftwareModuleRepository softwareModuleRepository;
-
     private final DistributionSetTagRepository distributionSetTagRepository;
-
-    private final AfterTransactionCommitExecutor afterCommit;
-
     private final Database database;
+    private final RepositoryProperties repositoryProperties;
 
-    public JpaDistributionSetManagement(final EntityManager entityManager,
+    public JpaDistributionSetManagement(
+            final EntityManager entityManager,
             final DistributionSetRepository distributionSetRepository,
             final DistributionSetTagManagement distributionSetTagManagement, final SystemManagement systemManagement,
             final DistributionSetTypeManagement distributionSetTypeManagement, final QuotaManagement quotaManagement,
             final DistributionSetMetadataRepository distributionSetMetadataRepository,
             final TargetRepository targetRepository,
             final TargetFilterQueryRepository targetFilterQueryRepository, final ActionRepository actionRepository,
-            final EventPublisherHolder eventPublisherHolder, final TenantAware tenantAware,
+            final TenantConfigHelper tenantConfigHelper,
             final VirtualPropertyReplacer virtualPropertyReplacer,
+            final PlatformTransactionManager txManager,
             final SoftwareModuleRepository softwareModuleRepository,
             final DistributionSetTagRepository distributionSetTagRepository,
-            final AfterTransactionCommitExecutor afterCommit,
-            final Database database) {
+            final Database database,
+            final RepositoryProperties repositoryProperties) {
         this.entityManager = entityManager;
         this.distributionSetRepository = distributionSetRepository;
         this.distributionSetTagManagement = distributionSetTagManagement;
@@ -154,13 +144,13 @@ public JpaDistributionSetManagement(final EntityManager entityManager,
         this.targetRepository = targetRepository;
         this.targetFilterQueryRepository = targetFilterQueryRepository;
         this.actionRepository = actionRepository;
-        this.eventPublisherHolder = eventPublisherHolder;
-        this.tenantAware = tenantAware;
+        this.tenantConfigHelper = tenantConfigHelper;
         this.virtualPropertyReplacer = virtualPropertyReplacer;
+        this.txManager = txManager;
         this.softwareModuleRepository = softwareModuleRepository;
         this.distributionSetTagRepository = distributionSetTagRepository;
-        this.afterCommit = afterCommit;
         this.database = database;
+        this.repositoryProperties = repositoryProperties;
     }
 
     @Override
@@ -679,7 +669,7 @@ private void checkAndThrowIfDistributionSetMetadataAlreadyExists(final DsMetadat
     @Transactional
     @Retryable(include = {
             ConcurrencyFailureException.class }, maxAttempts = Constants.TX_RT_MAX, backoff = @Backoff(delay = Constants.TX_RT_DELAY))
-    public DistributionSet unAssignTag(final long id, final long dsTagId) {
+    public DistributionSet unassignTag(final long id, final long dsTagId) {
         final JpaDistributionSet set = (JpaDistributionSet) getWithDetails(id)
                 .orElseThrow(() -> new EntityNotFoundException(DistributionSet.class, id));
 
@@ -701,17 +691,20 @@ public DistributionSet unAssignTag(final long id, final long dsTagId) {
     public void lock(final long id) {
         final JpaDistributionSet distributionSet = getById(id);
         if (!distributionSet.isLocked()) {
-            distributionSet.getModules().forEach(module -> {
-                if (!module.isLocked()) {
-                    final JpaSoftwareModule jpaSoftwareModule = (JpaSoftwareModule)module;
-                    jpaSoftwareModule.lock();
-                    softwareModuleRepository.save(jpaSoftwareModule);
-                }
-            });
-            distributionSet.lock();
-            distributionSetRepository.save(distributionSet);
+            lock0(distributionSet);
         }
     }
+    private void lock0(JpaDistributionSet distributionSet) {
+        distributionSet.getModules().forEach(module -> {
+            if (!module.isLocked()) {
+                final JpaSoftwareModule jpaSoftwareModule = (JpaSoftwareModule)module;
+                jpaSoftwareModule.lock();
+                softwareModuleRepository.save(jpaSoftwareModule);
+            }
+        });
+        distributionSet.lock();
+        distributionSetRepository.save(distributionSet);
+    }
 
     @Override
     @Transactional
@@ -830,6 +823,43 @@ public void invalidate(final DistributionSet distributionSet) {
         distributionSetRepository.save(jpaSet);
     }
 
+    // implicitly lock if not configured otherwise
+    void implicitLock(final DistributionSet distributionSet, final boolean newTransaction) {
+        if (distributionSet.isLocked()) {
+            // already locked
+            return;
+        }
+
+        if (!tenantConfigHelper.getConfigValue(IMPLICIT_LOCK_ENABLED, Boolean.class)) {
+            // implicit lock disabled
+            return;
+        }
+
+        final List<String> skipForTags = repositoryProperties.getSkipImplicitLockForTags();
+        if (!ObjectUtils.isEmpty(skipForTags)) {
+            final Set<DistributionSetTag> tags = ((JpaDistributionSet)distributionSet).getTags();
+            if (!ObjectUtils.isEmpty(tags)) {
+                for (final DistributionSetTag tag : tags) {
+                    if (skipForTags.contains(tag.getName())) {
+                        // has a skip tag
+                        return;
+                    }
+                }
+            }
+        }
+
+        // finally does the implicit lock
+        if (newTransaction) {
+            // without new transaction DS changed event is not thrown
+            DeploymentHelper.runInNewTransaction(txManager, "Implicit lock", status -> {
+                lock0((JpaDistributionSet) distributionSet);
+                return null;
+            });
+        } else {
+            lock0((JpaDistributionSet) distributionSet);
+        }
+    }
+
     private JpaDistributionSet getById(final long id) {
         return distributionSetRepository
                 .findById(id)
@@ -847,4 +877,4 @@ private void assertDsTagExists(final Long tagId) {
             throw new EntityNotFoundException(DistributionSetTag.class, tagId);
         }
     }
-}
+}