Skip to content

Port server cache fix to release #9932

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom
Merged
merged 2 commits into from
Feb 6, 2020
Merged

Port server cache fix to release #9932

merged 2 commits into from
Feb 6, 2020

Conversation

IanMatthewHuff
Copy link
Member

For #9926

Porting this PR into release:
#9929

  • Pull request represents a single change (i.e. not fixing disparate/unrelated things in a single PR).
  • Title summarizes what is changing.
  • Has a news entry file (remember to thank yourself!).
  • Appropriate comments and documentation strings in the code.
  • Has sufficient logging.
  • Has telemetry for enhancements.
  • Unit tests & system/integration tests are added/updated.
  • Test plan is updated as appropriate.
  • package-lock.json has been regenerated by running npm install (if dependencies have changed).
  • The wiki is updated with any design decisions/details.

@IanMatthewHuff
Use the autoStart server if it matches when starting a new server (mi…
b99c940 
…crosoft#9929)

* don't cancel an already resolve servercache just due to disableUI changes

* don't pull data a second time
rchiodo
rchiodo reviewed Feb 5, 2020
View reviewed changes
news/2 Fixes/9926.md Outdated
@@ -0,0 +1 @@
Use the autoStart server when available.
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Don't forget to update the changelog

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@rchiodo . Did we change the process? I didn't do this on previous release ports, thought that it was generated by running 'news' task as part of the final release plan.

Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think other people have started running the task during their port? @karthiknadig should we update the changelog when porting fixes?

Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It looks like that's what David did here:
https://github.com/microsoft/vscode-python/pull/9912/files

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hmm, guess I can do that. Seems like that would mess up the cherry-pick since that has the news file in it. But I could just delete that as well.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Via Karthik it sounds like we can do either. But I was already updating the CL, so I just went ahead with it.

@codecov-io
Copy link

codecov-io commented Feb 5, 2020 •
edited
Loading

Codecov Report

Merging #9932 into release-2020.02 will decrease coverage by 0.2%.
The diff coverage is 66.66%.

Impacted file tree graph

@@                 Coverage Diff                 @@
##           release-2020.02    #9932      +/-   ##
===================================================
- Coverage            61.21%   61.01%   -0.21%     
===================================================
  Files                  564      564              
  Lines                30061    30412     +351     
  Branches              4545     4635      +90     
===================================================
+ Hits                 18403    18555     +152     
- Misses               10629    10817     +188     
- Partials              1029     1040      +11
Impacted Files Coverage Δ
...lient/datascience/jupyter/liveshare/serverCache.ts 65.33% <66.66%> (-0.43%) ⬇️
...datascience/jupyter/liveshare/hostJupyterServer.ts 11.03% <0%> (-1.33%) ⬇️
...client/datascience/jupyter/jupyterServerWrapper.ts 28.07% <0%> (-0.51%) ⬇️
src/client/datascience/jupyter/jupyterServer.ts 8.73% <0%> (+0.39%) ⬆️
...ient/datascience/interactive-ipynb/nativeEditor.ts 57.3% <0%> (+0.59%) ⬆️

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 9f5ac3f...016a6fd. Read the comment docs.

@IanMatthewHuff IanMatthewHuff added the no-changelog No news entry required label Feb 5, 2020
@IanMatthewHuff
Copy link
Member Author

Stuck CI :(

@IanMatthewHuff IanMatthewHuff reopened this Feb 6, 2020
@sonarqubecloud
Copy link

sonarqubecloud bot commented Feb 6, 2020

Kudos, SonarCloud Quality Gate passed!

Bug A 0 Bugs
Vulnerability A 0 Vulnerabilities (and Security Hotspot 0 Security Hotspots to review)
Code Smell A 0 Code Smells

No Coverage information No Coverage information
No Duplication information No Duplication information

@IanMatthewHuff IanMatthewHuff merged commit d022524 into microsoft:release-2020.02 Feb 6, 2020
@IanMatthewHuff IanMatthewHuff deleted the dev/ianhu/portServerCacheToRelease branch February 6, 2020 11:13
@lock lock bot locked as resolved and limited conversation to collaborators Feb 13, 2020
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@rchiodo rchiodo rchiodo approved these changes

@DavidKutu DavidKutu DavidKutu approved these changes

@DonJayamanne DonJayamanne Awaiting requested review from DonJayamanne

@karthiknadig karthiknadig Awaiting requested review from karthiknadig

Assignees
No one assigned
Labels
no-changelog No news entry required
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@IanMatthewHuff @codecov-io @rchiodo @DavidKutu