statistics: resource metering (tikv#10155)

* init req-cpu Signed-off-by: Zhenchi <[email protected]> * update Signed-off-by: Zhenchi <[email protected]> * tiny improve Signed-off-by: Zhenchi <[email protected]> * add metrics Signed-off-by: Zhenchi <[email protected]> * update configs Signed-off-by: Zhenchi <[email protected]> * Record txn cpu usage Signed-off-by: Zhenchi <[email protected]> * introduce collector trait Signed-off-by: Zhenchi <[email protected]> * fix imprecise recording Signed-off-by: Zhenchi <[email protected]> * global singleton Signed-off-by: Zhenchi <[email protected]> * add tests Signed-off-by: Zhenchi <[email protected]> * integration into server Signed-off-by: Zhenchi <[email protected]> * rename: RequestTag -> ResourceMeteringTag Signed-off-by: Zhenchi <[email protected]> * opt-in Arc Signed-off-by: Zhenchi <[email protected]> * better place to instrument Signed-off-by: Zhenchi <[email protected]> * misc Signed-off-by: Zhenchi <[email protected]> * some movement Signed-off-by: Zhenchi <[email protected]> * add config Signed-off-by: Zhenchi <[email protected]> * implement reporter Signed-off-by: Zhenchi <[email protected]> * remove clone Signed-off-by: Zhenchi <[email protected]> * misc Signed-off-by: Zhenchi <[email protected]> * fix test Signed-off-by: Zhenchi <[email protected]> * tiny refactor Signed-off-by: Zhenchi <[email protected]> * tiny fix Signed-off-by: Zhenchi <[email protected]> * bump grpcio Signed-off-by: Zhenchi <[email protected]> Co-authored-by: Ti Chi Robot <[email protected]>
chejinge · Jun 3, 2021 · 1b0841c · 1b0841c
1 parent acbba9f
commit 1b0841c
Show file tree

Hide file tree

Showing 56 changed files with 1,620 additions and 79 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -64,6 +64,7 @@ protobuf-codec = [
   "txn_types/protobuf-codec",
   "grpcio-health/protobuf-codec",
   "file_system/protobuf-codec",
+  "resource_metering/protobuf-codec",
   "protobuf/bytes",
 ]
 prost-codec = [
@@ -98,6 +99,7 @@ prost-codec = [
   "txn_types/prost-codec",
   "grpcio-health/prost-codec",
   "file_system/prost-codec",
+  "resource_metering/prost-codec",
 ]
 testexport = ["raftstore/testexport"]
 test-engines-rocksdb = [
@@ -157,7 +159,7 @@ hyper-openssl = "0.8"
 http = "0"
 into_other = { path = "components/into_other", default-features = false }
 keys = { path = "components/keys", default-features = false }
-kvproto = { rev = "f42e582bf0bb6bc2aee647e5f4126d51ccf6d377", git = "https://github.com/pingcap/kvproto.git", default-features = false }
+kvproto = { rev = "7a046020d1c091638e1e8aba623c8c1e8962219d", git = "https://github.com/pingcap/kvproto.git", default-features = false }
 lazy_static = "1.3"
 libc = "0.2"
 libloading = "0.7"
@@ -220,6 +222,7 @@ url = "2"
 uuid = { version = "0.8.1", features = ["serde", "v4"] }
 walkdir = "2"
 yatp = { git = "https://github.com/tikv/yatp.git", branch = "master" }
+resource_metering = { path = "components/resource_metering" }
 
 [dev-dependencies]
 panic_hook = { path = "components/panic_hook" }
@@ -312,7 +315,8 @@ members = [
   "components/file_system",
   "components/collections",
   "components/coprocessor_plugin_api",
-  "components/test_coprocessor_plugin/example_plugin"
+  "components/test_coprocessor_plugin/example_plugin",
+  "components/resource_metering",
 ]
 default-members = ["cmd/tikv-server", "cmd/tikv-ctl"]
 

diff --git a/cmd/tikv-ctl/Cargo.toml b/cmd/tikv-ctl/Cargo.toml
@@ -95,7 +95,7 @@ tokio = { version = "0.2", features = ["rt-threaded", "time"] }
 grpcio = { version = "0.9",  default-features = false, features = ["openssl-vendored"] }
 hex = "0.4"
 keys = { path = "../../components/keys", default-features = false }
-kvproto = { rev = "f42e582bf0bb6bc2aee647e5f4126d51ccf6d377", git = "https://github.com/pingcap/kvproto.git", default-features = false }
+kvproto = { rev = "7a046020d1c091638e1e8aba623c8c1e8962219d", git = "https://github.com/pingcap/kvproto.git", default-features = false }
 libc = "0.2"
 log = { version = "0.4", features = ["max_level_trace", "release_max_level_debug"] }
 log_wrappers = { path = "../../components/log_wrappers" }

diff --git a/components/backup/Cargo.toml b/components/backup/Cargo.toml
@@ -77,7 +77,7 @@ futures-util = { version = "0.3", default-features = false, features = ["io"] }
 grpcio = { version = "0.9",  default-features = false, features = ["openssl-vendored"] }
 hex = "0.4"
 keys = { path = "../keys", default-features = false }
-kvproto = { rev = "f42e582bf0bb6bc2aee647e5f4126d51ccf6d377", git = "https://github.com/pingcap/kvproto.git", default-features = false }
+kvproto = { rev = "7a046020d1c091638e1e8aba623c8c1e8962219d", git = "https://github.com/pingcap/kvproto.git", default-features = false }
 lazy_static = "1.3"
 log_wrappers = { path = "../log_wrappers" }
 pd_client = { path = "../pd_client", default-features = false }

diff --git a/components/cdc/Cargo.toml b/components/cdc/Cargo.toml
@@ -57,7 +57,7 @@ engine_rocks = { path = "../engine_rocks", default-features = false }
 engine_traits = { path = "../engine_traits", default-features = false }
 futures = "0.3"
 grpcio = { version = "0.9",  default-features = false, features = ["openssl-vendored"] }
-kvproto = { rev = "f42e582bf0bb6bc2aee647e5f4126d51ccf6d377", git = "https://github.com/pingcap/kvproto.git", default-features = false }
+kvproto = { rev = "7a046020d1c091638e1e8aba623c8c1e8962219d", git = "https://github.com/pingcap/kvproto.git", default-features = false }
 pd_client = { path = "../pd_client", default-features = false }
 raft = { version = "0.6.0-alpha", default-features = false }
 raftstore = { path = "../raftstore", default-features = false }

diff --git a/components/cloud/Cargo.toml b/components/cloud/Cargo.toml
@@ -20,7 +20,7 @@ async-trait = "0.1"
 derive_more = "0.99.3"
 error_code = { path = "../error_code", default-features = false }
 futures-io = "0.3"
-kvproto = { rev = "f42e582bf0bb6bc2aee647e5f4126d51ccf6d377", git = "https://github.com/pingcap/kvproto.git", default-features = false }
+kvproto = { rev = "7a046020d1c091638e1e8aba623c8c1e8962219d", git = "https://github.com/pingcap/kvproto.git", default-features = false }
 openssl = "0.10"
 protobuf = "2.8"
 rusoto_core = "0.45.0"

diff --git a/components/cloud/aws/Cargo.toml b/components/cloud/aws/Cargo.toml
@@ -32,7 +32,7 @@ grpcio = { version = "0.9",  default-features = false, features = ["openssl-vend
 http = "0.2.0"
 hyper = "0.13.3"
 hyper-tls = "0.4.1"
-kvproto = { rev = "f42e582bf0bb6bc2aee647e5f4126d51ccf6d377", git = "https://github.com/pingcap/kvproto.git", default-features = false }
+kvproto = { rev = "7a046020d1c091638e1e8aba623c8c1e8962219d", git = "https://github.com/pingcap/kvproto.git", default-features = false }
 rusoto_core = "0.45.0"
 rusoto_credential = "0.45.0"
 rusoto_kms = { version = "0.45.0", features = ["serialize_structs"] }

diff --git a/components/cloud/gcp/Cargo.toml b/components/cloud/gcp/Cargo.toml
@@ -22,7 +22,7 @@ futures-util = { version = "0.3", default-features = false, features = ["io"] }
 http = "0.2.0"
 hyper = "0.13.3"
 hyper-tls = "0.4.1"
-kvproto = { rev = "f42e582bf0bb6bc2aee647e5f4126d51ccf6d377", git = "https://github.com/pingcap/kvproto.git", default-features = false }
+kvproto = { rev = "7a046020d1c091638e1e8aba623c8c1e8962219d", git = "https://github.com/pingcap/kvproto.git", default-features = false }
 slog = { version = "2.3", features = ["max_level_trace", "release_max_level_debug"] }
 # better to not use slog-global, but pass in the logger
 slog-global = { version = "0.1", git = "https://github.com/breeswish/slog-global.git", rev = "d592f88e4dbba5eb439998463054f1a44fbf17b9" }

diff --git a/components/encryption/Cargo.toml b/components/encryption/Cargo.toml
@@ -39,7 +39,7 @@ lazy_static = "1.3"
 prometheus = { version = "0.10", features = ["nightly"] }
 futures-util = { version = "0.3", default-features = false, features = ["std", "io"] }
 hex = "0.4.2"
-kvproto = { rev = "f42e582bf0bb6bc2aee647e5f4126d51ccf6d377", git = "https://github.com/pingcap/kvproto.git", default-features = false }
+kvproto = { rev = "7a046020d1c091638e1e8aba623c8c1e8962219d", git = "https://github.com/pingcap/kvproto.git", default-features = false }
 openssl = "0.10"
 protobuf = "2.8"
 rand = "0.7"

diff --git a/components/encryption/export/Cargo.toml b/components/encryption/export/Cargo.toml
@@ -35,7 +35,7 @@ derive_more = "0.99.3"
 encryption = { path = "../", default-features = false }
 error_code = { path = "../../error_code", default-features = false }
 file_system = { path = "../../file_system", default-features = false }
-kvproto = { rev = "f42e582bf0bb6bc2aee647e5f4126d51ccf6d377", git = "https://github.com/pingcap/kvproto.git", default-features = false }
+kvproto = { rev = "7a046020d1c091638e1e8aba623c8c1e8962219d", git = "https://github.com/pingcap/kvproto.git", default-features = false }
 openssl = "0.10"
 protobuf = "2.8"
 slog = { version = "2.3", features = ["max_level_trace", "release_max_level_debug"] }

diff --git a/components/engine_panic/Cargo.toml b/components/engine_panic/Cargo.toml
@@ -27,6 +27,6 @@ engine_traits = { path = "../engine_traits", default-features = false }
 tikv_alloc = { path = "../tikv_alloc" }
 # FIXME: Remove this dep from the engine_traits interface
 tikv_util = { path = "../tikv_util", default-features = false }
-kvproto = { rev = "f42e582bf0bb6bc2aee647e5f4126d51ccf6d377", git = "https://github.com/pingcap/kvproto.git", default-features = false }
+kvproto = { rev = "7a046020d1c091638e1e8aba623c8c1e8962219d", git = "https://github.com/pingcap/kvproto.git", default-features = false }
 raft = { version = "0.6.0-alpha", default-features = false }
 txn_types = { path = "../txn_types", default-features = false }
diff --git a/components/engine_rocks/Cargo.toml b/components/engine_rocks/Cargo.toml
@@ -64,7 +64,7 @@ configuration = { path = "../configuration" }
 tempfile = "3.0"
 serde = "1.0"
 serde_derive = "1.0"
-kvproto = { rev = "f42e582bf0bb6bc2aee647e5f4126d51ccf6d377", git = "https://github.com/pingcap/kvproto.git", default-features = false }
+kvproto = { rev = "7a046020d1c091638e1e8aba623c8c1e8962219d", git = "https://github.com/pingcap/kvproto.git", default-features = false }
 raft = { version = "0.6.0-alpha", default-features = false }
 protobuf = "2"
 fail = "0.4"
@@ -75,6 +75,6 @@ package = "rocksdb"
 features = ["encryption", "static_libcpp"]
 
 [dev-dependencies]
-kvproto = { rev = "f42e582bf0bb6bc2aee647e5f4126d51ccf6d377", git = "https://github.com/pingcap/kvproto.git", default-features = false }
+kvproto = { rev = "7a046020d1c091638e1e8aba623c8c1e8962219d", git = "https://github.com/pingcap/kvproto.git", default-features = false }
 rand = "0.7"
 toml = "0.5"
diff --git a/components/engine_traits/Cargo.toml b/components/engine_traits/Cargo.toml
@@ -35,7 +35,7 @@ txn_types = { path = "../txn_types", default-features = false }
 serde = "1.0"
 slog = { version = "2.3", features = ["max_level_trace", "release_max_level_debug"] }
 slog-global = { version = "0.1", git = "https://github.com/breeswish/slog-global.git", rev = "d592f88e4dbba5eb439998463054f1a44fbf17b9" }
-kvproto = { rev = "f42e582bf0bb6bc2aee647e5f4126d51ccf6d377", git = "https://github.com/pingcap/kvproto.git", default-features = false }
+kvproto = { rev = "7a046020d1c091638e1e8aba623c8c1e8962219d", git = "https://github.com/pingcap/kvproto.git", default-features = false }
 raft = { version = "0.6.0-alpha", default-features = false }
 
 [dev-dependencies]

diff --git a/components/error_code/Cargo.toml b/components/error_code/Cargo.toml
@@ -26,7 +26,7 @@ path = "bin.rs"
 [dependencies]
 lazy_static = "1.3"
 raft = { version = "0.6.0-alpha", default-features = false }
-kvproto = { rev = "f42e582bf0bb6bc2aee647e5f4126d51ccf6d377", git = "https://github.com/pingcap/kvproto.git", default-features = false }
+kvproto = { rev = "7a046020d1c091638e1e8aba623c8c1e8962219d", git = "https://github.com/pingcap/kvproto.git", default-features = false }
 tikv_alloc = { path = "../tikv_alloc" }
 grpcio = { version = "0.9",  default-features = false, features = ["openssl-vendored"] }
 toml = "0.5"

diff --git a/components/external_storage/Cargo.toml b/components/external_storage/Cargo.toml
@@ -37,7 +37,7 @@ futures-executor = "0.3"
 futures-io = "0.3"
 futures-util = { version = "0.3", default-features = false, features = ["io"] }
 grpcio = { optional = true, version = "0.9",  default-features = false, features = ["openssl-vendored"] }
-kvproto = { rev = "f42e582bf0bb6bc2aee647e5f4126d51ccf6d377", git = "https://github.com/pingcap/kvproto.git", default-features = false }
+kvproto = { rev = "7a046020d1c091638e1e8aba623c8c1e8962219d", git = "https://github.com/pingcap/kvproto.git", default-features = false }
 lazy_static = "1.3"
 libloading = { optional = true, version = "0.7.0" }
 prometheus = { version = "0.10", default-features = false, features = ["nightly", "push"] }

diff --git a/components/external_storage/export/Cargo.toml b/components/external_storage/export/Cargo.toml
@@ -80,7 +80,7 @@ futures = { optional = true, version = "0.3" }
 futures-executor = { optional = true, version = "0.3" }
 futures-io = { version = "0.3" }
 futures-util = { version = "0.3", default-features = false, features = ["io"] }
-kvproto = { rev = "f42e582bf0bb6bc2aee647e5f4126d51ccf6d377", git = "https://github.com/pingcap/kvproto.git", default-features = false }
+kvproto = { rev = "7a046020d1c091638e1e8aba623c8c1e8962219d", git = "https://github.com/pingcap/kvproto.git", default-features = false }
 libloading = { optional = true, version = "0.7.0" }
 once_cell = { optional = true, version = "1.3.1" }
 protobuf = { optional = true, version = "2" }

diff --git a/components/into_other/Cargo.toml b/components/into_other/Cargo.toml
@@ -19,5 +19,5 @@ prost-codec = [
 
 [dependencies]
 engine_traits = { path = "../engine_traits", default-features = false }
-kvproto = { rev = "f42e582bf0bb6bc2aee647e5f4126d51ccf6d377", git = "https://github.com/pingcap/kvproto.git", default-features = false }
+kvproto = { rev = "7a046020d1c091638e1e8aba623c8c1e8962219d", git = "https://github.com/pingcap/kvproto.git", default-features = false }
 raft = { version = "0.6.0-alpha", default-features = false }
diff --git a/components/keys/Cargo.toml b/components/keys/Cargo.toml
@@ -17,7 +17,7 @@ prost-codec = [
 
 [dependencies]
 byteorder = "1.2"
-kvproto = { rev = "f42e582bf0bb6bc2aee647e5f4126d51ccf6d377", git = "https://github.com/pingcap/kvproto.git", default-features = false }
+kvproto = { rev = "7a046020d1c091638e1e8aba623c8c1e8962219d", git = "https://github.com/pingcap/kvproto.git", default-features = false }
 log_wrappers = { path = "../log_wrappers" }
 thiserror = "1.0"
 tikv_alloc = { path = "../tikv_alloc" }

diff --git a/components/pd_client/Cargo.toml b/components/pd_client/Cargo.toml
@@ -28,7 +28,7 @@ failpoints = ["fail/failpoints"]
 error_code = { path = "../error_code", default-features = false }
 futures = "0.3"
 grpcio = { version = "0.9",  default-features = false, features = ["openssl-vendored"] }
-kvproto = { rev = "f42e582bf0bb6bc2aee647e5f4126d51ccf6d377", git = "https://github.com/pingcap/kvproto.git", default-features = false }
+kvproto = { rev = "7a046020d1c091638e1e8aba623c8c1e8962219d", git = "https://github.com/pingcap/kvproto.git", default-features = false }
 lazy_static = "1.3"
 log = { version = "0.4", features = ["max_level_trace", "release_max_level_debug"] }
 log_wrappers = { path = "../log_wrappers" }

diff --git a/components/raft_log_engine/Cargo.toml b/components/raft_log_engine/Cargo.toml
@@ -31,7 +31,7 @@ time = "0.1"
 configuration = { path = "../configuration" }
 serde = "1.0"
 serde_derive = "1.0"
-kvproto = { rev = "f42e582bf0bb6bc2aee647e5f4126d51ccf6d377", git = "https://github.com/pingcap/kvproto.git", default-features = false }
+kvproto = { rev = "7a046020d1c091638e1e8aba623c8c1e8962219d", git = "https://github.com/pingcap/kvproto.git", default-features = false }
 raft = { version = "0.6.0-alpha", default-features = false }
 raft-engine = { git = "https://github.com/tikv/raft-engine", branch = "master" }
 protobuf = "2"
diff --git a/components/raftstore/Cargo.toml b/components/raftstore/Cargo.toml
@@ -75,7 +75,7 @@ futures = "0.3"
 futures-util = { version = "0.3.1", default-features = false, features = ["io"] }
 into_other = { path = "../into_other",  default-features = false }
 keys = { path = "../keys", default-features = false }
-kvproto = { rev = "f42e582bf0bb6bc2aee647e5f4126d51ccf6d377", git = "https://github.com/pingcap/kvproto.git", default-features = false }
+kvproto = { rev = "7a046020d1c091638e1e8aba623c8c1e8962219d", git = "https://github.com/pingcap/kvproto.git", default-features = false }
 lazy_static = "1.3"
 log = { version = "0.4", features = ["max_level_trace", "release_max_level_debug"] }
 log_wrappers = { path = "../log_wrappers" }

diff --git a/components/resolved_ts/Cargo.toml b/components/resolved_ts/Cargo.toml
@@ -48,7 +48,7 @@ fail = "0.4"
 futures = "0.3"
 grpcio = { version = "0.9", default-features = false, features = ["openssl-vendored"] }
 hex = "0.4"
-kvproto = { rev = "f42e582bf0bb6bc2aee647e5f4126d51ccf6d377", git = "https://github.com/pingcap/kvproto.git", default-features = false }
+kvproto = { rev = "7a046020d1c091638e1e8aba623c8c1e8962219d", git = "https://github.com/pingcap/kvproto.git", default-features = false }
 lazy_static = "1.3"
 log_wrappers = { path = "../log_wrappers" }
 pd_client = { path = "../pd_client", default-features = false }

diff --git a/components/resource_metering/Cargo.toml b/components/resource_metering/Cargo.toml
@@ -0,0 +1,44 @@
+[package]
+name = "resource_metering"
+version = "0.0.1"
+edition = "2018"
+
+[features]
+default = ["protobuf-codec"]
+protobuf-codec = [
+    "kvproto/protobuf-codec",
+    "grpcio/protobuf-codec",
+    "security/protobuf-codec",
+]
+prost-codec = [
+    "kvproto/prost-codec",
+    "grpcio/prost-codec",
+    "security/prost-codec",
+]
+
+[dependencies]
+lazy_static = "1.3"
+collections = { path = "../collections" }
+libc = "0.2"
+crossbeam = "0.8"
+pin-project = "1.0"
+prometheus = { version = "0.10", features = ["nightly"] }
+prometheus-static-metric = "0.4"
+kvproto = { rev = "7a046020d1c091638e1e8aba623c8c1e8962219d", git = "https://github.com/pingcap/kvproto.git", default-features = false }
+tikv_util = { path = "../tikv_util" }
+grpcio = { version = "0.9",  default-features = false, features = ["openssl-vendored"] }
+security = { path = "../security", default-features = false }
+configuration = { path = "../configuration" }
+serde = "1.0"
+serde_derive = "1.0"
+log = { version = "0.4", features = ["max_level_trace", "release_max_level_debug"] }
+slog = { version = "2.3", features = ["max_level_trace", "release_max_level_debug"] }
+slog-global = { version = "0.1", git = "https://github.com/breeswish/slog-global.git", rev = "d592f88e4dbba5eb439998463054f1a44fbf17b9" }
+futures = "0.3"
+pdqselect = "0.1"
+
+[target.'cfg(target_os = "linux")'.dependencies]
+procinfo = { git = "https://github.com/tikv/procinfo-rs", rev = "5125fc1a69496b73b26b3c08b6e8afc3c665a56e" }
+
+[dev-dependencies]
+rand = "0.8"
diff --git a/components/resource_metering/src/cpu/collector/dummy.rs b/components/resource_metering/src/cpu/collector/dummy.rs
@@ -0,0 +1,8 @@
+// Copyright 2021 TiKV Project Authors. Licensed under Apache-2.0.
+
+use crate::cpu::collector::Collector;
+
+pub struct CollectorHandle;
+pub fn register_collector(_collector: Box<dyn Collector>) -> CollectorHandle {
+    CollectorHandle
+}