fix(search): restore live settings on per-entity promote path

openmetadata-integration-tests/src/test/java/org/openmetadata/it/tests/AppsResourceIT.java

@@ -81,8 +81,15 @@ static void setup() {
   private void waitForAppJobCompletion(String appName) {
     HttpClient httpClient = SdkClients.adminClient().getHttpClient();
     try {
+      // AppRunRecord.status is a lowercase enum (see appRunRecord.json: started, running,
+      // completed, failed, success, activeError, stopped, ...). Comparing with case-insensitive
+      // matchers — using uppercase here matches none of the real values and silently makes the
+      // wait a no-op. 5-minute ceiling covers an in-flight reindex from another test class
+      // (e.g. SearchIndexingFieldsParityIT triggers an "all entities" reindex that can take
+      // minutes); a 30s ceiling fell through to the catch and let the trigger Awaitility below
+      // hit its own 2-minute "already running" wall.
       Awaitility.await("Wait for app job completion: " + appName)
-          .atMost(Duration.ofSeconds(30))
+          .atMost(Duration.ofMinutes(5))
           .pollDelay(Duration.ofMillis(500))
           .pollInterval(Duration.ofSeconds(2))
           .ignoreExceptions()
@@ -98,9 +105,7 @@ private void waitForAppJobCompletion(String appName) {
                   return true;
                 }
                 String status = latestRun.getStatus().value();
-                return "SUCCESS".equals(status)
-                    || "FAILED".equals(status)
-                    || "COMPLETED".equals(status);
+                return !"running".equalsIgnoreCase(status) && !"started".equalsIgnoreCase(status);
               });
     } catch (org.awaitility.core.ConditionTimeoutException e) {
       // Best-effort wait — the app may be continuously running under parallel test load.

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

@@ -185,10 +185,20 @@ private ExecutionResult doExecute(
             recreateContext,
             !stopped.get() && !hasIncompleteProcessing(stats));
 
-    ExecutionResult.Status resultStatus = determineStatus(stats);
+    ExecutionResult.Status resultStatus = determineStatus(stats, recreateIndexHandler);
 
     StatsReconciler.reconcile(stats);
 
+    if (resultStatus == ExecutionResult.Status.FAILED) {
+      Set<String> dataLoss = collectDataLossPromotions(recreateIndexHandler);
+      listeners.onJobFailed(
+          stats,
+          new IllegalStateException(
+              "Promotion data loss for entities: "
+                  + dataLoss
+                  + ". Canonical index was deleted but alias not re-attached."));
+    }
+
     return ExecutionResult.builder()
         .status(resultStatus)
         .totalRecords(stats.getJobStats().getTotalRecords())
@@ -201,6 +211,19 @@ private ExecutionResult doExecute(
         .build();
   }
 
+  private Set<String> collectDataLossPromotions(RecreateIndexHandler strategyHandler) {
+    Set<String> all = new HashSet<>();
+    if (strategyHandler != null) {
+      all.addAll(strategyHandler.getDataLossPromotions());
+    }
+    RecreateIndexHandler executorHandler =
+        distributedExecutor != null ? distributedExecutor.getRecreateIndexHandler() : null;
+    if (executorHandler != null) {
+      all.addAll(executorHandler.getDataLossPromotions());
+    }
+    return all;
+  }
+
   private void flushAndAwaitSink() {
     if (searchIndexSink == null) {
       return;
@@ -452,11 +475,15 @@ private static int saturatedToInt(long value) {
     return (int) Math.min(value, Integer.MAX_VALUE);
   }
 
-  private ExecutionResult.Status determineStatus(Stats stats) {
+  private ExecutionResult.Status determineStatus(
+      Stats stats, RecreateIndexHandler strategyHandler) {
     if (stopped.get()) {
       return ExecutionResult.Status.STOPPED;
     }
-    if (hasIncompleteProcessing(stats)) {
+    if (hasDataLossPromotions(strategyHandler)) {
+      return ExecutionResult.Status.FAILED;
+    }
+    if (hasIncompleteProcessing(stats) || hasFailedPromotions(strategyHandler)) {
       return ExecutionResult.Status.COMPLETED_WITH_ERRORS;
     }
     return ExecutionResult.Status.COMPLETED;
@@ -473,6 +500,24 @@ private boolean hasIncompleteProcessing(Stats stats) {
     return failed > 0 || (total > 0 && processed < total);
   }
 
+  private boolean hasFailedPromotions(RecreateIndexHandler strategyHandler) {
+    if (strategyHandler != null && !strategyHandler.getFailedPromotions().isEmpty()) {
+      return true;
+    }
+    RecreateIndexHandler executorHandler =
+        distributedExecutor != null ? distributedExecutor.getRecreateIndexHandler() : null;
+    return executorHandler != null && !executorHandler.getFailedPromotions().isEmpty();
+  }
+
+  private boolean hasDataLossPromotions(RecreateIndexHandler strategyHandler) {
+    if (strategyHandler != null && !strategyHandler.getDataLossPromotions().isEmpty()) {
+      return true;
+    }
+    RecreateIndexHandler executorHandler =
+        distributedExecutor != null ? distributedExecutor.getRecreateIndexHandler() : null;
+    return executorHandler != null && !executorHandler.getDataLossPromotions().isEmpty();
+  }
+
   private boolean finalizeAllEntityReindex(
       RecreateIndexHandler recreateIndexHandler,
       ReindexContext recreateContext,

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

@@ -1762,6 +1762,15 @@ private ExecutionResult buildResult() {
       listeners.onJobCompletedWithErrors(stats.get(), endTime - startTime);
     } else if (status == ExecutionResult.Status.STOPPED) {
       listeners.onJobStopped(stats.get());
+    } else if (status == ExecutionResult.Status.FAILED) {
+      Set<String> dataLoss =
+          recreateIndexHandler != null ? recreateIndexHandler.getDataLossPromotions() : Set.of();
+      listeners.onJobFailed(
+          stats.get(),
+          new IllegalStateException(
+              "Promotion data loss for entities: "
+                  + dataLoss
+                  + ". Canonical index was deleted but alias not re-attached."));
     }
 
     return ExecutionResult.fromStats(stats.get(), status, startTime);
@@ -1771,26 +1780,35 @@ private ExecutionResult.Status determineStatus() {
     if (stopped.get()) {
       return ExecutionResult.Status.STOPPED;
     }
-
+    if (hasDataLossPromotions()) {
+      return ExecutionResult.Status.FAILED;
+    }
     if (hasIncompleteProcessing()) {
       return ExecutionResult.Status.COMPLETED_WITH_ERRORS;
     }
-
     return ExecutionResult.Status.COMPLETED;
   }
 
   private boolean hasIncompleteProcessing() {
     Stats currentStats = stats.get();
     if (currentStats == null || currentStats.getJobStats() == null) {
-      return false;
+      return hasFailedPromotions();
     }
 
     StepStats jobStats = currentStats.getJobStats();
     long failed = jobStats.getFailedRecords() != null ? jobStats.getFailedRecords() : 0;
     long processed = jobStats.getSuccessRecords() != null ? jobStats.getSuccessRecords() : 0;
     long total = jobStats.getTotalRecords() != null ? jobStats.getTotalRecords() : 0;
 
-    return failed > 0 || (total > 0 && processed < total);
+    return failed > 0 || (total > 0 && processed < total) || hasFailedPromotions();
+  }
+
+  private boolean hasFailedPromotions() {
+    return recreateIndexHandler != null && !recreateIndexHandler.getFailedPromotions().isEmpty();
+  }
+
+  private boolean hasDataLossPromotions() {
+    return recreateIndexHandler != null && !recreateIndexHandler.getDataLossPromotions().isEmpty();
   }
 
   public void stop() {

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

@@ -129,7 +129,7 @@ public static boolean isCoordinatingJob(UUID jobId) {
 
   // Per-entity index promotion
   private EntityCompletionTracker entityTracker;
-  private RecreateIndexHandler recreateIndexHandler;
+  @Getter private RecreateIndexHandler recreateIndexHandler;
   private ReindexContext recreateContext;
 
   // Reader stats tracking (accumulated across all worker threads)
@@ -1099,7 +1099,6 @@ private void initializeEntityTracker(UUID jobId, boolean recreateIndex) {
         partitionCountByEntity.size(),
         partitionCountByEntity);
 
-    // Set up per-entity promotion callback if recreating indices
     if (recreateIndex && recreateContext != null) {
       this.recreateIndexHandler = Entity.getSearchRepository().createReindexHandler();
       // Wire job configuration so applyLiveServingSettings can revert bulk-build overrides