[Search] Indexing Fixes

bootstrap/sql/migrations/native/1.5.6/mysql/schemaChanges.sql

@@ -0,0 +1,5 @@
+-- Delete Search Indexing Application 
+DELETE er FROM  entity_relationship er JOIN installed_apps ia ON er.fromId = ia.id OR er.toId = ia.id WHERE ia.name = 'SearchIndexingApplication';
+DELETE er FROM  entity_relationship er JOIN apps_marketplace ia ON er.fromId = ia.id OR er.toId = ia.id WHERE ia.name = 'SearchIndexingApplication';
+DELETE FROM  installed_apps where name = 'SearchIndexingApplication';
+DELETE FROM  apps_marketplace where name = 'SearchIndexingApplication';

bootstrap/sql/migrations/native/1.5.6/postgres/schemaChanges.sql

@@ -0,0 +1,5 @@
+-- Delete Search Indexing Application 
+DELETE FROM  entity_relationship er  USING installed_apps ia WHERE (er.fromId = ia.id OR er.toId = ia.id) AND ia.name = 'SearchIndexingApplication';
+DELETE FROM  entity_relationship er  USING apps_marketplace ia WHERE (er.fromId = ia.id OR er.toId = ia.id) AND ia.name = 'SearchIndexingApplication';
+DELETE FROM  installed_apps where name = 'SearchIndexingApplication';
+DELETE FROM  apps_marketplace where name = 'SearchIndexingApplication';

openmetadata-service/src/main/java/org/openmetadata/service/apps/bundles/searchIndex/SearchIndexApp.java

@@ -163,7 +163,21 @@ public void startApp(JobExecutionContext jobExecutionContext) {
     }
   }
 
+  private void cleanUpStaleJobsFromRuns() {
+    try {
+      collectionDAO
+          .appExtensionTimeSeriesDao()
+          .markStaleEntriesStopped(getApp().getId().toString());
+    } catch (Exception ex) {
+      LOG.error("Failed in Marking Stale Entries Stopped.");
+    }
+  }
+
   private void initializeJob() {
+    // Remove any Stale Jobs
+    cleanUpStaleJobsFromRuns();
+
+    // Initialize New Job
     int totalRecords = getTotalRequestToProcess(jobData.getEntities(), collectionDAO);
     this.jobData.setStats(
         new Stats()

openmetadata-service/src/main/java/org/openmetadata/service/jdbi3/CollectionDAO.java

@@ -4252,6 +4252,16 @@ interface AppExtensionTimeSeries {
         connectionType = POSTGRES)
     void insert(@Bind("json") String json);
 
+    @ConnectionAwareSqlUpdate(
+        value =
+            "UPDATE apps_extension_time_series SET json = JSON_SET(json, '$.status', 'stopped') where appId=:appId AND JSON_UNQUOTE(JSON_EXTRACT(json_column_name, '$.status')) = 'running'",
+        connectionType = MYSQL)
+    @ConnectionAwareSqlUpdate(
+        value =
+            "UPDATE apps_extension_time_series SET json = jsonb_set(json, '{status}', '\"stopped\"') WHERE appId = :appId AND json->>'status' = 'running'",
+        connectionType = POSTGRES)
+    void markStaleEntriesStopped(@Bind("appId") String appId);
+
     @ConnectionAwareSqlUpdate(
         value =
             "UPDATE apps_extension_time_series set json = :json where appId=:appId and timestamp=:timestamp",

openmetadata-service/src/main/java/org/openmetadata/service/search/elasticsearch/ElasticSearchClient.java

@@ -2228,6 +2228,7 @@ public RestHighLevelClient createElasticSearchClient(ElasticSearchConfiguration
                 requestConfigBuilder
                     .setConnectTimeout(esConfig.getConnectionTimeoutSecs() * 1000)
                     .setSocketTimeout(esConfig.getSocketTimeoutSecs() * 1000));
+        restClientBuilder.setCompressionEnabled(true);
         return new RestHighLevelClientBuilder(restClientBuilder.build())
             .setApiCompatibilityMode(true)
             .build();

openmetadata-service/src/main/java/org/openmetadata/service/search/elasticsearch/ElasticSearchIndexSink.java

@@ -28,10 +28,10 @@
 public class ElasticSearchIndexSink implements Sink<BulkRequest, BulkResponse> {
   private final StepStats stats = new StepStats();
   private final SearchRepository searchRepository;
-  private final int maxPayLoadSizeInBytes;
+  private final long maxPayLoadSizeInBytes;
 
   public ElasticSearchIndexSink(
-      SearchRepository searchRepository, int total, int maxPayLoadSizeInBytes) {
+      SearchRepository searchRepository, int total, long maxPayLoadSizeInBytes) {
     this.searchRepository = searchRepository;
     this.maxPayLoadSizeInBytes = maxPayLoadSizeInBytes;
     this.stats.withTotalRecords(total).withSuccessRecords(0).withFailedRecords(0);

openmetadata-service/src/main/java/org/openmetadata/service/search/opensearch/OpenSearchClient.java

@@ -2193,6 +2193,8 @@ public RestHighLevelClient createOpenSearchClient(ElasticSearchConfiguration esC
                 requestConfigBuilder
                     .setConnectTimeout(esConfig.getConnectionTimeoutSecs() * 1000)
                     .setSocketTimeout(esConfig.getSocketTimeoutSecs() * 1000));
+        restClientBuilder.setCompressionEnabled(true);
+        restClientBuilder.setChunkedEnabled(true);
         return new RestHighLevelClient(restClientBuilder);
       } catch (Exception e) {
         LOG.error("Failed to create open search client ", e);

openmetadata-service/src/main/java/org/openmetadata/service/search/opensearch/OpenSearchIndexSink.java

@@ -29,9 +29,9 @@ public class OpenSearchIndexSink implements Sink<BulkRequest, BulkResponse> {
   private final StepStats stats = new StepStats();
   private final SearchRepository searchRepository;
 
-  private final int maxPayLoadSizeInBytes;
+  private final long maxPayLoadSizeInBytes;
 
-  public OpenSearchIndexSink(SearchRepository repository, int total, int maxPayLoadSizeInBytes) {
+  public OpenSearchIndexSink(SearchRepository repository, int total, long maxPayLoadSizeInBytes) {
     this.searchRepository = repository;
     this.maxPayLoadSizeInBytes = maxPayLoadSizeInBytes;
     this.stats.withTotalRecords(total).withSuccessRecords(0).withFailedRecords(0);

openmetadata-service/src/main/java/org/openmetadata/service/util/OpenMetadataOperations.java

@@ -270,8 +270,8 @@ public Integer reIndex(
           int batchSize,
       @Option(
               names = {"-p", "--payload-size"},
-              defaultValue = "10485760")
-          int payloadSize,
+              defaultValue = "104857600l")
+          long payloadSize,
       @Option(
               names = {"--recreate-indexes"},
               defaultValue = "true")
@@ -295,7 +295,7 @@ public Integer reIndex(
   }
 
   private int executeSearchReindexApp(
-      String appName, int batchSize, int payloadSize, boolean recreateIndexes) {
+      String appName, int batchSize, long payloadSize, boolean recreateIndexes) {
     AppRepository appRepository = (AppRepository) Entity.getEntityRepository(Entity.APPLICATION);
     App originalSearchIndexApp =
         appRepository.getByName(null, appName, appRepository.getFields("id"));

openmetadata-service/src/main/resources/json/data/app/SearchIndexingApplication.json

@@ -45,6 +45,7 @@
     ],
     "recreateIndex": false,
     "batchSize": "100",
+    "payLoadSize": 104857600,
     "searchIndexMappingLanguage": "EN"
   },
   "appSchedule": {

openmetadata-service/src/main/resources/json/data/appMarketPlaceDefinition/SearchIndexingApplication.json

@@ -60,6 +60,7 @@
     ],
     "recreateIndex": false,
     "batchSize": "100",
+    "payLoadSize": 104857600,
     "searchIndexMappingLanguage": "EN"
   }
 }

openmetadata-spec/src/main/resources/json/schema/entity/applications/configuration/internal/searchIndexingAppConfig.json

@@ -38,6 +38,12 @@
       "type": "integer",
       "default": 100
     },
+    "payLoadSize": {
+      "description": "Maximum number of events sent in a batch (Default 100).",
+      "type": "integer",
+      "existingJavaType": "java.lang.Long",
+      "default": 104857600
+    },
     "searchIndexMappingLanguage": {
       "description": "Recreate Indexes with updated Language",
       "$ref": "../../../../configuration/elasticSearchConfiguration.json#/definitions/searchIndexMappingLanguage"

openmetadata-spec/src/main/resources/json/schema/system/eventPublisherJob.json

@@ -102,9 +102,10 @@
       "type": "integer"
     },
     "payLoadSize": {
-      "description": "Payload size in bytes depending on config",
+      "description": "Payload size in bytes depending on config.",
       "type": "integer",
-      "default": 10485760
+      "existingJavaType": "java.lang.Long",
+      "default": 104857600
     },
     "searchIndexMappingLanguage": {
       "description": "Recreate Indexes with updated Language",

openmetadata-ui/src/main/resources/ui/src/utils/ApplicationSchemas/SearchIndexingApplication.json

@@ -10,6 +10,12 @@
       "type": "integer",
       "default": 100
     },
+    "payLoadSize": {
+      "title": "Payload Size",
+      "description": "Maximum number of events entities in a batch (Default 100).",
+      "type": "integer",
+      "default": 104857600
+    },
     "entities": {
       "title": "Entities",
       "description": "List of entities that you need to reindex",