diff --git a/manila/share/drivers/zfsonlinux/driver.py b/manila/share/drivers/zfsonlinux/driver.py index 47b1041d05..c1f3861655 100644 --- a/manila/share/drivers/zfsonlinux/driver.py +++ b/manila/share/drivers/zfsonlinux/driver.py @@ -604,7 +604,7 @@ class ZFSonLinuxShareDriver(zfs_utils.ExecuteMixin, driver.ShareDriver): # NOTE(vponomaryov): SSH is used as workaround for 'execute' # implementation restriction that does not support usage of '|'. 'ssh', ssh_cmd, - 'sudo', 'zfs', 'send', '-vDp', snapshot_name, '|', + 'sudo', 'zfs', 'send', '-vD', snapshot_name, '|', 'sudo', 'zfs', 'receive', '-v', dataset_name, ) # Apply options based on used share type that may differ from diff --git a/manila/tests/share/drivers/zfsonlinux/test_driver.py b/manila/tests/share/drivers/zfsonlinux/test_driver.py index a5dd4fa977..8d3a31975c 100644 --- a/manila/tests/share/drivers/zfsonlinux/test_driver.py +++ b/manila/tests/share/drivers/zfsonlinux/test_driver.py @@ -846,7 +846,7 @@ class ZFSonLinuxShareDriverTestCase(test.TestCase): self.driver.execute.assert_has_calls([ mock.call( 'ssh', 'someuser@2.2.2.2', - 'sudo', 'zfs', 'send', '-vDp', snap_name, '|', + 'sudo', 'zfs', 'send', '-vD', snap_name, '|', 'sudo', 'zfs', 'receive', '-v', 'bar/subbar/some_prefix_fake_share_id'), mock.call( diff --git a/releasenotes/notes/bug-1645746-fix-inheritance-of-access-rules-from-parent-share-by-zfsonlinux-child-shares-4f85908c8e9871ef.yaml b/releasenotes/notes/bug-1645746-fix-inheritance-of-access-rules-from-parent-share-by-zfsonlinux-child-shares-4f85908c8e9871ef.yaml new file mode 100644 index 0000000000..9893697089 --- /dev/null +++ b/releasenotes/notes/bug-1645746-fix-inheritance-of-access-rules-from-parent-share-by-zfsonlinux-child-shares-4f85908c8e9871ef.yaml @@ -0,0 +1,5 @@ +--- +fixes: + - Fix inheritance of access rules from parent share by ZFSonLinux child + shares. It was inherited before, now it is not, as expected. + Now, each share created from snapshot will not have inherited access rules.