Skip to content

[Fix-#3956][Master] When running a task, the resource file is lost#3957

Merged
CalvinKirs merged 54 commits intoapache:devfrom
BoYiZhang:pr_3956
Oct 24, 2020
Merged

[Fix-#3956][Master] When running a task, the resource file is lost#3957
CalvinKirs merged 54 commits intoapache:devfrom
BoYiZhang:pr_3956

Conversation

@BoYiZhang
Copy link
Copy Markdown
Contributor

@BoYiZhang BoYiZhang commented Oct 20, 2020

When running a shell task, the resource file is lost, which results in an error
this close #3956

TaskParams
Taskparams does not have a resourcelist. When converting, the content of resourcelist will be lost

Not only shell tasks, param parameters in other task types may be overridden

The code is as follows:
VarPoolUtils#setTaskNodeLocalParams

/**
     * setTaskNodeLocalParams
     * @param taskNode taskNode
     * @param prop LocalParamName
     * @param value LocalParamValue
     */
    public static void setTaskNodeLocalParams(TaskNode taskNode, String prop, Object value) {
        String taskParamsJson = taskNode.getParams();
        TaskParams taskParams = JSONUtils.parseObject(taskParamsJson, TaskParams.class);
        if (taskParams == null) {
            return;
        }
        taskParams.setLocalParamValue(prop, value);
        taskNode.setParams(JSONUtils.toJsonString(taskParams));
    }

BoYiZhang and others added 30 commits June 30, 2020 00:11
Delete invalid field: executorcores

Modify verification prompt
Delete invalid field: executorcores

Modify verification prompt
Delete invalid field: executorcores

Modify verification prompt
dag add close buttion
modify submit workflow button
modify CLICK_ADD_BUTTON
in addition

update '- XX: largepagesizeinbytes = 128M' to '- XX: largepagesizeinbytes = 10M'
BoYiZhang and others added 22 commits July 14, 2020 08:59
in addition

update '- XX: largepagesizeinbytes = 128M' to '- XX: largepagesizeinbytes = 10M'
update code from apache
update code from apache
update code from apache
update code from apache
update code from apache
@codecov-io
Copy link
Copy Markdown

Codecov Report

Merging #3957 into dev will increase coverage by 0.10%.
The diff coverage is 80.00%.

Impacted file tree graph

@@             Coverage Diff              @@
##                dev    #3957      +/-   ##
============================================
+ Coverage     39.83%   39.94%   +0.10%     
- Complexity     2921     2931      +10     
============================================
  Files           460      459       -1     
  Lines         21826    21793      -33     
  Branches       2653     2647       -6     
============================================
+ Hits           8695     8705      +10     
+ Misses        12308    12271      -37     
+ Partials        823      817       -6     
Impacted Files Coverage Δ Complexity Δ
...he/dolphinscheduler/common/utils/VarPoolUtils.java 82.05% <80.00%> (+6.49%) 7.00 <0.00> (ø)
...e/dolphinscheduler/remote/NettyRemotingClient.java 50.00% <0.00%> (-2.78%) 9.00% <0.00%> (-2.00%)
...dolphinscheduler/remote/future/ResponseFuture.java 79.66% <0.00%> (-1.70%) 17.00% <0.00%> (-1.00%)
...eduler/server/worker/runner/TaskExecuteThread.java 55.20% <0.00%> (-0.80%) 12.00% <0.00%> (-1.00%)
...er/master/dispatch/host/assign/RandomSelector.java 83.33% <0.00%> (+5.55%) 4.00% <0.00%> (+1.00%)
...pache/dolphinscheduler/common/utils/JSONUtils.java 74.28% <0.00%> (+7.14%) 18.00% <0.00%> (ø%)
...apache/dolphinscheduler/common/model/TaskNode.java 69.76% <0.00%> (+32.55%) 39.00% <0.00%> (+23.00%)

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 4425968...aace551. Read the comment docs.

@BoYiZhang BoYiZhang changed the title [Fix-#3956][Master] When running a task, the resource file is lost, which results in an error [Fix-#3956][Master] When running a task, the resource file is lost Oct 21, 2020
@sonarqubecloud
Copy link
Copy Markdown

Kudos, SonarCloud Quality Gate passed!

Bug A 0 Bugs
Vulnerability A 0 Vulnerabilities (and Security Hotspot 0 Security Hotspots to review)
Code Smell A 0 Code Smells

81.8% 81.8% Coverage
0.0% 0.0% Duplication

Copy link
Copy Markdown
Member

@CalvinKirs CalvinKirs left a comment

Choose a reason for hiding this comment

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

+1

@CalvinKirs CalvinKirs merged commit 05b248f into apache:dev Oct 24, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

[Bug][Master] When running a task, the resource file is lost, which results in an error

6 participants