Merge pull request #464 from CodeNow/catch-start-container-layer-issues

fix start container issues

Author: tjmehta

lib/models/mongo/instance.js

@@ -20,6 +20,7 @@ var keypather = require('keypather')();
 var isFunction = require('101/is-function');
 var createCount = require('callback-count');
 var removeDottedKeys = require('remove-dotted-keys');
+var error = require('error');
 
 var InstanceSchema = require('models/mongo/schemas/instance');
 
@@ -248,6 +249,7 @@ InstanceSchema.methods.modifyContainerCreateErr = function (err, cb) {
       }
     }
   }, cb);
+  error.log(err);
 };
 
 /**
@@ -261,6 +263,7 @@ InstanceSchema.methods.modifySetContainerInspectErr = function (err, cb) {
       'container.inspect.error': pick(err, ['message', 'stack', 'data'])
     }
   }, cb);
+  error.log(err);
 };
 
 InstanceSchema.methods.findContainerById = function (containerId, cb) {

lib/routes/instances/index.js

@@ -157,10 +157,22 @@ var createSaveAndNetworkContainer = flow.series(
         })),
   mw.req('containerInfo').require()
     .then( // container create was successful
-      docker.model.startUserContainer('containerInfo'),
-      docker.model.inspectUserContainer('containerInfo'),
-      mw.req().set('containerInspect', 'dockerResult'),
-      instances.model.modifySetContainer('containerInspect', 'dockerHost'),
+      flow.try(
+        docker.model.startUserContainer('containerInfo')
+      ).catch(
+        // we've seen layer limit errors bubble from startContainer
+        mw.req().setToErr('containerStartErr'),
+        instances.model.modifyContainerCreateErr('containerStartErr')
+      ),
+      flow.try(
+        docker.model.inspectUserContainer('containerInfo'),
+        mw.req().set('containerInspect', 'dockerResult'),
+        instances.model.modifySetContainer('containerInspect', 'dockerHost')
+      ).catch(
+        // this logic is to ensure something is set for container inspect
+        mw.req().setToErr('containerInspectErr'),
+        instances.model.modifySetContainerInspectErr('containerInspectErr')
+      ),
       sauron.create('dockerHost'),
       sauron.model.attachHostToContainer(
         'instance.network.networkIp',
@@ -645,7 +657,7 @@ app.put('/instances/:id/actions/start',
     // start container
     mw.req().set('dockerHost', 'instance.container.dockerHost'),
     docker.create('dockerHost'),
-    docker.model.startContainer('instance.container'),
+    docker.model.startUserContainer('instance.container'),
     instances.model.inspectAndUpdate('instance.container', 'dockerHost'),
     // update weave
     sauron.create('instance.container.dockerHost'),