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.
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
librbd: add SnapshotNamespace to ImageCtx #12970
Merged
Merged
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -412,12 +412,14 @@ struct C_InvalidateCache : public Context { | |
return flags; | ||
} | ||
|
||
int ImageCtx::snap_set(string in_snap_name) | ||
int ImageCtx::snap_set(cls::rbd::SnapshotNamespace in_snap_namespace, | ||
string in_snap_name) | ||
{ | ||
assert(snap_lock.is_wlocked()); | ||
snap_t in_snap_id = get_snap_id(in_snap_name); | ||
snap_t in_snap_id = get_snap_id(in_snap_namespace, in_snap_name); | ||
if (in_snap_id != CEPH_NOSNAP) { | ||
snap_id = in_snap_id; | ||
snap_namespace = in_snap_namespace; | ||
snap_name = in_snap_name; | ||
snap_exists = true; | ||
data_ctx.snap_set_read(snap_id); | ||
|
@@ -430,16 +432,17 @@ struct C_InvalidateCache : public Context { | |
{ | ||
assert(snap_lock.is_wlocked()); | ||
snap_id = CEPH_NOSNAP; | ||
snap_namespace = {}; | ||
snap_name = ""; | ||
snap_exists = true; | ||
data_ctx.snap_set_read(snap_id); | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more.
|
||
} | ||
|
||
snap_t ImageCtx::get_snap_id(string in_snap_name) const | ||
snap_t ImageCtx::get_snap_id(cls::rbd::SnapshotNamespace in_snap_namespace, | ||
string in_snap_name) const | ||
{ | ||
assert(snap_lock.is_locked()); | ||
map<string, snap_t>::const_iterator it = | ||
snap_ids.find(in_snap_name); | ||
auto it = snap_ids.find({in_snap_namespace, in_snap_name}); | ||
if (it != snap_ids.end()) | ||
return it->second; | ||
return CEPH_NOSNAP; | ||
|
@@ -548,8 +551,8 @@ struct C_InvalidateCache : public Context { | |
return -ENOENT; | ||
} | ||
|
||
void ImageCtx::add_snap(string in_snap_name, | ||
cls::rbd::SnapshotNamespace in_snap_namespace, | ||
void ImageCtx::add_snap(cls::rbd::SnapshotNamespace in_snap_namespace, | ||
string in_snap_name, | ||
snap_t id, uint64_t in_size, | ||
const ParentInfo &parent, uint8_t protection_status, | ||
uint64_t flags, utime_t timestamp) | ||
|
@@ -558,16 +561,18 @@ struct C_InvalidateCache : public Context { | |
snaps.push_back(id); | ||
SnapInfo info(in_snap_name, in_snap_namespace, | ||
in_size, parent, protection_status, flags, timestamp); | ||
snap_info.insert(pair<snap_t, SnapInfo>(id, info)); | ||
snap_ids.insert(pair<string, snap_t>(in_snap_name, id)); | ||
snap_info.insert({id, info}); | ||
snap_ids.insert({{in_snap_namespace, in_snap_name}, id}); | ||
} | ||
|
||
void ImageCtx::rm_snap(string in_snap_name, snap_t id) | ||
void ImageCtx::rm_snap(cls::rbd::SnapshotNamespace in_snap_namespace, | ||
string in_snap_name, | ||
snap_t id) | ||
{ | ||
assert(snap_lock.is_wlocked()); | ||
snaps.erase(std::remove(snaps.begin(), snaps.end(), id), snaps.end()); | ||
snap_info.erase(id); | ||
snap_ids.erase(in_snap_name); | ||
snap_ids.erase({in_snap_namespace, in_snap_name}); | ||
} | ||
|
||
uint64_t ImageCtx::get_image_size(snap_t in_snap_id) const | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
snap_namespace = {};