Need to fix signal 11 error caused by spf

Author: meeeejin

storage/innobase/buf/buf0buf.cc

@@ -2048,6 +2048,7 @@ nvdimm_buf_pool_init(
 		}
 	}
 
+    //nvdimm_buf_LRU_old_ratio_update(95, FALSE);
     nvdimm_buf_LRU_old_ratio_update(100 * 3 / 8, FALSE);
 
     return(DB_SUCCESS);
@@ -6168,7 +6169,15 @@ buf_page_io_complete(
 		if (uncompressed) {
 			rw_lock_sx_unlock_gen(&((buf_block_t*) bpage)->lock,
 					      BUF_IO_WRITE);
-		}
+
+            if (bpage->id.space() == 30) {
+                ib::info() << bpage->id.space() << " " << bpage->id.page_no()
+                    <<  " is unlocked from " << bpage->buf_pool_index
+                    << " with " << bpage->flush_type
+                    << " cached? " << bpage->cached_in_nvdimm
+                    << " moved? " << bpage->moved_to_nvdimm;
+            }
+        }
 
 		buf_pool->stat.n_pages_written++;
 
@@ -6189,7 +6198,6 @@ buf_page_io_complete(
                 srv_stats.nvdimm_pages_written_no.inc();
             }
 #endif /* UNIV_NVDIMM_CACHE_NO */
-            bpage->cached_in_nvdimm = false;
         }
 #endif /* UNIV_NVDIMM_CACHE */
 
@@ -6212,6 +6220,7 @@ buf_page_io_complete(
 			buf_LRU_free_page(bpage, true);
 #ifdef NVDIMM_CACHE
             bpage->moved_to_nvdimm = false;
+            bpage->cached_in_nvdimm = false;
 #endif /* NVDIMM_CACHE */
 		} else {
 			mutex_exit(buf_page_get_mutex(bpage));

storage/innobase/buf/buf0dblwr.cc

@@ -727,9 +727,10 @@ buf_dblwr_update(
 	if (!srv_use_doublewrite_buf
 	    || buf_dblwr == NULL
 	    || fsp_is_system_temporary(bpage->id.space())
-//#ifdef UNIV_NVDIMM_CACHE
- //       || bpage->cached_in_nvdimm
-//#endif /* UNIV_NVDIMM_CACHE */       
+#ifdef UNIV_NVDIMM_CACHE
+        || bpage->cached_in_nvdimm
+        || bpage->moved_to_nvdimm
+#endif /* UNIV_NVDIMM_CACHE */       
        ) {
 		return;
 	}
@@ -764,32 +765,6 @@ buf_dblwr_update(
 		break;
 	case BUF_FLUSH_SINGLE_PAGE:
 		{
-#ifdef UNIV_NVDIMM_CACHE
-            if (!bpage->moved_to_nvdimm && !bpage->cached_in_nvdimm) {
-                const ulint size = 2 * TRX_SYS_DOUBLEWRITE_BLOCK_SIZE;
-                ulint i;
-                mutex_enter(&buf_dblwr->mutex);
-                for (i = srv_doublewrite_batch_size; i < size; ++i) {
-                    if (buf_dblwr->buf_block_arr[i] == bpage) {
-                        buf_dblwr->s_reserved--;
-                        buf_dblwr->buf_block_arr[i] = NULL;
-                        buf_dblwr->in_use[i] = false;
-                        break;
-                    }
-                }
-
-                /* The block we are looking for must exist as a
-                   reserved block. */
-                if (i >= size) {
-                    ib::info() << bpage->id.space() << " " 
-                        << bpage->id.page_no() << " in " << bpage->buf_pool_index
-                        << " cached? " << bpage->cached_in_nvdimm
-                        << " moved? " << bpage->moved_to_nvdimm
-                        << " " << i << " ? " << size << " " << srv_doublewrite_batch_size;
-                }
-                ut_a(i < size);
-            }
-#else
             const ulint size = 2 * TRX_SYS_DOUBLEWRITE_BLOCK_SIZE;
             ulint i;
             mutex_enter(&buf_dblwr->mutex);
@@ -805,7 +780,6 @@ buf_dblwr_update(
             /* The block we are looking for must exist as a
                reserved block. */
             ut_a(i < size);
-#endif /* UNIV_NVDIMM_CACHE */
 		}
 		os_event_set(buf_dblwr->s_event);
 		mutex_exit(&buf_dblwr->mutex);
@@ -924,13 +898,6 @@ buf_dblwr_write_block_to_datafile(
 	bool			sync)	/*!< in: true if sync IO
 					is requested */
 {
-    
-    if (!buf_page_in_file(bpage)) {
-    ib::info() << bpage->id.space() << " " 
-        << bpage->id.page_no() << " in " << bpage->buf_pool_index
-        << " " << sync << " " << buf_page_get_state(bpage);
-    }
-         
     ut_a(buf_page_in_file(bpage));
 
 	ulint	type = IORequest::WRITE;
@@ -1186,11 +1153,6 @@ buf_dblwr_add_to_batch(
 	ut_ad(buf_dblwr->first_free == buf_dblwr->b_reserved);
 	ut_ad(buf_dblwr->b_reserved <= srv_doublewrite_batch_size);
 
-    ib::info() << bpage->id.space() << " " << bpage->id.page_no()
-        << " in " << bpage->buf_pool_index
-        << " with " << bpage->flush_type
-        << " dwb total = " << buf_dblwr->first_free;
-
 	if (buf_dblwr->first_free == srv_doublewrite_batch_size) {
 		mutex_exit(&(buf_dblwr->mutex));
 

storage/innobase/buf/buf0flu.cc

@@ -1103,17 +1103,22 @@ buf_flush_write_block_low(
 
         /* Set the oldest LSN of the NVDIMM page to the previous newest LSN. */
         buf_flush_note_modification((buf_block_t *)nvdimm_page, bpage->newest_modification, bpage->newest_modification, nvdimm_page->flush_observer);
-
+        
+        ib::info() << bpage->id.space() << " " << bpage->id.page_no()
+            <<  " before io_complete " << bpage->buf_pool_index
+            << " with " << bpage->flush_type;
+        
         /* Remove the target page from the original buffer pool. */
-        buf_page_io_complete(nvdimm_page);
         buf_page_io_complete(bpage, true);
+        buf_page_io_complete(nvdimm_page);
 
         buf_pool_t*	buf_pool = buf_pool_from_bpage(nvdimm_page);
         ib::info() << nvdimm_page->id.space() << " "
                 << nvdimm_page->id.page_no() << " is moved to "
-                << nvdimm_page->buf_pool_index << " ?= " << buf_pool->instance_no << " and " << bpage->buf_pool_index
-                << " total = " << UT_LIST_GET_LEN(buf_pool->free);
+                << nvdimm_page->buf_pool_index << " from " << bpage->buf_pool_index;
     } else {
+        bpage->moved_to_nvdimm = false;
+
         if (!srv_use_doublewrite_buf
             || buf_dblwr == NULL
             || srv_read_only_mode
@@ -1148,9 +1153,15 @@ buf_flush_write_block_low(
            and we flush the changes to disk only for the tablespace we
            are working on. */
         if (sync) {
-            ut_ad(flush_type == BUF_FLUSH_SINGLE_PAGE);
-            fil_flush(bpage->id.space());
-
+            if (!bpage->cached_in_nvdimm) {
+                ut_ad(flush_type == BUF_FLUSH_SINGLE_PAGE);
+                fil_flush(bpage->id.space());
+            }
+            
+            /*ib::info() << bpage->id.space() << " "
+                << bpage->id.page_no() << " is spf "
+                << bpage->buf_pool_index << " cached? " << bpage->cached_in_nvdimm;
+*/
             /* true means we want to evict this page from the
                LRU list as well. */
             buf_page_io_complete(bpage, true);
@@ -1285,7 +1296,7 @@ buf_flush_page(
 
             if ((page_type == FIL_PAGE_INDEX || page_type == FIL_PAGE_RTREE) /* Index page */
                 && page_is_leaf(frame) /* Leaf page */) {
-                //ib::info() << bpage->id.space() << " " << bpage->id.page_no() << " " << bpage->flush_type;
+                ib::info() << bpage->id.space() << " " << bpage->id.page_no() << " ready to move nvdimm.. " << bpage->flush_type;
                 bpage->moved_to_nvdimm = true;
                 srv_stats.nvdimm_pages_stored_ol.inc();
             }
@@ -1316,21 +1327,6 @@ buf_flush_page(
         if (flush_type == BUF_FLUSH_LIST
 		    && is_uncompressed
 		    && !rw_lock_sx_lock_nowait(rw_lock, BUF_IO_WRITE)) {
-
-/*#ifdef UNIV_NVDIMM_CACHE
-            if (!bpage->moved_to_nvdimm) {
-                if (!fsp_is_system_temporary(bpage->id.space())) {
-  */                  /* avoiding deadlock possibility involves
-                    doublewrite buffer, should flush it, because
-                    it might hold the another block->lock. */
-    /*                buf_dblwr_flush_buffered_writes();
-                } else {
-                    buf_dblwr_sync_datafiles();
-                }
-            } else {
-                buf_dblwr_sync_datafiles();
-            }
-#else*/
             if (!fsp_is_system_temporary(bpage->id.space())) {
                 /* avoiding deadlock possibility involves
                 doublewrite buffer, should flush it, because
@@ -1339,7 +1335,6 @@ buf_flush_page(
             } else {
                 buf_dblwr_sync_datafiles();
             }    
-//#endif /* UNIV_NVDIMM_CACHE */
 			rw_lock_sx_lock_gen(rw_lock, BUF_IO_WRITE);
 		}
 
@@ -1362,7 +1357,6 @@ buf_flush_page(
 		buffer pool or removed from flush_list or LRU_list. */
 
 		buf_flush_write_block_low(bpage, flush_type, sync);
-	
     }
 
 	return(flush);
@@ -2310,6 +2304,7 @@ buf_flush_single_page_from_LRU(
 
 	buf_pool_mutex_enter(buf_pool);
 
+    ib::info() << "start spf " << buf_pool->instance_no;
 	for (bpage = buf_pool->single_scan_itr.start(), scanned = 0,
 	     freed = false;
 	     bpage != NULL;
@@ -2320,8 +2315,8 @@ buf_flush_single_page_from_LRU(
 		buf_page_t*	prev = UT_LIST_GET_PREV(LRU, bpage);
 
 #ifdef UNIV_NVDIMM_CACHE
-        if (prev == NULL/* && buf_pool->instance_no == 8*/) {
-            ib::info() << "null error in " << buf_pool->instance_no;
+        if (!prev/* && buf_pool->instance_no == 8*/) {
+            ib::info() << UT_LIST_GET_LEN(buf_pool->LRU) << " error in " << buf_pool->instance_no;
             break;
         }
 #endif /* UNIV_NVDIMM_CACHE */
@@ -2370,6 +2365,8 @@ buf_flush_single_page_from_LRU(
 
         ut_ad(!mutex_own(block_mutex));
 	}
+    ib::info() << "finish spf " << buf_pool->instance_no << " scanned = " 
+        << scanned << " free? " << freed;
 
 	if (!freed) {
 		/* Can't find a single flushable page. */

storage/innobase/buf/buf0lru.cc

@@ -1443,7 +1443,7 @@ buf_LRU_get_free_block(
 	involved (particularly in case of compressed pages). We
 	can do that in a separate patch sometime in future. */
 
-    //if (buf_pool->instance_no < 8) {
+    if (buf_pool->instance_no < 8) {
         if (!buf_flush_single_page_from_LRU(buf_pool)) {
             MONITOR_INC(MONITOR_LRU_SINGLE_FLUSH_FAILURE_COUNT);
             ++flush_failures;
@@ -1452,7 +1452,7 @@ buf_LRU_get_free_block(
         srv_stats.buf_pool_wait_free.add(n_iterations, 1);
 
         n_iterations++;
-    //}
+    }
 
 	goto loop;
 }

storage/innobase/include/buf0buf.ic

@@ -111,7 +111,7 @@ buf_pool_from_bpage(
         return(&nvdimm_buf_pool_ptr[0]);
     }    
 #ifdef UNIV_NVDIMM_CACHE_ST
-    if { /* Stock */
+    else { /* Stock */
         return(&nvdimm_buf_pool_ptr[1]);
     }
 #endif /* UNIV_NVDIMM_CACHE_ST */