summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| | * | | | ceph.spec.in: add copyright noticeNathan Cutler2016-02-081-0/+13
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | http://tracker.ceph.com/issues/14694 Fixes: #14694 Signed-off-by: Nathan Cutler <ncutler@suse.com>
* | | | | Merge pull request #7572 from ceph/wip-cmake-2-8-16Casey Bodley2016-02-081-4/+8
|\ \ \ \ \ | | | | | | | | | | | | cmake: Added new unittests to make check
| * | | | | cmake: Added new unittests to make checkAli Maredia2016-02-081-4/+8
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added unittest_shunique_lock & unittest_mutex_debug to make check, and made them link ALLOC_LIBS Signed-off-by: Ali Maredia <amaredia@redhat.com>
* | | | | Merge pull request #7513 from athanatos/wip-ceph-test-rados-2Sage Weil2016-02-083-140/+256
|\ \ \ \ \ | | | | | | | | | | | | ceph_test_rados: use less CPU
| * | | | | test/osd/: rework ceph_test_rados buffer generation and verificationSamuel Just2016-02-033-127/+254
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The previous implementation was staggeringly inefficient. Signed-off-by: Samuel Just <sjust@redhat.com>
| * | | | | ceph_test_rados: switch to std::minstd_rand0Samuel Just2016-02-031-13/+2
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Samuel Just <sjust@redhat.com>
* | | | | | Merge pull request #5931 from ceph/wip-cxx11concurrencySage Weil2016-02-0826-761/+2174
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | librados: move to c++11 concurrency types Reviewed-by: Matt Benjamin <mbenjami@redhat.com> Reviewed-by: Casey Bodley <cbodley@redhat.com>
| * | | | | | osdc: Update to use C++11 concurrencyAdam C. Emerson2016-02-0516-759/+768
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The only externally visible change is that Objecter::get_osdmap_read and Objedcter::put_osdmap_read have been removed in favor of Objecter::with_osdmap. It can be used like: objecter->with_osdmap([&](const OSDMap& o) { o.do_stuff(); }; int x = objecter->with_osdmap([&](const OSDMap& o) { return get_thing(id); }); objecter->with_osdmap(std::mem_fn(&OSDMap::do_stuff)); int x = objecter->with_osdmap(std::mem_fn(&OSDMap::get_thing), id); The choice between the style of the first two examples or the second two is arbitrary and depends on what you prefer. Signed-off-by: Adam C. Emerson <aemerson@redhat.com>
| * | | | | | concurrency: Add shunique_lockAdam C. Emerson2016-02-055-1/+991
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Locker class tracking shared/unique/unlocked state of SharedMutex concept. Signed-off-by: Adam C. Emerson <aemerson@redhat.com>
| * | | | | | concurrency: make C++11 style debugging muticesAdam C. Emerson2016-02-058-2/+416
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Adam C. Emerson <aemerson@redhat.com>
* | | | | | | Merge branch 'print-blocked-op' of git://github.com/majianpeng/cephSage Weil2016-02-085-8/+43
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Sage Weil <sage@redhat.com>
| * | | | | | | mds: add dump_blocked_ops asok command.Jianpeng Ma2015-09-022-2/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Like osd dump_blocked_ops, mds also dump blocked ops via asok. Signed-off-by: Jianpeng Ma <jianpeng.ma@intel.com>
| * | | | | | | osd: add dump_blocked_ops asok command.Jianpeng Ma2015-09-023-6/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | From ceph health we can see there are blocked ops and from 'ceph health detai' we can see which osd has blocked ops. Later we only in log of osd to see the detail message of blocked ops. Now via asok dump blocked ops. Signed-off-by: Jianpeng Ma <jianpeng.ma@intel.com>
* | | | | | | | Merge pull request #6608 from esnyder/wip-6634Sage Weil2016-02-082-5/+18
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | osd: remove unused SnapContext member snapc from MOSDSubOp message Reviewed-by: Xiaoxi Chen <xiaoxi.chen@intel.com> Reviewed-by: Sage Weil <sage@redhat.com>
| * | | | | | | | Remove unused SnapContext member snapc from MOSDSubOp message.Emile Snyder2015-12-302-5/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Emile Snyder <emsnyder@ebay.com>
* | | | | | | | | Merge branch 'master' of git://github.com/joconcepts/cephSage Weil2016-02-081-1/+1
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Sage Weil <sage@redhat.com>
| * | | | | | | | | fix rescuing while activatingjoconcepts2016-01-051-1/+1
| | | | | | | | | |
* | | | | | | | | | Merge pull request #7181 from songbaisen/song5Sage Weil2016-02-081-6/+5
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | crush: reply quickly from get_immediate_parent Reviewed-by: xie xingguo <xie.xingguo@zte.com.cn>
| * | | | | | | | | | Crush when get immediate parent quickly reply.songbaisen2016-02-031-6/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes: #14334 Signed-off-by: song baisen <song.baisen@zte.com.cn>
* | | | | | | | | | | Merge pull request #7437 from Ved-vampir/wip_zlib_pluginSage Weil2016-02-0811-2/+457
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | common: add zlib compression plugin Reviewed-by: Sage Weil <sage@redhat.com>
| * | | | | | | | | | | Compressor: add zlib unittestsVed-vampir2016-02-013-0/+160
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Alyona Kiseleva <akiselyova@mirantis.com>
| * | | | | | | | | | | Compressor: add Zlib compression pluginVed-vampir2016-02-018-2/+297
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Kiseleva Alyona <akiselyova@mirantis.com>
* | | | | | | | | | | | Merge pull request #7527 from liewegas/wip-no-rgw-prestartSage Weil2016-02-082-102/+1
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | systemd/ceph-radosgw-prestart.sh: remove Reviewed-by: Nathan Cutler <ncutler@suse.com>
| * | | | | | | | | | | | systemd/ceph-radosgw-prestart.sh: removeSage Weil2016-02-042-102/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is unpackaged and unused. Signed-off-by: Sage Weil <sage@redhat.com>
* | | | | | | | | | | | | Merge pull request #7547 from yuyuyu101/wip-14679Haomai Wang2016-02-082-14/+9
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | AsyncConnection: avoid debug log in cleanup_handler
| * | | | | | | | | | | | | AsyncConnection: avoid debug log in cleanup_handlerHaomai Wang2016-02-062-14/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | local connection will be stop and call cleanup_handler after messenger is down introduced in commit(https://github.com/ceph/ceph/commit/9da2fffd31562ed5d0b795d7862b3ebec66aba40) Fix #14679 Signed-off-by: Haomai Wang <haomai@xsky.com>
* | | | | | | | | | | | | | Merge pull request #7554 from tchaikov/wip-ceph-disk-testKefu Chai2016-02-071-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | tests: ceph-disk.sh should compare with the resolved path Reviewed-by: Loic Dachary <ldachary@redhat.com>
| * | | | | | | | | | | | | | tests: ceph-disk.sh should compare with the resolved pathKefu Chai2016-02-071-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Kefu Chai <kchai@redhat.com>
* | | | | | | | | | | | | | | Merge pull request #7551 from JevonQ/update-libcephfs-versionSage Weil2016-02-071-3/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | libcephfs: update LIBCEPHFS_VERSION to indicate the interface was changed Reviewed-by: Sage Weil <sage@redhat.com>
| * | | | | | | | | | | | | | libcephfs: Update LIBCEPHFS_VERSION to indicate the interface was changedJevon Qiao2016-02-071-3/+3
|/ / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Jevon Qiao <scaleqiao@gmail.com>
* | | | | | | | | | | | | | Merge pull request #7549 from tchaikov/wip-fix-ceph-disk-testsKefu Chai2016-02-061-8/+8
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ceph-disk/test: fix test_prepare.py::TestPrepare tests Reviewed-by: Loic Dachary <ldachary@redhat.com>
| * | | | | | | | | | | | | ceph-disk/test: fix test_prepare.py::TestPrepare testsKefu Chai2016-02-061-8/+8
|/ / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | actually we are verifying if the variable is an instance of specified class. for example, the `prepare.data` should be a `PrepareFilestoreData` if `--bluestore` is not specified. Signed-off-by: Kefu Chai <kchai@redhat.com>
* | | | | | | | | | | | | Merge pull request #7540 from dillaman/wip-librados-test-stub-unwatchJosh Durgin2016-02-061-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | librados_test_stub: protect against notify/unwatch race Reviewed-by: Josh Durgin <jdurgin@redhat.com>
| * | | | | | | | | | | | | librados_test_stub: protect against notify/unwatch raceJason Dillaman2016-02-051-1/+1
| | |_|_|_|_|_|/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Jason Dillaman <dillaman@redhat.com>
* | | | | | | | | | | | | Merge pull request #7529 from dillaman/wip-14412Josh Durgin2016-02-0646-472/+2061
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | librbd: journal framework for tracking exclusive lock transitions Reviewed-by: Josh Durgin <jdurgin@redhat.com>
| * | | | | | | | | | | | | librbd: partial implementation of journal client / tag allocationJason Dillaman2016-02-052-3/+32
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Jason Dillaman <dillaman@redhat.com>
| * | | | | | | | | | | | | librbd: initial version of journal client and tag metadataJason Dillaman2016-02-0515-59/+326
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Jason Dillaman <dillaman@redhat.com>
| * | | | | | | | | | | | | journal: added tag support methodsJason Dillaman2016-02-056-1/+297
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | librbd, for example, will allocate a new tag after acquiring the exclusive lock. Signed-off-by: Jason Dillaman <dillaman@redhat.com>
| * | | | | | | | | | | | | cls_journal: new get_client / client_update methodsJason Dillaman2016-02-054-5/+185
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Jason Dillaman <dillaman@redhat.com>
| * | | | | | | | | | | | | cls_journal: client registration should hold opaque data structureJason Dillaman2016-02-0516-61/+67
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The opaque structure will support journal client applications to store and retrieve complex state. Fixes: #13298 Signed-off-by: Jason Dillaman <dillaman@redhat.com>
| * | | | | | | | | | | | | cls_journal: new tag management methods and handlingJason Dillaman2016-02-056-36/+832
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In the case of librbd, a new tag will be allocated when the exclusive lock is acquired. All tags for the same dataset (e.g. librbd image) will belong to the same class. Tags are automatically pruned on tag create / client unregister if no other clients' commit position would require the tags. Signed-off-by: Jason Dillaman <dillaman@redhat.com>
| * | | | | | | | | | | | | journal: switched entry tags to use id instead of stringJason Dillaman2016-02-0528-325/+340
| |/ / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Later commits will add the ability to allocate tags and associate them with registered clients. Signed-off-by: Jason Dillaman <dillaman@redhat.com>
* | | | | | | | | | | | | Merge pull request #7377 from liewegas/wip-datadir-searchSage Weil2016-02-0613-20/+71
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | config: add $data_dir/config to config search path
| * | | | | | | | | | | | | unittest_config: cope with $data_dir not being expanded on non-daemonsSage Weil2016-02-041-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Sage Weil <sage@redhat.com>
| * | | | | | | | | | | | | common: add $data_dir/config to config search pathSage Weil2016-02-041-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Sage Weil <sage@redhat.com>
| * | | | | | | | | | | | | common/config: expand $data_dir in config pathSage Weil2016-02-041-0/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Sage Weil <sage@redhat.com>
| * | | | | | | | | | | | | global: add data_dir_option for all daemonsSage Weil2016-02-0412-17/+49
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This let's us use a generic $data_dir substitution that will map to rgw_data, osd_data, etc. Signed-off-by: Sage Weil <sage@redhat.com>
* | | | | | | | | | | | | | Merge pull request #7466 from adamemerson/wip-bsd-time-second-trySage Weil2016-02-062-14/+7
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | common: time: have skewing-now call non-skewing now
| * | | | | | | | | | | | | | time: Remove constexpr from non-literal type in testAdam C. Emerson2016-02-051-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This fixes a compile error under clang and fixes another FreeBSD porting issue. Signed-off-by: Adam C. Emerson <aemerson@redhat.com>
| * | | | | | | | | | | | | | time: Have skewing-now call non-skewing nowAdam C. Emerson2016-02-051-12/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For the real-time clocks, Ceph's testing infrastructure likes to be able to inject a skew. To avoid pulling CephContext into ceph_time.h these are moved to ceph_time.cc. The original way this was done called clock_gettime in both places. This is an unnecessary duplication and apparently error-prone. So only call clock_gettime from one place. Signed-off-by: Adam C. Emerson <aemerson@redhat.com>