Skip to content

[ISSUE #10931] Initialize cluster transaction address mapping #10932

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Aias00 wants to merge 1 commit into
base: develop
Choose a base branch
from
+12 −1
Open

[ISSUE #10931] Initialize cluster transaction address mapping #10932

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion ...rc/main/java/org/apache/rocketmq/proxy/service/transaction/ClusterTransactionService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,8 @@ public class ClusterTransactionService extends AbstractTransactionService {

private ThreadPoolExecutor heartbeatExecutors;
private final Map<String /* group */, Set<ClusterData>/* cluster list */> groupClusterData = new ConcurrentHashMap<>();
private final AtomicReference<Map<String /* brokerAddr */, String /* brokerName */>> brokerAddrNameMapRef = new AtomicReference<>();
private final AtomicReference<Map<String /* brokerAddr */, String /* brokerName */>> brokerAddrNameMapRef =
new AtomicReference<>(Collections.emptyMap());
private TxHeartbeatServiceThread txHeartbeatServiceThread;

public ClusterTransactionService(TopicRouteService topicRouteService, ProducerManager producerManager,
Expand Down
10 changes: 10 additions & 0 deletions ...est/java/org/apache/rocketmq/proxy/service/transaction/ClusterTransactionServiceTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@
import java.util.stream.Collectors;
import org.apache.rocketmq.broker.client.ProducerManager;
import org.apache.rocketmq.common.MixAll;
import org.apache.rocketmq.common.message.Message;
import org.apache.rocketmq.proxy.common.ProxyContext;
import org.apache.rocketmq.proxy.config.ConfigurationManager;
import org.apache.rocketmq.proxy.service.BaseServiceTest;
Expand All @@ -44,6 +45,7 @@

import static org.awaitility.Awaitility.await;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertTrue;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.ArgumentMatchers.anyLong;
Expand Down Expand Up @@ -108,6 +110,14 @@ public void testUnSubscribeAllTransactionTopic() {
assertEquals(0, this.clusterTransactionService.getGroupClusterData().size());
}

@Test
public void testAddTransactionDataByBrokerAddrBeforeFirstHeartbeat() {
TransactionData transactionData = this.clusterTransactionService.addTransactionDataByBrokerAddr(
ctx, BROKER_ADDR, TOPIC, GROUP, 1, 2, "transaction-id", new Message());

assertNull(transactionData);
}

@Test
public void testScanProducerHeartBeat() throws Exception {
when(this.producerManager.groupOnline(anyString())).thenReturn(true);
Expand Down
Loading