Commit Graph

25849 Commits

Author SHA1 Message Date
Sage Weil
77c068d1af mon: fix double-forwarding check
The PaxosServiceMessage fields are no longer filled in.  Use Session::proxy_con
instead.

Signed-off-by: Sage Weil <sage@inktank.com>
2013-04-26 10:48:10 -07:00
David Zafman
e3b602adf7 osd: Fix logic in OSDMap::containing_subtree_is_down()
Check for up OSDs as we walk up the crushmap hierarchy

fixes: #4822

Signed-off-by: David Zafman <david.zafman@inktank.com>
2013-04-26 10:24:43 -07:00
Dan Mick
a2a23ccd95 debian/rules: use multiline search to look for Build-Depends
When Build-Depends was split into multiple lines (in commit
8f5c665744), the grep for
libgoogle-perftools-dev broke.  Replace grep with perl for multiline
matching.

Fixes: #4818
Signed-off-by: Dan Mick <dan.mick@inktank.com>
(cherry picked from commit 89692e099f)
2013-04-26 10:19:04 -07:00
Sage Weil
f768fbba24 client: re-fix cap releases
Encode cap releases if NOT replay.  <facepalm>  Thanks, Greg!

Signed-off-by: Sage Weil <sage@inktank.com>
2013-04-26 10:12:37 -07:00
Sam Lang
5121e56c25 client: don't embed cap releases in clientreplay
If the client is sending replay requests, avoid sending embedded caps,
since the mds already has the client's caps from the reconnect.
This matches the behavior of the kernel client.

Fixes #4742.
Signed-off-by: Sam Lang <sam.lang@inktank.com>
Reviewed-by: Sage Weil <sage@inktank.com>
Reviewed-by: Greg Farnum <greg@inktank.com>
2013-04-26 09:51:45 -07:00
Dan Mick
89692e099f debian/rules: use multiline search to look for Build-Depends
When Build-Depends was split into multiple lines (in commit
8f5c665744), the grep for
libgoogle-perftools-dev broke.  Replace grep with perl for multiline
matching.

Fixes: #4818
Signed-off-by: Dan Mick <dan.mick@inktank.com>
2013-04-26 00:05:48 -07:00
Sage Weil
2146930ef0 mon: do not forward other mon's requests to other mons
The request forwarding infrastructure is there for client requests.
However, we (ab)use it for mon's sending MLog messages: LogClient sends an
MLog message to itself, and that is either handled locally (if leader) or
forwarded to the leader.

If that races with an election, we were forwarding an MLog from another mon
to the leader.  This is not necessary; the original MLog sender will resend
the request on election_finish() to the latest leader.

The fix is to adjust forward_request_leader() to only forward messages from
a mon if that mon is itself.

This was reproduced while testing the fix for #4748.

Signed-off-by: Sage Weil <sage@inktank.com>
2013-04-25 16:47:15 -07:00
Samuel Just
a5cade1fe7 PG: clear want_acting when we leave Primary
This is somewhat annoying actually.  Intuitively we want to
clear_primary_state when we leave primary, but when we restart
peering due to a change in prior set status, we can't afford
to forget most of our peering state.  want_acting, on the
other hand, should never persist across peering attempts.
In fact, in the future, want_acting should be pulled into
the Primary state structure.

Fixes: #3904
Signed-off-by: Samuel Just <sam.just@inktank.com>
Reviewed-by: Sage Weil <sage@inktank.com>
Reviewed-by: David Zafman <david.zafman@inktank.com>
2013-04-25 16:24:41 -07:00
Sage Weil
3ce35a6743 mon: get own entity_inst_t via messenger, not monmap
There are intervals during bootstrap(*) during which we are part of the
monmap, but our name (mon->name) does not match the monmap's.  This means
that calling monmap->get_inst(mon->name) is not a safe way to get our own
entity_inst_t.

Instead, use messenger->get_myinst().  This includes our addr (obviously)
and an up-to-date entity_name_t, too: in bootstrap we adjust the messenger
name at the same time as mon->rank, based on the contents of the monmap.

monmap->get_inst(mon->rank) would work too.

* During mkfs, the monmap may have noname-foo instead of the name if it was
  generated from the mon_host lines or dns or whatever by
  MonMap::build_initial().  This was the case for #4811.

Fixes: #4811
Signed-off-by: Sage Weil <sage@inktank.com>
Reviewed-by: Greg Farnum <greg@inktank.com>
2013-04-25 15:18:55 -07:00
Sage Weil
b0ba41235a Merge pull request #239 from ceph/wip-4760
#4760

Second patch Reviewed-by: Sage Weil <sage@inktank.com>
2013-04-25 13:11:59 -07:00
Sage Weil
42ab1f4561 Merge pull request #246 from ceph/wip-4793
#4793

Reviewed-by: Sage Weil <sage@inktank.com>
2013-04-25 11:52:30 -07:00
Li Wang
303e739e5b radosgw: receiving unexpected error code while accessing an non-existing object by authorized not-owner user
This patch fixes a bug in radosgw swift compatibility code,
that is, if a not-owner but authorized user access a non-existing
object in a container, he wiil receive unexpected error code,
to repeat this bug, do the following steps,

1 User1 creates a container, and grants the read/write permission to user2

curl -X PUT -i -k -H "X-Auth-Token: $user1_token" $url/$container
curl -X POST -i -k -H "X-Auth-Token: $user1_token" -H "X-Container-Read:
$user2" -H "X-Container-Write: $user2" $url/$container

2 User2 queries the object 'obj' in the newly created container
by using HEAD instruction, note the container currently is empty

curl -X HEAD -i -k -H "X-Auth-Token: $user2_token" $url/$container/obj

3 The response received by user2 is '401 Authorization Required',
rather than the expected '404 Not Found', the details are as follows,

HTTP/1.1 401 Authorization Required
Date: Tue, 16 Apr 2013 01:52:49 GMT
Server: Apache/2.2.22 (Ubuntu)
Accept-Ranges: bytes
Content-Length: 12
Vary: Accept-Encoding

Signed-off-by: Yunchuan Wen <yunchuanwen@ubuntukylin.com>
Signed-off-by: Li Wang <liwang@ubuntukylin.com>
Reviewed-by: Yehuda Sadeh <yehuda@inktank.com>
2013-04-25 11:36:50 -07:00
Sage Weil
407ce132ba PendingReleaseNotes: these are now in the release-notes.rst
Signed-off-by: Sage Weil <sage@inktank.com>
2013-04-25 11:17:41 -07:00
Sage Weil
c979d65bd2 Merge remote-tracking branch 'gh/next' 2013-04-25 11:17:15 -07:00
Sage Weil
4af93dccae doc/release-notes: add note about sysvinit script change
See cd7e52cc76.

Signed-off-by: Sage Weil <sage@inktank.com>
2013-04-25 11:17:08 -07:00
Sage Weil
cd7e52cc76 init-ceph: use remote config when starting daemons on remote nodes (-a)
If you use -a to start a remote daemon, assume the remote config is present
instead of pushing the local config.  This makes more sense and simplifies
things.

Note that this means that -a in concert with -c foo means that foo must
also be present on the remote node in the same path.  That, however, is a
use case that I don't particularly care about right now.  :)

Signed-off-by: Sage Weil <sage@inktank.com>
Reviewed-by: Dan Mick <dan.mick@inktank.com>
2013-04-25 11:13:33 -07:00
Sage Weil
ea54e6603f Merge branch 'wip-4748-b' into next
Reviewed-by: Greg Farnum <greg@inktank.com>
2013-04-25 10:21:11 -07:00
Danny Al-Gaaf
d90b0caf47 gen_state_diagram.py: fix function name
Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
2013-04-25 16:02:47 +02:00
Danny Al-Gaaf
1ee8f39038 gen_state_diagram.py: fix naming of global variables/constants
Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
2013-04-25 16:02:43 +02:00
Danny Al-Gaaf
d9f8de1e89 gen_state_diagram.py: add some missing spaces around operators
Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
2013-04-25 16:02:36 +02:00
Danny Al-Gaaf
7cd9d23ff6 gen_state_diagram.py: remove unnecessary semicolon
Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
2013-04-25 16:02:33 +02:00
Danny Al-Gaaf
eb3350e4b0 test_mon_config_key.py: fix some more naming of local vars
Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
2013-04-25 16:02:20 +02:00
Danny Al-Gaaf
7436542937 test_mon_config_key.py: fix naming of local variable opLOG
Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
2013-04-25 16:02:02 +02:00
Danny Al-Gaaf
9d3b4fd788 test_mon_config_key.py: fix naming of local variable
Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
2013-04-25 16:01:16 +02:00
Danny Al-Gaaf
04075722bc fix "Instance of 'list' has no 'split' member"
Cast with str() to fix issue.

Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
2013-04-25 16:00:09 +02:00
Danny Al-Gaaf
c792ea6707 test_mon_config_key.py: fix naming of local variable
Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
2013-04-25 15:57:20 +02:00
Danny Al-Gaaf
912bb82c72 test_mon_config_key.py: fix naming of global variables/constants
Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
2013-04-25 15:56:30 +02:00
Danny Al-Gaaf
1464169a26 test_mon_config_key.py: add missing space after comma
Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
2013-04-25 15:56:19 +02:00
Danny Al-Gaaf
16c565068b test_mon_config_key.py: remove unnecessary semicolon
Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
2013-04-25 15:56:14 +02:00
Danny Al-Gaaf
f601eb9053 test_mon_config_key.py: fix bad indentation
Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
2013-04-25 15:55:19 +02:00
Danny Al-Gaaf
9dd5de2635 perf-watch.py: fix naming of a local variable
Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
2013-04-25 15:54:34 +02:00
Danny Al-Gaaf
226ff52a64 perf-watch.py: fix naming of local variable
Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
2013-04-25 15:53:45 +02:00
Danny Al-Gaaf
148710fb72 perf-watch.py: add missing space after comma
Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
2013-04-25 15:53:06 +02:00
Danny Al-Gaaf
dffa9eeb62 perf-watch.py: remove unnecessary semicolons
Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
2013-04-25 15:52:57 +02:00
David Zafman
f4804849b7 Merge branch 'wip-4778' into next
Reviewed-by: Samuel Just <sam.just@inktank.com>
2013-04-24 17:33:00 -07:00
David Zafman
ac3dda214d scrub clears inconsistent flag set by deep scrub
Add new num_deep_scrub_errors and num_shallow_scrub_errors to object_stat_sum_t
Show deep-scrub error count when outputing regular scrub errors
Set invalid size in case of a stat error which sets read_error
For now do deep-scrub after repair (see #4783)

fixes: #4778
Signed-off-by: David Zafman <david.zafman@inktank.com>
2013-04-24 17:32:39 -07:00
Sage Weil
ba527c1ea2 doc/release-notes: enospc note
Signed-off-by: Sage Weil <sage@inktank.com>
2013-04-24 16:46:02 -07:00
Sage Weil
2075ec601e doc/release-notes: 0.61 cuttlefish notes
Signed-off-by: Sage Weil <sage@inktank.com>
2013-04-24 16:42:07 -07:00
Josh Durgin
4322522028 Merge pull request #242 from ceph/wip-objectcacher-enoent
Reviewed-by: Sage Weil <sage.weil@inktank.com>
2013-04-24 16:20:59 -07:00
Josh Durgin
82d5cd601e ObjectCacher: remove all buffers from a non-existent object
Once we're sure an object doesn't exist, we retry all the waiters in
order, and they return -ENOENT immediately. If there were a bunch of
BufferHeads waiting for data (rx state), they would be left behind
while the reads that triggered them were complete from the cache
user's perspective. These extra rx BufferHeads would pin the object in
the lru, so they wouldn't be removed by release_set(). This meant that
the assert during shutdown of the cache would be triggered.

To fix this, remove any BufferHeads in this state immediately when we
find out the object doesn't exist. Use the same condition as readx for
determining whether this is safe - if we got -ENOENT and all
BufferHeads for the object are clean or rx.

Fixes: #3664
Signed-off-by: Josh Durgin <josh.durgin@inktank.com>
2013-04-24 15:54:07 -07:00
Greg Farnum
fcaabf1a22 mon: when electing, be sure acked leaders have new enough stores to lead
In general anybody participating in an election should be new enough to
lead thanks to the bootstrap process, but we've observed situations in
which a monitor is leader but gets so busy that it gets booted out
without noticing for a while, then processes the election messages
which were spawned, responds to them, and the other monitors kick those
up to a new election epoch. Then the old and behind monitor gets
elected as the new leader, which does bad things to our sync.

To deal with this, add the paxos first and last committed versions
to the MMonElection messages, and consider those values when deciding
whether to defer to a peer. Only defer to them if their newest value
is newer than our oldest, but also *do* defer to them if their oldest
value is newer than our newest even if we out-rank them otherwise.

Signed-off-by: Greg Farnum <greg@inktank.com>
2013-04-24 15:40:13 -07:00
Greg Farnum
fb8bad3105 mon: be more careful about making sure we're up-to-date on sync check
We were looking at our own paxos_max_join_drift and using that to
calculate whether we were new enough to join without syncing, but
if those numbers don't match across monitors they might have trimmed. Use
the number they provide us as their first version and compare to that
as well.

Signed-off-by: Greg Farnum <greg@inktank.com>
2013-04-24 15:40:13 -07:00
Sage Weil
290b5eb0f1 rgw: fix i386 compile error
error: rgw/rgw_op.cc:665:63: no matching function for call to ‘min(uint64_t, size_t&)’

Signed-off-by: Sage Weil <sage@inktank.com>
2013-04-24 15:07:28 -07:00
Samuel Just
14f2392263 FileStore::_split_collection: src or dest may be removed on replay
If the collection is subsequently removed, the _split_collection
might get replayed and find either src or dest removed.

Fixes: #4806
Backport: bobtail
Signed-off-by: Samuel Just <sam.just@inktank.com>
Reviewed-by: Sage Weil <sage@inktank.com>
2013-04-24 15:05:41 -07:00
Sage Weil
3604c98232 librados: fix calc_snap_set_diff interval calculation
When calculating the [a,b] interval over which a given clone is valid, do
not assume that b == the clone id; that is *not* true when the original
end snap has been deleted/trimmed.

While we are here, make the code a bit cleaner to read.

Fixes: #4785
Signed-off-by: Sage Weil <sage@inktank.com>
Reviewed-by: Samuel Just <sam.just@inktank.com>
2013-04-24 14:34:40 -07:00
Samuel Just
5668e5b5a4 Merge remote-tracking branch 'upstream/wip_2476' into next
Fixes: #2476
Reviewed-by: Greg Farnum <greg@inktank.com>
2013-04-24 14:04:07 -07:00
Samuel Just
81a6165c13 PG: call check_recovery_sources in remove_down_peer_info
If we transition out of peering due to affected
prior set, we won't trigger start_peering_interval
and check_recovery_sources won't get called.  This
will leave an entry in missing_loc_sources without
a matching missing set.  We always want to
check_recovery_sources with remove_down_peer_info.

Fixes: 4805
Backport: bobtail
Signed-off-by: Samuel Just <sam.just@inktank.com>
Reviewed-by: Sage Weil <sage@inktank.com>
2013-04-24 13:20:44 -07:00
Sage Weil
a9791dae1b mon: send clients away while sychronizing
When we are out of quorum, we waitlist client messages or (eventually)
send them elsewhere.  If we are synchronizing, do the same.

Signed-off-by: Sage Weil <sage@inktank.com>
2013-04-24 12:26:37 -07:00
Sage Weil
12bc9a7aa9 mkcephfs: give mon. key 'allow *' mon caps
This will ease the transition from mkcephfs to ceph-deploy by allowing
ceph-create-keys to use the mon. keyring file in $mon_data and get the
caps it needs.

Fixes: #4756
Signed-off-by: Sage Weil <sage@inktank.com>
2013-04-24 11:23:25 -07:00
Josh Durgin
cce1c91ae8 PendingReleaseNotes: note about rbd resize --allow-shrink
Signed-off-by: Josh Durgin <josh.durgin@inktank.com>
2013-04-24 10:16:03 -07:00