issue #20054: run maintenance atomically