Commit Graph

78071 Commits

Author SHA1 Message Date
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
Sage Weil
5a3133bf18 Merge pull request #17588 from kungf/aio_submit_size_change
os/bluestore: shrink aio submit size to pending value

Reviewed-by: Sage Weil <sage@redhat.com>
2017-09-10 14:17:48 -05:00
Sage Weil
04c0044be0 Merge pull request #17599 from tchaikov/wip-encoding-optional
encoding: reset optional<> if it is uninitialized

Reviewed-by: Sage Weil <sage@redhat.com>
2017-09-10 14:17:32 -05:00
Sage Weil
fbeea651e3 Merge pull request #17600 from jecluis/wip-21309
mon/OSDMonitor: don't create pgs if pool was deleted

Reviewed-by: Kefu Chai <kchai@redhat.com>
Reviewed-by: Sage Weil <sage@redhat.com>
2017-09-10 14:17:00 -05:00
Sage Weil
f34821c7bd Merge pull request #17298 from xiexingguo/wip-pg-null-obc-access
osd/PrimaryLogPG: maybe_handle_manifest_detail - sanity check obc existence

Reviewed-by: Sage Weil <sage@redhat.com>
Reviewed-by: Amit Kumar <amitkuma@redhat.com>
2017-09-09 15:02:08 -05:00
Mykola Golub
0bafa7e8d4 Merge pull request #17559 from dillaman/wip-21181
qa/workunits/rbd: relax greps to support upgrade formatting change

Reviewed-by: Mykola Golub <mgolub@mirantis.com>
2017-09-09 11:23:57 +03:00
Kefu Chai
11d9b643ef Merge pull request #17324 from smithfarm/wip-rbd-symlink
build/ops: rpm: drop legacy librbd.so.1 symlink in /usr/lib64/qemu

Reviewed-by: Ken Dreyer <kdreyer@redhat.com>
Reviewed-by: Ademar de Souza Reis Jr <areis@redhat.com>
Reviewed-by: Boris Ranto <branto@redhat.com>
2017-09-09 12:12:08 +08:00
Kefu Chai
d40250d31e Merge pull request #17512 from tchaikov/wip-chmod-x
common,mon,osd,pybind: silence warning and remove executable mode bit

Reviewed-by: J. Eric Ivancich <ivancich@redhat.com>
2017-09-09 12:09:59 +08:00
Kefu Chai
de77a93765 Merge pull request #17539 from tchaikov/wip-21204
mon,option: set default value for mon_dns_srv_name

Reviewed-by: Sage Weil <sage@redhat.com>
2017-09-09 12:08:18 +08:00
Kefu Chai
050a9a516e Merge pull request #17549 from iliul/fix-texttable-align
tools: Modify "rados df" header's alignment

Reviewed-by: xie xingguo <xie.xingguo@zte.com.cn>
2017-09-09 12:07:38 +08:00
Tamilarasi Muthamizhan
ec423100dc Merge pull request #17096 from ceph/wip-ansbile-fixes
[qa/tests]: misc ceph-ansible fixes and udpate
2017-09-08 14:47:12 -07:00
Yuri Weinstein
0c2a139ee6 Merge pull request #17513 from Liuchang0812/wip-max-avail-in-df
mon: incorrect MAX AVAIL in "ceph df"

Reviewed-by: Kefu Chai <kchai@redhat.com>
Reviewed-by: Sage Weil <sage@redhat.com>
2017-09-08 13:41:07 -07:00
Patrick Donnelly
1b7aae6cdc
Merge PR #17533 into master
* refs/remotes/upstream/pull/17533/head:
	qa: log ceph-fuse kill/cleanup

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
2017-09-08 11:23:23 -07:00
Patrick Donnelly
6019a57fa3
Merge PR #17506 into master
* refs/remotes/upstream/pull/17506/head:
	mds: reset Formatter on error

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
2017-09-08 11:23:21 -07:00
Patrick Donnelly
52c79aecdd
Merge PR #17466 into master
* refs/remotes/upstream/pull/17466/head:
	qa: whitelist expected MDS_READ_ONLY for kcephfs test

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
2017-09-08 11:23:19 -07:00
Patrick Donnelly
5f99d9d53c
Merge PR #17456 into master
* refs/remotes/upstream/pull/17456/head:
	mds: print subtrees only after merge

Reviewed-by: Zheng Yan <zyan@redhat.com>
2017-09-08 11:23:17 -07:00
Patrick Donnelly
490bc0050c
Merge PR #17452 into master
* refs/remotes/upstream/pull/17452/head:
	Make standby-replay mds not migrate empty subtree when trimming cache
	Make standby-replay mds avoid initiating subtree export

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
Reviewed-by: Zheng Yan <zyan@redhat.com>
2017-09-08 11:23:15 -07:00
Patrick Donnelly
353b1311c3
Merge PR #17384 into master
* refs/remotes/upstream/pull/17384/head:
	ceph.in: validate service glob

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
2017-09-08 11:23:12 -07:00