style(cluster): spec-5.18 clang-format v18 — fast-gate Validate fix

Whitespace-only reformat of the spec-5.18 sources to clang-format v18 (the CI
version); no behavioural change.  Fixes the linkdb fast-gate Validate
clang-format check (run 28316812451).

Author: SqlRush

src/backend/cluster/cluster_guc.c

@@ -2250,14 +2250,15 @@ cluster_init_guc(void)
 					 "its GRD/GES/PCM leftover cleaned up cluster-wide."),
 		&cluster_online_node_removal, false, PGC_POSTMASTER, 0, NULL, NULL, NULL);
 
-	DefineCustomIntVariable("cluster.node_removal_cleanup_timeout_ms",
-							gettext_noop("Deadline for the post-shrink cluster-wide removal cleanup."),
-							gettext_noop("If verify_no_leftover + all-survivor cleanup ACKs do not "
-										 "complete within this bound, the removal enters "
-										 "CLEANUP_BLOCKED (resumable, fail-closed — never reports "
-										 "complete).  Range [5000, 120000] ms."),
-							&cluster_node_removal_cleanup_timeout_ms, 30000, 5000, 120000, PGC_SIGHUP,
-							GUC_UNIT_MS, NULL, NULL, NULL);
+	DefineCustomIntVariable(
+		"cluster.node_removal_cleanup_timeout_ms",
+		gettext_noop("Deadline for the post-shrink cluster-wide removal cleanup."),
+		gettext_noop("If verify_no_leftover + all-survivor cleanup ACKs do not "
+					 "complete within this bound, the removal enters "
+					 "CLEANUP_BLOCKED (resumable, fail-closed — never reports "
+					 "complete).  Range [5000, 120000] ms."),
+		&cluster_node_removal_cleanup_timeout_ms, 30000, 5000, 120000, PGC_SIGHUP, GUC_UNIT_MS,
+		NULL, NULL, NULL);
 
 	/* spec-2.28 Sprint A Step 1 D7: 4 fence-lite GUCs (Q8 user approve). */
 

src/backend/cluster/cluster_node_remove.c

@@ -74,7 +74,7 @@ extern PGDLLIMPORT bool cluster_enabled;
 /* on-slot StaticAssert: the removal marker must fit within the voting-slot
  * _reserved1 region after the 4.12 fence marker, clear of the slot crc32c. */
 StaticAssertDecl(CLUSTER_REMOVAL_MARKER_RESERVED1_OFFSET + sizeof(ClusterRemovalMarker)
-				 <= sizeof(((ClusterVotingSlot *)0)->_reserved1),
+					 <= sizeof(((ClusterVotingSlot *)0)->_reserved1),
 				 "removal marker must fit within voting-slot _reserved1 (after fence marker)");
 
 static ClusterNodeRemoveState *nr_state = NULL;
@@ -347,8 +347,7 @@ nr_node_is_drained(int32 node_id)
 	if (cluster_reconfig_is_clean_departed(node_id))
 		return true;
 	st = cluster_membership_get_state(node_id);
-	return st == CLUSTER_MEMBER_DEAD || st == CLUSTER_MEMBER_ABSENT
-		   || st == CLUSTER_MEMBER_REMOVED;
+	return st == CLUSTER_MEMBER_DEAD || st == CLUSTER_MEMBER_ABSENT || st == CLUSTER_MEMBER_REMOVED;
 }
 
 /* generate a per-attempt removal identity (R14 folds it into the event id). */
@@ -428,8 +427,8 @@ cluster_node_remove_request(int32 node_id)
 		nr_state->coordinator_node_id = cluster_node_id;
 		nr_state->remove_epoch = 0;
 		nr_state->removal_event_id = nr_make_event_id(node_id);
-		nr_state->target_last_incarnation =
-			cluster_membership_get_last_admitted_incarnation(node_id);
+		nr_state->target_last_incarnation
+			= cluster_membership_get_last_admitted_incarnation(node_id);
 		nr_state->remove_baseline_dead_gen = cluster_cssd_get_dead_generation();
 		nr_state->fence_armed = false;
 		nr_state->membership_shrunk = false;
@@ -444,8 +443,7 @@ cluster_node_remove_request(int32 node_id)
 	}
 	/* RESUME: keep the existing target/epoch; just re-arm the drive from SHRUNK by
 	 * moving CLEANUP_BLOCKED back to CLEANUP (the lmon_tick retries the cleanup). */
-	else if (verdict == CLUSTER_REMOVE_REQ_RESUME
-			 && cur_phase == CLUSTER_REMOVE_CLEANUP_BLOCKED) {
+	else if (verdict == CLUSTER_REMOVE_REQ_RESUME && cur_phase == CLUSTER_REMOVE_CLEANUP_BLOCKED) {
 		pg_atomic_write_u32(&nr_state->phase, CLUSTER_REMOVE_CLEANUP);
 	}
 	LWLockRelease(&nr_state->lock);
@@ -507,8 +505,7 @@ cluster_node_remove_drive(void)
 		pg_atomic_write_u32(&nr_state->phase, CLUSTER_REMOVE_PRECHECK);
 		/* fall through to re-validate on the same tick */
 		/* FALLTHROUGH */
-	case CLUSTER_REMOVE_PRECHECK:
-	{
+	case CLUSTER_REMOVE_PRECHECK: {
 		CLUSTER_INJECTION_POINT("cluster-node-remove-precheck");
 		/* re-validate (a node may have come back ALIVE, or quorum lost). */
 		if (!cluster_qvotec_in_quorum() || !nr_node_is_drained(node_id)) {
@@ -520,13 +517,12 @@ cluster_node_remove_drive(void)
 		pg_atomic_write_u32(&nr_state->phase, CLUSTER_REMOVE_FENCE_ARMING);
 	}
 		/* FALLTHROUGH */
-	case CLUSTER_REMOVE_FENCE_ARMING:
-	{
+	case CLUSTER_REMOVE_FENCE_ARMING: {
 		uint64 baseline_epoch = cluster_epoch_get_current();
 		uint64 new_epoch;
 		bool contest = false;
 
-		(void) baseline_dead_gen; /* contest is now signalled by out_contest, not derived */
+		(void)baseline_dead_gen; /* contest is now signalled by out_contest, not derived */
 
 		/* §2.5: durable REMOVING marker (pre-commit; not a trust source). */
 		(void)nr_write_marker(CLUSTER_REMOVAL_MARKER_REMOVING, node_id, baseline_epoch,
@@ -540,17 +536,16 @@ cluster_node_remove_drive(void)
 		 * set) or because the fence submit did not reach majority (transient, NOT a
 		 * contest) — both fail-closed (nothing published on 0).
 		 */
-		new_epoch = cluster_reconfig_apply_node_removed_as_coordinator(node_id, baseline_epoch,
-																	   removal_event_id,
-																	   last_incarnation, &contest);
+		new_epoch = cluster_reconfig_apply_node_removed_as_coordinator(
+			node_id, baseline_epoch, removal_event_id, last_incarnation, &contest);
 		if (new_epoch == 0) {
 			if (contest) {
 				/* a real death/contest intruded BEFORE the membership commit
 				 * (pre-SHRUNK) -> ABORTED_ESCALATE (hand to fail-stop 5.14).  Routed
 				 * through classify_contest for the pre/post-SHRUNK discipline (here
 				 * always pre-SHRUNK: membership not yet shrunk). */
-				ClusterRemovePhase next =
-					cluster_node_remove_classify_contest(nr_state->membership_shrunk);
+				ClusterRemovePhase next
+					= cluster_node_remove_classify_contest(nr_state->membership_shrunk);
 
 				CLUSTER_INJECTION_POINT("cluster-node-remove-escalate");
 				pg_atomic_write_u32(&nr_state->phase, next);
@@ -568,9 +563,9 @@ cluster_node_remove_drive(void)
 		nr_state->remove_epoch = new_epoch;
 		nr_state->fence_armed = true;
 		nr_state->membership_shrunk = true; /* committed: N is now a fenced non-member */
-		nr_state->cleanup_deadline_us =
-			(TimestampTz)((uint64)GetCurrentTimestamp()
-						  + (uint64)cluster_node_removal_cleanup_timeout_ms * 1000ULL);
+		nr_state->cleanup_deadline_us
+			= (TimestampTz)((uint64)GetCurrentTimestamp()
+							+ (uint64)cluster_node_removal_cleanup_timeout_ms * 1000ULL);
 		LWLockRelease(&nr_state->lock);
 
 		/* membership is committed-shrunk: advance to SHRINK_COMMITTING, which writes
@@ -579,8 +574,7 @@ cluster_node_remove_drive(void)
 		pg_atomic_write_u32(&nr_state->phase, CLUSTER_REMOVE_SHRINK_COMMITTING);
 	}
 		/* FALLTHROUGH */
-	case CLUSTER_REMOVE_SHRINK_COMMITTING:
-	{
+	case CLUSTER_REMOVE_SHRINK_COMMITTING: {
 		uint64 epoch;
 
 		LWLockAcquire(&nr_state->lock, LW_SHARED);
@@ -601,8 +595,7 @@ cluster_node_remove_drive(void)
 	}
 		/* FALLTHROUGH */
 	case CLUSTER_REMOVE_CLEANUP:
-	case CLUSTER_REMOVE_CLEANUP_BLOCKED:
-	{
+	case CLUSTER_REMOVE_CLEANUP_BLOCKED: {
 		uint64 epoch;
 		bool clean;
 
@@ -753,8 +746,8 @@ nr_announce_handler(const ClusterICEnvelope *env, const void *payload)
 static void
 nr_ack_handler(const ClusterICEnvelope *env, const void *payload)
 {
-	const ClusterNodeRemoveCleanupAckPayload *p =
-		(const ClusterNodeRemoveCleanupAckPayload *)payload;
+	const ClusterNodeRemoveCleanupAckPayload *p
+		= (const ClusterNodeRemoveCleanupAckPayload *)payload;
 
 	if (nr_state == NULL || !cluster_node_remove_ack_payload_valid(p))
 		return;
@@ -898,11 +891,10 @@ cluster_node_remove_rebuild_from_disks(const int *fds, int n_disks)
 				has[i] = true;
 		}
 
-		if (!cluster_removal_marker_authority_decide(per_disk, has,
-													 (n_disks < CLUSTER_MAX_VOTING_DISKS
-														  ? n_disks
-														  : CLUSTER_MAX_VOTING_DISKS),
-													 &authority))
+		if (!cluster_removal_marker_authority_decide(
+				per_disk, has,
+				(n_disks < CLUSTER_MAX_VOTING_DISKS ? n_disks : CLUSTER_MAX_VOTING_DISKS),
+				&authority))
 			continue; /* no majority removal marker on this slot */
 		/* structural-only validation (magic/version/crc/phase/range); the marker's
 		 * removed_node_id is the node to seed, not the slot it physically lives in. */
@@ -925,7 +917,7 @@ cluster_node_remove_rebuild_from_disks(const int *fds, int n_disks)
 		fence_says_fenced = cluster_write_fence_verify_durable(authority.remove_epoch);
 		resume = cluster_node_remove_recover_phase(true /* trust the durable marker */,
 												   authority.phase, &corrupt);
-		(void) fence_says_fenced;
+		(void)fence_says_fenced;
 		if (corrupt)
 			continue; /* unknown marker phase — ignore (struct_valid already vetted phase) */
 
@@ -947,9 +939,9 @@ cluster_node_remove_rebuild_from_disks(const int *fds, int n_disks)
 			nr_state->target_last_incarnation = authority.removed_incarnation;
 			nr_state->fence_armed = true;
 			nr_state->membership_shrunk = true;
-			nr_state->cleanup_deadline_us =
-				(TimestampTz)((uint64)GetCurrentTimestamp()
-							  + (uint64)cluster_node_removal_cleanup_timeout_ms * 1000ULL);
+			nr_state->cleanup_deadline_us
+				= (TimestampTz)((uint64)GetCurrentTimestamp()
+								+ (uint64)cluster_node_removal_cleanup_timeout_ms * 1000ULL);
 			pg_atomic_write_u32(&nr_state->phase, (resume == CLUSTER_REMOVE_COMMITTED)
 													  ? CLUSTER_REMOVE_COMMITTED
 													  : CLUSTER_REMOVE_CLEANUP);

src/backend/cluster/cluster_node_remove_policy.c

@@ -68,8 +68,7 @@ cluster_node_remove_phase_valid_transition(ClusterRemovePhase from, ClusterRemov
 	/* escalate is reachable ONLY from a pre-SHRUNK active phase */
 	if (to == CLUSTER_REMOVE_ABORTED_ESCALATE)
 		return (from == CLUSTER_REMOVE_REQUESTED || from == CLUSTER_REMOVE_PRECHECK
-				|| from == CLUSTER_REMOVE_FENCE_ARMING
-				|| from == CLUSTER_REMOVE_SHRINK_COMMITTING);
+				|| from == CLUSTER_REMOVE_FENCE_ARMING || from == CLUSTER_REMOVE_SHRINK_COMMITTING);
 
 	/* clean abort is reachable ONLY pre-fence-commit */
 	if (to == CLUSTER_REMOVE_ABORTED)
@@ -183,9 +182,9 @@ cluster_node_remove_request_result_str(ClusterRemoveRequestResult r)
  *	(SHRUNK/REMOVED) is recognised regardless of the live drained snapshot.
  */
 ClusterRemoveRequestResult
-cluster_node_remove_precheck(bool feature_enabled, bool is_self, bool is_declared,
-							 bool is_drained, bool in_quorum, int marker_phase,
-							 bool cleanup_blocked, bool drive_active)
+cluster_node_remove_precheck(bool feature_enabled, bool is_self, bool is_declared, bool is_drained,
+							 bool in_quorum, int marker_phase, bool cleanup_blocked,
+							 bool drive_active)
 {
 	if (!feature_enabled)
 		return CLUSTER_REMOVE_REQ_FEATURE_DISABLED;
@@ -290,7 +289,7 @@ cluster_node_remove_recover_phase(bool fence_says_fenced, int marker_phase, bool
 
 	/* fence is durable (N is fenced): drive the removal to completion. */
 	switch (marker_phase) {
-	case 0:							/* no removal marker yet */
+	case 0: /* no removal marker yet */
 	case CLUSTER_REMOVAL_MARKER_REMOVING:
 		/* fenced but membership not committed -> finish the shrink+cleanup */
 		return CLUSTER_REMOVE_SHRINK_COMMITTING;
@@ -392,7 +391,8 @@ cluster_removal_marker_unpack(const uint8 *reserved1, ClusterRemovalMarker *out)
  * region as-is (the caller zeroed it).
  */
 void
-cluster_removal_marker_preserve_per_disk(uint8 *new_reserved1, const uint8 *prior_reserved1_same_disk)
+cluster_removal_marker_preserve_per_disk(uint8 *new_reserved1,
+										 const uint8 *prior_reserved1_same_disk)
 {
 	ClusterRemovalMarker m;
 

src/backend/cluster/cluster_node_remove_views.c

@@ -137,8 +137,8 @@ pg_cluster_remove_node(PG_FUNCTION_ARGS)
 		ereport(ERROR, (errcode(ERRCODE_FEATURE_NOT_SUPPORTED),
 						errmsg("cluster.enabled is off; node removal is not available")));
 
-	PG_RETURN_TEXT_P(
-		cstring_to_text(cluster_node_remove_request_result_str(cluster_node_remove_request(node_id))));
+	PG_RETURN_TEXT_P(cstring_to_text(
+		cluster_node_remove_request_result_str(cluster_node_remove_request(node_id))));
 }
 
 #else /* !USE_PGRAC_CLUSTER */

src/backend/cluster/cluster_qvotec.c

@@ -677,8 +677,8 @@ qvotec_build_baseline_marker(ClusterFenceMarker *out)
 		memset(fenced, 0, sizeof(fenced));
 		if (any_removed)
 			cluster_reconfig_snapshot_removed_bitmap(fenced);
-		cluster_fence_marker_build_baseline(out, CLUSTER_EPOCH_INITIAL, fenced,
-											0 /* generation */, 0 /* event_id */,
+		cluster_fence_marker_build_baseline(out, CLUSTER_EPOCH_INITIAL, fenced, 0 /* generation */,
+											0 /* event_id */,
 											CLUSTER_FENCE_BASELINE_INITIAL_ISSUER);
 	} else {
 		/* applied reconfig: republish its membership tuple, unioned with removed. */

src/backend/cluster/cluster_reconfig.c

@@ -538,8 +538,8 @@ cluster_reconfig_compute_event_id_v2(uint8 reconfig_kind,
  *	produces a distinct, non-deduped event id.
  */
 uint64
-cluster_reconfig_compute_removal_event_id(const uint8 removed_bitmap[CLUSTER_RECONFIG_DEAD_BITMAP_BYTES],
-										  uint64 removal_event_id)
+cluster_reconfig_compute_removal_event_id(
+	const uint8 removed_bitmap[CLUSTER_RECONFIG_DEAD_BITMAP_BYTES], uint64 removal_event_id)
 {
 	uint8 hash_input[1 + CLUSTER_RECONFIG_DEAD_BITMAP_BYTES + sizeof(uint64)];
 	Size off = 0;
@@ -1492,8 +1492,8 @@ cluster_reconfig_lmon_tick(void)
 		 * re-admits it — it is no longer a member.
 		 */
 		for (b = 0; b < CLUSTER_RECONFIG_DEAD_BITMAP_BYTES; b++)
-			dead_bitmap[b] &= (uint8)~(ReconfigShmem->clean_departed_bitmap[b]
-									   | ReconfigShmem->removed_bitmap[b]);
+			dead_bitmap[b] &= (uint8) ~(ReconfigShmem->clean_departed_bitmap[b]
+										| ReconfigShmem->removed_bitmap[b]);
 
 		LWLockRelease(&ReconfigShmem->lock);
 	} else {
@@ -1942,8 +1942,8 @@ cluster_reconfig_apply_node_removed_as_coordinator(int32 removed_node_id, uint64
 		marker.magic = CLUSTER_FENCE_MARKER_MAGIC;
 		marker.version = CLUSTER_FENCE_MARKER_VERSION;
 		marker.fence_epoch = new_epoch;
-		marker.fence_event_id = cluster_reconfig_compute_removal_event_id(removed_with_n,
-																		  removal_event_id);
+		marker.fence_event_id
+			= cluster_reconfig_compute_removal_event_id(removed_with_n, removal_event_id);
 		marker.fence_generation = cssd_dead_generation;
 		marker.issuer_node_id = cluster_node_id;
 		marker.marker_kind = CLUSTER_FENCE_MARKER_KIND_NODE_REMOVED;

src/include/cluster/cluster_guc.h

@@ -445,8 +445,8 @@ extern char *cluster_voting_disks;
 extern int cluster_quorum_poll_interval_ms;
 extern int cluster_voting_disk_io_timeout_ms;
 extern int cluster_voting_disk_size_bytes;
-extern bool cluster_online_join;				/* spec-5.15 D7 */
-extern int cluster_join_convergence_timeout_ms; /* spec-5.15 D7 */
+extern bool cluster_online_join;					/* spec-5.15 D7 */
+extern int cluster_join_convergence_timeout_ms;		/* spec-5.15 D7 */
 extern bool cluster_online_node_removal;			/* spec-5.18 D13 */
 extern int cluster_node_removal_cleanup_timeout_ms; /* spec-5.18 D13 */