1
1
use crate :: utils:: { write_metric, Metric , MetricFamily } ;
2
- use solana_runtime:: snapshot_archive_info:: { SnapshotArchiveInfo , SnapshotArchiveInfoGetter } ;
2
+ use solana_runtime:: snapshot_archive_info:: SnapshotArchiveInfoGetter ;
3
3
use solana_runtime:: snapshot_config:: SnapshotConfig ;
4
4
use solana_runtime:: snapshot_utils;
5
- use solana_sdk:: clock:: Slot ;
6
5
use std:: io;
7
6
8
7
pub fn write_snapshot_metrics < W : io:: Write > (
@@ -11,9 +10,7 @@ pub fn write_snapshot_metrics<W: io::Write>(
11
10
) -> io:: Result < ( ) > {
12
11
let full_snapshot_info = match snapshot_utils:: get_highest_full_snapshot_archive_info (
13
12
& snapshot_config. snapshot_archives_dir ,
14
- )
15
- . map ( |full_snapshot_info| full_snapshot_info. snapshot_archive_info ( ) )
16
- {
13
+ ) {
17
14
Some ( info) => info,
18
15
None => return Ok ( ( ) ) ,
19
16
} ;
@@ -23,7 +20,7 @@ pub fn write_snapshot_metrics<W: io::Write>(
23
20
name : "solana_snapshot_last_full_snapshot_slot" ,
24
21
help : "The slot height of the most recent full snapshot" ,
25
22
type_ : "gauge" ,
26
- metrics : vec ! [ Metric :: new( full_snapshot_info. slot) ] ,
23
+ metrics : vec ! [ Metric :: new( full_snapshot_info. slot( ) ) ] ,
27
24
} ,
28
25
) ?;
29
26
@@ -32,10 +29,8 @@ pub fn write_snapshot_metrics<W: io::Write>(
32
29
let incremental_snapshot_info =
33
30
match snapshot_utils:: get_highest_incremental_snapshot_archive_info (
34
31
& snapshot_config. snapshot_archives_dir ,
35
- slot,
36
- )
37
- . map ( |inc_snapshot_info| inc_snapshot_info. snapshot_archive_info ( ) )
38
- {
32
+ full_snapshot_info. slot ( ) ,
33
+ ) {
39
34
None => return Ok ( ( ) ) ,
40
35
Some ( info) => info,
41
36
} ;
@@ -45,7 +40,7 @@ pub fn write_snapshot_metrics<W: io::Write>(
45
40
name : "solana_snapshot_last_incremental_snapshot_slot" ,
46
41
help : "The slot height of the most recent incremental snapshot" ,
47
42
type_ : "gauge" ,
48
- metrics : vec ! [ Metric :: new( incremental_snapshot_info. slot) ] ,
43
+ metrics : vec ! [ Metric :: new( incremental_snapshot_info. slot( ) ) ] ,
49
44
} ,
50
45
)
51
46
}
0 commit comments