Merge branch 'main' into wangzheng/recovery_cause

# Conflicts:
#	src/compute/src/rpc/service/stream_service.rs
#	src/meta/src/barrier/mod.rs
#	src/meta/src/barrier/rpc.rs
#	src/stream/src/task/stream_manager.rs

src/meta/src/barrier/rpc.rs

@@ -17,15 +17,13 @@ use std::future::Future;
 use std::sync::Arc;
 
 use anyhow::anyhow;
-use either::Either;
 use fail::fail_point;
 use futures::future::try_join_all;
 use futures::stream::FuturesUnordered;
 use futures::{FutureExt, StreamExt};
 use itertools::Itertools;
 use risingwave_common::bail;
 use risingwave_common::hash::ActorId;
-use risingwave_common::util::iter_util::ZipEqDebug;
 use risingwave_common::util::tracing::TracingContext;
 use risingwave_pb::common::{ActorInfo, WorkerNode};
 use risingwave_pb::stream_plan::{Barrier, BarrierMutation, StreamActor};
@@ -394,6 +392,7 @@ impl StreamRpcManager {
     }
 }
 
+#[allow(dead_code)]
 fn merge_compute_node_rpc_error(
     message: &str,
     errors: impl IntoIterator<Item = (WorkerId, RpcError)>,