Commit Graph

31586 Commits

Author SHA1 Message Date
Sage Weil
45a782ff56 Merge pull request #1255 from ceph/wip-cache-perf
osd: add perfcounters for new cache and agent events

Reviewed-by: Haomai Wang <haomaiwang@gmail.com>
2014-02-18 08:22:17 -08:00
Sage Weil
4bee6ff1bc osd/ReplicatedPG: clean up agent skip debug output
Signed-off-by: Sage Weil <sage@inktank.com>
2014-02-18 04:51:03 -08:00
Sage Weil
d1a185bd4b osd: l_osd_agent_{wake,skip,flush,evict}
Signed-off-by: Sage Weil <sage@inktank.com>
2014-02-18 04:51:03 -08:00
Sage Weil
dbec1096f4 osd: l_osd_tier_[dirty|clean]
Signed-off-by: Sage Weil <sage@inktank.com>
2014-02-18 04:51:03 -08:00
Sage Weil
150e87a163 osd: l_osd_tier_whiteout
Signed-off-by: Sage Weil <sage@inktank.com>
2014-02-18 04:51:03 -08:00
Sage Weil
2d5371ddaf osd: l_osd_tier_evict
Signed-off-by: Sage Weil <sage@inktank.com>
2014-02-18 04:51:02 -08:00
Sage Weil
c45a477efc osd: l_osd_tier_[try_]flush[_fail]
Signed-off-by: Sage Weil <sage@inktank.com>
2014-02-18 04:51:02 -08:00
Sage Weil
4b0a0a1023 osd: l_osd_copyfrom
Signed-off-by: Sage Weil <sage@inktank.com>
2014-02-18 04:51:02 -08:00
Sage Weil
e6a1122b04 osd: l_osd_tier_promote
Signed-off-by: Sage Weil <sage@inktank.com>
2014-02-17 16:26:33 -08:00
Yan, Zheng
5bc92ece56 Merge pull request #1128 from ceph/wip-dirfrags
Fixes for mds cluster + directory fragments
2014-02-18 07:15:58 +08:00
Sage Weil
093128a8b1 Merge pull request #1139 from ceph/wip-agent
osd: basic cache tier agent

Reviewed-by: Samuel Just <sam.just@inktank.com>
2014-02-17 14:14:21 -08:00
Sage Weil
bd8fcd2543 osd: improve whiteout debug prints
Signed-off-by: Sage Weil <sage@inktank.com>
2014-02-17 13:07:47 -08:00
Sage Weil
63f5a799aa osd/ReplicatedPG: make agent skip blocked obcs
Among other things, this can interfere with an in-flight copy-from and
corrupt the pg stats.

Signed-off-by: Sage Weil <sage@inktank.com>
2014-02-17 13:07:39 -08:00
Sage Weil
79976466ca ReplicatedBackend: print char ack_type as int
Signed-off-by: Sage Weil <sage@inktank.com>
2014-02-17 13:07:39 -08:00
Sage Weil
62532fb025 Merge pull request #1254 from ceph/wip-barrier
libcephfs: disable barriers for now
2014-02-17 11:09:09 -08:00
Sage Weil
a4ca4a7347 Merge remote-tracking branch 'gh/wip-7212-sage-b'
We should carefully backport some or all of this.

Backport: emperor, dumpling
Reviewed-by: Joao Eduardo Luis <joao.luis@inktank.com>
2014-02-17 11:07:55 -08:00
Sage Weil
a71d829e46 client: disable barrier support
The boost interval_set class is not available on centos6/rhel6.  Until that
dependency is sorted out, fix the build.

Signed-off-by: Sage Weil <sage@inktank.com>
2014-02-17 10:27:23 -08:00
Sage Weil
747002c6be client: fix barrier interval
(start, end) not (start, length)

Signed-off-by: Sage Weil <sage@inktank.com>
2014-02-17 10:23:37 -08:00
Sage Weil
d7457f7341 client/barrier: drop unused active_commit_interval
Signed-off-by: Sage Weil <sage@inktank.com>
2014-02-17 10:16:10 -08:00
Sage Weil
ce643e007a client: don't populate Client::barriers from read accesses
If the entry doesn't exist, no need to create it.

Signed-off-by: Sage Weil <sage@inktank.com>
2014-02-17 10:15:58 -08:00
Sage Weil
a1dbc9ceec qa/workunits/suites/pjd: use test suite with acl tweak
Test 45 in xacl/00.t fails on ext4 and cephfs.  Just disable it.
Everything else passes.

Signed-off-by: Sage Weil <sage@inktank.com>
2014-02-16 22:25:49 -08:00
Yan, Zheng
623748e54d mds: bump the protocol version
Signed-off-by: Yan, Zheng <zheng.z.yan@intel.com>
2014-02-17 13:23:02 +08:00
Sage Weil
2a19a1bebe osd/ReplicatedPG: allow is_degraded_object() to be called outside of backfil
The agent does this.

Signed-off-by: Sage Weil <sage@inktank.com>
2014-02-16 20:53:13 -08:00
Yan, Zheng
e5457dfbe2 mds: open sessions for rejoin imported caps
Signed-off-by: Yan, Zheng <zheng.z.yan@intel.com>
2014-02-17 09:37:52 +08:00
Yan, Zheng
c54b3ceaac mds: fix slave rename rollback
use rollback bufferlist to decide if the inode is being exported.

Signed-off-by: Yan, Zheng <zheng.z.yan@intel.com>
2014-02-17 09:37:51 +08:00
Yan, Zheng
9e8dbf9e3f mds: remove failed MDS from export bystanders list
make sure the importer does not wait for MExportDirNotifyAck from
the failed MDS

Signed-off-by: Yan, Zheng <zheng.z.yan@intel.com>
2014-02-17 09:37:51 +08:00
Yan, Zheng
21d209d024 mds: wake up dentry waiters when handling cache rejoin ack
Cache rejoin ack message may fragment dirfrag, we should set the
'replay' parameter of adjust_dir_fragments() to false in this case.
This makes sure that CDir::merge/split wake up any dentry waiter
in the fragmented dirfrag.

Signed-off-by: Yan, Zheng <zheng.z.yan@intel.com>
2014-02-17 09:37:51 +08:00
Yan, Zheng
74ef370b02 mds: fix negative rstat assertion
when gathering rstat for directory inode that is fragmented to
several dirfrags, inode's rstat may temporarily become nagtive.
This is because, when splitting dirfrag, delta rstat is always
added to the first new dirfrag.

Signed-off-by: Yan, Zheng <zheng.z.yan@intel.com>
2014-02-17 09:37:51 +08:00
Yan, Zheng
22535340b4 mds: avoid race between cache expire and pushing replicas
MDentryLink and MMDSFragmentNotify push replica inode/dirfrags
to other MDS. They both are racy because, when the target MDS
receives them, it may has expired the replicaed inode/dirfrags'
ancestor. The race creates unconnected replica inode/dirfrags,
unconnected replicas are problematic for subtree migration
because migrator sends MExportDirNotify according to subtree
dirfrag's replica list. MDS that contains unconnected replicas
may not receive MExportDirNotify.

The fix is, for MDentryLink and MMDSFragmentNotify messages
that may be received later, we avoid trimming their parent
replica objects. If null replica dentry is not readable, we
may receive a MDentryLink message later. If replica inode's
dirfragtreelock is not readable, it's likely some dirfrags
of the inode are being fragmented, we may receive a
MMDSFragmentNotify message later.

Signed-off-by: Yan, Zheng <zheng.z.yan@intel.com>
2014-02-17 09:37:51 +08:00
Yan, Zheng
cc77ef2d52 mds: fix scattered wrlock rejoin
If unstable scatter lock is encountered when handling weak cache
rejoin, don't remove the recovering MDS from the scatter lock's
gather list. The reason is the recovering MDS may hold rejoined
wrlock on the scatter lock. (Rejoined wrlocks were created when
handling strong cache rejoins from survivor MDS)

When composing cache rejoin ack, if the recovering MDS is in lock's
gather list, set lock state of the recovering MDS to a compatible
unstable stable.

Signed-off-by: Yan, Zheng <zheng.z.yan@intel.com>
2014-02-17 09:37:51 +08:00
Yan, Zheng
3b90c78540 mds: fixes for thrash fragment
This patch contains 3 changes:
- limit the number of in progress fragmenting processes.
- reduce the probability of splitting small dirfrag.
- process the merge_queue when thrash_fragments is enabled.

Signed-off-by: Yan, Zheng <zheng.z.yan@intel.com>
2014-02-17 09:37:51 +08:00
Yan, Zheng
5b1de69ac7 mds: force fragment subtree bounds when replaying ESubtreeMap
Signed-off-by: Yan, Zheng <zheng.z.yan@intel.com>
2014-02-17 09:37:51 +08:00
Yan, Zheng
4d5ceba531 mds: fix 'force dirfrags' during journal replay
For rename operation, null dentry is first replayed, it detaches
the inode from the FS hierarchy. Then primary dentry is replayed,
it updates the inode and re-attaches the inode to the FS hierarchy.
We may call CInode::force_dirfrag() when updating the inode. But
CInode::force_dirfrag() doesn't work well when inode is detached
from the FS hierarchy because adjusting fragments may also adjust
subtree map. The fix is don't detach the inode when replaying the
null dentry.

Signed-off-by: Yan, Zheng <zheng.z.yan@intel.com>
2014-02-17 09:37:51 +08:00
Yan, Zheng
f3666ededc mds: journal dirfragtree change
Introduce new flag DIRTYDFT to CDir and EMetaBlob::dirlump, the new
flag indicates the dirfrag is newly fragmented and the corresponding
dirfragtree change hasn't been propagate to the directory inode.

After fragmenting subtree dirfrags, make sure DIRTYDFT flag is set
on EMetaBlob::dirlump that correspond to the resulting dirfrags.
Journal replay code uses DIRTYDFT frag to decide if dirfragtree is
scattered dirty.

Signed-off-by: Yan, Zheng <zheng.z.yan@intel.com>
2014-02-17 09:37:51 +08:00
Yan, Zheng
ee7ac6fc66 mds: allow fragmenting subtree dirfrags
We can't wait until object becomes auth pinnable after freezing a
dirfrag/subtree, because it can cause deadlock. Current fragmenting
dirfrag code checks if the directory inode is auth pinnable, then
calls Locker::acquire_locks(). It avoids deadlock, but also forbids
fragmenting subtree dirfrags. We can get rid of the limitation by
using 'nonlocking auth pin' mode of Locker::acquire_locks().

Signed-off-by: Yan, Zheng <zheng.z.yan@intel.com>
2014-02-17 09:37:51 +08:00
Yan, Zheng
98105b2448 mds: preserve dir_auth when spliting/merging dirfrags
Signed-off-by: Yan, Zheng <zheng.z.yan@intel.com>
2014-02-17 09:37:51 +08:00
Yan, Zheng
3dc51dea31 mds: minor cleanup for EFragment and MMDSFragmentNotify
pass dirfrag_t to their constructors, instead of passing inode_t
and frag_t separately.

Signed-off-by: Yan, Zheng <zheng.z.yan@intel.com>
2014-02-17 09:37:51 +08:00
Yan, Zheng
9df6861b31 mds: freeze dir deadlock detection
freezing dir and freezing tree have the same deadlock cases.
This patch adds freeze dir deadlock detection, which imitates
commit ab93aa59 (mds: freeze tree deadlock detection)

Signed-off-by: Yan, Zheng <zheng.z.yan@intel.com>
2014-02-17 09:37:51 +08:00
Yan, Zheng
9a47913d20 mds: improve freeze tree deadlock detection
Current code uses the start time of freezing tree to detect deadlock.
It is better to check how long the auth pin count of freezing tree
stays unchanged to decide if there is potential deadlock.

Signed-off-by: Yan, Zheng <zheng.z.yan@intel.com>
2014-02-17 09:37:51 +08:00
Yan, Zheng
8079939534 mds: handle frag mismatch for cache expire
When sending MDSFragmentNotify to peers, also replicate the new
dirfrags. This guarantees peers get new replica nonces for the
new dirfrags. So it's safe to ignore mismatched/old dirfrags in
the cache expire message.

Signed-off-by: Yan, Zheng <zheng.z.yan@intel.com>
2014-02-17 09:37:51 +08:00
Yan, Zheng
305d16f3f6 mds: handle frag mismatch for cache rejoin weak
Signed-off-by: Yan, Zheng <zheng.z.yan@intel.com>
2014-02-17 09:37:51 +08:00
Yan, Zheng
0eb311d39c mds: fix open undef dirfrags
Undef inode may contain a undef dirfrag (*). When undef inode is
opened, we should force fragment the undef dirfrag (*). because
we may open other dirfrags later, the undef dirfrag (*) will
overlap with them.

Signed-off-by: Yan, Zheng <zheng.z.yan@intel.com>
2014-02-17 09:37:51 +08:00
Yan, Zheng
6e013cd675 mds: properly set COMPLETE flag when merging dirfrags
don't keep the COMPLETE flag when merging dirfrags during journal
replay, because it's inconvenience to check if the all dirfrags
under the 'basefrag' are in the cache and complete. One special case
is that newly created dirfrag get fragmented, then the fragment
operation get rolled back. The COMPLETE flag should be preserved in
this case because the dirfrag still doesn't exist on object store.

Signed-off-by: Yan, Zheng <zheng.z.yan@intel.com>
2014-02-17 09:37:51 +08:00
Yan, Zheng
ee0ab2b733 mds: fix CInode::get_dirfrags_under()
make the function work when opened dirfrags don't match the
dirfragtree.

Signed-off-by: Yan, Zheng <zheng.z.yan@intel.com>
2014-02-17 09:37:50 +08:00
Yan, Zheng
1080fa4571 mds: fix MDCache::adjust_subtree_after_rename()
process subtree dirfrags first, then process nested dirfrags. because
the code that processes nested dirfrags treats unprocessed subtree
dirfrags as child directories' dirfrags.

Signed-off-by: Yan, Zheng <zheng.z.yan@intel.com>
2014-02-17 09:37:50 +08:00
Yan, Zheng
e0e25658d6 mds: fix MDCache::get_force_dirfrag_bound_set()
don't force dir fragments according to the subtree bounds in resolve
message. The resolve message was not sent by the auth MDS of these
subtree bounds dirfrags.

Signed-off-by: Yan, Zheng <zheng.z.yan@intel.com>
2014-02-17 09:37:50 +08:00
Yan, Zheng
ffe7151600 mds: handle frag mismatch for discover
When handle discover dirfrag message, choose an approximate frag if
the requested dirfrag doesn't exist. When handling discover dirfrag
replay, wake up appropriate waiters if the reply is different from
the the requested dirfrag.

Signed-off-by: Yan, Zheng <zheng.z.yan@intel.com>
2014-02-17 09:37:50 +08:00
Yan, Zheng
b88034ee53 mds: use discover_path to open remote inode
MDCache::discover_ino() doesn't work well for directories that are
fragmented to several dirfrags. Because MDCache::handle_discover()
doesn't know which dirfrags the inode lives in when the sender has
outdatad frag information.

This patch replaces all use of MDCache::discover_ino() with
MDCache::discover_path().

Signed-off-by: Yan, Zheng <zheng.z.yan@intel.com>
2014-02-17 09:37:50 +08:00
Yan, Zheng
1ff776669b mds: introduce fine-grained discover dirfrag wait queue
Current discover dirfrag code only allows discover one dirfrag at
a time. This can cause deadlock if there are directories that are
fragmented to several dirfrags. For example:

mds.0                        mds.1
-----------------------------------------------------------------
                             freeze subtree (1.*) with bound (2.1*)
discover (2.0*) ->
                             handle discover (2.0*), frozen tree, wait
                          <- export subtree (1.*) to with bound (2.1*)
discover (2.1*), wait

Signed-off-by: Yan, Zheng <zheng.z.yan@intel.com>
2014-02-17 09:37:50 +08:00
Yan, Zheng
2c909cda0e mds: revert commit 15a5d37a
commit 15a5d37a (mds: fix race between scatter gather and dirfrag export)
is incomplete, it doesn't handles the race that no fragstat/neststat is
gathered. Previous commit prevents scatter gather during exporting dir,
which eliminates races of this type.

Signed-off-by: Yan, Zheng <zheng.z.yan@intel.com>
2014-02-17 09:37:50 +08:00