]> git.apps.os.sepia.ceph.com Git - ceph.git/log
ceph.git
8 years agomon/PGMonitor: link PGStatService to the actual PGMap
Sage Weil [Mon, 15 May 2017 21:45:06 +0000 (17:45 -0400)]
mon/PGMonitor: link PGStatService to the actual PGMap

Signed-off-by: Sage Weil <sage@redhat.com>
8 years agomon: adjust pgservice based on OSDMap require_luminous flag
Sage Weil [Mon, 15 May 2017 18:53:57 +0000 (14:53 -0400)]
mon: adjust pgservice based on OSDMap require_luminous flag

Signed-off-by: Sage Weil <sage@redhat.com>
8 years agomon: remove last trace of PGMap from MgrMonitor
Kefu Chai [Mon, 15 May 2017 13:46:32 +0000 (21:46 +0800)]
mon: remove last trace of PGMap from MgrMonitor

Signed-off-by: Kefu Chai <kchai@redhat.com>
8 years agomgr: send PGMapDigest instead of PGMap to mon
Sage Weil [Sat, 13 May 2017 04:51:45 +0000 (23:51 -0500)]
mgr: send PGMapDigest instead of PGMap to mon

Signed-off-by: Sage Weil <sage@redhat.com>
8 years agomon/OSDMonitor: avoid pulling pgmap ratio on mkfs
Sage Weil [Sat, 13 May 2017 02:40:22 +0000 (21:40 -0500)]
mon/OSDMonitor: avoid pulling pgmap ratio on mkfs

If this is the first osdmap epoch there is nothing to be learned from
the PGMap.

Signed-off-by: Sage Weil <sage@redhat.com>
8 years agomon/PGStatService: implement pre-luminous methods in parent
Sage Weil [Sat, 13 May 2017 02:30:43 +0000 (21:30 -0500)]
mon/PGStatService: implement pre-luminous methods in parent

Many of these are only needed to support PGMonitor.  Implement those
in the parent and make them ceph_abort() so that the new child can avoid
the clutter.

Signed-off-by: Sage Weil <sage@redhat.com>
8 years agomon/PGMap: move summary information into parent PGMapDigest object
Sage Weil [Sat, 13 May 2017 02:27:11 +0000 (21:27 -0500)]
mon/PGMap: move summary information into parent PGMapDigest object

Everything summary-ish that we need to send to the mon is moved into a
parent class.  The child PGMap retains the detail.

The parent gets its own encode(), and PGMap::encode_digest() will call it
to encode just the summary info.

Squashed in here is a new num_pg_by_osd that could have been done
in a preceding patch but I did things in the wrong order.  :(

Signed-off-by: Sage Weil <sage@redhat.com>
8 years agomon/OSDMonitor: condition PGMap->creating priming on !luminous
Sage Weil [Sat, 13 May 2017 02:08:57 +0000 (21:08 -0500)]
mon/OSDMonitor: condition PGMap->creating priming on !luminous

Once we set the luminous flag we shouldn't need this anymore.  In fact,
we should stop needing this immediately after we set the monitor
luminous flag.

Signed-off-by: Sage Weil <sage@redhat.com>
8 years agomon/PGMap: use num_pg where available
Sage Weil [Sat, 13 May 2017 01:45:29 +0000 (20:45 -0500)]
mon/PGMap: use num_pg where available

Signed-off-by: Sage Weil <sage@redhat.com>
8 years agomon/PGMap: remove version from summary
Sage Weil [Sat, 13 May 2017 01:41:01 +0000 (20:41 -0500)]
mon/PGMap: remove version from summary

Signed-off-by: Sage Weil <sage@redhat.com>
8 years agomon: give PGMonitor and MgrMonitor their own PGStatService implementations
Greg Farnum [Tue, 9 May 2017 20:06:56 +0000 (13:06 -0700)]
mon: give PGMonitor and MgrMonitor their own PGStatService implementations

Right now they pretty much just copy the PGMapStatService, but it'll
let us slim down the MgrMonitor's one more easily.

Signed-off-by: Greg Farnum <gfarnum@redhat.com>
8 years agomon: move the PGStatService lifecycle into the MgrMon/PGMon
Greg Farnum [Wed, 15 Mar 2017 22:24:51 +0000 (15:24 -0700)]
mon: move the PGStatService lifecycle into the MgrMon/PGMon

I remain lazy enough that we just use the MgrMon right now for easier
testing.

Signed-off-by: Greg Farnum <gfarnum@redhat.com>
8 years agomon: pgstats: move some creating_pgs maintenance into the PGStatService
Greg Farnum [Tue, 9 May 2017 19:01:22 +0000 (12:01 -0700)]
mon: pgstats: move some creating_pgs maintenance into the PGStatService

And remove get_pg_map() now that there are no users!

Signed-off-by: Greg Farnum <gfarnum@redhat.com>
8 years agomon: pgstat: remove unneeded StatIter functions
Greg Farnum [Tue, 9 May 2017 18:12:29 +0000 (11:12 -0700)]
mon: pgstat: remove unneeded StatIter functions

Signed-off-by: Greg Farnum <gfarnum@redhat.com>
8 years agomon: pgstat: expose the full pg_stat map to remove a get_pg_map() call
Greg Farnum [Fri, 5 May 2017 20:37:21 +0000 (13:37 -0700)]
mon: pgstat: expose the full pg_stat map to remove a get_pg_map() call

Signed-off-by: Greg Farnum <gfarnum@redhat.com>
8 years agomon: pgstat: expose the full osd_stat map to remove a get_pg_map() call
Greg Farnum [Fri, 5 May 2017 20:16:48 +0000 (13:16 -0700)]
mon: pgstat: expose the full osd_stat map to remove a get_pg_map() call

Signed-off-by: Greg Farnum <gfarnum@redhat.com>
8 years agomon: subclass PGStatService into PGMapStatService
Greg Farnum [Fri, 5 May 2017 20:48:02 +0000 (13:48 -0700)]
mon: subclass PGStatService into PGMapStatService

Here we begin moving chunks into more appropriate locations.

Signed-off-by: Greg Farnum <gfarnum@redhat.com>
8 years agomon: give PGStatService a reweight_by_utilization indirection
Greg Farnum [Fri, 5 May 2017 04:49:17 +0000 (21:49 -0700)]
mon: give PGStatService a reweight_by_utilization indirection

Signed-off-by: Greg Farnum <gfarnum@redhat.com>
8 years agomon: give PGStatService a process_pg_command indirection
Greg Farnum [Fri, 5 May 2017 04:42:24 +0000 (21:42 -0700)]
mon: give PGStatService a process_pg_command indirection

Signed-off-by: Greg Farnum <gfarnum@redhat.com>
8 years agomon: use a pointer to PGStatService instead of putting it in Monitor
Greg Farnum [Wed, 15 Mar 2017 21:33:33 +0000 (14:33 -0700)]
mon: use a pointer to PGStatService instead of putting it in Monitor

Signed-off-by: Greg Farnum <gfarnum@redhat.com>
8 years agomon: kill direct references to pgmon from OSDMonitor
Greg Farnum [Thu, 4 May 2017 19:45:25 +0000 (12:45 -0700)]
mon: kill direct references to pgmon from OSDMonitor

The only one left now is where the OSDMonitor triggers
PGMonitor::check_osd_map() and that's going to die post-Luminous,
so no need to do anything fancy with it.

Signed-off-by: Greg Farnum <gfarnum@redhat.com>
8 years agomon: get the OSDMonitor's pg info dump functions away from using PGMap
Greg Farnum [Wed, 15 Mar 2017 20:47:39 +0000 (13:47 -0700)]
mon: get the OSDMonitor's pg info dump functions away from using PGMap

Signed-off-by: Greg Farnum <gfarnum@redhat.com>
8 years agomon: stop dereferencing pg_map for object stats in OSDMonitor
Greg Farnum [Wed, 15 Mar 2017 00:46:48 +0000 (17:46 -0700)]
mon: stop dereferencing pg_map for object stats in OSDMonitor

Signed-off-by: Greg Farnum <gfarnum@redhat.com>
8 years agomon: yet more OSDMonitor dep-pgmap-ification
Greg Farnum [Wed, 15 Mar 2017 00:18:36 +0000 (17:18 -0700)]
mon: yet more OSDMonitor dep-pgmap-ification

Signed-off-by: Greg Farnum <gfarnum@redhat.com>
8 years agomon: more OSDMonitor de-pgmap-ification
Greg Farnum [Tue, 14 Mar 2017 23:29:27 +0000 (16:29 -0700)]
mon: more OSDMonitor de-pgmap-ification

Signed-off-by: Greg Farnum <gfarnum@redhat.com>
8 years agomon: OSDMonitor starting to abstract PGMap via PGService
Greg Farnum [Fri, 17 Mar 2017 22:42:38 +0000 (15:42 -0700)]
mon: OSDMonitor starting to abstract PGMap via PGService

We added an unfortunate get_pg_map() function but it's still easy
to find and puts off some of the logic work. We'll get to it soon.

Signed-off-by: Greg Farnum <gfarnum@redhat.com>
8 years agomon: FSCommands gets pool stats via PGService
Greg Farnum [Fri, 17 Mar 2017 22:41:14 +0000 (15:41 -0700)]
mon: FSCommands gets pool stats via PGService

Signed-off-by: Greg Farnum <gfarnum@redhat.com>
8 years agomon: FSCommands gets pool stats via PGService
Greg Farnum [Tue, 14 Mar 2017 23:11:04 +0000 (16:11 -0700)]
mon: FSCommands gets pool stats via PGService

Signed-off-by: Greg Farnum <gfarnum@redhat.com>
8 years agomon: outline a PGStatService to replace raw PGMap calls
Greg Farnum [Tue, 14 Mar 2017 22:43:08 +0000 (15:43 -0700)]
mon: outline a PGStatService to replace raw PGMap calls

Right now, this is a quick hack that derives from PGMap. Soon, it will
be more interesting.

Signed-off-by: Greg Farnum <gfarnum@redhat.com>
8 years agomon: mgr: send a pgmap in reports
Greg Farnum [Sat, 11 Mar 2017 03:09:22 +0000 (19:09 -0800)]
mon: mgr: send a pgmap in reports

This definitely isn't appropriate for long term but is a quick route to testing

Signed-off-by: Greg Farnum <gfarnum@redhat.com>
8 years agomon: route manager reports down to the MgrMon
Greg Farnum [Sat, 11 Mar 2017 02:25:13 +0000 (18:25 -0800)]
mon: route manager reports down to the MgrMon

Signed-off-by: Greg Farnum <gfarnum@redhat.com>
8 years agomgr: introduce tick() calls through the system
Greg Farnum [Sat, 11 Mar 2017 02:48:47 +0000 (18:48 -0800)]
mgr: introduce tick() calls through the system

Still empty for the moment

Signed-off-by: Greg Farnum <gfarnum@redhat.com>
8 years agomgr: create a skeleton MMonMgrReport message type
Greg Farnum [Sat, 11 Mar 2017 02:21:17 +0000 (18:21 -0800)]
mgr: create a skeleton MMonMgrReport message type

We'll use this for sending data to the monitor at tick intervals.

Signed-off-by: Greg Farnum <gfarnum@redhat.com>
8 years agomgr: switch from send_beacon() to tick()
Greg Farnum [Fri, 10 Mar 2017 23:02:50 +0000 (15:02 -0800)]
mgr: switch from send_beacon() to tick()

We are about to want similar time-based stuff in our other
classes and it's simplest to coalesce them into a single wakeup.

Signed-off-by: Greg Farnum <gfarnum@redhat.com>
8 years agoMonClient: support "passthrough" of MonMap messages so other Dispatchers can see...
Greg Farnum [Tue, 7 Mar 2017 23:30:55 +0000 (15:30 -0800)]
MonClient: support "passthrough" of MonMap messages so other Dispatchers can see them

Use this in the Manager so it can notify of new monitor maps.

Signed-off-by: Greg Farnum <gfarnum@redhat.com>
8 years agomon/MgrMap: prefix summary with epoch; add comma
Sage Weil [Tue, 16 May 2017 22:40:08 +0000 (18:40 -0400)]
mon/MgrMap: prefix summary with epoch; add comma

This matches the others now:

    cluster 0d553373-5de6-4d90-bc60-cfd6f6554631
     health HEALTH_OK
     monmap e2: 1 mons, quorum a
      fsmap e2: 0/0/1 up
        mgr e3: active: x(starting), standbys: y
     osdmap e5: 1 osds: 0 up, 0 in
      pgmap v6: 24 pgs, 3 pools, 0 bytes data, 0 objects
            0 kB used, 0 kB / 0 kB avail
            100.000% pgs inactive
                  24 creating

Signed-off-by: Sage Weil <sage@redhat.com>
8 years agoMerge pull request #15427 from tchaikov/wip-vstart-osd-id
Sage Weil [Fri, 2 Jun 2017 15:34:45 +0000 (10:34 -0500)]
Merge pull request #15427 from tchaikov/wip-vstart-osd-id

vstart: print "start osd.$id" instead of "start osd$id"

Reviewed-by: Sage Weil <sage@redhat.com>
8 years agoMerge pull request #15217 from badone/wip-async-sleep-timer-fix
Sage Weil [Fri, 2 Jun 2017 15:32:15 +0000 (10:32 -0500)]
Merge pull request #15217 from badone/wip-async-sleep-timer-fix

osd: Move scrub sleep timer to osdservice

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
8 years agoMerge pull request #15396 from jcsp/wip-ceph-status
Sage Weil [Fri, 2 Jun 2017 15:30:55 +0000 (10:30 -0500)]
Merge pull request #15396 from jcsp/wip-ceph-status

mon: revise "ceph status" output

Reviewed-by: Sage Weil <sage@redhat.com>
8 years agoMerge pull request #15011 from xiexingguo/wip-crush-tool
Sage Weil [Fri, 2 Jun 2017 15:20:44 +0000 (10:20 -0500)]
Merge pull request #15011 from xiexingguo/wip-crush-tool

tools/crushtool: replicated-rule API support

Reviewed-by: Sage Weil <sage@redhat.com>
8 years agoMerge pull request #15176 from SUSE/wip-mgr-fix-help
Sage Weil [Fri, 2 Jun 2017 15:20:27 +0000 (10:20 -0500)]
Merge pull request #15176 from SUSE/wip-mgr-fix-help

mgr,osd:  ceph-mgr --help, unify usage text of other daemons

Reviewed-by: Kefu Chai <kchai@redhat.com>
8 years agoMerge pull request #15395 from liewegas/wip-log-entity
Sage Weil [Fri, 2 Jun 2017 15:19:58 +0000 (10:19 -0500)]
Merge pull request #15395 from liewegas/wip-log-entity

common/LogEntry: include EntityName in log entries

Reviewed-by: Kefu Chai <kchai@redhat.com>
8 years agoMerge pull request #15398 from liewegas/wip-bluestore-leak
Sage Weil [Fri, 2 Jun 2017 15:19:26 +0000 (10:19 -0500)]
Merge pull request #15398 from liewegas/wip-bluestore-leak

os/bluestore: fix buffers pinned by indefinitely deferred writes

Reviewed-by: Igor Fedotov <ifedotov@mirantis.com>
8 years agoMerge pull request #15402 from liewegas/wip-bluestore-mempools
Sage Weil [Fri, 2 Jun 2017 15:19:03 +0000 (10:19 -0500)]
Merge pull request #15402 from liewegas/wip-bluestore-mempools

os/bluestore: improve mempool usage

Reviewed-by: Igor Fedotov <ifedotov@mirantis.com>
8 years agoMerge pull request #15403 from liewegas/wip-mempool-dump
Sage Weil [Fri, 2 Jun 2017 15:18:38 +0000 (10:18 -0500)]
Merge pull request #15403 from liewegas/wip-mempool-dump

mempool: improve dump; fix buffer accounting bugs

Reviewed-by: Kefu Chai <kchai@redhat.com>
8 years agoMerge pull request #15431 from rzarzynski/wip-rgw-vim-modeline-for-orhpantool
Casey Bodley [Fri, 2 Jun 2017 14:05:17 +0000 (10:05 -0400)]
Merge pull request #15431 from rzarzynski/wip-rgw-vim-modeline-for-orhpantool

rgw: add the Vim's modeline into rgw_orphan.cc.

Reviewed-by: Casey Bodley <cbodley@redhat.com>
8 years agoMerge pull request #15425 from yaozongyou/fix-build-error
Kefu Chai [Fri, 2 Jun 2017 13:56:03 +0000 (21:56 +0800)]
Merge pull request #15425 from yaozongyou/fix-build-error

cmake: link against fcgi only if enabled

Reviewed-by: Casey Bodley <cbodley@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
8 years agorgw: add the Vim's modeline into rgw_orphan.cc. 15431/head
Radoslaw Zarzynski [Fri, 2 Jun 2017 12:03:44 +0000 (14:03 +0200)]
rgw: add the Vim's modeline into rgw_orphan.cc.

Signed-off-by: Radoslaw Zarzynski <rzarzynski@mirantis.com>
8 years agovstart: print "start osd.$id" instead of "start osd$id" 15427/head
Kefu Chai [Fri, 2 Jun 2017 07:10:38 +0000 (15:10 +0800)]
vstart: print "start osd.$id" instead of "start osd$id"

"osd.9" is more consistent with other places where an osd is referenced.

Signed-off-by: Kefu Chai <kchai@redhat.com>
8 years agoMerge pull request #15408 from yonghengdexin735/wip-zzz-add_const
Jos Collin [Fri, 2 Jun 2017 05:41:58 +0000 (11:11 +0530)]
Merge pull request #15408 from yonghengdexin735/wip-zzz-add_const

include/lru.h: add const to member functions

Reviewed-by: Jos Collin <jcollin@redhat.com>
8 years agoFix cmake build error. 15425/head
Yao Zongyou [Fri, 2 Jun 2017 04:11:59 +0000 (12:11 +0800)]
Fix cmake build error.

Signed-off-by: Yao Zongyou <yaozongyou@vip.qq.com>
8 years agoMerge pull request #15420 from yuriw/wip_remove_default_idle_timeout
Sage Weil [Fri, 2 Jun 2017 03:08:31 +0000 (22:08 -0500)]
Merge pull request #15420 from yuriw/wip_remove_default_idle_timeout

qa: Removed all 'default_idle_timeout' due to chnage in rwg task

8 years agoMerge pull request #15397 from dzafman/wip-20089
Sage Weil [Fri, 2 Jun 2017 02:40:29 +0000 (21:40 -0500)]
Merge pull request #15397 from dzafman/wip-20089

osd: Object level shard errors are tracked and used if no auth available

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
8 years agoqa/workunits/cephtool/test.sh: adjust watch test 15395/head
Sage Weil [Fri, 2 Jun 2017 02:22:24 +0000 (22:22 -0400)]
qa/workunits/cephtool/test.sh: adjust watch test

Signed-off-by: Sage Weil <sage@redhat.com>
8 years agoMerge pull request #15417 from smithfarm/wip-cond-epoch-2
Sage Weil [Fri, 2 Jun 2017 02:14:13 +0000 (21:14 -0500)]
Merge pull request #15417 from smithfarm/wip-cond-epoch-2

build/ops: rpm: move _epoch_prefix below Epoch definition

8 years agoinclude/lru: add const to member function 15408/head
yonghengdexin735 [Thu, 1 Jun 2017 08:20:55 +0000 (16:20 +0800)]
include/lru: add const to member function

Signed-off-by: yonghengdexin735 <zhang.zezhu@zte.com.cn>
8 years agoRemoved all 'default_idle_timeout' due to chnage in rwg task 15420/head
Yuri Weinstein [Thu, 1 Jun 2017 21:01:30 +0000 (14:01 -0700)]
Removed all 'default_idle_timeout' due to chnage in rwg task
https://github.com/ceph/ceph/commit/8c74c8a639cd3dead52e1942b36f6eb3f1ceab2c#diff-995b04809fcabacc3e3ecfaea903a41aL539

Signed-off-by: Yuri Weinstein <yweinste@redhat.com>
8 years agobuild/ops: rpm: move _epoch_prefix below Epoch definition 15417/head
Nathan Cutler [Thu, 1 Jun 2017 19:37:09 +0000 (21:37 +0200)]
build/ops: rpm: move _epoch_prefix below Epoch definition

Signed-off-by: Nathan Cutler <ncutler@suse.com>
8 years agoMerge pull request #15400 from yehudasa/wip-20128
Sage Weil [Thu, 1 Jun 2017 19:22:39 +0000 (14:22 -0500)]
Merge pull request #15400 from yehudasa/wip-20128

qa/rgw_snaps: move default_idle_timeout config under the client

8 years agoosd: Object level shard errors are tracked and used if no auth available 15397/head
David Zafman [Wed, 31 May 2017 22:39:19 +0000 (15:39 -0700)]
osd: Object level shard errors are tracked and used if no auth available

Shards with object mismatch are tracked to mark them inconsistent
Fix test because storing omap_digest in object_info not behaving as before

Fixes: http://tracker.ceph.com/issues/20089
Signed-off-by: David Zafman <dzafman@redhat.com>
8 years agoosd-scrub-repair: Fix broken test and correctly handle ec overwrite testing
David Zafman [Thu, 1 Jun 2017 03:53:28 +0000 (20:53 -0700)]
osd-scrub-repair: Fix broken test and correctly handle ec overwrite testing

Caused by: 3ca750d41dfe33c6efea4abc96d2bd426a9742b9

Signed-off-by: David Zafman <dzafman@redhat.com>
8 years agoMerge pull request #15212 from neha-ojha/wip-fix-recovery-sleep-configurable
Sage Weil [Thu, 1 Jun 2017 16:54:58 +0000 (11:54 -0500)]
Merge pull request #15212 from neha-ojha/wip-fix-recovery-sleep-configurable

osd: Implement asynchronous recovery sleep

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
8 years agoMerge pull request #15262 from Adirl/revert_cm
Sage Weil [Thu, 1 Jun 2017 16:54:33 +0000 (11:54 -0500)]
Merge pull request #15262 from Adirl/revert_cm

msg/async: Revert RDMA-CM

Reviewed-by: Haomai Wang <haomai@xsky.com>
8 years agoMerge pull request #15307 from ovh/bp-64bit-mem-is-zero
Sage Weil [Thu, 1 Jun 2017 16:54:19 +0000 (11:54 -0500)]
Merge pull request #15307 from ovh/bp-64bit-mem-is-zero

inline_memory: optimized mem_is_zero for non-x64

Reviewed-by: Sage Weil <sage@redhat.com>
8 years agoMerge pull request #15340 from wjwithagen/wip-wjw-libcommon
Sage Weil [Thu, 1 Jun 2017 16:53:54 +0000 (11:53 -0500)]
Merge pull request #15340 from wjwithagen/wip-wjw-libcommon

cmake: do not link libcommon against some libs

Reviewed-by: Kefu Chai <kchai@redhat.com>
8 years agoMerge pull request #15342 from chardan/jfw-wip-add_VLA_warning
Sage Weil [Thu, 1 Jun 2017 16:53:32 +0000 (11:53 -0500)]
Merge pull request #15342 from chardan/jfw-wip-add_VLA_warning

build: Adds C++ warning flag for C Variable-Length Arrays.

Reviewed-by: Sage Weil <sage@redhat.com>
8 years agoMerge pull request #15364 from joscollin/wip-cleanup-putto-operator-const
Sage Weil [Thu, 1 Jun 2017 16:52:57 +0000 (11:52 -0500)]
Merge pull request #15364 from joscollin/wip-cleanup-putto-operator-const

src: put-to operator function - const input cleanup

Reviewed-by: Greg Farnum <gfarnum@redhat.com>
8 years agoMerge pull request #15372 from ganeshmaharaj/reuse-isal
Sage Weil [Thu, 1 Jun 2017 16:52:40 +0000 (11:52 -0500)]
Merge pull request #15372 from ganeshmaharaj/reuse-isal

erasure-code: Remove duplicate of isa-l files

Reviewed-by: Loic Dachary <ldachary@redhat.com>
8 years agoos/bluestore: release aios and pinned buffers on io complete 15398/head
Sage Weil [Wed, 31 May 2017 22:44:02 +0000 (18:44 -0400)]
os/bluestore: release aios and pinned buffers on io complete

Once we're done with our IO, clear the aio list so that the pinned buffers
are unpinned.  This ensures we release memory quickly, even if the
TransContext sticks around for a while (e.g., in the osr q).

Signed-off-by: Sage Weil <sage@redhat.com>
8 years agoos/bluestore: submit deferred if txc cleanup is blocked
Sage Weil [Wed, 31 May 2017 22:38:36 +0000 (18:38 -0400)]
os/bluestore: submit deferred if txc cleanup is blocked

If we have a single deferred write, and then a uniform workload with *no*
deferred writes, we will never actually submit it.  Meanwhile, the txc is
stuck on the osr q and nothing ever gets retired.

Simple fix is to submit any deferred ops if the osr queue is blocked by
a queued deferred write and the osr queue length is above some
threshold.  This prevents memory from being pinned indefinitely.

Signed-off-by: Sage Weil <sage@redhat.com>
8 years agoMerge pull request #15209 from liewegas/wip-sortbitwise-notes 15644/head
Sage Weil [Thu, 1 Jun 2017 16:26:06 +0000 (11:26 -0500)]
Merge pull request #15209 from liewegas/wip-sortbitwise-notes

doc/release-notes: update which jewel version does sortbitwise warning

8 years agoMerge pull request #15274 from liewegas/wip-auto-ccache
Sage Weil [Thu, 1 Jun 2017 16:25:36 +0000 (11:25 -0500)]
Merge pull request #15274 from liewegas/wip-auto-ccache

do_cmake.sh: enable ccache if installed

Reviewed-by: Kefu Chai <kchai@redhat.com>
8 years agodo_cmake.sh: enable ccache if installed 15274/head
Sage Weil [Thu, 1 Jun 2017 16:25:11 +0000 (12:25 -0400)]
do_cmake.sh: enable ccache if installed

Signed-off-by: Sage Weil <sage@redhat.com>
8 years agoMerge pull request #15391 from liewegas/wip-authors
Sage Weil [Thu, 1 Jun 2017 15:15:30 +0000 (10:15 -0500)]
Merge pull request #15391 from liewegas/wip-authors

AUTHORS: update with release manager, backport team

Reviewed-by: Loic Dachary <ldachary@redhat.com>
8 years agoMerge pull request #15410 from dachary/wip-19941-ceph-disk
Loic Dachary [Thu, 1 Jun 2017 14:31:38 +0000 (16:31 +0200)]
Merge pull request #15410 from dachary/wip-19941-ceph-disk

ceph-disk: do not setup_statedir on trigger

Reviewed-by: David Disseldorp <ddiss@suse.de>
Reviewed-by: Kefu Chai <kchai@redhat.com>
8 years agoMerge pull request #15412 from dachary/wip-choose-args
Kefu Chai [Thu, 1 Jun 2017 12:57:25 +0000 (20:57 +0800)]
Merge pull request #15412 from dachary/wip-choose-args

crush: add missing tunable in tests

Reviewed-by: Kefu Chai <kchai@redhat.com>
8 years agocrush: add missing tunable in tests 15412/head
Loic Dachary [Thu, 1 Jun 2017 11:50:51 +0000 (13:50 +0200)]
crush: add missing tunable in tests

Signed-off-by: Loic Dachary <loic@dachary.org>
8 years agoMerge pull request #15286 from smithfarm/wip-cond-epoch
Kefu Chai [Thu, 1 Jun 2017 11:41:41 +0000 (19:41 +0800)]
Merge pull request #15286 from smithfarm/wip-cond-epoch

build/ops: rpm: apply epoch only if %epoch macro is defined

Reviewed-by: Kefu Chai <kchai@redhat.com>
8 years agoMerge pull request #15240 from ukernel/wip-20055
John Spray [Thu, 1 Jun 2017 10:33:51 +0000 (11:33 +0100)]
Merge pull request #15240 from ukernel/wip-20055

osdc/Journaler: avoid executing on_safe contexts prematurely

Reviewed-by: Greg Farnum <gfarnum@redhat.com>
8 years agoMerge pull request #15282 from david-z/wip-fix-mantle
John Spray [Thu, 1 Jun 2017 10:28:46 +0000 (11:28 +0100)]
Merge pull request #15282 from david-z/wip-fix-mantle

mds: Pass empty string to clear mantle balancer

Reviewed-by: John Spray <john.spray@redhat.com>
8 years agoMerge pull request #15314 from renhwztetecs/renhw-wip-client-cleanup
John Spray [Thu, 1 Jun 2017 10:25:44 +0000 (11:25 +0100)]
Merge pull request #15314 from renhwztetecs/renhw-wip-client-cleanup

client: fix display ino in the ldout

Reviewed-by: Yan, Zheng <zyan@redhat.com>
8 years agoMerge pull request #15300 from ukernel/wip-20083
John Spray [Thu, 1 Jun 2017 10:24:09 +0000 (11:24 +0100)]
Merge pull request #15300 from ukernel/wip-20083

mds: properly create aux subtrees for pinned directory

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
8 years agoMerge pull request #15278 from viCEnTECheNg/wip-data-pools-type
John Spray [Thu, 1 Jun 2017 10:23:33 +0000 (11:23 +0100)]
Merge pull request #15278 from viCEnTECheNg/wip-data-pools-type

mds: change the type of data_pools

Reviewed-by: Yan, Zheng <zyan@redhat.com>
Reviewed-by: John Spray <john.spray@redhat.com>
8 years agoMerge pull request #15205 from batrick/i20039
John Spray [Thu, 1 Jun 2017 10:23:02 +0000 (11:23 +0100)]
Merge pull request #15205 from batrick/i20039

mds: check export pin during replay

Reviewed-by: Yan, Zheng <zyan@redhat.com>
8 years agoceph-disk: do not setup_statedir on trigger 15410/head
Loic Dachary [Thu, 1 Jun 2017 09:37:20 +0000 (11:37 +0200)]
ceph-disk: do not setup_statedir on trigger

trigger may run when statedir is unavailable and does not use it.

Fixes: http://tracker.ceph.com/issues/19941
Signed-off-by: Loic Dachary <loic@dachary.org>
8 years agoMerge pull request #15406 from tchaikov/wip-setuptools-vendors-six-or-not
Kefu Chai [Thu, 1 Jun 2017 07:17:15 +0000 (15:17 +0800)]
Merge pull request #15406 from tchaikov/wip-setuptools-vendors-six-or-not

install-deps.sh: workaround setuptools' dependency on six

Reviewed-by: Brad Hubbard <bhubbard@redhat.com>
8 years agoinstall-deps.sh: workaround setuptools' dependency on six 15406/head
Kefu Chai [Thu, 1 Jun 2017 06:05:07 +0000 (14:05 +0800)]
install-deps.sh: workaround setuptools' dependency on six

see also https://github.com/pypa/setuptools/issues/1042

Signed-off-by: Kefu Chai <kchai@redhat.com>
8 years agoos/bluestore: mempools for writing and writing_deferred 15402/head
Sage Weil [Thu, 1 Jun 2017 02:50:04 +0000 (22:50 -0400)]
os/bluestore: mempools for writing and writing_deferred

Signed-off-by: Sage Weil <sage@redhat.com>
8 years agoos/bluestore: bluestore_txc mempool
Sage Weil [Thu, 1 Jun 2017 02:45:11 +0000 (22:45 -0400)]
os/bluestore: bluestore_txc mempool

Signed-off-by: Sage Weil <sage@redhat.com>
8 years agoos/bluestore: rename cache mempools to bluestore_cache_*
Sage Weil [Thu, 1 Jun 2017 02:43:17 +0000 (22:43 -0400)]
os/bluestore: rename cache mempools to bluestore_cache_*

These map directly onto the bluestore_cache_size setting.

Signed-off-by: Sage Weil <sage@redhat.com>
8 years agoos/bluestore: maybe_rebuild before adding to cache too
Sage Weil [Wed, 31 May 2017 19:41:33 +0000 (15:41 -0400)]
os/bluestore: maybe_rebuild before adding to cache too

Signed-off-by: Sage Weil <sage@redhat.com>
8 years agoAUTHORS: update with release manager, backport team 15391/head
Sage Weil [Thu, 1 Jun 2017 02:32:13 +0000 (22:32 -0400)]
AUTHORS: update with release manager, backport team

Signed-off-by: Sage Weil <sage@redhat.com>
8 years agoMerge pull request #15370 from liewegas/wip-jewel-tunables
Sage Weil [Thu, 1 Jun 2017 02:26:17 +0000 (21:26 -0500)]
Merge pull request #15370 from liewegas/wip-jewel-tunables

crush, mon: make jewel the lower bound for client/crush compat for new clusters

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
8 years agotest/cli/osdmaptool/: fix tests 15370/head
Sage Weil [Thu, 1 Jun 2017 02:25:26 +0000 (22:25 -0400)]
test/cli/osdmaptool/: fix tests

CRUSH tunables now default to jewel; outputs vary and
upmap results are a bit different.

Signed-off-by: Sage Weil <sage@redhat.com>
8 years agobuffer: fix some append_buffer vs mempool assignment; add tests 15403/head
Sage Weil [Thu, 1 Jun 2017 02:19:51 +0000 (22:19 -0400)]
buffer: fix some append_buffer vs mempool assignment; add tests

Signed-off-by: Sage Weil <sage@redhat.com>
8 years agomempool: make dump more concise
Sage Weil [Wed, 31 May 2017 20:53:33 +0000 (16:53 -0400)]
mempool: make dump more concise

Signed-off-by: Sage Weil <sage@redhat.com>
8 years agotest/cli/crushtool: adjust tests
Sage Weil [Wed, 31 May 2017 13:44:27 +0000 (09:44 -0400)]
test/cli/crushtool: adjust tests

Specify chooseleaf_stable for --build tests to match prior output.

Signed-off-by: Sage Weil <sage@redhat.com>
8 years agomon: set mon_osd_initial_require_min_compat_client = jewel
Sage Weil [Tue, 30 May 2017 17:55:18 +0000 (13:55 -0400)]
mon: set mon_osd_initial_require_min_compat_client = jewel

IMO a jewel lower bound is reasonable for new clusters.

Signed-off-by: Sage Weil <sage@redhat.com>
8 years agocrush: set default tunables to jewel
Sage Weil [Tue, 30 May 2017 17:54:16 +0000 (13:54 -0400)]
crush: set default tunables to jewel

For new clusters.

This is the last "disruptive" tunable change we've made (where adjusting/
fixing it requires lots of data movement).  For new clusters a lower bound
of jewel seems pretty reasonable, and this has been upstream in Linux
for a while now.

Signed-off-by: Sage Weil <sage@redhat.com>
8 years agoMerge pull request #15267 from joscollin/wip-cleanup-redundant-headers-5
Brad Hubbard [Thu, 1 Jun 2017 00:39:15 +0000 (10:39 +1000)]
Merge pull request #15267 from joscollin/wip-cleanup-redundant-headers-5

common: Remove redundant includes - 5

Reviewed-by: Willem Jan Withagen <wjw@digiware.nl>