RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2024-12-19 09:57:05 +00:00
Code Issues Packages Projects Releases Wiki Activity
50,821 Commits 211 Branches 394 Tags 2.2 GiB
a795d34c30
Commit Graph

50821 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jason Dillaman
a795d34c30 librbd: protect against journal replay shutdown race condition 
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
 2016-03-11 09:07:46 -05:00
Jason Dillaman
aa6a8d3a8b librbd: replaying a journal op post-refresh requires locking 
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
 2016-03-11 07:39:53 -05:00
Jason Dillaman
fdeb125581 test: periodic failure in TestJournalReplay.SnapRename 
Force the refresh of the image to pick up the new snapshot
name before testing that it successfully was renamed.

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
 2016-03-11 07:39:53 -05:00
Josh Durgin
164de7aa39 Merge pull request #7923 from RustShen/master 
doc: add cinder backend section to rbd-openstack.rst

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
 2016-03-11 00:04:44 -08:00
Dan Mick
81d7b0d338 Merge pull request #7999 from liewegas/wip-armhf 
a few armhf (32-bit build) fixes

Reviewed-by: Dan Mick <dmick@redhat.com>
 2016-03-10 19:15:59 -08:00
Yehuda Sadeh
e730a9846e Merge pull request #7891 from rzarzynski/wip-rgw-content-disp 
rgw: multiple Swift API compliance improvements for TempURL (Radoslaw Zarzynsk)

Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
 2016-03-10 15:41:27 -08:00
Yehuda Sadeh
2ea72c1d5a Merge pull request #7990 from x11562/rgw_unused_vector 
rgw: remove unused vector

Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
 2016-03-10 14:57:06 -08:00
Yehuda Sadeh
e6ecc65e2c Merge pull request #8031 from ceph/wip-rgw-usage 
rgw: admin api for retrieving usage info (Ji Chen)

Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
Reviewed-by: Matt Benjamin <mbenjamin@redhat.com>
 2016-03-10 14:53:15 -08:00
Yehuda Sadeh
356aaf2626 Merge pull request #8036 from yehudasa/wip-rgw-support-json-format-v2 
rgw: support json format for admin policy API (Dunrong Huang)

Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
Reviewed-by: Matt Benjamin <mbenjamin@redhat.com>
 2016-03-10 14:50:21 -08:00
Yehuda Sadeh
adccab0154 Merge pull request #7874 from badone/wip-coverity-rgw_lib-uninit 
[rgw] RGWLib::env is not used so remove it

Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
 2016-03-10 14:26:30 -08:00
Yehuda Sadeh
b988f79b46 rgw_admin: policy dump --xml backward compatibility 
Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
 2016-03-10 14:22:19 -08:00
Dunrong Huang
3a8b0e3d1f rgw: remove unused header file 
Signed-off-by: Dunrong Huang <riegamaths@gmail.com>
 2016-03-10 13:35:28 -08:00
Dunrong Huang
dd24f51758 rgw: support json format output for rados-admin policy command 
when use rados-admin to get policy with parameter --format=json:
$ radosgw-admin policy --bucket=m8x --format=json

policy information with json format should be output.

Signed-off-by: Dunrong Huang <riegamaths@gmail.com>
 2016-03-10 13:35:28 -08:00
Dunrong Huang
a1333f547e rgw: support json format for admin policy API 
Fixes: #14090, #14091

- before this patch:
$ curl -s -X GET http://radosrgw:9090/admin/bucket?format=json&policy&bucket=m8x | xmllint --format -

got XML response with error format

- after this patch:
got correct response with json format

Signed-off-by: Dunrong Huang <riegamaths@gmail.com>
 2016-03-10 13:35:28 -08:00
Gregory Farnum
740c52d656 Merge pull request #8027 from liewegas/wip-reweight-fix 
test/pybind/test_ceph_argparse: fix reweight-by-utilization tests

Reviewed-by: Kefu Chai <kchai@redhat.com>
 2016-03-10 13:03:32 -08:00
Yehuda Sadeh
461bd7fa08 Merge pull request #6656 from jmunhoz/wip-bucket-request-payment-usage-log 
rgw: add bucket request payment feature usage statistics integration

Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
 2016-03-10 11:13:24 -08:00
Sage Weil
c812bbae47 Merge pull request #8021 from branch-predictor/bp-bench-full-bw 
common/obj_bencher.cc: bump the precision of bandwidth field

Reviewed-by: Sage Weil <sage@redhat.com>
 2016-03-10 13:08:54 -05:00
Matt Benjamin
70d3e1306f Merge pull request #7675 from vmcloud/wip-12917 
rgw: adjust the request_uri to support absoluteURI of http request
 2016-03-10 12:03:49 -05:00
Sage Weil
d0f8713196 test/pybind/test_ceph_argparse: fix reweight-by-utilization tests 
Signed-off-by: Sage Weil <sage@redhat.com>
 2016-03-10 11:13:43 -05:00
Kefu Chai
797f1d41d9 man/8/ceph.rst: remove invalid option for reweight-by-* 
--yes-i-really-mean-it is not valid option for reweight-by-*

Signed-off-by: Kefu Chai <kchai@redhat.com>
 2016-03-10 11:13:42 -05:00
Kefu Chai
76b1450730 Merge pull request #8025 from roidayan/xio-remove_duplicate_peer_addr_assignment 
xio: remove duplicate assignment of peer addr

Reviewed-by: Kefu Chai <kchai@redhat.com>
 2016-03-10 21:52:36 +08:00
Roi Dayan
d1627f5d01 xio: remove duplicate assignment of peer addr 
Signed-off-by: Roi Dayan <roid@mellanox.com>
 2016-03-10 15:33:32 +02:00
Jason Dillaman
9cf46b84a8 test: correct journal test failure caused by two merged commits 
Commit 21d9595 changed the journal width to 3 objects while commit
a00eae0 changed the signature of the journal create helper.

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
 2016-03-10 07:58:31 -05:00
Piotr Dałek
7a461a43ad common/obj_bencher.cc: bump the precision of bandwidth field 
When calculated final average bandwidth exceeds 999MB, it starts
to get printed in scientific notation. Bump up the bandwidth
field precision so it'll remain in floating-point format for
a bit longer.

Signed-off-by: Piotr Dałek <piotr.dalek@ts.fujitsu.com>
 2016-03-10 12:50:47 +01:00
Greg Farnum
c49de8c1c2 Merge remote-tracking branch 'origin/jewel' 
Conflicts:
	src/client/Client.h
Signed-off-by: Greg Farnum <gfarnum@redhat.com>
 2016-03-10 00:56:37 -08:00
Gregory Farnum
dedcbc6bc2 Merge pull request #7495 from ukernel/jewel-10436 
client: flush kernel pagecache before creating snapshot

Reviewed-by: Greg Farnum <gfarnum@redhat.com>
 2016-03-10 00:52:17 -08:00
Gregory Farnum
44f7b87263 Merge pull request #7798 from ukernel/wip-mds-snap 
A few more snapshot fixes, mostly around snapshotted inode/dentry tracking

Reviewed-by: Sage Weil <sage@redhat.com>
Reviewed-by: Greg Farnum <gfarnum@redhat.com>
 2016-03-09 22:49:46 -08:00
Gregory Farnum
d783e96775 Merge pull request #7994 from ukernel/jewel-14996 
Merge: Fix client handling of "lost" open directories on shutdown

Reviewed-by: Greg Farnum <gfarnum@redhat.com>
 2016-03-09 22:43:04 -08:00
RustShen
5fe3ff3f09 Modifications to rbd-openstack.rst 
Original configuration is not working

'enabled_backends' should be changed accordingly

Signed-off-by: RustShen <rustinpeace@163.com>

Update rbd-openstack.rst
 2016-03-10 14:31:34 +08:00
Greg Farnum
9f69cb1a81 Merge remote-tracking branch 'origin/greg-fs-testing-3-7-damage' 2016-03-09 22:25:25 -08:00
Gregory Farnum
eaded2ea4c Merge pull request #7686 from david-z/wip-fix-fh-ref-leak 
ceph-fuse: Fix potential filehandle ref leak at umount

Reviewed-by: Yan, Zheng <zyan@redhat.com>
Reviewed-by: Greg Farnum <gfarnum@redhat.com>
 2016-03-09 22:25:42 -08:00
Gregory Farnum
d63186f4fd Merge pull request #7685 from david-z/wip-fix-put-free-fd-back 
[cephfs] fix free fds being exhausted eventually because freed fds are never put back

Reviewed-by: Yan, Zheng <zyan@redhat.com>
 2016-03-09 22:24:22 -08:00
Gregory Farnum
9ae8486875 Merge pull request #7003 from jcsp/wip-cephfs-tmap-migrate 
tools/cephfs: add tmap_upgrade

Reviewed-by: David Zafman <dzafman@redhat.com>
Reviewed-by: Yan, Zheng <zyan@redhat.com>
Reviewed-by: Greg Farnum <gfarnum@redhat.com>
 2016-03-09 22:22:42 -08:00
Gregory Farnum
6f81a7ad9b Merge pull request #8014 from ukernel/wip-15038 
mds: fix inode_t::compare()

Reviewed-by: Greg Farnum <gfarnum@redhat.com>
 2016-03-09 22:12:07 -08:00
Dan Mick
1856de3848 Merge pull request #8012 from zmc/jewel 
man/8/ceph-disk: fix formatting issue

Reviewed-by: Dan Mick <dmick@redhat.com>
 2016-03-09 19:40:04 -08:00
Yan, Zheng
9b79d05c59 mds: fix inode_t::compare() 
Fixes: #15038
Signed-off-by: Yan, Zheng <zyan@redhat.com>
 2016-03-10 10:50:07 +08:00
Josh Durgin
4fdd10d59d Merge pull request #7978 from dillaman/wip-14908 
librbd: refresh image if required before replaying journal ops

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
 2016-03-09 17:51:02 -08:00
Josh Durgin
e3ea4e390f Merge pull request #8009 from dillaman/wip-14988 
test: reproducer for writeback CoW deadlock

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
 2016-03-09 17:30:08 -08:00
Josh Durgin
4260b08fe1 Merge pull request #8005 from dillaman/wip-rbd-lock-fence 
pybind: flag an RBD image as closed regardless of result code

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
 2016-03-09 17:25:55 -08:00
Josh Durgin
facd50d531 Merge pull request #8001 from dillaman/wip-rbd-cram 
test: update rbd integration cram tests for new default features

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
 2016-03-09 17:23:54 -08:00
Jason Dillaman
0d9fb7a749 test: reproducer for writeback CoW deadlock 
Refs: #14988

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
 2016-03-09 20:06:46 -05:00
Sage Weil
977bed095d man/8/ceph-disk: fix formatting issue 
ERROR: /srv/autobuild-ceph/gitbuilder.git/build/doc/man/8/ceph-disk.rst:39: Unexpected indentation.
WARNING: /srv/autobuild-ceph/gitbuilder.git/build/doc/man/8/ceph-disk.rst:40: Block quote ends without a blank line; unexpected unindent.

Signed-off-by: Sage Weil <sage@redhat.com>
(cherry picked from commit 8dcaacbb05)
 2016-03-09 16:46:21 -07:00
Josh Durgin
3d404f2e1c Merge pull request #7906 from dillaman/wip-14869 
journal: re-use common threads between journalers

Conflicts:
	src/journal/JournalPlayer.cc
	src/librbd/Journal.cc
	src/test/rbd_mirror/image_replay.cc
	src/tools/rbd_mirror/ImageReplayer.h
	src/tools/rbd_mirror/Mirror.cc

(merged interface changes to ImageReplayer, and reduced scope for
change to JournalPlayer due to pr #7884 (wip-14663)).

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
 2016-03-09 14:18:13 -08:00
Josh Durgin
cfed9b6afd Merge pull request #7958 from trociny/wip-rbd-mirror-fixup 
rbd-mirror: minor fix-ups for initial skeleton implementation

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
Reviewed-by: Josh Durgin <jdurgin@redhat.com>
 2016-03-09 14:03:48 -08:00
Josh Durgin
55efa7ae74 Merge pull request #7884 from dillaman/wip-14663 
librbd: allocate new journal tag after acquiring exclusive lock

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
 2016-03-09 14:02:38 -08:00
Josh Durgin
3538f11145 Merge pull request #7772 from xinxinsh/wip-14789 
librbd: truncate does not need to mark the object as existing in the object map

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
 2016-03-09 14:01:54 -08:00
Zack Cerza
89daecf496 Merge pull request #8003 from liewegas/wip-ceph-disk-doc 
man/8/ceph-disk: fix formatting issue
 2016-03-09 14:32:50 -07:00
Sage Weil
9a480e23b8 Merge pull request #7927 from oritwas/wip-rgw-fix-default 
rgw: RGWZoneParams::create should not handle -EEXIST error

Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
 2016-03-09 16:13:16 -05:00
Sage Weil
cec8f23b6a Merge remote-tracking branch 'gh/jewel' 2016-03-09 15:45:38 -05:00
Sage Weil
5e23cba187 Merge pull request #7768 from xinxinsh/wip-fix-zero 
osd: filestore: FALLOC_FL_PUNCH_HOLE must be used with FALLOC_FL_KEEP_SIZE

Reviewed-by: Kefu Chai <kchai@redhat.com>
 2016-03-09 15:05:28 -05:00