summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlistair Coles <alistair.coles@hpe.com>2016-03-22 11:36:32 +0000
committerAlistair Coles <alistair.coles@hpe.com>2016-03-22 11:36:32 +0000
commit736de613f1e2a6a460f4499cbd1e9f7f1fc3da68 (patch)
treea6fafc81e57007fa3bf001c3ed281b7bcca18b73
parent7cc2c783a4ea350725c82191425607967023cbe6 (diff)
downloadswift-736de613f1e2a6a460f4499cbd1e9f7f1fc3da68.tar.gz
Docs: Container sync does not require POST-as-COPY
Updates docs to remove warnings that container sync only works with object_post_as_copy=True. Since commit e91de49 container sync will also sync POST updates when using object_post_as_copy=False. Change-Id: I5cc3cc6e8f9ba2fef6f896f2b11d2a4e06825f7f
-rw-r--r--doc/manpages/proxy-server.conf.53
-rw-r--r--doc/source/deployment_guide.rst6
-rw-r--r--doc/source/overview_container_sync.rst14
-rw-r--r--etc/proxy-server.conf-sample3
-rw-r--r--swift/container/sync.py7
5 files changed, 3 insertions, 30 deletions
diff --git a/doc/manpages/proxy-server.conf.5 b/doc/manpages/proxy-server.conf.5
index 724aafd70..6fd9d16ea 100644
--- a/doc/manpages/proxy-server.conf.5
+++ b/doc/manpages/proxy-server.conf.5
@@ -971,8 +971,7 @@ is false.
.IP \fBobject_post_as_copy\fR
Set object_post_as_copy = false to turn on fast posts where only the metadata changes
are stored as new and the original data file is kept in place. This makes for quicker
-posts; but since the container metadata isn't updated in this mode, features like
-container sync won't be able to sync posts. The default is True.
+posts. The default is True.
.IP \fBaccount_autocreate\fR
If set to 'true' authorized accounts that do not yet exist within the Swift cluster
will be automatically created. The default is set to false.
diff --git a/doc/source/deployment_guide.rst b/doc/source/deployment_guide.rst
index 94d418c66..590b1f6a2 100644
--- a/doc/source/deployment_guide.rst
+++ b/doc/source/deployment_guide.rst
@@ -1325,11 +1325,7 @@ object_post_as_copy true Set object_post_as_copy = false
the metadata changes are stored
anew and the original data file
is kept in place. This makes for
- quicker posts; but since the
- container metadata isn't updated
- in this mode, features like
- container sync won't be able to
- sync posts.
+ quicker posts.
account_autocreate false If set to 'true' authorized
accounts that do not yet exist
within the Swift cluster will
diff --git a/doc/source/overview_container_sync.rst b/doc/source/overview_container_sync.rst
index c1255acaf..25772bdf1 100644
--- a/doc/source/overview_container_sync.rst
+++ b/doc/source/overview_container_sync.rst
@@ -14,13 +14,6 @@ synchronization key.
.. note::
- Container sync will sync object POSTs only if the proxy server is set to
- use "object_post_as_copy = true" which is the default. So-called fast
- object posts, "object_post_as_copy = false" do not update the container
- listings and therefore can't be detected for synchronization.
-
-.. note::
-
If you are using the large objects feature you will need to ensure both
your manifest file and your segment files are synced if they happen to be
in different containers.
@@ -386,13 +379,6 @@ from ``sync-containers``.
cluster. Therefore, the container servers must be permitted to initiate
outbound connections to the remote proxy servers (or load balancers).
-.. note::
-
- Container sync will sync object POSTs only if the proxy server is set to
- use "object_post_as_copy = true" which is the default. So-called fast
- object posts, "object_post_as_copy = false" do not update the container
- listings and therefore can't be detected for synchronization.
-
The actual syncing is slightly more complicated to make use of the three
(or number-of-replicas) main nodes for a container without each trying to
do the exact same work but also without missing work if one node happens to
diff --git a/etc/proxy-server.conf-sample b/etc/proxy-server.conf-sample
index 8267ce4ab..a746329b5 100644
--- a/etc/proxy-server.conf-sample
+++ b/etc/proxy-server.conf-sample
@@ -131,8 +131,7 @@ use = egg:swift#proxy
#
# Set object_post_as_copy = false to turn on fast posts where only the metadata
# changes are stored anew and the original data file is kept in place. This
-# makes for quicker posts; but since the container metadata isn't updated in
-# this mode, features like container sync won't be able to sync posts.
+# makes for quicker posts.
# object_post_as_copy = true
#
# If set to 'true' authorized accounts that do not yet exist within the Swift
diff --git a/swift/container/sync.py b/swift/container/sync.py
index 7bb37f922..0b3b933ac 100644
--- a/swift/container/sync.py
+++ b/swift/container/sync.py
@@ -100,13 +100,6 @@ class ContainerSync(Daemon):
If they exist, newer rows since the last sync will trigger PUTs or DELETEs
to the other container.
- .. note::
-
- Container sync will sync object POSTs only if the proxy server is set
- to use "object_post_as_copy = true" which is the default. So-called
- fast object posts, "object_post_as_copy = false" do not update the
- container listings and therefore can't be detected for synchronization.
-
The actual syncing is slightly more complicated to make use of the three
(or number-of-replicas) main nodes for a container without each trying to
do the exact same work but also without missing work if one node happens to