summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* osd/ReplicatedPG: fix iterator corruption in cancel_copy_ops()wip-cancel-copySage Weil2013-09-301-4/+5
| | | | | | | | | The cancel_copy() method removes the entry from copy_ops. Move the iterator forward before calling. Fixes segfault when thrashing osds with a copy-from workload. Signed-off-by: Sage Weil <sage@inktank.com>
* Merge pull request #660 from ceph/wip-fs-crcSage Weil2013-09-3011-3/+561
|\ | | | | | | | | sloppy / opportunistic CRC tracking in the filestore Reviewed-by: Samuel Just <sam.just@inktank.com>
| * os/FileStore: add sloppy crc trackingSage Weil2013-09-305-3/+180
| | | | | | | | | | | | | | Opportunistically track CRCs for data we write and verify it for data we read. Signed-off-by: Sage Weil <sage@inktank.com>
| * common/SloppyCRCMap: add type to sloppily track crcsSage Weil2013-09-306-0/+381
| | | | | | | | | | | | Signed-off-by: Sage Weil <sage@inktank.com> sloppy
* | Merge pull request #661 from ceph/wip-copy-cleanupsSage Weil2013-09-302-20/+10
|\ \ | |/ |/| | | | | Wip copy cleanups Reviewed-by: Sage Weil <sage@inktank.com>
| * ReplicatedPG: remove unused CopyOp::waiting member, rename function for accuracyGreg Farnum2013-09-302-13/+5
| | | | | | | | | | | | We never placed any ops here, and so we weren't ever requeuing any ops. Signed-off-by: Greg Farnum <greg@inktank.com>
| * ReplicatedPG: remove useless pcop param from start_copyGreg Farnum2013-09-302-5/+3
| | | | | | | | Signed-off-by: Greg Farnum <greg@inktank.com>
| * ReplicatedPG: use our already-found iterator instead of going back into mapGreg Farnum2013-09-301-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 remote-tracking branch 'gh/next'Sage Weil2013-09-274-6/+2
|\ | | | | | | | | Conflicts: src/common/crc32c_intel_fast.c
| * Merge pull request #658 from dmick/nextSage Weil2013-09-271-1/+1
| |\ | | | | | | | | | | | | ceph.in: fix missing exception variable in failure to open -o file Reviewed-by: Sage Weil <sage@inktank.com>
| | * ceph.in: fix missing exception variable in failure to open -o fileDan Mick2013-09-271-1/+1
| | | | | | | | | | | | | | | Fixes: #6424 Signed-off-by: Dan Mick <dan.mick@inktank.com>
| * | Merge pull request #657 from ceph/wip-6397Josh Durgin2013-09-272-4/+1
| |\ \ | | |/ | |/| | | | | | | Wip 6397 Reviewed-by: Josh Durgin <josh.durgin@inktank.com>
| | * rgw: don't append NULL char before json parsingYehuda Sadeh2013-09-271-1/+0
| | | | | | | | | | | | | | | | | | Parser handles that by itself. Signed-off-by: Yehuda Sadeh <yehuda@inktank.com>
| | * ceph_json: use different string constructor for parser bufferYehuda Sadeh2013-09-271-3/+1
| | | | | | | | | | | | | | | | | | | | | | | | Fixes: #6397 Previous implementation did not user the constructor with the length param. Signed-off-by: Yehuda Sadeh <yehuda@inktank.com>
| * | qa: workunits: mon: test snaps ops using rbd.Joao Eduardo Luis2013-09-271-0/+39
| | | | | | | | | | | | | | | | | | | | | Regression test for #6047 Signed-off-by: Joao Eduardo Luis <jecluis@gmail.com> (cherry picked from commit b2b0f202ea8a0028e7e27664b3ea6b9b8cdafe6e)
| * | common/crc32c_intel_fast: avoid reading partial trailing wordSage Weil2013-09-271-1/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The optimized intel code reads in word-sized chunks, knowing that the allocator will only hand out memory in word-sized increments. This makes valgrind unhappy. Whitelisting doesn't work because for some reason there is no caller context (probably because of some interaction with yasm?). Instead, just use the baseline code for the last few bytes. This should not be significant. Signed-off-by: Sage Weil <sage@inktank.com> Reviewed-by: Greg Farnum <greg@inktank.com> (cherry picked from commit 39c89dcfed0587f822e2226f2de8e4092449af29) Conflicts: src/test/common/test_crc32c.cc
* | | Merge pull request #643 from dachary/masterSage Weil2013-09-271-1/+1
|\ \ \ | | | | | | | | | | | | | | | | autoconf: fix build out of tree Reviewed-by: Sage Weil <sage@inktank.com>
| * | | autoconf: fix build out of treeLoic Dachary2013-09-261-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | so that the following works: git clone git@github.com:ceph/ceph.git cd ceph ./autogen.sh mkdir ../build cd ../build ../ceph/configure --with-radosgw make check Signed-off-by: Loic Dachary <loic@dachary.org>
* | | | doc: changed journal aio default to true.John Wilkins2013-09-271-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | fixes: #6389 Signed-off-by: John Wilkins <john.wilkins@inktank.com>
* | | | Merge pull request #654 from ceph/wip-testradosSage Weil2013-09-272-53/+17
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | fix some issues with ceph_test_rados Reviewed-by: Samuel Just <sam.just@inktank.com>
| * | | | ceph_test_rados: remove useless snapc setupSage Weil2013-09-271-44/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We update this on snap create and delete; no need to do it any other time. Signed-off-by: Sage Weil <sage@inktank.com>
| * | | | ceph_test_rados: update for copy_from in begin, not finishSage Weil2013-09-271-2/+7
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Sage Weil <sage@inktank.com>
| * | | | ceph_test_rados: improve debug outputwip-testradosSage Weil2013-09-262-5/+7
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Sage Weil <sage@inktank.com>
| * | | | ceph_test_rados: fix update_object_fullSage Weil2013-09-261-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update at current snap, not the last snap we did an update. Broken this this was introduced in 996af2d8fd8e60bcdce8e9408249b974521de24e Signed-off-by: Sage Weil <sage@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>
View Lorry Controller Status