]> git.apps.os.sepia.ceph.com Git - ceph.git/log
ceph.git
9 years agocmake: fix rbd compile errors 9058/head
Jason Dillaman [Wed, 11 May 2016 02:37:01 +0000 (22:37 -0400)]
cmake: fix rbd compile errors

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
9 years agoRevert "rgw: RGWDataSyncStatusManager::finalize() cleanup"
Yehuda Sadeh [Tue, 10 May 2016 23:24:30 +0000 (16:24 -0700)]
Revert "rgw: RGWDataSyncStatusManager::finalize() cleanup"

This reverts commit 365e8334b4d376ba2d57c2d7d904462fdcc35059.

9 years agorgw: RGWDataSyncStatusManager::finalize() cleanup
Casey Bodley [Tue, 10 May 2016 21:30:20 +0000 (17:30 -0400)]
rgw: RGWDataSyncStatusManager::finalize() cleanup

rgw: RGWDataSyncStatusManager::finalize() cleanup

Reviewed-by: Casey Bodley <cbodley@redhat.com>
9 years agoMerge pull request #9055 from cbodley/wip-rgw-period-commit-master
Yehuda Sadeh [Tue, 10 May 2016 21:15:50 +0000 (14:15 -0700)]
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>
9 years agoMerge pull request #8605 from theanalyst/fix/15455
Casey Bodley [Tue, 10 May 2016 21:14:32 +0000 (17:14 -0400)]
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>
9 years agoradosgw-admin: 'period commit' sends to new master zone by default 9055/head
Casey Bodley [Tue, 10 May 2016 19:51:27 +0000 (15:51 -0400)]
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>
9 years agoradosgw-admin: allow --remote to specify zone or zonegroup id
Casey Bodley [Tue, 10 May 2016 19:48:33 +0000 (15:48 -0400)]
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>
9 years agoMerge pull request #8909 from theanalyst/rgw/zone-eexist-msg
Casey Bodley [Tue, 10 May 2016 19:54:59 +0000 (15:54 -0400)]
Merge pull request #8909 from theanalyst/rgw/zone-eexist-msg

rgw: remove EEXIST error msg for ZoneCreate

Reviewed-by: Casey Bodley <cbodley@redhat.com>
9 years agoMerge pull request #9035 from tchaikov/wip-cmake-venv
Casey Bodley [Tue, 10 May 2016 19:06:18 +0000 (15:06 -0400)]
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>
9 years agoMerge pull request #8548 from weiqiaomiao/wq
Yehuda Sadeh [Tue, 10 May 2016 18:50:29 +0000 (11:50 -0700)]
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>
9 years agoMerge pull request #8301 from tchaikov/wip-fortify
Kefu Chai [Tue, 10 May 2016 18:42:28 +0000 (02:42 +0800)]
Merge pull request #8301 from tchaikov/wip-fortify

cmake: enable FORTFY flags if supported

Reviewed-by: Casey Bodley <cbodley@redhat.com>
9 years agocmake: enable FORTFY flags if supported 8301/head
Kefu Chai [Thu, 24 Mar 2016 15:20:44 +0000 (23:20 +0800)]
cmake: enable FORTFY flags if supported

Signed-off-by: Kefu Chai <kchai@redhat.com>
9 years agoMerge pull request #8945 from cbodley/wip-rgw-admin-output
Yehuda Sadeh [Tue, 10 May 2016 18:36:08 +0000 (11:36 -0700)]
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>
9 years agoMerge pull request #8951 from ceph/wip-15745
Yehuda Sadeh [Tue, 10 May 2016 18:18:25 +0000 (11:18 -0700)]
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>
9 years agorgw: 'period delete' cleans up all period objectsReviewed-by: Yehuda Sadeh
Yehuda Sadeh [Tue, 10 May 2016 16:44:02 +0000 (09:44 -0700)]
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>
9 years agoMerge pull request #9045 from ceph/wip-selinux-noprio
Nathan Cutler [Tue, 10 May 2016 16:36:57 +0000 (18:36 +0200)]
Merge pull request #9045 from ceph/wip-selinux-noprio

rpm: Drop SELinux priority setting

Reviewed by: Nathan Cutler <ncutler@suse.com>

9 years agorpm: Drop SELinux priority setting 9045/head
Boris Ranto [Tue, 10 May 2016 16:20:13 +0000 (18:20 +0200)]
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>
9 years agoMerge pull request #8921 from dillaman/wip-15110
Josh Durgin [Tue, 10 May 2016 15:10:24 +0000 (08:10 -0700)]
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)

9 years agoMerge pull request #8937 from dillaman/wip-15642
Josh Durgin [Tue, 10 May 2016 14:58:26 +0000 (07:58 -0700)]
Merge pull request #8937 from dillaman/wip-15642

librbd: client-side handling for incompatible object map sizes

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
9 years agoMerge pull request #8958 from dillaman/wip-15750
Josh Durgin [Tue, 10 May 2016 14:57:20 +0000 (07:57 -0700)]
Merge pull request #8958 from dillaman/wip-15750

librbd: constrain size of AioWriteEvent journal entries

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
9 years agolibrbd: potential concurrent event processing during journal replayReviewed-by: Josh...
Josh Durgin [Tue, 10 May 2016 14:56:58 +0000 (07:56 -0700)]
librbd: potential concurrent event processing during journal replayReviewed-by: Josh Durgin <jdurgin@redhat.com>

librbd: potential concurrent event processing during journal replay

9 years agoMerge pull request #8999 from dillaman/wip-15765
Josh Durgin [Tue, 10 May 2016 14:56:36 +0000 (07:56 -0700)]
Merge pull request #8999 from dillaman/wip-15765

journal: incorrectly computed object offset within set

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
9 years agoMerge pull request #9034 from dillaman/wip-rbd-cli-integration-test
Josh Durgin [Tue, 10 May 2016 14:51:07 +0000 (07:51 -0700)]
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>
9 years agocmake: pass CEPH_BUILD_VIRTUALENV to test as an env variable 9035/head
Kefu Chai [Tue, 10 May 2016 13:50:17 +0000 (21:50 +0800)]
cmake: pass CEPH_BUILD_VIRTUALENV to test as an env variable

Signed-off-by: Kefu Chai <kchai@redhat.com>
9 years agoMerge pull request #9030 from trociny/wip-15771
Jason Dillaman [Tue, 10 May 2016 13:04:22 +0000 (09:04 -0400)]
Merge pull request #9030 from trociny/wip-15771

librbd: fix get/list mirror image status API

Reviewed-by: Jason Dillaman <dillaman@redhat.com>
9 years agotest: update rbd integration cram test to remove format 1 warning 9034/head
Jason Dillaman [Tue, 10 May 2016 12:33:03 +0000 (08:33 -0400)]
test: update rbd integration cram test to remove format 1 warning

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
9 years agorbd-mirror: fixup to get/list mirror image status API 9030/head
Mykola Golub [Tue, 10 May 2016 09:29:12 +0000 (12:29 +0300)]
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>
9 years agoMerge pull request #8197 from H3C/wip-rgw-bugfixa
Orit Wasserman [Tue, 10 May 2016 11:57:05 +0000 (13:57 +0200)]
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>
9 years agoMerge pull request #8944 from vshankar/rbd-map-errno
Ilya Dryomov [Tue, 10 May 2016 09:02:20 +0000 (11:02 +0200)]
Merge pull request #8944 from vshankar/rbd-map-errno

rbd: helpful error message on map failure

Reviewed-by: Ilya Dryomov <idryomov@gmail.com>
9 years agotest: add missing header dependency for MockJournaler 8921/head
Jason Dillaman [Mon, 9 May 2016 22:25:39 +0000 (18:25 -0400)]
test: add missing header dependency for MockJournaler

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
9 years agoMerge pull request #8918 from ceph/wip-rgw-leak-3
Yehuda Sadeh [Mon, 9 May 2016 22:15:11 +0000 (15:15 -0700)]
Merge pull request #8918 from ceph/wip-rgw-leak-3

rgw: fix memory leaks

Reviewed-by: Casey Bodley <cbodley@redhat.com>
9 years agorgw: RGWDataSyncStatusManager::finalize() cleanup 9014/head
Yehuda Sadeh [Mon, 9 May 2016 22:13:41 +0000 (15:13 -0700)]
rgw: RGWDataSyncStatusManager::finalize() cleanup

cleanup following code review

Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
9 years agoMerge pull request #9012 from cbodley/wip-cmake-freelist
Ali Maredia [Mon, 9 May 2016 22:09:10 +0000 (18:09 -0400)]
Merge pull request #9012 from cbodley/wip-cmake-freelist

cmake: add missing FreelistManager sources

9 years agorgw: RGWHTTPClient requests can unregister themselves early 8918/head
Yehuda Sadeh [Thu, 5 May 2016 17:57:05 +0000 (10:57 -0700)]
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>
9 years agoMerge pull request #9013 from cbodley/wip-rgw-test-mtime
Yehuda Sadeh [Mon, 9 May 2016 21:37:48 +0000 (14:37 -0700)]
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>
9 years agorgw: move around sync_env.init()
Yehuda Sadeh [Thu, 5 May 2016 01:08:38 +0000 (18:08 -0700)]
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>
9 years agorgw: rados crs, explicit cleanup
Yehuda Sadeh [Tue, 3 May 2016 19:01:55 +0000 (12:01 -0700)]
rgw: rados crs, explicit cleanup

Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
9 years agorgw: RGWHTTPManager, avoid referring to req_data->client when completing
Yehuda Sadeh [Tue, 3 May 2016 19:00:46 +0000 (12:00 -0700)]
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>
9 years agorgw: civetweb_callback() refer to store inside lock
Yehuda Sadeh [Tue, 3 May 2016 18:59:11 +0000 (11:59 -0700)]
rgw: civetweb_callback() refer to store inside lock

pe->store might change when reconfiguring

Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
9 years agorgw: RGWPeriodPusher, stop http manager explicitly
Yehuda Sadeh [Tue, 3 May 2016 17:03:14 +0000 (10:03 -0700)]
rgw: RGWPeriodPusher, stop http manager explicitly

Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
9 years agorgw: RGWHTTPManager, can call stop() more than once
Yehuda Sadeh [Tue, 3 May 2016 17:02:02 +0000 (10:02 -0700)]
rgw: RGWHTTPManager, can call stop() more than once

destructor calls stop(), but it can be also called explicitly, if caller
wants to ensure requests are not being handled anymore.

Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
9 years agorgw: RGWReadRESTResourceCR, fix refcounting
Yehuda Sadeh [Tue, 3 May 2016 17:01:33 +0000 (10:01 -0700)]
rgw: RGWReadRESTResourceCR, fix refcounting

Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
9 years agorgw: RGWReadRemoteDataLogShardCR fix destructor
Yehuda Sadeh [Tue, 3 May 2016 16:59:47 +0000 (09:59 -0700)]
rgw: RGWReadRemoteDataLogShardCR fix destructor

was missing destructor, constructor was broken

Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
9 years agorgw: RGWDataSyncStatusManager, cleanup if failing init
Yehuda Sadeh [Tue, 3 May 2016 01:13:17 +0000 (18:13 -0700)]
rgw: RGWDataSyncStatusManager, cleanup if failing init

init can be called more than once, ended up with leaking some resources

Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
9 years agorgw: rest crs, explicitly call cleanup
Yehuda Sadeh [Fri, 29 Apr 2016 20:04:13 +0000 (13:04 -0700)]
rgw: rest crs, explicitly call cleanup

Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
9 years agorgw: more leaks fixes
Yehuda Sadeh [Fri, 29 Apr 2016 00:03:21 +0000 (17:03 -0700)]
rgw: more leaks fixes

Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
9 years agorgw: drop a reference to http op
Yehuda Sadeh [Wed, 27 Apr 2016 23:39:36 +0000 (16:39 -0700)]
rgw: drop a reference to http op

Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
9 years agoMerge pull request #8766 from yehudasa/wip-15597
Yehuda Sadeh [Mon, 9 May 2016 21:23:50 +0000 (14:23 -0700)]
Merge pull request #8766 from yehudasa/wip-15597

rgw: upgrade default zonegroup and set correct zone[group] id

Reviewed-by: Abhishek Lekshmanan <abhishek@suse.com>
9 years agorgw: code cleanup 8766/head
Yehuda Sadeh [Mon, 9 May 2016 21:23:03 +0000 (14:23 -0700)]
rgw: code cleanup

Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
9 years agoMerge pull request #8772 from yehudasa/wip-15625
Yehuda Sadeh [Mon, 9 May 2016 21:13:11 +0000 (14:13 -0700)]
Merge pull request #8772 from yehudasa/wip-15625

rgw: sync fixes

Reviewed-by: Casey Bodley <cbodley@redhat.com>
9 years agotest/rgw: enable mtime comparison in check_object_eq() 9013/head
Casey Bodley [Wed, 27 Apr 2016 21:17:57 +0000 (17:17 -0400)]
test/rgw: enable mtime comparison in check_object_eq()

Signed-off-by: Casey Bodley <cbodley@redhat.com>
9 years agoMerge pull request #8880 from cbodley/wip-rgw-zonegroup-remove
Yehuda Sadeh [Mon, 9 May 2016 21:05:53 +0000 (14:05 -0700)]
Merge pull request #8880 from cbodley/wip-rgw-zonegroup-remove

radosgw-admin: add missing 'zonegroup remove'

Reviewed-by: Yehuda Sadeh <yehudasa@gmail.com>
9 years agocmake: add missing FreelistManager sources 9012/head
Casey Bodley [Mon, 9 May 2016 20:57:14 +0000 (16:57 -0400)]
cmake: add missing FreelistManager sources

Signed-off-by: Casey Bodley <cbodley@redhat.com>
9 years agoMerge pull request #8166 from kmroz/wip-rgw-rest-conn-use-vector
Casey Bodley [Mon, 9 May 2016 18:11:05 +0000 (14:11 -0400)]
Merge pull request #8166 from kmroz/wip-rgw-rest-conn-use-vector

rgw: rest and http client code to use param vectors

Reviewed-by: Casey Bodley <cbodley@redhat.com>
9 years agocommon/ShardedOpWQ: make timeout when calling WaitInterval configurabletest run http...
Yuri Weinstein [Mon, 9 May 2016 16:10:01 +0000 (09:10 -0700)]
common/ShardedOpWQ: make timeout when calling WaitInterval configurabletest run http://pulpito.ceph.com/yuriw-2016-05-07_09:11:04-rados-wip-yuri-testing---basic-smithi/

common/ShardedOpWQ: make timeout when calling WaitInterval configurable

test run http://pulpito.ceph.com/yuriw-2016-05-07_09:11:04-rados-wip-yuri-testing---basic-smithi/

9 years agoMerge pull request #8810 from xiexingguo/xxg-wip-fixgotfullmap
Yuri Weinstein [Mon, 9 May 2016 16:09:26 +0000 (09:09 -0700)]
Merge pull request #8810 from xiexingguo/xxg-wip-fixgotfullmap

osd: fix problematic got_full_map() logic

test run http://pulpito.ceph.com/yuriw-2016-05-07_09:11:04-rados-wip-yuri-testing---basic-smithi/

9 years agoMerge pull request #8857 from liewegas/wip-15678
Yuri Weinstein [Mon, 9 May 2016 16:09:13 +0000 (09:09 -0700)]
Merge pull request #8857 from liewegas/wip-15678

osd: handle boot racing with NOUP set

test run http://pulpito.ceph.com/yuriw-2016-05-07_09:11:04-rados-wip-yuri-testing---basic-smithi/

9 years agoMerge pull request #8881 from liewegas/wip-14952
Yuri Weinstein [Mon, 9 May 2016 16:08:39 +0000 (09:08 -0700)]
Merge pull request #8881 from liewegas/wip-14952

osd: fix pg stuck messages while PGs are being created

test run http://pulpito.ceph.com/yuriw-2016-05-07_09:11:04-rados-wip-yuri-testing---basic-smithi/

9 years agoMerge pull request #8798 from majianpeng/buffer
Yuri Weinstein [Mon, 9 May 2016 16:07:19 +0000 (09:07 -0700)]
Merge pull request #8798 from majianpeng/buffer

common/buffer: clean up alignment checks

test run http://pulpito.ceph.com/yuriw-2016-05-08_08:12:51-rados-wip-yuri-testing2---basic-smithi/

9 years agoMerge pull request #8953 from xiexingguo/xxg-wip-prettydump
Yuri Weinstein [Mon, 9 May 2016 16:06:31 +0000 (09:06 -0700)]
Merge pull request #8953 from xiexingguo/xxg-wip-prettydump

mon/PGMap: pretty output for "pg dump osds" command

9 years agoMerge pull request #8986 from stiopaa1/osd_prepublishmap_move
Sage Weil [Mon, 9 May 2016 15:53:05 +0000 (11:53 -0400)]
Merge pull request #8986 from stiopaa1/osd_prepublishmap_move

osd/OSD.h: move shared_ptr instead of copying it

Reviewed-by: Adam Emerson <aemerson@redhat.com
Reviewed-by: Sage Weil <sage@redhat.com>
9 years agorbd: helpful error message on map failure 8944/head
Venky Shankar [Thu, 5 May 2016 09:58:16 +0000 (15:28 +0530)]
rbd: helpful error message on map failure

Failure to map an rbd image provides pretty much nothing to
debug (or rectify) the nature of failure. This change tries
to improve the same by providing helpful error messages (by
pointing to dmesg, etc..).

Fixes: http://tracker.ceph.com/issues/15721
Signed-off-by: Venky Shankar <vshankar@redhat.com>
9 years agoMerge pull request #8981 from ceph/wip-rgw-test-fix
Casey Bodley [Mon, 9 May 2016 15:25:32 +0000 (11:25 -0400)]
Merge pull request #8981 from ceph/wip-rgw-test-fix

test/rgw: fix bucket checkpoint

Reviewed-by: Casey Bodley <cbodley@redhat.com>
9 years agojournal: incorrectly computed object offset within set 8999/head
Jason Dillaman [Mon, 9 May 2016 15:22:48 +0000 (11:22 -0400)]
journal: incorrectly computed object offset within set

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
9 years agoMerge pull request #8786 from tchaikov/wip-btrfs-sudo
Kefu Chai [Mon, 9 May 2016 14:38:07 +0000 (22:38 +0800)]
Merge pull request #8786 from tchaikov/wip-btrfs-sudo

test: sudo to rm btrfs subvol

Reviewed-by: Erwan Velu <erwan@redhat.com>
9 years agoMerge pull request #8994 from theanalyst/fix/15776
Orit Wasserman [Mon, 9 May 2016 14:36:43 +0000 (16:36 +0200)]
Merge pull request #8994 from theanalyst/fix/15776

 rgw: log name instead of id for SystemMetaObj on failure

9 years agoMerge pull request #8919 from stiopaa1/log_moveToPrivateOsdService
Sage Weil [Mon, 9 May 2016 13:51:19 +0000 (09:51 -0400)]
Merge pull request #8919 from stiopaa1/log_moveToPrivateOsdService

osd/OSD.h: change some data members to private

Reviewed-by: Sage Weil <sage@redhat.com>
9 years agoMerge pull request #8989 from flyd1005/wip-fix-python-warnings
Sage Weil [Mon, 9 May 2016 13:50:46 +0000 (09:50 -0400)]
Merge pull request #8989 from flyd1005/wip-fix-python-warnings

cleanup: python: remove warnings of 'trailing whitespace' and 'new blank line at EOF'

9 years agoMerge pull request #8992 from runsisi/wip-fix-dup-keygen
Sage Weil [Mon, 9 May 2016 13:49:54 +0000 (09:49 -0400)]
Merge pull request #8992 from runsisi/wip-fix-dup-keygen

cls_journal: remove duplicated key generation

Reviewed-by: Sage Weil <sage@redhat.com>
9 years agoMerge pull request #8991 from emenguy/doc_test-reweight-by-utilization
Sage Weil [Mon, 9 May 2016 13:48:52 +0000 (09:48 -0400)]
Merge pull request #8991 from emenguy/doc_test-reweight-by-utilization

doc: adding test-reweight-by-utilization documentation

9 years agoMerge pull request #8984 from stiopaa1/osd_removeUnorderedSet
Sage Weil [Mon, 9 May 2016 13:38:12 +0000 (09:38 -0400)]
Merge pull request #8984 from stiopaa1/osd_removeUnorderedSet

osd/OSD.h: remove unneeded include file

Reviewed-by: Sage Weil <sage@redhat.com>
9 years agoMerge pull request #8097 from aclamk/crushtool-pool-id
Sage Weil [Mon, 9 May 2016 13:15:24 +0000 (09:15 -0400)]
Merge pull request #8097 from aclamk/crushtool-pool-id

crushtool: add ability of precise testing of placement group calculation.

Reviewed-by: Sage Weil <sage@redhat.com>
9 years agoMerge pull request #8832 from stiopaa1/log_graylogmove
Sage Weil [Mon, 9 May 2016 13:14:55 +0000 (09:14 -0400)]
Merge pull request #8832 from stiopaa1/log_graylogmove

common/Graylog.cc: use std move to avoid copy

Reviewed-by: Casey Bodley <cbodley@redhat.com>
Reviewed-by: Kefu Chai <kchai@redhat.com>
9 years agoMerge pull request #8920 from XinzeChi/wip-race-shutdown
Sage Weil [Mon, 9 May 2016 13:14:10 +0000 (09:14 -0400)]
Merge pull request #8920 from XinzeChi/wip-race-shutdown

osd: fix deadlock in OSD::_committed_osd_maps

Reviewed-by: Sage Weil <sage@redhat.com>
9 years agoMerge pull request #8922 from runsisi/wip-fix-lockdep-assert
Sage Weil [Mon, 9 May 2016 13:13:26 +0000 (09:13 -0400)]
Merge pull request #8922 from runsisi/wip-fix-lockdep-assert

lockdep: fix assertion expression if ran out of lock ids

Reviewed-by: Kefu Chai <kchai@redhat.com>
Reviewed-by: xie xingguo <xie.xingguo@zte.com.cn>
9 years agoMerge pull request #8967 from liewegas/wip-15760
Sage Weil [Mon, 9 May 2016 13:12:49 +0000 (09:12 -0400)]
Merge pull request #8967 from liewegas/wip-15760

osdc/Objecter: upper bound watch_check result

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
9 years agoMerge pull request #8357 from liewegas/wip-osd-prestart
Sage Weil [Mon, 9 May 2016 12:59:05 +0000 (08:59 -0400)]
Merge pull request #8357 from liewegas/wip-osd-prestart

osd: update crush_location from ceph-osd on startup

Reviewed-by: Kefu Chai <kchai@redhat.com>
9 years agoMerge pull request #8194 from tanghaodong25/fix_4
Sage Weil [Mon, 9 May 2016 12:58:33 +0000 (08:58 -0400)]
Merge pull request #8194 from tanghaodong25/fix_4

os/bluestore/KernelDevice.cc: small fix in buffer flush

Reviewed-by: Haomai Wang <haomai@xsky.com>
9 years agoMerge pull request #8349 from Aran85/prepare_entry_cleanup
Sage Weil [Mon, 9 May 2016 12:57:51 +0000 (08:57 -0400)]
Merge pull request #8349 from Aran85/prepare_entry_cleanup

os/filestore: prepare entry cleanup

Reviewed-by: Sage Weil <sage@redhat.com>
9 years agoosd: create osd id if it does not exist 8357/head
Sage Weil [Thu, 28 Apr 2016 14:09:29 +0000 (10:09 -0400)]
osd: create osd id if it does not exist

Most tools create the osd id before trying to start ceph-osd.  Notably,
teuthology does not.  We could fix that, but we would be changing behavior,
as the osd boot will happily create the osd id on the fly for us.  Other
provisioning tools might rely on that behavior.  Instead, just allocate
the id sooner in the process (if necessary).

Signed-off-by: Sage Weil <sage@redhat.com>
9 years agoosd: change osd_crush_initial_weight = 0 to mean weight to 0
Sage Weil [Fri, 22 Apr 2016 15:12:38 +0000 (11:12 -0400)]
osd: change osd_crush_initial_weight = 0 to mean weight to 0

Negative now means auto-weight, 0 means weight to 0.  Change the
default accordingly.

Signed-off-by: Sage Weil <sage@redhat.com>
9 years agoosd: update crush_location on startup from ceph-osd
Sage Weil [Fri, 22 Apr 2016 15:07:05 +0000 (11:07 -0400)]
osd: update crush_location on startup from ceph-osd

Update the crush location from ceph-osd instead of relying on
kludgey bash in ceph-osd-prestart.sh.  Among other things, this
lets us get accurate statfs information from the ObjectStore
implementation instead of relying on 'df'.

Fixes: http://tracker.ceph.com/issues/15213
Signed-off-by: Sage Weil <sage@redhat.com>
9 years agoosdc/Objecter: use cct's crush_location
Sage Weil [Tue, 29 Mar 2016 16:50:22 +0000 (12:50 -0400)]
osdc/Objecter: use cct's crush_location

Keep the observer so that we refresh our copy of the multimap.

Signed-off-by: Sage Weil <sage@redhat.com>
9 years agoglobal: init crush_location on daemon start
Sage Weil [Tue, 29 Mar 2016 16:50:03 +0000 (12:50 -0400)]
global: init crush_location on daemon start

Signed-off-by: Sage Weil <sage@redhat.com>
9 years agocommon/ceph_context: add CrushLocation to cct
Sage Weil [Tue, 29 Mar 2016 16:49:36 +0000 (12:49 -0400)]
common/ceph_context: add CrushLocation to cct

Signed-off-by: Sage Weil <sage@redhat.com>
9 years agocrush/CrushLocation: add class to manage crush_location
Sage Weil [Tue, 29 Mar 2016 16:49:16 +0000 (12:49 -0400)]
crush/CrushLocation: add class to manage crush_location

The crush_location can come from an explicitly set config,
a hook, or a simple fabricated default (root=default host=...).

Signed-off-by: Sage Weil <sage@redhat.com>
9 years agoMerge pull request #8684 from vuhuong/wip-radosaio-copyout-data-xio
Sage Weil [Mon, 9 May 2016 12:52:56 +0000 (08:52 -0400)]
Merge pull request #8684 from vuhuong/wip-radosaio-copyout-data-xio

librados: copy out data to users' buffer for xio

Reviewed-by: Matt Benjamin <mbenjami@redhat.com>
9 years agoMerge pull request #8759 from xiexingguo/xxg-wip-fixobjecterrace
Sage Weil [Mon, 9 May 2016 12:51:30 +0000 (08:51 -0400)]
Merge pull request #8759 from xiexingguo/xxg-wip-fixobjecterrace

osdc/Objecter: fix race condition for sortbitwise flag detection

Reviewed-by: Sage Weil <sage@redhat.com>
9 years agoMerge pull request #8826 from liewegas/wip-bluestore-bitmap-freelist
Sage Weil [Mon, 9 May 2016 12:50:23 +0000 (08:50 -0400)]
Merge pull request #8826 from liewegas/wip-bluestore-bitmap-freelist

os/bluestore: bitmap-based freelist using merge operator

Reviewed-by: Allen Samuels <allen.samuels@sandisk.com>
Reviewed-by: xie xingguo <xie.xingguo@zte.com.cn>
9 years agorgw: drop unnecessary spacing in rgw zg init log 8994/head
Abhishek Lekshmanan [Mon, 9 May 2016 12:05:06 +0000 (14:05 +0200)]
rgw: drop unnecessary spacing in rgw zg init log

Dropping unneeded space when we're printing the failed reading zg info
message

Signed-off-by: Abhishek Lekshmanan <abhishek@suse.com>
9 years agorgw: log name instead of id for SystemMetaObj on failure
Abhishek Lekshmanan [Mon, 9 May 2016 09:41:19 +0000 (11:41 +0200)]
rgw: log name instead of id for SystemMetaObj on failure

Currently if we fail to read a SystemMetaObj we try to log the
MetaObject id, however this will not be set mostly as read_id has
failed, so we end up logging an empty id, changing this to log
the object name instead

Fixes: http://tracker.ceph.com/issues/15776
Signed-off-by: Abhishek Lekshmanan <abhishek@suse.com>
9 years agoadding test-reweight-by-utilization documentation 8991/head
Etienne Menguy [Mon, 9 May 2016 08:49:47 +0000 (10:49 +0200)]
adding test-reweight-by-utilization documentation

Signed-off-by: Etienne Menguy <etienne.menguy@corp.ovh.com>
9 years agocls_journal: remove duplicated key generation 8992/head
runsisi [Mon, 9 May 2016 07:15:31 +0000 (15:15 +0800)]
cls_journal: remove duplicated key generation

Signed-off-by: runsisi <runsisi@zte.com.cn>
9 years agocleanup: python: remove warnings of 'new blank line at EOF' 8989/head
Li Peng [Mon, 9 May 2016 03:28:42 +0000 (11:28 +0800)]
cleanup: python: remove warnings of 'new blank line at EOF'

When applying ceph patches, some warnings reported, e.g.
qa/workunits/mon/caps.py:367: new blank line at EOF.

Signed-off-by: Li Peng <lip@dtdream.com>
9 years agocleanup: python: remove warnings of 'trailing whitespace'
Li Peng [Mon, 9 May 2016 03:25:08 +0000 (11:25 +0800)]
cleanup: python: remove warnings of 'trailing whitespace'

When applying ceph patches, some warnings reported, e.g.
doc/scripts/gen_state_diagram.py:99: trailing whitespace.

Signed-off-by: Li Peng <lip@dtdream.com>
9 years agoos/filestore/FileJournal: optimize align_bl. 8798/head
Jianpeng Ma [Wed, 27 Apr 2016 23:59:59 +0000 (07:59 +0800)]
os/filestore/FileJournal: optimize align_bl.

Using is_aligned_size_and_memory replace is_aligned &&
is_n_aligned_size.

Signed-off-by: Jianpeng Ma <jianpeng.ma@intel.com>
9 years agocommon/buffer: For bufferlist add func is_aligned_size_and_memory.
Jianpeng Ma [Wed, 27 Apr 2016 23:31:14 +0000 (07:31 +0800)]
common/buffer: For bufferlist add func is_aligned_size_and_memory.

For directIO requirement, we need check bufferpt whether size aligned
and the address aligned. To do this, we should call is_aligned &&
is_n_align_sized. Every func also list all ptr of bufferlist.
To reduce one list, we add is_aligned_size_and_memroy(align_size,
align_memory) which only need list once.

Signed-off-by: Jianpeng Ma <jianpeng.ma@intel.com>
9 years agoaos/bluestore/KernelDevice: optimize rebuild for aio_write.
Jianpeng Ma [Sat, 7 May 2016 23:16:28 +0000 (07:16 +0800)]
aos/bluestore/KernelDevice: optimize rebuild for aio_write.

For the requirement of directio, the content maybe rebuild.
In fact, rebuild_aligned_size_and_memory first check is_n_align_sized &&
is_algined and if need it rebuild.
So using rebuild_aligned_size_and_memory can remove the check.

Signed-off-by: Jianpeng Ma <jianpeng.ma@intel.com>
9 years agocommon/buffer: Change rebuild_aligned_* & rebuild_page_aligned API.
Jianpeng Ma [Fri, 29 Apr 2016 11:30:24 +0000 (19:30 +0800)]
common/buffer: Change rebuild_aligned_* & rebuild_page_aligned API.

Make those func return value from void to bool. Using the return value
we can know whether really rebuild content in order to optimize .

Signed-off-by: Jianpeng Ma <jianpeng.ma@intel.com>
9 years agoos/bluestore/BlueFS: remove the duplicate bufferlist.rebuild().
Jianpeng Ma [Wed, 27 Apr 2016 16:31:03 +0000 (00:31 +0800)]
os/bluestore/BlueFS: remove the duplicate bufferlist.rebuild().

In the later BlockDevice::aio_write(), it will rebuild again if
bufferlist need rebuild.

Signed-off-by: Jianpeng Ma <jianpeng.ma@intel.com>