From: Samuel Just Date: Fri, 1 May 2015 16:01:47 +0000 (-0700) Subject: Merge pull request #3004 from guangyy/wip-10183 X-Git-Tag: v9.0.1~42 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=94a701a553aedf9c951cb47bd21670467b02ecd0;p=ceph.git Merge pull request #3004 from guangyy/wip-10183 Add a new tick timer which does not need to hold osd_lock, put sched_scrub to that tick timer Reviewed-by: Samuel Just --- 94a701a553aedf9c951cb47bd21670467b02ecd0 diff --cc src/osd/OSD.cc index 933d35daaf22,3d0fa724c2d4..3d2e7081e7fd --- a/src/osd/OSD.cc +++ b/src/osd/OSD.cc @@@ -1454,14 -1502,16 +1456,16 @@@ OSD::OSD(CephContext *cct_, ObjectStor Dispatcher(cct_), osd_lock("OSD::osd_lock"), tick_timer(cct, osd_lock), + tick_timer_lock("OSD::tick_timer_lock"), + tick_timer_without_osd_lock(cct, tick_timer_lock), authorize_handler_cluster_registry(new AuthAuthorizeHandlerRegistry(cct, - cct->_conf->auth_supported.length() ? - cct->_conf->auth_supported : - cct->_conf->auth_cluster_required)), + cct->_conf->auth_supported.empty() ? + cct->_conf->auth_cluster_required : + cct->_conf->auth_supported)), authorize_handler_service_registry(new AuthAuthorizeHandlerRegistry(cct, - cct->_conf->auth_supported.length() ? - cct->_conf->auth_supported : - cct->_conf->auth_service_required)), + cct->_conf->auth_supported.empty() ? + cct->_conf->auth_service_required : + cct->_conf->auth_supported)), cluster_messenger(internal_messenger), client_messenger(external_messenger), objecter_messenger(osdc_messenger),