Fix potential race in volume creation Upstream-commit: 3f2e4e94d7dffe40a9cc1139cc2e6e5dcd1459f3 Component: engine