Navigation Menu

Skip to content

Commit

Permalink
Update catalog.json by droonga-engine-modify-catalog command
Browse files Browse the repository at this point in the history
  • Loading branch information
piroor committed Jun 27, 2014
1 parent 7deccdd commit 8bb9f32
Show file tree
Hide file tree
Showing 3 changed files with 55 additions and 28 deletions.
33 changes: 22 additions & 11 deletions _po/ja/tutorial/1.0.4/dump-restore/index.po
Expand Up @@ -377,16 +377,18 @@ msgstr "ノード `192.168.0.10` を含む複製元クラスタと、ノード `
msgid ""
"If you are reading this tutorial sequentially, you'll have an existing cluster"
" with two nodes.\n"
"Construct two clusters and make one empty, with these commands:"
"Construct two clusters by `droonga-engine-modify-catalog` and make one cluster"
" empty, with these commands:"
msgstr ""
"もし順番にこのチュートリアルを読み進めているのであれば、2つのノードを含むクラスタが手元にあるはずです。以下の操作で2つのクラスタを作り、1つを空にしましょ"
":"
"もし順番にこのチュートリアルを読み進めているのであれば、2つのノードを含むクラスタが手元にあるはずです。`droonga-engine-modify-cat"
"alog` を使って2つのクラスタを作り、1つを空にしましょう。手順は以下の通りです:"

msgid ""
" (on 192.168.0.10)\n"
" # host=192.168.0.10\n"
" # droonga-engine-catalog-generate --hosts=$host \\\n"
" --output=~/droonga/catalog.json"
" # droonga-engine-modify-catalog --source=~/droonga/catalog.json \\\n"
" --update \\\n"
" --hosts=$host"
msgstr ""

msgid ""
Expand All @@ -395,8 +397,9 @@ msgid ""
" # kill $(cat $PWD/droonga-engine.pid)\n"
" # rm -r 000\n"
" # host=192.168.0.11\n"
" # droonga-engine-catalog-generate --hosts=$host \\\n"
" --output=$PWD/catalog.json\n"
" # droonga-engine-modify-catalog --source=$PWD/catalog.json \\\n"
" --update \\\n"
" --hosts=$host\n"
" # droonga-engine --host=$host \\\n"
" --log-file=$PWD/droonga-engine.log \\\n"
" --daemon \\\n"
Expand Down Expand Up @@ -491,13 +494,21 @@ msgstr ""
msgid "### Unite two Droonga clusters"
msgstr "### 2つのDroongaクラスタを結合する"

msgid "Run following command line to unite these two clusters:"
msgid "Run following command lines to unite these two clusters:"
msgstr "これらの2つのクラスタを結合するために、以下のコマンド列を実行しましょう:"

msgid ""
" (on 192.168.0.10, 192.168.0.11)\n"
" # droonga-engine-catalog-generate --hosts=192.168.0.10,192.168.0.11 \\\n"
" --output=~/droonga/catalog.json"
" (on 192.168.0.10)\n"
" # droonga-engine-modify-catalog --source=~/droonga/catalog.json \\\n"
" --update \\\n"
" --add-replica-hosts=192.168.0.11"
msgstr ""

msgid ""
" (on 192.168.0.11)\n"
" # droonga-engine-modify-catalog --source=~/droonga/catalog.json \\\n"
" --update \\\n"
" --add-replica-hosts=192.168.0.10"
msgstr ""

msgid "After that there is just one cluster - yes, it's the initial state."
Expand Down
24 changes: 16 additions & 8 deletions ja/tutorial/1.0.4/dump-restore/index.md
Expand Up @@ -235,20 +235,22 @@ Elapsed time: 0.008678467

ノード `192.168.0.10` を含む複製元クラスタと、ノード `192.168.0.11` を含む複製先クラスタの2つのクラスタがあると仮定します。

もし順番にこのチュートリアルを読み進めているのであれば、2つのノードを含むクラスタが手元にあるはずです。以下の操作で2つのクラスタを作り、1つを空にしましょう:
もし順番にこのチュートリアルを読み進めているのであれば、2つのノードを含むクラスタが手元にあるはずです。`droonga-engine-modify-catalog` を使って2つのクラスタを作り、1つを空にしましょう。手順は以下の通りです:

(on 192.168.0.10)
# host=192.168.0.10
# droonga-engine-catalog-generate --hosts=$host \
--output=~/droonga/catalog.json
# droonga-engine-modify-catalog --source=~/droonga/catalog.json \
--update \
--hosts=$host

(on 192.168.0.11)
# cd ~/droonga
# kill $(cat $PWD/droonga-engine.pid)
# rm -r 000
# host=192.168.0.11
# droonga-engine-catalog-generate --hosts=$host \
--output=$PWD/catalog.json
# droonga-engine-modify-catalog --source=$PWD/catalog.json \
--update \
--hosts=$host
# droonga-engine --host=$host \
--log-file=$PWD/droonga-engine.log \
--daemon \
Expand Down Expand Up @@ -303,9 +305,15 @@ Elapsed time: 0.008678467

これらの2つのクラスタを結合するために、以下のコマンド列を実行しましょう:

(on 192.168.0.10, 192.168.0.11)
# droonga-engine-catalog-generate --hosts=192.168.0.10,192.168.0.11 \
--output=~/droonga/catalog.json
(on 192.168.0.10)
# droonga-engine-modify-catalog --source=~/droonga/catalog.json \
--update \
--add-replica-hosts=192.168.0.11

(on 192.168.0.11)
# droonga-engine-modify-catalog --source=~/droonga/catalog.json \
--update \
--add-replica-hosts=192.168.0.10

これで、1つだけクラスタがある状態になりました。最初の状態に戻ったという事になります。

Expand Down
26 changes: 17 additions & 9 deletions tutorial/1.0.4/dump-restore/index.md
Expand Up @@ -230,20 +230,22 @@ It copies all data from an existing cluster to another one directly, so it is re
Assume that there are two clusters: the source has a node `192.168.0.10`, and the destination has a node `192.168.0.11`.

If you are reading this tutorial sequentially, you'll have an existing cluster with two nodes.
Construct two clusters and make one empty, with these commands:
Construct two clusters by `droonga-engine-modify-catalog` and make one cluster empty, with these commands:

(on 192.168.0.10)
# host=192.168.0.10
# droonga-engine-catalog-generate --hosts=$host \
--output=~/droonga/catalog.json
# droonga-engine-modify-catalog --source=~/droonga/catalog.json \
--update \
--hosts=$host

(on 192.168.0.11)
# cd ~/droonga
# kill $(cat $PWD/droonga-engine.pid)
# rm -r 000
# host=192.168.0.11
# droonga-engine-catalog-generate --hosts=$host \
--output=$PWD/catalog.json
# droonga-engine-modify-catalog --source=$PWD/catalog.json \
--update \
--hosts=$host
# droonga-engine --host=$host \
--log-file=$PWD/droonga-engine.log \
--daemon \
Expand Down Expand Up @@ -296,11 +298,17 @@ After that contents of these two clusters are completely synchronized. Confirm i

### Unite two Droonga clusters

Run following command line to unite these two clusters:
Run following command lines to unite these two clusters:

(on 192.168.0.10, 192.168.0.11)
# droonga-engine-catalog-generate --hosts=192.168.0.10,192.168.0.11 \
--output=~/droonga/catalog.json
(on 192.168.0.10)
# droonga-engine-modify-catalog --source=~/droonga/catalog.json \
--update \
--add-replica-hosts=192.168.0.11

(on 192.168.0.11)
# droonga-engine-modify-catalog --source=~/droonga/catalog.json \
--update \
--add-replica-hosts=192.168.0.10

After that there is just one cluster - yes, it's the initial state.

Expand Down

0 comments on commit 8bb9f32

Please sign in to comment.