Project

General

Profile

Bug #11872

Fix incremental recursive encrypted receive

Added by Jason King about 1 month ago. Updated about 1 month ago.

Status:
Closed
Priority:
Normal
Assignee:
Category:
zfs - Zettabyte File System
Start date:
Due date:
% Done:

100%

Estimated time:
Difficulty:
Medium
Tags:

Description

Port from ZoL b4238327b Fix incremental recursive encrypted receive

Currently, incremental recursive encrypted receives fail to work
for any snapshot after the first. The reason for this is because
the check in zfs_setup_cmdline_props() did not properly realize
that when the user attempts to use '-x encryption' in this
situation, they are not really overriding the existing encryption
property and instead are attempting to prevent it from changing.
This resulted in an error message stating: "encryption property
'encryption' cannot be set or excluded for raw or incremental
streams".

This problem is fixed by updating the logic to expect this use
case.

History

#1

Updated by Jason King about 1 month ago

The issue was originally encountered on SmartOS. I ported the ZoL fix to SmartOS (the illumos-gate fix is identical), built a test platform image of SmartOS for the user who verified that the issue was resolved.

#2

Updated by Jason King about 1 month ago

I also ran the zfs test suite (on SmartOS w/ the change applied). The project and user quota tests were skipped, and the rsend send-c_verify_ratio test fails due to the fio not being present in a SmartOS gz, but this code does not touch any of the relevant zfs code.

#3

Updated by Electric Monk about 1 month ago

  • Status changed from New to Closed
  • % Done changed from 0 to 100

git commit 8675de3a4bb7d310dd672e8f2bf479154e07c678

commit  8675de3a4bb7d310dd672e8f2bf479154e07c678
Author: Tom Caputi <tcaputi@datto.com>
Date:   2019-10-29T15:49:26.000Z

    11872 Fix incremental recursive encrypted receive
    Portions contributed by: Jason King <jason.king@joyent.com>
    Reviewed by: loli10K <ezomori.nozomu@gmail.com>
    Reviewed by: Brian Behlendorf <behlendorf1@llnl.gov>
    Reviewed by: Igor Kozhukhov <igor@dilos.org>
    Reviewed by: Toomas Soome <tsoome@me.com>
    Reviewed by: Andy Fiddaman <omnios@citrus-it.co.uk>
    Approved by: Dan McDonald <danmcd@joyent.com>

Also available in: Atom PDF