List:Commits« Previous MessageNext Message »
From:jonas Date:January 27 2006 1:23pm
Subject:bk commit into 5.1 tree (jonas:1.2082)
View as plain text  
Below is the list of changes that have just been committed into a local
5.1 repository of jonas. When jonas does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet
  1.2082 06/01/27 14:23:43 jonas@stripped +1 -0
  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
    1.4 06/01/27 14:23:40 jonas@stripped +15 -6
    Remove incorrect assertion making it's impossible to only use 1 undo file with "high" load

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	jonas
# Host:	perch.ndb.mysql.com
# Root:	/home/jonas/src/51-new

--- 1.3/storage/ndb/src/kernel/blocks/lgman.cpp	2006-01-11 09:26:03 +01:00
+++ 1.4/storage/ndb/src/kernel/blocks/lgman.cpp	2006-01-27 14:23:40 +01:00
@@ -1461,6 +1461,8 @@
   }
 }
 
+#define REALLY_SLOW_FS 0
+
 Uint32
 Lgman::write_log_pages(Signal* signal, Ptr<Logfile_group> ptr,
 		       Uint32 pageId, Uint32 in_pages)
@@ -1506,9 +1508,13 @@
     max= pages;
     head.m_idx += max;
     ptr.p->m_file_pos[HEAD] = head;  
-    
-    sendSignal(NDBFS_REF, GSN_FSWRITEREQ, signal, 
-	       FsReadWriteReq::FixedLength + 1, JBA);
+
+    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);
 
     ptr.p->m_outstanding_fs++;
     filePtr.p->m_online.m_outstanding = max;
@@ -1529,8 +1535,12 @@
     req->numberOfPages = max;
     FsReadWriteReq::setSyncFlag(req->operationFlag, 1);
     
-    sendSignal(NDBFS_REF, GSN_FSWRITEREQ, signal, 
-	       FsReadWriteReq::FixedLength + 1, JBA);
+    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);
 
     ptr.p->m_outstanding_fs++;
     filePtr.p->m_online.m_outstanding = max;
@@ -1553,7 +1563,6 @@
       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;
 
Thread
bk commit into 5.1 tree (jonas:1.2082)jonas27 Jan