Commit Graph

19837 Commits

Author SHA1 Message Date
Sage Weil
4551808fa0 mon: add 'auth get-or-create' variant that outputs a keyring
This is more convenient when you're creating daemons, since you want to
write out a keyring file for them.  This lets you do it in a single
command.

Signed-off-by: Sage Weil <sage@inktank.com>
2012-06-08 17:22:10 -07:00
Sage Weil
b2793c426e mon: require force argument for 'mds newfs ...'
This is dangerous, make sure they know what they're doing.  I bet <someone>
$1 that Greg asked me to do this originally.

Signed-off-by: Sage Weil <sage@inktank.com>
2012-06-08 12:48:02 -07:00
Sage Weil
3876dbfdd7 Merge branch 'wip-crush-tunables'
Reviewed-by: Sam Just <sam.just@inktank.com>
2012-06-08 11:18:59 -07:00
Sage Weil
c0a02a4a49 crushtool: refine tunables warning message
Signed-off-by: Sage Weil <sage@inktank.com>
2012-06-08 11:17:14 -07:00
Sage Weil
978d5419a1 re-include assert after boost::pool
Signed-off-by: Sage Weil <sage@inktank.com>
2012-06-08 11:02:44 -07:00
Sage Weil
740aa3dfbd crush: compile/decompile tunables
Lines like

 tunable <name> <value>

will adjust tunables.  Right now only three are defined.

--enable-unsafe-tunables is required.

Signed-off-by: Sage Weil <sage@inktank.com>
2012-06-08 10:58:12 -07:00
Sage Weil
1a2959edd6 crushtool: add --enable-unsafe-tunables option
This is required to adjust tunables.

Signed-off-by: Sage Weil <sage@inktank.com>
2012-06-08 10:58:12 -07:00
Sage Weil
cfbe34d518 crushtool: --show-* instead of --output-*
Signed-off-by: Sage Weil <sage@inktank.com>
2012-06-08 10:58:12 -07:00
Sage Weil
eaad984545 CrushTester: clean up output interface
Multiple accessors.  Init in ctor.  Avoid temp vars in crushtool.

Signed-off-by: Sage Weil <sage@inktank.com>
2012-06-08 10:58:12 -07:00
Sage Weil
dba70eedbe CrushTester: dump histogram of choose attempts
Signed-off-by: Sage Weil <sage@inktank.com>
2012-06-08 10:58:12 -07:00
Sage Weil
c04de2b34d crush: generate histogram of choose tries
Optionally populate a histogram of choose descent attempts.

Signed-off-by: Sage Weil <sage@inktank.com>
2012-06-08 10:58:12 -07:00
Sage Weil
4abb53d4f3 crush: fix leaf recursion if we already collided
This just saves us some cycles, but does not effect placement results at
all.

Signed-off-by: Sage Weil <sage@inktank.com>
2012-06-08 10:58:11 -07:00
Sage Weil
487371149b CrushTester: optionally output bad mappings
Optionally dump bad inputs to stdout.

Signed-off-by: Sage Weil <sage@inktank.com>
2012-06-08 10:58:11 -07:00
Sage Weil
c4336a3a2e crushtool: arguments to adjust tunables
Signed-off-by: Sage Weil <sage@inktank.com>
2012-06-08 10:58:11 -07:00
Sage Weil
8b79697489 crush: make magic numbers tunable
We have three magic numbers in crush_choose that are now tunable.  The
first two control the local retry behavior, including fallback to a
permutation.  The last is the total map descent attempts.

We can avoid a drastic incompatibility by making these tunable and encoded
in the map.  That means users can enable/disable local retry, for example,
without changing the code.  As long as the clients understand the tunables,
they can be adjusted.

This patch doesn't address the compatibility and feature bit issue.  We may
want to roll that into a larger revision with more drastic changes, once
we know what those changes will look like.  However, a careful user can
use the new code and modify the behavior.

Signed-off-by: Sage Weil <sage@inktank.com>
2012-06-07 15:57:09 -07:00
Sage Weil
7332e9c717 mon: use mode 0600 throughout
Fixes: #2526
Signed-off-by: Sage Weil <sage@inktank.com>
2012-06-07 13:57:10 -07:00
Sage Weil
8093997761 Merge remote-tracking branch 'gh/mon-auth'
Reviewed-by: Greg Farnum <greg@inktank.com>
2012-06-07 12:22:47 -07:00
John Wilkins
07169d2e43 doc: Added mount cephfs with fstab.
Signed-off-by: John Wilkins <john.wilkins@inktank.com>
2012-06-07 11:35:37 -07:00
Sage Weil
7d1b32a091 osd: include past_intervals in pg query results
This will help us figure out *why* nodes are in the prior set.

Signed-off-by: Sage Weil <sage@inktank.com>
Reviewed-by: Sam Just <sam.just@inktank.com>
2012-06-07 11:21:52 -07:00
Samuel Just
36a3979590 OSD: _have_pg should return NULL if pg is not in map
Signed-off-by: Samuel Just <sam.just@inktank.com>
2012-06-07 11:21:49 -07:00
Sage Weil
ff470104d1 Merge remote-tracking branch 'gh/wip-assert2'
"So be it"

Reviewed-by: Sam Just <sam.just@dreamhost.com>
2012-06-07 11:21:39 -07:00
Sage Weil
fae1d47aae deliberately break encoding macros when wrong assert is present
Signed-off-by: Sage Weil <sage@inktank.com>
2012-06-07 10:19:09 -07:00
Sage Weil
3571f43c00 misc assert #include cleanup, hackery
Signed-off-by: Sage Weil <sage@inktank.com>
2012-06-07 10:18:56 -07:00
Sage Weil
a1ae8b6a7f reinclude assert.h after json_spirit
json_spirit clobbers it!

Signed-off-by: Sage Weil <sage@inktank.com>
2012-06-07 10:18:38 -07:00
John Wilkins
e87a66b7b7 doc: Incorporated Sam's comments.
Signed-off-by: John Wilkins <john.wilkins@inktank.com>
2012-06-07 10:08:16 -07:00
Sage Weil
3665855278 Merge remote-tracking branch 'gh/wip-assert'
Reviewed-by: Sam Just <sam.just@inktank.com>
2012-06-07 09:41:14 -07:00
John Wilkins
3939839bd2 doc: Typo fix.
Signed-off-by: John Wilkins <john.wilkins@inktank.com>
2012-06-07 07:38:36 -07:00
Sage Weil
22863c3083 mon: set policy for client, mds before throttler
Otherwise we fail the assert in Messenger::set_policy_throttler()!

Signed-off-by: Sage Weil <sage@inktank.com>
2012-06-06 19:19:59 -07:00
Sage Weil
71c2877cbb DBObjectMap: fix some warnings
os/DBObjectMap.cc:197: warning: suggest a space before ';' or explicit braces around empty body in 'for' statement

Signed-off-by: Sage Weil <sage@inktank.com>
2012-06-06 19:10:25 -07:00
Sage Weil
0f6d90c760 make everyone use our assert #include and macro
...as detected by the previous patch.

Signed-off-by: Sage Weil <sage@inktank.com>
2012-06-06 16:57:31 -07:00
Sage Weil
a30601a1b6 assert: detect when /usr/include/assert.h clobbers us
The normal assert.h is very rude in that it clobbers any existing assert
define and replaces it with its own.  An sadly, lots of things we include
include the generic version.

Be extra rude in response.  Clobber any existing assert #define, and also
#define _ASSERT_H to be a magic value that our commonly-used dendl #define
depends on.  This way we get a compile error if the system version replaces
out own.

This is imperfect, since we will only detect their rudeness when we use
the debug macros.  I'm not coming up with something that is more widely
used that would work better, however.

Signed-off-by: Sage Weil <sage@inktank.com>
2012-06-06 16:07:04 -07:00
Sage Weil
2be716cfcb Merge remote-tracking branch 'gh/wip-msgr-interface'
Reviewed-by: Sage Weil <sage@inktank.com>
2012-06-06 16:01:19 -07:00
Sage Weil
165fbd1331 keyserver: also authenticate against mon keyring
If we don't have a secret, also check in the extra_secrets keyring.

This means we can also authenticate as any users that appear in the mon
keyring, and get the caps defined there.  This lets us bootstrap the
client.admin key with mon. key, provided mon 'allow *' caps appear in the
mon keyring.

Signed-off-by: Sage Weil <sage@inktank.com>
2012-06-06 15:30:36 -07:00
Sage Weil
5d520f17d4 keyring: implement get_caps()
Simple accessor, mirrors KeyServerData.

Signed-off-by: Sage Weil <sage@inktank.com>
2012-06-06 15:26:53 -07:00
Sage Weil
ca433f28da mon: share mon keyring with KeyServer
This will let us authenticate against items in the mon keyring, like the
mon. key itself.

Signed-off-by: Sage Weil <sage@inktank.com>
2012-06-06 15:26:28 -07:00
Sage Weil
35a61af1a3 Merge remote-tracking branch 'gh/wip_hobject_wpool'
Reviewed-by: Sage Weil <sage@inktank.com>
2012-06-06 14:11:24 -07:00
Sage Weil
47b202ecfd mon: put cluster log at /var/log/ceph/$cluster.log and/or send to syslog
Also, stop breaking it down by event severity on disk.  If you want that,
use syslog.

Fixes: #2497
Backport: dho
Signed-off-by: Sage Weil <sage@inktank.com>
Reviewed-by: Joao Eduardo Luis <joao.luis@inktank.com>
Reviewed-by: Greg Farnum <greg@inktank.com>
2012-06-06 14:09:22 -07:00
Sage Weil
37705edb99 Merge branch 'wip-crushtool'
Reviewed-by: Sage Weil <sage@inktank.com>
2012-06-06 11:29:41 -07:00
Sage Weil
78b0bea1d6 monclient: be paranoid/defensive about send_log vs log_client==NULL
Signed-off-by: Sage Weil <sage@inktank.com>
2012-06-06 11:28:11 -07:00
Sage Weil
58b02f9325 crushtool: fix cli tests given new less-chatty output, help
Signed-off-by: Sage Weil <sage@inktank.com>
2012-06-06 11:07:10 -07:00
caleb miles
af4d8db55f crushtool: allow user to select output reporting in blocks
Signed-off-by: caleb miles <caleb.miles@inktank.com>
2012-06-06 11:07:00 -07:00
John Wilkins
87327c2d5c doc: Added mount cephfs and included it in quick start.
Signed-off-by: John Wilkins <john.wilkins@inktank.com>
2012-06-06 10:45:26 -07:00
Sage Weil
6c1558ecbc logclient: fix warning
Signed-off-by: Sage Weil <sage@inktank.com>
2012-06-05 21:27:17 -07:00
Sage Weil
d4c30da747 mon: include pg acting in health detail
Backport: dho
Signed-off-by: Sage Weil <sage@inktank.com>
2012-06-05 21:27:17 -07:00
Sage Weil
0167fd0bd6 mon: include all types of stuck pgs in health detail
We were just including the last one, which isn't as helpful.

Backport: dho
Signed-off-by: Sage Weil <sage@inktank.com>
2012-06-05 21:27:17 -07:00
Sage Weil
37bf2a145e test/cli/ceph-authtool: keyring.bin -> keyring
Signed-off-by: Sage Weil <sage@inktank.com>
2012-06-05 20:16:19 -07:00
Sage Weil
5b443ebd7f doc: keyring.bin -> keyring everwhere
Signed-off-by: Sage Weil <sage@inktank.com>
2012-06-05 20:16:04 -07:00
Eleanor Cawthon
f918049b90 test/: Made omap_bench compatible with teuthology
added --name parsing, made histogram better, made rados_id
configurable, changed object names to use configurable prefix.

Signed-off-by: Eleanor Cawthon <eleanor.cawthon@inktank.com>
2012-06-05 17:47:38 -07:00
John Wilkins
02a9a0130d doc: Added the root discussion to deploy with mkcephfs.
Signed-off-by: John Wilkins <john.wilkins@inktank.com>
2012-06-05 17:09:59 -07:00
John Wilkins
993caf8190 doc: Added chmod for keyring, and moved client.admin user higher.
Signed-off-by: John Wilkins <john.wilkins@inktank.com>
2012-06-05 17:08:45 -07:00