Skip to content

Commit b64b619

Browse files
mocsharpmocsharp
committed
Set a timeout when verify/list object calls to the storage library.
Signed-off-by: Victor Chang <[email protected]>
1 parent f87e94d commit b64b619

29 files changed

+223
-187
lines changed

‎src/Api/Monai.Deploy.InformaticsGateway.Api.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
<PackageReference Include="Macross.Json.Extensions" Version="3.0.0" />
3232
<PackageReference Include="Microsoft.EntityFrameworkCore.Abstractions" Version="6.0.15" />
3333
<PackageReference Include="Monai.Deploy.Messaging" Version="0.1.22" />
34-
<PackageReference Include="Monai.Deploy.Storage" Version="0.2.15" />
34+
<PackageReference Include="Monai.Deploy.Storage" Version="0.2.16" />
3535
</ItemGroup>
3636

3737
<ItemGroup>

‎src/Api/Test/packages.lock.json‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -273,22 +273,22 @@
273273
},
274274
"Monai.Deploy.Storage": {
275275
"type": "Transitive",
276-
"resolved": "0.2.15",
277-
"contentHash": "5VCzUVZek/1LB+4V7l2Ubg1gqzxn4wVPrpZG9SqCsUYtXBzpY73ohmyCXE0PpgO1z6WpWKH3IaYOJqWvAUeFXw==",
276+
"resolved": "0.2.16",
277+
"contentHash": "UVu9yyiJf4mYlz1H6g29LXdYv5RRFcttudTczA3w3SuGQ5u3fEIRbDaWuTjFjaaLor+IuibGaob6c1L6ACH7kg==",
278278
"dependencies": {
279279
"AWSSDK.SecurityToken": "3.7.101.26",
280280
"Ardalis.GuardClauses": "4.0.1",
281281
"Microsoft.Extensions.Configuration": "6.0.1",
282282
"Microsoft.Extensions.Diagnostics.HealthChecks": "6.0.15",
283283
"Microsoft.Extensions.Logging": "6.0.0",
284-
"Monai.Deploy.Storage.S3Policy": "0.2.15",
284+
"Monai.Deploy.Storage.S3Policy": "0.2.16",
285285
"System.IO.Abstractions": "17.2.3"
286286
}
287287
},
288288
"Monai.Deploy.Storage.S3Policy": {
289289
"type": "Transitive",
290-
"resolved": "0.2.15",
291-
"contentHash": "0+FCC5nltIDEXuBAJSDba2DUTm+yQ7KgZLavASt5wyF842VtTcLTG2uPHfHy+nJ6hfT7zCoBEsVup3g9KGC56w==",
290+
"resolved": "0.2.16",
291+
"contentHash": "KfiAW28llXSlDLgGwAeBCZGns9/5D/wHVOKt2NxzeiJpp0fR3VspQIbuHO1cbn4GcDM7tL0Se4gR494rHGoz4g==",
292292
"dependencies": {
293293
"Ardalis.GuardClauses": "4.0.1",
294294
"Newtonsoft.Json": "13.0.3"
@@ -1271,7 +1271,7 @@
12711271
"Microsoft.EntityFrameworkCore.Abstractions": "[6.0.15, )",
12721272
"Monai.Deploy.InformaticsGateway.Common": "[1.0.0, )",
12731273
"Monai.Deploy.Messaging": "[0.1.22, )",
1274-
"Monai.Deploy.Storage": "[0.2.15, )"
1274+
"Monai.Deploy.Storage": "[0.2.16, )"
12751275
}
12761276
},
12771277
"monai.deploy.informaticsgateway.common": {

‎src/Api/packages.lock.json‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -31,16 +31,16 @@
3131
},
3232
"Monai.Deploy.Storage": {
3333
"type": "Direct",
34-
"requested": "[0.2.15, )",
35-
"resolved": "0.2.15",
36-
"contentHash": "5VCzUVZek/1LB+4V7l2Ubg1gqzxn4wVPrpZG9SqCsUYtXBzpY73ohmyCXE0PpgO1z6WpWKH3IaYOJqWvAUeFXw==",
34+
"requested": "[0.2.16, )",
35+
"resolved": "0.2.16",
36+
"contentHash": "UVu9yyiJf4mYlz1H6g29LXdYv5RRFcttudTczA3w3SuGQ5u3fEIRbDaWuTjFjaaLor+IuibGaob6c1L6ACH7kg==",
3737
"dependencies": {
3838
"AWSSDK.SecurityToken": "3.7.101.26",
3939
"Ardalis.GuardClauses": "4.0.1",
4040
"Microsoft.Extensions.Configuration": "6.0.1",
4141
"Microsoft.Extensions.Diagnostics.HealthChecks": "6.0.15",
4242
"Microsoft.Extensions.Logging": "6.0.0",
43-
"Monai.Deploy.Storage.S3Policy": "0.2.15",
43+
"Monai.Deploy.Storage.S3Policy": "0.2.16",
4444
"System.IO.Abstractions": "17.2.3"
4545
}
4646
},
@@ -202,8 +202,8 @@
202202
},
203203
"Monai.Deploy.Storage.S3Policy": {
204204
"type": "Transitive",
205-
"resolved": "0.2.15",
206-
"contentHash": "0+FCC5nltIDEXuBAJSDba2DUTm+yQ7KgZLavASt5wyF842VtTcLTG2uPHfHy+nJ6hfT7zCoBEsVup3g9KGC56w==",
205+
"resolved": "0.2.16",
206+
"contentHash": "KfiAW28llXSlDLgGwAeBCZGns9/5D/wHVOKt2NxzeiJpp0fR3VspQIbuHO1cbn4GcDM7tL0Se4gR494rHGoz4g==",
207207
"dependencies": {
208208
"Ardalis.GuardClauses": "4.0.1",
209209
"Newtonsoft.Json": "13.0.3"

‎src/CLI/Test/packages.lock.json‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -521,22 +521,22 @@
521521
},
522522
"Monai.Deploy.Storage": {
523523
"type": "Transitive",
524-
"resolved": "0.2.15",
525-
"contentHash": "5VCzUVZek/1LB+4V7l2Ubg1gqzxn4wVPrpZG9SqCsUYtXBzpY73ohmyCXE0PpgO1z6WpWKH3IaYOJqWvAUeFXw==",
524+
"resolved": "0.2.16",
525+
"contentHash": "UVu9yyiJf4mYlz1H6g29LXdYv5RRFcttudTczA3w3SuGQ5u3fEIRbDaWuTjFjaaLor+IuibGaob6c1L6ACH7kg==",
526526
"dependencies": {
527527
"AWSSDK.SecurityToken": "3.7.101.26",
528528
"Ardalis.GuardClauses": "4.0.1",
529529
"Microsoft.Extensions.Configuration": "6.0.1",
530530
"Microsoft.Extensions.Diagnostics.HealthChecks": "6.0.15",
531531
"Microsoft.Extensions.Logging": "6.0.0",
532-
"Monai.Deploy.Storage.S3Policy": "0.2.15",
532+
"Monai.Deploy.Storage.S3Policy": "0.2.16",
533533
"System.IO.Abstractions": "17.2.3"
534534
}
535535
},
536536
"Monai.Deploy.Storage.S3Policy": {
537537
"type": "Transitive",
538-
"resolved": "0.2.15",
539-
"contentHash": "0+FCC5nltIDEXuBAJSDba2DUTm+yQ7KgZLavASt5wyF842VtTcLTG2uPHfHy+nJ6hfT7zCoBEsVup3g9KGC56w==",
538+
"resolved": "0.2.16",
539+
"contentHash": "KfiAW28llXSlDLgGwAeBCZGns9/5D/wHVOKt2NxzeiJpp0fR3VspQIbuHO1cbn4GcDM7tL0Se4gR494rHGoz4g==",
540540
"dependencies": {
541541
"Ardalis.GuardClauses": "4.0.1",
542542
"Newtonsoft.Json": "13.0.3"
@@ -1574,7 +1574,7 @@
15741574
"Microsoft.EntityFrameworkCore.Abstractions": "[6.0.15, )",
15751575
"Monai.Deploy.InformaticsGateway.Common": "[1.0.0, )",
15761576
"Monai.Deploy.Messaging": "[0.1.22, )",
1577-
"Monai.Deploy.Storage": "[0.2.15, )"
1577+
"Monai.Deploy.Storage": "[0.2.16, )"
15781578
}
15791579
},
15801580
"monai.deploy.informaticsgateway.client": {

‎src/CLI/packages.lock.json‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -457,22 +457,22 @@
457457
},
458458
"Monai.Deploy.Storage": {
459459
"type": "Transitive",
460-
"resolved": "0.2.15",
461-
"contentHash": "5VCzUVZek/1LB+4V7l2Ubg1gqzxn4wVPrpZG9SqCsUYtXBzpY73ohmyCXE0PpgO1z6WpWKH3IaYOJqWvAUeFXw==",
460+
"resolved": "0.2.16",
461+
"contentHash": "UVu9yyiJf4mYlz1H6g29LXdYv5RRFcttudTczA3w3SuGQ5u3fEIRbDaWuTjFjaaLor+IuibGaob6c1L6ACH7kg==",
462462
"dependencies": {
463463
"AWSSDK.SecurityToken": "3.7.101.26",
464464
"Ardalis.GuardClauses": "4.0.1",
465465
"Microsoft.Extensions.Configuration": "6.0.1",
466466
"Microsoft.Extensions.Diagnostics.HealthChecks": "6.0.15",
467467
"Microsoft.Extensions.Logging": "6.0.0",
468-
"Monai.Deploy.Storage.S3Policy": "0.2.15",
468+
"Monai.Deploy.Storage.S3Policy": "0.2.16",
469469
"System.IO.Abstractions": "17.2.3"
470470
}
471471
},
472472
"Monai.Deploy.Storage.S3Policy": {
473473
"type": "Transitive",
474-
"resolved": "0.2.15",
475-
"contentHash": "0+FCC5nltIDEXuBAJSDba2DUTm+yQ7KgZLavASt5wyF842VtTcLTG2uPHfHy+nJ6hfT7zCoBEsVup3g9KGC56w==",
474+
"resolved": "0.2.16",
475+
"contentHash": "KfiAW28llXSlDLgGwAeBCZGns9/5D/wHVOKt2NxzeiJpp0fR3VspQIbuHO1cbn4GcDM7tL0Se4gR494rHGoz4g==",
476476
"dependencies": {
477477
"Ardalis.GuardClauses": "4.0.1",
478478
"Newtonsoft.Json": "13.0.3"
@@ -1419,7 +1419,7 @@
14191419
"Microsoft.EntityFrameworkCore.Abstractions": "[6.0.15, )",
14201420
"Monai.Deploy.InformaticsGateway.Common": "[1.0.0, )",
14211421
"Monai.Deploy.Messaging": "[0.1.22, )",
1422-
"Monai.Deploy.Storage": "[0.2.15, )"
1422+
"Monai.Deploy.Storage": "[0.2.16, )"
14231423
}
14241424
},
14251425
"monai.deploy.informaticsgateway.client": {

‎src/Client/Test/packages.lock.json‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -747,36 +747,36 @@
747747
},
748748
"Monai.Deploy.Storage": {
749749
"type": "Transitive",
750-
"resolved": "0.2.15",
751-
"contentHash": "5VCzUVZek/1LB+4V7l2Ubg1gqzxn4wVPrpZG9SqCsUYtXBzpY73ohmyCXE0PpgO1z6WpWKH3IaYOJqWvAUeFXw==",
750+
"resolved": "0.2.16",
751+
"contentHash": "UVu9yyiJf4mYlz1H6g29LXdYv5RRFcttudTczA3w3SuGQ5u3fEIRbDaWuTjFjaaLor+IuibGaob6c1L6ACH7kg==",
752752
"dependencies": {
753753
"AWSSDK.SecurityToken": "3.7.101.26",
754754
"Ardalis.GuardClauses": "4.0.1",
755755
"Microsoft.Extensions.Configuration": "6.0.1",
756756
"Microsoft.Extensions.Diagnostics.HealthChecks": "6.0.15",
757757
"Microsoft.Extensions.Logging": "6.0.0",
758-
"Monai.Deploy.Storage.S3Policy": "0.2.15",
758+
"Monai.Deploy.Storage.S3Policy": "0.2.16",
759759
"System.IO.Abstractions": "17.2.3"
760760
}
761761
},
762762
"Monai.Deploy.Storage.MinIO": {
763763
"type": "Transitive",
764-
"resolved": "0.2.15",
765-
"contentHash": "hyN7GuTp80y5cpY01IqbzkRCc0QB3y2v7Sppzarsnw6l6FgLJ1ZUgvMN4VDBwVyMNJytBeEKWfgn/FdidGNYaw==",
764+
"resolved": "0.2.16",
765+
"contentHash": "/J8fylX91D/ePPCHTCgY11nPdADR5MZO239ZZWrK7ZO2ngAvKRmTB4Q6q6JbSErDF1hSk11HGhWCWNDsnK1rAQ==",
766766
"dependencies": {
767767
"AWSSDK.SecurityToken": "3.7.101.26",
768768
"Ardalis.GuardClauses": "4.0.1",
769769
"Microsoft.Extensions.Logging": "6.0.0",
770770
"Microsoft.Extensions.Options": "6.0.0",
771771
"Minio": "4.0.7",
772-
"Monai.Deploy.Storage": "0.2.15",
773-
"Monai.Deploy.Storage.S3Policy": "0.2.15"
772+
"Monai.Deploy.Storage": "0.2.16",
773+
"Monai.Deploy.Storage.S3Policy": "0.2.16"
774774
}
775775
},
776776
"Monai.Deploy.Storage.S3Policy": {
777777
"type": "Transitive",
778-
"resolved": "0.2.15",
779-
"contentHash": "0+FCC5nltIDEXuBAJSDba2DUTm+yQ7KgZLavASt5wyF842VtTcLTG2uPHfHy+nJ6hfT7zCoBEsVup3g9KGC56w==",
778+
"resolved": "0.2.16",
779+
"contentHash": "KfiAW28llXSlDLgGwAeBCZGns9/5D/wHVOKt2NxzeiJpp0fR3VspQIbuHO1cbn4GcDM7tL0Se4gR494rHGoz4g==",
780780
"dependencies": {
781781
"Ardalis.GuardClauses": "4.0.1",
782782
"Newtonsoft.Json": "13.0.3"
@@ -1694,8 +1694,8 @@
16941694
"Monai.Deploy.InformaticsGateway.DicomWeb.Client": "[1.0.0, )",
16951695
"Monai.Deploy.Messaging.RabbitMQ": "[0.1.22, )",
16961696
"Monai.Deploy.Security": "[0.1.3, )",
1697-
"Monai.Deploy.Storage": "[0.2.15, )",
1698-
"Monai.Deploy.Storage.MinIO": "[0.2.15, )",
1697+
"Monai.Deploy.Storage": "[0.2.16, )",
1698+
"Monai.Deploy.Storage.MinIO": "[0.2.16, )",
16991699
"NLog": "[5.1.2, )",
17001700
"NLog.Web.AspNetCore": "[5.2.2, )",
17011701
"Polly": "[7.2.3, )",
@@ -1711,7 +1711,7 @@
17111711
"Microsoft.EntityFrameworkCore.Abstractions": "[6.0.15, )",
17121712
"Monai.Deploy.InformaticsGateway.Common": "[1.0.0, )",
17131713
"Monai.Deploy.Messaging": "[0.1.22, )",
1714-
"Monai.Deploy.Storage": "[0.2.15, )"
1714+
"Monai.Deploy.Storage": "[0.2.16, )"
17151715
}
17161716
},
17171717
"monai.deploy.informaticsgateway.client": {
@@ -1747,7 +1747,7 @@
17471747
"Monai.Deploy.InformaticsGateway.Api": "[1.0.0, )",
17481748
"Monai.Deploy.InformaticsGateway.Common": "[1.0.0, )",
17491749
"Monai.Deploy.Messaging": "[0.1.22, )",
1750-
"Monai.Deploy.Storage": "[0.2.15, )",
1750+
"Monai.Deploy.Storage": "[0.2.16, )",
17511751
"System.IO.Abstractions": "[17.2.3, )"
17521752
}
17531753
},

‎src/Client/packages.lock.json‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -221,22 +221,22 @@
221221
},
222222
"Monai.Deploy.Storage": {
223223
"type": "Transitive",
224-
"resolved": "0.2.15",
225-
"contentHash": "5VCzUVZek/1LB+4V7l2Ubg1gqzxn4wVPrpZG9SqCsUYtXBzpY73ohmyCXE0PpgO1z6WpWKH3IaYOJqWvAUeFXw==",
224+
"resolved": "0.2.16",
225+
"contentHash": "UVu9yyiJf4mYlz1H6g29LXdYv5RRFcttudTczA3w3SuGQ5u3fEIRbDaWuTjFjaaLor+IuibGaob6c1L6ACH7kg==",
226226
"dependencies": {
227227
"AWSSDK.SecurityToken": "3.7.101.26",
228228
"Ardalis.GuardClauses": "4.0.1",
229229
"Microsoft.Extensions.Configuration": "6.0.1",
230230
"Microsoft.Extensions.Diagnostics.HealthChecks": "6.0.15",
231231
"Microsoft.Extensions.Logging": "6.0.0",
232-
"Monai.Deploy.Storage.S3Policy": "0.2.15",
232+
"Monai.Deploy.Storage.S3Policy": "0.2.16",
233233
"System.IO.Abstractions": "17.2.3"
234234
}
235235
},
236236
"Monai.Deploy.Storage.S3Policy": {
237237
"type": "Transitive",
238-
"resolved": "0.2.15",
239-
"contentHash": "0+FCC5nltIDEXuBAJSDba2DUTm+yQ7KgZLavASt5wyF842VtTcLTG2uPHfHy+nJ6hfT7zCoBEsVup3g9KGC56w==",
238+
"resolved": "0.2.16",
239+
"contentHash": "KfiAW28llXSlDLgGwAeBCZGns9/5D/wHVOKt2NxzeiJpp0fR3VspQIbuHO1cbn4GcDM7tL0Se4gR494rHGoz4g==",
240240
"dependencies": {
241241
"Ardalis.GuardClauses": "4.0.1",
242242
"Newtonsoft.Json": "13.0.3"
@@ -1180,7 +1180,7 @@
11801180
"Microsoft.EntityFrameworkCore.Abstractions": "[6.0.15, )",
11811181
"Monai.Deploy.InformaticsGateway.Common": "[1.0.0, )",
11821182
"Monai.Deploy.Messaging": "[0.1.22, )",
1183-
"Monai.Deploy.Storage": "[0.2.15, )"
1183+
"Monai.Deploy.Storage": "[0.2.16, )"
11841184
}
11851185
},
11861186
"monai.deploy.informaticsgateway.client.common": {

‎src/Configuration/Monai.Deploy.InformaticsGateway.Configuration.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="6.0.3" />
3131
<PackageReference Include="Microsoft.Extensions.Options" Version="6.0.0" />
3232
<PackageReference Include="Monai.Deploy.Messaging" Version="0.1.22" />
33-
<PackageReference Include="Monai.Deploy.Storage" Version="0.2.15" />
33+
<PackageReference Include="Monai.Deploy.Storage" Version="0.2.16" />
3434
<PackageReference Include="System.IO.Abstractions" Version="17.2.3" />
3535
</ItemGroup>
3636

‎src/Configuration/RetryConfiguration.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ public class RetryConfiguration
2929
/// Default is 250, 500, 1000.
3030
/// </summary>
3131
[ConfigurationKeyName("delays")]
32-
public int[] DelaysMilliseconds { get; set; } = new[] { 250, 500, 1000 };
32+
public int[] DelaysMilliseconds { get; set; } = new[] { 750, 1200, 2500 };
3333

3434
// Gets the delays in TimeSpan objects
3535
public IEnumerable<TimeSpan> RetryDelays

‎src/Configuration/StorageConfiguration.cs‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -103,5 +103,12 @@ public class StorageConfiguration : StorageServiceConfiguration
103103
/// </summary>
104104
[ConfigurationKeyName("concurrentUploads")]
105105
public int ConcurrentUploads { get; set; } = 2;
106+
107+
/// <summary>
108+
/// Gets or set the timeout value, in milliseconds, for calls made to the storage service. Default is 5000;
109+
/// This applies to the following calls: ListObjectsAsync, VerifyObjectsExistAsync, VerifyObjectExistsAsync, ListObjectsWithCredentialsAsync.
110+
/// </summary>
111+
[ConfigurationKeyName("storageServiceListTimeout")]
112+
public int StorageServiceListTimeout { get; set; } = 5000;
106113
}
107114
}

0 commit comments

Comments
 (0)