优化

2026-08-25 09:52:49 +08:00
parent b211121365
commit b67217332a
37 changed files with 1009 additions and 343 deletions
@@ -12,6 +12,7 @@ import org.springframework.test.util.ReflectionTestUtils;

 import java.net.URI;
 import java.time.Duration;
+import java.util.List;

 import static org.assertj.core.api.Assertions.assertThat;
 import static org.mockito.ArgumentMatchers.*;
@@ -103,6 +104,59 @@ class OverseasEventDispatcherTest {
        assertThat(updatedAttempt().getStatus()).isEqualTo("DELIVERED");
    }

+    @Test
+    void downstream503RetriesThenDeliversWithDiagnosticAttemptsInBothDirections() throws Exception {
+        for (String target : List.of("OVERSEAS", "CN")) {
+            reset(inboxMapper, attemptMapper, eventClient, firstlegEventClient);
+            event.setSourceRegion("CN".equals(target) ? "OVERSEAS" : "CN");
+            event.setTargetRegion(target);
+            event.setRetryCount(0);
+            when(inboxMapper.claim(eq("event-1"), anyString(), anyLong())).thenReturn(1);
+            when(inboxMapper.selectById("event-1")).thenReturn(event);
+            when(inboxMapper.nextAttemptNo("event-1")).thenReturn(1, 2);
+            doAnswer(invocation -> {
+                event.setRetryCount(1);
+                event.setStatus("RETRY");
+                event.setLastError(invocation.getArgument(4));
+                event.setNextRetryAt(java.time.LocalDateTime.now().plusSeconds(
+                    ((Number) invocation.getArgument(3)).longValue()));
+                return 1;
+            }).when(inboxMapper).markFailed(eq("event-1"), anyString(), eq(3), anyLong(), anyString());
+            when(inboxMapper.markProcessed(eq("event-1"), anyString())).thenAnswer(invocation -> {
+                event.setStatus("PROCESSED");
+                event.setLastError(null);
+                event.setNextRetryAt(null);
+                return 1;
+            });
+            if ("CN".equals(target)) {
+                when(firstlegEventClient.deliver(event))
+                    .thenThrow(new IllegalStateException("HTTP 503 code=S0503 requestId=req-cn traceId=trace-cn"))
+                    .thenReturn("200");
+            } else {
+                when(eventClient.deliver(event))
+                    .thenThrow(new IllegalStateException("HTTP 503 code=S0503 requestId=req-overseas traceId=trace-overseas"))
+                    .thenReturn("200");
+            }
+
+            dispatcher.dispatchOne("event-1");
+            assertThat(event.getStatus()).isEqualTo("RETRY");
+            assertThat(event.getNextRetryAt()).isNotNull();
+            assertThat(event.getLastError()).contains("HTTP 503", "requestId=", "traceId=");
+            dispatcher.dispatchOne("event-1");
+
+            ArgumentCaptor<BridgeDeliveryAttempt> attempts = ArgumentCaptor.forClass(BridgeDeliveryAttempt.class);
+            verify(attemptMapper, times(2)).updateById(attempts.capture());
+            assertThat(attempts.getAllValues()).extracting(BridgeDeliveryAttempt::getAttemptNo)
+                .containsExactly(1, 2);
+            assertThat(attempts.getAllValues()).extracting(BridgeDeliveryAttempt::getStatus)
+                .containsExactly("RETRY", "DELIVERED");
+            assertThat(attempts.getAllValues().get(0).getErrorMessage())
+                .contains("HTTP 503", "requestId=", "traceId=");
+            assertThat(event.getStatus()).isEqualTo("PROCESSED");
+            assertThat(event.getLastError()).isNull();
+        }
+    }
+
    private BridgeDeliveryAttempt updatedAttempt() {
        ArgumentCaptor<BridgeDeliveryAttempt> captor = ArgumentCaptor.forClass(BridgeDeliveryAttempt.class);
        verify(attemptMapper).updateById(captor.capture());