Buffered requestResignChan

internal/leadership/elector.go

@@ -139,7 +139,9 @@ func (e *Elector) Start(ctx context.Context) error {
 	// We'll send to this channel anytime a leader resigns on the key with `name`
 	e.leaderResignedChan = make(chan struct{})
 
-	e.requestResignChan = make(chan struct{})
+	// Buffered to 1 so a send from handleLeadershipNotification doesn't block
+	// if keepLeadershipLoop hasn't entered its select yet.
+	e.requestResignChan = make(chan struct{}, 1)
 
 	var sub *notifier.Subscription
 	if e.notifier == nil {

internal/leadership/elector_test.go

@@ -344,6 +344,31 @@ func testElector[TElectorBundle any](
 		startstoptest.Stress(ctx, t, elector)
 	})
 
+	t.Run("RequestResignImmediatelyAfterElection", func(t *testing.T) {
+		t.Parallel()
+
+		elector, _ := setup(t, nil)
+
+		startElector(ctx, t, elector)
+
+		elector.testSignals.GainedLeadership.WaitOrTimeout()
+
+		// Send a resign request immediately after gaining leadership.
+		// GainedLeadership is signaled _before_ keepLeadershipLoop is
+		// entered, so the resign request arrives before the loop's
+		// select. This only works if requestResignChan is buffered;
+		// with an unbuffered channel the send would be dropped by the
+		// default case since nobody is receiving yet.
+		payload, err := json.Marshal(DBNotification{
+			Action: DBNotificationKindRequestResign,
+		})
+		require.NoError(t, err)
+		elector.handleLeadershipNotification(ctx, notifier.NotificationTopicLeadership, string(payload))
+
+		elector.testSignals.ResignedLeadership.WaitOrTimeout()
+		elector.testSignals.GainedLeadership.WaitOrTimeout()
+	})
+
 	t.Run("RequestResignStress", func(t *testing.T) {
 		t.Parallel()