RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-02-24 11:37:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

librbd: fast diff should treat all _EXISTS objects as dirty

Browse Source 
With the fast-diff feature enabled, if the object map marks the
object as _EXISTS, it can only occur due to a write -- otherwise
it would be _EXISTS_CLEAN.  Therefore, ensure it is properly
flagged as an updated object for diff_iterate.

Fixes: #11553
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
This commit is contained in:
Jason Dillaman 2015-05-06 21:28:25 -04:00
parent a7ffd8d19b
commit 819c9800df
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/librbd/internal.cc
View File

@ -139,9 +139,10 @@ int diff_object_map(ImageCtx* ictx, uint64_t from_snap_id, uint64_t to_snap_id,
if (prev_object_map[i] != OBJECT_NONEXISTENT) {
(*object_diff_state)[i] = OBJECT_DIFF_STATE_HOLE;
}
} else if (prev_object_map[i] != object_map[i] &&
!(prev_object_map[i] == OBJECT_EXISTS &&
object_map[i] == OBJECT_EXISTS_CLEAN)) {
} else if (object_map[i] == OBJECT_EXISTS ||
(prev_object_map[i] != object_map[i] &&
!(prev_object_map[i] == OBJECT_EXISTS &&
object_map[i] == OBJECT_EXISTS_CLEAN))) {
(*object_diff_state)[i] = OBJECT_DIFF_STATE_UPDATED;
}
}