This is an automated email from the ASF dual-hosted git repository. qianzhang pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/mesos.git
commit ea4099028cfe93e1e2fd80e4d30e03057ec27df1 Author: Qian Zhang <[email protected]> AuthorDate: Sun Aug 30 10:23:06 2020 +0800 Relaxed unknown volume check when unpublishing volumes. Review: https://reviews.apache.org/r/72820 --- src/csi/v0_volume_manager.cpp | 5 ++++- src/csi/v1_volume_manager.cpp | 5 ++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/src/csi/v0_volume_manager.cpp b/src/csi/v0_volume_manager.cpp index 8ba6100..3d5caa8 100644 --- a/src/csi/v0_volume_manager.cpp +++ b/src/csi/v0_volume_manager.cpp @@ -498,7 +498,10 @@ Future<Nothing> VolumeManagerProcess::publishVolume( Future<Nothing> VolumeManagerProcess::unpublishVolume(const string& volumeId) { if (!volumes.contains(volumeId)) { - return Failure("Cannot unpublish unknown volume '" + volumeId + "'"); + LOG(WARNING) << "Ignoring unpublish request for unknown volume '" + << volumeId << "'"; + + return Nothing(); } VolumeData& volume = volumes.at(volumeId); diff --git a/src/csi/v1_volume_manager.cpp b/src/csi/v1_volume_manager.cpp index 29ae821..c50fda2 100644 --- a/src/csi/v1_volume_manager.cpp +++ b/src/csi/v1_volume_manager.cpp @@ -519,7 +519,10 @@ Future<Nothing> VolumeManagerProcess::publishVolume( Future<Nothing> VolumeManagerProcess::unpublishVolume(const string& volumeId) { if (!volumes.contains(volumeId)) { - return Failure("Cannot unpublish unknown volume '" + volumeId + "'"); + LOG(WARNING) << "Ignoring unpublish request for unknown volume '" + << volumeId << "'"; + + return Nothing(); } VolumeData& volume = volumes.at(volumeId);
