Try to set takenDuringRecovery appropriately.

diff --git a/src/backend/storage/ipc/snaparray.c b/src/backend/storage/ipc/snaparray.c
index 0c780c486d7b70052a02c668dabc0824486fbc97..1c71d5bf3218a961ec9d61fc59b648a55abdee21 100644 (file)
--- a/src/backend/storage/ipc/snaparray.c
+++ b/src/backend/storage/ipc/snaparray.c
@@ -669,7 +669,8 @@ retry:
        if (num_running_xids > 0)
                memcpy(snapshot->oxip, SnapArrayCache.buffer + SNAPARRAY_SUMMARY_ITEMS,
                           num_running_xids * sizeof(TransactionId));
-       snapshot->takenDuringRecovery = true;           /* XXX FIXME */
+       /* XXX Is there a race condition setting takenDuringRecovery? */
+       snapshot->takenDuringRecovery = RecoveryInProgress();
        snapshot->highest_removed_subxid = SnapArrayCache.buffer[2];
        snapshot->curcid = GetCurrentCommandId(false);