@@ -61,15 +61,13 @@ use super::{
61
61
writer:: Writer ,
62
62
StagingError ,
63
63
} ,
64
- LogStream ,
64
+ LogStream , ARROW_FILE_EXTENSION ,
65
65
} ;
66
66
67
67
#[ derive( Debug , thiserror:: Error ) ]
68
68
#[ error( "Stream not found: {0}" ) ]
69
69
pub struct StreamNotFound ( pub String ) ;
70
70
71
- const ARROW_FILE_EXTENSION : & str = "data.arrows" ;
72
-
73
71
pub type StreamRef = Arc < Stream > ;
74
72
75
73
/// All state associated with a single logstream in Parseable.
@@ -486,10 +484,12 @@ impl Stream {
486
484
}
487
485
writer. close ( ) ?;
488
486
489
- if part_file. metadata ( ) . unwrap ( ) . len ( ) < parquet:: file:: FOOTER_SIZE as u64 {
487
+ if part_file. metadata ( ) . expect ( "File was just created" ) . len ( )
488
+ < parquet:: file:: FOOTER_SIZE as u64
489
+ {
490
490
error ! (
491
- "Invalid parquet file {:?} detected for stream {}, removing it" ,
492
- & part_path , & self . stream_name
491
+ "Invalid parquet file {part_path :?} detected for stream {}, removing it" ,
492
+ & self . stream_name
493
493
) ;
494
494
remove_file ( part_path) . unwrap ( ) ;
495
495
} else {
@@ -501,15 +501,22 @@ impl Stream {
501
501
}
502
502
503
503
for file in arrow_files {
504
- // warn!("file-\n{file:?}\n");
505
- let file_size = file. metadata ( ) . unwrap ( ) . len ( ) ;
506
- let file_type = file. extension ( ) . unwrap ( ) . to_str ( ) . unwrap ( ) ;
507
- if remove_file ( file. clone ( ) ) . is_err ( ) {
504
+ let file_size = match file. metadata ( ) {
505
+ Ok ( meta) => meta. len ( ) ,
506
+ Err ( err) => {
507
+ warn ! (
508
+ "Looks like the file ({}) was removed; Error = {err}" ,
509
+ file. display( )
510
+ ) ;
511
+ continue ;
512
+ }
513
+ } ;
514
+ if remove_file ( & file) . is_err ( ) {
508
515
error ! ( "Failed to delete file. Unstable state" ) ;
509
516
process:: abort ( )
510
517
}
511
518
metrics:: STORAGE_SIZE
512
- . with_label_values ( & [ "staging" , & self . stream_name , file_type ] )
519
+ . with_label_values ( & [ "staging" , & self . stream_name , ARROW_FILE_EXTENSION ] )
513
520
. sub ( file_size as i64 ) ;
514
521
}
515
522
}
0 commit comments