RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2024-12-29 15:03:33 +00:00
Code Issues Packages Projects Releases Wiki Activity
48,832 Commits 1 Branch 394 Tags 1.4 GiB
678e2bbec0
Commit Graph

48832 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Pete Zaitcev
678e2bbec0 rgw: cleanups to comments and messages 
These are minor cleanups that do not affect the code in a
material way:
- Forgot to add --tenant to usage message
- Make the help slightly less misleading
- Fix a strange error message "could not add remove caps"
- Spelling in a comment
- The vstart.sh can be run with civetweb

Signed-off-by: Pete Zaitcev <zaitcev@redhat.com>
 2016-02-14 22:01:22 -07:00
Sage Weil
a88076415d Merge pull request #7350 from ddiss/tracker14499_enotconn_rados_monitor_log 
librados: check connection state in rados_monitor_log

Reviewed-by: Sage Weil <sage@redhat.com>
 2016-02-12 15:45:37 -05:00
Sage Weil
56d3e94bed Merge pull request #7584 from ifed01/wip-14511 
osd: fix lack of object unblock when flush fails

Reviewed-by: Sage Weil <sage@redhat.com>
 2016-02-12 15:40:33 -05:00
Sage Weil
50b45ccfa8 Merge pull request #7593 from ifed01/wip-no-blockedpromote-return-fix 
osd: fix return value from maybe_handle_cache_detail()

Reviewed-by: Sage Weil <sage@redhat.com>
 2016-02-12 15:39:58 -05:00
Sage Weil
bd17b5f427 Merge pull request #7587 from cbodley/wip-pageset-align 
osd: memstore: fix alignment of Page for test_pageset

Reviewed-by: Dan Mick <dmick@redhat.com>
 2016-02-12 15:39:30 -05:00
Sage Weil
a00e835817 Merge pull request #7595 from liewegas/wip-hobject-stringify 
osd: ghobject_t: use ! instead of @ as a separator
 2016-02-12 15:38:18 -05:00
Sage Weil
9be30dbe9f Merge pull request #7596 from dachary/wip-erasure-code-corpus 
tests: sync ceph-erasure-code-corpus for mktemp -d

Reviewed-by: Sage Weil <sage@redhat.com>
 2016-02-12 15:37:31 -05:00
Sage Weil
eec65d035a Merge pull request #7608 from liewegas/wip-warnings 
tests: fix a few build warnings

Reviewed-by: Kefu Chai <kchai@redhat.com>
 2016-02-12 15:36:35 -05:00
Kefu Chai
7496dd9f0c Merge pull request #7626 from tchaikov/wip-fix-automake 
Makefile: workaround an automake bug for "make check"

Reviewed-by: Loic Dachary <ldachary@redhat.com>
 2016-02-13 01:33:12 +08:00
Loic Dachary
b709f7ce1d Merge pull request #7351 from fmeppo/master 
Add --setuser and --setgroup options for ceph-disk

Reviewed-by: Loic Dachary <ldachary@redhat.com>
 2016-02-12 23:10:18 +07:00
Kefu Chai
19391b7149 Makefile: workaround an automake bug for "make check" 
override the automake variable of am__is_gnu_make. it is a workaround
for http://debbugs.gnu.org/cgi/bugreport.cgi?bug=18744. this bug was
fixed in automake 1.15, but automake 1.13 is supported. so we can not
just require 1.15 using `AM_INIT_AUTOMAKE`. this only happens when we
have lots of source files *and* we are using automake v1.14 or lower.

Fixes: #14723
Signed-off-by: Kefu Chai <kchai@redhat.com>
 2016-02-12 23:56:34 +08:00
Kefu Chai
fb72714326 Merge pull request #7605 from dachary/wip-python-wheelhouse 
python: use pip instead of python setup.py

Reviewed-by: Kefu Chai <kchai@redhat.com>
 2016-02-12 19:59:08 +08:00
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
Loic Dachary
18e64820aa Merge pull request #7528 from objoo/YD-jewel-mailmap-updates-take2 
mailmap updates

Reviewed-by: Loic Dachary <ldachary@redhat.com>
 2016-02-12 13:14:17 +07:00
Josh Durgin
a2888e0ad8 Merge pull request #7609 from dillaman/wip-librbd-flatten-test 
test: new librbd flatten test case

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
 2016-02-11 21:10:13 -08:00
Josh Durgin
bc22c0f327 Merge pull request #7583 from dillaman/wip-librbd-journal-fsx 
librbd: integrate journal replay with fsx testing

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
 2016-02-11 21:09:01 -08:00
Sage Weil
90d93fe938 Merge pull request #7613 from wjwithagen/patch-1 
osd: add missing newline to usage message

Reviewed-by: Sage Weil <sage@redhat.com>
 2016-02-11 16:32:44 -05:00
Willem Jan Withagen
34f896b0db src/ceph_osd.cc Add missing newline to usage message 
Signed-off-by: Willem Jan Withagen <wjw@digiware.nl>
 2016-02-11 21:29:19 +01:00
Sage Weil
d7f0304aec common: fix build error with Graylog 
Graylog includes boost stuff, which clobbers our assert macros.

Signed-off-by: Sage Weil <sage@redhat.com>
 2016-02-11 13:24:29 -05:00
Casey Bodley
05a4811c57 Merge pull request #6920 from oritwas/wip-mstart-cmake 
ajdust mstart and mstop script to run with cmake build
 2016-02-11 12:43:04 -05:00
Ali Maredia
aa6d0a9c65 Merge pull request #7523 from tchaikov/wip-fix-cmake 
cmake: fix the build of tests
 2016-02-11 12:40:41 -05:00
Sage Weil
6adb6944a4 Merge pull request #7607 from FlorentCoppint/master 
mount.fuse.ceph: better parsing of arguments passed to mount.fuse.ceph by mount command

Reviewed-by: Sage Weil <sage@redhat.com>
 2016-02-11 12:30:54 -05:00
Jason Dillaman
5b3a4d2cbc test: new librbd flatten test case 
AIO operations after a flatten operation were previously
hanging during the close of the parent image.

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
 2016-02-11 10:01:38 -05:00
Sage Weil
0da0eda783 unittest_[ceph_]crypto: fix warnings 
test/crypto.cc:20:31: warning: ‘crypto_env’ defined but not used [-Wunused-variable]
 ::testing::Environment* const crypto_env = ::testing::AddGlobalTestEnvironment(n
                               ^
test/ceph_crypto.cc:12:31: warning: ‘crypto_env’ defined but not used [-Wunused-variable]
 ::testing::Environment* const crypto_env = ::testing::AddGlobalTestEnvironment(n
                               ^

Signed-off-by: Sage Weil <sage@redhat.com>
 2016-02-11 08:53:26 -05:00
Sage Weil
fd85a9b576 unittest_bufferlist: fix warning 
Signed-off-by: Sage Weil <sage@redhat.com>
 2016-02-11 08:53:25 -05:00
Sage Weil
c63325850d unittest_compression_[*_][plugin]: fix warnings 
test/compressor/test_compression_plugin.cc: In function ‘int main(int, char**)’:
test/compressor/test_compression_plugin.cc:55:38: warning: ignoring return value of ‘int system(const char*)’, declared with attribute warn_unused_result [-Wunused-result]
   system("mkdir -p .libs/compressor");
                                      ^
test/compressor/test_compression_plugin.cc:56:59: warning: ignoring return value of ‘int system(const char*)’, declared with attribute warn_unused_result [-Wunused-result]
   system("cp .libs/libceph_example.so* .libs/compressor/");
                                                           ^

Signed-off-by: Sage Weil <sage@redhat.com>
 2016-02-11 08:53:25 -05:00
Florent
8fe75846bd Better parsing of arguments passed to mount.fuse.ceph by mount command. 
Signed-off-by: Florent Bautista <florent@coppint.com>
 2016-02-11 14:51:49 +01: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
856e6daf85 ceph_test_libcephfs: fix warnings 
Signed-off-by: Sage Weil <sage@redhat.com>
 2016-02-11 08:45:00 -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
Jason Dillaman
b92eb668c1 librbd: protect journal replay against overlapping writes 
If fsx issues a back-to-back synchronous write, these will be
replayed as AIO writes.  If object map is enabled, it's possible
for the two writes to commit to disk out-of-order if the first
write required an object map update.

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
 2016-02-10 19:06:02 -05:00
Jason Dillaman
bb662311b4 librbd: track in-flight AIO flush requests during journal replay 
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
 2016-02-10 17:40:42 -05:00
Jason Dillaman
1cc409b45e test: possible librbd journal replay flush race 
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
 2016-02-10 17:39:36 -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