Snapshots on demand, separate from the nightly backup

Before I do a risky upgrade I want to take an instant snapshot and roll back if it goes wrong, without waiting for or overwriting the scheduled backup. A one-click snapshot/restore would be huge.