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

fix: reboot emqx_license app for join cluster #10820

Merged
merged 2 commits into from May 29, 2023

Conversation

JimMoen
Copy link
Member

@JimMoen JimMoen commented May 25, 2023

Fixes

Summary

🤖 Generated by Copilot at ace04e8

Refactor basic_reboot_apps function to use a helper function for enterprise applications and add emqx_license to the list. This fixes the license check issue after upgrading.

PR Checklist

Please convert it to a draft if any of the following conditions are not met. Reviewers may skip over until all the items are checked:

  • Added tests for the changes
  • Changed lines covered in coverage report
  • Change log has been added to changes/{ce,ee}/(feat|perf|fix)-<PR-id>.en.md files
  • For internal contributor: there is a jira ticket to track this change
  • If there should be document changes, a PR to emqx-docs.git is sent, or a jira ticket is created to follow up
  • Schema changes are backward compatible

Checklist for CI (.github/workflows) changes

  • If changed package build workflow, pass this action (manual trigger)
  • Change log has been added to changes/ dir for user-facing artifacts update

@JimMoen JimMoen requested a review from a team as a code owner May 25, 2023 09:35
@JimMoen JimMoen force-pushed the fix-license-checker-update branch from ace04e8 to 032a0ab Compare May 25, 2023 10:25
Copy link
Member

@zmstone zmstone left a comment

Choose a reason for hiding this comment

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

this is fixed in master already but in a different way,
#10807

please mind the conflicts when merging release-50 back to master.

@JimMoen JimMoen force-pushed the fix-license-checker-update branch 2 times, most recently from 1fe6b38 to 6619192 Compare May 26, 2023 02:05
@JimMoen JimMoen changed the base branch from release-50 to master May 26, 2023 02:05
@JimMoen JimMoen force-pushed the fix-license-checker-update branch 4 times, most recently from 03f7af8 to ea4a8ba Compare May 29, 2023 02:06
@coveralls
Copy link
Collaborator

coveralls commented May 29, 2023

Pull Request Test Coverage Report for Build 5108922041

  • 3 of 4 (75.0%) changed or added relevant lines in 1 file are covered.
  • 30 unchanged lines in 12 files lost coverage.
  • Overall coverage decreased (-0.02%) to 81.637%

Changes Missing Coverage Covered Lines Changed/Added Lines %
apps/emqx_machine/src/emqx_machine_boot.erl 3 4 75.0%
Files with Coverage Reduction New Missed Lines %
apps/emqx_authn/src/enhanced_authn/emqx_enhanced_authn_scram_mnesia.erl 1 85.29%
apps/emqx_ft/src/emqx_ft_storage_exporter_fs.erl 1 80.0%
apps/emqx_gateway_mqttsn/src/emqx_mqttsn_channel.erl 1 73.18%
apps/emqx_gateway/src/emqx_gateway_schema.erl 1 88.89%
apps/emqx_resource/src/emqx_resource_buffer_worker.erl 1 93.24%
apps/emqx_s3/src/emqx_s3_uploader.erl 1 92.0%
apps/emqx/src/emqx_limiter/src/emqx_limiter_server.erl 1 89.36%
apps/emqx/src/emqx_quic_data_stream.erl 1 75.21%
apps/emqx/src/emqx_sys_mon.erl 1 90.63%
apps/emqx_ft/src/emqx_ft_storage_fs.erl 2 81.29%
Totals Coverage Status
Change from base Build 5097986976: -0.02%
Covered Lines: 28626
Relevant Lines: 35065

💛 - Coveralls

@JimMoen JimMoen force-pushed the fix-license-checker-update branch from ea4a8ba to 6f90369 Compare May 29, 2023 05:48
@JimMoen JimMoen merged commit e287cf9 into emqx:master May 29, 2023
165 of 166 checks passed
@JimMoen JimMoen deleted the fix-license-checker-update branch May 29, 2023 11:07
JimMoen added a commit to JimMoen/emqx that referenced this pull request May 29, 2023
@zmstone zmstone mentioned this pull request May 29, 2023
8 tasks
@yanzhiemq
Copy link
Collaborator

yanzhiemq commented Jun 13, 2023

Bug Fixes

  • Fixed the issue where newly added nodes in the cluster would not apply the new license after a cluster license update and would continue to use the old license.

    Sometimes the new node must start with a outdated license. e.g. use emqx-operator deployed and needed to scale up after license expired. At the time the cluster's license key already updated by API/CLI, but the new node won't use it.

@yanzhiemq
Copy link
Collaborator

yanzhiemq commented Jun 13, 2023

修复

  • 修复了集群更新 license 后,新加入的节点不会应用新 license 而是继续使用旧 license 的问题。

    有时新节点必须使用过时的 license。例如,在 license 过期后使用 emqx-operator 进行部署,并且需要扩展规模。此时,集群的 license 已经通过 API/CLI 更新,但新节点不会使用它。

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.

None yet

5 participants