Commit Graph

17488 Commits

Author SHA1 Message Date
Florian Haas
9b6422dbc7 Spec: conditionally build ceph-resource-agents package
Put OCF resource agents in a separate subpackage,
to be enabled with a separate build conditional
(--with ocf).

Make the subpackage depend on the resource-agents
package, which provides the ocf-shellfuncs library
that the Ceph RAs use.

Signed-off-by: Florian Haas <florian@hastexo.com>
2011-12-30 09:00:31 -08:00
Florian Haas
92cfad4203 Add OCF-compliant resource agent for Ceph daemons
Add a wrapper around the ceph init script that makes
MDS, OSD and MON configurable as Open Cluster Framework
(OCF) compliant cluster resources. Allows Ceph
daemons to tie in with cluster resource managers that
support OCF, such as Pacemaker (http://www.clusterlabs.org).

Disabled by default, configure --with-ocf to enable.

Signed-off-by: Florian Haas <florian@hastexo.com>
2011-12-30 09:00:30 -08:00
Sage Weil
66170633ff mon: fix full ratio updates
- update them independently
- only if we are leader
- fix type for nearfull_ratio

Signed-off-by: Sage Weil <sage@newdream.net>
2011-12-30 08:06:55 -08:00
Sage Weil
f2e4109796 mon: don't ignore first full ratio update callback
We get a callack on startup.  Don't ignore it.

Signed-off-by: Sage Weil <sage@newdream.net>
2011-12-30 08:06:06 -08:00
Sage Weil
a693438e13 mon: only update full_ratio if we're the leader
Signed-off-by: Sage Weil <sage@newdream.net>
2011-12-30 07:45:21 -08:00
Sage Weil
47d0227187 Merge remote branch 'gh/wip-cleanup' 2011-12-30 07:42:20 -08:00
Sage Weil
df84594f20 mon: make full ratio config change callback safe
We can't propose_pending() from any context; do this in the tick() thread,
with the proper locking.  Among other things, this fixes the crash on
startup that is now triggered due to eba235f2.

Signed-off-by: Sage Weil <sage@newdream.net>
2011-12-29 17:15:07 -08:00
Josh Durgin
585fb5cef9 clitests: update for new error format
This was changed in 1f434da8a3

Signed-off-by: Josh Durgin <josh.durgin@dreamhost.com>
2011-12-29 15:43:55 -08:00
Josh Durgin
cec2692ea3 clitests: update monmaptool test
e93961c111 changed output format.

Signed-off-by: Josh Durgin <josh.durgin@dreamhost.com>
2011-12-29 15:28:16 -08:00
Florian Haas
48df71c854 init script: be LSB compliant for exit code on status
An exit code of 1 on status is defined in LSB as
"program is dead, but pid file exists". Check for existence
of this pid file, and only set the exit status 1 if it's still there.
Set it to 3 ("program is not running") otherwise.

Reference: http://refspecs.linuxbase.org/LSB_3.1.0/LSB-Core-generic/LSB-Core-generic/iniscrptact.html

Signed-off-by: Florian Haas <florian@hastexo.com>
2011-12-29 12:00:02 -08:00
Sage Weil
3b2ca7cf9b keyring: print more useful errors to log/err
Signed-off-by: Sage Weil <sage@newdream.net>
2011-12-29 11:58:28 -08:00
Sage Weil
eba235f26c common: trigger all observers on startup
Among other things, this makes err-to-stderr and friends initialize
properly in the DoutStreamBuf.

Signed-off-by: Sage Weil <sage@newdream.net>
2011-12-29 11:57:55 -08:00
Sage Weil
1f434da8a3 common: make cpp_strerror output prettier
Signed-off-by: Sage Weil <sage@newdream.net>
2011-12-29 11:24:50 -08:00
Sage Weil
04c8db001a librados: check for monclient::init() error
I think this fixes #1835.

Signed-off-by: Sage Weil <sage@newdream.net>
2011-12-29 11:24:12 -08:00
Sage Weil
37013b6fe5 qa: load-gen-mix-small.sh 2011-12-29 09:59:26 -08:00
Yehuda Sadeh
1a59405c2f rgw: turn on cache by default 2011-12-29 09:59:26 -08:00
Sage Weil
d24ea23585 mds: assert if we get an EINVAL on our truncate
Signed-off-by: Sage Weil <sage@newdream.net>
2011-12-29 09:09:01 -08:00
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
Josh Durgin
97dd28c0ce librados: return -EROFS when trying to write to a snapshot
operate_read doesn't need this check because it does not write.

Signed-off-by: Josh Durgin <josh.durgin@dreamhost.com>
2011-12-19 18:03:14 -08:00
Josh Durgin
68ba1862e8 librados: make getxattrs ENOMEM return negative
This is more consistent with the rest of librados.

Signed-off-by: Josh Durgin <josh.durgin@dreamhost.com>
2011-12-19 18:00:16 -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