Commit Graph

23343 Commits

Author SHA1 Message Date
Sage Weil
8ddb55d34c os/FileStore: fix compile when sync_file_range is missing;
If sync_file_range is not present, we always close inline, and flush
via fdatasync(2).

Fixes compile on ancient platforms like RHEL5.8.

Backport: bobtail
Signed-off-by: Sage Weil <sage@inktank.com>
Reviewed-by: Samuel Just <sam.just@inktank.com>
2013-01-18 12:14:40 -08:00
Sage Weil
b8d5e28651 doc/rados/operations/crush: need kernel v3.6 for first round of tunables
Reported-by: rl219 in #ceph on irc.oftc.net
Signed-off-by: Sage Weil <sage@inktank.com>
2013-01-18 11:05:03 -08:00
John Wilkins
76e715ba8f doc: Added link to rotation section.
Signed-off-by: John Wilkins <john.wilkins@inktank.com>
2013-01-18 00:25:28 -08:00
John Wilkins
e1741ba602 doc: Added hyperlink to log rotation section.
Signed-off-by: John Wilkins <john.wilkins@inktank.com>
2013-01-18 00:25:08 -08:00
John Wilkins
612717af9b doc: Added section on log rotation.
fixes: #3776

Signed-off-by: John Wilkins <john.wilkins@inktank.com>
2013-01-18 00:24:22 -08:00
John Wilkins
48f414686e Merge branch 'master' of https://github.com/ceph/ceph 2013-01-17 23:33:06 -08:00
John Wilkins
83326588c7 doc: Modified index to include mon-osd-interaction.
Signed-off-by: John Wilkins <john.wilkins@inktank.com>
2013-01-17 23:32:26 -08:00
John Wilkins
d6fc92dfae doc: Added a section describing mon/osd interaction.
Signed-off-by: John Wilkins <john.wilkins@inktank.com>
2013-01-17 23:31:47 -08:00
Gary Lowell
bebdc70b42 build: Add perl installation dependency to rpm and debian packages.
There was already a dependency on python in the debian control file,
a similar dependency was added to the rpm spec file.  perl is needed
for the logrotate script, so a dependecy was on perl wass added to
both. Bug 3768.

Signed-off-by: Gary Lowell  <gary.lowell@inktank.com>
2013-01-17 22:43:07 -08:00
John Wilkins
ff7c971fce doc: Added an admonishment for SSD write latency.
Signed-off-by: John Wilkins <john.wilkins@inktank.com>
2013-01-17 22:13:12 -08:00
John Wilkins
ca2d9ac906 doc: Updated OSD configuration reference with backfill config options.
Signed-off-by: John Wilkins <john.wilkins@inktank.com>
2013-01-17 21:27:46 -08:00
Sage Weil
5a384f48bf Merge branch 'wip-mds'
Reviewed-by: Sage Weil <sage@inktank.com>
2013-01-17 21:05:05 -08:00
Josh Durgin
d81ac8418f rbd: fix bench-write infinite loop
I/O was continously submitted as long as there were few enough ops in
flight. If the number of 'threads' was high, or caching was turned on,
there would never be that many ops in flight, so the loop would continue
indefinitely. Instead, submit at most io_threads ops per offset.

Fixes: #3413
Signed-off-by: Josh Durgin <josh.durgin@inktank.com>
Reviewed-by: Dan Mick <dan.mick@inktank.com>
Reviewed-by: Sage Weil <sage.weil@inktank.com>
2013-01-17 17:54:52 -08:00
Sage Weil
233d034d32 Merge branch 'wip-cephx'
Reviewed-by: Josh Durgin <josh.durgin@inktank.com>
2013-01-17 17:01:49 -08:00
Dan Mick
60db6e3e39 crushtool: warn usefully about missing output spec
When running with --test, you must request output to CSV files or
specific types of output to --show-X; make the error message
clarify what the tool wants.

Fixes: #3827
Signed-off-by: Dan Mick <dan.mick@inktank.com>
Reviewed-by: Sage Weil <sage@inktank.com>
2013-01-17 16:09:05 -08:00
Dan Mick
e776b63dd5 crushtool: consolidate_whitespace() should eat everything except \n
CRUSH map source with \r (like a DOS text file) failed to compile
with the usual nonuseful message; turns out that eating \r along with
' ' and '\t' etc. solves that problem.

Fixes: #3834
Signed-off-by: Dan Mick <dan.mick@inktank.com>
Reviewed-by: Sage Weil <sage@inktank.com>
2013-01-17 16:09:05 -08:00
Sage Weil
efa595f5d3 doc/rados/operations/authentication: update for cephx sig requirement options
Signed-off-by: Sage Weil <sage@inktank.com>
2013-01-17 15:12:59 -08:00
Sage Weil
91a573a4eb mon: enforce 'cephx require signatures' during negotiation
If we are negotiating which auth protocol to use, and the client does not
support the MSG_AUTH feature, and the server has 'cephx require signatures'
set to true, then remove cephx from the list of allowed protocols.

Also print something in the mon log so that we know wtf is going on.

Signed-off-by: Sage Weil <sage@inktank.com>
2013-01-17 15:12:00 -08:00
Sage Weil
50db10dc25 msg/Pipe: require MSG_AUTH feature on server if option is enabled
If we

  negotiate cephx AND
  are a server AND
  cephx require signatures = true

then require the MSG_AUTH feature bit.  Put this in the Policy struct for
this connection so that the existing feature bit checks and error reporting
are used, and the peer knows what feature it is missing.

Signed-off-by: Sage Weil <sage@inktank.com>
2013-01-17 15:12:00 -08:00
Sage Weil
4a49a09d27 cephx: control signaures for service vs cluster
Signed-off-by: Sage Weil <sage@inktank.com>
2013-01-17 15:11:59 -08:00
Sage Weil
c236a51a80 osdmap: make replica separate in default crush map configurable
Add 'osd crush chooseleaf type' option to control what the default
CRUSH rule separates replicas across.  Default to 1 (host), and set it
to 0 in vstart.sh.

Fixes: #3785
Signed-off-by: Sage Weil <sage@inktank.com>
Reviewed-by: Greg Farnum <greg@inktank.com>
2013-01-17 15:01:35 -08:00
Joao Eduardo Luis
c6f8010b1c mon: Monitor: drop messages from old timecheck epochs
We were asserting when the message's timecheck epoch (which is mapped to
the election epoch) was older than the current epoch.  However, if a
monitor is lagged just enough to not even notice an election happened,
then it might eventually answer to old timechecks, which would make
the leader assert.  Instead, we just drop the message, while warning we
did so.

Fixes: #3835

Signed-off-by: Joao Eduardo Luis <joao.luis@inktank.com>
Reviewed-by: Sage Weil <sage@inktank.com>
2013-01-17 18:11:23 +00:00
Sage Weil
b0162fab3d osdmaptool: more fix cli test
Signed-off-by: Sage Weil <sage@inktank.com>
2013-01-16 21:19:18 -08:00
Sage Weil
5bd8765c91 osdmaptool: fix cli test
Signed-off-by: Sage Weil <sage@inktank.com>
2013-01-16 21:10:26 -08:00
Sage Weil
98a7631232 osd: leave osd_lock locked in shutdown()
No callers expect the lock to be dropped.

Fixes: #3816
Signed-off-by: Sage Weil <sage@inktank.com>
2013-01-16 21:01:51 -08:00
Kyle Bader
faa62fa8bb radosgw: increate nofile ulimit in upstart
The default ulimit for open file descriptors per process is 1024,
far too few for radosgw if you have lots of OSDs and configure
radosgw for decent number of threads.

Signed-off-by: Kyle Bader <kyle.bader@dreamhost.com>
2013-01-16 18:04:32 -08:00
Sage Weil
19ee231115 ceph: adjust crush tunables via 'ceph osd crush tunables <profile>'
Make it easy to adjust crush tunables.  Create profiles:

 legacy: the legacy values
 argonaut: the argonaut defaults, and what is supported.. legacy! (*(
 bobtail: best that bobtail supports
 optimal: the current optimal values
 default: the current default values

* In actuality, argonaut supports some of the tunables, but it doesn't
  say so via the feature bits.

Signed-off-by: Sage Weil <sage@inktank.com>
Reviewed-by: Samuel Just <sam.just@inktank.com>
Reviewed-by: Dan Mick <dan.mick@inktank.com>
2013-01-16 16:25:13 -08:00
Samuel Just
85eb8e382a osdmaptool: allow user to specify pool for test-map-object
Fixes: #3820
Backport: bobtail
Signed-off-by: Samuel Just <sam.just@inktank.com>
Reviewed-by: Gregory Farnum <greg@inktank.com>
2013-01-16 16:19:38 -08:00
Samuel Just
7b6fe03208 Merge branch 'wip_snap_scrub'
Reviewed-by: Sage Weil <sage@inktank.com>
2013-01-16 15:52:53 -08:00
Samuel Just
70c3512037 ReplicatedPG: ignore snap link info in scrub if nlinks==0
links==0 implies that the replica did not sent snap link information.

Signed-off-by: Samuel Just <sam.just@inktank.com>
2013-01-16 14:42:47 -08:00
Sage Weil
381e25870f osd/PG: fix osd id in error message on snap collection errors
Signed-off-by: Sage Weil <sage@inktank.com>
2013-01-16 14:42:47 -08:00
Sage Weil
665577a88b osd/ReplicatedPG: validate ino when scrubbing snap collections
Signed-off-by: Sage Weil <sage@inktank.com>
2013-01-16 14:42:47 -08:00
Samuel Just
e65ea70ea6 ReplicatedPG: compare nlinks to snapcolls
nlinks gives us the number of hardlinks to the object.
nlinks should be 1 + snapcolls.size().  This will allow
us to detect links which remain in an erroneous snap
collection.

Signed-off-by: Samuel Just <sam.just@inktank.com>
2013-01-16 14:42:47 -08:00
Samuel Just
57352351bb ReplicatedPG/PG: check snap collections during _scan_list
During _scan_list check the snapcollections corresponding to the
object_info attr on the object.  Report inconsistencies during
scrub_finalize.

Signed-off-by: Samuel Just <sam.just@inktank.com>
2013-01-16 14:42:47 -08:00
Samuel Just
b85687475f osd_types: add nlink and snapcolls fields to ScrubMap::object
Signed-off-by: Samuel Just <sam.just@inktank.com>
2013-01-16 14:42:47 -08:00
Samuel Just
39bc65492a PG: move auth replica selection to helper in scrub
Signed-off-by: Samuel Just <sam.just@inktank.com>
2013-01-16 14:42:46 -08:00
Samuel Just
9e44fca13b ReplicatedPG: correctly handle new snap collections on replica
Backport: bobtail
Signed-off-by: Samuel Just <sam.just@inktank.com>
Reviewed-by: Sage Weil <sage@inktank.com>
2013-01-16 14:42:43 -08:00
Samuel Just
88956e3186 ReplicatedPG: make_snap_collection when moving snap link in snap_trimmer
Backport: bobtail
Signed-off-by: Samuel Just <sam.just@inktank.com>
Reviewed-by: Sage Weil <sage@inktank.com>
2013-01-16 14:35:47 -08:00
David Zafman
625c3cb9b5 rados.cc: fix rmomapkey usage: val not needed
Signed-off-by: David Zafman <david.zafman@inktank.com>
Reviewed-by: Samuel Just <samuel.just@inktank.com>
2013-01-16 14:33:38 -08:00
Samuel Just
3f0ad497b3 librados.hpp: fix omap_get_vals and omap_get_keys comments
We list keys greater than start_after.

Signed-off-by: Samuel Just <sam.just@inktank.com>
Reviewed-by: David Zafman <david.zafman@inktank.com>
2013-01-16 14:33:38 -08:00
Samuel Just
cb5e2be418 rados.cc: use omap_get_vals_by_keys in getomapval
Fixes: #3811
Signed-off-by: Samuel Just <sam.just@inktank.com>
Reviewed-by: David Zafman <david.zafman@inktank.com>
2013-01-16 14:33:37 -08:00
Samuel Just
44c45e520c rados.cc: fix listomapvals usage: key,val are not needed
Fixes: #3812
Signed-off-by: Samuel Just <sam.just@inktank.com>
Reviewed-by: David Zafman <david.zafman@inktank.com>
2013-01-16 14:33:37 -08:00
Josh Durgin
333cc0d511 Merge branch 'wip-rbd-formatted-output'
Reviewed-by: Dan Mick <dan.mick@inktank.com>

Conflicts:
	src/rbd.cc
	src/test/cli/rbd/help.t
2013-01-16 13:29:22 -08:00
Sage Weil
b59c27dd6a Merge branch 'master' into wip-scrub 2013-01-16 13:17:41 -08:00
Sage Weil
fb4bb5d7a1 osd: better error message for request on pool that dne
If the request is sent when the pool didn't even exist, say so.  This
would have made #3734 a bit easier to track down.

Signed-off-by: Sage Weil <sage@inktank.com>
Reviewed-by: Samuel Just <sam.just@inktank.com>
2013-01-16 13:15:09 -08:00
Sage Weil
9a1f574283 osd: drop newlines from event descriptions
These produce extra newlines in the log.

Signed-off-by: Sage Weil <sage@inktank.com>
Reviewed-by: Samuel Just <sam.just@inktank.com>
2013-01-16 13:14:58 -08:00
Josh Durgin
0efb9c512c test: add cram integration test for formatted output
This can be used with the new teuthology cram task.

Signed-off-by: Josh Durgin <josh.durgin@inktank.com>
2013-01-16 13:14:49 -08:00
Josh Durgin
f6dabc839d rbd: always output result for formatted output
When there's nothing, return an empty array.
This way scripts don't have to special case this.

Signed-off-by: Josh Durgin <josh.durgin@inktank.com>
2013-01-16 13:14:49 -08:00
Josh Durgin
d7cdcc0e25 rbd: regenerate man page and cli test
Signed-off-by: Josh Durgin <josh.durgin@inktank.com>
2013-01-16 13:14:49 -08:00
Josh Durgin
4e5a07bceb XMLFormatter: fix pretty printing
It used the wrong indentation level and did not add a newline after
closing a section. dump_stream() did not indent at all.

Simplify a little and remove the parameter from print_spaces(). If we just
remove the element from m_sections before calling print_spaces() in
close_section(), the number of elements in m_sections is always the
indentation level.

Signed-off-by: Josh Durgin <josh.durgin@inktank.com>
2013-01-16 13:14:49 -08:00