summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* common,os: Remove filestore_xattr_use_omap optionwip-6143David Zafman2013-09-272-71/+56
| | | | | | | | Now we operate just like when this was set to true Fixes: #6143 Signed-off-by: David Zafman <david.zafman@inktank.com>
* Merge pull request #650 from dachary/wip-6425-2Loic Dachary2013-09-271-4/+8
|\ | | | | pybind: update osd blacklist tests for nonce
| * pybind: update osd blacklist tests for nonceLoic Dachary2013-09-271-4/+8
|/ | | | | | | | | | Update the unit tests to reflect a) that the nonce is no longer mandatory, b) that it must be an integer. http://tracker.ceph.com/issues/6426 refs #6426 Reviewed-by: Joao Eduardo Luis <joao.luis@inktank.com> Signed-off-by: Loic Dachary <loic@dachary.org>
* test/common/get_command_descriptions: null terminate c stringSage Weil2013-09-261-1/+1
| | | | | | This fixes a bunch of trailing goop I see on my machine. Signed-off-by: Sage Weil <sage@inktank.com>
* Merge remote-tracking branch 'gh/next'Sage Weil2013-09-267-10/+42
|\ | | | | | | | | Conflicts: src/pybind/ceph_argparse.py
| * Merge pull request #648 from dmick/wip-6425Sage Weil2013-09-263-5/+28
| |\ | | | | | | | | | | | | ceph_argparse.py, cephtool/test.sh: fix blacklist with no nonce Reviewed-by: Sage Weil <sage@inktank.com>
| | * ceph_argparse.py, cephtool/test.sh: fix blacklist with no nonceDan Mick2013-09-263-5/+28
| |/ | | | | | | | | | | | | | | | | | | | | | | | | It's legal to give a CephEntityAddr to osd blacklist with no nonce, so allow it in the valid() method; also add validation of any nonce given that it's a long >= 0. Also fix comment on CephEntityAddr type description in MonCommands.h, and add tests for invalid nonces (while fixing the existing tests to remove the () around expect_false args). Fixes: #6425 Signed-off-by: Dan Mick <dan.mick@inktank.com>
| * Merge pull request #646 from liewegas/wip-6385Josh Durgin2013-09-261-0/+3
| |\ | | | | | | | | | | | | qa/run_xfstests.sh: use old xfstests until we adapt to new org Reviewed-by: Josh Durgin <josh.durgin@inktank.com>
| | * qa/run_xfstests.sh: use old xfstests until we adapt to new orgSage Weil2013-09-261-0/+3
| | | | | | | | | | | | | | | | | | | | | Tests were rearranged upstream; use an old version for the time being until we can refactor run_xfstests.sh to cope. See #6385 Signed-off-by: Sage Weil <sage@inktank.com>
| * | Merge pull request #647 from ceph/wip-ceph-cli-envJosh Durgin2013-09-261-1/+3
| |\ \ | | |/ | |/| | | | | | | improve ceph clie CEPH_ARGS handling Reviewed-by: Josh Durgin <josh.durgin@inktank.com>
| | * Revert "ceph: parse CEPH_ARGS environment variable"Sage Weil2013-09-261-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 67a95b9880c9bc6e858150352318d68d64ed74ad. We now put CEPH_ARGS in the actual args we parse in python, which are passed to rados piecemeal later. This lets you put things like --id ... in there that need to be parsed before librados is initialized.
| | * Add CEPH_ARGS at the end of sys.argvBenoît Knecht2013-09-261-0/+3
| |/ | | | | | | | | | | | | | | This allows, for instance, to pass a different client name to ceph by exporting CEPH_ARGS="--id client_id". Signed-off-by: Benoît Knecht <benoit.knecht@fsfe.org> Signed-off-by: Sage Weil <sage@inktank.com>
| * Merge pull request #645 from liewegas/wip-6346Gregory Farnum2013-09-261-0/+3
| |\ | | | | | | Reviewed-by: Greg Farnum <greg@inktank.com>
| | * osd/ReplicatedPG: fix bl resize on write vs truncate raceSage Weil2013-09-261-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | If we resize the write due to the funky truncate behavior, we need to resize the bufferlist to match. Fixes: #6346 Signed-off-by: Sage Weil <sage@inktank.com>
| * | mon: OSDMonitor: do not write full_latest during trimJoao Eduardo Luis2013-09-261-2/+6
| |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | On commit 81983bab we patched OSDMonitor::update_from_paxos() such that we write the latest full map version to 'full_latest' each time the latest full map was built from the incremental versions. This change however clashed with OSDMonitor::encode_trim_extra(), which also wrote to 'full_latest' on each trim, writing instead the version of the *oldest* full map. This duality of behaviors could lead the store to an inconsistent state across the monitors (although there's no sign of it actually imposing any issues besides rebuilding already existing full maps on some monitors). We now stop OSDMonitor::encode_trim_extra() from writing to 'full_latest'. This function will still write out the oldest full map it has in the store, but it will no longer write to full_latest, instead leaving it up to OSDMonitor::update_from_paxos() to figure it out -- and it already does. Fixes: #6378 Backport: dumpling Signed-off-by: Joao Eduardo Luis <joao.luis@inktank.com> Reviewed-by: Sage Weil <sage@inktank.com>
* | Merge pull request #631 from ceph/wip-5857-8athanatos2013-09-2617-847/+1722
|\ \ | | | | | | | | | | | | Wip 5857 8 Reviewed-by: Sage Weil <sage@inktank.com>
| * | ReplicatedPG: take obc read lock prior to recovering an object to replicasSamuel Just2013-09-261-0/+8
| | | | | | | | | | | | Signed-off-by: Samuel Just <sam.just@inktank.com>
| * | ReplicatedBackend::handle_pull_response: use list<ObjectContextRef>Samuel Just2013-09-262-9/+9
| | | | | | | | | | | | Signed-off-by: Samuel Just <sam.just@inktank.com>
| * | ReplicatedPG: remove noop C_OSD_CompletedPullSamuel Just2013-09-262-14/+0
| | | | | | | | | | | | Signed-off-by: Samuel Just <sam.just@inktank.com>
| * | ReplicatedPG: assert build_push_op succeeds on primarySamuel Just2013-09-261-6/+8
| | | | | | | | | | | | Signed-off-by: Samuel Just <sam.just@inktank.com>
| * | ReplicatedPG.h: remove temp_coll stubSamuel Just2013-09-261-5/+0
| | | | | | | | | | | | Signed-off-by: Samuel Just <sam.just@inktank.com>
| * | OSD,ReplicatedPG: queue pushes in a op_tp workqueueSamuel Just2013-09-263-4/+11
| | | | | | | | | | | | Signed-off-by: Samuel Just <sam.just@inktank.com>
| * | ReplicatedPG: don't proceed to backfill until recovering is emptySamuel Just2013-09-261-2/+5
| | | | | | | | | | | | Signed-off-by: Samuel Just <sam.just@inktank.com>
| * | ReplicatedPG: correctly handle backfillSamuel Just2013-09-263-18/+18
| | | | | | | | | | | | Signed-off-by: Samuel Just <sam.just@inktank.com>
| * | ReplicatedPG/Backend: fix up recalc_subsetsSamuel Just2013-09-263-35/+16
| | | | | | | | | | | | Signed-off-by: Samuel Just <sam.just@inktank.com>
| * | ReplicatedBackend: wire in start_pushesSamuel Just2013-09-263-10/+71
| | | | | | | | | | | | Signed-off-by: Samuel Just <sam.just@inktank.com>
| * | ReplicatedBackend: handle stats properlySamuel Just2013-09-264-24/+38
| | | | | | | | | | | | Signed-off-by: Samuel Just <sam.just@inktank.com>
| * | ReplicatedBackend: track object contexts in Push/PullInfoSamuel Just2013-09-262-15/+7
| | | | | | | | | | | | Signed-off-by: Samuel Just <sam.just@inktank.com>
| * | ReplicatedBackend: remove priority from Pull/PushInfoSamuel Just2013-09-262-3/+1
| | | | | | | | | | | | | | | | | | Instead, we'll just nab the priority from the messages. Signed-off-by: Samuel Just <sam.just@inktank.com>
| * | ReplicatedPG/Backend: move prep_push and friends to ReplicatedBackendSamuel Just2013-09-264-110/+115
| | | | | | | | | | | | Signed-off-by: Samuel Just <sam.just@inktank.com>
| * | ReplicatedPG: remove pushing/pullingSamuel Just2013-09-262-76/+22
| | | | | | | | | | | | Signed-off-by: Samuel Just <sam.just@inktank.com>
| * | ReplicatedPG/Backend: handle down pull sourcesSamuel Just2013-09-265-18/+40
| | | | | | | | | | | | Signed-off-by: Samuel Just <sam.just@inktank.com>
| * | ReplicatedPG/Backend: split recover_missing out of prepare_pullSamuel Just2013-09-264-108/+180
| | | | | | | | | | | | | | | | | | Also, move prepare_pull to PGBackend. Signed-off-by: Samuel Just <sam.just@inktank.com>
| * | ReplicatedPG/Backend: shuffle over submit_push_*/build_push_opSamuel Just2013-09-263-20/+20
| | | | | | | | | | | | Signed-off-by: Samuel Just <sam.just@inktank.com>
| * | ReplicatedPG/Backend: move over send_pushes/send_pulls/prep_push_op_blankSamuel Just2013-09-263-32/+27
| | | | | | | | | | | | Signed-off-by: Samuel Just <sam.just@inktank.com>
| * | ReplicatedPG/Backend: move over _failed_pushSamuel Just2013-09-263-4/+10
| | | | | | | | | | | | Signed-off-by: Samuel Just <sam.just@inktank.com>
| * | ReplicatedPG/Backend: move handle_*Samuel Just2013-09-263-32/+25
| | | | | | | | | | | | Signed-off-by: Samuel Just <sam.just@inktank.com>
| * | ReplicatedPG/Backend: shuffle do_pull/do_push_replySamuel Just2013-09-263-6/+4
| | | | | | | | | | | | Signed-off-by: Samuel Just <sam.just@inktank.com>
| * | ReplicatedPG/Backend: move _do_push,_do_pull_response,do_pushSamuel Just2013-09-263-21/+17
| | | | | | | | | | | | Signed-off-by: Samuel Just <sam.just@inktank.com>
| * | ReplicatedPG/Backend: convert sub_op_pullSamuel Just2013-09-263-3/+2
| | | | | | | | | | | | Signed-off-by: Samuel Just <sam.just@inktank.com>
| * | ReplicatedPG: make log_subop_stats staticSamuel Just2013-09-262-25/+22
| | | | | | | | | | | | Signed-off-by: Samuel Just <sam.just@inktank.com>
| * | ReplicatedPG/Backend: shuffle sub_op_push_replySamuel Just2013-09-263-3/+2
| | | | | | | | | | | | Signed-off-by: Samuel Just <sam.just@inktank.com>
| * | ReplicatedPG/Backend: shuffle sub_op_push over to ReplicatedBackendSamuel Just2013-09-264-17/+19
| | | | | | | | | | | | Signed-off-by: Samuel Just <sam.just@inktank.com>
| * | osd/: allow dout for ReplicatedBackend methods to work in ReplicatedPG.ccSamuel Just2013-09-261-2/+3
| | | | | | | | | | | | Signed-off-by: Samuel Just <sam.just@inktank.com>
| * | ReplicatedPG: extract PGBackend::Listener recovery callbacksSamuel Just2013-09-264-109/+160
| | | | | | | | | | | | Signed-off-by: Samuel Just <sam.just@inktank.com>
| * | PG,ReplicatedPG: handle do_request in ReplicatedPG,PGBackendSamuel Just2013-09-265-89/+68
| | | | | | | | | | | | Signed-off-by: Samuel Just <sam.just@inktank.com>
| * | ReplicatedPG: pass on dump_recovery_info to PGBackendSamuel Just2013-09-261-43/+6
| | | | | | | | | | | | Signed-off-by: Samuel Just <sam.just@inktank.com>
| * | OSD,ReplicatedPG: let PGBackend handle the temp collectionSamuel Just2013-09-267-77/+69
| | | | | | | | | | | | Signed-off-by: Samuel Just <sam.just@inktank.com>
| * | osd/: add PGBackend interfaces and stubsSamuel Just2013-09-268-2/+726
| | | | | | | | | | | | Signed-off-by: Samuel Just <sam.just@inktank.com>
| * | ReplicatedPG: Allow get_object_context caller to provide attributesSamuel Just2013-09-263-32/+69
| | | | | | | | | | | | | | | | | | | | | | | | | | | This will be used by PGBackend implementers to get the SnapSet and ObjectInfo for newly recovered objects on the primary. get_object_context may be called on a missing object for a lost_revert Signed-off-by: Samuel Just <sam.just@inktank.com>
View Lorry Controller Status