Commit e24c3b7e authored by jonas@perch.ndb.mysql.com's avatar jonas@perch.ndb.mysql.com

Merge perch.ndb.mysql.com:/home/jonas/src/51-new

into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new
parents c383ec95 44001d58
...@@ -1461,6 +1461,8 @@ Lgman::process_log_buffer_waiters(Signal* signal, Ptr<Logfile_group> ptr) ...@@ -1461,6 +1461,8 @@ Lgman::process_log_buffer_waiters(Signal* signal, Ptr<Logfile_group> ptr)
} }
} }
#define REALLY_SLOW_FS 0
Uint32 Uint32
Lgman::write_log_pages(Signal* signal, Ptr<Logfile_group> ptr, Lgman::write_log_pages(Signal* signal, Ptr<Logfile_group> ptr,
Uint32 pageId, Uint32 in_pages) Uint32 pageId, Uint32 in_pages)
...@@ -1506,9 +1508,13 @@ Lgman::write_log_pages(Signal* signal, Ptr<Logfile_group> ptr, ...@@ -1506,9 +1508,13 @@ Lgman::write_log_pages(Signal* signal, Ptr<Logfile_group> ptr,
max= pages; max= pages;
head.m_idx += max; head.m_idx += max;
ptr.p->m_file_pos[HEAD] = head; ptr.p->m_file_pos[HEAD] = head;
sendSignal(NDBFS_REF, GSN_FSWRITEREQ, signal, if (REALLY_SLOW_FS)
FsReadWriteReq::FixedLength + 1, JBA); sendSignalWithDelay(NDBFS_REF, GSN_FSWRITEREQ, signal, REALLY_SLOW_FS,
FsReadWriteReq::FixedLength + 1);
else
sendSignal(NDBFS_REF, GSN_FSWRITEREQ, signal,
FsReadWriteReq::FixedLength + 1, JBA);
ptr.p->m_outstanding_fs++; ptr.p->m_outstanding_fs++;
filePtr.p->m_online.m_outstanding = max; filePtr.p->m_online.m_outstanding = max;
...@@ -1529,8 +1535,12 @@ Lgman::write_log_pages(Signal* signal, Ptr<Logfile_group> ptr, ...@@ -1529,8 +1535,12 @@ Lgman::write_log_pages(Signal* signal, Ptr<Logfile_group> ptr,
req->numberOfPages = max; req->numberOfPages = max;
FsReadWriteReq::setSyncFlag(req->operationFlag, 1); FsReadWriteReq::setSyncFlag(req->operationFlag, 1);
sendSignal(NDBFS_REF, GSN_FSWRITEREQ, signal, if (REALLY_SLOW_FS)
FsReadWriteReq::FixedLength + 1, JBA); sendSignalWithDelay(NDBFS_REF, GSN_FSWRITEREQ, signal, REALLY_SLOW_FS,
FsReadWriteReq::FixedLength + 1);
else
sendSignal(NDBFS_REF, GSN_FSWRITEREQ, signal,
FsReadWriteReq::FixedLength + 1, JBA);
ptr.p->m_outstanding_fs++; ptr.p->m_outstanding_fs++;
filePtr.p->m_online.m_outstanding = max; filePtr.p->m_online.m_outstanding = max;
...@@ -1553,7 +1563,6 @@ Lgman::write_log_pages(Signal* signal, Ptr<Logfile_group> ptr, ...@@ -1553,7 +1563,6 @@ Lgman::write_log_pages(Signal* signal, Ptr<Logfile_group> ptr,
files.first(next); files.first(next);
} }
ndbout_c("changing file from %d to %d", filePtr.i, next.i); ndbout_c("changing file from %d to %d", filePtr.i, next.i);
ndbassert(filePtr.i != next.i);
filePtr.p->m_state |= Undofile::FS_MOVE_NEXT; filePtr.p->m_state |= Undofile::FS_MOVE_NEXT;
next.p->m_state &= ~(Uint32)Undofile::FS_EMPTY; next.p->m_state &= ~(Uint32)Undofile::FS_EMPTY;
......
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