[ReceveryServices] Fix delay in long running operations (Azure#18568)

VeryEarly · web-flow · commit ee57d06b7640 · 2022-06-17T14:12:40.000+08:00
* fix delay

* update changelog
diff --git a/src/RecoveryServices/RecoveryServices.Backup.Helpers/TrackingHelpers.cs b/src/RecoveryServices/RecoveryServices.Backup.Helpers/TrackingHelpers.cs
@@ -47,10 +47,13 @@ public static T GetOperationStatus<T>(RestAzureNS.AzureOperationResponse respons
             string testMode = Environment.GetEnvironmentVariable("AZURE_TEST_MODE");
             while (opStatusResponse.Body.Status == ServiceClientModel.OperationStatusValues.InProgress)
             {
-                TestMockSupport.Delay(_defaultSleepForOperationTracking * 1000);
-                if (String.Compare(testMode, "Record", StringComparison.OrdinalIgnoreCase) == 0 || !TestMockSupport.RunningMocked)
+                if (String.Compare(testMode, "Record", StringComparison.OrdinalIgnoreCase) == 0)
                 {
-                    Thread.Sleep(5000);
+                    Thread.Sleep(10000);
+                }
+                else
+                {
+                    TestMockSupport.Delay(_defaultSleepForOperationTracking * 1000);
                 }
                 opStatusResponse = getOpStatus(operationId);
             }
@@ -79,10 +82,13 @@ public static T GetOperationStatus<T, S>(RestAzureNS.AzureOperationResponse<S> r
             while (opStatusResponse.Body.Status ==
                 ServiceClientModel.OperationStatusValues.InProgress)
             {
-                TestMockSupport.Delay(_defaultSleepForOperationTracking * 1000);
-                if (String.Compare(testMode, "Record", StringComparison.OrdinalIgnoreCase) == 0 || !TestMockSupport.RunningMocked)
+                if (String.Compare(testMode, "Record", StringComparison.OrdinalIgnoreCase) == 0)
+                {
+                    Thread.Sleep(10000);
+                }
+                else
                 {
-                    Thread.Sleep(5000);
+                    TestMockSupport.Delay(_defaultSleepForOperationTracking * 1000);
                 }
                 opStatusResponse = getOpStatus(operationId);
             }
@@ -110,10 +116,13 @@ public static RestAzureNS.AzureOperationResponse GetOperationResult(
             string testMode = Environment.GetEnvironmentVariable("AZURE_TEST_MODE");
             while (opStatusResponse.Response.StatusCode == SystemNet.HttpStatusCode.Accepted)
             {
-                TestMockSupport.Delay(_defaultSleepForOperationTracking * 1000);
-                if (String.Compare(testMode, "Record", StringComparison.OrdinalIgnoreCase) == 0 || !TestMockSupport.RunningMocked)
+                if (String.Compare(testMode, "Record", StringComparison.OrdinalIgnoreCase) == 0)
+                {
+                    Thread.Sleep(10000);
+                }
+                else
                 {
-                    Thread.Sleep(5000);
+                    TestMockSupport.Delay(_defaultSleepForOperationTracking * 1000);
                 }
                 opStatusResponse = getOpStatus(operationId);
             }
@@ -141,10 +150,13 @@ public static RestAzureNS.AzureOperationResponse<T> GetOperationStatusDataMove<T
             string testMode = Environment.GetEnvironmentVariable("AZURE_TEST_MODE");
             while (opStatusResponse.Body.Status == "InProgress")
             {
-                TestMockSupport.Delay(_defaultSleepForOperationTracking * 1000);
-                if (String.Compare(testMode, "Record", StringComparison.OrdinalIgnoreCase) == 0 || !TestMockSupport.RunningMocked)
+                if (String.Compare(testMode, "Record", StringComparison.OrdinalIgnoreCase) == 0)
                 {
-                    Thread.Sleep(5000);
+                    Thread.Sleep(10000);
+                }
+                else
+                {
+                    TestMockSupport.Delay(_defaultSleepForOperationTracking * 1000);
                 }
                 opStatusResponse = getOpStatus(operationId);
             }
@@ -171,10 +183,13 @@ public static RestAzureNS.AzureOperationResponse<T> GetOperationResult<T>(
             string testMode = Environment.GetEnvironmentVariable("AZURE_TEST_MODE");
             while (opStatusResponse.Response.StatusCode == SystemNet.HttpStatusCode.Accepted)
             {
-                TestMockSupport.Delay(_defaultSleepForOperationTracking * 1000);
-                if (String.Compare(testMode, "Record", StringComparison.OrdinalIgnoreCase) == 0 || !TestMockSupport.RunningMocked)
+                if (String.Compare(testMode, "Record", StringComparison.OrdinalIgnoreCase) == 0)
+                {
+                    Thread.Sleep(10000);
+                }
+                else
                 {
-                    Thread.Sleep(5000);
+                    TestMockSupport.Delay(_defaultSleepForOperationTracking * 1000);
                 }
                 opStatusResponse = getOpStatus(operationId);
             }
@@ -216,10 +231,13 @@ public static RestAzureNS.AzureOperationResponse<T> GetOperationResult<T>(
             string testMode = Environment.GetEnvironmentVariable("AZURE_TEST_MODE");
             while (opStatusResponse.Response.StatusCode == SystemNet.HttpStatusCode.Accepted)
             {
-                TestMockSupport.Delay(_defaultSleepForOperationTracking * 1000);
-                if (String.Compare(testMode, "Record", StringComparison.OrdinalIgnoreCase) == 0 || !TestMockSupport.RunningMocked)
+                if (String.Compare(testMode, "Record", StringComparison.OrdinalIgnoreCase) == 0)
+                {
+                    Thread.Sleep(10000);
+                }
+                else
                 {
-                    Thread.Sleep(5000);
+                    TestMockSupport.Delay(_defaultSleepForOperationTracking * 1000);
                 }
                 opStatusResponse = getOpStatus(operationId);
             }
diff --git a/src/RecoveryServices/RecoveryServices/ChangeLog.md b/src/RecoveryServices/RecoveryServices/ChangeLog.md
@@ -18,6 +18,7 @@
         - Additional information about change #1
 -->
 ## Upcoming Release
+* Fixed delay in long running operations [#18567]
 
 ## Version 5.4.0
 * Added support for Multi-user authorization using Resource Guard for recovery services vault.

Original file line number	Diff line number	Diff line change
`@@ -47,10 +47,13 @@ public static T GetOperationStatus<T>(RestAzureNS.AzureOperationResponse respons`
`47`	`47`	`string testMode = Environment.GetEnvironmentVariable("AZURE_TEST_MODE");`
`48`	`48`	`while (opStatusResponse.Body.Status == ServiceClientModel.OperationStatusValues.InProgress)`
`49`	`49`	`{`
`50`		`- TestMockSupport.Delay(_defaultSleepForOperationTracking * 1000);`
`51`		`- if (String.Compare(testMode, "Record", StringComparison.OrdinalIgnoreCase) == 0 \|\| !TestMockSupport.RunningMocked)`
	`50`	`+ if (String.Compare(testMode, "Record", StringComparison.OrdinalIgnoreCase) == 0)`
`52`	`51`	`{`
`53`		`- Thread.Sleep(5000);`
	`52`	`+ Thread.Sleep(10000);`
	`53`	`+ }`
	`54`	`+ else`
	`55`	`+ {`
	`56`	`+ TestMockSupport.Delay(_defaultSleepForOperationTracking * 1000);`
`54`	`57`	`}`
`55`	`58`	`opStatusResponse = getOpStatus(operationId);`
`56`	`59`	`}`
`@@ -79,10 +82,13 @@ public static T GetOperationStatus<T, S>(RestAzureNS.AzureOperationResponse<S> r`
`79`	`82`	`while (opStatusResponse.Body.Status ==`
`80`	`83`	`ServiceClientModel.OperationStatusValues.InProgress)`
`81`	`84`	`{`
`82`		`- TestMockSupport.Delay(_defaultSleepForOperationTracking * 1000);`
`83`		`- if (String.Compare(testMode, "Record", StringComparison.OrdinalIgnoreCase) == 0 \|\| !TestMockSupport.RunningMocked)`
	`85`	`+ if (String.Compare(testMode, "Record", StringComparison.OrdinalIgnoreCase) == 0)`
	`86`	`+ {`
	`87`	`+ Thread.Sleep(10000);`
	`88`	`+ }`
	`89`	`+ else`
`84`	`90`	`{`
`85`		`- Thread.Sleep(5000);`
	`91`	`+ TestMockSupport.Delay(_defaultSleepForOperationTracking * 1000);`
`86`	`92`	`}`
`87`	`93`	`opStatusResponse = getOpStatus(operationId);`
`88`	`94`	`}`
`@@ -110,10 +116,13 @@ public static RestAzureNS.AzureOperationResponse GetOperationResult(`
`110`	`116`	`string testMode = Environment.GetEnvironmentVariable("AZURE_TEST_MODE");`
`111`	`117`	`while (opStatusResponse.Response.StatusCode == SystemNet.HttpStatusCode.Accepted)`
`112`	`118`	`{`
`113`		`- TestMockSupport.Delay(_defaultSleepForOperationTracking * 1000);`
`114`		`- if (String.Compare(testMode, "Record", StringComparison.OrdinalIgnoreCase) == 0 \|\| !TestMockSupport.RunningMocked)`
	`119`	`+ if (String.Compare(testMode, "Record", StringComparison.OrdinalIgnoreCase) == 0)`
	`120`	`+ {`
	`121`	`+ Thread.Sleep(10000);`
	`122`	`+ }`
	`123`	`+ else`
`115`	`124`	`{`
`116`		`- Thread.Sleep(5000);`
	`125`	`+ TestMockSupport.Delay(_defaultSleepForOperationTracking * 1000);`
`117`	`126`	`}`
`118`	`127`	`opStatusResponse = getOpStatus(operationId);`
`119`	`128`	`}`
`@@ -141,10 +150,13 @@ public static RestAzureNS.AzureOperationResponse<T> GetOperationStatusDataMove<T`
`141`	`150`	`string testMode = Environment.GetEnvironmentVariable("AZURE_TEST_MODE");`
`142`	`151`	`while (opStatusResponse.Body.Status == "InProgress")`
`143`	`152`	`{`
`144`		`- TestMockSupport.Delay(_defaultSleepForOperationTracking * 1000);`
`145`		`- if (String.Compare(testMode, "Record", StringComparison.OrdinalIgnoreCase) == 0 \|\| !TestMockSupport.RunningMocked)`
	`153`	`+ if (String.Compare(testMode, "Record", StringComparison.OrdinalIgnoreCase) == 0)`
`146`	`154`	`{`
`147`		`- Thread.Sleep(5000);`
	`155`	`+ Thread.Sleep(10000);`
	`156`	`+ }`
	`157`	`+ else`
	`158`	`+ {`
	`159`	`+ TestMockSupport.Delay(_defaultSleepForOperationTracking * 1000);`
`148`	`160`	`}`
`149`	`161`	`opStatusResponse = getOpStatus(operationId);`
`150`	`162`	`}`
`@@ -171,10 +183,13 @@ public static RestAzureNS.AzureOperationResponse<T> GetOperationResult<T>(`
`171`	`183`	`string testMode = Environment.GetEnvironmentVariable("AZURE_TEST_MODE");`
`172`	`184`	`while (opStatusResponse.Response.StatusCode == SystemNet.HttpStatusCode.Accepted)`
`173`	`185`	`{`
`174`		`- TestMockSupport.Delay(_defaultSleepForOperationTracking * 1000);`
`175`		`- if (String.Compare(testMode, "Record", StringComparison.OrdinalIgnoreCase) == 0 \|\| !TestMockSupport.RunningMocked)`
	`186`	`+ if (String.Compare(testMode, "Record", StringComparison.OrdinalIgnoreCase) == 0)`
	`187`	`+ {`
	`188`	`+ Thread.Sleep(10000);`
	`189`	`+ }`
	`190`	`+ else`
`176`	`191`	`{`
`177`		`- Thread.Sleep(5000);`
	`192`	`+ TestMockSupport.Delay(_defaultSleepForOperationTracking * 1000);`
`178`	`193`	`}`
`179`	`194`	`opStatusResponse = getOpStatus(operationId);`
`180`	`195`	`}`
`@@ -216,10 +231,13 @@ public static RestAzureNS.AzureOperationResponse<T> GetOperationResult<T>(`
`216`	`231`	`string testMode = Environment.GetEnvironmentVariable("AZURE_TEST_MODE");`
`217`	`232`	`while (opStatusResponse.Response.StatusCode == SystemNet.HttpStatusCode.Accepted)`
`218`	`233`	`{`
`219`		`- TestMockSupport.Delay(_defaultSleepForOperationTracking * 1000);`
`220`		`- if (String.Compare(testMode, "Record", StringComparison.OrdinalIgnoreCase) == 0 \|\| !TestMockSupport.RunningMocked)`
	`234`	`+ if (String.Compare(testMode, "Record", StringComparison.OrdinalIgnoreCase) == 0)`
	`235`	`+ {`
	`236`	`+ Thread.Sleep(10000);`
	`237`	`+ }`
	`238`	`+ else`
`221`	`239`	`{`
`222`		`- Thread.Sleep(5000);`
	`240`	`+ TestMockSupport.Delay(_defaultSleepForOperationTracking * 1000);`
`223`	`241`	`}`
`224`	`242`	`opStatusResponse = getOpStatus(operationId);`
`225`	`243`	`}`