Skip to content

[clickhouse-handler] print error stacktrace in clickhouse-handler #1525

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
databend-bot merged 1 commit into from
Aug 20, 2021
Merged

[clickhouse-handler] print error stacktrace in clickhouse-handler #1525

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
6 changes: 5 additions & 1 deletion query/src/servers/clickhouse/interactive_worker.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ use common_datavalues::prelude::Arc;
use metrics::histogram;

use crate::servers::clickhouse::interactive_worker_base::InteractiveWorkerBase;
use crate::servers::clickhouse::writers::to_clickhouse_err;
use crate::servers::clickhouse::writers::QueryWriter;
use crate::sessions::SessionRef;

Expand Down Expand Up @@ -48,7 +49,10 @@ impl ClickHouseSession for InteractiveWorker {
let mut query_writer = QueryWriter::create(ctx.client_revision, conn, context.clone());

let get_query_result = InteractiveWorkerBase::do_query(ctx, context);
query_writer.write(get_query_result.await).await?;
if let Err(cause) = query_writer.write(get_query_result.await).await {
let new_error = cause.add_message(&ctx.state.query);
return Err(to_clickhouse_err(new_error));
}

histogram!(
super::clickhouse_metrics::METRIC_CLICKHOUSE_PROCESSOR_REQUEST_DURATION,
Expand Down
1 change: 1 addition & 0 deletions query/src/servers/clickhouse/writers/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,4 +16,5 @@ mod query_writer;

pub use query_writer::from_clickhouse_block;
pub use query_writer::to_clickhouse_block;
pub use query_writer::to_clickhouse_err;
pub use query_writer::QueryWriter;
7 changes: 4 additions & 3 deletions query/src/servers/clickhouse/writers/query_writer.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,12 +49,12 @@ impl<'a> QueryWriter<'a> {
}
}

pub async fn write(&mut self, receiver: Result<Receiver<BlockItem>>) -> CHResult<()> {
pub async fn write(&mut self, receiver: Result<Receiver<BlockItem>>) -> Result<()> {
match receiver {
Err(error) => self.write_error(error).await.map_err(to_clickhouse_err),
Err(error) => self.write_error(error).await,
Ok(receiver) => {
let write_data = self.write_data(receiver);
write_data.await.map_err(to_clickhouse_err)
write_data.await
}
}
}
Expand All @@ -78,6 +78,7 @@ impl<'a> QueryWriter<'a> {
}

async fn write_error(&mut self, error: ErrorCode) -> Result<()> {
log::error!("OnQuery Error: {:?}", error);
let clickhouse_err = to_clickhouse_err(error);
match self.conn.write_error(&clickhouse_err).await {
Ok(_) => Ok(()),
Expand Down