From b6c2afab3c4f37be60f14ce79d63ca26f1b4b759 Mon Sep 17 00:00:00 2001 From: cosven Date: Thu, 5 Nov 2020 09:46:27 +0000 Subject: [PATCH 1/4] add argo files for bank2-compaction --- argo/cron/bank2-compaction.yaml | 50 +++++++++++++++++++++++++++++ argo/workflow/bank2-compaction.yaml | 35 ++++++++++++++++++++ config/tikv/compaction.toml | 23 +++++++++++++ 3 files changed, 108 insertions(+) create mode 100644 argo/cron/bank2-compaction.yaml create mode 100644 argo/workflow/bank2-compaction.yaml create mode 100644 config/tikv/compaction.toml diff --git a/argo/cron/bank2-compaction.yaml b/argo/cron/bank2-compaction.yaml new file mode 100644 index 00000000..343ffe02 --- /dev/null +++ b/argo/cron/bank2-compaction.yaml @@ -0,0 +1,50 @@ +# maintainer: cosven + +metadata: + name: tipocket-bank2-compaction +spec: + schedule: "0 6 * * *" + concurrencyPolicy: "Forbid" + timezone: "Asia/Shanghai" + startingDeadlineSeconds: 0 + workflowSpec: + # select the template `main` as the the entrypoint + entrypoint: main + templates: + - name: main + steps: + - - name: call-wait-cluster + templateRef: + name: wait-cluster + template: wait-cluster + arguments: + parameters: + - name: ns + value: "{{workflow.parameters.ns}}" + - - name: call-tipocket-scbank2 + templateRef: + # the template `tipocket-scbank2` refers to the argo + # template defined in argo/template/sc_bank2.yaml + name: tipocket-scbank2 + template: tipocket-scbank2 + arguments: + parameters: + - name: ns + value: tipocket-bank2-compaction + - name: purge + value: "true" + - name: image-version + value: nightly + # NOTE: differenct K8s cluster has different storage-class name + - name: storage-class + value: sas + - name: run-time + value: "6h" + - name: tikv-replicas + value: "5" + - name: tikv-config + value: "/config/tikv/compaction.toml" + - name: namesis + value: "random_kill,partition_one,subcritical_skews,shuffle-leader-scheduler,shuffle-region-scheduler" + - name: tidb-replica-read + value: "leader-and-follower" diff --git a/argo/workflow/bank2-compaction.yaml b/argo/workflow/bank2-compaction.yaml new file mode 100644 index 00000000..4e660678 --- /dev/null +++ b/argo/workflow/bank2-compaction.yaml @@ -0,0 +1,35 @@ +# maintainer: cosven + +metadata: + generateName: tipocket-bank2-compaction- + namespace: argo +spec: + entrypoint: main + templates: + - name: main + steps: + - - name: call-tipocket-scbank2 + templateRef: + name: tipocket-scbank2 + template: tipocket-scbank2 + arguments: + parameters: + - name: ns + value: tipocket-bank2-compaction + # reserve tidb-cluster after test finished + - name: purge + value: "false" + - name: image-version + value: nightly + - name: storage-class + value: local-storage + - name: run-time + value: "2h" + - name: tikv-replicas + value: "5" + - name: tikv-config + value: "/config/tikv/compaction.toml" + - name: namesis + value: "random_kill,partition_one,subcritical_skews,shuffle-leader-scheduler,shuffle-region-scheduler" + - name: tidb-replica-read + value: "leader-and-follower" diff --git a/config/tikv/compaction.toml b/config/tikv/compaction.toml new file mode 100644 index 00000000..de34174a --- /dev/null +++ b/config/tikv/compaction.toml @@ -0,0 +1,23 @@ +# maintainer: cosven + +[gc] +enable-compaction-filter = true +compaction-filter-skip-version-check = true + +[coprocessor] +consistency-check-method = "mvcc" + +[raftstore] +consistency-check-interval = "180s" + +[rocksdb] +force-consistency-checks = true + +[rocksdb.defaultcf] +enable-compaction-guard = true + +[rocksdb.writecf] +enable-compaction-guard = true + +[rocksdb.lockcf] +enable-compaction-guard = true \ No newline at end of file From 3ccaa8d8fa9727102869e9196a264e553db13ae9 Mon Sep 17 00:00:00 2001 From: cosven Date: Thu, 5 Nov 2020 10:08:37 +0000 Subject: [PATCH 2/4] address comments --- config/tikv/compaction.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/tikv/compaction.toml b/config/tikv/compaction.toml index de34174a..065830b3 100644 --- a/config/tikv/compaction.toml +++ b/config/tikv/compaction.toml @@ -20,4 +20,4 @@ enable-compaction-guard = true enable-compaction-guard = true [rocksdb.lockcf] -enable-compaction-guard = true \ No newline at end of file +enable-compaction-guard = true From ea086675a3bfd674d383f1f802c652fcb2007dfe Mon Sep 17 00:00:00 2001 From: cosven Date: Fri, 6 Nov 2020 02:38:42 +0000 Subject: [PATCH 3/4] rename bank-compaction to bank-compaction-opt --- argo/cron/bank2-compaction-opt.yaml | 53 +++++++++++++++++++ ...n.yaml => titan-bank2-compaction-opt.yaml} | 4 +- ...paction.yaml => bank2-compaction-opt.yaml} | 4 +- .../{compaction.toml => compaction-opt.toml} | 5 +- config/tikv/titan-compaction-opt.toml | 26 +++++++++ 5 files changed, 86 insertions(+), 6 deletions(-) create mode 100644 argo/cron/bank2-compaction-opt.yaml rename argo/cron/{bank2-compaction.yaml => titan-bank2-compaction-opt.yaml} (93%) rename argo/workflow/{bank2-compaction.yaml => bank2-compaction-opt.yaml} (92%) rename config/tikv/{compaction.toml => compaction-opt.toml} (85%) create mode 100644 config/tikv/titan-compaction-opt.toml diff --git a/argo/cron/bank2-compaction-opt.yaml b/argo/cron/bank2-compaction-opt.yaml new file mode 100644 index 00000000..d22fd8c3 --- /dev/null +++ b/argo/cron/bank2-compaction-opt.yaml @@ -0,0 +1,53 @@ +# maintainer: cosven +# +# a workflow for debugging bank2-compaction-opt + + +metadata: + name: tipocket-bank2-compaction-opt +spec: + schedule: "0 6 * * *" + concurrencyPolicy: "Forbid" + timezone: "Asia/Shanghai" + startingDeadlineSeconds: 0 + workflowSpec: + # select the template `main` as the the entrypoint + entrypoint: main + templates: + - name: main + steps: + - - name: call-wait-cluster + templateRef: + name: wait-cluster + template: wait-cluster + arguments: + parameters: + - name: ns + value: "{{workflow.parameters.ns}}" + - - name: call-tipocket-scbank2 + templateRef: + # the template `tipocket-scbank2` refers to the argo + # template defined in argo/template/sc_bank2.yaml + name: tipocket-scbank2 + template: tipocket-scbank2 + arguments: + parameters: + - name: ns + value: tipocket-titan-bank2-compaction + - name: purge + value: "true" + - name: image-version + value: nightly + # NOTE: differenct K8s cluster has different storage-class name + - name: storage-class + value: sas + - name: run-time + value: "6h" + - name: tikv-replicas + value: "5" + - name: tikv-config + value: "/config/tikv/compaction-opt.toml" + - name: namesis + value: "random_kill,partition_one,subcritical_skews,shuffle-leader-scheduler,shuffle-region-scheduler" + - name: tidb-replica-read + value: "leader-and-follower" diff --git a/argo/cron/bank2-compaction.yaml b/argo/cron/titan-bank2-compaction-opt.yaml similarity index 93% rename from argo/cron/bank2-compaction.yaml rename to argo/cron/titan-bank2-compaction-opt.yaml index 343ffe02..71da83ef 100644 --- a/argo/cron/bank2-compaction.yaml +++ b/argo/cron/titan-bank2-compaction-opt.yaml @@ -1,7 +1,7 @@ # maintainer: cosven metadata: - name: tipocket-bank2-compaction + name: tipocket-titan-bank2-compaction-opt spec: schedule: "0 6 * * *" concurrencyPolicy: "Forbid" @@ -43,7 +43,7 @@ spec: - name: tikv-replicas value: "5" - name: tikv-config - value: "/config/tikv/compaction.toml" + value: "/config/tikv/titan-compaction-opt.toml" - name: namesis value: "random_kill,partition_one,subcritical_skews,shuffle-leader-scheduler,shuffle-region-scheduler" - name: tidb-replica-read diff --git a/argo/workflow/bank2-compaction.yaml b/argo/workflow/bank2-compaction-opt.yaml similarity index 92% rename from argo/workflow/bank2-compaction.yaml rename to argo/workflow/bank2-compaction-opt.yaml index 4e660678..43b1a1aa 100644 --- a/argo/workflow/bank2-compaction.yaml +++ b/argo/workflow/bank2-compaction-opt.yaml @@ -1,7 +1,9 @@ # maintainer: cosven +# +# a workflow for debugging bank2-compaction-opt metadata: - generateName: tipocket-bank2-compaction- + generateName: tipocket-bank2-compaction-opt- namespace: argo spec: entrypoint: main diff --git a/config/tikv/compaction.toml b/config/tikv/compaction-opt.toml similarity index 85% rename from config/tikv/compaction.toml rename to config/tikv/compaction-opt.toml index 065830b3..cba8834b 100644 --- a/config/tikv/compaction.toml +++ b/config/tikv/compaction-opt.toml @@ -15,9 +15,8 @@ force-consistency-checks = true [rocksdb.defaultcf] enable-compaction-guard = true +target-file-size-base = 128M [rocksdb.writecf] enable-compaction-guard = true - -[rocksdb.lockcf] -enable-compaction-guard = true +target-file-size-base = 128M diff --git a/config/tikv/titan-compaction-opt.toml b/config/tikv/titan-compaction-opt.toml new file mode 100644 index 00000000..adaf1ffd --- /dev/null +++ b/config/tikv/titan-compaction-opt.toml @@ -0,0 +1,26 @@ +# maintainer: cosven + +[gc] +enable-compaction-filter = true +compaction-filter-skip-version-check = true + +[coprocessor] +consistency-check-method = "mvcc" + +[raftstore] +consistency-check-interval = "180s" + +[rocksdb] +force-consistency-checks = true + +[rocksdb.titan] +enabled = true +max-background-gc = 3 # default 1 + +[rocksdb.defaultcf] +enable-compaction-guard = true +target-file-size-base = 128M # default 8M + +[rocksdb.writecf] +enable-compaction-guard = true +target-file-size-base = 128M From 754c35bee216352eee63262bc1bfe1f8caae5dab Mon Sep 17 00:00:00 2001 From: cosven Date: Fri, 6 Nov 2020 06:01:21 +0000 Subject: [PATCH 4/4] fix toml config --- config/tikv/compaction-opt.toml | 4 ++-- config/tikv/titan-compaction-opt.toml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/config/tikv/compaction-opt.toml b/config/tikv/compaction-opt.toml index cba8834b..c6861dc8 100644 --- a/config/tikv/compaction-opt.toml +++ b/config/tikv/compaction-opt.toml @@ -15,8 +15,8 @@ force-consistency-checks = true [rocksdb.defaultcf] enable-compaction-guard = true -target-file-size-base = 128M +target-file-size-base = "128M" [rocksdb.writecf] enable-compaction-guard = true -target-file-size-base = 128M +target-file-size-base = "128M" diff --git a/config/tikv/titan-compaction-opt.toml b/config/tikv/titan-compaction-opt.toml index adaf1ffd..9423ede2 100644 --- a/config/tikv/titan-compaction-opt.toml +++ b/config/tikv/titan-compaction-opt.toml @@ -19,8 +19,8 @@ max-background-gc = 3 # default 1 [rocksdb.defaultcf] enable-compaction-guard = true -target-file-size-base = 128M # default 8M +target-file-size-base = "128M" # default 8M [rocksdb.writecf] enable-compaction-guard = true -target-file-size-base = 128M +target-file-size-base = "128M"