]>
git.apps.os.sepia.ceph.com Git - ceph.git/log
Sage Weil [Wed, 18 May 2011 01:26:46 +0000 (18:26 -0700)]
page: redefine PAGE_* macros
Saw this on sid i386:
msg/SimpleMessenger.cc: In function 'void alloc_aligned_buffer(ceph::bufferlist&
, int, int)':
msg/SimpleMessenger.cc:1782:14: error: '__sysconf' was not declared in this scop
e
msg/SimpleMessenger.cc:1789:23: error: '__sysconf' was not declared in this scop
Some header is clobbering out PAGE_* macros. Make our header more
forceful.
Signed-off-by: Sage Weil <sage@newdream.net>
Sage Weil [Wed, 18 May 2011 01:46:38 +0000 (18:46 -0700)]
osd: add --mkkey mkfs option
Optionally generate a new key as part of the mkfs step. This makes life
a bit easier for the admin.
Signed-off-by: Sage Weil <sage.weil@dreamhost.com>
Sage Weil [Wed, 18 May 2011 01:32:03 +0000 (18:32 -0700)]
mon: 'auth caps <name> [svc value [svc2 value2 [...]]]'
Avoid having to futz with cauthtool if possible.
Signed-off-by: Sage Weil <sage.weil@dreamhost.com>
Josh Durgin [Wed, 18 May 2011 00:36:39 +0000 (17:36 -0700)]
PG: update same_acting_since when acting or up changes
This is a hack since we currently use same_up_since to denote the beginning of an interval.
We should probably change this usaged or rename it to same_interval since.
Signed-off-by: Josh Durgin <josh.durgin@dreamhost.com>
Sage Weil [Wed, 18 May 2011 00:27:39 +0000 (17:27 -0700)]
crush: allow - and _ in crushmap type/item names
Signed-off-by: Sage Weil <sage.weil@dreamhost.com>
Sage Weil [Wed, 18 May 2011 00:27:16 +0000 (17:27 -0700)]
crushtool: strip leading spaces from identifiers
No idea where these are coming from! Weird.
Signed-off-by: Sage Weil <sage.weil@dreamhost.com>
Sage Weil [Tue, 17 May 2011 17:10:45 +0000 (10:10 -0700)]
msgr: avoid clearing connection_state on pipe replacement
read_message and write_message both dereference connection-state, so avoid
clearing it when replacing a pipe.
read_message still uses it to find rx_buffers in ways that may interfere
when two Pipes reference the connection, but currently that is only used
for lossy pipes. We could still take pipe_lock in that case, but it is
only an optimization (we copy the data if the buffers don't get used
directly) and probably not worth bothering with.
Signed-off-by: Sage Weil <sage@newdream.net>
Sage Weil [Tue, 17 May 2011 21:25:47 +0000 (14:25 -0700)]
ceph.spec.in: add obsync
Signed-off-by: Sage Weil <sage@newdream.net>
Sage Weil [Mon, 16 May 2011 21:28:33 +0000 (14:28 -0700)]
debian: obsync
Signed-off-by: Sage Weil <sage@newdream.net>
Sage Weil [Mon, 16 May 2011 21:28:28 +0000 (14:28 -0700)]
obsync: no .py
Signed-off-by: Sage Weil <sage@newdream.net>
Samuel Just [Wed, 11 May 2011 18:56:34 +0000 (11:56 -0700)]
PG: Replicas send Notifies in response to queries
Replicas only send Infos during activate.
Signed-off-by: Samuel Just <samuel.just@dreamhost.com>
Samuel Just [Wed, 11 May 2011 20:50:20 +0000 (13:50 -0700)]
PG: choose_log_location, fix error when scanning up set
++up.begin() does not skip the primary. Primary might not be up[0].
Signed-off-by: Samuel Just <samuel.just@dreamhost.com>
Samuel Just [Tue, 17 May 2011 16:57:09 +0000 (09:57 -0700)]
PG: PG can receive a log in WaitActingChange requested in GetLog
Discard logs requested during GetLog once we are in WaitActingChange.
Signed-off-by: Samuel Just <samuel.just@dreamhost.com>
Samuel Just [Mon, 16 May 2011 23:24:02 +0000 (16:24 -0700)]
PG: Don't use exit to call proc_master_log
exit is also invoked when transitioning to Reset...
Signed-off-by: Samuel Just <samuel.just@dreamhost.com>
Sage Weil [Mon, 16 May 2011 20:42:31 +0000 (13:42 -0700)]
mon: health WARN if monitor quorum is incomplete
Signed-off-by: Sage Weil <sage@newdream.net>
root [Sun, 15 May 2011 13:54:13 +0000 (08:54 -0500)]
fix segfault introduced by commit
de640d85fa3e0e5e5a31704eab5a8714a1ffe867
That commit introduces the line 'cur_con->put()' which has the possibility
of being called while cur_con is not initialized.
Sage Weil [Fri, 13 May 2011 20:01:52 +0000 (13:01 -0700)]
osd: lazily close connections to down peers
If we hear from a peer that should be dead, tell them, but mark our
connection so that it will close after that message is delivered or if
it encounters any errors.
Signed-off-by: Sage Weil <sage.weil@dreamhost.com>
Sage Weil [Fri, 13 May 2011 20:01:08 +0000 (13:01 -0700)]
msgr: mark_down_on_empty and mark_disposable
Mark a connection to close when messages are sent, and to close on any
error. We can use this to tell people who should be dead that they should
be dead, but not waste resources reconnecting to them.
Signed-off-by: Sage Weil <sage.weil@dreamhost.com>
Sage Weil [Sat, 14 May 2011 20:46:09 +0000 (13:46 -0700)]
PG: Remove downed osds from peer_missing and peer_info
Signed-off-by: Samuel Just <samuel.just@dreamhost.com>
Signed-off-by: Sage Weil <sage.weil@dreamhost.com>
Samuel Just [Sat, 14 May 2011 00:30:50 +0000 (17:30 -0700)]
PG: Only pull the master log from a member of the prior_set
There must be a member of the prior_set such that no other
osd has a more recent last_update. This way, prior_set_affected
will ensure that we reset peering if the master log source
goes down.
Signed-off-by: Samuel Just <samuel.just@dreamhost.com>
Samuel Just [Fri, 13 May 2011 21:07:05 +0000 (14:07 -0700)]
PG: search_for_missing takes the other osd's missing set
Previously, search_for_missing was erroneously passed the
primary's missing in a few places.
Signed-off-by: Samuel Just <samuel.just@dreamhost.com>
Sage Weil [Fri, 13 May 2011 20:13:21 +0000 (13:13 -0700)]
radosgw_admin: fix clitest
Signed-off-by: Sage Weil <sage.weil@dreamhost.com>
Sage Weil [Thu, 12 May 2011 18:01:06 +0000 (11:01 -0700)]
radosgw_admin: dump log by object
instead of only by date+bucket.
Signed-off-by: Sage Weil <sage.weil@dreamhost.com>
Colin Patrick McCabe [Thu, 12 May 2011 00:27:10 +0000 (17:27 -0700)]
rgw: in S3 PUT, don't crash on Content-Length == 0
Signed-off-by: Colin McCabe <colin.mccabe@dreamhost.com>
Brian Chrisman [Tue, 10 May 2011 19:38:49 +0000 (12:38 -0700)]
expand testceph to check xattrs
Signed-off-by: Brian Chrisman <brchrisman@gmail.com>
Brian Chrisman [Wed, 11 May 2011 17:28:42 +0000 (10:28 -0700)]
client: support security. namespace
Signed-off-by: Brian Chrisman <brchrisman@gmail.com>
Brian Chrisman [Wed, 11 May 2011 17:27:50 +0000 (10:27 -0700)]
support for xattrs in libceph
Signed-off-by: Brian Chrisman <brchrisman@gmail.com>
Sage Weil [Wed, 11 May 2011 04:30:52 +0000 (21:30 -0700)]
monclient: fix crash on shutdown
cur_con may be null on shutdown.
Signed-off-by: Sage Weil <sage.weil@dreamhost.com>
Sage Weil [Tue, 10 May 2011 23:54:23 +0000 (16:54 -0700)]
monclient: maintain explicit session connection; ignore stray messages
Maintain an explicit Connection handle to send messages and mark_down old
monitor connections. Ignore any incoming message that is not part of that
session. This fixes problems with incoming messages that race with
session restarts.
Fixes: #1033
Reported-by: Wido den Hollander <wido@widodh.nl>
Signed-off-by: Sage Weil <sage@newdream.net>
Sage Weil [Tue, 10 May 2011 22:23:26 +0000 (15:23 -0700)]
librados: don't crash if we call connect twice
Fixes: #1034
Reported-by: Wido den Hollander <wido@widodh.nl>
Signed-off-by: Sage Weil <sage@newdream.net>
Sage Weil [Tue, 10 May 2011 21:33:30 +0000 (14:33 -0700)]
Merge remote branch 'origin/stable'
Colin Patrick McCabe [Tue, 10 May 2011 18:14:39 +0000 (11:14 -0700)]
rados_sync: implement --delete-after, fix bugs
Implement --delete-after for both export and import.
Fix DIR* leaks.
Signed-off-by: Colin McCabe <colin.mccabe@dreamhost.com>
Colin Patrick McCabe [Mon, 9 May 2011 23:18:48 +0000 (16:18 -0700)]
Allow dashes in ceph_argparse, etc.
Signed-off-by: Colin McCabe <colin.mccabe@dreamhost.com>
Colin Patrick McCabe [Mon, 9 May 2011 23:09:50 +0000 (16:09 -0700)]
test_rados_sync: test --force
Signed-off-by: Colin McCabe <colin.mccabe@dreamhost.com>
Colin Patrick McCabe [Mon, 9 May 2011 15:16:03 +0000 (08:16 -0700)]
rados_sync: support --force
Support --force, which re-copies all objects all the time.
Signed-off-by: Colin McCabe <colin.mccabe@dreamhost.com>
Sage Weil [Tue, 10 May 2011 15:22:34 +0000 (08:22 -0700)]
osd: initialize oi.oloc if on-disk value is bogus
If the on-disk locator is undefined (upgrade of an old cluster?) initialize
the oloc fields based on the PG::Info.
Reported-by: ar Fred <ar.fred@yahoo.com>
Tested-by: ar Fred <ar.fred@yahoo.com>
Signed-off-by: Sage Weil <sage.weil@dreamhost.com>
Yehuda Sadeh [Tue, 10 May 2011 12:15:15 +0000 (05:15 -0700)]
rgw: switch bucket creation operations
First we create the pool, then we create the bucket object. This
should have the effect of making the bucket creation sync.
Sage Weil [Mon, 9 May 2011 22:56:20 +0000 (15:56 -0700)]
osd: rename Pending -> WaitActingChange
We only use the Pending state while waiting for the acting set to change.
Rename the state and log it appropriately so we can see how much time the
OSD is spending doing this.
Signed-off-by: Sage Weil <sage.weil@dreamhost.com>
Sage Weil [Mon, 9 May 2011 22:55:38 +0000 (15:55 -0700)]
osd: log debug output for Crashed state
Signed-off-by: Sage Weil <sage.weil@dreamhost.com>
Sage Weil [Mon, 9 May 2011 22:50:28 +0000 (15:50 -0700)]
osd: wait for up_thru updates
Before the primary can go active we need to wait for the up_thru in the
osdmap to reflect that we were alive during the current interval. This got
lost in the translation to the new state machine.
Add a new state WaitUpThru between GetMissing and Active, so that we can
continue doing the work of peering and finding unfound objects while we
are waiting for the osdmap to update. Request said update early (in
GetInfo).
Signed-off-by: Sage Weil <sage.weil@dreamhost.com>
Sage Weil [Mon, 9 May 2011 22:37:28 +0000 (15:37 -0700)]
osd: fix pollution of peer_info
The ++ postfix has no effect here! We really want +1.
Signed-off-by: Sage Weil <sage.weil@dreamhost.com>
Sage Weil [Mon, 9 May 2011 22:36:39 +0000 (15:36 -0700)]
osd: fix osd$foo typos
Signed-off-by: Sage Weil <sage.weil@dreamhost.com>
Sage Weil [Sat, 7 May 2011 20:22:06 +0000 (13:22 -0700)]
osd: simplify build_might_have_unfound
Signed-off-by: Sage Weil <sage.weil@dreamhost.com>
Sage Weil [Sat, 7 May 2011 20:21:34 +0000 (13:21 -0700)]
osd: reset last_complete on mark_all_unfound_as_lost if no more missing
If we marked _all_ missing as lost, reset last_complete, since missing is
now empty!
Signed-off-by: Sage Weil <sage.weil@dreamhost.com>
Sage Weil [Sat, 7 May 2011 20:10:28 +0000 (13:10 -0700)]
osd: drop bad warning
The stats won't match reality if there are any missing or if there are any
snapped objects.
Signed-off-by: Sage Weil <sage.weil@dreamhost.com>
Colin Patrick McCabe [Mon, 9 May 2011 15:02:25 +0000 (08:02 -0700)]
rados tool: remove import/export
rados_sync replaces rados import / rados export
Signed-off-by: Colin McCabe <colin.mccabe@dreamhost.com>
Sage Weil [Sat, 7 May 2011 19:56:09 +0000 (12:56 -0700)]
.gitignore: rados_sync
Signed-off-by: Sage Weil <sage.weil@dreamhost.com>
Sage Weil [Sat, 7 May 2011 04:59:59 +0000 (21:59 -0700)]
osd: reassert our assert definition after including boostchart
Signed-off-by: Sage Weil <sage.weil@dreamhost.com>
Sage Weil [Sat, 7 May 2011 04:59:41 +0000 (21:59 -0700)]
assert: make our assert clobber any others too
Two can play this game, /usr/include/assert.h!
Signed-off-by: Sage Weil <sage.weil@dreamhost.com>
Yehuda Sadeh [Sat, 7 May 2011 05:10:21 +0000 (22:10 -0700)]
osd: fix compilation for some g++ versions
wasn't compiling on lenny, g++ ver 4.3.2. Might be that
it's also due to differebt boost version.
Yehuda Sadeh [Sat, 7 May 2011 04:42:01 +0000 (21:42 -0700)]
rgw: minor cleanup
Yehuda Sadeh [Sat, 7 May 2011 04:32:43 +0000 (21:32 -0700)]
rgw: opening bucket io ctx stats bucket info if failed
this should trigger request of a new osdmap if we were racing
with bucket creation.
Colin Patrick McCabe [Sat, 7 May 2011 00:43:10 +0000 (17:43 -0700)]
Merge branch 'wip-rados-sync'
Colin Patrick McCabe [Sat, 7 May 2011 00:42:23 +0000 (17:42 -0700)]
test_rados_sync: check that second sync does nada
Signed-off-by: Colin McCabe <colin.mccabe@dreamhost.com>
Colin Patrick McCabe [Sat, 7 May 2011 00:33:07 +0000 (17:33 -0700)]
rados_sync: more fixes
* separate BackedUpObject::from_path and BackedUpObject::from_file.
* librados functions return negative values on error, but most may
return positive values on success, even things like setxattr.
* implement read_xattrs_from_rados
* change rados_sync printout a bit
* fix up test_rados_sync xattr tests
Signed-off-by: Colin McCabe <colin.mccabe@dreamhost.com>
Sage Weil [Fri, 6 May 2011 23:50:36 +0000 (16:50 -0700)]
osd: warn when obc locator doesn't match ops
This will hopefully help us track down #1028.
Signed-off-by: Sage Weil <sage@newdream.net>
Colin Patrick McCabe [Fri, 6 May 2011 23:41:28 +0000 (16:41 -0700)]
rados_sync: fix memory leak, other misc fixes
* Store BackedUpObject in auto_ptr to avoid memory leaks
* better comment for BackedUpObject::get_fs_path()
* xattrs: handle only_in_a list separately from diff list, since
librados complains if you call setxattr(foo) and there is already an
xattr foo.
* xattrs: add xattrs_to_str for debugging purposes
Signed-off-by: Colin McCabe <colin.mccabe@dreamhost.com>
Sage Weil [Fri, 6 May 2011 23:26:39 +0000 (16:26 -0700)]
osdmap: refactor mapping; don't assert on missing pool
We were asserting on a pg with a missing pool fed to pg_to_acting_osds
because raw_to_temp_osds called raw_pg_to_pg. Refactor to let us look up
the pool only once, and return gracefully instead of crashing.
Signed-off-by: Sage Weil <sage@newdream.net>
Colin Patrick McCabe [Fri, 6 May 2011 23:13:31 +0000 (16:13 -0700)]
test_rados_sync: test xattr preservation
test xattr preservation across import/export
Signed-off-by: Colin McCabe <colin.mccabe@dreamhost.com>
Colin Patrick McCabe [Fri, 6 May 2011 23:03:43 +0000 (16:03 -0700)]
test_rados_sync: add import/export test
Signed-off-by: Colin McCabe <colin.mccabe@dreamhost.com>
Colin Patrick McCabe [Fri, 6 May 2011 23:01:02 +0000 (16:01 -0700)]
rados_sync: complain if import src is inaccessible
Signed-off-by: Colin McCabe <colin.mccabe@dreamhost.com>
Colin Patrick McCabe [Fri, 6 May 2011 22:55:55 +0000 (15:55 -0700)]
rados_sync: fix --create for import
Fix import's pool creation faculty.
Signed-off-by: Colin McCabe <colin.mccabe@dreamhost.com>
Colin Patrick McCabe [Fri, 6 May 2011 22:55:42 +0000 (15:55 -0700)]
add test_rados_sync.sh
Signed-off-by: Colin McCabe <colin.mccabe@dreamhost.com>
Sage Weil [Fri, 6 May 2011 22:23:44 +0000 (15:23 -0700)]
client: map file stripes to acting osds
Old result was just wrong if any osds were down.
Signed-off-by: Sage Weil <sage@newdream.net>
Colin Patrick McCabe [Fri, 6 May 2011 22:18:02 +0000 (15:18 -0700)]
rados_sync: fix import a bit
Signed-off-by: Colin McCabe <colin.mccabe@dreamhost.com>
Colin Patrick McCabe [Fri, 6 May 2011 22:11:44 +0000 (15:11 -0700)]
rados_sync: nicer error formatting
Signed-off-by: Colin McCabe <colin.mccabe@dreamhost.com>
Sage Weil [Fri, 6 May 2011 21:57:06 +0000 (14:57 -0700)]
common: be a little less scary in our startup warning
- be less scary
- be helpful and tell them where to go
Signed-off-by: Sage Weil <sage@newdream.net>
Colin Patrick McCabe [Fri, 6 May 2011 21:47:43 +0000 (14:47 -0700)]
rados_sync: misc bugfixes
Avoid using a temporary c_str pointer when it goes out of scope.
Complain if XATTR_FULLNAME is empty, as well as missing.
Signed-off-by: Colin McCabe <colin.mccabe@dreamhost.com>
Colin Patrick McCabe [Fri, 6 May 2011 21:37:55 +0000 (14:37 -0700)]
rados_sync: nicer printouts
Signed-off-by: Colin McCabe <colin.mccabe@dreamhost.com>
Sage Weil [Fri, 6 May 2011 21:31:57 +0000 (14:31 -0700)]
man: mkcephfs: small fixes
Signed-off-by: Sage Weil <sage@newdream.net>
Colin Patrick McCabe [Fri, 6 May 2011 21:28:02 +0000 (14:28 -0700)]
rados_sync: do_export: fix diff'ing
Signed-off-by: Colin McCabe <colin.mccabe@dreamhost.com>
Colin Patrick McCabe [Fri, 6 May 2011 21:22:21 +0000 (14:22 -0700)]
rados_sync: more improvements to xattr_test
Signed-off-by: Colin McCabe <colin.mccabe@dreamhost.com>
Sage Weil [Fri, 6 May 2011 21:21:53 +0000 (14:21 -0700)]
mkcephfs.man: update man page
Not beautiful, but at least it's accurate.
Signed-off-by: Sage Weil <sage@newdream.net>
Colin Patrick McCabe [Fri, 6 May 2011 21:13:49 +0000 (14:13 -0700)]
rados_sync: Add xattr_test
Add xattr_test to test if the underlying filesystem supports xattrs
Fix BackedUpObject::get_fs_path a bit.
Signed-off-by: Colin McCabe <colin.mccabe@dreamhost.com>
Sage Weil [Fri, 6 May 2011 20:43:05 +0000 (13:43 -0700)]
Merge branch 'stable'
Sage Weil [Fri, 6 May 2011 20:42:23 +0000 (13:42 -0700)]
osd: used fixed size types for fiemap/mapext/sparseread encoding
The client expects <uint64_t,uint64_t>, so this breaks on any 32-bit osd.
Signed-off-by: Sage Weil <sage@newdream.net>
Sage Weil [Fri, 6 May 2011 20:15:32 +0000 (13:15 -0700)]
cfuse: don't -d
Signed-off-by: Sage Weil <sage@newdream.net>
Sage Weil [Fri, 6 May 2011 20:15:03 +0000 (13:15 -0700)]
mds: assert auth on journal_cow_dentry
We have no business doing cow (or journaling) non-auth dentries.
Signed-off-by: Sage Weil <sage@newdream.net>
Sage Weil [Fri, 6 May 2011 20:14:42 +0000 (13:14 -0700)]
mds: don't journal src when not auth on rename
If we aren't auth for the srcdn, don't put it in the journal, or else we'll
barf on journal replay.
This fixes a crash reproduced with
sudo mkdir mnt/foo
sudo touch mnt/foo/a
sudo ln mnt/foo/a mnt/foo/b
sudo rm mnt/foo/a
sudo mkdir mnt/bar
sudo touch mnt/bar/nothing
./ceph mds tell 0 export_dir /bar 1
sudo mv mnt/foo/b mnt/bar/b
+ mds restart.
Signed-off-by: Sage Weil <sage@newdream.net>
Josh Durgin [Fri, 6 May 2011 19:23:45 +0000 (12:23 -0700)]
PG: choose_acting needs the value of the osd, not its index
This caused two osds to keep flipping the acting set between [2] and
[0,2] when osd.0 was far behind and needed a backlog. This is visible
as toggling between peering and peering+degraded.
Signed-off-by: Josh Durgin <josh.durgin@dreamhost.com>
Colin Patrick McCabe [Fri, 6 May 2011 19:05:17 +0000 (12:05 -0700)]
Create rados_sync tool to back up rados pools
Signed-off-by: Colin McCabe <colin.mccabe@dreamhost.com>
Tommi Virtanen [Fri, 6 May 2011 18:10:16 +0000 (11:10 -0700)]
stop.sh: Avoid bashisms.
I have a habit of running "sh -x stop.sh" whenever it seems
to fail, and that runs it with dash, not bash. Since it
doesn't actually need the bashisms, remove them.
Signed-off-by: Tommi Virtanen <tommi.virtanen@dreamhost.com>
Tommi Virtanen [Fri, 6 May 2011 18:07:05 +0000 (11:07 -0700)]
stop.sh: Whitespace.
Signed-off-by: Tommi Virtanen <tommi.virtanen@dreamhost.com>
Sage Weil [Fri, 6 May 2011 16:26:59 +0000 (09:26 -0700)]
osd: fix include in cosd.cc too
Signed-off-by: Sage Weil <sage.weil@dreamhost.com>
Sage Weil [Fri, 6 May 2011 16:26:32 +0000 (09:26 -0700)]
osd: rearrange #includes to get our assert
Make sure we include boostchart headers before our common/assert.h so that
ours clobbers theirs. Otherwise the generic one will clobber ours and our
assert output won't get logged or be as pretty.
Signed-off-by: Sage Weil <sage.weil@dreamhost.com>
Sage Weil [Thu, 5 May 2011 23:27:20 +0000 (16:27 -0700)]
mon: fix multi-osd 'ceph in|out N..' operations
Signed-off-by: Sage Weil <sage.weil@dreamhost.com>
Colin Patrick McCabe [Thu, 5 May 2011 23:17:34 +0000 (16:17 -0700)]
ceph_argparse: ignore dashes after equals sign
When parsing argv, ignore dashes after equals signs. This is so that
things like --log-file=/tmp/foo-file will work correctly.
Signed-off-by: Colin McCabe <colin.mccabe@dreamhost.com>
Sage Weil [Thu, 5 May 2011 23:17:21 +0000 (16:17 -0700)]
Merge branch 'wip_pg_refactor'
Josh Durgin [Thu, 5 May 2011 23:28:35 +0000 (16:28 -0700)]
PG: strays don't peer (only the primary does)
Signed-off-by: Josh Durgin <josh.durgin@dreamhost.com>
Josh Durgin [Thu, 5 May 2011 23:28:06 +0000 (16:28 -0700)]
PG: clear peering flag when we transition from Peering to Reset
This is safe because the only other transitions are to Pending (still
peering) and Active, which clears the state itself.
Signed-off-by: Josh Durgin <josh.durgin@dreamhost.com>
Sage Weil [Thu, 5 May 2011 23:17:17 +0000 (16:17 -0700)]
Merge branch 'stable'
Sage Weil [Thu, 5 May 2011 23:08:58 +0000 (16:08 -0700)]
osdmap: fix temp osd pg mapping
If you feed in a raw pg (full precision) you should get the same mapping
out as when you plug in the effective/reduced precision pg. The
raw_to_temp_osds() wasn't doing that, which gave you results like
flak:src 04:01 PM $ ./ceph pg map 0.4
2011-05-05 16:01:18.524051 mon <- [pg,map,0.4]
2011-05-05 16:01:18.524987 mon2 -> 'osdmap e11 pg 0.4 (0.4) -> up [1,0] acting [0]' (0)
flak:src 04:01 PM $ ./ceph pg map 0.7ed4
2011-05-05 16:01:21.755490 mon <- [pg,map,0.7ed4]
2011-05-05 16:01:21.755996 mon1 -> 'osdmap e11 pg 0.7ed4 (0.4) -> up [1,0] acting [1,0]' (0)
The objecter was feeding in raw pgs, so this was sending requests to the
wrong nodes.
Signed-off-by: Sage Weil <sage.weil@dreamhost.com>
Sage Weil [Thu, 5 May 2011 22:15:03 +0000 (15:15 -0700)]
mon: do not stop mds0 unless all other nodes have also stopped
If we are the root node or the tableserver, we have to shut down last.
(And even then, if we have client sessions, we can't fully shut down, we
can only kill ourselves!)
Fixes: #1048 (sorta)
Signed-off-by: Sage Weil <sage.weil@dreamhost.com>
Sage Weil [Thu, 5 May 2011 22:24:48 +0000 (15:24 -0700)]
Merge branch 'stable'
Conflicts:
src/mds/Resetter.cc
Greg Farnum [Thu, 5 May 2011 21:36:26 +0000 (14:36 -0700)]
PG: handle MOSDPGLog messages in Active state.
We previously didn't, but we definitely need to as we can go
active while waiting on strays to send in logs to recover missing
objects.
Signed-off-by: Greg Farnum <gregory.farnum@dreamhost.com>
Tommi Virtanen [Thu, 5 May 2011 21:07:02 +0000 (14:07 -0700)]
ceph_crypto: Fix ceph::crypto::init mutex for NSS.
Even after ceph::crypto::shutdown, the library looked
already initialized; this broke the ForkDeathTest.MD5
in "make check", and NSS-using daemons.
See
921d4b3d8b79485a6786f8ca75b2a96ea377da84 for more.
Signed-off-by: Tommi Virtanen <tommi.virtanen@dreamhost.com>
Sage Weil [Thu, 5 May 2011 20:42:20 +0000 (13:42 -0700)]
v0.27.1
Colin Patrick McCabe [Thu, 5 May 2011 20:38:13 +0000 (13:38 -0700)]
ceph::crypto::init: add PTHREAD_MUTEX_INITIALIZER
Signed-off-by: Colin McCabe <colin.mccabe@dreamhost.com>
Sage Weil [Thu, 5 May 2011 20:35:50 +0000 (13:35 -0700)]
mds: fix --reset-journal
Don't fork. (Already fixed in master branch by the start_with_nonce
refactor, so this is just for 0.27.1.)
Signed-off-by: Sage Weil <sage@newdream.net>
Colin Patrick McCabe [Thu, 5 May 2011 18:50:29 +0000 (11:50 -0700)]
obsync: remove misguided strip_owner
Signed-off-by: Colin McCabe <colin.mccabe@dreamhost.com>