Skip to content
Merged
Show file tree
Hide file tree
Changes from all 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
8 changes: 4 additions & 4 deletions docs/0-getting-started.md
Original file line number Diff line number Diff line change
Expand Up @@ -61,8 +61,8 @@ ssh -o BatchMode=yes -o ConnectTimeout=10 <host> hostname

- ZooKeeper ์„œ๋ฒ„๊ฐ€ ์‹คํ–‰๋˜๋Š” ์›๊ฒฉ ์žฅ๋น„
- ZooKeeper ๋ฒ„์ „๊ณผ ํ˜ธํ™˜๋˜๋Š” Java ๋Ÿฐํƒ€์ž„
- ํ† ํด๋กœ์ง€์˜ `path`, `data_dir`์„ ๋งŒ๋“ค๊ณ  ์ˆ˜์ •ํ•  ์ˆ˜ ์žˆ๋Š” ๊ถŒํ•œ
- `data_log_dir`์„ ๋ณ„๋„๋กœ ์ง€์ •ํ–ˆ๋‹ค๋ฉด ํ•ด๋‹น ๊ฒฝ๋กœ๋ฅผ ๋งŒ๋“ค๊ณ  ์ˆ˜์ •ํ•  ์ˆ˜ ์žˆ๋Š” ๊ถŒํ•œ
- ํ† ํด๋กœ์ง€์˜ `path`, `dataDir`์„ ๋งŒ๋“ค๊ณ  ์ˆ˜์ •ํ•  ์ˆ˜ ์žˆ๋Š” ๊ถŒํ•œ
- `dataLogDir`์„ ๋ณ„๋„๋กœ ์ง€์ •ํ–ˆ๋‹ค๋ฉด ํ•ด๋‹น ๊ฒฝ๋กœ๋ฅผ ๋งŒ๋“ค๊ณ  ์ˆ˜์ •ํ•  ์ˆ˜ ์žˆ๋Š” ๊ถŒํ•œ

- ์บ์‹œ ์„œ๋ฒ„๊ฐ€ ์‹คํ–‰๋˜๋Š” ์›๊ฒฉ ์žฅ๋น„
- ์†Œ์Šค ์•„์นด์ด๋ธŒ์˜ ์˜์กด์„ฑ์„ ์„ค์น˜ํ•  ์ˆ˜ ์žˆ๋Š” ํ™˜๊ฒฝ
Expand Down Expand Up @@ -138,8 +138,8 @@ ssh -o BatchMode=yes -o ConnectTimeout=10 <host> hostname
โ””โ”€โ”€ zk<myid>/
```

ZooKeeper์˜ `data_dir`์„ ์ƒ๋žตํ•˜๋ฉด `<path>/data/<ensemble-name>`์„ ์‚ฌ์šฉํ•ฉ๋‹ˆ๋‹ค.
`data_dir` ๋˜๋Š” `data_log_dir`์„ ์ง์ ‘ ์ง€์ •ํ•˜๋ฉด ๊ฐ ๊ฒฝ๋กœ ์•„๋ž˜์— `zk<myid>` ๋””๋ ‰ํ„ฐ๋ฆฌ๋ฅผ ์ƒ์„ฑํ•ฉ๋‹ˆ๋‹ค.
ZooKeeper์˜ `dataDir`์„ ์ƒ๋žตํ•˜๋ฉด `<path>/data/<ensemble-name>`์„ ์‚ฌ์šฉํ•ฉ๋‹ˆ๋‹ค.
`dataDir` ๋˜๋Š” `dataLogDir`์„ ์ง์ ‘ ์ง€์ •ํ•˜๋ฉด ๊ฐ ๊ฒฝ๋กœ ์•„๋ž˜์— `zk<myid>` ๋””๋ ‰ํ„ฐ๋ฆฌ๋ฅผ ์ƒ์„ฑํ•ฉ๋‹ˆ๋‹ค.

## ๊ธฐ๋ณธ ์šด์˜ ํ๋ฆ„

Expand Down
58 changes: 29 additions & 29 deletions docs/1-zk-guide.md
Original file line number Diff line number Diff line change
Expand Up @@ -38,20 +38,20 @@ servers:
- myid: 1
address: 192.0.2.11:2181:2888:3888
config:
data_log_dir: /data/zookeeper/txlog-1
dataLogDir: /data/zookeeper/txlog-1

- myid: 2
address: 192.0.2.12:2181:2888:3888

- myid: 3
address: 192.0.2.13:2181:2888:3888

global_config:
tick_time: 2000
init_limit: 10
sync_limit: 5
data_dir: /var/lib/zk/data
data_log_dir: /var/lib/zk/datalog
globalConfig:
tickTime: 2000
initLimit: 10
syncLimit: 5
dataDir: /var/lib/zk/data
dataLogDir: /var/lib/zk/datalog
properties:
maxClientCnxns: "60"
autopurge.snapRetainCount: "10"
Expand All @@ -68,31 +68,31 @@ global_config:
| `servers[].myid` | ์•™์ƒ๋ธ” ์•ˆ์—์„œ ์ค‘๋ณต๋˜์ง€ ์•Š๋Š” ZooKeeper ์„œ๋ฒ„ ID | ์˜ˆ |
| `servers[].address` | `<host>:<client-port>:<quorum-port>:<election-port>` ํ˜•์‹์˜ ๊ณ ์œ  ์ฃผ์†Œ | ์˜ˆ |
| `servers[].config` | ํŠน์ • ZooKeeper ์„œ๋ฒ„์— ์ถ”๊ฐ€ํ•˜๊ฑฐ๋‚˜ ๋ฎ์–ด์“ธ ์„ค์ • | ์•„๋‹ˆ์š” |
| `global_config` | ๋ชจ๋“  ZooKeeper ์„œ๋ฒ„์— ๊ณตํ†ต์œผ๋กœ ์ ์šฉํ•  ์„ค์ • | ์•„๋‹ˆ์š” |
| `globalConfig` | ๋ชจ๋“  ZooKeeper ์„œ๋ฒ„์— ๊ณตํ†ต์œผ๋กœ ์ ์šฉํ•  ์„ค์ • | ์•„๋‹ˆ์š” |

### ZooKeeper ์„ค์ •

| ํ•„๋“œ | ์„ค๋ช… | ๊ธฐ๋ณธ๊ฐ’ |
|----------------|------------------------------------------------------------|-------------------------------|
| `tick_time` | ZooKeeper์˜ ๊ธฐ๋ณธ `tick` ์‹œ๊ฐ„ | `2000` |
| `init_limit` | follower๊ฐ€ leader์— ์—ฐ๊ฒฐํ•˜๊ณ  ๋™๊ธฐํ™”ํ•  ์ˆ˜ ์žˆ๋Š” `tick` ์ˆ˜ | `10` |
| `sync_limit` | follower์™€ leader ์‚ฌ์ด์˜ ์š”์ฒญ ๋ฐ ์‘๋‹ต์— ํ—ˆ์šฉ๋˜๋Š” `tick` ์ˆ˜ | `5` |
| `data_dir` | ์Šค๋ƒ…์ƒท๊ณผ `myid`๋ฅผ ์ €์žฅํ•  ๊ธฐ์ค€ ๋””๋ ‰ํ„ฐ๋ฆฌ | `<path>/data/<ensemble-name>` |
| `data_log_dir` | ํŠธ๋žœ์žญ์…˜ ๋กœ๊ทธ๋ฅผ ์ €์žฅํ•  ๊ธฐ์ค€ ๋””๋ ‰ํ„ฐ๋ฆฌ | ํ•ด๋‹น ์„œ๋ฒ„์˜ `data_dir` |
| `properties` | ์ถ”๊ฐ€ํ•  `zoo.cfg` ์†์„ฑ | ์—†์Œ |
| ํ•„๋“œ | ์„ค๋ช… | ๊ธฐ๋ณธ๊ฐ’ |
|--------------|------------------------------------------------------------|-------------------------------|
| `tickTime` | ZooKeeper์˜ ๊ธฐ๋ณธ `tick` ์‹œ๊ฐ„ | `2000` |
| `initLimit` | follower๊ฐ€ leader์— ์—ฐ๊ฒฐํ•˜๊ณ  ๋™๊ธฐํ™”ํ•  ์ˆ˜ ์žˆ๋Š” `tick` ์ˆ˜ | `10` |
| `syncLimit` | follower์™€ leader ์‚ฌ์ด์˜ ์š”์ฒญ ๋ฐ ์‘๋‹ต์— ํ—ˆ์šฉ๋˜๋Š” `tick` ์ˆ˜ | `5` |
| `dataDir` | ์Šค๋ƒ…์ƒท๊ณผ `myid`๋ฅผ ์ €์žฅํ•  ๊ธฐ์ค€ ๋””๋ ‰ํ„ฐ๋ฆฌ | `<path>/data/<ensemble-name>` |
| `dataLogDir` | ํŠธ๋žœ์žญ์…˜ ๋กœ๊ทธ๋ฅผ ์ €์žฅํ•  ๊ธฐ์ค€ ๋””๋ ‰ํ„ฐ๋ฆฌ | ํ•ด๋‹น ์„œ๋ฒ„์˜ `dataDir` |
| `properties` | ์ถ”๊ฐ€ํ•  `zoo.cfg` ์†์„ฑ | ์—†์Œ |

ZooKeeper ์„œ๋ฒ„๋ณ„ `servers[].config`๋Š” `global_config`์— ๋ณ‘ํ•ฉ๋ฉ๋‹ˆ๋‹ค.
ZooKeeper ์„œ๋ฒ„๋ณ„ `servers[].config`๋Š” `globalConfig`์— ๋ณ‘ํ•ฉ๋ฉ๋‹ˆ๋‹ค.

- ZooKeeper ์„œ๋ฒ„๋ณ„ ์„ค์ •์— ๊ฐ’์ด ์žˆ์œผ๋ฉด ๊ฐ™์€ ์ด๋ฆ„์˜ ์ „์—ญ ์„ค์ •์„ ๋ฎ์–ด์”๋‹ˆ๋‹ค.
- `properties`๋Š” ํ‚ค ๋‹จ์œ„๋กœ ์ถ”๊ฐ€ํ•˜๊ฑฐ๋‚˜ ๋ฎ์–ด์”๋‹ˆ๋‹ค.
- ์ „์—ญ ์„ค์ •๊ณผ ์„œ๋ฒ„๋ณ„ ์„ค์ •์—์„œ ๋ชจ๋‘ `data_dir`์„ ์ƒ๋žตํ•˜๋ฉด `<path>/data/<ensemble-name>`์„ ์‚ฌ์šฉํ•ฉ๋‹ˆ๋‹ค.
- ์ „์—ญ ์„ค์ •๊ณผ ์„œ๋ฒ„๋ณ„ ์„ค์ •์—์„œ ๋ชจ๋‘ `data_log_dir`์„ ์ƒ๋žตํ•˜๋ฉด ํ•ด๋‹น ZooKeeper ์„œ๋ฒ„์˜ ์ตœ์ข… `data_dir`์„ ์‚ฌ์šฉํ•ฉ๋‹ˆ๋‹ค.
- ์ „์—ญ ์„ค์ •๊ณผ ์„œ๋ฒ„๋ณ„ ์„ค์ •์—์„œ ๋ชจ๋‘ `dataDir`์„ ์ƒ๋žตํ•˜๋ฉด `<path>/data/<ensemble-name>`์„ ์‚ฌ์šฉํ•ฉ๋‹ˆ๋‹ค.
- ์ „์—ญ ์„ค์ •๊ณผ ์„œ๋ฒ„๋ณ„ ์„ค์ •์—์„œ ๋ชจ๋‘ `dataLogDir`์„ ์ƒ๋žตํ•˜๋ฉด ํ•ด๋‹น ZooKeeper ์„œ๋ฒ„์˜ ์ตœ์ข… `dataDir`์„ ์‚ฌ์šฉํ•ฉ๋‹ˆ๋‹ค.

๊ฐ ZooKeeper ์„œ๋ฒ„์˜ ์‹ค์ œ ๋ฐ์ดํ„ฐ ๋ฐ ๋กœ๊ทธ ๊ฒฝ๋กœ์—๋Š” `zk<myid>` ํ•˜์œ„ ๋””๋ ‰ํ„ฐ๋ฆฌ๊ฐ€ ์ถ”๊ฐ€๋ฉ๋‹ˆ๋‹ค.

```text
<data_dir>/zk<myid>
<data_log_dir>/zk<myid>
<dataDir>/zk<myid>
<dataLogDir>/zk<myid>
```

๊ธฐ๋ณธ ์„ค์ •์„ ์‚ฌ์šฉํ•˜๋Š” ๊ฒฝ์šฐ ์‹ค์ œ ๊ฒฝ๋กœ๋Š” ๋‹ค์Œ๊ณผ ๊ฐ™์Šต๋‹ˆ๋‹ค.
Expand Down Expand Up @@ -183,14 +183,14 @@ ZooKeeper ๋ฐ”์ด๋„ˆ๋ฆฌ๋Š” ์›๊ฒฉ ์žฅ๋น„์˜ `<path>/<version>`์— ์„ค์น˜๋ฉ๋‹ˆ๋‹ค
โ””โ”€โ”€ myid
```

์œ„์˜ `data` ๊ตฌ์กฐ๋Š” `data_dir`์„ ์ƒ๋žตํ•œ ๊ฒฝ์šฐ์ž…๋‹ˆ๋‹ค. `data_dir` ๋˜๋Š” `data_log_dir`์„ ์ง€์ •ํ•˜๋ฉด ๊ฐ๊ฐ ๋‹ค์Œ ๊ฒฝ๋กœ๋ฅผ ์‚ฌ์šฉํ•ฉ๋‹ˆ๋‹ค.
์œ„์˜ `data` ๊ตฌ์กฐ๋Š” `dataDir`์„ ์ƒ๋žตํ•œ ๊ฒฝ์šฐ์ž…๋‹ˆ๋‹ค. `dataDir` ๋˜๋Š” `dataLogDir`์„ ์ง€์ •ํ•˜๋ฉด ๊ฐ๊ฐ ๋‹ค์Œ ๊ฒฝ๋กœ๋ฅผ ์‚ฌ์šฉํ•ฉ๋‹ˆ๋‹ค.

```text
<data_dir>/zk<myid>
<data_log_dir>/zk<myid>
<dataDir>/zk<myid>
<dataLogDir>/zk<myid>
```

`data_log_dir`์„ ์ƒ๋žตํ•˜๋ฉด `data_dir`๊ณผ ๋™์ผํ•œ ๊ฒฝ๋กœ๋ฅผ ์‚ฌ์šฉํ•˜๋ฏ€๋กœ ์Šค๋ƒ…์ƒท๊ณผ ํŠธ๋žœ์žญ์…˜ ๋กœ๊ทธ๊ฐ€ ๊ฐ™์€ `<data_dir>/zk<myid>` ๋””๋ ‰ํ„ฐ๋ฆฌ์— ์ €์žฅ๋ฉ๋‹ˆ๋‹ค.
`dataLogDir`์„ ์ƒ๋žตํ•˜๋ฉด `dataDir`๊ณผ ๋™์ผํ•œ ๊ฒฝ๋กœ๋ฅผ ์‚ฌ์šฉํ•˜๋ฏ€๋กœ ์Šค๋ƒ…์ƒท๊ณผ ํŠธ๋žœ์žญ์…˜ ๋กœ๊ทธ๊ฐ€ ๊ฐ™์€ `<dataDir>/zk<myid>` ๋””๋ ‰ํ„ฐ๋ฆฌ์— ์ €์žฅ๋ฉ๋‹ˆ๋‹ค.

๊ฐ™์€ ์›๊ฒฉ ์žฅ๋น„์˜ ๋™์ผํ•œ `<path>/<version>`์€ ์—ฌ๋Ÿฌ ์•™์ƒ๋ธ”์ด ๊ณต์œ ํ•  ์ˆ˜ ์žˆ์Šต๋‹ˆ๋‹ค.
`<path>/<version>/bin/zkServer.sh`๊ฐ€ ์ด๋ฏธ ์žˆ์œผ๋ฉด ๋ฒ„์ „๋ณ„ ๋ฐ”์ด๋„ˆ๋ฆฌ๋ฅผ ์žฌ์‚ฌ์šฉํ•˜๊ณ  ์•™์ƒ๋ธ”๋ณ„ ์„ค์ •๊ณผ ๋ฐ์ดํ„ฐ๋ฅผ ์ƒ์„ฑํ•ฉ๋‹ˆ๋‹ค.
Expand All @@ -207,8 +207,8 @@ ZooKeeper ๋ฐ”์ด๋„ˆ๋ฆฌ๋Š” ์›๊ฒฉ ์žฅ๋น„์˜ `<path>/<version>`์— ์„ค์น˜๋ฉ๋‹ˆ๋‹ค
```text
<path>/<version>
<path>/conf/<ensemble-name>/zk<myid>
<data_dir>/zk<myid>
<data_log_dir>/zk<myid>
<dataDir>/zk<myid>
<dataLogDir>/zk<myid>
```

์šด์˜ ์žฅ๋น„์— ๋ฐฐํฌ ์ •๋ณด๊ฐ€ ์ผ๋ถ€ ์ €์žฅ๋˜์—ˆ์„ ์ˆ˜ ์žˆ์œผ๋ฏ€๋กœ ๋‹ค์Œ ๊ฒฝ๋กœ๋„ ํ•จ๊ป˜ ํ™•์ธํ•˜์„ธ์š”.
Expand Down Expand Up @@ -374,8 +374,8 @@ arcusctl zk delete my-ensemble --purge

```text
<path>/conf/<ensemble-name>/zk<myid>
<data_dir>/zk<myid>
<data_log_dir>/zk<myid>
<dataDir>/zk<myid>
<dataLogDir>/zk<myid>
```

`--purge`๋กœ ์ถ”๊ฐ€๋˜๋Š” ์‚ญ์ œ ๊ฒฝ๋กœ๋Š” ๋‹ค์Œ๊ณผ ๊ฐ™์Šต๋‹ˆ๋‹ค.
Expand Down
6 changes: 3 additions & 3 deletions docs/2-cluster-guide.md
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ servers:
config:
options: "-m 128 -v"

global_config:
globalConfig:
options: "-t 4 -c 1024 -b 1024 -B auto -m 64"
```

Expand All @@ -75,7 +75,7 @@ servers:
role: slave
port: 33533

global_config:
globalConfig:
options: "-t 8 -m 128"
```

Expand All @@ -89,7 +89,7 @@ global_config:
| `servers` | ํ•˜๋‚˜ ์ด์ƒ์˜ ์บ์‹œ ์„œ๋ฒ„ ๋ชฉ๋ก | ์˜ˆ |
| `servers[].address` | `<host>:<port>` ํ˜•์‹์˜ ๊ณ ์œ ํ•œ ์บ์‹œ ์„œ๋ฒ„ ์ฃผ์†Œ | ์˜ˆ |
| `servers[].config.options` | ํŠน์ • ์บ์‹œ ์„œ๋ฒ„์— ์ถ”๊ฐ€ํ•  ์‹คํ–‰ ์˜ต์…˜ | ์•„๋‹ˆ์š” |
| `global_config.options` | ๋ชจ๋“  ์บ์‹œ ์„œ๋ฒ„์— ๊ณตํ†ต์œผ๋กœ ์ ์šฉํ•  ์‹คํ–‰ ์˜ต์…˜ | ์•„๋‹ˆ์š” |
| `globalConfig.options` | ๋ชจ๋“  ์บ์‹œ ์„œ๋ฒ„์— ๊ณตํ†ต์œผ๋กœ ์ ์šฉํ•  ์‹คํ–‰ ์˜ต์…˜ | ์•„๋‹ˆ์š” |
| `servers[].group` | Enterprise ์บ์‹œ ์„œ๋ฒ„์˜ replication group ์„ค์ • | ์กฐ๊ฑด๋ถ€ |

ํ•˜๋‚˜์˜ ํ† ํด๋กœ์ง€์— Community edition ์บ์‹œ ์„œ๋ฒ„์™€ Enterprise edition ์บ์‹œ ์„œ๋ฒ„๋ฅผ ํ•จ๊ป˜ ์ •์˜ํ•  ์ˆ˜ ์—†์Šต๋‹ˆ๋‹ค.
Expand Down
2 changes: 1 addition & 1 deletion examples/cluster-community-topology.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -13,5 +13,5 @@ servers:
config: # optional - per-node override
options: "-m 128 -v" # optional - override global options (-p, -P, -z, -d are not allowed)

global_config:
globalConfig:
options: "-t 4 -c 1024 -b 1024 -B auto -m 64" # memcached command-line arguments
2 changes: 1 addition & 1 deletion examples/cluster-enterprise-topology.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -19,5 +19,5 @@ servers:
role: slave
port: 33533

global_config:
globalConfig:
options: "-t 8 -m 128" # memcached command-line arguments
16 changes: 8 additions & 8 deletions examples/zk-topology.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,29 +9,29 @@ servers:
- myid: 1 # required
address: 192.0.2.11:2181:2888:3888 # required (host:clientPort:quorumPort:electionPort)
config: # optional - per-node override
data_log_dir: /data/zookeeper/txlog-1
dataLogDir: /data/zookeeper/txlog-1

- myid: 2
address: 192.0.2.12:2181:2888:3888

- myid: 3
address: 192.0.2.13:2181:2888:3888

global_config:
globalConfig:
# optional (default: 2000)
tick_time: 2000
tickTime: 2000

# optional (default: 10) - ticks for follower to sync to leader
init_limit: 10
initLimit: 10

# optional (default: 5) - ticks between request and ack
sync_limit: 5
syncLimit: 5

# optional (default: <path>/data/<name>)
data_dir: /var/lib/zk/data
dataDir: /var/lib/zk/data

# optional (default: data_dir)
data_log_dir: /var/lib/zk/datalog
# optional (default: dataDir)
dataLogDir: /var/lib/zk/datalog

# optional - other ZK options (string values only)
properties:
Expand Down
2 changes: 1 addition & 1 deletion internal/topology/cluster.go
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ type ClusterTopology struct {
Path string `yaml:"path"`
ZooKeeper string `yaml:"zookeeper"`
Servers []CacheServer `yaml:"servers"`
GlobalConfig CacheConfig `yaml:"global_config"`
GlobalConfig CacheConfig `yaml:"globalConfig"`
Comment thread
f1v3-dev marked this conversation as resolved.
}

type CacheServer struct {
Expand Down
12 changes: 6 additions & 6 deletions internal/topology/zk.go
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ type ZKTopology struct {
Name string `yaml:"name"`
Path string `yaml:"path"`
Servers []ZKServer `yaml:"servers"`
GlobalConfig ZKConfig `yaml:"global_config"`
GlobalConfig ZKConfig `yaml:"globalConfig"`
}

type ZKServer struct {
Expand All @@ -19,11 +19,11 @@ type ZKServer struct {
}

type ZKConfig struct {
TickTime int `yaml:"tick_time,omitempty"`
InitLimit int `yaml:"init_limit,omitempty"`
SyncLimit int `yaml:"sync_limit,omitempty"`
DataDir string `yaml:"data_dir,omitempty"`
DataLogDir string `yaml:"data_log_dir,omitempty"`
TickTime int `yaml:"tickTime,omitempty"`
InitLimit int `yaml:"initLimit,omitempty"`
SyncLimit int `yaml:"syncLimit,omitempty"`
DataDir string `yaml:"dataDir,omitempty"`
DataLogDir string `yaml:"dataLogDir,omitempty"`
Comment thread
f1v3-dev marked this conversation as resolved.
Properties map[string]string `yaml:"properties,omitempty"`
}

Expand Down
Loading