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

chore: bump mariadb driver to 1.2.1 to fix crash issue #6133

Merged
merged 1 commit into from
Jun 24, 2024

Conversation

ruibaby
Copy link
Member

@ruibaby ruibaby commented Jun 24, 2024

What type of PR is this?

/area core
/kind bug
/milestone 2.17.x

What this PR does / why we need it:

升级 MariaDB 的原生驱动版本至 1.2.1,以解决无法正常部署的问题。

Which issue(s) this PR fixes:

Fixes #5534

Special notes for your reviewer:

测试方式:

./gradlew clean build -x check -x test --refresh-dependencies
docker build -t halohub/halo:mariadb-fix .
services:
  halo:
    image: halohub/halo:mariadb-fix
    restart: on-failure:3
    networks:
      halo_network:
    volumes:
      - ./halo2:/root/.halo2
    ports:
      - "8090:8090"
    healthcheck:
      test: ["CMD", "curl", "-f", "http://localhost:8090/actuator/health/readiness"]
      interval: 30s
      timeout: 5s
      retries: 5
      start_period: 30s
    command:
      - --spring.r2dbc.url=r2dbc:pool:mariadb://halodb:3306/halo
      - --spring.r2dbc.username=root
      - --spring.r2dbc.password=jzm3h9t9jggo6ww
      - --spring.sql.init.platform=mariadb
      - --halo.external-url=http://localhost:8090/

  halodb:
    image: mariadb:latest
    container_name: mariadb
    restart: always
    networks:
      halo_network:
    environment:
      MYSQL_ROOT_PASSWORD: jzm3h9t9jggo6ww
      MYSQL_DATABASE: halo
    volumes:
      - ./db:/var/lib/mysql
networks:
  halo_network:
docker compose up

Does this PR introduce a user-facing change?

升级 MariaDB 的原生驱动版本至 [1.2.1](https://github.com/mariadb-corporation/mariadb-connector-r2dbc/releases/tag/1.2.1),以解决使用 MariaDB 无法正常部署的问题。

@f2c-ci-robot f2c-ci-robot bot added release-note Denotes a PR that will be considered when it comes time to generate release notes. area/core Issues or PRs related to the Halo Core labels Jun 24, 2024
@f2c-ci-robot f2c-ci-robot bot added this to the 2.17.x milestone Jun 24, 2024
@f2c-ci-robot f2c-ci-robot bot added the kind/bug Categorizes issue or PR as related to a bug. label Jun 24, 2024
@f2c-ci-robot f2c-ci-robot bot requested review from guqing and LIlGG June 24, 2024 15:59
@ruibaby ruibaby requested a review from JohnNiang June 24, 2024 15:59
Copy link
Member

@JohnNiang JohnNiang left a comment

Choose a reason for hiding this comment

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

/lgtm

@f2c-ci-robot f2c-ci-robot bot added the lgtm Indicates that a PR is ready to be merged. label Jun 24, 2024
Copy link

f2c-ci-robot bot commented Jun 24, 2024

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: JohnNiang

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@f2c-ci-robot f2c-ci-robot bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Jun 24, 2024
Copy link

codecov bot commented Jun 24, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 54.68%. Comparing base (5fdf6c0) to head (dbe0a56).
Report is 250 commits behind head on main.

Additional details and impacted files
@@             Coverage Diff              @@
##               main    #6133      +/-   ##
============================================
- Coverage     56.91%   54.68%   -2.23%     
- Complexity     3319     3427     +108     
============================================
  Files           587      629      +42     
  Lines         18968    21209    +2241     
  Branches       1401     1482      +81     
============================================
+ Hits          10795    11599     +804     
- Misses         7594     9019    +1425     
- Partials        579      591      +12     

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

@f2c-ci-robot f2c-ci-robot bot merged commit 4f63352 into halo-dev:main Jun 24, 2024
7 checks passed
@ruibaby ruibaby deleted the chore/bump-mariadb-1.2.1 branch June 24, 2024 16:26
f2c-ci-robot bot pushed a commit to halo-dev/docs that referenced this pull request Jun 25, 2024
使用 MariaDB 原生驱动无法启动的问题将在 halo-dev/halo#6133 中修复,并发布到 2.17.0,所以移除此提示。

/kind documentation

```release-note
None
```
@ruibaby ruibaby modified the milestones: 2.17.x, 2.17.0 Jun 25, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. area/core Issues or PRs related to the Halo Core kind/bug Categorizes issue or PR as related to a bug. lgtm Indicates that a PR is ready to be merged. release-note Denotes a PR that will be considered when it comes time to generate release notes.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

使用 MariaDB 有几率无法正常初始化 Halo
2 participants