]> git.apps.os.sepia.ceph.com Git - ceph.git/log
ceph.git
8 years agobuild: Use .S suffix for ppc64le assembly files 15373/head
Andrew Solomon [Tue, 30 May 2017 17:39:34 +0000 (17:39 +0000)]
build: Use .S suffix for ppc64le assembly files

The assembly file name suffix was changed from .S to .s,
which caused a build break on ppc64le architecture.

To fix this issue, the suffix will be changed back to .S
for ppc64le assembly files only.  The x86 assembly files
can retain the .s suffix.

Fixes: http://tracker.ceph.com/issues/20106
Signed-off-by: Andrew Solomon <asolomon@us.ibm.com>
8 years agoMerge pull request #15359 from liewegas/wip-kraken-x
Sage Weil [Tue, 30 May 2017 14:38:31 +0000 (09:38 -0500)]
Merge pull request #15359 from liewegas/wip-kraken-x

qa/suites/upgrade/kraken-x: enable experimental for bluestore

Reviewed-by: Kefu Chai <kchai@redhat.com>
8 years agoMerge pull request #15306 from mikulely/fix-test_multi
Casey Bodley [Tue, 30 May 2017 13:46:28 +0000 (09:46 -0400)]
Merge pull request #15306 from mikulely/fix-test_multi

rgw: fix test_multi.py default config file path

Reviewed-by: Casey Bodley <cbodley@redhat.com>
8 years agoqa/suites/upgrade/kraken-x: enable experimental for bluestore 15359/head
Sage Weil [Tue, 30 May 2017 13:28:13 +0000 (09:28 -0400)]
qa/suites/upgrade/kraken-x: enable experimental for bluestore

Signed-off-by: Sage Weil <sage@redhat.com>
8 years agoMerge pull request #15294 from liewegas/wip-osd-tree
Sage Weil [Tue, 30 May 2017 13:22:35 +0000 (08:22 -0500)]
Merge pull request #15294 from liewegas/wip-osd-tree

osd: 'osd tree in|out|up|down' to filter tree results

Reviewed-by: Kefu Chai <kchai@redhat.com>
8 years agoMerge pull request #15225 from smithfarm/wip-s390-rgw
Kefu Chai [Tue, 30 May 2017 12:39:12 +0000 (20:39 +0800)]
Merge pull request #15225 from smithfarm/wip-s390-rgw

build/ops: conditionalize rgw Beast frontend so it isn't built on s390x architecture

Reviewed-by: Willem Jan Withagen <wjw@digiware.nl>
Reviewed-by: Kefu Chai <kchai@redhat.com>
8 years agomon: add up|down|in|out filters to 'osd tree' 15294/head
Sage Weil [Tue, 30 May 2017 12:21:16 +0000 (08:21 -0400)]
mon: add up|down|in|out filters to 'osd tree'

For example, 'ceph osd tree down' will show *just* down OSDs and their
ancestors.  \o/

Signed-off-by: Sage Weil <sage@redhat.com>
8 years agocmake: link radosgw with boost libraries 15225/head
Nathan Cutler [Mon, 29 May 2017 22:37:00 +0000 (00:37 +0200)]
cmake: link radosgw with boost libraries

Signed-off-by: Nathan Cutler <ncutler@suse.com>
8 years agoMerge pull request #15355 from joscollin/wip-cleanup-testdenc-warning
Kefu Chai [Tue, 30 May 2017 04:28:12 +0000 (12:28 +0800)]
Merge pull request #15355 from joscollin/wip-cleanup-testdenc-warning

test: test_denc.cc: silence warning from -Wsign-compare

Reviewed-by: Kefu Chai <kchai@redhat.com>
8 years agotest: test_denc.cc: silence warning from -Wsign-compare 15355/head
Jos Collin [Tue, 30 May 2017 03:05:40 +0000 (08:35 +0530)]
test: test_denc.cc: silence warning from -Wsign-compare

The following warning appears during make:
ceph/src/test/test_denc.cc:669:5:   required from here
ceph/src/googletest/googletest/include/gtest/gtest.h:1530:28: warning: comparison between signed and unsigned integer expressions [-Wsign-compare]
ceph/src/googletest/googletest/include/gtest/gtest.h:1510:7:
   if (val1 op val2) {\

Signed-off-by: Jos Collin <jcollin@redhat.com>
8 years agoMerge pull request #15058 from yuyuyu101/wip-rocksdb-opt
Sage Weil [Tue, 30 May 2017 01:47:52 +0000 (20:47 -0500)]
Merge pull request #15058 from yuyuyu101/wip-rocksdb-opt

kv/rocksdb: supports SliceParts interface

Reviewed-by: Sage Weil <sage@redhat.com>
8 years agoMerge pull request #15068 from liewegas/wip-osdmap-require
Sage Weil [Tue, 30 May 2017 01:47:06 +0000 (20:47 -0500)]
Merge pull request #15068 from liewegas/wip-osdmap-require

osd/OSDMap: replace require_*_osds flags with a single require_osd_release field

Reviewed-by: Kefu Chai <kchai@redhat.com>
8 years agoMerge pull request #15313 from Linbing/wip-pg-scrub-code-optimize
Sage Weil [Tue, 30 May 2017 01:42:50 +0000 (20:42 -0500)]
Merge pull request #15313 from Linbing/wip-pg-scrub-code-optimize

mon: it's no need to get pg action_primary osd twice in pg scrub

Reviewed-by: Kefu Chai <kchai@redhat.com>
8 years agomon/OSDMonitor: fix osd metadata update ordering 15068/head
Sage Weil [Mon, 15 May 2017 13:34:11 +0000 (09:34 -0400)]
mon/OSDMonitor: fix osd metadata update ordering

Do not do both.

Signed-off-by: Sage Weil <sage@redhat.com>
8 years agoosd: replace all require_*_osds flag checks with a require_osd_release comparison
Sage Weil [Fri, 12 May 2017 15:43:16 +0000 (11:43 -0400)]
osd: replace all require_*_osds flag checks with a require_osd_release comparison

Signed-off-by: Sage Weil <sage@redhat.com>
8 years agoosd: replace require_*_osds flags with require_osd_release field
Sage Weil [Fri, 12 May 2017 15:42:52 +0000 (11:42 -0400)]
osd: replace require_*_osds flags with require_osd_release field

- OSDMap encode and decode translate between the flags and int
representations.
- OSDMap::Incremental only does decode; we do not expect to ever encode
an incremental osdmap for an old osd that sets any of these flags.
- the 'osd set' command still lets you set the jewel and kraken flags,
but not luminous.
- OSDMap::apply_incremental handles the conversion of legacy require flags
to the new field if the jewel or kraken flags have to be set before
starting the osd upgrade.
- clear out the legacy flags when we make the luminous transition only;
until then we keep using the old flag in the encoded and decoded version
(although the require_osd_release field will be accurate in memory in all
cases).

Signed-off-by: Sage Weil <sage@redhat.com>
8 years agomon: new 'osd require-osd-release' command
Sage Weil [Fri, 12 May 2017 15:31:41 +0000 (11:31 -0400)]
mon: new 'osd require-osd-release' command

Note that we only allow setting this to 'luminous'.  If the 'jewel' or 'kraken'
flags need to be set that can be done through the legacy interface.

Signed-off-by: Sage Weil <sage@redhat.com>
8 years agoosd/OSDMap: add require_osd_release numeric field, CEPH_RELEASE_*
Sage Weil [Fri, 12 May 2017 13:54:11 +0000 (09:54 -0400)]
osd/OSDMap: add require_osd_release numeric field, CEPH_RELEASE_*

Instead of eating up a flag for each release, which is super-awkward and
annoying, just keep a numeric release version min.

Signed-off-by: Sage Weil <sage@redhat.com>
8 years agocmake: delete excidentail reintroduced line.
Willem Jan Withagen [Sun, 28 May 2017 11:54:19 +0000 (13:54 +0200)]
cmake: delete excidentail reintroduced line.

- This target got reintroduced by accident after the creation
  of ceph-common in commit:
    https://github.com/ceph/ceph/commit/046b2bde6d93992c36d4943c4f7859993f034ca

  Detection was trigger by refering to libresolv, and results in a
  linking error.

Signed-off-by: Willem Jan Withagen <wjw@digiware.nl>
8 years agobuild/ops: deb: no rgw Beast frontend on s390x
Nathan Cutler [Fri, 26 May 2017 05:07:46 +0000 (07:07 +0200)]
build/ops: deb: no rgw Beast frontend on s390x

Signed-off-by: Kefu Chai <kchai@redhat.com>
Signed-off-by: Nathan Cutler <ncutler@suse.com>
8 years agobuild/ops: rpm: no rgw Beast frontend on s390x
Nathan Cutler [Wed, 24 May 2017 07:58:40 +0000 (09:58 +0200)]
build/ops: rpm: no rgw Beast frontend on s390x

Since the Beast frontend uses boost::context which is not supported on
s390x.

Signed-off-by: Nathan Cutler <ncutler@suse.com>
Signed-off-by: Kefu Chai <kchai@redhat.com>
8 years agobuild/ops: rpm: reverse s390 bcond conditional block
Nathan Cutler [Wed, 24 May 2017 07:54:47 +0000 (09:54 +0200)]
build/ops: rpm: reverse s390 bcond conditional block

I'm not a fan of "if NOT x - then - else" blocks.

Signed-off-by: Nathan Cutler <ncutler@suse.com>
8 years agocmake: build boost::context and coroutine only with rgw Beast frontend
Nathan Cutler [Tue, 23 May 2017 07:44:45 +0000 (09:44 +0200)]
cmake: build boost::context and coroutine only with rgw Beast frontend

boost::context is currently (1.63) unsupported for s390x and anyway
it makes sense to conditionalize Boost components so they are only
built with the Ceph components that need them (like is already being
done for mgr).

Fixes: http://tracker.ceph.com/issues/20048
Signed-off-by: Nathan Cutler <ncutler@suse.com>
Signed-off-by: Tim Serong <tserong@suse.com>
Signed-off-by: Casey Bodley <cbodley@redhat.com>
Signed-off-by: Kefu Chai <kchai@redhat.com>
8 years agoMerge pull request #15324 from yuyuyu101/wip-20093
Sage Weil [Mon, 29 May 2017 19:49:57 +0000 (14:49 -0500)]
Merge pull request #15324 from yuyuyu101/wip-20093

msg/async: avoid requeue racing with handle_write

Reviewed-by: Sage Weil <sage@redhat.com>
8 years agoMerge pull request #15325 from liewegas/wip-redirect
Sage Weil [Mon, 29 May 2017 19:48:33 +0000 (14:48 -0500)]
Merge pull request #15325 from liewegas/wip-redirect

osd,librados: add manifest, redirect

Reviewed-by: Sage Weil <sage@redhat.com>
Reviewed-by: Josh Durgin <jdurgin@redhat.com>
8 years agoMerge pull request #15326 from xiexingguo/fix-kvtool-tip
Sage Weil [Mon, 29 May 2017 19:48:10 +0000 (14:48 -0500)]
Merge pull request #15326 from xiexingguo/fix-kvtool-tip

tools/ceph_kvstore_tool: add "bluestore-kv" to usage

Reviewed-by: Sage Weil <sage@redhat.com>
8 years agoMerge pull request #15337 from wjwithagen/wip-wjw-freebsd-fix-includes
Sage Weil [Mon, 29 May 2017 19:47:50 +0000 (14:47 -0500)]
Merge pull request #15337 from wjwithagen/wip-wjw-freebsd-fix-includes

common: include: Redo some includes for FreeBSD

8 years agoMerge pull request #15338 from trociny/wip-get_process_name
Kefu Chai [Mon, 29 May 2017 12:55:30 +0000 (20:55 +0800)]
Merge pull request #15338 from trociny/wip-get_process_name

common: get_process_name: use getprogname on bsd systems

Reviewed-by: Kefu Chai <kchai@redhat.com>
Reviewed-by: Willem Jan Withagen <wjw@digiware.nl>
8 years agoMerge pull request #15345 from badone/wip-tracker-19900-wait_auth_rotating-crash-2
Brad Hubbard [Mon, 29 May 2017 08:25:36 +0000 (18:25 +1000)]
Merge pull request #15345 from badone/wip-tracker-19900-wait_auth_rotating-crash-2

osd: Return early on shutdown

Reviewed-by: Kefu Chai <kchai@redhat.com>
8 years agoosd: Return early on shutdown 15345/head
Brad Hubbard [Mon, 29 May 2017 00:58:39 +0000 (10:58 +1000)]
osd: Return early on shutdown

eb5c02d was missing a return statement, rectify that.

Fixes: http://tracker.ceph.com/issues/19900
Signed-off-by: Brad Hubbard <bhubbard@redhat.com>
8 years agoMerge pull request #15336 from wjwithagen/wjw-wip-iso_8601
Kefu Chai [Sun, 28 May 2017 16:44:46 +0000 (00:44 +0800)]
Merge pull request #15336 from wjwithagen/wjw-wip-iso_8601

common/iso_8601.cc: Make return expression Clang compatible

Reviewed-By: Adam C. Emerson <aemerson@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
8 years agoerasure-code/isa/ErasureCodePluginIsa.cc: fixup includes 15337/head
Willem Jan Withagen [Sat, 27 May 2017 18:43:12 +0000 (20:43 +0200)]
erasure-code/isa/ErasureCodePluginIsa.cc: fixup includes

 - Buffer.h is needed to prevent Clang seriously complaining
   about missing and wrong forward declarations of
ceph::buffer:ptr
   including buffer_fwd.h does not help.

Signed-off-by: Willem Jan Withagen <wjw@digiware.nl>
8 years agobuild/include: Redo som includes for FreeBSD
Willem Jan Withagen [Sat, 27 May 2017 18:31:48 +0000 (20:31 +0200)]
build/include: Redo som includes for FreeBSD

- During include cleanup just a too bit much was removed for FreeBSD
  to get things compiled.
  This redoes some of the includes.

Tracker: http://tracker.ceph.com/issues/19883
Signed-off-by: Willem Jan Withagen <wjw@digiware.nl>
8 years agoMerge pull request #15055 from mogeb/wip-with-instrument-functions
Kefu Chai [Sun, 28 May 2017 06:45:57 +0000 (14:45 +0800)]
Merge pull request #15055 from mogeb/wip-with-instrument-functions

cmake: Add -finstrument-functions flag to OSD code

Reviewed-by: Kefu Chai <kchai@redhat.com>
8 years agoMerge pull request #15319 from liewegas/wip-upmap
Sage Weil [Sun, 28 May 2017 03:17:14 +0000 (22:17 -0500)]
Merge pull request #15319 from liewegas/wip-upmap

mon,osd/OSDMap: a couple pg-upmap fixes

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
8 years agoMerge pull request #15292 from liewegas/wip-map-cache
Sage Weil [Sun, 28 May 2017 03:11:57 +0000 (22:11 -0500)]
Merge pull request #15292 from liewegas/wip-map-cache

osd: reduce map cache size

Reviewed-by: Kefu Chai <kchai@redhat.com>
Reviewed-by: Josh Durgin <jdurgin@redhat.com>
8 years agoMerge pull request #15296 from liewegas/wip-fix-at-end
Sage Weil [Sun, 28 May 2017 03:11:31 +0000 (22:11 -0500)]
Merge pull request #15296 from liewegas/wip-fix-at-end

qa/tasks/repair_test: unset flags we set

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
8 years agoMerge pull request #15297 from liewegas/wip-19595
Sage Weil [Sun, 28 May 2017 03:10:12 +0000 (22:10 -0500)]
Merge pull request #15297 from liewegas/wip-19595

mgr/MgrStandby: prevent use-after-free on just-shut-down Mgr

Reviewed-by: Kefu Chai <kchai@redhat.com>
8 years agoMerge pull request #14284 from tchaikov/wip-19439
Kefu Chai [Sun, 28 May 2017 02:38:26 +0000 (10:38 +0800)]
Merge pull request #14284 from tchaikov/wip-19439

qa/tasks/rebuild_mondb: grant "mgr:allow *" to client.admin

Reviewed-by: Sage Weil <sage@redhat.com>
8 years agoMerge pull request #15284 from majianpeng/bluestore-batch-throotle
Sage Weil [Sun, 28 May 2017 02:02:49 +0000 (21:02 -0500)]
Merge pull request #15284 from majianpeng/bluestore-batch-throotle

os/bluestore: batch throttle

Reviewed-by: Igor Fedotov <ifedotov@mirantis.com>
Reviewed-by: Sage Weil <sage@redhat.com>
8 years agoMerge pull request #15302 from xiexingguo/wip-fix-reg-leak
Sage Weil [Sun, 28 May 2017 02:01:52 +0000 (21:01 -0500)]
Merge pull request #15302 from xiexingguo/wip-fix-reg-leak

common/ceph_context: fix leak of registered commands on exit

Reviewed-by: Sage Weil <sage@redhat.com>
8 years agoMerge pull request #15320 from liewegas/wip-peon-mapping
Sage Weil [Sun, 28 May 2017 02:00:50 +0000 (21:00 -0500)]
Merge pull request #15320 from liewegas/wip-peon-mapping

mon/OSDMonitor: cancel mapping job from update_from_paxos

Reviewed-by: Kefu Chai <kchai@redhat.com>
8 years agoqa/tasks/rebuild_mondb: update to address ceph-mgr changes 14284/head
Kefu Chai [Sat, 27 May 2017 08:58:12 +0000 (16:58 +0800)]
qa/tasks/rebuild_mondb: update to address ceph-mgr changes

- revive ceph-mgr after updating the keyring cap
- grant "mgr:allow *" to client.admin
- minor refactors

Signed-off-by: Kefu Chai <kchai@redhat.com>
8 years agocommon: get_process_name: use getprogname on bsd systems 15338/head
Mykola Golub [Fri, 26 May 2017 20:32:33 +0000 (20:32 +0000)]
common: get_process_name: use getprogname on bsd systems

Signed-off-by: Mykola Golub <mgolub@mirantis.com>
8 years agocommon/iso_8601.cc: Make return expression Clang compatible 15336/head
Willem Jan Withagen [Sat, 27 May 2017 16:36:08 +0000 (18:36 +0200)]
common/iso_8601.cc: Make return expression Clang compatible

Signed-off-by: Willem Jan Withagen <wjw@digiware.nl>
8 years agotools/ceph_kvstore_tool: add "bluestore-kv" to usage 15326/head
xie xingguo [Sat, 27 May 2017 03:06:56 +0000 (11:06 +0800)]
tools/ceph_kvstore_tool: add "bluestore-kv" to usage

We are soon going to use BlueStore as the default OS, and
hence "bluestore-kv" shall be the preferred option.

By applying this patch, the help message shall be slightly
nicer to newcomers to this tool now.

Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
8 years agoceph_test_rados_api_tier: skip redirect tests if not luminous 15325/head
Sage Weil [Sat, 27 May 2017 03:01:26 +0000 (23:01 -0400)]
ceph_test_rados_api_tier: skip redirect tests if not luminous

Signed-off-by: Sage Weil <sage@redhat.com>
8 years agoMerge pull request #15111 from Liuchang0812/wip-19885-mgr-help
Kefu Chai [Sat, 27 May 2017 02:53:22 +0000 (10:53 +0800)]
Merge pull request #15111 from Liuchang0812/wip-19885-mgr-help

ceph: introduce "tell x help" subcommand

Reviewed-by: Kefu Chai <kchai@redhat.com>
8 years agoqa/suites/rados/thrash-luminous: redirects require luminous
Sage Weil [Sat, 27 May 2017 02:52:48 +0000 (22:52 -0400)]
qa/suites/rados/thrash-luminous: redirects require luminous

...so skip the at-end variant of d-luminous.

Signed-off-by: Sage Weil <sage@redhat.com>
8 years agoMerge branch 'wip-extensible_tier-redirect' of git://github.com/myoungwon/ceph into...
Sage Weil [Sat, 27 May 2017 02:50:14 +0000 (22:50 -0400)]
Merge branch 'wip-extensible_tier-redirect' of git://github.com/myoungwon/ceph into wip-redirect

8 years agorgw: fix test_multi.py default config file path 15306/head
Jiaying Ren [Fri, 26 May 2017 10:06:21 +0000 (18:06 +0800)]
rgw: fix test_multi.py default config file path

$ python test_multi.py --num-zonegroups=2 --num-zones 2 --gateways-per-zone 1
Traceback (most recent call last):
  File "test_multi.py", line 315, in <module>
      init(True)
        File "test_multi.py", line 162, in init
    path = tpath('test_multi.conf')
    NameError: global name 'tpath' is not defined

Signed-off-by: Jiaying Ren <jiaying.ren@umcloud.com>
8 years agomsg/async: keep _has_next_outgoing calling under write_lock 15324/head
Haomai Wang [Sat, 27 May 2017 02:44:34 +0000 (10:44 +0800)]
msg/async: keep _has_next_outgoing calling under write_lock

Signed-off-by: Haomai Wang <haomai@xsky.com>
8 years agomsg/async: avoid requeue racing with handle_write
Haomai Wang [Sat, 27 May 2017 01:59:11 +0000 (09:59 +0800)]
msg/async: avoid requeue racing with handle_write

when the thread is calling AsyncConnection::handle_write, another thread may
replace it and requeue all messages. Because we remove the write_lock
protection for handle_write caller, it may happen sent racing with out_q

Fix: http://tracker.ceph.com/issues/20093

Signed-off-by: Haomai Wang <haomai@xsky.com>
8 years agoMerge pull request #15289 from ifed01/wip-bluestore-fix-bmap-assert 15334/head
Sage Weil [Fri, 26 May 2017 22:48:08 +0000 (17:48 -0500)]
Merge pull request #15289 from ifed01/wip-bluestore-fix-bmap-assert

os/bluestore: fix BitMapAllocator assert on out-of-bound hint value

Reviewed-by: Varada Kari <varada.kari@gmail.com>
8 years agoMerge pull request #15288 from yuyuyu101/wip-20062
Sage Weil [Fri, 26 May 2017 22:47:22 +0000 (17:47 -0500)]
Merge pull request #15288 from yuyuyu101/wip-20062

msg/async: remove false alert "assert"

8 years agoMerge pull request #15214 from gregsfortytwo/wip-19931-snaptrim-pgref
Gregory Farnum [Fri, 26 May 2017 21:50:00 +0000 (14:50 -0700)]
Merge pull request #15214 from gregsfortytwo/wip-19931-snaptrim-pgref

osd: don't leak pgrefs or reservations in SnapTrimmer

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
8 years agoosd: do not default-abort on leaked pg refs 15214/head
Greg Farnum [Fri, 26 May 2017 05:32:01 +0000 (22:32 -0700)]
osd: do not default-abort on leaked pg refs

Signed-off-by: Greg Farnum <gfarnum@redhat.com>
8 years agoosd: shutdown our reserver_finisher earlier in the process
Greg Farnum [Fri, 26 May 2017 05:14:38 +0000 (22:14 -0700)]
osd: shutdown our reserver_finisher earlier in the process

This finisher thread has a lot of callbacks which can hold PGRefs. Make
sure we drain them out before checking that all the PGs have finished
and have no outstanding references.

Moving this should be safe; we've already stopped the op thread et al
and the only things still running are the OSDService's objecter_finisher,
recovery_request_timer, and snap_sleep_timer (which has definitely been emptied
by the time we get here as it's synchronously cleared out on PG shutdown).

Signed-off-by: Greg Farnum <gfarnum@redhat.com>
8 years agoMerge pull request #15316 from linuxbox2/wip-limitcheck-fixes
Casey Bodley [Fri, 26 May 2017 21:05:23 +0000 (17:05 -0400)]
Merge pull request #15316 from linuxbox2/wip-limitcheck-fixes

rgw-admin: fix bucket limit check argparse, div(0)

Reviewed-by: Casey Bodley <cbodley@redhat.com>
8 years agorgw-admin: fix bucket limit check argparse, div(0) 15316/head
Matt Benjamin [Fri, 26 May 2017 16:41:40 +0000 (12:41 -0400)]
rgw-admin: fix bucket limit check argparse, div(0)

1. normalize arg parsing for "bucket limit check"
1.1 s/buckets/bucket/

2. avoid dividing by num_shards when it is 0

Signed-off-by: Matt Benjamin <mbenjamin@redhat.com>
8 years agomon/OSDMonitor: cancel mapping job from update_from_paxos 15320/head
Sage Weil [Fri, 26 May 2017 18:09:59 +0000 (14:09 -0400)]
mon/OSDMonitor: cancel mapping job from update_from_paxos

On the leader we cancel the mapping job in encode_pending.  On a peon,
we don't cancel it at all!  It is surprising this didn't already cause
problems, but with the PGtempMap is pretty reliably crashes with a
largish map.

Fixes: http://tracker.ceph.com/issues/20067
Signed-off-by: Sage Weil <sage@redhat.com>
8 years agoosd/OSDMap: some better pg-upmap debug output 15319/head
Sage Weil [Fri, 26 May 2017 17:01:35 +0000 (13:01 -0400)]
osd/OSDMap: some better pg-upmap debug output

Signed-off-by: Sage Weil <sage@redhat.com>
8 years agomon/OSDMonitor: allow upmap records for deleted pools to be removed
Sage Weil [Thu, 25 May 2017 20:52:40 +0000 (16:52 -0400)]
mon/OSDMonitor: allow upmap records for deleted pools to be removed

Otherwise the offline osdmaptool --upmap-cleanup can't do its thing.

Signed-off-by: Sage Weil <sage@redhat.com>
8 years agoMerge pull request #15304 from Linbing/modify-note-word-error
Jos Collin [Fri, 26 May 2017 16:11:08 +0000 (21:41 +0530)]
Merge pull request #15304 from Linbing/modify-note-word-error

mon: Fixed typo in function comment blocks and in other comments

8 years agoos/bluestore: fix BitMapAllocator assert on out-of-bound hint value 15289/head
Igor Fedotov [Thu, 25 May 2017 14:27:36 +0000 (07:27 -0700)]
os/bluestore: fix BitMapAllocator assert on out-of-bound hint value

Signed-off-by: Igor Fedotov <ifedotov@mirantis.com>
8 years agoMerge pull request #15256 from fangyuxiangGL/bucket-stats
Casey Bodley [Fri, 26 May 2017 14:48:41 +0000 (10:48 -0400)]
Merge pull request #15256 from fangyuxiangGL/bucket-stats

rgw: display more info when using  radosgw-admin bucket stats

Reviewed-by: Casey Bodley <cbodley@redhat.com>
8 years agoMerge pull request #15221 from fangyuxiangGL/set-placement-rule
Casey Bodley [Fri, 26 May 2017 14:35:26 +0000 (10:35 -0400)]
Merge pull request #15221 from fangyuxiangGL/set-placement-rule

rgw: set placement rule properly

Reviewed-by: Casey Bodley <cbodley@redhat.com>
8 years agoMerge pull request #15287 from ktdreyer/doc-ceph-fs-settings
John Spray [Fri, 26 May 2017 14:35:10 +0000 (15:35 +0100)]
Merge pull request #15287 from ktdreyer/doc-ceph-fs-settings

doc: describe CephFS max_file_size

Reviewed-by: John Spray <john.spray@redhat.com>
Reviewed-by: Alfredo Deza <adeza@redhat.com>
8 years agoMerge pull request #15219 from fangyuxiangGL/extra_pool
Casey Bodley [Fri, 26 May 2017 14:34:19 +0000 (10:34 -0400)]
Merge pull request #15219 from fangyuxiangGL/extra_pool

rgw: use get_data_extra_pool() when get extra pool

Reviewed-by: Casey Bodley <cbodley@redhat.com>
8 years agoMerge pull request #14341 from theanalyst/cleanup/rgw/str-find
Casey Bodley [Fri, 26 May 2017 14:33:35 +0000 (10:33 -0400)]
Merge pull request #14341 from theanalyst/cleanup/rgw/str-find

rgw_common: use string::npos for the results of str.find

Reviewed-by: Casey Bodley <cbodley@redhat.com>
8 years agoMerge pull request #14746 from wjwithagen/wip-wjw-reduce-noise-2
Sage Weil [Fri, 26 May 2017 14:30:17 +0000 (09:30 -0500)]
Merge pull request #14746 from wjwithagen/wip-wjw-reduce-noise-2

src/ceph.in: Use env(CEPH_DEV) to suppress noise from ceph

Reviewed-by: Sage Weil <sage@redhat.com>
8 years agoMerge pull request #15247 from liewegas/wip-upmap-save
Sage Weil [Fri, 26 May 2017 14:20:05 +0000 (09:20 -0500)]
Merge pull request #15247 from liewegas/wip-upmap-save

osdmaptool: require --upmap-save before modifying input osdmap

Reviewed-by: Loic Dachary <ldachary@redhat.com>
8 years agoMerge pull request #15234 from trociny/wip-19832
Jason Dillaman [Fri, 26 May 2017 14:12:44 +0000 (10:12 -0400)]
Merge pull request #15234 from trociny/wip-19832

librbd: potential read IO hang when image is flattened

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
8 years agoMerge pull request #15239 from trociny/wip-19962
Jason Dillaman [Fri, 26 May 2017 14:12:06 +0000 (10:12 -0400)]
Merge pull request #15239 from trociny/wip-19962

librbd: discard related IO should skip op if object non-existent

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
8 years agoMerge pull request #15293 from linuxbox2/wip-rgwfile-buckattr
Matt Benjamin [Fri, 26 May 2017 13:48:09 +0000 (09:48 -0400)]
Merge pull request #15293 from linuxbox2/wip-rgwfile-buckattr

rgw_file: store bucket uxattrs on the bucket

8 years agomon: it's no need to get pg action_primary osd twice in pg scrub 15313/head
linbing [Fri, 26 May 2017 09:39:39 +0000 (17:39 +0800)]
mon: it's no need to get pg action_primary osd twice in pg scrub

Signed-off-by: linbing <linbing@t2cloud.net>
8 years agoMerge pull request #15290 from idryomov/wip-krbd-unmap-straw
Jason Dillaman [Fri, 26 May 2017 13:27:50 +0000 (09:27 -0400)]
Merge pull request #15290 from idryomov/wip-krbd-unmap-straw

qa/suites/krbd: unmap subsuite needs straw buckets

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
8 years agodoc: describe differences with "mds set" vs "fs set" 15287/head
Ken Dreyer [Thu, 25 May 2017 17:40:48 +0000 (11:40 -0600)]
doc: describe differences with "mds set" vs "fs set"

Thanks to John Spray <jspray@redhat.com> on ceph-users for this
information.

Signed-off-by: Ken Dreyer <kdreyer@redhat.com>
8 years agodoc: describe CephFS max_file_size
Ken Dreyer [Thu, 25 May 2017 03:51:54 +0000 (21:51 -0600)]
doc: describe CephFS max_file_size

Add a description of max_file_size to the CephFS admin docs.

Thanks to John Spray <jspray@redhat.com> on ceph-users for this
information.

Signed-off-by: Ken Dreyer <kdreyer@redhat.com>
8 years agoos/bluestore/BlueStore: Only call once notify_all. 15284/head
Jianpeng Ma [Thu, 25 May 2017 17:01:40 +0000 (01:01 +0800)]
os/bluestore/BlueStore: Only call once notify_all.

All txcs of deferred_running have the same osr, so only call once
notify_call.

Signed-off-by: Jianpeng Ma <jianpeng.ma@intel.com>
8 years agoos/bluestore/BlueStore: avoid iterating to get ios/cost in _kv_sync_thread.
Jianpeng Ma [Fri, 26 May 2017 10:13:15 +0000 (18:13 +0800)]
os/bluestore/BlueStore: avoid iterating to get ios/cost in _kv_sync_thread.

Signed-off-by: Jianpeng Ma <jianpeng.ma@intel.com>
8 years agoos/bluestore/BlueStore: batch handle Throttle.put.
Jianpeng Ma [Thu, 25 May 2017 16:54:14 +0000 (00:54 +0800)]
os/bluestore/BlueStore: batch handle Throttle.put.

Signed-off-by: Jianpeng Ma <jianpeng.ma@intel.com>
8 years ago./qa/workunits/ceph-helpers.sh: Do not trace kill_daemon 14746/head
Willem Jan Withagen [Thu, 27 Apr 2017 16:09:03 +0000 (18:09 +0200)]
./qa/workunits/ceph-helpers.sh: Do not trace kill_daemon

Signed-off-by: Willem Jan Withagen <wjw@digiware.nl>
8 years agovstart:Suppress trivial logging info during devlopment
Willem Jan Withagen [Thu, 27 Apr 2017 14:06:29 +0000 (16:06 +0200)]
vstart:Suppress trivial logging info during devlopment

Signed-off-by: Willem Jan Withagen <wjw@digiware.nl>
8 years agosrc/ceph.in: Use env(CEPH_DEV) to suppress noise from ceph
Willem Jan Withagen [Mon, 24 Apr 2017 10:32:09 +0000 (12:32 +0200)]
src/ceph.in: Use env(CEPH_DEV) to suppress noise from ceph

Signed-off-by: Willem Jan Withagen <wjw@digiware.nl>
8 years agoModify note error 15304/head
linbing [Fri, 26 May 2017 09:45:43 +0000 (17:45 +0800)]
Modify note error

Signed-off-by: linbing linbing@t2cloud.net
8 years agotool/ceph: support target mon in tell help subcommand 15111/head
liuchang0812 [Fri, 26 May 2017 02:38:38 +0000 (10:38 +0800)]
tool/ceph: support target mon in tell help subcommand

Signed-off-by: liuchang0812 <liuchang0812@gmail.com>
8 years agocommon/ceph_context: fix leak of registered commands on exit 15302/head
xie xingguo [Fri, 26 May 2017 09:28:55 +0000 (17:28 +0800)]
common/ceph_context: fix leak of registered commands on exit

By unregister them properly.
Also rearrange commands order to keep pace with register process.

Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
8 years agoosd: Reset() the snaptrimmer on shutdown
Greg Farnum [Fri, 26 May 2017 04:52:49 +0000 (21:52 -0700)]
osd: Reset() the snaptrimmer on shutdown

We were failing to exit various wait states which held PGRefs. Error!

Fixes: http://tracker.ceph.com/issues/19931
Signed-off-by: Greg Farnum <gfarnum@redhat.com>
8 years agoMerge pull request #14658 from chardan/jfw-wip-halflife_atomic_t-baragon
Sage Weil [Fri, 26 May 2017 03:29:19 +0000 (22:29 -0500)]
Merge pull request #14658 from chardan/jfw-wip-halflife_atomic_t-baragon

librados,libradosstriper,test: migrate atomic_t to std::atomic (baragon)

Reviewed-by: Sage Weil <sage@redhat.com>
8 years agoMerge pull request #15227 from tchaikov/wip-20051
Sage Weil [Fri, 26 May 2017 03:28:47 +0000 (22:28 -0500)]
Merge pull request #15227 from tchaikov/wip-20051

mon/MonClient: cancel pending commands on shutdown

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
8 years agoMerge pull request #15249 from Alessandro-Barbieri/patch-2
Sage Weil [Fri, 26 May 2017 03:27:57 +0000 (22:27 -0500)]
Merge pull request #15249 from Alessandro-Barbieri/patch-2

yasm-wrapper: filter -pthread

Reviewed-by: Sage Weil <sage@redhat.com>
8 years agoMerge pull request #15268 from ifed01/wip-bluestore-false-assert
Sage Weil [Fri, 26 May 2017 03:27:23 +0000 (22:27 -0500)]
Merge pull request #15268 from ifed01/wip-bluestore-false-assert

os/bluestore: fix false assert in IOContext::aio_wake

Reviewed-by: Sage Weil <sage@redhat.com>
8 years agoMerge pull request #15272 from tchaikov/wip-mon-cleanups
Sage Weil [Fri, 26 May 2017 03:27:11 +0000 (22:27 -0500)]
Merge pull request #15272 from tchaikov/wip-mon-cleanups

mon: cleanups

Reviewed-by: Sage Weil <sage@redhat.com>
8 years agoosd: reduce size of osdmap cache, messages 15292/head
Sage Weil [Thu, 25 May 2017 19:27:32 +0000 (15:27 -0400)]
osd: reduce size of osdmap cache, messages

On large clusters, these large caches can be problematic (as maps get big).
We've seen good results with extremely small caches (10s of maps).  Make
a more modest reduction.

Signed-off-by: Sage Weil <sage@redhat.com>
8 years agotest/osd/osd-config.sh: fix test to isolate cases
Sage Weil [Fri, 26 May 2017 03:12:26 +0000 (23:12 -0400)]
test/osd/osd-config.sh: fix test to isolate cases

The third test (increasing osd_map_max_advance)
was triggering a warning from the 4th case (which
it didn't before).

Signed-off-by: Sage Weil <sage@redhat.com>
8 years agoosd: fadvise hint WILL_NEED when reading encoded osdmaps
Sage Weil [Thu, 25 May 2017 19:42:39 +0000 (15:42 -0400)]
osd: fadvise hint WILL_NEED when reading encoded osdmaps

This way will ensure we cache data for recent osdmaps if we need to for
the benefit of laggy clients... even if (in bluestore's case)
bluestore_default_buffered_reads = false (it's true by default).  This
should mitigate any tail latency/work even if the osdmap cache size is too
small.

Signed-off-by: Sage Weil <sage@redhat.com>
8 years agoosd: instrument osdmap bl cache hits and misses
Sage Weil [Thu, 25 May 2017 19:41:04 +0000 (15:41 -0400)]
osd: instrument osdmap bl cache hits and misses

Add perfcounters so we can see whether we are missing osdmaps in the
cache.  This will let us tell whether, given a workload or environment,
our osdmap cache might be too small.

Signed-off-by: Sage Weil <sage@redhat.com>
8 years agoosd: do not bother with misdirected op diagnosis by default
Sage Weil [Thu, 25 May 2017 19:31:33 +0000 (15:31 -0400)]
osd: do not bother with misdirected op diagnosis by default

We enable osd_debug_misdirected_ops in QA, but this is wasted effort on
a production cluster.  In particular, it means that a idle client that
sends an op to the wrong OSD based on an old map will require that OSD to
load that old map into memory to decide whether to print a warning... all
on the off-chance that the client is buggy.

Signed-off-by: Sage Weil <sage@redhat.com>
8 years agoosd: remove osd_enxio_on_misdirected_op option
Sage Weil [Thu, 25 May 2017 19:29:20 +0000 (15:29 -0400)]
osd: remove osd_enxio_on_misdirected_op option

There is no good reason anyone would want this turned on.

Introduced 923e7f5ce5ed437af15e178299a61029ff48e4a2 (post-kraken), but
backported to kraken and jewel (10.2.6).

Signed-off-by: Sage Weil <sage@redhat.com>