Commit caf57616 authored by unknown's avatar unknown

5.1.6 release ndb dd - fix problem with O_DIRECT on some platforms


storage/ndb/src/kernel/blocks/ndbfs/AsyncFile.cpp:
  reopen wo/ O_DIRECT if firts write fails
parent d4e3c827
...@@ -370,7 +370,6 @@ void AsyncFile::openReq(Request* request) ...@@ -370,7 +370,6 @@ void AsyncFile::openReq(Request* request)
const int mode = S_IRUSR | S_IWUSR | const int mode = S_IRUSR | S_IWUSR |
S_IRGRP | S_IWGRP | S_IRGRP | S_IWGRP |
S_IROTH | S_IWOTH; S_IROTH | S_IWOTH;
retry:
if(flags & FsOpenReq::OM_CREATE_IF_NONE){ if(flags & FsOpenReq::OM_CREATE_IF_NONE){
if((theFd = ::open(theFileName.c_str(), new_flags, mode)) != -1) { if((theFd = ::open(theFileName.c_str(), new_flags, mode)) != -1) {
close(theFd); close(theFd);
...@@ -432,6 +431,7 @@ void AsyncFile::openReq(Request* request) ...@@ -432,6 +431,7 @@ void AsyncFile::openReq(Request* request)
m_fs.EXECUTE_DIRECT(block, GSN_FSWRITEREQ, signal, m_fs.EXECUTE_DIRECT(block, GSN_FSWRITEREQ, signal,
FsReadWriteReq::FixedLength + 1); FsReadWriteReq::FixedLength + 1);
retry:
Uint32 size = request->par.open.page_size; Uint32 size = request->par.open.page_size;
char* buf = (char*)m_page_ptr.p; char* buf = (char*)m_page_ptr.p;
while(size > 0){ while(size > 0){
...@@ -449,9 +449,21 @@ void AsyncFile::openReq(Request* request) ...@@ -449,9 +449,21 @@ void AsyncFile::openReq(Request* request)
} }
if(size != 0) if(size != 0)
{ {
int err = errno;
#ifdef O_DIRECT
if ((new_flags & O_DIRECT) && off == 0)
{
ndbout_c("error on first write(%d), disable O_DIRECT", err);
new_flags &= ~O_DIRECT;
close(theFd);
theFd = ::open(theFileName.c_str(), new_flags, mode);
if (theFd != -1)
goto retry;
}
#endif
close(theFd); close(theFd);
unlink(theFileName.c_str()); unlink(theFileName.c_str());
request->error = errno; request->error = err;
return; return;
} }
off += request->par.open.page_size; off += request->par.open.page_size;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment