Fix for comments

Author: ssalinas

SingularityService/src/main/java/com/hubspot/singularity/data/TaskManager.java

@@ -1394,10 +1394,9 @@ private void createTaskAndDeletePendingTaskPrivate(SingularityTask task)
       }
     }
 
+    AtomicBoolean hasErr = new AtomicBoolean(false);
     try {
       final String path = getTaskPath(task.getTaskId());
-
-      AtomicBoolean hasErr = new AtomicBoolean(false);
       curator
         .transaction()
         .forOperations(
@@ -1422,12 +1421,13 @@ private void createTaskAndDeletePendingTaskPrivate(SingularityTask task)
       // Not checking isActive here, already called within offer check flow
       leaderCache.putActiveTask(task.getTaskId());
       taskCache.set(path, task);
+    } catch (KeeperException.NodeExistsException nee) {
+      LOG.error("Task or active path already existed for {}", task.getTaskId());
+    } finally {
       if (hasErr.get()) {
         // Rare case, but in case the transaction failed to write task data, try again from the cache data
         tryRepairTask(task.getTaskId());
       }
-    } catch (KeeperException.NodeExistsException nee) {
-      LOG.error("Task or active path already existed for {}", task.getTaskId());
     }
   }
 

SingularityService/src/main/java/com/hubspot/singularity/scheduler/SingularityDeployChecker.java

@@ -1497,31 +1497,6 @@ private SingularityDeployResult enqueueAndProcessLbRequest(
 
     Iterable<SingularityTaskId> allIds = Iterables.concat(deployActiveTasks, toShutDown);
     final Map<SingularityTaskId, SingularityTask> tasks = taskManager.getTasks(allIds);
-    // Handle a case where occasionally a task's data cannot be found in zk, but the task is running
-    if (
-      !tasks.keySet().containsAll(deployActiveTasks) ||
-      !tasks.keySet().containsAll(toShutDown)
-    ) {
-      LOG.warn("Could not find task data for task to shut down, will check taskCache");
-      for (SingularityTaskId taskId : deployActiveTasks) {
-        if (!tasks.containsKey(taskId)) {
-          Optional<SingularityTask> maybeRepaired = taskManager.tryRepairTask(taskId);
-          if (maybeRepaired.isPresent()) {
-            LOG.info("Repaired and fetched definition for {}", taskId);
-            tasks.put(taskId, maybeRepaired.get());
-          }
-        }
-      }
-      for (SingularityTaskId taskId : toShutDown) {
-        if (!tasks.containsKey(taskId)) {
-          Optional<SingularityTask> maybeRepaired = taskManager.tryRepairTask(taskId);
-          if (maybeRepaired.isPresent()) {
-            LOG.info("Repaired and fetched definition for {}", taskId);
-            tasks.put(taskId, maybeRepaired.get());
-          }
-        }
-      }
-    }
     final LoadBalancerRequestId lbRequestId = SingularityDeployCheckHelper.getNewLoadBalancerRequestId(
       pendingDeploy
     );