Skip to content
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

Enable parallel discovery #3349

Merged
merged 40 commits into from
Feb 18, 2022
Merged

Enable parallel discovery #3349

merged 40 commits into from
Feb 18, 2022

Conversation

Evangelink
Copy link
Member

@Evangelink Evangelink commented Feb 10, 2022 •
edited
Loading

Description

Replaces #3226 and #3186.

Tagging @Sanan07

Related issue

Fixes : #2902, #2903, #2904, #2686

Sanan07 and others added 18 commits November 22, 2021 21:00
@Sanan07
initial implem
01df3aa
@Sanan07
temp
3e0a4b1
@Sanan07
initila
d114afb
@Sanan07
Stopping discovery after abort
9bc76c7
@Sanan07
removing old logic test
5f6ba48
@Sanan07
Fixing test
a239149
@Sanan07
fixing last chunk logic
fcdd4b6
@Sanan07
temp commit
524448b
@Sanan07
Merge branch 'main' of https://github.com/microsoft/vstest into dev/s…
e8aa241 
…ayuzbas/par-discovery
@Sanan07
Fixing last chunk is empty case. Some refactoring
059181e
@Sanan07
writing first part of tests
0fb8aff
@Sanan07
more tests
a220af5
@Sanan07
Merge branch 'main' of https://github.com/microsoft/vstest into dev/s…
bb13111 
…ayuzbas/par-discovery
@Sanan07
fixing public api
adfdabb
@Sanan07
more public api
c094306
@Sanan07
changing public api files
31ebaa0
@Sanan07
Merge branch 'dev/sayuzbas/par-discovery' into dev/sayuzbas/parallel-…
35e7060 
…discovery--fix
@Evangelink
Merge branch 'main' into pr/3226
0a2bce3 
# Conflicts:
#	src/Microsoft.TestPlatform.Client/DesignMode/DesignModeClient.cs
#	src/Microsoft.TestPlatform.Client/Discovery/DiscoveryRequest.cs
#	src/Microsoft.TestPlatform.Client/RequestHelper/ITestRequestManager.cs
#	src/Microsoft.TestPlatform.Common/Interfaces/Engine/ClientProtocol/IParallelProxyDiscoveryManager.cs
#	src/Microsoft.TestPlatform.Common/Interfaces/Engine/ClientProtocol/IProxyDiscoveryManager.cs
#	src/Microsoft.TestPlatform.Common/Interfaces/Engine/TesthostProtocol/IDiscoveryManager.cs
#	src/Microsoft.TestPlatform.CommunicationUtilities/Interfaces/ITestRequestSender.cs
#	src/Microsoft.TestPlatform.CommunicationUtilities/JsonDataSerializer.cs
#	src/Microsoft.TestPlatform.CommunicationUtilities/Messages/DiscoveryCompletePayload.cs
#	src/Microsoft.TestPlatform.CommunicationUtilities/TestRequestSender.cs
#	src/Microsoft.TestPlatform.CrossPlatEngine/Client/InProcessProxyDiscoveryManager.cs
#	src/Microsoft.TestPlatform.CrossPlatEngine/Client/Parallel/ParallelDiscoveryDataAggregator.cs
#	src/Microsoft.TestPlatform.CrossPlatEngine/Client/Parallel/ParallelDiscoveryEventsHandler.cs
#	src/Microsoft.TestPlatform.CrossPlatEngine/Client/Parallel/ParallelProxyDiscoveryManager.cs
#	src/Microsoft.TestPlatform.CrossPlatEngine/Client/ProxyDiscoveryManager.cs
#	src/Microsoft.TestPlatform.CrossPlatEngine/Discovery/DiscovererEnumerator.cs
#	src/Microsoft.TestPlatform.CrossPlatEngine/Discovery/DiscoveryManager.cs
#	src/Microsoft.TestPlatform.CrossPlatEngine/EventHandlers/TestRequestHandler.cs
#	src/Microsoft.TestPlatform.ObjectModel/Client/Events/DiscoveryCompleteEventArgs.cs
#	src/Microsoft.TestPlatform.ObjectModel/Client/Interfaces/IDiscoveryRequest.cs
#	src/Microsoft.TestPlatform.ObjectModel/Constants.cs
#	src/Microsoft.TestPlatform.VsTestConsole.TranslationLayer/VsTestConsoleRequestSender.cs
#	src/vstest.console/TestPlatformHelpers/TestRequestManager.cs
#	test/Microsoft.TestPlatform.AcceptanceTests/TranslationLayerTests/DiscoverTests.cs
#	test/Microsoft.TestPlatform.AcceptanceTests/TranslationLayerTests/EventHandler/DiscoveryEventHandler.cs
#	test/Microsoft.TestPlatform.Client.UnitTests/DesignMode/DesignModeClientTests.cs
#	test/Microsoft.TestPlatform.Client.UnitTests/Discovery/DiscoveryRequestTests.cs
#	test/Microsoft.TestPlatform.CrossPlatEngine.UnitTests/Client/Parallel/ParallelDiscoveryDataAggregatorTests.cs
#	test/Microsoft.TestPlatform.CrossPlatEngine.UnitTests/Client/Parallel/ParallelDiscoveryEventsHandlerTests.cs
#	test/Microsoft.TestPlatform.CrossPlatEngine.UnitTests/Client/Parallel/ParallelProxyDiscoveryManagerTests.cs
#	test/Microsoft.TestPlatform.CrossPlatEngine.UnitTests/Discovery/DiscoveryManagerTests.cs
#	test/TranslationLayer.UnitTests/VsTestConsoleRequestSenderTests.cs
#	test/vstest.console.UnitTests/TestPlatformHelpers/TestRequestManagerTests.cs
Evangelink
Evangelink commented Feb 10, 2022
View reviewed changes
src/Microsoft.TestPlatform.Client/RequestHelper/ITestRequestManager.cs Outdated Show resolved Hide resolved
src/Microsoft.TestPlatform.Common/Interfaces/Engine/TesthostProtocol/IDiscoveryManager.cs Outdated Show resolved Hide resolved
src/Microsoft.TestPlatform.CommunicationUtilities/Interfaces/ITestRequestSender.cs Outdated Show resolved Hide resolved
src/Microsoft.TestPlatform.CommunicationUtilities/Messages/DiscoveryCompletePayload.cs Outdated Show resolved Hide resolved
src/Microsoft.TestPlatform.CommunicationUtilities/Messages/DiscoveryCompletePayload.cs Outdated Show resolved Hide resolved
src/Microsoft.TestPlatform.CrossPlatEngine/Client/Parallel/ParallelDiscoveryDataAggregator.cs Outdated Show resolved Hide resolved
src/Microsoft.TestPlatform.CrossPlatEngine/Client/Parallel/ParallelDiscoveryDataAggregator.cs Outdated Show resolved Hide resolved
src/Microsoft.TestPlatform.CrossPlatEngine/Client/Parallel/ParallelDiscoveryDataAggregator.cs Outdated Show resolved Hide resolved
src/Microsoft.TestPlatform.CrossPlatEngine/Client/Parallel/ParallelDiscoveryEventsHandler.cs Outdated Show resolved Hide resolved
src/Microsoft.TestPlatform.ObjectModel/Client/Interfaces/IDiscoveryRequest.cs Outdated Show resolved Hide resolved
@Evangelink @Haplois
Update src/Microsoft.TestPlatform.Client/Discovery/DiscoveryRequest.cs
56ab677 
Co-authored-by: Medeni Baykal <433724+Haplois@users.noreply.github.com>
nohwnd
nohwnd reviewed Feb 14, 2022
View reviewed changes
src/Microsoft.TestPlatform.Client/DesignMode/DesignModeClient.cs Outdated Show resolved Hide resolved
src/Microsoft.TestPlatform.Client/Discovery/DiscoveryRequest.cs Outdated Show resolved Hide resolved
src/Microsoft.TestPlatform.Client/RequestHelper/ITestRequestManager.cs Outdated Show resolved Hide resolved
src/Microsoft.TestPlatform.Common/Interfaces/Engine/ClientProtocol/DiscoveryStatus.cs Show resolved Hide resolved
src/Microsoft.TestPlatform.Common/Interfaces/Engine/ClientProtocol/IProxyDiscoveryManager.cs Show resolved Hide resolved
src/Microsoft.TestPlatform.CrossPlatEngine/Client/Parallel/ParallelProxyDiscoveryManager.cs Outdated
{
if (sources == null || sources.Count() == 0) return;

lock (_enumeratorLockObject)
Copy link
Member

Choose a reason for hiding this comment

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

What does the second remark mean?

src/Microsoft.TestPlatform.CrossPlatEngine/Discovery/DiscoveryManager.cs Outdated Show resolved Hide resolved
src/Microsoft.TestPlatform.CrossPlatEngine/Discovery/DiscoveryManager.cs Outdated Show resolved Hide resolved
src/Microsoft.TestPlatform.CrossPlatEngine/Discovery/DiscoveryManager.cs Outdated Show resolved Hide resolved
src/Microsoft.TestPlatform.ObjectModel/Client/Events/DiscoveryCompleteEventArgs.cs Outdated Show resolved Hide resolved
@Evangelink Evangelink mentioned this pull request Feb 15, 2022
Merged
@Evangelink
Address part of the review comments
5271c97
@Evangelink
Simpler API
226544d
@Evangelink
Merge branch 'main' into pr/3226
a9115b5 
# Conflicts:
#	src/Microsoft.TestPlatform.CrossPlatEngine/Client/Parallel/ParallelDiscoveryDataAggregator.cs
Haplois
Haplois approved these changes Feb 16, 2022
View reviewed changes
Copy link
Contributor

@Haplois Haplois left a comment

Choose a reason for hiding this comment

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

LGTM, I have some comments though.

src/Microsoft.TestPlatform.Common/Interfaces/Engine/ClientProtocol/DiscoveryStatus.cs Show resolved Hide resolved
test/Microsoft.TestPlatform.Client.UnitTests/Discovery/DiscoveryRequestTests.cs Outdated Show resolved Hide resolved
@nohwnd nohwnd mentioned this pull request Feb 17, 2022
Closed
@Evangelink Evangelink merged commit 8ec0c03 into microsoft:main Feb 18, 2022
@Evangelink Evangelink deleted the pr/3226 branch February 18, 2022 13:53
@psfinaki psfinaki mentioned this pull request Feb 18, 2022
Closed
This was referenced Mar 3, 2022
Closed
Merged
This was referenced Aug 1, 2022
Closed
Closed
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Haplois Haplois Haplois approved these changes

@MarcoRossignoli MarcoRossignoli MarcoRossignoli left review comments

@nohwnd nohwnd nohwnd approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Fix discovery abort scenario
5 participants
@Evangelink @MarcoRossignoli @Haplois @nohwnd @Sanan07