Influxdata
/
influxdb
mirror of https://github.com/influxdata/influxdb.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

fix: improve "server not initialized" error 

We've reported "databases not loaded" which is a bit confusing for
router nodes, so change the description to "server not initialized".
pull/24376/head
Marco Neumann 2021-06-23 10:47:51 +02:00
parent c52410b3d9
commit 39eac62d5d
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
server/src/lib.rs
View File

@ -146,9 +146,9 @@ pub enum Error {
ErrorReplicating { source: DatabaseError },
#[snafu(display(
"server ID is set but DBs are not yet loaded. Server is not yet ready to read/write data."
"Server ID is set ({}) but server is not yet initialized (e.g. DBs and remotes are not loaded). Server is not yet ready to read/write data.", server_id
))]
DatabasesNotLoaded,
ServerNotInitialized { server_id: ServerId },
#[snafu(display("error serializing database rules to protobuf: {}", source))]
ErrorSerializingRulesProtobuf {
@ -474,7 +474,7 @@ where
if self.initialized() {
Ok(server_id)
} else {
Err(Error::DatabasesNotLoaded)
Err(Error::ServerNotInitialized { server_id })
}
}
@ -1783,7 +1783,7 @@ mod tests {
let err = create_simple_database(&server, "bananas")
.await
.unwrap_err();
assert!(matches!(err, Error::DatabasesNotLoaded));
assert!(matches!(err, Error::ServerNotInitialized { .. }));
}
#[tokio::test]

4
src/influxdb_ioxd/rpc/error.rs
View File

@ -14,8 +14,8 @@ pub fn default_server_error_handler(error: server::Error) -> tonic::Status {
description: "Writer ID must be set".to_string(),
}
.into(),
Error::DatabasesNotLoaded => tonic::Status::unavailable(
"Server ID set but DBs not yet loaded. Server cannot accept reads/writes yet.",
Error::ServerNotInitialized{server_id} => tonic::Status::unavailable(
format!("Server ID is set ({}) but server is not yet initialized (e.g. DBs and remotes are not loaded). Server is not yet ready to read/write data.", server_id)
),
Error::DatabaseNotFound { db_name } => NotFound {
resource_type: "database".to_string(),