Merge #1860

1860: refactor: specify the events stream replicas r=tiagolobocastro a=tiagolobocastro



Co-authored-by: Tiago Castro <[email protected]>

Author: mayastor-bors

io-engine-tests/src/lib.rs

@@ -158,6 +158,7 @@ pub fn mayastor_test_init_ex(log_format: LogFormat, log_level: Option<&str>) {
         log_level.unwrap_or("info,io_engine=DEBUG"),
         log_format,
         None,
+        None,
     );
 
     io_engine::CPS_INIT!();

io-engine/src/bin/io-engine.rs

@@ -253,9 +253,19 @@ fn main() -> Result<(), Box<dyn std::error::Error>> {
     // automatically. trace maps to debug at FFI level. If RUST_LOG is
     // passed, we will use it regardless.
     if !args.log_components.is_empty() {
-        logger::init_ex("TRACE", log_format, args.events_url.clone());
+        logger::init_ex(
+            "TRACE",
+            log_format,
+            args.events_url.clone(),
+            args.events_replicas,
+        );
     } else {
-        logger::init_ex("INFO", log_format, args.events_url.clone());
+        logger::init_ex(
+            "INFO",
+            log_format,
+            args.events_url.clone(),
+            args.events_replicas,
+        );
     }
 
     info!("{}", fmt_package_info!());

io-engine/src/core/env.rs

@@ -251,6 +251,9 @@ pub struct MayastorCliArgs {
     /// Events message-bus endpoint url.
     #[clap(long)]
     pub events_url: Option<url::Url>,
+    /// Replication factor for the events jetstream.
+    #[clap(long)]
+    pub events_replicas: Option<usize>,
     /// Enables additional nexus I/O channel debugging.
     #[clap(
         long = "enable-channel-dbg",
@@ -345,6 +348,7 @@ impl Default for MayastorCliArgs {
             skip_sig_handler: false,
             enable_io_all_thrd_nexus_channels: false,
             events_url: None,
+            events_replicas: None,
             enable_nexus_channel_debug: false,
             lvm: false,
             snap_rebuild: false,

io-engine/src/logger.rs

@@ -508,7 +508,12 @@ impl LogFormat {
 ///
 /// We might want to suppress certain messages, as some of them are redundant,
 /// in particular, the NOTICE messages as such, they are mapped to debug.
-pub fn init_ex(level: &str, format: LogFormat, events_url: Option<url::Url>) {
+pub fn init_ex(
+    level: &str,
+    format: LogFormat,
+    events_url: Option<url::Url>,
+    events_replicas: Option<usize>,
+) {
     // Set up a "logger" that simply translates any "log" messages it receives
     // to trace events. This is for our custom spdk log messages, but also
     // for any other third party crates still using the logging facade.
@@ -532,7 +537,7 @@ pub fn init_ex(level: &str, format: LogFormat, events_url: Option<url::Url>) {
         Some(url) => {
             let events_filter = Targets::new().with_target(EVENTING_TARGET, Level::INFO);
             Some(
-                EventHandle::init_ext(url.to_string(), SERVICE_NAME, spawn)
+                EventHandle::init_ext(url.to_string(), SERVICE_NAME, spawn, events_replicas)
                     .with_filter(events_filter),
             )
         }
@@ -548,5 +553,5 @@ pub fn init_ex(level: &str, format: LogFormat, events_url: Option<url::Url>) {
 }
 
 pub fn init(level: &str) {
-    init_ex(level, Default::default(), None)
+    init_ex(level, Default::default(), None, None)
 }