Skip to content

Commit 361591c

Browse files
committed
Remove unnecessary comments
1 parent 6da3afd commit 361591c

File tree

7 files changed

+8
-23
lines changed

7 files changed

+8
-23
lines changed

my-origin.cnf

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ innodb_page_size=4KB
4646
innodb_file_per_table=1
4747

4848
#buffer settings
49-
innodb_buffer_pool_size=5000M
49+
innodb_buffer_pool_size=5G
5050
innodb_buffer_pool_instances=8
5151
innodb_max_dirty_pages_pct_lwm=0
5252

@@ -64,7 +64,7 @@ innodb_log_buffer_size=32M
6464
innodb_flush_neighbors=0
6565

6666
#doublewrite and flush method
67-
innodb_doublewrite=OFF
67+
innodb_doublewrite=ON
6868
innodb_flush_method=O_DIRECT
6969

7070
#AIO control

my.cnf

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -57,8 +57,8 @@ innodb_page_cleaners=8
5757
#nvdimm settings
5858
innodb_use_nvdimm_buffer=true
5959
innodb_nvdimm_buffer_pool_size=1G
60-
innodb_nvdimm_buffer_pool_instances=2
61-
innodb_nvdimm_pc_threshold_pct=10
60+
innodb_nvdimm_buffer_pool_instances=1
61+
innodb_nvdimm_pc_threshold_pct=15
6262

6363
#transaction log settings
6464
innodb_log_file_size=2G
@@ -70,7 +70,7 @@ innodb_log_buffer_size=32M
7070
innodb_flush_neighbors=0
7171

7272
#doublewrite and flush method
73-
innodb_doublewrite=OFF
73+
innodb_doublewrite=ON
7474
innodb_flush_method=O_DIRECT
7575

7676
#AIO control

storage/innobase/buf/.buf0flu.cc.swp

4 KB
Binary file not shown.

storage/innobase/buf/.buf0lru.cc.swp

-88 KB
Binary file not shown.

storage/innobase/buf/buf0buf.cc

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -6169,14 +6169,6 @@ buf_page_io_complete(
61696169
if (uncompressed) {
61706170
rw_lock_sx_unlock_gen(&((buf_block_t*) bpage)->lock,
61716171
BUF_IO_WRITE);
6172-
6173-
if (bpage->id.space() == 30) {
6174-
ib::info() << bpage->id.space() << " " << bpage->id.page_no()
6175-
<< " is unlocked from " << bpage->buf_pool_index
6176-
<< " with " << bpage->flush_type
6177-
<< " cached? " << bpage->cached_in_nvdimm
6178-
<< " moved? " << bpage->moved_to_nvdimm;
6179-
}
61806172
}
61816173

61826174
buf_pool->stat.n_pages_written++;

storage/innobase/buf/buf0flu.cc

Lines changed: 3 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1104,18 +1104,14 @@ buf_flush_write_block_low(
11041104
/* Set the oldest LSN of the NVDIMM page to the previous newest LSN. */
11051105
buf_flush_note_modification((buf_block_t *)nvdimm_page, bpage->newest_modification, bpage->newest_modification, nvdimm_page->flush_observer);
11061106

1107-
ib::info() << bpage->id.space() << " " << bpage->id.page_no()
1108-
<< " before io_complete " << bpage->buf_pool_index
1109-
<< " with " << bpage->flush_type;
1110-
11111107
/* Remove the target page from the original buffer pool. */
11121108
buf_page_io_complete(bpage, true);
11131109
buf_page_io_complete(nvdimm_page);
11141110

1115-
buf_pool_t* buf_pool = buf_pool_from_bpage(nvdimm_page);
1111+
/*buf_pool_t* buf_pool = buf_pool_from_bpage(nvdimm_page);
11161112
ib::info() << nvdimm_page->id.space() << " "
11171113
<< nvdimm_page->id.page_no() << " is moved to "
1118-
<< nvdimm_page->buf_pool_index << " from " << bpage->buf_pool_index;
1114+
<< nvdimm_page->buf_pool_index << " from " << bpage->buf_pool_index;*/
11191115
} else {
11201116
bpage->moved_to_nvdimm = false;
11211117

@@ -1296,7 +1292,7 @@ buf_flush_page(
12961292

12971293
if ((page_type == FIL_PAGE_INDEX || page_type == FIL_PAGE_RTREE) /* Index page */
12981294
&& page_is_leaf(frame) /* Leaf page */) {
1299-
ib::info() << bpage->id.space() << " " << bpage->id.page_no() << " ready to move nvdimm.. " << bpage->flush_type;
1295+
/* ib::info() << bpage->id.space() << " " << bpage->id.page_no() << " ready to move nvdimm.. " << bpage->flush_type;*/
13001296
bpage->moved_to_nvdimm = true;
13011297
srv_stats.nvdimm_pages_stored_ol.inc();
13021298
}
@@ -2304,7 +2300,6 @@ buf_flush_single_page_from_LRU(
23042300

23052301
buf_pool_mutex_enter(buf_pool);
23062302

2307-
ib::info() << "start spf " << buf_pool->instance_no;
23082303
for (bpage = buf_pool->single_scan_itr.start(), scanned = 0,
23092304
freed = false;
23102305
bpage != NULL;
@@ -2365,8 +2360,6 @@ buf_flush_single_page_from_LRU(
23652360

23662361
ut_ad(!mutex_own(block_mutex));
23672362
}
2368-
ib::info() << "finish spf " << buf_pool->instance_no << " scanned = "
2369-
<< scanned << " free? " << freed;
23702363

23712364
if (!freed) {
23722365
/* Can't find a single flushable page. */
16 KB
Binary file not shown.

0 commit comments

Comments
 (0)