check optional computation service when sending computation status#1018
Open
EtienneLt wants to merge 13 commits into
Open
check optional computation service when sending computation status#1018EtienneLt wants to merge 13 commits into
EtienneLt wants to merge 13 commits into
Conversation
Signed-off-by: Etienne LESOT <etienne.lesot@rte-france.com>
|
No actionable comments were generated in the recent review. 🎉 ℹ️ Recent review info⚙️ Run configurationConfiguration used: Organization UI Review profile: CHILL Plan: Pro Run ID: 📒 Files selected for processing (6)
📝 WalkthroughWalkthroughChangesOptional Service Status Handling
Sequence Diagram(s)sequenceDiagram
participant Client
participant StudyService
participant RemoteServicesInspector
participant RootNetworkNodeInfoService
Client->>StudyService: getAllComputationsStatus()
StudyService->>RootNetworkNodeInfoService: resolve LOAD_FLOW status
RootNetworkNodeInfoService-->>StudyService: LOAD_FLOW status
StudyService->>RemoteServicesInspector: getRunningOptionalServices()
RemoteServicesInspector-->>StudyService: running service names
StudyService->>RootNetworkNodeInfoService: resolve matching computation statuses
RootNetworkNodeInfoService-->>StudyService: selected statuses
StudyService-->>Client: computation status map
Suggested reviewers: 🚥 Pre-merge checks | ✅ 3 | ❌ 2❌ Failed checks (1 warning, 1 inconclusive)
✅ Passed checks (3 passed)
Warning There were issues while running some tools. Please review the errors and either fix the tool's configuration or disable the tool if it's a critical failure. 🔧 ast-grep (0.44.1)src/main/java/org/gridsuite/study/server/service/StudyService.javaast-grep timed out on this file src/main/java/org/gridsuite/study/server/service/client/RemoteServiceName.javaast-grep retry budget exhausted before isolating this batch src/test/java/org/gridsuite/study/server/PccMinTest.javaast-grep retry budget exhausted before isolating this batch
Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out. Comment |
![coderabbitai[bot]](https://avatars.githubusercontent.com/in/347564?s=60&v=4){kind=small}
There was a problem hiding this comment.
Actionable comments posted: 2
🧹 Nitpick comments (2)
src/main/java/org/gridsuite/study/server/service/StudyService.java (1)
144-144: 📐 Maintainability & Code Quality | 🔵 Trivial | ⚡ Quick winDeclare
remoteServicesInspectorasfinalfor consistency.Every other constructor-injected collaborator in
StudyServiceisprivate final; this new field breaks that convention and allows accidental reassignment.♻️ Proposed fix
- private RemoteServicesInspector remoteServicesInspector; + private final RemoteServicesInspector remoteServicesInspector;Also applies to: 209-210, 248-248
🤖 Prompt for AI Agents
Verify each finding against current code. Fix only still-valid issues, skip the rest with a brief reason, keep changes minimal, and validate. In `@src/main/java/org/gridsuite/study/server/service/StudyService.java` at line 144, Declare the remoteServicesInspector field in StudyService as private final, matching the other constructor-injected collaborators, and ensure it is initialized through the constructor without reassignment.src/main/java/org/gridsuite/study/server/service/RemoteServicesInspector.java (1)
85-109: 📐 Maintainability & Code Quality | 🔵 Trivial | ⚡ Quick winDuplicate async aggregation logic between
getOptionalServices()andgetOptionalServicesAsMap().Both methods run the identical parallel health-check/join logic, differing only in the terminal collector. Simplify by having the map variant delegate to the list variant.
♻️ Proposed refactor
public Map<String, ServiceStatusInfos> getOptionalServicesAsMap() { - List<CompletableFuture<ServiceStatusInfos>> results = remoteServicesProperties.getServices().stream() - .filter(RemoteServicesProperties.Service::isOptional) - .map(service -> asyncSelf.isOptionalServiceUp(service).thenApply(isUp -> ServiceStatusInfos.builder() - .name(service.getName()) - .status(Boolean.TRUE.equals(isUp) ? ServiceStatus.UP : ServiceStatus.DOWN) - .build())) - .toList(); - CompletableFuture.allOf(results.toArray(CompletableFuture[]::new)).join(); - return results.stream().map(CompletableFuture::join).collect(Collectors.toMap(ServiceStatusInfos::name, Function.identity())); + return getOptionalServices().stream().collect(Collectors.toMap(ServiceStatusInfos::name, Function.identity())); }🤖 Prompt for AI Agents
Verify each finding against current code. Fix only still-valid issues, skip the rest with a brief reason, keep changes minimal, and validate. In `@src/main/java/org/gridsuite/study/server/service/RemoteServicesInspector.java` around lines 85 - 109, Remove the duplicated asynchronous health-check pipeline from getOptionalServicesAsMap() by delegating to getOptionalServices() and collecting its returned ServiceStatusInfos with Collectors.toMap(ServiceStatusInfos::name, Function.identity()). Preserve the existing optional-service filtering, status construction, and map key behavior through the list method.
🤖 Prompt for all review comments with AI agents
Verify each finding against current code. Fix only still-valid issues, skip the
rest with a brief reason, keep changes minimal, and validate.
Inline comments:
In `@src/main/java/org/gridsuite/study/server/service/StudyService.java`:
- Around line 3715-3720: The getAllComputationsStatus method triggers uncached
optional-service health checks on every request. Add a short-TTL cache for the
result of RemoteServicesInspector.getOptionalServicesAsMap(), ensuring
concurrent requests reuse an in-flight or recently completed lookup while
retaining refresh behavior after expiration; update getAllComputationsStatus to
use this cached path.
- Around line 3726-3728: The dynamic margin calculation status is guarded by the
wrong optional-service constant in the surrounding status-building logic. In the
`allComputationStatus` block, replace `DYNAMIC_MAPPING_SERVER` with the service
key/constant corresponding to `DYNAMIC_MARGIN_CALCULATION` when calling
`checkOptionalServiceIsUp`.
---
Nitpick comments:
In
`@src/main/java/org/gridsuite/study/server/service/RemoteServicesInspector.java`:
- Around line 85-109: Remove the duplicated asynchronous health-check pipeline
from getOptionalServicesAsMap() by delegating to getOptionalServices() and
collecting its returned ServiceStatusInfos with
Collectors.toMap(ServiceStatusInfos::name, Function.identity()). Preserve the
existing optional-service filtering, status construction, and map key behavior
through the list method.
In `@src/main/java/org/gridsuite/study/server/service/StudyService.java`:
- Line 144: Declare the remoteServicesInspector field in StudyService as private
final, matching the other constructor-injected collaborators, and ensure it is
initialized through the constructor without reassignment.
🪄 Autofix (Beta)
Fix all unresolved CodeRabbit comments on this PR:
- Push a commit to this branch (recommended)
- Create a new PR with the fixes
ℹ️ Review info
⚙️ Run configuration
Configuration used: Organization UI
Review profile: CHILL
Plan: Pro
Run ID: d27a72fe-4de4-4771-8c3b-1a3434dc6e3c
📒 Files selected for processing (4)
src/main/java/org/gridsuite/study/server/service/RemoteServicesInspector.javasrc/main/java/org/gridsuite/study/server/service/RootNetworkNodeInfoService.javasrc/main/java/org/gridsuite/study/server/service/StudyService.javasrc/main/resources/application-local.yml
Signed-off-by: Etienne LESOT <etienne.lesot@rte-france.com>
Signed-off-by: Etienne LESOT <etienne.lesot@rte-france.com>
Signed-off-by: Etienne LESOT <etienne.lesot@rte-france.com>
|
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
PR Summary