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 workflow instance restart failed due to duplicate key in varpool #16001

Merged
merged 3 commits into from
May 16, 2024

Conversation

ruanwenjun
Copy link
Member

@ruanwenjun ruanwenjun commented May 15, 2024

Purpose of the pull request

  • Fix workflow instance restart failed when using varpool, since duplicate key exist in varpool with (Direct: OUT, IN)
image
  • Unify the direct to OUT in varpool, since it shouldn't be IN, only OUT will localparam will be put into varpool.
  • After this PR the varpool will only exist one record for each key.

Brief change log

  • Fix the varpool merge logic will cause duplicate key in varpool.
  • Fix delete taskInstance failed due to delete log error.
  • Load the plugin when server startup, fix the load plugin log will exist in task instance log.

Verify this pull request

Verify by manual.

@ruanwenjun ruanwenjun self-assigned this May 15, 2024
@ruanwenjun ruanwenjun added 3.2.2 bug Something isn't working labels May 15, 2024
@ruanwenjun ruanwenjun added this to the 3.2.2 milestone May 15, 2024
@codecov-commenter
Copy link

codecov-commenter commented May 15, 2024

Codecov Report

Attention: Patch coverage is 52.47525% with 48 lines in your changes are missing coverage. Please review.

Project coverage is 40.58%. Comparing base (68a1906) to head (167e734).

❗ Current head 167e734 differs from pull request most recent head 05d4f3c. Consider uploading reports for the commit 05d4f3c to get more accurate results

Files Patch % Lines
...nscheduler/plugin/task/api/utils/VarPoolUtils.java 55.31% 18 Missing and 3 partials ⚠️
.../server/master/runner/WorkflowExecuteRunnable.java 60.86% 8 Missing and 1 partial ⚠️
...plugin/task/api/parameters/AbstractParameters.java 22.22% 6 Missing and 1 partial ⚠️
...uler/api/service/impl/TaskInstanceServiceImpl.java 0.00% 6 Missing ⚠️
...source/api/plugin/DataSourceProcessorProvider.java 0.00% 2 Missing ⚠️
...e/dolphinscheduler/server/master/MasterServer.java 0.00% 1 Missing ⚠️
...uler/plugin/task/api/parameters/SqlParameters.java 50.00% 1 Missing ⚠️
...e/dolphinscheduler/server/worker/WorkerServer.java 0.00% 1 Missing ⚠️
Additional details and impacted files
@@             Coverage Diff              @@
##                dev   #16001      +/-   ##
============================================
+ Coverage     40.51%   40.58%   +0.07%     
- Complexity     5198     5216      +18     
============================================
  Files          1379     1380       +1     
  Lines         46116    46056      -60     
  Branches       4931     4916      -15     
============================================
+ Hits          18682    18691       +9     
+ Misses        25505    25439      -66     
+ Partials       1929     1926       -3     

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

fuchanghai
fuchanghai previously approved these changes May 15, 2024
Copy link
Member

@fuchanghai fuchanghai left a comment

Choose a reason for hiding this comment

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

LGTM ,if CI pass

Copy link
Member

@Radeity Radeity left a comment

Choose a reason for hiding this comment

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

LGTM

Copy link
Contributor

@rickchengx rickchengx left a comment

Choose a reason for hiding this comment

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

LGTM

Copy link

sonarcloud bot commented May 16, 2024

@ruanwenjun ruanwenjun merged commit 61915a2 into apache:dev May 16, 2024
63 checks passed
@ruanwenjun ruanwenjun deleted the dev_wenjun_fixDatabaseCheck branch May 16, 2024 03:32
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants