snapshot: adding eah to bg batch tile

firedancer-io · Jan 8, 2025 · 386f8af · 386f8af
1 parent 4d09c21
commit 386f8af
Show file tree

Hide file tree

Showing 19 changed files with 680 additions and 260 deletions.
diff --git a/src/app/fdctl/Local.mk b/src/app/fdctl/Local.mk
@@ -50,8 +50,8 @@ $(call add-objs,run/tiles/fd_poh_int,fd_fdctl)
 $(call add-objs,run/tiles/fd_sender,fd_fdctl)
 $(call add-objs,run/tiles/fd_eqvoc,fd_fdctl)
 $(call add-objs,run/tiles/fd_rpcserv,fd_fdctl)
-$(call add-objs,run/tiles/fd_snapshot,fd_fdctl)
-$(call add-objs,run/tiles/fd_snapshot_thread,fd_fdctl)
+$(call add-objs,run/tiles/fd_batch,fd_fdctl)
+$(call add-objs,run/tiles/fd_batch_thread,fd_fdctl)
 endif
 
 # fdctl topologies

diff --git a/src/app/fdctl/config.h b/src/app/fdctl/config.h
@@ -310,7 +310,7 @@ typedef struct {
       ulong incremental_interval;
       char  out_dir[ PATH_MAX ];
       ulong hash_tpool_thread_count;
-    } snaps;
+    } batch;
 
   } tiles;
 } config_t;

diff --git a/src/app/fdctl/config/default-firedancer.toml b/src/app/fdctl/config/default-firedancer.toml
@@ -22,8 +22,8 @@
         cluster_version =  "1.18.0"
     [tiles.pack]
         use_consumed_cus = false
-    [tiles.snaps]
-        hash_tpool_thread_count = 2
+    [tiles.batch]
+        hash_tpool_thread_count = 3
 
 [consensus]
     vote = true

diff --git a/src/app/fdctl/config_parse.c b/src/app/fdctl/config_parse.c
@@ -389,10 +389,10 @@ fdctl_pod_to_cfg( config_t * config,
   CFG_POP      ( cstr,   tiles.store_int.shred_cap_archive                );
   CFG_POP      ( cstr,   tiles.store_int.shred_cap_replay                 );
 
-  CFG_POP      ( ulong,  tiles.snaps.full_interval                        );
-  CFG_POP      ( ulong,  tiles.snaps.incremental_interval                 );
-  CFG_POP      ( cstr,   tiles.snaps.out_dir                              );
-  CFG_POP      ( ulong,  tiles.snaps.hash_tpool_thread_count              );
+  CFG_POP      ( ulong,  tiles.batch.full_interval                        );
+  CFG_POP      ( ulong,  tiles.batch.incremental_interval                 );
+  CFG_POP      ( cstr,   tiles.batch.out_dir                              );
+  CFG_POP      ( ulong,  tiles.batch.hash_tpool_thread_count              );
 
 # undef CFG_POP
 # undef CFG_ARRAY

diff --git a/src/app/fdctl/main.c b/src/app/fdctl/main.c
@@ -37,7 +37,8 @@ extern fd_topo_run_tile_t fd_tile_repair;
 extern fd_topo_run_tile_t fd_tile_store_int;
 extern fd_topo_run_tile_t fd_tile_replay;
 extern fd_topo_run_tile_t fd_tile_replay_thread;
-extern fd_topo_run_tile_t fd_tile_snaps_thread;
+extern fd_topo_run_tile_t fd_tile_batch;
+extern fd_topo_run_tile_t fd_tile_batch_thread;
 extern fd_topo_run_tile_t fd_tile_poh_int;
 extern fd_topo_run_tile_t fd_tile_sender;
 extern fd_topo_run_tile_t fd_tile_eqvoc;
@@ -67,6 +68,8 @@ fd_topo_run_tile_t * TILES[] = {
   &fd_tile_store_int,
   &fd_tile_replay,
   &fd_tile_replay_thread,
+  &fd_tile_batch,
+  &fd_tile_batch_thread,
   &fd_tile_poh_int,
   &fd_tile_sender,
   &fd_tile_eqvoc,

diff --git a/src/app/fdctl/ready.c b/src/app/fdctl/ready.c
@@ -23,9 +23,9 @@ ready_cmd_fn( args_t *         args,
        anyway. */
     if( FD_UNLIKELY( tile->is_agave ) ) continue;
 
-    /* Don't wait for rtpool/stpool tiles, they will not report ready. */
+    /* Don't wait for rtpool/btpool tiles, they will not report ready. */
     if( strncmp( tile->name, "rtpool", 7 )==0 ) continue;
-    if( strncmp( tile->name, "stpool", 7 )==0 ) continue;
+    if( strncmp( tile->name, "btpool", 7 )==0 ) continue;
 
     long start = fd_log_wallclock();
     int printed = 0;

diff --git a/...pp/fdctl/run/tiles/snapshot.seccomppolicy → src/app/fdctl/run/tiles/batch.seccomppolicy b/...pp/fdctl/run/tiles/snapshot.seccomppolicy → src/app/fdctl/run/tiles/batch.seccomppolicy