YUKI Hiroshi
null+****@clear*****
Fri Jun 27 21:59:08 JST 2014
YUKI Hiroshi 2014-06-27 21:59:08 +0900 (Fri, 27 Jun 2014) New Revision: 8bb9f327417345d698322975ce9721564365350a https://github.com/droonga/droonga.org/commit/8bb9f327417345d698322975ce9721564365350a Message: Update catalog.json by droonga-engine-modify-catalog command Modified files: _po/ja/tutorial/1.0.4/dump-restore/index.po ja/tutorial/1.0.4/dump-restore/index.md tutorial/1.0.4/dump-restore/index.md Modified: _po/ja/tutorial/1.0.4/dump-restore/index.po (+22 -11) =================================================================== --- _po/ja/tutorial/1.0.4/dump-restore/index.po 2014-06-27 20:42:25 +0900 (92df75d) +++ _po/ja/tutorial/1.0.4/dump-restore/index.po 2014-06-27 21:59:08 +0900 (333a0bb) @@ -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 "" @@ -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" @@ -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." Modified: ja/tutorial/1.0.4/dump-restore/index.md (+16 -8) =================================================================== --- ja/tutorial/1.0.4/dump-restore/index.md 2014-06-27 20:42:25 +0900 (0c7d69a) +++ ja/tutorial/1.0.4/dump-restore/index.md 2014-06-27 21:59:08 +0900 (6c88d83) @@ -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 \ @@ -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つだけクラスタがある状態になりました。最初の状態に戻ったという事になります。 Modified: tutorial/1.0.4/dump-restore/index.md (+17 -9) =================================================================== --- tutorial/1.0.4/dump-restore/index.md 2014-06-27 20:42:25 +0900 (4a68e2d) +++ tutorial/1.0.4/dump-restore/index.md 2014-06-27 21:59:08 +0900 (be674b9) @@ -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 \ @@ -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. -------------- next part -------------- HTML����������������������������... Télécharger