Merge branch 'omu/launcher_evol'

[modules/kernel.git] / src / Launcher / Launcher.cxx

diff --git a/src/Launcher/Launcher.cxx b/src/Launcher/Launcher.cxx
index 8814a57236acd0f1e59ae5037f9f74f149dd04eb..b6737b1774036b9321836312d5db5c52eb080856 100644 (file)
--- a/src/Launcher/Launcher.cxx
+++ b/src/Launcher/Launcher.cxx
@@ -133,7 +133,7 @@ Launcher_cpp::launchJob(int job_id)
     throw LauncherException("Bad state of the job: " + job->getState());
   }
 
-  // Third step search batch manager for the job into the map -> instanciate one if does not exist
+  // Third step search batch manager for the job into the map -> instantiate one if does not exist
 #ifdef WITH_LIBBATCH
   std::map<int, Batch::BatchManager *>::const_iterator it = _batchmap.find(job_id);
   if(it == _batchmap.end())
@@ -457,7 +457,7 @@ Launcher_cpp::createJobWithFile(const std::string xmlExecuteFile,
 
 //=============================================================================
 /*!
- *  Factory to instanciate the good batch manager for choosen cluster.
+ *  Factory to instantiate the good batch manager for chosen cluster.
  */ 
 //=============================================================================
 Batch::BatchManager *
@@ -555,7 +555,7 @@ Launcher_cpp::FactoryBatchManager(ParserResourcesType& params)
     LAUNCHER_MESSAGE("Cannot find batch manager factory for " << bmType << ". Check your version of libBatch.");
     throw LauncherException("Cannot find batch manager factory");
   }
-  LAUNCHER_MESSAGE("Instanciation of batch manager of type: " << bmType);
+  LAUNCHER_MESSAGE("Instantiation of batch manager of type: " << bmType);
   Batch::BatchManager * batch_client = (*fact)(hostname.c_str(), params.UserName.c_str(),
                                                protocol, mpi.c_str());
   return batch_client;
@@ -607,6 +607,14 @@ Launcher_cpp::getJobResults(int job_id, std::string directory)
                           "(libBatch was not present at compilation time)");
 }
 
+void
+Launcher_cpp::clearJobWorkingDir(int job_id)
+{
+  LAUNCHER_INFOS("Launcher compiled without LIBBATCH - cannot clear directory!!!");
+  throw LauncherException("Method Launcher_cpp::clearJobWorkingDir is not available "
+                          "(libBatch was not present at compilation time)");
+}
+
 bool
 Launcher_cpp::getJobDumpState(int job_id, std::string directory)
 {
@@ -696,7 +704,7 @@ Launcher_cpp::createBatchManagerForJob(Launcher::Job * job)
 {
   int job_id = job->getNumber();
 
-  // Select a ressource for the job
+  // Select a resource for the job
   std::vector<std::string> ResourceList;
   resourceParams params = job->getResourceRequiredParams();
   // Consider only resources that can launch batch jobs
@@ -819,7 +827,7 @@ Launcher_cpp::loadJobs(const char* jobs_file)
     {
       if (job_state == "CREATED")
       {
-        // In this case, we ignore run_part informations
+        // In this case, we ignore run_part information
         createJob(new_job);
         new_jobs_id_list.push_back(new_job->getNumber());
       }
@@ -845,7 +853,7 @@ Launcher_cpp::loadJobs(const char* jobs_file)
                job_state == "FAILED"   ||
                job_state == "ERROR")
       {
-        // Step 2: We add run_part informations
+        // Step 2: We add run_part information
         addJobDirectlyToMap(new_job);
         new_jobs_id_list.push_back(new_job->getNumber());
       }