Commit Graph

22848 Commits

Author SHA1 Message Date
Joao Eduardo Luis
bc6f726825 mon: PGMonitor: erase entries from 'creating_pgs_by_osd' when set is empty
This patch avoids sending empty MOSDPGCreate's every tick.

Fixes: #3571

Signed-off-by: Joao Eduardo Luis <joao.luis@inktank.com>
2012-12-07 04:16:15 -08:00
Joao Eduardo Luis
e1c27fe178 mon: Monitor: rework 'paxos' to a list instead of a vector
After adding the gv patches, during Monitor::recovered_leader() we started
waking up contexts following the order of the 'paxos' vector. However,
given that the mdsmon has a forgotten dependency on the osdmon paxos
machine, we were incurring in a situation in which we proposed a value
through the osdmon before creating a new pending value (but by being
active, the mdsmon would go through with it nonetheless).

This is easily fixed by making sure that the mdsmon callbacks are only
awaken *after* the osdmon has been taken care of.

Fixes: #3495

Signed-off-by: Joao Eduardo Luis <joao.luis@inktank.com>
2012-12-07 04:04:14 -08:00
Sage Weil
58f6798f3d Merge branch 'testing' into next 2012-12-07 04:00:22 -08:00
Samuel Just
27071f3bc2 OSD: store current pg epoch in info and load at that epoch
Prior to split, this did not matter.  With split, however, it's
crucial that a pg go through advance_pg() for the map causing
the split.  During operation, a PG lags the OSD superblock
epoch.  If the OSD dies after the OSD epoch passes the split
but before the pg epoch passes the split, the PG will be
reloaded at the OSD epoch and won't see the split operation.
The PG collection might after that point contain incorrect
objects which should have been split into a child.

Signed-off-by: Samuel Just <sam.just@inktank.com>
2012-12-06 22:53:07 -08:00
Samuel Just
9f169ac0f5 OSD: account for split in project_pg_history
split causes a new interval.

Signed-off-by: Samuel Just <sam.just@inktank.com>
2012-12-06 22:53:07 -08:00
Samuel Just
15d899370f PG: update info.last_update_started in split_into
Signed-off-by: Samuel Just <sam.just@inktank.com>
2012-12-06 22:53:07 -08:00
Samuel Just
338f3688b0 OSDMonitor: require --allow-experimental-feature to increase pg_num
Signed-off-by: Samuel Just <sam.just@inktank.com>
2012-12-06 22:53:06 -08:00
Samuel Just
fb738506f6 PG: set child up/acting in split_into
Signed-off-by: Samuel Just <sam.just@inktank.com>
2012-12-06 22:53:06 -08:00
Samuel Just
3f412e88fa OSD: do _remove_pg in add_newly_split_pg is pool if gone
Signed-off-by: Samuel Just <sam.just@inktank.com>
2012-12-06 22:52:54 -08:00
Samuel Just
19e6861daf osd/: dirty info and log on child during split
Otherwise, the log may not get written out.

Signed-off-by: Samuel Just <sam.just@inktank.com>
2012-12-06 22:51:56 -08:00
Samuel Just
9835e19015 osd/: mark info.stats as invalid after split, fix in scrub
Signed-off-by: Samuel Just <sam.just@inktank.com>
2012-12-06 22:51:56 -08:00
Samuel Just
5f8a3634c4 PG: split ops for child objects into child
Signed-off-by: Samuel Just <sam.just@inktank.com>
2012-12-06 22:51:56 -08:00
Samuel Just
9981bee565 OSD: add initial split support
PGs are split after updating to the map on which they split.
OSD::activate_map populates the set of currently "splitting"
pgs.  Messages for those pgs are delayed until the split
is complete.  We add the newly split children to pg_map
once the transaction populating their on-disk state completes.

Signed-off-by: Samuel Just <sam.just@inktank.com>
2012-12-06 22:51:52 -08:00
Samuel Just
58890cfad5 librados: watch() should set the WRITE flag on the op
This caused a bug where the watch operation bypassed the is_degraded()
check in the write path and the repop got sent to the replica where the
replica crashed due to the is_missing() assert in sub_op_modify.

Signed-off-by: Samuel Just <sam.just@inktank.com>
Reviewed-by: Josh Durgin <josh.durgin@inktank.com>
2012-12-06 16:56:41 -08:00
Samuel Just
f2914af52e HashIndex: fix list_by_hash handling of next->is_max()
get_path_str() should not handle hobject_t::get_max().  get_path_str()
now asserts that the passed object is not max and the callers now check
for is_max().  This caused HashIndex.cc to incorrectly scan an entire
collection before returning no objects rather than scanning the top
level and returning no objects.  It did not actually list_by_hash to
return an incorrect answer, however.

Signed-off-by: Samuel Just <sam.just@inktank.com>
Reviewed-by: Josh Durgin <josh.durgin@inktank.com>
2012-12-06 16:56:25 -08:00
Dan Mick
0c01094972 rbd: remove block-by-block messages when exporting
Signed-off-by: Dan Mick <dan.mick@inktank.com>
2012-12-06 15:58:19 -08:00
Josh Durgin
ca1a4db457 release: add note about 'ceph osd create' syntax
Signed-off-by: Josh Durgin <josh.durgin@inktank.com>
2012-12-06 12:25:39 -08:00
Sam Lang
214c7a1705 client: Allow cap release timeout to be configured
The delay for releasing an inode's capability is
hardcoded to 5 seconds.  This patch takes the timeout
value from a config parameter, which defaults presently
to 5 seconds.

Signed-off-by: Sam Lang <sam.lang@inktank.com>
2012-12-06 05:30:17 -08:00
Sage Weil
0a137d76bd mkcephfs: fix fs_type assignment typo
Reported-by: Matthew Via <via@matthewvia.info>
Signed-off-by: Sage Weil <sage@inktank.com>
2012-12-06 05:27:41 -08:00
Sage Weil
4c31598e0a upstart: fix radosgw upstart job
Signed-off-by: Sage Weil <sage@inktank.com>
2012-12-06 05:26:11 -08:00
Sage Weil
47266cdaec upstart: rename ceph -> ceph-all
This avoids a conflict with the sysvinit job.

Signed-off-by: Sage Weil <sage@inktank.com>
2012-12-06 05:26:01 -08:00
Dan Mick
3e98d1af4d Merge branch 'testing' into next 2012-12-05 18:18:41 -08:00
Dan Mick
b7b724299e rbd: update manpage for import/export
Signed-off-by: Dan Mick <dan.mick@inktank.com>
2012-12-05 18:17:35 -08:00
Dan Mick
e9653f27de librbd: hold AioCompletion lock while modifying global state
C_AioRead::finish needs to add in each chunk of a partial read
request to the 'partial' map in the AioCompletion's state
(in destriper, of type StripedReadResult).  That map is global
and must be protected from simultaneous access.  Use the
AioCompletion lock; could create a separate lock if contention is an
issue.

Fixes: #3567
Signed-off-by: Dan Mick <dan.mick@inktank.com>
(cherry picked from commit a55700cc0a)
2012-12-05 17:38:05 -08:00
Dan Mick
b2ccf11d3a librbd: handle parent change while async I/Os are in flight
During a test_librbd_fsx run including flatten, ImageCtx->parent
was being dereferenced while null.  Between the time the parent
overlap is calculated and the time the guard+write completes
with ENOENT and submits the copyup+write, the parent image
could have changed (by resize) or been made irrelevant (by
child flatten) such that the parent overlap is now incorrect.

Handle "no parent" by just sending the copyup+write; the copyup
part will be a no-op.  Move to WRITE_FLAT state in this case
because there's no more child to deal with.

Handle "overlap changed" by recalculating overlap before
reading parent data; if none is left, don't read, but rather
just clear m_object_image_extents, in which case the copyup
will again be a no-op because it will be of zero length.
However we still have a parent, so stay in WRITE_COPYUP state
and come back through as usual.

Signed-off-by: Dan Mick <dan.mick@inktank.com>
Fixes: #3524
(cherry picked from commit 41e16a3b40)
2012-12-05 17:38:05 -08:00
Dan Mick
64ecc87057 Striper: use local variable inside if() that tested it
Signed-off-by: Dan Mick <dan.mick@inktank.com>
(cherry picked from commit 917a6f2963)
2012-12-05 17:38:05 -08:00
Dan Mick
a55700cc0a librbd: hold AioCompletion lock while modifying global state
C_AioRead::finish needs to add in each chunk of a partial read
request to the 'partial' map in the AioCompletion's state
(in destriper, of type StripedReadResult).  That map is global
and must be protected from simultaneous access.  Use the
AioCompletion lock; could create a separate lock if contention is an
issue.

Fixes: #3567
Signed-off-by: Dan Mick <dan.mick@inktank.com>
2012-12-05 17:05:18 -08:00
Dan Mick
41e16a3b40 librbd: handle parent change while async I/Os are in flight
During a test_librbd_fsx run including flatten, ImageCtx->parent
was being dereferenced while null.  Between the time the parent
overlap is calculated and the time the guard+write completes
with ENOENT and submits the copyup+write, the parent image
could have changed (by resize) or been made irrelevant (by
child flatten) such that the parent overlap is now incorrect.

Handle "no parent" by just sending the copyup+write; the copyup
part will be a no-op.  Move to WRITE_FLAT state in this case
because there's no more child to deal with.

Handle "overlap changed" by recalculating overlap before
reading parent data; if none is left, don't read, but rather
just clear m_object_image_extents, in which case the copyup
will again be a no-op because it will be of zero length.
However we still have a parent, so stay in WRITE_COPYUP state
and come back through as usual.

Signed-off-by: Dan Mick <dan.mick@inktank.com>
Fixes: #3524
2012-12-05 17:05:18 -08:00
Dan Mick
917a6f2963 Striper: use local variable inside if() that tested it
Signed-off-by: Dan Mick <dan.mick@inktank.com>
2012-12-05 17:05:18 -08:00
Josh Durgin
2a5549cc0c qa: add script for running xfstests in a vm
Signed-off-by: Josh Durgin <josh.durgin@inktank.com>
2012-12-05 15:54:49 -08:00
Samuel Just
993ff14357 PG: add split_into to populate child members
Signed-off-by: Samuel Just <sam.just@inktank.com>
2012-12-05 11:34:19 -08:00
Samuel Just
6e67a27f89 osd/: splitting a pg now triggers a new interval
Signed-off-by: Samuel Just <sam.just@inktank.com>
2012-12-05 11:34:18 -08:00
Samuel Just
36c0fd220e PrioritizedQueue: allow caller to get items removed by removed_by_filter
Signed-off-by: Samuel Just <sam.just@inktank.com>
2012-12-05 11:34:18 -08:00
Samuel Just
b6c49b484a mon/OSDMonitor: enable split in Monitor
Signed-off-by: Samuel Just <sam.just@inktank.com>
2012-12-05 11:34:18 -08:00
Samuel Just
b8a37fdf6c PGMonitor,OSD: don't send creates on split
Splits will be handled when the map update effecting the split is
processed for the splitting pg on each OSD.  This will mesh
with the pg history which will place the new pg at the current
positions of the splitting pg.

Signed-off-by: Samuel Just <sam.just@inktank.com>
2012-12-05 11:34:18 -08:00
Samuel Just
f4f6bd7f53 OSD: dispatch_context only discard transaction if contexts empty
Signed-off-by: Samuel Just <sam.just@inktank.com>
2012-12-05 11:34:18 -08:00
Samuel Just
fec47cad52 OSD: don't wait for superblock writes in handle_osd_map
Instead, pass the pinned maps into a Context and clear the
cache after the transaction is applied.

Signed-off-by: Samuel Just <sam.just@inktank.com>
2012-12-05 11:34:18 -08:00
Samuel Just
fdc5e5d187 os/: Add CollectionIndex::prep_delete
If an unlink is interupted between removing the file
and updating the subdir attribute, the attribute will
overestimate the number of files in the directory.  This
is by design, at worst we will merge the collection later
than intended, but closing the gap would require a second
subdir xattr update.  However, this can in extreme cases
result in a collection with subdirectories but no objects.
FileStore::_destry_collection would therefore see an
erroneous -ENOTEMPTY.

prep_delete allows the CollectionIndex implementation to
clean up state prior to removal.

Signed-off-by: Samuel Just <sam.just@inktank.com>
2012-12-05 11:34:18 -08:00
Samuel Just
a48dee547c os/: Add failure CollectionIndex failure injection
Several pieces of HashIndex involve multi-step operations
which are sensitive to OSD crashes.  This patch introduces
failure injection to force retries from various points in
the LFNIndex helper methods to be used with store_test.cc.

Signed-off-by: Samuel Just <sam.just@inktank.com>
2012-12-05 11:34:18 -08:00
Samuel Just
bd46386353 test/store_test: add simple tests for collection_split
Signed-off-by: Samuel Just <sam.just@inktank.com>
2012-12-05 11:34:18 -08:00
Samuel Just
f2a23916d4 os/: add filestore collection_split
Signed-off-by: Samuel Just <sam.just@inktank.com>
2012-12-05 11:34:18 -08:00
Samuel Just
a83d13a3b7 OSD: ignore queries on now deleted pools
Signed-off-by: Samuel Just <sam.just@inktank.com>
Reviewed-by: Josh Durgin <josh.durgin@inktank.com>
2012-12-05 11:33:26 -08:00
Greg Farnum
4cdc30b943 Merge remote-tracking branch 'origin/wip-mds' into next
Reviewed-by: Sage Weil <sage@inktank.com>
Reviewed-by: Greg Farnum <greg@inktank.com>
2012-12-04 16:48:19 -08:00
Sage Weil
3ef741ac2d Merge branch 'wip-filestore' into next
Reviewed-by: Sam Just <sam.just@inktank.com>
2012-12-04 15:05:18 -08:00
Sage Weil
f3bd3564fa Merge branch 'wip-msgr-delay-queue' into next 2012-12-04 14:52:22 -08:00
Yan, Zheng
727c37a712 mds: journal remote inode's projected parent
Server::_rename_prepare() adds remote inode's parent instead of
projected parent to the journal. So during journal replay, the
journal entry for the rename operation will wrongly revert the
remote inode's projected rename. This issue can be reproduced by:

 touch file1
 ln file1 file2
 rm file1
 mv file2 file3

After journal replay, file1 reappears and directory's fragstat
gets corrupted.

Signed-off-by: Yan, Zheng <zheng.z.yan@intel.com>
2012-12-04 14:50:14 -08:00
Yan, Zheng
3f69f7290d mds: don't create bloom filter for incomplete dir
Creating bloom filter for incomplete dir that was added by log
replay will confuse subsequent dir lookup and can create null
dentry for existing file. The erroneous null dentry confuses the
fragstat accounting and causes undeletable empty directory.

The fix is check if the dir is complete before creating the bloom
filter. For the MDCache::trim_non_auth{,_subtree} cases, just do
not call CDir::add_to_bloom because bloom filter is useless for
replica.

Signed-off-by: Yan, Zheng <zheng.z.yan@intel.com>
2012-12-04 14:50:11 -08:00
Samuel Just
0756052cff PG: remove last_epoch_started asserts in proc_primary_info
These asserts are valid for a uniform cluster, but they won't hold
for a replica running a version without the info.last_epoch_started
patch.

Signed-off-by: Samuel Just <sam.just@inktank.com>
Reviewed-by: Greg Farnum <greg@inktank.com>
2012-12-04 11:41:05 -08:00
Yan, Zheng
2ba9c870b0 mds: journal remote inode's projected parent
Server::_rename_prepare() adds remote inode's parent instead of
projected parent to the journal. So during journal replay, the
journal entry for the rename operation will wrongly revert the
remote inode's projected rename. This issue can be reproduced by:

 touch file1
 ln file1 file2
 rm file1
 mv file2 file3

After journal replay, file1 reappears and directory's fragstat
gets corrupted.

Signed-off-by: Yan, Zheng <zheng.z.yan@intel.com>
2012-12-04 05:35:03 -08:00
Yan, Zheng
8cd8f2504a mds: don't create bloom filter for incomplete dir
Creating bloom filter for incomplete dir that was added by log
replay will confuse subsequent dir lookup and can create null
dentry for existing file. The erroneous null dentry confuses the
fragstat accounting and causes undeletable empty directory.

The fix is check if the dir is complete before creating the bloom
filter. For the MDCache::trim_non_auth{,_subtree} cases, just do
not call CDir::add_to_bloom because bloom filter is useless for
replica.

Signed-off-by: Yan, Zheng <zheng.z.yan@intel.com>
2012-12-04 05:29:13 -08:00