Skip to content

Modification flush: use the same thread as for apply (bounded thread pool for large modifications) #692

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

Open
wants to merge 1 commit into
base: applytoolongtransactionmini
Choose a base branch
from
Open

Modification flush: use the same thread as for apply (bounded thread pool for large modifications) #692

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
22 changes: 14 additions & 8 deletions ...n/java/org/gridsuite/modification/server/modifications/NetworkModificationApplicator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,15 +101,18 @@ public NetworkModificationResult applyModifications(ModificationApplicationGroup
.orElse(PreloadingStrategy.NONE);

NetworkStoreListener listener = NetworkStoreListener.create(networkInfos.getNetwork(), networkInfos.getNetworkUuuid(), networkStoreService, equipmentInfosService, applicationInfosService, collectionThreshold);
ApplicationStatus groupApplicationStatus;
if (preloadingStrategy == PreloadingStrategy.ALL_COLLECTIONS_NEEDED_FOR_BUS_VIEW) {
groupApplicationStatus = largeNetworkModificationExecutionService
.supplyAsync(() -> apply(modificationInfosGroup, listener))
return largeNetworkModificationExecutionService
.supplyAsync(() -> applyAndFlush(modificationInfosGroup, listener))
.join();
} else {
groupApplicationStatus = apply(modificationInfosGroup, listener);
return applyAndFlush(modificationInfosGroup, listener);
}
}

private NetworkModificationResult applyAndFlush(ModificationApplicationGroup modificationInfosGroup,
NetworkStoreListener listener) {
ApplicationStatus groupApplicationStatus = apply(modificationInfosGroup, listener);
return flushModificationApplications(groupApplicationStatus, listener);
}

Expand Down Expand Up @@ -142,15 +145,18 @@ public NetworkModificationResult applyModifications(List<ModificationApplication
.orElse(PreloadingStrategy.NONE);

NetworkStoreListener listener = NetworkStoreListener.create(networkInfos.getNetwork(), networkInfos.getNetworkUuuid(), networkStoreService, equipmentInfosService, applicationInfosService, collectionThreshold);
List<ApplicationStatus> groupsApplicationStatuses;
if (preloadingStrategy == PreloadingStrategy.ALL_COLLECTIONS_NEEDED_FOR_BUS_VIEW) {
groupsApplicationStatuses = largeNetworkModificationExecutionService
.supplyAsync(() -> apply(modificationInfosGroups, listener))
return largeNetworkModificationExecutionService
.supplyAsync(() -> applyAndFlush(modificationInfosGroups, listener))
.join();
} else {
groupsApplicationStatuses = apply(modificationInfosGroups, listener);
return applyAndFlush(modificationInfosGroups, listener);
}
}

private NetworkModificationResult applyAndFlush(List<ModificationApplicationGroup> modificationInfosGroups,
NetworkStoreListener listener) {
List<ApplicationStatus> groupsApplicationStatuses = apply(modificationInfosGroups, listener);
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Need this variable ?

return flushModificationApplications(groupsApplicationStatuses, listener);
}

Expand Down