Merge pull request #7 from meeeejin/develop

Fix the read fail error

Author: meeeejin

storage/innobase/buf/buf0buf.cc

@@ -4550,7 +4550,21 @@ buf_page_get_gen(
 				"innodb_page_corruption_retries",
 				retries = BUF_PAGE_READ_MAX_RETRIES;
 			);
+
+#ifdef UNIV_NVDIMM_CACHE
+            buf_pool_t* after_buf_pool = buf_pool_get(page_id);
+
+            if (buf_pool->instance_no != after_buf_pool->instance_no) {
+                /*ib::info() << buf_pool->instance_no << " != " 
+                    << after_buf_pool->instance_no << " for " 
+                    << page_id.space() << " " << page_id.page_no();*/    
+                buf_pool = after_buf_pool;
+            }
+#endif /* UNIV_NVDIMM_CACHE */
 		} else {
+            /* mijin */
+            buf_pool_t* after_buf_pool = buf_pool_get(page_id);
+
 			ib::fatal() << "Unable to read page " << page_id
 				<< " into the buffer pool after "
 				<< BUF_PAGE_READ_MAX_RETRIES << " attempts."
@@ -4562,7 +4576,9 @@ buf_page_get_gen(
 				" you can try to fix this problem by using"
 				" innodb_force_recovery."
 				" Please see " REFMAN " for more"
-				" details. Aborting...";
+				" details. Aborting...before "
+                << buf_pool->instance_no << " after "
+                << after_buf_pool->instance_no;
 		}
 
 #if defined UNIV_DEBUG || defined UNIV_BUF_DEBUG

storage/innobase/buf/buf0flu.cc

@@ -1114,10 +1114,10 @@ buf_flush_write_block_low(
 
         if (nvdimm_page == NULL)    goto normal;
 
-        ib::info() << "page_id = " << bpage->id.space()
+        /*ib::info() << "page_id = " << bpage->id.space()
             << " offset = " << bpage->id.page_no() 
             << " dst = " << &(((buf_block_t *)nvdimm_page)->frame) << " src = " << &(((buf_block_t *)bpage)->frame)
-            << " flush-type = " << bpage->flush_type;
+            << " flush-type = " << bpage->flush_type;*/
         memcpy(((buf_block_t *)nvdimm_page)->frame, ((buf_block_t *)bpage)->frame, UNIV_PAGE_SIZE);
 
         /* Set the oldest LSN of the NVDIMM page to the previous newest LSN. */

storage/innobase/buf/buf0lru.cc

@@ -1175,16 +1175,6 @@ buf_LRU_get_free_only(
 		ut_d(block->page.in_free_list = FALSE);
 		ut_ad(!block->page.in_flush_list);
 		ut_ad(!block->page.in_LRU_list);
-        /* mijin */
-		if (buf_page_in_file(&block->page)) {
-            ib::info() << "not free: "
-                    << (&block->page)->id.space() << " "
-                    << (&block->page)->id.page_no() << " in "
-                    << buf_pool->instance_no
-                    << " state = " << (&block->page)->state
-                    << " io = " << (&block->page)->io_fix
-                    << " total = " << UT_LIST_GET_LEN(buf_pool->free);
-        }
         ut_a(!buf_page_in_file(&block->page));
 		UT_LIST_REMOVE(buf_pool->free, &block->page);