openstack/swift
Code Issues Proposed changes

Merge "Fix port ranges in install guide"

Browse Source
This commit is contained in:
Jenkins
2017-03-03 02:50:24 +00:00
committed by Gerrit Code Review
parent f9954729a8 740d683e29
commit 4cd1e0d697
2 changed files with 43 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

84
install-guide/source/initial-rings.rst
View File

@@ -36,7 +36,7 @@ The account server uses the account ring to maintain lists of containers.
.. code-block:: console .. code-block:: console
# swift-ring-builder account.builder \ # swift-ring-builder account.builder \
add --region 1 --zone 1 --ip STORAGE_NODE_MANAGEMENT_INTERFACE_IP_ADDRESS --port 6002 \ add --region 1 --zone 1 --ip STORAGE_NODE_MANAGEMENT_INTERFACE_IP_ADDRESS --port 6202 \
--device DEVICE_NAME --weight DEVICE_WEIGHT --device DEVICE_NAME --weight DEVICE_WEIGHT
Replace ``STORAGE_NODE_MANAGEMENT_INTERFACE_IP_ADDRESS`` with the IP address Replace ``STORAGE_NODE_MANAGEMENT_INTERFACE_IP_ADDRESS`` with the IP address
@@ -48,7 +48,7 @@ The account server uses the account ring to maintain lists of containers.
.. code-block:: console .. code-block:: console
# swift-ring-builder account.builder add \ # swift-ring-builder account.builder add \
--region 1 --zone 1 --ip 10.0.0.51 --port 6002 --device sdb --weight 100 --region 1 --zone 1 --ip 10.0.0.51 --port 6202 --device sdb --weight 100
Repeat this command for each storage device on each storage node. In the Repeat this command for each storage device on each storage node. In the
example architecture, use the command in four variations: example architecture, use the command in four variations:
@@ -56,17 +56,17 @@ The account server uses the account ring to maintain lists of containers.
.. code-block:: console .. code-block:: console
# swift-ring-builder account.builder add \ # swift-ring-builder account.builder add \
--region 1 --zone 1 --ip 10.0.0.51 --port 6002 --device sdb --weight 100 --region 1 --zone 1 --ip 10.0.0.51 --port 6202 --device sdb --weight 100
Device d0r1z1-10.0.0.51:6002R10.0.0.51:6002/sdb_"" with 100.0 weight got id 0 Device d0r1z1-10.0.0.51:6202R10.0.0.51:6202/sdb_"" with 100.0 weight got id 0
# swift-ring-builder account.builder add \ # swift-ring-builder account.builder add \
--region 1 --zone 1 --ip 10.0.0.51 --port 6002 --device sdc --weight 100 --region 1 --zone 1 --ip 10.0.0.51 --port 6202 --device sdc --weight 100
Device d1r1z2-10.0.0.51:6002R10.0.0.51:6002/sdc_"" with 100.0 weight got id 1 Device d1r1z2-10.0.0.51:6202R10.0.0.51:6202/sdc_"" with 100.0 weight got id 1
# swift-ring-builder account.builder add \ # swift-ring-builder account.builder add \
--region 1 --zone 2 --ip 10.0.0.52 --port 6002 --device sdb --weight 100 --region 1 --zone 2 --ip 10.0.0.52 --port 6202 --device sdb --weight 100
Device d2r1z3-10.0.0.52:6002R10.0.0.52:6002/sdb_"" with 100.0 weight got id 2 Device d2r1z3-10.0.0.52:6202R10.0.0.52:6202/sdb_"" with 100.0 weight got id 2
# swift-ring-builder account.builder add \ # swift-ring-builder account.builder add \
--region 1 --zone 2 --ip 10.0.0.52 --port 6002 --device sdc --weight 100 --region 1 --zone 2 --ip 10.0.0.52 --port 6202 --device sdc --weight 100
Device d3r1z4-10.0.0.52:6002R10.0.0.52:6002/sdc_"" with 100.0 weight got id 3 Device d3r1z4-10.0.0.52:6202R10.0.0.52:6202/sdc_"" with 100.0 weight got id 3
#. Verify the ring contents: #. Verify the ring contents:
@@ -78,10 +78,10 @@ The account server uses the account ring to maintain lists of containers.
The minimum number of hours before a partition can be reassigned is 1 The minimum number of hours before a partition can be reassigned is 1
The overload factor is 0.00% (0.000000) The overload factor is 0.00% (0.000000)
Devices: id region zone ip address port replication ip replication port name weight partitions balance meta Devices: id region zone ip address port replication ip replication port name weight partitions balance meta
0 1 1 10.0.0.51 6002 10.0.0.51 6002 sdb 100.00 0 -100.00 0 1 1 10.0.0.51 6202 10.0.0.51 6202 sdb 100.00 0 -100.00
1 1 1 10.0.0.51 6002 10.0.0.51 6002 sdc 100.00 0 -100.00 1 1 1 10.0.0.51 6202 10.0.0.51 6202 sdc 100.00 0 -100.00
2 1 2 10.0.0.52 6002 10.0.0.52 6002 sdb 100.00 0 -100.00 2 1 2 10.0.0.52 6202 10.0.0.52 6202 sdb 100.00 0 -100.00
3 1 2 10.0.0.52 6002 10.0.0.52 6002 sdc 100.00 0 -100.00 3 1 2 10.0.0.52 6202 10.0.0.52 6202 sdc 100.00 0 -100.00
#. Rebalance the ring: #. Rebalance the ring:
@@ -113,7 +113,7 @@ However, it does not track object locations.
.. code-block:: console .. code-block:: console
# swift-ring-builder container.builder \ # swift-ring-builder container.builder \
add --region 1 --zone 1 --ip STORAGE_NODE_MANAGEMENT_INTERFACE_IP_ADDRESS --port 6001 \ add --region 1 --zone 1 --ip STORAGE_NODE_MANAGEMENT_INTERFACE_IP_ADDRESS --port 6201 \
--device DEVICE_NAME --weight DEVICE_WEIGHT --device DEVICE_NAME --weight DEVICE_WEIGHT
Replace ``STORAGE_NODE_MANAGEMENT_INTERFACE_IP_ADDRESS`` with the IP address Replace ``STORAGE_NODE_MANAGEMENT_INTERFACE_IP_ADDRESS`` with the IP address
@@ -125,7 +125,7 @@ However, it does not track object locations.
.. code-block:: console .. code-block:: console
# swift-ring-builder container.builder add \ # swift-ring-builder container.builder add \
--region 1 --zone 1 --ip 10.0.0.51 --port 6001 --device sdb --weight 100 --region 1 --zone 1 --ip 10.0.0.51 --port 6201 --device sdb --weight 100
Repeat this command for each storage device on each storage node. In the Repeat this command for each storage device on each storage node. In the
example architecture, use the command in four variations: example architecture, use the command in four variations:
@@ -133,17 +133,17 @@ However, it does not track object locations.
.. code-block:: console .. code-block:: console
# swift-ring-builder container.builder add \ # swift-ring-builder container.builder add \
--region 1 --zone 1 --ip 10.0.0.51 --port 6001 --device sdb --weight 100 --region 1 --zone 1 --ip 10.0.0.51 --port 6201 --device sdb --weight 100
Device d0r1z1-10.0.0.51:6001R10.0.0.51:6001/sdb_"" with 100.0 weight got id 0 Device d0r1z1-10.0.0.51:6201R10.0.0.51:6201/sdb_"" with 100.0 weight got id 0
# swift-ring-builder container.builder add \ # swift-ring-builder container.builder add \
--region 1 --zone 1 --ip 10.0.0.51 --port 6001 --device sdc --weight 100 --region 1 --zone 1 --ip 10.0.0.51 --port 6201 --device sdc --weight 100
Device d1r1z2-10.0.0.51:6001R10.0.0.51:6001/sdc_"" with 100.0 weight got id 1 Device d1r1z2-10.0.0.51:6201R10.0.0.51:6201/sdc_"" with 100.0 weight got id 1
# swift-ring-builder container.builder add \ # swift-ring-builder container.builder add \
--region 1 --zone 2 --ip 10.0.0.52 --port 6001 --device sdb --weight 100 --region 1 --zone 2 --ip 10.0.0.52 --port 6201 --device sdb --weight 100
Device d2r1z3-10.0.0.52:6001R10.0.0.52:6001/sdb_"" with 100.0 weight got id 2 Device d2r1z3-10.0.0.52:6201R10.0.0.52:6201/sdb_"" with 100.0 weight got id 2
# swift-ring-builder container.builder add \ # swift-ring-builder container.builder add \
--region 1 --zone 2 --ip 10.0.0.52 --port 6001 --device sdc --weight 100 --region 1 --zone 2 --ip 10.0.0.52 --port 6201 --device sdc --weight 100
Device d3r1z4-10.0.0.52:6001R10.0.0.52:6001/sdc_"" with 100.0 weight got id 3 Device d3r1z4-10.0.0.52:6201R10.0.0.52:6201/sdc_"" with 100.0 weight got id 3
#. Verify the ring contents: #. Verify the ring contents:
@@ -155,10 +155,10 @@ However, it does not track object locations.
The minimum number of hours before a partition can be reassigned is 1 The minimum number of hours before a partition can be reassigned is 1
The overload factor is 0.00% (0.000000) The overload factor is 0.00% (0.000000)
Devices: id region zone ip address port replication ip replication port name weight partitions balance meta Devices: id region zone ip address port replication ip replication port name weight partitions balance meta
0 1 1 10.0.0.51 6001 10.0.0.51 6001 sdb 100.00 0 -100.00 0 1 1 10.0.0.51 6201 10.0.0.51 6201 sdb 100.00 0 -100.00
1 1 1 10.0.0.51 6001 10.0.0.51 6001 sdc 100.00 0 -100.00 1 1 1 10.0.0.51 6201 10.0.0.51 6201 sdc 100.00 0 -100.00
2 1 2 10.0.0.52 6001 10.0.0.52 6001 sdb 100.00 0 -100.00 2 1 2 10.0.0.52 6201 10.0.0.52 6201 sdb 100.00 0 -100.00
3 1 2 10.0.0.52 6001 10.0.0.52 6001 sdc 100.00 0 -100.00 3 1 2 10.0.0.52 6201 10.0.0.52 6201 sdc 100.00 0 -100.00
#. Rebalance the ring: #. Rebalance the ring:
@@ -190,7 +190,7 @@ on local devices.
.. code-block:: console .. code-block:: console
# swift-ring-builder object.builder \ # swift-ring-builder object.builder \
add --region 1 --zone 1 --ip STORAGE_NODE_MANAGEMENT_INTERFACE_IP_ADDRESS --port 6000 \ add --region 1 --zone 1 --ip STORAGE_NODE_MANAGEMENT_INTERFACE_IP_ADDRESS --port 6200 \
--device DEVICE_NAME --weight DEVICE_WEIGHT --device DEVICE_NAME --weight DEVICE_WEIGHT
Replace ``STORAGE_NODE_MANAGEMENT_INTERFACE_IP_ADDRESS`` with the IP address Replace ``STORAGE_NODE_MANAGEMENT_INTERFACE_IP_ADDRESS`` with the IP address
@@ -202,7 +202,7 @@ on local devices.
.. code-block:: console .. code-block:: console
# swift-ring-builder object.builder add \ # swift-ring-builder object.builder add \
--region 1 --zone 1 --ip 10.0.0.51 --port 6000 --device sdb --weight 100 --region 1 --zone 1 --ip 10.0.0.51 --port 6200 --device sdb --weight 100
Repeat this command for each storage device on each storage node. In the Repeat this command for each storage device on each storage node. In the
example architecture, use the command in four variations: example architecture, use the command in four variations:
@@ -210,17 +210,17 @@ on local devices.
.. code-block:: console .. code-block:: console
# swift-ring-builder object.builder add \ # swift-ring-builder object.builder add \
--region 1 --zone 1 --ip 10.0.0.51 --port 6000 --device sdb --weight 100 --region 1 --zone 1 --ip 10.0.0.51 --port 6200 --device sdb --weight 100
Device d0r1z1-10.0.0.51:6000R10.0.0.51:6000/sdb_"" with 100.0 weight got id 0 Device d0r1z1-10.0.0.51:6200R10.0.0.51:6200/sdb_"" with 100.0 weight got id 0
# swift-ring-builder object.builder add \ # swift-ring-builder object.builder add \
--region 1 --zone 1 --ip 10.0.0.51 --port 6000 --device sdc --weight 100 --region 1 --zone 1 --ip 10.0.0.51 --port 6200 --device sdc --weight 100
Device d1r1z2-10.0.0.51:6000R10.0.0.51:6000/sdc_"" with 100.0 weight got id 1 Device d1r1z2-10.0.0.51:6200R10.0.0.51:6200/sdc_"" with 100.0 weight got id 1
# swift-ring-builder object.builder add \ # swift-ring-builder object.builder add \
--region 1 --zone 2 --ip 10.0.0.52 --port 6000 --device sdb --weight 100 --region 1 --zone 2 --ip 10.0.0.52 --port 6200 --device sdb --weight 100
Device d2r1z3-10.0.0.52:6000R10.0.0.52:6000/sdb_"" with 100.0 weight got id 2 Device d2r1z3-10.0.0.52:6200R10.0.0.52:6200/sdb_"" with 100.0 weight got id 2
# swift-ring-builder object.builder add \ # swift-ring-builder object.builder add \
--region 1 --zone 2 --ip 10.0.0.52 --port 6000 --device sdc --weight 100 --region 1 --zone 2 --ip 10.0.0.52 --port 6200 --device sdc --weight 100
Device d3r1z4-10.0.0.52:6000R10.0.0.52:6000/sdc_"" with 100.0 weight got id 3 Device d3r1z4-10.0.0.52:6200R10.0.0.52:6200/sdc_"" with 100.0 weight got id 3
#. Verify the ring contents: #. Verify the ring contents:
@@ -232,10 +232,10 @@ on local devices.
The minimum number of hours before a partition can be reassigned is 1 The minimum number of hours before a partition can be reassigned is 1
The overload factor is 0.00% (0.000000) The overload factor is 0.00% (0.000000)
Devices: id region zone ip address port replication ip replication port name weight partitions balance meta Devices: id region zone ip address port replication ip replication port name weight partitions balance meta
0 1 1 10.0.0.51 6000 10.0.0.51 6000 sdb 100.00 0 -100.00 0 1 1 10.0.0.51 6200 10.0.0.51 6200 sdb 100.00 0 -100.00
1 1 1 10.0.0.51 6000 10.0.0.51 6000 sdc 100.00 0 -100.00 1 1 1 10.0.0.51 6200 10.0.0.51 6200 sdc 100.00 0 -100.00
2 1 2 10.0.0.52 6000 10.0.0.52 6000 sdb 100.00 0 -100.00 2 1 2 10.0.0.52 6200 10.0.0.52 6200 sdb 100.00 0 -100.00
3 1 2 10.0.0.52 6000 10.0.0.52 6000 sdc 100.00 0 -100.00 3 1 2 10.0.0.52 6200 10.0.0.52 6200 sdc 100.00 0 -100.00
#. Rebalance the ring: #. Rebalance the ring:

2
install-guide/source/storage-include3.txt
View File

@@ -9,7 +9,7 @@ following actions:
[DEFAULT] [DEFAULT]
... ...
bind_ip = MANAGEMENT_INTERFACE_IP_ADDRESS bind_ip = MANAGEMENT_INTERFACE_IP_ADDRESS
bind_port = 6000 bind_port = 6200
user = swift user = swift
swift_dir = /etc/swift swift_dir = /etc/swift
devices = /srv/node devices = /srv/node