Commit Graph

27493 Commits

Author SHA1 Message Date
Dan Mick
7da0320c56 mon: AuthMonitor: dump formatted and plaintext key on 'get-key'
Signed-off-by: Joao Eduardo Luis <joao.luis@inktank.com>
2013-07-10 19:02:31 -07:00
Dan Mick
7049efca50 mon: AuthMonitor: early out on bad entity name
Signed-off-by: Dan Mick <dan.mick@inktank.com>
Reviewed-by: Sage Weil <sage@inktank.com>
2013-07-10 19:02:31 -07:00
Dan Mick
83bcde34c9 mon,auth: AuthMonitor, KeyRing: add Formatter-dumps of auth info
Signed-off-by: Dan Mick <dan.mick@inktank.com>

auth: KeyRing: encode_formatted() receives a label as first argument

Also, this allows us to standardize formatted output on the AuthMonitor,
so that all output starts with a section 'auth'.  Other subsystems using
the KeyRing class, can specify whatever section they prefer.

Signed-off-by: Joao Eduardo Luis <joao.luis@inktank.com>
2013-07-10 19:02:31 -07:00
Dan Mick
92d5eb08b4 auth: Crypto: add encode_formatted/plaintext() functions
Signed-off-by: Joao Eduardo Luis <joao.luis@inktank.com>
2013-07-10 19:02:30 -07:00
Dan Mick
2e2bc6d023 ceph_argparse.py cleanup: simplify some code, error on unused args
Signed-off-by: Dan Mick <dan.mick@inktank.com>
2013-07-10 19:02:30 -07:00
Dan Mick
a5621625e1 ceph CLI: valid() no longer returns bool, but just exception
The type validation's valid() method was using a combination of
return code and exception to really indicate the same thing;
simplify by only raising on validation error, and change callers
to cope.  validate_one() follows suit.

Also, allow validate() to be called with args that are dicts
(for REST support) rather than bare words.  Rules: 'name':'value'
must both match descriptor's name and validate (through valid() for
the value.  If value is '', it's assumed to be the same as name,
(one can pass, for example, "detail" as one parameter to
REST, but it will still show up as {'detail':''} here).

Tweak validate()'s algorithm a bit in the process, and make
validate_command() exit the bestcmds loop immediately on first
full validation.

Signed-off-by: Dan Mick <dan.mick@inktank.com>
2013-07-10 19:02:30 -07:00
Dan Mick
0f2ebc6ee3 ceph.in, ceph_argparse.py: move descsort() to ceph_argparse
Signed-off-by: Dan Mick <dan.mick@inktank.com>
2013-07-10 19:02:30 -07:00
Dan Mick
bfa2284d21 MonCommands: add new fields: modulename, perms, availability
To help optimize the REST API, we need to know whether the commands
are read (GET) or write (PUT/POST).  However, we also could use that
same info for permission/caps checking.  Add modulename/perms as
the required caps for each command to drive both needs.

The availability field is to control whether a command is displayed/
advertised through the CLI or REST interfaces; some commands aren't
really useful for REST, and we may want to invent REST-only commands;
also, this gives us a way to deprecate commands quickly and leave the
code, should that be desirable.  Make the CLI display only commands
marked with the 'CLI' marker.

Also stop renaming 'help' to 'helptext' in the client.

Signed-off-by: Dan Mick <dan.mick@inktank.com>
2013-07-10 19:02:30 -07:00
Dan Mick
c9b54d7569 common: Formatter: add flush to bufferlist
Signed-off-by: Joao Eduardo Luis <joao.luis@inktank.com>
2013-07-10 19:02:30 -07:00
Dan Mick
989be66cf8 rados.py: allow long-form names of 'warn' and 'err' as watch levels
Signed-off-by: Dan Mick <dan.mick@inktank.com>
2013-07-10 19:02:30 -07:00
Yehuda Sadeh
7f67848060 Merge pull request #420 from gregsfortytwo/master
radosgw-admin help command naming and text improvements

Reviewed-by: Yehuda Sadeh <yehuda@inktank.com>
2013-07-10 18:42:18 -07:00
Samuel Just
1ad2127ff5 PGMonitor: fix stat comparison in prepare_pg_stats
Signed-off-by: Samuel Just <sam.just@inktank.com>
Reviewed-by: Sage Weil <sage@inktank.com>
2013-07-10 18:33:51 -07:00
Sandon Van Ness
836e35f8ed Get device-by-path by looking for it instead of assuming 3rd entry.
On some systems (virtual machines so far) the device-by-path entry
from udevadm is not always in the same spot so instead actually
look for the right output instead of blindy assuming that its a
specific field in the output.

Signed-off-by: Sandon Van Ness <sandon@inktank.com>
Reviewed-by: Gary Lowell  <gary.lowell@inktank.com>
2013-07-10 14:55:52 -07:00
Josh Durgin
5deeb7b0c5 Merge branch 'next' 2013-07-10 13:27:58 -07:00
Josh Durgin
dcb42ca36c test_rados: don't use assert_greater
It's only present in very recent versions of nose, and doesn't provide
much beyond a simple assert.

Signed-off-by: Josh Durgin <josh.durgin@inktank.com>
Reviewed-by: Dan Mick <dan.mick@inktank.com>
2013-07-10 13:25:56 -07:00
Johannes Erdfelt
d8fe439260 Python Ioctx.get_xattrs does not take xattr_name
Fixes bug 5528

Since it returns all xattrs, it does not take an xattr_name. Also,
add unit tests for the Object xattrs methods.

Signed-off-by: Johannes Erdfelt <johannes@erdfelt.com>
Reviewed-by: Josh Durgin <josh.durgin@inktank.com>
2013-07-10 13:14:55 -07:00
Sage Weil
bc291d3fc3 osd: fix warning
From 653e04a79430317e275dd77a46c2b17c788b860b

Backport: cuttlefish, bobtail
Signed-off-by: Sage Weil <sage@inktank.com>
2013-07-10 11:32:34 -07:00
Sage Weil
653e04a794 osd: limit number of inc osdmaps send to peers, clients
We should not send an unbounded number of inc maps to our peers or clients.
In particular, if a peer is not contacted for a while, we may think they
have a very old map (say, 10000 epochs ago) and send thousands of inc maps
when the distribution shifts and we need to peer.

Note that if we do not send enough maps, the peers will make do by
requesting the map from somewhere else (currently the mon).  Regardless
of the source, however, we must limit the amount that we speculatively
share as it usually is not needed.

Backport: cuttlefish, bobtail
Signed-off-by: Sage Weil <sage@inktank.com>
Reviewed-by: Samuel Just <sam.just@inktank.com>
2013-07-10 11:02:08 -07:00
Sage Weil
5c8a563463 mon: do not populate MMonCommand paxos version field
The field is not used or useful since the monitor does not even look
at it (in Monitor::handle_command()).  Avoid populating it and the
subsequent confusion for poor developers.

Signed-off-by: Sage Weil <sage@inktank.com>
2013-07-10 10:19:38 -07:00
Sage Weil
b36338be43 messages/MPGStats: do not set paxos version to osdmap epoch
The PaxosServiceMessage version field is meant for client-coordinated
ordering of messages when switching between monitors (and is rarely
used).  Do not fill it with the osdmap epoch lest it be compared to a
pgmap version, which may cause the mon to (near) indefinitely put it on
a wait queue until the pgmap version catches up.

Backport: cuttlefish
Signed-off-by: Sage Weil <sage@inktank.com>
Reviewed-by: Greg Farnum <greg@inktank.com>
2013-07-10 10:19:38 -07:00
Greg Farnum
997c6f4e95 rgw-admin: add some of the newer flags and specify their use
Signed-off-by: Greg Farnum <greg@inktank.com>
2013-07-10 10:09:35 -07:00
Greg Farnum
2ea6c4cc70 rgw-admin: use 'get' instead of 'show' or info for geo stuff
These all output data that you can put back in via 'set', so they're
a 'get' rather than something else.

Signed-off-by: Greg Farnum <greg@inktank.com>
2013-07-10 10:09:35 -07:00
Sage Weil
c124aa09ee Merge pull request #419 from dalgaaf/wip-da-fix-build-rados-classes
ceph.spec.in: add missing %{_libdir}/rados-classes/libcls_* files
2013-07-10 09:34:40 -07:00
Sage Weil
d36ec78ba1 qa/workunits/cls/test_cls_rgw: add new rgw class tests
Signed-off-by: Sage Weil <sage@inktank.com>
Reviewed-by: Yehuda Sadeh <yehuda@inktank.com>
2013-07-10 09:30:19 -07:00
Sage Weil
6ddaa26e14 Merge pull request #418 from dalgaaf/wip-da-fix-build-ceph-test
Fix build and packaging of ceph-test package

Reviewed-by: Sage Weil <sage@inktank.com>
2013-07-10 09:21:05 -07:00
Sage Weil
bee4c72f57 Merge pull request #417 from dalgaaf/wip-da-fix-CRYPTO_LIBS
Makefile.am: fix build, use $(CRYPTO_LIBS)

Reviewed-by: Sage Weil <sage@Inktank.com>
2013-07-10 09:20:03 -07:00
Danny Al-Gaaf
2e79f73bd3 ceph.spec.in: add missing %{_libdir}/rados-classes/libcls_* files
Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
2013-07-10 18:12:05 +02:00
Danny Al-Gaaf
ff5f25eb24 debian/ceph-test.install: add missing files
Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
2013-07-10 17:55:52 +02:00
Danny Al-Gaaf
640d138c80 ceph.spec.in: add some more ceph_test_cls_rgw_* files
Add new ceph_test_cls_rgw_* files to ceph-test package section.

Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
2013-07-10 17:53:28 +02:00
Danny Al-Gaaf
dfe3c217c8 src/Makefile.am: rename cls_test_rgw_*
Rename files from cls_test_rgw_* to ceph_test_cls_rgw_* to fit the current
naming scheme.

Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
2013-07-10 17:52:52 +02:00
Danny Al-Gaaf
78bae33f7f ceph.spec.in: add some ceph_test_cls_* files
Add some installed but not packaged ceph_test_cls_* files to
the ceph-test package.

Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
2013-07-10 17:51:17 +02:00
Danny Al-Gaaf
dc99a23d05 Makefile.am: fix build, use $(CRYPTO_LIBS)
Use $(CRYPTO_LIBS) instead of -lcryptopp to work also with
nss crypto lib.

Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
2013-07-10 17:15:00 +02:00
Sage Weil
8fd870930f Merge pull request #400 from ceph/wip-mon-newsync
simpler mon sync

Reviewed-by: Greg Farnum <greg@inktank.com>
Reviewed-by: Joao Eduardo Luis <joao.luis@inktank.com>
2013-07-09 17:12:28 -07:00
David Zafman
51dbc389c4 Merge branch 'wip-4982-4983-oloc-rebase'
fixes: #4982
fixes: #4983

Reviewed-by: Samuel Just <sam.just@inktank.com>
Reviewed-by: Sage Weil <sage@inktank.com>
Reviewed-by: David Zafman <david.zafman@inktank.com>
2013-07-09 16:24:53 -07:00
Sage Weil
aa7448cd17 Merge pull request #415 from ceph/rgw-next 2013-07-09 15:34:05 -07:00
Sage Weil
00ae543b3e mon: do not scrub if scrub is in progress
This prevents an assert from unexpected scrub results from the previous
scrub on the leader.

Backport: cuttlefish
Signed-off-by: Sage Weil <sage@inktank.com>
2013-07-09 14:12:15 -07:00
Sage Weil
8638fb64b1 unittest_pglog: fix unittest
This was broken by the pg_stat_t::reported cleanup.

Signed-off-by: Sage Weil <sage@inktank.com>
2013-07-09 14:12:07 -07:00
David Zafman
b10848e212 Merge branch 'master' into wip-4982-4983-oloc-rebase 2013-07-09 14:10:42 -07:00
Samuel Just
c4870143c9 librados/misc.cc: reverse offset and length on write call
Signed-off-by: Samuel Just <sam.just@inktank.com>
2013-07-09 14:09:25 -07:00
David Zafman
bad317b96f osd: Add namespace to dump_watchers output
Signed-off-by: David Zafman <david.zafman@inktank.com>
2013-07-09 14:09:25 -07:00
David Zafman
f03cdf559f osd: Clean-up redundant use of object_locator_t
Remove locator arg from get_object_context()/find_object_context()
Remove locator from object_info_t but retain encode format
Remove locator from object_info_t dump output
Remove OLOC_BLANK

Signed-off-by: David Zafman <david.zafman@inktank.com>
2013-07-09 14:09:25 -07:00
David Zafman
8c501651f9 osd: Add the ability to set capabilities on namespaces
Parse namespace spec in osd caps and use in is_match()
Add test cases to unit test

feature: #4983 (OSD: namespaces pt 2 (caps))

Signed-off-by: David Zafman <david.zafman@inktank.com>
2013-07-09 14:09:25 -07:00
David Zafman
71295640ff osd: Prepare for nspace match with simpler is_match_all()
Signed-off-by: David Zafman <david.zafman@inktank.com>
2013-07-09 14:09:24 -07:00
David Zafman
6eb88a1399 test: Add namespace list test cases to librados test
Signed-off-by: David Zafman <david.zafman@inktank.com>
2013-07-09 14:09:24 -07:00
David Zafman
fddfdebf9a test: Add namespace test cases to librados tests
Signed-off-by: David Zafman <david.zafman@inktank.com>
2013-07-09 14:09:24 -07:00
David Zafman
94ccfac41e rados: Add namespace arg (--namespace, -N) to rados command
Signed-off-by: David Zafman <david.zafman@inktank.com>
2013-07-09 14:09:24 -07:00
David Zafman
69af60db73 librados: Add operate()/operate_read() log messages
Signed-off-by: David Zafman <david.zafman@inktank.com>
2013-07-09 14:09:24 -07:00
David Zafman
e761e4e55f librados, os, osd, osdc, test: Add support for client specified namespaces
Add rados_ioctx_namespace_set_key() and librados::IoCtx::namespace_set_key()
Add namespace to admin-daemon operations
Support namespace in osd map command
Add namespace to object_locator_t and hobject_t
Add random namespaces to psim program

Feature: #4982 (OSD: namespaces pt 1 (librados/osd, not caps))

Signed-off-by: David Zafman <david.zafman@inktank.com>
2013-07-09 14:09:02 -07:00
Sage Weil
ae866426ca Merge branch 'wip-mon-osdmap-trim'
Reviewed-by: Samuel Just <sam.just@inktank.com>
2013-07-09 13:43:25 -07:00
Sage Weil
8e075146f9 osd: change pg_stat_t::reported from eversion_t to a pair of fields
This rarely represents an actual eversion_t as the epoch and seq values are
bumped semi-independently to ensure it is always unique.  Break it into
two separate fields to avoid confusion.

Drop now-unused and slightly curious inc() method.

Signed-off-by: Sage Weil <sage@inktank.com>
2013-07-09 13:42:34 -07:00