Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit c078ccd

Browse files
meeeejinmeeeejin
authored
Merge pull request meeeejin#4 from JonghyeokPark/recovery
2 parents a3453b1 + 2d22d18 commit c078ccd

27 files changed

+678
-117
lines changed

‎storage/innobase/CMakeLists.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ INCLUDE(innodb.cmake)
2020
SET(INNOBASE_SOURCES
2121
pmem/pmem0mmap.cc
2222
pmem/pmem0buf.cc
23+
pmem/pmem0recv.cc
2324
api/api0api.cc
2425
api/api0misc.cc
2526
btr/btr0btr.cc

‎storage/innobase/btr/btr0cur.cc

Lines changed: 16 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4943,6 +4943,10 @@ btr_cur_del_mark_set_clust_rec(
49434943
ulint cur_rec_size = rec_offs_size(offsets);
49444944
pm_mmap_mtrlogbuf_commit(rec, cur_rec_size, nvm_bpage->id.space(), nvm_bpage->id.page_no());
49454945
} else {
4946+
if ( nvm_bpage->id.space() == 28) {
4947+
fprintf(stderr, "[JONGQ] WATCH-OUT-2\n");
4948+
exit(-1);
4949+
}
49464950
btr_cur_del_mark_set_clust_rec_log(rec, index, trx->id,
49474951
roll_ptr, mtr);
49484952
}
@@ -5048,10 +5052,16 @@ btr_cur_del_mark_set_sec_rec(
50485052
rec_t* rec;
50495053
dberr_t err;
50505054

5055+
50515056
block = btr_cur_get_block(cursor);
50525057
rec = btr_cur_get_rec(cursor);
50535058

5054-
err = lock_sec_rec_modify_check_and_lock(flags,
5059+
fprintf(stderr,"[JONGQ] btr_cur_del_mark_set_sec_rec! space: %lu\n", block->page.id.space());
5060+
if (block->page.id.space() == 28) {
5061+
fprintf(stderr, "[JONGQ] WRONG!!!\n");
5062+
}
5063+
5064+
err = lock_sec_rec_modify_check_and_lock(flags,
50555065
btr_cur_get_block(cursor),
50565066
rec, cursor->index, thr, mtr);
50575067
if (err != DB_SUCCESS) {
@@ -6544,7 +6554,6 @@ btr_cur_unmark_extern_fields(
65446554

65456555
for (i = 0; i < n; i++) {
65466556
if (rec_offs_nth_extern(offsets, i)) {
6547-
65486557
btr_cur_set_ownership_of_extern_field(
65496558
page_zip, rec, index, offsets, i, TRUE, mtr);
65506559
}
@@ -7535,6 +7544,11 @@ btr_rec_free_externally_stored_fields(
75357544
ulint n_fields;
75367545
ulint i;
75377546

7547+
// dbug
7548+
if (index->space == 28) {
7549+
fprintf(stderr, "[JONGQ] btr_rec_Free_externally_stored_fields\n");
7550+
}
7551+
75387552
ut_ad(rec_offs_validate(rec, index, offsets));
75397553
ut_ad(mtr_is_page_fix(mtr, rec, MTR_MEMO_PAGE_X_FIX, index->table));
75407554
/* Free possible externally stored fields in the record */

‎storage/innobase/buf/buf0buf.cc

Lines changed: 28 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -798,11 +798,10 @@ buf_page_is_corrupted(
798798

799799
/* Stored log sequence numbers at the start and the end
800800
of page do not match */
801-
802801
return(TRUE);
803802
}
804803

805-
#if !defined(UNIV_HOTBACKUP) && !defined(UNIV_INNOCHECKSUM)
804+
#if !defined(UNIV_HOTBACKUP) && !defined(UNIV_INNOCHECKSUM) &!defined(UNIV_NVDIMM_CACHE)
806805
if (check_lsn && recv_lsn_checks_on) {
807806
lsn_t current_lsn;
808807
const lsn_t page_lsn
@@ -973,7 +972,6 @@ buf_page_is_corrupted(
973972
page_no, is_log_enabled, log_file, curr_algo,
974973
#endif /* UNIV_INNOCHECKSUM */
975974
true)) {
976-
977975
return(FALSE);
978976
}
979977
legacy_checksum_checked = true;
@@ -1084,7 +1082,6 @@ buf_page_is_corrupted(
10841082
page_id);
10851083
}
10861084
#endif /* UNIV_INNOCHECKSUM */
1087-
10881085
return(FALSE);
10891086
}
10901087

@@ -1620,8 +1617,6 @@ buf_chunk_nvm_init(
16201617
// NVDIMM-porting
16211618
chunk->mem = buf_pool->allocator.allocate_large_nvm(mem_size,
16221619
&chunk->mem_pfx);
1623-
//chunk->mem = pm_mmap_buf_chunk_alloc(mem_size, &chunk->mem_pfx);
1624-
16251620
if (UNIV_UNLIKELY(chunk->mem == NULL)) {
16261621
return(NULL);
16271622
}
@@ -2207,11 +2202,17 @@ buf_pool_free_instance(
22072202
chunks = buf_pool->chunks;
22082203
chunk = chunks + buf_pool->n_chunks;
22092204

2205+
fprintf(stderr, "[JONGQ] buf_pool->instance_no check: %lu\n", buf_pool->instance_no);
2206+
22102207
while (--chunk >= chunks) {
22112208
buf_block_t* block = chunk->blocks;
2212-
2209+
22132210
#ifdef UNIV_NVDIMM_CACHE
2214-
if (buf_pool->instance_no == 8 && chunk == chunks) break;
2211+
if (buf_pool->instance_no == 8 && chunk == chunks) {
2212+
//buf_pool->allocator.deallocate_large_nvm(
2213+
// chunk->mem, &chunk->mem_pfx);
2214+
break;
2215+
}
22152216
#endif /* UNIV_NVDIMM_CACHE */
22162217

22172218
for (ulint i = chunk->size; i--; block++) {
@@ -2220,8 +2221,18 @@ buf_pool_free_instance(
22202221
ut_d(rw_lock_free(&block->debug_latch));
22212222
}
22222223

2224+
#ifdef UNIV_NVDIMM_CACHE
2225+
if (buf_pool->instance_no == 8) {
2226+
buf_pool->allocator.deallocate_large_nvm(
2227+
chunk->mem, &chunk->mem_pfx);
2228+
} else {
2229+
buf_pool->allocator.deallocate_large(
2230+
chunk->mem, &chunk->mem_pfx);
2231+
}
2232+
#else
22232233
buf_pool->allocator.deallocate_large(
22242234
chunk->mem, &chunk->mem_pfx);
2235+
#endif
22252236
}
22262237

22272238
for (ulint i = BUF_FLUSH_LRU; i < BUF_FLUSH_N_TYPES; ++i) {
@@ -2298,7 +2309,7 @@ buf_pool_free(
22982309
}
22992310

23002311
#ifdef UNIV_NVDIMM_CACHE
2301-
nvdimm_buf_pool_free(srv_nvdimm_buf_pool_instances);
2312+
nvdimm_buf_pool_free(srv_nvdimm_buf_pool_instances);
23022313
#endif /* UNIV_NVDIMM_CACHE */
23032314

23042315
UT_DELETE(buf_chunk_map_reg);
@@ -5333,8 +5344,14 @@ buf_page_init_low(
53335344
HASH_INVALIDATE(bpage, hash);
53345345

53355346
#ifdef UNIV_NVDIMM_CACHE
5336-
bpage->cached_in_nvdimm = false;
5337-
bpage->moved_to_nvdimm = false;
5347+
// bpage->cached_in_nvdimm = false;
5348+
// bpage->moved_to_nvdimm = false;
5349+
bpage->moved_to_nvdimm = false;
5350+
if (bpage->buf_pool_index >= srv_buf_pool_instances) {
5351+
bpage->cached_in_nvdimm = true;
5352+
} else {
5353+
bpage->cached_in_nvdimm = false;
5354+
}
53385355
#endif /* UNIV_NVDIMM_CACHE */
53395356

53405357
ut_d(bpage->file_page_was_freed = FALSE);

‎storage/innobase/buf/buf0flu.cc

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1047,7 +1047,15 @@ buf_flush_write_block_low(
10471047

10481048
/* Force the log to the disk before writing the modified block */
10491049
if (!srv_read_only_mode) {
1050-
log_write_up_to(bpage->newest_modification, true);
1050+
#if defined(UNIV_NVDIMM_CACHE_NO) && defined(UNIV_NVDIMM_CACHE_OL)
1051+
if (bpage->id.space() != 28) {
1052+
log_write_up_to(bpage->newest_modification, true);
1053+
} else {
1054+
//fprintf(stderr, "avoid neworder page to flush REDO log file\n");
1055+
}
1056+
#else
1057+
log_write_up_to(bpage->newest_modification, true);
1058+
#endif
10511059
}
10521060

10531061
switch (buf_page_get_state(bpage)) {

‎storage/innobase/buf/buf0rea.cc

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -153,6 +153,12 @@ buf_read_page_low(
153153
return(0);
154154
}
155155

156+
// debug
157+
// fprintf(stderr, "[JONGQ] read page %u:%u size=%u unzip=%u, sync=%d\n"
158+
// , (unsigned) page_id.space(),
159+
// (unsigned) page_id.page_no(),
160+
// (unsigned) page_size.physical(), (unsigned) unzip, sync);
161+
156162
DBUG_PRINT("ib_buf", ("read page %u:%u size=%u unzip=%u,%s",
157163
(unsigned) page_id.space(),
158164
(unsigned) page_id.page_no(),
@@ -227,7 +233,7 @@ buf_read_page_low(
227233
return(0);
228234
}
229235
}
230-
236+
231237
return(1);
232238
}
233239

@@ -873,35 +879,34 @@ buf_read_recv_pages(
873879
/* The tablespace is missing: do nothing */
874880
return;
875881
}
876-
882+
877883
fil_space_open_if_needed(space);
878884

879885
const page_size_t page_size(space->flags);
880886

881887
for (i = 0; i < n_stored; i++) {
888+
882889
buf_pool_t* buf_pool;
883890
const page_id_t cur_page_id(space_id, page_nos[i]);
884891

885892
count = 0;
886893

887894
buf_pool = buf_pool_get(cur_page_id);
888895
while (buf_pool->n_pend_reads >= recv_n_pool_free_frames / 2) {
889-
890896
os_aio_simulated_wake_handler_threads();
891897
os_thread_sleep(10000);
892898

893899
count++;
894900

895901
if (!(count % 1000)) {
896-
897902
ib::error()
898903
<< "Waited for " << count / 100
899904
<< " seconds for "
900905
<< buf_pool->n_pend_reads
901906
<< " pending reads";
902907
}
903908
}
904-
909+
905910
if ((i + 1 == n_stored) && sync) {
906911
buf_read_page_low(
907912
&err, true,

‎storage/innobase/fil/fil0fil.cc

Lines changed: 4 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -5578,8 +5578,8 @@ fil_io(
55785578
least one file while holding it, if the file is not already open */
55795579

55805580
fil_mutex_enter_and_prepare_for_io(page_id.space());
5581-
5582-
fil_space_t* space = fil_space_get_by_id(page_id.space());
5581+
5582+
fil_space_t* space = fil_space_get_by_id(page_id.space());
55835583

55845584
/* If we are deleting a tablespace we don't allow async read operations
55855585
on that. However, we do allow write operations and sync read operations. */
@@ -5609,14 +5609,12 @@ fil_io(
56095609
fil_node_t* node = UT_LIST_GET_FIRST(space->chain);
56105610

56115611
for (;;) {
5612-
56135612
if (node == NULL) {
5614-
56155613
if (req_type.ignore_missing()) {
56165614
mutex_exit(&fil_system->mutex);
56175615
return(DB_ERROR);
56185616
}
5619-
5617+
56205618
fil_report_invalid_page_access(
56215619
page_id.page_no(), page_id.space(),
56225620
space->name, byte_offset, len,
@@ -5632,7 +5630,6 @@ fil_io(
56325630
} else if (node->size > cur_page_no) {
56335631
/* Found! */
56345632
break;
5635-
56365633
} else {
56375634
if (space->id != srv_sys_space.space_id()
56385635
&& UT_LIST_GET_LEN(space->chain) == 1
@@ -5649,7 +5646,6 @@ fil_io(
56495646
}
56505647

56515648
cur_page_no -= node->size;
5652-
56535649
node = UT_LIST_GET_NEXT(chain, node);
56545650
}
56555651
}
@@ -5672,7 +5668,6 @@ fil_io(
56725668
cur_page_no)
56735669
<< ", I/O length: " << len << " bytes";
56745670
}
5675-
56765671
return(DB_TABLESPACE_DELETED);
56775672
}
56785673

@@ -5774,7 +5769,7 @@ fil_io(
57745769
#ifdef UNIV_HOTBACKUP
57755770
/* In mysqlbackup do normal i/o, not aio */
57765771
if (req_type.is_read()) {
5777-
5772+
57785773
err = os_file_read(req_type, node->handle, buf, offset, len);
57795774

57805775
} else {
@@ -5793,7 +5788,6 @@ fil_io(
57935788
fsp_is_system_temporary(page_id.space())
57945789
? false : srv_read_only_mode,
57955790
node, message);
5796-
57975791
#endif /* UNIV_HOTBACKUP */
57985792

57995793
if (err == DB_IO_NO_PUNCH_HOLE) {
@@ -5827,7 +5821,6 @@ fil_io(
58275821

58285822
ut_ad(fil_validate_skip());
58295823
}
5830-
58315824
return(err);
58325825
}
58335826

‎storage/innobase/include/mtr0mtr.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,7 @@ Created 11/26/1995 Heikki Tuuri
4949
#ifdef UNIV_NVDIMM_CACHE
5050
/** Commit a mini-transaction for nvdimm resident pages */
5151
#define mtr_commit_nvm(m) (m)->commit_nvm()
52+
#define mtr_commit_no_nvm(m) (m)->commit_no_nvm()
5253
#endif /* UNIV_NVDIMM_CACHE */
5354

5455
/** Set and return a savepoint in mtr.
@@ -264,6 +265,7 @@ struct mtr_t {
264265
#ifdef UNIV_NVDIMM_CACHE
265266
/** Commit the mini-transaction for nvm resident page. */
266267
void commit_nvm();
268+
void commit_no_nvm();
267269
#endif /* UNIV_NVDIMM_CACHE */
268270

269271
/** Commit a mini-transaction that did not modify any pages,

‎storage/innobase/include/pmem_mmap_obj.h

Lines changed: 28 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -169,7 +169,6 @@ struct __pmem_mmap_mtrlog_hdr {
169169
};
170170

171171
// logging?
172-
173172
int pm_mmap_mtrlogbuf_init(const size_t size);
174173
void pm_mmap_mtrlogbuf_mem_free();
175174
void pm_mmap_read_logfile_header(PMEM_MMAP_MTRLOGFILE_HDR* mtrlog_fil_hdr);
@@ -179,7 +178,6 @@ void pm_mmap_write_logfile_header_ckpt_info(uint64_t offset, uint64_t lsn);
179178
uint64_t pm_mmap_log_checkpoint(uint64_t cur_offset);
180179
void pm_mmap_log_commit(unsigned long cur_space, unsigned long cur_page, uint64_t cur_offset);
181180

182-
183181
ssize_t pm_mmap_mtrlogbuf_write(const uint8_t* buf,
184182
unsigned long int n, unsigned long int lsn);
185183

@@ -193,4 +191,32 @@ void pm_mmap_buf_init(const uint64_t size);
193191
void pm_mmap_buf_free(void);
194192
void pm_mmap_buf_write(unsigned long len, void* buf);
195193
//unsigned char* pm_mmap_buf_chunk_alloc(unsigned long mem_size, ut_new_pfx_t* pfx);
194+
195+
196+
// recovery
197+
//bool pm_mmap_recv(PMEM_MMAP_MTRLOGFILE_HDR* log_fil_hdr);
198+
bool pm_mmap_recv(uint64_t start_offset, uint64_t end_offset);
199+
uint64_t pm_mmap_recv_check(PMEM_MMAP_MTRLOGFILE_HDR* log_fil_hdr);
200+
void pm_mmap_recv_flush_buffer();
201+
202+
// TODO(jhpark): covert these variables as structure (i.e., recv_sys_t)
203+
extern bool is_pmem_recv;
204+
extern uint64_t pmem_recv_offset;
205+
extern uint64_t pmem_recv_size;
206+
207+
/** Recovery system data structure */
208+
//struct recv_sys_t{
209+
// ib_mutex_t mutex;
210+
/*!< mutex protecting the fields apply_log_recs,
211+
n_addrs, and the state field in each recv_addr struct */
212+
// ib_mutex_t writer_mutex;
213+
/*!< mutex coordinating
214+
flushing between recv_writer_thread and the recovery thread. */
215+
// ibool apply_log_recs;
216+
/*!< this is TRUE when log rec application to pages is allowed; this flag tells the
217+
i/o-handler if it should do log record application */
218+
// byte* buf; /*!< buffer for parsing log records */
219+
// ulint len; /*!< amount of data in buf */
220+
//};
221+
196222
#endif /* __PMEMMAPOBJ_H__ */

0 commit comments

Comments
 (0)