rust/neon
1
0
Fork 0
mirror of https://github.com/neondatabase/neon.git synced 2026-05-20 22:50:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

Log shard map and protocol version updates explicitly

Browse Source
This commit is contained in:
Matthias van de Meent
2024-06-13 20:04:45 +02:00
parent f1420159e8
commit 3029c65541
1 changed files with 33 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
pgxn/neon/libpagestore.c
View File

@@ -49,7 +49,9 @@ char *neon_auth_token;
int readahead_buffer_size = 128; int readahead_buffer_size = 128;
int flush_every_n_requests = 8; int flush_every_n_requests = 8;
int neon_protocol_version = 2; int neon_protocol_version = 2;
static int last_protocol_version = -1; /* copy of n_p_v used to detect changes
* to the parameter at runtime */
static int max_reconnect_attempts = 60; static int max_reconnect_attempts = 60;
static int stripe_size; static int stripe_size;
@@ -230,6 +232,14 @@ AssignPageserverConnstring(const char *newval, void *extra)
memcpy(&pagestore_shared->shard_map, &shard_map, sizeof(ShardMap)); memcpy(&pagestore_shared->shard_map, &shard_map, sizeof(ShardMap));
pg_write_barrier(); pg_write_barrier();
pg_atomic_add_fetch_u64(&pagestore_shared->end_update_counter, 1); pg_atomic_add_fetch_u64(&pagestore_shared->end_update_counter, 1);
neon_log(LOG, "Updated shard map: %d active shards",
shard_map.num_shards);
for (int i = 0; i < shard_map.num_shards; i++)
{
neon_shard_log(i, LOG, "New connection string: \"%s\"",
shard_map.connstring[i]);
}
} }
else else
{ {
@@ -616,6 +626,9 @@ pageserver_connect(shardno_t shard_no, int elevel)
/* fallthrough */ /* fallthrough */
} }
case PS_Connected: case PS_Connected:
{
int ll;
/* /*
* We successfully connected. Future connections to this PageServer * We successfully connected. Future connections to this PageServer
* will do fast retries again, with exponential backoff. * will do fast retries again, with exponential backoff.
@@ -623,8 +636,18 @@ pageserver_connect(shardno_t shard_no, int elevel)
shard->delay_us = MIN_RECONNECT_INTERVAL_USEC; shard->delay_us = MIN_RECONNECT_INTERVAL_USEC;
neon_shard_log(shard_no, DEBUG5, "Connection state: Connected"); neon_shard_log(shard_no, DEBUG5, "Connection state: Connected");
neon_shard_log(shard_no, DEBUG1, "libpagestore: connected to '%s' with protocol version %d", connstr, neon_protocol_version); if (last_protocol_version != neon_protocol_version)
{
ll = LOG;
last_protocol_version = neon_protocol_version;
}
else
{
ll = DEBUG1;
}
neon_shard_log(shard_no, ll, "libpagestore: connected to '%s' with protocol version %d", connstr, neon_protocol_version);
return true; return true;
}
default: default:
neon_shard_log(shard_no, ERROR, "libpagestore: invalid connection state %d", shard->state); neon_shard_log(shard_no, ERROR, "libpagestore: invalid connection state %d", shard->state);
} }
@@ -1055,6 +1078,14 @@ pg_init_libpagestore(void)
0, /* no flags required */ 0, /* no flags required */
NULL, NULL, NULL); NULL, NULL, NULL);
/*
* Store last seen protocol version as initialization, so we can log
* differences once we see them appear.
*/
last_protocol_version = neon_protocol_version;
neon_log(LOG, "Initializing libpagestore with protocol version %d",
neon_protocol_version);
relsize_hash_init(); relsize_hash_init();
if (page_server != NULL) if (page_server != NULL)