Skip to content

Fix JpaControllerManagement @Transactionl write declarations #3294

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
avgustinmm merged 1 commit into from
Aug 14, 2026
+46 −40
Merged

Fix JpaControllerManagement @Transactionl write declarations #3294

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
86 changes: 46 additions & 40 deletions .../src/main/java/org/eclipse/hawkbit/repository/jpa/management/JpaControllerManagement.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -197,34 +197,6 @@ public int getWeightConsideringDefault(final Action action) {
return super.getWeightConsideringDefault(action);
}

@Override
protected void onActionStatusUpdate(final JpaActionStatus newActionStatus, final JpaAction action) {
final Action.Status updatedActionStatus = newActionStatus.getStatus();
final long timestamp = newActionStatus.getTimestamp();
switch (updatedActionStatus) {
case ERROR: {
final JpaTarget target = action.getTarget();
target.setUpdateStatus(TargetUpdateStatus.ERROR);
handleErrorOnAction(action, target);
break;
}
case FINISHED: {
requestControllerAttributes(handleFinishedAndStoreInTargetStatus(timestamp, action));
break;
}
case DOWNLOADED: {
handleDownloadedActionStatus(action).ifPresent(controllerId ->
requestControllerAttributes(findByControllerId(controllerId)
.map(JpaTarget.class::cast)
.orElseThrow(() -> new EntityNotFoundException(Target.class, controllerId))));
break;
}
default: {
break;
}
}
}

@Override
@Transactional(isolation = Isolation.READ_COMMITTED)
@Retryable(includes = ConcurrencyFailureException.class, maxRetriesString = Constants.RETRY_MAX, delayString = Constants.RETRY_DELAY)
Expand Down Expand Up @@ -271,7 +243,7 @@ public Map<Long, Map<String, String>> findTargetVisibleMetaDataBySoftwareModuleI
}

@Override
@Transactional
@Transactional(isolation = Isolation.READ_COMMITTED)
@Retryable(includes = ConcurrencyFailureException.class, maxRetriesString = Constants.RETRY_MAX, delayString = Constants.RETRY_DELAY)
public ActionStatus addInformationalActionStatus(final ActionStatusCreate create) {
final JpaAction action = actionRepository.getById(create.getActionId());
Expand Down Expand Up @@ -348,13 +320,6 @@ public Target findOrRegisterTargetIfItDoesNotExist(final String controllerId, fi
return findOrRegisterTargetIfItDoesNotExist0(controllerId, address, name, type);
}

private Target findOrRegisterTargetIfItDoesNotExist0(final String controllerId, final URI address, final String name, final String type) {
final Specification<JpaTarget> spec = (targetRoot, query, cb) -> cb.equal(targetRoot.get(JpaTarget_.controllerId), controllerId);
return targetRepository.findOne(spec)
.map(target -> updateTarget(target, address, name, type))
.orElseGet(() -> createTarget(controllerId, address, name, type));
}

@Override
public Action getActionForDownloadByTargetAndSoftwareModule(final String controllerId, final long moduleId) {
throwExceptionIfTargetDoesNotExist(controllerId);
Expand Down Expand Up @@ -426,14 +391,14 @@ public boolean hasTargetArtifactAssigned(final long targetId, final String sha1H
}

@Override
@Transactional
@Transactional(isolation = Isolation.READ_COMMITTED)
@Retryable(includes = ConcurrencyFailureException.class, maxRetriesString = Constants.RETRY_MAX, delayString = Constants.RETRY_DELAY)
public void registerRetrieved(final long actionId, final String message) {
handleRegisterRetrieved(actionId, message);
}

@Override
@Transactional
@Transactional(isolation = Isolation.READ_COMMITTED)
@Retryable(includes = ConcurrencyFailureException.class, maxRetriesString = Constants.RETRY_MAX, delayString = Constants.RETRY_DELAY)
public Target updateControllerAttributes(final String controllerId, final Map<String, String> data, final UpdateMode mode) {
// Constraints on attribute keys & values are not validated by EclipseLink. Hence, they are validated here.
Expand Down Expand Up @@ -544,6 +509,7 @@ public Action cancelAction(final Action action) {
}

@Override
@Transactional(isolation = Isolation.READ_COMMITTED)
public void updateActionExternalRef(final long actionId, @NotEmpty final String externalRef) {
// if access control for target repository is present check that caller has UPDATE access to the target of the action
targetRepository.getAccessController().ifPresent(
Expand All @@ -554,6 +520,7 @@ public void updateActionExternalRef(final long actionId, @NotEmpty final String
}

@Override
@Transactional(isolation = Isolation.READ_COMMITTED)
public void deleteExistingTarget(@NotEmpty final String controllerId) {
final JpaTarget target = targetRepository.getByControllerId(controllerId);
targetRepository.deleteById(target.getId());
Expand All @@ -569,16 +536,19 @@ public Optional<Action> findInstalledActionByTarget(final Target target) {
}

@Override
@Transactional(isolation = Isolation.READ_COMMITTED)
public AutoConfirmationStatus activateAutoConfirmation(final String controllerId, final String initiator, final String remark) {
return confirmationManagement.activateAutoConfirmation(controllerId, initiator, remark);
}

@Override
@Transactional(isolation = Isolation.READ_COMMITTED)
public void deactivateAutoConfirmation(final String controllerId) {
confirmationManagement.deactivateAutoConfirmation(controllerId);
}

@Override
@Transactional(isolation = Isolation.READ_COMMITTED)
public boolean updateOfflineAssignedVersion(@NotEmpty final String controllerId, final String distributionName, final String version) {
List<DistributionSetAssignmentResult> distributionSetAssignmentResults =
asSystem(() -> asActor(controllerId, () -> deploymentManagement.offlineAssignedDistributionSets(
Expand All @@ -590,15 +560,51 @@ public boolean updateOfflineAssignedVersion(@NotEmpty final String controllerId,
.orElseThrow();
}

private Optional<TargetType> findTargetType(String targetTypeName) {
return targetTypeRepository.findOne(TargetTypeSpecification.hasName(targetTypeName)).map(TargetType.class::cast);
// transaction write contract shall be handled by the callers
@Override
protected void onActionStatusUpdate(final JpaActionStatus newActionStatus, final JpaAction action) {
final Action.Status updatedActionStatus = newActionStatus.getStatus();
final long timestamp = newActionStatus.getTimestamp();
switch (updatedActionStatus) {
case ERROR: {
final JpaTarget target = action.getTarget();
target.setUpdateStatus(TargetUpdateStatus.ERROR);
handleErrorOnAction(action, target);
break;
}
case FINISHED: {
requestControllerAttributes(handleFinishedAndStoreInTargetStatus(timestamp, action));
break;
}
case DOWNLOADED: {
handleDownloadedActionStatus(action).ifPresent(controllerId ->
requestControllerAttributes(findByControllerId(controllerId)
.map(JpaTarget.class::cast)
.orElseThrow(() -> new EntityNotFoundException(Target.class, controllerId))));
break;
}
default: {
break;
}
}
}

// for testing
void setTargetRepository(final TargetRepository targetRepositorySpy) {
this.targetRepository = targetRepositorySpy;
}

private Target findOrRegisterTargetIfItDoesNotExist0(final String controllerId, final URI address, final String name, final String type) {
final Specification<JpaTarget> spec = (targetRoot, query, cb) -> cb.equal(targetRoot.get(JpaTarget_.controllerId), controllerId);
return targetRepository.findOne(spec)
.map(target -> updateTarget(target, address, name, type))
.orElseGet(() -> createTarget(controllerId, address, name, type));
}

private Optional<TargetType> findTargetType(String targetTypeName) {
return targetTypeRepository.findOne(TargetTypeSpecification.hasName(targetTypeName)).map(TargetType.class::cast);
}

private static boolean isAddressChanged(final URI addressToUpdate, final URI address) {
return addressToUpdate == null || !addressToUpdate.equals(address);
}
Expand Down
Loading