-
Notifications
You must be signed in to change notification settings - Fork 4
Parse positional server names on start #366
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
Open
sdairs
wants to merge
2
commits into
issue-353-docker-pull-progress
from
issue-357-server-start-name
+230
−11
Open
Changes from all commits
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
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
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
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
115 changes: 115 additions & 0 deletions
115
crates/clickhousectl/tests/local_server_start_args_test.rs
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,115 @@ | ||
| //! Regression coverage for server start argument parsing (issue #357). | ||
|
|
||
| use serde_json::Value; | ||
| use std::os::unix::fs::PermissionsExt; | ||
| use std::path::{Path, PathBuf}; | ||
| use std::process::{Command, Output}; | ||
| use std::time::{Duration, Instant}; | ||
|
|
||
| const DEFAULT_VERSION: &str = "25.11.1.1"; | ||
| const REQUESTED_VERSION: &str = "25.12.9.61"; | ||
|
|
||
| fn clickhousectl_binary() -> PathBuf { | ||
| PathBuf::from(env!("CARGO_BIN_EXE_clickhousectl")) | ||
| } | ||
|
|
||
| fn install_fake_clickhouse(home: &Path, version: &str) { | ||
| let binary = home | ||
| .join(".clickhouse/versions") | ||
| .join(version) | ||
| .join("clickhouse"); | ||
| std::fs::create_dir_all(binary.parent().unwrap()).expect("create fake version dir"); | ||
| std::fs::write( | ||
| &binary, | ||
| b"#!/bin/sh\nprintf '%s\\n' \"$@\" > \"$FAKE_CLICKHOUSE_ARGS_FILE\"\nexec sleep 30\n", | ||
| ) | ||
| .expect("write fake ClickHouse"); | ||
| let mut permissions = std::fs::metadata(&binary).unwrap().permissions(); | ||
| permissions.set_mode(0o755); | ||
| std::fs::set_permissions(binary, permissions).expect("make fake ClickHouse executable"); | ||
| } | ||
|
|
||
| fn run_start(project: &Path, home: &Path, args_file: &Path) -> Output { | ||
| Command::new(clickhousectl_binary()) | ||
| .env("DO_NOT_TRACK", "1") | ||
| .env("HOME", home) | ||
| .env("FAKE_CLICKHOUSE_ARGS_FILE", args_file) | ||
| .current_dir(project) | ||
| .args([ | ||
| "local", | ||
| "--json", | ||
| "server", | ||
| "start", | ||
| "--no-wait", | ||
| "existing", | ||
| "--version", | ||
| REQUESTED_VERSION, | ||
| "--", | ||
| "--logger.level=trace", | ||
| ]) | ||
| .output() | ||
| .expect("run clickhousectl") | ||
| } | ||
|
|
||
| fn read_file_eventually(path: &Path) -> String { | ||
| let deadline = Instant::now() + Duration::from_secs(5); | ||
| loop { | ||
| match std::fs::read_to_string(path) { | ||
| Ok(contents) if !contents.is_empty() => return contents, | ||
| Ok(_) => {} | ||
| Err(error) if error.kind() == std::io::ErrorKind::NotFound => {} | ||
| Err(error) => panic!("read fake ClickHouse arguments: {error}"), | ||
| } | ||
| assert!(Instant::now() < deadline, "fake ClickHouse did not start"); | ||
| std::thread::sleep(Duration::from_millis(10)); | ||
| } | ||
| } | ||
|
|
||
| struct ProcessGuard(u32); | ||
|
|
||
| impl Drop for ProcessGuard { | ||
| fn drop(&mut self) { | ||
| unsafe { | ||
| libc::kill(self.0 as i32, libc::SIGKILL); | ||
| } | ||
| } | ||
| } | ||
|
|
||
| #[test] | ||
| fn positional_name_keeps_following_version_and_passthrough_separate() { | ||
| let project = tempfile::tempdir().expect("create project tempdir"); | ||
| let home = tempfile::tempdir().expect("create home tempdir"); | ||
| install_fake_clickhouse(home.path(), DEFAULT_VERSION); | ||
| install_fake_clickhouse(home.path(), REQUESTED_VERSION); | ||
| std::fs::write(home.path().join(".clickhouse/default"), DEFAULT_VERSION) | ||
| .expect("write default version"); | ||
| let args_file = home.path().join("clickhouse-args.txt"); | ||
|
|
||
| let output = run_start(project.path(), home.path(), &args_file); | ||
| assert!( | ||
| output.status.success(), | ||
| "stderr: {}", | ||
| String::from_utf8_lossy(&output.stderr) | ||
| ); | ||
| let body: Value = serde_json::from_slice(&output.stdout).expect("parse start JSON"); | ||
| let _process = ProcessGuard(body["pid"].as_u64().expect("start PID") as u32); | ||
|
|
||
| assert_eq!(body["name"], "existing"); | ||
| assert_eq!(body["version"], REQUESTED_VERSION); | ||
| assert!( | ||
| project | ||
| .path() | ||
| .join(".clickhouse/servers/existing.json") | ||
| .exists() | ||
| ); | ||
| assert!( | ||
| !project | ||
| .path() | ||
| .join(".clickhouse/servers/default.json") | ||
| .exists() | ||
| ); | ||
|
|
||
| let child_args = read_file_eventually(&args_file); | ||
| assert_eq!(child_args.lines().last(), Some("--logger.level=trace")); | ||
| assert!(!child_args.lines().any(|arg| arg == "--version")); | ||
| } |
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.
Uh oh!
There was an error while loading. Please reload this page.