summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* fixup 'ReplicatedPG: allow CopyOps to optionally clean up themselves'dnm-wip-promoteGreg Farnum2013-09-261-0/+1
|
* fixup honor_cache_redirectsGreg Farnum2013-09-261-3/+3
|
* OSD: unset_honor_cache_redirects() on ObjecterGreg Farnum2013-09-261-0/+1
| | | | Signed-off-by: Greg Farnum <greg@inktank.com>
* Objecter: add "honor_cache_redirects" flag covering cache settingsGreg Farnum2013-09-262-2/+7
| | | | | | | When set to false, we do not redirect based on the cache_pool data in the OSDMap. We'll use this so the OSDs can actually fetch data into the cache pools on promotion! Signed-off-by: Greg Farnum <greg@inktank.com>
* ReplicatedPG: implement promote_objectGreg Farnum2013-09-262-0/+30
| | | | | | | | This doesn't work at all if the underlying object doesn't exist -- it will just fetch over and over again. (To say nothing of less obvious ways in which it is probably broken). Signed-off-by: Greg Farnum <greg@inktank.com>
* ReplicatedPG: allow CopyOps to optionally clean up themselvesGreg Farnum2013-09-262-9/+26
| | | | | | | | Right now they're only triggered by client request as part of a write op, but we're about to do promotes that can be triggered by read requests, and those will not be able to do the last chunk as part of their op. Signed-off-by: Greg Farnum <greg@inktank.com>
* ReplicatedPG: remove useless pcop param from start_copyGreg Farnum2013-09-242-5/+3
| | | | Signed-off-by: Greg Farnum <greg@inktank.com>
* ReplicatedPG: add insufficient skeleton for promote_objectGreg Farnum2013-09-242-6/+21
| | | | Signed-off-by: Greg Farnum <greg@inktank.com>
* ReplicatedPG: follow the same finish path for failed copy opsGreg Farnum2013-09-231-31/+29
| | | | | | | | | | | | We don't necessarily want to respond to clients with a failure if a copy got an error code. Instead, conditionally execute the success path and always launch back into execute_ctx() when the copy has stopped (either due to completion or failure). Update the COPY_FROM section so it returns the CopyOp::rval (instead of always zero) and only launches finish_copy() on success. Signed-off-by: Greg Farnum <greg@inktank.com>
* ReplicatedPG: use our already-found iterator instead of going back into mapGreg Farnum2013-09-231-2/+2
| | | | | | | We have an iterator pointing at the element we want; no need to search the map again in order to grab the element or remove it. Signed-off-by: Greg Farnum <greg@inktank.com>
* Merge pull request #614 from ceph/wip-rados-modelGregory Farnum2013-09-233-11/+17
|\ | | | | | | | | Prevent copy_from against yourself, and fix issues with the testing framework around it Reviewed-by: Greg Farnum <greg@inktank.com>
| * ceph_test_rados: fix COPY_FROM completionSage Weil2013-09-201-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | Fix the copy_from operation to not remove the objects from the in_use list until after the entire operation is complete. In particular, the racing read was completing and removing the dest oid from the in-use list before the copy-from completed. This keeps the model in sync with what the OSD is actually doing. If another new read started up, it would grab the previous value from the model and expect to see that, but would instead see the updated value. Signed-off-by: Sage Weil <sage@inktank.com>
| * ceph_test_rados: fix seq_num, improve error outputSage Weil2013-09-201-4/+3
| | | | | | | | Signed-off-by: Sage Weil <sage@inktank.com>
| * ceph_test_rados: limit max_in_flight to objects/2Sage Weil2013-09-201-2/+2
| | | | | | | | | | | | In particular, we need to allow all in-flight ops to be COPY_FROM. Signed-off-by: Sage Weil <sage@inktank.com>
| * ceph_test_rados: do not COPY_FROM selfSage Weil2013-09-201-1/+3
| | | | | | | | Signed-off-by: Sage Weil <sage@inktank.com>
| * osd/ReplicatedPG: handle COPY_FROM selfSage Weil2013-09-201-0/+5
| | | | | | | | | | | | Return EINVAL if we try to COPY_FROM ourselves. Signed-off-by: Sage Weil <sage@inktank.com>
* | Merge remote-tracking branch 'gh/next'Sage Weil2013-09-238-41/+73
|\ \
| * \ Merge pull request #612 from ceph/wip-6361João Eduardo Luís2013-09-214-6/+19
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | perfglue/heapprofiler: expect cmd name when handling command instead of 'heap <cmd>' This was broken by the cli rework. Reviewed-by: Samuel Just <sam.just@inktank.com>
| | * | qa: workunits: cephtool: check if 'heap' commands are parseablewip-6361Joao Eduardo Luis2013-09-201-0/+7
| | | | | | | | | | | | | | | | Signed-off-by: Joao Eduardo Luis <jecluis@gmail.com>
| | * | osd: OSD: add 'heap' command to known osd commands arrayJoao Eduardo Luis2013-09-201-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Must have been forgotten during the cli rework. Backport: dumpling Signed-off-by: Joao Eduardo Luis <jecluis@gmail.com>
| | * | mds: MDS: pass only heap profiler commands instead of the whole cmd vectorJoao Eduardo Luis2013-09-201-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The heap profiler doesn't care, nor should it, what our command name is. It only cares about the commands it handles. Backport: dumpling Signed-off-by: Joao Eduardo Luis <jecluis@gmail.com>
| | * | perfglue/heap_profiler.cc: expect args as first element on cmd vectorJoao Eduardo Luis2013-09-201-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We used to pass 'heap' as the first element of the cmd vector when handling commands. We haven't been doing so for a while now, so we needed to fix this. Not expecting 'heap' also makes sense, considering that what we need to know when we reach this function is what command we should handle, and we should not care what the caller calls us when handling his business. Fixes: #6361 Backport: dumpling Signed-off-by: Joao Eduardo Luis <jecluis@gmail.com>
| * | | mon: fix wrong arg to "instructed to" status messageDan Mick2013-09-201-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Fixes: #6293 Signed-off-by: Dan Mick <dan.mick@inktank.com> (cherry picked from commit 16ebb25f7cdb8e92c618a333c505c16edb16c95c)
| * | | rgw: destroy get_obj handle in copy_obj()Yehuda Sadeh2013-09-202-7/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes: #6176 Backport: dumpling We take different code paths in copy_obj, make sure we close the handle when we exit the function. Move the call to finish_get_obj() out of copy_obj_data() as we don't create the handle there, so that should makes code less confusing and less prone to errors. Also, note that RGWRados::get_obj() also calls finish_get_obj(). For everything to work in concert we need to pass a pointer to the handle and not the handle itself. Therefore we needed to also change the call to copy_obj_data(). Reviewed-by: Josh Durgin <josh.durgin@inktank.com> Signed-off-by: Yehuda Sadeh <yehuda@inktank.com>
| * | | lru_map: don't use list::size()Yehuda Sadeh2013-09-201-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | replace list::size() with map::size(), which should have a constant time complexity. Reviewed-by: Sage Weil <sage@inktank.com> Signed-off-by: Yehuda Sadeh <yehuda@inktank.com>
| * | | common/lru_map: rename tokens to entriesYehuda Sadeh2013-09-201-24/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This code was originally used in a token cache, now as a generic infrastructure rename token fields. Reviewed-by: Sage Weil <sage@inktank.com> Signed-off-by: Yehuda Sadeh <yehuda@inktank.com>
| * | | bufferlist: don't use list::size()Yehuda Sadeh2013-09-201-3/+6
| |/ / | | | | | | | | | | | | Reviewed-by: Sage Weil <sage@inktank.com> Signed-off-by: Yehuda Sadeh <yehuda@inktank.com>
| * | rgw: use bufferlist::append() instead of bufferlist::push_back()Yehuda Sadeh2013-09-191-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | push_back() expects char *, whereas append can append a single char. Appending a NULL char to push_back is cast as a NULL pointer which is bad. Signed-off-by: Yehuda Sadeh <yehuda@inktank.com>
* | | doc: When bootstrapping mon set the correct caps for client.adminWido den Hollander2013-09-231-1/+1
| |/ |/| | | | | | | Otherwise client.admin will be privilege-less and the admin can't access the cluster.
* | Merge pull request #592 from ceph/wip-6287Dan Mick2013-09-201-2/+2
|\ \ | | | | | | | | | | | | mon/OSDMonitor: make busy creating pgs message more explicit Reviewed-by: Dan Mick <dan.mick@inktank.com>
| * | mon/OSDMonitor: make busy creating pgs message more explicitSage Weil2013-09-121-2/+2
| | | | | | | | | | | | | | | Fixes: #6287 Signed-off-by: Sage Weil <sage@inktank.com>
* | | Merge pull request #608 from dachary/wip-6357Dan Mick2013-09-202-2/+3
|\ \ \ | | | | | | | | | | | | | | | | mon: fix inverted test in osd pool create Reviewed-by: Dan Mick <dan.mick@inktank.com>
| * | | mon: fix inverted test in osd pool createLoic Dachary2013-09-202-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When using the properties key=value only, the test was inverted and an attempt to obtain a substring at index string::npos throws an exception. Add variations of osd pool create to qa/workunits/mon/pool_ops.sh to assert the problem has been fixed and all code paths are used. http://tracker.ceph.com/issues/6357 fixes #6357 Signed-off-by: Loic Dachary <loic@dachary.org>
* | | | Merge pull request #613 from ceph/wip-6356John Wilkins2013-09-201-13/+16
|\ \ \ \ | | | | | | | | | | note that ceph-deploy should not be called with sudo on certain situations
| * | | | note that ceph-deploy should not be called with sudo on certain situationsAlfredo Deza2013-09-201-13/+16
|/ / / / | | | | | | | | | | | | Signed-off-by: Alfredo Deza <alfredo.deza@inktank.com>
* | | | FileStore: only remove the omap entries if nlink == 1Samuel Just2013-09-201-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes: #6359 Introduced in 17c5d765d7c7573f875f6b3ba66e3b6813110a06 Signed-off-by: Samuel Just <sam.just@inktank.com> Reviewed-by: Sage Weil <sage@inktank.com>
* | | | Merge pull request #590 from ceph/wip-6284Sage Weil2013-09-201-2/+4
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | osdc/ObjectCacher: finish contexts after dropping object reference Tested: ubuntu@teuthology:/a/sage-2013-09-19_19:40:56-fs-wip-6284-testing-basic-plana Reviewed-by: Sage Weil <sage@inktank.com>
| * | | | osdc/ObjectCacher: finish contexts after dropping object referenceYan, Zheng2013-09-181-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The context to finish can be class C_Client_PutInode, which may drop inode's last reference. So we should first drop object's reference, then finish contexts. Signed-off-by: Yan, Zheng <zheng.z.yan@intel.com>
* | | | | Makefile: add extra cls DENCODER_DEPS in the cls makefile, not rgwSage Weil2013-09-192-5/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | They belong next to the class. Also, if rgw isn't built, ceph-dencoder will fail to link. Fixes: #6352 Tested-by: Haomai Wang <haomaiwang@gmail.com> Signed-off-by: Sage Weil <sage@inktank.com>
* | | | | Merge pull request #609 from dmick/wip-6293David Zafman2013-09-191-1/+1
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | mon: fix wrong arg to "instructed to" status message Reviewed-by: David Zafman <david.zafman@inktank.com>
| * | | | | mon: fix wrong arg to "instructed to" status messageDan Mick2013-09-191-1/+1
|/ / / / / | | | | | | | | | | | | | | | | | | | | Fixes: #6293 Signed-off-by: Dan Mick <dan.mick@inktank.com>
* | | | | Merge pull request #604 from ceph/wip-buck-centos-coreGary Lowell2013-09-193-27/+13
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | Wip buck centos core Reviewed-by: Gary Lowell <gary.lowell@inktank.com>
| * | | | | Remove unneeded junit4 checkwip-buck-centos-coreJoe Buck2013-09-161-4/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We refactored the java tests to not use the ExternalResource class, so this test is no longer necessary. Signed-off-by: Joe Buck <jbbuck@gmail.com>
| * | | | | Removing extraneous codeJoe Buck2013-09-162-15/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The ExternalResource code was unnecessary and caused issues on CentOS. Removing it. Update Makefile.am to reflect the fact that an anonymous class was removed and its $1.class file is no longer generated. Signed-off-by: Joe Buck <jbbuck@gmail.com>
| * | | | | Use a loop for testing jdk pathsJoe Buck2013-09-161-8/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Loop through a list of sensible default locations for a JDK, stopping if a workable JDK is found. Also, add support for CentOS' default java location. Signed-off-by: Joe Buck <jbbuck@gmail.com>
* | | | | | Makefile: fix unittest_archSage Weil2013-09-191-0/+5
| |_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | Also broken by makefile refactor. Signed-off-by: Sage Weil <sage@inktank.com>
* | | | | Makefile: fix unittest_crc32cSage Weil2013-09-191-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This got dropped during the makefile refactor. Signed-off-by: Sage Weil <sage@inktank.com>
* | | | | os/FileStore: fix uninitialized varSage Weil2013-09-181-1/+1
| |/ / / |/| | | | | | | | | | | Signed-off-by: Sage Weil <sage@inktank.com>
* | | | doc/release-notes: v0.69Sage Weil2013-09-181-0/+50
| | | | | | | | | | | | | | | | Signed-off-by: Sage Weil <sage@inktank.com>
* | | | Merge branch 'next'Gary Lowell2013-09-1811-6/+36
|\ \ \ \ | | |_|/ | |/| |
View Lorry Controller Status