summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Improve test by getting cloneid from my_snaps vectorwip-snap-test-fixDavid Zafman2013-03-221-4/+4
| | | | Signed-off-by: David Zafman <david.zafman@inktank.com>
* Merge remote-tracking branch 'upstream/wip_4435'Samuel Just2013-03-226-39/+108
|\ | | | | | | | | Fixes: #4435 Reviewed-by: David Zafman <david.zafman@inktank.com>
| * ReplicatedPG: add debug flag to skip full check at reservationSamuel Just2013-03-212-1/+3
| | | | | | | | | | | | This will make it easier to test the check in do_scan. Signed-off-by: Samuel Just <sam.just@inktank.com>
| * ReplicatedPG: replica should post BackfillTooFull in do_scan if fullSamuel Just2013-03-211-0/+13
| | | | | | | | Signed-off-by: Samuel Just <sam.just@inktank.com>
| * PG: halt backfill on RemoteReservationRejected in BackillingSamuel Just2013-03-212-1/+16
| | | | | | | | Signed-off-by: Samuel Just <sam.just@inktank.com>
| * PG: add helper for adding a timer event to retry backfillSamuel Just2013-03-212-24/+30
| | | | | | | | Signed-off-by: Samuel Just <sam.just@inktank.com>
| * PG: add BackfillTooFull event for RepRecoveringSamuel Just2013-03-212-1/+12
| | | | | | | | | | | | Replica will use this to notify Primary to stop backfilling. Signed-off-by: Samuel Just <sam.just@inktank.com>
| * PG: add helper for rejecting backfill reservationSamuel Just2013-03-212-7/+13
| | | | | | | | Signed-off-by: Samuel Just <sam.just@inktank.com>
| * PG: use OSDService::too_full_for_backfill in RepWaitBackfillReservedSamuel Just2013-03-211-7/+5
| | | | | | | | Signed-off-by: Samuel Just <sam.just@inktank.com>
| * OSDService: add too_full_for_backfillSamuel Just2013-03-212-0/+18
| | | | | | | | Signed-off-by: Samuel Just <sam.just@inktank.com>
* | Merge pull request #130 from ceph/wip-fs-renameSage Weil2013-03-221-0/+31
|\ \ | | | | | | | | | | | | test: add ceph_rename test Reviewed-by: Sage Weil <sage@inktank.com>
| * | test: add ceph_rename testNoah Watkins2013-03-211-0/+31
| | | | | | | | | | | | | | | | | | Triggers bug in ticket #4517 Signed-off-by: Noah Watkins <noahwatkins@gmail.com>
* | | doc: Added {id} argument to OSD lost.John Wilkins2013-03-221-1/+1
| | | | | | | | | | | | Signed-off-by: John Wilkins <john.wilkins@inktank.com>
* | | ceph-disk: re-add python 2.7 dependency commentSage Weil2013-03-221-0/+1
| | | | | | | | | | | | | | | | | | FIXME! Signed-off-by: Sage Weil <sage@inktank.com>
* | | Merge pull request #117 from ceph/wip-ceph-diskSage Weil2013-03-226-1764/+1672
|\ \ \ | | | | | | | | ceph-disk-* refactor
| * \ \ Merge pull request #122 from dalgaaf/wip-da-ceph-disk-1Sage Weil2013-03-201-28/+31
| |\ \ \ | | | | | | | | | | | | | | | | | | | | More fixes for ceph-disk Reviewed-by: Sage Weil <sage@inktank.com>
| | * | | ceph-disk: cast output of subprocess.Popen() to str()Danny Al-Gaaf2013-03-201-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Cast output of subprocess.Popen() to str() to be able to use str.split() and str.splitlines() without warnings from pylint. Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
| | * | | ceph-disk: fix adjust_symlink() replace 'journal' with 'target'Danny Al-Gaaf2013-03-201-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Replace 'journal' variable with 'target' since journal doesn't exist in this function. Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
| | * | | ceph-disk: fix adjust_symlink() replace 'canonical' with 'path'Danny Al-Gaaf2013-03-201-7/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Replace 'canonical' variable with 'path' since canonical doesn't exist in this function. Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
| | * | | ceph-disk: there is no os.path.lstat use os.lstatDanny Al-Gaaf2013-03-201-1/+1
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
| | * | | ceph-disk: remove unused variable key from prepare_journal_dev()Danny Al-Gaaf2013-03-201-1/+0
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
| | * | | ceph-disk: fix except to catch OSErrorDanny Al-Gaaf2013-03-201-3/+3
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
| | * | | ceph-disk: add missing space after >> operatorDanny Al-Gaaf2013-03-201-1/+1
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
| | * | | fix: Redefining name 'uuid' from outer scope (line 14)Danny Al-Gaaf2013-03-201-10/+10
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
| | * | | ceph-disk: remove unused variables from list_partitions()Danny Al-Gaaf2013-03-201-1/+1
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
| | * | | ceph-disk: fix /dev/dm-[0-9] handling list_all_partitions()Danny Al-Gaaf2013-03-201-1/+5
| |/ / / | | | | | | | | | | | | Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
| * | | Merge pull request #119 from dalgaaf/wip-da-ceph-diskSage Weil2013-03-191-87/+8
| |\ \ \ | | | | | | | | | | Cleanup and fixes for wip-ceph-disk
| | * | | ceph-disk: rename local variable shadowing builtinDanny Al-Gaaf2013-03-191-3/+3
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
| | * | | ceph-disk: remove twice defined identical function unmountDanny Al-Gaaf2013-03-191-15/+1
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
| | * | | ceph-disk: remove twice defined function mountDanny Al-Gaaf2013-03-191-34/+0
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
| | * | | ceph-disk: remove double defined function get_confDanny Al-Gaaf2013-03-191-32/+1
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
| | * | | ceph-disk: rename local variable shadowing builtinDanny Al-Gaaf2013-03-191-3/+3
| |/ / / | | | | | | | | | | | | Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
| * | | ceph-disk: install and packageSage Weil2013-03-193-0/+4
| | | | | | | | | | | | | | | | Signed-off-by: Sage Weil <sage@inktank.com>
| * | | ceph-disk: simplify command dispatchSage Weil2013-03-191-13/+43
| | | | | | | | | | | | | | | | Signed-off-by: Sage Weil <sage@inktank.com>
| * | | ceph-disk: consolidate exceptionsSage Weil2013-03-191-110/+97
| | | | | | | | | | | | | | | | | | | | | | | | Use a single exception type, and catch it at the top level. Signed-off-by: Sage Weil <sage@inktank.com>
| * | | ceph-disk: consolidate ceph-disk-* into a single binarySage Weil2013-03-193-1764/+1727
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ceph-disk prepare ... ceph-disk activate ... ceph-disk ... This let's us share code (we were already duplicating a bunch of stuff!) and to add new commands easily. Signed-off-by: Sage Weil <sage@inktank.com>
* | | | Merge branch 'next'Sage Weil2013-03-223-11/+22
|\ \ \ \
| * | | | osd: reenable 'journal aio = true'Sage Weil2013-03-221-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Now that #4079 is resolved. Reverts 1cfc3ae0. Signed-off-by: Sage Weil <sage@inktank.com>
| * | | | os/FileJournal: fix aio self-throttling deadlockSage Weil2013-03-221-8/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This block of code tries to limit the number of aios in flight by waiting for the amount of data to be written to grow relative to a function of the number of aios. Strictly speaking, the condition we are waiting for is a function of both aio_num and the write queue, but we are only woken by changes in aio_num, and were (in rare cases) waiting when aio_num == 0 and there was no possibility of being woken. Fix this by verifying that aio_num > 0, and restructuring the loop to recheck that condition on each wakeup. Fixes: #4079 Signed-off-by: Sage Weil <sage@inktank.com> Reviewed-by: Samuel Just <sam.just@inktank.com>
| * | | | Merge pull request #135 from ceph/wip-4519Sage Weil2013-03-211-2/+4
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | mon: AuthMonitor: delete auth_handler while increasing max_global_id Reviewed-by: Sage Weil <sage@inktank.com>
| | * | | | mon: AuthMonitor: delete auth_handler while increasing max_global_idJoao Eduardo Luis2013-03-221-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | By not deleting and setting NULL the session's auth_handler, we could hit a scenario in which we'd end up dispatching a previously-wait-listed auth message and we wouldn't start its auth session. This only happened when increasing max_global_id via Paxos (in which case we would wait-list the message) and would only be noticeable when running with cephx disabled. Fixes: #4519 Signed-off-by: Joao Eduardo Luis <joao.luis@inktank.com>
| * | | | | FileJournal: quieter debugging on journal scanningSamuel Just2013-03-211-3/+4
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Samuel Just <sam.just@inktank.com> Reviewed-by: David Zafman <david.zafman@inktank.com> (cherry picked from commit 6740d512ac12263f7bee370bc14b1179f83af5be)
* | | | | Merge pull request #137 from dalgaaf/wip-da-cleanup-includesSage Weil2013-03-225-8/+1
|\ \ \ \ \ | |_|_|_|/ |/| | | | | | | | | | | | | | Cleanup some twice included header Reviewed-by: Sage Weil <sage@inktank.com>
| * | | | test/test_snap_mapper.cc: remove twice included <tr1/memory>Danny Al-Gaaf2013-03-221-1/+0
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
| * | | | mon/MDSMonitor.cc: remove twice included MonitorDBStore.hDanny Al-Gaaf2013-03-221-4/+1
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
| * | | | mon/LogMonitor.cc: remove twice included <sstream>Danny Al-Gaaf2013-03-221-1/+0
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
| * | | | mon/AuthMonitor.cc: remove twice included <sstream>Danny Al-Gaaf2013-03-221-1/+0
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
| * | | | common/Formatter.h: remove twice included <list>Danny Al-Gaaf2013-03-221-1/+0
|/ / / / | | | | | | | | | | | | Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
* | | | Merge remote-tracking branch 'upstream/wip_osd_shutdown_notification'Samuel Just2013-03-2117-166/+463
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Fixes: #1857 Fixes: #4267 Reviewed-by: Sage Weil <sage@inktank.com>
| * | | | Makefile: add MOSDMarkMeDownSamuel Just2013-03-211-0/+1
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Samuel Just <sam.just@inktank.com>