Date: Sat, 17 Jan 2009 02:23:04 -0600 (CST)
From: Christopher Powers <Christopher.Powers@Sun.COM>
Subject: bzr commit into mysql-6.0-falcon-team branch (christopher.powers:2964)
 Bug#42131
Sender: Christopher.Powers@Sun.COM
To: commits@lists.mysql.com
Message-id: <20090117082305.6075E1DB074C@xeno.mysql.com>
MIME-version: 1.0
Content-type: text/plain; charset=us-ascii
Content-transfer-encoding: 7BIT
Precedence: bulk
Received-SPF: pass (lists.mysql.com: local policy)
Mailing-List: contact commits-help@lists.mysql.com; run by ezmlm
User-Agent: Bazaar (1.5)
Original-recipient: rfc822;klewis@mysql.com

#At file:///home/cpowers/work/dev/dev-03/mysql/

 2964 Christopher Powers	2009-01-17
      Bug #42131 "falcon_backlog test crashes in Record::getEncodedValue"
      
      Transaction:chill() must get an exclusive syncPrior lock before deleting record data.
modified:
  storage/falcon/Record.h
  storage/falcon/SRLUpdateRecords.cpp
  storage/falcon/SRLUpdateRecords.h
  storage/falcon/Table.h

per-file messages:
  storage/falcon/Record.h
    Disable CHECK_RECORD_ACTIVITY. This flag has not been maintained, and causes
    invalid fatal assertions.
  storage/falcon/SRLUpdateRecords.cpp
    SRLUpdateRecords::chill() now gets an exclusive syncPrior lock before
    deleting the record data of a record being chilled.
    
    To prevent a deadlock with concurrent record thaws, abandon the chill for
    any record for which the syncPrior cannot be acquired within 50ms.
    
    The presumption is that if syncPrior is held for a record chain, then
    all records should remain fully intact.
  storage/falcon/SRLUpdateRecords.h
    Change return type of SRLUpdateRecords::chill() to boolean
  storage/falcon/Table.h
    Increase size of syncPrior and syncThaw hash table
=== modified file 'storage/falcon/Record.h'
--- a/storage/falcon/Record.h	2009-01-09 22:00:52 +0000
+++ b/storage/falcon/Record.h	2009-01-17 08:22:44 +0000
@@ -27,7 +27,7 @@
 #define ALLOCATE_RECORD(n)		(char*) MemMgrRecordAllocate (n, __FILE__, __LINE__)
 #define DELETE_RECORD(record)	MemMgrRecordDelete (record);
 
-#define CHECK_RECORD_ACTIVITY
+//#define CHECK_RECORD_ACTIVITY
 
 #include "SynchronizationObject.h"
 

=== modified file 'storage/falcon/SRLUpdateRecords.cpp'
--- a/storage/falcon/SRLUpdateRecords.cpp	2008-11-19 17:00:02 +0000
+++ b/storage/falcon/SRLUpdateRecords.cpp	2009-01-17 08:22:44 +0000
@@ -28,6 +28,7 @@
 #include "Sync.h"
 #include "SerialLogWindow.h"
 #include "Format.h"
+#include "SQLError.h"
 
 SRLUpdateRecords::SRLUpdateRecords(void)
 {
@@ -37,8 +38,19 @@ SRLUpdateRecords::~SRLUpdateRecords(void
 {
 }
 
-void SRLUpdateRecords::chill(Transaction *transaction, RecordVersion *record, uint dataLength)
+bool SRLUpdateRecords::chill(Transaction *transaction, RecordVersion *record, uint dataLength)
 {
+	Sync syncPrior(record->getSyncPrior(), "SRLUpdateRecords::chill");
+	
+	try
+		{
+		syncPrior.lock(Exclusive, 50);
+		}
+	catch (...)
+		{
+		return false;
+		}
+	
 	// Record data has been written to the serial log, so release the data
 	// buffer and set the state accordingly
 	
@@ -55,6 +67,8 @@ void SRLUpdateRecords::chill(Transaction
 		transaction->totalRecordData -= dataLength;
 	else
 		transaction->totalRecordData = 0;
+		
+	return true;
 }
 
 int SRLUpdateRecords::thaw(RecordVersion *record, bool *thawed)
@@ -200,15 +214,16 @@ void SRLUpdateRecords::append(Transactio
 					{
 					int chillBytes = record->getEncodedSize();
 
-					chill(transaction, record, chillBytes);
-					
-					log->chilledRecords++;
-					log->chilledBytes += chillBytes;
+					if (chill(transaction, record, chillBytes))
+						{
+						log->chilledRecords++;
+						log->chilledBytes += chillBytes;
 					
-					ASSERT(transaction->thawedRecords > 0);
+						//ASSERT(transaction->thawedRecords > 0);
 
-					if (transaction->thawedRecords)
-						transaction->thawedRecords--;
+						if (transaction->thawedRecords)
+							transaction->thawedRecords--;
+						}
 					}
 				else
 					{
@@ -253,9 +268,11 @@ void SRLUpdateRecords::append(Transactio
 			
 			if (chillRecords && record->state != recDeleted)
 				{
-				chill(transaction, record, stream.totalLength);
-				chilledRecordsWindow++;
-				chilledBytesWindow += stream.totalLength;
+				if (chill(transaction, record, stream.totalLength))
+					{
+					chilledRecordsWindow++;
+					chilledBytesWindow += stream.totalLength;
+					}
 				}
 			} // next record version
 		

=== modified file 'storage/falcon/SRLUpdateRecords.h'
--- a/storage/falcon/SRLUpdateRecords.h	2008-11-14 02:30:11 +0000
+++ b/storage/falcon/SRLUpdateRecords.h	2009-01-17 08:22:44 +0000
@@ -33,7 +33,7 @@ public:
 	virtual void	read(void);
 	virtual void	pass2(void);
 	void			append(Transaction *transaction, RecordVersion *records, bool chillRecords = false);
-	void			chill(Transaction *transaction, RecordVersion *record, uint dataLength);
+	bool			chill(Transaction *transaction, RecordVersion *record, uint dataLength);
 	int				thaw(RecordVersion *record, bool *thawed);
 	
 	const UCHAR		*data;

=== modified file 'storage/falcon/Table.h'
--- a/storage/falcon/Table.h	2009-01-15 20:29:54 +0000
+++ b/storage/falcon/Table.h	2009-01-17 08:22:44 +0000
@@ -42,8 +42,8 @@ static const int PostCommit	= 128;
 
 static const int BL_SIZE			= 128;
 static const int FORMAT_HASH_SIZE	= 20;
-static const int SYNC_VERSIONS_SIZE	= 16;
-static const int SYNC_THAW_SIZE		= 16;
+static const int SYNC_VERSIONS_SIZE	= 32; // 16;
+static const int SYNC_THAW_SIZE		= 32; // 16;
 
 #define FOR_FIELDS(field,table)	{for (Field *field=table->fields; field; field = field->next){
 

-- 
MySQL Code Commits Mailing List
For list archives: http://lists.mysql.com/commits
To unsubscribe:    http://lists.mysql.com/commits?unsub=klewis@mysql.com