Fix sofaruntime manager destroy whitout shutdown #1324
Conversation
WalkthroughThe recent changes enhance the shutdown process of Changes
Thank you for using CodeRabbit. We offer it for free to the OSS community and would appreciate your support in helping us grow. If you find it useful, would you consider giving us a shout-out on your favorite social media? TipsChatThere are 3 ways to chat with CodeRabbit:
Note: Be mindful of the bot's finite context window. It's strongly recommended to break down tasks such as reading entire modules into smaller chunks. For a focused discussion, use review comments to chat about specific files and their changes, instead of using the PR comments. CodeRabbit Commands (invoked as PR comments)
Additionally, you can add CodeRabbit Configration File (
|
![coderabbitai[bot]](https://avatars.githubusercontent.com/in/347564?s=60&v=4){kind=small}
There was a problem hiding this comment.
Actionable comments posted: 1
Review Details
Configuration used: CodeRabbit UI
Review profile: CHILL
Files selected for processing (2)
- sofa-boot-project/sofa-boot-core/ark-sofa-boot/src/main/java/com/alipay/sofa/boot/ark/SofaRuntimeContainer.java (1 hunks)
- sofa-boot-project/sofa-boot-core/ark-sofa-boot/src/main/java/com/alipay/sofa/boot/ark/handler/SofaBizUninstallEventHandler.java (1 hunks)
Additional comments not posted (1)
sofa-boot-project/sofa-boot-core/ark-sofa-boot/src/main/java/com/alipay/sofa/boot/ark/handler/SofaBizUninstallEventHandler.java (1)
48-49: LGTM! The addition of the null check before shutting down theSofaRuntimeManagerenhances robustness.Verification successful
The verification script successfully identified instances where
SofaRuntimeManageris checked for null before usage. The results show that the null check is present in the following files:
sofa-boot-project/sofa-boot-core/ark-sofa-boot/src/main/java/com/alipay/sofa/boot/ark/SofaRuntimeContainer.javasofa-boot-project/sofa-boot-core/ark-sofa-boot/src/main/java/com/alipay/sofa/boot/ark/handler/SofaBizUninstallEventHandler.javaThis confirms that the null check is consistently applied in the relevant parts of the codebase.
Scripts Executed
The following scripts were executed for the analysis:
Script:
#!/bin/bash # Description: Verify integration with other components interacting with `SofaRuntimeManager`. # Test: Search for other usages of `SofaRuntimeManager` to ensure they handle null cases. rg --type java $'SofaRuntimeManager' --exec cat {} | grep 'if (sofaRuntimeManager != null)'Length of output: 501
Script:
#!/bin/bash # Description: Verify integration with other components interacting with `SofaRuntimeManager`. # Test: Search for other usages of `SofaRuntimeManager` to ensure they handle null cases. rg 'SofaRuntimeManager' --type java | xargs grep 'if (sofaRuntimeManager != null)'Length of output: 38490
Script:
#!/bin/bash # Description: Verify integration with other components interacting with `SofaRuntimeManager`. # Test: Search for other usages of `SofaRuntimeManager` to ensure they handle null cases. rg 'SofaRuntimeManager' --type java --files-with-matches | xargs grep -H 'if (sofaRuntimeManager != null)'Length of output: 430
| SofaRuntimeManager sofaRuntimeManager = SOFA_RUNTIME_MANAGER_MAP.remove(contextClassLoader); | ||
| if (sofaRuntimeManager != null) { | ||
| sofaRuntimeManager.shutDownExternally(); | ||
| } |
There was a problem hiding this comment.
LGTM! Properly shutting down SofaRuntimeManager before removal is a good practice for clean resource management.
Consider adding logging before and after the shutdown process to enhance traceability and debugging.
+ logger.info("Shutting down SofaRuntimeManager for class loader: " + contextClassLoader);
sofaRuntimeManager.shutDownExternally();
+ logger.info("Shutdown complete for SofaRuntimeManager.");Committable suggestion
‼️ IMPORTANT
Carefully review the code before committing. Ensure that it accurately replaces the highlighted code, contains no missing lines, and has no issues with indentation.
| SofaRuntimeManager sofaRuntimeManager = SOFA_RUNTIME_MANAGER_MAP.remove(contextClassLoader); | |
| if (sofaRuntimeManager != null) { | |
| sofaRuntimeManager.shutDownExternally(); | |
| } | |
| SofaRuntimeManager sofaRuntimeManager = SOFA_RUNTIME_MANAGER_MAP.remove(contextClassLoader); | |
| if (sofaRuntimeManager != null) { | |
| logger.info("Shutting down SofaRuntimeManager for class loader: " + contextClassLoader); | |
| sofaRuntimeManager.shutDownExternally(); | |
| logger.info("Shutdown complete for SofaRuntimeManager."); | |
| } |
Signed-off-by: JermaineHua <crazyhzm@apache.org>
There was a problem hiding this comment.
Actionable comments posted: 0
Review Details
Configuration used: CodeRabbit UI
Review profile: CHILL
Files selected for processing (4)
- sofa-boot-project/sofa-boot-core/ark-sofa-boot/src/main/java/com/alipay/sofa/boot/ark/SofaRuntimeContainer.java (3 hunks)
- sofa-boot-project/sofa-boot-core/ark-sofa-boot/src/main/java/com/alipay/sofa/boot/ark/handler/SofaBizUninstallEventHandler.java (1 hunks)
- sofa-boot-project/sofa-boot-core/ark-sofa-boot/src/test/java/com/alipay/sofa/boot/ark/SofaRuntimeContainerTests.java (1 hunks)
- sofa-boot-project/sofa-boot-core/ark-sofa-boot/src/test/java/com/alipay/sofa/boot/ark/handler/SofaBizUninstallEventHandlerTests.java (2 hunks)
Files skipped from review due to trivial changes (1)
- sofa-boot-project/sofa-boot-core/ark-sofa-boot/src/test/java/com/alipay/sofa/boot/ark/handler/SofaBizUninstallEventHandlerTests.java
Files skipped from review as they are similar to previous changes (2)
- sofa-boot-project/sofa-boot-core/ark-sofa-boot/src/main/java/com/alipay/sofa/boot/ark/SofaRuntimeContainer.java
- sofa-boot-project/sofa-boot-core/ark-sofa-boot/src/main/java/com/alipay/sofa/boot/ark/handler/SofaBizUninstallEventHandler.java
Additional comments not posted (1)
sofa-boot-project/sofa-boot-core/ark-sofa-boot/src/test/java/com/alipay/sofa/boot/ark/SofaRuntimeContainerTests.java (1)
96-96: The updateddestroymethod now correctly accepts aClassLoaderparameter, enhancing the test's specificity and accuracy.
Codecov ReportAll modified and coverable lines are covered by tests ✅
Additional details and impacted files@@ Coverage Diff @@
## master #1324 +/- ##
============================================
+ Coverage 83.08% 83.12% +0.03%
+ Complexity 2964 2960 -4
============================================
Files 337 337
Lines 9718 9711 -7
Branches 1173 1174 +1
============================================
- Hits 8074 8072 -2
+ Misses 1133 1128 -5
Partials 511 511 ☔ View full report in Codecov by Sentry. |
@HzjNeverStop 你好，合并后可以构建下并部署到mvnrepository仓库吗，似乎现在的还是之前的 |
Signed-off-by: JermaineHua <crazyhzm@apache.org>
see #1321
Summary by CodeRabbit
SofaRuntimeManagerto ensure it is properly shut down before removal.sofaRuntimeManageris not null before shutting it down.