Skip to content

Commit 74dc549

Browse files
jherrera-jumpjherrera-jump
committed
restore, repair, replay: boot screen metrics
1 parent c30ea13 commit 74dc549

File tree

18 files changed

+278
-238
lines changed

18 files changed

+278
-238
lines changed

‎book/api/metrics-generated.md

Lines changed: 3 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -484,17 +484,6 @@
484484

485485
</div>
486486

487-
## Storei Tile
488-
489-
<div class="metrics">
490-
491-
| Metric | Type | Description |
492-
|--------|------|-------------|
493-
| <span class="metrics-name">storei_&#8203;first_&#8203;turbine_&#8203;slot</span> | gauge | |
494-
| <span class="metrics-name">storei_&#8203;current_&#8203;turbine_&#8203;slot</span> | gauge | |
495-
496-
</div>
497-
498487
## Gossip Tile
499488

500489
<div class="metrics">
@@ -720,6 +709,9 @@
720709

721710
| Metric | Type | Description |
722711
|--------|------|-------------|
712+
| <span class="metrics-name">repair_&#8203;first_&#8203;turbine_&#8203;slot</span> | gauge | |
713+
| <span class="metrics-name">repair_&#8203;latest_&#8203;turbine_&#8203;slot</span> | gauge | |
714+
| <span class="metrics-name">repair_&#8203;latest_&#8203;repair_&#8203;slot</span> | gauge | |
723715
| <span class="metrics-name">repair_&#8203;recv_&#8203;clnt_&#8203;pkt</span> | counter | Now many client packets have we received |
724716
| <span class="metrics-name">repair_&#8203;recv_&#8203;serv_&#8203;pkt</span> | counter | How many server packets have we received |
725717
| <span class="metrics-name">repair_&#8203;recv_&#8203;serv_&#8203;corrupt_&#8203;pkt</span> | counter | How many corrupt server packets have we received |

‎src/app/firedancer/topology.c

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -788,22 +788,22 @@ fd_topo_initialize( config_t * config ) {
788788
fd_topob_wksp( topo, "plugin_out" );
789789
fd_topob_wksp( topo, "plugin" );
790790

791-
/**/ fd_topob_link( topo, "plugin_out", "plugin_out", 128UL, 8UL+40200UL*(58UL+12UL*34UL), 1UL );
792-
/**/ fd_topob_link( topo, "replay_plugi", "plugin_in", 128UL, 4098*8UL, 1UL );
793-
/**/ fd_topob_link( topo, "gossip_plugi", "plugin_in", 128UL, 8UL+40200UL*(58UL+12UL*34UL), 1UL );
794-
/**/ fd_topob_link( topo, "votes_plugin", "plugin_in", 128UL, 8UL+40200UL*(58UL+12UL*34UL), 1UL );
791+
/**/ fd_topob_link( topo, "plugin_out", "plugin_out", 128UL, 8UL+40200UL*(58UL+12UL*34UL), 1UL );
792+
/**/ fd_topob_link( topo, "replay_plugi", "plugin_in", 128UL, 4098*8UL, 1UL );
793+
/**/ fd_topob_link( topo, "gossip_plugi", "plugin_in", 128UL, 8UL+40200UL*(58UL+12UL*34UL), 1UL );
794+
/**/ fd_topob_link( topo, "snaprd_plugi", "plugin_in", 128UL, sizeof(fd_restore_snapshot_update_t), 1UL );
795795

796796
/**/ fd_topob_tile( topo, "plugin", "plugin", "metric_in", tile_to_cpu[ topo->tile_cnt ], 0, 0 );
797797

798798
/**/ fd_topob_tile_out( topo, "replay", 0UL, "replay_plugi", 0UL );
799-
/**/ fd_topob_tile_out( topo, "replay", 0UL, "votes_plugin", 0UL );
800799
/**/ fd_topob_tile_out( topo, "gossip", 0UL, "gossip_plugi", 0UL );
801-
/**/ fd_topob_tile_out( topo, "plugin", 0UL, "plugin_out", 0UL );
800+
/**/ fd_topob_tile_out( topo, "plugin", 0UL, "plugin_out", 0UL );
801+
/**/ fd_topob_tile_out( topo, "snaprd", 0UL, "snaprd_plugi", 0UL );
802802

803803
/**/ fd_topob_tile_in( topo, "plugin", 0UL, "metric_in", "replay_plugi", 0UL, FD_TOPOB_RELIABLE, FD_TOPOB_POLLED );
804804
/**/ fd_topob_tile_in( topo, "plugin", 0UL, "metric_in", "gossip_plugi", 0UL, FD_TOPOB_RELIABLE, FD_TOPOB_POLLED );
805805
/**/ fd_topob_tile_in( topo, "plugin", 0UL, "metric_in", "stake_out", 0UL, FD_TOPOB_RELIABLE, FD_TOPOB_POLLED );
806-
/**/ fd_topob_tile_in( topo, "plugin", 0UL, "metric_in", "votes_plugin", 0UL, FD_TOPOB_RELIABLE, FD_TOPOB_POLLED );
806+
/**/ fd_topob_tile_in( topo, "plugin", 0UL, "metric_in", "snaprd_plugi", 0UL, FD_TOPOB_RELIABLE, FD_TOPOB_POLLED );
807807
}
808808

809809
if( FD_LIKELY( config->tiles.gui.enabled ) ) {

‎src/disco/gui/fd_gui.c

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1706,6 +1706,10 @@ fd_gui_plugin_message( fd_gui_t * gui,
17061706
fd_gui_handle_block_engine_update( gui, msg );
17071707
break;
17081708
}
1709+
case FD_PLUGIN_MSG_SNAPSHOT_UPDATE: {
1710+
/* todo */
1711+
break;
1712+
}
17091713
default:
17101714
FD_LOG_ERR(( "Unhandled plugin msg: 0x%lx", plugin_msg ));
17111715
break;

‎src/disco/metrics/generated/fd_metrics_all.c

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,6 @@ const char * FD_METRICS_TILE_KIND_NAMES[FD_METRICS_TILE_KIND_CNT] = {
4949
"store",
5050
"metric",
5151
"replay",
52-
"storei",
5352
"gossip",
5453
"netlnk",
5554
"sock",
@@ -74,7 +73,6 @@ const ulong FD_METRICS_TILE_KIND_SIZES[FD_METRICS_TILE_KIND_CNT] = {
7473
FD_METRICS_STORE_TOTAL,
7574
FD_METRICS_METRIC_TOTAL,
7675
FD_METRICS_REPLAY_TOTAL,
77-
FD_METRICS_STOREI_TOTAL,
7876
FD_METRICS_GOSSIP_TOTAL,
7977
FD_METRICS_NETLNK_TOTAL,
8078
FD_METRICS_SOCK_TOTAL,
@@ -98,7 +96,6 @@ const fd_metrics_meta_t * FD_METRICS_TILE_KIND_METRICS[FD_METRICS_TILE_KIND_CNT]
9896
FD_METRICS_STORE,
9997
FD_METRICS_METRIC,
10098
FD_METRICS_REPLAY,
101-
FD_METRICS_STOREI,
10299
FD_METRICS_GOSSIP,
103100
FD_METRICS_NETLNK,
104101
FD_METRICS_SOCK,

‎src/disco/metrics/generated/fd_metrics_all.h

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616
#include "fd_metrics_shred.h"
1717
#include "fd_metrics_store.h"
1818
#include "fd_metrics_replay.h"
19-
#include "fd_metrics_storei.h"
2019
#include "fd_metrics_repair.h"
2120
#include "fd_metrics_gossip.h"
2221
#include "fd_metrics_netlnk.h"
@@ -160,7 +159,7 @@ extern const fd_metrics_meta_t FD_METRICS_ALL_LINK_OUT[FD_METRICS_ALL_LINK_OUT_T
160159

161160
#define FD_METRICS_TOTAL_SZ (8UL*253UL)
162161

163-
#define FD_METRICS_TILE_KIND_CNT 22
162+
#define FD_METRICS_TILE_KIND_CNT 21
164163
extern const char * FD_METRICS_TILE_KIND_NAMES[FD_METRICS_TILE_KIND_CNT];
165164
extern const ulong FD_METRICS_TILE_KIND_SIZES[FD_METRICS_TILE_KIND_CNT];
166165
extern const fd_metrics_meta_t * FD_METRICS_TILE_KIND_METRICS[FD_METRICS_TILE_KIND_CNT];

‎src/disco/metrics/generated/fd_metrics_repair.c

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,9 @@
22
#include "fd_metrics_repair.h"
33

44
const fd_metrics_meta_t FD_METRICS_REPAIR[FD_METRICS_REPAIR_TOTAL] = {
5+
DECLARE_METRIC( REPAIR_FIRST_TURBINE_SLOT, GAUGE ),
6+
DECLARE_METRIC( REPAIR_LATEST_TURBINE_SLOT, GAUGE ),
7+
DECLARE_METRIC( REPAIR_LATEST_REPAIR_SLOT, GAUGE ),
58
DECLARE_METRIC( REPAIR_RECV_CLNT_PKT, COUNTER ),
69
DECLARE_METRIC( REPAIR_RECV_SERV_PKT, COUNTER ),
710
DECLARE_METRIC( REPAIR_RECV_SERV_CORRUPT_PKT, COUNTER ),

‎src/disco/metrics/generated/fd_metrics_repair.h

Lines changed: 40 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -3,87 +3,105 @@
33
#include "../fd_metrics_base.h"
44
#include "fd_metrics_enums.h"
55

6-
#define FD_METRICS_COUNTER_REPAIR_RECV_CLNT_PKT_OFF (16UL)
6+
#define FD_METRICS_GAUGE_REPAIR_FIRST_TURBINE_SLOT_OFF (16UL)
7+
#define FD_METRICS_GAUGE_REPAIR_FIRST_TURBINE_SLOT_NAME "repair_first_turbine_slot"
8+
#define FD_METRICS_GAUGE_REPAIR_FIRST_TURBINE_SLOT_TYPE (FD_METRICS_TYPE_GAUGE)
9+
#define FD_METRICS_GAUGE_REPAIR_FIRST_TURBINE_SLOT_DESC ""
10+
#define FD_METRICS_GAUGE_REPAIR_FIRST_TURBINE_SLOT_CVT (FD_METRICS_CONVERTER_NONE)
11+
12+
#define FD_METRICS_GAUGE_REPAIR_LATEST_TURBINE_SLOT_OFF (17UL)
13+
#define FD_METRICS_GAUGE_REPAIR_LATEST_TURBINE_SLOT_NAME "repair_latest_turbine_slot"
14+
#define FD_METRICS_GAUGE_REPAIR_LATEST_TURBINE_SLOT_TYPE (FD_METRICS_TYPE_GAUGE)
15+
#define FD_METRICS_GAUGE_REPAIR_LATEST_TURBINE_SLOT_DESC ""
16+
#define FD_METRICS_GAUGE_REPAIR_LATEST_TURBINE_SLOT_CVT (FD_METRICS_CONVERTER_NONE)
17+
18+
#define FD_METRICS_GAUGE_REPAIR_LATEST_REPAIR_SLOT_OFF (18UL)
19+
#define FD_METRICS_GAUGE_REPAIR_LATEST_REPAIR_SLOT_NAME "repair_latest_repair_slot"
20+
#define FD_METRICS_GAUGE_REPAIR_LATEST_REPAIR_SLOT_TYPE (FD_METRICS_TYPE_GAUGE)
21+
#define FD_METRICS_GAUGE_REPAIR_LATEST_REPAIR_SLOT_DESC ""
22+
#define FD_METRICS_GAUGE_REPAIR_LATEST_REPAIR_SLOT_CVT (FD_METRICS_CONVERTER_NONE)
23+
24+
#define FD_METRICS_COUNTER_REPAIR_RECV_CLNT_PKT_OFF (19UL)
725
#define FD_METRICS_COUNTER_REPAIR_RECV_CLNT_PKT_NAME "repair_recv_clnt_pkt"
826
#define FD_METRICS_COUNTER_REPAIR_RECV_CLNT_PKT_TYPE (FD_METRICS_TYPE_COUNTER)
927
#define FD_METRICS_COUNTER_REPAIR_RECV_CLNT_PKT_DESC "Now many client packets have we received"
1028
#define FD_METRICS_COUNTER_REPAIR_RECV_CLNT_PKT_CVT (FD_METRICS_CONVERTER_NONE)
1129

12-
#define FD_METRICS_COUNTER_REPAIR_RECV_SERV_PKT_OFF (17UL)
30+
#define FD_METRICS_COUNTER_REPAIR_RECV_SERV_PKT_OFF (20UL)
1331
#define FD_METRICS_COUNTER_REPAIR_RECV_SERV_PKT_NAME "repair_recv_serv_pkt"
1432
#define FD_METRICS_COUNTER_REPAIR_RECV_SERV_PKT_TYPE (FD_METRICS_TYPE_COUNTER)
1533
#define FD_METRICS_COUNTER_REPAIR_RECV_SERV_PKT_DESC "How many server packets have we received"
1634
#define FD_METRICS_COUNTER_REPAIR_RECV_SERV_PKT_CVT (FD_METRICS_CONVERTER_NONE)
1735

18-
#define FD_METRICS_COUNTER_REPAIR_RECV_SERV_CORRUPT_PKT_OFF (18UL)
36+
#define FD_METRICS_COUNTER_REPAIR_RECV_SERV_CORRUPT_PKT_OFF (21UL)
1937
#define FD_METRICS_COUNTER_REPAIR_RECV_SERV_CORRUPT_PKT_NAME "repair_recv_serv_corrupt_pkt"
2038
#define FD_METRICS_COUNTER_REPAIR_RECV_SERV_CORRUPT_PKT_TYPE (FD_METRICS_TYPE_COUNTER)
2139
#define FD_METRICS_COUNTER_REPAIR_RECV_SERV_CORRUPT_PKT_DESC "How many corrupt server packets have we received"
2240
#define FD_METRICS_COUNTER_REPAIR_RECV_SERV_CORRUPT_PKT_CVT (FD_METRICS_CONVERTER_NONE)
2341

24-
#define FD_METRICS_COUNTER_REPAIR_RECV_SERV_INVALID_SIGNATURE_OFF (19UL)
42+
#define FD_METRICS_COUNTER_REPAIR_RECV_SERV_INVALID_SIGNATURE_OFF (22UL)
2543
#define FD_METRICS_COUNTER_REPAIR_RECV_SERV_INVALID_SIGNATURE_NAME "repair_recv_serv_invalid_signature"
2644
#define FD_METRICS_COUNTER_REPAIR_RECV_SERV_INVALID_SIGNATURE_TYPE (FD_METRICS_TYPE_COUNTER)
2745
#define FD_METRICS_COUNTER_REPAIR_RECV_SERV_INVALID_SIGNATURE_DESC "How many invalid signatures have we received"
2846
#define FD_METRICS_COUNTER_REPAIR_RECV_SERV_INVALID_SIGNATURE_CVT (FD_METRICS_CONVERTER_NONE)
2947

30-
#define FD_METRICS_COUNTER_REPAIR_RECV_SERV_FULL_PING_TABLE_OFF (20UL)
48+
#define FD_METRICS_COUNTER_REPAIR_RECV_SERV_FULL_PING_TABLE_OFF (23UL)
3149
#define FD_METRICS_COUNTER_REPAIR_RECV_SERV_FULL_PING_TABLE_NAME "repair_recv_serv_full_ping_table"
3250
#define FD_METRICS_COUNTER_REPAIR_RECV_SERV_FULL_PING_TABLE_TYPE (FD_METRICS_TYPE_COUNTER)
3351
#define FD_METRICS_COUNTER_REPAIR_RECV_SERV_FULL_PING_TABLE_DESC "Is our ping table full and causing packet drops"
3452
#define FD_METRICS_COUNTER_REPAIR_RECV_SERV_FULL_PING_TABLE_CVT (FD_METRICS_CONVERTER_NONE)
3553

36-
#define FD_METRICS_COUNTER_REPAIR_RECV_SERV_PKT_TYPES_OFF (21UL)
54+
#define FD_METRICS_COUNTER_REPAIR_RECV_SERV_PKT_TYPES_OFF (24UL)
3755
#define FD_METRICS_COUNTER_REPAIR_RECV_SERV_PKT_TYPES_NAME "repair_recv_serv_pkt_types"
3856
#define FD_METRICS_COUNTER_REPAIR_RECV_SERV_PKT_TYPES_TYPE (FD_METRICS_TYPE_COUNTER)
3957
#define FD_METRICS_COUNTER_REPAIR_RECV_SERV_PKT_TYPES_DESC "Server messages received"
4058
#define FD_METRICS_COUNTER_REPAIR_RECV_SERV_PKT_TYPES_CVT (FD_METRICS_CONVERTER_NONE)
4159
#define FD_METRICS_COUNTER_REPAIR_RECV_SERV_PKT_TYPES_CNT (5UL)
4260

43-
#define FD_METRICS_COUNTER_REPAIR_RECV_SERV_PKT_TYPES_PONG_OFF (21UL)
44-
#define FD_METRICS_COUNTER_REPAIR_RECV_SERV_PKT_TYPES_WINDOW_OFF (22UL)
45-
#define FD_METRICS_COUNTER_REPAIR_RECV_SERV_PKT_TYPES_HIGHEST_WINDOW_OFF (23UL)
46-
#define FD_METRICS_COUNTER_REPAIR_RECV_SERV_PKT_TYPES_ORPHAN_OFF (24UL)
47-
#define FD_METRICS_COUNTER_REPAIR_RECV_SERV_PKT_TYPES_UNKNOWN_OFF (25UL)
61+
#define FD_METRICS_COUNTER_REPAIR_RECV_SERV_PKT_TYPES_PONG_OFF (24UL)
62+
#define FD_METRICS_COUNTER_REPAIR_RECV_SERV_PKT_TYPES_WINDOW_OFF (25UL)
63+
#define FD_METRICS_COUNTER_REPAIR_RECV_SERV_PKT_TYPES_HIGHEST_WINDOW_OFF (26UL)
64+
#define FD_METRICS_COUNTER_REPAIR_RECV_SERV_PKT_TYPES_ORPHAN_OFF (27UL)
65+
#define FD_METRICS_COUNTER_REPAIR_RECV_SERV_PKT_TYPES_UNKNOWN_OFF (28UL)
4866

49-
#define FD_METRICS_COUNTER_REPAIR_RECV_PKT_CORRUPTED_MSG_OFF (26UL)
67+
#define FD_METRICS_COUNTER_REPAIR_RECV_PKT_CORRUPTED_MSG_OFF (29UL)
5068
#define FD_METRICS_COUNTER_REPAIR_RECV_PKT_CORRUPTED_MSG_NAME "repair_recv_pkt_corrupted_msg"
5169
#define FD_METRICS_COUNTER_REPAIR_RECV_PKT_CORRUPTED_MSG_TYPE (FD_METRICS_TYPE_COUNTER)
5270
#define FD_METRICS_COUNTER_REPAIR_RECV_PKT_CORRUPTED_MSG_DESC "How many corrupt messages have we received"
5371
#define FD_METRICS_COUNTER_REPAIR_RECV_PKT_CORRUPTED_MSG_CVT (FD_METRICS_CONVERTER_NONE)
5472

55-
#define FD_METRICS_COUNTER_REPAIR_SEND_PKT_CNT_OFF (27UL)
73+
#define FD_METRICS_COUNTER_REPAIR_SEND_PKT_CNT_OFF (30UL)
5674
#define FD_METRICS_COUNTER_REPAIR_SEND_PKT_CNT_NAME "repair_send_pkt_cnt"
5775
#define FD_METRICS_COUNTER_REPAIR_SEND_PKT_CNT_TYPE (FD_METRICS_TYPE_COUNTER)
5876
#define FD_METRICS_COUNTER_REPAIR_SEND_PKT_CNT_DESC "How many packets have sent"
5977
#define FD_METRICS_COUNTER_REPAIR_SEND_PKT_CNT_CVT (FD_METRICS_CONVERTER_NONE)
6078

61-
#define FD_METRICS_COUNTER_REPAIR_SENT_PKT_TYPES_OFF (28UL)
79+
#define FD_METRICS_COUNTER_REPAIR_SENT_PKT_TYPES_OFF (31UL)
6280
#define FD_METRICS_COUNTER_REPAIR_SENT_PKT_TYPES_NAME "repair_sent_pkt_types"
6381
#define FD_METRICS_COUNTER_REPAIR_SENT_PKT_TYPES_TYPE (FD_METRICS_TYPE_COUNTER)
6482
#define FD_METRICS_COUNTER_REPAIR_SENT_PKT_TYPES_DESC "What types of client messages are we sending"
6583
#define FD_METRICS_COUNTER_REPAIR_SENT_PKT_TYPES_CVT (FD_METRICS_CONVERTER_NONE)
6684
#define FD_METRICS_COUNTER_REPAIR_SENT_PKT_TYPES_CNT (3UL)
6785

68-
#define FD_METRICS_COUNTER_REPAIR_SENT_PKT_TYPES_NEEDED_WINDOW_OFF (28UL)
69-
#define FD_METRICS_COUNTER_REPAIR_SENT_PKT_TYPES_NEEDED_HIGHEST_WINDOW_OFF (29UL)
70-
#define FD_METRICS_COUNTER_REPAIR_SENT_PKT_TYPES_NEEDED_ORPHAN_OFF (30UL)
86+
#define FD_METRICS_COUNTER_REPAIR_SENT_PKT_TYPES_NEEDED_WINDOW_OFF (31UL)
87+
#define FD_METRICS_COUNTER_REPAIR_SENT_PKT_TYPES_NEEDED_HIGHEST_WINDOW_OFF (32UL)
88+
#define FD_METRICS_COUNTER_REPAIR_SENT_PKT_TYPES_NEEDED_ORPHAN_OFF (33UL)
7189

72-
#define FD_METRICS_HISTOGRAM_REPAIR_STORE_LINK_WAIT_OFF (31UL)
90+
#define FD_METRICS_HISTOGRAM_REPAIR_STORE_LINK_WAIT_OFF (34UL)
7391
#define FD_METRICS_HISTOGRAM_REPAIR_STORE_LINK_WAIT_NAME "repair_store_link_wait"
7492
#define FD_METRICS_HISTOGRAM_REPAIR_STORE_LINK_WAIT_TYPE (FD_METRICS_TYPE_HISTOGRAM)
7593
#define FD_METRICS_HISTOGRAM_REPAIR_STORE_LINK_WAIT_DESC "Time in seconds spent waiting for the store to link a new FEC set"
7694
#define FD_METRICS_HISTOGRAM_REPAIR_STORE_LINK_WAIT_CVT (FD_METRICS_CONVERTER_SECONDS)
7795
#define FD_METRICS_HISTOGRAM_REPAIR_STORE_LINK_WAIT_MIN (1e-08)
78-
#define FD_METRICS_HISTOGRAM_REPAIR_STORE_LINK_WAIT_MAX (0.001)
96+
#define FD_METRICS_HISTOGRAM_REPAIR_STORE_LINK_WAIT_MAX (0.0005)
7997

80-
#define FD_METRICS_HISTOGRAM_REPAIR_STORE_LINK_WORK_OFF (48UL)
98+
#define FD_METRICS_HISTOGRAM_REPAIR_STORE_LINK_WORK_OFF (51UL)
8199
#define FD_METRICS_HISTOGRAM_REPAIR_STORE_LINK_WORK_NAME "repair_store_link_work"
82100
#define FD_METRICS_HISTOGRAM_REPAIR_STORE_LINK_WORK_TYPE (FD_METRICS_TYPE_HISTOGRAM)
83101
#define FD_METRICS_HISTOGRAM_REPAIR_STORE_LINK_WORK_DESC "Time in seconds spent on linking a new FEC set"
84102
#define FD_METRICS_HISTOGRAM_REPAIR_STORE_LINK_WORK_CVT (FD_METRICS_CONVERTER_SECONDS)
85103
#define FD_METRICS_HISTOGRAM_REPAIR_STORE_LINK_WORK_MIN (1e-08)
86-
#define FD_METRICS_HISTOGRAM_REPAIR_STORE_LINK_WORK_MAX (0.001)
104+
#define FD_METRICS_HISTOGRAM_REPAIR_STORE_LINK_WORK_MAX (0.0005)
87105

88-
#define FD_METRICS_REPAIR_TOTAL (17UL)
106+
#define FD_METRICS_REPAIR_TOTAL (20UL)
89107
extern const fd_metrics_meta_t FD_METRICS_REPAIR[FD_METRICS_REPAIR_TOTAL];

‎src/disco/metrics/generated/fd_metrics_shred.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -117,15 +117,15 @@
117117
#define FD_METRICS_HISTOGRAM_SHRED_STORE_INSERT_WAIT_DESC "Time in seconds spent waiting for the store to insert a new FEC set"
118118
#define FD_METRICS_HISTOGRAM_SHRED_STORE_INSERT_WAIT_CVT (FD_METRICS_CONVERTER_SECONDS)
119119
#define FD_METRICS_HISTOGRAM_SHRED_STORE_INSERT_WAIT_MIN (1e-08)
120-
#define FD_METRICS_HISTOGRAM_SHRED_STORE_INSERT_WAIT_MAX (0.001)
120+
#define FD_METRICS_HISTOGRAM_SHRED_STORE_INSERT_WAIT_MAX (0.0005)
121121

122122
#define FD_METRICS_HISTOGRAM_SHRED_STORE_INSERT_WORK_OFF (133UL)
123123
#define FD_METRICS_HISTOGRAM_SHRED_STORE_INSERT_WORK_NAME "shred_store_insert_work"
124124
#define FD_METRICS_HISTOGRAM_SHRED_STORE_INSERT_WORK_TYPE (FD_METRICS_TYPE_HISTOGRAM)
125125
#define FD_METRICS_HISTOGRAM_SHRED_STORE_INSERT_WORK_DESC "Time in seconds spent on inserting a new FEC set"
126126
#define FD_METRICS_HISTOGRAM_SHRED_STORE_INSERT_WORK_CVT (FD_METRICS_CONVERTER_SECONDS)
127127
#define FD_METRICS_HISTOGRAM_SHRED_STORE_INSERT_WORK_MIN (1e-08)
128-
#define FD_METRICS_HISTOGRAM_SHRED_STORE_INSERT_WORK_MAX (0.001)
128+
#define FD_METRICS_HISTOGRAM_SHRED_STORE_INSERT_WORK_MAX (0.0005)
129129

130130
#define FD_METRICS_SHRED_TOTAL (22UL)
131131
extern const fd_metrics_meta_t FD_METRICS_SHRED[FD_METRICS_SHRED_TOTAL];

‎src/disco/metrics/metrics.xml

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -680,10 +680,6 @@ metric introduced.
680680
<summary>Time in seconds spent on publishing a new FEC set</summary>
681681
</histogram>
682682
</tile>
683-
<tile name="storei">
684-
<gauge name="FirstTurbineSlot" label="The first slot for which we have received a turbine shred" />
685-
<gauge name="CurrentTurbineSlot" label="The latest slot for which we have received a turbine shred" />
686-
</tile>
687683
<enum name="GossipMessage">
688684
<int value="0" name="PullRequest" label="Pull Request" />
689685
<int value="1" name="PullResponse" label="Pull Response" />
@@ -791,6 +787,9 @@ metric introduced.
791787

792788

793789
<tile name="repair">
790+
<gauge name="FirstTurbineSlot" label="The first slot for which we have received a turbine shred" />
791+
<gauge name="LatestTurbineSlot" label="The latest slot for which we have received a turbine shred" />
792+
<gauge name="LatestRepairSlot" label="The latest slot for which we have sent out a repair request" />
794793
<counter name="RecvClntPkt" clickhouse_exclude="true" summary="Now many client packets have we received" />
795794
<counter name="RecvServPkt" clickhouse_exclude="true" summary="How many server packets have we received" />
796795
<counter name="RecvServCorruptPkt" clickhouse_exclude="true" summary="How many corrupt server packets have we received" />

‎src/disco/plugin/fd_plugin.h

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -107,4 +107,16 @@ typedef struct {
107107
int status;
108108
} fd_plugin_msg_block_engine_update_t;
109109

110+
#define FD_PLUGIN_MSG_SNAPSHOT_UPDATE (15UL)
111+
112+
#define FD_PLUGIN_MSG_SNAPSHOT_TYPE_FULL (0)
113+
#define FD_PLUGIN_MSG_SNAPSHOT_TYPE_INCREMENTAL (1)
114+
typedef struct __attribute__((packed)) {
115+
int type;
116+
ulong slot;
117+
uint peer_addr;
118+
ushort peer_port;
119+
char read_path[ PATH_MAX ];
120+
} fd_restore_snapshot_update_t;
121+
110122
#endif /* HEADER_fd_src_disco_plugin_fd_plugin_h */

0 commit comments

Comments
 (0)