Skip to content

[DS-6483][MasterServer] upgrade the druid and mysql connector version#6484

Merged
lenboo merged 3 commits intoapache:devfrom
caishunfeng:druid_opt
Oct 10, 2021
Merged

[DS-6483][MasterServer] upgrade the druid and mysql connector version#6484
lenboo merged 3 commits intoapache:devfrom
caishunfeng:druid_opt

Conversation

@caishunfeng
Copy link
Copy Markdown
Contributor

this pr close #6483

Purpose of the pull request

Brief change log

Verify this pull request

This pull request is code cleanup without any test coverage.

(or)

This pull request is already covered by existing tests, such as (please describe tests).

(or)

This change added tests and can be verified as follows:

@codecov-commenter
Copy link
Copy Markdown

codecov-commenter commented Oct 10, 2021

Codecov Report

Merging #6484 (9dbe797) into dev (7459ee2) will not change coverage.
The diff coverage is 100.00%.

Impacted file tree graph

@@            Coverage Diff            @@
##                dev    #6484   +/-   ##
=========================================
  Coverage     38.64%   38.64%           
  Complexity     3206     3206           
=========================================
  Files           645      645           
  Lines         25729    25729           
  Branches       2786     2786           
=========================================
  Hits           9942     9942           
  Misses        14870    14870           
  Partials        917      917           
Impacted Files Coverage Δ
...eduler/dao/datasource/SpringConnectionFactory.java 100.00% <100.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 7459ee2...9dbe797. Read the comment docs.

@zhongjiajie
Copy link
Copy Markdown
Member

Good job!

zhongjiajie
zhongjiajie previously approved these changes Oct 10, 2021
druidDataSource.setTestWhileIdle(PropertyUtils.getBoolean(Constants.SPRING_DATASOURCE_TEST_WHILE_IDLE, true));
druidDataSource.setTestOnBorrow(PropertyUtils.getBoolean(Constants.SPRING_DATASOURCE_TEST_ON_BORROW, true));
druidDataSource.setTestOnReturn(PropertyUtils.getBoolean(Constants.SPRING_DATASOURCE_TEST_ON_RETURN, true));
druidDataSource.setTestOnReturn(PropertyUtils.getBoolean(Constants.SPRING_DATASOURCE_TEST_ON_RETURN, false));
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Should we add comment to desc why we have to set it to fasle?

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

you can see the druid config and comment at datasource.properties.

mybatis-plus-core-3.2.0.jar
mybatis-plus-extension-3.2.0.jar
mybatis-spring-2.0.2.jar
mysql-connector-java-8.0.24.jar
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

don't need to add this dependency.

druid's some licenses not add.

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

ok, I will fix it.

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

This should not be added, it's GPL license.

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

yup, his dependency scope tests. so we don't need to add it

<mybatis.spring.version>2.0.1</mybatis.spring.version>
<cron.utils.version>5.0.5</cron.utils.version>
<druid.version>1.1.22</druid.version>
<druid.version>1.2.4</druid.version>
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

The compatibility of the druid version and the sql driver version should be noted

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

This problem may need to be reflected in the document

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

ok, I will change related document if this pr is merged.

@sonarqubecloud
Copy link
Copy Markdown

Kudos, SonarCloud Quality Gate passed!    Quality Gate passed

Bug A 0 Bugs
Vulnerability A 0 Vulnerabilities
Security Hotspot A 0 Security Hotspots
Code Smell A 0 Code Smells

100.0% 100.0% Coverage
0.0% 0.0% Duplication

@CalvinKirs
Copy link
Copy Markdown
Member

I will fix the missing Notice issue.

Copy link
Copy Markdown
Contributor

@lenboo lenboo left a comment

Choose a reason for hiding this comment

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

+1

@lenboo lenboo merged commit c8ee2df into apache:dev Oct 10, 2021
lenboo pushed a commit that referenced this pull request Oct 11, 2021
…onnector version (#6494)

* [DS-6483][MasterServer] upgrade the druid and mysql connector version (#6484)

* [DS-6483][MasterServer] upgrade the druid and mysql connector version

* remove mysql connector in known-dependencies.txt

* change mysql connector version to 8.0.16

Co-authored-by: caishunfeng <534328519@qq.com>

* Add Alibaba Druid to NOTICE file (#6488)

Co-authored-by: wind <caishunfeng@users.noreply.github.com>
Co-authored-by: caishunfeng <534328519@qq.com>
@caishunfeng caishunfeng deleted the druid_opt branch October 12, 2021 06:23
zhongjiajie added a commit to zhongjiajie/dolphinscheduler-website that referenced this pull request Oct 13, 2021
@lenboo lenboo added this to the 2.0-prepare milestone Oct 14, 2021
zhongjiajie added a commit to zhongjiajie/dolphinscheduler-website that referenced this pull request Oct 14, 2021
lenboo pushed a commit to apache/dolphinscheduler-website that referenced this pull request Oct 16, 2021
* Copy doc from 1.3.8 to dev

* Change dev default page to quick start

* Sperate User Munal to multiple file

* Combine doc page parameter and parameters-intro

* Move flink call and open api to user_guide

* Rename directory user_guide to guide

* Upgrade mysql connector to 8.0.16

ref: apache/dolphinscheduler#6484

* Add sub directory install for `user_doc/guide`

* Add directory architecture

* Add directory for integration

* Fix quick start link

* Fix en-us install link

* Sperate datasource to multiple files

* Remove TODO marked

* Change TOD order and name

* Union globalParam and param to directory parameter

* Delete file parameter

* Add task conditions

* Correct task conditions keyword `Conditions`

* Add task Pigeon doc
davidzollo pushed a commit to davidzollo/dolphinscheduler-website that referenced this pull request Dec 17, 2021
* Copy doc from 1.3.8 to dev

* Change dev default page to quick start

* Sperate User Munal to multiple file

* Combine doc page parameter and parameters-intro

* Move flink call and open api to user_guide

* Rename directory user_guide to guide

* Upgrade mysql connector to 8.0.16

ref: apache/dolphinscheduler#6484

* Add sub directory install for `user_doc/guide`

* Add directory architecture

* Add directory for integration

* Fix quick start link

* Fix en-us install link

* Sperate datasource to multiple files

* Remove TODO marked

* Change TOD order and name

* Union globalParam and param to directory parameter

* Delete file parameter

* Add task conditions

* Correct task conditions keyword `Conditions`

* Add task Pigeon doc
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] [MasterServer] With MySQL 8.0, Druid make thread blocked to wait lock when load class

6 participants