Changeset 7317

Timestamp:

Apr 3, 2017, 1:44:30 PM (6 years ago)

Author:

Nicklas Nordborg

Message:

Fixes #2071: Restart a job from the beginning if it has already been restarted in the middle

It is now possible to select if a job should be restarted from the beginning or from the stored breakpoint.

Location:

trunk

Files:

• src/core/net/sf/basedb/core/Job.java (modified) (1 diff)
• www/common/plugin/finish_job.jsp (modified) (1 diff)
• www/common/plugin/index.jsp (modified) (1 diff)
• www/views/jobs/index.jsp (modified) (1 diff)
• www/views/jobs/jobs.js (modified) (2 diffs)
• www/views/jobs/restart_job_options.js (added)
• www/views/jobs/restart_job_options.jsp (added)
• www/views/jobs/view_job.jsp (modified) (2 diffs)

trunk/src/core/net/sf/basedb/core/Job.java

@@ -1014 +1014 @@
 
   /**
+    The command to send to the plug-in when starting to
+    execute it. If null, a default values is used. See
+    Request.COMMAND_EXECUTE. This is usually only used when
+    automatically restarting a failed job.
+    @since 3.11
+  */
+  public String getExecuteCommand()
+  {
+    return getData().getExecuteCommand();
+  }
+  
+  /**
+    Reset th currently stored execution command to force a 
+    plug-in to restart from the beginning instead of at the
+    stored breakpoint.
+    @since 3.11
+  */
+  public void clearExecuteCommand()
+  {
+    checkPermission(Permission.WRITE);
+    getData().setExecuteCommand(null);
+  }
+  
+  /**
     Set the job's status to {@link Status#WAITING}. This status is
     used to signal that a job has been fully configured and is ready

trunk/www/common/plugin/finish_job.jsp

@@ -117 +117 @@
       </tr>
       <%
+      if (job.getExecuteCommand() != null)
+      {
+        %>
+        <tr>
+          <th class="subprompt"></th>
+          <td>
+            <input type="checkbox" name="resume_from_breakpoint" id="resumeFromBreakPoint" value="1">
+            <label for="resumeFromBreakPoint">Resume from breakpoint: <%=HTML.encodeTags(job.getExecuteCommand()) %></label>
+          </td>
+        </tr>
+        <%
+      }
+      %>
+      <%
       if (agents != null && agents.size() > 0)
       {

trunk/www/common/plugin/index.jsp

@@ -559 +559 @@
     job.setSendMessage(Values.getBoolean(request.getParameter("send_message")));
     job.setRemoveJobWhenFinished(Values.getBoolean(request.getParameter("remove_job")));
-    
+    if (!Values.getBoolean(request.getParameter("resume_from_breakpoint")))
+    {
+      job.clearExecuteCommand();
+    }
     if (!executeImmediately)
     {

trunk/www/views/jobs/index.jsp

@@ -308 +308 @@
     boolean useLatestConfiguration = Values.getBoolean(request.getParameter("useLatestConfiguration"), false);
     boolean clearDryRun = Values.getBoolean(request.getParameter("clearDryRun"), false);
+    boolean resumeFromBreakPoint = Values.getBoolean(request.getParameter("resumeFromBreakPoint"), false);
     dc = sc.newDbControl();
     Job job = Job.getById(dc, cc.getId());
+    if (!resumeFromBreakPoint) job.clearExecuteCommand();
     job.retry(useLatestConfiguration, clearDryRun);
     dc.commit();

trunk/www/views/jobs/jobs.js

@@ -122 +122 @@
 
   
-  jobs.restartJob = function(event)
+  jobs.restartJob = function(event, options)
   {
     var parameterVersion = Data.int('page-data', 'job-parameter-version');
     var latestVersion = Data.int('page-data', 'latest-parameter-version');
-    var jobId = Data.get('page-data', 'item-id');
-    var clearDryRun = Data.int(event.currentTarget, 'clear-dry-run', 0);
+    var breakPoint = Data.get('page-data', 'breakpoint');
+    var jobId = Data.get('page-data', 'item-id');
+    var clearDryRun = event ? Data.int(event.currentTarget, 'clear-dry-run', 0) : 0;
     
     var useLatestConfiguration = 0;
-    if (parameterVersion != latestVersion)
-    {
-      var msg = 'The configuration parameters for the plugin has changed since\n';
-      msg += 'the job was added to the job queue. Do you want to use the new\n';
-      msg += 'configuration parameters?\n\n';
-      msg += 'Ok / Yes = Use the new parameters (version = '+latestVersion + ')\n';
-      msg += 'Cancel / No = Use the current parameters (version = ' + parameterVersion + ')';
-      if (confirm(msg)) 
-      {
-        useLatestConfiguration = 1;
+    var resumeFromBreakPoint = 0;
+    if (parameterVersion != latestVersion || breakPoint)
+    {
+      if (!options)
+      {
+        var url = 'restart_job_options.jsp?';
+        Dialogs.openPopup(url, 'RestartJobOptions', 500, 300);
+        return;
+      }
+      else
+      {
+        useLatestConfiguration = options.useLatestConfiguration || 0;
+        resumeFromBreakPoint = options.resumeFromBreakPoint || 0;
       }
     }
@@ -145 +149 @@
     url += '&cmd=RestartJob&item_id='+jobId;
     url += '&useLatestConfiguration='+useLatestConfiguration;
+    url += '&resumeFromBreakPoint='+resumeFromBreakPoint;
     if (clearDryRun) url += '&clearDryRun=' + clearDryRun;
     location.replace(url);

trunk/www/views/jobs/view_job.jsp

@@ -227 +227 @@
       data-job-parameter-version="<%=parameterVersion %>"
       data-latest-parameter-version="<%=latestParameterVersion %>"
+      data-breakpoint="<%=HTML.encodeTags(job.getExecuteCommand()) %>"
       data-job-status="<%=status.name()%>"
       data-auto-update="<%=autoUpdate ? 1 : 0 %>"
@@ -317 +318 @@
           <div class="<%=job.getStatus() == Job.Status.ERROR ? "error messagecontainer" : ""%>" style="margin: 1px 0px;">
           <%=job.getStatus()%><%=job.isDryRun() ? " (dry-run)" : "" %>: 
-          <span id="message" ><%=HTML.niceFormat(job.getStatusMessage())%></span>
+          <span id="message">
+            <%=job.getStatus() == Job.Status.WAITING && job.getExecuteCommand() != null ? 
+              "(Resume from " + job.getExecuteCommand() + ")" : ""%>
+            <%=HTML.niceFormat(job.getStatusMessage())%></span>
           </div>
         </td>