Skip to content

Fix invalidated multiroot studies blocked nodes #1007

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
Meklo merged 4 commits into from
Jun 10, 2026
Merged

Fix invalidated multiroot studies blocked nodes #1007

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
96a0ce1
Fix invalidated multiroot studies blocked nodes
Jun 10, 2026
25131b1
Make test more robust
Jun 10, 2026
339471b
Add comments
Jun 10, 2026
1b7a40b
Coderabbit suggestion
Jun 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
15 changes: 5 additions & 10 deletions src/main/java/org/gridsuite/study/server/service/StudyService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3703,16 +3703,11 @@ private List<CurrentLimitViolationInfos> getCurrentLimitViolations(UUID nodeUuid
public void invalidateStudyRootNetwork(UUID studyUuid, UUID rootNetworkUuid, String userId) {
rootNetworkService.assertIsRootNetworkInStudy(studyUuid, rootNetworkUuid);
var rootNodeUuid = networkModificationTreeService.getStudyRootNodeUuid(studyUuid);
try {
// First we unbuild all nodes
doUnbuildNodeTree(studyUuid, rootNodeUuid, true, true, userId);
// Then we erase data linked to root node on all root networks
rootNetworkService.invalidateRootNetworkRemoteInfos(List.of(rootNetworkService.getRootNetworkInfos(rootNetworkUuid)), true, false);
rootNetworkService.updateRootNetworkIndexationStatus(studyUuid, rootNetworkUuid, RootNetworkIndexationStatus.NOT_INDEXED);
} finally {
networkModificationTreeService.unblockNodeTree(rootNetworkUuid, rootNodeUuid);
}

// First we unbuild all nodes
doUnbuildNodeTree(studyUuid, rootNodeUuid, true, true, userId);
// Then we erase data linked to root node on all root networks
rootNetworkService.invalidateRootNetworkRemoteInfos(List.of(rootNetworkService.getRootNetworkInfos(rootNetworkUuid)), true, false);
rootNetworkService.updateRootNetworkIndexationStatus(studyUuid, rootNetworkUuid, RootNetworkIndexationStatus.NOT_INDEXED);
notificationService.emitRootNetworksUpdated(studyUuid);
}
}
11 changes: 8 additions & 3 deletions src/main/java/org/gridsuite/study/server/service/SupervisionService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -373,9 +373,14 @@ public void unbuildAllNodes(UUID studyUuid) {
public void invalidateStudy(UUID studyUuid) {
AtomicReference<Long> startTime = new AtomicReference<>();
startTime.set(System.nanoTime());
rootNetworkService.getStudyRootNetworkIds(studyUuid).forEach(rnId ->
studyService.invalidateStudyRootNetwork(studyUuid, rnId, SUPERVISION_USER)
);
try {
rootNetworkService.getStudyRootNetworkIds(studyUuid).forEach(rnId ->
studyService.invalidateStudyRootNetwork(studyUuid, rnId, SUPERVISION_USER)
);
} finally {
var rootNodeUuid = networkModificationTreeService.getStudyRootNodeUuid(studyUuid);
studyService.unblockNodeTree(studyUuid, rootNodeUuid);
}
notificationService.emitElementUpdated(studyUuid, SUPERVISION_USER);
LOGGER.trace("Study {} nodes builds deleted and root node invalidated in : {} milliseconds", studyUuid, TimeUnit.NANOSECONDS.toMillis(System.nanoTime() - startTime.get()));
}
Expand Down
51 changes: 44 additions & 7 deletions src/test/java/org/gridsuite/study/server/SupervisionControllerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,17 +18,15 @@
import com.powsybl.network.store.client.NetworkStoreService;
import com.powsybl.network.store.iidm.impl.NetworkFactoryImpl;
import org.elasticsearch.client.RestClient;
import org.gridsuite.study.server.dto.BasicRootNetworkInfos;
import org.gridsuite.study.server.dto.CreatedStudyBasicInfos;
import org.gridsuite.study.server.dto.RootNetworkIndexationStatus;
import org.gridsuite.study.server.dto.VoltageLevelInfos;
import org.gridsuite.study.server.dto.*;
import org.gridsuite.study.server.dto.elasticsearch.EquipmentInfos;
import org.gridsuite.study.server.dto.elasticsearch.TombstonedEquipmentInfos;
import org.gridsuite.study.server.dto.supervision.SupervisionStudyInfos;
import org.gridsuite.study.server.elasticsearch.EquipmentInfosService;
import org.gridsuite.study.server.elasticsearch.StudyInfosService;
import org.gridsuite.study.server.repository.StudyEntity;
import org.gridsuite.study.server.repository.StudyRepository;
import org.gridsuite.study.server.repository.rootnetwork.RootNetworkNodeInfoRepository;
import org.gridsuite.study.server.service.*;
import org.gridsuite.study.server.utils.TestUtils;
import org.junit.jupiter.api.AfterEach;
Expand All @@ -49,6 +47,7 @@
import java.util.Set;
import java.util.UUID;

import static org.assertj.core.api.AssertionsForInterfaceTypes.assertThat;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.ArgumentMatchers.eq;
Expand Down Expand Up @@ -78,6 +77,9 @@ class SupervisionControllerTest {
private static final UUID NETWORK_UUID = UUID.randomUUID();
private static final UUID STUDY_UUID = UUID.randomUUID();

private static final UUID SECOND_NETWORK_UUID = UUID.randomUUID();
private static final UUID SECOND_CASE_UUID = UUID.randomUUID();

@Autowired
private NetworkModificationTreeService networkModificationTreeService;

Expand Down Expand Up @@ -114,6 +116,9 @@ class SupervisionControllerTest {
@Autowired
private StudyInfosService studyInfosService;

@Autowired
private RootNetworkNodeInfoRepository rootNetworkNodeInfoRepository;

private static EquipmentInfos toEquipmentInfos(Identifiable<?> i) {
return EquipmentInfos.builder()
.networkUuid(SupervisionControllerTest.NETWORK_UUID)
Expand Down Expand Up @@ -159,6 +164,24 @@ private StudyEntity initStudy() throws Exception {
return study;
}

private void addSecondRootNetwork(UUID rootNetworkUuid, UUID networkUuid) {
rootNetworkService.insertCreationRequest(STUDY_UUID,
RootNetworkInfos.builder()
.id(rootNetworkUuid)
.name("second")
.tag("SND")
.caseInfos(new CaseInfos(SECOND_CASE_UUID, null, "secondCase", "XIIDM"))
.networkInfos(new NetworkInfos(networkUuid, "secondNetworkId"))
.build(),
"userId");
studyService.createRootNetwork(STUDY_UUID,
RootNetworkInfos.builder()
.id(rootNetworkUuid)
.networkInfos(new NetworkInfos(networkUuid, "secondNetworkId"))
.caseInfos(new CaseInfos(SECOND_CASE_UUID, null, "secondCase", "XIIDM"))
.build());
}
Comment thread
coderabbitai[bot] marked this conversation as resolved.

private void assertIndexationCount(long expectedEquipmentsIndexationCount, long expectedTombstonedEquipmentsIndexationCount) throws Exception {
MvcResult mvcResult;
// Test get indexed equipments and tombstoned equipments counts
Expand Down Expand Up @@ -315,18 +338,32 @@ void testSupervisionStudiesBasicData() throws Exception {
@Test
void testInvalidateStudy() throws Exception {
initStudy();
UUID secondRootNetworkUuid = UUID.randomUUID();
addSecondRootNetwork(secondRootNetworkUuid, SECOND_NETWORK_UUID);
when(rootNetworkService.getNetworkUuid(secondRootNetworkUuid)).thenReturn(SECOND_NETWORK_UUID);

Mockito.doNothing().when(networkStoreService).deleteNetwork(NETWORK_UUID);
Mockito.doNothing().when(networkStoreService).deleteNetwork(SECOND_NETWORK_UUID);

mockMvc.perform(delete("/v1/supervision/studies/{studyUuid}/invalidate", STUDY_UUID))
.andExpect(status().isOk());

// Remote root-network data was deleted
Mockito.verify(rootNetworkService, Mockito.times(1))
// Check that both root network underlying networks have been erased
Mockito.verify(rootNetworkService, Mockito.times(2))
.invalidateRootNetworkRemoteInfos(any(), eq(true), eq(false));
Mockito.verify(networkStoreService, Mockito.times(1)).deleteNetwork(NETWORK_UUID);
Mockito.verify(networkStoreService, Mockito.times(1)).deleteNetwork(SECOND_NETWORK_UUID);

// Indexation flipped to NOT_INDEXED so the auto-detect path will reimport on reopen
// Check that the study index data has been erased
assertIndexationStatus(STUDY_UUID, RootNetworkIndexationStatus.NOT_INDEXED.name());
assertIndexationCount(0, 0);

// Check that all nodes aren't blocked
Mockito.verify(studyService, Mockito.times(1)).unblockNodeTree(eq(STUDY_UUID), any());
List<UUID> allRootNetworkUuids = rootNetworkService.getStudyRootNetworkIds(STUDY_UUID);
assertThat(allRootNetworkUuids).hasSize(2);
allRootNetworkUuids.forEach(rootNetworkUuid ->
rootNetworkNodeInfoRepository.findAllByRootNetworkId(rootNetworkUuid)
.forEach(info -> assertThat(info.getBlockedNode()).isFalse()));
}
}
Loading