From dec47bc1c70caef01a97a4ed7bf24bdad7df64b2 Mon Sep 17 00:00:00 2001 From: Brendan Kowitz Date: Mon, 19 Aug 2024 10:17:06 -0700 Subject: [PATCH] Feedback --- .../Features/Storage/CosmosContainerProvider.cs | 7 +------ src/Microsoft.Health.Fhir.Shared.Web/appsettings.json | 3 ++- 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/src/Microsoft.Health.Fhir.CosmosDb/Features/Storage/CosmosContainerProvider.cs b/src/Microsoft.Health.Fhir.CosmosDb/Features/Storage/CosmosContainerProvider.cs index 13ef96685a..e6219c6d64 100644 --- 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 index 26028f5f33..9986c773db 100644 --- 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",