Skip to content

M
MariaDB
Commit 45fb5361 authored by unknown's avatar unknown
Browse files
Options

ndb dd - bug#16386 

  Use shared pool for logfile group/undofiles in lgman


storage/ndb/src/kernel/blocks/lgman.cpp:
  Use shared pool for logfile group/undofiles in lgman
storage/ndb/src/kernel/blocks/lgman.hpp:
  Use shared pool for logfile group/undofiles in lgman
parent 7472f326
Hide whitespace changes
Inline Side-by-side
Showing with 45 additions and 33 deletions
storage/ndb/src/kernel/blocks/lgman.cpp
View file @ 45fb5361
......@@ -93,10 +93,7 @@ Lgman::Lgman(Block_context & ctx) :
addRecSignal(GSN_GET_TABINFOREQ, &Lgman::execGET_TABINFOREQ);
m_last_lsn = 1;
m_logfile_group_pool.setSize(10);
m_logfile_group_hash.setSize(10);
m_file_pool.setSize(10);
m_data_buffer_pool.setSize(10);
}
Lgman::~Lgman()
......@@ -122,6 +119,9 @@ Lgman::execREAD_CONFIG_REQ(Signal* signal)
Pool_context pc;
pc.m_block = this;
m_log_waiter_pool.wo_pool_init(RT_LGMAN_LOG_WAITER, pc);
m_file_pool.init(RT_LGMAN_FILE, pc);
m_logfile_group_pool.init(RT_LGMAN_FILEGROUP, pc);
m_data_buffer_pool.setSize(10);
ReadConfigConf * conf = (ReadConfigConf*)signal->getDataPtrSend();
conf->senderRef = reference();
......@@ -438,7 +438,7 @@ Lgman::drop_filegroup_drop_files(Signal* signal,
ndbrequire(ptr.p->m_meta_files.isEmpty());
ndbrequire(ptr.p->m_outstanding_fs == 0);
LocalDLFifoList<Undofile> list(m_file_pool, ptr.p->m_files);
Local_undofile_list list(m_file_pool, ptr.p->m_files);
Ptr<Undofile> file_ptr;
if (list.first(file_ptr))
......@@ -529,7 +529,8 @@ Lgman::execCREATE_FILE_REQ(Signal* signal){
}
new (file_ptr.p) Undofile(req, ptr.i);
LocalDLFifoList<Undofile> tmp(m_file_pool, ptr.p->m_meta_files);
Local_undofile_list tmp(m_file_pool, ptr.p->m_meta_files);
tmp.add(file_ptr);
open_file(signal, file_ptr, req->requestInfo);
......@@ -649,7 +650,7 @@ Lgman::execFSOPENREF(Signal* signal)
CreateFileImplRef::SignalLength, JBB);
}
LocalDLFifoList<Undofile> meta(m_file_pool, lg_ptr.p->m_meta_files);
Local_undofile_list meta(m_file_pool, lg_ptr.p->m_meta_files);
meta.release(ptr);
}
......@@ -683,9 +684,9 @@ Lgman::execFSOPENCONF(Signal* signal)
bool
Lgman::find_file_by_id(Ptr<Undofile>& ptr,
DLFifoList<Undofile>::Head& head, Uint32 id)
Local_undofile_list::Head& head, Uint32 id)
{
LocalDLFifoList<Undofile> list(m_file_pool, head);
Local_undofile_list list(m_file_pool, head);
for(list.first(ptr); !ptr.isNull(); list.next(ptr))
if(ptr.p->m_file_id == id)
return true;
......@@ -704,8 +705,8 @@ Lgman::create_file_commit(Signal* signal,
if(ptr.p->m_state == Undofile::FS_CREATING)
{
jam();
LocalDLFifoList<Undofile> free(m_file_pool, lg_ptr.p->m_files);
LocalDLFifoList<Undofile> meta(m_file_pool, lg_ptr.p->m_meta_files);
Local_undofile_list free(m_file_pool, lg_ptr.p->m_files);
Local_undofile_list meta(m_file_pool, lg_ptr.p->m_meta_files);
first= free.isEmpty();
meta.remove(ptr);
if(!first)
......@@ -812,7 +813,7 @@ Lgman::execFSCLOSECONF(Signal* signal)
{
jam();
{
LocalDLFifoList<Undofile> list(m_file_pool, lg_ptr.p->m_files);
Local_undofile_list list(m_file_pool, lg_ptr.p->m_files);
list.release(ptr);
}
drop_filegroup_drop_files(signal, lg_ptr, senderRef, senderData);
......@@ -820,7 +821,7 @@ Lgman::execFSCLOSECONF(Signal* signal)
else
{
jam();
LocalDLFifoList<Undofile> list(m_file_pool, lg_ptr.p->m_meta_files);
Local_undofile_list list(m_file_pool, lg_ptr.p->m_meta_files);
list.release(ptr);
CreateFileImplConf* conf= (CreateFileImplConf*)signal->getDataPtr();
......@@ -967,7 +968,7 @@ Lgman::compute_free_file_pages(Ptr<Logfile_group> ptr)
{
Ptr<Undofile> file;
m_file_pool.getPtr(file, head.m_ptr_i);
LocalDLFifoList<Undofile> list(m_file_pool, ptr.p->m_files);
Local_undofile_list list(m_file_pool, ptr.p->m_files);
do
{
......@@ -1632,7 +1633,7 @@ Lgman::write_log_pages(Signal* signal, Ptr<Logfile_group> ptr,
ptr.p->m_last_sync_req_lsn = lsn; // And logfile_group
Ptr<Undofile> next = filePtr;
LocalDLFifoList<Undofile> files(m_file_pool, ptr.p->m_files);
Local_undofile_list files(m_file_pool, ptr.p->m_files);
if(!files.next(next))
{
jam();
......@@ -1683,7 +1684,7 @@ Lgman::execFSWRITECONF(Signal* signal)
Uint32 tot= 0;
Uint64 lsn = 0;
{
LocalDLFifoList<Undofile> files(m_file_pool, lg_ptr.p->m_files);
Local_undofile_list files(m_file_pool, lg_ptr.p->m_files);
while(cnt && ! (ptr.p->m_state & Undofile::FS_OUTSTANDING))
{
Uint32 state= ptr.p->m_state;
......@@ -1888,7 +1889,7 @@ Lgman::cut_log_tail(Signal* signal, Ptr<Logfile_group> ptr)
ptr.p->m_free_file_words += free * File_formats::UNDO_PAGE_WORDS;
Ptr<Undofile> next = filePtr;
LocalDLFifoList<Undofile> files(m_file_pool, ptr.p->m_files);
Local_undofile_list files(m_file_pool, ptr.p->m_files);
while(files.next(next) && (next.p->m_state & Undofile::FS_EMPTY))
ndbrequire(next.i != filePtr.i);
if(next.isNull())
......@@ -2083,7 +2084,7 @@ Lgman::find_log_head(Signal* signal, Ptr<Logfile_group> ptr)
/**
* Read first page from each undofile (1 file at a time...)
*/
LocalDLFifoList<Undofile> files(m_file_pool, ptr.p->m_meta_files);
Local_undofile_list files(m_file_pool, ptr.p->m_meta_files);
Ptr<Undofile> file_ptr;
files.first(file_ptr);
......@@ -2120,7 +2121,7 @@ Lgman::find_log_head(Signal* signal, Ptr<Logfile_group> ptr)
* and m_files is sorted acording to lsn
*/
ndbrequire(!ptr.p->m_files.isEmpty());
LocalDLFifoList<Undofile> read_files(m_file_pool, ptr.p->m_files);
Local_undofile_list read_files(m_file_pool, ptr.p->m_files);
read_files.last(file_ptr);
......@@ -2181,7 +2182,7 @@ Lgman::execFSREADCONF(Signal* signal)
if(lg_ptr.p->m_next_reply_ptr_i == ptr.i)
{
Uint32 tot= 0;
LocalDLFifoList<Undofile> files(m_file_pool, lg_ptr.p->m_files);
Local_undofile_list files(m_file_pool, lg_ptr.p->m_files);
while(cnt && ! (ptr.p->m_state & Undofile::FS_OUTSTANDING))
{
Uint32 state= ptr.p->m_state;
......@@ -2245,8 +2246,8 @@ Lgman::execFSREADCONF(Signal* signal)
* Insert into m_files
*/
{
LocalDLFifoList<Undofile> meta(m_file_pool, lg_ptr.p->m_meta_files);
LocalDLFifoList<Undofile> files(m_file_pool, lg_ptr.p->m_files);
Local_undofile_list meta(m_file_pool, lg_ptr.p->m_meta_files);
Local_undofile_list files(m_file_pool, lg_ptr.p->m_files);
meta.remove(ptr);
Ptr<Undofile> loop;
......@@ -2370,7 +2371,7 @@ Lgman::find_log_head_in_file(Signal* signal,
ptr.p->m_next_reply_ptr_i = file_ptr.i;
{
LocalDLFifoList<Undofile> files(m_file_pool, ptr.p->m_files);
Local_undofile_list files(m_file_pool, ptr.p->m_files);
if(tail == 1)
{
/**
......@@ -2423,8 +2424,8 @@ Lgman::init_run_undo_log(Signal* signal)
* Perform initial sorting of logfile groups
*/
Ptr<Logfile_group> group;
DLFifoList<Logfile_group>& list= m_logfile_group_list;
DLFifoList<Logfile_group> tmp(m_logfile_group_pool);
Logfile_group_list& list= m_logfile_group_list;
Logfile_group_list tmp(m_logfile_group_pool);
list.first(group);
while(!group.isNull())
......@@ -2632,7 +2633,7 @@ Lgman::read_undo_pages(Signal* signal, Ptr<Logfile_group> ptr,
Ptr<Undofile> prev = filePtr;
{
LocalDLFifoList<Undofile> files(m_file_pool, ptr.p->m_files);
Local_undofile_list files(m_file_pool, ptr.p->m_files);
if(!files.prev(prev))
{
jam();
......@@ -2892,7 +2893,7 @@ Lgman::stop_run_undo_log(Signal* signal)
if(pages >= diff)
{
pages -= diff;
LocalDLFifoList<Undofile> files(m_file_pool, ptr.p->m_files);
Local_undofile_list files(m_file_pool, ptr.p->m_files);
if(!files.next(file))
files.first(file);
tail.m_idx = 1;
......
storage/ndb/src/kernel/blocks/lgman.hpp
View file @ 45fb5361
......@@ -99,6 +99,7 @@ public:
Undofile(){}
Undofile(const struct CreateFileImplReq*, Uint32 lg_ptr_i);
Uint32 m_magic;
Uint32 m_file_id; // Dict obj id
Uint32 m_logfile_group_ptr_i;
......@@ -140,6 +141,9 @@ public:
};
};
typedef RecordPool<Undofile, RWPool> Undofile_pool;
typedef DLFifoListImpl<Undofile_pool, Undofile> Undofile_list;
typedef LocalDLFifoListImpl<Undofile_pool, Undofile> Local_undofile_list;
typedef LocalDataBuffer<15> Page_map;
struct Buffer_idx
......@@ -156,6 +160,7 @@ public:
Logfile_group(){}
Logfile_group(const struct CreateFilegroupImplReq*);
Uint32 m_magic;
union {
Uint32 key;
Uint32 m_logfile_group_id;
......@@ -200,8 +205,8 @@ public:
Buffer_idx m_file_pos[2]; // 0 tail, 1 head = { file_ptr_i, page_no }
Uint64 m_free_file_words; // Free words in logfile group
DLFifoList<Undofile>::Head m_files; // Files in log
DLFifoList<Undofile>::Head m_meta_files;// Files being created or dropped
Undofile_list::Head m_files; // Files in log
Undofile_list::Head m_meta_files;// Files being created or dropped
Uint32 m_free_buffer_words; // Free buffer page words
Log_waiter_list::Head m_log_buffer_waiters;
......@@ -226,6 +231,11 @@ public:
}
};
typedef RecordPool<Logfile_group, RWPool> Logfile_group_pool;
typedef DLFifoListImpl<Logfile_group_pool, Logfile_group> Logfile_group_list;
typedef LocalDLFifoListImpl<Logfile_group_pool, Logfile_group> Local_logfile_group_list;
typedef KeyTableImpl<Logfile_group_pool, Logfile_group> Logfile_group_hash;
/**
* Alloc/free space in log
* Alloction will be removed at either/or
......@@ -237,16 +247,17 @@ public:
private:
friend class Logfile_client;
ArrayPool<Undofile> m_file_pool;
ArrayPool<Logfile_group> m_logfile_group_pool;
Undofile_pool m_file_pool;
Logfile_group_pool m_logfile_group_pool;
Log_waiter_pool m_log_waiter_pool;
Page_map::DataBufferPool m_data_buffer_pool;
Uint64 m_last_lsn;
Uint32 m_latest_lcp;
DLFifoList<Logfile_group> m_logfile_group_list;
KeyTable<Logfile_group> m_logfile_group_hash;
Logfile_group_list m_logfile_group_list;
Logfile_group_hash m_logfile_group_hash;
bool alloc_logbuffer_memory(Ptr<Logfile_group>, Uint32 pages);
void init_logbuffer_pointers(Ptr<Logfile_group>);
......@@ -280,7 +291,7 @@ private:
void stop_run_undo_log(Signal* signal);
void init_tail_ptr(Signal* signal, Ptr<Logfile_group> ptr);
bool find_file_by_id(Ptr<Undofile>&, DLFifoList<Undofile>::Head&, Uint32 id);
bool find_file_by_id(Ptr<Undofile>&, Undofile_list::Head&, Uint32 id);
void create_file_commit(Signal* signal, Ptr<Logfile_group>, Ptr<Undofile>);
void create_file_abort(Signal* signal, Ptr<Logfile_group>, Ptr<Undofile>);
......
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
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7