Feedback

microsoft · Sep 3, 2024 · dec47bc · dec47bc
1 parent 92e84ec
commit dec47bc
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 7 deletions.
diff --git a/src/Microsoft.Health.Fhir.CosmosDb/Features/Storage/CosmosContainerProvider.cs b/src/Microsoft.Health.Fhir.CosmosDb/Features/Storage/CosmosContainerProvider.cs
@@ -133,18 +133,13 @@ private async Task InitializeDataStoreAsync(
                         await collectionSetup.CreateCollectionAsync(collectionInitializers, retryPolicyFactory.RetryPolicy, cancellationTokenSource.Token);
                     }
                 }
-                catch (Exception ex)
-                {
-                    _logger.LogError(ex, "Error while checking if Cosmos setup is required.");
-                }
 
                 // When the collection exists we can start a distributed lock to ensure only one instance of the service does the rest of the setup
                 ICosmosDbDistributedLock setupLock = _distributedLockFactory.Create(_container.Value, nameof(InitializeDataStoreAsync));
 
+                await setupLock.AcquireLock(cancellationTokenSource.Token);
                 try
                 {
-                    await setupLock.AcquireLock(cancellationTokenSource.Token);
-
                     if (cosmosDataStoreConfiguration.AllowCollectionSetup)
                     {
                         await collectionSetup.InstallStoredProcs(cancellationTokenSource.Token);

diff --git a/src/Microsoft.Health.Fhir.Shared.Web/appsettings.json b/src/Microsoft.Health.Fhir.Shared.Web/appsettings.json
@@ -152,8 +152,9 @@
     "CosmosDb": {
         "Host": null,
         "Key": null,
-        "UseManagedIdentity": false,
+        "UseManagedIdentity": false, // False for localhost/emulator
         "AllowDatabaseCreation": true,
+        "AllowCollectionSetup": true,
         "DatabaseId": "health",
         "InitialDatabaseThroughput": null,
         "ConnectionMode": "Direct",