Exposed support for Parallel jobs to Tripal Daemon.

tripal_daemon/TripalDaemon.inc

@@ -40,7 +40,7 @@ class TripalDaemon extends DrushDaemon {
 
   // Maximum number of jobs that can be run in parallel.
   // @todo: Implement actually changing this setting (see above note).
-  protected $max_num_jobs = 2;
+  protected $max_num_jobs = 3;
 
   /**
    * Implements DaemonAPIDaemon::executeTask() function.
@@ -301,4 +301,17 @@ class TripalDaemon extends DrushDaemon {
 
     return $status_details;
   }
+
+  /**
+   * Set whether we should run parallel jobs or not.
+   *
+   * @param $do_parallel
+   *   Boolean indicating whether to allow parallel processing of jobs.
+   * @param $max_num_jobs
+   *   Integer indicating the maximum number of jobs to run at once.
+   */
+  public function setParallel($do_parallel, $max_num_jobs) {
+    $this->do_parallel = $do_parallel;
+    $this->max_num_jobs = $max_num_jobs;
+  }
 }

tripal_daemon/tripal_daemon.drush.inc

@@ -29,6 +29,8 @@ function tripal_daemon_drush_command() {
       'show-log' => 'Show the log file.',
     ),
     'options' => array(
+      'parallel' => dt('Normally jobs are executed one at a time. But if you are certain no conflicts will occur with other currently running jobs you may set this argument to a value of 1 to make the job run in parallel with other running jobs.'),
+      'max_jobs' => dt('Indicate the maximum number of concurrent jobs. Default is 3; use -1 (unlimited). Ignore if not running parallel jobs'),
       'num_lines' => 'The number of lines of the log file to show.',
       'child' => array(
         'hidden' => TRUE,
@@ -40,7 +42,7 @@ function tripal_daemon_drush_command() {
     'examples' => array(
       'drush trpjob-daemon start' => 'Start the daemon.',
       'drush trpjob-daemon status' => 'Show the current status of the daemon.',
-      'drush trpjob-daemon stop'              => 'Stop the daemon.',
+      'drush trpjob-daemon stop' => 'Stop the daemon.',
       'drush trpjob-daemon show-log' => 'Show the last 10 lines of the log file.',
       'drush trpjob-daemon show-log --num_lines=50' => 'Show the last 10 lines of the log file.',
     ),
@@ -61,5 +63,56 @@ function tripal_daemon_drush_command() {
  *   you want the daemon to do.
  */
 function drush_tripal_daemon_tripal_jobs_daemon($action) {
-  drush_drushd_daemon($action, 'tripal_daemon');
+
+  $parallel = drush_get_option('parallel', FALSE);
+  $max_jobs = drush_get_option('max_jobs', 3);
+
+  // Check if we have the right version of Drush Daemon to support passing
+  // options to the daemon class.
+  $have_support = FALSE;
+  if (function_exists('drushd_instantiate_daemon')) {
+    $have_support = TRUE;
+  }
+
+  // We need to handle start ourselves in order to handle parallel processing
+  if ($parallel AND ($action == 'start')) {
+
+    // Check if we have the right version of Drush Daemon to support passing
+    // options to the daemon class.
+    if (function_exists('drushd_instantiate_daemon')) {
+      // First, instantiate the daemon.
+      $daemon = drushd_instantiate_daemon('tripal_daemon');
+
+      // We always start our daemons in daemon-mode. Thus when the daemon is first
+      // started from drush, we need to fork the process. However, we don't want
+      // our children to fork continuously or we will end up with a fork_bomb.
+      // Thus when we start our child process we pass in the "child" option which
+      // tells our drush command not to fork again but instead to just run
+      // the daemon.
+      if (!drush_get_option('child')) {
+        drush_invoke_process(
+          '@self',
+          'tripal-jobs-daemon',
+          array('start'),
+          array('child' => TRUE, 'parallel' => $parallel, 'max_jobs' => $max_jobs),
+          array('fork' => TRUE)
+        );
+        drush_print(dt("Use 'drush tripal-jobs-daemon status' to check the "
+          . "status of the daemon just started and 'drush tripal-jobs-daemon stop' to stop it.\n"));
+      }
+      else {
+        $daemon->setParallel($parallel, $max_jobs);
+        $daemon->run();
+      }
+    }
+    else {
+      drush_set_error(dt('Error: You need version 2.3 of Drush Daemon to run
+        parallel jobs. Either update your version of Drush Daemon or start the
+        Tripal Daemon without the parallel option.'));
+    }
+  }
+  // Otherwise just let Drush daemon handle it ;-).
+  else {
+    drush_drushd_daemon($action, 'tripal_daemon');
+  }
 }