]>
git.apps.os.sepia.ceph.com Git - ceph.git/log
Greg Farnum [Sat, 24 Dec 2011 00:41:38 +0000 (16:41 -0800)]
osd: add a monitor timeout via MPGStatsAck messages
Keep track of when we have outstanding updates, and while we do, make
sure the monitor responds within a timeout (default 30 seconds). If
it doesn't, reconnect!
Signed-off-by: Greg Farnum <gregory.farnum@dreamhost.com>
Alphat-PC [Tue, 3 Jan 2012 15:36:15 +0000 (16:36 +0100)]
Fix invalid docdir_SCRIPTS usage with >=automake-1.11.2
Sage Weil [Sat, 31 Dec 2011 01:04:47 +0000 (17:04 -0800)]
librados: take lock in rollback
We're poking through the osdmap; need to hold the lock here.
Signed-off-by: Sage Weil <sage@newdream.net>
Sage Weil [Sat, 31 Dec 2011 01:04:30 +0000 (17:04 -0800)]
objecter: assert lock held in op_submit
Signed-off-by: Sage Weil <sage@newdream.net>
Sage Weil [Sat, 31 Dec 2011 01:04:22 +0000 (17:04 -0800)]
librados: call aio_operate() with lock held
Signed-off-by: Sage Weil <sage@newdream.net>
Yehuda Sadeh [Fri, 30 Dec 2011 22:18:40 +0000 (14:18 -0800)]
rgw: create default constructors for some structs
this will silence valgrind a bit
Josh Durgin [Fri, 30 Dec 2011 18:32:05 +0000 (10:32 -0800)]
workunits: update rbd test for new error format
Signed-off-by: Josh Durgin <josh.durgin@dreamhost.com>
Sage Weil [Fri, 30 Dec 2011 17:50:36 +0000 (09:50 -0800)]
config: use autoconf $libdir for default rados class dir
Fixes: #1722
Signed-off-by: Sage Weil <sage@newdream.net>
Sage Weil [Fri, 30 Dec 2011 17:17:06 +0000 (09:17 -0800)]
.gitignore: src/ocf/ceph
Signed-off-by: Sage Weil <sage@newdream.net>
Florian Haas [Thu, 29 Dec 2011 19:58:02 +0000 (20:58 +0100)]
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>
Florian Haas [Thu, 29 Dec 2011 19:58:01 +0000 (20:58 +0100)]
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>
Sage Weil [Fri, 30 Dec 2011 16:06:55 +0000 (08:06 -0800)]
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>
Sage Weil [Fri, 30 Dec 2011 16:06:06 +0000 (08:06 -0800)]
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>
Sage Weil [Fri, 30 Dec 2011 15:45:21 +0000 (07:45 -0800)]
mon: only update full_ratio if we're the leader
Signed-off-by: Sage Weil <sage@newdream.net>
Sage Weil [Fri, 30 Dec 2011 15:42:20 +0000 (07:42 -0800)]
Merge remote branch 'gh/wip-cleanup'
Sage Weil [Fri, 30 Dec 2011 01:15:07 +0000 (17:15 -0800)]
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>
Josh Durgin [Thu, 29 Dec 2011 23:43:55 +0000 (15:43 -0800)]
clitests: update for new error format
This was changed in
1f434da8a3ca4db830d1f3b0d87e5df941d85f2d
Signed-off-by: Josh Durgin <josh.durgin@dreamhost.com>
Josh Durgin [Thu, 29 Dec 2011 23:28:16 +0000 (15:28 -0800)]
clitests: update monmaptool test
e93961c11119942eae3a4cd14a79f779a5a4d277 changed output format.
Signed-off-by: Josh Durgin <josh.durgin@dreamhost.com>
Florian Haas [Tue, 27 Dec 2011 10:43:47 +0000 (11:43 +0100)]
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>
Sage Weil [Thu, 29 Dec 2011 19:58:28 +0000 (11:58 -0800)]
keyring: print more useful errors to log/err
Signed-off-by: Sage Weil <sage@newdream.net>
Sage Weil [Thu, 29 Dec 2011 19:57:55 +0000 (11:57 -0800)]
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>
Sage Weil [Thu, 29 Dec 2011 19:24:50 +0000 (11:24 -0800)]
common: make cpp_strerror output prettier
Signed-off-by: Sage Weil <sage@newdream.net>
Sage Weil [Thu, 29 Dec 2011 19:24:12 +0000 (11:24 -0800)]
librados: check for monclient::init() error
I think this fixes #1835.
Signed-off-by: Sage Weil <sage@newdream.net>
Sage Weil [Thu, 29 Dec 2011 17:59:26 +0000 (09:59 -0800)]
qa: load-gen-mix-small.sh
Yehuda Sadeh [Thu, 29 Dec 2011 17:46:55 +0000 (09:46 -0800)]
rgw: turn on cache by default
Sage Weil [Wed, 30 Nov 2011 01:18:48 +0000 (17:18 -0800)]
mds: assert if we get an EINVAL on our truncate
Signed-off-by: Sage Weil <sage@newdream.net>
Sage Weil [Thu, 29 Dec 2011 17:00:46 +0000 (09:00 -0800)]
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>
Sage Weil [Thu, 29 Dec 2011 16:59:00 +0000 (08:59 -0800)]
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>
Sage Weil [Thu, 29 Dec 2011 16:43:41 +0000 (08:43 -0800)]
osd: catch authenticate error on startup
Signed-off-by: Sage Weil <sage@newdream.net>
Greg Farnum [Fri, 23 Dec 2011 22:27:15 +0000 (14:27 -0800)]
osdmap: add const markers to some unfixed functions
Signed-off-by: Greg Farnum <gregory.farnum@dreamhost.com>
Yehuda Sadeh [Thu, 29 Dec 2011 01:00:19 +0000 (17:00 -0800)]
rgw: removing swift user index when removing user
Yehuda Sadeh [Thu, 29 Dec 2011 00:50:36 +0000 (16:50 -0800)]
rgw-admin: remove subuser index when required
Yehuda Sadeh [Thu, 29 Dec 2011 00:34:03 +0000 (16:34 -0800)]
rgw: clone operation should only update index for main category
Yehuda Sadeh [Thu, 29 Dec 2011 00:33:14 +0000 (16:33 -0800)]
rgw: fix cache interface (was not overloading method)
Yehuda Sadeh [Wed, 28 Dec 2011 23:10:10 +0000 (15:10 -0800)]
rgw: fix bucket creation
Yehuda Sadeh [Fri, 23 Dec 2011 20:46:05 +0000 (12:46 -0800)]
rgw: write bucket info in one operation
Greg Farnum [Fri, 23 Dec 2011 17:56:42 +0000 (09:56 -0800)]
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>
Sage Weil [Thu, 22 Dec 2011 23:25:00 +0000 (15:25 -0800)]
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>
Samuel Just [Thu, 22 Dec 2011 23:17:22 +0000 (15:17 -0800)]
MOSDPGRepScrub: Fix typo in MOSDPGRepScrub
Signed-off-by: Samuel Just <samuel.just@dreamhost.com>
Sage Weil [Thu, 22 Dec 2011 22:00:23 +0000 (14:00 -0800)]
Merge branch 'wip-signal'
Samuel Just [Thu, 22 Dec 2011 20:33:48 +0000 (12:33 -0800)]
MOSDRepScrub: use header.version for payload version
Signed-off-by: Samuel Just <samuel.just@dreamhost.com>
Sage Weil [Thu, 22 Dec 2011 20:16:06 +0000 (12:16 -0800)]
Merge branch 'stable'
Henry C Chang [Thu, 22 Dec 2011 10:48:29 +0000 (18:48 +0800)]
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>
Henry C Chang [Thu, 22 Dec 2011 10:49:04 +0000 (18:49 +0800)]
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>
Henry C Chang [Thu, 22 Dec 2011 10:47:25 +0000 (18:47 +0800)]
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>
Sage Weil [Wed, 21 Dec 2011 22:21:37 +0000 (14:21 -0800)]
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>
Sage Weil [Wed, 21 Dec 2011 22:17:42 +0000 (14:17 -0800)]
mon: drop special SIGTERM handler
Default does exit(0).
Signed-off-by: Sage Weil <sage@newdream.net>
Sage Weil [Wed, 21 Dec 2011 22:17:19 +0000 (14:17 -0800)]
mds: drop special SIGTERM handler
Default does exit(0).
Signed-off-by: Sage Weil <sage@newdream.net>
Sage Weil [Wed, 21 Dec 2011 22:17:00 +0000 (14:17 -0800)]
exit(0) on SIGTERM by default
Signed-off-by: Sage Weil <sage@newdream.net>
Sage Weil [Wed, 21 Dec 2011 04:11:51 +0000 (20:11 -0800)]
Merge pull request #7 from kylemarsh/wip-obsync-swift-metadata
obsync: pull object metadata from swift store
Kyle Marsh [Wed, 21 Dec 2011 01:08:21 +0000 (17:08 -0800)]
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.
Yehuda Sadeh [Tue, 20 Dec 2011 19:39:32 +0000 (11:39 -0800)]
rgw: fix subuser key name when purging subuser keys
Yehuda Sadeh [Tue, 20 Dec 2011 19:00:39 +0000 (11:00 -0800)]
radosgw-admin: add --purge-keys option
Josh Durgin [Tue, 20 Dec 2011 02:03:14 +0000 (18:03 -0800)]
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>
Josh Durgin [Tue, 20 Dec 2011 02:00:16 +0000 (18:00 -0800)]
librados: make getxattrs ENOMEM return negative
This is more consistent with the rest of librados.
Signed-off-by: Josh Durgin <josh.durgin@dreamhost.com>
Yehuda Sadeh [Tue, 20 Dec 2011 00:00:27 +0000 (16:00 -0800)]
rgw: add timeout to init path
Samuel Just [Mon, 19 Dec 2011 22:50:17 +0000 (14:50 -0800)]
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>
Sage Weil [Mon, 19 Dec 2011 21:47:43 +0000 (13:47 -0800)]
mon: update man page to document --mkfs stuff
Signed-off-by: Sage Weil <sage@newdream.net>
Sage Weil [Wed, 30 Nov 2011 01:21:42 +0000 (17:21 -0800)]
mds: misc assertions about truncation
Signed-off-by: Sage Weil <sage@newdream.net>
Sage Weil [Wed, 30 Nov 2011 01:17:25 +0000 (17:17 -0800)]
osd: EINVAL on truncate to huge object size
Signed-off-by: Sage Weil <sage@newdream.net>
Sage Weil [Mon, 19 Dec 2011 22:00:59 +0000 (14:00 -0800)]
Merge pull request #6 from kylemarsh/wip-obsync-swift
Wip obsync swift
Yehuda Sadeh [Mon, 19 Dec 2011 21:54:04 +0000 (13:54 -0800)]
rgw: remove temp context in prepare_get_obj
Yehuda Sadeh [Mon, 19 Dec 2011 21:38:58 +0000 (13:38 -0800)]
rgw: fix xml parser internal structure leak
Yehuda Sadeh [Mon, 19 Dec 2011 21:38:40 +0000 (13:38 -0800)]
rgw: fix a leak of acl structure (in req_state)
Yehuda Sadeh [Mon, 19 Dec 2011 21:54:04 +0000 (13:54 -0800)]
rgw: remove temp context in prepare_get_obj
Yehuda Sadeh [Mon, 19 Dec 2011 21:38:58 +0000 (13:38 -0800)]
rgw: fix xml parser internal structure leak
Yehuda Sadeh [Mon, 19 Dec 2011 21:38:40 +0000 (13:38 -0800)]
rgw: fix a leak of acl structure (in req_state)
Greg Farnum [Mon, 19 Dec 2011 21:25:27 +0000 (13:25 -0800)]
Merge branch 'wip-osd-maybe-created'
Sage Weil [Mon, 19 Dec 2011 21:24:46 +0000 (13:24 -0800)]
Merge branch 'wip-osd-fsid'
Sage Weil [Mon, 19 Dec 2011 21:24:31 +0000 (13:24 -0800)]
doc: fix typo
Signed-off-by: Sage Weil <sage@newdream.net>
Sage Weil [Wed, 30 Nov 2011 22:13:47 +0000 (14:13 -0800)]
osd: --get-journal-fsid
Signed-off-by: Sage Weil <sage@newdream.net>
Sage Weil [Wed, 30 Nov 2011 22:13:14 +0000 (14:13 -0800)]
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>
Sage Weil [Wed, 30 Nov 2011 05:49:49 +0000 (21:49 -0800)]
filestore: make fsid uuid_d instead of uint64_t
Signed-off-by: Sage Weil <sage.weil@dreamhost.com>
Sage Weil [Wed, 30 Nov 2011 05:06:29 +0000 (21:06 -0800)]
osd: --get-osd-fsid and --get-cluster-fsid
Signed-off-by: Sage Weil <sage.weil@dreamhost.com>
Sage Weil [Wed, 30 Nov 2011 05:06:10 +0000 (21:06 -0800)]
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>
Sage Weil [Wed, 30 Nov 2011 05:05:20 +0000 (21:05 -0800)]
osd: include osd_fsid in OSDSuperblock
Generated during mkfs.
Signed-off-by: Sage Weil <sage.weil@dreamhost.com>
Sage Weil [Wed, 30 Nov 2011 04:46:42 +0000 (20:46 -0800)]
osd: rename OSDSuperblock::fsid -> cluster_fsid
Signed-off-by: Sage Weil <sage.weil@dreamhost.com>
Sage Weil [Mon, 19 Dec 2011 16:04:53 +0000 (08:04 -0800)]
doc: fix mon cluster expansion docs
Signed-off-by: Sage Weil <sage@newdream.net>
Sage Weil [Mon, 19 Dec 2011 16:03:59 +0000 (08:03 -0800)]
mon: pull addr from ceph.conf, mon_host as needed when joining mon cluster
Signed-off-by: Sage Weil <sage@newdream.net>
Sage Weil [Mon, 19 Dec 2011 15:57:45 +0000 (07:57 -0800)]
mon: fix setting of mon addr when joining a cluster
Signed-off-by: Sage Weil <sage@newdream.net>
Yehuda Sadeh [Sat, 17 Dec 2011 06:04:43 +0000 (22:04 -0800)]
rgw: fix updating of object metadata
being used in swift POST. We were updating wrong object
size and etag
Yehuda Sadeh [Sat, 17 Dec 2011 01:13:53 +0000 (17:13 -0800)]
rgw: bucket cannot be recreated if already exists
Wido den Hollander [Fri, 16 Dec 2011 21:01:05 +0000 (22:01 +0100)]
man: Update the configuration example for radosgw
Signed-off-by: Wido den Hollander <wido@widodh.nl>
Wido den Hollander [Fri, 16 Dec 2011 21:00:46 +0000 (22:00 +0100)]
man: It is capital -C instead of -c when for creating a new keyring
Signed-off-by: Wido den Hollander <wido@widodh.nl>
Yehuda Sadeh [Sat, 17 Dec 2011 06:04:43 +0000 (22:04 -0800)]
rgw: fix updating of object metadata
being used in swift POST. We were updating wrong object
size and etag
Yehuda Sadeh [Sat, 17 Dec 2011 01:13:53 +0000 (17:13 -0800)]
rgw: bucket cannot be recreated if already exists
Kyle Marsh [Sat, 17 Dec 2011 00:05:46 +0000 (16:05 -0800)]
obsync: add authurl to CLI
s3 connections require the hostname and swift connections require the
authurl. obsync treats these as equivalent internally, but breaks them
apart on the command line interface for clarity for the users.
Samuel Just [Fri, 16 Dec 2011 22:42:36 +0000 (14:42 -0800)]
object.h: initialize max in hobject_t(sobject_t) constructor
Signed-off-by: Samuel Just <samuel.just@dreamhost.com>
Samuel Just [Fri, 16 Dec 2011 19:30:46 +0000 (11:30 -0800)]
ReplicatedPG: fix handle_watch_timeout ctx->at_version
ctx->at_version should match the head of the new log entries
during issue_repop. This could cause the scrub hang bug as
last_update would be less than last_update_applied.
Signed-off-by: Samuel Just <samuel.just@dreamhost.com>
Samuel Just [Fri, 16 Dec 2011 19:22:58 +0000 (11:22 -0800)]
ReplicatedPG: add asserts to catch scrub error
If last_update_applied skipped over last_update, we would see
scrub hang.
Signed-off-by: Samuel Just <samuel.just@dreamhost.com>
Sage Weil [Fri, 16 Dec 2011 18:39:33 +0000 (10:39 -0800)]
doc: fix filename in mon addition process
Signed-off-by: Sage Weil <sage@newdream.net>
Sage Weil [Fri, 16 Dec 2011 17:19:59 +0000 (09:19 -0800)]
filejournal: preallocate journal bytes on create
This should reduce fragmentation for large journals that are written
slowly the first time around.
Signed-off-by: Sage Weil <sage@newdream.net>
Sage Weil [Fri, 16 Dec 2011 17:08:17 +0000 (09:08 -0800)]
Merge pull request #5 from homac/master
Minor fix for init files and cleaned up spec file. Please pull
Josh Durgin [Thu, 15 Dec 2011 22:03:00 +0000 (14:03 -0800)]
man: clarify mount.ceph auth options
Signed-off-by: Josh Durgin <josh.durgin@dreamhost.com>
Josh Durgin [Thu, 15 Dec 2011 21:49:10 +0000 (13:49 -0800)]
man: update rule definition for ceph-rbdnamer
This is the rule we install since
891025e539a92b5d75011e2e75c475fc0c272042 .
Signed-off-by: Josh Durgin <josh.durgin@dreamhost.com>
Josh Durgin [Thu, 15 Dec 2011 21:41:56 +0000 (13:41 -0800)]
authx -> cephx everywhere it's used
The term authx was in the mount.ceph man page, and got accidentally
copied into rbd help.
Signed-off-by: Josh Durgin <josh.durgin@dreamhost.com>
Holger Macht [Thu, 15 Dec 2011 16:51:04 +0000 (17:51 +0100)]
ceph.spec: Clean up and fix spec file and build for a couple of distributions
Clean up and fix the spec file. This includes cleaning up of build and
installed system dependencies, LSB compliance fixes, splitting up into
several sub-packages (lib*) and so on. It now builds fine for the
following distributions in the Open Build Service and should be
considered as a starting point for further fixes:
- CentOS 6
- Fedora 15
- RedHat Enterprise Linux 6
- openSUSE 11.4
- openSUSE 12.1
- openSUSE Factory
- SUSE Linux Enterprise 11 (SP1 and SP2)
Signed-off-by: Holger Macht <hmacht@suse.de>
Holger Macht [Thu, 15 Dec 2011 16:49:15 +0000 (17:49 +0100)]
init-ceph/init-radosgw: Don't use unspecified runlevel 4
Don't use runlevel 4 in init scripts. AFAIK, no distribution is using it
and at least the Open Build Service complains about it.
Signed-off-by: Holger Macht <hmacht@suse.de>
Sage Weil [Thu, 15 Dec 2011 01:43:18 +0000 (17:43 -0800)]
client: fix logger deregistration
Only unregister logger if it is non-NULL (and thus registered) to avoid
running afoul of the cct assertions.
Signed-off-by: Sage Weil <sage@newdream.net>
Kyle Marsh [Wed, 14 Dec 2011 23:37:47 +0000 (15:37 -0800)]
obsync: add vvprint back in
Commit
ebe5fc60d20f92a0037c53c1e7bd7ae512be3da4 removed the definition of
vvprint without removint all the places that used it.