fix e2e_test token validate

Signed-off-by: junxiang Mu <1948535941@qq.com>

common/protos/src/generated/flatbuffers_generated/models.rs

@@ -1,9 +1,10 @@
 // automatically generated by the FlatBuffers compiler, do not modify
 
+
 // @generated
 
-use core::cmp::Ordering;
 use core::mem;
+use core::cmp::Ordering;
 
 extern crate flatbuffers;
 use self::flatbuffers::{EndianScalar, Follow};
@@ -11,8 +12,8 @@ use self::flatbuffers::{EndianScalar, Follow};
 #[allow(unused_imports, dead_code)]
 pub mod models {
 
-    use core::cmp::Ordering;
   use core::mem;
+  use core::cmp::Ordering;
 
   extern crate flatbuffers;
   use self::flatbuffers::{EndianScalar, Follow};
@@ -28,9 +29,7 @@ pub mod models {
   type Inner = PingBody<'a>;
   #[inline]
   unsafe fn follow(buf: &'a [u8], loc: usize) -> Self::Inner {
-            Self {
+    Self { _tab: flatbuffers::Table::new(buf, loc) }
-                _tab: flatbuffers::Table::new(buf, loc),
-            }
   }
 }
 
@@ -48,30 +47,28 @@ pub mod models {
   #[allow(unused_mut)]
   pub fn create<'bldr: 'args, 'args: 'mut_bldr, 'mut_bldr, A: flatbuffers::Allocator + 'bldr>(
     _fbb: &'mut_bldr mut flatbuffers::FlatBufferBuilder<'bldr, A>,
-            args: &'args PingBodyArgs<'args>,
+    args: &'args PingBodyArgs<'args>
   ) -> flatbuffers::WIPOffset<PingBody<'bldr>> {
     let mut builder = PingBodyBuilder::new(_fbb);
-            if let Some(x) = args.payload {
+    if let Some(x) = args.payload { builder.add_payload(x); }
-                builder.add_payload(x);
-            }
     builder.finish()
   }
 
+
   #[inline]
   pub fn payload(&self) -> Option<flatbuffers::Vector<'a, u8>> {
     // Safety:
     // Created from valid Table for this object
     // which contains a valid value in this slot
-            unsafe {
+    unsafe { self._tab.get::<flatbuffers::ForwardsUOffset<flatbuffers::Vector<'a, u8>>>(PingBody::VT_PAYLOAD, None)}
-                self._tab
-                    .get::<flatbuffers::ForwardsUOffset<flatbuffers::Vector<'a, u8>>>(PingBody::VT_PAYLOAD, None)
-            }
   }
 }
 
 impl flatbuffers::Verifiable for PingBody<'_> {
   #[inline]
-        fn run_verifier(v: &mut flatbuffers::Verifier, pos: usize) -> Result<(), flatbuffers::InvalidFlatbuffer> {
+  fn run_verifier(
+    v: &mut flatbuffers::Verifier, pos: usize
+  ) -> Result<(), flatbuffers::InvalidFlatbuffer> {
     use self::flatbuffers::Verifiable;
     v.visit_table(pos)?
      .visit_field::<flatbuffers::ForwardsUOffset<flatbuffers::Vector<'_, u8>>>("payload", Self::VT_PAYLOAD, false)?
@@ -85,7 +82,9 @@ pub mod models {
 impl<'a> Default for PingBodyArgs<'a> {
   #[inline]
   fn default() -> Self {
-            PingBodyArgs { payload: None }
+    PingBodyArgs {
+      payload: None,
+    }
   }
 }
 
@@ -96,8 +95,7 @@ pub mod models {
 impl<'a: 'b, 'b, A: flatbuffers::Allocator + 'a> PingBodyBuilder<'a, 'b, A> {
   #[inline]
   pub fn add_payload(&mut self, payload: flatbuffers::WIPOffset<flatbuffers::Vector<'b , u8>>) {
-            self.fbb_
+    self.fbb_.push_slot_always::<flatbuffers::WIPOffset<_>>(PingBody::VT_PAYLOAD, payload);
-                .push_slot_always::<flatbuffers::WIPOffset<_>>(PingBody::VT_PAYLOAD, payload);
   }
   #[inline]
   pub fn new(_fbb: &'b mut flatbuffers::FlatBufferBuilder<'a, A>) -> PingBodyBuilder<'a, 'b, A> {
@@ -122,3 +120,4 @@ pub mod models {
   }
 }
 }  // pub mod models
+

e2e_test/src/reliant/lock.rs

@@ -1,55 +1,18 @@
 #![cfg(test)]
 
-use std::{collections::HashMap, error::Error, sync::Arc, time::Duration, vec};
+use std::{error::Error, sync::Arc, time::Duration};
 
-use lazy_static::lazy_static;
 use lock::{
     drwmutex::Options,
     lock_args::LockArgs,
     namespace_lock::{new_nslock, NsLockMap},
     new_lock_api,
 };
-use protos::proto_gen::node_service::{node_service_client::NodeServiceClient, GenerallyLockRequest};
+use protos::{node_service_time_out_client, proto_gen::node_service::GenerallyLockRequest};
 use tokio::sync::RwLock;
-use tonic::{
+use tonic::Request;
-    metadata::MetadataValue,
-    service::interceptor::InterceptedService,
-    transport::{Channel, Endpoint},
-    Request, Status,
-};
 
-lazy_static! {
+const CLUSTER_ADDR: &str = "http://localhost:9000";
-    pub static ref GLOBAL_Conn_Map: RwLock<HashMap<String, Channel>> = RwLock::new(HashMap::new());
-}
-
-async fn get_client() -> Result<
-    NodeServiceClient<
-        InterceptedService<Channel, Box<dyn Fn(Request<()>) -> Result<Request<()>, Status> + Send + Sync + 'static>>,
-    >,
-    Box<dyn Error>,
-> {
-    let token: MetadataValue<_> = "rustfs rpc".parse()?;
-    let channel = match GLOBAL_Conn_Map.read().await.get("local") {
-        Some(channel) => channel.clone(),
-        None => {
-            println!("get channel start");
-            let connector = Endpoint::from_static("http://localhost:9000").connect_timeout(Duration::from_secs(60));
-            let channel = connector.connect().await?;
-            // let channel = Channel::from_static("http://localhost:9000").connect().await?;
-            channel
-        }
-    };
-    GLOBAL_Conn_Map.write().await.insert("local".to_owned(), channel.clone());
-
-    // let timeout_channel = Timeout::new(channel, Duration::from_secs(60));
-    Ok(NodeServiceClient::with_interceptor(
-        channel,
-        Box::new(move |mut req: Request<()>| {
-            req.metadata_mut().insert("authorization", token.clone());
-            Ok(req)
-        }),
-    ))
-}
 
 #[tokio::test]
 async fn test_lock_unlock_rpc() -> Result<(), Box<dyn Error>> {
@@ -62,7 +25,7 @@ async fn test_lock_unlock_rpc() -> Result<(), Box<dyn Error>> {
     };
     let args = serde_json::to_string(&args)?;
 
-    let mut client = get_client().await?;
+    let mut client = node_service_time_out_client(&CLUSTER_ADDR.to_string()).await?;
     println!("got client");
     let request = Request::new(GenerallyLockRequest { args: args.clone() });
 

e2e_test/src/reliant/node_interact_test.rs

@@ -3,17 +3,13 @@
 use ecstore::disk::VolumeInfo;
 use protos::{
     models::{PingBody, PingBodyBuilder},
-    proto_gen::node_service::{
+    node_service_time_out_client,
-        node_service_client::NodeServiceClient, ListVolumesRequest, MakeVolumeRequest, PingRequest, PingResponse, ReadAllRequest,
+    proto_gen::node_service::{ListVolumesRequest, MakeVolumeRequest, PingRequest, PingResponse, ReadAllRequest},
-    },
 };
 use std::error::Error;
 use tonic::Request;
 
-async fn get_client() -> Result<NodeServiceClient<tonic::transport::Channel>, Box<dyn Error>> {
+const CLUSTER_ADDR: &str = "http://localhost:9000";
-    // Ok(NodeServiceClient::connect("http://220.181.1.138:9000").await?)
-    Ok(NodeServiceClient::connect("http://localhost:9000").await?)
-}
 
 #[tokio::test]
 async fn ping() -> Result<(), Box<dyn Error>> {
@@ -31,7 +27,7 @@ async fn ping() -> Result<(), Box<dyn Error>> {
     assert!(decoded_payload.is_ok());
 
     // 创建客户端
-    let mut client = get_client().await?;
+    let mut client = node_service_time_out_client(&CLUSTER_ADDR.to_string()).await?;
 
     // 构造 PingRequest
     let request = Request::new(PingRequest {
@@ -55,7 +51,7 @@ async fn ping() -> Result<(), Box<dyn Error>> {
 
 #[tokio::test]
 async fn make_volume() -> Result<(), Box<dyn Error>> {
-    let mut client = get_client().await?;
+    let mut client = node_service_time_out_client(&CLUSTER_ADDR.to_string()).await?;
     let request = Request::new(MakeVolumeRequest {
         disk: "data".to_string(),
         volume: "dandan".to_string(),
@@ -72,7 +68,7 @@ async fn make_volume() -> Result<(), Box<dyn Error>> {
 
 #[tokio::test]
 async fn list_volumes() -> Result<(), Box<dyn Error>> {
-    let mut client = get_client().await?;
+    let mut client = node_service_time_out_client(&CLUSTER_ADDR.to_string()).await?;
     let request = Request::new(ListVolumesRequest {
         disk: "data".to_string(),
     });
@@ -90,7 +86,7 @@ async fn list_volumes() -> Result<(), Box<dyn Error>> {
 
 #[tokio::test]
 async fn read_all() -> Result<(), Box<dyn Error>> {
-    let mut client = get_client().await?;
+    let mut client = node_service_time_out_client(&CLUSTER_ADDR.to_string()).await?;
     let request = Request::new(ReadAllRequest {
         disk: "data".to_string(),
         volume: "ff".to_string(),