Moved polling into the validation step to avoid holding up builds.

paulmedynski · paulmedynski · commit 39054445febc · 2026-03-23T16:06:29.000-03:00
diff --git a/.github/copilot-instructions.md b/.github/copilot-instructions.md
@@ -133,6 +133,7 @@ When a new issue is created, follow these steps:
 - All source code is in `src/Microsoft.Data.SqlClient/src/`. Do NOT add code to legacy `netfx/src/` or `netcore/src/` directories.
 - Only `ref/` folders in `netcore/ref/` and `netfx/ref/` remain active for defining the public API surface.
 - Check for platform-specific differences using file suffixes (`.netfx.cs`, `.netcore.cs`, `.windows.cs`, `.unix.cs`) and conditional compilation (`#if NETFRAMEWORK`, `#if NET`, `#if _WINDOWS`, `#if _UNIX`).
+- Lines of code, comments, and other text should be a maximum of 100 characters (see `policy/coding-style.md`).
 - Respect API compatibility rules across .NET versions
 - Do not introduce breaking changes without proper justification and documentation
 - Use the `doc/` directory for any new documentation or updates to existing documentation
diff --git a/eng/pipelines/onebranch/jobs/validate-symbols.ps1 b/eng/pipelines/onebranch/jobs/validate-symbols.ps1
@@ -61,7 +61,15 @@ param(
     [string]$SymbolServerUrl,
 
     [Parameter(Mandatory)]
-    [string]$SymbolServerName
+    [string]$SymbolServerName,
+
+    # Maximum number of attempts when symbols are not yet available.  The first
+    # attempt runs immediately; subsequent attempts wait RetryIntervalSeconds
+    # between them.  Defaults to 10 (~5 minutes total with default interval).
+    [int]$MaxRetries = 10,
+
+    # Seconds to wait between retry attempts (default 30).
+    [int]$RetryIntervalSeconds = 30
 )
 
 Set-StrictMode -Version Latest
@@ -118,33 +126,41 @@ if (-not $symchkPath) {
     exit 1
 }
 
-# ── Verify symbols ────────────────────────────────────────────────────────────
+# ── Verify symbols (with retries for publishing latency) ──────────────────────
 
 $dllLeaf = Split-Path $dllFullPath -Leaf
 
 Write-Host "Verifying symbols for $dllLeaf on $SymbolServerName ($SymbolServerUrl)"
 Write-Host "Using symchk: $symchkPath"
+Write-Host "Max attempts: $MaxRetries, interval: ${RetryIntervalSeconds}s"
 
 $symchkArgs = @(
     $dllFullPath,
     "/s", "srv*$SymbolServerUrl",
     "/os"
 )
 
-Write-Host "Running: symchk $($symchkArgs -join ' ')"
-$output = & $symchkPath @symchkArgs 2>&1 | Out-String
-$symchkExit = $LASTEXITCODE
+for ($attempt = 1; $attempt -le $MaxRetries; $attempt++) {
+    Write-Host "Attempt $attempt of $MaxRetries — running: symchk $($symchkArgs -join ' ')"
+    $output = & $symchkPath @symchkArgs 2>&1 | Out-String
+    $symchkExit = $LASTEXITCODE
 
-Write-Host $output
+    Write-Host $output
 
-if ($symchkExit -ne 0) {
-    Write-Host "##vso[task.logissue type=error]symchk failed for $dllLeaf on $SymbolServerName (exit code: $symchkExit)"
-    exit 1
-}
+    $passed = ($symchkExit -eq 0) -and
+             ($output -match "FAILED files = 0") -and
+             ($output -match "PASSED \+ IGNORED files = [1-9]")
 
-if ($output -match "FAILED files = 0" -and $output -match "PASSED \+ IGNORED files = [1-9]") {
-    Write-Host "Symbols verified successfully for $dllLeaf on $SymbolServerName"
-} else {
-    Write-Host "##vso[task.logissue type=error]symchk did not confirm symbols for $dllLeaf on $SymbolServerName"
-    exit 1
+    if ($passed) {
+        Write-Host "Symbols verified successfully for $dllLeaf on $SymbolServerName"
+        exit 0
+    }
+
+    if ($attempt -lt $MaxRetries) {
+        Write-Host "Symbols not yet available. Retrying in $RetryIntervalSeconds seconds..."
+        Start-Sleep -Seconds $RetryIntervalSeconds
+    }
 }
+
+Write-Host "##vso[task.logissue type=error]symchk could not verify symbols for $dllLeaf on $SymbolServerName after $MaxRetries attempts."
+exit 1
diff --git a/eng/pipelines/onebranch/steps/compound-publish-symbols-step.yml b/eng/pipelines/onebranch/steps/compound-publish-symbols-step.yml
@@ -137,49 +137,7 @@ steps:
             -Body $publishSymbolsBody
           echo ">  3.Request to publish symbols submitted successfully."
 
-          # Poll until symbol publishing completes on all requested servers.
-          #
-          # PublishingStatus:  0=NotRequested, 1=Submitted, 2=Processing, 3=Completed
-          # PublishingResult:  0=Pending, 1=Succeeded, 2=Failed, 3=Cancelled
-          #
-          echo ">  4.Waiting for symbol publishing to complete..."
-
-          $baseUri = "https://$publishServer.trafficmanager.net/projects/$publishProjectName/requests/$artifactName"
-          $headers = @{ Authorization = "Bearer $symbolPublishingToken" }
-          $timeoutMinutes = 30
-          $pollIntervalSeconds = 30
-          $deadline = (Get-Date).AddMinutes($timeoutMinutes)
-
-          while ((Get-Date) -lt $deadline) {
-              $status = Invoke-RestMethod -Method GET -Uri $baseUri -Headers $headers -ContentType "application/json"
-
-              $serversToCheck = @()
-              if ($publishToInternal -eq 'true') { $serversToCheck += @{ Name = 'Internal'; Status = $status.internalServerStatus; Result = $status.internalServerResult } }
-              if ($publishToPublic -eq 'true')   { $serversToCheck += @{ Name = 'Public';   Status = $status.publicServerStatus;   Result = $status.publicServerResult } }
-
-              $allCompleted = $true
-              foreach ($server in $serversToCheck) {
-                  echo "  $($server.Name): Status=$($server.Status) Result=$($server.Result)"
-                  if ($server.Status -ne 3) { $allCompleted = $false }
-              }
-
-              if ($allCompleted) {
-                  $anyFailed = $false
-                  foreach ($server in $serversToCheck) {
-                      if ($server.Result -ne 1) {
-                          echo "##vso[task.logissue type=error]Symbol publishing to $($server.Name) server did not succeed (Result=$($server.Result))."
-                          $anyFailed = $true
-                      }
-                  }
-                  if ($anyFailed) { exit 1 }
-                  echo ">  4.Symbol publishing completed successfully on all requested servers."
-                  break
-              }
-
-              echo "  Publishing still in progress, waiting $pollIntervalSeconds seconds..."
-              Start-Sleep -Seconds $pollIntervalSeconds
-          }
-
-          if ((Get-Date) -ge $deadline) {
-              echo "##vso[task.logissue type=warning]Symbol publishing did not complete within $timeoutMinutes minutes. Verification may fail."
-          }
+          # Publishing status will be verified by the validate-symbols job in the
+          # validation stage (via symchk).  Polling here would block subsequent
+          # build stages unnecessarily — enough time typically elapses during the
+          # remaining build stages for publishing to complete before validation.
diff --git a/eng/pipelines/onebranch/steps/publish-symbols-step.yml b/eng/pipelines/onebranch/steps/publish-symbols-step.yml
@@ -97,49 +97,7 @@ steps:
 
       echo ">  3.Request to publish symbols succeeded."
 
-      # Poll until symbol publishing completes on all requested servers.
-      #
-      # PublishingStatus:  0=NotRequested, 1=Submitted, 2=Processing, 3=Completed
-      # PublishingResult:  0=Pending, 1=Succeeded, 2=Failed, 3=Cancelled
-      #
-      echo ">  4.Waiting for symbol publishing to complete..."
-
-      $baseUri = "https://$symbolServer.trafficmanager.net/projects/$projectName/requests/$requestName"
-      $headers = @{ Authorization = "Bearer $symbolPublishingToken" }
-      $timeoutMinutes = 30
-      $pollIntervalSeconds = 30
-      $deadline = (Get-Date).AddMinutes($timeoutMinutes)
-
-      while ((Get-Date) -lt $deadline) {
-          $status = Invoke-RestMethod -Method GET -Uri $baseUri -Headers $headers -ContentType "application/json"
-
-          $serversToCheck = @()
-          if ($publishToInternalServer -eq 'true') { $serversToCheck += @{ Name = 'Internal'; Status = $status.internalServerStatus; Result = $status.internalServerResult } }
-          if ($publishToPublicServer -eq 'true')   { $serversToCheck += @{ Name = 'Public';   Status = $status.publicServerStatus;   Result = $status.publicServerResult } }
-
-          $allCompleted = $true
-          foreach ($server in $serversToCheck) {
-              echo "  $($server.Name): Status=$($server.Status) Result=$($server.Result)"
-              if ($server.Status -ne 3) { $allCompleted = $false }
-          }
-
-          if ($allCompleted) {
-              $anyFailed = $false
-              foreach ($server in $serversToCheck) {
-                  if ($server.Result -ne 1) {
-                      echo "##vso[task.logissue type=error]Symbol publishing to $($server.Name) server did not succeed (Result=$($server.Result))."
-                      $anyFailed = $true
-                  }
-              }
-              if ($anyFailed) { exit 1 }
-              echo ">  4.Symbol publishing completed successfully on all requested servers."
-              break
-          }
-
-          echo "  Publishing still in progress, waiting $pollIntervalSeconds seconds..."
-          Start-Sleep -Seconds $pollIntervalSeconds
-      }
-
-      if ((Get-Date) -ge $deadline) {
-          echo "##vso[task.logissue type=warning]Symbol publishing did not complete within $timeoutMinutes minutes. Verification may fail."
-      }
+      # Publishing status will be verified by the validate-symbols job in the
+      # validation stage (via symchk).  Polling here would block subsequent
+      # build stages unnecessarily — enough time typically elapses during the
+      # remaining build stages for publishing to complete before validation.
