List:Internals« Previous MessageNext Message »
From:Stewart Smith Date:December 2 2005 8:27am
Subject:bk commit into 4.1 tree (stewart:1.2479) BUG#15425
View as plain text  
Below is the list of changes that have just been committed into a local
4.1 repository of stewart. When stewart 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.2479 05/12/02 09:27:06 stewart@stripped +2 -0
  BUG#15425 Small window for NF during backup failing without error

  ndb/src/kernel/blocks/dbdict/Dbdict.cpp
    1.43 05/12/02 09:27:03 stewart@stripped +0 -1
    Assert is incorrect for testBackup NFSlave test (causes crash insert 10015 to fail)

  ndb/src/kernel/blocks/backup/Backup.cpp
    1.22 05/12/02 09:27:03 stewart@stripped +10 -5
    If crash 10018 is inserted on a 2 node cluster with fast CPU and slower disk,
    all nodes can respond with BACKUP_FRAGMENT_CONF for all fragments before the
    error in FSAPPENDCONF is hit.
    
    This would mean that no error code was set for the backup and that it would
    be incomplete as not all IO had been written to disk before the node crash.
    This would not be reported to the user.
    
    So the backup would appear to succeed but it really didn't.
    
    The window for this is rather small though.

# 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:	stewart
# Host:	willster.(none)
# Root:	/home/stewart/Documents/MySQL/4.1/main

--- 1.21/ndb/src/kernel/blocks/backup/Backup.cpp	2005-09-21 17:24:38 +02:00
+++ 1.22/ndb/src/kernel/blocks/backup/Backup.cpp	2005-12-02 09:27:03 +01:00
@@ -786,13 +786,17 @@
       pos= &ref->nodeId - signal->getDataPtr();
       break;
     }
+    case GSN_WAIT_GCP_REQ:
+    case GSN_DROP_TRIG_REQ:
     case GSN_CREATE_TRIG_REQ:
     case GSN_ALTER_TRIG_REQ:
-    case GSN_WAIT_GCP_REQ:
+      ptr.p->setErrorCode(AbortBackupOrd::BackupFailureDueToNodeFail);
+      return;
     case GSN_UTIL_SEQUENCE_REQ:
     case GSN_UTIL_LOCK_REQ:
-    case GSN_DROP_TRIG_REQ:
       return;
+    default:
+      ndbrequire(false);
     }
     
     for(Uint32 i = 0; (i = mask.find(i+1)) != NdbNodeBitmask::NotFound; )
@@ -1803,7 +1807,7 @@
   const Uint32 nodeId = refToNode(signal->senderBlockRef());
   const Uint32 noOfBytes = conf->noOfBytes;
   const Uint32 noOfRecords = conf->noOfRecords;
-  
+
   BackupRecordPtr ptr;
   c_backupPool.getPtr(ptr, ptrI);
 
@@ -1880,7 +1884,7 @@
       }
     }
   }
-  ndbrequire(false);
+  goto err;
 
 done:
   ptr.p->masterData.sendCounter--;
@@ -1892,7 +1896,8 @@
     masterAbort(signal, ptr);
     return;
   }//if
-  
+
+err:
   AbortBackupOrd *ord = (AbortBackupOrd*)signal->getDataPtrSend();
   ord->backupId = ptr.p->backupId;
   ord->backupPtr = ptr.i;

--- 1.42/ndb/src/kernel/blocks/dbdict/Dbdict.cpp	2005-09-22 08:35:26 +02:00
+++ 1.43/ndb/src/kernel/blocks/dbdict/Dbdict.cpp	2005-12-02 09:27:03 +01:00
@@ -11694,7 +11694,6 @@
     // broken trigger allowed if force
     if (! (triggerPtr.p->triggerLocal & TriggerRecord::TL_CREATED_LQH)) {
       jam();
-      ndbrequire(opPtr.p->m_requestFlag & RequestFlag::RF_FORCE);
       alterTrigger_sendReply(signal, opPtr, false);
       return;
     }
Thread
bk commit into 4.1 tree (stewart:1.2479) BUG#15425Stewart Smith2 Dec