Merge pull request #439 from CodeNow/image-pull-changes

pull image fixes

Author: tjmehta

lib/models/mongo/instance.js

@@ -240,7 +240,9 @@ InstanceSchema.methods.modifyUnsetContainer = function (cb) {
 InstanceSchema.methods.modifyContainerCreateErr = function (err, cb) {
   Instance.findByIdAndUpdate(this._id, {
     $set: {
-      'container.error': pick(err, ['message', 'stack', 'data'])
+      container: {
+        error: pick(err, ['message', 'stack', 'data', 'imageIsPulling'])
+      }
     }
   }, cb);
 };

lib/models/mongo/schemas/instance.js

@@ -130,7 +130,8 @@ var InstanceSchema = module.exports = new Schema({
         type: {
           message: String,
           stack: String,
-          data: Schema.Types.Mixed
+          data: Schema.Types.Mixed,
+          imageIsPulling: Boolean
         }
       }
     }

lib/routes/instances/index.js

@@ -127,24 +127,31 @@ var createSaveAndNetworkContainer = flow.series(
   .catch(
     mw.req().setToErr('containerCreateErr'),
     mw.req('containerCreateErr.output.statusCode').validate(validations.equals(404))
+      .then(
+        mw.req().set('containerCreateErr.imageIsPulling', true)),
+    instances.model.modifyContainerCreateErr('containerCreateErr'),
+    mw.req('containerCreateErr.imageIsPulling').validate(validations.equals(true))
       .then(
         docker.model.pullImage('contextVersion'),
         function(req, res, next) {
           // emitter.emit('dockerResult') need to emit pull event here
-          req.dockerResult.on('data', function() {});
+          req.dockerResult.on('data', function () {
+            // TODO: pipe to pull-stream
+          });
+          // on pull finish, redeploy instance
+          req.dockerResult.on('end', function () {
+            flow.series(
+              runnable.create({}, 'sessionUser'),
+              runnable.model.redeployInstance('instance', {
+                forceDock: 'dockerHost',
+                json: { build: 'build._id.toString()' }
+              }))(req, res, function (err) {
+                error.logIfErr(err, req);
+              });
+          });
+          // next immediately, background pull and redeploy
           next();
-        },
-        runnable.create({}, 'sessionUser'),
-        // redeploy instance with host. remove lock associated with redeploy route
-        hosts.model.releaseHostLock('ownerUsername', 'instance.name'),
-        runnable.model.redeployInstance('instance', {
-          forceDock: 'dockerHost',
-          json: { build: 'build._id.toString()' }
-        }),
-        hosts.model.acquireHostLock('ownerUsername', 'instance.name'),
-        instances.findById('instanceId'))
-      .else(
-        instances.model.modifyContainerCreateErr('containerCreateErr'))),
+        })),
   mw.req('containerInfo').require()
     .then( // container create was successful
       docker.model.startUserContainer('containerInfo'),

test/instances/post/201.js

@@ -243,11 +243,9 @@ describe('201 POST /instances', {timeout:500}, function () {
         beforeEach(function (done) {
           extend(ctx.expected, {
             containers: exists,
-            'containers[0]': exists,
-            'containers[0].ports': exists,
-            'containers[0].dockerHost': exists,
-            'containers[0].dockerContainer': exists,
-            'containers[0].inspect.State.Running': true
+            'containers[0].error.message': exists,
+            'containers[0].error.stack': exists,
+            'containers[0].error.imageIsPulling': true
           });
           Dockerode.prototype.createContainer = forceImageNotFoundOnCreateErrOnce(Dockerode.prototype.createContainer);
           done();