Commit Graph

48731 Commits

Author SHA1 Message Date
Loic Dachary
cd87bd48de ceph-disk,ceph-detect-init: clean the build directory
b030d8fc11 should have kept the build
directory in .gitignore and the clean target. Re-adding.

Signed-off-by: Loic Dachary <loic@dachary.org>
2016-02-12 17:10:41 +07:00
Loic Dachary
c1d8faad26 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>
2016-02-12 17:10:41 +07:00
Sage Weil
63e671a979 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>
2016-02-11 08:46:22 -05:00
Sage Weil
e211b5b278 Merge pull request #7533 from Cdiscount/master
debian: include cpio in build-requiers

Reviewed-by: Sage Weil <sage@redhat.com>
2016-02-11 08:45:17 -05:00
Sage Weil
cc2200c5e6 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>
2016-02-11 08:44:35 -05:00
Sage Weil
f8d5807151 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>
2016-02-11 08:43:46 -05:00
Sage Weil
88d251475b Merge pull request #7579 from javacruft/wip-systemd-escaping
systemd: correctly escape block device paths

Reviewed-by: Sage Weil <sage@redhat.com>
2016-02-11 08:42:50 -05:00
Sage Weil
0d819d549b Merge pull request #7581 from jcsp/wip-asok-lockdep
librados: mix lock cycle (un)registering asok commands

Reviewed-by: Sage Weil <sage@redhat.com>
2016-02-11 08:42:26 -05:00
Sage Weil
62ecb28ff2 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>
2016-02-11 08:37:50 -05:00
Loic Dachary
4056ee298a 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>
2016-02-11 19:18:34 +07:00
Kefu Chai
8f42f89937 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>
2016-02-11 20:08:35 +08:00
Boris Ranto
bcf12049fb 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>
2016-02-11 12:37:51 +01:00
Haomai Wang
765c7592af Merge pull request #7601 from jjhuo/master
os/bluestore: fix a typo in SPDK path parsing

Reviewed-by: Haomai Wang <haomai@xsky.com>
2016-02-11 14:36:01 +08:00
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
Rémi BUISSON
6666300084 debian: fix build-depends
Signed-off-by: Rémi BUISSON <remi.buisson@cdiscount.com>
2016-02-09 14:41:51 +01: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
John Spray
f06c4dc1d0 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>
2016-02-09 12:19:14 +00:00
John Spray
be5748a818 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>
2016-02-09 12:18:24 +00:00
James Page
c28c0b1824 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>
2016-02-09 11:13:00 +00: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