Commit Graph

53291 Commits

Author SHA1 Message Date
Sage Weil
6b6b38163b doc/rados: drop description of cache modes we don't recommend
Signed-off-by: Sage Weil <sage@redhat.com>
2016-05-11 08:15:53 -04:00
Kefu Chai
ba5b40c0ce Merge pull request #8955 from xiexingguo/xxg-wip-docrgw
doc/rgw: fix typo, abbreviation error etc.

Reviewed-by: Abhishek Lekshmanan <abhishek@suse.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
2016-05-11 20:09:58 +08:00
Kefu Chai
e2fa841887 Merge pull request #9058 from dillaman/wip-cmake-test-rbd-mirror
cmake: fix rbd compile errors

Reviewed-by: Kefu Chai <kchai@redhat.com>
2016-05-11 19:42:20 +08:00
Jason Dillaman
8d4c00d1be cmake: fix rbd compile errors
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
2016-05-11 07:24:46 -04:00
Mykola Golub
e925ce8624 cls::rbd: mirror_image_status_list returned max 64 items
Signed-off-by: Mykola Golub <mgolub@mirantis.com>
2016-05-11 14:20:55 +03:00
Orit Wasserman
89d1601cf8 Merge pull request #8633 from dreamhost/wip-15531
rgw/s3website: Fix x-amz-website-redirect-location support.
Reviewed-by: Orit Wasserman <owasserm@redhat.com>
2016-05-11 11:05:23 +02:00
Orit Wasserman
7cf5d1d8c7 rgw: Set Access-Control-Allow-Origin to a Asterisk if allowed in a ruleReviewed-by: Orit Wasserman <owasserm@redhat.com>
rgw: Set Access-Control-Allow-Origin to a Asterisk if allowed in a rule
Reviewed-by: Orit Wasserman <owasserm@redhat.com>
2016-05-11 11:02:30 +02:00
Yehuda Sadeh
b8172a5a64 Revert "rgw: RGWDataSyncStatusManager::finalize() cleanup"
This reverts commit 365e8334b4.
2016-05-10 16:24:30 -07:00
Casey Bodley
b89d793afc rgw: RGWDataSyncStatusManager::finalize() cleanup
rgw: RGWDataSyncStatusManager::finalize() cleanup

Reviewed-by: Casey Bodley <cbodley@redhat.com>
2016-05-10 17:30:20 -04:00
Yehuda Sadeh
6feb8c4fa8 Merge pull request #9055 from cbodley/wip-rgw-period-commit-master
rgw: 'period commit' sends to new master zone by default

Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
2016-05-10 14:15:50 -07:00
Casey Bodley
a1881bc636 Merge pull request #8605 from theanalyst/fix/15455
rgw: return 503 for requests when master zone is down

Reviewed-by: Casey Bodley <cbodley@redhat.com>
2016-05-10 17:14:32 -04:00
Casey Bodley
fbe1a05355 radosgw-admin: 'period commit' sends to new master zone by default
if no --remote or --url is given, set --remote = master_zone_id to
override the rest_master_conn (which refers to the old master zone)

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

Signed-off-by: Casey Bodley <cbodley@redhat.com>
2016-05-10 16:09:23 -04:00
Casey Bodley
9fcff89ee1 radosgw-admin: allow --remote to specify zone or zonegroup id
--remote was only looking for zonegroup connections. extended to check
for zone connections as well

updated the usage to clarify that it expects zone/zonegroup ids

Signed-off-by: Casey Bodley <cbodley@redhat.com>
2016-05-10 15:57:34 -04:00
Casey Bodley
3c210ff545 Merge pull request #8909 from theanalyst/rgw/zone-eexist-msg
rgw: remove EEXIST error msg for ZoneCreate

Reviewed-by: Casey Bodley <cbodley@redhat.com>
2016-05-10 15:54:59 -04:00
Casey Bodley
0d4f04a50a Merge pull request #9035 from tchaikov/wip-cmake-venv
cmake: pass CEPH_BUILD_VIRTUALENV to test as an env variable

Reviewed-by: Casey Bodley <cbodley@redhat.com>
2016-05-10 15:06:18 -04:00
Yehuda Sadeh
a80ef267fe Merge pull request #8548 from weiqiaomiao/wq
rgw:remove an unnecessary assignment of the variable 'marker'

Reviewed-by: Orit Wasserman <owasserm@redhat.com>
Reviewed-by: Matt Benjamin <mbenjami@redhat.com>
2016-05-10 11:50:29 -07:00
Kefu Chai
ed43214ca2 Merge pull request #8301 from tchaikov/wip-fortify
cmake: enable FORTFY flags if supported

Reviewed-by: Casey Bodley <cbodley@redhat.com>
2016-05-11 02:42:28 +08:00
Kefu Chai
e79c031dbe cmake: enable FORTFY flags if supported
Signed-off-by: Kefu Chai <kchai@redhat.com>
2016-05-11 02:41:12 +08:00
Yehuda Sadeh
143e3c3174 Merge pull request #8945 from cbodley/wip-rgw-admin-output
radosgw-admin: added missing json output to some commands

Reviewed-by: Abhishek Lekshmanan <abhishek@suse.com>
2016-05-10 11:36:08 -07:00
Yehuda Sadeh
88e10286b6 Merge pull request #8951 from ceph/wip-15745
rgw: handle stripe transition when flushing final pending_data_bl

Reviewed-by: Casey Bodley <cbodley@redhat.com>
2016-05-10 11:18:25 -07:00
Yehuda Sadeh
7dbd6360e8 rgw: 'period delete' cleans up all period objectsReviewed-by: Yehuda Sadeh
rgw: 'period delete' cleans up all period objects

Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
2016-05-10 09:44:02 -07:00
Nathan Cutler
b3b3cc2631 Merge pull request #9045 from ceph/wip-selinux-noprio
rpm: Drop SELinux priority setting

Reviewed by: Nathan Cutler <ncutler@suse.com>
2016-05-10 18:36:57 +02:00
Douglas Fuller
4acca1ac43 test/rbd: document fsx option to keep data on success
Add documentation line for the -k option to fsx to retain data
on success.

Signed-off-by: Douglas Fuller <dfuller@redhat.com>
2016-05-10 09:21:55 -07:00
Boris Ranto
7e606f29f4 rpm: Drop SELinux priority setting
Older versions of semodule binary that are in Centos/RHEL do not
support priority setting, dropping it.

Fixes: #15822
Signed-off-by: Boris Ranto <branto@redhat.com>
2016-05-10 18:21:50 +02:00
Josh Durgin
7fcb52d0d3 Merge pull request #8921 from dillaman/wip-15110
rbd-mirror: image sync needs to handle snapshot size and protection status

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
Reviewed-by: Mykola Golub <mgolub@mirantis.com>

Conflicts:
	src/test/librbd/test_mock_Journal.cc (moved and edited MockJournaler - trivial)
2016-05-10 08:10:24 -07:00
Josh Durgin
43b66f9721 Merge pull request #8937 from dillaman/wip-15642
librbd: client-side handling for incompatible object map sizes 

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
2016-05-10 07:58:26 -07:00
Josh Durgin
f5d38f099b Merge pull request #8958 from dillaman/wip-15750
librbd: constrain size of AioWriteEvent journal entries

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
2016-05-10 07:57:20 -07:00
Josh Durgin
e0c57573a1 librbd: potential concurrent event processing during journal replayReviewed-by: Josh Durgin <jdurgin@redhat.com>
librbd: potential concurrent event processing during journal replay
2016-05-10 07:56:58 -07:00
Josh Durgin
9c43690c88 Merge pull request #8999 from dillaman/wip-15765
journal: incorrectly computed object offset within set

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
2016-05-10 07:56:36 -07:00
Josh Durgin
7131b77919 Merge pull request #9034 from dillaman/wip-rbd-cli-integration-test
test: update rbd integration cram test to remove format 1 warning

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
2016-05-10 07:51:07 -07:00
Kefu Chai
25030b0436 cmake: pass CEPH_BUILD_VIRTUALENV to test as an env variable
Signed-off-by: Kefu Chai <kchai@redhat.com>
2016-05-10 21:50:17 +08:00
Jason Dillaman
85e325369f Merge pull request #9030 from trociny/wip-15771
librbd: fix get/list mirror image status API

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
2016-05-10 09:04:22 -04:00
Jason Dillaman
098038fad4 test: update rbd integration cram test to remove format 1 warning
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
2016-05-10 08:33:13 -04:00
Mykola Golub
e6c709b3a8 rbd-mirror: fixup to get/list mirror image status API
- embed name and rbd_mirror_image_info_t into rbd_mirror_image_status_t;
- index image status list by image id to make 'start' work correctly;
- provide rbd_mirror_image_status_list_cleanup function.

Fixes: #15771
Signed-off-by: Mykola Golub <mgolub@mirantis.com>
2016-05-10 15:04:14 +03:00
Orit Wasserman
dee1bdf42a Merge pull request #8197 from H3C/wip-rgw-bugfixa
rgw:response information is error when geting token of swift account
Reviewed-by: Orit Wasserman <owasserm@redhat.com>
2016-05-10 13:57:05 +02:00
Ilya Dryomov
ee31a7f658 Merge pull request #8944 from vshankar/rbd-map-errno
rbd: helpful error message on map failure

Reviewed-by: Ilya Dryomov <idryomov@gmail.com>
2016-05-10 11:02:20 +02:00
Mykola Golub
46bf727d43 rbd-mirror: avoid potential deadlock
Signed-off-by: Mykola Golub <mgolub@mirantis.com>
2016-05-10 08:55:13 +03:00
Mykola Golub
2fd6fdd3dc rbd-mirror: don't unregister asok commands if image replayer start failed
Signed-off-by: Mykola Golub <mgolub@mirantis.com>
2016-05-10 08:54:05 +03:00
xie xingguo
2b3d5686d7 mon/Monitor: use CEPH_MON_PORT for CRC output
The default monitor port will be changed from 6789 to 3300, which has
been assigned to us by IANA. So update this accordingly for better
tracing and understanding.

Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
2016-05-10 12:19:44 +08:00
xie xingguo
ae5184ac07 mon/Monitor: fix memory leak
Fixes: http://tracker.ceph.com/issues/15793
Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
2016-05-10 12:19:20 +08:00
Jason Dillaman
fa91919c85 test: add missing header dependency for MockJournaler
Signed-off-by: Jason Dillaman <dillaman@redhat.com>
2016-05-09 18:25:39 -04:00
Yehuda Sadeh
c49c8bdf17 Merge pull request #8918 from ceph/wip-rgw-leak-3
rgw: fix memory leaks

Reviewed-by: Casey Bodley <cbodley@redhat.com>
2016-05-09 15:15:11 -07:00
Yehuda Sadeh
365e8334b4 rgw: RGWDataSyncStatusManager::finalize() cleanup
cleanup following code review

Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
2016-05-09 15:13:41 -07:00
Ali Maredia
2d5bb928d5 Merge pull request #9012 from cbodley/wip-cmake-freelist
cmake: add missing FreelistManager sources
2016-05-09 18:09:10 -04:00
Yehuda Sadeh
91f61d68bf rgw: RGWHTTPClient requests can unregister themselves early
No need to wait for req_state to complete anymore.

Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
2016-05-09 14:38:22 -07:00
Yehuda Sadeh
fa9566825c Merge pull request #9013 from cbodley/wip-rgw-test-mtime
test/rgw: enable mtime comparison in check_object_eq()

Reviewed-by: Yehuda Sadeh <yehuda@redhat.com>
2016-05-09 14:37:48 -07:00
Yehuda Sadeh
3d8442effc rgw: move around sync_env.init()
call sync_env.init() even if we're initalized in RGWRemoteDataLog::init()

Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
2016-05-09 14:36:41 -07:00
Yehuda Sadeh
1c876eb387 rgw: rados crs, explicit cleanup
Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
2016-05-09 14:36:40 -07:00
Yehuda Sadeh
7ada4df124 rgw: RGWHTTPManager, avoid referring to req_data->client when completing
this is past calling req_data->finish(), client can be destroyed by now

Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
2016-05-09 14:36:40 -07:00
Yehuda Sadeh
2ca38dab07 rgw: civetweb_callback() refer to store inside lock
pe->store might change when reconfiguring

Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
2016-05-09 14:36:40 -07:00