]> git.apps.os.sepia.ceph.com Git - ceph.git/log
ceph.git
7 years agoceph-debug-docker.sh: add ceph-osd-dbg package 17947/head
Patrick Donnelly [Mon, 25 Sep 2017 18:28:47 +0000 (11:28 -0700)]
ceph-debug-docker.sh: add ceph-osd-dbg package

So we can debug ceph-osd cores.

Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
7 years agoMerge pull request #17810 from hjwsm1989/wip-21294
Sage Weil [Mon, 25 Sep 2017 17:33:34 +0000 (12:33 -0500)]
Merge pull request #17810 from hjwsm1989/wip-21294

qa/ceph_manager: check pg state again before timedout

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
7 years agoMerge pull request #17661 from yunfeiguan/master
Sage Weil [Mon, 25 Sep 2017 17:33:18 +0000 (12:33 -0500)]
Merge pull request #17661 from yunfeiguan/master

librados: Fix a potential risk of buffer::list::claim_prepend(list& b…

Reviewed-by: Kefu Chai <kchai@redhat.com>
7 years agoMerge pull request #17790 from joscollin/wip-test-warning-signed-unsigned
Sage Weil [Mon, 25 Sep 2017 17:32:53 +0000 (12:32 -0500)]
Merge pull request #17790 from joscollin/wip-test-warning-signed-unsigned

test: silence warning from -Wsign-compare

Reviewed-by: xie xingguo <xie.xingguo@zte.com.cn>
7 years agoMerge pull request #17928 from xiexingguo/wip-more-interval-set-size
Sage Weil [Mon, 25 Sep 2017 17:32:29 +0000 (12:32 -0500)]
Merge pull request #17928 from xiexingguo/wip-more-interval-set-size

osd/PrimaryLogPG: calc clone_overlap size in a more efficient and concise way

Reviewed-by: Sage Weil <sage@redhat.com>
7 years agoMerge pull request #17528 from liewegas/wip-mgr-localpool
Sage Weil [Mon, 25 Sep 2017 17:30:05 +0000 (12:30 -0500)]
Merge pull request #17528 from liewegas/wip-mgr-localpool

pybind/mgr/localpool: module to automagically create localized pools

Reviewed-by: John Spray <john.spray@redhat.com>
7 years agoqa/workunits/mgr/test_localpool: simple test for localpool mode 17528/head
Sage Weil [Sun, 24 Sep 2017 18:05:14 +0000 (14:05 -0400)]
qa/workunits/mgr/test_localpool: simple test for localpool mode

Signed-off-by: Sage Weil <sage@redhat.com>
7 years agoMerge pull request #17831 from badone/wip-require-osd-release-with-no-up-osds
Sage Weil [Mon, 25 Sep 2017 02:18:51 +0000 (21:18 -0500)]
Merge pull request #17831 from badone/wip-require-osd-release-with-no-up-osds

mon: osd feature checks with 0 up osds

Reviewed-by: Sage Weil <sage@redhat.com>
7 years agoMerge pull request #17848 from liewegas/wip-ruleset-errors
Sage Weil [Mon, 25 Sep 2017 02:15:42 +0000 (21:15 -0500)]
Merge pull request #17848 from liewegas/wip-ruleset-errors

mon/OSDMonitor: error out if setting ruleset-* ec profile property

Reviewed-by: Joao Eduardo Luis <joao@suse.de>
7 years agoMerge pull request #17902 from tchaikov/wip-21474
Sage Weil [Mon, 25 Sep 2017 02:14:58 +0000 (21:14 -0500)]
Merge pull request #17902 from tchaikov/wip-21474

qa/tasks: prolong revive_osd() timeout to 6 min

Reviewed-by: Sage Weil <sage@redhat.com>
7 years agoMerge pull request #17903 from lixiaoy1/add_func_log
Sage Weil [Mon, 25 Sep 2017 02:14:35 +0000 (21:14 -0500)]
Merge pull request #17903 from lixiaoy1/add_func_log

os/bluestore: Add missing __func__ in dout

Reviewed-by: Jos Collin <jcollin@redhat.com>
7 years agoMerge pull request #17905 from tchaikov/wip-osd_types-cleanup
Sage Weil [Mon, 25 Sep 2017 02:14:09 +0000 (21:14 -0500)]
Merge pull request #17905 from tchaikov/wip-osd_types-cleanup

osd/osd_types: object_info_t: remove unused function

Reviewed-by: Amit Kumar <amitkuma@redhat.com>
Reviewed-by: Sage Weil <sage@redhat.com>
7 years agoMerge pull request #17927 from liewegas/wip-21511
Sage Weil [Mon, 25 Sep 2017 02:13:03 +0000 (21:13 -0500)]
Merge pull request #17927 from liewegas/wip-21511

qa/standalone/scrub/osd-scrub-snaps: adjust test for lack of snapdir objects

Reviewed-by: David Zafman <dzafman@redhat.com>
7 years agoMerge PR #17919 into master
Patrick Donnelly [Mon, 25 Sep 2017 00:07:34 +0000 (17:07 -0700)]
Merge PR #17919 into master

* refs/remotes/upstream/pull/17919/head:
qa: whitelist cache too large in client-limits

Reviewed-by: Zheng Yan <zyan@redhat.com>
7 years agoMerge PR #17918 into master
Patrick Donnelly [Mon, 25 Sep 2017 00:07:32 +0000 (17:07 -0700)]
Merge PR #17918 into master

* refs/remotes/upstream/pull/17918/head:
qa: whitelist failover log warnings

Reviewed-by: Zheng Yan <zyan@redhat.com>
7 years agoMerge PR #17917 into master
Patrick Donnelly [Mon, 25 Sep 2017 00:07:27 +0000 (17:07 -0700)]
Merge PR #17917 into master

* refs/remotes/upstream/pull/17917/head:
qa: ignore evicted client in client-recovery

Reviewed-by: Zheng Yan <zyan@redhat.com>
7 years agomon/OSDMonitor: error out if setting ruleset-* ec profile property 17848/head
Sage Weil [Wed, 20 Sep 2017 20:42:01 +0000 (16:42 -0400)]
mon/OSDMonitor: error out if setting ruleset-* ec profile property

We change ruleset -> crush back in dc7a2aaf7a34b1e6af0c7b79dc44a69974c1da23.
If someone tries to use the old property, error out early, instead of
silently not doing the thing they thought they told us to do.

Signed-off-by: Sage Weil <sage@redhat.com>
7 years agoMerge pull request #17850 from batrick/vstart-confg-path
John Spray [Sat, 23 Sep 2017 15:36:25 +0000 (16:36 +0100)]
Merge pull request #17850 from batrick/vstart-confg-path

qa: revert "qa: use config_path property instead of literal"

Reviewed-by: John Spray <john.spray@redhat.com>
7 years agoMerge pull request #17881 from joscollin/wip-mgr-signed-unsigned-warning
Kefu Chai [Sat, 23 Sep 2017 03:23:50 +0000 (11:23 +0800)]
Merge pull request #17881 from joscollin/wip-mgr-signed-unsigned-warning

mgr: silence warning from -Wsign-compare

Reviewed-by: Kefu Chai <kchai@redhat.com>
7 years agoosd/PrimaryLogPG: calc clone_overlap size in a more efficient and concise way 17928/head
xie xingguo [Sat, 23 Sep 2017 02:54:18 +0000 (10:54 +0800)]
osd/PrimaryLogPG: calc clone_overlap size in a more efficient and concise way

Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
7 years agoqa/standalone/scrub/osd-scrub-snaps: adjust test for lack of snapdir objects 17927/head
Sage Weil [Fri, 22 Sep 2017 21:49:19 +0000 (17:49 -0400)]
qa/standalone/scrub/osd-scrub-snaps: adjust test for lack of snapdir objects

The head_exists stuff is totally gone; those test failures go away.

Signed-off-by: Sage Weil <sage@redhat.com>
7 years agoMerge pull request #17756 from jcsp/wip-19291
Sage Weil [Fri, 22 Sep 2017 21:09:39 +0000 (16:09 -0500)]
Merge pull request #17756 from jcsp/wip-19291

mgr: set explicit thread name

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
7 years agoMerge pull request #17808 from xiexingguo/wip-eqduot-vs-enospc
Sage Weil [Fri, 22 Sep 2017 21:09:09 +0000 (16:09 -0500)]
Merge pull request #17808 from xiexingguo/wip-eqduot-vs-enospc

osd/PrimaryLogPG: prepare_transaction - fix EDQUOT vs ENOSPC

Reviewed-by: Sage Weil <sage@redhat.com>
7 years agoMerge pull request #17819 from neha-ojha/wip-cbt-teuthology-fix-pg-num
Sage Weil [Fri, 22 Sep 2017 21:08:14 +0000 (16:08 -0500)]
Merge pull request #17819 from neha-ojha/wip-cbt-teuthology-fix-pg-num

qa/suites/rados/perf: create pool with lower pg_num

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
7 years agoMerge pull request #17827 from tchaikov/wip-mono-heartbeat
Sage Weil [Fri, 22 Sep 2017 21:07:51 +0000 (16:07 -0500)]
Merge pull request #17827 from tchaikov/wip-mono-heartbeat

common: use mono clock for HeartbeatMap

Reviewed-by: Sage Weil <sage@redhat.com>
7 years agoMerge pull request #17844 from liewegas/wip-21259
Sage Weil [Fri, 22 Sep 2017 21:05:50 +0000 (16:05 -0500)]
Merge pull request #17844 from liewegas/wip-21259

os/bluestore: debug bluestore cache shutdown

7 years agoMerge pull request #17845 from liewegas/wip-21408
Sage Weil [Fri, 22 Sep 2017 21:04:22 +0000 (16:04 -0500)]
Merge pull request #17845 from liewegas/wip-21408

os/bluestore: ignore 0x2000~2000 extent oddity from luminous upgrade

Reviewed-by: Varada Kari <varada.kari@gmail.com>
7 years agoMerge PR #17853 into master
Patrick Donnelly [Fri, 22 Sep 2017 18:33:33 +0000 (11:33 -0700)]
Merge PR #17853 into master

* refs/remotes/upstream/pull/17853/head:
mds: check ongoing catter-gather process before capping log

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

* refs/remotes/upstream/pull/17851/head:
client: use unique_ptr for locks
client: use unique_ptr for Formatter

Reviewed-by: Jos Collin <jcollin@redhat.com>
7 years agoMerge PR #17843 into master
Patrick Donnelly [Fri, 22 Sep 2017 18:33:29 +0000 (11:33 -0700)]
Merge PR #17843 into master

* refs/remotes/upstream/pull/17843/head:
ceph_volume_client: perform snapshot operations in

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
7 years agoMerge pull request #17757 from ceph/wip-rgw-ansible-var
vasukulkarni [Fri, 22 Sep 2017 18:22:02 +0000 (11:22 -0700)]
Merge pull request #17757 from ceph/wip-rgw-ansible-var

qa/tests: Add additional required ceph-ansible vars due to upstream changes

7 years agoqa: whitelist cache too large in client-limits 17919/head
Patrick Donnelly [Fri, 22 Sep 2017 16:44:43 +0000 (09:44 -0700)]
qa: whitelist cache too large in client-limits

Fixes: http://tracker.ceph.com/issues/21510
Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
7 years agoqa: whitelist failover log warnings 17918/head
Patrick Donnelly [Fri, 22 Sep 2017 16:42:06 +0000 (09:42 -0700)]
qa: whitelist failover log warnings

Fixes: http://tracker.ceph.com/issues/21509
Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
7 years agoqa: ignore evicted client in client-recovery 17917/head
Patrick Donnelly [Fri, 22 Sep 2017 16:38:59 +0000 (09:38 -0700)]
qa: ignore evicted client in client-recovery

Fixes: http://tracker.ceph.com/issues/21508
Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
7 years agoMerge pull request #17910 from smithfarm/wip-21499
Nathan Cutler [Fri, 22 Sep 2017 15:07:02 +0000 (17:07 +0200)]
Merge pull request #17910 from smithfarm/wip-21499

tests: point-to-point-x: upgrade client.1 to -x along with cluster nodes

Reviewed-by: Casey Bodley <cbodley@redhat.com>
7 years agoMerge pull request #17904 from carltonf/wip-fix-21498
Kefu Chai [Fri, 22 Sep 2017 15:01:59 +0000 (23:01 +0800)]
Merge pull request #17904 from carltonf/wip-fix-21498

ceph-disk: fix '--runtime' omission for ceph-osd service

Reviewed-by: Loic Dachary <ldachary@redhat.com>
Reviewed-by: Nathan Cutler <ncutler@suse.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
7 years agoMerge pull request #17770 from aclamk/fix-bluestore-fio-hash
Kefu Chai [Fri, 22 Sep 2017 14:51:44 +0000 (22:51 +0800)]
Merge pull request #17770 from aclamk/fix-bluestore-fio-hash

bluestore/fio: Fixed problem with all objects having the same hash

Reviewed-by: Casey Bodley <cbodley@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
7 years agoMerge pull request #17901 from tchaikov/wip-cmake-gperftools
Eric Ivancich [Fri, 22 Sep 2017 13:57:33 +0000 (09:57 -0400)]
Merge pull request #17901 from tchaikov/wip-cmake-gperftools

cmake: update the error message for gperftools bug

7 years agoAdd missed __func__ in dout 17903/head
lisali [Fri, 22 Sep 2017 11:27:39 +0000 (07:27 -0400)]
Add missed __func__ in dout

With __func__ it makes users to know where it prints the logs in source code.

Signed-off-by: Xiaoyan Li xiaoyan.li@intel.com
7 years agoqa: point-to-point-x: upgrade client.1 to -x along with cluster nodes 17910/head
Nathan Cutler [Thu, 21 Sep 2017 20:50:06 +0000 (22:50 +0200)]
qa: point-to-point-x: upgrade client.1 to -x along with cluster nodes

The client.1 rgw in workload_x had not been upgraded to -x.

Fixes: http://tracker.ceph.com/issues/21499
Signed-off-by: Nathan Cutler <ncutler@suse.com>
7 years agoosd/osd_types: object_info_t: remove unused function 17905/head
Kefu Chai [Fri, 22 Sep 2017 05:09:44 +0000 (13:09 +0800)]
osd/osd_types: object_info_t: remove unused function

legacy_object_locator_to_ps() is not used anymore, so drop it.

Signed-off-by: Kefu Chai <kchai@redhat.com>
7 years agoMerge pull request #17806 from tchaikov/wip-osdc-new-options
Kefu Chai [Fri, 22 Sep 2017 04:44:36 +0000 (12:44 +0800)]
Merge pull request #17806 from tchaikov/wip-osdc-new-options

osdc/Journaler: use new style options

Reviewed-by: John Spray <john.spray@redhat.com>
Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
7 years agoMerge pull request #17823 from xiexingguo/wip-clone-bytes
Kefu Chai [Fri, 22 Sep 2017 04:43:03 +0000 (12:43 +0800)]
Merge pull request #17823 from xiexingguo/wip-clone-bytes

osd/osd_type: get_clone_bytes - inline size() for overlapping size

Reviewed-by: Kefu Chai <kchai@redhat.com>
7 years agoMerge pull request #17794 from hjwsm1989/wip-21425
Kefu Chai [Fri, 22 Sep 2017 04:42:27 +0000 (12:42 +0800)]
Merge pull request #17794 from hjwsm1989/wip-21425

qa/suites/rest/basic/tasks/rest_test: more whitelisting

Reviewed-by: Kefu Chai <kchai@redhat.com>
7 years agoMerge pull request #17744 from xiexingguo/wip-blue-eio
Kefu Chai [Fri, 22 Sep 2017 04:41:21 +0000 (12:41 +0800)]
Merge pull request #17744 from xiexingguo/wip-blue-eio

os/bluestore: propagate read-EIO to high level callers

Reviewed-by: Sage Weil <sage@redhat.com>
7 years agoMerge pull request #17460 from dengquan/master
Kefu Chai [Fri, 22 Sep 2017 04:40:18 +0000 (12:40 +0800)]
Merge pull request #17460 from dengquan/master

java/native: fix milliseconds to mtime/atime conversion

Reviewed-by: Kefu Chai <kchai@redhat.com>
7 years agomon/OSDMonitor: mon osd feature checks with 0 up osds 17831/head
Brad Hubbard [Wed, 20 Sep 2017 03:15:30 +0000 (13:15 +1000)]
mon/OSDMonitor: mon osd feature checks with 0 up osds

get_up_osd_features() returns 0 if no osds are up which causes feature
checks to fail.

Fixes: http://tracker.ceph.com/issues/21471
Signed-off-by: Brad Hubbard <bhubbard@redhat.com>
7 years agoMerge pull request #17422 from aclamk/fix-cmake-unsupported-allocator
Kefu Chai [Fri, 22 Sep 2017 04:33:36 +0000 (12:33 +0800)]
Merge pull request #17422 from aclamk/fix-cmake-unsupported-allocator

cmake: in case of bad "ALLOCATOR" selected issue warning

Reviewed-by: Kefu Chai <kchai@redhat.com>
7 years agoMerge pull request #17374 from jcsp/wip-mgr-config-tidy
Kefu Chai [Fri, 22 Sep 2017 04:32:13 +0000 (12:32 +0800)]
Merge pull request #17374 from jcsp/wip-mgr-config-tidy

mgr: use new style config opts + add metadata

Reviewed-by: Kefu Chai <kchai@redhat.com>
7 years agoMerge pull request #17309 from jcsp/wip-daemonserver-locks
Kefu Chai [Fri, 22 Sep 2017 04:30:41 +0000 (12:30 +0800)]
Merge pull request #17309 from jcsp/wip-daemonserver-locks

mgr: locking fixes

Reviewed-by: Sage Weil <sage@redhat.com>
7 years agoosdc/Journaler: use new style options 17806/head
Kefu Chai [Tue, 19 Sep 2017 11:16:24 +0000 (19:16 +0800)]
osdc/Journaler: use new style options

also use uint64_t for these options, as they are casted to uint64_t when
reading from conf.

Signed-off-by: Kefu Chai <kchai@redhat.com>
7 years agoMerge pull request #17830 from Yan-waller/wip-walle-0920primarypg
Kefu Chai [Fri, 22 Sep 2017 04:24:07 +0000 (12:24 +0800)]
Merge pull request #17830 from Yan-waller/wip-walle-0920primarypg

osd/PrimaryLogPG: misc cleanups

Reviewed-by: Kefu Chai <kchai@redhat.com>
7 years agoceph-disk: fix '--runtime' omission for ceph-osd service 17904/head
Carl Xiong [Fri, 22 Sep 2017 03:55:33 +0000 (11:55 +0800)]
ceph-disk: fix '--runtime' omission for ceph-osd service

f425a127b introduces a regression that ceph-disk omits "--runtime" when
enabling ceph-osd@$ID.service units for device-backed OSDs.

Fixes: http://tracker.ceph.com/issues/21498
Signed-off-by: Carl Xiong <cxiong@suse.com>
7 years agoqa/tasks: prolong revive_osd() timeout to 6 min 17902/head
Kefu Chai [Fri, 22 Sep 2017 02:58:40 +0000 (10:58 +0800)]
qa/tasks: prolong revive_osd() timeout to 6 min

bluestore_fsck_on_mount and bluestore_fsck_on_mount_deep are enabled by
default. and bluestore is used as the default store backend. it takes
longer to perform the deep fsck with verbose log. so prolong the
revive_osd()'s timeout from 150 sec to 360 sec.

Fixes: http://tracker.ceph.com/issues/21474
Signed-off-by: Kefu Chai <kchai@redhat.com>
7 years agocmake: update the error message for gperftools bug 17901/head
Kefu Chai [Fri, 22 Sep 2017 02:38:01 +0000 (10:38 +0800)]
cmake: update the error message for gperftools bug

it's a follow-up of #17788

Signed-off-by: Kefu Chai <kchai@redhat.com>
7 years agoMerge pull request #17891 from b-ranto/wip-selinux-lnk-getattr
Boris Ranto [Fri, 22 Sep 2017 02:35:26 +0000 (04:35 +0200)]
Merge pull request #17891 from b-ranto/wip-selinux-lnk-getattr

selinux: Allow getattr on lnk sysfs files

Reviewed-by: Ken Dreyer <kdreyer@redhat.com>
7 years agoMerge pull request #17739 from liewegas/wip-filestore-configs
Sage Weil [Fri, 22 Sep 2017 02:25:52 +0000 (21:25 -0500)]
Merge pull request #17739 from liewegas/wip-filestore-configs

common/options: document filestore and filejournal options

Reviewed-by: Kefu Chai <kchai@redhat.com>
7 years agoMerge pull request #17740 from liewegas/wip-objecter-configs
Sage Weil [Fri, 22 Sep 2017 02:25:36 +0000 (21:25 -0500)]
Merge pull request #17740 from liewegas/wip-objecter-configs

common/options: document objecter, filer, and journal options

Reviewed-by: Kefu Chai <kchai@redhat.com>
7 years agoMerge pull request #17579 from liewegas/wip-kill-snapdirs
Sage Weil [Fri, 22 Sep 2017 02:25:17 +0000 (21:25 -0500)]
Merge pull request #17579 from liewegas/wip-kill-snapdirs

osd: kill snapdirs

Reviewed-by: Kefu Chai <kchai@redhat.com>
7 years agoMerge pull request #17895 from ivancich/wip-fix-mclock-coverity
Kefu Chai [Fri, 22 Sep 2017 02:04:38 +0000 (10:04 +0800)]
Merge pull request #17895 from ivancich/wip-fix-mclock-coverity

tests: fix uninitialized value found by coverity scan

Reviewed-by: Kefu Chai <kchai@redhat.com>
7 years agouse ovh instead of vps 17757/head
Vasu Kulkarni [Thu, 21 Sep 2017 22:34:31 +0000 (15:34 -0700)]
use ovh instead of vps

Signed-off-by: Vasu Kulkarni <vasu@redhat.com>
7 years agotests: fix uninitialized value found by coverity scan 17895/head
J. Eric Ivancich [Thu, 21 Sep 2017 13:40:47 +0000 (09:40 -0400)]
tests: fix uninitialized value found by coverity scan

Unit test for mclock priority queue had a default constructor, which
didn't initialize a value.

Signed-off-by: J. Eric Ivancich <ivancich@redhat.com>
7 years agoosd: make shutdown debug conditional (and off by default) 17844/head
Sage Weil [Thu, 21 Sep 2017 19:19:47 +0000 (15:19 -0400)]
osd: make shutdown debug conditional (and off by default)

Signed-off-by: Sage Weil <sage@redhat.com>
7 years agocommon/options: document filestore and filejournal options 17739/head
Sage Weil [Thu, 14 Sep 2017 21:23:25 +0000 (17:23 -0400)]
common/options: document filestore and filejournal options

Signed-off-by: Sage Weil <sage@redhat.com>
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 agocommon: use mono clock for HeartbeatMap 17827/head
Kefu Chai [Wed, 20 Sep 2017 07:13:35 +0000 (15:13 +0800)]
common: use mono clock for HeartbeatMap

to avoid problems when admin sets system clock.

see https://gcc.gnu.org/bugzilla/show_bug.cgi?id=53901 for the reason
why we cannot use atomic<time_point>.

Signed-off-by: Kefu Chai <kchai@redhat.com>
Signed-off-by: Xinze Chi <xinze@xsky.com>
7 years agoselinux: Allow getattr on lnk sysfs files 17891/head
Boris Ranto [Thu, 21 Sep 2017 15:24:07 +0000 (17:24 +0200)]
selinux: Allow getattr on lnk sysfs files

This showed up during downstream testing for luminous. We are doing
getattr on the sysfs lnk files and the current policy does not allow
this.

Signed-off-by: Boris Ranto <branto@redhat.com>
7 years agoMerge pull request #17872 from joscollin/wip-osdmap-signed-unsigned-warning
Xie Xingguo [Thu, 21 Sep 2017 13:02:57 +0000 (21:02 +0800)]
Merge pull request #17872 from joscollin/wip-osdmap-signed-unsigned-warning

osd: silence warnings from -Wsign-compare

Reviewed-by: xie xingguo <xie.xingguo@zte.com.cn>
7 years agomgr: silence warning from -Wsign-compare 17881/head
Jos Collin [Thu, 21 Sep 2017 09:05:39 +0000 (14:35 +0530)]
mgr: silence warning from -Wsign-compare

Fixed the warning:

ceph/src/mgr/Mgr.cc: In lambda function:
ceph/src/mgr/Mgr.cc:413:42: warning: comparison between signed and unsigned integer expressions [-Wsign-compare]
     for (unsigned int osd_id = 0; osd_id < osd_map.get_max_osd(); ++osd_id) {
                                   ~~~~~~~^~~~~~~~~~~~~~~~~~~~~~~

Signed-off-by: Jos Collin <jcollin@redhat.com>
7 years agoosd: silence warnings from -Wsign-compare 17872/head
Jos Collin [Thu, 21 Sep 2017 07:05:53 +0000 (12:35 +0530)]
osd: silence warnings from -Wsign-compare

Fixed the warning :

ceph/src/osd/OSDMap.cc: In member function ‘int OSDMap::validate_crush_rules(CrushWrapper*, std::ostream*) const’:
ceph/src/osd/OSDMap.cc:3278:25: warning: comparison between signed and unsigned integer expressions [-Wsign-compare]
     if (pool.get_size() < (int)newcrush->get_rule_mask_min_size(ruleno) ||
         ~~~~~~~~~~~~~~~~^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
ceph/src/osd/OSDMap.cc:3279:18: warning: comparison between signed and unsigned integer expressions [-Wsign-compare]
  pool.get_size() > (int)newcrush->get_rule_mask_max_size(ruleno)) {
  ~~~~~~~~~~~~~~~~^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

Signed-off-by: Jos Collin <jcollin@redhat.com>
7 years agoMerge pull request #17833 from mogeb/cache-tiering-doc
Kefu Chai [Thu, 21 Sep 2017 03:10:10 +0000 (11:10 +0800)]
Merge pull request #17833 from mogeb/cache-tiering-doc

doc: update link to placing-different-pools

Reviewed-by: Kefu Chai <kchai@redhat.com>
7 years agomds: check ongoing catter-gather process before capping log 17853/head
Yan, Zheng [Thu, 21 Sep 2017 02:56:07 +0000 (10:56 +0800)]
mds: check ongoing catter-gather process before capping log

When deactivating mds, MDLog::trim() may start scatter-gather
process on mdsdir inode. Locker::scatter_writebehind() submits
log entry. So mds should make sure there is no scatter-gather
before capping log.

Fixes: http://tracker.ceph.com/issues/21467
Signed-off-by: "Yan, Zheng" <zyan@redhat.com>
7 years agoMerge PR #17849 into master
Patrick Donnelly [Thu, 21 Sep 2017 01:31:09 +0000 (18:31 -0700)]
Merge PR #17849 into master

* refs/remotes/upstream/pull/17849/head:
qa: get config only on running MDS

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
7 years agoclient: use unique_ptr for locks 17851/head
Patrick Donnelly [Thu, 16 Mar 2017 18:35:49 +0000 (14:35 -0400)]
client: use unique_ptr for locks

Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>