summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* cleanup: changed order of #includes, global_context.h, debug.hwip-doutRoald J. van Loon2012-12-24489-2502/+2153
| | | | | | | | | | | | | | | | | | | | | | | | - lots of rewriting of #include ordering (see below) - renamed mdstypes.h to mds_types.h, same as {osd,mon}_types.h - included global/global_context.h and global/debug.h where used - fixed lots of duplicate includes The order of #includes is now; 1. types include (include/types.h, mds/mds_types.h, etc) 2. system includes (like stl, boost, etc) 3. ceph includes (include/..) 4. ceph common (common/..) 5. ceph other (auth/.., os/.., global/.., etc) 6. list of messages/.., if used 7. local includes (headers from same module) 8. own header (<basename>.h) "using namespace" stuff is always directly below #include, not intermixed with them (WIP notice: most files have this implemented, but some not yet) Signed-off-by: Roald J. van Loon <roaldvanloon@gmail.com>
* cleanup: debug.h/dout.h and global_ceph_context changesRoald J. van Loon2012-12-221-2/+0
| | | | | | - removing unused debug.h include Signed-off-by: Roald J. van Loon <roaldvanloon@gmail.com>
* cleanup: debug.h/dout.h and global_ceph_context changesRoald J. van Loon2012-12-2227-3/+33
| | | | | | | - forgot rest_bench.cc, resulting in --with-rest-bench build failure - added debug.h in some more places so we don't rely on magic forwards Signed-off-by: Roald J. van Loon <roaldvanloon@gmail.com>
* cleanup: debug.h/dout.h and global_ceph_context changesRoald J. van Loon2012-12-22109-135/+216
| | | | | | | | | | - common/dout.h became common/debug.h - common/debug.h became global/debug.h - removing magic forward include to global ctx from common/debug.h - modified some source files to use the right debug.h (common/global) - modified source files using g_* to include global_context.h Signed-off-by: Roald J. van Loon <roaldvanloon@gmail.com>
* doc: Added new journaler page to CephFS section. Needs descriptions.John Wilkins2012-12-211-0/+49
| | | | Signed-off-by: John Wilkins <john.wilkins@inktank.com>
* doc: Added Journaler Configuration to toc tree.John Wilkins2012-12-211-0/+1
| | | | Signed-off-by: John Wilkins <john.wilkins@inktank.com>
* doc: Added --mkfs options.John Wilkins2012-12-211-9/+36
| | | | Signed-off-by: John Wilkins <john.wilkins@inktank.com>
* doc: Added running multiple clusters. Per Tommi.John Wilkins2012-12-211-0/+66
| | | | Signed-off-by: John Wilkins <john.wilkins@inktank.com>
* doc: Updated the Configuration File section.John Wilkins2012-12-211-18/+47
| | | | | | | | | | | | - Replaced ceph.conf with Ceph configuration to clarify when running multiple clusters on the same hardware. - Added a [client] entry so people know it can be set too. - Updated existing auth example. - Added an authentication section with a link to the cephx guide. - Added section for running multiple clusters. Per Tommi. Signed-off-by: John Wilkins <john.wilkins@inktank.com>
* doc: Added sudo the ceph health for when cephx is on.John Wilkins2012-12-211-1/+1
| | | | Signed-off-by: John Wilkins <john.wilkins@inktank.com>
* doc: minor fix to syntax.John Wilkins2012-12-211-2/+2
| | | | Signed-off-by: John Wilkins <john.wilkins@inktank.com>
* doc: update ceph.conf examples about btrfs defaultSage Weil2012-12-212-12/+15
| | | | Signed-off-by: Sage Weil <sage@inktank.com>
* doc: Moved path to individual OSD entires.John Wilkins2012-12-211-8/+18
| | | | Signed-off-by: John Wilkins <john.wilkins@inktank.com>
* Merge remote-tracking branch 'gh/next'Sage Weil2012-12-207-45/+15
|\
| * Merge remote-tracking branch 'upstream/wip_notify' into nextSamuel Just2012-12-202-21/+9
| |\ | | | | | | | | | Reviewed-by: Sage Weil <sage@inktank.com>
| | * ReplicatedPG::remove_notify : don't leak the notify objectSamuel Just2012-12-201-0/+1
| | | | | | | | | | | | | | | | | | | | | Following remove_notify, there are no other references to notif, delete it. Signed-off-by: Samuel Just <sam.just@inktank.com>
| | * OSD,ReplicatedPG: do not track notifies on the sessionSamuel Just2012-12-202-21/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | handle_notify_timeout and remove_notify currently do not clean up this state leaving dangling Notification*. Further, we only use this mapping in unwatch in order to determine which notifies to update. We can accomplish the same thing by iterating through the obc->notifs mapping since all notifications relevant for a given watch would have been for the same obc as the watch. Signed-off-by: Samuel Just <sam.just@inktank.com>
| * | cephtool: mention ceph osd ls, fix ceph osd tell N benchDan Mick2012-12-202-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | Add ceph osd ls to help; make help for ceph osd tell N bench look more like injectargs, which says <osd-id or *> to make it clear you can benchmark all osds simultaneously Signed-off-by: Dan Mick <dan.mick@inktank.com>
| * | rgw: remove noisy log messageYehuda Sadeh2012-12-201-1/+0
| | | | | | | | | | | | | | | | | | No need for that log message. Signed-off-by: Yehuda Sadeh <yehuda@inktank.com>
| * | rgw: fix daemonize initializationYehuda Sadeh2012-12-201-20/+1
| | | | | | | | | | | | | | | | | | | | | Just call the common daemonize function. Otherwise we end up not initializng stdout / stderr correctly. Signed-off-by: Yehuda Sadeh <yehuda@inktank.com>
| * | log: fix flush/signal raceSage Weil2012-12-201-1/+1
| |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We need to signal the cond in the same interval where we hold the lock *and* modify the queue. Otherwise, we can have a race like: queue has 1 item, max is 1. A: enter submit_entry, signal cond, wait on condition B: enter submit_entry, signal cond, wait on condition C: flush wakes up, flushes 1 previous item A: retakes lock, enqueues something, exits B: retakes lock, condition fails, waits -> C is never woken up as there are 2 items waiting Signed-off-by: Sage Weil <sage@inktank.com> Reviewed-by: Dan Mick <dan.mick@inktank.com>
* | doc: Added package and repo links for Apache and FastCGI. Added SSL enable too.John Wilkins2012-12-201-6/+38
| | | | | | | | Signed-off-by: John Wilkins <john.wilkins@inktank.com>
* | doc: Fixed restructuredText usage.John Wilkins2012-12-201-14/+14
| | | | | | | | Signed-off-by: John Wilkins <john.wilkins@inktank.com>
* | doc: Removed foo. Apparently myimage was added and foo not removed.John Wilkins2012-12-201-2/+2
| | | | | | | | Signed-off-by: John Wilkins <john.wilkins@inktank.com>
* | Merge branch 'next'Sage Weil2012-12-2020-110/+344
|\ \ | |/
| * Merge remote-tracking branch 'gh/wip-cephtool' into nextSage Weil2012-12-204-3/+81
| |\
| | * cephtool: add qa workunitSage Weil2012-12-191-0/+24
| | | | | | | | | | | | | | | | | | A few basic sanity checks, including a tell on a down osd. Signed-off-by: Sage Weil <sage@inktank.com>
| | * osd: implement 'version' tell commandSage Weil2012-12-181-1/+7
| | | | | | | | | | | | Signed-off-by: Sage Weil <sage@inktank.com>
| | * ceph: report error string to stderr, not stdoutSage Weil2012-12-181-2/+6
| | | | | | | | | | | | | | | | | | | | | | | | If we return an error, send the message to stderr. This makes things more easily scriptable because error messages won't take the place of expected output. Signed-off-by: Sage Weil <sage@inktank.com>
| | * ceph: fix error reporting when tell target is invalid or downSage Weil2012-12-181-0/+12
| | | | | | | | | | | | Signed-off-by: Sage Weil <sage@inktank.com>
| | * mon: 'ceph osd ls'Sage Weil2012-12-181-0/+32
| | | | | | | | | | | | | | | | | | List osd ids that exist. Signed-off-by: Sage Weil <sage@inktank.com>
| * | Merge branch 'wip-build-fixes' into nextSage Weil2012-12-203-22/+82
| |\ \
| | * | ceph.spec.in: Improve finding location of jni.h for sles11.Gary Lowell2012-12-181-2/+2
| | | | | | | | | | | | | | | | Signed-off-by: Gary Lowell <gary.lowell@inktank.com>
| | * | ceph.spec.in: Add packages for libcephfs-jni and libcephfs-javaGary Lowell2012-12-181-3/+44
| | | | | | | | | | | | | | | | Signed-off-by: Gary Lowell <gary.lowell@inktank.com>
| | * | ceph.spec.in: Update pre-reqs for ceph-fuse pacakge.Gary Lowell2012-12-171-0/+3
| | | |
| | * | Makefiles: Two new packages needed in the debian build depdencies.Gary Lowell2012-12-161-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The ceph test programs that are now being built by default require the junit and libboost-program-options packages. These have been added to the build dependecies in the debian control file. Signed-off-by: Gary Lowell <gary.lowell@inktank.com>
| | * | Refactor rule file to separate arch/indep builds.James Page2012-12-161-18/+34
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Prior to the ceph fs java bindings, all packages where architecture depdendent so the packaging rules file worked OK; this fixes up the binary-indep/arch targets to split the builds of architecture dependent and independent files. Signed-off-by: James Page <james.page@ubuntu.com>
| * | | rgw: configurable exit timeoutYehuda Sadeh2012-12-202-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes: #3638 rgw exit timeout secs : number of seconds to wait for process to exit cleanly before forcing exit. If set to 0, it'l wait indefinitely. Signed-off-by: Yehuda Sadeh <yehuda@inktank.com>
| * | | rgw: don't try to assign content type if not foundYehuda Sadeh2012-12-201-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes: #3648 Cannot assign a NULL pointer into stl string. This is only relevant to swift, when uploading an object without specifying content type, and when the suffix cannot be determined. Signed-off-by: Yehuda Sadeh <yehuda@inktank.com>
| * | | Merge remote-tracking branch 'gh/wip-crushtool' into nextSage Weil2012-12-202-26/+83
| |\ \ \ | | | | | | | | | | | | | | | Reviewed-by: Caleb Miles <caleb.miles@inktank.com>
| | * | | crushtool: nicer error message on extra argsSage Weil2012-12-171-1/+1
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Sage Weil <sage@inktank.com>
| | * | | crushtool: only dump usage on -h|--helpSage Weil2012-12-172-25/+78
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Instead, output a useful error message. Fix error code to be a success. Add test for the output usage. Signed-off-by: Sage Weil <sage@inktank.com>
| | * | | crushtool: add --set-chooseleaf-descend-once to helpSage Weil2012-12-172-0/+4
| | |/ / | | | | | | | | | | | | | | | | | | | | We forgot to update this in 88f218181a9e6d2292e2697fc93797d0f6d6e5dc. Signed-off-by: Sage Weil <sage@inktank.com>
| * | | rgw: don't initialize keystone if not set upYehuda Sadeh2012-12-192-2/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes: #3653 No need to initialize keystone, including the keystone revocation thread which was verbose if key stone was not set up. This removes some unuseful errors from the log. Signed-off-by: Yehuda Sadeh <yehuda@inktank.com>
| * | | rgw: remove useless configurable, fix swift auth error handlingYehuda Sadeh2012-12-192-3/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes: #3649 No need to have an extra configurable to use keystone. Use keystone whenever keystone url has been specified. Also, fix a bad error handling that turned a failure to authenticate into successfully authenticating a bad user. Signed-off-by: Yehuda Sadeh <yehuda@inktank.com>
| * | | Merge remote-tracking branch 'upstream/wip_pg_temp' into nextSamuel Just2012-12-194-20/+48
| |\ \ \ | | | | | | | | | | | | | | | | | | | | Reviewed-by: Sage Weil <sage@inktank.com> Reviewed-by: Joao Luis <joao.luis@inktank.com>
| | * | | OSDMonitor: remove temp pg mappings with no up pgsSamuel Just2012-12-192-0/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Otherwise, the pg won't be validly mapped until one of the temp pgs comes back up. Signed-off-by: Samuel Just <sam.just@inktank.com>
| | * | | OSDMap: make apply_incremental take a const argumentSamuel Just2012-12-192-20/+23
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | This requires us to copy bufferlists in two cases since bufferlist does not have a const interator at this time. Signed-off-by: Samuel Just <sam.just@inktank.com>
| * | | OSDMap::dump: tag pg_temp mappings with pgidSamuel Just2012-12-181-0/+3
| | |/ | |/| | | | | | | | | | Signed-off-by: Samuel Just <sam.just@inktank.com> Reviewed-by: Yehuda Sadeh <yehuda@inktank.com>
| * | Merge remote-tracking branch 'gh/testing' into nextSage Weil2012-12-172-1/+7
| |\ \