RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-01-04 02:02:36 +00:00
Code Issues Packages Projects Releases Wiki Activity
48,709 Commits 212 Branches 394 Tags 1.6 GiB
40936fb1f5
Commit Graph

48709 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jianjian Huo
40936fb1f5 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>
 2016-02-10 20:44:33 -05:00
Sage Weil
0148eacb8d Merge pull request #7588 from dmick/master 
common/page.cc: _page_mask has too many bits

Reviewed-by: Sage Weil <sage@redhat.com>
 2016-02-10 16:02:11 -05:00
Yehuda Sadeh
da554ae9b2 Merge pull request #7413 from YankunLi/dev 
rgw: remove duplicated code in RGWRados::get_bucket_info()

Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
 2016-02-10 11:16:30 -08:00
Yehuda Sadeh
4d36bc792b Merge branch 'wip-11642-0203' 2016-02-10 11:15:49 -08:00
Bo Cai
fce9b27430 rgw: make function parameter 'errordoc_key' passed by reference 
Signed-off-by: Bo Cai <cai.bo@h3c.com>
 2016-02-10 11:15:11 -08:00
Sage Weil
cb82fc69bd Merge branch 'master' of github.com:ceph/ceph 2016-02-10 13:58:50 -05:00
Yehuda Sadeh
d3e0ca4e14 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>
 2016-02-10 11:03:04 -08:00
Yehuda Sadeh
709ab2dd6e Merge pull request #7586 from bsedyang/master 
rgw: user quota may not adjust on bucket removal

Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
 2016-02-10 11:01:54 -08:00
Sage Weil
7d10a4467b doc/release-notes: v10.0.3 
Finalized release notes.

Signed-off-by: Sage Weil <sage@redhat.com>
 2016-02-10 13:57:37 -05:00
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
Dan Mick
27212c5eb5 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>
 2016-02-09 19:35:25 -08:00
root
06507992e3 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
 2016-02-09 12:03:24 -08: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