]> git.apps.os.sepia.ceph.com Git - ceph.git/log
ceph.git
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 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>
8 years agoMerge pull request #15311 from dachary/wip-crush-add-remove
Sage Weil [Wed, 31 May 2017 23:09:36 +0000 (18:09 -0500)]
Merge pull request #15311 from dachary/wip-crush-add-remove

crush: update choose_args when items are added/removed

Reviewed-by: Sage Weil <sage@redhat.com>
8 years agoMerge pull request #15318 from tchaikov/wip-20067
Sage Weil [Wed, 31 May 2017 23:09:06 +0000 (18:09 -0500)]
Merge pull request #15318 from tchaikov/wip-20067

mon: trim the creating_pgs after updating it with pgmap

Reviewed-by: Sage Weil <sage@redhat.com>
8 years agoMerge pull request #15352 from liewegas/wip-buffer-mempools
Sage Weil [Wed, 31 May 2017 23:08:49 +0000 (18:08 -0500)]
Merge pull request #15352 from liewegas/wip-buffer-mempools

buffer: allow buffers to be accounted in arbitrary mempools

8 years agoMerge pull request #15357 from ceph/typo_bluestore
Sage Weil [Wed, 31 May 2017 23:08:34 +0000 (18:08 -0500)]
Merge pull request #15357 from ceph/typo_bluestore

os/bluestore: fix a typo about bleustore

Reviewed-by: Varada Kari <varada.kari@gmail.com>
8 years agoMerge pull request #15385 from myoungwon/wip-20114
Sage Weil [Wed, 31 May 2017 23:06:40 +0000 (18:06 -0500)]
Merge pull request #15385 from myoungwon/wip-20114

test/osd/TestRados.cc: run set-redirect test after finishing setup

Reviewed-by: Sage Weil <sage@redhat.com>
8 years agoMerge pull request #14457 from ceph/wip-rest-flask
Sage Weil [Wed, 31 May 2017 22:48:43 +0000 (17:48 -0500)]
Merge pull request #14457 from ceph/wip-rest-flask

ceph-mgr: Implement new pecan-based rest api

8 years agoMerge pull request #15222 from guihecheng/rgw_file-fix-unlink
Matt Benjamin [Wed, 31 May 2017 20:57:20 +0000 (16:57 -0400)]
Merge pull request #15222 from guihecheng/rgw_file-fix-unlink

rgw_file: fix flags set on unsuccessful unlink

8 years agoMerge pull request #15329 from guihecheng/rgw_file-readdir
Matt Benjamin [Wed, 31 May 2017 20:35:37 +0000 (16:35 -0400)]
Merge pull request #15329 from guihecheng/rgw_file-readdir

rgw_file: add lock protection for readdir against gc

8 years agoMerge pull request #14871 from ceph/wip-selinux-optimize
Boris Ranto [Wed, 31 May 2017 18:53:14 +0000 (20:53 +0200)]
Merge pull request #14871 from ceph/wip-selinux-optimize

selinux: Do parallel relabel on package install

Reviewed-by: Loic Dachary <ldachary@redhat.com>
Reviewed-by: Ken Dreyer <kdreyer@redhat.com>
8 years agomempool: dump total, too 15352/head
Sage Weil [Tue, 30 May 2017 18:47:04 +0000 (14:47 -0400)]
mempool: dump total, too

Signed-off-by: Sage Weil <sage@redhat.com>
8 years agoosd: (loosely) mark cached map bl buffers as osd_mapbl
Sage Weil [Mon, 29 May 2017 20:55:28 +0000 (16:55 -0400)]
osd: (loosely) mark cached map bl buffers as osd_mapbl

Signed-off-by: Sage Weil <sage@redhat.com>
8 years agoos/bluestore: mark buffer caches buffers as bluestore_data
Sage Weil [Mon, 29 May 2017 01:21:20 +0000 (21:21 -0400)]
os/bluestore: mark buffer caches buffers as bluestore_data

Signed-off-by: Sage Weil <sage@redhat.com>
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 agotest/osd/TestRados.cc: run test after finishing redirect setup 15385/head
myoungwon oh [Wed, 31 May 2017 14:13:56 +0000 (23:13 +0900)]
test/osd/TestRados.cc: run test after finishing redirect setup

set-redirect test creates more objects than default due to redirect mapping
(let's assume that we create 500 objects, oid 1 -> oid 501, oid 2 -> oid 502)
But the test should use objects within pre-defined range. For example,
If the number of object is 500, only 1~500 oid are allowed for test operations.

In the failure cases, test operation tried to use wrong oids (which means
higher than 500). This is because the bug in the setup phase.
If max_inflights > 1, set-redirect can be finished after setup is completed.
(so wrong oid is included in oid_in_use).
We need to completely remove redirect objects in oid_in_use before start the test.

Fixes: http://tracker.ceph.com/issues/20114
Signed-off-by: Myoungwon Oh <omwmw@sk.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 agorpm: Move ceph-disk to ceph-base 14871/head
Boris Ranto [Fri, 26 May 2017 07:52:25 +0000 (09:52 +0200)]
rpm: Move ceph-disk to ceph-base

The SELinux package now requires the ceph-disk binary but that one was
part of the ceph-osd package. The ceph-disk python library is already
packaged in ceph-base so moving ceph-disk to ceph-base seems like a
reasonable next step.

Signed-off-by: Boris Ranto <branto@redhat.com>
8 years agorgw_file: add lock protection for readdir against gc 15329/head
Gui Hecheng [Sat, 27 May 2017 02:03:59 +0000 (10:03 +0800)]
rgw_file: add lock protection for readdir against gc

The state.mtx protects state.events accessed both from readdir and gc.
Fixes: http://tracker.ceph.com/issues/20121
Signed-off-by: Gui Hecheng <guihecheng@cmss.chinamobile.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 agocrush: update choose_args on adjust_item_weight 15311/head
Loic Dachary [Fri, 26 May 2017 21:46:10 +0000 (00:46 +0300)]
crush: update choose_args on adjust_item_weight

The osd_crush_update_weight_set (true by default) can be used to disable
the update of the weights.

Signed-off-by: Loic Dachary <loic@dachary.org>
8 years agocrush: update choose_args when items are added/removed
Loic Dachary [Fri, 26 May 2017 13:38:24 +0000 (16:38 +0300)]
crush: update choose_args when items are added/removed

When items are added:

- the value in the weight set is set to the target weight. It is assumed
  that weight set are updated on a regular basis and will eventually be
  set to a value that prevents excessive over/under filling.

- the value in the id list is set to the item id.

When items are removed, their weight / ids in all choose_args are
removed.

Signed-off-by: Loic Dachary <loic@dachary.org>
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 agoceph-disk: Fix the file ownership, skip missing
Boris Ranto [Thu, 25 May 2017 12:36:13 +0000 (14:36 +0200)]
ceph-disk: Fix the file ownership, skip missing

This commit fixes the file ownership for the /usr/bin/ and /etc/ceph
files and skips missing files as some of the files that we do specify
now can be missing from the system (not installed, e.f. radosgw).

Fixes: http://tracker.ceph.com/issues/20077
Signed-off-by: Boris Ranto <branto@redhat.com>
8 years agoselinux: Do parallel relabel on package install
Boris Ranto [Fri, 28 Apr 2017 10:29:46 +0000 (12:29 +0200)]
selinux: Do parallel relabel on package install

We can take advantage of ceph-disk fix subcommand when doing a package
install. We will keep using the differential fixfiles command otherwise.

We also need to add relabel for /usr/bin/ daemons so that we could use
this.

Fixes: http://tracker.ceph.com/issues/20077
Signed-off-by: Boris Ranto <branto@redhat.com>
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 agobluestore: fix a typo about bleustore 15357/head
Dongsheng Yang [Tue, 30 May 2017 10:32:49 +0000 (18:32 +0800)]
bluestore: fix a typo about bleustore

Signed-off-by: Dongsheng Yang <dongsheng.yang@easystack.cn>
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>