accdb: add record allocation metrics (#7604)

Co-authored-by: Richard Patel <[email protected]>

Author: ripatel-fd

book/api/metrics-generated.md

@@ -533,10 +533,12 @@
 | <span class="metrics-name">replay_&#8203;transactions_&#8203;total</span> | counter | Count of transactions processed overall on the current fork |
 | <span class="metrics-name">replay_&#8203;sched_&#8203;full</span> | counter | Times where sched is full and a FEC set can't be processed |
 | <span class="metrics-name">replay_&#8203;reasm_&#8203;empty</span> | counter | Times where reasm is empty and a FEC set can't be processed |
-| <span class="metrics-name">replay_&#8203;leader_&#8203;bid_&#8203;wait</span> | counter | Times where replay is blocked by the the PoH tile not sending an end of leader message |
+| <span class="metrics-name">replay_&#8203;leader_&#8203;bid_&#8203;wait</span> | counter | Times where replay is blocked by the PoH tile not sending an end of leader message |
 | <span class="metrics-name">replay_&#8203;banks_&#8203;full</span> | counter | Times where banks are full and a FEC set can't be processed |
 | <span class="metrics-name">replay_&#8203;progcache_&#8203;rooted</span> | counter | Number of program cache entries rooted |
 | <span class="metrics-name">replay_&#8203;progcache_&#8203;gc_&#8203;root</span> | counter | Number of program cache entries garbage collected while rooting |
+| <span class="metrics-name">replay_&#8203;accdb_&#8203;created</span> | counter | Number of account database records created |
+| <span class="metrics-name">replay_&#8203;accdb_&#8203;reverted</span> | counter | Number of account database records reverted |
 | <span class="metrics-name">replay_&#8203;accdb_&#8203;rooted</span> | counter | Number of account database entries rooted |
 | <span class="metrics-name">replay_&#8203;accdb_&#8203;gc_&#8203;root</span> | counter | Number of account database entries garbage collected |
 
@@ -1133,6 +1135,7 @@
 | <span class="metrics-name">exec_&#8203;progcache_&#8203;fill_&#8203;fails</span> | counter | Number of program cache load fails (tombstones inserted) |
 | <span class="metrics-name">exec_&#8203;progcache_&#8203;dup_&#8203;inserts</span> | counter | Number of time two tiles raced to insert the same cache entry |
 | <span class="metrics-name">exec_&#8203;progcache_&#8203;invalidations</span> | counter | Number of program cache invalidations |
+| <span class="metrics-name">exec_&#8203;accdb_&#8203;created</span> | counter | Number of account database records created |
 
 </div>
 

src/disco/metrics/generated/fd_metrics_exec.c

@@ -9,4 +9,5 @@ const fd_metrics_meta_t FD_METRICS_EXEC[FD_METRICS_EXEC_TOTAL] = {
     DECLARE_METRIC( EXEC_PROGCACHE_FILL_FAILS, COUNTER ),
     DECLARE_METRIC( EXEC_PROGCACHE_DUP_INSERTS, COUNTER ),
     DECLARE_METRIC( EXEC_PROGCACHE_INVALIDATIONS, COUNTER ),
+    DECLARE_METRIC( EXEC_ACCDB_CREATED, COUNTER ),
 };

src/disco/metrics/generated/fd_metrics_exec.h

@@ -48,7 +48,13 @@
 #define FD_METRICS_COUNTER_EXEC_PROGCACHE_INVALIDATIONS_DESC "Number of program cache invalidations"
 #define FD_METRICS_COUNTER_EXEC_PROGCACHE_INVALIDATIONS_CVT  (FD_METRICS_CONVERTER_NONE)
 
-#define FD_METRICS_EXEC_TOTAL (7UL)
+#define FD_METRICS_COUNTER_EXEC_ACCDB_CREATED_OFF  (23UL)
+#define FD_METRICS_COUNTER_EXEC_ACCDB_CREATED_NAME "exec_accdb_created"
+#define FD_METRICS_COUNTER_EXEC_ACCDB_CREATED_TYPE (FD_METRICS_TYPE_COUNTER)
+#define FD_METRICS_COUNTER_EXEC_ACCDB_CREATED_DESC "Number of account database records created"
+#define FD_METRICS_COUNTER_EXEC_ACCDB_CREATED_CVT  (FD_METRICS_CONVERTER_NONE)
+
+#define FD_METRICS_EXEC_TOTAL (8UL)
 extern const fd_metrics_meta_t FD_METRICS_EXEC[FD_METRICS_EXEC_TOTAL];
 
 #endif /* HEADER_fd_src_disco_metrics_generated_fd_metrics_exec_h */

src/disco/metrics/generated/fd_metrics_replay.c

@@ -26,6 +26,8 @@ const fd_metrics_meta_t FD_METRICS_REPLAY[FD_METRICS_REPLAY_TOTAL] = {
     DECLARE_METRIC( REPLAY_BANKS_FULL, COUNTER ),
     DECLARE_METRIC( REPLAY_PROGCACHE_ROOTED, COUNTER ),
     DECLARE_METRIC( REPLAY_PROGCACHE_GC_ROOT, COUNTER ),
+    DECLARE_METRIC( REPLAY_ACCDB_CREATED, COUNTER ),
+    DECLARE_METRIC( REPLAY_ACCDB_REVERTED, COUNTER ),
     DECLARE_METRIC( REPLAY_ACCDB_ROOTED, COUNTER ),
     DECLARE_METRIC( REPLAY_ACCDB_GC_ROOT, COUNTER ),
 };

src/disco/metrics/generated/fd_metrics_replay.h

@@ -141,7 +141,7 @@
 #define FD_METRICS_COUNTER_REPLAY_LEADER_BID_WAIT_OFF  (132UL)
 #define FD_METRICS_COUNTER_REPLAY_LEADER_BID_WAIT_NAME "replay_leader_bid_wait"
 #define FD_METRICS_COUNTER_REPLAY_LEADER_BID_WAIT_TYPE (FD_METRICS_TYPE_COUNTER)
-#define FD_METRICS_COUNTER_REPLAY_LEADER_BID_WAIT_DESC "Times where replay is blocked by the the PoH tile not sending an end of leader message"
+#define FD_METRICS_COUNTER_REPLAY_LEADER_BID_WAIT_DESC "Times where replay is blocked by the PoH tile not sending an end of leader message"
 #define FD_METRICS_COUNTER_REPLAY_LEADER_BID_WAIT_CVT  (FD_METRICS_CONVERTER_NONE)
 
 #define FD_METRICS_COUNTER_REPLAY_BANKS_FULL_OFF  (133UL)
@@ -162,19 +162,31 @@
 #define FD_METRICS_COUNTER_REPLAY_PROGCACHE_GC_ROOT_DESC "Number of program cache entries garbage collected while rooting"
 #define FD_METRICS_COUNTER_REPLAY_PROGCACHE_GC_ROOT_CVT  (FD_METRICS_CONVERTER_NONE)
 
-#define FD_METRICS_COUNTER_REPLAY_ACCDB_ROOTED_OFF  (136UL)
+#define FD_METRICS_COUNTER_REPLAY_ACCDB_CREATED_OFF  (136UL)
+#define FD_METRICS_COUNTER_REPLAY_ACCDB_CREATED_NAME "replay_accdb_created"
+#define FD_METRICS_COUNTER_REPLAY_ACCDB_CREATED_TYPE (FD_METRICS_TYPE_COUNTER)
+#define FD_METRICS_COUNTER_REPLAY_ACCDB_CREATED_DESC "Number of account database records created"
+#define FD_METRICS_COUNTER_REPLAY_ACCDB_CREATED_CVT  (FD_METRICS_CONVERTER_NONE)
+
+#define FD_METRICS_COUNTER_REPLAY_ACCDB_REVERTED_OFF  (137UL)
+#define FD_METRICS_COUNTER_REPLAY_ACCDB_REVERTED_NAME "replay_accdb_reverted"
+#define FD_METRICS_COUNTER_REPLAY_ACCDB_REVERTED_TYPE (FD_METRICS_TYPE_COUNTER)
+#define FD_METRICS_COUNTER_REPLAY_ACCDB_REVERTED_DESC "Number of account database records reverted"
+#define FD_METRICS_COUNTER_REPLAY_ACCDB_REVERTED_CVT  (FD_METRICS_CONVERTER_NONE)
+
+#define FD_METRICS_COUNTER_REPLAY_ACCDB_ROOTED_OFF  (138UL)
 #define FD_METRICS_COUNTER_REPLAY_ACCDB_ROOTED_NAME "replay_accdb_rooted"
 #define FD_METRICS_COUNTER_REPLAY_ACCDB_ROOTED_TYPE (FD_METRICS_TYPE_COUNTER)
 #define FD_METRICS_COUNTER_REPLAY_ACCDB_ROOTED_DESC "Number of account database entries rooted"
 #define FD_METRICS_COUNTER_REPLAY_ACCDB_ROOTED_CVT  (FD_METRICS_CONVERTER_NONE)
 
-#define FD_METRICS_COUNTER_REPLAY_ACCDB_GC_ROOT_OFF  (137UL)
+#define FD_METRICS_COUNTER_REPLAY_ACCDB_GC_ROOT_OFF  (139UL)
 #define FD_METRICS_COUNTER_REPLAY_ACCDB_GC_ROOT_NAME "replay_accdb_gc_root"
 #define FD_METRICS_COUNTER_REPLAY_ACCDB_GC_ROOT_TYPE (FD_METRICS_TYPE_COUNTER)
 #define FD_METRICS_COUNTER_REPLAY_ACCDB_GC_ROOT_DESC "Number of account database entries garbage collected"
 #define FD_METRICS_COUNTER_REPLAY_ACCDB_GC_ROOT_CVT  (FD_METRICS_CONVERTER_NONE)
 
-#define FD_METRICS_REPLAY_TOTAL (26UL)
+#define FD_METRICS_REPLAY_TOTAL (28UL)
 extern const fd_metrics_meta_t FD_METRICS_REPLAY[FD_METRICS_REPLAY_TOTAL];
 
 #endif /* HEADER_fd_src_disco_metrics_generated_fd_metrics_replay_h */

src/disco/metrics/metrics.xml

@@ -809,6 +809,8 @@ metric introduced.
   <counter name="ProgcacheRooted" summary="Number of program cache entries rooted" />
   <counter name="ProgcacheGcRoot" summary="Number of program cache entries garbage collected while rooting" />
 
+  <counter name="AccdbCreated" summary="Number of account database records created" />
+  <counter name="AccdbReverted" summary="Number of account database records reverted" />
   <counter name="AccdbRooted" summary="Number of account database entries rooted" />
   <counter name="AccdbGcRoot" summary="Number of account database entries garbage collected" />
 </tile>
@@ -1125,6 +1127,7 @@ metric introduced.
     <counter name="ProgcacheFillFails" summary="Number of program cache load fails (tombstones inserted)" />
     <counter name="ProgcacheDupInserts" summary="Number of time two tiles raced to insert the same cache entry" />
     <counter name="ProgcacheInvalidations" summary="Number of program cache invalidations" />
+    <counter name="AccdbCreated" summary="Number of account database records created" />
 </tile>
 
 <tile name="benchs">

src/discof/exec/fd_exec_tile.c

@@ -98,6 +98,9 @@ metrics_write( fd_exec_tile_ctx_t * ctx ) {
   FD_MCNT_SET( EXEC, PROGCACHE_FILL_TOT_SZ,   progcache->metrics->fill_tot_sz    );
   FD_MCNT_SET( EXEC, PROGCACHE_INVALIDATIONS, progcache->metrics->invalidate_cnt );
   FD_MCNT_SET( EXEC, PROGCACHE_DUP_INSERTS,   progcache->metrics->dup_insert_cnt );
+
+  fd_accdb_user_t * accdb = ctx->accdb;
+  FD_MCNT_SET( EXEC, ACCDB_CREATED, accdb->base.created_cnt );
 }
 
 /* Publish the txn finalized message to the replay tile */

src/discof/replay/fd_replay_tile.c

@@ -495,8 +495,10 @@ metrics_write( fd_replay_tile_t * ctx ) {
   FD_MCNT_SET( REPLAY, PROGCACHE_ROOTED,  ctx->progcache_admin->metrics.root_cnt );
   FD_MCNT_SET( REPLAY, PROGCACHE_GC_ROOT, ctx->progcache_admin->metrics.gc_root_cnt );
 
-  FD_MCNT_SET( REPLAY, ACCDB_ROOTED,  ctx->accdb_admin->metrics.root_cnt    );
-  FD_MCNT_SET( REPLAY, ACCDB_GC_ROOT, ctx->accdb_admin->metrics.gc_root_cnt );
+  FD_MCNT_SET( REPLAY, ACCDB_CREATED,  ctx->accdb->base.created_cnt          );
+  FD_MCNT_SET( REPLAY, ACCDB_REVERTED, ctx->accdb_admin->metrics.revert_cnt  );
+  FD_MCNT_SET( REPLAY, ACCDB_ROOTED,   ctx->accdb_admin->metrics.root_cnt    );
+  FD_MCNT_SET( REPLAY, ACCDB_GC_ROOT,  ctx->accdb_admin->metrics.gc_root_cnt );
 }
 
 static inline ulong

src/flamenco/accdb/fd_accdb_admin.c

@@ -110,6 +110,7 @@ fd_accdb_txn_cancel_one( fd_accdb_admin_t * admin,
     rec_idx = next_idx;
     rec_cnt++;
   }
+  admin->metrics.revert_cnt += rec_cnt;
   FD_LOG_INFO(( "accdb freed %lu records while cancelling txn %lu:%lu",
                 rec_cnt, txn->xid.ul[0], txn->xid.ul[1] ));
 

src/flamenco/accdb/fd_accdb_admin.h

@@ -9,6 +9,7 @@ struct fd_accdb_admin {
   struct {
     ulong root_cnt;
     ulong gc_root_cnt;
+    ulong revert_cnt;
   } metrics;
 };