Merge branch '1.0'

wrench-project · Jul 16, 2018 · b6e4c80 · b6e4c80
2 parents 3923135 + eaeb4ca
commit b6e4c80
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/src/wrench/managers/JobManager.cpp b/src/wrench/managers/JobManager.cpp
@@ -560,7 +560,6 @@ namespace wrench {
           this->pending_standard_jobs.erase(job);
           this->completed_standard_jobs.insert(job);
 
-
           // Forward the notification along the notification chain
           std::string callback_mailbox = job->popCallbackMailbox();
           if (not callback_mailbox.empty()) {

diff --git a/src/wrench/services/compute/batch/BatchService.cpp b/src/wrench/services/compute/batch/BatchService.cpp
@@ -1391,7 +1391,7 @@ namespace wrench {
 
       // Remove the job from the running job list
       BatchJob *batch_job = nullptr;
-      for (auto it = this->running_jobs.begin(); it != this->running_jobs.end();) {
+      for (auto it = this->running_jobs.begin(); it != this->running_jobs.end(); it++) {
         if ((*it)->getWorkflowJob() == job) {
           batch_job = (*it);
           break;
@@ -1412,6 +1412,7 @@ namespace wrench {
 
       //first forward this notification to the batsched
 #ifdef ENABLE_BATSCHED
+      WRENCH_INFO("FORWARDING TO BATSCHED");
       this->notifyJobEventsToBatSched(std::to_string(batch_job->getJobID()), "SUCCESS", "COMPLETED_SUCCESSFULLY", "", "JOB_COMPLETED");
       this->appendJobInfoToCSVOutputFile(batch_job, "success");
 #endif