Skip to content

[Subscription] Suppress expected commit progress warnings #18615

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

Merged
jt2594838 merged 2 commits into from
Sep 11, 2026
+69 −8
Merged

[Subscription] Suppress expected commit progress warnings #18615

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
720f558
[Subscription] Suppress expected commit progress warnings
Caideyipi Sep 10, 2026
56b08ec
[Subscription] Remove Logback coupling from commit progress test
Caideyipi Sep 10, 2026
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
17 changes: 13 additions & 4 deletions .../confignode/procedure/impl/subscription/consumer/runtime/CommitProgressSyncProcedure.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -147,10 +147,13 @@ private static void syncCommitProgress(
for (final Map.Entry<Integer, TPullCommitProgressResp> entry : respMap.entrySet()) {
final TPullCommitProgressResp resp = entry.getValue();
if (!isSuccessfulResponse(resp)) {
LOGGER.warn(
ProcedureMessages.LOG_FAILED_PULL_COMMIT_PROGRESS_DATANODE_ARG_STATUS_ARG_33037B29,
entry.getKey(),
Objects.isNull(resp) ? null : resp.getStatus());
// DataNodes with subscription disabled are expected to reject best-effort pulls.
if (!isUnsupportedOperationResponse(resp)) {
LOGGER.warn(
ProcedureMessages.LOG_FAILED_PULL_COMMIT_PROGRESS_DATANODE_ARG_STATUS_ARG_33037B29,
entry.getKey(),
Objects.isNull(resp) ? null : resp.getStatus());
}
continue;
}
if (resp.isSetCommitRegionProgress()) {
Expand Down Expand Up @@ -192,6 +195,12 @@ private static boolean isSuccessfulResponse(final TPullCommitProgressResp respon
&& response.getStatus().getCode() == TSStatusCode.SUCCESS_STATUS.getStatusCode();
}

private static boolean isUnsupportedOperationResponse(final TPullCommitProgressResp response) {
return Objects.nonNull(response)
&& response.isSetStatus()
&& response.getStatus().getCode() == TSStatusCode.UNSUPPORTED_OPERATION.getStatusCode();
}

@Override
public void executeFromOperateOnDataNodes(ConfigNodeProcedureEnv env) {
LOGGER.info(
Expand Down
60 changes: 56 additions & 4 deletions ...fignode/procedure/impl/subscription/consumer/runtime/CommitProgressSyncProcedureTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@
import org.apache.iotdb.rpc.subscription.payload.poll.WriterProgress;

import org.junit.Test;
import org.mockito.ArgumentCaptor;
import org.mockito.Mockito;

import java.io.ByteArrayOutputStream;
Expand All @@ -51,12 +52,15 @@ public class CommitProgressSyncProcedureTest {

@Test
public void requiredSyncShouldRejectFailedResponseBeforeConsensusWrite() throws Exception {
assertRequiredSyncRejectsResponse(TSStatusCode.EXECUTE_STATEMENT_ERROR);
assertRequiredSyncRejectsResponse(TSStatusCode.UNSUPPORTED_OPERATION);
}

private static void assertRequiredSyncRejectsResponse(final TSStatusCode statusCode)
throws Exception {
final ConfigNodeProcedureEnv env = Mockito.mock(ConfigNodeProcedureEnv.class);
final Map<Integer, TPullCommitProgressResp> responses = new LinkedHashMap<>();
responses.put(
2,
new TPullCommitProgressResp(
new TSStatus(TSStatusCode.EXECUTE_STATEMENT_ERROR.getStatusCode())));
responses.put(2, new TPullCommitProgressResp(new TSStatus(statusCode.getStatusCode())));
Mockito.when(env.pullCommitProgressFromDataNodes()).thenReturn(responses);

try {
Expand All @@ -70,6 +74,54 @@ public void requiredSyncShouldRejectFailedResponseBeforeConsensusWrite() throws
Mockito.verify(env, Mockito.never()).getConfigManager();
}

@Test
public void bestEffortSyncShouldSkipUnsuccessfulResponses() throws Exception {
final String progressKey = "successful_progress";
final RegionProgress progress =
new RegionProgress(
Collections.singletonMap(new WriterId("DataRegion[1]", 1), new WriterProgress(200, 1)));
final Map<Integer, TPullCommitProgressResp> responses = new LinkedHashMap<>();
responses.put(
1,
new TPullCommitProgressResp(
new TSStatus(TSStatusCode.UNSUPPORTED_OPERATION.getStatusCode())));
responses.put(
2,
new TPullCommitProgressResp(new TSStatus(TSStatusCode.SUCCESS_STATUS.getStatusCode()))
.setCommitRegionProgress(Collections.singletonMap(progressKey, serialize(progress))));
responses.put(
3,
new TPullCommitProgressResp(
new TSStatus(TSStatusCode.EXECUTE_STATEMENT_ERROR.getStatusCode())));
responses.put(4, null);
responses.put(5, new TPullCommitProgressResp());

final ConfigNodeProcedureEnv env = Mockito.mock(ConfigNodeProcedureEnv.class);
final ConfigManager configManager = Mockito.mock(ConfigManager.class);
final ConsensusManager consensusManager = Mockito.mock(ConsensusManager.class);
Mockito.when(env.pullCommitProgressFromDataNodesBestEffort()).thenReturn(responses);
Mockito.when(env.getConfigManager()).thenReturn(configManager);
Mockito.when(configManager.getConsensusManager()).thenReturn(consensusManager);
Mockito.when(consensusManager.write(Mockito.any()))
.thenReturn(new TSStatus(TSStatusCode.SUCCESS_STATUS.getStatusCode()));

final CommitProgressSyncProcedure procedure =
new CommitProgressSyncProcedure() {
{
subscriptionInfo = new AtomicReference<>(new SubscriptionInfo());
}
};
procedure.executeFromOperateOnConfigNodes(env);

final ArgumentCaptor<CommitProgressHandleMetaChangePlan> planCaptor =
ArgumentCaptor.forClass(CommitProgressHandleMetaChangePlan.class);
Mockito.verify(consensusManager).write(planCaptor.capture());
assertEquals(
progress,
RegionProgress.deserialize(planCaptor.getValue().getRegionProgressMap().get(progressKey)));
Mockito.verify(env, Mockito.never()).pullCommitProgressFromDataNodes();
}

@Test
public void requiredSyncShouldPersistEmptyProgressAndMergeByMaximum() throws Exception {
final String emptyProgressKey = "empty_progress";
Expand Down
Loading