Merge the current master and stock

Author: meeeejin

build.sh

@@ -18,21 +18,18 @@ sudo rm -rf CMakeFiles/*
 if [ "$1" = "--origin" ]; then
     # No caching
     BUILD_FLAGS=""
-elif [ "$1" = "--nc-ol" ]; then
+elif [ "$1" = "--nc" ]; then
     # Cache New-Orders and Order-Line pages
-    BUILD_FLAGS="-DUNIV_NVDIMM_CACHE -DUNIV_NVDIMM_CACHE_NO -DUNIV_NVDIMM_CACHE_OL"
+    BUILD_FLAGS="-DUNIV_NVDIMM_CACHE"
 elif [ "$1" = "--nc-st" ]; then
-    # Cache New-Orders and Stock pages
-    BUILD_FLAGS="-DUNIV_NVDIMM_CACHE -DUNIV_NVDIMM_CACHE_NO -DUNIV_NVDIMM_CACHE_ST"
-elif [ "$1" = "--nc-ol-st" ]; then
     # Cache New-Orders, Order-Line and Stock pages
-    BUILD_FLAGS="-DUNIV_NVDIMM_CACHE -DUNIV_NVDIMM_CACHE_NO -DUNIV_NVDIMM_CACHE_OL -DUNIV_NVDIMM_CACHE_ST"
-elif [ "$1" = "--mtr" ]; then
- 		# Cache New-Orders, Order-Line with mtr-logging enabled
-		BUILD_FLAGS="-DUNIV_NVDIMM_CACHE -DUNIV_NVDIMM_CACHE_NO -DUNIV_NVDIMM_CACHE_OL -DUNIV_LOG_HEADER"
+    BUILD_FLAGS="-DUNIV_NVDIMM_CACHE -DUNIV_NVDIMM_CACHE_ST"
+elif [ "$1" = "--nc-st-od" ]; then
+    # Cache New-Orders, Order-Line, Stock and Orders pages
+    BUILD_FLAGS="-DUNIV_NVDIMM_CACHE -DUNIV_NVDIMM_CACHE_ST -DUNIV_NVDIMM_CACHE_OD"
 else
     # Cache New-Orders and Order-Line pages (default)
-    BUILD_FLAGS="-DUNIV_NVDIMM_CACHE -DUNIV_NVDIMM_CACHE_NO -DUNIV_NVDIMM_CACHE_OL"
+    BUILD_FLAGS="-DUNIV_NVDIMM_CACHE"
 fi
 
 echo "Start build using $BUILD_FLAGS"

my-origin.cnf

@@ -46,7 +46,7 @@ innodb_page_size=4KB
 innodb_file_per_table=1
 
 #buffer settings
-innodb_buffer_pool_size=5000M
+innodb_buffer_pool_size=6G
 innodb_buffer_pool_instances=8
 innodb_max_dirty_pages_pct_lwm=0
 
@@ -64,7 +64,7 @@ innodb_log_buffer_size=32M
 innodb_flush_neighbors=0
 
 #doublewrite and flush method
-innodb_doublewrite=OFF
+innodb_doublewrite=ON
 innodb_flush_method=O_DIRECT
 
 #AIO control

my.cnf

@@ -46,7 +46,7 @@ innodb_page_size=4KB
 innodb_file_per_table=1
 
 #buffer settings
-innodb_buffer_pool_size=5G
+innodb_buffer_pool_size=4G
 innodb_buffer_pool_instances=8
 innodb_max_dirty_pages_pct_lwm=0
 
@@ -56,9 +56,9 @@ innodb_page_cleaners=8
 
 #nvdimm settings
 innodb_use_nvdimm_buffer=true
-innodb_nvdimm_buffer_pool_size=1G
-innodb_nvdimm_buffer_pool_instances=1
-innodb_nvdimm_pc_threshold_pct=5
+innodb_nvdimm_buffer_pool_size=2G
+innodb_nvdimm_buffer_pool_instances=2
+innodb_nvdimm_pc_threshold_pct=15
 
 #transaction log settings
 innodb_log_file_size=2G
@@ -70,7 +70,7 @@ innodb_log_buffer_size=32M
 innodb_flush_neighbors=0
 
 #doublewrite and flush method
-innodb_doublewrite=OFF
+innodb_doublewrite=ON
 innodb_flush_method=O_DIRECT
 
 #AIO control