Skip to content

Conversation

BugenZhao
Copy link
Member

I hereby agree to the terms of the RisingWave Labs, Inc. Contributor License Agreement.

What's changed and what's your intention?

In some CI runs we find that connections cannot be shutdown in the grace period of 30s for docker stop. As a result, there's no chance for the diagnose step (#19787) to be run.

function dump_diagnose_info() {
ret=$?
if [ $ret -eq 0 ]; then
exit 0
fi
echo "^^^ +++"
echo "--- Failed to run command! Dumping diagnose info..."
if [ -f .risingwave/config/risedev-env ]; then
./risedev diagnose || true
fi
}
trap dump_diagnose_info EXIT

This PR configures shutdown timeout to 10s to leave some time, by bump sqllogictest to 0.28.3 to include risinglightdb/sqllogictest-rs#265.

Also fi x #22095 for CI image.

Checklist

  • I have written necessary rustdoc comments.
  • I have added necessary unit tests and integration tests.
  • I have added test labels as necessary.
  • I have added fuzzing tests or opened an issue to track them.
  • My PR contains breaking changes.
  • My PR changes performance-critical code, so I will run (micro) benchmarks and present the results.
  • I have checked the Release Timeline and Currently Supported Versions to determine which release branches I need to cherry-pick this PR into.

Documentation

  • My PR needs documentation updates.
Release note

Copy link
Contributor

@Copilot Copilot AI left a comment

Choose a reason for hiding this comment

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

Pull Request Overview

Update CI configuration to reduce SQL logic test shutdown timeout, adjust Dockerfile environment variable syntax, and bump related tool versions.

  • Set SLT_SHUTDOWN_TIMEOUT to 10s to allow diagnose step time after docker stop
  • Standardize ENV declarations in ci/Dockerfile and bump sqllogictest-bin to 0.28.3
  • Update CI environment image version in ci/.env

Reviewed Changes

Copilot reviewed 3 out of 3 changed files in this pull request and generated no comments.

File Description
ci/scripts/common.sh Added SLT_SHUTDOWN_TIMEOUT=10 to shorten SLT shutdown grace
ci/Dockerfile Changed ENV syntax to KEY=VALUE and bumped sqllogictest
ci/.env Updated BUILD_ENV_VERSION to the latest CI image tag

@BugenZhao BugenZhao changed the base branch from main to graphite-base/22147 June 9, 2025 08:57
@BugenZhao BugenZhao changed the base branch from graphite-base/22147 to bz/important-falcon June 9, 2025 08:57
Copy link
Member Author

BugenZhao commented Jun 9, 2025

This stack of pull requests is managed by Graphite. Learn more about stacking.

@BugenZhao BugenZhao mentioned this pull request Jun 9, 2025
8 tasks
Base automatically changed from bz/important-falcon to main June 9, 2025 13:17
@BugenZhao BugenZhao enabled auto-merge June 10, 2025 06:13
@BugenZhao BugenZhao changed the title chore(ci): configure slt shutdown timeout to 10s chore(ci):  configure slt shutdown timeout to 10s Jun 10, 2025
@BugenZhao BugenZhao added this pull request to the merge queue Jun 10, 2025
Merged via the queue into main with commit 265b8ef Jun 10, 2025
33 checks passed
@BugenZhao BugenZhao deleted the bz/academic-rat branch June 10, 2025 07:24
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants