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.

Sign up for GitHub

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

Jump to bottom

[Improvement][Monitor] Show master && worker Busy Or Normal Status and Show Commands table list #15978

Merged
merged 29 commits into from
May 15, 2024
Merged

[Improvement][Monitor] Show master && worker Busy Or Normal Status and Show Commands table list #15978

merged 29 commits into from
May 15, 2024

Conversation

qingwli
Copy link
Member

@qingwli qingwli commented May 10, 2024 •
edited by Radeity

qingwli and others added 6 commits April 23, 2024 17:11
@qingwli
update
8a0c5fe
@qingwli
test
c9a699d
@yeahhhz
add monitor enhance ui
5285f15
@qingwli
Merge pull request #6 from yeahhhz/monitor-enhance-ui
05c2882 
add monitor enhance ui
@qingwli
update
48e6573
@qingwli
Merge branch 'dev' into monitor-enhance
c443a51 
# Conflicts:
#	dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/mapper/CommandMapper.java
@github-actions github-actions bot added UI ui and front end related backend labels May 10, 2024
@SbloodyS SbloodyS added this to the 3.3.0 milestone May 10, 2024
@SbloodyS SbloodyS added improvement make more easy to user or prompt friendly 3.3.0 labels May 10, 2024
SbloodyS
SbloodyS reviewed May 10, 2024
View reviewed changes
Copy link
Member

@SbloodyS SbloodyS left a comment

Choose a reason for hiding this comment

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

Please put some pictures in the document. @qingwli

@qingwli
Copy link
Member Author

qingwli commented May 10, 2024

Please put some pictures in the document. @qingwli

OK, Will update later

@codecov-commenter
Copy link

codecov-commenter commented May 10, 2024 •
edited

Codecov Report

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

Project coverage is 40.46%. Comparing base (4f4a13d) to head (93d4f0e).

❗ Current head 93d4f0e differs from pull request most recent head c5d99b3. Consider uploading reports for the commit c5d99b3 to get more accurate results

Files Patch % Lines
...uler/api/service/impl/DataAnalysisServiceImpl.java 0.00% 33 Missing ⚠️
...heduler/api/controller/DataAnalysisController.java 0.00% 8 Missing ⚠️
...cheduler/api/service/impl/ExecutorServiceImpl.java 50.00% 1 Missing ⚠️
Additional details and impacted files 
@@             Coverage Diff              @@
##                dev   #15978      +/-   ##
============================================
- Coverage     40.51%   40.46%   -0.06%     
+ Complexity     5205     5203       -2     
============================================
  Files          1379     1379              
  Lines         46093    46116      +23     
  Branches       4924     4931       +7     
============================================
- Hits          18673    18659      -14     
- Misses        25494    25531      +37     
  Partials       1926     1926

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

@qingwli
Copy link
Member Author

qingwli commented May 10, 2024

@SbloodyS Done

ruanwenjun
ruanwenjun requested changes May 12, 2024
View reviewed changes
...ler-api/src/main/java/org/apache/dolphinscheduler/api/controller/DataAnalysisController.java Outdated Show resolved Hide resolved
...ler-api/src/main/java/org/apache/dolphinscheduler/api/controller/DataAnalysisController.java Outdated Show resolved Hide resolved
...inscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/mapper/ErrorCommandMapper.java Outdated Show resolved Hide resolved
dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/mapper/CommandMapper.java Outdated Show resolved Hide resolved
...er-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProcessDefinitionMapper.xml Outdated Show resolved Hide resolved
...heduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ErrorCommandMapper.xml Outdated Show resolved Hide resolved
...heduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ErrorCommandMapper.xml Outdated Show resolved Hide resolved
qingwli and others added 10 commits May 14, 2024 15:35
@qingwli @ruanwenjun
Update dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler…
0a055ab 
…/api/controller/DataAnalysisController.java

Co-authored-by: Wenjun Ruan <wenjun@apache.org>
@qingwli @ruanwenjun
Update dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler…
914568b 
…/api/controller/DataAnalysisController.java

Co-authored-by: Wenjun Ruan <wenjun@apache.org>
@qingwli @ruanwenjun
Update dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler…
b3fdcc5 
…/dao/mapper/ErrorCommandMapper.java

Co-authored-by: Wenjun Ruan <wenjun@apache.org>
@qingwli @ruanwenjun
Update dolphinscheduler-dao/src/main/resources/org/apache/dolphinsche…
f0b6c4a 
…duler/dao/mapper/ErrorCommandMapper.xml

Co-authored-by: Wenjun Ruan <wenjun@apache.org>
@qingwli @ruanwenjun
Update dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler…
ae87f98 
…/dao/mapper/CommandMapper.java

Co-authored-by: Wenjun Ruan <wenjun@apache.org>
@qingwli @ruanwenjun
Update dolphinscheduler-dao/src/main/resources/org/apache/dolphinsche…
665d50f 
…duler/dao/mapper/ErrorCommandMapper.xml

Co-authored-by: Wenjun Ruan <wenjun@apache.org>
@qingwli
Merge branch 'dev' into monitor-enhance
e442b64
@qingwli
update
68d7e9a
@qingwli
fix spotless
f76a8e9
@qingwli
update
30a5284
ruanwenjun
ruanwenjun approved these changes May 14, 2024
View reviewed changes
Copy link
Member

@ruanwenjun ruanwenjun left a comment •
edited

Choose a reason for hiding this comment

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

Basically LGTM, it would be better if you can add UT.

caishunfeng
caishunfeng approved these changes May 15, 2024
View reviewed changes
Copy link
Contributor

@caishunfeng caishunfeng left a comment

Choose a reason for hiding this comment

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

LGTM 👍

rickchengx
rickchengx approved these changes May 15, 2024
View reviewed changes
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

@qingwli
Copy link
Member Author

qingwli commented May 15, 2024

I will add some UT later

@sonarcloud SonarCloud
Copy link

sonarcloud bot commented May 15, 2024

Quality Gate Failed Quality Gate failed

Failed conditions
5.1% Coverage on New Code (required ≥ 60%)
B Reliability Rating on New Code (required ≥ A)

See analysis details on SonarCloud

Catch issues before they fail your Quality Gate with our IDE extension SonarLint

@qingwli qingwli merged commit 0e5cb66 into apache:dev May 15, 2024
61 of 63 checks passed
@qingwli qingwli deleted the monitor-enhance branch May 15, 2024 05:59
@qingwli qingwli mentioned this pull request May 15, 2024
Merged
sdhzwc pushed a commit to sdhzwc/dolphinscheduler that referenced this pull request May 16, 2024
@qingwli @ruanwenjun @sdhzwc
[Improvement][Monitor] Show master && worker Busy Or Normal Status an…
8d2220b 
…d Show Commands table list (apache#15978)

* update

* test

* add monitor enhance ui

* update

* update

* update doc

* fix spotless

* update

* update

* Update dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/controller/DataAnalysisController.java

Co-authored-by: Wenjun Ruan <wenjun@apache.org>

* Update dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/controller/DataAnalysisController.java

Co-authored-by: Wenjun Ruan <wenjun@apache.org>

* Update dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/mapper/ErrorCommandMapper.java

Co-authored-by: Wenjun Ruan <wenjun@apache.org>

* Update dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ErrorCommandMapper.xml

Co-authored-by: Wenjun Ruan <wenjun@apache.org>

* Update dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/mapper/CommandMapper.java

Co-authored-by: Wenjun Ruan <wenjun@apache.org>

* Update dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ErrorCommandMapper.xml

Co-authored-by: Wenjun Ruan <wenjun@apache.org>

* update

* fix spotless

* update

---------

Co-authored-by: Wenjun Ruan <wenjun@apache.org>
SbloodyS pushed a commit that referenced this pull request May 21, 2024
@sdhzwc
[DSIP-39][parameter] Improvement startup parameters/global parameters…
0fc2fe9 
…/project parameters data type (#15967)

* [Improvement][parameter] New data types and type filtering

* [Improvement][parameter] Improvement startup parameters/global parameters data type

* fix api interfaces compatible

* add project parameter data type default value

* [Improvement][parameter] New data types and type filtering

* [Improvement][parameter] Improvement startup parameters/global parameters data type

* fix api interfaces compatible

* add project parameter data type default value

* improvement project code

* remove useless imports

* remove method onClearSearchTaskType

* add parameter doc

* optimisation logic

* code conflict resolution

* code conflict resolution

* [Improvement][Monitor] Show master && worker Busy Or Normal Status and Show Commands table list (#15978)

* update

* test

* add monitor enhance ui

* update

* update

* update doc

* fix spotless

* update

* update

* Update dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/controller/DataAnalysisController.java

Co-authored-by: Wenjun Ruan <wenjun@apache.org>

* Update dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/controller/DataAnalysisController.java

Co-authored-by: Wenjun Ruan <wenjun@apache.org>

* Update dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/mapper/ErrorCommandMapper.java

Co-authored-by: Wenjun Ruan <wenjun@apache.org>

* Update dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ErrorCommandMapper.xml

Co-authored-by: Wenjun Ruan <wenjun@apache.org>

* Update dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/mapper/CommandMapper.java

Co-authored-by: Wenjun Ruan <wenjun@apache.org>

* Update dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ErrorCommandMapper.xml

Co-authored-by: Wenjun Ruan <wenjun@apache.org>

* update

* fix spotless

* update

---------

Co-authored-by: Wenjun Ruan <wenjun@apache.org>

* [Improvement][Monitor] Add UT for montor (#15998)

* formatting Code
wangxj3 added a commit that referenced this pull request May 25, 2024
@wangxj3 @ruanwenjun
@rickchengx @EricGao888 @TianXinCoord @sdhzwc @alei1206 @SbloodyS @yinxiaolog @Radeity
3.2.2 release cherry-pick cp: Reduce the size of tarball to continue …
646bbf4 
…ASF release (#16042)

* add version of 3.2.2

* Fix rpc channel leak due to concurrent operation (#16021)

* Fix rpc channel leak due to concurrent operation

* Throw channel create failed exception

---------

Co-authored-by: Rick Cheng <rickchengx@gmail.com>

* Fix WorkerTaskExecutorThreadPool#isOverload is incorrect (#16027)

* cp: Reduce the size of tarball to continue ASF release (#15004) (#15540)

* Reduce the size of tarball to continue ASF release

for more detail you can see https://lists.apache.org/thread/rmp7fghlj0n7h9y2v3p8gkw9f9qbo6qt
# Conflicts:
#	tools/dependencies/known-dependencies.txt

* Increase block-until-connected in ZookeeperRegistryTestCase (#16041)

* [Fix][CI] fix the ci error of Values.datasource.profile (#16031)

Co-authored-by: Eric Gao <ericgao.apache@gmail.com>

* Correction of Typos in the Chinese Document Appendix for Task Parameters (#16033)

Co-authored-by: Rick Cheng <rickchengx@gmail.com>

* [DSIP-39][parameter] Improvement startup parameters/global parameters/project parameters data type (#15967)

* [Improvement][parameter] New data types and type filtering

* [Improvement][parameter] Improvement startup parameters/global parameters data type

* fix api interfaces compatible

* add project parameter data type default value

* [Improvement][parameter] New data types and type filtering

* [Improvement][parameter] Improvement startup parameters/global parameters data type

* fix api interfaces compatible

* add project parameter data type default value

* improvement project code

* remove useless imports

* remove method onClearSearchTaskType

* add parameter doc

* optimisation logic

* code conflict resolution

* code conflict resolution

* [Improvement][Monitor] Show master && worker Busy Or Normal Status and Show Commands table list (#15978)

* update

* test

* add monitor enhance ui

* update

* update

* update doc

* fix spotless

* update

* update

* Update dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/controller/DataAnalysisController.java

Co-authored-by: Wenjun Ruan <wenjun@apache.org>

* Update dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/controller/DataAnalysisController.java

Co-authored-by: Wenjun Ruan <wenjun@apache.org>

* Update dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/mapper/ErrorCommandMapper.java

Co-authored-by: Wenjun Ruan <wenjun@apache.org>

* Update dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ErrorCommandMapper.xml

Co-authored-by: Wenjun Ruan <wenjun@apache.org>

* Update dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/mapper/CommandMapper.java

Co-authored-by: Wenjun Ruan <wenjun@apache.org>

* Update dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ErrorCommandMapper.xml

Co-authored-by: Wenjun Ruan <wenjun@apache.org>

* update

* fix spotless

* update

---------

Co-authored-by: Wenjun Ruan <wenjun@apache.org>

* [Improvement][Monitor] Add UT for montor (#15998)

* formatting Code

* add pom

* Fix NettyRemotingClient might throw IllegalMonitorStateException (#16038)

* Removed unused StateEventHandleFailure (#16052)

* Remove OmitStackTraceInFastThrow in start.sh (#16054)

* Update Chart.yaml Rollback APPversion

* modify log msg (#16062)

Co-authored-by: xiangzihao <460888207@qq.com>

* [DS-16046][fix] Set PreparedStatement parameter type (#16050)

Fix the PreparedStatement parameter is TIME, set it to java.sql.Time

Co-authored-by: Aaron Wang <wangweirao16@gmail.com>
Co-authored-by: Rick Cheng <rickchengx@gmail.com>

* Update pom.xml

* [DSIP-42] Add dolphinscheduler-aws-authentication module  (#16043)

---------

Co-authored-by: wangxj <wangxj31>
Co-authored-by: Wenjun Ruan <wenjun@apache.org>
Co-authored-by: Rick Cheng <rickchengx@gmail.com>
Co-authored-by: Eric Gao <ericgao.apache@gmail.com>
Co-authored-by: TianXinCoord <tianxincoord@163.com>
Co-authored-by: 小可耐 <46134044+sdhzwc@users.noreply.github.com>
Co-authored-by: sleo <97011595+alei1206@users.noreply.github.com>
Co-authored-by: xiangzihao <460888207@qq.com>
Co-authored-by: yinxiaolog <43245392+yinxiaolog@users.noreply.github.com>
Co-authored-by: Aaron Wang <wangweirao16@gmail.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@SbloodyS SbloodyS SbloodyS left review comments

@caishunfeng caishunfeng caishunfeng approved these changes

@songjianet songjianet songjianet approved these changes

@ruanwenjun ruanwenjun ruanwenjun approved these changes

@rickchengx rickchengx rickchengx approved these changes

@Amy0104 Amy0104 Awaiting requested review from Amy0104 Amy0104 is a code owner

@EricGao888 EricGao888 Awaiting requested review from EricGao888 EricGao888 is a code owner

Assignees

@qingwli qingwli

Labels
3.2.2 backend document improvement make more easy to user or prompt friendly priority:middle ready-to-merge UI ui and front end related
Projects
None yet
Milestone
3.2.2
Development

Successfully merging this pull request may close these issues.

[Improvement][Monitor] Show master && worker Busy Or Normal Status and Show Commands table list
8 participants
@qingwli @codecov-commenter @ruanwenjun @caishunfeng @SbloodyS @songjianet @rickchengx @yeahhhz