ENH: refs #68. Added work_dir to Task model.

Author: Michael Grauer

modules/batchmake/controllers/components/KWBatchmakeComponent.php

@@ -453,13 +453,8 @@ public function createTask($userDao)
     {
     $modelLoad = new MIDAS_ModelLoader();
     $batchmakeTaskModel = $modelLoad->loadModel('Task', 'batchmake');
-    $taskDao = $batchmakeTaskModel->createTask($userDao);
-    $userId = $taskDao->getUserId();
-    $taskId = $taskDao->getKey();
-    $subdirs = array(MIDAS_BATCHMAKE_SSP_DIR, $userId, $taskId);
-    // create a workDir based on the task and user
-    $workDir = KWUtils::createSubDirectories($this->configTmpDir . "/", $subdirs);
-    return $workDir;
+    $taskDao = $batchmakeTaskModel->createTask($userDao, $this->configTmpDir);
+    return $taskDao;
     }
 
   /**

modules/batchmake/database/mysql/0.1.0.sql

@@ -1,13 +1,13 @@
-CREATE TABLE batchmake_task (
+CREATE TABLE IF NOT EXISTS batchmake_task (
     batchmake_task_id bigint(20) NOT NULL AUTO_INCREMENT,
     user_id bigint(20) NOT NULL,
+    work_dir text,
     PRIMARY KEY (batchmake_task_id)
-);
+)   DEFAULT CHARSET=utf8;
 
-
-CREATE TABLE batchmake_itemmetric (
+CREATE TABLE IF NOT EXISTS batchmake_itemmetric (
     itemmetric_id bigint(20) NOT NULL AUTO_INCREMENT,
     metric_name character varying(64) NOT NULL,
     bms_name character varying(256) NOT NULL,
     PRIMARY KEY (itemmetric_id)
-);
+)   DEFAULT CHARSET=utf8;

modules/batchmake/database/pgsql/0.1.0.sql

@@ -1,6 +1,7 @@
 CREATE TABLE batchmake_task (
     batchmake_task_id serial PRIMARY KEY,
-    user_id bigint NOT NULL
+    user_id bigint NOT NULL,
+    work_dir text
 );
 
 

modules/batchmake/models/base/TaskModelBase.php

@@ -9,6 +9,7 @@
 the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
 PURPOSE.  See the above copyright notices for more information.
 =========================================================================*/
+include_once BASE_PATH . '/modules/batchmake/constant/module.php';
 /** TaskModel Base class */
 class Batchmake_TaskModelBase extends Batchmake_AppModel {
 
@@ -23,15 +24,15 @@ public function __construct()
 
     $this->_mainData = array(
       'batchmake_task_id' => array('type' => MIDAS_DATA),
-      'user_id' => array('type' => MIDAS_DATA, )
-       );
+      'user_id' => array('type' => MIDAS_MANY_TO_ONE, 'model' => 'User', 'parent_column' => 'user_id', 'child_column' => 'user_id'),
+      'work_dir' => array('type' => MIDAS_DATA));
     $this->initialize(); // required
     }
 
 
   /** Create a task
    * @return TaskDao */
-  function createTask($userDao)
+  function createTask($userDao, $tmpWorkDirRoot)
     {
     if(!$userDao instanceof UserDao)
       {
@@ -41,7 +42,13 @@ function createTask($userDao)
     $task = new Batchmake_TaskDao();
     $task->setUserId($userDao->getKey());
     $this->save($task);
-
+    $userId = $task->getUserId();
+    $taskId = $task->getKey();
+    $subdirs = array(MIDAS_BATCHMAKE_SSP_DIR, $userId, $taskId);
+    // create a workDir based on the task and user
+    $workDir = KWUtils::createSubDirectories($tmpWorkDirRoot . "/", $subdirs);
+    $task->setWorkDir($workDir);
+    $this->save($task);
     return $task;
     } // end createTask()
 

modules/batchmake/tests/controllers/components/KWBatchmakeComponentTest.php

@@ -152,7 +152,8 @@ public function testPreparePipelineScripts()
     {
     $usersFile = $this->loadData('User', 'default');
     $userDao = $this->User->load($usersFile[0]->getKey());
-    $workDir = $this->kwBatchmakeComponent->createTask($userDao);
+    $taskDao = $this->kwBatchmakeComponent->createTask($userDao);
+    $workDir = $taskDao->getWorkDir();
 
     $scriptName = 'anotherscript.bms';
     $expectedSet = array("myscript.bms", "Myscript2.bms",
@@ -192,7 +193,8 @@ public function testPreparePipelineBmms()
     {
     $usersFile = $this->loadData('User', 'default');
     $userDao = $this->User->load($usersFile[0]->getKey());
-    $workDir = $this->kwBatchmakeComponent->createTask($userDao);
+    $taskDao = $this->kwBatchmakeComponent->createTask($userDao);
+    $workDir = $taskDao->getWorkDir();
 
     // try a script that refers to a non-existant bmm
     $scriptName = 'bmmswitherrors.bms';
@@ -247,7 +249,8 @@ public function testCompileBatchMakeScript()
     {
     $usersFile = $this->loadData('User', 'default');
     $userDao = $this->User->load($usersFile[0]->getKey());
-    $workDir = $this->kwBatchmakeComponent->createTask($userDao);
+    $taskDao = $this->kwBatchmakeComponent->createTask($userDao);
+    $workDir = $taskDao->getWorkDir();
 
     // a script that compiles
     $scriptName = 'Compiles.bms';
@@ -313,7 +316,8 @@ public function testGenerateCondorDag()
     {
     $usersFile = $this->loadData('User', 'default');
     $userDao = $this->User->load($usersFile[0]->getKey());
-    $workDir = $this->kwBatchmakeComponent->createTask($userDao);
+    $taskDao = $this->kwBatchmakeComponent->createTask($userDao);
+    $workDir = $taskDao->getWorkDir();
 
     // try a script that returns a non-zero value
     $scriptName = 'CompileReturnNonzero.bms';
@@ -353,7 +357,8 @@ public function testCondorSubmitDag()
     {
     $usersFile = $this->loadData('User', 'default');
     $userDao = $this->User->load($usersFile[0]->getKey());
-    $workDir = $this->kwBatchmakeComponent->createTask($userDao);
+    $taskDao = $this->kwBatchmakeComponent->createTask($userDao);
+    $workDir = $taskDao->getWorkDir();
 
     // try a script that returns a non-zero value
     $scriptName = 'CompileReturnNonzero.dagjob';

modules/batchmake/tests/models/base/TaskModelTest.php

@@ -32,7 +32,10 @@ public function testCreateTask()
 
     $user1Dao = $usersFile[0];
 
-    $task1Dao = $taskModel->createTask($user1Dao);
+    $tmpWorkDirRoot = KWUtils::getTempDirectory() . '/' . 'test';
+    KWUtils::mkDir($tmpWorkDirRoot);
+
+    $task1Dao = $taskModel->createTask($user1Dao, $tmpWorkDirRoot);
 
     $this->assertNotEmpty($task1Dao);
     $this->assertTrue($task1Dao instanceof Batchmake_TaskDao);
@@ -47,7 +50,7 @@ public function testCreateTask()
     // now try a different user
     $user2Dao = $usersFile[1];
 
-    $task2Dao = $taskModel->createTask($user2Dao);
+    $task2Dao = $taskModel->createTask($user2Dao, $tmpWorkDirRoot);
     $this->assertNotEmpty($task2Dao);
     $this->assertTrue($task2Dao instanceof Batchmake_TaskDao);
     $userId2 = $task2Dao->getUserId();
@@ -68,6 +71,9 @@ public function testCreateTask()
 
     $task4Dao = $taskModel->load($taskId2);
     $this->assertTrue($taskModel->compareDao($task2Dao, $task4Dao));
+
+    // now clean up
+    KWUtils::recursiveRemoveDirectory($tmpWorkDirRoot);
     }