fix: Overflow of backoff value. (#352)

Energinet-DataHub · Sep 13, 2024 · c6176a9 · c6176a9
1 parent 76a8d5d
commit c6176a9
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 7 deletions.
diff --git a/source/Databricks/documents/release-notes/release-notes.md b/source/Databricks/documents/release-notes/release-notes.md
@@ -1,5 +1,9 @@
 # Databricks Release Notes
 
+## Version 11.2.4
+
+- Fix overflow of backoff value.
+
 ## Version 11.2.3
 
 - Skip tests

diff --git a/source/Databricks/source/Jobs/Jobs.csproj b/source/Databricks/source/Jobs/Jobs.csproj
@@ -31,7 +31,7 @@ limitations under the License.
 
   <PropertyGroup>
     <PackageId>Energinet.DataHub.Core.Databricks.Jobs</PackageId>
-    <PackageVersion>11.2.3$(VersionSuffix)</PackageVersion>
+    <PackageVersion>11.2.4$(VersionSuffix)</PackageVersion>
     <Title>Databricks Jobs</Title>
     <Company>Energinet-DataHub</Company>
     <Authors>Energinet-DataHub</Authors>

diff --git a/source/Databricks/source/SqlStatementExecution/SqlStatementExecution.csproj b/source/Databricks/source/SqlStatementExecution/SqlStatementExecution.csproj
@@ -30,7 +30,7 @@ limitations under the License.
 
   <PropertyGroup>
     <PackageId>Energinet.DataHub.Core.Databricks.SqlStatementExecution</PackageId>
-    <PackageVersion>11.2.3$(VersionSuffix)</PackageVersion>
+    <PackageVersion>11.2.4$(VersionSuffix)</PackageVersion>
     <Title>Databricks SQL Statement Execution</Title>
     <Company>Energinet-DataHub</Company>
     <Authors>Energinet-DataHub</Authors>

diff --git a/source/Databricks/source/SqlStatementExecution/Statement/DatabricksStatementRequest.cs b/source/Databricks/source/SqlStatementExecution/Statement/DatabricksStatementRequest.cs
@@ -65,12 +65,17 @@ public async ValueTask<DatabricksStatementResponse> WaitForSqlWarehouseResultAsy
     {
         DatabricksStatementResponse? response = null;
         var fibonacci = new Fibonacci();
+        var currentDelay = 0;
+
         do
         {
             try
             {
-                var delayInMilliseconds = Math.Min(fibonacci.GetNextNumber() * 10, MaxWaitTimeForLoopInMilliseconds);
-                response = await GetResponseFromDataWarehouseAsync(client, endpoint, response, delayInMilliseconds, cancellationToken).ConfigureAwait(false);
+                currentDelay = currentDelay < MaxWaitTimeForLoopInMilliseconds
+                    ? fibonacci.GetNextNumber() * 10
+                    : MaxWaitTimeForLoopInMilliseconds;
+
+                response = await GetResponseFromDataWarehouseAsync(client, endpoint, response, currentDelay, cancellationToken).ConfigureAwait(false);
                 if (response.IsSucceeded)
                     return response;
 
@@ -103,9 +108,6 @@ private async Task<DatabricksStatementResponse> GetResponseFromDataWarehouseAsyn
         int delayInMilliseconds,
         CancellationToken cancellationToken)
     {
-        ArgumentOutOfRangeException.ThrowIfNegativeOrZero(delayInMilliseconds, nameof(delayInMilliseconds));
-        ArgumentOutOfRangeException.ThrowIfGreaterThan(delayInMilliseconds, MaxWaitTimeForLoopInMilliseconds, nameof(delayInMilliseconds));
-
         if (response == null)
         {
             // No cancellation token is used because we want to wait for the result