open-dsi
/
postgres
mirror of https://github.com/postgres/postgres
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Change last_inactive_time to inactive_since in pg_replication_slots.

Browse Source 
Commit a11f330b55 added last_inactive_time to show the last time the slot
was inactive. But, it tells the last time that a currently-inactive slot
previously *WAS* active. This could be unclear, so we changed the name to
inactive_since.

Reported-by: Robert Haas
Author: Bharath Rupireddy
Reviewed-by: Bertrand Drouvot, Shveta Malik, Amit Kapila
Discussion: https://postgr.es/m/CA+Tgmob_Ta-t2ty8QrKHBGnNLrf4ZYcwhGHGFsuUoFrAEDw4sA@mail.gmail.com
Discussion: https://postgr.es/m/CALj2ACUXS0SfbHzsX8bqo+7CZhocsV52Kiu7OWGb5HVPAmJqnA@mail.gmail.com
pull/159/head
Amit Kapila 1 year ago
parent bb952c8c8b
commit 6d49c8d4b4
9 changed files with 52 additions and 49 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 4
      doc/src/sgml/system-views.sgml
  2. 2
      src/backend/catalog/system_views.sql
  3. 17
      src/backend/replication/slot.c
  4. 4
      src/backend/replication/slotfuncs.c
  5. 2
      src/include/catalog/catversion.h
  6. 2
      src/include/catalog/pg_proc.dat
  7. 4
      src/include/replication/slot.h
  8. 62
      src/test/recovery/t/019_replslot_limit.pl
  9. 4
      src/test/regress/expected/rules.out

4
doc/src/sgml/system-views.sgml
Unescape View File

@ -2525,10 +2525,10 @@ SELECT * FROM pg_locks pl LEFT JOIN pg_prepared_xacts ppx
<row> <row>
<entry role="catalog_table_entry"><para role="column_definition"> <entry role="catalog_table_entry"><para role="column_definition">
<structfield>last_inactive_time</structfield> <type>timestamptz</type> <structfield>inactive_since</structfield> <type>timestamptz</type>
</para> </para>
<para> <para>
The time at which the slot became inactive. The time since the slot has become inactive.
<literal>NULL</literal> if the slot is currently being used. <literal>NULL</literal> if the slot is currently being used.
</para></entry> </para></entry>
</row> </row>

2
src/backend/catalog/system_views.sql
Unescape View File

@ -1023,7 +1023,7 @@ CREATE VIEW pg_replication_slots AS
L.wal_status, L.wal_status,
L.safe_wal_size, L.safe_wal_size,
L.two_phase, L.two_phase,
L.last_inactive_time, L.inactive_since,
L.conflicting, L.conflicting,
L.invalidation_reason, L.invalidation_reason,
L.failover, L.failover,

17
src/backend/replication/slot.c
Unescape View File

@ -409,7 +409,7 @@ ReplicationSlotCreate(const char *name, bool db_specific,
slot->candidate_restart_valid = InvalidXLogRecPtr; slot->candidate_restart_valid = InvalidXLogRecPtr;
slot->candidate_restart_lsn = InvalidXLogRecPtr; slot->candidate_restart_lsn = InvalidXLogRecPtr;
slot->last_saved_confirmed_flush = InvalidXLogRecPtr; slot->last_saved_confirmed_flush = InvalidXLogRecPtr;
slot->last_inactive_time = 0; slot->inactive_since = 0;
/* /*
* Create the slot on disk. We haven't actually marked the slot allocated * Create the slot on disk. We haven't actually marked the slot allocated
@ -623,9 +623,12 @@ retry:
if (SlotIsLogical(s)) if (SlotIsLogical(s))
pgstat_acquire_replslot(s); pgstat_acquire_replslot(s);
/* Reset the last inactive time as the slot is active now. */ /*
* Reset the time since the slot has become inactive as the slot is active
* now.
*/
SpinLockAcquire(&s->mutex); SpinLockAcquire(&s->mutex);
s->last_inactive_time = 0; s->inactive_since = 0;
SpinLockRelease(&s->mutex); SpinLockRelease(&s->mutex);
if (am_walsender) if (am_walsender)
@ -703,14 +706,14 @@ ReplicationSlotRelease(void)
*/ */
SpinLockAcquire(&slot->mutex); SpinLockAcquire(&slot->mutex);
slot->active_pid = 0; slot->active_pid = 0;
slot->last_inactive_time = now; slot->inactive_since = now;
SpinLockRelease(&slot->mutex); SpinLockRelease(&slot->mutex);
ConditionVariableBroadcast(&slot->active_cv); ConditionVariableBroadcast(&slot->active_cv);
} }
else else
{ {
SpinLockAcquire(&slot->mutex); SpinLockAcquire(&slot->mutex);
slot->last_inactive_time = now; slot->inactive_since = now;
SpinLockRelease(&slot->mutex); SpinLockRelease(&slot->mutex);
} }
@ -2373,9 +2376,9 @@ RestoreSlotFromDisk(const char *name)
* inactive as decoding is not allowed on those. * inactive as decoding is not allowed on those.
*/ */
if (!(RecoveryInProgress() && slot->data.synced)) if (!(RecoveryInProgress() && slot->data.synced))
slot->last_inactive_time = GetCurrentTimestamp(); slot->inactive_since = GetCurrentTimestamp();
else else
slot->last_inactive_time = 0; slot->inactive_since = 0;
restored = true; restored = true;
break; break;

4
src/backend/replication/slotfuncs.c
Unescape View File

@ -410,8 +410,8 @@ pg_get_replication_slots(PG_FUNCTION_ARGS)
values[i++] = BoolGetDatum(slot_contents.data.two_phase); values[i++] = BoolGetDatum(slot_contents.data.two_phase);
if (slot_contents.last_inactive_time > 0) if (slot_contents.inactive_since > 0)
values[i++] = TimestampTzGetDatum(slot_contents.last_inactive_time); values[i++] = TimestampTzGetDatum(slot_contents.inactive_since);
else else
nulls[i++] = true; nulls[i++] = true;

2
src/include/catalog/catversion.h
Unescape View File

@ -57,6 +57,6 @@
*/ */
/* yyyymmddN */ /* yyyymmddN */
#define CATALOG_VERSION_NO 202403251 #define CATALOG_VERSION_NO 202403271
#endif #endif

2
src/include/catalog/pg_proc.dat
Unescape View File

@ -11135,7 +11135,7 @@
proargtypes => '', proargtypes => '',
proallargtypes => '{name,name,text,oid,bool,bool,int4,xid,xid,pg_lsn,pg_lsn,text,int8,bool,timestamptz,bool,text,bool,bool}', proallargtypes => '{name,name,text,oid,bool,bool,int4,xid,xid,pg_lsn,pg_lsn,text,int8,bool,timestamptz,bool,text,bool,bool}',
proargmodes => '{o,o,o,o,o,o,o,o,o,o,o,o,o,o,o,o,o,o,o}', proargmodes => '{o,o,o,o,o,o,o,o,o,o,o,o,o,o,o,o,o,o,o}',
proargnames => '{slot_name,plugin,slot_type,datoid,temporary,active,active_pid,xmin,catalog_xmin,restart_lsn,confirmed_flush_lsn,wal_status,safe_wal_size,two_phase,last_inactive_time,conflicting,invalidation_reason,failover,synced}', proargnames => '{slot_name,plugin,slot_type,datoid,temporary,active,active_pid,xmin,catalog_xmin,restart_lsn,confirmed_flush_lsn,wal_status,safe_wal_size,two_phase,inactive_since,conflicting,invalidation_reason,failover,synced}',
prosrc => 'pg_get_replication_slots' }, prosrc => 'pg_get_replication_slots' },
{ oid => '3786', descr => 'set up a logical replication slot', { oid => '3786', descr => 'set up a logical replication slot',
proname => 'pg_create_logical_replication_slot', provolatile => 'v', proname => 'pg_create_logical_replication_slot', provolatile => 'v',

4
src/include/replication/slot.h
Unescape View File

@ -202,8 +202,8 @@ typedef struct ReplicationSlot
*/ */
XLogRecPtr last_saved_confirmed_flush; XLogRecPtr last_saved_confirmed_flush;
/* The time at which this slot becomes inactive */ /* The time since the slot has become inactive */
TimestampTz last_inactive_time; TimestampTz inactive_since;
} ReplicationSlot; } ReplicationSlot;
#define SlotIsPhysical(slot) ((slot)->data.database == InvalidOid) #define SlotIsPhysical(slot) ((slot)->data.database == InvalidOid)

62
src/test/recovery/t/019_replslot_limit.pl
Unescape View File

@ -411,7 +411,7 @@ $node_primary3->stop;
$node_standby3->stop; $node_standby3->stop;
# ============================================================================= # =============================================================================
# Testcase start: Check last_inactive_time property of the streaming standby's slot # Testcase start: Check inactive_since property of the streaming standby's slot
# #
# Initialize primary node # Initialize primary node
@ -440,45 +440,45 @@ $primary4->safe_psql(
SELECT pg_create_physical_replication_slot(slot_name := '$sb4_slot'); SELECT pg_create_physical_replication_slot(slot_name := '$sb4_slot');
]); ]);
# Get last_inactive_time value after the slot's creation. Note that the slot # Get inactive_since value after the slot's creation. Note that the slot is
# is still inactive till it's used by the standby below. # still inactive till it's used by the standby below.
my $last_inactive_time = my $inactive_since =
capture_and_validate_slot_last_inactive_time($primary4, $sb4_slot, $slot_creation_time); capture_and_validate_slot_inactive_since($primary4, $sb4_slot, $slot_creation_time);
$standby4->start; $standby4->start;
# Wait until standby has replayed enough data # Wait until standby has replayed enough data
$primary4->wait_for_catchup($standby4); $primary4->wait_for_catchup($standby4);
# Now the slot is active so last_inactive_time value must be NULL # Now the slot is active so inactive_since value must be NULL
is( $primary4->safe_psql( is( $primary4->safe_psql(
'postgres', 'postgres',
qq[SELECT last_inactive_time IS NULL FROM pg_replication_slots WHERE slot_name = '$sb4_slot';] qq[SELECT inactive_since IS NULL FROM pg_replication_slots WHERE slot_name = '$sb4_slot';]
), ),
't', 't',
'last inactive time for an active physical slot is NULL'); 'last inactive time for an active physical slot is NULL');
# Stop the standby to check its last_inactive_time value is updated # Stop the standby to check its inactive_since value is updated
$standby4->stop; $standby4->stop;
# Let's restart the primary so that the last_inactive_time is set upon # Let's restart the primary so that the inactive_since is set upon loading the
# loading the slot from the disk. # slot from the disk.
$primary4->restart; $primary4->restart;
is( $primary4->safe_psql( is( $primary4->safe_psql(
'postgres', 'postgres',
qq[SELECT last_inactive_time > '$last_inactive_time'::timestamptz FROM pg_replication_slots WHERE slot_name = '$sb4_slot' AND last_inactive_time IS NOT NULL;] qq[SELECT inactive_since > '$inactive_since'::timestamptz FROM pg_replication_slots WHERE slot_name = '$sb4_slot' AND inactive_since IS NOT NULL;]
), ),
't', 't',
'last inactive time for an inactive physical slot is updated correctly'); 'last inactive time for an inactive physical slot is updated correctly');
$standby4->stop; $standby4->stop;
# Testcase end: Check last_inactive_time property of the streaming standby's slot # Testcase end: Check inactive_since property of the streaming standby's slot
# ============================================================================= # =============================================================================
# ============================================================================= # =============================================================================
# Testcase start: Check last_inactive_time property of the logical subscriber's slot # Testcase start: Check inactive_since property of the logical subscriber's slot
my $publisher4 = $primary4; my $publisher4 = $primary4;
# Create subscriber node # Create subscriber node
@ -499,10 +499,10 @@ $publisher4->safe_psql('postgres',
"SELECT pg_create_logical_replication_slot(slot_name := '$lsub4_slot', plugin := 'pgoutput');" "SELECT pg_create_logical_replication_slot(slot_name := '$lsub4_slot', plugin := 'pgoutput');"
); );
# Get last_inactive_time value after the slot's creation. Note that the slot # Get inactive_since value after the slot's creation. Note that the slot is
# is still inactive till it's used by the subscriber below. # still inactive till it's used by the subscriber below.
$last_inactive_time = $inactive_since =
capture_and_validate_slot_last_inactive_time($publisher4, $lsub4_slot, $slot_creation_time); capture_and_validate_slot_inactive_since($publisher4, $lsub4_slot, $slot_creation_time);
$subscriber4->start; $subscriber4->start;
$subscriber4->safe_psql('postgres', $subscriber4->safe_psql('postgres',
@ -512,54 +512,54 @@ $subscriber4->safe_psql('postgres',
# Wait until subscriber has caught up # Wait until subscriber has caught up
$subscriber4->wait_for_subscription_sync($publisher4, 'sub'); $subscriber4->wait_for_subscription_sync($publisher4, 'sub');
# Now the slot is active so last_inactive_time value must be NULL # Now the slot is active so inactive_since value must be NULL
is( $publisher4->safe_psql( is( $publisher4->safe_psql(
'postgres', 'postgres',
qq[SELECT last_inactive_time IS NULL FROM pg_replication_slots WHERE slot_name = '$lsub4_slot';] qq[SELECT inactive_since IS NULL FROM pg_replication_slots WHERE slot_name = '$lsub4_slot';]
), ),
't', 't',
'last inactive time for an active logical slot is NULL'); 'last inactive time for an active logical slot is NULL');
# Stop the subscriber to check its last_inactive_time value is updated # Stop the subscriber to check its inactive_since value is updated
$subscriber4->stop; $subscriber4->stop;
# Let's restart the publisher so that the last_inactive_time is set upon # Let's restart the publisher so that the inactive_since is set upon
# loading the slot from the disk. # loading the slot from the disk.
$publisher4->restart; $publisher4->restart;
is( $publisher4->safe_psql( is( $publisher4->safe_psql(
'postgres', 'postgres',
qq[SELECT last_inactive_time > '$last_inactive_time'::timestamptz FROM pg_replication_slots WHERE slot_name = '$lsub4_slot' AND last_inactive_time IS NOT NULL;] qq[SELECT inactive_since > '$inactive_since'::timestamptz FROM pg_replication_slots WHERE slot_name = '$lsub4_slot' AND inactive_since IS NOT NULL;]
), ),
't', 't',
'last inactive time for an inactive logical slot is updated correctly'); 'last inactive time for an inactive logical slot is updated correctly');
# Testcase end: Check last_inactive_time property of the logical subscriber's slot # Testcase end: Check inactive_since property of the logical subscriber's slot
# ============================================================================= # =============================================================================
$publisher4->stop; $publisher4->stop;
$subscriber4->stop; $subscriber4->stop;
# Capture and validate last_inactive_time of a given slot. # Capture and validate inactive_since of a given slot.
sub capture_and_validate_slot_last_inactive_time sub capture_and_validate_slot_inactive_since
{ {
my ($node, $slot_name, $slot_creation_time) = @_; my ($node, $slot_name, $slot_creation_time) = @_;
my $last_inactive_time = $node->safe_psql('postgres', my $inactive_since = $node->safe_psql('postgres',
qq(SELECT last_inactive_time FROM pg_replication_slots qq(SELECT inactive_since FROM pg_replication_slots
WHERE slot_name = '$slot_name' AND last_inactive_time IS NOT NULL;) WHERE slot_name = '$slot_name' AND inactive_since IS NOT NULL;)
); );
# Check that the captured time is sane # Check that the captured time is sane
is( $node->safe_psql( is( $node->safe_psql(
'postgres', 'postgres',
qq[SELECT '$last_inactive_time'::timestamptz > to_timestamp(0) AND qq[SELECT '$inactive_since'::timestamptz > to_timestamp(0) AND
'$last_inactive_time'::timestamptz >= '$slot_creation_time'::timestamptz;] '$inactive_since'::timestamptz >= '$slot_creation_time'::timestamptz;]
), ),
't', 't',
"last inactive time for an active slot $slot_name is sane"); "last inactive time for an active slot $slot_name is sane");
return $last_inactive_time; return $inactive_since;
} }
done_testing(); done_testing();

4
src/test/regress/expected/rules.out
Unescape View File

@ -1473,12 +1473,12 @@ pg_replication_slots| SELECT l.slot_name,
l.wal_status, l.wal_status,
l.safe_wal_size, l.safe_wal_size,
l.two_phase, l.two_phase,
l.last_inactive_time, l.inactive_since,
l.conflicting, l.conflicting,
l.invalidation_reason, l.invalidation_reason,
l.failover, l.failover,
l.synced l.synced
FROM (pg_get_replication_slots() l(slot_name, plugin, slot_type, datoid, temporary, active, active_pid, xmin, catalog_xmin, restart_lsn, confirmed_flush_lsn, wal_status, safe_wal_size, two_phase, last_inactive_time, conflicting, invalidation_reason, failover, synced) FROM (pg_get_replication_slots() l(slot_name, plugin, slot_type, datoid, temporary, active, active_pid, xmin, catalog_xmin, restart_lsn, confirmed_flush_lsn, wal_status, safe_wal_size, two_phase, inactive_since, conflicting, invalidation_reason, failover, synced)
LEFT JOIN pg_database d ON ((l.datoid = d.oid))); LEFT JOIN pg_database d ON ((l.datoid = d.oid)));
pg_roles| SELECT pg_authid.rolname, pg_roles| SELECT pg_authid.rolname,
pg_authid.rolsuper, pg_authid.rolsuper,

Write Preview
Loading…
Cancel
Save