From 961bc0c93642bdd4f4aa59ea853ef13b4c11287f Mon Sep 17 00:00:00 2001 From: "Yan, Zheng" Date: Mon, 19 Nov 2012 10:43:44 +0800 Subject: [PATCH] mds: fix open_remote_inode race discover_ino() may return -ENOENT if it races with other FS activities. so use C_MDC_RetryOpenRemoteIno instead of C_MDC_OpenRemoteIno as onfinish callback. Signed-off-by: Yan, Zheng --- src/mds/MDCache.cc | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/mds/MDCache.cc b/src/mds/MDCache.cc index 399156ec83775..32799bde1093b 100644 --- a/src/mds/MDCache.cc +++ b/src/mds/MDCache.cc @@ -7122,7 +7122,8 @@ void MDCache::open_remote_ino_2(inodeno_t ino, if (!dir && in->is_auth()) { if (in->is_frozen_dir()) { dout(7) << "traverse: " << *in << " is frozen_dir, waiting" << dendl; - in->parent->dir->add_waiter(CDir::WAIT_UNFREEZE, onfinish); + in->parent->dir->add_waiter(CDir::WAIT_UNFREEZE, + new C_MDC_RetryOpenRemoteIno(this, ino, onfinish)); return; } dir = in->get_or_open_dirfrag(this, frag); @@ -7157,7 +7158,7 @@ void MDCache::open_remote_ino_2(inodeno_t ino, dout(10) << "have remote dirfrag " << *dir << ", discovering " << anchortrace[i].ino << dendl; discover_ino(dir, anchortrace[i].ino, - new C_MDC_OpenRemoteIno(this, ino, anchortrace, onfinish)); + new C_MDC_RetryOpenRemoteIno(this, ino, onfinish)); } } -- 2.39.5