summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* make: build common/secret only on linuxautomake-fix-commonNoah Watkins2013-09-231-1/+4
| | | | | | | | | libkeyutils is only available on linux. before the automake refactoring secret.c was compiled into rbd and ceph_mount targets which are linux only targets. secret.c was moved to libcommon during the refactoring, but the conditional compilation was lost. Signed-off-by: Noah Watkins <noahwatkins@gmail.com>
* 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
|\ \ \
| * | | v0.69v0.69Gary Lowell2013-09-182-1/+7
| | | |
| * | | rgw: try to create log pool if doesn't existYehuda Sadeh2013-09-131-0/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When using replica log, if the log pool doesn't exist all operations are going to fail. Try to create it if doesn't exist. Reviewed-by: Josh Durgin <josh.durgin@inktank.com> Signed-off-by: Yehuda Sadeh <yehuda@inktank.com>
| * | | rgw: NULL terminate buffer before parsing itYehuda Sadeh2013-09-131-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes: #6175 Backport: dumpling We get a buffer off the remote gateway which might not be NULL terminated. The JSON parser needs the buffer to be NULL terminated even though we provide a buffer length as it calls strlen(). Reviewed-by: Josh Durgin <josh.durgin@inktank.com> Signed-off-by: Yehuda Sadeh <yehuda@inktank.com>
| * | | rgw: don't call list::size() in ObjectCacheYehuda Sadeh2013-09-112-2/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes: #6286 Use an external counter instead of calling list::size() Reviewed-by: Sage Weil <sage@inktank.com> Signed-off-by: Yehuda Sadeh <yehuda@inktank.com>
| * | | rgw: drain pending requests before completing writeYehuda Sadeh2013-09-112-1/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes: #6268 When doing aio write of objects (either regular or multipart parts) we need to drain pending aio requests. Otherwise if gateway goes down then object might end up corrupted. Reviewed-by: Josh Durgin <josh.durgin@inktank.com> Signed-off-by: Yehuda Sadeh <yehuda@inktank.com>
| * | | rgw: when failing read from client, return correct errorYehuda Sadeh2013-09-101-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes: #6214 When getting a failed read from client when putting an object we returned the wrong value (always 0), which in the chunked- upload case ended up in assuming that the write was done successfully. Signed-off-by: Yehuda Sadeh <yehuda@inktank.com> Reviewed-by: Sage Weil <sage@inktank.com>
| * | | Merge pull request #583 from ceph/wip-6230-workunitSage Weil2013-09-091-0/+4
| |\ \ \ | | | | | | | | | | | | | | | | | | | | qa: workunits: mon: crush_ops: test 'ceph osd crush move' Reviewed-by: Sage Weil <sage@inktank.com>
| | * | | qa: workunits: mon: crush_ops: test 'ceph osd crush move'Joao Eduardo Luis2013-09-101-0/+4
| |/ / / | | | | | | | | | | | | Signed-off-by: Joao Eduardo Luis <joao.luis@inktank.com>
| * | | Merge pull request #582 from ceph/wip-6230Sage Weil2013-09-092-1/+2
| |\ \ \ | | | | | | | | | | | | | | | | | | | | mon: MonCommands: expect a CephString as 1st arg for 'osd crush move' Reviewed-by: Sage Weil <sage@inktank.com>
| | * | | mon: MonCommands: expect a CephString as 1st arg for 'osd crush move'wip-6230Joao Eduardo Luis2013-09-092-1/+2
| |/ / / | | | | | | | | | | | | | | | | | | | | Fixes: #6230 Signed-off-by: Joao Eduardo Luis <joao.luis@inktank.com>
* | | | Merge pull request #586 from ceph/wip-copyfrom-bigGregory Farnum2013-09-1715-265/+641
|\ \ \ \ | | | | | | | | | | | | | | | Reviewed-by: Greg Farnum <greg@inktank.com> Reviewed-by: Samuel Just <sam.just@inktank.com>
| * | | | ceph_test_rados: identify write seq_num in outputSage Weil2013-09-171-3/+3
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Sage Weil <sage@inktank.com>
| * | | | librados: test copy_from without src_version specifiedSage Weil2013-09-171-16/+45
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Sage Weil <sage@inktank.com>
| * | | | osd: allow a copy_from without knowing the src_versionSage Weil2013-09-171-5/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If we don't specify the version up front, learn the version after the first chunk and enforce it thereafter to ensure we do not get torn content. Signed-off-by: Sage Weil <sage@inktank.com>
| * | | | ceph_test_rados: submit a racing read with every COPY_FROMSage Weil2013-09-171-21/+55
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Verify that the racing read completes after the COPY_FROM does (i.e., is blocked by it). Signed-off-by: Sage Weil <sage@inktank.com>
| * | | | ceph_test_rados: use get_version64() throughoutSage Weil2013-09-171-3/+3
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Sage Weil <sage@inktank.com>
| * | | | osd: block requests on object during COPY_FROMSage Weil2013-09-172-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Block any request on an object (read or write) during the COPY_FROM operation. This could potentially be broken down into read vs write operations without much difficulty, but blocking any op indescriminately is sufficient for now, so let's keep it simple. Signed-off-by: Sage Weil <sage@inktank.com>
| * | | | osd: add infrastructure to block io on an obcSage Weil2013-09-174-2/+50
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add an is_blocked() method for the obc, and add infrastructure to block any operations if it returns true. Clean up on_change(), and add a helper to kick an obc when whatever condition leading to it being blocked is no longer true. For now, is_blocked() is always false... Signed-off-by: Sage Weil <sage@inktank.com>
| * | | | osd/ReplicatedPG: factor some bits into finish_copySage Weil2013-09-172-39/+49
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is a bit cleaner and hopefully more usable for osd-driven cache promotion. Signed-off-by: Sage Weil <sage@inktank.com>
| * | | | ceph_test_rados: more readable outputSage Weil2013-09-172-98/+113
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Sage Weil <sage@inktank.com>
| * | | | osd/ReplicatedPG: stage object chunks to replicas during COPY_FROMSage Weil2013-09-173-10/+73
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | As we get each chunk of data during the COPY_FROM operation, write it out to a temporary object on the replicas. When we get all the pieces, move it into place. Signed-off-by: Sage Weil <sage@inktank.com>
| * | | | osd/ReplicatedPG: allow RepGathers with no versionSage Weil2013-09-111-9/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If the repop has no version set, skip the updates to last_update and last_update_{applied,ondisk} and last_complete_ondisk. Signed-off-by: Sage Weil <sage@inktank.com>
| * | | | osd: flag new/old temp objects in MOSDSubOpSage Weil2013-09-113-1/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allow us to mark when we start and stop using a temporary object in a sub_op. If we start to use it, make sure the collection exists on the replica. Signed-off-by: Sage Weil <sage@inktank.com>
| * | | | osd/ReplicatedPG: drop unused issue_repop() argumentsSage Weil2013-09-112-26/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | These are cruft from the old parallelexec mode and can be removed. Signed-off-by: Sage Weil <sage@inktank.com>
| * | | | osd/ReplicatedPG: drop dead code from parallelexec issue_repopSage Weil2013-09-111-24/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is unused and references otherwise unused variables we can remove! Signed-off-by: Sage Weil <sage@inktank.com>
| * | | | osd/ReplicatedPG: generate one-off unique temp object namesSage Weil2013-09-112-4/+16
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Sage Weil <sage@inktank.com>
| * | | | osd/osd_types: move coll_t::META_COLL definitionSage Weil2013-09-113-4/+2
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Sage Weil <sage@inktank.com>
| * | | | os/FileStore: implement collection_move_renameSage Weil2013-09-113-10/+154
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is similar to a collection_add + collection_move sequence in that we apply the same replay guards. The difference is that we roll it up into a single operation, change the filename, and make the omap content carry over by calling DBObjectMap->clone (as there is no rename function or collection awareness in the DBObjectMap). Signed-off-by: Sage Weil <sage@inktank.com>
View Lorry Controller Status