Skip to content
Snippets Groups Projects
Commit 8393d1d3 authored by Dominik Pilár's avatar Dominik Pilár
Browse files

Merge branch '81-fix-delete-finished-training-instance-with-training-runs' into 'master'

Fix delete finished training instance with assigned training runs.

Closes #81

See merge request !80
parents 3aecc687 e1e2aae4
No related branches found
No related tags found
1 merge request!80Fix delete finished training instance with assigned training runs.
Pipeline #134739 passed with stages
in 3 minutes and 48 seconds
......@@ -224,8 +224,6 @@ public class TrainingInstanceFacade {
public void delete(Long trainingInstanceId, boolean forceDelete) {
TrainingInstance trainingInstance = trainingInstanceService.findById(trainingInstanceId);
if (forceDelete) {
Set<TrainingRun> trainingRunsInTrainingInstance = trainingRunService.findAllByTrainingInstanceId(trainingInstanceId);
trainingRunsInTrainingInstance.forEach(tr -> trainingRunService.deleteTrainingRun(tr.getId(), true, false));
if (!trainingInstance.isLocalEnvironment() && trainingInstance.getPoolId() != null) {
sandboxServiceApi.unlockPool(trainingInstance.getPoolId());
deleteBashCommandsByPool(trainingInstance.getPoolId());
......@@ -239,6 +237,8 @@ public class TrainingInstanceFacade {
"First, you must unassign pool id from training instance then try it again."));
// not possible to delete training instance with associated pool
}
Set<TrainingRun> trainingRunsInTrainingInstance = trainingRunService.findAllByTrainingInstanceId(trainingInstanceId);
trainingRunsInTrainingInstance.forEach(tr -> trainingRunService.deleteTrainingRun(tr.getId(), true, false));
if (trainingInstance.isLocalEnvironment()) {
deleteBashCommandsByAccessToken(trainingInstance.getAccessToken());
}
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment