On Mon, 17 Jun 2013, Yan, Zheng wrote:
> From: "Yan, Zheng" <zheng.z.yan@xxxxxxxxx>
>
> don't journal bare dirfrag when starting scatter. also add debug
> code for bare dirfrag modification.
>
> Signed-off-by: Yan, Zheng <zheng.z.yan@xxxxxxxxx>
> ---
> src/mds/CDir.cc | 1 +
> src/mds/CInode.cc | 2 ++
> src/mds/Server.cc | 5 +++--
> 3 files changed, 6 insertions(+), 2 deletions(-)
>
> diff --git a/src/mds/CDir.cc b/src/mds/CDir.cc
> index 211cec0..8c83eba 100644
> --- a/src/mds/CDir.cc
> +++ b/src/mds/CDir.cc
> @@ -1211,6 +1211,7 @@ void CDir::finish_waiting(uint64_t mask, int result)
>
> fnode_t *CDir::project_fnode()
> {
> + assert(get_version() != 0);
> fnode_t *p = new fnode_t;
> *p = *get_projected_fnode();
> projected_fnode.push_back(p);
> diff --git a/src/mds/CInode.cc b/src/mds/CInode.cc
> index 4a592bc..8936acd 100644
> --- a/src/mds/CInode.cc
> +++ b/src/mds/CInode.cc
> @@ -1625,6 +1625,8 @@ void CInode::finish_scatter_update(ScatterLock *lock, CDir *dir,
>
> if (dir->is_frozen()) {
> dout(10) << "finish_scatter_update " << fg << " frozen, marking " << *lock << " stale " << *dir << dendl;
> + } else if (dir->get_version() == 0) {
> + dout(10) << "finish_scatter_update " << fg << " not loaded, marking " << *lock << " stale " << *dir << dendl;
> } else {
> if (dir_accounted_version != inode_version) {
> dout(10) << "finish_scatter_update " << fg << " journaling accounted scatterstat update v" << inode_version << dendl;
> diff --git a/src/mds/Server.cc b/src/mds/Server.cc
> index 00bf018..1d16d04 100644
> --- a/src/mds/Server.cc
> +++ b/src/mds/Server.cc
> @@ -4010,7 +4010,8 @@ public:
> if (newi->inode.is_dir()) {
> CDir *dir = newi->get_dirfrag(frag_t());
> assert(dir);
> - dir->mark_dirty(1, mdr->ls);
> + dir->fnode.version--;
> + dir->mark_dirty(dir->fnode.version + 1, mdr->ls);
BTW I notice that fnode_t's ctor doesn't initialize version or
snap_purged_thru (although CDir's ctor does a memset). Does that mean
that this is rolling over from (u64)-1 to 0 here? Would it be simpler to
make '1' the "don't journal me" value and leave this starting at v1?
> dir->mark_new(mdr->ls);
> }
>
> @@ -4169,7 +4170,7 @@ void Server::handle_client_mkdir(MDRequest *mdr)
> // ...and that new dir is empty.
> CDir *newdir = newi->get_or_open_dirfrag(mds->mdcache, frag_t());
> newdir->mark_complete();
> - newdir->pre_dirty();
> + newdir->fnode.version = newdir->pre_dirty();
>
> // prepare finisher
> mdr->ls = mdlog->get_current_segment();
> --
> 1.8.1.4
>
>
--
To unsubscribe from this list: send the line "unsubscribe ceph-devel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
