File tree Expand file tree Collapse file tree 3 files changed +14
-10
lines changed Expand file tree Collapse file tree 3 files changed +14
-10
lines changed Original file line number Diff line number Diff line change @@ -1903,7 +1903,7 @@ mod test {
19031903 address: compute_node. to_string( ) ,
19041904 } ] ,
19051905 storage_nodes : vec ! [ ] ,
1906- user_nodes : vec ! [ ] ,
1906+ user_nodes : Some ( vec ! [ ] ) ,
19071907 compute_raft : 0 ,
19081908 compute_raft_tick_timeout : 10 ,
19091909 compute_mining_event_timeout : 500 ,
Original file line number Diff line number Diff line change @@ -114,7 +114,7 @@ pub struct ComputeNodeConfig {
114114 /// All storage nodes addresses: only use first
115115 pub storage_nodes : Vec < NodeSpec > ,
116116 /// All user nodes addresses
117- pub user_nodes : Vec < NodeSpec > ,
117+ pub user_nodes : Option < Vec < NodeSpec > > ,
118118 /// Whether compute node will use raft or act independently (0)
119119 pub compute_raft : usize ,
120120 /// API port
Original file line number Diff line number Diff line change @@ -1136,6 +1136,17 @@ async fn init_compute(
11361136) -> ArcComputeNode {
11371137 let node_info = & info. node_infos [ name] ;
11381138 let compute_raft = usize:: from ( config. compute_raft ) ;
1139+ let mut user_nodes = None ;
1140+
1141+ if info. user_nodes . len ( ) > 0 {
1142+ user_nodes = Some (
1143+ info. user_nodes . clone ( ) . into_iter ( )
1144+ . map ( |v| NodeSpec {
1145+ address : v. to_string ( ) ,
1146+ } )
1147+ . collect :: < Vec < NodeSpec > > ( ) ,
1148+ ) ;
1149+ }
11391150
11401151 let config = ComputeNodeConfig {
11411152 compute_db_mode : node_info. db_mode ,
@@ -1159,14 +1170,7 @@ async fn init_compute(
11591170 address : v. to_string ( ) ,
11601171 } )
11611172 . collect :: < Vec < NodeSpec > > ( ) ,
1162- user_nodes : info
1163- . user_nodes
1164- . clone ( )
1165- . into_iter ( )
1166- . map ( |v| NodeSpec {
1167- address : v. to_string ( ) ,
1168- } )
1169- . collect :: < Vec < NodeSpec > > ( ) ,
1173+ user_nodes,
11701174 compute_raft,
11711175 compute_raft_tick_timeout : 200 / config. test_duration_divider ,
11721176 compute_mining_event_timeout : 500 / config. test_duration_divider ,
You can’t perform that action at this time.
0 commit comments