]> git.apps.os.sepia.ceph.com Git - ceph.git/log
ceph.git
7 years agoosd/PrimaryLogPG: can_create false for cache ops 17579/head
Sage Weil [Fri, 8 Sep 2017 19:28:59 +0000 (15:28 -0400)]
osd/PrimaryLogPG: can_create false for cache ops

Some cache ops do writes, but none of them *create* objects, so we
should not set can_create.

Signed-off-by: Sage Weil <sage@redhat.com>
7 years agoosd/PrimaryLogPG: drop odd maintain_ssc hack
Sage Weil [Fri, 8 Sep 2017 19:24:42 +0000 (15:24 -0400)]
osd/PrimaryLogPG: drop odd maintain_ssc hack

This was added two years ago by b61f3e43f1c9d43daa0dedd7cbd0fe5787cbdfbb,
but I can see why it is needed here.  The test case for that
original bug (from a3442cf07841a7269713e30ca270f2f9c356a598) passes
fine.

Signed-off-by: Sage Weil <sage@redhat.com>
7 years agoceph-objectstore-tool: drop pre-snapset support for setting up snapmapper
Sage Weil [Thu, 7 Sep 2017 19:11:21 +0000 (15:11 -0400)]
ceph-objectstore-tool: drop pre-snapset support for setting up snapmapper

Signed-off-by: Sage Weil <sage@redhat.com>
7 years agoceph-objectstore-tool: drop head_exists corruption
Sage Weil [Thu, 7 Sep 2017 19:09:04 +0000 (15:09 -0400)]
ceph-objectstore-tool: drop head_exists corruption

Signed-off-by: Sage Weil <sage@redhat.com>
7 years agoceph_test_rados_api_pool: make LibRadosPools.PoolList tolerate long pool names
Sage Weil [Fri, 1 Sep 2017 21:12:56 +0000 (17:12 -0400)]
ceph_test_rados_api_pool: make LibRadosPools.PoolList tolerate long pool names

There was a baked-in assumption that the first pool was <20 chars.
No more!

Signed-off-by: Sage Weil <sage@redhat.com>
7 years agoosd/osd_types: object_info_t: remove legacy_snaps
Sage Weil [Fri, 1 Sep 2017 17:42:49 +0000 (13:42 -0400)]
osd/osd_types: object_info_t: remove legacy_snaps

Signed-off-by: Sage Weil <sage@redhat.com>
7 years agoosd/PrimaryLogPG: drop last legacy_snaps users (just debug output!)
Sage Weil [Fri, 1 Sep 2017 17:41:38 +0000 (13:41 -0400)]
osd/PrimaryLogPG: drop last legacy_snaps users (just debug output!)

Signed-off-by: Sage Weil <sage@redhat.com>
7 years agoosd/osd_types: SnapSet: remove head_exists
Sage Weil [Fri, 1 Sep 2017 17:39:46 +0000 (13:39 -0400)]
osd/osd_types: SnapSet: remove head_exists

Signed-off-by: Sage Weil <sage@redhat.com>
7 years agoosd: drop last head_exists = true calls
Sage Weil [Fri, 1 Sep 2017 17:39:35 +0000 (13:39 -0400)]
osd: drop last head_exists = true calls

No more users!

Signed-off-by: Sage Weil <sage@redhat.com>
7 years agoosd/PrimaryLogPG: find_object_context: drop !head_exists path
Sage Weil [Fri, 1 Sep 2017 17:37:48 +0000 (13:37 -0400)]
osd/PrimaryLogPG: find_object_context: drop !head_exists path

Signed-off-by: Sage Weil <sage@redhat.com>
7 years agoosd/PrimaryLogPG: do_osd_ops: head_exists is always true for LIST_SNAPS
Sage Weil [Fri, 1 Sep 2017 17:36:42 +0000 (13:36 -0400)]
osd/PrimaryLogPG: do_osd_ops: head_exists is always true for LIST_SNAPS

Signed-off-by: Sage Weil <sage@redhat.com>
7 years agoosd/osd_types: SnapSet: drop is_legacy
Sage Weil [Fri, 1 Sep 2017 17:35:32 +0000 (13:35 -0400)]
osd/osd_types: SnapSet: drop is_legacy

Signed-off-by: Sage Weil <sage@redhat.com>
7 years agoosd/PrimaryLogPG: start_flush: drop legacy snapset handling
Sage Weil [Fri, 1 Sep 2017 17:35:07 +0000 (13:35 -0400)]
osd/PrimaryLogPG: start_flush: drop legacy snapset handling

Signed-off-by: Sage Weil <sage@redhat.com>
7 years agoosd/osd_types: default head_exists = true
Sage Weil [Fri, 1 Sep 2017 17:34:31 +0000 (13:34 -0400)]
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>
7 years agoosd/PrimaryLogPG: finish_promote: drop legacy snapset handling
Sage Weil [Fri, 1 Sep 2017 17:33:56 +0000 (13:33 -0400)]
osd/PrimaryLogPG: finish_promote: drop legacy snapset handling

Signed-off-by: Sage Weil <sage@redhat.com>
7 years agoosd/PrimaryLogPG: do_copy_get: drop legacy snapset path
Sage Weil [Fri, 1 Sep 2017 17:33:09 +0000 (13:33 -0400)]
osd/PrimaryLogPG: do_copy_get: drop legacy snapset path

Signed-off-by: Sage Weil <sage@redhat.com>
7 years agoosd/PrimaryLogPG: _delete_oid: drop legacy snapset handling
Sage Weil [Fri, 1 Sep 2017 16:43:44 +0000 (12:43 -0400)]
osd/PrimaryLogPG: _delete_oid: drop legacy snapset handling

Signed-off-by: Sage Weil <sage@redhat.com>
7 years agoosd/PrimaryLogPG: do_osd_ops: drop legacy snapset handling from LIST_SNAPS
Sage Weil [Fri, 1 Sep 2017 16:42:16 +0000 (12:42 -0400)]
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>
7 years agoosd/PrimaryLogPG: on_local_recover: drop legacy snapset handling
Sage Weil [Fri, 1 Sep 2017 16:41:45 +0000 (12:41 -0400)]
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>
7 years agoosd/PG: _scan_snaps: drop legacy snapset handling
Sage Weil [Fri, 1 Sep 2017 16:40:59 +0000 (12:40 -0400)]
osd/PG: _scan_snaps: drop legacy snapset handling

Signed-off-by: Sage Weil <sage@redhat.com>
7 years agoosd/PrimaryLogPG: find_object_context: drop legacy snapset handling
Sage Weil [Fri, 1 Sep 2017 16:38:25 +0000 (12:38 -0400)]
osd/PrimaryLogPG: find_object_context: drop legacy snapset handling

Signed-off-by: Sage Weil <sage@redhat.com>
7 years agoosd/PrimaryLogPG: issue_repop: drop obsolete condition on head_obc
Sage Weil [Fri, 1 Sep 2017 16:15:08 +0000 (12:15 -0400)]
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>
7 years agoosd/PrimaryLogPG: snapset_obc -> head_obc
Sage Weil [Fri, 1 Sep 2017 16:13:03 +0000 (12:13 -0400)]
osd/PrimaryLogPG: snapset_obc -> head_obc

This is only used for trim_object, now!

Signed-off-by: Sage Weil <sage@redhat.com>
7 years agoosd/PrimaryLogPG: do_op: drop snapset_obc lookup on snapdir
Sage Weil [Fri, 1 Sep 2017 16:11:32 +0000 (12:11 -0400)]
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>
7 years agoosd/PrimaryLogPG: trim_object: ctx->snapset_obc -> head_obc
Sage Weil [Fri, 1 Sep 2017 16:09:06 +0000 (12:09 -0400)]
osd/PrimaryLogPG: trim_object: ctx->snapset_obc -> head_obc

Signed-off-by: Sage Weil <sage@redhat.com>
7 years agoosd/PrimaryLogPG: trim_object: simplify a bit more for post-snapdir world
Sage Weil [Fri, 1 Sep 2017 16:06:13 +0000 (12:06 -0400)]
osd/PrimaryLogPG: trim_object: simplify a bit more for post-snapdir world

Signed-off-by: Sage Weil <sage@redhat.com>
7 years agoosd/PrimaryLogPG: trim_object: drop legacy SnapSet handling
Sage Weil [Fri, 1 Sep 2017 16:03:53 +0000 (12:03 -0400)]
osd/PrimaryLogPG: trim_object: drop legacy SnapSet handling

Signed-off-by: Sage Weil <sage@redhat.com>
7 years agoosd/PrimaryLogPG: trim_object: rename oid, obc vars {snap->head}
Sage Weil [Fri, 1 Sep 2017 16:03:20 +0000 (12:03 -0400)]
osd/PrimaryLogPG: trim_object: rename oid, obc vars {snap->head}

Signed-off-by: Sage Weil <sage@redhat.com>
7 years agoosd/PG: chunky_scrub: degeneralize end boundary condition to head
Sage Weil [Fri, 1 Sep 2017 15:43:49 +0000 (11:43 -0400)]
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>
7 years agoosd/PrimaryLogPG: do_osd_ops: update CACHE_EVICT comment
Sage Weil [Fri, 1 Sep 2017 01:11:09 +0000 (21:11 -0400)]
osd/PrimaryLogPG: do_osd_ops: update CACHE_EVICT comment

Signed-off-by: Sage Weil <sage@redhat.com>
7 years agoosd/PrimaryLogPG: do_osd_ops: update LIST_SNAPS comment
Sage Weil [Fri, 1 Sep 2017 01:10:18 +0000 (21:10 -0400)]
osd/PrimaryLogPG: do_osd_ops: update LIST_SNAPS comment

Signed-off-by: Sage Weil <sage@redhat.com>
7 years agoosd/PrimaryLogPG: start_copy: simplify assert
Sage Weil [Fri, 1 Sep 2017 01:09:23 +0000 (21:09 -0400)]
osd/PrimaryLogPG: start_copy: simplify assert

Signed-off-by: Sage Weil <sage@redhat.com>
7 years agoosd/PrimaryLogPG: start_flush: update comment for a post-snapdir world
Sage Weil [Fri, 1 Sep 2017 01:09:00 +0000 (21:09 -0400)]
osd/PrimaryLogPG: start_flush: update comment for a post-snapdir world

Signed-off-by: Sage Weil <sage@redhat.com>
7 years agoosd/PrimaryLogPG: find_object_context: drop snapdir handling
Sage Weil [Fri, 1 Sep 2017 14:16:29 +0000 (10:16 -0400)]
osd/PrimaryLogPG: find_object_context: drop snapdir handling

Signed-off-by: Sage Weil <sage@redhat.com>
7 years agoosd/PrimaryLogPG: do_op: move up LIST_SNAPS specialness
Sage Weil [Fri, 1 Sep 2017 01:06:29 +0000 (21:06 -0400)]
osd/PrimaryLogPG: do_op: move up LIST_SNAPS specialness

Signed-off-by: Sage Weil <sage@redhat.com>
7 years agoosd/PrimaryLogPG: do_op: use head on for LIST_SNAPS
Sage Weil [Thu, 31 Aug 2017 22:44:01 +0000 (18:44 -0400)]
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>
7 years agoosd/PrimaryLogPG: do_op: move and strength LIST_SNAPs vs snapdir check
Sage Weil [Thu, 31 Aug 2017 22:42:18 +0000 (18:42 -0400)]
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>
7 years agoosd/PrimaryLogPG: add_object_context_to_pg_stat: drop snapdir handling
Sage Weil [Thu, 31 Aug 2017 22:23:53 +0000 (18:23 -0400)]
osd/PrimaryLogPG: add_object_context_to_pg_stat: drop snapdir handling

Signed-off-by: Sage Weil <sage@redhat.com>
7 years agoosd/PrimaryLogPG: get_snapset_context: don't look on snapdir
Sage Weil [Thu, 31 Aug 2017 22:22:15 +0000 (18:22 -0400)]
osd/PrimaryLogPG: get_snapset_context: don't look on snapdir

Signed-off-by: Sage Weil <sage@redhat.com>
7 years agoosd/PrimaryLogPG: recover_missing: no need to look for snapdir
Sage Weil [Thu, 31 Aug 2017 22:19:28 +0000 (18:19 -0400)]
osd/PrimaryLogPG: recover_missing: no need to look for snapdir

Signed-off-by: Sage Weil <sage@redhat.com>
7 years agoosd/PrimaryLogPG: recover_replicas: don;t care about missing snapdir
Sage Weil [Thu, 31 Aug 2017 22:18:38 +0000 (18:18 -0400)]
osd/PrimaryLogPG: recover_replicas: don;t care about missing snapdir

Signed-off-by: Sage Weil <sage@redhat.com>
7 years agoosd/PrimaryLogPG: recover_backfill: remove snapdir hackery
Sage Weil [Thu, 31 Aug 2017 22:16:13 +0000 (18:16 -0400)]
osd/PrimaryLogPG: recover_backfill: remove snapdir hackery

Phew!

Signed-off-by: Sage Weil <sage@redhat.com>
7 years agoosd/PrimaryLogPG: scrub_snapshot_metadata: no snapdirs
Sage Weil [Thu, 31 Aug 2017 22:08:23 +0000 (18:08 -0400)]
osd/PrimaryLogPG: scrub_snapshot_metadata: no snapdirs

Signed-off-by: Sage Weil <sage@redhat.com>
7 years agoosd/PrimaryLogPG: remove some snapdir-specific head_exists cases
Sage Weil [Thu, 31 Aug 2017 22:06:40 +0000 (18:06 -0400)]
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>
7 years agoosd/PrimaryLogPG: scrub_snapshot_metadata: remove snapset conversion
Sage Weil [Thu, 31 Aug 2017 21:56:28 +0000 (17:56 -0400)]
osd/PrimaryLogPG: scrub_snapshot_metadata: remove snapset conversion

Signed-off-by: Sage Weil <sage@redhat.com>
7 years agoosd/PrimaryLogPG: scrub_snapshot_metadata: no need for snapdir
Sage Weil [Thu, 31 Aug 2017 21:51:25 +0000 (17:51 -0400)]
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>
7 years agoosd/PrimaryLogPG: finish_ctx: remove snapdir handling
Sage Weil [Thu, 31 Aug 2017 21:49:39 +0000 (17:49 -0400)]
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>
7 years agoosd/PrimaryLogPG: make_writeable: remove legacy SnapSet handling
Sage Weil [Thu, 31 Aug 2017 21:40:22 +0000 (17:40 -0400)]
osd/PrimaryLogPG: make_writeable: remove legacy SnapSet handling

The SnapSet will now never be 'legacy'.

Signed-off-by: Sage Weil <sage@redhat.com>
7 years agoosd/PrimaryLogPG: make_writeable: whitespace
Sage Weil [Thu, 31 Aug 2017 21:38:20 +0000 (17:38 -0400)]
osd/PrimaryLogPG: make_writeable: whitespace

Signed-off-by: Sage Weil <sage@redhat.com>
7 years agoosd/ReplicatedBackend: prepare_pull: simplify assert
Sage Weil [Thu, 31 Aug 2017 21:38:11 +0000 (17:38 -0400)]
osd/ReplicatedBackend: prepare_pull: simplify assert

Signed-off-by: Sage Weil <sage@redhat.com>
7 years agoosd/ReplicatedBackend: never missing snapdirs
Sage Weil [Thu, 31 Aug 2017 21:31:39 +0000 (17:31 -0400)]
osd/ReplicatedBackend: never missing snapdirs

Signed-off-by: Sage Weil <sage@redhat.com>
7 years agoosd/PrimaryLogPG: maybe_await_blocked_{snapset->head}
Sage Weil [Thu, 31 Aug 2017 21:23:35 +0000 (17:23 -0400)]
osd/PrimaryLogPG: maybe_await_blocked_{snapset->head}

Signed-off-by: Sage Weil <sage@redhat.com>
7 years agoosd/PrimaryLogPG: do_op: no need to block on missing/degraded snapdir
Sage Weil [Thu, 31 Aug 2017 21:22:00 +0000 (17:22 -0400)]
osd/PrimaryLogPG: do_op: no need to block on missing/degraded snapdir

Signed-off-by: Sage Weil <sage@redhat.com>
7 years agoosd: PrimaryLogPG: no snapdirs objects during pgls
Sage Weil [Thu, 31 Aug 2017 21:21:19 +0000 (17:21 -0400)]
osd: PrimaryLogPG: no snapdirs objects during pgls

Signed-off-by: Sage Weil <sage@redhat.com>
7 years agoosd: scrub: no need to expect snapdir objects
Sage Weil [Thu, 31 Aug 2017 21:21:01 +0000 (17:21 -0400)]
osd: scrub: no need to expect snapdir objects

Signed-off-by: Sage Weil <sage@redhat.com>
7 years agoMerge pull request #17621 from idryomov/wip-krbd-xfstests-blockdev
Mykola Golub [Mon, 11 Sep 2017 11:09:32 +0000 (14:09 +0300)]
Merge pull request #17621 from idryomov/wip-krbd-xfstests-blockdev

qa/suites/krbd: enable xfstests blockdev tests

Reviewed-by: Mykola Golub <mgolub@mirantis.com>
7 years agoMerge pull request #17453 from kungf/eversion_t_opt_max
Sage Weil [Sun, 10 Sep 2017 19:21:39 +0000 (14:21 -0500)]
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>
7 years agoMerge pull request #17571 from jcsp/wip-21260
Sage Weil [Sun, 10 Sep 2017 19:20:30 +0000 (14:20 -0500)]
Merge pull request #17571 from jcsp/wip-21260

mon: fix dropping mgr metadata for active mgr (#21260)

Reviewed-by: Kefu Chai <kchai@redhat.com>
7 years agoMerge pull request #17572 from xiexingguo/wip-os-tool
Sage Weil [Sun, 10 Sep 2017 19:18:37 +0000 (14:18 -0500)]
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>
7 years agoMerge pull request #17585 from jdurgin/wip-recovery-delete-encoding-master
Sage Weil [Sun, 10 Sep 2017 19:18:13 +0000 (14:18 -0500)]
Merge pull request #17585 from jdurgin/wip-recovery-delete-encoding-master

MOSDPGRecoveryDelete[Reply]: bump header version

Reviewed-by: Sage Weil <sage@redhat.com>
7 years agoMerge pull request #17588 from kungf/aio_submit_size_change
Sage Weil [Sun, 10 Sep 2017 19:17:48 +0000 (14:17 -0500)]
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>
7 years agoMerge pull request #17599 from tchaikov/wip-encoding-optional
Sage Weil [Sun, 10 Sep 2017 19:17:32 +0000 (14:17 -0500)]
Merge pull request #17599 from tchaikov/wip-encoding-optional

encoding: reset optional<> if it is uninitialized

Reviewed-by: Sage Weil <sage@redhat.com>
7 years agoMerge pull request #17600 from jecluis/wip-21309
Sage Weil [Sun, 10 Sep 2017 19:17:00 +0000 (14:17 -0500)]
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>
7 years agoMerge pull request #17298 from xiexingguo/wip-pg-null-obc-access
Sage Weil [Sat, 9 Sep 2017 20:02:08 +0000 (15:02 -0500)]
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>
7 years agoMerge pull request #17559 from dillaman/wip-21181
Mykola Golub [Sat, 9 Sep 2017 08:23:57 +0000 (11:23 +0300)]
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>
7 years agoMerge pull request #17324 from smithfarm/wip-rbd-symlink
Kefu Chai [Sat, 9 Sep 2017 04:12:08 +0000 (12:12 +0800)]
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>
7 years agoMerge pull request #17512 from tchaikov/wip-chmod-x
Kefu Chai [Sat, 9 Sep 2017 04:09:59 +0000 (12:09 +0800)]
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>
7 years agoMerge pull request #17539 from tchaikov/wip-21204
Kefu Chai [Sat, 9 Sep 2017 04:08:18 +0000 (12:08 +0800)]
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>
7 years agoMerge pull request #17549 from iliul/fix-texttable-align
Kefu Chai [Sat, 9 Sep 2017 04:07:38 +0000 (12:07 +0800)]
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>
7 years agoMerge pull request #17096 from ceph/wip-ansbile-fixes
Tamilarasi Muthamizhan [Fri, 8 Sep 2017 21:47:12 +0000 (14:47 -0700)]
Merge pull request #17096 from ceph/wip-ansbile-fixes

[qa/tests]: misc ceph-ansible fixes and udpate

7 years agoMerge pull request #17513 from Liuchang0812/wip-max-avail-in-df
Yuri Weinstein [Fri, 8 Sep 2017 20:41:07 +0000 (13:41 -0700)]
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>
7 years agoMerge PR #17533 into master
Patrick Donnelly [Fri, 8 Sep 2017 18:23:23 +0000 (11:23 -0700)]
Merge PR #17533 into master

* refs/remotes/upstream/pull/17533/head:
qa: log ceph-fuse kill/cleanup

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
7 years agoMerge PR #17506 into master
Patrick Donnelly [Fri, 8 Sep 2017 18:23:21 +0000 (11:23 -0700)]
Merge PR #17506 into master

* refs/remotes/upstream/pull/17506/head:
mds: reset Formatter on error

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
7 years agoMerge PR #17466 into master
Patrick Donnelly [Fri, 8 Sep 2017 18:23:19 +0000 (11:23 -0700)]
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>
7 years agoMerge PR #17456 into master
Patrick Donnelly [Fri, 8 Sep 2017 18:23:17 +0000 (11:23 -0700)]
Merge PR #17456 into master

* refs/remotes/upstream/pull/17456/head:
mds: print subtrees only after merge

Reviewed-by: Zheng Yan <zyan@redhat.com>
7 years agoMerge PR #17452 into master
Patrick Donnelly [Fri, 8 Sep 2017 18:23:15 +0000 (11:23 -0700)]
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>
7 years agoMerge PR #17384 into master
Patrick Donnelly [Fri, 8 Sep 2017 18:23:12 +0000 (11:23 -0700)]
Merge PR #17384 into master

* refs/remotes/upstream/pull/17384/head:
ceph.in: validate service glob

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
7 years agoMerge PR #16752 into master
Patrick Donnelly [Fri, 8 Sep 2017 18:23:10 +0000 (11:23 -0700)]
Merge PR #16752 into master

* refs/remotes/upstream/pull/16752/head:
client: NULL check before append value to bufferlist

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
Reviewed-by: Jos Collin <jcollin@redhat.com>
Reviewed-by: Piotr Dałek <piotr.dalek@corp.ovh.com>
7 years agoStop the mgr on node which is not client, this will ensure 17096/head
Vasu Kulkarni [Fri, 8 Sep 2017 17:00:49 +0000 (10:00 -0700)]
Stop the mgr on node which is not client, this will ensure
the client.0's mgr is active mgr for workunit to work.

Signed-off-by: Vasu Kulkarni <vasu@redhat.com>
7 years agoMerge pull request #16272 from liewegas/wip-balancer
Sage Weil [Fri, 8 Sep 2017 16:29:14 +0000 (11:29 -0500)]
Merge pull request #16272 from liewegas/wip-balancer

mgr/balancer: mgr module to automatically balance PGs across OSDs

Reviewed-by: John Spray <john.spray@redhat.com>
7 years agoos/bluestore: shrink aio submit size to pending value 17588/head
kungf [Fri, 8 Sep 2017 04:09:35 +0000 (12:09 +0800)]
os/bluestore: shrink aio submit size to pending value

Signed-off-by: kungf <yang.wang@easystack.cn>
7 years agoMerge pull request #17403 from ceph/wip-bz1485011
Andrew Schoen [Fri, 8 Sep 2017 15:43:44 +0000 (10:43 -0500)]
Merge pull request #17403 from ceph/wip-bz1485011

ceph-volume Persist non-lv devices for journals

Reviewed-by: Andrew Schoen aschoen@redhat.com
7 years agoMerge pull request #17603 from liewegas/wip-migration-twiddle
Sage Weil [Fri, 8 Sep 2017 15:32:08 +0000 (10:32 -0500)]
Merge pull request #17603 from liewegas/wip-migration-twiddle

doc: restructure bluestore migration insructions

Reviewed-by: David Galloway <dgallowa@redhat.com>
7 years agodoc: restructure bluestore migration insructions 17603/head
Sage Weil [Fri, 8 Sep 2017 15:13:49 +0000 (11:13 -0400)]
doc: restructure bluestore migration insructions

Signed-off-by: Sage Weil <sage@redhat.com>
7 years agoMerge pull request #17602 from ceph/wip-blumig-doc
Sage Weil [Fri, 8 Sep 2017 15:05:27 +0000 (10:05 -0500)]
Merge pull request #17602 from ceph/wip-blumig-doc

doc: Updates to bluestore migration doc

Reviewed-by: Sage Weil <sage@redhat.com>
7 years agodoc/rados/operations/bluestore-migration: Add instruction for evacuating 17602/head
David Galloway [Fri, 8 Sep 2017 14:46:21 +0000 (10:46 -0400)]
doc/rados/operations/bluestore-migration: Add instruction for evacuating
host

Signed-off-by: David Galloway <dgallowa@redhat.com>
7 years agoMerge pull request #17011 from liewegas/wip-doc-bluestore-migration
Sage Weil [Fri, 8 Sep 2017 14:47:02 +0000 (09:47 -0500)]
Merge pull request #17011 from liewegas/wip-doc-bluestore-migration

doc/rados/operations/bluestore-migration: update docs a bit

7 years agoMerge pull request #17582 from ivancich/wip-fix-mclock-unittests
Kefu Chai [Fri, 8 Sep 2017 14:03:28 +0000 (22:03 +0800)]
Merge pull request #17582 from ivancich/wip-fix-mclock-unittests

test/common: unittest_mclock_priority_queue builds with "make" command

Reviewed-by: Sage Weil <sage@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
7 years agodoc/rados/operations/bluestore-migration: Fix typo in bluestore migration doc
David Galloway [Thu, 7 Sep 2017 23:51:45 +0000 (19:51 -0400)]
doc/rados/operations/bluestore-migration: Fix typo in bluestore migration doc

Signed-off-by: David Galloway <dgallowa@redhat.com>
7 years agomon: fix dropping mgr metadata for active mgr 17571/head
John Spray [Thu, 7 Sep 2017 13:44:36 +0000 (09:44 -0400)]
mon: fix dropping mgr metadata for active mgr

drop_standby() was killing it and it was only getting added
back in certain locations.  Instead, make the metadata
drop conditional and only do it in the places we're
really dropping the daemon, not when we're promoting
it to active.

Fixes: http://tracker.ceph.com/issues/21260
Signed-off-by: John Spray <john.spray@redhat.com>
7 years agoqa/tasks/mgr: regression test for 21260
John Spray [Thu, 7 Sep 2017 13:42:29 +0000 (09:42 -0400)]
qa/tasks/mgr: regression test for 21260

(aka http://tracker.ceph.com/issues/21260)

Fixes: http://tracker.ceph.com/issues/21260
Signed-off-by: John Spray <john.spray@redhat.com>
7 years agoqa/suites/krbd: enable xfstests blockdev tests 17621/head
Ilya Dryomov [Fri, 8 Sep 2017 13:45:34 +0000 (15:45 +0200)]
qa/suites/krbd: enable xfstests blockdev tests

Signed-off-by: Ilya Dryomov <idryomov@gmail.com>
7 years agomon/OSDMonitor: don't create pgs if pool was deleted 17600/head
Joao Eduardo Luis [Fri, 8 Sep 2017 11:48:12 +0000 (12:48 +0100)]
mon/OSDMonitor: don't create pgs if pool was deleted

A pool may be deleted while in the process of creating pgs. If that
happens, we should not queue additional pgs from that pool to be
created.

Fixes: http://tracker.ceph.com/issues/21309
Signed-off-by: Joao Eduardo Luis <joao@suse.de>
7 years agoMerge pull request #17569 from liewegas/wip-21293
Sage Weil [Fri, 8 Sep 2017 12:19:42 +0000 (07:19 -0500)]
Merge pull request #17569 from liewegas/wip-21293

Revert "os/bluestore: pass strict flag to bluestore_blob_use_tracker_t::equal()"

Reviewed-by: xie xingguo <xie.xingguo@zte.com.cn>
7 years agoMerge pull request #17352 from liewegas/wip-21171
Sage Weil [Fri, 8 Sep 2017 12:16:40 +0000 (07:16 -0500)]
Merge pull request #17352 from liewegas/wip-21171

os/bluestore: drop deferred_submit_lock, fix aio leak

Reviewed-by: xie xingguo <xie.xingguo@zte.com.cn>
Reviewed-by: Pan Liu <liupan1111@gmail.com>
7 years agoencoding: reset optional<> if it is uninitialized 17599/head
Kefu Chai [Fri, 8 Sep 2017 11:28:09 +0000 (19:28 +0800)]
encoding: reset optional<> if it is uninitialized

* should reset it, in case we reuse it after initializing it.
* initialize the value of `p` using the C++11 style initializer, so it
  is zero-initialized.
* revert 2a83ef3c which disables a warning of:
 ./include/encoding.h:317:7: warning: 't' may be used uninitialized in
    this function [-Wmaybe-uninitialized]
 where the `t` is the temporary variable for initializing the value of
 `p`.

Signed-off-by: Kefu Chai <kchai@redhat.com>
7 years agoMerge pull request #17593 from shashalu/fix-clean-up-apply_epoch
Jos Collin [Fri, 8 Sep 2017 11:15:59 +0000 (11:15 +0000)]
Merge pull request #17593 from shashalu/fix-clean-up-apply_epoch

rgw: drop unused function apply_epoch

Reviewed-by: Jos Collin <jcollin@redhat.com>
7 years agoMerge pull request #17590 from xiaoxichen/minor_doc_fix
Kefu Chai [Fri, 8 Sep 2017 10:46:09 +0000 (18:46 +0800)]
Merge pull request #17590 from xiaoxichen/minor_doc_fix

doc: fix typo on specify db block device

Reviewed-by: Jos Collin <jcollin@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
7 years agoMerge pull request #17573 from jcsp/wip-21292
Boris Ranto [Fri, 8 Sep 2017 08:32:20 +0000 (10:32 +0200)]
Merge pull request #17573 from jcsp/wip-21292

mgr/restful: cleaner message when not configured

Reviewed-by: Boris Ranto <branto@redhat.com>
7 years agorgw: drop unused function apply_epoch 17593/head
lu.shasha [Fri, 8 Sep 2017 07:16:13 +0000 (15:16 +0800)]
rgw: drop unused function apply_epoch

Signed-off-by: Shasha Lu <lu.shasha@eisoo.com>