f1a0eccab93e1752c07805d9e181907b2b27a739
Commit Graph

8239 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Zuul
f1a0eccab9 Merge "py3: bulk -- alternate approach" 2019年05月17日 22:49:10 +00:00
Zuul
f1e2a21efe Merge "Wait longer for log lines in unit test" 2019年05月17日 18:30:23 +00:00
Zuul
b38dd29a97 Merge "Make build/upload/promote image jobs non-voting" 2019年05月17日 17:27:31 +00:00
Zuul
3b76c717aa Merge "Set Content-Type with s3api metadata updates." 2019年05月17日 02:55:09 +00:00
Tim Burke
add5a411ac Make build/upload/promote image jobs non-voting
Change-Id: If284513ead5ff0d7f9e997ebf2a8820c9acf79e3
2019年05月15日 15:39:25 -07:00
Timur Alperovich
8b64381371 Set Content-Type with s3api metadata updates.
S3 supports two metadata operations on object copy: COPY and REPLACE.
When using REPLACE, the Content-Type should be set to the one supplied
by the caller. When using COPY, the existing object's Content-Type value
is used.
Change-Id: Ic7c6278dedef308c9219eb45751abfa5655f144f
Closes-Bug: #1828907 
2019年05月14日 09:48:47 -07:00
Tim Burke
5cd2a2ac2f py3: bulk -- alternate approach
Related-Change: I3603247e0c36299de2107aa8e494a3f87647696f
Change-Id: Iaf14c1ab3e236e6774492ed711fccef066a16fca
2019年05月13日 20:08:50 -05:00
Tim Burke
51e415b749 py3: port proxy/test_mem_server.py
This finishes the proxy unit tests.
Change-Id: I2452e4e4dabef071bfbf376d03ec63211f7c2906
2019年05月08日 17:47:40 -07:00
Tim Burke
8b3d0a6c64 py3: finish porting proxy/test_server.py
Change-Id: I8287db75b4f19581203360c646e72f64fe45f170
2019年05月08日 17:47:40 -07:00
Tim Burke
259224f009 py3: port unit/proxy/test_server.py
All except the versioned_writes tests, which are hairy.
Change-Id: Ieb54869f93a70c8887d33bd2ad46cf04a190d896
2019年05月08日 15:59:06 -07:00
Thiago da Silva
032cf3b3b4 Update docker secret.
Removed trailing newline
Change-Id: I8b100b8213d6efde67b0452ce988bc47c830a2e2
2019年05月08日 11:20:53 -04:00
Zuul
4343c253e4 Merge "Add Dockerfile to build a SAIO container image" 2019年05月08日 04:24:27 +00:00
Zuul
e85dda286e Merge "Require logger passed to broker in unit tests for account-reaper" 2019年05月07日 21:55:49 +00:00
Thiago da Silva
37e257913c Add Dockerfile to build a SAIO container image
Added Dockerfile and configuration files under the
new `docker` directory to build a Swift All in One container
image.
The primary goal of this container image is to provide
application developers with a Swift/S3 endpoint that can be
tested against during the development cycle.
Added Zuul jobs to build docker container
Change-Id: Ib10975a1862a4fa8c4eeaba139837cf1f22b272a
2019年05月07日 15:44:00 -04:00
Zuul
4473fd9ba1 Merge "py3: port unit/proxy/test_sysmeta.py" 2019年05月07日 19:17:31 +00:00
Zuul
f9898ec8f3 Merge "[Trivial fix]Remove unnecessary slash" 2019年05月07日 11:27:51 +00:00
Takashi Kajinami
211cf3983c Require logger passed to broker in unit tests for account-reaper
This patch removes default value for logger passed to
faked BrokerClass in some unit tests for account reaper,
to make sure that a logger instance is properly passed
when generation BrokerClass instance.
This patch also removes unnecessory parameter, which is
added to confirm logger passed to broker, but is not
useful in fact.
NOTE: This patch is a follow-up of my previous commit[1]
[1] https://review.opendev.org/#/c/295875/
Change-Id: Ica10e3ac42375c2dc141478e647408df90028ae9
2019年05月07日 00:16:08 +00:00
Zuul
631b704e17 Merge "py3: Make StoragePolicy objects hashable" 2019年05月06日 20:36:36 +00:00
Zuul
4aa33a2cc2 Merge "py3: start porting for unit/proxy/test_server.py" 2019年05月06日 20:36:35 +00:00
zhufl
6d63297f02 [Trivial fix]Remove unnecessary slash
This is to remove the unncessary slash when the line doesn't
exceed the length of 79, to make the code more readable.
Change-Id: I31070067913560d6147f95d0fdfba4f9f9ce0936
2019年05月06日 14:23:05 +08:00
Tim Burke
767872210f py3: port unit/proxy/test_sysmeta.py
Change-Id: I378705a8d9ad51dbfa85287d44e6313aa7680c23
2019年05月05日 05:06:54 +00:00
Tim Burke
fed0204e86 py3: Make StoragePolicy objects hashable
Change-Id: I2e233afff26878ba94e268c71f6779bcca7b641c
2019年05月04日 21:01:29 -07:00
Tim Burke
b8284538be py3: start porting for unit/proxy/test_server.py
Mostly this ammounts to
 Exception.message -> Exception.args[0]
 '...' -> b'...'
 StringIO -> BytesIO
 makefile() -> makefile('rwb')
 iter.next() -> next(iter)
 bytes[n] -> bytes[n:n + 1]
 integer division
Note that the versioning tests are mostly untouched; they seemed to get
a little hairy.
Change-Id: I167b5375e7ed39d4abecf0653f84834ea7dac635
2019年05月04日 20:35:05 -07:00
Clay Gerrard
34bd4f7fa3 Clarify usage of dequeue_from_legacy option
Change-Id: Iae9aa7a91b9afc19cb8613b5bc31de463b853dde
2019年05月05日 03:20:34 +00:00
Zuul
fd73353bb1 Merge "Enable to configure object-expirer in object-server.conf" 2019年05月05日 00:25:11 +00:00
Zuul
506d0fa821 Merge "Unify auth_host/port/ssl/prefix func test options into auth_uri" 2019年05月05日 00:04:08 +00:00
Tim Burke
9290f29e1c Wait longer for log lines in unit test
We've seen a noteworthy (literally -- there's a comment about it) number
of failures for test_multiphase_put_drains_extra_commit_junk_disconnect;
I'd rather waste an extra few hundredths of a second every run than have
to recheck most patches we want merged.
Co-Authored-By: Clay Gerrard <clay.gerrard@gmail.com>
Change-Id: Iebec6c18866e4f8ef40faab539b173f017d658e3
2019年05月04日 15:56:55 -07:00
Zuul
310416abf3 Merge "py3: port s3api" 2019年05月04日 22:49:38 +00:00
Zuul
de7c7f1007 Merge "Remove py35 unit test job" 2019年05月04日 22:38:47 +00:00
Zuul
2f05025255 Merge "versioned_writes: stop trying to catch HTTPPreconditionFailed" 2019年05月04日 18:35:50 +00:00
Zuul
89f2f7e8cd Merge "Fix wrong tox env name from func-post-ec to func-ec" 2019年05月04日 17:49:22 +00:00
Kazuhiro MIYAHARA
443f029a58 Enable to configure object-expirer in object-server.conf
To prepare for object-expirer's general task queue feature [1],
this patch enables to configure object-expirer in object-server.conf.
Object-expirer.conf can be used in the same manner as before, but deprecated.
If both of object-server.conf with "object-expirer" section and
object-expirer.conf are in a node, only object-server.conf is used.
Object-expirer.conf is used only if all object-server.conf doesn't have
"object-expirer" section.
There are two differences between "object-expirer.conf" style and
"object-server.conf" style.
The first difference is `dequeue_from_legacy` default value.
`dequeue_from_legacy` defines task queue mode. In "object-expirer.conf"
style, the default mode is legacy queue. In "object-server.conf" style,
the default mode is general queue. But general mode means no-op mode
for now, because general task queue is not implemented yet.
The second difference is internal client config. In "object-expirer.conf"
style, config file of internal client is the object-expirer.conf itself.
In "object-server.conf" style, config file of internal client is
another file.
[1]: https://review.openstack.org/#/c/517389/
Co-Authored-By: Matthew Oliver <matt@oliver.net.au>
Change-Id: Ib21568f9b9d8547da87a99d65ae73a550e9c3230
2019年05月04日 15:45:02 +00:00
Zuul
b8824f052b Merge "Fix ostestr invocation" 2019年05月04日 15:35:32 +00:00
Tim Burke
1e4cdca339 Fix ostestr invocation
More-recent versions of stestr are rather picky about wanting an integer
for concurrency [1], but ostestr prior to [2] defaults it to None. As a
result, all our func tests would fail with:
 TypeError: int() argument must be a string or a number, not 'NoneType'
Also, move the rolling upgrade job to non-voting since it's going to
pull in the old version but try to run with new deps.
[1] https://github.com/mtreinish/stestr/commit/c93bc81
[2] https://review.openstack.org/#/c/651275/
Change-Id: Icba6c46bcff0e0516107e0f6742d32c92488ae20
2019年05月03日 22:48:22 -07:00
Zuul
1c899f78d4 Merge "py3: Stop using stdlib's putrequest(); it only does ASCII" 2019年05月04日 00:13:42 +00:00
Kota Tsuyuzaki
f5b472cdc7 Fix wrong tox env name from func-post-ec to func-ec
Change-Id: I789fb2413985942460d3275b479d6410c62c380f
2019年05月04日 07:28:44 +09:00
Zuul
4ee9545805 Merge "py3: Be able to parse non-RFC-compliant request lines" 2019年05月03日 21:08:45 +00:00
Zuul
8585c8742e Merge "Make log format for requests configurable" 2019年05月03日 21:08:43 +00:00
Tim Burke
359d136c29 Unify auth_host/port/ssl/prefix func test options into auth_uri
Retain support for the old way, though (at least for now).
Change-Id: Id3c2ed87230c5918c18e2c01d086df8157f036b1
2019年05月03日 20:55:52 +00:00
Tim Burke
a239f4ec35 Remove py35 unit test job
Change-Id: Iadb3bed811907740f85bd9277ba09a4ca17fc025
2019年05月03日 13:36:42 -07:00
Zuul
ce1ba6a51d Merge "Pass logger instances to AccountBroker/ContainerBroker" 2019年05月03日 10:27:27 +00:00
Gilles Biannic
a4cc353375 Make log format for requests configurable
Add the log_msg_template option in proxy-server.conf and log_format in
a/c/o-server.conf. It is a string parsable by Python's format()
function. Some fields containing user data might be anonymized by using
log_anonymization_method and log_anonymization_salt.
Change-Id: I29e30ef45fe3f8a026e7897127ffae08a6a80cd9
2019年05月02日 17:43:25 -06:00
Tim Burke
3a9f3f8419 py3: port s3api
Drive-by: When passing a list or tuple to swob.Response as an app_iter,
check that it's full of byte strings.
Change-Id: Ifc35aacb2e45004f74c871f08ff3c52bc57c1463
2019年05月02日 16:38:39 -07:00
Tim Burke
c0ae48ba9a py3: Stop using stdlib's putrequest(); it only does ASCII
Note that this only affects the functest client.
See also: https://bugs.python.org/issue36274
Change-Id: I1359c475fbe93db2f0fcc4b450be6dd5073f922e
2019年05月02日 14:44:18 -07:00
Tim Burke
93b49c5e48 py3: Be able to parse non-RFC-compliant request lines
There's a bug in CPython [1] that causes servers to mis-parse request
lines that include the bytes \x85 or \xa0. Naturally, we have
functional tests that (with high probability) will send such request
lines. There's a fix proposed, but the earliest it's likely to land
would be for 3.8, and we need to be able to target an earlier Python.
So, intercept the request line immediately before parsing and re-write
it to be RFC-compliant. Note that this is done for Python 2 as well,
though there should be no change in the request environment that
eventlet eventually hands to us.
[1] https://bugs.python.org/issue33973
Change-Id: Ie648f5c04d4415f3b620fb196fa567ce7575d522
2019年05月02日 14:44:18 -07:00
Takashi Kajinami
4b2ac606b1 Pass logger instances to AccountBroker/ContainerBroker
There are some processes which don't pass their logger instances
when creating AccountBrokers/ContainerBrokers, which causes some
error messages with a different setting from the other logs
generated by the processes.
This patch makes them pass logger instances, to make sure they
generate all logs according to their log settings.
Change-Id: I914c3a2811e1a2b7f19ad2bc9b3d042fcba63820
2019年05月03日 01:15:20 +09:00
Zuul
f55167a735 Merge "Increase node_timeout in gate" 2019年04月30日 22:12:01 +00:00
Clay Gerrard
58352b285d s3api multi upload test clean up
Add a test assertion for invalid ETag of MPU manifest and make some
global constants more obvious.
Change-Id: I830c0d2e473d1740f9138ebc6efd64a39d85d1dc
Related-Change-Id: I7df13e670f702a2956a9c8057fcb971f4bfb7319
2019年04月29日 14:22:36 -05:00
Tim Burke
c51db382cb s3api: Block ETag header from CompleteMultipartUpload requests
Change-Id: I7df13e670f702a2956a9c8057fcb971f4bfb7319
Closes-Bug: 1810397
2019年04月29日 14:01:06 -05:00
ZhongShengping
32bf43990c Replace git.openstack.org URLs with opendev.org URLs
Thorough replacement of git.openstack.org URLs with their opendev.org
counterparts.
Change-Id: I5e77307de6a484fd69b2a5863423ceb357e8601f
2019年04月24日 09:56:54 +08:00