RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-01-20 01:51:34 +00:00
Code Issues Packages Projects Releases Wiki Activity
68,972 Commits 216 Branches 394 Tags 1.8 GiB
5cc7771447
Commit Graph

68972 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Daniel Gryniewicz
acd633c105 Merge pull request #13385 from zhangsw/feature-lifecycle-noncurrent 
rgw: add support for noncurrentversion expiration in s3 lifecycle.
 2017-02-20 12:29:51 -05:00
Kefu Chai
b3e516fc38 Merge pull request #13518 from tchaikov/wip-fix-pgp-num 
test: Thrasher: do not update pools_to_fix_pgp_num if nothing happens

Reviewed-by: Sage Weil <sage@redhat.com>
 2017-02-21 00:46:26 +08:00
Yehuda Sadeh
47712977e0 Merge pull request #12223 from cbodley/wip-rgw-meta-sync-yield 
rgw: fix for broken yields in RGWMetaSyncShardCR

Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
 2017-02-20 08:30:11 -08:00
Sage Weil
d6950a413f Merge pull request #13517 from liewegas/wip-kraken-x 
qa/suites/upgrade/kraken-x

Reviewed-by: Yuri Weinstein <yweins@redhat.com>
 2017-02-20 10:20:26 -06:00
Haomai Wang
de90eb6706 Merge pull request #13538 from Adirl/ENOMEM 
msg/async/rdma: Print error only on ENOMEM

Reviewed-by: Haomai Wang <haomai@xsky.com>
 2017-02-20 22:57:21 +08:00
Haomai Wang
281f0775cf Merge pull request #13539 from Adirl/destructor 
msg/async/rdma: update destructor message

Reviewed-by: Haomai Wang <haomai@xsky.com>
 2017-02-20 22:56:32 +08:00
Sage Weil
11797c24dc osd: debug con in ms_handle_connect 
Signed-off-by: Sage Weil <sage@redhat.com>
 2017-02-20 09:55:47 -05:00
Sarit Zubakov
a8aeda9308 msg/async/rdma: update destructor message 
issue:939258

Change-Id: Ib00bb5661a0e80fb258babb63d23458daa8b7025
Signed-off-by: Sarit Zubakov <saritz@mellanox.com>
 2017-02-20 16:46:36 +02:00
Sarit Zubakov
d523bedb0e msg/async/rdma: Print error only on ENOMEM 
issue: 931114

Change-Id: I1e1710245c2c056bd2b8cccae9d96676a8f49678
Signed-off-by: Sarit Zubakov <saritz@mellanox.com>
 2017-02-20 16:43:30 +02:00
Sage Weil
ac9904fd41 messages/MOSDOp: fix pg_t decoding for version <7 decoding 
This was broken by f6e219a4df8553336839bb914733a78090561ec8

Fixes: http://tracker.ceph.com/issues/19005
Signed-off-by: Sage Weil <sage@redhat.com>
 2017-02-20 09:29:11 -05:00
John Spray
41253bbd6c Merge pull request #13065 from ceph/wip-fuse-client-config-edits 
doc: minor changes in fuse client config reference

Reviewed-by: John Spray <john.spray@redhat.com>
 2017-02-20 13:34:04 +00:00
Jason Dillaman
ea7b10501c librbd: new rbd_aio_readv/rbd_aio_writev API methods 
The RBD C API now has scatter/gather IO support via the API. The C++
API uses bufferlists which can also support scatter/gather IO.

Fixes: http://tracker.ceph.com/issues/13025
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
 2017-02-20 08:19:24 -05:00
Jason Dillaman
b00b67ac56 librbd: ReadResult helper class for reassembling partial reads 
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
 2017-02-20 08:19:24 -05:00
Jason Dillaman
de95d862f5 librbd: move IO-related classes to new io namespace 
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
 2017-02-20 08:19:18 -05:00
Haomai Wang
3c0af07629 Merge pull request #13528 from yuyuyu101/wip-fix-rdma-fd 
msg/async/rdma: don't need to delete event when tcp connection isn't …

Reviewed-by: Adir lev <adirl@mellanox.com>
 2017-02-20 16:21:39 +08:00
tangwenjun
e901b271c4 os/bluestore rm unused variable in aio_read() 
Signed-off-by: tangwenjun <tang.wenjun3@zte.com.cn>
 2017-02-20 14:11:27 +08:00
Kefu Chai
0f9c15e32d Merge pull request #13468 from vumrao/wip-vumrao-18932 
auth: 'ceph auth import -i' overwrites caps, if caps are not specified

Reviewed-by: Sage Weil <sage@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
 2017-02-20 11:06:06 +08:00
Kefu Chai
c119da5e00 Merge pull request #13267 from yuyuyu101/wip-fix-lock 
msg/simple: fix missing unlock when already bind

Reviewed-by: Kefu Chai <kchai@redhat.com>
 2017-02-20 11:02:30 +08:00
Kefu Chai
0423b61975 Merge pull request #10125 from stiopaa1/msg_asyncmess_changeReturnTypeIntToVoid 
msg/AsyncMessenger: remove unused method

Reviewed-by: Haomai Wang <haomai@xsky.com>
 2017-02-20 11:00:42 +08:00
Kefu Chai
a9b20741f5 Merge pull request #13339 from wjwithagen/wip-wjw-include-ceph_features 
common: include/ceph_features.h uses uint64_t, which is in sys/types.h

Reviewed-by: Sage Weil <sage@redhat.com>
 2017-02-20 10:58:53 +08:00
Matt Benjamin
2cd60ee971 rgw_file: rgw_readdir can't list multi-segment dirs 
This issue has one root cause in librgw, namely that the marker
argument to these requests was incorrectly formatted (though the
marker cache was working as intended).

Secondarily, for nfs-ganesha users, there is a compounding issue
that the RGW fsal was required by "temporary" convention to
populate the entire dirent cache for a directory on a single
readdir() invocation--the cache_inode/mdcache implementations
invariantly pass (before future 2.5 changesets, currently in
progress) a null pointer for the start cookie offset, intended
to convey this.

Fixes: http://tracker.ceph.com/issues/18991

Signed-off-by: Matt Benjamin <mbenjamin@redhat.com>
 2017-02-19 20:44:08 -05:00
Matt Benjamin
55eec1c0a0 rgw_file: allow setattr on placeholder directories 
When a POSIX path <bucket>/foo/ is known only as an implicit path
segment from other objects (e.g., <bucket>/foo/bar.txt), a case
that would usually arise from S3 upload of such an object, an
RGWFileHandle object representing "<bucket>/foo/" will be constructed
as needed, with no backing in RGW.

This is by design, but subsequently, if a setattr is performed on
such a handle, we must be ready to create the object inline with
storing the attributes.

Fixes: http://tracker.ceph.com/issues/18989

Signed-off-by: Matt Benjamin <mbenjamin@redhat.com>
 2017-02-19 20:43:56 -05:00
Matt Benjamin
e31e9eb980 rgw_file: invalid use of RGWFileHandle::FLAG_EXACT_MATCH 
The change which introduced this flag also caused it to be
given as the flags argument to RGWLibFS::stat_leaf() when called
from rgw_lookup().

This was incorrect:  in particular, when a directory is known only
as a common prefix of other objects, the AWS namespace mapping
convention requires lookup("foo") to match a non-materialized
instance of "foo/" (case 2 in RGWLibFS::stat_leaf's stat loop).

Fixes: http://tracker.ceph.com/issues/18992

Signed-off-by: Matt Benjamin <mbenjamin@redhat.com>
 2017-02-19 20:43:28 -05:00
Haomai Wang
b056f09d9c msg/async/rdma: don't need to delete event when tcp connection isn't built 
Signed-off-by: Haomai Wang <haomai@xsky.com>
 2017-02-20 09:13:05 +08:00
Vikhyat Umrao
90144aa64c auth: 'ceph auth import -i' overwrites caps, if caps are not specified 
in given keyring file, should alert user and should not allow this import.
Because in 'ceph auth list' we keep all the keyrings with caps and importing
'client.admin' user keyring without caps locks the cluster with error[1]
because admin keyring caps are missing in 'ceph auth'.

[1] Error connecting to cluster: PermissionDeniedError

Fixes: http://tracker.ceph.com/issues/18932

Signed-off-by: Vikhyat Umrao <vumrao@redhat.com>
 2017-02-20 03:48:31 +05:30
Kefu Chai
e09de2c313 Merge pull request #13519 from smithfarm/wip-drop-boost-devel 
rpm: drop boost build dependencies

Reviewed-by: Kefu Chai <kchai@redhat.com>
 2017-02-20 02:13:29 +08:00
Kefu Chai
4c049bd424 Merge pull request #13524 from tchaikov/wip-debian-drop-boost-builddeps 
debian: drop boost build dependencies

Reviewed-by: Nathan Cutler <ncutler@suse.com>
 2017-02-20 01:59:24 +08:00
Willem Jan Withagen
e30140d017 test/ceph-test-objectstore: Don't always include BlueStore code 
- FreBSD does not do Bluestore, so TESTS added using
   BlueStore need to be conditional on HAVE_LIBAIO

Signed-off-by: Willem Jan Withagen <wjw@digiware.nl>
 2017-02-19 18:58:44 +01:00
Jason Dillaman
b2b18998c7 Merge pull request #10487 from yangdongsheng/rbd_export 
rbd: introduce v2 format for rbd export/import

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
 2017-02-19 12:18:04 -05:00
Dongsheng Yang
5b1458290d rbd: import/export/mergediff: use STD[IN|OUT]_FILENO instead of 0 or 1 
Signed-off-by: Dongsheng Yang <dongsheng.yang@easystack.cn>
 2017-02-19 20:42:03 +08:00
Dongsheng Yang
fedf772ba1 rbd: import: use read() instead of lseek() when from_stdin is true 
Signed-off-by: Dongsheng Yang <dongsheng.yang@easystack.cn>
 2017-02-19 20:42:03 +08:00
Dongsheng Yang
aa913ced12 rbd: add docs for new format of rbd export. 
Signed-off-by: Dongsheng Yang <dongsheng.yang@easystack.cn>
 2017-02-19 20:42:03 +08:00
Dongsheng Yang
8d2a6139fb rbd: combine the namespaces of export_diff and export_full, import_diff and import. 
Signed-off-by: Dongsheng Yang <dongsheng.yang@easystack.cn>
 2017-02-19 20:42:03 +08:00
Dongsheng Yang
c2356bee4c rbd: import: decode file data in le64 for compatability on different platform 
Signed-off-by: Dongsheng Yang <dongsheng.yang@easystack.cn>
 2017-02-19 20:42:03 +08:00
Dongsheng Yang
435104a294 rbd: import_diff/export_diff: encode length for each tag. 
Signed-off-by: Dongsheng Yang <dongsheng.yang@easystack.cn>
 2017-02-19 20:42:03 +08:00
Dongsheng Yang
08d0c2ab9f rbd: refactor export/import to v1 and v2 methods. 
Signed-off-by: Dongsheng Yang <dongsheng.yang@easystack.cn>
 2017-02-19 20:42:03 +08:00
Dongsheng Yang
f16899a749 rbd: use the unified --export-format option for rbd export and rbd import 
Signed-off-by: Dongsheng Yang <dongsheng.yang@easystack.cn>
 2017-02-19 20:42:03 +08:00
Dongsheng Yang
4ee764f9e1 qa/workunit/rbd: import_export.sh: add image priorities exporting and importing test cases. 
Signed-off-by: Dongsheng Yang <dongsheng.yang@easystack.cn>
 2017-02-19 20:42:03 +08:00
Dongsheng Yang
d7479a09b6 rbd: import/export image stripe_unit and stripe_count. 
Signed-off-by: Dongsheng Yang <dongsheng.yang@easystack.cn>
 2017-02-19 20:42:03 +08:00
Dongsheng Yang
912ff4d2ae rbd: import/export features of image 
Signed-off-by: Dongsheng Yang <dongsheng.yang@easystack.cn>
 2017-02-19 20:42:03 +08:00
Dongsheng Yang
8679521a03 rbd: import/export image_order. 
Signed-off-by: Dongsheng Yang <dongsheng.yang@easystack.cn>
 2017-02-19 20:42:03 +08:00
Dongsheng Yang
55edd81658 qa/workunit/rbd: add test case for --import/export-format in import_export.sh 
Signed-off-by: Dongsheng Yang <dongsheng.yang@easystack.cn>
 2017-02-19 20:42:03 +08:00
Dongsheng Yang
26b858ee1e rbd: introduce --export-format to export command 
Signed-off-by: Dongsheng Yang <dongsheng.yang@easystack.cn>
 2017-02-19 20:42:03 +08:00
Dongsheng Yang
5e034600a2 rbd: introduce --import-format to import command 
Signed-off-by: Dongsheng Yang <dongsheng.yang@easystack.cn>
 2017-02-19 20:42:03 +08:00
Dongsheng Yang
58c8e8cd00 rbd: refactor do_import_diff to accept fd. 
Signed-off-by: Dongsheng Yang <dongsheng.yang@easystack.cn>
 2017-02-19 20:42:03 +08:00
Dongsheng Yang
bc80b147ac rbd: refactor do_export_diff to accept fd 
Signed-off-by: Dongsheng Yang <dongsheng.yang@easystack.cn>
 2017-02-19 20:42:03 +08:00
Dongsheng Yang
de671d77a1 rbd: move do_import_diff out from namespace of import_diff 
Signed-off-by: Dongsheng Yang <dongsheng.yang@easystack.cn>
 2017-02-19 20:42:03 +08:00
Dongsheng Yang
21be324e11 rbd: move do_export_diff out from namespace of export_diff. 
Signed-off-by: Dongsheng Yang <dongsheng.yang@easystack.cn>
 2017-02-19 20:42:03 +08:00
Dongsheng Yang
f6192de7af rbd: squash ImportDiff.cc into Import.cc. 
Signed-off-by: Dongsheng Yang <dongsheng.yang@easystack.cn>
 2017-02-19 20:42:03 +08:00
Dongsheng Yang
262c8d321c rbd: squash ExportDiff.cc into Export.cc 
Signed-off-by: Dongsheng Yang <dongsheng.yang@easystack.cn>
 2017-02-19 20:42:03 +08:00