Commit Graph

17468 Commits

Author SHA1 Message Date
Sage Weil
47013c289e osd: get fsid from monmap, not osdmap
We may not have a valid OSDMap in all of these cases (notably, during
boot).  Always take the fsid from the monmap, which will be valid after
we've authenticated.

This fixes messages like

2011-12-29 08:53:44.530830 7ff3595e2700 mon.a@0(leader).pg v5 handle_statfs on fsid 00000000-0000-0000-0000-000000000000 != f8a6383d-5fbe-4f65-907e-f8d09e1d540d

on the monitor from MPGStats messages with a bad fsid right after osd boot.

Signed-off-by: Sage Weil <sage@newdream.net>
2011-12-29 09:00:46 -08:00
Sage Weil
05cc4eb93c monc: get latest monmap during authentication
Tell the monitor which monmap version we have in our initial auth message.
Make the monitor send the latest monmap if it has something newer.  This
ensures that once authentication completes the monclient has the latest
monmap and a valid fsid.

Fixes: #1848
Signed-off-by: Sage Weil <sage@newdream.net>
2011-12-29 08:59:00 -08:00
Sage Weil
300c758421 osd: catch authenticate error on startup
Signed-off-by: Sage Weil <sage@newdream.net>
2011-12-29 08:44:03 -08:00
Greg Farnum
5d5c9b6fc3 osdmap: add const markers to some unfixed functions
Signed-off-by: Greg Farnum <gregory.farnum@dreamhost.com>
2011-12-29 08:44:03 -08:00
Yehuda Sadeh
e18b1c9734 rgw: removing swift user index when removing user 2011-12-28 17:00:19 -08:00
Yehuda Sadeh
997e35aeee rgw-admin: remove subuser index when required 2011-12-28 16:50:36 -08:00
Yehuda Sadeh
2dc90d032d rgw: clone operation should only update index for main category 2011-12-28 16:34:03 -08:00
Yehuda Sadeh
bb52b18725 rgw: fix cache interface (was not overloading method) 2011-12-28 16:33:14 -08:00
Yehuda Sadeh
0db9a42330 rgw: fix bucket creation 2011-12-28 15:10:10 -08:00
Yehuda Sadeh
4ac04e8978 rgw: write bucket info in one operation 2011-12-23 12:47:16 -08:00
Greg Farnum
60bbf68891 Objecter: fix local reads one more time.
Document it a little since we've gotten it wrong so often.

Signed-off-by: Greg Farnum <gregory.farnum@dreamhost.com>
2011-12-23 09:56:42 -08:00
Sage Weil
855e93b6de filestore: fix config observer
Actually, I don't think this was fully implemented to begin with, so it's
not a 'fix' per se.  This will let you use injectargs to adjust the
filestore config options during runtime.

Signed-off-by: Sage Weil <sage@newdream.net>
2011-12-22 15:25:20 -08:00
Samuel Just
decdc363f2 MOSDPGRepScrub: Fix typo in MOSDPGRepScrub
Signed-off-by: Samuel Just <samuel.just@dreamhost.com>
2011-12-22 15:18:20 -08:00
Sage Weil
9fc060c055 Merge branch 'wip-signal' 2011-12-22 14:00:23 -08:00
Samuel Just
c7fee72dea MOSDRepScrub: use header.version for payload version
Signed-off-by: Samuel Just <samuel.just@dreamhost.com>
2011-12-22 12:33:48 -08:00
Sage Weil
3cb53cc9f3 Merge branch 'stable' 2011-12-22 12:16:06 -08:00
Henry C Chang
e93961c111 monmap: iterate over addr_name when printing summary
The rank is now ordered by IP address. We should iterate over
addr_name.

Signed-off-by: Henry C Chang <henry.cy.chang@gmail.com>
2011-12-22 12:15:17 -08:00
Henry C Chang
bfbeae68c0 monmap: clear addr_name map on calculating ranks
We should clear addr_name before filling it. Otherwise, the removed
mon will stay there and cause incorrect rank assignment.

Signed-off-by: Henry C Chang <henry.cy.chang@gmail.com>
2011-12-22 12:15:05 -08:00
Henry C Chang
ea9f2f62c4 interval_set: fix truncation of _size
_size is type of int64_t. Use int to store the value of _size
will cause value truncation.

Signed-off-by: Henry C Chang <henry.cy.chang@gmail.com>
2011-12-22 12:15:04 -08:00
Sage Weil
9eee1ecbee osd: remove SIGTERM cruft
The default handler will exit(0).  The got_sigterm stuff was dead code.

Signed-off-by: Sage Weil <sage@newdream.net>
2011-12-21 14:21:37 -08:00
Sage Weil
e04109a368 mon: drop special SIGTERM handler
Default does exit(0).

Signed-off-by: Sage Weil <sage@newdream.net>
2011-12-21 14:17:42 -08:00
Sage Weil
2daa655f02 mds: drop special SIGTERM handler
Default does exit(0).

Signed-off-by: Sage Weil <sage@newdream.net>
2011-12-21 14:17:19 -08:00
Sage Weil
d1dbeaf59d exit(0) on SIGTERM by default
Signed-off-by: Sage Weil <sage@newdream.net>
2011-12-21 14:17:00 -08:00
Sage Weil
dcedda84d0 Merge pull request #7 from kylemarsh/wip-obsync-swift-metadata
obsync: pull object metadata from swift store
2011-12-20 20:11:51 -08:00
Kyle Marsh
a85ab1eacc obsync: pull object metadata from swift store
Obsync wasn't pulling object metadata from swift stores and thus wasn't
syncing metadata when reading from a swift store.  This commit fixes that.
2011-12-20 17:08:21 -08:00
Yehuda Sadeh
3bea1ed4bd rgw: fix subuser key name when purging subuser keys 2011-12-20 11:39:32 -08:00
Yehuda Sadeh
9ddb802c72 radosgw-admin: add --purge-keys option 2011-12-20 11:00:39 -08:00
Yehuda Sadeh
01f3f6a620 rgw: add timeout to init path 2011-12-19 16:01:18 -08:00
Samuel Just
cc22f1546d MOSDRepScrub,ReplicatedPG: Add scrub_to to MOSDRepScrub
When scrub_from is set, also set scrub_to to the primary's
last_update_applied (which will also be the official last_update before
finalizing scrub began).  The replica instead of waiting for
last_update_applied to catch up to last_update will wait for
last_update_applied to catch up to active_rep_scrub->scrub_to.  This
avoids a race where the replica scrub is requeued before all of the
currently queued sub-ops have been processed.

Signed-off-by: Samuel Just <samuel.just@dreamhost.com>
2011-12-19 14:57:11 -08:00
Sage Weil
2710bd8520 mon: update man page to document --mkfs stuff
Signed-off-by: Sage Weil <sage@newdream.net>
2011-12-19 14:02:10 -08:00
Sage Weil
ed780fdd5e mds: misc assertions about truncation
Signed-off-by: Sage Weil <sage@newdream.net>
2011-12-19 14:02:10 -08:00
Sage Weil
720bab94c8 osd: EINVAL on truncate to huge object size
Signed-off-by: Sage Weil <sage@newdream.net>
2011-12-19 14:02:10 -08:00
Sage Weil
29e6d6c8c2 Merge pull request #6 from kylemarsh/wip-obsync-swift
Wip obsync swift
2011-12-19 14:00:59 -08:00
Yehuda Sadeh
33cb27961e rgw: remove temp context in prepare_get_obj 2011-12-19 13:57:15 -08:00
Yehuda Sadeh
5e7393352c rgw: fix xml parser internal structure leak 2011-12-19 13:57:08 -08:00
Yehuda Sadeh
a72348ea93 rgw: fix a leak of acl structure (in req_state) 2011-12-19 13:57:03 -08:00
Yehuda Sadeh
002eb5815e rgw: remove temp context in prepare_get_obj 2011-12-19 13:54:04 -08:00
Yehuda Sadeh
27da89f436 rgw: fix xml parser internal structure leak 2011-12-19 13:38:58 -08:00
Yehuda Sadeh
3a8af0f724 rgw: fix a leak of acl structure (in req_state) 2011-12-19 13:38:40 -08:00
Greg Farnum
42980922f2 Merge branch 'wip-osd-maybe-created' 2011-12-19 13:25:27 -08:00
Sage Weil
98a4809ad2 Merge branch 'wip-osd-fsid' 2011-12-19 13:24:46 -08:00
Sage Weil
3af5fff5e1 doc: fix typo
Signed-off-by: Sage Weil <sage@newdream.net>
2011-12-19 13:24:31 -08:00
Sage Weil
dc977901c6 osd: --get-journal-fsid
Signed-off-by: Sage Weil <sage@newdream.net>
2011-12-19 08:15:08 -08:00
Sage Weil
ae8fbb881a filejournal: uuid for fsid
Decode old header struct, but encode new class using more normal encoding
style.  Embed in a bufferlist for later extensibility.  Use the first
64 bits of the uuid for the per-entry magic, as before.

When we load an old fsid, we mirror the 64-bits.

Signed-off-by: Sage Weil <sage@newdream.net>
2011-12-19 08:13:01 -08:00
Sage Weil
c8c5e5d6cc filestore: make fsid uuid_d instead of uint64_t
Signed-off-by: Sage Weil <sage.weil@dreamhost.com>
2011-12-19 08:13:01 -08:00
Sage Weil
c59eb8ca33 osd: --get-osd-fsid and --get-cluster-fsid
Signed-off-by: Sage Weil <sage.weil@dreamhost.com>
2011-12-19 08:12:11 -08:00
Sage Weil
a582209517 osd: store osd_fsid as text in osd_data dir
along with ceph_fsid (the cluster fsid) and a few other things.

Signed-off-by: Sage Weil <sage.weil@dreamhost.com>
2011-12-19 08:12:11 -08:00
Sage Weil
dcceb8e835 osd: include osd_fsid in OSDSuperblock
Generated during mkfs.

Signed-off-by: Sage Weil <sage.weil@dreamhost.com>
2011-12-19 08:12:11 -08:00
Sage Weil
237b19cd22 osd: rename OSDSuperblock::fsid -> cluster_fsid
Signed-off-by: Sage Weil <sage.weil@dreamhost.com>
2011-12-19 08:12:10 -08:00
Sage Weil
cd909acaa4 doc: fix mon cluster expansion docs
Signed-off-by: Sage Weil <sage@newdream.net>
2011-12-19 08:04:53 -08:00