change tikv config template (#1111)

* change tikv config template Signed-off-by: Little-Wallace <[email protected]> * fix roles default.yml Signed-off-by: Little-Wallace <[email protected]>
pingcap · Jan 14, 2020 · 46f858d · 46f858d
1 parent 73dd115
commit 46f858d
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 6 deletions.
diff --git a/conf/tikv.yml b/conf/tikv.yml
@@ -69,7 +69,7 @@ server:
   # grpc-concurrent-stream: 1024
 
   ## The number of connections with each TiKV server to send Raft messages.
-  # grpc-raft-conn-num: 10
+  # grpc-raft-conn-num: 1
 
   ## Amount to read ahead on individual gRPC streams.
   # grpc-stream-initial-window-size: "2MB"
@@ -103,8 +103,8 @@ server:
 storage:
   ## The number of slots in Scheduler latches, which controls write concurrency.
   ## In most cases you can use the default value. When importing data, you can set it to a larger
-  ## value.
-  # scheduler-concurrency: 2048000
+  ## value, but no more than 2097152
+  # scheduler-concurrency: 524288
 
   ## Scheduler's worker pool size, i.e. the number of write threads.
   ## It should be less than total CPU cores. When there are frequent write operations, set it to a
@@ -115,6 +115,11 @@ storage:
   ## When the pending write bytes exceeds this threshold, the "scheduler too busy" error is displayed.
   # scheduler-pending-write-threshold: "100MB"
 
+  ## TiKV will create a temporary file in {{data-dir}} to reserve some space, which is named 'space_placeholder_file'.
+  ## When the disk has no free space you could remove this temporary file so thath TiKV can execute compaction
+  ## job to reclaim disk space, which requires some extra temporary space.
+  # reserve-space: "2GB"
+
   block-cache:
     ## Whether to create a shared block cache for all RocksDB column families.
     ##

diff --git a/roles/tikv/vars/default.yml b/roles/tikv/vars/default.yml
@@ -69,7 +69,7 @@ server:
   # grpc-concurrent-stream: 1024
 
   ## The number of connections with each TiKV server to send Raft messages.
-  # grpc-raft-conn-num: 10
+  # grpc-raft-conn-num: 1
 
   ## Amount to read ahead on individual gRPC streams.
   # grpc-stream-initial-window-size: "2MB"
@@ -103,8 +103,8 @@ server:
 storage:
   ## The number of slots in Scheduler latches, which controls write concurrency.
   ## In most cases you can use the default value. When importing data, you can set it to a larger
-  ## value.
-  # scheduler-concurrency: 2048000
+  ## value, but no more than 2097152.
+  # scheduler-concurrency: 524288
 
   ## Scheduler's worker pool size, i.e. the number of write threads.
   ## It should be less than total CPU cores. When there are frequent write operations, set it to a
@@ -115,6 +115,12 @@ storage:
   ## When the pending write bytes exceeds this threshold, the "scheduler too busy" error is displayed.
   # scheduler-pending-write-threshold: "100MB"
 
+  ## TiKV will create a temporary file in {{data-dir}} to reserve some space, which is named 'space_placeholder_file'.
+  ## When the disk has no free space you could remove this temporary file so that TiKV can execute compaction
+  ## job to reclaim disk space, which requires some extra temporary space.
+  # reserve-space: "2GB"
+
+
   block-cache:
     ## Whether to create a shared block cache for all RocksDB column families.
     ##