Skip to content
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.

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

Fix the problem that plugins without jar file may not be deleted #6334

Merged
merged 1 commit into from
Jul 24, 2024

Conversation

JohnNiang
Copy link
Member

What type of PR is this?

/kind bug
/area core
/area plugin
/milestone 2.18.x

What this PR does / why we need it:

This PR checks if the plugin is already unloaded while getting dependents to fix the problem that plugins without jar file may not be deleted or not be enabled or disabled.

Which issue(s) this PR fixes:

Fixes #6072

Special notes for your reviewer:

  1. Try to move plugins folder to another folder
  2. Restart Halo
  3. Try to change state of plugins or delete plugins directly
  4. See the result

Does this PR introduce a user-facing change?

修复在没有插件文件的情况下可能无法删除插件的问题

…eted

Signed-off-by: JohnNiang <johnniang@foxmail.com>
@f2c-ci-robot f2c-ci-robot bot added release-note Denotes a PR that will be considered when it comes time to generate release notes. kind/bug Categorizes issue or PR as related to a bug. labels Jul 16, 2024
@f2c-ci-robot f2c-ci-robot bot added this to the 2.18.x milestone Jul 16, 2024
@f2c-ci-robot f2c-ci-robot bot requested a review from LIlGG July 16, 2024 07:45
@f2c-ci-robot f2c-ci-robot bot added the area/core Issues or PRs related to the Halo Core label Jul 16, 2024
@f2c-ci-robot f2c-ci-robot bot requested a review from ruibaby July 16, 2024 07:45
@f2c-ci-robot f2c-ci-robot bot added the area/plugin Issues or PRs related to the Plugin Provider label Jul 16, 2024
Copy link

codecov bot commented Jul 16, 2024

Codecov Report

Attention: Patch coverage is 90.90909% with 1 line in your changes missing coverage. Please review.

Project coverage is 58.27%. Comparing base (bc10336) to head (efacd5c).
Report is 82 commits behind head on main.

Files Patch % Lines
...in/java/run/halo/app/plugin/HaloPluginManager.java 90.90% 0 Missing and 1 partial ⚠️
Additional details and impacted files
@@             Coverage Diff              @@
##               main    #6334      +/-   ##
============================================
+ Coverage     54.51%   58.27%   +3.76%     
- Complexity     3523     3763     +240     
============================================
  Files           646      646              
  Lines         21862    21979     +117     
  Branches       1528     1545      +17     
============================================
+ Hits          11917    12809     +892     
+ Misses         9328     8550     -778     
- Partials        617      620       +3     

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@JohnNiang
Copy link
Member Author

/cherrypick release-2.17

@halo-dev-bot
Copy link
Collaborator

@JohnNiang: once the present PR merges, I will cherry-pick it on top of release-2.17 in a new PR and assign it to you.

In response to this:

/cherrypick release-2.17

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

Copy link
Member

@guqing guqing left a comment

Choose a reason for hiding this comment

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

/lgtm

@f2c-ci-robot f2c-ci-robot bot added the lgtm Indicates that a PR is ready to be merged. label Jul 24, 2024
Copy link

f2c-ci-robot bot commented Jul 24, 2024

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: guqing

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@f2c-ci-robot f2c-ci-robot bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Jul 24, 2024
@f2c-ci-robot f2c-ci-robot bot merged commit eae83ae into halo-dev:main Jul 24, 2024
7 checks passed
@halo-dev-bot
Copy link
Collaborator

@JohnNiang: #6334 failed to apply on top of branch "release-2.17":

Applying: Fix the problem that plugin may not be deleted while its jar file deleted
Using index info to reconstruct a base tree...
M	application/src/main/java/run/halo/app/plugin/HaloPluginManager.java
Falling back to patching base and 3-way merge...
Auto-merging application/src/main/java/run/halo/app/plugin/HaloPluginManager.java
CONFLICT (content): Merge conflict in application/src/main/java/run/halo/app/plugin/HaloPluginManager.java
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 Fix the problem that plugin may not be deleted while its jar file deleted
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".

In response to this:

/cherrypick release-2.17

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

@JohnNiang JohnNiang deleted the bug/delete-plugin-without-jar branch July 25, 2024 02:26
JohnNiang added a commit to JohnNiang/halo that referenced this pull request Jul 25, 2024
…o-dev#6334)

/kind bug
/area core
/area plugin
/milestone 2.18.x

This PR checks if the plugin is already unloaded while getting dependents to fix the problem that plugins without jar file may not be deleted or not be enabled or disabled.

Fixes halo-dev#6072

1. Try to move plugins folder to another folder
2. Restart Halo
3. Try to change state of plugins or delete plugins directly
4. See the result

```release-note
修复在没有插件文件的情况下可能无法删除插件的问题
```
f2c-ci-robot bot pushed a commit that referenced this pull request Jul 25, 2024
…be deleted (#6374)

This is an automated cherry-pick of #6334

/assign JohnNiang

```release-note
修复在没有插件文件的情况下可能无法删除插件的问题
```
@ruibaby ruibaby modified the milestones: 2.18.x, 2.18.0 Jul 29, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. area/core Issues or PRs related to the Halo Core area/plugin Issues or PRs related to the Plugin Provider kind/bug Categorizes issue or PR as related to a bug. lgtm Indicates that a PR is ready to be merged. release-note Denotes a PR that will be considered when it comes time to generate release notes.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

当插件的 JAR 包不存在时无法卸载插件
4 participants