slicer endpoint should not hang on new slicer creation resolves #659 … (

#667) * slicer endpoint should not hang on new slicer creation resolves #659 #589 * updated api error handling * fixed size issue on slicer query
terascope · Feb 27, 2018 · 5fc34f1 · 5fc34f1
1 parent 25c9a3e
commit 5fc34f1
Show file tree

Hide file tree

Showing 10 changed files with 135 additions and 171 deletions.
diff --git a/lib/cluster/execution_controller/engine.js b/lib/cluster/execution_controller/engine.js
@@ -222,7 +222,7 @@ module.exports = function module(context, messaging, exStore, stateStore, execut
     function _terminalError(err) {
         const errMsg = parseError(err);
         const executionStats = executionAnalytics.getAnalytics();
-        const errorMeta = exStore.failureMetaData(errMsg, executionStats);
+        const errorMeta = exStore.executionMetaData(executionStats, errMsg);
         logger.error(errMsg);
 
         exStore.setStatus(exId, 'failed', errorMeta)
@@ -353,7 +353,7 @@ module.exports = function module(context, messaging, exStore, stateStore, execut
                         isProcessing = false;
                         const errMsg = `slicer for ex ${exId} had an error, shutting down execution ${parseError(err)}`;
                         const executionStats = executionAnalytics.getAnalytics();
-                        const errorMeta = exStore.failureMetaData(errMsg, executionStats);
+                        const errorMeta = exStore.executionMetaData(executionStats, errMsg);
                         logger.error(errMsg);
 
                         exStore.setStatus(exId, 'failed', errorMeta)
@@ -479,9 +479,10 @@ module.exports = function module(context, messaging, exStore, stateStore, execut
     }
 
     function _setFailingStatus() {
-        logger.error(`slicer: ${exId} has encountered a processing_error`);
+        const errMsg = `slicer: ${exId} has encountered a processing_error`;
+        logger.error(errMsg);
         const executionStats = executionAnalytics.getAnalytics();
-        const errorMeta = exStore.failureMetaData(null, executionStats);
+        const errorMeta = exStore.executionMetaData(executionStats, errMsg);
         exStore.setStatus(exId, 'failing', errorMeta);
     }
 
@@ -491,7 +492,7 @@ module.exports = function module(context, messaging, exStore, stateStore, execut
             if (checkFn()) {
                 logger.error(logMsg);
                 const executionStats = executionAnalytics.getAnalytics();
-                const errorMetaData = exStore.failureMetaData(errMsg, executionStats);
+                const errorMetaData = exStore.executionMetaData(executionStats, errMsg);
                 exStore.setStatus(exId, 'failed', errorMetaData)
                     .then(() => {
                         messaging.send({
@@ -565,12 +566,12 @@ module.exports = function module(context, messaging, exStore, stateStore, execut
 
                 if (errCount > 0) {
                     const message = `execution: ${exId} had ${errCount} slice failures during processing`;
-                    const errorMeta = exStore.failureMetaData(message, executionStats);
+                    const errorMeta = exStore.executionMetaData(executionStats, message);
                     logger.error(message);
                     exStore.setStatus(exId, 'failed', errorMeta);
                 } else {
                     logger.info(`execution ${exId} has completed`);
-                    const metaData = exStore.failureMetaData(false, executionStats);
+                    const metaData = exStore.executionMetaData(executionStats);
                     exStore.setStatus(exId, 'completed', metaData);
                 }
                 messaging.send(msg);

diff --git a/lib/cluster/execution_controller/recovery.js b/lib/cluster/execution_controller/recovery.js
@@ -41,7 +41,7 @@ module.exports = function module(context, messaging, executionAnalytics, exStore
     function _recoveryFailure(_errMsg) {
         const errMsg = _errMsg.error || _errMsg;
         const slicerAnalytics = executionAnalytics.getAnalytics();
-        const errorMeta = exStore.failureMetaData(errMsg, slicerAnalytics);
+        const errorMeta = exStore.executionMetaData(slicerAnalytics, errMsg);
         logger.error(errMsg);
 
         exStore.setStatus(exId, 'failed', errorMeta)