Merge pull request #8266 from cpuguy83/fix_race_in_createing_volumes

Fix potential race in volume creation