Ensure activated applications have a reindexing status
@@ -120,12 +120,10 @@ public class Deployment implements com.yahoo.config.provision.Deployment {
activation.sourceSessionId().stream().mapToObj(id -> ". Based on session " + id).findFirst().orElse("") +
". File references: " + applicationRepository.getFileReferences(applicationId));
- if (configChangeActions != null) {
- if (provisioner.isPresent())
+ if (provisioner.isPresent() && configChangeActions != null)
restartServices(applicationId);
storeReindexing(applicationId, session.getMetaData().getGeneration());
- }
return session.getMetaData().getGeneration();
}
@@ -151,6 +149,7 @@ public class Deployment implements com.yahoo.config.provision.Deployment {
private void storeReindexing(ApplicationId applicationId, long requiredSession) {
applicationRepository.modifyReindexing(applicationId, reindexing -> {
+ if (configChangeActions != null)
for (ReindexActions.Entry entry : configChangeActions.getReindexActions().getEntries())
reindexing = reindexing.withPending(entry.getClusterName(), entry.getDocumentType(), requiredSession);
