Feature: Delete Job: Add robustness, and auto-delete all workflow sub-jobs when parent is deleted.

Author: jhuckaby

htdocs/js/pages/Job.class.js

@@ -3054,7 +3054,17 @@ Page.Job = class Job extends Page.PageUtils {
 		var job = this.job;
 		if (!app.requirePrivilege('delete_jobs')) return;
 
-		Dialog.confirmDanger( 'Delete Job', "Are you sure you want to permanently delete the current job, including all logs and files?  There is no way to undo this operation.", ['trash-can', 'Delete'], function(result) {
+		var title = "Delete Job";
+		var text = "Are you sure you want to permanently delete the current job, including all logs and files?  There is no way to undo this operation.";
+		var btn = ['trash-can', 'Delete'];
+		
+		if (job.type == 'workflow') {
+			title = "Delete Workflow Job";
+			text += "<br><br>Also, since this is a workflow, note that all sub-jobs will be deleted as well.";
+			btn = ['trash-can', 'Delete All'];
+		}
+		
+		Dialog.confirmDanger( title, text, btn, function(result) {
 			if (!result) return;
 			app.clearError();
 			Dialog.showProgress( 1.0, "Deleting Job..." );

lib/job.js

@@ -1865,6 +1865,7 @@ class Jobs {
 	deleteJob(job, callback) {
 		// delete job record, log and any files
 		var self = this;
+		this.logJob(5, "Deleting job: " + job.id);
 
 		// rollback affected stats
 		this.rollbackJobStats(job);
@@ -1878,20 +1879,23 @@ class Jobs {
 				// delete log file, if present
 				if (!job.log_file_size || job.output) return process.nextTick(callback);
 				var log_path = 'logs/jobs/' + job.id + '/log.txt.gz';
-				self.storage.delete( log_path, callback );
+				self.storage.delete( log_path, function(err) {
+					self.logError('storage', "" + err);
+					callback();
+				} );
 			},
 			function(callback) {
 				// delete other files, if any
 				if (!job.files || !job.files.length) return process.nextTick(callback);
 				var keys = job.files.map( function(file) { return file.path; } );
-				self.storage.deleteMulti( keys, callback );
+				self.storage.deleteAll( keys, callback );
 			},
 			function(callback) {
 				// delete input files, but only if not attached to buckets/tickets
 				if (!job.input || !job.input.files || !job.input.files.length) return process.nextTick(callback);
 				var keys = job.input.files.filter( function(file) { return !file.bucket && !file.ticket; } ).map( function(file) { return file.path; } );
 				if (!keys.length) return process.nextTick(callback);
-				self.storage.deleteMulti( keys, callback );
+				self.storage.deleteAll( keys, callback );
 			},
 			function(callback) {
 				// update parent workflow if applicable
@@ -1912,6 +1916,37 @@ class Jobs {
 						callback();
 					}
 				); // unbase.get
+			},
+			function(callback) {
+				// recurse for workflow jobs
+				if ((job.type != 'workflow') || !job.workflow || !job.workflow.jobs) return process.nextTick(callback);
+				
+				// collect all sub-job ids from wf
+				var job_ids = [];
+				for (var node_id in job.workflow.jobs) {
+					job.workflow.jobs[node_id].forEach( function(stub) {
+						job_ids.push( stub.id );
+					} );
+				}
+				
+				// workflow may not have completed any jobs
+				if (!job_ids.length) return process.nextTick(callback);
+				
+				self.logJob(5, "Deleting all workflow sub-jobs for: " + job.id, { ids: job_ids });
+				
+				async.eachSeries( job_ids, function(job_id, callback) {
+					self.unbase.get( 'jobs', job_id, function(err, sub_job) {
+						if (err) {
+							self.logError('unbase', "" + err);
+							return callback();
+						}
+						
+						// prevent deleteJob recursion from trying to update parent workflow
+						if (sub_job.workflow && sub_job.workflow.job) delete sub_job.workflow.job;
+						
+						self.deleteJob(sub_job, callback);
+					} ); // unbase.get
+				}, callback); // eachSeries
 			}
 		], callback ); // async.series
 	}