]> git.apps.os.sepia.ceph.com Git - ceph.git/log
ceph.git
8 years agoclient: fix segment fault in Client::_invalidate_kernel_dcache(). 11170/head
Yan, Zheng [Wed, 21 Sep 2016 13:57:25 +0000 (21:57 +0800)]
client: fix segment fault in Client::_invalidate_kernel_dcache().

when umounting, root can be NULL

Fixes: http://tracker.ceph.com/issues/17253
Signed-off-by: Yan, Zheng <zyan@redhat.com>
8 years agoMerge pull request #11144 from tchaikov/wip-17306
Brad Hubbard [Tue, 20 Sep 2016 06:45:23 +0000 (16:45 +1000)]
Merge pull request #11144 from tchaikov/wip-17306

crush/CrushCompiler: error out as long as parse fails

Reviewed-by: Brad Hubbard <bhubbard@redhat.com>
8 years agocrush/CrushCompiler: error out as long as parse fails 11144/head
Kefu Chai [Tue, 20 Sep 2016 06:10:16 +0000 (14:10 +0800)]
crush/CrushCompiler: error out as long as parse fails

do not output compiled crush map if anything goes wrong when parsing
crush map.

Fixes: http://tracker.ceph.com/issues/17306
Signed-off-by: Kefu Chai <kchai@redhat.com>
8 years agoMerge pull request #11129 from xiexingguo/xxg-wip-bluestore-0919
Sage Weil [Tue, 20 Sep 2016 03:11:20 +0000 (22:11 -0500)]
Merge pull request #11129 from xiexingguo/xxg-wip-bluestore-0919

os/bluestore: misc. fixes

Reviewed-by: Sage Weil <sage@redhat.com.
8 years agoMerge pull request #11116 from badone/wip-rm-modprobe-run-cmake-check
Sage Weil [Tue, 20 Sep 2016 03:08:38 +0000 (22:08 -0500)]
Merge pull request #11116 from badone/wip-rm-modprobe-run-cmake-check

run-cmake-check.sh: Remove redundant calls

Reviewed-by: Loic Dachary <ldachary@redhat.com>
Reviewed-by: Ilya Dryomov <idryomov@redhat.com>
8 years agoMerge pull request #10943 from jdurgin/wip-tox-coverage
Dan Mick [Mon, 19 Sep 2016 23:41:19 +0000 (16:41 -0700)]
Merge pull request #10943 from jdurgin/wip-tox-coverage

tox.ini: remove extraneous coverage --omit option

Reviewed-by: Dan Mick <dmick@redhat.com>
8 years agoMerge pull request #11006 from iain-buclaw-sociomantic/pyaiostat
Josh Durgin [Mon, 19 Sep 2016 23:32:34 +0000 (16:32 -0700)]
Merge pull request #11006 from iain-buclaw-sociomantic/pyaiostat

python-rados: implement new aio_stat.

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
8 years agofix test_rgw_ldap.cc for search filter
Matt Benjamin [Mon, 19 Sep 2016 20:54:24 +0000 (16:54 -0400)]
fix test_rgw_ldap.cc for search filter

Signed-off-by: Matt Benjamin <mbenjamin@redhat.com>
8 years agoMerge branch 'ldap-auth-custom-searchfilter' of https://github.com/haklein/ceph into...
Matt Benjamin [Mon, 19 Sep 2016 21:26:29 +0000 (17:26 -0400)]
Merge branch 'ldap-auth-custom-searchfilter' of https://github.com/haklein/ceph into haklein-ldap-auth-custom-searchfilter

8 years agoMerge pull request #11134 from tserlin/wip-tserlin-fix-radosgw-admin-manpage
Casey Bodley [Mon, 19 Sep 2016 20:19:55 +0000 (16:19 -0400)]
Merge pull request #11134 from tserlin/wip-tserlin-fix-radosgw-admin-manpage

Add two options to radosgw-admin.rst manpage

Reviewed-by: Casey Bodley <cbodley@redhat.com>
8 years agoAdd two options to radosgw-admin.rst manpage 11134/head
tserlin [Mon, 19 Sep 2016 18:40:12 +0000 (14:40 -0400)]
Add two options to radosgw-admin.rst manpage

Add '--job-id' and '--max-concurrent-ios' to Orphan Search Options

Fixes: http://tracker.ceph.com/issues/17281
Signed-off-by: Thomas Serlin <tserlin@redhat.com>
8 years agoMerge pull request #11051 from prallabh/wip-17256
Casey Bodley [Mon, 19 Sep 2016 19:25:05 +0000 (15:25 -0400)]
Merge pull request #11051 from prallabh/wip-17256

rgw: Do not archive metadata by default

Reviewed-by: Casey Bodley <cbodley@redhat.com>
8 years agoMerge pull request #11132 from ceph/wip-17167
Casey Bodley [Mon, 19 Sep 2016 18:29:36 +0000 (14:29 -0400)]
Merge pull request #11132 from ceph/wip-17167

rgw: fix decoding of creation_time and last_update.

Reviewed-by: Casey Bodley <cbodley@redhat.com>
8 years agorgw: fix decoding of creation_time and last_update. 11132/head
Orit Wasserman [Mon, 19 Sep 2016 13:05:22 +0000 (15:05 +0200)]
rgw: fix decoding of creation_time and last_update.

Fixes: http://tracker.ceph.com/issues/17167
Signed-off-by: Orit Wasserman <owasserm@redhat.com>
8 years agoMerge pull request #11115 from petermaloney/peter-mds-docs3
John Wilkins [Mon, 19 Sep 2016 15:52:52 +0000 (08:52 -0700)]
Merge pull request #11115 from petermaloney/peter-mds-docs3

doc: manual instructions to set up mds daemon

Reviewed-by: John Wilkins<jowilkin@redhat.com>
8 years agoMerge pull request #11063 from ceph/wip-doc-BZ#1368528
Samuel Just [Mon, 19 Sep 2016 12:31:04 +0000 (05:31 -0700)]
Merge pull request #11063 from ceph/wip-doc-BZ#1368528

Removed reference about pool ownership based on BZ#1368528

Reviewed-by: Samuel Just <sjust@redhat.com>
8 years agoos/bluestore: simplify marking unused logic of blob tail 11129/head
xie xingguo [Mon, 19 Sep 2016 10:30:46 +0000 (18:30 +0800)]
os/bluestore: simplify marking unused logic of blob tail

Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
8 years agoMerge pull request #11104 from dillaman/wip-17283
Mykola Golub [Mon, 19 Sep 2016 11:20:41 +0000 (14:20 +0300)]
Merge pull request #11104 from dillaman/wip-17283

rbd-mirror: concurrent access of event might result in heap corruption

Reviewed-by: Mykola Golub <mgolub@mirantis.com>
8 years agoMerge pull request #11123 from batrick/ceph-create-keys-bugfix
John Spray [Mon, 19 Sep 2016 10:54:03 +0000 (11:54 +0100)]
Merge pull request #11123 from batrick/ceph-create-keys-bugfix

ceph-create-keys: add missing argument comma

Reviewed-by: Kefu Chai <kchai@redhat.com>
Reviewed-by: John Spray <john.spray@redhat.com>
8 years agoMerge pull request #10815 from ceph/wip-qa-workunits-py3
Kefu Chai [Mon, 19 Sep 2016 10:45:34 +0000 (18:45 +0800)]
Merge pull request #10815 from ceph/wip-qa-workunits-py3

Python 3 compatibility for workunits

Reviewed-by: Kefu Chai <kchai@redhat.com>
8 years agoos/bluestore: exercise handle when trying to get through throttlers
xie xingguo [Mon, 19 Sep 2016 08:38:16 +0000 (16:38 +0800)]
os/bluestore: exercise handle when trying to get through throttlers

Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
8 years agoos/bluestore: confirm buffer is empty before moving it into AOUT queue
xie xingguo [Mon, 19 Sep 2016 02:27:39 +0000 (10:27 +0800)]
os/bluestore: confirm buffer is empty before moving it into AOUT queue

Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
8 years agoos/bluestore: avoid reset cache_private if we haven't to
xie xingguo [Mon, 19 Sep 2016 02:24:46 +0000 (10:24 +0800)]
os/bluestore: avoid reset cache_private if we haven't to

Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
8 years agoMerge pull request #11100 from bassamtabbara/rocksdb-build-improvements
Kefu Chai [Mon, 19 Sep 2016 02:17:59 +0000 (10:17 +0800)]
Merge pull request #11100 from bassamtabbara/rocksdb-build-improvements

cmake: enable ccache for rocksdb too

Reviewed-by: Kefu Chai <kchai@redhat.com>
8 years agoMerge pull request #11105 from badone/wip-dnf-enable-build-scripts
Kefu Chai [Mon, 19 Sep 2016 02:15:32 +0000 (10:15 +0800)]
Merge pull request #11105 from badone/wip-dnf-enable-build-scripts

build scripts: Enable dnf for Fedora >= 22

Reviewed-by: Kefu Chai <kchai@redhat.com>
8 years agoMerge pull request #11111 from bassamtabbara/wip-tcmalloc-minimal
Kefu Chai [Mon, 19 Sep 2016 01:57:57 +0000 (09:57 +0800)]
Merge pull request #11111 from bassamtabbara/wip-tcmalloc-minimal

cmake: Support tcmalloc_minimal allocator

Reviewed-by: Kefu Chai <kchai@redhat.com>
8 years agoos/bluestore: fix sanity check of object key length
xie xingguo [Mon, 19 Sep 2016 01:31:29 +0000 (09:31 +0800)]
os/bluestore: fix sanity check of object key length

We now encode shard-id into exactly one byte.

Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
8 years agoMerge pull request #11109 from dmick/master
Sage Weil [Sun, 18 Sep 2016 23:49:13 +0000 (18:49 -0500)]
Merge pull request #11109 from dmick/master

unittest_chain_xattr: account for existing xattrs

Reviewed-by: Sage Weil <sage@redhat.com>
8 years agoMerge pull request #9569 from stiopaa1/osdc_objectCacher_const
Sage Weil [Sun, 18 Sep 2016 22:57:31 +0000 (17:57 -0500)]
Merge pull request #9569 from stiopaa1/osdc_objectCacher_const

osdc/ObjectCacher.h: add const to member functions

Reviewed-by: Sage Weil <sage@redhat.com>
8 years agoMerge pull request #9701 from stiopaa1/osd_removeUnneededReturn
Sage Weil [Sun, 18 Sep 2016 22:56:05 +0000 (17:56 -0500)]
Merge pull request #9701 from stiopaa1/osd_removeUnneededReturn

OSD.cc: remove unneeded return

Reviewed-by: xie xingguo <xie.xingguo@zte.com.cn>
8 years agoMerge pull request #9932 from stiopaa1/test_simple_dispatcher_removeUnusedVariable
Sage Weil [Sun, 18 Sep 2016 22:55:01 +0000 (17:55 -0500)]
Merge pull request #9932 from stiopaa1/test_simple_dispatcher_removeUnusedVariable

test/simple_dispatcher.cc: remove unused variable

Reviewed-by: Sage Weil <sage@redhat.com>
8 years agoMerge pull request #10071 from stiopaa1/compatset_removeUnneededInline_mc
Sage Weil [Sun, 18 Sep 2016 22:54:39 +0000 (17:54 -0500)]
Merge pull request #10071 from stiopaa1/compatset_removeUnneededInline_mc

CompatSet.h: remove unneeded inline

Reviewed-by: Sage Weil <sage@redhat.com>
8 years agoMerge pull request #10503 from stiopaa1/msg_queuestrategy_addOverrideNew
Sage Weil [Sun, 18 Sep 2016 22:52:00 +0000 (17:52 -0500)]
Merge pull request #10503 from stiopaa1/msg_queuestrategy_addOverrideNew

msg/QueueStrategy: add override to virtual functs

Reviewed-by: Sage Weil <sage@redhat.com>
8 years agoMerge pull request #10575 from stiopaa1/mon_osdmonitor_removeUnneededCasts
Sage Weil [Sun, 18 Sep 2016 22:51:25 +0000 (17:51 -0500)]
Merge pull request #10575 from stiopaa1/mon_osdmonitor_removeUnneededCasts

mon/OSDMonitor.cc: remove unneeded casts

Reviewed-by: Sage Weil <sage@redhat.com>
8 years agoMerge pull request #10599 from stiopaa1/mon_monclient_deleteCopyConstrAndAssing
Sage Weil [Sun, 18 Sep 2016 22:46:23 +0000 (17:46 -0500)]
Merge pull request #10599 from stiopaa1/mon_monclient_deleteCopyConstrAndAssing

mon/MonClient.h: delete copy constr and assing op

Reviewed-by: Sage Weil <sage@redhat.com>
8 years agoMerge pull request #10618 from stiopaa1/mon_configkeyservice_passStringByConstRef
Sage Weil [Sun, 18 Sep 2016 22:45:38 +0000 (17:45 -0500)]
Merge pull request #10618 from stiopaa1/mon_configkeyservice_passStringByConstRef

mon/ConfigKeyService: pass strings by const ref

Reviewed-by: Sage Weil <sage@redhat.com>
8 years agoMerge pull request #10639 from stiopaa1/common_trackedop_moveShardedTrackingData
Sage Weil [Sun, 18 Sep 2016 22:44:59 +0000 (17:44 -0500)]
Merge pull request #10639 from stiopaa1/common_trackedop_moveShardedTrackingData

common/TrackedOp: move ShardedTrackingData to .cc

Reviewed-by: Sage Weil <sage@redhat.com>
8 years agoMerge pull request #10721 from stiopaa1/mon_logmonitor_moveCLogStruct
Sage Weil [Sun, 18 Sep 2016 22:44:24 +0000 (17:44 -0500)]
Merge pull request #10721 from stiopaa1/mon_logmonitor_moveCLogStruct

mon/LogMonitor: move C_Log struct to cc file

Reviewed-by: Sage Weil <sage@redhat.com>
8 years agoMerge pull request #10549 from stiopaa1/mon_healthmonitor_addOverride
Sage Weil [Sun, 18 Sep 2016 22:43:40 +0000 (17:43 -0500)]
Merge pull request #10549 from stiopaa1/mon_healthmonitor_addOverride

mon/HealthMonitor: add override to virtual functs

Reviewed-by: Sage Weil <sage@redhat.com>
8 years agoMerge pull request #10529 from stiopaa1/mon_paxosservice_moveClassesTocc
Sage Weil [Sun, 18 Sep 2016 22:43:18 +0000 (17:43 -0500)]
Merge pull request #10529 from stiopaa1/mon_paxosservice_moveClassesTocc

mon/PaxosService: move classes to cc file

Reviewed-by: Sage Weil <sage@redhat.com>
8 years agoMerge pull request #10422 from stiopaa1/msg_accepter_addOverride
Sage Weil [Sun, 18 Sep 2016 22:42:48 +0000 (17:42 -0500)]
Merge pull request #10422 from stiopaa1/msg_accepter_addOverride

msg/Accepter.h: add override to virtual function

Reviewed-by: Sage Weil <sage@redhat.com>
8 years agoMerge pull request #10416 from stiopaa1/mon_elector_moveCElectionExpire
Sage Weil [Sun, 18 Sep 2016 22:42:17 +0000 (17:42 -0500)]
Merge pull request #10416 from stiopaa1/mon_elector_moveCElectionExpire

mon/Elector:move C_ElectionExpire class to cc file

Reviewed-by: Sage Weil <sage@redhat.com>
8 years agoMerge pull request #10383 from stiopaa1/mon_monclient_moveCTickClass
Sage Weil [Sun, 18 Sep 2016 22:40:25 +0000 (17:40 -0500)]
Merge pull request #10383 from stiopaa1/mon_monclient_moveCTickClass

mon/MonClient: move C_Tick struct to cc file

Reviewed-by: Sage Weil <sage@redhat.com>
8 years agoMerge pull request #10441 from stiopaa1/msg_accepter_moveIncludeToCC
Sage Weil [Sun, 18 Sep 2016 22:39:57 +0000 (17:39 -0500)]
Merge pull request #10441 from stiopaa1/msg_accepter_moveIncludeToCC

msg/Accepter: move include to cc file

Reviewed-by: Sage Weil <sage@redhat.com>
8 years agoMerge pull request #10513 from stiopaa1/mon_monitor_moveCScrubCScrubTimeout
Sage Weil [Sun, 18 Sep 2016 22:39:04 +0000 (17:39 -0500)]
Merge pull request #10513 from stiopaa1/mon_monitor_moveCScrubCScrubTimeout

mon/Monitor: move C_Scrub, C_ScrubTimeout to .cc

Reviewed-by: Sage Weil <sage@redhat.com>
8 years agoMerge pull request #10482 from stiopaa1/msg_faststrategy_addOverride
Sage Weil [Sun, 18 Sep 2016 22:38:07 +0000 (17:38 -0500)]
Merge pull request #10482 from stiopaa1/msg_faststrategy_addOverride

msg/FastStrategy.h: add override to virtual funct

Reviewed-by: Sage Weil <sage@redhat.com>
8 years agoMerge pull request #10605 from stiopaa1/mon_monclient_passStringsByRef
Sage Weil [Sun, 18 Sep 2016 22:37:18 +0000 (17:37 -0500)]
Merge pull request #10605 from stiopaa1/mon_monclient_passStringsByRef

mon/MonClient.h: pass strings by const reference

Reviewed-by: Sage Weil <sage@redhat.com>
8 years agoMerge pull request #10734 from stiopaa1/osdc_objecter_moveRequestStatHook
Sage Weil [Sun, 18 Sep 2016 22:36:48 +0000 (17:36 -0500)]
Merge pull request #10734 from stiopaa1/osdc_objecter_moveRequestStatHook

osdc/Objecter: move RequestStateHook class to .cc

Reviewed-by: Sage Weil <sage@redhat.com>
8 years agoMerge pull request #10833 from stiopaa1/os_memstore_moveBufferlistObject
Sage Weil [Sun, 18 Sep 2016 22:36:06 +0000 (17:36 -0500)]
Merge pull request #10833 from stiopaa1/os_memstore_moveBufferlistObject

os/MemStore: move BufferlistObject to .cc file

Reviewed-by: Sage Weil <sage@redhat.com>
8 years agoMerge pull request #11099 from stiopaa1/osd_osd_finalInitInitializeVar
Sage Weil [Sun, 18 Sep 2016 22:34:54 +0000 (17:34 -0500)]
Merge pull request #11099 from stiopaa1/osd_osd_finalInitInitializeVar

osd/OSD.cc: initialise variable at definition

8 years agoMerge pull request #11114 from stiopaa1/osd_osd_addConsts
Sage Weil [Sun, 18 Sep 2016 22:34:41 +0000 (17:34 -0500)]
Merge pull request #11114 from stiopaa1/osd_osd_addConsts

osd/OSD.h: add const to member functions

Reviewed-by: Sage Weil <sage@redhat.com>
8 years agoceph-create-keys: add missing argument comma 11123/head
Patrick Donnelly [Sun, 18 Sep 2016 20:26:29 +0000 (16:26 -0400)]
ceph-create-keys: add missing argument comma

The arguments "get" and "client.admin" were being concatenated into
"getclient.admin".

Found using ceph-ansible + strace:

    13031 execve("/usr/bin/ceph", ["ceph", "--cluster=ceph", "--name=mon.", "--keyring=/var/lib/ceph/mon/ceph-ceph-mon0/keyring", "auth", "getclient.admin"], ["PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin", "LANG=en_US.UTF-8", "CLUSTER=ceph", "TCMALLOC_MAX_TOTAL_THREAD_CACHE_BYTES=134217728", "CEPH_AUTO_RESTART_ON_UPGRADE=no"] <unfinished ...>

Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
8 years agoSupport tcmalloc_minimal allocator 11111/head
Bassam Tabbara [Sat, 17 Sep 2016 04:51:05 +0000 (21:51 -0700)]
Support tcmalloc_minimal allocator

Signed-off-by: Bassam Tabbara <bassam.tabbara@quantum.com>
8 years agoenable ccache for rocksdb too 11100/head
Bassam Tabbara [Thu, 15 Sep 2016 05:12:10 +0000 (22:12 -0700)]
enable ccache for rocksdb too

Signed-off-by: Bassam Tabbara <bassam.tabbara@quantum.com>
8 years agoMerge pull request #11117 from xiexingguo/xxg-wip-mon-0918
Kefu Chai [Sun, 18 Sep 2016 05:05:17 +0000 (13:05 +0800)]
Merge pull request #11117 from xiexingguo/xxg-wip-mon-0918

tools/rebuild_mondb: kill comipling warning and other fixes

Reviewed-by: Kefu Chai <kchai@redhat.com>
8 years agotools/rebuild_mondb: kill compiling warning 11117/head
xie xingguo [Sun, 18 Sep 2016 03:40:56 +0000 (11:40 +0800)]
tools/rebuild_mondb: kill compiling warning

As follow:

[ 72%] Building CXX object src/tools/CMakeFiles/ceph-objectstore-tool.dir/RadosDump.cc.o
/home/jenkins-build/build/workspace/ceph-pull-requests/src/tools/rebuild_mondb.cc: In function ‘int update_mon_db(ObjectStore&, OSDSuperblock&, const string&, const string&)’:
/home/jenkins-build/build/workspace/ceph-pull-requests/src/tools/rebuild_mondb.cc:289:22: warning: ‘crc’ may be used uninitialized in this function [-Wmaybe-uninitialized]
         if (have_crc && osdmap.get_crc() != crc) {
                      ^
/home/jenkins-build/build/workspace/ceph-pull-requests/src/tools/rebuild_mondb.cc:238:14: note: ‘crc’ was declared here
     uint32_t crc;

Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
8 years agotools/ceph_objectstore_tool: set error code if path of mon-db does not exist
xie xingguo [Sun, 18 Sep 2016 02:48:26 +0000 (10:48 +0800)]
tools/ceph_objectstore_tool: set error code if path of mon-db does not exist

Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
8 years agotools/rebuild_mondb: return error if ondisk version of pg_info is incompatible
xie xingguo [Sun, 18 Sep 2016 02:43:10 +0000 (10:43 +0800)]
tools/rebuild_mondb: return error if ondisk version of pg_info is incompatible

In this case "r" will be >= 0 and caller will be able to catch
this kind of error.

Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
8 years agotools/rebuild_mondb: avoid unnecessary result code cast
xie xingguo [Sun, 18 Sep 2016 02:33:56 +0000 (10:33 +0800)]
tools/rebuild_mondb: avoid unnecessary result code cast

In general we return negative codes for error cases, so there is
no need perform the cast here.

Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
8 years agorun-cmake-check.sh: Remove redundant calls 11116/head
Brad Hubbard [Sat, 17 Sep 2016 02:19:23 +0000 (12:19 +1000)]
run-cmake-check.sh: Remove redundant calls

Calling "git submodule init" is redundant since it is called in do_cmake.sh and
there's no reason to do a modprobe of rbd.ko here either.

Signed-off-by: Brad Hubbard <bhubbard@redhat.com>
8 years agodoc: manual instructions to set up mds daemon 11115/head
Peter Maloney [Sat, 17 Sep 2016 20:29:49 +0000 (22:29 +0200)]
doc: manual instructions to set up mds daemon

Signed-off-by: Peter Maloney <peter.maloney@brockmann-consult.de>
8 years agoMerge pull request #8558 from branch-predictor/bp-mark-down-on-perm-rst
Yuri Weinstein [Sat, 17 Sep 2016 15:48:11 +0000 (08:48 -0700)]
Merge pull request #8558 from branch-predictor/bp-mark-down-on-perm-rst

msg: mark daemons down on RST + ECONNREFUSED

Reviewed-by: Sage Weil <sage@redhat.com>
Reviewed-by: Gregory Farnum <gfarnum@redhat.com>
Reviewed-by: Haomai Wang <haomai@xsky.com>
8 years agoMerge pull request #11050 from xiexingguo/xxg-wip-os-0912
Yuri Weinstein [Sat, 17 Sep 2016 15:45:45 +0000 (08:45 -0700)]
Merge pull request #11050 from xiexingguo/xxg-wip-os-0912

os/ObjectStore: fix return code of collection_empty() method

Reviewed-by: Sage Weil <sage@redhat.com>
8 years agoMerge pull request #11112 from dillaman/wip-17289
Mykola Golub [Sat, 17 Sep 2016 14:21:26 +0000 (17:21 +0300)]
Merge pull request #11112 from dillaman/wip-17289

librbd: corrected use-after-free in ImageWatcher

Reviewed-by: Mykola Golub <mgolub@mirantis.com>
8 years agoosd/OSD.h: add const to member functions 11114/head
Michal Jarzabek [Sat, 17 Sep 2016 14:07:24 +0000 (15:07 +0100)]
osd/OSD.h: add const to member functions

Signed-off-by: Michal Jarzabek <stiopa@gmail.com>
8 years agoMerge pull request #10933 from tchaikov/wip-rebuild-monstore
Kefu Chai [Sat, 17 Sep 2016 13:29:52 +0000 (21:29 +0800)]
Merge pull request #10933 from tchaikov/wip-rebuild-monstore

tools: rebuild monstore

Reviewed-by: Samuel Just <sjust@redhat.com>
Reviewed-by: Greg Farnum <gfarnum@redhat.com>
Reviewed-by: Joao Eduardo Luis <joao@suse.de>
8 years agolibrbd: corrected use-after-free in ImageWatcher 11112/head
Jason Dillaman [Sat, 17 Sep 2016 12:29:15 +0000 (08:29 -0400)]
librbd: corrected use-after-free in ImageWatcher

Fixes: http://tracker.ceph.com/issues/17289
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
8 years agounittest_chain_xattr: account for existing xattrs 11109/head
Dan Mick [Fri, 16 Sep 2016 22:37:15 +0000 (15:37 -0700)]
unittest_chain_xattr: account for existing xattrs

On CentOS with selinux enabled, files always have an
xattr 'security.selinux'.  Account for that when adding/
removing xattrs.

Fixes: http://tracker.ceph.com/issues/16025
Signed-off-by: Dan Mick <dan.mick@redhat.com>
8 years agoMerge pull request #11107 from stiopaa1/msg_stack_deletecopyAssign
Sage Weil [Fri, 16 Sep 2016 21:27:19 +0000 (16:27 -0500)]
Merge pull request #11107 from stiopaa1/msg_stack_deletecopyAssign

msg/Stack.h: delete copy constr and assign op

8 years agomsg/Stack.h: delete copy constr and assign op 11107/head
Michal Jarzabek [Fri, 16 Sep 2016 17:43:14 +0000 (18:43 +0100)]
msg/Stack.h: delete copy constr and assign op

Signed-off-by: Michal Jarzabek <stiopa@gmail.com>
8 years agoMerge pull request #11106 from liewegas/wip-bluestore-clone-range
Sage Weil [Fri, 16 Sep 2016 16:18:56 +0000 (11:18 -0500)]
Merge pull request #11106 from liewegas/wip-bluestore-clone-range

os/bluestore: make clone_range copy-on-write

8 years agoMerge pull request #11101 from andihit/master
Ilya Dryomov [Fri, 16 Sep 2016 15:56:38 +0000 (17:56 +0200)]
Merge pull request #11101 from andihit/master

doc: fix description for rsize and rasize

Reviewed-by: Ilya Dryomov <idryomov@gmail.com>
8 years agoMerge pull request #10267 from cbodley/wip-fio-objectstore
Sage Weil [Fri, 16 Sep 2016 15:26:36 +0000 (10:26 -0500)]
Merge pull request #10267 from cbodley/wip-fio-objectstore

fio engine for objectstore

Reviewed-by: Igor Fedotov <ifedotov@mirantis.com>
Reviewed-by: Samuel Just <sjust@redhat.com>
8 years agoos/bluestore: do not dup Blob::id in dup() 11106/head
Sage Weil [Fri, 16 Sep 2016 15:05:52 +0000 (11:05 -0400)]
os/bluestore: do not dup Blob::id in dup()

This field is local to a particular onode!

Signed-off-by: Sage Weil <sage@redhat.com>
8 years agoos/bluestore: add cow clone_range via _do_clone_range
Sage Weil [Fri, 16 Sep 2016 14:15:33 +0000 (10:15 -0400)]
os/bluestore: add cow clone_range via _do_clone_range

Signed-off-by: Sage Weil <sage@redhat.com>
8 years agoos/bluestore: factor _do_clone_range out of _clone
Sage Weil [Fri, 16 Sep 2016 14:15:12 +0000 (10:15 -0400)]
os/bluestore: factor _do_clone_range out of _clone

Signed-off-by: Sage Weil <sage@redhat.com>
8 years agoos/bluestore: CLONE implicitly creates the target
Sage Weil [Thu, 15 Sep 2016 19:39:54 +0000 (15:39 -0400)]
os/bluestore: CLONE implicitly creates the target

Signed-off-by: Sage Weil <sage@redhat.com>
8 years agoos/bluestore: EINVAL bad clone_range args
Sage Weil [Thu, 15 Sep 2016 21:41:49 +0000 (17:41 -0400)]
os/bluestore: EINVAL bad clone_range args

Signed-off-by: Sage Weil <sage@redhat.com>
8 years agoMerge pull request #10841 from fiskn/master
Ilya Dryomov [Fri, 16 Sep 2016 14:22:28 +0000 (16:22 +0200)]
Merge pull request #10841 from fiskn/master

udev: add krbd readahead placeholder

Reviewed-by: Ilya Dryomov <idryomov@gmail.com>
8 years agoMerge pull request #11075 from badone/wip-run-cmake-check-ctest
Sage Weil [Fri, 16 Sep 2016 13:56:20 +0000 (08:56 -0500)]
Merge pull request #11075 from badone/wip-run-cmake-check-ctest

run-cmake-check.sh: Actually run the tests

8 years agoudev: add krbd readahead placeholder 10841/head
fiskn [Wed, 24 Aug 2016 13:45:22 +0000 (14:45 +0100)]
udev: add krbd readahead placeholder

Signed-off-by: Nick Fisk <nick@fisk.me.uk>
8 years agoMerge pull request #10687 from rzarzynski/wip-rgw-is_admin-fix
Orit Wasserman [Fri, 16 Sep 2016 13:32:40 +0000 (15:32 +0200)]
Merge pull request #10687 from rzarzynski/wip-rgw-is_admin-fix

rgw: fix is_admin handling in RGWLDAPAuthEngine and introduce acct_privilege_t
Reviewed-by: Orit Wasserman <owasserm@redhat.com>
8 years agobuild scripts: Enable dnf for Fedora >= 22 11105/head
Brad Hubbard [Fri, 16 Sep 2016 04:29:15 +0000 (14:29 +1000)]
build scripts: Enable dnf for Fedora >= 22

The use of yum triggers a warning and reference to yum2dnf on Fedora >= 22.
Use either yum or dnf based on the Fedora version.

Signed-off-by: Brad Hubbard <bhubbard@redhat.com>
8 years agoMerge pull request #11102 from ceph/wip-17279
Orit Wasserman [Fri, 16 Sep 2016 07:24:23 +0000 (09:24 +0200)]
Merge pull request #11102 from ceph/wip-17279

rgw: revert a commit that broke s3 signature validation
Reviewed-by: Orit Wasserman <owasserm@redhat.com>
8 years agorun-cmake-check.sh: Actually run the tests 11075/head
Brad Hubbard [Wed, 14 Sep 2016 08:28:41 +0000 (18:28 +1000)]
run-cmake-check.sh: Actually run the tests

Actually run the tests from run-cmake-check.sh

Signed-off-by: Brad Hubbard <bhubbard@redhat.com>
8 years agorbd-mirror: concurrent access of event might result in heap corruption 11104/head
Jason Dillaman [Thu, 15 Sep 2016 22:14:15 +0000 (18:14 -0400)]
rbd-mirror: concurrent access of event might result in heap corruption

Fixes: http://tracker.ceph.com/issues/17283
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
8 years agoMerge pull request #11098 from ktdreyer/wip-17280-help-orphan-stale-secs
Casey Bodley [Thu, 15 Sep 2016 20:25:29 +0000 (16:25 -0400)]
Merge pull request #11098 from ktdreyer/wip-17280-help-orphan-stale-secs

radosgw-admin: add "--orphan-stale-secs" to --help

Reviewed-by: Casey Bodley <cbodley@redhat.com>
8 years agodoc: fix description for rsize and rasize 11101/head
Andreas Gerstmayr [Thu, 15 Sep 2016 20:02:23 +0000 (22:02 +0200)]
doc: fix description for rsize and rasize

Signed-off-by: Andreas Gerstmayr <andreas.gerstmayr@gmail.com>
8 years agoRevert "rgw: Fix Host->bucket fallback logic inversion" 11102/head
Casey Bodley [Thu, 15 Sep 2016 19:49:34 +0000 (15:49 -0400)]
Revert "rgw: Fix Host->bucket fallback logic inversion"

This reverts commit 0e0a4bc3dcb61c2e8dfe65daefe207c62b36306c.

this commit, while logically correct, causes us to add a / to the end of
the request_uri. this breaks signature verification, because the initial
signature was generated without the /

Fixes: http://tracker.ceph.com/issues/17279
Signed-off-by: Casey Bodley <cbodley@redhat.com>
8 years agoradosgw-admin: add "--orphan-stale-secs" to --help 11098/head
Ken Dreyer [Thu, 15 Sep 2016 18:56:39 +0000 (12:56 -0600)]
radosgw-admin: add "--orphan-stale-secs" to --help

The radosgw-admin --help did not include the description of the
`--orphan-stale-secs` option of the `orphans find` command. The option
sets the number of seconds to wait before declaring an object to be an
orphan.

Fixes: http://tracker.ceph.com/issues/17280
Signed-off-by: Ken Dreyer <kdreyer@redhat.com>
8 years agoosd/OSD.cc: initialise variable at definition 11099/head
Michal Jarzabek [Thu, 15 Sep 2016 19:05:42 +0000 (20:05 +0100)]
osd/OSD.cc: initialise variable at definition

Signed-off-by: Michal Jarzabek <stiopa@gmail.com>
8 years agoMerge pull request #11097 from ktdreyer/wip-17280-doc-orphan-stale-secs
Casey Bodley [Thu, 15 Sep 2016 18:40:04 +0000 (14:40 -0400)]
Merge pull request #11097 from ktdreyer/wip-17280-doc-orphan-stale-secs

doc: add "--orphan-stale-secs" to radosgw-admin(8)

Reviewed-by: Casey Bodley <cbodley@redhat.com>
8 years agoMerge pull request #10415 from jcsp/wip-16255
Sage Weil [Thu, 15 Sep 2016 18:19:11 +0000 (13:19 -0500)]
Merge pull request #10415 from jcsp/wip-16255

ceph-create-keys: fix existing-but-different case

Reviewed-by: Kefu Chai <kchai@redhat.com>
Reviewed-by: Alfredo Deza <adeza@redhat.com>
8 years agodoc: add "--orphan-stale-secs" to radosgw-admin(8) 11097/head
Ken Dreyer [Thu, 15 Sep 2016 17:40:14 +0000 (11:40 -0600)]
doc: add "--orphan-stale-secs" to radosgw-admin(8)

The radosgw-admin(8) manual page did not include the description of the
`--orphan-stale-secs` option of the `orphans find` command. The option sets
the number of seconds to wait before declaring an object to be an
orphan.

Fixes: http://tracker.ceph.com/issues/17280
Signed-off-by: Ken Dreyer <kdreyer@redhat.com>
8 years agoMerge pull request #11095 from liewegas/wip-bluefs
Sage Weil [Thu, 15 Sep 2016 16:54:32 +0000 (11:54 -0500)]
Merge pull request #11095 from liewegas/wip-bluefs

os/bluestore/BlueFS: prevent concurrent async compaction

8 years agoos/bluestore/BlueFS: add assert for sanity/clarity 11095/head
Sage Weil [Thu, 15 Sep 2016 16:20:01 +0000 (12:20 -0400)]
os/bluestore/BlueFS: add assert for sanity/clarity

Signed-off-by: Sage Weil <sage@redhat.com>
8 years agoMerge pull request #11096 from ifed01/wip-bluestore-compression-test-fix
Sage Weil [Thu, 15 Sep 2016 15:40:17 +0000 (10:40 -0500)]
Merge pull request #11096 from ifed01/wip-bluestore-compression-test-fix

test/store_test: fix statfs results check to consider SSD min_alloc_size

Reviewed-by: Sage Weil <sage@redhat.com>
8 years agoos/bluestore/BlueFS: prevent concurrent async compaction
Sage Weil [Thu, 15 Sep 2016 15:37:11 +0000 (11:37 -0400)]
os/bluestore/BlueFS: prevent concurrent async compaction

Tried to fix this in dbe23c94c0074358380a40d47a417f7999920696
but got the condition wrong (log_flushing is for
normal fsync).

Signed-off-by: Sage Weil <sage@redhat.com>
8 years agotest/store_test: fix statfs results check to consider SSD min_alloc_size 11096/head
Igor Fedotov [Thu, 15 Sep 2016 15:33:23 +0000 (15:33 +0000)]
test/store_test: fix statfs results check to consider SSD min_alloc_size

Signed-off-by: Igor Fedotov <ifedotov@mirantis.com>
8 years agoMerge pull request #11081 from ifed01/wip-plugin-registry-fix
Sage Weil [Thu, 15 Sep 2016 14:35:31 +0000 (09:35 -0500)]
Merge pull request #11081 from ifed01/wip-plugin-registry-fix

common/PluginRegistry: improve error output for shared library load fa…

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