fixup! fixup! [core] deployment retry properly retries only failed tasks

Author: Michal Tichák

core/task/manager.go

@@ -554,25 +554,25 @@ func (m *Manager) acquireTasks(envId uid.ID, taskDescriptors Descriptors) (err e
 				log.WithField("tasksToRunThisAttempt", len(tasksToRunThisAttempt)).
 					WithField("partition", envId))
 
-			deployedThisRound := roOutcome.deployed
+			deployedThisAttempt := roOutcome.deployed
 			undeployedDescriptors = roOutcome.undeployed
 			undeployableDescriptors = roOutcome.undeployable
 
-			logWithId.WithField("tasks", deployedThisRound).
-				Debugf("resourceOffers is done, %d new tasks running", len(deployedThisRound))
+			logWithId.WithField("tasks", deployedThisAttempt).
+				Debugf("resourceOffers is done, %d new tasks running", len(deployedThisAttempt))
 
-			for deployedTask, deployedDescriptor := range deployedThisRound {
+			for deployedTask, deployedDescriptor := range deployedThisAttempt {
 				allDeployedTasks[deployedTask] = deployedDescriptor
 				// add deployed tasks to roster, so updates can be distributed properly
 				m.roster.append(deployedTask)
 			}
 
-			if len(deployedThisRound) != len(tasksToRunThisAttempt) {
+			if len(deployedThisAttempt) != len(tasksToRunThisAttempt) {
 				// ↑ Not all roles could be deployed. If some were critical,
 				//   we cannot proceed with running this environment. Either way,
 				//   we keep the roles running since they might be useful in the future.
 				logWithId.WithField("level", infologger.IL_Devel).
-					Errorf("environment deployment failure: %d tasks requested for deployment, but %d deployed", len(tasksToRunThisAttempt), len(deployedThisRound))
+					Errorf("environment deployment failure: %d tasks requested for deployment, but %d deployed", len(tasksToRunThisAttempt), len(deployedThisAttempt))
 
 				for _, desc := range undeployedDescriptors {
 					if desc.TaskRole.GetTaskTraits().Critical == true {
@@ -596,7 +596,7 @@ func (m *Manager) acquireTasks(envId uid.ID, taskDescriptors Descriptors) (err e
 			if deploymentSuccess {
 				// ↑ means all the required critical processes are now running,
 				//   and we are ready to update the envId
-				for taskPtr, descriptor := range deployedThisRound {
+				for taskPtr, descriptor := range deployedThisAttempt {
 					taskPtr.SetParent(descriptor.TaskRole)
 					// Ensure everything is filled out properly
 					if !taskPtr.IsLocked() {