Skip to content

[Fix-18040][Service] Local parameters should have higher priority than upstream VarPool#18190

Open
leocook wants to merge 1 commit intoapache:devfrom
leocook:fix-18040-local-param-priority
Open

[Fix-18040][Service] Local parameters should have higher priority than upstream VarPool#18190
leocook wants to merge 1 commit intoapache:devfrom
leocook:fix-18040-local-param-priority

Conversation

@leocook
Copy link
Copy Markdown
Contributor

@leocook leocook commented Apr 24, 2026

Was this PR generated or assisted by AI?

Yes

Purpose of the pull request

close #18040

Brief change log

  • Local IN parameters now take precedence over upstream VarPool values, aligning with the documented priority "Startup > Local > Context (VarPool) > Global > Project > Built-in".
  • Added unit tests to verify Local > VarPool priority and VarPool > Global when no local param collides.

Verify this pull request

This change added tests and can be verified as follows:

  • Added testLocalParamShouldOverrideUpstreamVarPool in CuringParamsServiceImplTest to verify local param wins over upstream VarPool.
  • Added testVarPoolShouldOverrideGlobalWhenNoLocal as a regression guard.

Pull Request Notice

Pull Request Notice

If your pull request contains incompatible change, you should also add it to docs/docs/en/guide/upgrade/incompatible.md

@SbloodyS SbloodyS added the bug Something isn't working label Apr 24, 2026
@SbloodyS SbloodyS added this to the 3.4.2 milestone Apr 24, 2026
@leocook leocook force-pushed the fix-18040-local-param-priority branch from 5d49f0c to d945d5e Compare April 25, 2026 00:54
…n upstream VarPool

- Local IN parameters now take precedence over upstream VarPool values, aligning with the documented priority "Startup > Local > Context (VarPool) > Global > Project > Built-in".
- Added unit tests to verify Local > VarPool priority and VarPool > Global when no local param collides.
- Fixed timezone-dependent test that was hardcoding UTC timestamps on UTC+8 machines.
@leocook leocook force-pushed the fix-18040-local-param-priority branch from d945d5e to a9c9fce Compare April 25, 2026 00:56
@leocook
Copy link
Copy Markdown
Contributor Author

leocook commented Apr 25, 2026

Summary of Changes

Fixed the CI pipeline failures by resolving a timezone-dependent test issue:

What was fixed

  1. Timezone-dependent test failure: testPreBuildBusinessParams_withScheduleTime() was hardcoding UTC timestamps and failing on UTC+8 machines. Switched to a timezone-agnostic approach.
  2. Commit history: Consolidated two commits into a single logical commit for cleaner history.
  3. Cleanup: Removed temporary build artifacts (.zcf/, tmp.txt) from git tracking.

Verification completed locally

  • ✅ Unit tests: 21/21 passed
  • ✅ Code format: Spotless checks passed
  • ✅ Backend build: SUCCESS
  • ✅ Pre-commit hooks: All critical checks passed

Ready for CI re-run

All local validations have passed. The CI pipeline should now complete successfully. The original flake8 failures were unrelated to this PR (Python style check on non-Python files in the project).

@ruanwenjun ruanwenjun added the discussion discussion label Apr 25, 2026
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

backend bug Something isn't working discussion discussion test

Projects

None yet

Development

Successfully merging this pull request may close these issues.

[Bug] [Worker] Local parameters have lower priority than parameters passed from upstream tasks.

3 participants