From 766f79c0f623aef16970ec2ed608782e11f03eb7 Mon Sep 17 00:00:00 2001
From: Shanicky Chen <peng@risingwave-labs.com>
Date: Mon, 6 Nov 2023 18:14:08 +0800
Subject: [PATCH] roll back ci.toml

Signed-off-by: Shanicky Chen <peng@risingwave-labs.com>
---
 src/common/src/config.rs                                  | 2 +-
 src/config/ci.toml                                        | 4 ++--
 src/meta/src/barrier/recovery.rs                          | 3 ---
 .../integration_tests/recovery/scale_in_when_recovery.rs  | 8 --------
 4 files changed, 3 insertions(+), 14 deletions(-)

diff --git a/src/common/src/config.rs b/src/common/src/config.rs
index 0ab5131eb71f1..c096b17af5500 100644
--- a/src/common/src/config.rs
+++ b/src/common/src/config.rs
@@ -208,7 +208,7 @@ pub struct MetaConfig {
     #[serde(default)]
     pub disable_recovery: bool,
 
-    /// Whether to enable fail-on-recovery. Should only be used in e2e tests.
+    /// Whether to enable scale-in when recovery.
     #[serde(default)]
     pub enable_scale_in_when_recovery: bool,
 
diff --git a/src/config/ci.toml b/src/config/ci.toml
index adb45b42e5355..79a0dbca06f23 100644
--- a/src/config/ci.toml
+++ b/src/config/ci.toml
@@ -1,6 +1,6 @@
 [meta]
-disable_recovery = false
-max_heartbeat_interval_secs = 10
+disable_recovery = true
+max_heartbeat_interval_secs = 600
 
 [streaming]
 in_flight_barrier_nums = 10
diff --git a/src/meta/src/barrier/recovery.rs b/src/meta/src/barrier/recovery.rs
index e6685948489f0..faa5fbe72b9e6 100644
--- a/src/meta/src/barrier/recovery.rs
+++ b/src/meta/src/barrier/recovery.rs
@@ -400,7 +400,6 @@ impl GlobalBarrierManager {
     async fn scale_actors(&self, info: &BarrierActorInfo) -> MetaResult<bool> {
         debug!("start scaling-in offline actors.");
 
-        // 1. get expired workers.
         let expired_workers: HashSet<WorkerId> = info
             .actor_map
             .iter()
@@ -408,8 +407,6 @@ impl GlobalBarrierManager {
             .map(|(&worker, _)| worker)
             .collect();
 
-        println!("expired {:?}", expired_workers);
-
         if expired_workers.is_empty() {
             debug!("no expired workers, skipping.");
             return Ok(false);
diff --git a/src/tests/simulation/tests/integration_tests/recovery/scale_in_when_recovery.rs b/src/tests/simulation/tests/integration_tests/recovery/scale_in_when_recovery.rs
index 2f57afff7b544..9fe792b25b3b0 100644
--- a/src/tests/simulation/tests/integration_tests/recovery/scale_in_when_recovery.rs
+++ b/src/tests/simulation/tests/integration_tests/recovery/scale_in_when_recovery.rs
@@ -18,17 +18,9 @@ use anyhow::Result;
 use risingwave_simulation::cluster::{Cluster, Configuration};
 use risingwave_simulation::ctl_ext::predicate::identity_contains;
 use tokio::time::sleep;
-use tracing_subscriber::EnvFilter;
 
 #[tokio::test]
 async fn test_scale_in_when_recovery() -> Result<()> {
-    _ = tracing_subscriber::fmt()
-        .with_env_filter(EnvFilter::from_default_env())
-        // no ANSI color codes when output to file
-        .with_ansi(console::colors_enabled_stderr() && console::colors_enabled())
-        .with_writer(std::io::stderr)
-        .try_init();
-
     let config = Configuration::for_auto_scale();
     let mut cluster = Cluster::start(config.clone()).await?;
     let mut session = cluster.start_session();