diff --git a/src/common/plugin/LocalExecutor.js b/src/common/plugin/LocalExecutor.js index 0b360c029..d857a5ee3 100644 --- a/src/common/plugin/LocalExecutor.js +++ b/src/common/plugin/LocalExecutor.js @@ -10,7 +10,6 @@ define([ var LocalExecutor = function() { }; - // Should these be in lua? LocalExecutor.prototype[CONSTANTS.OP.INPUT] = function(node) { // Get the hash from the output node var hash; @@ -153,12 +152,14 @@ define([ newName = this.core.getOwnAttribute(node, 'saveName'), createdAt = Date.now(); - if (newName) { - newNodes.forEach(node => { - this.setAttribute(node, 'name', newName); - this.setAttribute(node, 'createdAt', createdAt); - }); - } + newNodes.forEach(newNode => { + if (newName) { + this.setAttribute(newNode, 'name', newName); + } + this.setAttribute(newNode, 'createdAt', createdAt); + this.setPointer(newNode, 'origin', inputs[0][2]); + }); + var hashes = dataNodes.map(n => this.getAttribute(n, 'data')); this.logger.info(`saving hashes: ${hashes.map(h => `"${h}"`)}`); } else if (allDataNodes.length === 0) { diff --git a/src/plugins/ExecutePipeline/ExecutePipeline.js b/src/plugins/ExecutePipeline/ExecutePipeline.js index cf17c677c..5bf3c4d36 100644 --- a/src/plugins/ExecutePipeline/ExecutePipeline.js +++ b/src/plugins/ExecutePipeline/ExecutePipeline.js @@ -217,7 +217,7 @@ define([ .then(ops => ops.forEach(op => this.updateJobCompletionRecords(op))) .then(() => this.save(`Resuming pipeline execution: ${name}`)) .then(() => { - + if (jobs.running.length) { // Resume all running jobs return Q.all(jobs.running.map(job => this.resumeJob(job))); } else if (this.completedCount === this.totalCount) { @@ -547,7 +547,7 @@ define([ hasReadyOps = counts.indexOf(0) > -1; - this.logger.debug(`Operation "${name}" completed. ` + + this.logger.debug(`Operation "${name}" completed. ` + `${this.totalCount - this.completedCount} remaining.`); if (hasReadyOps) { this.executeReadyOperations(); @@ -582,6 +582,8 @@ define([ let hash = this.getAttribute(result, 'data'); this.setAttribute(next, 'data', hash); + this.setPointer(next, 'origin', result); + this.logger.info(`forwarding data (${dataType}) from ${this.core.getPath(result)} ` + `to ${this.core.getPath(next)}`); diff --git a/src/seeds/pipeline/pipeline.webgmex b/src/seeds/pipeline/pipeline.webgmex index f3cf233c1..5d996c46b 100644 Binary files a/src/seeds/pipeline/pipeline.webgmex and b/src/seeds/pipeline/pipeline.webgmex differ diff --git a/src/seeds/pipeline/version.txt b/src/seeds/pipeline/version.txt index 899f24fc7..78bc1abd1 100644 --- a/src/seeds/pipeline/version.txt +++ b/src/seeds/pipeline/version.txt @@ -1 +1 @@ -0.9.0 \ No newline at end of file +0.10.0