-
Notifications
You must be signed in to change notification settings - Fork 6
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Allow task interruption in groovy scripts (#129)
* add ThreadInterrupt check in groovy loops and right before execution + tests Signed-off-by: Nicolas Rol <[email protected]> * fix issues Signed-off-by: Nicolas Rol <[email protected]> * fix issues Signed-off-by: Nicolas Rol <[email protected]> * fix checkstyle issues Signed-off-by: Nicolas Rol <[email protected]> * Use Abstract test from powsybl-core Signed-off-by: Nicolas Rol <[email protected]> * modif + test on MetrixDslDataLoader Signed-off-by: Nicolas Rol <[email protected]> * fix issue Signed-off-by: Nicolas Rol <[email protected]> * Adapt to AbstractTaskInterruptionTest changes Signed-off-by: Olivier Perrin <[email protected]> * Temporary build powsybl-core 'nro/groovy_interruption' branch Signed-off-by: Olivier Perrin <[email protected]> * move addCompilationCustomizers to createCompilerConfig to be consistent with TimeSeriesDslLoader Signed-off-by: Nicolas Rol <[email protected]> --------- Signed-off-by: Nicolas Rol <[email protected]> Signed-off-by: Olivier Perrin <[email protected]> Co-authored-by: Olivier Perrin <[email protected]> (cherry picked from commit 3b93069)
- Loading branch information
Showing
7 changed files
with
222 additions
and
2 deletions.
There are no files selected for viewing
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
125 changes: 125 additions & 0 deletions
125
...ion/src/test/java/com/powsybl/metrix/integration/MetrixDslDataLoaderInterruptionTest.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,125 @@ | ||
| package com.powsybl.metrix.integration; | ||
|
|
||
| import com.google.common.jimfs.Configuration; | ||
| import com.google.common.jimfs.Jimfs; | ||
| import com.powsybl.computation.AbstractTaskInterruptionTest; | ||
| import com.powsybl.iidm.network.Network; | ||
| import com.powsybl.iidm.serde.NetworkSerDe; | ||
| import com.powsybl.metrix.mapping.DataTableStore; | ||
| import com.powsybl.metrix.mapping.MappingParameters; | ||
| import com.powsybl.metrix.mapping.TimeSeriesDslLoader; | ||
| import com.powsybl.metrix.mapping.TimeSeriesMappingConfig; | ||
| import com.powsybl.timeseries.ReadOnlyTimeSeriesStore; | ||
| import com.powsybl.timeseries.ReadOnlyTimeSeriesStoreCache; | ||
| import org.junit.jupiter.api.AfterEach; | ||
| import org.junit.jupiter.api.BeforeEach; | ||
| import org.junit.jupiter.api.Timeout; | ||
| import org.junit.jupiter.params.ParameterizedTest; | ||
| import org.junit.jupiter.params.provider.ValueSource; | ||
|
|
||
| import java.io.IOException; | ||
| import java.io.Writer; | ||
| import java.nio.charset.StandardCharsets; | ||
| import java.nio.file.FileSystem; | ||
| import java.nio.file.Files; | ||
| import java.nio.file.Path; | ||
| import java.util.Objects; | ||
|
|
||
| /** | ||
| * @author Nicolas Rol {@literal <nicolas.rol at rte-france.com>} | ||
| */ | ||
| class MetrixDslDataLoaderInterruptionTest extends AbstractTaskInterruptionTest { | ||
|
|
||
| private FileSystem fileSystem; | ||
| private Path dslFile; | ||
| private Path mappingFile; | ||
| private Network network; | ||
| private final MetrixParameters parameters = new MetrixParameters(); | ||
| private final MappingParameters mappingParameters = MappingParameters.load(); | ||
|
|
||
| @BeforeEach | ||
| public void setUp() throws Exception { | ||
| fileSystem = Jimfs.newFileSystem(Configuration.unix()); | ||
| dslFile = fileSystem.getPath("/test.dsl"); | ||
| mappingFile = fileSystem.getPath("/mapping.dsl"); | ||
| network = NetworkSerDe.read(Objects.requireNonNull(getClass().getResourceAsStream("/simpleNetwork.xml"))); | ||
|
|
||
| // Create mapping file for use in all tests | ||
| try (Writer writer = Files.newBufferedWriter(mappingFile, StandardCharsets.UTF_8)) { | ||
| writer.write(String.join(System.lineSeparator(), | ||
| "timeSeries['tsN'] = 1000", | ||
| "timeSeries['tsN_1'] = 2000", | ||
| "timeSeries['tsITAM'] = 3000", | ||
| "timeSeries['ts1'] = 100", | ||
| "timeSeries['ts2'] = 200", | ||
| "timeSeries['ts3'] = 300", | ||
| "timeSeries['ts4'] = 400", | ||
| "timeSeries['ts5'] = 500" | ||
| )); | ||
| } | ||
| } | ||
|
|
||
| @AfterEach | ||
| public void tearDown() throws Exception { | ||
| fileSystem.close(); | ||
| } | ||
|
|
||
| @ParameterizedTest | ||
| @Timeout(10) | ||
| @ValueSource(booleans = {false, true}) | ||
| void testCancelMetrixDslDataLoaderShort(boolean isDelayed) throws Exception { | ||
|
|
||
| try (Writer writer = Files.newBufferedWriter(dslFile, StandardCharsets.UTF_8)) { | ||
| writer.write(String.join(System.lineSeparator(), | ||
| "load('FVALDI11_L') {", | ||
| " preventiveSheddingPercentage 20", | ||
| "}", | ||
| "load('FVALDI11_L2') {", | ||
| " preventiveSheddingPercentage 30", | ||
| " preventiveSheddingCost 12000", | ||
| "}", | ||
| "load('FVERGE11_L') {", | ||
| " preventiveSheddingPercentage 0", | ||
| " preventiveSheddingCost 10000", | ||
| "}", | ||
| "load('FSSV.O11_L') {", | ||
| " curativeSheddingPercentage 40", | ||
| "}")); | ||
| } | ||
| ReadOnlyTimeSeriesStore store = new ReadOnlyTimeSeriesStoreCache(); | ||
| TimeSeriesMappingConfig tsConfig = new TimeSeriesDslLoader(mappingFile).load(network, mappingParameters, store, new DataTableStore(), null); | ||
| testCancelShortTask(isDelayed, () -> MetrixDslDataLoader.load(dslFile, network, parameters, store, tsConfig)); | ||
| } | ||
|
|
||
| @ParameterizedTest | ||
| @Timeout(10) | ||
| @ValueSource(booleans = {false, true}) | ||
| void testCancelMetrixDslDataLoaderLong(boolean isDelayed) throws IOException, InterruptedException { | ||
|
|
||
| try (Writer writer = Files.newBufferedWriter(dslFile, StandardCharsets.UTF_8)) { | ||
| writer.write(""" | ||
| for (int i = 0; i < 10; i++) { | ||
| sleep(500) | ||
| print(i) | ||
| } | ||
| """ + String.join(System.lineSeparator(), | ||
| "load('FVALDI11_L') {", | ||
| " preventiveSheddingPercentage 20", | ||
| "}", | ||
| "load('FVALDI11_L2') {", | ||
| " preventiveSheddingPercentage 30", | ||
| " preventiveSheddingCost 12000", | ||
| "}", | ||
| "load('FVERGE11_L') {", | ||
| " preventiveSheddingPercentage 0", | ||
| " preventiveSheddingCost 10000", | ||
| "}", | ||
| "load('FSSV.O11_L') {", | ||
| " curativeSheddingPercentage 40", | ||
| "}")); | ||
| } | ||
| ReadOnlyTimeSeriesStore store = new ReadOnlyTimeSeriesStoreCache(); | ||
| TimeSeriesMappingConfig tsConfig = new TimeSeriesDslLoader(mappingFile).load(network, mappingParameters, store, new DataTableStore(), null); | ||
| testCancelLongTask(isDelayed, () -> MetrixDslDataLoader.load(dslFile, network, parameters, store, tsConfig)); | ||
| } | ||
| } |
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
59 changes: 59 additions & 0 deletions
59
...mapping/src/test/java/com/powsybl/metrix/mapping/TimeSeriesDslLoaderInterruptionTest.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,59 @@ | ||
| package com.powsybl.metrix.mapping; | ||
|
|
||
| import com.powsybl.computation.AbstractTaskInterruptionTest; | ||
| import com.powsybl.iidm.network.Network; | ||
| import com.powsybl.timeseries.ReadOnlyTimeSeriesStore; | ||
| import com.powsybl.timeseries.ReadOnlyTimeSeriesStoreCache; | ||
| import org.junit.jupiter.api.*; | ||
| import org.junit.jupiter.params.ParameterizedTest; | ||
| import org.junit.jupiter.params.provider.ValueSource; | ||
|
|
||
| /** | ||
| * @author Nicolas Rol {@literal <nicolas.rol at rte-france.com>} | ||
| */ | ||
| @TestMethodOrder(MethodOrderer.OrderAnnotation.class) | ||
| class TimeSeriesDslLoaderInterruptionTest extends AbstractTaskInterruptionTest { | ||
|
|
||
| private final MappingParameters parameters = MappingParameters.load(); | ||
| private final Network network = MappingTestNetwork.create(); | ||
| private final ReadOnlyTimeSeriesStore store = new ReadOnlyTimeSeriesStoreCache(); | ||
|
|
||
| @ParameterizedTest | ||
| @Timeout(10) | ||
| @Order(1) | ||
| @ValueSource(booleans = {false, true}) | ||
| void testCancelTaskJava(boolean isDelayed) throws Exception { | ||
| testCancelLongTask(isDelayed, () -> { | ||
| try { | ||
| Thread.sleep(5000L); | ||
| return 0; | ||
| } catch (InterruptedException e) { | ||
| throw new RuntimeException(e); | ||
| } | ||
| }); | ||
| } | ||
|
|
||
| @ParameterizedTest | ||
| @Timeout(10) | ||
| @Order(2) | ||
| @ValueSource(booleans = {false, true}) | ||
| void testCancelTaskGroovyLong(boolean isDelayed) throws Exception { | ||
| String script = """ | ||
| for (int i = 0; i < 10; i++) { | ||
| sleep(500) | ||
| } | ||
| """; | ||
| TimeSeriesDslLoader dsl = new TimeSeriesDslLoader(script); | ||
| testCancelLongTask(isDelayed, () -> dsl.load(network, parameters, store, new DataTableStore(), null)); | ||
| } | ||
|
|
||
| @ParameterizedTest | ||
| @Timeout(10) | ||
| @Order(3) | ||
| @ValueSource(booleans = {false, true}) | ||
| void testCancelTaskGroovyShort(boolean isDelayed) throws Exception { | ||
| String script = "writeLog(\"LOG_TYPE\", \"LOG_SECTION\", \"LOG_MESSAGE\")"; | ||
| TimeSeriesDslLoader dsl = new TimeSeriesDslLoader(script); | ||
| testCancelShortTask(isDelayed, () -> dsl.load(network, parameters, store, new DataTableStore(), null)); | ||
| } | ||
| } |
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