[Improvement][Monitor] Show master && worker Busy Or Normal Status and Show Commands table list#15978
Merged
qingwli merged 29 commits intoapache:devfrom May 15, 2024
Merged
[Improvement][Monitor] Show master && worker Busy Or Normal Status and Show Commands table list#15978qingwli merged 29 commits intoapache:devfrom
qingwli merged 29 commits intoapache:devfrom
Conversation
add monitor enhance ui
# Conflicts: # dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/mapper/CommandMapper.java
…cheduler into monitor-enhance
Member
Author
OK, Will update later |
Codecov ReportAttention: Patch coverage is
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. |
…cheduler into monitor-enhance
Member
Author
|
@SbloodyS Done |
Member
|
Since this is compatible with 3.2.1, so I change the milestone to 3.2.2. |
rickchengx
reviewed
May 11, 2024
dolphinscheduler-dao/src/main/resources/sql/dolphinscheduler_h2.sql
Outdated
Show resolved
Hide resolved
…cheduler into monitor-enhance
ruanwenjun
requested changes
May 12, 2024
...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
…/api/controller/DataAnalysisController.java Co-authored-by: Wenjun Ruan <wenjun@apache.org>
…/api/controller/DataAnalysisController.java Co-authored-by: Wenjun Ruan <wenjun@apache.org>
…/dao/mapper/ErrorCommandMapper.java Co-authored-by: Wenjun Ruan <wenjun@apache.org>
…duler/dao/mapper/ErrorCommandMapper.xml Co-authored-by: Wenjun Ruan <wenjun@apache.org>
…/dao/mapper/CommandMapper.java Co-authored-by: Wenjun Ruan <wenjun@apache.org>
…duler/dao/mapper/ErrorCommandMapper.xml Co-authored-by: Wenjun Ruan <wenjun@apache.org>
ruanwenjun
approved these changes
May 14, 2024
Member
Author
|
I will add some UT later |
songjianet
approved these changes
May 15, 2024
|
SbloodyS
pushed a commit
that referenced
this pull request
May 21, 2024
…/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
…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>
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
9 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.