Service to startup without schema initialized (#866)

* Enable service to respond to schema apis * Update indexDataStore instance * Catch the particular exception
microsoft · Jul 8, 2021 · de3ad4b · de3ad4b
1 parent 1090a01
commit de3ad4b
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 7 deletions.
diff --git a/src/Microsoft.Health.Dicom.Core/Features/HealthCheck/BackgroundServiceHealthCheck.cs b/src/Microsoft.Health.Dicom.Core/Features/HealthCheck/BackgroundServiceHealthCheck.cs
@@ -11,6 +11,7 @@
 using Microsoft.Extensions.Diagnostics.HealthChecks;
 using Microsoft.Extensions.Options;
 using Microsoft.Health.Dicom.Core.Configs;
+using Microsoft.Health.Dicom.Core.Exceptions;
 using Microsoft.Health.Dicom.Core.Features.Store;
 
 namespace Microsoft.Health.Dicom.Core.Features.HealthCheck
@@ -41,13 +42,20 @@ public BackgroundServiceHealthCheck(
 
         public async Task<HealthCheckResult> CheckHealthAsync(HealthCheckContext context, CancellationToken cancellationToken = default)
         {
-            Task<DateTimeOffset> oldestWaitingToBeDeleated = _backgroundServiceHealthCheckCache.GetOrAddOldestTimeAsync(_indexDataStore.GetOldestDeletedAsync, cancellationToken);
-            Task<int> numReachedMaxedRetry = _backgroundServiceHealthCheckCache.GetOrAddNumExhaustedDeletionAttemptsAsync(
-                t => _indexDataStore.RetrieveNumExhaustedDeletedInstanceAttemptsAsync(_deletedInstanceCleanupConfiguration.MaxRetries, t),
-                cancellationToken);
+            try
+            {
+                Task<DateTimeOffset> oldestWaitingToBeDeleated = _backgroundServiceHealthCheckCache.GetOrAddOldestTimeAsync(_indexDataStore.GetOldestDeletedAsync, cancellationToken);
+                Task<int> numReachedMaxedRetry = _backgroundServiceHealthCheckCache.GetOrAddNumExhaustedDeletionAttemptsAsync(
+                    t => _indexDataStore.RetrieveNumExhaustedDeletedInstanceAttemptsAsync(_deletedInstanceCleanupConfiguration.MaxRetries, t),
+                    cancellationToken);
 
-            _telemetryClient.GetMetric("Oldest-Requested-Deletion").TrackValue((await oldestWaitingToBeDeleated).ToUnixTimeSeconds());
-            _telemetryClient.GetMetric("Count-Deletions-Max-Retry").TrackValue(await numReachedMaxedRetry);
+                _telemetryClient.GetMetric("Oldest-Requested-Deletion").TrackValue((await oldestWaitingToBeDeleated).ToUnixTimeSeconds());
+                _telemetryClient.GetMetric("Count-Deletions-Max-Retry").TrackValue(await numReachedMaxedRetry);
+            }
+            catch (DataStoreException e) // This is expected when service is starting up without schema initialization
+            {
+                return HealthCheckResult.Unhealthy("Unhealthy service." + e.Message);
+            }
 
             return HealthCheckResult.Healthy("Successfully computed values for background service.");
         }

diff --git a/src/Microsoft.Health.Dicom.SqlServer/Features/Store/SqlIndexDataStoreFactory.cs b/src/Microsoft.Health.Dicom.SqlServer/Features/Store/SqlIndexDataStoreFactory.cs
@@ -26,7 +26,13 @@ public SqlIndexDataStoreFactory(SchemaInformation schemaInformation, IEnumerable
 
         public IIndexDataStore GetInstance()
         {
-            return _indexDataStores.First(store => (int)store.Version == _schemaInformation.Current.Value);
+            // if the service is starting without schema initialized
+            if (_schemaInformation.Current == null)
+            {
+                return _indexDataStores.First(store => (int)store.Version == _schemaInformation.MinimumSupportedVersion);
+            }
+
+            return _indexDataStores.FirstOrDefault(store => (int)store.Version == _schemaInformation.Current);
         }
     }
 }