]> git.apps.os.sepia.ceph.com Git - ceph.git/log
ceph.git
7 years agorgw: Check bucket CORS operations in policy 18000/head
Adam C. Emerson [Wed, 27 Sep 2017 19:42:27 +0000 (15:42 -0400)]
rgw: Check bucket CORS operations in policy

Add code to check s3:GetCORS and s3:PutCORS operations against bucket
policy.

Fixes: http://tracker.ceph.com/issues/21578
Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=1494140
Signed-off-by: Adam C. Emerson <aemerson@redhat.com>
7 years agoMerge pull request #17978 from alram/rbdmap-fix
Sage Weil [Wed, 27 Sep 2017 17:57:33 +0000 (12:57 -0500)]
Merge pull request #17978 from alram/rbdmap-fix

rbdmap: fix umount when multiple mounts use the same RBD

Reviewed-by: Dan Mick <dmick@redhat.com>
Reviewed-by: Sage Weil <sage@redhat.com>
7 years agoMerge pull request #17962 from joscollin/wip-test-signed-unsigned-warning
Casey Bodley [Wed, 27 Sep 2017 14:26:49 +0000 (10:26 -0400)]
Merge pull request #17962 from joscollin/wip-test-signed-unsigned-warning

test: silence warnings from -Wsign-compare

Reviewed-by: Amit Kumar <amitkuma@redhat.com>
Reviewed-by: Casey Bodley <cbodley@redhat.com>
7 years agoMerge pull request #17988 from wumingqiao/wip-rados-update
Jos Collin [Wed, 27 Sep 2017 09:07:29 +0000 (09:07 +0000)]
Merge pull request #17988 from wumingqiao/wip-rados-update

include/rados: fix typo in librados.h

Reviewed-by: Jos Collin <jcollin@redhat.com>
7 years agoinclude/rados: fix typo in librados.h 17988/head
wumingqiao [Wed, 27 Sep 2017 08:31:14 +0000 (16:31 +0800)]
include/rados: fix typo in librados.h

opeprate -> operate

Signed-off-by: wumingqiao <wumingqiao@inspur.com>
7 years agorbdmap: fix umount when multiple mounts use the same RBD 17978/head
Alexandre Marangone [Tue, 26 Sep 2017 18:35:04 +0000 (11:35 -0700)]
rbdmap: fix umount when multiple mounts use the same RBD

When a Kubernetes Pod consumes a RBD it is mounted two
times on the same host. When the host shutdown umount will
fail leading to a hung system

Signed-off-by: Alexandre Marangone <amarango@redhat.com>
7 years agoMerge pull request #17063 from bspark8/wip-dynamic-cli-info-f
Yuri Weinstein [Tue, 26 Sep 2017 23:02:19 +0000 (16:02 -0700)]
Merge pull request #17063 from bspark8/wip-dynamic-cli-info-f

osd: use dmclock library client_info_f function dynamically

Reviewed-by: J. Eric Ivancich <ivancich@redhat.com>
7 years agoMerge pull request #17335 from Carudy/cxw
Yuri Weinstein [Tue, 26 Sep 2017 23:01:14 +0000 (16:01 -0700)]
Merge pull request #17335 from Carudy/cxw

crush: safe check for 'ceph osd crush swap-bucket'

Reviewed-by: Kefu Chai <kchai@redhat.com>
7 years agoMerge pull request #17410 from zmedico/PGPool-update-optimize-removed_snaps-compariso...
Yuri Weinstein [Tue, 26 Sep 2017 22:59:59 +0000 (15:59 -0700)]
Merge pull request #17410 from zmedico/PGPool-update-optimize-removed_snaps-comparison-when-possible

PGPool::update: optimize removed_snaps comparison when possible

Reviewed-by: Gregory Farnum <gfarnum@redhat.com>
7 years agoMerge pull request #17980 from liewegas/wip-boost-url
Sage Weil [Tue, 26 Sep 2017 22:07:03 +0000 (17:07 -0500)]
Merge pull request #17980 from liewegas/wip-boost-url

make-dist,cmake: move boost tarball location to download.ceph.com

Reviewed-by: Jeff Layton <jlayton@redhat.com>
7 years agomake-dist,cmake: move boost tarball location to download.ceph.com 17980/head
Sage Weil [Tue, 26 Sep 2017 21:15:17 +0000 (17:15 -0400)]
make-dist,cmake: move boost tarball location to download.ceph.com

Sourceforge is down.  Also, we can hammer our servers instead of
theirs.

Signed-off-by: Sage Weil <sage@redhat.com>
7 years agoMerge pull request #17589 from myENA/feature/20883-adminapi_sync_stats_master
Matt Benjamin [Tue, 26 Sep 2017 16:45:24 +0000 (12:45 -0400)]
Merge pull request #17589 from myENA/feature/20883-adminapi_sync_stats_master

rgw: admin api - add ability to sync user stats from admin api

7 years agoMerge pull request #17433 from C2python/check_action
Matt Benjamin [Tue, 26 Sep 2017 16:40:08 +0000 (12:40 -0400)]
Merge pull request #17433 from C2python/check_action

rgw: Return Error if Bucket Policy Contians Undefined Action

7 years agoMerge pull request #17969 from ceph/rbd-mirror-reboot
Jason Dillaman [Tue, 26 Sep 2017 16:10:16 +0000 (12:10 -0400)]
Merge pull request #17969 from ceph/rbd-mirror-reboot

systemd: rbd-mirror does not start on reboot

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
7 years agoMerge pull request #17929 from renhwztetecs/renhw-wip-mgrmon-command_descs_prefix
Sage Weil [Tue, 26 Sep 2017 13:38:14 +0000 (08:38 -0500)]
Merge pull request #17929 from renhwztetecs/renhw-wip-mgrmon-command_descs_prefix

mon/mgr: sync "mgr_command_descs","osd_metadata" and "mgr_metadata" prefixes to new mons

Reviewed-by: Kefu Chai <kchai@redhat.com>
7 years agoMerge pull request #17932 from jcsp/wip-21197
Sage Weil [Tue, 26 Sep 2017 13:36:24 +0000 (08:36 -0500)]
Merge pull request #17932 from jcsp/wip-21197

mgr: store declared_types in MgrSession

Reviewed-by: Kefu Chai <kchai@redhat.com>
Reviewed-by: Sage Weil <sage@redhat.com>
7 years agoMerge pull request #17933 from jcsp/wip-17737
Sage Weil [Tue, 26 Sep 2017 13:35:52 +0000 (08:35 -0500)]
Merge pull request #17933 from jcsp/wip-17737

mgr: fix crashable DaemonStateIndex::get calls

Reviewed-by: Kefu Chai <kchai@redhat.com>
7 years agoMerge pull request #17944 from thmour/tmour_upmap
Sage Weil [Tue, 26 Sep 2017 13:35:07 +0000 (08:35 -0500)]
Merge pull request #17944 from thmour/tmour_upmap

osd/OSDMap: upmap should respect the osd reweights

Reviewed-by: Sage Weil <sage@redhat.com>
7 years agoMerge pull request #17880 from amitkumar50/cov-rgw-9
Matt Benjamin [Tue, 26 Sep 2017 12:29:09 +0000 (08:29 -0400)]
Merge pull request #17880 from amitkumar50/cov-rgw-9

rgw: Error check on return of read_line()

7 years agorbd-mirorr: does not start on reboot 17969/head
Sébastien Han [Tue, 26 Sep 2017 12:05:37 +0000 (14:05 +0200)]
rbd-mirorr: does not start on reboot

The current systemd unit file misses 'PartOf=ceph-rbd-mirror.target',
which results in the unit not starting after reboot.
If you have ceph-rbd-mirror@rbd-mirror.ceph-rbd-mirror0, it won't start
after reboot even if enabled.
Adding 'PartOf=ceph-rbd-mirror.target' will enable
ceph-rbd-mirror.target when ceph-rbd-mirror@rbd-mirror.ceph-rbd-mirror0
gets enabled.

Signed-off-by: Sébastien Han <seb@redhat.com>
7 years agoMerge pull request #17961 from tchaikov/wip-doc-local-pool-in-toc
John Spray [Tue, 26 Sep 2017 10:31:09 +0000 (11:31 +0100)]
Merge pull request #17961 from tchaikov/wip-doc-local-pool-in-toc

doc/mgr: add "local pool" plugin to toc

Reviewed-by: John Spray <john.spray@redhat.com>
7 years agoMerge pull request #17949 from asomers/nproc_freebsd
Kefu Chai [Tue, 26 Sep 2017 09:45:56 +0000 (17:45 +0800)]
Merge pull request #17949 from asomers/nproc_freebsd

do_{cmake,freebsd}: Don't invoke nproc(1) on FreeBSD

Reviewed-by: Sage Weil <sage@redhat.com>
Reviewed-by: Willem Jan Withagen <wjw@digiware.nl>
Reviewed-by: Kefu Chai <kchai@redhat.com>
7 years agoMerge pull request #17940 from jcsp/wip-21534
Kefu Chai [Tue, 26 Sep 2017 09:09:54 +0000 (17:09 +0800)]
Merge pull request #17940 from jcsp/wip-21534

mon: update get_store_prefixes implementations

Reviewed-by: Joao Eduardo Luis <joao@suse.de>
Reviewed-by: Kefu Chai <kchai@redhat.com>
7 years agotest: silence warnings from -Wsign-compare 17962/head
Jos Collin [Tue, 26 Sep 2017 04:54:08 +0000 (10:24 +0530)]
test: silence warnings from -Wsign-compare

Fixed the warnings:

ceph/src/test/bufferlist.cc:2150:3:   required from here
ceph/src/googletest/googletest/include/gtest/gtest.h:1392:11: warning: comparison between signed and unsigned integer expressions [-Wsign-compare]
   if (lhs == rhs) {

ceph/src/test/bufferlist.cc:2151:3:   required from here
ceph/src/googletest/googletest/include/gtest/gtest.h:1392:11: warning: comparison between signed and unsigned integer expressions [-Wsign-compare]
   if (lhs == rhs) {

Signed-off-by: Jos Collin <jcollin@redhat.com>
7 years agodoc/mgr: add "local pool" plugin to toc 17961/head
Kefu Chai [Tue, 26 Sep 2017 04:10:28 +0000 (12:10 +0800)]
doc/mgr: add "local pool" plugin to toc

Signed-off-by: Kefu Chai <kchai@redhat.com>
7 years agoMerge pull request #17842 from MahatiC/fix_example
Kefu Chai [Tue, 26 Sep 2017 03:15:14 +0000 (11:15 +0800)]
Merge pull request #17842 from MahatiC/fix_example

examples: fix link order in librados example Makefile

Reviewed-by: Kefu Chai <kchai@redhat.com>
7 years agoMerge pull request #17633 from yonghengdexin735/wip-zzz-doc
Jason Dillaman [Tue, 26 Sep 2017 01:40:32 +0000 (21:40 -0400)]
Merge pull request #17633 from yonghengdexin735/wip-zzz-doc

doc/rbd: add info for rbd group

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
7 years agoMerge pull request #17803 from amitkumar50/cov-librbd-5
Jason Dillaman [Tue, 26 Sep 2017 01:33:36 +0000 (21:33 -0400)]
Merge pull request #17803 from amitkumar50/cov-librbd-5

test: address coverity false positives

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
7 years agoMerge pull request #17800 from amitkumar50/cov-misc-8
Jason Dillaman [Tue, 26 Sep 2017 01:31:58 +0000 (21:31 -0400)]
Merge pull request #17800 from amitkumar50/cov-misc-8

test/librbd: initialize on_finish,locker,force,snap_id

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
7 years agodo_{cmake,freebsd}: Don't invoke nproc(1) on FreeBSD 17949/head
Alan Somers [Mon, 25 Sep 2017 21:01:49 +0000 (15:01 -0600)]
do_{cmake,freebsd}: Don't invoke nproc(1) on FreeBSD

Use sysctl(8) instead.  Also, there's no longer any need for /bin/bash
on FreeBSD.

Signed-off-by: Alan Somers <asomers@gmail.com>
7 years agoMerge pull request #17813 from liewegas/wip-21410-note
Sage Weil [Mon, 25 Sep 2017 21:36:36 +0000 (16:36 -0500)]
Merge pull request #17813 from liewegas/wip-21410-note

PendingReleaseNotes: note about upmap mapping change in luminous release notes

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
7 years agoPendingReleaseNotes: note about upmap mapping change in luminous release notes 17813/head
Sage Weil [Tue, 19 Sep 2017 17:51:13 +0000 (12:51 -0500)]
PendingReleaseNotes: note about upmap mapping change in luminous release notes

Signed-off-by: Sage Weil <sage@redhat.com>
7 years agoMerge pull request #17809 from yaozongyou/fix-rgw-file-write-error
Matt Benjamin [Mon, 25 Sep 2017 18:45:57 +0000 (14:45 -0400)]
Merge pull request #17809 from yaozongyou/fix-rgw-file-write-error

rgw_file: fix write error when the write offset overlaps

7 years agoMerge pull request #17947 from batrick/ceph-osd-core-dbg
Sage Weil [Mon, 25 Sep 2017 18:37:22 +0000 (13:37 -0500)]
Merge pull request #17947 from batrick/ceph-osd-core-dbg

ceph-debug-docker.sh: add ceph-osd-dbg package

Reviewed-by: Sage Weil <sage@redhat.com>
7 years agoceph-debug-docker.sh: add ceph-osd-dbg package 17947/head
Patrick Donnelly [Mon, 25 Sep 2017 18:28:47 +0000 (11:28 -0700)]
ceph-debug-docker.sh: add ceph-osd-dbg package

So we can debug ceph-osd cores.

Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
7 years agoosd: upmap should respect osd reweights 17944/head
Theofilos Mouratidis [Mon, 25 Sep 2017 14:17:47 +0000 (16:17 +0200)]
osd: upmap should respect osd reweights

Modify OSDMap::calc_pg_upmaps to take the osd reweight into account when
computing the size of each OSD.

Signed-off-by: Theofilos Mouratidis <t.mour@cern.ch>
Fixes: http://tracker.ceph.com/issues/21538
7 years agotest/cli/osdmaptool: test upmap with an out osd
Theofilos Mouratidis [Mon, 25 Sep 2017 14:15:45 +0000 (16:15 +0200)]
test/cli/osdmaptool: test upmap with an out osd

Test upmap with one osd marked out.

Signed-off-by: Theofilos Mouratidis <t.mour@cern.ch>
7 years agoMerge pull request #17810 from hjwsm1989/wip-21294
Sage Weil [Mon, 25 Sep 2017 17:33:34 +0000 (12:33 -0500)]
Merge pull request #17810 from hjwsm1989/wip-21294

qa/ceph_manager: check pg state again before timedout

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
7 years agoMerge pull request #17661 from yunfeiguan/master
Sage Weil [Mon, 25 Sep 2017 17:33:18 +0000 (12:33 -0500)]
Merge pull request #17661 from yunfeiguan/master

librados: Fix a potential risk of buffer::list::claim_prepend(list& b…

Reviewed-by: Kefu Chai <kchai@redhat.com>
7 years agoMerge pull request #17790 from joscollin/wip-test-warning-signed-unsigned
Sage Weil [Mon, 25 Sep 2017 17:32:53 +0000 (12:32 -0500)]
Merge pull request #17790 from joscollin/wip-test-warning-signed-unsigned

test: silence warning from -Wsign-compare

Reviewed-by: xie xingguo <xie.xingguo@zte.com.cn>
7 years agoMerge pull request #17928 from xiexingguo/wip-more-interval-set-size
Sage Weil [Mon, 25 Sep 2017 17:32:29 +0000 (12:32 -0500)]
Merge pull request #17928 from xiexingguo/wip-more-interval-set-size

osd/PrimaryLogPG: calc clone_overlap size in a more efficient and concise way

Reviewed-by: Sage Weil <sage@redhat.com>
7 years agoMerge pull request #17528 from liewegas/wip-mgr-localpool
Sage Weil [Mon, 25 Sep 2017 17:30:05 +0000 (12:30 -0500)]
Merge pull request #17528 from liewegas/wip-mgr-localpool

pybind/mgr/localpool: module to automagically create localized pools

Reviewed-by: John Spray <john.spray@redhat.com>
7 years agoqa/workunits/mgr/test_localpool: simple test for localpool mode 17528/head
Sage Weil [Sun, 24 Sep 2017 18:05:14 +0000 (14:05 -0400)]
qa/workunits/mgr/test_localpool: simple test for localpool mode

Signed-off-by: Sage Weil <sage@redhat.com>
7 years agoosdmaptool: add --mark-out option
Theofilos Mouratidis [Mon, 25 Sep 2017 14:14:09 +0000 (16:14 +0200)]
osdmaptool: add --mark-out option

Add a --mark-down <id> option which sets the reweight for a given
osd id to 0.0.

Signed-off-by: Theofilos Mouratidis <t.mour@cern.ch>
7 years agoexamples: fix link order in librados example Makefile 17842/head
Mahati Chamarthy [Wed, 20 Sep 2017 14:09:55 +0000 (19:39 +0530)]
examples: fix link order in librados example Makefile

The library link order in librados example Makefile is incorrect
and as a result 'make' throws an error. This change fixes the order.

Signed-off-by: Mahati Chamarthy <mahati.chamarthy@intel.com>
7 years agomon/mgr: sync mgr_command_descs table and mgr_metadata table 17929/head
huanwen ren [Mon, 25 Sep 2017 07:01:02 +0000 (15:01 +0800)]
mon/mgr: sync mgr_command_descs table and mgr_metadata table

sync mgr_command_descs table and mgr_metadata table to new mons

Fixes: http://tracker.ceph.com/issues/21527
Signed-off-by: huanwen ren <ren.huanwen@zte.com.cn>
7 years agomon/osd_metadata: sync osd_metadata table
huanwen ren [Mon, 25 Sep 2017 06:55:55 +0000 (14:55 +0800)]
mon/osd_metadata: sync osd_metadata table

sync osd_metadata table to new mons when add new mons

Signed-off-by: huanwen ren <ren.huanwen@zte.com.cn>
7 years agomgr: fix crashable DaemonStateIndex::get calls 17933/head
John Spray [Sat, 23 Sep 2017 17:21:47 +0000 (13:21 -0400)]
mgr: fix crashable DaemonStateIndex::get calls

This function was recently fixed to return null
on missing entries: handle that properly.

Fixes: http://tracker.ceph.com/issues/17737
Signed-off-by: John Spray <john.spray@redhat.com>
7 years agomon: implement MDSMonitor::get_store_prefixes 17940/head
John Spray [Mon, 25 Sep 2017 09:44:28 +0000 (10:44 +0100)]
mon: implement MDSMonitor::get_store_prefixes

Fixes: http://tracker.ceph.com/issues/21534
Signed-off-by: John Spray <john.spray@redhat.com>
7 years agomon/OSDMonitor: tidy prefix definitions
John Spray [Mon, 25 Sep 2017 09:37:18 +0000 (10:37 +0100)]
mon/OSDMonitor: tidy prefix definitions

We should define them in one place to make it easy
when updating get_store_prefixes.

Fixes: http://tracker.ceph.com/issues/21534
Signed-off-by: John Spray <john.spray@redhat.com>
7 years agomon/osd_metadata: sync osd_metadata table
huanwen ren [Mon, 25 Sep 2017 06:55:55 +0000 (14:55 +0800)]
mon/osd_metadata: sync osd_metadata table

sync osd_metadata table to new mons when add new mons

Signed-off-by: huanwen ren <ren.huanwen@zte.com.cn>
7 years agoMerge pull request #17831 from badone/wip-require-osd-release-with-no-up-osds
Sage Weil [Mon, 25 Sep 2017 02:18:51 +0000 (21:18 -0500)]
Merge pull request #17831 from badone/wip-require-osd-release-with-no-up-osds

mon: osd feature checks with 0 up osds

Reviewed-by: Sage Weil <sage@redhat.com>
7 years agoMerge pull request #17848 from liewegas/wip-ruleset-errors
Sage Weil [Mon, 25 Sep 2017 02:15:42 +0000 (21:15 -0500)]
Merge pull request #17848 from liewegas/wip-ruleset-errors

mon/OSDMonitor: error out if setting ruleset-* ec profile property

Reviewed-by: Joao Eduardo Luis <joao@suse.de>
7 years agoMerge pull request #17902 from tchaikov/wip-21474
Sage Weil [Mon, 25 Sep 2017 02:14:58 +0000 (21:14 -0500)]
Merge pull request #17902 from tchaikov/wip-21474

qa/tasks: prolong revive_osd() timeout to 6 min

Reviewed-by: Sage Weil <sage@redhat.com>
7 years agoMerge pull request #17903 from lixiaoy1/add_func_log
Sage Weil [Mon, 25 Sep 2017 02:14:35 +0000 (21:14 -0500)]
Merge pull request #17903 from lixiaoy1/add_func_log

os/bluestore: Add missing __func__ in dout

Reviewed-by: Jos Collin <jcollin@redhat.com>
7 years agoMerge pull request #17905 from tchaikov/wip-osd_types-cleanup
Sage Weil [Mon, 25 Sep 2017 02:14:09 +0000 (21:14 -0500)]
Merge pull request #17905 from tchaikov/wip-osd_types-cleanup

osd/osd_types: object_info_t: remove unused function

Reviewed-by: Amit Kumar <amitkuma@redhat.com>
Reviewed-by: Sage Weil <sage@redhat.com>
7 years agoMerge pull request #17927 from liewegas/wip-21511
Sage Weil [Mon, 25 Sep 2017 02:13:03 +0000 (21:13 -0500)]
Merge pull request #17927 from liewegas/wip-21511

qa/standalone/scrub/osd-scrub-snaps: adjust test for lack of snapdir objects

Reviewed-by: David Zafman <dzafman@redhat.com>
7 years agoMerge PR #17919 into master
Patrick Donnelly [Mon, 25 Sep 2017 00:07:34 +0000 (17:07 -0700)]
Merge PR #17919 into master

* refs/remotes/upstream/pull/17919/head:
qa: whitelist cache too large in client-limits

Reviewed-by: Zheng Yan <zyan@redhat.com>
7 years agoMerge PR #17918 into master
Patrick Donnelly [Mon, 25 Sep 2017 00:07:32 +0000 (17:07 -0700)]
Merge PR #17918 into master

* refs/remotes/upstream/pull/17918/head:
qa: whitelist failover log warnings

Reviewed-by: Zheng Yan <zyan@redhat.com>
7 years agoMerge PR #17917 into master
Patrick Donnelly [Mon, 25 Sep 2017 00:07:27 +0000 (17:07 -0700)]
Merge PR #17917 into master

* refs/remotes/upstream/pull/17917/head:
qa: ignore evicted client in client-recovery

Reviewed-by: Zheng Yan <zyan@redhat.com>
7 years agomon/OSDMonitor: error out if setting ruleset-* ec profile property 17848/head
Sage Weil [Wed, 20 Sep 2017 20:42:01 +0000 (16:42 -0400)]
mon/OSDMonitor: error out if setting ruleset-* ec profile property

We change ruleset -> crush back in dc7a2aaf7a34b1e6af0c7b79dc44a69974c1da23.
If someone tries to use the old property, error out early, instead of
silently not doing the thing they thought they told us to do.

Signed-off-by: Sage Weil <sage@redhat.com>
7 years agorgw_file: fix write error when the write offset overlaps. 17809/head
Yao Zongyou [Sun, 24 Sep 2017 14:11:22 +0000 (22:11 +0800)]
rgw_file: fix write error when the write offset overlaps.

Signed-off-by: Yao Zongyou <yaozongyou@vip.qq.com>
7 years agomgr: store declared_types in MgrSession 17932/head
John Spray [Sat, 23 Sep 2017 15:55:55 +0000 (11:55 -0400)]
mgr: store declared_types in MgrSession

Because we don't (yet) properly prevent multiple sessions
from daemons reporting the same name (e.g. rgws), storing
it in the DaemonPerfCounters meant that one daemon's report
was referring to another daemon's set of reported types.

This should always have been a property of the session.

The behaviour will still be ugly when multiple daemons
are using the same name (stomping on each other's stats/statsu)
but it shouldn't crash.

Fixes: http://tracker.ceph.com/issues/21197
Signed-off-by: John Spray <john.spray@redhat.com>
7 years agoMerge pull request #17850 from batrick/vstart-confg-path
John Spray [Sat, 23 Sep 2017 15:36:25 +0000 (16:36 +0100)]
Merge pull request #17850 from batrick/vstart-confg-path

qa: revert "qa: use config_path property instead of literal"

Reviewed-by: John Spray <john.spray@redhat.com>
7 years agoMerge pull request #17881 from joscollin/wip-mgr-signed-unsigned-warning
Kefu Chai [Sat, 23 Sep 2017 03:23:50 +0000 (11:23 +0800)]
Merge pull request #17881 from joscollin/wip-mgr-signed-unsigned-warning

mgr: silence warning from -Wsign-compare

Reviewed-by: Kefu Chai <kchai@redhat.com>
7 years agoosd/PrimaryLogPG: calc clone_overlap size in a more efficient and concise way 17928/head
xie xingguo [Sat, 23 Sep 2017 02:54:18 +0000 (10:54 +0800)]
osd/PrimaryLogPG: calc clone_overlap size in a more efficient and concise way

Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
7 years agoqa/standalone/scrub/osd-scrub-snaps: adjust test for lack of snapdir objects 17927/head
Sage Weil [Fri, 22 Sep 2017 21:49:19 +0000 (17:49 -0400)]
qa/standalone/scrub/osd-scrub-snaps: adjust test for lack of snapdir objects

The head_exists stuff is totally gone; those test failures go away.

Signed-off-by: Sage Weil <sage@redhat.com>
7 years agoMerge pull request #17756 from jcsp/wip-19291
Sage Weil [Fri, 22 Sep 2017 21:09:39 +0000 (16:09 -0500)]
Merge pull request #17756 from jcsp/wip-19291

mgr: set explicit thread name

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
7 years agoMerge pull request #17808 from xiexingguo/wip-eqduot-vs-enospc
Sage Weil [Fri, 22 Sep 2017 21:09:09 +0000 (16:09 -0500)]
Merge pull request #17808 from xiexingguo/wip-eqduot-vs-enospc

osd/PrimaryLogPG: prepare_transaction - fix EDQUOT vs ENOSPC

Reviewed-by: Sage Weil <sage@redhat.com>
7 years agoMerge pull request #17819 from neha-ojha/wip-cbt-teuthology-fix-pg-num
Sage Weil [Fri, 22 Sep 2017 21:08:14 +0000 (16:08 -0500)]
Merge pull request #17819 from neha-ojha/wip-cbt-teuthology-fix-pg-num

qa/suites/rados/perf: create pool with lower pg_num

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
7 years agoMerge pull request #17827 from tchaikov/wip-mono-heartbeat
Sage Weil [Fri, 22 Sep 2017 21:07:51 +0000 (16:07 -0500)]
Merge pull request #17827 from tchaikov/wip-mono-heartbeat

common: use mono clock for HeartbeatMap

Reviewed-by: Sage Weil <sage@redhat.com>
7 years agoMerge pull request #17844 from liewegas/wip-21259
Sage Weil [Fri, 22 Sep 2017 21:05:50 +0000 (16:05 -0500)]
Merge pull request #17844 from liewegas/wip-21259

os/bluestore: debug bluestore cache shutdown

7 years agoMerge pull request #17845 from liewegas/wip-21408
Sage Weil [Fri, 22 Sep 2017 21:04:22 +0000 (16:04 -0500)]
Merge pull request #17845 from liewegas/wip-21408

os/bluestore: ignore 0x2000~2000 extent oddity from luminous upgrade

Reviewed-by: Varada Kari <varada.kari@gmail.com>
7 years agoMerge PR #17853 into master
Patrick Donnelly [Fri, 22 Sep 2017 18:33:33 +0000 (11:33 -0700)]
Merge PR #17853 into master

* refs/remotes/upstream/pull/17853/head:
mds: check ongoing catter-gather process before capping log

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
7 years agoMerge PR #17851 into master
Patrick Donnelly [Fri, 22 Sep 2017 18:33:31 +0000 (11:33 -0700)]
Merge PR #17851 into master

* refs/remotes/upstream/pull/17851/head:
client: use unique_ptr for locks
client: use unique_ptr for Formatter

Reviewed-by: Jos Collin <jcollin@redhat.com>
7 years agoMerge PR #17843 into master
Patrick Donnelly [Fri, 22 Sep 2017 18:33:29 +0000 (11:33 -0700)]
Merge PR #17843 into master

* refs/remotes/upstream/pull/17843/head:
ceph_volume_client: perform snapshot operations in

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
7 years agoMerge pull request #17757 from ceph/wip-rgw-ansible-var
vasukulkarni [Fri, 22 Sep 2017 18:22:02 +0000 (11:22 -0700)]
Merge pull request #17757 from ceph/wip-rgw-ansible-var

qa/tests: Add additional required ceph-ansible vars due to upstream changes

7 years agoqa: whitelist cache too large in client-limits 17919/head
Patrick Donnelly [Fri, 22 Sep 2017 16:44:43 +0000 (09:44 -0700)]
qa: whitelist cache too large in client-limits

Fixes: http://tracker.ceph.com/issues/21510
Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
7 years agoqa: whitelist failover log warnings 17918/head
Patrick Donnelly [Fri, 22 Sep 2017 16:42:06 +0000 (09:42 -0700)]
qa: whitelist failover log warnings

Fixes: http://tracker.ceph.com/issues/21509
Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
7 years agoqa: ignore evicted client in client-recovery 17917/head
Patrick Donnelly [Fri, 22 Sep 2017 16:38:59 +0000 (09:38 -0700)]
qa: ignore evicted client in client-recovery

Fixes: http://tracker.ceph.com/issues/21508
Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
7 years agoMerge pull request #17910 from smithfarm/wip-21499
Nathan Cutler [Fri, 22 Sep 2017 15:07:02 +0000 (17:07 +0200)]
Merge pull request #17910 from smithfarm/wip-21499

tests: point-to-point-x: upgrade client.1 to -x along with cluster nodes

Reviewed-by: Casey Bodley <cbodley@redhat.com>
7 years agoMerge pull request #17904 from carltonf/wip-fix-21498
Kefu Chai [Fri, 22 Sep 2017 15:01:59 +0000 (23:01 +0800)]
Merge pull request #17904 from carltonf/wip-fix-21498

ceph-disk: fix '--runtime' omission for ceph-osd service

Reviewed-by: Loic Dachary <ldachary@redhat.com>
Reviewed-by: Nathan Cutler <ncutler@suse.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
7 years agoMerge pull request #17770 from aclamk/fix-bluestore-fio-hash
Kefu Chai [Fri, 22 Sep 2017 14:51:44 +0000 (22:51 +0800)]
Merge pull request #17770 from aclamk/fix-bluestore-fio-hash

bluestore/fio: Fixed problem with all objects having the same hash

Reviewed-by: Casey Bodley <cbodley@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
7 years agoMerge pull request #17901 from tchaikov/wip-cmake-gperftools
Eric Ivancich [Fri, 22 Sep 2017 13:57:33 +0000 (09:57 -0400)]
Merge pull request #17901 from tchaikov/wip-cmake-gperftools

cmake: update the error message for gperftools bug

7 years agoAdd missed __func__ in dout 17903/head
lisali [Fri, 22 Sep 2017 11:27:39 +0000 (07:27 -0400)]
Add missed __func__ in dout

With __func__ it makes users to know where it prints the logs in source code.

Signed-off-by: Xiaoyan Li xiaoyan.li@intel.com
7 years agoqa: point-to-point-x: upgrade client.1 to -x along with cluster nodes 17910/head
Nathan Cutler [Thu, 21 Sep 2017 20:50:06 +0000 (22:50 +0200)]
qa: point-to-point-x: upgrade client.1 to -x along with cluster nodes

The client.1 rgw in workload_x had not been upgraded to -x.

Fixes: http://tracker.ceph.com/issues/21499
Signed-off-by: Nathan Cutler <ncutler@suse.com>
7 years agocrush: safe check for 'ceph osd crush swap-bucket' 17335/head
Carudy [Wed, 30 Aug 2017 02:06:54 +0000 (10:06 +0800)]
crush: safe check for 'ceph osd crush swap-bucket'
The swap method is just swap the two buckets'weight,son and name.So there is a problem when we swap parent and children. When swap two buckets,one should not be ancestor of the other,or there will be a loop,which would destory the structure.

Signed-off-by: Carudy <zhaoyang.han@easystack.cn>
7 years agoosd/osd_types: object_info_t: remove unused function 17905/head
Kefu Chai [Fri, 22 Sep 2017 05:09:44 +0000 (13:09 +0800)]
osd/osd_types: object_info_t: remove unused function

legacy_object_locator_to_ps() is not used anymore, so drop it.

Signed-off-by: Kefu Chai <kchai@redhat.com>
7 years agoMerge pull request #17806 from tchaikov/wip-osdc-new-options
Kefu Chai [Fri, 22 Sep 2017 04:44:36 +0000 (12:44 +0800)]
Merge pull request #17806 from tchaikov/wip-osdc-new-options

osdc/Journaler: use new style options

Reviewed-by: John Spray <john.spray@redhat.com>
Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
7 years agoMerge pull request #17823 from xiexingguo/wip-clone-bytes
Kefu Chai [Fri, 22 Sep 2017 04:43:03 +0000 (12:43 +0800)]
Merge pull request #17823 from xiexingguo/wip-clone-bytes

osd/osd_type: get_clone_bytes - inline size() for overlapping size

Reviewed-by: Kefu Chai <kchai@redhat.com>
7 years agoMerge pull request #17794 from hjwsm1989/wip-21425
Kefu Chai [Fri, 22 Sep 2017 04:42:27 +0000 (12:42 +0800)]
Merge pull request #17794 from hjwsm1989/wip-21425

qa/suites/rest/basic/tasks/rest_test: more whitelisting

Reviewed-by: Kefu Chai <kchai@redhat.com>
7 years agoMerge pull request #17744 from xiexingguo/wip-blue-eio
Kefu Chai [Fri, 22 Sep 2017 04:41:21 +0000 (12:41 +0800)]
Merge pull request #17744 from xiexingguo/wip-blue-eio

os/bluestore: propagate read-EIO to high level callers

Reviewed-by: Sage Weil <sage@redhat.com>
7 years agoMerge pull request #17460 from dengquan/master
Kefu Chai [Fri, 22 Sep 2017 04:40:18 +0000 (12:40 +0800)]
Merge pull request #17460 from dengquan/master

java/native: fix milliseconds to mtime/atime conversion

Reviewed-by: Kefu Chai <kchai@redhat.com>
7 years agomon/OSDMonitor: mon osd feature checks with 0 up osds 17831/head
Brad Hubbard [Wed, 20 Sep 2017 03:15:30 +0000 (13:15 +1000)]
mon/OSDMonitor: mon osd feature checks with 0 up osds

get_up_osd_features() returns 0 if no osds are up which causes feature
checks to fail.

Fixes: http://tracker.ceph.com/issues/21471
Signed-off-by: Brad Hubbard <bhubbard@redhat.com>
7 years agoMerge pull request #17422 from aclamk/fix-cmake-unsupported-allocator
Kefu Chai [Fri, 22 Sep 2017 04:33:36 +0000 (12:33 +0800)]
Merge pull request #17422 from aclamk/fix-cmake-unsupported-allocator

cmake: in case of bad "ALLOCATOR" selected issue warning

Reviewed-by: Kefu Chai <kchai@redhat.com>
7 years agoMerge pull request #17374 from jcsp/wip-mgr-config-tidy
Kefu Chai [Fri, 22 Sep 2017 04:32:13 +0000 (12:32 +0800)]
Merge pull request #17374 from jcsp/wip-mgr-config-tidy

mgr: use new style config opts + add metadata

Reviewed-by: Kefu Chai <kchai@redhat.com>
7 years agoMerge pull request #17309 from jcsp/wip-daemonserver-locks
Kefu Chai [Fri, 22 Sep 2017 04:30:41 +0000 (12:30 +0800)]
Merge pull request #17309 from jcsp/wip-daemonserver-locks

mgr: locking fixes

Reviewed-by: Sage Weil <sage@redhat.com>
7 years agoosdc/Journaler: use new style options 17806/head
Kefu Chai [Tue, 19 Sep 2017 11:16:24 +0000 (19:16 +0800)]
osdc/Journaler: use new style options

also use uint64_t for these options, as they are casted to uint64_t when
reading from conf.

Signed-off-by: Kefu Chai <kchai@redhat.com>
7 years agoMerge pull request #17830 from Yan-waller/wip-walle-0920primarypg
Kefu Chai [Fri, 22 Sep 2017 04:24:07 +0000 (12:24 +0800)]
Merge pull request #17830 from Yan-waller/wip-walle-0920primarypg

osd/PrimaryLogPG: misc cleanups

Reviewed-by: Kefu Chai <kchai@redhat.com>
7 years agoceph-disk: fix '--runtime' omission for ceph-osd service 17904/head
Carl Xiong [Fri, 22 Sep 2017 03:55:33 +0000 (11:55 +0800)]
ceph-disk: fix '--runtime' omission for ceph-osd service

f425a127b introduces a regression that ceph-disk omits "--runtime" when
enabling ceph-osd@$ID.service units for device-backed OSDs.

Fixes: http://tracker.ceph.com/issues/21498
Signed-off-by: Carl Xiong <cxiong@suse.com>