microsoft · rchiodo · Jul 15, 2019 · Jul 10, 2019 · Jul 10, 2019 · Jul 10, 2019
diff --git a/build/ci/templates/test_phases.yml b/build/ci/templates/test_phases.yml
@@ -203,6 +203,7 @@ steps:
       python -m pip install -U pip
       python -m pip install numpy
       python -m pip install --upgrade -r ./build/functional-test-requirements.txt
+      python -m pip install --upgrade --pre ptvsd
     displayName: 'pip install functional requirements'
     condition: and(succeeded(), eq(variables['NeedsPythonFunctionalReqs'], 'true'))
 

diff --git a/build/ci/vscode-python-nightly-ci.yaml b/build/ci/vscode-python-nightly-ci.yaml
@@ -34,7 +34,7 @@ jobs:
 #       ignorePythonVersions: "3.6,3.5"
 
 - job: 'Nightly'
-
+  timeoutInMinutes: 90
   strategy:
     matrix:
       # Each member of this list must contain these values:

diff --git a/build/functional-test-requirements.txt b/build/functional-test-requirements.txt
@@ -4,4 +4,4 @@ jupyter
 numpy
 matplotlib
 pandas
-livelossplot
+livelossplot
diff --git a/package-lock.json b/package-lock.json
diff --git a/src/client/datascience/jupyter/jupyterServer.ts b/src/client/datascience/jupyter/jupyterServer.ts
@@ -14,7 +14,7 @@ import { CancellationToken } from 'vscode-jsonrpc';
 
 import { ILiveShareApi } from '../../common/application/types';
 import { Cancellation, CancellationError } from '../../common/cancellation';
-import { traceInfo, traceWarning } from '../../common/logger';
+import { traceError, traceInfo, traceWarning } from '../../common/logger';
 import { IAsyncDisposableRegistry, IConfigurationService, IDisposableRegistry, ILogger } from '../../common/types';
 import { createDeferred, Deferred, waitForPromise } from '../../common/utils/async';
 import * as localize from '../../common/utils/localize';
@@ -44,17 +44,21 @@ class CellSubscriber {
     private cellRef: ICell;
     private subscriber: Subscriber<ICell>;
     private promiseComplete: (self: CellSubscriber) => void;
-    private startTime: number;
+    private _startTime: number;
 
     constructor(cell: ICell, subscriber: Subscriber<ICell>, promiseComplete: (self: CellSubscriber) => void) {
         this.cellRef = cell;
         this.subscriber = subscriber;
         this.promiseComplete = promiseComplete;
-        this.startTime = Date.now();
+        this._startTime = Date.now();
+    }
+
+    public get startTime(): number {
+        return this._startTime;
     }
 
     public isValid(sessionStartTime: number | undefined) {
-        return sessionStartTime && this.startTime > sessionStartTime;
+        return sessionStartTime && this.startTime >= sessionStartTime;
     }
 
     public next(sessionStartTime: number | undefined) {
@@ -305,15 +309,19 @@ export class JupyterServerBase implements INotebookServer {
             // Update our start time so we don't keep sending responses
             this.sessionStartTime = Date.now();
 
+            traceInfo('restartKernel - finishing cells that are outstanding');
             // Complete all pending as an error. We're restarting
             this.finishUncompletedCells();
+            traceInfo('restartKernel - restarting kernel');
 
             // Restart our kernel
             await this.session.restart(timeoutMs);
 
             // Rerun our initial setup for the notebook
             this.ranInitialSetup = false;
+            traceInfo('restartKernel - initialSetup');
             await this.initialNotebookSetup();
+            traceInfo('restartKernel - initialSetup completed');
 
             return;
         }
@@ -531,6 +539,8 @@ export class JupyterServerBase implements INotebookServer {
             }
         }
 
+        traceError('No session during execute observable');
+
         // Can't run because no session
         return new Observable<ICell[]>(subscriber => {
             subscriber.error(this.getDisposedError());
@@ -539,7 +549,7 @@ export class JupyterServerBase implements INotebookServer {
     }
 
     private generateRequest = (code: string, silent?: boolean): Kernel.IFuture | undefined => {
-        //this.logger.logInformation(`Executing code in jupyter : ${code}`)
+        //traceInfo(`Executing code in jupyter : ${code}`);
         try {
             const cellMatcher = new CellMatcher(this.configService.getSettings().datascience);
             return this.session ? this.session.requestExecute(
@@ -563,25 +573,29 @@ export class JupyterServerBase implements INotebookServer {
     // Set up our initial plotting and imports
     private async initialNotebookSetup(cancelToken?: CancellationToken): Promise<void> {
         if (this.ranInitialSetup) {
+            traceInfo(`Already ran setup for ${this.id}`);
             return;
         }
         this.ranInitialSetup = true;
 
         try {
             // When we start our notebook initial, change to our workspace or user specified root directory
             if (this.launchInfo && this.launchInfo.workingDir && this.launchInfo.connectionInfo.localLaunch) {
+                traceInfo(`Changing directory for ${this.id}`);
                 await this.changeDirectoryIfPossible(this.launchInfo.workingDir);
             }
 
             const settings = this.configService.getSettings().datascience;
             const matplobInit = !settings || settings.enablePlotViewer ? CodeSnippits.MatplotLibInitSvg : CodeSnippits.MatplotLibInitPng;
 
+            traceInfo(`Initialize matplotlib for ${this.id}`);
             // Force matplotlib to inline and save the default style. We'll use this later if we
             // get a request to update style
             await this.executeSilently(
                 matplobInit,
                 cancelToken
             );
+            traceInfo(`Initial setup complete for ${this.id}`);
         } catch (e) {
             traceWarning(e);
         }
@@ -640,6 +654,7 @@ export class JupyterServerBase implements INotebookServer {
             if (this.launchInfo && this.launchInfo.connectionInfo && this.launchInfo.connectionInfo.localProcExitCode) {
                 // Not running, just exit
                 const exitCode = this.launchInfo.connectionInfo.localProcExitCode;
+                traceError(`Jupyter crashed with code ${exitCode}`);
                 subscriber.error(this.sessionStartTime, new Error(localize.DataScience.jupyterServerCrashed().format(exitCode.toString())));
                 subscriber.complete(this.sessionStartTime);
             } else {
@@ -716,6 +731,10 @@ export class JupyterServerBase implements INotebookServer {
                 }
             }
         } else {
+            const sessionDate = new Date(this.sessionStartTime!);
+            const cellDate = new Date(subscriber.startTime);
+            traceInfo(`Session start time is newer than cell : \r\n${sessionDate.toTimeString()}\r\n${cellDate.toTimeString()}`);
+
             // Otherwise just set to an error
             this.handleInterrupted(subscriber.cell);
             subscriber.cell.state = CellState.error;