Merge branch 'main' into wt-log-fix

risingwavelabs · Jul 7, 2022 · cad79b8 · cad79b8
2 parents 93be928 + 79eb45b
commit cad79b8
Show file tree

Hide file tree

Showing 11 changed files with 25 additions and 11 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/src/common/Cargo.toml b/src/common/Cargo.toml
@@ -53,5 +53,10 @@ url = "2"
 value-encoding = { path = "../utils/value-encoding" }
 workspace-hack = { version = "0.1", path = "../workspace-hack" }
 
+[target.'cfg(target_os = "linux")'.dependencies]
+procinfo = { git = "https://github.com/tikv/procinfo-rs", rev = "6599eb9dca74229b2c1fcc44118bef7eff127128" }
+procfs = { version = "0.12", default-features = false }
+libc = "0.2"
+
 [dev-dependencies]
 rand = "0.8"
diff --git a/src/common/src/monitor/mod.rs b/src/common/src/monitor/mod.rs
@@ -13,6 +13,7 @@
 // limitations under the License.
 
 pub mod my_stats;
+pub mod process_linux;
 
 use prometheus::core::{AtomicU64, Collector, GenericCounter, GenericCounterVec, Metric};
 use prometheus::{Histogram, HistogramVec};

diff --git a/src/storage/src/monitor/process_linux.rs → src/common/src/monitor/process_linux.rs b/src/storage/src/monitor/process_linux.rs → src/common/src/monitor/process_linux.rs
@@ -33,6 +33,12 @@ pub struct ProcessCollector {
     rss: IntGauge,
 }
 
+impl Default for ProcessCollector {
+    fn default() -> Self {
+        Self::new()
+    }
+}
+
 impl ProcessCollector {
     pub fn new() -> Self {
         let mut descs = Vec::new();

diff --git a/src/compute/src/server.rs b/src/compute/src/server.rs
@@ -20,6 +20,7 @@ use risingwave_batch::executor::monitor::BatchMetrics;
 use risingwave_batch::rpc::service::task_service::BatchServiceImpl;
 use risingwave_batch::task::{BatchEnvironment, BatchManager};
 use risingwave_common::config::ComputeNodeConfig;
+use risingwave_common::monitor::process_linux::monitor_process;
 use risingwave_common::service::MetricsManager;
 use risingwave_common::util::addr::HostAddr;
 use risingwave_pb::common::WorkerType;
@@ -87,6 +88,7 @@ pub async fn compute_node_serve(
     )];
     // Initialize the metrics subsystem.
     let registry = prometheus::Registry::new();
+    monitor_process(&registry).unwrap();
     let source_metrics = Arc::new(SourceMetrics::new(registry.clone()));
     let hummock_metrics = Arc::new(HummockMetrics::new(registry.clone()));
     let streaming_metrics = Arc::new(StreamingMetrics::new(registry.clone()));

diff --git a/src/meta/src/rpc/metrics.rs b/src/meta/src/rpc/metrics.rs
@@ -172,6 +172,10 @@ impl MetaMetrics {
         });
     }
 
+    pub fn registry(&self) -> &Registry {
+        &self.registry
+    }
+
     async fn metrics_service(req: Request<Body>) -> Result<Response<Body>, hyper::Error> {
         let meta_metrics = req.extensions().get::<Arc<MetaMetrics>>().unwrap();
         let encoder = TextEncoder::new();

diff --git a/src/meta/src/rpc/server.rs b/src/meta/src/rpc/server.rs
@@ -21,6 +21,7 @@ use itertools::Itertools;
 use prost::Message;
 use risingwave_common::error::ErrorCode::InternalError;
 use risingwave_common::error::{ErrorCode, Result, RwError};
+use risingwave_common::monitor::process_linux::monitor_process;
 use risingwave_pb::ddl_service::ddl_service_server::DdlServiceServer;
 use risingwave_pb::hummock::hummock_manager_service_server::HummockManagerServiceServer;
 use risingwave_pb::meta::cluster_service_server::ClusterServiceServer;
@@ -291,6 +292,7 @@ pub async fn rpc_serve_with_store<S: MetaStore>(
         Arc::new(CompactionGroupManager::new(env.clone()).await.unwrap());
     let fragment_manager = Arc::new(FragmentManager::new(env.clone()).await.unwrap());
     let meta_metrics = Arc::new(MetaMetrics::new());
+    monitor_process(meta_metrics.registry()).unwrap();
     let compactor_manager = Arc::new(hummock::CompactorManager::new());
 
     let cluster_manager = Arc::new(

diff --git a/src/storage/Cargo.toml b/src/storage/Cargo.toml
@@ -75,10 +75,6 @@ value-encoding = { path = "../utils/value-encoding" }
 workspace-hack = { version = "0.1", path = "../workspace-hack" }
 zstd = "0.11.2"
 
-[target.'cfg(target_os = "linux")'.dependencies]
-procinfo = { git = "https://github.com/tikv/procinfo-rs", rev = "6599eb9dca74229b2c1fcc44118bef7eff127128" }
-procfs = { version = "0.12", default-features = false }
-
 [dev-dependencies]
 criterion = "0.3"
 risingwave_meta = { path = "../meta", features = ["test"] }

diff --git a/src/storage/compactor/src/server.rs b/src/storage/compactor/src/server.rs
@@ -17,6 +17,7 @@ use std::path::PathBuf;
 use std::sync::Arc;
 use std::time::Duration;
 
+use risingwave_common::monitor::process_linux::monitor_process;
 use risingwave_common::service::MetricsManager;
 use risingwave_common::util::addr::HostAddr;
 use risingwave_object_store::object::parse_remote_object_store;
@@ -62,6 +63,7 @@ pub async fn compactor_serve(
 
     // Boot compactor
     let registry = prometheus::Registry::new();
+    monitor_process(&registry).unwrap();
     let hummock_metrics = Arc::new(HummockMetrics::new(registry.clone()));
     let object_metrics = Arc::new(ObjectStoreMetrics::new(registry.clone()));
     let hummock_meta_client = Arc::new(MonitoredHummockMetaClient::new(

diff --git a/src/storage/src/monitor/mod.rs b/src/storage/src/monitor/mod.rs
@@ -23,6 +23,3 @@ pub use hummock_metrics::*;
 mod local_metrics;
 pub use local_metrics::StoreLocalStatistic;
 pub use risingwave_object_store::object::object_metrics::ObjectStoreMetrics;
-
-mod process_linux;
-pub use self::process_linux::monitor_process;
diff --git a/src/storage/src/monitor/state_store_metrics.rs b/src/storage/src/monitor/state_store_metrics.rs
@@ -23,7 +23,6 @@ use prometheus::{
 use risingwave_common::monitor::Print;
 use risingwave_hummock_sdk::HummockSSTableId;
 
-use super::monitor_process;
 use crate::hummock::sstable_store::SstableStoreRef;
 use crate::hummock::{BlockCache, LruCache, Sstable};
 
@@ -388,7 +387,6 @@ impl StateStoreMetrics {
         )
         .unwrap();
 
-        monitor_process(&registry).unwrap();
         Self {
             get_duration,
             get_key_size,