Fix NFS "already mounted" detection
Previous fix2f32c98a
RemoteFS: don't fail in do_mount if already mounted was made with the assumption that "already mounted" appearing in stderr from an NFS mount means that the NFS share was already mounted. However, the NFS client can fail with "busy or already mounted" in cases where it fails to mount the share as well. This results in the Cinder NFS backup driver believing that the NFS mount has succeeded when it didn't, and as a result, data can be written to the local disk instead of the NFS target. Fail if the share isn't actually mounted rather than succeeding. Related-Bug: #1780813 Closes-Bug: #1797233 Change-Id: Iebd1afb3340fcaeb1969784966c4f9be35a28417 (cherry picked from commit360a20c7c7
) (cherry picked from commit4c94477cb5
)
This commit is contained in:
parent
e6b4bf3ae0
commit
30d7bc124e
|
@ -123,10 +123,15 @@ class RemoteFsClient(executor.Executor):
|
||||||
except processutils.ProcessExecutionError as exc:
|
except processutils.ProcessExecutionError as exc:
|
||||||
if 'already mounted' in exc.stderr:
|
if 'already mounted' in exc.stderr:
|
||||||
LOG.info("Already mounted: %s", share)
|
LOG.info("Already mounted: %s", share)
|
||||||
else:
|
|
||||||
LOG.error("Failed to mount %(share)s, reason: %(reason)s",
|
# The error message can say "busy or already mounted" when the
|
||||||
{'share': share, 'reason': exc.stderr})
|
# share didn't actually mount, so look for it.
|
||||||
raise
|
if share in self._read_mounts():
|
||||||
|
return
|
||||||
|
|
||||||
|
LOG.error("Failed to mount %(share)s, reason: %(reason)s",
|
||||||
|
{'share': share, 'reason': exc.stderr})
|
||||||
|
raise
|
||||||
|
|
||||||
def _mount_nfs(self, nfs_share, mount_path, flags=None):
|
def _mount_nfs(self, nfs_share, mount_path, flags=None):
|
||||||
"""Mount nfs share using present mount types."""
|
"""Mount nfs share using present mount types."""
|
||||||
|
|
|
@ -86,9 +86,13 @@ class RemoteFsClientTestCase(base.TestCase):
|
||||||
def test_mount_race(self, mock_execute):
|
def test_mount_race(self, mock_execute):
|
||||||
err_msg = 'mount.nfs: /var/asdf is already mounted'
|
err_msg = 'mount.nfs: /var/asdf is already mounted'
|
||||||
mock_execute.side_effect = putils.ProcessExecutionError(stderr=err_msg)
|
mock_execute.side_effect = putils.ProcessExecutionError(stderr=err_msg)
|
||||||
|
mounts = {'192.0.2.20:/share': '/var/asdf/'}
|
||||||
client = remotefs.RemoteFsClient("nfs", root_helper='true',
|
client = remotefs.RemoteFsClient("nfs", root_helper='true',
|
||||||
nfs_mount_point_base='/var/asdf')
|
nfs_mount_point_base='/var/asdf')
|
||||||
client._do_mount('nfs', '192.0.2.20:/share', '/var/asdf')
|
|
||||||
|
with mock.patch.object(client, '_read_mounts',
|
||||||
|
return_value=mounts):
|
||||||
|
client._do_mount('nfs', '192.0.2.20:/share', '/var/asdf')
|
||||||
|
|
||||||
@mock.patch.object(priv_rootwrap, 'execute')
|
@mock.patch.object(priv_rootwrap, 'execute')
|
||||||
def test_mount_failure(self, mock_execute):
|
def test_mount_failure(self, mock_execute):
|
||||||
|
|
Loading…
Reference in New Issue