EDGE-2300 : fixing retry logic for consistency check