Commit 9ea27d32 authored by unknown's avatar unknown
Browse files

ndb dd - Remove incorrect assertion making it's impossible to only use 1 undo file with "high" load


storage/ndb/src/kernel/blocks/lgman.cpp:
  Remove incorrect assertion making it's impossible to only use 1 undo file with "high" load
parent d255344c
Loading
Loading
Loading
Loading
+15 −6
Original line number Diff line number Diff line
@@ -1461,6 +1461,8 @@ Lgman::process_log_buffer_waiters(Signal* signal, Ptr<Logfile_group> ptr)
  }
}

#define REALLY_SLOW_FS 0

Uint32
Lgman::write_log_pages(Signal* signal, Ptr<Logfile_group> ptr,
		       Uint32 pageId, Uint32 in_pages)
@@ -1507,6 +1509,10 @@ Lgman::write_log_pages(Signal* signal, Ptr<Logfile_group> ptr,
    head.m_idx += max;
    ptr.p->m_file_pos[HEAD] = head;  

    if (REALLY_SLOW_FS)
      sendSignalWithDelay(NDBFS_REF, GSN_FSWRITEREQ, signal, REALLY_SLOW_FS,
			  FsReadWriteReq::FixedLength + 1);
    else
      sendSignal(NDBFS_REF, GSN_FSWRITEREQ, signal, 
		 FsReadWriteReq::FixedLength + 1, JBA);

@@ -1529,6 +1535,10 @@ Lgman::write_log_pages(Signal* signal, Ptr<Logfile_group> ptr,
    req->numberOfPages = max;
    FsReadWriteReq::setSyncFlag(req->operationFlag, 1);
    
    if (REALLY_SLOW_FS)
      sendSignalWithDelay(NDBFS_REF, GSN_FSWRITEREQ, signal, REALLY_SLOW_FS, 
			  FsReadWriteReq::FixedLength + 1);
    else
      sendSignal(NDBFS_REF, GSN_FSWRITEREQ, signal, 
		 FsReadWriteReq::FixedLength + 1, JBA);

@@ -1553,7 +1563,6 @@ Lgman::write_log_pages(Signal* signal, Ptr<Logfile_group> ptr,
      files.first(next);
    }
    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;
    next.p->m_state &= ~(Uint32)Undofile::FS_EMPTY;