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(risedev): fixes and improvements for risedev-dev running risingwave commands #17586

Merged
merged 3 commits into from
Jul 11, 2024

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?

Several fixes and improvements for risedev-dev running risingwave commands.

  • Let risingwave processes handle Ctrl-C and run shutdown logic, instead of signaling tee which kills risingwave abnormally.

  • Keep colors when checking logs in tmux windows.

  • Ignore writing to the status file if it is not present, which is normal when risedev-dev successfully finishes launching all components and the temporary status file is cleaned up.

Checklist

  • I have written necessary rustdoc comments
  • I have added necessary unit tests and integration tests
  • All checks passed in ./risedev check (or alias, ./risedev c)

Documentation

  • My PR needs documentation updates. (Please use the Release note section below to summarize the impact on users)

Release note

If this PR includes changes that directly affect users or other significant modifications relevant to the community, kindly draft a release note to provide a concise summary of these changes. Please prioritize highlighting the impact these changes will have on users.

@github-actions github-actions bot added the type/fix Bug fix label Jul 5, 2024
@@ -138,11 +138,7 @@ where
if !id.is_empty() {
self.pb.set_prefix(id.clone());
self.id = Some(id.clone());

// Remove the old status file if exists to avoid confusion.
let status_file = self.status_dir.path().join(format!("{}.status", id));
Copy link
Member Author

Choose a reason for hiding this comment

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

status_dir is a temp dir. It cannot be the identical to the one in previous run.

@BugenZhao BugenZhao requested review from shanicky and xxchan July 5, 2024 08:43
Copy link
Member

@xxchan xxchan left a comment

Choose a reason for hiding this comment

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

rubber stamp

@BugenZhao
Copy link
Member Author

BugenZhao commented Jul 5, 2024

image

Can't merge now as it essentially make ./risedev k also trigger graceful shutdown of all components thus expose some problems: if one fails to handle it, it may panic and fails CI due to the appearance of "panicked at" in the log.

Requires all tasks of #17351 to be done.

@BugenZhao BugenZhao force-pushed the bz/risedev-run-command branch from c632be0 to cf27a65 Compare July 9, 2024 04:55
@BugenZhao BugenZhao changed the base branch from main to bz/shutdown-meta-1 July 9, 2024 04:55
@BugenZhao BugenZhao force-pushed the bz/shutdown-meta-1 branch from 3d20d6b to 869dfcb Compare July 9, 2024 05:09
@BugenZhao BugenZhao force-pushed the bz/risedev-run-command branch from cf27a65 to 6c07313 Compare July 9, 2024 05:09
@BugenZhao BugenZhao force-pushed the bz/shutdown-meta-1 branch from 869dfcb to a466fce Compare July 9, 2024 09:14
@BugenZhao BugenZhao force-pushed the bz/risedev-run-command branch 2 times, most recently from 6ec81c2 to 05e2ce9 Compare July 10, 2024 05:49
@BugenZhao BugenZhao force-pushed the bz/shutdown-meta-1 branch from 955a90d to 8de79d9 Compare July 10, 2024 05:54
@BugenZhao BugenZhao force-pushed the bz/risedev-run-command branch from 05e2ce9 to 6660205 Compare July 10, 2024 05:54
Base automatically changed from bz/shutdown-meta-1 to main July 10, 2024 08:05
@BugenZhao BugenZhao enabled auto-merge July 11, 2024 09:08
@BugenZhao BugenZhao added this pull request to the merge queue Jul 11, 2024
Merged via the queue into main with commit f81ca60 Jul 11, 2024
30 of 31 checks passed
@BugenZhao BugenZhao deleted the bz/risedev-run-command branch July 11, 2024 09:46
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
type/fix Bug fix
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants