[Feature] Issue#26 ADD TOKUDB_CPU_NUMS TO CONTROL TokuDB CPU NUMS

AliSQL · AliSQL · commit e04735005439 · 2016-10-08T12:36:30.000+08:00
diff --git a/mysql-test/suite/rds/r/tokudb.result b/mysql-test/suite/rds/r/tokudb.result
@@ -281,6 +281,9 @@ Tokudb_rows_inserted	41
 Tokudb_rows_read	98
 Tokudb_rows_deleted	8
 Tokudb_rows_updated	19
+show variables like 'tokudb_cpu_nums';
+Variable_name	Value
+tokudb_cpu_nums	0
 # Restart server.
 DROP TABLE t1;
 DROP TABLE t2;
diff --git a/mysql-test/suite/rds/t/tokudb.test b/mysql-test/suite/rds/t/tokudb.test
@@ -183,6 +183,7 @@ SELECT MAX(c1) FROM t3;
 --sleep 2
 --let $innodb_status =`show engine tokudb status`
 show status like '%tokudb_rows%';
+show variables like 'tokudb_cpu_nums';
 
 #Restart the server to cover TC_LOG_MMAP recover logic
 --disable_reconnect
diff --git a/storage/tokudb/ft-index/buildheader/db-4.6.19.h b/storage/tokudb/ft-index/buildheader/db-4.6.19.h
@@ -1713,6 +1713,7 @@ struct __db {
 	int  (*set_bt_prefix)
 		__P((DB *, size_t (*)(DB *, const DBT *, const DBT *)));
 	int  (*set_cachesize) __P((DB *, uint32_t, uint32_t, int));
+	int  (*set_cpunums) __P((DB *, int));
 	int  (*set_dup_compare)
 		__P((DB *, int (*)(DB *, const DBT *, const DBT *)));
 	int  (*set_encrypt) __P((DB *, const char *, uint32_t));
@@ -2402,6 +2403,7 @@ struct __db_env {
 	int  (*set_app_dispatch)
 		__P((DB_ENV *, int (*)(DB_ENV *, DBT *, DB_LSN *, db_recops)));
 	int  (*set_cachesize) __P((DB_ENV *, uint32_t, uint32_t, int));
+	int  (*set_cpunums) __P((DB_ENV *, int));
 	int  (*set_cache_max) __P((DB_ENV *, uint32_t, uint32_t));
 	int  (*set_data_dir) __P((DB_ENV *, const char *));
 	int  (*set_encrypt) __P((DB_ENV *, const char *, uint32_t));
diff --git a/storage/tokudb/ft-index/buildheader/make_tdb.cc b/storage/tokudb/ft-index/buildheader/make_tdb.cc
@@ -387,6 +387,7 @@ static void print_db_env_struct (void) {
     STRUCT_SETUP(DB_ENV, log_flush, "int  (*%s) (DB_ENV *, const DB_LSN *)");
     STRUCT_SETUP(DB_ENV, open, "int  (*%s) (DB_ENV *, const char *, uint32_t, int)");
     STRUCT_SETUP(DB_ENV, set_cachesize, "int  (*%s) (DB_ENV *, uint32_t, uint32_t, int)");
+    STRUCT_SETUP(DB_ENV, set_cpunums, "int  (*%s) (DB_ENV *, int)");
     STRUCT_SETUP(DB_ENV, set_data_dir, "int  (*%s) (DB_ENV *, const char *)");
 #if DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR == 1
     STRUCT_SETUP(DB_ENV, set_errcall, "void (*%s) (DB_ENV *, void (*)(const char *, char *))");
diff --git a/storage/tokudb/ft-index/portability/portability.cc b/storage/tokudb/ft-index/portability/portability.cc
@@ -170,6 +170,8 @@ toku_os_get_number_processors(void) {
     return sysconf(_SC_NPROCESSORS_CONF);
 }
 
+int toku_cpu_nums;
+
 int
 toku_os_get_number_active_processors(void) {
     int n = sysconf(_SC_NPROCESSORS_ONLN);
@@ -184,6 +186,8 @@ toku_os_get_number_active_processors(void) {
         }
     }
 #endif
+    if (toku_cpu_nums > 0 && toku_cpu_nums < n)
+        n = toku_cpu_nums;
     return n;
 }
 
diff --git a/storage/tokudb/ft-index/src/ydb.cc b/storage/tokudb/ft-index/src/ydb.cc
@@ -1262,6 +1262,14 @@ env_set_cachesize(DB_ENV * env, uint32_t gbytes, uint32_t bytes, int ncache) {
     return 0;
 }
 
+static int
+env_set_cpunums(DB_ENV * env, int nums) {
+    (void)env;
+    extern int toku_cpu_nums;
+    toku_drd_unsafe_set(&toku_cpu_nums, nums);
+    return 0;
+}
+
 static int env_dbremove(DB_ENV * env, DB_TXN *txn, const char *fname, const char *dbname, uint32_t flags);
 
 static int
@@ -2599,6 +2607,7 @@ toku_env_create(DB_ENV ** envp, uint32_t flags) {
     USENV(cleaner_get_period);
     USENV(cleaner_set_iterations);
     USENV(cleaner_get_iterations);
+    USENV(set_cpunums);
     USENV(set_cachesize);
 #if DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR >= 3
     USENV(get_cachesize);
diff --git a/storage/tokudb/hatoku_hton.cc b/storage/tokudb/hatoku_hton.cc
@@ -252,6 +252,7 @@ static uint32_t tokudb_env_flags = 0;
 static my_bool tokudb_directio = FALSE;
 static my_bool tokudb_checkpoint_on_flush_logs = FALSE;
 static ulonglong tokudb_cache_size = 0;
+static int tokudb_cpu_nums = 0;
 static ulonglong tokudb_max_lock_memory = 0;
 static char *tokudb_home;
 static char *tokudb_tmp_dir;
@@ -511,6 +512,17 @@ static int tokudb_init_func(void *p) {
             goto error; 
         }
     }
+
+    if (tokudb_cpu_nums) {
+        DBUG_PRINT("info", ("tokudb_cpu_nums: %d\n", tokudb_cpu_nums));
+        r = db_env->set_cpunums(db_env, tokudb_cpu_nums);
+        if (r) {
+            DBUG_PRINT("info", ("set_cpunums %d\n", r));
+            goto error;
+        }
+    }
+
+
     if (tokudb_max_lock_memory == 0) {
         tokudb_max_lock_memory = tokudb_cache_size/8;
     }
@@ -1463,6 +1475,10 @@ static MYSQL_SYSVAR_ULONGLONG(cache_size, tokudb_cache_size,
     PLUGIN_VAR_READONLY, "TokuDB cache table size", NULL, NULL, 0,
     0, ~0ULL, 0);
 
+static MYSQL_SYSVAR_INT(cpu_nums, tokudb_cpu_nums,
+    PLUGIN_VAR_READONLY, "TokuDB CPU nums", NULL, NULL, 0,
+    0, 0, 0);
+
 static MYSQL_SYSVAR_ULONGLONG(max_lock_memory, tokudb_max_lock_memory, PLUGIN_VAR_READONLY, "TokuDB max memory for locks", NULL, NULL, 0, 0, ~0ULL, 0);
 static MYSQL_SYSVAR_ULONG(debug, tokudb_debug, 0, "TokuDB Debug", NULL, NULL, 0, 0, ~0UL, 0);
 
@@ -1492,6 +1508,7 @@ static MYSQL_SYSVAR_UINT(fsync_log_period, tokudb_fsync_log_period, 0, "TokuDB f
 
 static struct st_mysql_sys_var *tokudb_system_variables[] = {
     MYSQL_SYSVAR(cache_size),
+    MYSQL_SYSVAR(cpu_nums),
     MYSQL_SYSVAR(max_lock_memory),
     MYSQL_SYSVAR(data_dir),
     MYSQL_SYSVAR(log_dir),

Original file line number	Diff line number	Diff line change
`@@ -170,6 +170,8 @@ toku_os_get_number_processors(void) {`
`170`	`170`	`return sysconf(_SC_NPROCESSORS_CONF);`
`171`	`171`	`}`
`172`	`172`
	`173`	`+int toku_cpu_nums;`
	`174`	`+`
`173`	`175`	`int`
`174`	`176`	`toku_os_get_number_active_processors(void) {`
`175`	`177`	`int n = sysconf(_SC_NPROCESSORS_ONLN);`
`@@ -184,6 +186,8 @@ toku_os_get_number_active_processors(void) {`
`184`	`186`	`}`
`185`	`187`	`}`
`186`	`188`	`#endif`
	`189`	`+ if (toku_cpu_nums > 0 && toku_cpu_nums < n)`
	`190`	`+ n = toku_cpu_nums;`
`187`	`191`	`return n;`
`188`	`192`	`}`
`189`	`193`