Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[PoC] Export sub region #59

Draft
wants to merge 4 commits into
base: branch-17.2.6
Choose a base branch
from
Draft

[PoC] Export sub region #59

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
a99a4cb
wip
toshipp Apr 30, 2024
1317fe3
wip
toshipp May 7, 2024
be2e17e
wip
toshipp May 7, 2024
e29fff0
wip
toshipp May 7, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions src/tools/rbd/ArgumentTypes.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,10 @@ static const std::string DEST_SNAPSHOT_NAME("dest-snap");
static const std::string PATH("path");
static const std::string FROM_SNAPSHOT_NAME("from-snap");
static const std::string WHOLE_OBJECT("whole-object");
static const std::string READ_OFFSET("read-offset");
static const std::string READ_LENGTH("read-length");
static const std::string OUTPUT_FROM_SNAPSHOT_NAME("output-from-snap");
static const std::string OUTPUT_END_SNAPSHOT_NAME("output-end-snap");

static const std::string IMAGE_FORMAT("image-format");
static const std::string IMAGE_NEW_FORMAT("new-format");
Expand Down
71 changes: 57 additions & 14 deletions src/tools/rbd/action/Export.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,9 @@ class C_ExportDiff : public Context {


int do_export_diff_fd(librbd::Image& image, const char *fromsnapname,
const char *endsnapname, bool whole_object,
const char *endsnapname, const char *out_fromsnapname,
const char* out_endsnapname, uint64_t offset,
uint64_t length, bool whole_object,
int fd, bool no_progress, int export_format)
{
int r;
Expand All @@ -133,6 +135,12 @@ int do_export_diff_fd(librbd::Image& image, const char *fromsnapname,
if (r < 0)
return r;

if (length == 0) {
length = info.size - offset;
} else {
length = std::min(length, info.size - offset);
}

{
// header
bufferlist bl;
Expand All @@ -143,21 +151,21 @@ int do_export_diff_fd(librbd::Image& image, const char *fromsnapname,

__u8 tag;
uint64_t len = 0;
if (fromsnapname) {
if (out_fromsnapname) {
tag = RBD_DIFF_FROM_SNAP;
encode(tag, bl);
std::string from(fromsnapname);
std::string from(out_fromsnapname);
if (export_format == 2) {
len = from.length() + 4;
encode(len, bl);
}
encode(from, bl);
}

if (endsnapname) {
if (out_endsnapname) {
tag = RBD_DIFF_TO_SNAP;
encode(tag, bl);
std::string to(endsnapname);
std::string to(out_endsnapname);
if (export_format == 2) {
len = to.length() + 4;
encode(len, bl);
Expand Down Expand Up @@ -192,10 +200,10 @@ int do_export_diff_fd(librbd::Image& image, const char *fromsnapname,
return r;
}
}
ExportDiffContext edc(&image, fd, info.size,
ExportDiffContext edc(&image, fd, length + offset,
g_conf().get_val<uint64_t>("rbd_concurrent_management_ops"),
no_progress, export_format);
r = image.diff_iterate2(fromsnapname, 0, info.size, true, whole_object,
r = image.diff_iterate2(fromsnapname, offset, length, true, whole_object,
&C_ExportDiff::export_diff_cb, (void *)&edc);
if (r < 0) {
goto out;
Expand Down Expand Up @@ -223,7 +231,9 @@ int do_export_diff_fd(librbd::Image& image, const char *fromsnapname,
}

int do_export_diff(librbd::Image& image, const char *fromsnapname,
const char *endsnapname, bool whole_object,
const char *endsnapname, const char *out_fromsnapname,
const char* out_endsnapname, uint64_t offset,
uint64_t length, bool whole_object,
const char *path, bool no_progress)
{
int r;
Expand All @@ -236,7 +246,9 @@ int do_export_diff(librbd::Image& image, const char *fromsnapname,
if (fd < 0)
return -errno;

r = do_export_diff_fd(image, fromsnapname, endsnapname, whole_object, fd, no_progress, 1);
r = do_export_diff_fd(image, fromsnapname, endsnapname, out_fromsnapname,
out_endsnapname, offset, length, whole_object, fd,
no_progress, 1);

if (fd != 1)
close(fd);
Expand All @@ -260,7 +272,11 @@ void get_arguments_diff(po::options_description *positional,
options->add_options()
(at::FROM_SNAPSHOT_NAME.c_str(), po::value<std::string>(),
"snapshot starting point")
(at::WHOLE_OBJECT.c_str(), po::bool_switch(), "compare whole object");
(at::WHOLE_OBJECT.c_str(), po::bool_switch(), "compare whole object")
(at::READ_OFFSET.c_str(), po::value<uint64_t>(), "offset in bytes")
(at::READ_LENGTH.c_str(), po::value<uint64_t>(), "length in bytes")
(at::OUTPUT_FROM_SNAPSHOT_NAME.c_str(), po::value<std::string>(), "from snapshot name in output diff")
(at::OUTPUT_END_SNAPSHOT_NAME.c_str(), po::value<std::string>(), "end snapshot name in output diff");
at::add_no_progress_option(options);
}

Expand Down Expand Up @@ -290,6 +306,26 @@ int execute_diff(const po::variables_map &vm,
from_snap_name = vm[at::FROM_SNAPSHOT_NAME].as<std::string>();
}

uint64_t read_offset = 0;
if (vm.count(at::READ_OFFSET)) {
read_offset = vm[at::READ_OFFSET].as<uint64_t>();
}

uint64_t read_length = 0;
if (vm.count(at::READ_LENGTH)) {
read_length = vm[at::READ_LENGTH].as<uint64_t>();
}

std::string output_from_snap_name;
if (vm.count(at::OUTPUT_FROM_SNAPSHOT_NAME)) {
output_from_snap_name = vm[at::OUTPUT_FROM_SNAPSHOT_NAME].as<std::string>();
}

std::string output_end_snap_name;
if (vm.count(at::OUTPUT_END_SNAPSHOT_NAME)) {
output_end_snap_name = vm[at::OUTPUT_END_SNAPSHOT_NAME].as<std::string>();
}

librados::Rados rados;
librados::IoCtx io_ctx;
librbd::Image image;
Expand All @@ -299,9 +335,15 @@ int execute_diff(const po::variables_map &vm,
return r;
}

const char* fromsnapname = from_snap_name.empty() ? nullptr : from_snap_name.c_str();
const char* endsnapname = snap_name.empty() ? nullptr : snap_name.c_str();

r = do_export_diff(image,
from_snap_name.empty() ? nullptr : from_snap_name.c_str(),
snap_name.empty() ? nullptr : snap_name.c_str(),
fromsnapname,
endsnapname,
output_from_snap_name.empty() ? fromsnapname : output_from_snap_name.c_str(),
output_end_snap_name.empty() ? endsnapname : output_end_snap_name.c_str(),
read_offset, read_length,
vm[at::WHOLE_OBJECT].as<bool>(), path.c_str(),
vm[at::NO_PROGRESS].as<bool>());
if (r < 0) {
Expand Down Expand Up @@ -501,15 +543,16 @@ static int do_export_v2(librbd::Image& image, librbd::image_info_t &info, int fd
const char *last_snap = NULL;
for (size_t i = 0; i < snaps.size(); ++i) {
utils::snap_set(image, snaps[i].name.c_str());
r = do_export_diff_fd(image, last_snap, snaps[i].name.c_str(), false, fd, true, 2);
r = do_export_diff_fd(image, last_snap, snaps[i].name.c_str(), last_snap,
snaps[i].name.c_str(), 0, 0, false, fd, true, 2);
if (r < 0) {
return r;
}
pc.update_progress(i, snaps.size() + 1);
last_snap = snaps[i].name.c_str();
}
utils::snap_set(image, std::string(""));
r = do_export_diff_fd(image, last_snap, nullptr, false, fd, true, 2);
r = do_export_diff_fd(image, last_snap, nullptr, last_snap, nullptr, 0, 0, false, fd, true, 2);
if (r < 0) {
return r;
}
Expand Down
Loading