a064fa4227c4960052e2089d2b05bc684706f13e
Commit Graph

2270 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jenkins
94d295e409 Merge "Allow object-expirer to delete the last version of an object" 2012年11月02日 19:37:58 +00:00
Jenkins
452469592a Merge "Make multipart/byteranges boundary always length 32." 2012年11月02日 19:37:36 +00:00
Jenkins
13941cb8eb Merge "dispersion report option to output missing parts" 2012年11月02日 19:35:38 +00:00
yuan-zhou
ba3babadde Allow object-expirer to delete the last version of an object
Fix bug 1067677
When we delete a versioned object, the last version will be poped out from the
versiones container. When a versioned object is expired and deleted by object-
expirer, the last version is restored but remains in the versions container
instead of getting deleted. The reason is object-expirer will set
'X-If-Delete- At' header when deleteing an object. However this is for the
current version - not for the last version. When the object-server is trying
to delete the last version, the transaction will fail with error:
X-If-Delete-At and X-Delete-At do not match. Delete the 'X-If-Delete-At'
field in the later built delete request would help to solve this issue.
This patch, without the test, was first proposed by
Zhou Yuan <yuan.zhou@intel.com>.
Change-Id: I62c97e6a0f140888497e189129825865fb6f7966
2012年11月02日 11:49:33 -07:00
Jenkins
7af535cb2c Merge "Separate wsgi init from web-front-end activation" 2012年11月02日 18:26:40 +00:00
Samuel Merritt
f955e66a02 Make multipart/byteranges boundary always length 32.
Due to a lack of zero-padding in a format string, there was a 1/16
chance that the length of the randomly-generated boundary string was
less than 32. This didn't affect client downloads, but it did give the
unit tests a 1/16 chance of failing (there's a [0-9a-f]{32} regex in a
test).
Now we left-zero-pad the boundary string to length 32, and the test
consistently passes.
Change-Id: I4ee98dab127e5674e59b078d8090470ec783e0b0
2012年11月02日 11:21:24 -07:00
Jenkins
8a061c086a Merge "blueprint Multi-range support implementation" 2012年11月02日 18:16:28 +00:00
David Hadas
9efa9be167 Separate wsgi init from web-front-end activation
Separate the request processor initialization steps
 Load common settings from conf
 Set the logger
 Load the request processor
from the web front end server application step
On branch bp/wsgi-application-interface-7
 modified: swift/common/wsgi.py
Implements Blueprint: wsgi-application-interface
Change-Id: I25fabad8846cd644e4bf1e1bd9c2e568512e12e5
2012年11月02日 10:48:57 -07:00
Jenkins
d70d3092c0 Merge "Handle down object servers in container-sync" 2012年11月02日 05:44:45 +00:00
Michael Barton
af031138be re-use headers_to_container_info on container GET
Currently, a container's info can be cached without cors data intact after
a container GET.
I made headers_to_container_info a function instead of a method and I crammed
all container metadata into container_info.
This is so e.g. staticweb can eventually re-use the same container info cache.
Fix pep8 in swift/proxy/controllers/container.py
Change-Id: I4bbb042dde79afac48395efc38bd80f0ff240e1f
2012年11月01日 18:46:47 -07:00
litong01
ce274b3532 blueprint Multi-range support implementation
This change adds multi range retrieval to OpenStack Swift. For non-
segmented data object, a client can use HTTP Range header to specify
multiple ranges to retrieve sections of the data object.
This implementation currently does not support segmented data object
multi range retrieval. When a client sends a multi range request
against a segmented data object, Swift will return HTTP status code
200. Support for segmented data multi range retrieval will be added
in near future.
This implementation is to bring Swift closer to CDMI multi range
data retrieval standard. Once support for segemented data multi
range is added, Swift will be compliant with CDMI standard in
this area.
DocImpact
Change-Id: I4ed1fb0a0a93c037ddb2f551ea62afe447945107
2012年11月01日 20:45:30 -04:00
Donagh McCabe
00c3fde8f8 Handle down object servers in container-sync
If an object server is down, container-sync stops syncing the container
even if the it gets object copies from "up" obejct servers.
Bug 1069910
In case the git history gets mangled, this fix was done almost entirely
by Donagh McCabe <donagh.mccabe@hp.com>.
Change-Id: Ieeadcfeb4e880fe5f08e284d7c12492bf7a29460
2012年11月01日 16:45:35 -07:00
Jenkins
c7948ec5d9 Merge "changed TRUE_VALUES references to utils.config_true_value() call" 2012年10月31日 18:46:11 +00:00
gholt
dcc89e3ad6 dispersion report option to output missing parts
Adds a -p option to swift-dispersion-report that will output the
partitions missing copies to standard error. Another thing we've been
meaning to add for forever. It's useful when you want to do some
further research on whether a partition truly has fewer copies or if
they're just somewhere else in the cluster due to a ring change, for
instance.
DocImpact
Change-Id: I5e47aa5818483ecc34b39ef6f8cd83ad312ed9a0
2012年10月30日 17:40:42 +00:00
gholt
a94a283149 Fixed bugs re: make_pre_authed* and SCRIPT_NAME
There were bugs with SCRIPT_NAME and
swift.common.wsgi.make_pre_authed* functions.
1) SCRIPT_NAME wasn't copied with PATH_INFO, which it should've been.
2) When a new path was given, SCRIPT_NAME wasn't set to an empty
 string but just omitted, which is allowed by spec, but really
 should be set.
For completeness, if SCRIPT_NAME doesn't exist in the source env, it
will be created in the new env, but as an empty string.
Change-Id: Ifbc27ed8ff357038c54df4d37de46cfd5e31372e
2012年10月30日 15:54:05 +00:00
John Dickinson
8ac292595f changed TRUE_VALUES references to utils.config_true_value() call
cleaned up pep8 (v1.3.3) in all files this patch touches
Change-Id: I30e8314dfdc23fb70ab83741a548db9905dfccff
2012年10月29日 13:59:01 -07:00
David Hadas
6c6b84b3f5 Fix non standard 100-continue behaviour
Swift proxy server, when communicating with
the back-end servers ALWAYS sends 100-continue.
Even if the length headers indicate that there
is no body (content-length: 0).
This behavior is not inline with the standard.
RFC2616:8.2.3 disallows 100-continue
 for req.content_length==0
This fix removes 100-continue during PUT requests
without a body while maintining the ability for
handoff in case of faliure.
On branch bp/wsgi-application-interface-5
 modified: swift/proxy/controllers/obj.py
Fixes: Bug #1070025
Implements Blueprint: 	wsgi-application-interface
Change-Id: Ia4eb8b886a74968cca4e8bde208641b37f2c104c
2012年10月29日 22:06:34 +02:00
Jenkins
1f232e19cf Merge "Remove double GET on range requests." 2012年10月29日 05:11:43 +00:00
Jenkins
0ca2d007e2 Merge "Extended documentation for using custom loggers" 2012年10月29日 04:55:31 +00:00
Florian Hines
de09cbe6f4 Extended documentation for using custom loggers
Change-Id: I78a5c109c9440df752e390698502f57d4392fb67
2012年10月26日 17:59:42 -05:00
Samuel Merritt
40f46e245c Allow unsetting of X-Container-Sync-To header.
Fixes bug 1071790.
Change-Id: Ic0509190b9994e7d983bcf20daa64a650cc974cb
2012年10月26日 10:11:22 -07:00
Jenkins
0a03bd06a3 Merge "Added partition option to swift-get-nodes" 2012年10月25日 23:11:05 +00:00
Jenkins
b91c5900ed Merge "Db reclamation should remove empty suffix dirs" 2012年10月25日 21:30:03 +00:00
Jenkins
a3676b6e02 Merge "fix config parsing in swift-bench -x" 2012年10月25日 20:21:31 +00:00
gholt
b5509b1bee Db reclamation should remove empty suffix dirs
When a db is reclaimed it removes the hash dir the db files are in,
but it does not try to remove the parent suffix dir though it might
be empty now. This eventually leads to a bunch of empty suffix dirs
lying around. This patch fixes that by attempting to remove the
parent suffix dir after a hash dir reclamation.
Here's a quick script to see how bad a given drive might be:
import os, os.path, sys
if len(sys.argv) != 2:
 sys.exit('%s <mount-point>' % sys.argv[0])
in_use = 0
empty = 0
containers = os.path.join(sys.argv[1], 'containers')
for p in os.listdir(containers):
 partition = os.path.join(containers, p)
 for s in os.listdir(partition):
 suffix = os.path.join(partition, s)
 if os.listdir(suffix):
 in_use += 1
 else:
 empty += 1
print in_use, 'in use,', empty, 'empty,', '%.02f%%' % (
 100.0 * empty / (in_use + empty)), 'empty'
And here's a quick script to clean up a drive:
NOTE THAT I HAVEN'T ACTUALLY RUN THIS ON A LIVE NODE YET!
import errno, os, os.path, sys
if len(sys.argv) != 2:
 sys.exit('%s <mount-point>' % sys.argv[0])
containers = os.path.join(sys.argv[1], 'containers')
for p in os.listdir(containers):
 partition = os.path.join(containers, p)
 for s in os.listdir(partition):
 suffix = os.path.join(partition, s)
 try:
 os.rmdir(suffix)
 except OSError, err:
 if err.errno not in (errno.ENOENT, errno.ENOTEMPTY):
 print err
Change-Id: I2e6463a4cd40597fc236ebe3e73b4b31347f2309
2012年10月25日 19:42:56 +00:00
gholt
e415e4d235 Added partition option to swift-get-nodes
Sometimes you just want to know what machines a given partition
should be on, or what handoffs that partition would use if needed.
We've been meaning to add this option to swift-get-nodes for quite
some time, but I just finally got to it.
Example: swift-get-nodes /etc/swift/object.ring.gz -p 123
I tried to leave as much of the existing swift-get-nodes unaltered,
so the output isn't exactly distilled to just what you'd need for
getting a partition's nodes. But it should suffice for what it is, an
admin tool.
Change-Id: I438400ddc0eecbf9c48266e7f38a2e4f0765f374
2012年10月25日 17:47:01 +00:00
John Dickinson
af4b2851fc fix config parsing in swift-bench -x
This patch ensures that the command-line arg format (boolean)
doesn't conflict with the conf file format (string) and the
proper action is taken.
Change-Id: I3284096e1a9478897e1c3246ab190b46d2590243
2012年10月25日 09:26:00 -07:00
Jenkins
f9b49a8052 Merge "Remove utf-8 in metadata and http header names" 2012年10月25日 16:01:05 +00:00
Jenkins
1c05d62bed Merge "Adding CORS support" 2012年10月25日 02:23:57 +00:00
Samuel Merritt
9cb7751fad Remove double GET on range requests.
The proxy server's ObjectController was performing multiple GET
requests to the object server when processing requests with Range
headers. This was a workaround for a bug in the proxy server's
Controller.GETorHEAD_base method where a response code of 416 from the
object server was incorrectly treated as a bad response from the
backend, the same way a 404 or a 5xx would be.
A 416 (Requested Range Not Satisfiable) from the object server is now
considered a good response. Since the response headers from the object
server already include the X-Object-Manifest header, there's no need
to make a second request (sans Range header) to see if the object is a
manifest.
Bonus fix: updated message for status 416 to match RFC2616.
Bonus fix 2: removed a leftover debugging print() in
test/unit/proxy/test_server.py.
Fixes bug 1065869.
Change-Id: I156af0b463f02ef19a8cfe37092544a599d89b78
2012年10月24日 17:16:11 -07:00
Jenkins
63a564e6ca Merge "Two MIME types sent during test" 2012年10月23日 22:19:22 +00:00
Jenkins
655892423e Merge "Track unlinks of async_pendings." 2012年10月23日 22:19:01 +00:00
Jenkins
78e2ffab6c Merge "Fixes Ilegal chunk encoding by the test_client" 2012年10月23日 20:50:52 +00:00
Scott Simpson
74b27d504d Adding CORS support
Change-Id: I894473994cdfea0996ad16e7619aff421f604abc
2012年10月23日 14:48:59 -05:00
David Hadas
56e757257e Remove utf-8 in metadata and http header names
RFC2616 implicitly allows transferring utf-8 in
headers (vals) but not in header names (keys)
Swift functional tests includes testing for utf-8
header names (keys) which is non aligned with the standard.
This seem to be the case when testing file metadata.
File metadata keys are than transferred as part of
the http header keys (header names) as
 X-Object-Meta-<metadata_key>=metadata_name.
As a result metadata_keys in swift must be composed from
a subset of ASCII characters - alpha numerics,
some punctuation, not a lot else* and cannot be utf-8.
On branch bp/wsgi-application-interface-4
modified: test/functional/tests.py
Change-Id: I1932e9d4ead83089e8a31a06d28a54f5625efb9c
Fixes: bug 1068026
Implements: blueprint wsgi-application-interface
2012年10月23日 20:39:50 +02:00
Jenkins
e2cb7a6855 Merge "Add OpenStack trove classifier for PyPI" 2012年10月23日 18:15:22 +00:00
Samuel Merritt
851bbe2ea9 Track unlinks of async_pendings.
It's not sufficient to just look at swift.object-updater.successes to
see the async_pending unlink rate. There are two different spots where
unlinks happen: one when an async_pending has been successfully
processed, and another when the updater notices multiple
async_pendings for the same object. Both events are now tracked under
the same name: swift.object-updater.unlinks.
FakeLogger has now sprouted a couple of convenience methods for
testing logged metrics.
Fixed pep8 1.3.3's complaints in the files this diff touches.
Also: bonus speling and, grammar fixes in the admin guide.
Change-Id: I8c1493784adbe24ba2b5512615e87669b3d94505
2012年10月23日 10:27:21 -07:00
David Hadas
d5cdbbe0ea Two MIME types sent during test
The directory tests TestContainerPathsEnv creates directorys during SetUp while indicating duplicate application internet media type (MIME) via the Content-Type header.
E.g the output on the line using 'nosetests -v test.functional.tests:TestContainerPaths.testContainerListing' includes:
Host: 127.0.0.1:8080
Accept-Encoding: identity
Content-Type: application/octet-stream
Content-Length: 0
content-type: application/directory
X-Auth-Token: AUTH_tkd40f5550289d4d60af75bb1b6c6067be
On branch bp/wsgi-application-interface-3
 modified: test/functional/tests.py
Fixes: Bug #1068499
Implements Blueprint 	wsgi-application-interface
Change-Id: I49c5d1f73fff3c06d4be18b20c7209eff4e1326c
2012年10月23日 09:36:51 +02:00
Jenkins
cee685e11a Merge "Fix version requirement for mock library." 2012年10月23日 04:27:28 +00:00
Doug Hellmann
529f410605 Add OpenStack trove classifier for PyPI
Add trove classifier to have swift listed among the
other OpenStack-related projets on PyPI to reserve
the name, even though we won't release packages there.
Change-Id: I2c6cd2e37ea55d2bc2ddbba813ee2a190b1c90a9
Signed-off-by: Doug Hellmann <doug.hellmann@dreamhost.com>
2012年10月22日 18:55:15 -04:00
David Hadas
2531df96a0 Fixes Ilegal chunk encoding by the test_client
test_client sends a wrong size indication when testing
chunked data.
For example instead of sending:
 5\r\nabcde\r\n (which is inline with the standard)
The client would send:
 0x5\r\nabcde\r\n
On branch bp/wsgi-application-interface-2
 modified: test/functional/swift_test_client.py
Change-Id: I7597dcd24adade009aead66f67674f361f3fe4fa
Fixes: Bug #1070036
Implements: Blueprint wsgi-application-interface
2012年10月23日 00:35:09 +02:00
Victor Rodionov
22a8adfcb9 path_qs for swob.Request
Add path_qs property to swob.Request. First of all this property
has webob.Request, also this property can be used in swift3 middleware
for generate canonical string, if webob will be replaced in swift3 with
swob (2b36fbd477).
Change-Id: Idf58096baaf7830dd0d624ea6c72eda1eb91ff0d
2012年10月22日 16:56:30 +04:00
Jenkins
bdafc29fd9 Merge "Make StatsD tests less flaky." 2012年10月19日 18:26:07 +00:00
Jenkins
67d1017d8a Merge "do not dump_recon_cache on limited obj replic" 2012年10月19日 18:04:10 +00:00
Jenkins
83d9cd6606 Merge "Remove replication prioritization" 2012年10月19日 16:59:09 +00:00
Jenkins
425ca1ff70 Merge "Relax mount point name checking." 2012年10月19日 15:39:27 +00:00
Jenkins
43ee6396ae Merge "fix empty body getter bug 1067923" 2012年10月19日 15:09:55 +00:00
gholt
25ee63a943 Remove replication prioritization
Turns out this prioritization causes stampedes right after capacity
additions (especially on smaller clusters), which means the things it
prioritizes don't get done for several passes anyway, which means the
prioritization isn't solving the problem it was designed to do, and
it causes non-productive load spikes instead. :/
Getting rid of the prioritization doesn't make things go any slower
overall, could make things actually go faster since there are less
collisions, and evens out the load.
Change-Id: I4938bcd12d9a21fad635cfe772897e4c151f8a95
2012年10月19日 00:50:25 +00:00
John Dickinson
4c76f3dc3c removed duplicate in AUTHORS file
Change-Id: Ia430637f24d883ee166cb6529dde03049cc06120
2012年10月18日 12:37:50 -07:00
Victor Lowther
956cc0c793 Relax mount point name checking.
In general, Linux does not care about what a mount point is named as
long as it is a vaild directory name (no / or null characters).
However, that is too relaxed for swift, which will pass that mount
point name around as part of url path construction all over the
place. To make sure that the mount point name was sane from that POV,
Swift was using isalnum to verify that the mount point name was sane,
which is overly restrictive.
This patch replaces that test with a test that verifies that the name
has no characters that need to be URL encoded.
The specific use case this enables is allowing mount points to be
named according to the UUID of the filesystem that is being mounted,
which will make Swift more robust in the face of device name instability.
Change-Id: I4d49b21c1783e97c16d3f394c2171f1f80eea058
2012年10月18日 11:24:18 -05:00