Skip to content

Commit 33bd7e0

Browse files
mahjonpmahjonp
authored
Make case easily running on local environment (pingcap#283)
Signed-off-by: mahjonp <[email protected]>
1 parent 4ee880f commit 33bd7e0

87 files changed

Lines changed: 534 additions & 509 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎Makefile‎

Lines changed: 30 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -15,23 +15,44 @@ DOCKER_REGISTRY_PREFIX := $(if $(DOCKER_REGISTRY),$(DOCKER_REGISTRY)/,)
1515

1616
default: tidy fmt lint build
1717

18-
build: tidb pocket tpcc ledger txn-rand-pessimistic on-dup sqllogic block-writer \
19-
region-available deadlock-detector crud bank bank2 abtest cdc-pocket tiflash-pocket vbank \
20-
read-stress rawkv-linearizability tiflash-abtest tiflash-cdc dm-pocket follower-read append register \
21-
resolve-lock
18+
build: consistency isolation pocket on-dup sqllogic block-writer \
19+
region-available deadlock-detector crud abtest cdc-pocket tiflash-pocket \
20+
read-stress tiflash-abtest tiflash-cdc dm-pocket follower-read resolve-lock
2221

23-
tidb:
24-
$(GOBUILD) $(GOMOD) -o bin/chaos-tidb cmd/tidb/main.go
22+
consistency: bank bank2 pbank vbank ledger rawkv-linearizability tpcc txn-rand-pessimistic
23+
24+
isolation: append register
25+
26+
bank:
27+
$(GOBUILD) $(GOMOD) -o bin/bank cmd/bank/*.go
28+
29+
bank2:
30+
$(GOBUILD) $(GOMOD) -o bin/bank2 cmd/bank2/*.go
31+
32+
pbank:
33+
$(GOBUILD) $(GOMOD) -o bin/pbank cmd/pbank/main.go
34+
35+
vbank:
36+
$(GOBUILD) $(GOMOD) -o bin/vbank cmd/vbank/*.go
37+
38+
ledger:
39+
$(GOBUILD) $(GOMOD) -o bin/ledger cmd/ledger/*.go
40+
41+
rawkv-linearizability:
42+
$(GOBUILD) $(GOMOD) -o bin/rawkv-linearizability cmd/rawkv-linearizability/*.go
43+
44+
tpcc:
45+
$(GOBUILD) $(GOMOD) -o bin/tpcc cmd/tpcc/main.go
46+
47+
txn-rand-pessimistic:
48+
$(GOBUILD) $(GOMOD) -o bin/txn-rand-pessimistic cmd/txn-rand-pessimistic/*.go
2549

2650
append:
2751
$(GOBUILD) $(GOMOD) -o bin/append cmd/append/main.go
2852

2953
register:
3054
$(GOBUILD) $(GOMOD) -o bin/register cmd/register/main.go
3155

32-
tpcc:
33-
$(GOBUILD) $(GOMOD) -o bin/tpcc cmd/tpcc/main.go
34-
3556
rawkv:
3657
$(GOBUILD) $(GOMOD) -o bin/chaos-rawkv cmd/rawkv/main.go
3758

@@ -47,24 +68,9 @@ pocket:
4768
compare:
4869
$(GOBUILD) $(GOMOD) -o bin/compare cmd/compare/*.go
4970

50-
ledger:
51-
$(GOBUILD) $(GOMOD) -o bin/ledger cmd/ledger/*.go
52-
5371
resolve-lock:
5472
$(GOBUILD) $(GOMOD) -o bin/resolve-lock cmd/resolve-lock/*.go
5573

56-
bank:
57-
$(GOBUILD) $(GOMOD) -o bin/bank cmd/bank/*.go
58-
59-
bank2:
60-
$(GOBUILD) $(GOMOD) -o bin/bank2 cmd/bank2/*.go
61-
62-
vbank:
63-
$(GOBUILD) $(GOMOD) -o bin/vbank cmd/vbank/*.go
64-
65-
txn-rand-pessimistic:
66-
$(GOBUILD) $(GOMOD) -o bin/txn-rand-pessimistic cmd/txn-rand-pessimistic/*.go
67-
6874
on-dup:
6975
$(GOBUILD) $(GOMOD) -o bin/on-dup cmd/on-dup/*.go
7076

@@ -89,9 +95,6 @@ abtest:
8995
cdc-pocket:
9096
$(GOBUILD) $(GOMOD) -o bin/cdc-pocket cmd/cdc-pocket/*.go
9197

92-
rawkv-linearizability:
93-
$(GOBUILD) $(GOMOD) -o bin/rawkv-linearizability cmd/rawkv-linearizability/*.go
94-
9598
tiflash-pocket:
9699
$(GOBUILD) $(GOMOD) -o bin/tiflash-pocket cmd/tiflash-pocket/*.go
97100

‎README.md‎

Lines changed: 13 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -47,13 +47,16 @@ Another convenient way we recommend you is using tiup to deploy a cluster on loc
4747
tiup playground --kv 3
4848
```
4949

50-
* Specify that cluster as SUT cluster on TiPocket
50+
* Specify that cluster address through `-tidb-server` `-tikv-server` and `-pd-server`
5151

52-
```Go
53-
suit := util.Suit{
54-
...
55-
Provisioner: cluster.NewLocalClusterProvisioner([]string{"127.0.0.1:4000"}, []string{"127.0.0.1:2379"}, []string{"127.0.0.1:20160"}),
56-
}
52+
```bash
53+
-tidb-server 127.0.0.1:4000
54+
```
55+
56+
* If a cluster has many service addresses, you can pass a flag multiple times
57+
58+
```bash
59+
-tikv-server 127.0.0.1:20160 -tikv-server 127.0.0.1:20161
5760
```
5861

5962
## Workloads
@@ -62,13 +65,14 @@ TiPocket includes some consistency, isolation and other kinds of tests
6265

6366
### Consistency
6467

65-
* **bank** check bank accounts using a linearizability checker [porcupine](https://github.com/anishathalye/porcupine)
68+
* **bank** transfers between rows of a shared table
69+
* **pbank** check bank accounts using a linearizability checker [porcupine](https://github.com/anishathalye/porcupine)
6670
* **vbank** like bank but cover more TiKV features
6771
* **ledger** yet another bank test
68-
* **scbank** transfers between rows of a shared table
6972
* **rawkv-linearizability** rawkv linearizability checker
7073
* **tpcc** use [go-tpc](https://github.com/pingcap/go-tpc) testing consistency
7174

7275
### Isolation
7376

74-
* **append** checks for dependency cycles in transactions using Elle
77+
* **append** checks for dependency cycles in transactions using Elle
78+
* **register** checks for write-read dependency cycles over read-write registers using Elle

‎argo/cron/resolve-lock.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ spec:
2020
- name: nemesis
2121
value: "shuffle-leader-scheduler,shuffle-region-scheduler,random-merge-scheduler,scaling"
2222
- name: run-time
23-
value: "20h"
23+
value: "12h"
2424
- name: loki-addr
2525
value: "http://gateway.loki.svc"
2626
- name: loki-username

‎argo/template/bank.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ spec:
6666
- sh
6767
- '-c'
6868
- |
69-
/bin/chaos-tidb \
69+
/bin/pbank \
7070
-namespace={{inputs.parameters.ns}} \
7171
-hub={{inputs.parameters.hub}} \
7272
-repository={{inputs.parameters.repository}} \

‎argo/workflow/resolve-lock-master.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ spec:
1818
- name: pd-image
1919
value: "hub.pingcap.net/qa/pd:master-failpoint"
2020
- name: storage-class
21-
value: local-storage
21+
value: sas
2222
- name: nemesis
2323
value: "shuffle-leader-scheduler,shuffle-region-scheduler,random-merge-scheduler,scaling"
2424
- name: run-time

‎cmd/abtest/main.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,8 +47,8 @@ func main() {
4747
pocketConfig.Options.EnableHint = fixture.Context.EnableHint
4848
c := fixture.Context
4949
suit := util.Suit{
50-
Config: &cfg,
51-
Provisioner: cluster.NewK8sProvisioner(),
50+
Config: &cfg,
51+
Provider: cluster.NewDefaultClusterProvider(),
5252
ClientCreator: creator.PocketCreator{
5353
Config: creator.Config{
5454
ConfigPath: *configPath,

‎cmd/append/main.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ func main() {
3131
RunTime: fixture.Context.RunTime,
3232
History: fixture.Context.HistoryFile,
3333
},
34-
Provisioner: cluster.NewK8sProvisioner(),
34+
Provider: cluster.NewDefaultClusterProvider(),
3535
ClientCreator: listappend.NewClientCreator(*tableCount, *readLock, *txnMode),
3636
NemesisGens: util.ParseNemesisGenerators(fixture.Context.Nemesis),
3737
ClientRequestGen: util.OnClientLoop,

‎cmd/bank/main.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ func main() {
6666

6767
suit := util.Suit{
6868
Config: &cfg,
69-
Provisioner: cluster.NewK8sProvisioner(),
69+
Provider: cluster.NewDefaultClusterProvider(),
7070
ClientCreator: bank.ClientCreator{Cfg: &bankConfig},
7171
NemesisGens: util.ParseNemesisGenerators(fixture.Context.Nemesis),
7272
ClusterDefs: test_infra.NewDefaultCluster(fixture.Context.Namespace, fixture.Context.Namespace,

‎cmd/bank2/main.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -58,8 +58,8 @@ func main() {
5858
}
5959

6060
suit := util.Suit{
61-
Config: &cfg,
62-
Provisioner: cluster.NewK8sProvisioner(),
61+
Config: &cfg,
62+
Provider: cluster.NewDefaultClusterProvider(),
6363
ClientCreator: bank2.ClientCreator{Cfg: &bank2.Config{
6464
NumAccounts: *accounts,
6565
Interval: *interval,

‎cmd/block-writer/main.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ func main() {
4444
}
4545
suit := util.Suit{
4646
Config: &cfg,
47-
Provisioner: cluster.NewK8sProvisioner(),
47+
Provider: cluster.NewDefaultClusterProvider(),
4848
ClientCreator: blockwriter.ClientCreator{TableNum: *tables, Concurrency: *concurrency},
4949
NemesisGens: util.ParseNemesisGenerators(fixture.Context.Nemesis),
5050
ClusterDefs: test_infra.NewDefaultCluster(fixture.Context.Namespace, fixture.Context.Namespace,

0 commit comments

Comments
 (0)