4f617f49b6d854a0073525da5da7e9b97f0b6fa7
Commit Graph

2250 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Jenkins
711df677cb Merge "Random pep8 fixes!" 2012年10月16日 19:28:26 +00:00
Jenkins
58df647aaa Merge "fix bug with swob.Request accept property" 2012年10月16日 18:51:45 +00:00
Samuel Merritt
646651260a Make StatsD tests less flaky.
There have been a bunch of Jenkins failures lately where the StatsD
tests fail because they can't bind to their desired port. There's
nothing special about the particular port they're using, so now we let
the kernel pick an available one for us.
This also lets us get rid of a sleep() in the test that looked like an
attempt to alleviate EADDRINUSE errors, so now in the happy case, the
tests are a few fractions of a second faster.
Change-Id: Idee11349254107a59643539b1566f3588eee7ef4
2012年10月16日 11:17:11 -07:00
David Goetz
b52538074e do not dump_recon_cache on limited obj replic
Change-Id: I38e38607ba9c5cf331c216e4c81582d23c58eeca
2012年10月15日 14:21:02 -07:00
Samuel Merritt
e76b82c91b Fix version requirement for mock library.
One of the tests uses mock.call, which is only available in version
0.8.0 and up.
Fixes bug 1066274.
Change-Id: I77e4de0908f93326992fc4d4af4a7e54e60b5585
2012年10月14日 08:02:09 -07:00
Tom Fifield
9344a4a582 Random pep8 fixes!
This patch merely fixes a selection of files to the point where
pep8 1.3.3 is happy. Most of the errors are indentation related to
continued lines (E126, E127, E128), bracket positions (E124) and the
use of backslash (E502).
Patch 2 fixes David's comments regarding backslash and an odd comment
 - thanks David!
Change-Id: I4fbd77ecf5395743cb96acb95fa946c322c16560
2012年10月13日 12:04:25 +11:00
Samuel Merritt
4cf96b3791 Honor sample_rate in StatsD logging.
It's there to let administrators turn down the barrage of stats data
that StatsD must cope with, but it wasn't actually honored. Worse, if
the sample rate was set to e.g. 0.2, the stats would all be multiplied
by its inverse, e.g. 2. This patch actually drops packets when
sample_rate < 1, so you get correct measurements.
Fortunately, the default sample rate is 1 (i.e. drop nothing), and
multiplying by 1/1 doesn't change anything, so stats with the default
sample rate of 1.0 are, and have been, just fine.
Fixes bug 1065643.
Also, make the two touched files compliant with pep8 v1.3.3.
Change-Id: I66663144009ae4c9ee96f6a111745d8f5d2f5ca3
2012年10月12日 12:38:33 -07:00
Victor Rodionov
583850e866 fix bug with swob.Request accept property
Change-Id: I2c1246b9bbd1d3ab22c2a035b735d937dd90da11
2012年10月12日 16:53:10 +04:00
Constantine Peresypkin
b304a15b0b fix empty body getter bug 1067923
Change-Id: Ifd609f305ee878c39ea4e6840ed8fa9369595cfa
2012年10月12日 08:17:57 +02:00
Jenkins
8cacf5aaf8 Merge "fixed internal client things" 2012年10月11日 19:48:39 +00:00
Jenkins
e61fa389b3 Merge "Allows removal of ACLs" 2012年10月11日 17:35:44 +00:00
Greg Lange
52baf4eee4 fixed internal client things
_get_metadata() should only look for metadata on 200 family http status codes
in the path_parts() in the internal client test file should return distinct unicode strings
with spaces for account, container, and obj
Change-Id: I74e335d3b73a59092a0eec06539f4931420061dd
2012年10月11日 15:37:56 +00:00
Tom Fifield
124e75bc1b Allows removal of ACLs
fixes bug 1049017
As per the bug report, the -remove- form of deletion only works with
 meta headers and not with x-container-read and x-container-write.
This patch by Yukihiro KAWADA detects the container acls and sends
them through to the backend empty like the other metadata values.
patch2 extends metadata-helper in ContainerController tests so that
the new functionality can be tested.
patch3 changes the k.lower().startswith() commands for read/write to
a single k.lower - thanks David :)
patch4 fixes PEP8
patch5 fixes more than two hundred pep8 errors. Except one,
 where the pep8 tool complains of overindent, or underindent
depending on the position on the line. No idea how to fix that one.
patch6 fixes the remaining pep8 error - thanks Darrell
Change-Id: I36c2dd72b4636136c5ce7db414bf2b61501090ad
2012年10月11日 10:16:35 +11:00
Jenkins
89845bc811 Merge "Fix two edge cases with Range: header" 2012年10月09日 20:18:15 +00:00
Jenkins
dc717ea57e Merge "fix swob for make_pre_authed_request" 2012年10月09日 18:59:31 +00:00
Jenkins
3602e2e2a1 Merge "Fixing alterations to sys.path" 2012年10月09日 18:17:23 +00:00
David Goetz
7f476d7b48 fix swob for make_pre_authed_request
Change-Id: Ic263f4a77a0aa0eb40078772a567eb41a60e40f7
2012年10月09日 09:19:29 -07:00
Jenkins
512bf3b67d Merge "internal client unicode paths" 2012年10月09日 16:12:51 +00:00
Derek Higgins
387744197e Fixing alterations to sys.path
Fixes bug 1064249
sys.path should be extended not appended to
Change-Id: I3404a50b16b843b47f5082676029a4dd3b03f812
2012年10月09日 09:58:06 +01:00
Jenkins
fc1c5a5fd0 Merge "remove configobj from deps" 2012年10月09日 00:00:03 +00:00