Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update execution cancelation to abort plugin. Closes #1220 #1223

Merged
merged 4 commits into from
Sep 11, 2019
Merged

Update execution cancelation to abort plugin. Closes #1220 #1223

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
f404164
WIP #1220 Add onAbort handler
brollb Sep 10, 2019
63931eb
WIP #1220 Updated execution to check for executionId
brollb Sep 11, 2019
a4ee7fe
Add executionId to Execution and Job
brollb Sep 11, 2019
50f2a01
WIP removed references to the executor client
brollb Sep 11, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
WIP removed references to the executor client
  • Loading branch information
@brollb
brollb committed Sep 11, 2019
commit 50f2a013ec9442c530e48c890a6fac905c2e5611
41 changes: 1 addition & 40 deletions src/common/viz/Execute.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,13 @@
/* globals define, WebGMEGlobal */
/* globals define */
// Mixin for executing jobs and pipelines
define([
'q',
'executor/ExecutorClient',
'deepforge/api/ExecPulseClient',
'deepforge/api/JobOriginClient',
'deepforge/Constants',
'panel/FloatingActionButton/styles/Materialize'
], function(
Q,
ExecutorClient,
ExecPulseClient,
JobOriginClient,
CONSTANTS,
Expand All @@ -22,11 +20,6 @@ define([
this.pulseClient = new ExecPulseClient({
logger: this.logger
});
this._executor = new ExecutorClient({
logger: this.logger.fork('ExecutorClient'),
serverPort: WebGMEGlobal.gmeConfig.server.port,
httpsecure: window.location.protocol === 'https:'
});
this.originManager = new JobOriginClient({logger: this.logger});
};

Expand Down Expand Up @@ -90,38 +83,6 @@ define([
return node.getAttribute('executionId');
};

Execute.prototype.silentStopJob = function(job) {
var jobHash,
secret;

job = job || this.client.getNode(this._currentNodeId);
jobHash = job.getAttribute('jobId');
secret = job.getAttribute('secret');
if (!jobHash || !secret) {
this.logger.error('Cannot stop job. Missing jobHash or secret');
return;
}

return this._executor.cancelJob(jobHash, secret)
.then(() => this.logger.info(`${jobHash} has been cancelled!`))
.fail(err => this.logger.error(`Job cancel failed: ${err}`));
};

Execute.prototype._setJobStopped = function(jobId, silent) {
if (!silent) {
var name = this.client.getNode(jobId).getAttribute('name');
this.client.startTransaction(`Stopping "${name}" job`);
}

this.client.delAttribute(jobId, 'jobId');
this.client.delAttribute(jobId, 'secret');
this.client.setAttribute(jobId, 'status', 'canceled');

if (!silent) {
this.client.completeTransaction();
}
};

Execute.prototype.loadChildren = function(id) {
var deferred = Q.defer(),
execNode = this.client.getNode(id || this._currentNodeId),
Expand Down