Skip to content

tarantool: align source precedence with documentation#61

Merged
bigbes merged 1 commit intomasterfrom
bigbes/gh-no-fix-tarantool-order
May 7, 2026
Merged

tarantool: align source precedence with documentation#61
bigbes merged 1 commit intomasterfrom
bigbes/gh-no-fix-tarantool-order

Conversation

@bigbes
Copy link
Copy Markdown
Collaborator

@bigbes bigbes commented May 6, 2026

The Tarantool builder docs state precedence (highest → lowest) as TT_* env vars, local YAML file, centralized storage, TT_*_DEFAULT env vars, but buildInner was adding the storage collector after the file collector — and since AddCollector is last-wins, that gave centralized storage higher priority than the local file, silently overriding file values from storage.

Reorganize buildInner so sources are listed top-down in the documented precedence order (env > file/dir > storage > env-default) and appended to the inner builder in reverse. Behavior now matches the docs: the local YAML file overrides centralized storage, with storage filling in keys absent from the file.

The previous TestBuild_StorageOverridesFile was asserting the doc-mismatching behavior; renamed to TestBuild_FileOverridesStorage and flipped its assertions.

The buildInner ordering added centralized storage after the local YAML
file collector, giving storage higher priority than the file. This
contradicts the documented precedence (file > storage) and silently
overrode local-file values with values from centralized storage.

- Build the source list top-down in documented precedence order
  (TT_* > file/dir > storage > TT_*_DEFAULT) and add to the inner
  builder in reverse, since AddCollector treats later additions as
  higher priority.
- Rename TestBuild_StorageOverridesFile to TestBuild_FileOverridesStorage
  and update assertions to match the documented behavior.
@bigbes bigbes force-pushed the bigbes/gh-no-fix-tarantool-order branch from 5012b6e to f620bc2 Compare May 6, 2026 20:35
@bigbes bigbes requested review from patapenka-alexey and sssciel May 6, 2026 20:37
@coveralls
Copy link
Copy Markdown

Coverage Report for CI Build 25459643976

Coverage increased (+0.04%) to 85.423%

Details

  • Coverage increased (+0.04%) from the base build.
  • Patch coverage: 23 of 23 lines across 1 file are fully covered (100%).
  • No coverage regressions found.

Uncovered Changes

No uncovered changes found.

Coverage Regressions

No coverage regressions found.


Coverage Stats

Coverage Status
Relevant Lines: 3917
Covered Lines: 3346
Line Coverage: 85.42%
Coverage Strength: 110.69 hits per line

💛 - Coveralls

@bigbes bigbes merged commit db37c86 into master May 7, 2026
14 checks passed
@bigbes bigbes deleted the bigbes/gh-no-fix-tarantool-order branch May 7, 2026 09:34
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.

4 participants