From ef800e8db89ed6e3ccb2d937ba84e74d4817c2ed Mon Sep 17 00:00:00 2001 From: Chris Lu Date: Sun, 12 Feb 2017 22:19:01 -0800 Subject: [PATCH] fix documentation --- Change-List.md | 3 --- Getting-Started.md | 2 -- Replication.md | 47 +++++++++------------------------------------- 3 files changed, 9 insertions(+), 43 deletions(-) diff --git a/Change-List.md b/Change-List.md index 298f75b..f3cbe9d 100644 --- a/Change-List.md +++ b/Change-List.md @@ -79,7 +79,6 @@ Adjust command line options. - -peers => -master.peers - -mdir => -master.dir - -volumeSizeLimitMB => -master.volumeSizeLimitMB - - -conf => -master.conf - -defaultReplicaPlacement => -master.defaultReplicaPlacement - -port => -volume.port - -max => -volume.max @@ -211,8 +210,6 @@ weed volume -dir=/tmp/1 -port=8080 -dataCenter=dc1 weed volume -dir=/tmp/2 -port=8081 -dataCenter=dc2 ``` -Or the master server can determine the data center via volume server's IP address and settings in weed.conf file. - Now when requesting a file key, an optional "dataCenter" parameter can limit the assigned volume to the specific data center. For example, this specif ``` diff --git a/Getting-Started.md b/Getting-Started.md index aadc929..fd8e381 100644 --- a/Getting-Started.md +++ b/Getting-Started.md @@ -24,8 +24,6 @@ If no replication is required, this will be enough. The "mdir" option is to conf ./weed master -mdir="." ``` -If you need replication, you would also set the configuration file. By default it is "/etc/weedfs/weedfs.conf" file. The example can be found in RackDataCenterAwareReplication - ### Set up Weed Volume Server ```bash diff --git a/Replication.md b/Replication.md index 249a7f8..11fafc1 100644 --- a/Replication.md +++ b/Replication.md @@ -13,12 +13,16 @@ Basically, the way it works is: 2. start volume servers as this: ```bash - ./weed volume -port=8081 -dir=/tmp/1 -max=100 - ./weed volume -port=8082 -dir=/tmp/2 -max=100 - ./weed volume -port=8083 -dir=/tmp/3 -max=100 + ./weed volume -port=8081 -dir=/tmp/1 -max=100 -mserver="master_address:9333" -dataCenter=dc1 -rack=rack1 + ./weed volume -port=8082 -dir=/tmp/2 -max=100 -mserver="master_address:9333" -dataCenter=dc1 -rack=rack1 + ``` +On another rack, + ```bash + ./weed volume -port=8081 -dir=/tmp/1 -max=100 -mserver="master_address:9333" -dataCenter=dc1 -rack=rack2 + ./weed volume -port=8082 -dir=/tmp/2 -max=100 -mserver="master_address:9333" -dataCenter=dc1 -rack=rack2 ``` -Submitting, Reading, Deleting files has the same steps. +No change to Submitting, Reading, and Deleting files. ## The meaning of replication type @@ -45,41 +49,8 @@ Column | Meaning x,y,z each can be 0, 1, or 2. So there are 9 possible replication types, and can be easily extended. Each replication type will physically create x+y+z+1 copies of volume data files. -Example topology configuration -################################### -The SeaweedFS master server tries to read the default topology configuration file are read from /etc/weedfs/weedfs.conf, if it exists. The topology setting to configure data center and racks file format is as this. - -```xml - - - - - 192.168.1.1 - - - - - 192.168.1.2 - - - 192.168.1.3 - 192.168.1.4 - - - - -``` - -Allocate File Key on specific data center -Volume servers can start with a specific data center name. - -```bash -weed volume -dir=/tmp/1 -port=8080 -dataCenter=dc1 -weed volume -dir=/tmp/2 -port=8081 -dataCenter=dc2 -``` - -Or the master server can determine the data center via volume server's IP address and settings in weed.conf file. +## Allocate File Key on specific data center Now when requesting a file key, an optional "dataCenter" parameter can limit the assigned volume to the specific data center. For example, this specify