Merge pull request #293 from thaJeztah/17.11-backport-stream-ctx-fix

[17.11] builder: fix long stream sync
2017-11-06 13:33:57 -08:00
parent 40dc614b99 36134084bc
commit 1894fce853
1 changed files with 2 additions and 2 deletions
@@ -131,10 +131,10 @@ func (bm *BuildManager) initializeClientSession(ctx context.Context, cancel func
 	}
 	logrus.Debug("client is session enabled")

-	ctx, cancelCtx := context.WithTimeout(ctx, sessionConnectTimeout)
+	connectCtx, cancelCtx := context.WithTimeout(ctx, sessionConnectTimeout)
 	defer cancelCtx()

-	c, err := bm.sg.Get(ctx, options.SessionID)
+	c, err := bm.sg.Get(connectCtx, options.SessionID)
 	if err != nil {
 		return nil, err
 	}