RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-02-16 23:37:46 +00:00
Code Issues Packages Projects Releases Wiki Activity
48,696 Commits 216 Branches 395 Tags 1.2 GiB
dbe0fc61bd
Commit Graph

48696 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Sage Weil
dbe0fc61bd Merge pull request #7592 from dachary/wip-release-notes 
release-notes: draft v10.0.3 release notes
 2016-02-10 09:24:35 -05:00
Loic Dachary
c6947b02ac 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>
 2016-02-10 20:58:53 +07:00
Kefu Chai
7ba6889046 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>
 2016-02-10 21:31:25 +08:00
Loic Dachary
ca5ec8a4c2 release-notes: draft v10.0.3 release notes 
Signed-off-by: Loic Dachary <loic@dachary.org>
 2016-02-10 17:12:06 +07:00
Loic Dachary
5591cdf480 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>
 2016-02-10 16:19:58 +07:00
Sage Weil
2c79a5e428 Merge pull request #7496 from xiexingguo/xxg-wip-fixnvme 
osd: BlueStore/NVMEDevice: fix compiling and fd leak

Reviewed-by: Haomai Wang <haomai@xsky.com>
 2016-02-09 09:02:22 -05:00
Sage Weil
a20134d94a 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>
 2016-02-09 08:58:28 -05:00
Sage Weil
a710dcd8a0 Merge pull request #7504 from renhwsky/renhw-wip-mon-shutdown 
mon: unregister command on shutdown

Reviewed-by: Joao Eduardo Luis <joao@suse.de>
 2016-02-09 08:57:11 -05:00
Sage Weil
c2342b53a6 Merge pull request #7550 from tchaikov/wip-osd-cleanup 
osd: a fix for HeartbeatDispatcher and cleanups

Reviewed-by: Sage Weil <sage@redhat.com>
 2016-02-09 08:56:48 -05:00
Sage Weil
8895416a0b 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>
 2016-02-09 08:56:14 -05:00
Sage Weil
8205c873c4 Merge pull request #7560 from tchaikov/wip-fix-icl 
crush/CrushTester: workaround a bug in boost::icl
 2016-02-09 08:55:59 -05:00
Sage Weil
be5544b293 Merge pull request #7568 from liewegas/wip-bluestore-mutex 
osd: bluestore/blockdevice: use std::mutex et al
 2016-02-09 08:55:43 -05:00
Jason Dillaman
278acb6ad6 Merge pull request #7578 from ceph/fix-stripper 
Stripper: Fix incorrect push_front -> append_zero change

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
 2016-02-09 07:57:53 -05:00
Haomai Wang
12ea474c31 Stripper: Fix incorrect push_front -> append_zero change 
Signed-off-by: Haomai Wang <haomai@xsky.com>
 2016-02-09 16:46:44 +08:00
Yehuda Sadeh
7731ae92c8 Merge pull request #7444 from dreamhost/wip-rgw-static-website-robbat2 
rgw: approximate AmazonS3 HostId error field.

Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
 2016-02-08 16:48:14 -08:00
Sage Weil
f22b671434 Merge remote-tracking branch 'gh/jewel' 2016-02-08 17:26:13 -05:00
Sage Weil
efc8134f66 v10.0.3 
Signed-off-by: Sage Weil <sage@redhat.com>
 2016-02-08 17:10:53 -05:00
Casey Bodley
4815a46615 Merge pull request #7572 from ceph/wip-cmake-2-8-16 
cmake: Added new unittests to make check
 2016-02-08 15:00:57 -05:00
Sage Weil
07dda1aaa3 Merge pull request #7574 from SUSE/wip-spec-license 
ceph.spec.in: add license declaration

Reviewed-by: Sage Weil <sage@redhat.com>
 2016-02-08 13:43:38 -05:00
Nathan Cutler
db9408bfdf ceph.spec.in: add license declaration 
Signed-off-by: Nathan Cutler <ncutler@suse.com>
 2016-02-08 18:57:31 +01:00
Ali Maredia
51a15726fc 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>
 2016-02-08 12:30:45 -05:00
Sage Weil
4235af3cf2 Merge pull request #7569 from SUSE/wip-copyright2 
ceph.spec.in: add copyright notice

Reviewed-by: Sage Weil <sage@redhat.com>
 2016-02-08 10:48:07 -05:00
Nathan Cutler
23ec516b0d ceph.spec.in: add copyright notice 
http://tracker.ceph.com/issues/14694 Fixes: #14694

Signed-off-by: Nathan Cutler <ncutler@suse.com>
 2016-02-08 16:04:34 +01:00
Sage Weil
37b517ebfe os/bluestore/BlockDevice: std::atomic_int 
Signed-off-by: Sage Weil <sage@redhat.com>
 2016-02-08 09:53:19 -05:00
Sage Weil
434620bab9 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>
 2016-02-08 09:53:19 -05:00
Sage Weil
3f66231edf Merge pull request #7513 from athanatos/wip-ceph-test-rados-2 
ceph_test_rados: use less CPU
 2016-02-08 09:23:56 -05:00
Sage Weil
6a8cafe198 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>
 2016-02-08 09:23:15 -05:00
Sage Weil
7e44299618 Merge branch 'print-blocked-op' of git://github.com/majianpeng/ceph 
Reviewed-by: Sage Weil <sage@redhat.com>
 2016-02-08 09:14:21 -05:00
Sage Weil
f17dbc65df 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>
 2016-02-08 09:17:49 -05:00
Sage Weil
658780730a Merge branch 'master' of git://github.com/joconcepts/ceph 
Reviewed-by: Sage Weil <sage@redhat.com>
 2016-02-08 09:12:12 -05:00
Sage Weil
a981c1ecc2 Merge pull request #7181 from songbaisen/song5 
crush: reply quickly from get_immediate_parent

Reviewed-by: xie xingguo <xie.xingguo@zte.com.cn>
 2016-02-08 09:16:14 -05:00
Sage Weil
20228cb0a2 Merge pull request #7437 from Ved-vampir/wip_zlib_plugin 
common: add zlib compression plugin

Reviewed-by: Sage Weil <sage@redhat.com>
 2016-02-08 09:15:04 -05:00
Sage Weil
34d33bcc5b Merge pull request #7527 from liewegas/wip-no-rgw-prestart 
systemd/ceph-radosgw-prestart.sh: remove

Reviewed-by: Nathan Cutler <ncutler@suse.com>
 2016-02-08 09:13:38 -05:00
Haomai Wang
90561b466d Merge pull request #7547 from yuyuyu101/wip-14679 
AsyncConnection: avoid debug log in cleanup_handler
 2016-02-08 14:15:37 +08:00
Kefu Chai
3395fb9e06 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>
 2016-02-08 13:37:45 +08:00
Kefu Chai
d21724a145 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>
 2016-02-08 01:52:16 +08:00
Xinze Chi
990b437f4e 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>
 2016-02-07 22:19:35 +08:00
Sage Weil
e604d681a4 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>
 2016-02-07 09:01:04 -05:00
Kefu Chai
d267aaf8f3 tests: ceph-disk.sh should compare with the resolved path 
Signed-off-by: Kefu Chai <kchai@redhat.com>
 2016-02-07 04:39:24 -08:00
Jevon Qiao
4d3830225c libcephfs: Update LIBCEPHFS_VERSION to indicate the interface was changed 
Signed-off-by: Jevon Qiao <scaleqiao@gmail.com>
 2016-02-07 14:00:53 +08:00
Kefu Chai
c21de4d08a AsyncMessenger: remove unused variables 
* remove AsyncMessenger::listen_sd
* remove `ee` in KqueueDriver::del_event()

Signed-off-by: Kefu Chai <kchai@redhat.com>
 2016-02-07 02:37:46 +08:00
Kefu Chai
c45854a806 crypto: remove unused Digest::sec_type 
Signed-off-by: Kefu Chai <kchai@redhat.com>
 2016-02-07 01:59:47 +08:00
Kefu Chai
93ac31c7d0 journal: remove unused ObjectPlayer::m_fetch_interval 
Signed-off-by: Kefu Chai <kchai@redhat.com>
 2016-02-07 01:59:46 +08:00
Kefu Chai
2a53737054 librbd: remove unused C_DiffObject::m_request_num 
Signed-off-by: Kefu Chai <kchai@redhat.com>
 2016-02-07 01:59:46 +08:00
Kefu Chai
9c3f821936 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>
 2016-02-07 01:59:46 +08:00
Kefu Chai
64361c3986 ECUtil: remove unused stripe_info_t::stripe_size 
Signed-off-by: Kefu Chai <kchai@redhat.com>
 2016-02-07 01:59:46 +08:00
Kefu Chai
7d08bbf595 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>
 2016-02-07 01:59:44 +08:00
Kefu Chai
7f854cc180 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>
 2016-02-06 23:43:31 +08:00
Kefu Chai
08364c2ff7 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>
 2016-02-06 06:27:30 -08:00
Haomai Wang
8569d38f98 AsyncConnection: avoid debug log in cleanup_handler 
local connection will be stop and call cleanup_handler after messenger
is down
introduced in
commit(9da2fffd31)

Fix #14679

Signed-off-by: Haomai Wang <haomai@xsky.com>
 2016-02-06 15:40:25 +08:00