Skip to content

Commit

Permalink
filestore: fix my broken ifdef flow
Browse files Browse the repository at this point in the history
Signed-off-by: Sage Weil <[email protected]>
  • Loading branch information
liewegas committed May 30, 2012
1 parent 188d171 commit a6f8fe3
Showing 1 changed file with 9 additions and 6 deletions.
15 changes: 9 additions & 6 deletions src/os/FileStore.cc
Original file line number Diff line number Diff line change
Expand Up @@ -1471,25 +1471,28 @@ int FileStore::_detect_fs()
btrfs = false;
}

bool have_syncfs = false;
#ifdef HAVE_SYS_SYNCFS
if (syncfs(fd) == 0) {
dout(0) << "mount syncfs(2) syscall fully supported (by glibc and kernel)" << dendl;
have_syncfs = true;
} else {
dout(0) << "mount syncfs(2) syscall supported by glibc BUT NOT the kernel" << dendl;
} else
}
#else
dout(0) << "mount syncfs(2) syscall not support by glibc" << dendl;
#endif
{
if (!have_syncfs) {
if (btrfs) {
dout(0) << "mount syncfs(2) syscall not support by glibc, but the btrfs SYNC ioctl will suffice" << dendl;
dout(0) << "mount no syncfs(2), but the btrfs SYNC ioctl will suffice" << dendl;
} else if (m_filestore_fsync_flushes_journal_data) {
dout(0) << "mount syncfs(2) syscall not support by glibc, but 'filestore fsync flushes journal data = true', so fsync will suffice." << dendl;
dout(0) << "mount no syncfs(2), but 'filestore fsync flushes journal data = true', so fsync will suffice." << dendl;
} else {
dout(0) << "mount syncfs(2) syscall not support by glibc; must use sync(2)." << dendl;
dout(0) << "mount no syncfs(2), must use sync(2)." << dendl;
dout(0) << "mount WARNING: multiple ceph-osd daemons on the same host will be slow" << dendl;
}
}


TEMP_FAILURE_RETRY(::close(fd));
return 0;
}
Expand Down

0 comments on commit a6f8fe3

Please sign in to comment.