Merge pull request #162 from CSCfi/indexer-improvements2

Increase cronjob allowed execution time. Add logging to index switch
CSCfi · Nov 8, 2024 · b4dd24d · b4dd24d
2 parents c0c589d + 36ded2f
commit b4dd24d
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 7 deletions.
diff --git a/aspnetcore/openshift/indexer/rahti2/template-indexer-cronjob-devel.yml b/aspnetcore/openshift/indexer/rahti2/template-indexer-cronjob-devel.yml
@@ -30,7 +30,7 @@ objects:
       failedJobsHistoryLimit: 2
       jobTemplate:
         spec:
-          activeDeadlineSeconds: 2400 # Can run for 40 minutes
+          activeDeadlineSeconds: 5400 # Can run for 90 minutes
           template:
             spec:
               restartPolicy: Never

diff --git a/aspnetcore/openshift/indexer/rahti2/template-indexer-cronjob-production.yml b/aspnetcore/openshift/indexer/rahti2/template-indexer-cronjob-production.yml
@@ -30,7 +30,7 @@ objects:
       failedJobsHistoryLimit: 2
       jobTemplate:
         spec:
-          activeDeadlineSeconds: 2400 # Can run for 40 minutes
+          activeDeadlineSeconds: 5400 # Can run for 90 minutes
           template:
             spec:
               restartPolicy: Never

diff --git a/aspnetcore/openshift/indexer/rahti2/template-indexer-cronjob-qa.yml b/aspnetcore/openshift/indexer/rahti2/template-indexer-cronjob-qa.yml
@@ -30,7 +30,7 @@ objects:
       failedJobsHistoryLimit: 2
       jobTemplate:
         spec:
-          activeDeadlineSeconds: 2400 # Can run for 40 minutes
+          activeDeadlineSeconds: 5400 # Can run for 90 minutes
           template:
             spec:
               restartPolicy: Never

diff --git a/aspnetcore/src/ElasticService/ElasticSearchIndexService.cs b/aspnetcore/src/ElasticService/ElasticSearchIndexService.cs
@@ -32,7 +32,7 @@ public async Task IndexAsync(string indexName, List<object> entities, Type model
         await IndexEntities(indexToCreate, entities, modelType);
 
         // Switch indexes
-        await SwitchIndexes(indexName, indexToCreate, indexToDelete);
+        await SwitchIndexes(indexName, indexToCreate, indexToDelete, modelType.Name);
 
         _logger.LogDebug("{EntityType:l}: Indexing to {IndexName:l} complete", modelType.Name, indexName);
     }
@@ -43,8 +43,9 @@ public async Task IndexChunkAsync(string indexToCreate, List<object> entities, T
         await IndexEntities(indexToCreate, entities, modelType);
     }
 
-    public async Task SwitchIndexes(string indexName, string indexToCreate, string indexToDelete)
+    public async Task SwitchIndexes(string indexName, string indexToCreate, string indexToDelete, string modelTypeName)
     {
+        _logger.LogInformation($"{modelTypeName}: Switch indexes start: indexName={indexName}, indexToCreate={indexToCreate}, indexToDelete={indexToDelete}");
         // Wait for new index to be operational.
         await _elasticClient.Cluster
             .HealthAsync(selector: s => s
@@ -61,6 +62,7 @@ await _elasticClient.Indices.BulkAliasAsync(r => r
 
         // Delete the old index if it exists.
         await _elasticClient.Indices.DeleteAsync(indexToDelete, d => d.RequestConfiguration(x => x.AllowedStatusCodes(404)));
+        _logger.LogInformation($"{modelTypeName}: Switch indexes complete");
     }
 
     public async Task<(string indexToCreate, string indexToDelete)> GetIndexNames(string indexName)

diff --git a/aspnetcore/src/ElasticService/IElasticSearchIndexService.cs b/aspnetcore/src/ElasticService/IElasticSearchIndexService.cs
@@ -48,6 +48,7 @@ public interface IElasticSearchIndexService
     /// <param name="indexName"></param>
     /// <param name="indexToCreate"></param>
     /// <param name="indexToDelete"></param>
+    /// <param name="modelTypeName"></param>
     /// <returns></returns>
-    Task SwitchIndexes(string indexName, string indexToCreate, string indexToDelete);
+    Task SwitchIndexes(string indexName, string indexToCreate, string indexToDelete, string modelTypeName);
 }
diff --git a/aspnetcore/src/Indexer/Indexer.cs b/aspnetcore/src/Indexer/Indexer.cs
@@ -177,7 +177,7 @@ private async Task IndexEntities(string indexName, IIndexRepository repository,
                 } while (numOfResults >= takeAmount - 1);
 
                 // Activate new index and delete old
-                await _indexService.SwitchIndexes(indexName, indexToCreate, indexToDelete);
+                await _indexService.SwitchIndexes(indexName, indexToCreate, indexToDelete, type.Name);
                 _logger.LogInformation("{EntityType:l}: Recreated index {IndexName:l}, {ElasticsearchDocumentCount} documents", type.Name, indexName, processedCount);
             }
             else