Hi, Not critically important but note that the PopActiveSnapshot and InvalidateCatalogSnapshot call and the comment about "giving up if there is still an active or registered snapshot" have a close relationship; I think it would make sense to keep them together. I would add your new test-and-ereport just before the PopActiveSnapshot() call, to avoid breaking that.
Cheers -- Álvaro Herrera 48°01'N 7°57'E — https://www.EnterpriseDB.com/ "Siempre hay que alimentar a los dioses, aunque la tierra esté seca" (Orual)
