[release-2.12] fix: failure in data query due to reconciler triggered…

… by uncommitted transaction (#5329)



Co-authored-by: guqing <i@guqing.email>

application/src/main/java/run/halo/app/extension/ReactiveExtensionClientImpl.java

@@ -26,7 +26,8 @@
 import org.springframework.data.domain.Sort;
 import org.springframework.data.util.Predicates;
 import org.springframework.stereotype.Component;
-import org.springframework.transaction.annotation.Transactional;
+import org.springframework.transaction.ReactiveTransactionManager;
+import org.springframework.transaction.reactive.TransactionalOperator;
 import reactor.core.publisher.Flux;
 import reactor.core.publisher.Mono;
 import reactor.util.retry.Retry;
@@ -40,7 +41,6 @@
 
 @Slf4j
 @Component
-@RequiredArgsConstructor
 public class ReactiveExtensionClientImpl implements ReactiveExtensionClient {
 
     private final ReactiveExtensionStoreClient client;
@@ -60,6 +60,28 @@ public class ReactiveExtensionClientImpl implements ReactiveExtensionClient {
     private final ConcurrentMap<GroupKind, AtomicBoolean> indexBuildingState =
         new ConcurrentHashMap<>();
 
+    private TransactionalOperator transactionalOperator;
+
+    public ReactiveExtensionClientImpl(ReactiveExtensionStoreClient client,
+        ExtensionConverter converter, SchemeManager schemeManager, ObjectMapper objectMapper,
+        IndexerFactory indexerFactory, IndexedQueryEngine indexedQueryEngine,
+        ReactiveTransactionManager reactiveTransactionManager) {
+        this.client = client;
+        this.converter = converter;
+        this.schemeManager = schemeManager;
+        this.objectMapper = objectMapper;
+        this.indexerFactory = indexerFactory;
+        this.indexedQueryEngine = indexedQueryEngine;
+        this.transactionalOperator = TransactionalOperator.create(reactiveTransactionManager);
+    }
+
+    /**
+     * Only for test.
+     */
+    void setTransactionalOperator(TransactionalOperator transactionalOperator) {
+        this.transactionalOperator = transactionalOperator;
+    }
+
     @Override
     public <E extends Extension> Flux<E> list(Class<E> type, Predicate<E> predicate,
         Comparator<E> comparator) {
@@ -151,7 +173,6 @@ private Mono<Unstructured> get(GroupVersionKind gvk, String name) {
     }
 
     @Override
-    @Transactional
     public <E extends Extension> Mono<E> create(E extension) {
         checkClientWritable(extension);
         return Mono.just(extension)
@@ -185,7 +206,6 @@ && hasText(extension.getMetadata().getGenerateName()))
     }
 
     @Override
-    @Transactional
     public <E extends Extension> Mono<E> update(E extension) {
         checkClientWritable(extension);
         // Refactor the atomic reference if we have a better solution.
@@ -223,7 +243,6 @@ private Mono<? extends Extension> getLatest(Extension extension) {
     }
 
     @Override
-    @Transactional
     public <E extends Extension> Mono<E> delete(E extension) {
         checkClientWritable(extension);
         // set deletionTimestamp
@@ -247,7 +266,8 @@ <E extends Extension> Mono<E> doCreate(E oldExtension, String name, byte[] data)
             var indexer = indexerFactory.getIndexer(gvk);
             return client.create(name, data)
                 .map(created -> converter.convertFrom(type, created))
-                .doOnNext(indexer::indexRecord);
+                .doOnNext(indexer::indexRecord)
+                .as(transactionalOperator::transactional);
         });
     }
 
@@ -258,7 +278,8 @@ <E extends Extension> Mono<E> doUpdate(E oldExtension, String name, Long version
             var indexer = indexerFactory.getIndexer(oldExtension.groupVersionKind());
             return client.update(name, version, data)
                 .map(updated -> converter.convertFrom(type, updated))
-                .doOnNext(indexer::updateRecord);
+                .doOnNext(indexer::updateRecord)
+                .as(transactionalOperator::transactional);
         });
     }
 

application/src/test/java/run/halo/app/extension/ReactiveExtensionClientTest.java

@@ -36,6 +36,8 @@
 import org.mockito.Spy;
 import org.mockito.junit.jupiter.MockitoExtension;
 import org.springframework.dao.DataIntegrityViolationException;
+import org.springframework.transaction.ReactiveTransactionManager;
+import org.springframework.transaction.reactive.TransactionalOperator;
 import reactor.core.Exceptions;
 import reactor.core.publisher.Flux;
 import reactor.core.publisher.Mono;
@@ -63,6 +65,9 @@ class ReactiveExtensionClientTest {
     @Mock
     IndexerFactory indexerFactory;
 
+    @Mock
+    ReactiveTransactionManager reactiveTransactionManager;
+
     @Spy
     ObjectMapper objectMapper = JsonMapper.builder()
         .addModule(new JavaTimeModule())
@@ -76,6 +81,10 @@ void setUp() {
         lenient().when(schemeManager.get(eq(FakeExtension.class)))
             .thenReturn(fakeScheme);
         lenient().when(schemeManager.get(eq(fakeScheme.groupVersionKind()))).thenReturn(fakeScheme);
+        var transactionalOperator = mock(TransactionalOperator.class);
+        client.setTransactionalOperator(transactionalOperator);
+        lenient().when(transactionalOperator.transactional(any(Mono.class)))
+            .thenAnswer(invocation -> invocation.getArgument(0));
     }
 
     FakeExtension createFakeExtension(String name, Long version) {