]> git.apps.os.sepia.ceph.com Git - ceph.git/log
ceph.git
9 years agoceph-disk,ceph-detect-init: clean the build directory 7605/head
Loic Dachary [Thu, 11 Feb 2016 17:09:44 +0000 (00:09 +0700)]
ceph-disk,ceph-detect-init: clean the build directory

b030d8fc113736b479e84246b6b36d5f698a2da3 should have kept the build
directory in .gitignore and the clean target. Re-adding.

Signed-off-by: Loic Dachary <loic@dachary.org>
9 years agopython: use pip instead of python setup.py
Loic Dachary [Thu, 11 Feb 2016 11:47:55 +0000 (18:47 +0700)]
python: use pip instead of python setup.py

python setup.py develop may try to pull dependencies from the net and
has no way to collect them from the wheelhouse that was populated by
install-deps.sh. Use pip install -e instead

Signed-off-by: Loic Dachary <loic@dachary.org>
9 years agoMerge pull request #5961 from majianpeng/small-fix
Sage Weil [Thu, 11 Feb 2016 13:46:22 +0000 (08:46 -0500)]
Merge pull request #5961 from majianpeng/small-fix

osd: clean up CMPXATTR checks

Reviewed-by: Samuel Just <sjust@redhat.com>
Reviewed-by: Sage Weil <sage@redhat.com>
9 years agoMerge pull request #7533 from Cdiscount/master
Sage Weil [Thu, 11 Feb 2016 13:45:17 +0000 (08:45 -0500)]
Merge pull request #7533 from Cdiscount/master

debian: include cpio in build-requiers

Reviewed-by: Sage Weil <sage@redhat.com>
9 years agoMerge pull request #7537 from ifed01/wip-no-promote-for-delete-fix
Sage Weil [Thu, 11 Feb 2016 13:44:35 +0000 (08:44 -0500)]
Merge pull request #7537 from ifed01/wip-no-promote-for-delete-fix

osd: fix unnecessary object promotion when deleting from cache pool

Reviewed-by: Sage Weil <sage@redhat.com>
9 years agoMerge pull request #7567 from branch-predictor/bp-slimdown-conns
Sage Weil [Thu, 11 Feb 2016 13:43:46 +0000 (08:43 -0500)]
Merge pull request #7567 from branch-predictor/bp-slimdown-conns

msg: significantly reduce minimal memory usage of connections

Reviewed-by: Sage Weil <sage@redhat.com>
9 years agoMerge pull request #7579 from javacruft/wip-systemd-escaping
Sage Weil [Thu, 11 Feb 2016 13:42:50 +0000 (08:42 -0500)]
Merge pull request #7579 from javacruft/wip-systemd-escaping

systemd: correctly escape block device paths

Reviewed-by: Sage Weil <sage@redhat.com>
9 years agoMerge pull request #7581 from jcsp/wip-asok-lockdep
Sage Weil [Thu, 11 Feb 2016 13:42:26 +0000 (08:42 -0500)]
Merge pull request #7581 from jcsp/wip-asok-lockdep

librados: mix lock cycle (un)registering asok commands

Reviewed-by: Sage Weil <sage@redhat.com>
9 years agoMerge pull request #7604 from ceph/wip-selinux-update-radosgw-log
Sage Weil [Thu, 11 Feb 2016 13:37:50 +0000 (08:37 -0500)]
Merge pull request #7604 from ceph/wip-selinux-update-radosgw-log

selinux: allow log files to be located in /var/log/radosgw

Reviewed-by: Sage Weil <sage@redhat.com>
9 years agoMerge pull request #7606 from tchaikov/wip-fix-ceph-disk
Loic Dachary [Thu, 11 Feb 2016 12:18:34 +0000 (19:18 +0700)]
Merge pull request #7606 from tchaikov/wip-fix-ceph-disk

tests: ceph-disk.sh: use "readlink -f" instead for fullpath

Reviewed-by: Loic Dachary <ldachary@redhat.com>
9 years agotests: ceph-disk.sh: use "readlink -f" instead for fullpath 7606/head
Kefu Chai [Thu, 11 Feb 2016 12:08:32 +0000 (20:08 +0800)]
tests: ceph-disk.sh: use "readlink -f" instead for fullpath

if $PATH has ".." in it, and the program happen to be located in
"..", `which program` will print `../program` instead of its fullpath,
so we should always use `readlink -f` for the fullpath.

Signed-off-by: Kefu Chai <kchai@redhat.com>
9 years agoselinux: Allow log files to be located in /var/log/radosgw 7604/head
Boris Ranto [Thu, 11 Feb 2016 11:03:06 +0000 (12:03 +0100)]
selinux: Allow log files to be located in /var/log/radosgw

We do suggest users to put their logs in /var/log/radosgw in the
documentation at times. We should also label that directory with
ceph_var_log_t so that ceph daemons can also write there.

The commit also updates the man page for this policy. This man page is
automatically generated by

* sepolicy manpage -p . -d ceph_t

and have not been reloaded in a while. Hence, it contains few more
changes than the new radosgw directory.

Signed-off-by: Boris Ranto <branto@redhat.com>
9 years agoMerge pull request #7601 from jjhuo/master
Haomai Wang [Thu, 11 Feb 2016 06:36:01 +0000 (14:36 +0800)]
Merge pull request #7601 from jjhuo/master

os/bluestore: fix a typo in SPDK path parsing

Reviewed-by: Haomai Wang <haomai@xsky.com>
9 years agoos/bluestore: fix a typo in SPDK path parsing 7601/head
Jianjian Huo [Thu, 11 Feb 2016 01:44:33 +0000 (20:44 -0500)]
os/bluestore: fix a typo in SPDK path parsing

SPDK block path with bluestore is something like spdk:55cd2e404bd73932.
The size of the prefix to compare should be 5.
sizeof(SPDK_PREFIX)-1 returns 5, while sizeof(SPDK_PREFIX-1) returns 8.

Signed-off-by: Jianjian Huo <samuel.huo@gmail.com>
9 years agoMerge pull request #7588 from dmick/master
Sage Weil [Wed, 10 Feb 2016 21:02:11 +0000 (16:02 -0500)]
Merge pull request #7588 from dmick/master

common/page.cc: _page_mask has too many bits

Reviewed-by: Sage Weil <sage@redhat.com>
9 years agoMerge pull request #7413 from YankunLi/dev
Yehuda Sadeh [Wed, 10 Feb 2016 19:16:30 +0000 (11:16 -0800)]
Merge pull request #7413 from YankunLi/dev

rgw: remove duplicated code in RGWRados::get_bucket_info()

Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
9 years agoMerge branch 'wip-11642-0203'
Yehuda Sadeh [Wed, 10 Feb 2016 19:15:49 +0000 (11:15 -0800)]
Merge branch 'wip-11642-0203'

9 years agorgw: make function parameter 'errordoc_key' passed by reference
Bo Cai [Wed, 3 Feb 2016 08:49:50 +0000 (16:49 +0800)]
rgw: make function parameter 'errordoc_key' passed by reference

Signed-off-by: Bo Cai <cai.bo@h3c.com>
9 years agoMerge branch 'master' of github.com:ceph/ceph
Sage Weil [Wed, 10 Feb 2016 18:58:50 +0000 (13:58 -0500)]
Merge branch 'master' of github.com:ceph/ceph

9 years agoMerge pull request #7544 from ceph/wip-rh-covscan
Yehuda Sadeh [Wed, 10 Feb 2016 19:03:04 +0000 (11:03 -0800)]
Merge pull request #7544 from ceph/wip-rh-covscan

rgw/rgw_orphan: check the return value of save_state

Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
9 years agoMerge pull request #7586 from bsedyang/master
Yehuda Sadeh [Wed, 10 Feb 2016 19:01:54 +0000 (11:01 -0800)]
Merge pull request #7586 from bsedyang/master

rgw: user quota may not adjust on bucket removal

Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
9 years agodoc/release-notes: v10.0.3
Sage Weil [Wed, 10 Feb 2016 18:57:37 +0000 (13:57 -0500)]
doc/release-notes: v10.0.3

Finalized release notes.

Signed-off-by: Sage Weil <sage@redhat.com>
9 years agoMerge pull request #7592 from dachary/wip-release-notes
Sage Weil [Wed, 10 Feb 2016 14:24:35 +0000 (09:24 -0500)]
Merge pull request #7592 from dachary/wip-release-notes

release-notes: draft v10.0.3 release notes

9 years agoMerge pull request #7594 from tchaikov/fix-ceph-disk-test
Loic Dachary [Wed, 10 Feb 2016 13:58:53 +0000 (20:58 +0700)]
Merge pull request #7594 from tchaikov/fix-ceph-disk-test

tests: ceph-disk.sh: should use "readlink -f" instead

Reviewed-by: Loic Dachary <ldachary@redhat.com>
9 years agotests: ceph-disk.sh: should use "readlink -f" instead 7594/head
Kefu Chai [Wed, 10 Feb 2016 13:30:46 +0000 (21:30 +0800)]
tests: ceph-disk.sh: should use "readlink -f" instead

turns out trusty does not have `realpath` unless the package named
`realpath` is installed.

Reported-by: Joao Eduardo Luis <joao@suse.de>
Signed-off-by: Kefu Chai <kchai@redhat.com>
9 years agorelease-notes: draft v10.0.3 release notes 7592/head
Loic Dachary [Wed, 10 Feb 2016 09:19:06 +0000 (16:19 +0700)]
release-notes: draft v10.0.3 release notes

Signed-off-by: Loic Dachary <loic@dachary.org>
9 years agoscripts: ceph-release-notes fix merge messages handling
Loic Dachary [Wed, 10 Feb 2016 08:14:31 +0000 (15:14 +0700)]
scripts: ceph-release-notes fix merge messages handling

Strip the title line if it is the same as the pr title instead of
ignoring the message entirely.

Signed-off-by: Loic Dachary <loic@dachary.org>
9 years agocommon/page.cc: _page_mask has too many bits 7588/head
Dan Mick [Wed, 10 Feb 2016 03:35:25 +0000 (19:35 -0800)]
common/page.cc: _page_mask has too many bits

It's not used anywhere, but in case it is one day...

Signed-off-by: Dan Mick <dan.mick@redhat.com>
9 years agorgw: user quota may not adjust on bucket removal 7586/head
root [Tue, 9 Feb 2016 20:03:24 +0000 (12:03 -0800)]
rgw: user quota may not adjust on bucket removal

Description:
If the user/admin removes a bucket using --force/--purge-objects options with s3cmd/radosgw-admin respectively, the user stats will continue to reflect the deleted objects for quota purposes, and there seems to be no way to reset them. User stats need to be sync'ed prior to bucket removal.

Solution:
Sync user stats before removing a bucket.

Fixes: #14507
Signed-off-by: Edward Yang eyang@us.fujitsu.com
9 years agoMerge pull request #7496 from xiexingguo/xxg-wip-fixnvme
Sage Weil [Tue, 9 Feb 2016 14:02:22 +0000 (09:02 -0500)]
Merge pull request #7496 from xiexingguo/xxg-wip-fixnvme

osd: BlueStore/NVMEDevice: fix compiling and fd leak

Reviewed-by: Haomai Wang <haomai@xsky.com>
9 years agoMerge pull request #7349 from yuyuyu101/add-pwritev
Sage Weil [Tue, 9 Feb 2016 13:58:28 +0000 (08:58 -0500)]
Merge pull request #7349 from yuyuyu101/add-pwritev

osd: FileStore: use pwritev instead of lseek+writev

Reviewed-by: Kefu Chai <kchai@redhat.com>
Reviewed-by: Sage Weil <sage@redhat.com>
9 years agoMerge pull request #7504 from renhwsky/renhw-wip-mon-shutdown
Sage Weil [Tue, 9 Feb 2016 13:57:11 +0000 (08:57 -0500)]
Merge pull request #7504 from renhwsky/renhw-wip-mon-shutdown

mon: unregister command on shutdown

Reviewed-by: Joao Eduardo Luis <joao@suse.de>
9 years agoMerge pull request #7550 from tchaikov/wip-osd-cleanup
Sage Weil [Tue, 9 Feb 2016 13:56:48 +0000 (08:56 -0500)]
Merge pull request #7550 from tchaikov/wip-osd-cleanup

osd: a fix for HeartbeatDispatcher and cleanups

Reviewed-by: Sage Weil <sage@redhat.com>
9 years agoMerge pull request #7553 from XinzeChi/wip-osdmap-affinity
Sage Weil [Tue, 9 Feb 2016 13:56:14 +0000 (08:56 -0500)]
Merge pull request #7553 from XinzeChi/wip-osdmap-affinity

osd: OSDMap: reset osd_primary_affinity shared_ptr when deepish_copy_from

Reviewed-by: Sage Weil <sage@redhat.com>
9 years agoMerge pull request #7560 from tchaikov/wip-fix-icl
Sage Weil [Tue, 9 Feb 2016 13:55:59 +0000 (08:55 -0500)]
Merge pull request #7560 from tchaikov/wip-fix-icl

crush/CrushTester: workaround a bug in boost::icl

9 years agoMerge pull request #7568 from liewegas/wip-bluestore-mutex
Sage Weil [Tue, 9 Feb 2016 13:55:43 +0000 (08:55 -0500)]
Merge pull request #7568 from liewegas/wip-bluestore-mutex

osd: bluestore/blockdevice: use std::mutex et al

9 years agodebian: fix build-depends 7533/head
Rémi BUISSON [Fri, 5 Feb 2016 07:00:01 +0000 (08:00 +0100)]
debian: fix build-depends

Signed-off-by: Rémi BUISSON <remi.buisson@cdiscount.com>
9 years agoMerge pull request #7578 from ceph/fix-stripper
Jason Dillaman [Tue, 9 Feb 2016 12:57:53 +0000 (07:57 -0500)]
Merge pull request #7578 from ceph/fix-stripper

Stripper: Fix incorrect push_front -> append_zero change

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
9 years agoosdc/Objecter: drop lock to unregister asok hooks 7581/head
John Spray [Tue, 9 Feb 2016 12:15:56 +0000 (12:15 +0000)]
osdc/Objecter: drop lock to unregister asok hooks

unregister blocks until any running hook has
completed, and that running hook might
be one that takes the objecter lock, so you
can't hold it while unregistering.

Signed-off-by: John Spray <john.spray@redhat.com>
9 years agocommon: asok should drop lock to call hook
John Spray [Tue, 9 Feb 2016 12:11:40 +0000 (12:11 +0000)]
common: asok should drop lock to call hook

Otherwise, hooks cannot take any locks which
were held during registration of hooks, because
it creates a cycle.

Signed-off-by: John Spray <john.spray@redhat.com>
9 years agoCorrectly escape block device paths for systemd 7579/head
James Page [Tue, 9 Feb 2016 11:13:00 +0000 (11:13 +0000)]
Correctly escape block device paths for systemd

Ensure that the leading / is stripped from block device
paths before escaping for using in systemd unit names.

Fixes: #14706
Signed-off-by: James Page <james.page@ubuntu.com>
9 years agoStripper: Fix incorrect push_front -> append_zero change 7578/head
Haomai Wang [Tue, 9 Feb 2016 08:46:44 +0000 (16:46 +0800)]
Stripper: Fix incorrect push_front -> append_zero change

Signed-off-by: Haomai Wang <haomai@xsky.com>
9 years agoMerge pull request #7444 from dreamhost/wip-rgw-static-website-robbat2
Yehuda Sadeh [Tue, 9 Feb 2016 00:48:14 +0000 (16:48 -0800)]
Merge pull request #7444 from dreamhost/wip-rgw-static-website-robbat2

rgw: approximate AmazonS3 HostId error field.

Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
9 years agoMerge remote-tracking branch 'gh/jewel'
Sage Weil [Mon, 8 Feb 2016 22:26:13 +0000 (17:26 -0500)]
Merge remote-tracking branch 'gh/jewel'

9 years agov10.0.3 v10.0.3
Sage Weil [Mon, 8 Feb 2016 22:10:53 +0000 (17:10 -0500)]
v10.0.3

Signed-off-by: Sage Weil <sage@redhat.com>
9 years agoMerge pull request #7572 from ceph/wip-cmake-2-8-16
Casey Bodley [Mon, 8 Feb 2016 20:00:57 +0000 (15:00 -0500)]
Merge pull request #7572 from ceph/wip-cmake-2-8-16

cmake: Added new unittests to make check

9 years agoMerge pull request #7574 from SUSE/wip-spec-license
Sage Weil [Mon, 8 Feb 2016 18:43:38 +0000 (13:43 -0500)]
Merge pull request #7574 from SUSE/wip-spec-license

ceph.spec.in: add license declaration

Reviewed-by: Sage Weil <sage@redhat.com>
9 years agoceph.spec.in: add license declaration 7574/head
Nathan Cutler [Mon, 8 Feb 2016 17:57:31 +0000 (18:57 +0100)]
ceph.spec.in: add license declaration

Signed-off-by: Nathan Cutler <ncutler@suse.com>
9 years agocmake: Added new unittests to make check 7572/head
Ali Maredia [Mon, 8 Feb 2016 17:30:45 +0000 (12:30 -0500)]
cmake: Added new unittests to make check

Added unittest_shunique_lock & unittest_mutex_debug
to make check, and made them link ALLOC_LIBS

Signed-off-by: Ali Maredia <amaredia@redhat.com>
9 years agoMerge pull request #7569 from SUSE/wip-copyright2
Sage Weil [Mon, 8 Feb 2016 15:48:07 +0000 (10:48 -0500)]
Merge pull request #7569 from SUSE/wip-copyright2

ceph.spec.in: add copyright notice

Reviewed-by: Sage Weil <sage@redhat.com>
9 years agoceph.spec.in: add copyright notice 7569/head
Nathan Cutler [Mon, 8 Feb 2016 14:58:51 +0000 (15:58 +0100)]
ceph.spec.in: add copyright notice

http://tracker.ceph.com/issues/14694 Fixes: #14694

Signed-off-by: Nathan Cutler <ncutler@suse.com>
9 years agoos/bluestore/BlockDevice: std::atomic_int 7568/head
Sage Weil [Fri, 5 Feb 2016 16:45:23 +0000 (11:45 -0500)]
os/bluestore/BlockDevice: std::atomic_int

Signed-off-by: Sage Weil <sage@redhat.com>
9 years agoos/bluestore/BlockDevice: use std::mutex and std::condition_variable
Sage Weil [Fri, 5 Feb 2016 16:20:15 +0000 (11:20 -0500)]
os/bluestore/BlockDevice: use std::mutex and std::condition_variable

Pull aio wait code into an IOContext method too.

Signed-off-by: Sage Weil <sage@redhat.com>
9 years agoMerge pull request #7513 from athanatos/wip-ceph-test-rados-2
Sage Weil [Mon, 8 Feb 2016 14:23:56 +0000 (09:23 -0500)]
Merge pull request #7513 from athanatos/wip-ceph-test-rados-2

ceph_test_rados: use less CPU

9 years agoMerge pull request #5931 from ceph/wip-cxx11concurrency
Sage Weil [Mon, 8 Feb 2016 14:23:15 +0000 (09:23 -0500)]
Merge pull request #5931 from ceph/wip-cxx11concurrency

librados: move to c++11 concurrency types

Reviewed-by: Matt Benjamin <mbenjami@redhat.com>
Reviewed-by: Casey Bodley <cbodley@redhat.com>
9 years agomsg/simple: significantly reduce minimal memory usage of Pipes 7567/head
Piotr Dałek [Mon, 8 Feb 2016 13:05:03 +0000 (14:05 +0100)]
msg/simple: significantly reduce minimal memory usage of Pipes

Pipe class instance weights over 17 KB in size, and most of it is used by
msgvec structure, which weights 16 KB. Reduce it to 4KB by reducing
number of iovecs in this array down to 256 (= 1024/4). This won't cause
noticeable perf decrease, as even under extreme loads, we exceed 256 used
iovecs in only less than 1% of all write calls. For high-density nodes and
large clusters, savings will exceed hundreds of megabytes per node.

Signed-off-by: Piotr Dałek <piotr.dalek@ts.fujitsu.com>
9 years agomsg/async: significantly reduce minimal memory usage of AsyncConnections
Piotr Dałek [Mon, 8 Feb 2016 12:21:55 +0000 (13:21 +0100)]
msg/async: significantly reduce minimal memory usage of AsyncConnections

AsyncConnection class instance weights over 18 KB in size, and most of it
is used by msgvec structure, which weights 16 KB. Reduce it to 4KB by reducing
number of iovecs in this array down to 256 (= 1024/4). This won't cause
noticeable perf decrease, as even under extreme loads, we exceed 256 used
iovecs in only less than 1% of all write calls. For high-density nodes and
large clusters, savings will exceed hundreds of megabytes per node.

Signed-off-by: Piotr Dałek <piotr.dalek@ts.fujitsu.com>
9 years agoMerge branch 'print-blocked-op' of git://github.com/majianpeng/ceph
Sage Weil [Mon, 8 Feb 2016 14:14:21 +0000 (09:14 -0500)]
Merge branch 'print-blocked-op' of git://github.com/majianpeng/ceph

Reviewed-by: Sage Weil <sage@redhat.com>
9 years agoMerge pull request #6608 from esnyder/wip-6634
Sage Weil [Mon, 8 Feb 2016 14:17:49 +0000 (09:17 -0500)]
Merge pull request #6608 from esnyder/wip-6634

osd: remove unused SnapContext member snapc from MOSDSubOp message

Reviewed-by: Xiaoxi Chen <xiaoxi.chen@intel.com>
Reviewed-by: Sage Weil <sage@redhat.com>
9 years agoMerge branch 'master' of git://github.com/joconcepts/ceph
Sage Weil [Mon, 8 Feb 2016 14:12:12 +0000 (09:12 -0500)]
Merge branch 'master' of git://github.com/joconcepts/ceph

Reviewed-by: Sage Weil <sage@redhat.com>
9 years agoMerge pull request #7181 from songbaisen/song5
Sage Weil [Mon, 8 Feb 2016 14:16:14 +0000 (09:16 -0500)]
Merge pull request #7181 from songbaisen/song5

crush: reply quickly from get_immediate_parent

Reviewed-by: xie xingguo <xie.xingguo@zte.com.cn>
9 years agoMerge pull request #7437 from Ved-vampir/wip_zlib_plugin
Sage Weil [Mon, 8 Feb 2016 14:15:04 +0000 (09:15 -0500)]
Merge pull request #7437 from Ved-vampir/wip_zlib_plugin

common: add zlib compression plugin

Reviewed-by: Sage Weil <sage@redhat.com>
9 years agoMerge pull request #7527 from liewegas/wip-no-rgw-prestart
Sage Weil [Mon, 8 Feb 2016 14:13:38 +0000 (09:13 -0500)]
Merge pull request #7527 from liewegas/wip-no-rgw-prestart

systemd/ceph-radosgw-prestart.sh: remove

Reviewed-by: Nathan Cutler <ncutler@suse.com>
9 years agoOSD/ReplicatedPG: Fixes unneccessary object promotion when deleting from the cache... 7537/head
Igor Fedotov [Fri, 5 Feb 2016 14:25:43 +0000 (17:25 +0300)]
OSD/ReplicatedPG: Fixes unneccessary object promotion when deleting from the cache that lacks hit_set configured.

Signed-off-by: Igor Fedotov <ifedotov@mirantis.com>
9 years agoMerge pull request #7547 from yuyuyu101/wip-14679
Haomai Wang [Mon, 8 Feb 2016 06:15:37 +0000 (14:15 +0800)]
Merge pull request #7547 from yuyuyu101/wip-14679

AsyncConnection: avoid debug log in cleanup_handler

9 years agocrush/CrushTester: workaround a bug in boost::icl 7560/head
Kefu Chai [Mon, 8 Feb 2016 05:37:43 +0000 (13:37 +0800)]
crush/CrushTester: workaround a bug in boost::icl

the boost::icl in boost v1.55 has a bug when working with libc++,

> Assertion failed: (this->_map.find(inter_val) == this->_map.end()),
> function gap_insert, file
> /usr/local/include/boost/icl/interval_base_map.hpp, line 555.

see https://svn.boost.org/trac/boost/ticket/9501 and
    https://svn.boost.org/trac/boost/ticket/9987

the bug was fixed in boost v1.56. as a workaround we use the the
`set` from `boost::container` instead of the `std::set` from libc++.
we should drop this workaround once we bump the supported boost
version from 1.42 to 1.56.

Signed-off-by: Kefu Chai <kchai@redhat.com>
9 years agoMerge pull request #7554 from tchaikov/wip-ceph-disk-test
Kefu Chai [Sun, 7 Feb 2016 17:52:16 +0000 (01:52 +0800)]
Merge pull request #7554 from tchaikov/wip-ceph-disk-test

tests: ceph-disk.sh should compare with the resolved path

Reviewed-by: Loic Dachary <ldachary@redhat.com>
9 years agoOSDMap: reset osd_primary_affinity shared_ptr when deepish_copy_from 7553/head
Xinze Chi [Sun, 7 Feb 2016 10:50:29 +0000 (18:50 +0800)]
OSDMap: reset osd_primary_affinity shared_ptr when deepish_copy_from

Base on current logic, OSDMonitor may call create_pending and
encode_pending twice for the some epoch.

In encode_pending:

tmp.deepish_copy_from(osdmap);
tmp.apply_incremental(pending_inc);

This Op would change the tmp osd_primary_affinity, but the osd_primary_affinity
is declared as ceph::shared_ptr, so this would change the osdmap too. When this
round encode_pending is proposed fail. We may call encode_pending again, but the
osdmap is changed last round, so the pending_inc would be wrong.

Fixes: #14686
Signed-off-by: Xinze Chi <xinze@xsky.com>
9 years agoMerge pull request #7551 from JevonQ/update-libcephfs-version
Sage Weil [Sun, 7 Feb 2016 14:01:04 +0000 (09:01 -0500)]
Merge pull request #7551 from JevonQ/update-libcephfs-version

libcephfs: update LIBCEPHFS_VERSION to indicate the interface was changed

Reviewed-by: Sage Weil <sage@redhat.com>
9 years agotests: ceph-disk.sh should compare with the resolved path 7554/head
Kefu Chai [Sun, 7 Feb 2016 12:36:58 +0000 (04:36 -0800)]
tests: ceph-disk.sh should compare with the resolved path

Signed-off-by: Kefu Chai <kchai@redhat.com>
9 years agolibcephfs: Update LIBCEPHFS_VERSION to indicate the interface was changed 7551/head
Jevon Qiao [Sun, 7 Feb 2016 06:00:53 +0000 (14:00 +0800)]
libcephfs: Update LIBCEPHFS_VERSION to indicate the interface was changed

Signed-off-by: Jevon Qiao <scaleqiao@gmail.com>
9 years agoAsyncMessenger: remove unused variables 7550/head
Kefu Chai [Sat, 6 Feb 2016 17:54:12 +0000 (01:54 +0800)]
AsyncMessenger: remove unused variables

* remove AsyncMessenger::listen_sd
* remove `ee` in KqueueDriver::del_event()

Signed-off-by: Kefu Chai <kchai@redhat.com>
9 years agocrypto: remove unused Digest::sec_type
Kefu Chai [Sat, 6 Feb 2016 17:49:30 +0000 (01:49 +0800)]
crypto: remove unused Digest::sec_type

Signed-off-by: Kefu Chai <kchai@redhat.com>
9 years agojournal: remove unused ObjectPlayer::m_fetch_interval
Kefu Chai [Sat, 6 Feb 2016 17:44:12 +0000 (01:44 +0800)]
journal: remove unused ObjectPlayer::m_fetch_interval

Signed-off-by: Kefu Chai <kchai@redhat.com>
9 years agolibrbd: remove unused C_DiffObject::m_request_num
Kefu Chai [Sat, 6 Feb 2016 17:43:09 +0000 (01:43 +0800)]
librbd: remove unused C_DiffObject::m_request_num

Signed-off-by: Kefu Chai <kchai@redhat.com>
9 years agolibrbd: replace atomic_t with std::atomic<int>
Kefu Chai [Sat, 6 Feb 2016 16:26:59 +0000 (00:26 +0800)]
librbd: replace atomic_t with std::atomic<int>

it fails to compile with clang, and turns out it should be
`ceph::atomic_t`, but I take this chance to replace it
with std::atomic<> to phase out atomic_t.

Signed-off-by: Kefu Chai <kchai@redhat.com>
9 years agoECUtil: remove unused stripe_info_t::stripe_size
Kefu Chai [Sat, 6 Feb 2016 15:38:29 +0000 (23:38 +0800)]
ECUtil: remove unused stripe_info_t::stripe_size

Signed-off-by: Kefu Chai <kchai@redhat.com>
9 years agoosd: init HeartbeatDispatcher using OSD->cct
Kefu Chai [Sat, 6 Feb 2016 15:35:14 +0000 (23:35 +0800)]
osd: init HeartbeatDispatcher using OSD->cct

its base class 'Dispatcher' is uninitialized when used here to access
'Dispatcher::cct', so we'd better use OSD::cct to initialize it instead.

Signed-off-by: Kefu Chai <kchai@redhat.com>
9 years agoMerge pull request #7549 from tchaikov/wip-fix-ceph-disk-tests
Kefu Chai [Sat, 6 Feb 2016 15:43:31 +0000 (23:43 +0800)]
Merge pull request #7549 from tchaikov/wip-fix-ceph-disk-tests

ceph-disk/test: fix test_prepare.py::TestPrepare tests

Reviewed-by: Loic Dachary <ldachary@redhat.com>
9 years agoceph-disk/test: fix test_prepare.py::TestPrepare tests 7549/head
Kefu Chai [Sat, 6 Feb 2016 14:25:38 +0000 (06:25 -0800)]
ceph-disk/test: fix test_prepare.py::TestPrepare tests

actually we are verifying if the variable is an instance of
specified class. for example, the `prepare.data` should be
a `PrepareFilestoreData` if `--bluestore` is not specified.

Signed-off-by: Kefu Chai <kchai@redhat.com>
9 years agoAsyncConnection: avoid debug log in cleanup_handler 7547/head
Haomai Wang [Sat, 6 Feb 2016 06:52:43 +0000 (14:52 +0800)]
AsyncConnection: avoid debug log in cleanup_handler

local connection will be stop and call cleanup_handler after messenger
is down
introduced in
commit(https://github.com/ceph/ceph/commit/9da2fffd31562ed5d0b795d7862b3ebec66aba40)

Fix #14679

Signed-off-by: Haomai Wang <haomai@xsky.com>
9 years agoMerge pull request #7540 from dillaman/wip-librados-test-stub-unwatch
Josh Durgin [Sat, 6 Feb 2016 01:41:03 +0000 (17:41 -0800)]
Merge pull request #7540 from dillaman/wip-librados-test-stub-unwatch

librados_test_stub: protect against notify/unwatch race

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
9 years agoMerge pull request #7529 from dillaman/wip-14412
Josh Durgin [Sat, 6 Feb 2016 01:39:03 +0000 (17:39 -0800)]
Merge pull request #7529 from dillaman/wip-14412

librbd: journal framework for tracking exclusive lock transitions

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
9 years agorgw/rgw_orphan: check the return value of save_state 7544/head
Boris Ranto [Sat, 6 Feb 2016 01:00:22 +0000 (02:00 +0100)]
rgw/rgw_orphan: check the return value of save_state

It was discovered by covscan that we do not check the return value of
save_state in this one case.

Signed-off-by: Boris Ranto <branto@redhat.com>
9 years agoMerge pull request #7377 from liewegas/wip-datadir-search
Sage Weil [Sat, 6 Feb 2016 01:03:50 +0000 (20:03 -0500)]
Merge pull request #7377 from liewegas/wip-datadir-search

config: add $data_dir/config to config search path

9 years agoMerge pull request #7466 from adamemerson/wip-bsd-time-second-try
Sage Weil [Sat, 6 Feb 2016 01:03:35 +0000 (20:03 -0500)]
Merge pull request #7466 from adamemerson/wip-bsd-time-second-try

common: time: have skewing-now call non-skewing now

9 years agoMerge pull request #7463 from dachary/wip-13422-pid-file
Sage Weil [Sat, 6 Feb 2016 01:03:00 +0000 (20:03 -0500)]
Merge pull request #7463 from dachary/wip-13422-pid-file

global: do not start two daemons with a single pid-file (part 2)

Reviewed-by: Kefu Chai <kchai@redhat.com>
9 years agoMerge pull request #7460 from xiexingguo/xxg-wip-block
Sage Weil [Sat, 6 Feb 2016 01:02:34 +0000 (20:02 -0500)]
Merge pull request #7460 from xiexingguo/xxg-wip-block

osd: blockdevice: avoid implicit cast and add guard

Reviewed-by: Sage Weil <sage@redhat.com>
9 years agoMerge pull request #7530 from xiexingguo/xxg-wip-nid
Sage Weil [Sat, 6 Feb 2016 01:02:07 +0000 (20:02 -0500)]
Merge pull request #7530 from xiexingguo/xxg-wip-nid

osd: bluestore: assign nid for newly created onode

Reviewed-by: Sage Weil <sage@redhat.com>
9 years agoMerge pull request #7521 from liewegas/wip-memstore
Sage Weil [Sat, 6 Feb 2016 01:01:47 +0000 (20:01 -0500)]
Merge pull request #7521 from liewegas/wip-memstore

osd: memstore: set Collection::cid on create

9 years agoMerge pull request #7486 from ceph/wip-bluestore-oref
Sage Weil [Sat, 6 Feb 2016 01:01:32 +0000 (20:01 -0500)]
Merge pull request #7486 from ceph/wip-bluestore-oref

osd: bluestore: fix two wal bugs; reuse OnodeRefs when applying txc

Reviewed-by: xie xingguo <xie.xingguo@zte.com.cn>
9 years agoMerge pull request #7531 from jjhuo/master
Sage Weil [Sat, 6 Feb 2016 01:01:05 +0000 (20:01 -0500)]
Merge pull request #7531 from jjhuo/master

osd: bluestore: remove unused intrusive member hook in enode

Reviewed-by: Sage Weil <sage@redhat.com>
9 years agoMerge pull request #7535 from liewegas/wip-bluefs-mkfs
Sage Weil [Sat, 6 Feb 2016 01:00:31 +0000 (20:00 -0500)]
Merge pull request #7535 from liewegas/wip-bluefs-mkfs

osd: bluestore/BlueFS: initialize super block_size earlier in mkfs

Reviewed-by: Dan Mick <dmick@redhat.com>
9 years agoMerge pull request #7536 from liewegas/wip-bluestore-block
Sage Weil [Sat, 6 Feb 2016 01:00:07 +0000 (20:00 -0500)]
Merge pull request #7536 from liewegas/wip-bluestore-block

osd: bluestore: fix block device file creation

9 years agoMerge pull request #7541 from linuxbox2/cmake-feb5
Ali Maredia [Sat, 6 Feb 2016 00:53:08 +0000 (19:53 -0500)]
Merge pull request #7541 from linuxbox2/cmake-feb5

Cmake feb5

9 years agoosdc: Update to use C++11 concurrency 5931/head
Adam C. Emerson [Mon, 14 Sep 2015 17:35:10 +0000 (13:35 -0400)]
osdc: Update to use C++11 concurrency

The only externally visible change is that Objecter::get_osdmap_read
and Objedcter::put_osdmap_read have been removed in favor of
Objecter::with_osdmap.

It can be used like:

objecter->with_osdmap([&](const OSDMap& o) { o.do_stuff(); };
int x = objecter->with_osdmap([&](const OSDMap& o) {
    return get_thing(id); });
objecter->with_osdmap(std::mem_fn(&OSDMap::do_stuff));
int x = objecter->with_osdmap(std::mem_fn(&OSDMap::get_thing),
                              id);

The choice between the style of the first two examples or the second two
is arbitrary and depends on what you prefer.

Signed-off-by: Adam C. Emerson <aemerson@redhat.com>
9 years agocmake: add libboost_system to EXTRALIBS 7541/head
Matt Benjamin [Fri, 5 Feb 2016 21:43:43 +0000 (16:43 -0500)]
cmake: add libboost_system to EXTRALIBS

This concisely fixes several unittest builds, and reflects the
fact that this library dependency has moved into several areas
of the codebase (libcephfs, librbd, librgw).

Signed-off-by: Matt Benjamin <mbenjamin@redhat.com>
9 years agocmake: don't try to install src/ceph-disk directory
Matt Benjamin [Fri, 5 Feb 2016 20:54:19 +0000 (15:54 -0500)]
cmake: don't try to install src/ceph-disk directory

The proper cmake boilerplate to call ceph-disk/ceph-disk's
python installer is not present, FYI.

Signed-off-by: Matt Benjamin <mbenjamin@redhat.com>
9 years agocmake: don't add_test cephtool_test_osd twice
Matt Benjamin [Fri, 5 Feb 2016 20:51:00 +0000 (15:51 -0500)]
cmake: don't add_test cephtool_test_osd twice

Signed-off-by: Matt Benjamin <mbenjamin@redhat.com>
9 years agolibrados_test_stub: protect against notify/unwatch race 7540/head
Jason Dillaman [Fri, 5 Feb 2016 21:14:39 +0000 (16:14 -0500)]
librados_test_stub: protect against notify/unwatch race

Signed-off-by: Jason Dillaman <dillaman@redhat.com>