@@ -151,23 +151,24 @@ pub struct Engine {
151151}
152152
153153struct DownloadContext < ' a , T > {
154+ engine : & ' a Engine ,
154155 client : Arc < dyn FullNodeOverlayClient > ,
155- db : & ' a InternalDb ,
156156 downloader : Arc < dyn Downloader < Item = T > > ,
157157 id : & ' a BlockIdExt ,
158158 limit : Option < u32 > ,
159159 log_error_limit : u32 ,
160160 name : & ' a str ,
161161 timeout : Option < ( u64 , u64 , u64 ) > , // (current, multiplier*10, max)
162- #[ cfg( feature = "telemetry" ) ]
163- full_node_telemetry : & ' a FullNodeTelemetry ,
164162}
165163
166164impl < T > DownloadContext < ' _ , T > {
167165
168166 async fn download ( & mut self ) -> Result < T > {
169167 let mut attempt = 1 ;
170168 loop {
169+ if self . engine . check_stop ( ) {
170+ fail ! ( "{} id: {}, stop flag was set" , self . name, self . id) ;
171+ }
171172 match self . downloader . try_download ( self ) . await {
172173 Err ( e) => self . log ( format ! ( "{}" , e) . as_str ( ) , attempt) ,
173174 Ok ( ret) => break Ok ( ret)
@@ -219,10 +220,10 @@ impl Downloader for BlockDownloader {
219220 & self ,
220221 context : & DownloadContext < ' _ , Self :: Item > ,
221222 ) -> Result < Self :: Item > {
222- if let Some ( handle) = context. db . load_block_handle ( context. id ) ? {
223+ if let Some ( handle) = context. engine . db . load_block_handle ( context. id ) ? {
223224 let mut is_link = false ;
224225 if handle. has_data ( ) && handle. has_proof_or_link ( & mut is_link) {
225- let block = match context. db . load_block_data ( & handle) . await {
226+ let block = match context. engine . db . load_block_data ( & handle) . await {
226227 Err ( e) => if !handle. has_data ( ) {
227228 None
228229 } else {
@@ -233,7 +234,7 @@ impl Downloader for BlockDownloader {
233234 let proof = if block. is_none ( ) {
234235 None
235236 } else {
236- match context. db . load_block_proof ( & handle, is_link) . await {
237+ match context. engine . db . load_block_proof ( & handle, is_link) . await {
237238 Err ( e) => if is_link && !handle. has_proof_link ( ) {
238239 None
239240 } else if !is_link && !handle. has_proof ( ) {
@@ -252,11 +253,11 @@ impl Downloader for BlockDownloader {
252253 }
253254 }
254255 #[ cfg( feature = "telemetry" ) ]
255- context. full_node_telemetry . new_downloading_block_attempt ( context. id ) ;
256+ context. engine . full_node_telemetry . new_downloading_block_attempt ( context. id ) ;
256257 let ret = context. client . download_block_full ( context. id ) . await ;
257258 #[ cfg( feature = "telemetry" ) ]
258259 if ret. is_ok ( ) {
259- context. full_node_telemetry . new_downloaded_block ( context. id ) ;
260+ context. engine . full_node_telemetry . new_downloaded_block ( context. id ) ;
260261 }
261262 ret
262263 }
@@ -274,10 +275,10 @@ impl Downloader for BlockProofDownloader {
274275 & self ,
275276 context : & DownloadContext < ' _ , Self :: Item > ,
276277 ) -> Result < Self :: Item > {
277- if let Some ( handle) = context. db . load_block_handle ( context. id ) ? {
278+ if let Some ( handle) = context. engine . db . load_block_handle ( context. id ) ? {
278279 let mut is_link = false ;
279280 if handle. has_proof_or_link ( & mut is_link) {
280- return Ok ( context. db . load_block_proof ( & handle, is_link) . await ?) ;
281+ return Ok ( context. engine . db . load_block_proof ( & handle, is_link) . await ?) ;
281282 }
282283 }
283284 context. client . download_block_proof (
@@ -297,15 +298,15 @@ impl Downloader for NextBlockDownloader {
297298 & self ,
298299 context : & DownloadContext < ' _ , Self :: Item > ,
299300 ) -> Result < Self :: Item > {
300- if let Some ( prev_handle) = context. db . load_block_handle ( context. id ) ? {
301+ if let Some ( prev_handle) = context. engine . db . load_block_handle ( context. id ) ? {
301302 if prev_handle. has_next1 ( ) {
302- let next_id = context. db . load_block_next1 ( context. id ) ?;
303- if let Some ( next_handle) = context. db . load_block_handle ( & next_id) ? {
303+ let next_id = context. engine . db . load_block_next1 ( context. id ) ?;
304+ if let Some ( next_handle) = context. engine . db . load_block_handle ( & next_id) ? {
304305 let mut is_link = false ;
305306 if next_handle. has_data ( ) && next_handle. has_proof_or_link ( & mut is_link) {
306307 return Ok ( (
307- context. db . load_block_data ( & next_handle) . await ?,
308- context. db . load_block_proof ( & next_handle, is_link) . await ?
308+ context. engine . db . load_block_data ( & next_handle) . await ?,
309+ context. engine . db . load_block_proof ( & next_handle, is_link) . await ?
309310 ) ) ;
310311 }
311312 }
@@ -324,9 +325,9 @@ impl Downloader for ZeroStateDownloader {
324325 & self ,
325326 context : & DownloadContext < ' _ , Self :: Item > ,
326327 ) -> Result < Self :: Item > {
327- if let Some ( handle) = context. db . load_block_handle ( context. id ) ? {
328+ if let Some ( handle) = context. engine . db . load_block_handle ( context. id ) ? {
328329 if handle. has_state ( ) {
329- let zs = context. db . load_shard_state_dynamic ( context. id ) ?;
330+ let zs = context. engine . db . load_shard_state_dynamic ( context. id ) ?;
330331 let mut data = vec ! ( ) ;
331332 zs. write_to ( & mut data) ?;
332333 return Ok ( ( zs, data) ) ;
@@ -1306,15 +1307,13 @@ impl Engine {
13061307 id. shard ( ) . workchain_id ( ) ,
13071308 id. shard ( ) . shard_prefix_with_tag ( )
13081309 ) . await ?,
1309- db : self . db . deref ( ) ,
1310+ engine : self ,
13101311 downloader,
13111312 id,
13121313 limit,
13131314 log_error_limit,
13141315 name,
13151316 timeout,
1316- #[ cfg( feature = "telemetry" ) ]
1317- full_node_telemetry : self . full_node_telemetry ( ) ,
13181317 } ;
13191318 Ok ( ret)
13201319 }
@@ -1546,78 +1545,70 @@ impl Engine {
15461545
15471546 async fn check_gc_for_archives (
15481547 engine : & Arc < Engine > ,
1549- curr_block_handle : & Arc < BlockHandle > ,
1548+ last_keyblock : & Arc < BlockHandle > ,
15501549 mc_state : & ShardStateStuff
15511550 ) -> Result < ( ) > {
1552- let mut prev_pss_block = None ;
1553- let mut prev_prev_pss_block = None ;
1554- let mut handle = curr_block_handle. clone ( ) ;
1555- let mut check_date = std:: time:: SystemTime :: now ( ) . duration_since ( std:: time:: UNIX_EPOCH ) ?;
1556-
1551+ let mut gc_max_date = std:: time:: SystemTime :: now ( ) . duration_since ( std:: time:: UNIX_EPOCH ) ?;
15571552 match & engine. archives_life_time {
15581553 None => return Ok ( ( ) ) ,
15591554 Some ( life_time) => {
1560- match check_date . checked_sub ( Duration :: from_secs ( ( life_time * 3600 ) as u64 ) ) {
1555+ match gc_max_date . checked_sub ( Duration :: from_secs ( ( life_time * 3600 ) as u64 ) ) {
15611556 Some ( date) => {
15621557 log:: info!( "archive gc: checked date {}." , & date. as_secs( ) ) ;
1563- check_date = date
1558+ gc_max_date = date
15641559 } ,
15651560 None => {
15661561 log:: info!( "archive gc: life_time in config is bad, actual checked date: {}" ,
1567- & check_date . as_secs( )
1562+ & gc_max_date . as_secs( )
15681563 ) ;
15691564 }
15701565 }
15711566 }
15721567 }
15731568
1569+ let mut visited_pss_blocks = 0 ;
1570+ let mut keyblock = last_keyblock. clone ( ) ;
1571+ let prev_blocks = & mc_state. shard_state_extra ( ) ?. prev_blocks ;
15741572 loop {
1575- if handle. id ( ) . seq_no ( ) == 0 {
1576- return Ok ( ( ) ) ;
1577- }
1578-
1579- if let Some ( prev_key_block_id) =
1580- mc_state. shard_state_extra ( ) ?. prev_blocks . get_prev_key_block ( handle. id ( ) . seq_no ( ) - 1 ) ? {
1581-
1582- let block_id = BlockIdExt {
1583- shard_id : ShardIdent :: masterchain ( ) ,
1584- seq_no : prev_key_block_id. seq_no ,
1585- root_hash : prev_key_block_id. root_hash ,
1586- file_hash : prev_key_block_id. file_hash
1587- } ;
1588- let prev_handle = engine. load_block_handle ( & block_id) ?. ok_or_else (
1589- || error ! ( "Cannot load handle for PSS keeper prev key block {}" , block_id)
1590- ) ?;
1591- if engine. is_persistent_state ( curr_block_handle. gen_utime ( ) ?,
1592- prev_handle. gen_utime ( ) ?, boot:: PSS_PERIOD_BITS ) {
1593- prev_prev_pss_block = prev_pss_block;
1594- prev_pss_block = Some ( prev_handle. clone ( ) ) ;
1595- }
1596- handle = prev_handle;
1597-
1598- if let Some ( pss_block) = & prev_prev_pss_block {
1599- let gen_time = pss_block. gen_utime ( ) ? as u64 ;
1600- let check_date = check_date. as_secs ( ) ;
1601- if gen_time < check_date {
1602- log:: info!(
1603- "gc for archives: found block (gen time: {}, seq_no: {}), check date: {}" ,
1604- & gen_time, pss_block. id( ) . seq_no( ) , & check_date
1605- ) ;
1606- break ;
1573+ match prev_blocks. get_prev_key_block ( keyblock. id ( ) . seq_no ( ) - 1 ) ? {
1574+ None => return Ok ( ( ) ) ,
1575+ Some ( prev_keyblock) => {
1576+ let prev_keyblock = BlockIdExt :: from_ext_blk ( prev_keyblock) ;
1577+ let prev_keyblock = engine. load_block_handle ( & prev_keyblock) ?. ok_or_else (
1578+ || error ! ( "Cannot load handle for PSS keeper prev key block {}" , prev_keyblock)
1579+ ) ?;
1580+ if engine. is_persistent_state (
1581+ keyblock. gen_utime ( ) ?, prev_keyblock. gen_utime ( ) ?, boot:: PSS_PERIOD_BITS
1582+ ) {
1583+ visited_pss_blocks += 1 ;
1584+
1585+ // Due to boot process specific (pss period and key_block_utime_step combinations)
1586+ // we shouldn't delete last 4 pss blocks
1587+ // ....................pss_block....pss_block....pss_block....pss_block...
1588+ // visited_pss_blocks: 4 3 2 1
1589+ // ↑ we may delete blocks starting at least here (before 4th pss)
1590+ if visited_pss_blocks >= 4 {
1591+ let gen_time = keyblock. gen_utime ( ) ? as u64 ;
1592+ let gc_max_date = gc_max_date. as_secs ( ) ;
1593+ if gen_time < gc_max_date {
1594+ log:: info!(
1595+ "gc for archives: found block (gen time: {}, seq_no: {}), gc max date: {}" ,
1596+ & gen_time, keyblock. id( ) . seq_no( ) , & gc_max_date
1597+ ) ;
1598+ log:: info!( "start gc for archives.." ) ;
1599+ engine. db . archive_manager ( ) . gc ( & keyblock. id ( ) ) . await ;
1600+ log:: info!( "finish gc for archives." ) ;
1601+ return Ok ( ( ) ) ;
1602+ }
1603+ }
1604+ }
1605+ if prev_keyblock. id ( ) . seq_no ( ) == 0 {
1606+ return Ok ( ( ) ) ;
16071607 }
1608+ keyblock = prev_keyblock;
16081609 }
1609- } else {
1610- return Ok ( ( ) ) ;
16111610 }
16121611 }
1613-
1614- if let Some ( gc_marked_block) = & prev_prev_pss_block {
1615- log:: info!( "start gc for archives.." ) ;
1616- engine. db . archive_manager ( ) . gc ( & gc_marked_block. id ( ) ) . await ;
1617- log:: info!( "finish gc for archives." ) ;
1618- }
1619-
1620- Ok ( ( ) )
16211612 }
16221613
16231614 fn check_finish_sync ( self : Arc < Self > ) {
0 commit comments