Skip to content

Fix borked main #7473

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.

Sign up for GitHub

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

Merged
karencfv merged 1 commit into from
Feb 4, 2025
Merged

Fix borked main #7473

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 2 additions & 3 deletions clickhouse-admin/src/context.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,8 @@ use clickhouse_admin_types::{
CLICKHOUSE_KEEPER_CONFIG_FILE, CLICKHOUSE_SERVER_CONFIG_DIR,
CLICKHOUSE_SERVER_CONFIG_FILE,
};
use dropshot::HttpError;
use dropshot::{ClientErrorStatusCode, HttpError};
use flume::{Receiver, Sender, TrySendError};
use http::StatusCode;
use illumos_utils::svcadm::Svcadm;
use omicron_common::address::CLICKHOUSE_TCP_PORT;
use omicron_common::api::external::Generation;
Expand Down Expand Up @@ -340,7 +339,7 @@ fn generate_config_and_enable_svc(
if current > incoming_generation {
return Err(HttpError::for_client_error(
Some(String::from("Conflict")),
StatusCode::CONFLICT,
ClientErrorStatusCode::CONFLICT,
format!(
"current generation '{}' is greater than incoming generation '{}'",
current,
Expand Down
10 changes: 5 additions & 5 deletions clickhouse-admin/src/http_entrypoints.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,10 @@ use clickhouse_admin_types::{
SystemTimeSeriesSettings, TimeSeriesSettingsQuery,
};
use dropshot::{
ApiDescription, HttpError, HttpResponseCreated, HttpResponseOk,
HttpResponseUpdatedNoContent, Path, Query, RequestContext, TypedBody,
ApiDescription, ClientErrorStatusCode, HttpError, HttpResponseCreated,
HttpResponseOk, HttpResponseUpdatedNoContent, Path, Query, RequestContext,
TypedBody,
};
use http::StatusCode;
use omicron_common::api::external::Generation;
use std::sync::Arc;

Expand Down Expand Up @@ -59,7 +59,7 @@ impl ClickhouseAdminServerApi for ClickhouseAdminServerImpl {
None => {
return Err(HttpError::for_client_error(
Some(String::from("ObjectNotFound")),
StatusCode::NOT_FOUND,
ClientErrorStatusCode::NOT_FOUND,
"no generation number found".to_string(),
))
}
Expand Down Expand Up @@ -125,7 +125,7 @@ impl ClickhouseAdminKeeperApi for ClickhouseAdminKeeperImpl {
None => {
return Err(HttpError::for_client_error(
Some(String::from("ObjectNotFound")),
StatusCode::NOT_FOUND,
ClientErrorStatusCode::NOT_FOUND,
"no generation number found".to_string(),
))
}
Expand Down
Loading