Commit Graph

23712 Commits

Author SHA1 Message Date
Danny Al-Gaaf
7b89ee666b ceph-test: give binaries from ceph-test package useful names
The files from the ceph-test subpackage are installed to /usr/bin,
give them more useful names to make sure that the user know they
belong to ceph. add a 'ceph_' prefix and change some test* binaries
to ceph_test_*.

Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>

Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
2013-02-10 18:33:56 +01:00
Sage Weil
abc80ffc5b java: make CephMountTest use user.* xattr names
Changes to the xattr code in Ceph require
a few tweaks to existing test cases.
Specifically, there is now a ceph.file.layout
xattr by default and user defined xattrs
are prepended with "user."

Signed-off-by: Sage Weil <sage@inktank.com>
Reviewed-by: Joe Buck <jbbuck@gmail.com>
Reviewed-by: Noah Watkins <noahwatkins@gmail.com>
2013-02-09 18:58:21 -08:00
Sage Weil
6d199e22fb Merge branch 'next' 2013-02-09 09:41:02 -08:00
Sage Weil
b19b6dced8 osd: fix load_pgs collection handling
On a _TEMP pg, is_pg() would succeed, which meant we weren't actually
hitting the cleanup checks.  Instead, restructure this loop as positive
checks and handle each type of collection we understand.

This fixes _TEMP cleanup.

Signed-off-by: Sage Weil <sage@inktank.com>
Reviewed-by: Samuel Just <sam.just@inktank.com>
2013-02-09 09:40:58 -08:00
Sage Weil
1f80a0b576 osd: fix load_pgs handling of pg dirs without a head
If there is a pgid that passes coll_t::is_pg() but there is no head, we
will populate the pgs map but then fail later when we try to do
read_state.  This is a side-effect of 55f8579.

Take explicit note of _head collections we see, and then warn when we
find stray snap collections.

Signed-off-by: Sage Weil <sage@inktank.com>
Reviewed-by: Samuel Just <sam.just@inktank.com>
2013-02-09 09:40:54 -08:00
Sage Weil
ead68b47f4 Merge branch 'next'
Conflicts:
	src/mon/PGMonitor.h
2013-02-09 09:40:34 -08:00
Samuel Just
073f58ede2 OSD::load_pgs: first scan colls before initing PGs
Backport: bobtail
Signed-off-by: Samuel Just <sam.just@inktank.com>
Reviewed-by: Sage Weil <sage@inktank.com>
2013-02-09 09:37:33 -08:00
Sage Weil
0d68f3a8f7 test/crypto: fix narrowing conversion warning
warning: test/crypto.cc:49:3: narrowing conversion of ‘136’ from ‘int’ to ‘char’ inside { } is ill-formed in C++11 [-Wnarrowing]

Signed-off-by: Sage Weil <sage@inktank.com>
2013-02-08 21:47:34 -08:00
Sage Weil
20255d9846 doc: update commands for fetching release PGP keys
Use https to ceph.com.  The gitweb URLs aren't as pretty, but our
cert is at least valid!

Signed-off-by: Sage Weil <sage@inktank.com>
2013-02-08 21:09:20 -08:00
John Wilkins
38dd59ba7c doc: Removed unnecessary/contradictory options.
fixes: #4058

Signed-off-by: John Wilkins <john.wilkins@inktank.com>
2013-02-08 13:27:58 -08:00
John Wilkins
19c946663e doc: Fixed order of option.
fixes: #4046

Signed-off-by: John Wilkins <john.wilkins@inktank.com>
2013-02-08 13:18:23 -08:00
Sage Weil
3cf3710be0 mon: fix typo in C_Stats
Broken by previous commit.

Signed-off-by: Sage Weil <sage@inktank.com>
2013-02-08 09:59:25 -08:00
Sage Weil
2bdf753d7d mon: assert valid context return values
We recognized EAGAIN, ECANCELED, and success only.

Signed-off-by: Sage Weil <sage@inktank.com>
Reviewed-by: Joao Luis <joao.luis@inktank.com>
2013-02-08 09:18:11 -08:00
Sage Weil
3322e96b7b Merge branch 'next' 2013-02-08 09:18:01 -08:00
Sage Weil
4837063d44 mon: retry PGStats message on EAGAIN
If we get EAGAIN from a paxos restart/election/whatever, we should
restart the message instead of just blindly acking it.

Signed-off-by: Sage Weil <sage@inktank.com>
Reviewed-by: Joao Luis <joao.luis@inktank.com>
2013-02-08 09:09:20 -08:00
Sage Weil
17827769f1 mon: handle -EAGAIN in completion contexts
We can get ECANCELED, EAGAIN, or success out of the completion contexts,
but in the EAGAIN case (meaning there was an election) we were sending
a success to the client.  This resulted in client hangs and all-around
confusion when the monitor cluster was thrashing.

Backport: bobtail
Signed-off-by: Sage Weil <sage@inktank.com>
Reviewed-by: Joao Luis <joao.luis@inktank.com>
2013-02-08 09:09:03 -08:00
Sage Weil
5a02d6de7e Merge branch 'next' 2013-02-07 23:20:44 -08:00
Sage Weil
1b05b0edba radosgw-admin: fix cli test
Signed-off-by: Sage Weil <sage@inktank.com>
2013-02-07 22:51:29 -08:00
Sage Weil
2eaa728151 keys: renew autobuild.asc key
This expired today.  Change it to never expire, like the Ubuntu release
keys.

Signed-off-by: Sage Weil <sage@inktank.com>
2013-02-07 22:31:40 -08:00
Sage Weil
f3ba46d31f Merge remote-tracking branch 'gh/next' 2013-02-07 22:19:58 -08:00
Yehuda Sadeh
8a2de334fe Merge remote-tracking branch 'origin/master' into wip-2941-3 2013-02-07 17:16:49 -08:00
Yehuda Sadeh
278dfe50fd rgw: stream get_obj operation
Fixes: #2941
Instead of iterating through the parts one by one when reading
an object, we can now send multiple requests in parallel. Two new
configurables added to control the max request size, and the total
size of pending requests.

Signed-off-by: Yehuda Sadeh <yehuda@inktank.com>
2013-02-07 16:59:41 -08:00
Yehuda Sadeh
3383618da8 throttle: optional non perf counter mode
Signed-off-by: Yehuda Sadeh <yehuda@inktank.com>
2013-02-07 16:59:32 -08:00
Samuel Just
ed2bb38770 OSD: check pg snap collections on start up
Backport: bobtail
Signed-off-by: Samuel Just <sam.just@inktank.com>
Reviewed-by: Sage Weil <sage@inktank.com>
2013-02-07 16:16:04 -08:00
Samuel Just
55f857962f OSD::load_pgs: first scan colls before initing PGs
Backport: bobtail
Signed-off-by: Samuel Just <sam.just@inktank.com>
Reviewed-by: Sage Weil <sage@inktank.com>
2013-02-07 16:16:01 -08:00
Yehuda Sadeh
70532d1985 rgw: get bucket_owner from policy
We already read the bucket policy, we can get the bucket
owner from there.

Signed-off-by: Yehuda Sadeh <yehuda@inktank.com>
2013-02-07 14:54:54 -08:00
Yehuda Sadeh
f6af1e76a8 rgw: fix bucket_owner assignment
s->bucket_acl may be null, so reverting to old behavior.

Signed-off-by: Yehuda Sadeh <yehuda@inktank.com>
2013-02-07 14:54:54 -08:00
caleb miles
e345dfe04a Feature 3667: Support extra canned acls.
Support the bucket-owner-read and bucket-owner-full
canned acls.

Signed-off-by caleb miles <caleb.miles@inktank.com>
Reviewed-by: Yehuda Sadeh <yehuda@inktank.com>
2013-02-07 14:54:39 -08:00
Samuel Just
fa47e77a13 ReplicatedPG: check store for temp collection in have_temp_coll
We may not have "created" the temp collection since OSD restart
before removing the PG.  have_temp_coll must also look at the
OSD store.  Currently, the only user is pg removal, so the
extra work is acceptable.

Backport: bobtail
Signed-off-by: Samuel Just <sam.just@inktank.com>
2013-02-07 14:27:10 -08:00
Yehuda Sadeh
a18045f0f6 rgw: a tool to fix clobbered bucket info in user's bucket list
This fixes bad entries in user's bucket list that may have occured
due to issue #4039. Syntax:

 $ radosgw-admin user check --uid=<uid> [--fix]

Signed-off-by: Yehuda Sadeh <yehuda@inktank.com>
Reviewed-by: Greg Farnum <greg@inktank.com>
(cherry picked from commit 9cb6c33f0e)

Conflicts:
	src/rgw/rgw_admin.cc
2013-02-07 13:55:23 -08:00
Yehuda Sadeh
a00c77abe2 rgw: bucket recreation should not clobber bucket info
Fixes: #4039
User's list of buckets is getting modified even if bucket already
exists. This fix removes the newly created directory object, and
makes sure that user info's data points at the correct bucket.

Signed-off-by: Yehuda Sadeh <yehuda@inktank.com>
Reviewed-by: Greg Farnum <greg@inktank.com>
(cherry picked from commit 9d006ec40c)

Conflicts:
	src/rgw/rgw_op.cc
	src/rgw/rgw_rados.cc
2013-02-07 13:55:17 -08:00
Dan Mick
784547943b Merge branch 'wip-cephtool' into next
Usage/errmsg fixups for the ceph CLI tool

Reviewed-by: Josh Durgin <josh.durgin@inktank.com>
2013-02-07 13:09:28 -08:00
Dan Mick
36cf4d0cdf ceph: fix 'pg' error message to direct user toward better input
Signed-off-by: Dan Mick <dan.mick@inktank.com>
2013-02-07 13:06:54 -08:00
Dan Mick
1042060f40 mds: error messages for export_dir said 'migrate_dir'
Signed-off-by: Dan Mick <dan.mick@inktank.com>
2013-02-07 13:06:53 -08:00
Dan Mick
c44846e035 ceph: ceph mon delete doesn't exist; ceph mon remove is the command
Fix up cli test as well (doc is already correct)

Signed-off-by: Dan Mick <dan.mick@inktank.com>
2013-02-07 13:06:53 -08:00
Dan Mick
eb9d6cac0d osd: fix name of setomapval admin-daemon command
Signed-off-by: Dan Mick <dan.mick@inktank.com>
2013-02-07 13:06:53 -08:00
Dan Mick
73872e7194 ceph: use "config set" consistently in help/error msgs
apparently it was once known as set_config.  Fix up everything to
refer to the new name.  Also, fix up the help message.

Signed-off-by: Dan Mick <dan.mick@inktank.com>
2013-02-07 13:06:53 -08:00
tamil
5896b971a3 modified the script to run on both argonaut and bobtail.
Signed-off-by: tamil <tamil.muthamizhan@inktank.com>
2013-02-07 11:47:06 -08:00
Samuel Just
dbce1d0dc9 PG: dirty_info on handle_activate_map
We need to make sure the pg epoch is persisted during
activate_map.

Backport: bobtail
Reviewed-by: Sage Weil <sage@inktank.com>
Signed-off-by: Samuel Just <sam.just@inktank.com>
2013-02-07 10:44:46 -08:00
Greg Farnum
9432353519 mds: rename mds_traceless_replies to mds_inject_traceless_reply_probability
Sage pointed out we should try for consistent naming on these debug
options, and this option is like our other inject_[x] stuff.
While we're here, make the config option comment a bit clearer.

08b82b3ef6
2013-02-07 10:25:33 -08:00
Sage Weil
af95d934b0 osd: flush peering queue (consume maps) prior to boot
If the osd itself is behind on many maps during boot, it will get more and
(as part of that) flush the peering wq to ensure the pgs consume them.
However, it is possible for OSD to have latest/recnet maps, but pgs to be
behind, and to jump directly to boot and join.  The OSD is then laggy and
unresponsive because the peering wq is way behind.

To avoid this, call consume_map() (kick the peering wq) at the end of
init and flush it to ensure we are *internally* all caught up before we
consider joining the cluster.

I'm pretty sure this is the root cause of #3905 and possibly #3995.

Signed-off-by: Sage Weil <sage@inktank.com>
Reviewed-by: Josh Durgin <josh.durgin@inktank.com>
Reviewed-by: Samuel Just <sam.just@inktank.com>
2013-02-07 10:21:49 -08:00
Sage Weil
75c40fac60 qa: fix iogen script
Wait 10 minutes and then stop.

Signed-off-by: Sage Weil <sage@inktank.com>
2013-02-06 22:01:24 -08:00
Greg Farnum
46d7dbd347 client: trigger the completion in _flush when short-cutting
We missed a shortcut return from _flush() when doing
e9a6694d01, so _fsync() calls
were failing. To fix, if _flush discovers there's nothing to flush,
trigger the completion by calling onfinish->finish().

Fixes #4038

Signed-off-by: Greg Farnum <greg@inktank.com>
Reviewed-by: Sage Weil <sage@inktank.com>
2013-02-06 16:47:51 -08:00
Greg Farnum
08b82b3ef6 mds: add "mds traceless replies" debug option
This option specifies (in the range 0-1) the percentage of modifying
operations that should be responded to without including a trace
for the dentries.
In order to implement it, we add a "modify" parameter to
set_trace_dist(), and the callers fill that with
mdr->req->may_write().

Signed-off-by: Greg Farnum <greg@inktank.com>
Reviewed-by: Sam Lang <sam.lang@inktank.com>
2013-02-06 13:34:02 -08:00
Gary Lowell
9871cf2751 logrotate.conf: Silence rgw logrotate some more
Apply the same change as commit d02340d90c to
the radosgw logrotate.conf.

Signed-off-by: Gary Lowell  <gary.lowell@inktank.com>
2013-02-06 11:45:30 -08:00
Alexandre Oliva
d02340d90c silence logrotate some more
I was getting email with logrotate error output from “which invoke-rc.d”
on systems without an invoke-rc.d.  This patch silences it.

Silence stderr from which when running logrotate

From: Alexandre Oliva <oliva@gnu.org>

Signed-off-by: Alexandre Oliva <oliva@gnu.org>
2013-02-06 11:44:56 -08:00
Sage Weil
f81e09525f Merge remote-tracking branch 'gh/wip-danny-cleanups'
Reviewed-by: Sage Weil <sage@inktank.com>
2013-02-06 10:43:29 -08:00
Sage Weil
0aea4dba04 Merge remote-tracking branch 'gh/wip-3768' 2013-02-06 10:38:08 -08:00
Greg Farnum
c0e1070f2f test: fix Throttle unit test.
A bunch of these are slightly racy so they're enclosed in loops. This
particular one, though, changes the Throttle state in ways that
invalidate the asserts. To fix, reset the state before commencing a
rerun.

Signed-off-by: Greg Farnum <greg@inktank.com>
2013-02-06 10:22:06 -08:00
Sage Weil
1948a02bc8 osd: do not spam system log on successful read_log
Signed-off-by: Sage Weil <sage@inktank.com>
2013-02-06 09:02:54 -08:00