Commit Graph

78088 Commits

Author SHA1 Message Date
Sage Weil
a9145997db osd/PrimaryLogPG: do_osd_ops: head_exists is always true for LIST_SNAPS
Signed-off-by: Sage Weil <sage@redhat.com>
2017-09-21 14:29:34 -04:00
Sage Weil
b5ac17874d osd/osd_types: SnapSet: drop is_legacy
Signed-off-by: Sage Weil <sage@redhat.com>
2017-09-21 14:29:34 -04:00
Sage Weil
fca22aae5d osd/PrimaryLogPG: start_flush: drop legacy snapset handling
Signed-off-by: Sage Weil <sage@redhat.com>
2017-09-21 14:29:34 -04:00
Sage Weil
222a5e6f13 osd/osd_types: default head_exists = true
This will be helpful as we start removing code that would otherwise
set this to true in some convoluted way.

Signed-off-by: Sage Weil <sage@redhat.com>
2017-09-21 14:29:33 -04:00
Sage Weil
8924bbeb5f osd/PrimaryLogPG: finish_promote: drop legacy snapset handling
Signed-off-by: Sage Weil <sage@redhat.com>
2017-09-21 14:29:33 -04:00
Sage Weil
cec378d94d osd/PrimaryLogPG: do_copy_get: drop legacy snapset path
Signed-off-by: Sage Weil <sage@redhat.com>
2017-09-21 14:29:33 -04:00
Sage Weil
3671bef26b osd/PrimaryLogPG: _delete_oid: drop legacy snapset handling
Signed-off-by: Sage Weil <sage@redhat.com>
2017-09-21 14:29:33 -04:00
Sage Weil
8d55ba7e2c osd/PrimaryLogPG: do_osd_ops: drop legacy snapset handling from LIST_SNAPS
This is so much simpler, yay!

Signed-off-by: Sage Weil <sage@redhat.com>
2017-09-21 14:29:33 -04:00
Sage Weil
1f90d10b2a osd/PrimaryLogPG: on_local_recover: drop legacy snapset handling
This was there to deal with jewel peers, which are no more.

Signed-off-by: Sage Weil <sage@redhat.com>
2017-09-21 14:29:33 -04:00
Sage Weil
e3779d9e0f osd/PG: _scan_snaps: drop legacy snapset handling
Signed-off-by: Sage Weil <sage@redhat.com>
2017-09-21 14:29:33 -04:00
Sage Weil
89c3439191 osd/PrimaryLogPG: find_object_context: drop legacy snapset handling
Signed-off-by: Sage Weil <sage@redhat.com>
2017-09-21 14:29:33 -04:00
Sage Weil
bd36330ff8 osd/PrimaryLogPG: issue_repop: drop obsolete condition on head_obc
The only user is trim_object, which sets obc = clone, head_obc =
head.

Signed-off-by: Sage Weil <sage@redhat.com>
2017-09-21 14:29:32 -04:00
Sage Weil
b01783fb97 osd/PrimaryLogPG: snapset_obc -> head_obc
This is only used for trim_object, now!

Signed-off-by: Sage Weil <sage@redhat.com>
2017-09-21 14:29:32 -04:00
Sage Weil
93ae366bff osd/PrimaryLogPG: do_op: drop snapset_obc lookup on snapdir
We'll never find it.  This also means we can drop the goofy hack
to clear it for cache tiers.

Signed-off-by: Sage Weil <sage@redhat.com>
2017-09-21 14:29:32 -04:00
Sage Weil
0d45f26243 osd/PrimaryLogPG: trim_object: ctx->snapset_obc -> head_obc
Signed-off-by: Sage Weil <sage@redhat.com>
2017-09-21 14:29:32 -04:00
Sage Weil
a53e731f8f osd/PrimaryLogPG: trim_object: simplify a bit more for post-snapdir world
Signed-off-by: Sage Weil <sage@redhat.com>
2017-09-21 14:29:32 -04:00
Sage Weil
203cd6fe81 osd/PrimaryLogPG: trim_object: drop legacy SnapSet handling
Signed-off-by: Sage Weil <sage@redhat.com>
2017-09-21 14:29:32 -04:00
Sage Weil
62137df332 osd/PrimaryLogPG: trim_object: rename oid, obc vars {snap->head}
Signed-off-by: Sage Weil <sage@redhat.com>
2017-09-11 09:13:35 -05:00
Sage Weil
a16968927c osd/PG: chunky_scrub: degeneralize end boundary condition to head
We can swap has_snapset() for is_head(), and drop the get_head()
on hobject_t's we know are head.

(The original constraint on the scrub boundary is still needed;
the clones get created to the left of both head and snapdir.)

Signed-off-by: Sage Weil <sage@redhat.com>
2017-09-11 09:13:35 -05:00
Sage Weil
95c7077068 osd/PrimaryLogPG: do_osd_ops: update CACHE_EVICT comment
Signed-off-by: Sage Weil <sage@redhat.com>
2017-09-11 09:13:35 -05:00
Sage Weil
a0284798fc osd/PrimaryLogPG: do_osd_ops: update LIST_SNAPS comment
Signed-off-by: Sage Weil <sage@redhat.com>
2017-09-11 09:13:35 -05:00
Sage Weil
438d0e97c7 osd/PrimaryLogPG: start_copy: simplify assert
Signed-off-by: Sage Weil <sage@redhat.com>
2017-09-11 09:13:35 -05:00
Sage Weil
189e1385c5 osd/PrimaryLogPG: start_flush: update comment for a post-snapdir world
Signed-off-by: Sage Weil <sage@redhat.com>
2017-09-11 09:13:34 -05:00
Sage Weil
ad955d8064 osd/PrimaryLogPG: find_object_context: drop snapdir handling
Signed-off-by: Sage Weil <sage@redhat.com>
2017-09-11 09:13:34 -05:00
Sage Weil
881f4be3a6 osd/PrimaryLogPG: do_op: move up LIST_SNAPS specialness
Signed-off-by: Sage Weil <sage@redhat.com>
2017-09-11 09:13:34 -05:00
Sage Weil
4fe9213b90 osd/PrimaryLogPG: do_op: use head on for LIST_SNAPS
Use head oid even for LIST_SNAPS op.  This doesn't really affect
LIST_SNAPS but it *does* mean that we never call find_object_context
on a snapdir oid.

Signed-off-by: Sage Weil <sage@redhat.com>
2017-09-11 09:13:34 -05:00
Sage Weil
3e366ceb22 osd/PrimaryLogPG: do_op: move and strength LIST_SNAPs vs snapdir check
Verify that *only* the LIST_SNAPS op uses an oid with snapdir set.

Signed-off-by: Sage Weil <sage@redhat.com>
2017-09-11 09:13:34 -05:00
Sage Weil
5eb3ba195b osd/PrimaryLogPG: add_object_context_to_pg_stat: drop snapdir handling
Signed-off-by: Sage Weil <sage@redhat.com>
2017-09-11 09:13:34 -05:00
Sage Weil
4d611cfaa6 osd/PrimaryLogPG: get_snapset_context: don't look on snapdir
Signed-off-by: Sage Weil <sage@redhat.com>
2017-09-11 09:13:34 -05:00
Sage Weil
5e0d5c1213 osd/PrimaryLogPG: recover_missing: no need to look for snapdir
Signed-off-by: Sage Weil <sage@redhat.com>
2017-09-11 09:13:34 -05:00
Sage Weil
6a547ae293 osd/PrimaryLogPG: recover_replicas: don;t care about missing snapdir
Signed-off-by: Sage Weil <sage@redhat.com>
2017-09-11 09:13:34 -05:00
Sage Weil
117dc9a475 osd/PrimaryLogPG: recover_backfill: remove snapdir hackery
Phew!

Signed-off-by: Sage Weil <sage@redhat.com>
2017-09-11 09:13:33 -05:00
Sage Weil
78732cc384 osd/PrimaryLogPG: scrub_snapshot_metadata: no snapdirs
Signed-off-by: Sage Weil <sage@redhat.com>
2017-09-11 09:13:31 -05:00
Sage Weil
794702df12 osd/PrimaryLogPG: remove some snapdir-specific head_exists cases
We don't care about these any more.

Signed-off-by: Sage Weil <sage@redhat.com>
2017-09-11 09:12:34 -05:00
Sage Weil
8b9967b159 osd/PrimaryLogPG: scrub_snapshot_metadata: remove snapset conversion
Signed-off-by: Sage Weil <sage@redhat.com>
2017-09-11 09:12:28 -05:00
Sage Weil
0f26bd2ec7 osd/PrimaryLogPG: scrub_snapshot_metadata: no need for snapdir
The object never exists; no need to look for it.

Signed-off-by: Sage Weil <sage@redhat.com>
2017-09-11 09:11:30 -05:00
Sage Weil
328ed770f9 osd/PrimaryLogPG: finish_ctx: remove snapdir handling
- we neither need to delete or create snapdir objects
- snapset is only ever written to head; move bufferlist bss and
encode call there
- drop legacy_snapset encoding path

Signed-off-by: Sage Weil <sage@redhat.com>
2017-09-11 09:11:30 -05:00
Sage Weil
452b4ac781 osd/PrimaryLogPG: make_writeable: remove legacy SnapSet handling
The SnapSet will now never be 'legacy'.

Signed-off-by: Sage Weil <sage@redhat.com>
2017-09-11 09:11:30 -05:00
Sage Weil
ec25b374dc osd/PrimaryLogPG: make_writeable: whitespace
Signed-off-by: Sage Weil <sage@redhat.com>
2017-09-11 09:11:30 -05:00
Sage Weil
916ff5d37a osd/ReplicatedBackend: prepare_pull: simplify assert
Signed-off-by: Sage Weil <sage@redhat.com>
2017-09-11 09:11:30 -05:00
Sage Weil
cdb54d7ade osd/ReplicatedBackend: never missing snapdirs
Signed-off-by: Sage Weil <sage@redhat.com>
2017-09-11 09:11:30 -05:00
Sage Weil
9b84633f57 osd/PrimaryLogPG: maybe_await_blocked_{snapset->head}
Signed-off-by: Sage Weil <sage@redhat.com>
2017-09-11 09:11:29 -05:00
Sage Weil
bc16d7e300 osd/PrimaryLogPG: do_op: no need to block on missing/degraded snapdir
Signed-off-by: Sage Weil <sage@redhat.com>
2017-09-11 09:11:29 -05:00
Sage Weil
630a55c2da osd: PrimaryLogPG: no snapdirs objects during pgls
Signed-off-by: Sage Weil <sage@redhat.com>
2017-09-11 09:11:29 -05:00
Sage Weil
2c71964096 osd: scrub: no need to expect snapdir objects
Signed-off-by: Sage Weil <sage@redhat.com>
2017-09-11 09:11:29 -05:00
Mykola Golub
b196d38783 Merge pull request #17621 from idryomov/wip-krbd-xfstests-blockdev
qa/suites/krbd: enable xfstests blockdev tests

Reviewed-by: Mykola Golub <mgolub@mirantis.com>
2017-09-11 14:09:32 +03:00
Sage Weil
2809fbf142 Merge pull request #17453 from kungf/eversion_t_opt_max
osd_types: define max in eversion_t::max() to static

Reviewed-by: Kefu Chai <kchai@redhat.com>
2017-09-10 14:21:39 -05:00
Sage Weil
14e783c0b9 Merge pull request #17571 from jcsp/wip-21260
mon: fix dropping mgr metadata for active mgr (#21260)

Reviewed-by: Kefu Chai <kchai@redhat.com>
2017-09-10 14:20:30 -05:00
Sage Weil
bd2569b38c Merge pull request #17572 from xiexingguo/wip-os-tool
tools/ceph_objectstore_tool: fix 'dup' unable to duplicate meta PG

Reviewed-by: Sage Weil <sage@redhat.com>
2017-09-10 14:18:37 -05:00
Sage Weil
745ed76164 Merge pull request #17585 from jdurgin/wip-recovery-delete-encoding-master
MOSDPGRecoveryDelete[Reply]: bump header version

Reviewed-by: Sage Weil <sage@redhat.com>
2017-09-10 14:18:13 -05:00