]> git.apps.os.sepia.ceph.com Git - ceph.git/log
ceph.git
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 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 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 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 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 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 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 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 agoqa: get config only on running MDS 17849/head
Patrick Donnelly [Wed, 20 Sep 2017 22:44:40 +0000 (15:44 -0700)]
qa: get config only on running MDS

Fixes: http://tracker.ceph.com/issues/21466
Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
7 years agoMerge PR #17791 into master
Patrick Donnelly [Wed, 20 Sep 2017 19:38:25 +0000 (12:38 -0700)]
Merge PR #17791 into master

* refs/remotes/upstream/pull/17791/head:
client: set client_try_dentry_invalidate to false by default

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
7 years agoMerge PR #17784 into master
Patrick Donnelly [Wed, 20 Sep 2017 19:38:23 +0000 (12:38 -0700)]
Merge PR #17784 into master

* refs/remotes/upstream/pull/17784/head:
vstart: create MDSs before filesystems

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
7 years agoMerge PR #17783 into master
Patrick Donnelly [Wed, 20 Sep 2017 19:38:21 +0000 (12:38 -0700)]
Merge PR #17783 into master

* refs/remotes/upstream/pull/17783/head:
mon/MDSMonitor: fix clog msgs on MDS rank add/rm

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
7 years agoMerge PR #17778 into master
Patrick Donnelly [Wed, 20 Sep 2017 19:38:18 +0000 (12:38 -0700)]
Merge PR #17778 into master

* refs/remotes/upstream/pull/17778/head:
client: move Fh init to ctor

Reviewed-by: Jos Collin <jcollin@redhat.com>
7 years agoMerge PR #17768 into master
Patrick Donnelly [Wed, 20 Sep 2017 19:38:16 +0000 (12:38 -0700)]
Merge PR #17768 into master

* refs/remotes/upstream/pull/17768/head:
ceph: do link/rename semantic checks after srcdn is readable

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
7 years agoMerge pull request #17807 from xiexingguo/wip-kill-add-interval-usage
Sage Weil [Wed, 20 Sep 2017 16:27:20 +0000 (11:27 -0500)]
Merge pull request #17807 from xiexingguo/wip-kill-add-interval-usage

osd/PrimaryLogPG: kill add_interval_usage

Reviewed-by: Kefu Chai <kchai@redhat.com>
7 years agoMerge pull request #17723 from amitkumar50/cov-librados-3
Yuri Weinstein [Wed, 20 Sep 2017 16:26:41 +0000 (09:26 -0700)]
Merge pull request #17723 from amitkumar50/cov-librados-3

rados: Initialization of alignment

Reviewed-by: Jos Collin <jcollin@redhat.com>
7 years agodoc: update 'ceph osd pool set' example 17833/head
Mohamad Gebai [Wed, 20 Sep 2017 15:58:08 +0000 (17:58 +0200)]
doc: update 'ceph osd pool set' example

Signed-off-by: Mohamad Gebai <mgebai@suse.com>
7 years agoMerge pull request #17747 from tchaikov/wip-qa
Kefu Chai [Wed, 20 Sep 2017 15:08:47 +0000 (23:08 +0800)]
Merge pull request #17747 from tchaikov/wip-qa

qa/standalone: respect $TEMPDIR

Reviewed-by: David Zafman <dzafman@redhat.com>
7 years agoMerge pull request #17828 from jdurgin/wip-21428
Josh Durgin [Wed, 20 Sep 2017 15:07:56 +0000 (08:07 -0700)]
Merge pull request #17828 from jdurgin/wip-21428

osd/PrimaryLogPG: request osdmap update in the right block

Reviewed-by: Sage Weil <sage@redhat.com>
7 years agodoc: update link to placing-different-pools
Mohamad Gebai [Wed, 20 Sep 2017 11:19:55 +0000 (13:19 +0200)]
doc: update link to placing-different-pools

Signed-off-by: Mohamad Gebai <mgebai@suse.com>
7 years agoosd/PrimaryLogPG: drop unused variables 17830/head
Yan Jun [Wed, 20 Sep 2017 08:06:56 +0000 (16:06 +0800)]
osd/PrimaryLogPG: drop unused variables

Signed-off-by: Yan Jun <yan.jun8@zte.com.cn>
7 years agoosd/PrimaryLogPG: avoid accessing value of map.end()
Yan Jun [Wed, 20 Sep 2017 08:47:13 +0000 (16:47 +0800)]
osd/PrimaryLogPG: avoid accessing value of map.end()

Signed-off-by: Yan Jun <yan.jun8@zte.com.cn>
7 years agoosd/PrimaryLogPG: request osdmap update in the right block 17828/head
Josh Durgin [Wed, 20 Sep 2017 05:18:35 +0000 (01:18 -0400)]
osd/PrimaryLogPG: request osdmap update in the right block

Fixes: http://tracker.ceph.com/issues/21428
Signed-off-by: Josh Durgin <jdurgin@redhat.com>
7 years agoMerge pull request #17785 from dzafman/wip-add-repair
Kefu Chai [Wed, 20 Sep 2017 04:35:16 +0000 (12:35 +0800)]
Merge pull request #17785 from dzafman/wip-add-repair

test: Fix ceph-objectstore-tool usage check

Reviewed-by: Kefu Chai <kchai@redhat.com>
7 years agoosd/osd_type: get_clone_bytes - inline size() for overlapping size 17823/head
xie xingguo [Wed, 20 Sep 2017 03:13:42 +0000 (11:13 +0800)]
osd/osd_type: get_clone_bytes - inline size() for overlapping size

This is faster and simpler. A similar issue can be found at:
https://github.com/ceph/ceph/pull/17807

Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
7 years agoMerge pull request #17138 from Liuchang0812/wip-updata-osd-hostname-in-metaupdater
Kefu Chai [Wed, 20 Sep 2017 03:22:49 +0000 (11:22 +0800)]
Merge pull request #17138 from Liuchang0812/wip-updata-osd-hostname-in-metaupdater

mgr: preventing blank hostname in DaemonState

Reviewed-by: John Spray <john.spray@redhat.com>
7 years agoMerge pull request #17738 from jtlayton/wip-jlayton-20988
Kefu Chai [Wed, 20 Sep 2017 03:11:02 +0000 (11:11 +0800)]
Merge pull request #17738 from jtlayton/wip-jlayton-20988

common: lockdep fixes

Reviewed-by: Sage Weil <sage@redhat.com>
Reviewed-by: Adam Emerson <aemerson@redhat.com>
Reviewed-by: John Spray <john.spray@redhat.com>
7 years agoMerge pull request #17753 from tchaikov/wip-osd-cleanup
Kefu Chai [Wed, 20 Sep 2017 03:06:45 +0000 (11:06 +0800)]
Merge pull request #17753 from tchaikov/wip-osd-cleanup

osd: cleanups

Reviewed-by: xie xingguo <xie.xingguo@zte.com.cn>
7 years agoMerge pull request #17787 from tchaikov/wip-os-release-wo-version_id
Kefu Chai [Wed, 20 Sep 2017 03:02:00 +0000 (11:02 +0800)]
Merge pull request #17787 from tchaikov/wip-os-release-wo-version_id

common/util: do not print error if VERSION_ID is missing

Reviewed-by: Brad Hubbard <bhubbard@redhat.com>
7 years agoMerge pull request #17788 from tchaikov/wip-cmake-rocksdb-tcmalloc
Kefu Chai [Wed, 20 Sep 2017 02:30:37 +0000 (10:30 +0800)]
Merge pull request #17788 from tchaikov/wip-cmake-rocksdb-tcmalloc

cmake: identify the possible incompatibility of rocksdb and tcmalloc

Reviewed-by: Brad Hubbard <bhubbard@redhat.com>
7 years agocmake: error out if rocksdb is incompatible w/ tcmalloc 17788/head
Kefu Chai [Tue, 19 Sep 2017 04:23:44 +0000 (12:23 +0800)]
cmake: error out if rocksdb is incompatible w/ tcmalloc

the commit d406f228 in gperf implements a c11 feature used by a
recent change in rocksdb: 16e03882, which uses aligned_alloc().
and 16e03882 in rocksdb was merged after v5.7 was tagged, while
16e03882 in gperf was merged after v2.6.1 was tagged.

because aligned_alloc() is not implemented by tcmalloc until the
not-yet-released 2.6.2, if we call aligned_alloc() in an application
linked against tcmalloc, what gets called will be the glibc's
aligned_alloc(). but if we free() the memory chunk allocated by
aligned_alloc(), the tcmalloc's implementation kicks in, then
InvalidFree() is called, because the memory chunk being freed was
allocated by tcmalloc. in short, "mixing allocators", quote from
Dan Mick.

in rocksdb, aligned_alloc() is used if _ISOC11_SOURCE is defined, this
makes sense, because aligned_alloc() is a C11 function. we could avoid
using it by not defining _ISOC11_SOURCE. but as long as _GNU_SOURCE is
defined, glibc defines _ISOC11_SOURCE. and libstdc++ requires
_GNU_SOURCE, because it uses a fair amount of GNU extensions.

Fixes: http://tracker.ceph.com/issues/21422
Signed-off-by: Kefu Chai <kchai@redhat.com>
7 years agoMerge pull request #17795 from jdurgin/wip-21428
Josh Durgin [Tue, 19 Sep 2017 23:43:24 +0000 (16:43 -0700)]
Merge pull request #17795 from jdurgin/wip-21428

osd: request new map from PG when needed

Reviewed-by: Greg Farnum <gfarnum@redhat.com>
Reviewed-by: Sage Weil <sage@redhat.com>
7 years agoosd: request new map from PG when needed 17795/head
Josh Durgin [Tue, 19 Sep 2017 02:31:10 +0000 (22:31 -0400)]
osd: request new map from PG when needed

The fast dispatch refactor in 3cc48278bf0ee5c9535d04b60a661f988c50063b
eliminated the osdmap subscription in the ms_fast_dispatch path, which
meant ops could reach a PG without having the latest map. In a cluster
with few osdmap updates, where the monitor fails to send a new map to
an osd (it tries one random osd), this can result in indefinitely
blocked requests.

Fix this by adding an OSDService mechanism for scheduling a new osdmap
subscription request.

Fixes: http://tracker.ceph.com/issues/21428
Signed-off-by: Josh Durgin <jdurgin@redhat.com>
7 years agoMerge pull request #17607 from liewegas/wip-post-luminous-more-mon
Sage Weil [Tue, 19 Sep 2017 18:19:06 +0000 (13:19 -0500)]
Merge pull request #17607 from liewegas/wip-post-luminous-more-mon

mon: post-luminous cleanup (part 3 of ?)

Reviewed-by: Greg Farnum <gfarnum@redhat.com>
7 years agoMerge pull request #16913 from liewegas/wip-20944
Sage Weil [Tue, 19 Sep 2017 18:00:33 +0000 (13:00 -0500)]
Merge pull request #16913 from liewegas/wip-20944

os/filestore: fix device/partition metadata detection

Reviewed-by: Greg Farnum <gfarnum@redhat.com>
7 years agoMerge pull request #17427 from liewegas/wip-pg-num-limits
Sage Weil [Tue, 19 Sep 2017 17:57:10 +0000 (12:57 -0500)]
Merge pull request #17427 from liewegas/wip-pg-num-limits

mon/OSDMonitor: implement cluster pg limit

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
7 years agoMerge pull request #17760 from liewegas/wip-21410-b
Sage Weil [Tue, 19 Sep 2017 17:31:44 +0000 (12:31 -0500)]
Merge pull request #17760 from liewegas/wip-21410-b

Revert "osd/OSDMap: allow bidirectional swap of pg-upmap-items"

Reviewed-by: xie xingguo <xie.xingguo@zte.com.cn>
7 years agoMerge pull request #15369 from rzarzynski/wip-rgw-custom-errmsgs-2
Matt Benjamin [Tue, 19 Sep 2017 16:09:38 +0000 (12:09 -0400)]
Merge pull request #15369 from rzarzynski/wip-rgw-custom-errmsgs-2

rgw: improve handling of Swift's error messages and limits

7 years agoMerge pull request #12704 from rzarzynski/wip-rgw-per-storage-policy-stats
Matt Benjamin [Tue, 19 Sep 2017 16:04:28 +0000 (12:04 -0400)]
Merge pull request #12704 from rzarzynski/wip-rgw-per-storage-policy-stats

rgw: add support for Swift's per storage policy statistics

7 years agoMerge pull request #17786 from neha-ojha/wip-cbt-teuthology-integration-cntd
Josh Durgin [Tue, 19 Sep 2017 15:35:10 +0000 (08:35 -0700)]
Merge pull request #17786 from neha-ojha/wip-cbt-teuthology-integration-cntd

qa/suites/rados/perf: add optimized settings

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
7 years agorgw: rename the configurables for metadata limits to start with rgw_. 15369/head
Radoslaw Zarzynski [Tue, 19 Sep 2017 12:46:53 +0000 (14:46 +0200)]
rgw: rename the configurables for metadata limits to start with rgw_.

Signed-off-by: Radoslaw Zarzynski <rzarzyns@redhat.com>
7 years agocommon/options: document objecter, filer, and journal options 17740/head
Sage Weil [Thu, 14 Sep 2017 21:29:13 +0000 (17:29 -0400)]
common/options: document objecter, filer, and journal options

Signed-off-by: Sage Weil <sage@redhat.com>
7 years agorgw: calculate and print Swift's X-Account-Storage-Policy-* headers. 12704/head
Radoslaw Zarzynski [Wed, 28 Dec 2016 18:22:32 +0000 (19:22 +0100)]
rgw: calculate and print Swift's X-Account-Storage-Policy-* headers.

Fixes: http://tracker.ceph.com/issues/17932
Signed-off-by: Radoslaw Zarzynski <rzarzynski@mirantis.com>
7 years agorgw: bucket linking stores also the info about a placement rule.
Radoslaw Zarzynski [Wed, 28 Dec 2016 16:14:35 +0000 (17:14 +0100)]
rgw: bucket linking stores also the info about a placement rule.

Fixes: http://tracker.ceph.com/issues/17932
Signed-off-by: Radoslaw Zarzynski <rzarzynski@mirantis.com>
7 years agorgw: convey placement rule in RGWBucketEnt and cls_user_bucket_entry.
Radoslaw Zarzynski [Wed, 28 Dec 2016 16:12:50 +0000 (17:12 +0100)]
rgw: convey placement rule in RGWBucketEnt and cls_user_bucket_entry.

Fixes: http://tracker.ceph.com/issues/17932
Signed-off-by: Radoslaw Zarzynski <rzarzynski@mirantis.com>
7 years agorgw: clean-up around and implement the move semantics in RGWBucketEnt.
Radoslaw Zarzynski [Wed, 28 Dec 2016 14:54:42 +0000 (15:54 +0100)]
rgw: clean-up around and implement the move semantics in RGWBucketEnt.

Signed-off-by: Radoslaw Zarzynski <rzarzynski@mirantis.com>
Signed-off-by: Radoslaw Zarzynski <rzarzyns@redhat.com>
7 years agoosd/PrimaryLogPG: kill add_interval_usage 17807/head
xie xingguo [Tue, 19 Sep 2017 10:29:44 +0000 (18:29 +0800)]
osd/PrimaryLogPG: kill add_interval_usage

Use inline size() member of interval_set instead, which is faster and simpler.

Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
7 years agoMerge pull request #17508 from liewegas/wip-crushrule-convert
Kefu Chai [Tue, 19 Sep 2017 10:18:55 +0000 (18:18 +0800)]
Merge pull request #17508 from liewegas/wip-crushrule-convert

mon: more aggressively convert crush rulesets -> distinct rules

Reviewed-by: Kefu Chai <kchai@redhat.com>
7 years agoMerge pull request #17802 from ygtzf/option-default-value-error
Kefu Chai [Tue, 19 Sep 2017 09:18:08 +0000 (17:18 +0800)]
Merge pull request #17802 from ygtzf/option-default-value-error

doc: update default value of option mon_sync_timeout

Reviewed-by: Kefu Chai <kchai@redhat.com>
Reviewed-by: Amit Kumar <amitkuma@redhat.com>
7 years agodoc: update default value of option mon_sync_timeout 17802/head
Yao Guotao [Tue, 19 Sep 2017 08:47:00 +0000 (04:47 -0400)]
doc: update default value of option mon_sync_timeout

Signed-off-by: Yao Guotao <yaoguot@gmail.com>
7 years agoqa/suites/rest/basic/tasks/rest_test: more whitelisting 17794/head
huangjun [Tue, 19 Sep 2017 08:13:34 +0000 (16:13 +0800)]
qa/suites/rest/basic/tasks/rest_test: more whitelisting

Fixes: http://tracker.ceph.com/issues/21425
Signed-off-by: huangjun <huangjun@xsky.com>
7 years agoclient: set client_try_dentry_invalidate to false by default 17791/head
Yan, Zheng [Tue, 19 Sep 2017 06:38:13 +0000 (14:38 +0800)]
client: set client_try_dentry_invalidate to false by default

By default, ceph-fuse uses side effect of 'dentry invalidation' to
trim kernel dcache if it runs on kernel < 3.18. The implemention of
kernel function d_invalidate() changed in 3.18 kernel, the method no
longer works for upstream kernel >= 3.18.

RHEL 3.10 kernel includes backport of patches that change implemention
of d_invalidate(). So checking kernel version to decide if 'dentry
invalidation' method works is unreliable.

Fixes: http://tracker.ceph.com/issues/21423
Signed-off-by: "Yan, Zheng" <zyan@redhat.com>
7 years agocmake: requires rockdb version 5.8
Kefu Chai [Tue, 19 Sep 2017 05:36:31 +0000 (13:36 +0800)]
cmake: requires rockdb version 5.8

we've updated the rockdb wrapper on ceph side to be compatible with
the latest version of rocksdb upstream. so ceph is not compatible with
older version of rocksdb.

Signed-off-by: Kefu Chai <kchai@redhat.com>
7 years agocmake: detect rocksdb's version
Kefu Chai [Tue, 19 Sep 2017 05:07:59 +0000 (13:07 +0800)]
cmake: detect rocksdb's version

Signed-off-by: Kefu Chai <kchai@redhat.com>
7 years agocmake: detect gperf-tools' version
Kefu Chai [Tue, 19 Sep 2017 04:23:13 +0000 (12:23 +0800)]
cmake: detect gperf-tools' version

Signed-off-by: Kefu Chai <kchai@redhat.com>
7 years agocmake: extract BuildRocksDB into BuildRocksDB.cmake
Kefu Chai [Tue, 19 Sep 2017 03:56:15 +0000 (11:56 +0800)]
cmake: extract BuildRocksDB into BuildRocksDB.cmake

Signed-off-by: Kefu Chai <kchai@redhat.com>
7 years agocmake: enable find_package(perftools) to check non-default dir
Kefu Chai [Tue, 19 Sep 2017 03:55:16 +0000 (11:55 +0800)]
cmake: enable find_package(perftools) to check non-default dir

so it checks $ENV{GPERF_ROOT} first.

Signed-off-by: Kefu Chai <kchai@redhat.com>
7 years agoqa/suites/rados/perf: add optimized settings 17786/head
Neha Ojha [Mon, 18 Sep 2017 22:53:28 +0000 (15:53 -0700)]
qa/suites/rados/perf: add optimized settings

Signed-off-by: Neha Ojha <nojha@redhat.com>