Commit Graph

23127 Commits

Author SHA1 Message Date
Sage Weil
19e44bff37 osd: clear scrub state if queued scrub doesn't start
We set SCRUBBING when we queue a pg for scrub.  If we dequeue and
call scrub() but abort for some reason (!active, degraded, etc.), clear
that state bit.

Bug is easily reproduced with 'ceph osd scrub N' during cluster startup
when PGs are peering; some PGs can get left in the scrubbing state.

Signed-off-by: Sage Weil <sage@inktank.com>
2012-12-21 11:29:47 -08:00
John Wilkins
feb0aad23e doc: Moved path to individual OSD entires.
Signed-off-by: John Wilkins <john.wilkins@inktank.com>
2012-12-21 10:15:38 -08:00
Sage Weil
e765dcb4f1 osd: only dec_scrubs_active if we were active
This fixes a bug that puts scrubs_active negative.

Signed-off-by: Sage Weil <sage@inktank.com>
2012-12-20 21:45:09 -08:00
Sage Weil
ada3e27fa5 osd: reintroduce inc_scrubs_active helper
This mostly generates nice debug output.  It also slightly simplifies
code and makes things symmetric.

Signed-off-by: Sage Weil <sage@inktank.com>
2012-12-20 21:44:34 -08:00
Sage Weil
ae26432de8 Merge remote-tracking branch 'gh/next' 2012-12-20 17:43:51 -08:00
Samuel Just
accce83051 Merge remote-tracking branch 'upstream/wip_notify' into next
Reviewed-by: Sage Weil <sage@inktank.com>
2012-12-20 16:24:05 -08:00
Dan Mick
129a49ada1 cephtool: mention ceph osd ls, fix ceph osd tell N bench
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>
2012-12-20 15:51:55 -08:00
Yehuda Sadeh
a36d1db10f rgw: remove noisy log message
No need for that log message.

Signed-off-by: Yehuda Sadeh <yehuda@inktank.com>
2012-12-20 15:32:59 -08:00
Yehuda Sadeh
5b5a19ac76 rgw: fix daemonize initialization
Just call the common daemonize function. Otherwise we end up
not initializng stdout / stderr correctly.

Signed-off-by: Yehuda Sadeh <yehuda@inktank.com>
2012-12-20 15:30:53 -08:00
Sage Weil
50914e7a42 log: fix flush/signal race
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>
2012-12-20 13:48:06 -08:00
Samuel Just
c0e2371284 ReplicatedPG::remove_notify : don't leak the notify object
Following remove_notify, there are no other references to
notif, delete it.

Signed-off-by: Samuel Just <sam.just@inktank.com>
2012-12-20 13:29:14 -08:00
Samuel Just
b5031a2233 OSD,ReplicatedPG: do not track notifies on the session
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>
2012-12-20 13:27:24 -08:00
John Wilkins
719679ea11 doc: Added package and repo links for Apache and FastCGI. Added SSL enable too.
Signed-off-by: John Wilkins <john.wilkins@inktank.com>
2012-12-20 12:59:58 -08:00
John Wilkins
04eb1e73ad doc: Fixed restructuredText usage.
Signed-off-by: John Wilkins <john.wilkins@inktank.com>
2012-12-20 12:59:22 -08:00
John Wilkins
ea9fc87d89 doc: Removed foo. Apparently myimage was added and foo not removed.
Signed-off-by: John Wilkins <john.wilkins@inktank.com>
2012-12-20 11:39:41 -08:00
Sage Weil
9f67c450fe Merge branch 'next' 2012-12-20 11:07:10 -08:00
Sage Weil
17c627b5e4 Merge remote-tracking branch 'gh/wip-cephtool' into next 2012-12-20 11:04:29 -08:00
Sage Weil
f38d891138 Merge branch 'wip-build-fixes' into next 2012-12-20 10:49:34 -08:00
Yehuda Sadeh
a803159b02 rgw: configurable exit timeout
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>
2012-12-20 10:13:16 -08:00
Yehuda Sadeh
92b59e9059 rgw: don't try to assign content type if not found
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>
2012-12-20 09:45:35 -08:00
Sage Weil
c02e9062b9 Merge remote-tracking branch 'gh/wip-crushtool' into next
Reviewed-by: Caleb Miles <caleb.miles@inktank.com>
2012-12-20 08:53:19 -08:00
Yehuda Sadeh
08c64249eb rgw: don't initialize keystone if not set up
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>
2012-12-19 22:03:56 -08:00
Yehuda Sadeh
799c59ae89 rgw: remove useless configurable, fix swift auth error handling
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>
2012-12-19 22:03:56 -08:00
Samuel Just
9a9778fb9c Merge remote-tracking branch 'upstream/wip_pg_temp' into next
Reviewed-by: Sage Weil <sage@inktank.com>
Reviewed-by: Joao Luis <joao.luis@inktank.com>
2012-12-19 16:51:25 -08:00
John Wilkins
5497d22811 doc: Modified the demo configuration file for Bobtail.
Signed-off-by: John Wilkins <john.wilkins@inktank.com>
2012-12-19 14:22:43 -08:00
John Wilkins
40fdd7738e doc: Added Gateway Quick Start.
Signed-off-by: John Wilkins <john.wilkins@inktank.com>
2012-12-19 14:02:19 -08:00
John Wilkins
5281ee2425 doc: Added Gateway Quick Start configuration file.
Signed-off-by: John Wilkins <john.wilkins@inktank.com>
2012-12-19 14:02:02 -08:00
John Wilkins
84fb371d9a Updated Getting Started index to include Gateway Quick Start.
Signed-off-by: John Wilkins <john.wilkins@inktank.com>
2012-12-19 14:01:30 -08:00
John Wilkins
5e95510380 doc: Added REST Gateway link to 5-minute Quick Start.
Signed-off-by: John Wilkins <john.wilkins@inktank.com>
2012-12-19 14:00:55 -08:00
John Wilkins
c2b231e416 doc: Updated the 5-minute Quick Start for Bobtail.
Signed-off-by: John Wilkins <john.wilkins@inktank.com>
2012-12-19 13:52:20 -08:00
John Wilkins
f596cee7fc doc: Updated Block Device Quick Start for Bobtail.
Signed-off-by: John Wilkins <john.wilkins@inktank.com>
2012-12-19 13:47:11 -08:00
John Wilkins
60b2857dee doc: Updated CephFS Quick Start for Bobtail.
Signed-off-by: John Wilkins <john.wilkins@inktank.com>
2012-12-19 13:46:28 -08:00
John Wilkins
d17bd3840f doc: Added authentication and mkcephfs settings for Bobtail.
Signed-off-by: John Wilkins <john.wilkins@inktank.com>
2012-12-19 13:45:34 -08:00
John Wilkins
cd5c82db9b doc: Added javascript code block tag.
Signed-off-by: John Wilkins <john.wilkins@inktank.com>
2012-12-19 13:36:17 -08:00
Samuel Just
6122a9f62f OSDMonitor: remove temp pg mappings with no up pgs
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>
2012-12-19 10:33:40 -08:00
Samuel Just
2395af9f7a OSDMap: make apply_incremental take a const argument
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>
2012-12-19 10:32:52 -08:00
Sage Weil
2e49d5c4b7 cephtool: add qa workunit
A few basic sanity checks, including a tell on a down osd.

Signed-off-by: Sage Weil <sage@inktank.com>
2012-12-19 08:37:42 -08:00
Gary Lowell
d9c2396b55 ceph.spec.in: Improve finding location of jni.h for sles11.
Signed-off-by: Gary Lowell <gary.lowell@inktank.com>
2012-12-18 21:00:15 -08:00
Sage Weil
b2eb8bd2ed osd: implement 'version' tell command
Signed-off-by: Sage Weil <sage@inktank.com>
2012-12-18 20:08:42 -08:00
Gary Lowell
46344105e7 ceph.spec.in: Add packages for libcephfs-jni and libcephfs-java
Signed-off-by: Gary Lowell <gary.lowell@inktank.com>
2012-12-18 19:40:32 -08:00
Sage Weil
85763f09fe ceph: report error string to stderr, not stdout
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>
2012-12-18 19:21:24 -08:00
Sage Weil
5f24e23b19 ceph: fix error reporting when tell target is invalid or down
Signed-off-by: Sage Weil <sage@inktank.com>
2012-12-18 19:20:06 -08:00
Sage Weil
b00eb6fd87 mon: 'ceph osd ls'
List osd ids that exist.

Signed-off-by: Sage Weil <sage@inktank.com>
2012-12-18 19:11:49 -08:00
Samuel Just
212f6b56d1 OSDMap::dump: tag pg_temp mappings with pgid
Signed-off-by: Samuel Just <sam.just@inktank.com>
Reviewed-by: Yehuda Sadeh <yehuda@inktank.com>
2012-12-18 17:00:45 -08:00
Yehuda Sadeh
04e7a5ca13 rgw: configurable exit timeout
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>
2012-12-18 14:12:29 -08:00
Sage Weil
6c7ec2d435 crushtool: nicer error message on extra args
Signed-off-by: Sage Weil <sage@inktank.com>
2012-12-17 17:12:06 -08:00
Sage Weil
dbe6fb7281 crushtool: only dump usage on -h|--help
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>
2012-12-17 17:12:06 -08:00
Sage Weil
0dd1302543 Merge remote-tracking branch 'gh/testing' into next 2012-12-17 16:51:20 -08:00
Gary Lowell
fd482a2781 ceph.spec.in: Update pre-reqs for ceph-fuse pacakge. 2012-12-17 16:38:19 -08:00
Sage Weil
1b67a43891 Revert "objecter: don't use new tid when retrying notifies"
This reverts commit c3107009f6.

This appears to be causing problems in the objecter by corrupting
the stack.  Until that is resolved, let's revert.

Signed-off-by: Sage Weil <sage@inktank.com>
2012-12-17 16:29:19 -08:00