fix: pre-hotreload cartridge support #341
Merged
Conversation
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
DifferentialOrange
force-pushed
the
DifferentialOrange/support-older-cartridges
branch
4 times, most recently
from
ce6c37d to
c288f08
Compare
AnaNek
approved these changes
Feb 13, 2023
test/integration/reload_test.lua
Outdated
| @@ -99,6 +102,9 @@ function g.test_router() | |||
| end | |||
|
|
|||
| function g.test_storage() | |||
| t.skip_if(pcall(require, 'cartridge.hotreload') == false, | |||
There was a problem hiding this comment.
As I can see, there is a check (pcall(require, 'cartridge.hotreload') == false) of hotreload support in several places in the code. Maybe it should be a separate function? BTW it is unlikely the realization of getting hotreload will change, but I would put
function get_cartridge_hotreload()
return pcall(require, 'cartridge.hotreload')
endin a separate function.
There was a problem hiding this comment.
That's fair, reworked
`crud` module is cartridge-independent in nature, but provides cartridge roles which are the most popular way to setup the module. The roles also not use any modern cartridge features and should work with any cartridge version. But since crud.cfg was introduced [1], it was required to add some code for roles reload [2] proper support. Now cartridge.hotreload module is unconditionally required, so roles cannot be used with cartridge older than 2.4.0. This patch fixes the behavior. 1. 6da4f56 2. tarantool/cartridge@941952e Follows #244
Before this patch, tests were marked with xfail since there was a bug in metrics module [1]. This bug is fixes in newer versions, so xfail is replaced with skip based on metrics version. 1. tarantool/metrics#334 Follows #244
DifferentialOrange
force-pushed
the
DifferentialOrange/support-older-cartridges
branch
from
c288f08 to
50865c3
Compare
Test with newer metrics and older cartridges to check previous patches.
DifferentialOrange
force-pushed
the
DifferentialOrange/support-older-cartridges
branch
from
50865c3 to
8fdd6d8
Compare
DifferentialOrange
deleted the
DifferentialOrange/support-older-cartridges
branch
DifferentialOrange
added a commit
that referenced
this pull request
Mar 13, 2023
Overview This release introduces new API to check module version in code, as well as several compatibility bugfixes. New features * Add versioning support (PR #342). Bugfixes * Fix pre-hotreload `cartridge` support (older than 2.4.0) (PR #341). * Fix Tarantool version-dependent features for 3.x (PR #344).
Merged
DifferentialOrange
added a commit
that referenced
this pull request
Mar 13, 2023
Overview This release introduces new API to check module version in code, as well as several compatibility bugfixes. New features * Add versioning support (PR #342). Bugfixes * Fix pre-hotreload `cartridge` support (older than 2.4.0) (PR #341). * Fix Tarantool version-dependent features for 3.x (PR #344).
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
This PR fixes an unreasonable version support drop introduced in #244, as well as test pipeline update. See commit messages for more info.
I didn't forget about
Closes #244