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

feat(ingester): enable object store metrics

pull/24376/head
Dom Dwyer 2022-03-15 16:23:43 +00:00
parent 65273721b6
commit f4d836eed7
2 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
influxdb_iox/src/commands/run/ingester.rs
View File

@ -12,7 +12,7 @@ use influxdb_ioxd::{
},
Service,
};
use object_store::ObjectStoreImpl;
use object_store::{instrumentation::ObjectStoreMetrics, DynObjectStore, ObjectStoreImpl};
use observability_deps::tracing::*;
use query::exec::Executor;
use std::{convert::TryFrom, sync::Arc};
@ -83,10 +83,11 @@ pub async fn command(config: Config) -> Result<()> {
.get_catalog("ingester", Arc::clone(&metric_registry))
.await?;
let object_store = Arc::new(
ObjectStoreImpl::try_from(config.run_config.object_store_config())
.map_err(Error::ObjectStoreParsing)?,
);
let object_store = ObjectStoreImpl::try_from(config.run_config.object_store_config())
.map_err(Error::ObjectStoreParsing)?;
// Decorate the object store with a metric recorder.
let object_store: Arc<DynObjectStore> =
Arc::new(ObjectStoreMetrics::new(object_store, &*metric_registry));
let exec = Arc::new(Executor::new(config.query_exec_thread_count));
let server_type = create_ingester_server_type(

4
influxdb_ioxd/src/server_type/ingester.rs
View File

@ -16,7 +16,7 @@ use ingester::{
};
use iox_catalog::interface::Catalog;
use metric::Registry;
use object_store::ObjectStoreImpl;
use object_store::DynObjectStore;
use query::exec::Executor;
use trace::TraceCollector;
@ -134,7 +134,7 @@ pub async fn create_ingester_server_type(
common_state: &CommonServerState,
metric_registry: Arc<metric::Registry>,
catalog: Arc<dyn Catalog>,
object_store: Arc<ObjectStoreImpl>,
object_store: Arc<DynObjectStore>,
exec: Arc<Executor>,
write_buffer_config: &WriteBufferConfig,
ingester_config: IngesterConfig,