diff options
| author | Greg Farnum <greg@inktank.com> | 2013-01-28 11:55:03 -0800 |
|---|---|---|
| committer | Greg Farnum <greg@inktank.com> | 2013-01-29 10:51:48 -0800 |
| commit | 7cd4e50ddf103d93308715218ec2735d93d493ac (patch) | |
| tree | fd6fe98f745e96e3fe0ac8b01311f23c716407f6 | |
| parent | 907c709ccb0a929411a1a86bfeab57974efb73da (diff) | |
| download | ceph-7cd4e50ddf103d93308715218ec2735d93d493ac.tar.gz | |
client: Wait for caps to flush when flushing metadata.
Embarrassingly, this conditional has been backwards since
I committed it in 818e7939. But we want to do the wait when
we did do the flush and are syncing metadata. As the code
previously stood, we only did the wait when we didn't care,
and it didn't wait anyway since it was waiting for 0. So,
bad all around.
Signed-off-by: Greg Farnum <greg@inktank.com>
| -rw-r--r-- | src/client/Client.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/client/Client.cc b/src/client/Client.cc index feb3beb8a31..705c162da3b 100644 --- a/src/client/Client.cc +++ b/src/client/Client.cc @@ -5900,7 +5900,7 @@ int Client::_fsync(Fh *f, bool syncdataonly) wait_on_list(in->waitfor_commit); } - if (!flushed_metadata) wait_sync_caps(wait_on_flush); //this could wait longer than strictly necessary, + if (flushed_metadata) wait_sync_caps(wait_on_flush); //this could wait longer than strictly necessary, //but on a sync the user can put up with it ldout(cct, 10) << "ino " << in->ino << " has no uncommitted writes" << dendl; |