Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions eng/publishing/v3/publish-assets.yml
Original file line number Diff line number Diff line change
Expand Up @@ -102,6 +102,8 @@ jobs:
/p:AzureDevOpsOrg='$(AzDOAccount)'
/p:AzureProject='$(AzDOProjectName)'
/p:UseStreamingPublishing='true'
/p:StreamingPublishingMaxClients=16
/p:NonStreamingPublishingMaxClients=12
- template: /eng/common/templates/steps/publish-logs.yml
parameters:
StageLabel: '${{ parameters.stageName }}'
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -109,6 +109,8 @@
<AllowFeedOverrides Condition="'$(AllowFeedOverrides)' == ''">false</AllowFeedOverrides>
<UseStreamingPublishing Condition="'$(UseStreamingPublishing)' == ''">false</UseStreamingPublishing>
<ArtifactsBasePath Condition="'$(ArtifactsBasePath)' == ''">$(BlobBasePath)</ArtifactsBasePath>
<NonStreamingPublishingMaxClients Condition="'$(NonStreamingPublishingMaxClients)' == ''">12</NonStreamingPublishingMaxClients>
<StreamingPublishingMaxClients Condition="'$(UseStreamingPublishing)' == 'true' and '$(StreamingPublishingMaxClients)' == ''">16</StreamingPublishingMaxClients>
</PropertyGroup>

<Error
Expand Down Expand Up @@ -160,8 +162,9 @@
BuildId="$(BuildId)"
AzureDevOpsOrg="$(AzureDevOpsOrg)"
AzureProject="$(AzureProject)"
UseStreamingPublishing="$(UseStreamingPublishing)"/>

UseStreamingPublishing="$(UseStreamingPublishing)"
StreamingPublishingMaxClients="$(StreamingPublishingMaxClients)"
NonStreamingPublishingMaxClients="$(NonStreamingPublishingMaxClients)"/>
</Target>

<ItemGroup>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -196,6 +196,10 @@ public string BuildQuality
/// </summary>
public bool UseStreamingPublishing { get; set; } = false;

public int StreamingPublishingMaxClients {get; set;}
Copy link
Member

Choose a reason for hiding this comment

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

perhaps a short comment describing why these values are settable is in order.

Copy link
Member Author

Choose a reason for hiding this comment

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

added a comment with the streaming and non streaming values

Copy link
Member

@MattGal MattGal Jun 8, 2021

Choose a reason for hiding this comment

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

The comments should be /// < Summary > style and go here
(argh github formatting)

Copy link
Member Author

Choose a reason for hiding this comment

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

sure will update it


public int NonStreamingPublishingMaxClients {get; set;}

/// <summary>
/// Just an internal flag to keep track whether we published assets via a V3 manifest or not.
/// </summary>
Expand Down Expand Up @@ -389,7 +393,9 @@ internal PublishArtifactsInManifestBase ConstructPublishingV3Task(BuildModel bui
BuildId = this.BuildId,
AzureProject = this.AzureProject,
AzureDevOpsOrg = this.AzureDevOpsOrg,
UseStreamingPublishing = this.UseStreamingPublishing
UseStreamingPublishing = this.UseStreamingPublishing,
StreamingPublishingMaxClients = this.StreamingPublishingMaxClients,
NonStreamingPublishingMaxClients = this.NonStreamingPublishingMaxClients
};
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -69,9 +69,13 @@ public abstract class PublishArtifactsInManifestBase : Microsoft.Build.Utilities
/// </summary>
[Required]
public string NugetPath { get; set; }

private const int StreamingPublishingMaxClients = 16;
private const int NonStreamingPublishingMaxClients = 12;

/// <summary>
/// We are setting StreamingPublishingMaxClients=16 and NonStreamingPublishingMaxClients=12 through publish-asset.yml as we were hitting OOM issue
/// https://github.com/dotnet/core-eng/issues/13098 for more details.
/// </summary>
public int StreamingPublishingMaxClients {get; set;}
public int NonStreamingPublishingMaxClients {get; set;}

/// <summary>
/// Maximum number of parallel uploads for the upload tasks.
Expand Down