summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* ceph-disk: do not mount -o ''wip-ceph-diskSage Weil2013-08-091-19/+10
| | | | | | Let's not trust all distros to be polite about this. Signed-off-by: Sage Weil <sage@inktank.com>
* ceph-disk: fix mount options passed to move_mountSage Weil2013-08-091-0/+6
| | | | | | | | | | Commit 6cbe0f021f62b3ebd5f68fcc01a12fde6f08cff5 added a mount_options but in certain cases it may be blank. Fill in with the defaults, just as we do in mount(). Backport: cuttlefish Reviewed-by: Dan Mick <dan.mick@inktank.com> Signed-off-by: Sage Weil <sage@inktank.com>
* config_opts.h: reduce osd_recovery_max_active and osd_recovery_max_single_startSamuel Just2013-08-091-2/+2
| | | | | Signed-off-by: Samuel Just <sam.just@inktank.com> Reviewed-by: David Zafman <david.zafman@inktank.com>
* ceph: retry new-style mon command if we get EINVAL from the old-style commandSage Weil2013-08-091-15/+23
| | | | | | | | | | | | | | | We can race with a mon upgrade: - get command descriptions, get EINVAL - mons upgrade, new quorum - send old-style command - get EINVAL In this case, we should try one last time to get the command descriptions. Fixes: #5788 Reviewed-by: Dan Mick <dan.mick@inktank.com> Signed-off-by: Sage Weil <sage@inktank.com>
* common: pick_addresses: fix bug with observer class that triggered #5205Joao Eduardo Luis2013-08-091-7/+6
| | | | | | | | | | | | | | | | | The Observer class we defined to observe conf changes and thus avoid triggering #5205 (as fixed by eb86eebe1ba42f04b46f7c3e3419b83eb6fe7f9a), was returning always the same const static array, which would lead us to always populate the observer's list with an observer for 'public_addr'. This would of course become a problem when trying to obtain the observer for 'cluster_add' during md_config_t::set_val() -- thus triggering the same assert as initially reported on #5205. Backport: cuttlefish Fixes: #5205 Signed-off-by: Joao Eduardo Luis <jecluis@gmail.com> Reviewed-by: Sage Weil <sage@inktank.com>
* rgw: return 423 Locked response when failing to lock objectYehuda Sadeh2013-08-094-0/+8
| | | | | | | | | | Fixes: #5882 Translate the EBUSY we get when trying to lock a shard / object to 423 Locked response. Beforehand it was just translated to the default 500. Reviewed-by: Sage Weil <sage@inktank.com> Signed-off-by: Yehuda Sadeh <yehuda@inktank.com>
* rgw: make RGWHTTPClient callback methods pure virtualYehuda Sadeh2013-08-092-3/+22
| | | | | | | | This will make it easier to catch interface changes, like the ones that triggered #5921. Reviewed-by: Sage Weil <sage@inktank.com> Signed-off-by: Yehuda Sadeh <yehuda@inktank.com>
* rgw: rename read_header() to receive_header() where neededYehuda Sadeh2013-08-091-2/+2
| | | | | | | The same as with #5921, fixing a missed interface change. Reviewed-by: Sage Weil <sage@inktank.com> Signed-off-by: Yehuda Sadeh <yehuda@inktank.com>
* rgw: rename data receive callbacks in swift token revocationYehuda Sadeh2013-08-091-2/+2
| | | | | | | | | | | | Fixes: #5921 As part of the work that was made for dumpling, the http client in-data callback was renamed in order to avoid confusion. However, we missed the rename in a couple of places, which this patch amend. Reported-by: Roald van Loon <roaldvanloon@gmail.com> Reviewed-by: Sage Weil <sage@inktank.com> Signed-off-by: Yehuda Sadeh <yehuda@inktank.com>
* RadosClient: shutdown monclient after dropping lockSamuel Just2013-08-081-1/+1
| | | | | | | | | Otherwise, the monclient shutdown may deadlock waiting on a context trying to take the RadosClient lock. Fixes: #5897 Signed-off-by: Samuel Just <sam.just@inktank.com> Reviewed-by: Sage Weil <sage@inktank.com>
* buffer: change #include orderSage Weil2013-08-081-1/+2
| | | | | | | huangjun <hjwsm1989@gmail.com> reports that this fixes the compilation on CentOS5. Signed-off-by: Sage Weil <sage@inktank.com>
* make sure we are using the mount optionsAlfredo Deza2013-08-081-0/+4
| | | | | Signed-off-by: Alfredo Deza <alfredo@deza.pe> (cherry picked from commit 34831d0989d4bcec4920068b6ee09ab6b3234c91)
* Merge pull request #487 from ceph/wip-5746Sage Weil2013-08-081-3/+8
|\ | | | | | | | | ceph.in: Re-enable ceph interactive mode (missing its output). Reviewed-by: Sage Weil <sage@inktank.com>
| * ceph.in: Re-enable ceph interactive mode (missing its output).Dan Mick2013-08-081-3/+8
| | | | | | | | | | | | | | | | | | Also, loop on error. There's no reason to exit the interpreter loop on an error, and it's probably less annoying if we don't. Print the error, and any output, and continue. Fixes: #5746 Signed-off-by: Dan Mick <dan.mick@inktank.com>
* | Merge pull request #488 from dmick/wip-dmick-daemon-einvalSage Weil2013-08-081-2/+4
|\ \ | | | | | | | | | | | | Wip dmick daemon einval Reviewed-by: Sage Weil <sage@inktank.com>
| * | ceph.in: return EINVAL on daemon command errorDan Mick2013-08-081-2/+4
|/ / | | | | | | Signed-off-by: Dan Mick <dan.mick@inktank.com>
* | mon: fix 'osd crush rule rm ...' dup argSage Weil2013-08-081-2/+1
| | | | | | | | | | | | | | This was broken way back in 0d66c9ebbf626117c641c975a8682a0aaba588c4, but we were ignoring the dup until recently. t Signed-off-by: Sage Weil <sage@inktank.com>
* | qa/workunits/cephtool/test.sh: test set/unset of all osd flagsSage Weil2013-08-071-0/+8
| | | | | | | | Signed-off-by: Sage Weil <sage@inktank.com>
* | mon/MonCommands: fix typo nobackfile -> nobackfillSage Weil2013-08-071-2/+2
| | | | | | | | Signed-off-by: Sage Weil <sage@inktank.com>
* | Add back the mistakenly removed "ceph osd set noscrub/nodeep-scrub"Dan Mick2013-08-072-2/+10
| | | | | | | | | | | | Fixes: #5868 Signed-off-by: Dan Mick <dan.mick@inktank.com> Reviewed-by: Sage Weil <sage@inktank.com>
* | Merge branch 'wip-recovery-op-warn' into nextSamuel Just2013-08-069-50/+100
|\ \ | | | | | | | | | Reviewed-by: Sage Weil <sage@inktank.com>
| * | OSD: suspend timeout on process_peering_events pg lockSamuel Just2013-08-061-1/+1
| | | | | | | | | | | | Signed-off-by: Samuel Just <sam.just@inktank.com>
| * | OSD: only start osd_recovery_max_single_start at onceSamuel Just2013-08-062-2/+4
| | | | | | | | | | | | Signed-off-by: Samuel Just <sam.just@inktank.com>
| * | ReplicatedPG: ping tphandle between pushesSamuel Just2013-08-062-7/+11
| | | | | | | | | | | | Signed-off-by: Samuel Just <sam.just@inktank.com>
| * | ReplicatedPG: ping TPHandle during scan_rangeSamuel Just2013-08-066-22/+56
| | | | | | | | | | | | Signed-off-by: Samuel Just <sam.just@inktank.com>
| * | OSD: also suspend timeout while grabbing recovery_tp lockSamuel Just2013-08-062-5/+5
| | | | | | | | | | | | Signed-off-by: Samuel Just <sam.just@inktank.com>
| * | OpRequest: don't warn as quickly for slow recovery opsSamuel Just2013-08-063-13/+23
| | | | | | | | | | | | Signed-off-by: Samuel Just <sam.just@inktank.com>
* | | Merge pull request #476 from dalgaaf/wip-CID-1058791Yehuda Sadeh2013-08-061-1/+1
|\ \ \ | |/ / |/| | | | | | | | Fix CID 1058791 Reviewed-by: Yehuda Sadeh <yehuda@inktank.com>
| * | rgw_rados.cc: fix invalid iterator comparisonDanny Al-Gaaf2013-08-011-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The iterator should be compared against the end() function of the same iter() from region_conn_map. CID 1058791 (#1 of 1): Invalid iterator comparison (MISMATCHED_ITERATOR) mismatched_comparison: Comparing "iter" from "this->region_conn_map" to "this->zone_conn_map.end()" from "this->zone_conn_map". Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
* | | mon, osd: Clean up "flush(stringstream)" continuedDan Mick2013-08-063-7/+7
| | | | | | | | | | | | | | | | | | Missing files in last commit; sorry! Signed-off-by: Dan Mick <dan.mick@inktank.com>
* | | mon, osd: Clean up "flush(stringstream); bl.append(stringstream.str())Dan Mick2013-08-068-17/+9
| |/ |/| | | | | | | | | | | | | Also: One redundant flush in AuthMonitor, two in PGMonitor, and a ds << that should have been conditional in Monitor. Signed-off-by: Dan Mick <dan.mick@inktank.com> Reviewed-by: Sage Weil <sage@inktank.com>
* | qa/workunits/cephtool/test.sh: add tests for 'pg dump ...'Sage Weil2013-08-051-0/+8
| | | | | | | | Signed-off-by: Sage Weil <sage@inktank.com>
* | mon/PGMonitor: add 'pg dump pgs_brief' subcommandDan Mick2013-08-056-6/+26
| | | | | | | | | | | | | | | | | | | | It is useful to map OSDs to PGs and vice-versa; pg dump gives that information, but gives a lot of other stuff. This is the same dump as pg dump pgs, but omitting everything except pgid, state, and osd up and acting sets. Signed-off-by: Dan Mick <dan.mick@inktank.com> Reviewed-by: Sage Weil <sage@inktank.com>
* | Merge branch 'wip-python-cleanup' into nextDan Mick2013-08-054-18/+19
|\ \ | | | | | | | | | Reviewed-by: Sage Weil <sage@inktank.com>
| * | cephtool/test.sh, rest/test.py: add tell command testsDan Mick2013-08-052-13/+11
| | | | | | | | | | | | | | | | | | Also add HTTP method to test.py output Signed-off-by: Dan Mick <dan.mick@inktank.com>
| * | ceph.in, ceph_rest_api.py: import only used syms from ceph_argparse.pyDan Mick2013-08-052-5/+8
| | | | | | | | | | | | | | | | | | This makes pyflakes/pylint happier and is better practice in general Signed-off-by: Dan Mick <dan.mick@inktank.com>
* | | rgw: only log (as in ops logging) certain operationsYehuda Sadeh2013-08-053-8/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes: #5875 ops logging should (at this point) should only include object store related operations. Signed-off-by: Yehuda Sadeh <yehuda@inktank.com> Reviewed-by: Josh Durgin <josh.durgin@inktank.com>
* | | rgw_admin: flush replicalog entriesYehuda Sadeh2013-08-051-0/+2
|/ / | | | | | | | | Signed-off-by: Yehuda Sadeh <yehuda@inktank.com> Reviewed-by: Josh Durgin <josh.durgin@inktank.com>
* | cephtool/test.sh: add a few tests for invalid command argsDan Mick2013-08-051-0/+37
| | | | | | | | | | Signed-off-by: Dan Mick <dan.mick@inktank.com> Reviewed-by: Sage Weil <sage@inktank.com>
* | ceph_argparse.py: add stderr note if nonrequired param is invalidDan Mick2013-08-051-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | If we run across a user-supplied parameter that doesn't validate against a non-required descriptor, it may be that it's a valid entry for a later descriptor...or it may be that it's supposed to match. We can't really tell. A possible heuristic would be to call it invalid-for-sure if we're at the end of the descriptor list, but that's not very generic. Warn about it and try to drive on anyway. Signed-off-by: Dan Mick <dan.mick@inktank.com> Reviewed-by: Sage Weil <sage@inktank.com>
* | Fix "too few args validate"Dan Mick2013-08-051-49/+111
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Check that number of validated arguments matches the number of required arguments in the signature. Also, sort all possible matches by length of signature. This way "ceph osd crush set" and "ceph osd crush set <args>" can work while still insisting that extra args or too few args are errors. Also, restructure and factor out some of the work of validate() to make its inner loop smaller and hopefully more comprehensible. Signed-off-by: Dan Mick <dan.mick@inktank.com> Reviewed-by: Sage Weil <sage@inktank.com>
* | qa/workunits/cephtool/test_daemon.sh: we should error on bad commandSage Weil2013-08-041-0/+3
| | | | | | | | | | | | See #5872. Signed-off-by: Sage Weil <sage@inktank.com>
* | PG: set !flushed in Reset()Samuel Just2013-08-021-1/+2
| | | | | | | | | | | | | | | | | | Otherwise, we might serve a pull before we start_flush in the ReplicaActive constructor. Fixes: #5799 Signed-off-by: Samuel Just <sam.just@inktank.com> Reviewed-by: Sage Weil <sage@inktank.com>
* | Merge branch 'wip-5831' into nextYehuda Sadeh2013-08-017-108/+116
|\ \
| * | rgw: only fetch cors info when neededYehuda Sadeh2013-08-017-109/+116
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes: #5831 This commit moves around the cors handling code. Beforehand we were unnecessarily reading the cors headers for every request whether that was needed or not. Moved that code to be only called when needed. While at it, cleaned up the layering a bit so that not to mix S3 specific code with the generic functionality (except for debugging). Signed-off-by: Yehuda Sadeh <yehuda@inktank.com> Reviewed-by: Josh Durgin <josh.durgin@inktank.com>
| * | rgw: don't read cors attrs if there's no bucket in operationYehuda Sadeh2013-08-011-20/+21
| | | | | | | | | | | | | | | Signed-off-by: Yehuda Sadeh <yehuda@inktank.com> Reviewed-by: Josh Durgin <josh.durgin@inktank.com>
* | | Merge branch 'wip-5810' into nextYehuda Sadeh2013-08-013-6/+11
|\ \ \
| * | | rgw: rename sync-type to update-typeYehuda Sadeh2013-08-011-1/+1
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Yehuda Sadeh <yehuda@inktank.com> Reviewed-by: Josh Durgin <josh.durgin@inktank.com>
| * | | rgw: only check version if meta object existsYehuda Sadeh2013-08-012-5/+10
| |/ / | | | | | | | | | | | | Signed-off-by: Yehuda Sadeh <yehuda@inktank.com> Reviewed-by: Josh Durgin <josh.durgin@inktank.com>
* | | Merge pull request #478 from dalgaaf/wip-da-spec-reqGary Lowell2013-08-011-0/+11
|\ \ \ | | | | | | | | | | | | Fix BuildRequires in SPEC file Reviewed-by: Gary Lowell <gary.lowell@inktank.com>
View Lorry Controller Status