Merge branch 'main' into wendi/fix-1es-pipeline

Author: wonwuakpa-msft

cmd/copy.go

@@ -1360,6 +1360,7 @@ func (cca *CookedCopyCmdArgs) ReportProgressOrExit(lcm LifecycleMgr) (totalKnown
 
 		return common.Iff(timeElapsed != 0, bytesInMb/timeElapsed, 0) * 8
 	}
+	throughput := computeThroughput()
 	builder := func(format OutputFormat) string {
 		if format == EOutputFormat.Json() {
 			jsonOutput, err := json.Marshal(summary)
@@ -1378,7 +1379,6 @@ func (cca *CookedCopyCmdArgs) ReportProgressOrExit(lcm LifecycleMgr) (totalKnown
 				scanningString = ""
 			}
 
-			throughput := computeThroughput()
 			throughputString := fmt.Sprintf("2-sec Throughput (Mb/s): %v", jobsAdmin.ToFixed(throughput, 4))
 			if throughput == 0 {
 				// As there would be case when no bits sent from local, e.g. service side copy, when throughput = 0, hide it.

cmd/jobsResume.go

@@ -110,6 +110,7 @@ func (cca *resumeJobController) ReportProgressOrExit(lcm LifecycleMgr) (totalKno
 
 		return common.Iff(timeElapsed != 0, bytesInMb/timeElapsed, 0) * 8
 	}
+	throughput := computeThroughput()
 	builder := func(format OutputFormat) string {
 		if format == EOutputFormat.Json() {
 			jsonOutput, err := json.Marshal(summary)
@@ -123,7 +124,6 @@ func (cca *resumeJobController) ReportProgressOrExit(lcm LifecycleMgr) (totalKno
 				scanningString = ""
 			}
 
-			throughput := computeThroughput()
 			throughputString := fmt.Sprintf("2-sec Throughput (Mb/s): %v", jobsAdmin.ToFixed(throughput, 4))
 			if throughput == 0 {
 				// As there would be case when no bits sent from local, e.g. service side copy, when throughput = 0, hide it.

e2etest/newe2e_task_validation.go

@@ -568,3 +568,29 @@ func ValidateLogFileRetention(a Asserter, logsDir string, expectedLogFileToRetai
 	}
 	a.AssertNow("Expected job log files to be retained", Equal{}, cnt, expectedLogFileToRetain)
 }
+
+// ValidateThroughputOutput validates that throughput information is displayed in AzCopy output
+// This is a regression test for the v10.31.0 bug where throughput was hidden when it equaled 0
+func ValidateThroughputOutput(a Asserter, stdout AzCopyStdout) {
+	if dryrunner, ok := a.(DryrunAsserter); ok && dryrunner.Dryrun() {
+		return
+	}
+
+	var foundThroughput bool
+	for _, line := range stdout.RawStdout() {
+		// Look for throughput display patterns:
+		// - "2-sec Throughput (Mb/s): X.XXXX" (normal display)
+		// - "Throughput (Mb/s)" (partial match for any throughput display)
+		if strings.Contains(line, "Throughput (Mb/s)") {
+			foundThroughput = true
+			break
+		}
+	}
+
+	if !foundThroughput {
+		fmt.Println("=== AzCopy Output for Throughput Validation ===")
+		fmt.Println(stdout.String())
+		fmt.Println("=== End AzCopy Output ===")
+		a.Error("throughput information not found in azcopy output - this may indicate a regression in throughput display")
+	}
+}

e2etest/zt_newe2e_basic_functionality_test.go

@@ -850,3 +850,54 @@ func (s *BasicFunctionalitySuite) Scenario_JobResume(svm *ScenarioVariationManag
 		svm.Assert("resume completed transfers not equal to 1", Equal{}, resumeParsed.FinalStatus.TransfersCompleted, uint32(1))
 	}
 }
+
+func (s *BasicFunctionalitySuite) Scenario_ValidateThroughput(svm *ScenarioVariationManager) {
+	azCopyVerb := ResolveVariation(svm, []AzCopyVerb{AzCopyVerbCopy, AzCopyVerbSync}) // Calculate verb early to create the destination object early
+	// Resolve variation early so name makes sense
+	srcLoc := ResolveVariation(svm, []common.Location{common.ELocation.Local(), common.ELocation.Blob()})
+	// Scale up from service to object
+	dstContainer := CreateResource[ContainerResourceManager](svm, GetRootResource(svm, ResolveVariation(svm, []common.Location{common.ELocation.Local(), common.ELocation.Blob()})), ResourceDefinitionContainer{})
+
+	// Scale up from service to object
+	srcDef := ResourceDefinitionContainer{
+		Objects: ObjectResourceMappingFlat{
+			"abc":    ResourceDefinitionObject{Body: NewRandomObjectContentContainer(SizeFromString("10K"))},
+			"def":    ResourceDefinitionObject{Body: NewRandomObjectContentContainer(SizeFromString("10K"))},
+			"foobar": ResourceDefinitionObject{Body: NewRandomObjectContentContainer(SizeFromString("10K"))},
+		},
+	}
+	srcContainer := CreateResource[ContainerResourceManager](svm, GetRootResource(svm, srcLoc), srcDef)
+
+	// no s2s, no local->local
+	if srcContainer.Location().IsRemote() == dstContainer.Location().IsRemote() {
+		svm.InvalidateScenario()
+		return
+	}
+
+	sasOpts := GenericAccountSignatureValues{}
+
+	stdOut, _ := RunAzCopy(
+		svm,
+		AzCopyCommand{
+			Verb: azCopyVerb,
+			Targets: []ResourceManager{
+				TryApplySpecificAuthType(srcContainer, EExplicitCredentialType.SASToken(), svm, CreateAzCopyTargetOptions{
+					SASTokenOptions: sasOpts,
+				}),
+				TryApplySpecificAuthType(dstContainer, EExplicitCredentialType.SASToken(), svm, CreateAzCopyTargetOptions{
+					SASTokenOptions: sasOpts,
+				}),
+			},
+			Flags: CopyFlags{
+				CopySyncCommonFlags: CopySyncCommonFlags{
+					Recursive: pointerTo(true),
+					GlobalFlags: GlobalFlags{
+						OutputType: pointerTo(cmd.EOutputFormat.Text()),
+					},
+				},
+			},
+		})
+
+	// Validate that throughput is displayed in the output (regression test for v10.31.0 throughput display bug)
+	ValidateThroughputOutput(svm, stdOut)
+}