Skip to content
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

Jump to bottom

[Hotfix][Zeta] Fix completePendingCheckpoint concurrent action #4854

Merged
merged 1 commit into from
May 30, 2023
Merged

[Hotfix][Zeta] Fix completePendingCheckpoint concurrent action #4854

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
2 changes: 1 addition & 1 deletion config/seatunnel.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ seatunnel:
checkpoint:
interval: 10000
timeout: 60000
max-concurrent: 5
max-concurrent: 1
tolerable-failure: 2
storage:
type: hdfs
Expand Down
8 changes: 4 additions & 4 deletions docs/en/seatunnel-engine/checkpoint-storage.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ seatunnel:
checkpoint:
interval: 6000
timeout: 7000
max-concurrent: 5
max-concurrent: 1
tolerable-failure: 2
storage:
type: hdfs
Expand Down Expand Up @@ -94,7 +94,7 @@ seatunnel:
checkpoint:
interval: 6000
timeout: 7000
max-concurrent: 5
max-concurrent: 1
tolerable-failure: 2
storage:
type: hdfs
Expand All @@ -119,7 +119,7 @@ seatunnel:
checkpoint:
interval: 6000
timeout: 7000
max-concurrent: 5
max-concurrent: 1
tolerable-failure: 2
storage:
type: hdfs
Expand Down Expand Up @@ -160,7 +160,7 @@ seatunnel:
checkpoint:
interval: 6000
timeout: 7000
max-concurrent: 5
max-concurrent: 1
tolerable-failure: 2
storage:
type: hdfs
Expand Down
2 changes: 1 addition & 1 deletion ...l-e2e/seatunnel-engine-e2e/connector-seatunnel-e2e-base/src/test/resources/seatunnel.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ seatunnel:
checkpoint:
interval: 300000
timeout: 10000
max-concurrent: 5
max-concurrent: 1
tolerable-failure: 2
storage:
type: localfile
Expand Down
2 changes: 1 addition & 1 deletion seatunnel-engine/seatunnel-engine-client/src/test/resources/seatunnel.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ seatunnel:
checkpoint:
interval: 6000
timeout: 7000
max-concurrent: 5
max-concurrent: 1
tolerable-failure: 2
storage:
type: hdfs
Expand Down
2 changes: 1 addition & 1 deletion seatunnel-engine/seatunnel-engine-common/src/main/resources/seatunnel.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ seatunnel:
checkpoint:
interval: 300000
timeout: 10000
max-concurrent: 5
max-concurrent: 1
tolerable-failure: 2
storage:
type: hdfs
Expand Down
2 changes: 1 addition & 1 deletion ...rc/test/java/org/apache/seatunnel/engine/common/config/YamlSeaTunnelConfigParserTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ public void testSeaTunnelConfig() {
7000, config.getEngineConfig().getCheckpointConfig().getCheckpointTimeout());

Assertions.assertEquals(
5, config.getEngineConfig().getCheckpointConfig().getMaxConcurrentCheckpoints());
1, config.getEngineConfig().getCheckpointConfig().getMaxConcurrentCheckpoints());

Assertions.assertEquals(
2, config.getEngineConfig().getCheckpointConfig().getTolerableFailureCheckpoints());
Expand Down
2 changes: 1 addition & 1 deletion seatunnel-engine/seatunnel-engine-common/src/test/resources/seatunnel.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ seatunnel:
checkpoint:
interval: 6000
timeout: 7000
max-concurrent: 5
max-concurrent: 1
tolerable-failure: 2
storage:
type: hdfs
Expand Down
2 changes: 1 addition & 1 deletion ...er/src/main/java/org/apache/seatunnel/engine/server/checkpoint/CheckpointCoordinator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -608,7 +608,7 @@ protected void acknowledgeTask(TaskAcknowledgeOperation ackOperation) {
: SubtaskStatus.RUNNING);
}

public void completePendingCheckpoint(CompletedCheckpoint completedCheckpoint) {
public synchronized void completePendingCheckpoint(CompletedCheckpoint completedCheckpoint) {
LOG.debug(
"pending checkpoint({}/{}@{}) completed! cost: {}, trigger: {}, completed: {}",
completedCheckpoint.getCheckpointId(),
Expand Down
2 changes: 1 addition & 1 deletion seatunnel-engine/seatunnel-engine-server/src/test/resources/seatunnel.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ seatunnel:
checkpoint:
interval: 6000
timeout: 7000
max-concurrent: 5
max-concurrent: 1
tolerable-failure: 2
storage:
type: hdfs
Expand Down