-
Notifications
You must be signed in to change notification settings - Fork 1.9k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
[Fix][Zeta] Fix apply resource again for another pipeline when restor…
…e one pipeline (#7965)
- Loading branch information
1 parent
b6c9c0a
commit a0ee6bf
Showing
5 changed files
with
227 additions
and
28 deletions.
There are no files selected for viewing
48 changes: 48 additions & 0 deletions
48
...nector-seatunnel-e2e-base/src/test/java/org/apache/seatunnel/engine/e2e/JobRestoreIT.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,48 @@ | ||
| /* | ||
| * Licensed to the Apache Software Foundation (ASF) under one or more | ||
| * contributor license agreements. See the NOTICE file distributed with | ||
| * this work for additional information regarding copyright ownership. | ||
| * The ASF licenses this file to You under the Apache License, Version 2.0 | ||
| * (the "License"); you may not use this file except in compliance with | ||
| * the License. You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
|
|
||
| package org.apache.seatunnel.engine.e2e; | ||
|
|
||
| import org.junit.jupiter.api.Assertions; | ||
| import org.junit.jupiter.api.BeforeAll; | ||
| import org.junit.jupiter.api.Test; | ||
| import org.testcontainers.containers.Container; | ||
|
|
||
| import java.io.IOException; | ||
|
|
||
| import static org.apache.seatunnel.e2e.common.util.ContainerUtil.PROJECT_ROOT_PATH; | ||
|
|
||
| public class JobRestoreIT extends SeaTunnelContainer { | ||
|
|
||
| @Override | ||
| @BeforeAll | ||
| public void startUp() throws Exception { | ||
| this.server = | ||
| createSeaTunnelContainerWithFakeSourceAndInMemorySink( | ||
| PROJECT_ROOT_PATH | ||
| + "/seatunnel-e2e/seatunnel-engine-e2e/connector-seatunnel-e2e-base/src/test/resources/seatunnel_job_restore_apply_resources.yaml"); | ||
| } | ||
|
|
||
| /** When testing job recovery, is it successful to reapply for resources */ | ||
| @Test | ||
| public void testJobRestoreApplyResources() throws IOException, InterruptedException { | ||
| Container.ExecResult execResult = | ||
| executeJob(server, "/restore-job/restore_job_apply_resources.conf"); | ||
| Assertions.assertEquals(1, execResult.getExitCode()); | ||
| Assertions.assertFalse(server.getLogs().contains("NoEnoughResourceException")); | ||
| } | ||
| } |
84 changes: 84 additions & 0 deletions
84
...nector-seatunnel-e2e-base/src/test/resources/restore-job/restore_job_apply_resources.conf
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,84 @@ | ||
| # | ||
| # Licensed to the Apache Software Foundation (ASF) under one or more | ||
| # contributor license agreements. See the NOTICE file distributed with | ||
| # this work for additional information regarding copyright ownership. | ||
| # The ASF licenses this file to You under the Apache License, Version 2.0 | ||
| # (the "License"); you may not use this file except in compliance with | ||
| # the License. You may obtain a copy of the License at | ||
| # | ||
| # http://www.apache.org/licenses/LICENSE-2.0 | ||
| # | ||
| # Unless required by applicable law or agreed to in writing, software | ||
| # distributed under the License is distributed on an "AS IS" BASIS, | ||
| # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| # See the License for the specific language governing permissions and | ||
| # limitations under the License. | ||
| # | ||
| ###### | ||
| ###### This config file is a demonstration of streaming processing in seatunnel config | ||
| ###### | ||
|
|
||
| env { | ||
| parallelism = 1 | ||
| job.mode = "BATCH" | ||
| checkpoint.interval = 5000 | ||
| job.retry.times = 1 | ||
| } | ||
|
|
||
| source { | ||
| # This is a example source plugin **only for test and demonstrate the feature source plugin** | ||
| FakeSource { | ||
| result_table_name = "fake1" | ||
| row.num = 10 | ||
| split.num = 1 | ||
| schema = { | ||
| fields { | ||
| name = "string" | ||
| age = "int" | ||
| } | ||
| } | ||
| parallelism = 1 | ||
| } | ||
| FakeSource { | ||
| result_table_name = "fake2" | ||
| row.num = 10 | ||
| split.num = 1 | ||
| schema = { | ||
| fields { | ||
| name = "string" | ||
| age = "int" | ||
| } | ||
| } | ||
| parallelism = 1 | ||
| } | ||
| FakeSource { | ||
| result_table_name = "fake3" | ||
| row.num = 10 | ||
| split.num = 1 | ||
| schema = { | ||
| fields { | ||
| name = "string" | ||
| age = "int" | ||
| } | ||
| } | ||
| parallelism = 1 | ||
| } | ||
| } | ||
|
|
||
| transform { | ||
| } | ||
|
|
||
| sink { | ||
| InMemory { | ||
| source_table_name="fake1" | ||
| throw_exception=true | ||
| } | ||
| InMemory { | ||
| source_table_name="fake2" | ||
| throw_exception=true | ||
| } | ||
| InMemory { | ||
| source_table_name="fake3" | ||
| throw_exception=true | ||
| } | ||
| } |
34 changes: 34 additions & 0 deletions
34
...onnector-seatunnel-e2e-base/src/test/resources/seatunnel_job_restore_apply_resources.yaml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,34 @@ | ||
| # | ||
| # Licensed to the Apache Software Foundation (ASF) under one or more | ||
| # contributor license agreements. See the NOTICE file distributed with | ||
| # this work for additional information regarding copyright ownership. | ||
| # The ASF licenses this file to You under the Apache License, Version 2.0 | ||
| # (the "License"); you may not use this file except in compliance with | ||
| # the License. You may obtain a copy of the License at | ||
| # | ||
| # http://www.apache.org/licenses/LICENSE-2.0 | ||
| # | ||
| # Unless required by applicable law or agreed to in writing, software | ||
| # distributed under the License is distributed on an "AS IS" BASIS, | ||
| # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| # See the License for the specific language governing permissions and | ||
| # limitations under the License. | ||
| # | ||
|
|
||
| seatunnel: | ||
| engine: | ||
| history-job-expire-minutes: 1 | ||
| backup-count: 2 | ||
| queue-type: blockingqueue | ||
| print-execution-info-interval: 10 | ||
| slot-service: | ||
| dynamic-slot: false | ||
| slot-num: 9 | ||
| checkpoint: | ||
| interval: 300000 | ||
| timeout: 100000 | ||
| storage: | ||
| type: localfile | ||
| max-retained: 3 | ||
| plugin-config: | ||
| namespace: /tmp/seatunnel/checkpoint_snapshot/ |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters