]> git.apps.os.sepia.ceph.com Git - ceph.git/log
ceph.git
8 years agobuffer: remove buffer_data mempool
Sage Weil [Tue, 30 May 2017 19:58:53 +0000 (15:58 -0400)]
buffer: remove buffer_data mempool

We are explicitly accounting for buffers via arbitrary pools, defaulting
to buffer_anon, so we don't need buffer_data anymore.  It leads to
double-counting.

Signed-off-by: Sage Weil <sage@redhat.com>
8 years agobuffer: allow buffers to map into arbitrary mempools
Sage Weil [Mon, 29 May 2017 01:21:05 +0000 (21:21 -0400)]
buffer: allow buffers to map into arbitrary mempools

- default is buffer_anon
- buffer_data includes *all* buffers across all mempools, and is the
*actual* allocation (includes raw_combined).
- buffer_meta is other buffer-related overhead.

Signed-off-by: Sage Weil <sage@redhat.com>
8 years agomempool: allow pool counts to be adjusted explicitly
Sage Weil [Mon, 29 May 2017 01:19:44 +0000 (21:19 -0400)]
mempool: allow pool counts to be adjusted explicitly

Signed-off-by: Sage Weil <sage@redhat.com>
8 years agobuffer: fix mempool accounting for claimed chars
Sage Weil [Mon, 8 May 2017 18:50:43 +0000 (14:50 -0400)]
buffer: fix mempool accounting for claimed chars

These are allocated by the caller, outside of the mempool; do not
deallocate via the mempool.

Signed-off-by: Sage Weil <sage@redhat.com>
8 years agomempool: kill unittest_? mempools
Sage Weil [Fri, 5 May 2017 19:48:46 +0000 (15:48 -0400)]
mempool: kill unittest_? mempools

These were just annoying.  Use some real ones that will be empty
for the unit tests.

Signed-off-by: Sage Weil <sage@redhat.com>
8 years agoMerge pull request #15291 from liewegas/wip-osdmap-pgtemp
Sage Weil [Wed, 31 May 2017 18:47:00 +0000 (13:47 -0500)]
Merge pull request #15291 from liewegas/wip-osdmap-pgtemp

osd/OSDMap: make pg_temp more efficient

Reviewed-by: Kefu Chai <kchai@redhat.com>
8 years agoMerge pull request #15321 from liewegas/wip-failed-msg
Sage Weil [Wed, 31 May 2017 18:46:09 +0000 (13:46 -0500)]
Merge pull request #15321 from liewegas/wip-failed-msg

mon/OSDMonitor: change info in 'osd failed' messages

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
8 years agoMerge pull request #15388 from idryomov/wip-krbd-fallocate-tests
Jason Dillaman [Wed, 31 May 2017 16:38:15 +0000 (12:38 -0400)]
Merge pull request #15388 from idryomov/wip-krbd-fallocate-tests

qa: krbd discard/zeroout tests

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
8 years agoMerge pull request #15135 from cbodley/wip-denc-sstring
Sage Weil [Wed, 31 May 2017 15:38:53 +0000 (10:38 -0500)]
Merge pull request #15135 from cbodley/wip-denc-sstring

denc: add encode/decode for basic_sstring

Reviewed-by: Sage Weil <sage@redhat.com>
8 years agoMerge pull request #13802 from LiumxNL/wip-170306
Sage Weil [Wed, 31 May 2017 15:38:24 +0000 (10:38 -0500)]
Merge pull request #13802 from LiumxNL/wip-170306

mon/OSDMonitor: use up set instead of acting set in reweight_by_utilization

Reviewed-by: Kefu Chai <kchai@redhat.com>
8 years agoMerge pull request #15295 from liewegas/wip-bluestore-fsck
Sage Weil [Wed, 31 May 2017 14:39:18 +0000 (09:39 -0500)]
Merge pull request #15295 from liewegas/wip-bluestore-fsck

os/bluestore: fix fsck deferred_replay

Reviewed-by: Igor Fedotov <ifedotov@mirantis.com>
8 years agoqa: krbd discard/zeroout tests 15388/head
Ilya Dryomov [Tue, 30 May 2017 14:17:21 +0000 (16:17 +0200)]
qa: krbd discard/zeroout tests

Signed-off-by: Ilya Dryomov <idryomov@gmail.com>
8 years agoMerge pull request #15374 from yonghengdexin735/wip-zzz-mds
Jos Collin [Wed, 31 May 2017 07:50:45 +0000 (13:20 +0530)]
Merge pull request #15374 from yonghengdexin735/wip-zzz-mds

mon: Removed unnecessary function declaration in MDSMonitor.h

Reviewed-by: Jos Collin <jcollin@redhat.com>
8 years agoMerge pull request #15373 from kestrels/wip-asm-capital-S
Kefu Chai [Wed, 31 May 2017 05:46:56 +0000 (13:46 +0800)]
Merge pull request #15373 from kestrels/wip-asm-capital-S

build: Use .S suffix for ppc64le assembly files

Reviewed-by: Bassam Tabbara <bassam.tabbara@quantum.com>
Reviewed-By: Kefu Chai <kchai@redhat.com>
8 years agomon:remove useless function for MDSMonitor::generate_mds_map() 15374/head
yonghengdexin735 [Wed, 31 May 2017 03:34:23 +0000 (11:34 +0800)]
mon:remove useless function for MDSMonitor::generate_mds_map()

Signed-off-by: yonghengdexin735 <zhang.zezhu@zte.com.cn>
8 years agoMerge pull request #15351 from liewegas/wip-osdmap-require-min-client
Sage Weil [Wed, 31 May 2017 02:48:01 +0000 (21:48 -0500)]
Merge pull request #15351 from liewegas/wip-osdmap-require-min-client

osd/OSDMap: replace string-based min_compat_client with a CEPH_RELEASE_* uint8_t

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
8 years agoosdmaptool: fix cli tests 15351/head
Sage Weil [Tue, 30 May 2017 18:51:31 +0000 (14:51 -0400)]
osdmaptool: fix cli tests

Signed-off-by: Sage Weil <sage@redhat.com>
8 years agocommon/version: include release name and type in version string
Sage Weil [Sat, 27 May 2017 19:38:10 +0000 (15:38 -0400)]
common/version: include release name and type in version string

 ceph version 12.0.2-1687-ge042051 (e0420518d712d87a4882b3a327eaf1d3fcea12df) luminous (dev)

Signed-off-by: Sage Weil <sage@redhat.com>
8 years agoosd/OSDMap: switch [require_]min_compat_client to CEPH_RELEASE_* values
Sage Weil [Sat, 27 May 2017 19:09:16 +0000 (15:09 -0400)]
osd/OSDMap: switch [require_]min_compat_client to CEPH_RELEASE_* values

Instead of using a string, use the defined CEPH_RELEASE_* values.  This
is simpler.

We allow decoding of post-kraken pre-luminous maps that use the string
values.

Signed-off-by: Sage Weil <sage@redhat.com>
8 years agocommon: expand CEPH_RELEASE_ names; rename helper
Sage Weil [Sat, 27 May 2017 18:53:24 +0000 (14:53 -0400)]
common: expand CEPH_RELEASE_ names; rename helper

Signed-off-by: Sage Weil <sage@redhat.com>
8 years agoMerge pull request #15331 from yonghengdexin735/wip-zzz-override
Jos Collin [Wed, 31 May 2017 01:57:48 +0000 (07:27 +0530)]
Merge pull request #15331 from yonghengdexin735/wip-zzz-override

mon: Add override for FsNewHandler::handle()

Reviewed-by: Jos Collin <jcollin@redhat.com>
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 agomon: Add override for FsNewHandler::handle() 15331/head
yonghengdexin735 [Wed, 31 May 2017 00:34:42 +0000 (08:34 +0800)]
mon: Add override for FsNewHandler::handle()

Signed-off-by: yonghengdexin735 <zhang.zezhu@zte.com.cn>
8 years agoMerge pull request #15184 from cbodley/wip-qa-rgw-cleanup
Yehuda Sadeh [Tue, 30 May 2017 20:09:31 +0000 (13:09 -0700)]
Merge pull request #15184 from cbodley/wip-qa-rgw-cleanup

qa/rgw: remove apache/fastcgi and radosgw-agent tests

Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
8 years agoMerge pull request #13851 from zhangsw/optimize-datasync
Casey Bodley [Tue, 30 May 2017 18:16:07 +0000 (14:16 -0400)]
Merge pull request #13851 from zhangsw/optimize-datasync

rgw: optimize data sync. Add zones_trace in log to avoid needless sync.

Reviewed-by: Casey Bodley <cbodley@redhat.com>
8 years agoMerge pull request #15368 from dzafman/wip-20089
David Zafman [Tue, 30 May 2017 17:46:23 +0000 (10:46 -0700)]
Merge pull request #15368 from dzafman/wip-20089

osd: When scrub finds an attr error mark shard inconsistent

Reviewed-by: Sage Weil <sage@redhat.com>
8 years agoMerge pull request #15350 from mrbojangles3/master
Sage Weil [Tue, 30 May 2017 17:32:06 +0000 (12:32 -0500)]
Merge pull request #15350 from mrbojangles3/master

libradosstriper: Add example code

8 years agoMerge pull request #15356 from joscollin/wip-test-msgr-warning
Sage Weil [Tue, 30 May 2017 17:29:51 +0000 (12:29 -0500)]
Merge pull request #15356 from joscollin/wip-test-msgr-warning

test/msgr: silence warnings from -Wsign-compare

8 years agoMerge pull request #15362 from andihit/doc-rados-xattr-commands
Sage Weil [Tue, 30 May 2017 17:28:34 +0000 (12:28 -0500)]
Merge pull request #15362 from andihit/doc-rados-xattr-commands

doc: add rados xattr commands to manpage

Reviewed-by: Kefu Chai <kchai@redhat.com>
8 years agoMerge pull request #15366 from joscollin/wip-cleanup-test-remove-commented-code
Sage Weil [Tue, 30 May 2017 17:25:39 +0000 (12:25 -0500)]
Merge pull request #15366 from joscollin/wip-cleanup-test-remove-commented-code

test/old: Removed commented code

Reviewed-by: Sage Weil <sage@redhat.com>
8 years agoosd: When scrub finds an attr error mark shard inconsistent 15368/head
David Zafman [Fri, 26 May 2017 00:22:50 +0000 (17:22 -0700)]
osd: When scrub finds an attr error mark shard inconsistent

Fixes: http://tracker.ceph.com/issues/20089
Signed-off-by: David Zafman <dzafman@redhat.com>
8 years agoMerge pull request #14971 from SUSE/wip-mgr-py-sub-interpreter
Sage Weil [Tue, 30 May 2017 16:02:27 +0000 (11:02 -0500)]
Merge pull request #14971 from SUSE/wip-mgr-py-sub-interpreter

mgr: load modules in separate python sub-interpreters

Reviewed-by: John Spray <john.spray@redhat.com>
8 years agoos/bluestore: bluestore_debug_fsck_abort 15295/head
Sage Weil [Tue, 30 May 2017 15:54:28 +0000 (11:54 -0400)]
os/bluestore: bluestore_debug_fsck_abort

Abort fsck early to get a massif result.

Signed-off-by: Sage Weil <sage@redhat.com>
8 years agoMerge pull request #15259 from zealoussnow/wip-0524
Yuri Weinstein [Tue, 30 May 2017 15:44:47 +0000 (08:44 -0700)]
Merge pull request #15259 from zealoussnow/wip-0524

build: remove ceph-disk-udev entirely

Reviewed-by: Kefu Chai <kchai@redhat.com>
Reviewed-by: Loic Dachary <loic@dachary.org>
8 years agoMerge pull request #15285 from smithfarm/wip-kill-fcgi
Yuri Weinstein [Tue, 30 May 2017 15:42:55 +0000 (08:42 -0700)]
Merge pull request #15285 from smithfarm/wip-kill-fcgi

build/ops: drop libfcgi build dependency

Reviewed-by: Kefu Chai <kchai@redhat.com>
8 years agotest/old: Removed commented code 15366/head
Jos Collin [Tue, 30 May 2017 15:30:47 +0000 (21:00 +0530)]
test/old: Removed commented code

There were lot of commented code inside src/test/old/testcrush.cc. This was found while doing
the PR#15364. Removed them.

Signed-off-by: Jos Collin <jcollin@redhat.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 agodoc: add rados xattr commands to manpage 15362/head
Andreas Gerstmayr [Tue, 30 May 2017 14:02:09 +0000 (16:02 +0200)]
doc: add rados xattr commands to manpage

Signed-off-by: Andreas Gerstmayr <andreas.gerstmayr@catalysts.cc>
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 agotest/msgr: silence warnings from -Wsign-compare 15356/head
Jos Collin [Tue, 30 May 2017 05:19:15 +0000 (10:49 +0530)]
test/msgr: silence warnings from -Wsign-compare

The following warning appears during make:

ceph/src/test/msgr/test_msgr.cc: In member function ‘virtual void MessengerTest_MarkdownTest_Test::TestBody()’:
ceph/src/test/msgr/test_msgr.cc:1474:46: warning: comparison between signed and unsigned integer expressions [-Wsign-compare]
     CHECK_AND_WAIT_TRUE(srv_dispatcher.count > last + 1);
                         ~~~~~~~~~~~~~~~~~~~~~^~~~~~~~~~
ceph/src/test/msgr/test_msgr.cc:54:9: note: in definition of macro ‘CHECK_AND_WAIT_TRUE’
     if (expr)                           \
         ^~~~
ceph/src/test/msgr/test_msgr.cc:1475:30: warning: comparison between signed and unsigned integer expressions [-Wsign-compare]
     if (srv_dispatcher.count == last) {
         ~~~~~~~~~~~~~~~~~~~~~^~~~~~~

Signed-off-by: Jos Collin <jcollin@redhat.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 agoos/bluestore: deep decode onode value
Sage Weil [Tue, 30 May 2017 01:55:33 +0000 (21:55 -0400)]
os/bluestore: deep decode onode value

In particular, we want the attrs (map<string,bufferptr>) to be a deep
decode so that we do not pin this buffer, and so that any changed attr
will free the previous memory.

Signed-off-by: Sage Weil <sage@redhat.com>
8 years agoos/bluestore: fsck: use btree_set to replace set<uint64_t>
Sage Weil [Mon, 29 May 2017 20:46:21 +0000 (16:46 -0400)]
os/bluestore: fsck: use btree_set to replace set<uint64_t>

Signed-off-by: Sage Weil <sage@redhat.com>
8 years agoinclude/cpp-btree/btree_set: add btree_set
Sage Weil [Mon, 29 May 2017 20:44:52 +0000 (16:44 -0400)]
include/cpp-btree/btree_set: add btree_set

Signed-off-by: Sage Weil <sage@redhat.com>
8 years agoceph-bluestore-tool: init deep = false
Sage Weil [Sun, 28 May 2017 17:54:17 +0000 (13:54 -0400)]
ceph-bluestore-tool: init deep = false

Signed-off-by: Sage Weil <sage@redhat.com>
8 years agoos/bluestore: rebuild Buffer buffers with too much waste
Sage Weil [Fri, 26 May 2017 20:02:00 +0000 (16:02 -0400)]
os/bluestore: rebuild Buffer buffers with too much waste

Avoid pinning extra memory by rebuilding Buffer buffers when we waste too
much.

Signed-off-by: Sage Weil <sage@redhat.com>
8 years agobuffer: make wasted() const
Sage Weil [Fri, 26 May 2017 03:09:11 +0000 (23:09 -0400)]
buffer: make wasted() const

Remove useless assert (we'll segv on the next line anyway).

Signed-off-by: Sage Weil <sage@redhat.com>
8 years agoos/bluestore: wait for kv thread to start before stopping it
Sage Weil [Fri, 26 May 2017 22:18:06 +0000 (18:18 -0400)]
os/bluestore: wait for kv thread to start before stopping it

Otherwise we can assert out when we try to join a thread that
hasn't started.

- move everything into _kv_start() and _kv_stop()
- separate stop bools for each thread
- wait until thread starts before signalling stop (and potentially calling
join()).

Signed-off-by: Sage Weil <sage@redhat.com>
8 years agoos/bluestore: fix fsck deferred_replay
Sage Weil [Fri, 26 May 2017 20:24:57 +0000 (16:24 -0400)]
os/bluestore: fix fsck deferred_replay

_deferred_replay needs the kv_sync_thread to complete IOs; start them
just for that, but then shut them down again.  (We might revisit that
later if/when fsck does any sort of repair.)

Signed-off-by: Sage Weil <sage@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 agoAdded libradosstriper example Signed-off-by: Logan Blyth <mrbojangles3@gmail.com> 15350/head
Logan Blyth [Mon, 29 May 2017 19:26:15 +0000 (15:26 -0400)]
Added libradosstriper example Signed-off-by: Logan Blyth <mrbojangles3@gmail.com>

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>