Skip to content

flamenco, gossip: two-tiered value table #4800

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
May 2, 2025
Merged

flamenco, gossip: two-tiered value table #4800

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
cf9826e
flamenco, gossip: two-tiered value table for fast iteration in push a…
ravyu-jump Apr 16, 2025
3d31432
flamenco, gossip: use vector as push queue; order-preserving cleanup;
ravyu-jump Apr 11, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions book/api/metrics-generated.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -381,6 +381,8 @@
| gossip_​peer_​counts_​repair | `gauge` | Number of peers of each type (Repair) |
| gossip_​peer_​counts_​voter | `gauge` | Number of peers of each type (Voter) |
| gossip_​shred_​version_​zero | `counter` | Shred version zero |
| gossip_​value_​meta_​size | `gauge` | Current size of the CRDS value metas map |
| gossip_​value_​vec_​size | `gauge` | Current size of the CRDS value vector |
| gossip_​received_​packets | `counter` | Number of all gossip packets received |
| gossip_​corrupted_​messages | `counter` | Number of corrupted gossip messages received |
| gossip_​received_​gossip_​messages_​pull_​request | `counter` | Number of gossip messages received (Pull Request) |
Expand Down
2 changes: 2 additions & 0 deletions src/disco/metrics/generated/fd_metrics_gossip.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,8 @@ const fd_metrics_meta_t FD_METRICS_GOSSIP[FD_METRICS_GOSSIP_TOTAL] = {
DECLARE_METRIC_ENUM( GOSSIP_PEER_COUNTS, GAUGE, PEER_TYPES, REPAIR ),
DECLARE_METRIC_ENUM( GOSSIP_PEER_COUNTS, GAUGE, PEER_TYPES, VOTER ),
DECLARE_METRIC( GOSSIP_SHRED_VERSION_ZERO, COUNTER ),
DECLARE_METRIC( GOSSIP_VALUE_META_SIZE, GAUGE ),
DECLARE_METRIC( GOSSIP_VALUE_VEC_SIZE, GAUGE ),
DECLARE_METRIC( GOSSIP_RECEIVED_PACKETS, COUNTER ),
DECLARE_METRIC( GOSSIP_CORRUPTED_MESSAGES, COUNTER ),
DECLARE_METRIC_ENUM( GOSSIP_RECEIVED_GOSSIP_MESSAGES, COUNTER, GOSSIP_MESSAGE, PULL_REQUEST ),
Expand Down
368 changes: 190 additions & 178 deletions src/disco/metrics/generated/fd_metrics_gossip.h
View file
Open in desktop

Large diffs are not rendered by default.

3 changes: 3 additions & 0 deletions src/disco/metrics/metrics.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -643,6 +643,9 @@ metric introduced.
<gauge name="PeerCounts" enum="PeerTypes" clickhouse_exclude="true" summary="Number of peers of each type" />
<counter name="ShredVersionZero" clickhouse_exclude="true" summary="Shred version zero" />

<gauge name="ValueMetaSize" clickhouse_exclude="true" summary="Current size of the CRDS value metas map" />
<gauge name="ValueVecSize" clickhouse_exclude="true" summary="Current size of the CRDS value vector" />

<counter name="ReceivedPackets" clickhouse_exclude="true" summary="Number of all gossip packets received" />
<counter name="CorruptedMessages" clickhouse_exclude="true" summary="Number of corrupted gossip messages received" />
<counter name="ReceivedGossipMessages" enum="GossipMessage" clickhouse_exclude="true" summary="Number of gossip messages received" />
Expand Down
3 changes: 3 additions & 0 deletions src/discof/gossip/fd_gossip_tile.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1073,6 +1073,9 @@ fd_gossip_update_gossip_metrics( fd_gossip_metrics_t * metrics ) {
FD_MCNT_ENUM_COPY( GOSSIP, PUSH_CRDS_DROP, metrics->push_crds_drop_reason );
FD_MGAUGE_SET( GOSSIP, PUSH_CRDS_QUEUE_COUNT, metrics->push_crds_queue_cnt );

FD_MGAUGE_SET( GOSSIP, VALUE_META_SIZE, metrics->value_meta_cnt );
FD_MGAUGE_SET( GOSSIP, VALUE_VEC_SIZE, metrics->value_vec_cnt );

FD_MGAUGE_SET( GOSSIP, ACTIVE_PUSH_DESTINATIONS, metrics->active_push_destinations );
FD_MCNT_SET( GOSSIP, REFRESH_PUSH_STATES_FAIL_COUNT, metrics->refresh_push_states_failcnt );

Expand Down
698 changes: 421 additions & 277 deletions src/flamenco/gossip/fd_gossip.c
View file
Open in desktop

Large diffs are not rendered by default.

4 changes: 4 additions & 0 deletions src/flamenco/gossip/fd_gossip.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -177,6 +177,10 @@ struct fd_gossip_metrics {
ulong push_crds_drop_reason[FD_METRICS_COUNTER_GOSSIP_PUSH_CRDS_DROP_CNT];
ulong push_crds_queue_cnt;

/* Value DS sizes */
ulong value_meta_cnt;
ulong value_vec_cnt;

/* Active Push Destinations */
ulong active_push_destinations;
ulong refresh_push_states_failcnt;
Expand Down
18 changes: 12 additions & 6 deletions src/util/tmpl/fd_vec.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -161,7 +161,7 @@ VEC_(new)( void * shmem,
return shmem;
}

FD_FN_CONST static inline VEC_T *
static inline VEC_T *
VEC_(join)( void * shvec ) {

if( FD_UNLIKELY( !shvec ) ) return NULL;
Expand All @@ -179,7 +179,7 @@ VEC_(leave)( VEC_T * join ) {
return (void *)(((ulong)join) - VEC_(private_meta_footprint)());
}

FD_FN_CONST static inline void *
static inline void *
VEC_(delete)( void * shvec ) {

if( FD_UNLIKELY( !shvec ) ) return NULL;
Expand Down Expand Up @@ -223,8 +223,8 @@ VEC_(contract)( VEC_T * join,
}

static inline VEC_T *
VEC_(remove)( VEC_T * join,
ulong idx ) {
VEC_(remove_idx)( VEC_T * join,
ulong idx ) {
VEC_(private_t) * vec = VEC_(private)( join );
ulong cnt = vec->cnt - 1UL;
join[idx] = join[cnt]; /* TODO: Consider letting user decide if self copy is cheaper than testing */
Expand All @@ -233,8 +233,14 @@ VEC_(remove)( VEC_T * join,
}

static inline VEC_T *
VEC_(remove_compact)( VEC_T * join,
ulong idx ) {
VEC_(remove_ele)( VEC_T * join,
VEC_T * ele){
return VEC_(remove_idx)( join, (ulong)(ele-join) );
}

static inline VEC_T *
VEC_(remove_compact_idx)( VEC_T * join,
ulong idx ) {
VEC_(private_t) * vec = VEC_(private)( join );
ulong cnt = vec->cnt - 1UL;
for( ; idx<cnt; idx++ ) join[idx] = join[idx+1UL];
Expand Down
19 changes: 14 additions & 5 deletions src/util/tmpl/test_vec.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ main( int argc,
FD_TEST( !memcmp( vec, ref, cnt*sizeof(MYVEC_T) ) );

uint r = fd_rng_uint( rng );
int op = (int)(r & 3U); r>>=2;
int op = (int)(r & 7U); r>>=3;

switch( op ) {
default:
Expand All @@ -78,19 +78,28 @@ main( int argc,
break;
}

case 2: { /* remove with backfill */
case 2: { /* remove with backfill via idx */
if( !cnt ) break;
ulong idx = fd_rng_ulong_roll( rng, cnt );
FD_TEST( myvec_remove( vec, idx )==vec );
FD_TEST( myvec_remove_idx( vec, idx )==vec );
cnt--;
ref[idx] = ref[cnt];
break;
}

case 3: { /* remove with compaction */
case 3: { /* remove with backfill via ptr */
if( !cnt ) break;
ulong idx = fd_rng_ulong_roll( rng, cnt );
FD_TEST( myvec_remove_compact( vec, idx )==vec );
FD_TEST( myvec_remove_ele( vec, &vec[idx] )==vec );
cnt--;
ref[idx] = ref[cnt];
break;
}

case 4: { /* remove with compaction */
if( !cnt ) break;
ulong idx = fd_rng_ulong_roll( rng, cnt );
FD_TEST( myvec_remove_compact_idx( vec, idx )==vec );
cnt--;
for( ; idx<cnt; idx++ ) ref[idx] = ref[idx+1UL];
break;
Expand Down
Loading