Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Refine ClusterInfo & Instance #591

Merged
merged 17 commits into from
Jun 8, 2020
Merged
Show file tree
Hide file tree
Changes from 15 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions etc/manualTestEnv/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
.vagrant/
tiup-cluster-*.log
12 changes: 12 additions & 0 deletions etc/manualTestEnv/_shared/Vagrantfile.partial.pubKey.ruby
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
Vagrant.configure("2") do |config|
ssh_pub_key = File.readlines("#{File.dirname(__FILE__)}/vagrant_key.pub").first.strip

config.vm.box = "hashicorp/bionic64"
config.vm.provision "shell", privileged: false, inline: <<-SHELL
sudo apt install -y zsh
sh -c "$(curl -fsSL https://raw.githubusercontent.com/ohmyzsh/ohmyzsh/master/tools/install.sh)"
sudo chsh -s /usr/bin/zsh vagrant

echo #{ssh_pub_key} >> /home/vagrant/.ssh/authorized_keys
SHELL
end
27 changes: 27 additions & 0 deletions etc/manualTestEnv/_shared/vagrant_key
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
-----BEGIN OPENSSH PRIVATE KEY-----
b3BlbnNzaC1rZXktdjEAAAAABG5vbmUAAAAEbm9uZQAAAAAAAAABAAABFwAAAAdzc2gtcn
NhAAAAAwEAAQAAAQEAxboZzYumqNoVOQ/hKKhIZHxNhf5tmnkLZry8i6Xur4FPLDiRxos/
xVVDx0ynTPOyQVVaXtNxZnAmbR4HuNBzRvNoklwSXazt5YgWeiKCHtPpKFt3PJeE2cn6FJ
p6F6qFChG0NSPbZxJWWxv4noX0U3PLKgHNIehYK2Fu0E6plhSZazzJEVWapwo9d7aGnAsz
bBCd5TNZ5ogrXn+3bSFcdCbAfWOwYg54a+PzTQlzgt6JmhlEjpFfPhhpBW92pQXxmQ2c17
iPCbA8G++FiaEwA5teex8k1+HzmHf7YjyhPr+I67EzEiIueJg2+0PYbM1p06S8kVTNDXsf
0eJx4Dr8qQAAA9iFPcpVhT3KVQAAAAdzc2gtcnNhAAABAQDFuhnNi6ao2hU5D+EoqEhkfE
2F/m2aeQtmvLyLpe6vgU8sOJHGiz/FVUPHTKdM87JBVVpe03FmcCZtHge40HNG82iSXBJd
rO3liBZ6IoIe0+koW3c8l4TZyfoUmnoXqoUKEbQ1I9tnElZbG/iehfRTc8sqAc0h6FgrYW
7QTqmWFJlrPMkRVZqnCj13toacCzNsEJ3lM1nmiCtef7dtIVx0JsB9Y7BiDnhr4/NNCXOC
3omaGUSOkV8+GGkFb3alBfGZDZzXuI8JsDwb74WJoTADm157HyTX4fOYd/tiPKE+v4jrsT
MSIi54mDb7Q9hszWnTpLyRVM0Nex/R4nHgOvypAAAAAwEAAQAAAQBtk0+/YDgQ9SKzx8AQ
xwmvXk+cBT76T0BpRAj9HwziiDe3GvZ2YC8MDc+NAEbq11ae7E0zpdv/WAGDkRPYcPShij
0Wdx3aef4wqLVEJCGWMfvRWLcAhjuiclM73cvxl5c42EzU8jUhrsDapuql9zhKky4w7mSe
+OL7z3gYyq8isvcQMe+1eXJqiv27AJJfAir+rLJZO/gDW36hOowhnZxYRlVYPgZ8GwetxD
VdCrgwUgR/2HYmbXYdVxI0PwswGc6rEqs5XXOYRzwvPTvRKdD3J5MxmsvJljT7FMr4kCLT
X1+aWysk1cgAUIdzzwQL8DLE/N9PFFYdZyNBkZMgedl9AAAAgCtP3F8XYFR18gQLPGLDyQ
FFg8+JHN9b/yIg2pymC6SI8qEp+GnuEK9IKhqh/Uw14KEKcs/9sgbZo0K9uTBTDG5F6Qmp
hADVbWXJ/97Xeya6kH2Sa56UKLCQ/uQWBKwLQ0auU/qwxATIZowh31XUXjzVBg6wgUjT7Q
+3Fk1zGYxnAAAAgQD5USIRUNwkI+htv+f1g8QdmrFAGymcGEkXAixKvBTon9cWQb2iyiK+
2IO8EwFwRdL5kw2foILCnlp/4FevfxHU7wTcoFEp3PItUlcxYqO8vY2VCZ913oNLKBIt9p
uFfG2BZM5szMRNMh0svelu61FePsfN5Z8J0ltPrS8UKB95ywAAAIEAywbyNbjz1AxEjWIX
2Vbk4/MjQyjui8Wi7H0F+LDWyMfPJHzhnbr79Z/lIZmDAo++3EYU9J9s0C+wJ6vXGK+gvC
7e5qGfT/0J0DwBfLbpeTdDELCa/LmfLWVPzZ9Q+9Fq0AjmW9YXFZ/+qT9xfY1v9XfztFRS
xR1iXJ42q6ff5NsAAAAeYnJlZXpld2lzaEBCcmVlemV3aXNoTUJQLmxvY2FsAQIDBAU=
-----END OPENSSH PRIVATE KEY-----
1 change: 1 addition & 0 deletions etc/manualTestEnv/_shared/vagrant_key.pub
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDFuhnNi6ao2hU5D+EoqEhkfE2F/m2aeQtmvLyLpe6vgU8sOJHGiz/FVUPHTKdM87JBVVpe03FmcCZtHge40HNG82iSXBJdrO3liBZ6IoIe0+koW3c8l4TZyfoUmnoXqoUKEbQ1I9tnElZbG/iehfRTc8sqAc0h6FgrYW7QTqmWFJlrPMkRVZqnCj13toacCzNsEJ3lM1nmiCtef7dtIVx0JsB9Y7BiDnhr4/NNCXOC3omaGUSOkV8+GGkFb3alBfGZDZzXuI8JsDwb74WJoTADm157HyTX4fOYd/tiPKE+v4jrsTMSIi54mDb7Q9hszWnTpLyRVM0Nex/R4nHgOvyp
36 changes: 36 additions & 0 deletions etc/manualTestEnv/multiHost/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
# multiHost

TiDB, PD, TiKV, TiFlash each in different hosts.

## Usage

1. Start the box:

```bash
vagrant up
```

1. Use [TiUP](https://tiup.io/) to deploy the cluster to the box (only need to do it once):

```bash
tiup cluster deploy multiHost nightly topology.yaml -i ../_shared/vagrant_key -y --user vagrant
```

1. Start the cluster in the box:

```bash
tiup cluster start multiHost
```

1. Start TiDB Dashboard server:

```bash
bin/tidb-dashboard --pd http://10.0.1.11:2379
```

## Cleanup

```bash
tiup cluster destroy multiHost -y
vagrant destroy --force
```
14 changes: 14 additions & 0 deletions etc/manualTestEnv/multiHost/Vagrantfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
load "#{File.dirname(__FILE__)}/../_shared/Vagrantfile.partial.pubKey.ruby"

Vagrant.configure("2") do |config|
config.vm.provider "virtualbox" do |v|
v.memory = 1024
v.cpus = 1
end

(1..4).each do |i|
config.vm.define "node#{i}" do |node|
node.vm.network "private_network", ip: "10.0.1.#{i+10}"
end
end
end
38 changes: 38 additions & 0 deletions etc/manualTestEnv/multiHost/topology.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
global:
user: tidb
deploy_dir: tidb-deploy
data_dir: tidb-data

server_configs:
tikv:
server.grpc-concurrency: 1
raftstore.apply-pool-size: 1
raftstore.store-pool-size: 1
readpool.unified.max-thread-count: 1
readpool.storage.use-unified-pool: false
readpool.coprocessor.use-unified-pool: true
storage.block-cache.capacity: 256MB
raftstore.capacity: 10GB
pd:
replication.enable-placement-rules: true

pd_servers:
- host: 10.0.1.11

tikv_servers:
- host: 10.0.1.12

tidb_servers:
- host: 10.0.1.13

tiflash_servers:
- host: 10.0.1.14

grafana_servers:
- host: 10.0.1.11

monitoring_servers:
- host: 10.0.1.11

alertmanager_servers:
- host: 10.0.1.11
36 changes: 36 additions & 0 deletions etc/manualTestEnv/multiReplica/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
# multiReplica

Multiple TiKV nodes in different labels.

## Usage

1. Start the box:

```bash
vagrant up
```

1. Use [TiUP](https://tiup.io/) to deploy the cluster to the box (only need to do it once):

```bash
tiup cluster deploy multiReplica nightly topology.yaml -i ../_shared/vagrant_key -y --user vagrant
```

1. Start the cluster in the box:

```bash
tiup cluster start multiReplica
```

1. Start TiDB Dashboard server:

```bash
bin/tidb-dashboard --pd http://10.0.1.20:2379
```

## Cleanup

```bash
tiup cluster destroy multiReplica -y
vagrant destroy --force
```
10 changes: 10 additions & 0 deletions etc/manualTestEnv/multiReplica/Vagrantfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
load "#{File.dirname(__FILE__)}/../_shared/Vagrantfile.partial.pubKey.ruby"

Vagrant.configure("2") do |config|
config.vm.provider "virtualbox" do |v|
v.memory = 4 * 1024
v.cpus = 2
end

config.vm.network "private_network", ip: "10.0.1.20"
end
64 changes: 64 additions & 0 deletions etc/manualTestEnv/multiReplica/topology.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,64 @@
global:
user: tidb
deploy_dir: tidb-deploy
data_dir: tidb-data

server_configs:
tikv:
server.grpc-concurrency: 1
raftstore.apply-pool-size: 1
raftstore.store-pool-size: 1
readpool.unified.max-thread-count: 1
readpool.storage.use-unified-pool: false
readpool.coprocessor.use-unified-pool: true
storage.block-cache.capacity: 256MB
raftstore.capacity: 10GB
pd:
replication.location-labels:
- zone
- rack
- host

pd_servers:
- host: 10.0.1.20

tikv_servers:
- host: 10.0.1.20
port: 20160
status_port: 20180
config:
server.labels: { host: tikv1, rack: rack1 }
- host: 10.0.1.20
port: 20161
status_port: 20181
config:
server.labels: { host: tikv1, rack: rack1 }
- host: 10.0.1.20
port: 20162
status_port: 20182
config:
server.labels: { host: tikv2, rack: rack1 }
- host: 10.0.1.20
port: 20163
status_port: 20183
config:
server.labels: { host: tikv2, rack: rack1 }
- host: 10.0.1.20
port: 20164
status_port: 20184
config:
server.labels: { host: tikv3, rack: rack2 }
- host: 10.0.1.20
port: 20165
status_port: 20185
config:
server.labels: { host: tikv3, rack: rack2 }

tidb_servers:
- host: 10.0.1.20

grafana_servers:
- host: 10.0.1.20

monitoring_servers:
- host: 10.0.1.20
36 changes: 36 additions & 0 deletions etc/manualTestEnv/singleHost/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
# singleHost

TiDB, PD, TiKV, TiFlash in the same host.

## Usage

1. Start the box:

```bash
vagrant up
```

1. Use [TiUP](https://tiup.io/) to deploy the cluster to the box (only need to do it once):

```bash
tiup cluster deploy singleHost nightly topology.yaml -i ../_shared/vagrant_key -y --user vagrant
```

1. Start the cluster in the box:

```bash
tiup cluster start singleHost
```

1. Start TiDB Dashboard server:

```bash
bin/tidb-dashboard --pd http://10.0.1.2:2379
```

## Cleanup

```bash
tiup cluster destroy singleHost -y
vagrant destroy --force
```
10 changes: 10 additions & 0 deletions etc/manualTestEnv/singleHost/Vagrantfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
load "#{File.dirname(__FILE__)}/../_shared/Vagrantfile.partial.pubKey.ruby"

Vagrant.configure("2") do |config|
config.vm.provider "virtualbox" do |v|
v.memory = 3 * 1024
v.cpus = 2
end

config.vm.network "private_network", ip: "10.0.1.2"
end
37 changes: 37 additions & 0 deletions etc/manualTestEnv/singleHost/topology.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
global:
user: tidb
deploy_dir: tidb-deploy
data_dir: tidb-data

server_configs:
tikv:
server.grpc-concurrency: 1
raftstore.apply-pool-size: 1
raftstore.store-pool-size: 1
readpool.unified.max-thread-count: 1
readpool.storage.use-unified-pool: false
readpool.coprocessor.use-unified-pool: true
storage.block-cache.capacity: 256MB
pd:
replication.enable-placement-rules: true

pd_servers:
- host: 10.0.1.2

tikv_servers:
- host: 10.0.1.2

tidb_servers:
- host: 10.0.1.2

tiflash_servers:
- host: 10.0.1.2

grafana_servers:
- host: 10.0.1.2

monitoring_servers:
- host: 10.0.1.2

alertmanager_servers:
- host: 10.0.1.2
1 change: 1 addition & 0 deletions etc/manualTestEnv/singleHostMultiDisk/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
data/
36 changes: 36 additions & 0 deletions etc/manualTestEnv/singleHostMultiDisk/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
# singleHostMultiDisk

All instances in a single host, but on different disks.

## Usage

1. Start the box:

```bash
vagrant up
```

1. Use [TiUP](https://tiup.io/) to deploy the cluster to the box (only need to do it once):

```bash
tiup cluster deploy singleHostMultiDisk nightly topology.yaml -i ../_shared/vagrant_key -y --user vagrant
```

1. Start the cluster in the box:

```bash
tiup cluster start singleHostMultiDisk
```

1. Start TiDB Dashboard server:

```bash
bin/tidb-dashboard --pd http://10.0.1.3:2379
```

## Cleanup

```bash
tiup cluster destroy singleHostMultiDisk -y
vagrant destroy --force
```
10 changes: 10 additions & 0 deletions etc/manualTestEnv/singleHostMultiDisk/Vagrantfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
load "#{File.dirname(__FILE__)}/../_shared/Vagrantfile.partial.pubKey.ruby"

Vagrant.configure("2") do |config|
config.vm.provider "virtualbox" do |v|
v.memory = 3 * 1024
v.cpus = 2
end

config.vm.network "private_network", ip: "10.0.1.3"
end
Loading