62cb4736eda9460467538e31c726ce5fa6d4625e
Commit Graph

10862 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Tim Burke
62cb4736ed Remove dependency on mock
Change-Id: I9044e49ff30b092a97b75fa7fa133016d17cde37
2025年03月06日 12:35:43 -08:00
Tim Burke
0a8ecbc554 py3: Fix unicode-header-name handling in bufferedhttp
We need to parse additional headers earlier, before stdlib tries to
establish message framing.
Now, TestReconstructorRebuildUTF8 can pass on py3.
Closes-Bug: #2097030
Co-Authored-By: Alistair Coles <alistairncoles@gmail.com>
Related-Change: https://review.opendev.org/c/openstack/swift/+/662546
Change-Id: I6aa16fda9285c9fc3816da6fbff2615bd14a020c
2025年03月03日 10:41:34 -08:00
Alistair Coles
e4cc228ed0 Refactor some file-like iters as utils.InputProxy subclasses
There's a few places where bespoke file-like wrapper classes have been
implemented. The common methods are now inherited from
utils.InputProxy.
Make utils.FileLikeIter tolerate size=None to mean the same as size=-1
so that it is consistent with the behavior of other input streams.
Fix docstrings in FileLikeIter.
Depends-On: https://review.opendev.org/c/openstack/requirements/+/942845
Change-Id: I20741ab58b0933390dc4679c3e6b2d888857d577
2025年02月26日 10:40:26 -08:00
Zuul
7140633925 Merge "tests: Allow more configuration for S3 cross-compat tests" 2025年02月20日 22:58:31 +00:00
Zuul
1fa687ec20 Merge "slo_test: make x-delete-after consistent in func test" 2025年02月20日 20:39:07 +00:00
Zuul
9723f99250 Merge "tests: More simplification of s3api test bucket naming" 2025年02月20日 20:16:50 +00:00
ashnair
e0d66f3ebf slo_test: make x-delete-after consistent in func test
Related-Change-Id: Ia1d8d9085bad5c6df744a4551eef9dcf56e6e261
Change-Id: I6c5bb824d7145c25faf37fd1fa575cedf05e499a
2025年02月20日 18:58:12 +00:00
Zuul
97cc335d54 Merge "tests: Remove a couple more py2 code paths" 2025年02月20日 18:28:30 +00:00
Alistair Coles
adc7760ed5 tests: More simplification of s3api test bucket naming
Change-Id: Ie59f11874daf9f166a699fa904581830942163a9
Related-Change: I02efba463a8263ca44be511c025c6c6bfbc57334
2025年02月20日 18:15:25 +00:00
Tim Burke
605c701235 tests: Remove a couple more py2 code paths
Change-Id: Ia754021714a8ed3d5d6010a946c558552821fbe4
2025年02月20日 07:32:47 -08:00
Zuul
57f2732f9f Merge "s3api: Simplify HashingInput signature" 2025年02月20日 12:05:18 +00:00
Tim Burke
b49941c9b8 s3api: Simplify HashingInput signature
It's always called with sha256 and raises sha256-specific errors;
we don't need to pretend to support arbitrary hashes.
Change-Id: Icff79ded067084249080e3e6f555429261eb0af0
2025年02月19日 16:54:35 -08:00
Tim Burke
ed0b68e1b7 tests: Simplify test bucket name
We already prefix everything with "s3api-test-"; there's no reason to
double up the "test-" part.
Change-Id: I02efba463a8263ca44be511c025c6c6bfbc57334
2025年02月19日 16:10:15 -08:00
Tim Burke
f9354c9eb6 tests: Allow more configuration for S3 cross-compat tests
Specifically, allow endpoint and region to be configured. This allows
developers to compare boto3 behaviors with TLS enabled/disabled, for
example, or AWS behaviors between different regions.
Change-Id: I4113e2fd47e5535eec8bd9487884af077e8b0318
2025年02月19日 16:04:00 -08:00
Zuul
8b6abfb85d Merge "refactor test for x-delete-at w/t part_num and x-open-expired" 2025年02月18日 21:10:46 +00:00
Zuul
0c04c9e88f Merge "tests: Add unknown-policy container to account test" 2025年02月18日 20:03:15 +00:00
ashnair
c3237aba14 refactor test for x-delete-at w/t part_num and x-open-expired
We shouldn't allow a test to assume a strict coupling of
client/server time and the test needs to be modified so that
the functional test-suite pass for us.
Change-Id: Ia1d8d9085bad5c6df744a4551eef9dcf56e6e261
2025年02月18日 10:50:41 -08:00
Zuul
427615a874 Merge "s3api: Stop requiring Content-MD5 for multi-deletes" 2025年02月14日 23:40:38 +00:00
Tim Burke
a5db202c55 s3api: Stop requiring Content-MD5 for multi-deletes
...at least, provided the client sent a X-Amz-Content-SHA256 header.
Apparently Content-MD5 is no longer strictly required by AWS? Or maybe
it never was, provided the client sent a SHA256 of the content.
This also allows us to test with newer boto3, botocore, s3transfer.
Related-Bug: #2098529
Co-Authored-By: Clay Gerrard <clay.gerrard@gmail.com>
Change-Id: Ifbcde9820bee72d80cab0fe3e67ea0f5817df949
2025年02月14日 13:11:30 -08:00
Tim Burke
62fa6d27a6 tests: Add unknown-policy container to account test
Also:
- Couple small clean-ups in account.backend and account.utils
- Make a couple test assertions more useful.
Related-Change: https://review.opendev.org/c/openstack/swift/+/940601
Change-Id: Ic14642df50592c982adfb55a0c6cfd673a5a95b8
2025年02月14日 09:06:41 -08:00
Zuul
fc88b0e816 Merge "Add NotificationServer to fix swift-reload" 2025年02月13日 22:25:51 +00:00
Tim Burke
313fab5f5f Add NotificationServer to fix swift-reload
This implementation uses abstract sockets for process notifications,
similar to systemd's notify sockets, but notifiers use a PID-specific
name from a well-known namespace and listeners are assumed to be
ephemeral.
Update swift-reload to use these instead of polling child processes to
determine when a server reload has completed. Bonus: it also acts as a
non-blocking lock to prevent two swift-reload commands from reloading a
process at the same time.
Closes-Bug: #2098405
Related-Change: Ib2dd9513d3bb7c7686e6fa35485317bbad915876
Change-Id: I5f36aba583650bddddff5e55ac557302d023ea1b
2025年02月13日 20:07:15 +00:00
Zuul
11557559b3 Merge "versioning: 411 PUTs with neither content-length nor transfer-encoding" 2025年02月12日 22:09:31 +00:00
Zuul
747b2a4a32 Merge "Add per-container storage policy to account listing" 2025年02月12日 00:22:25 +00:00
Zuul
4c922fbeff Merge "Remove last vestiges of translations" 2025年02月11日 22:54:35 +00:00
Zuul
ed842ce12b Merge "Remove some dead code for older pythons" 2025年02月11日 22:54:32 +00:00
Tim Burke
bc5de5f4a8 Remove last vestiges of translations
Closes-Bug: #1674543
Change-Id: Ic74dbcaf6d8293ae41984d5cd61f0326c91988e2
2025年02月11日 12:11:37 -08:00
Tim Burke
b94d7960f7 Remove some dead code for older pythons
Change-Id: I9a793e4c352cd40a073326315a6ae144a14de1e0
2025年02月11日 12:11:08 -08:00
Zuul
0850bee997 Merge "Migrate encrypter tests to assert FakeSwiftCall attributes" 2025年02月11日 19:21:53 +00:00
Zuul
de0df20032 Merge "Tighten up encrypter tests re. request footers" 2025年02月11日 18:10:31 +00:00
Alistair Coles
2560eb7cb5 Migrate encrypter tests to assert FakeSwiftCall attributes
Make encrypter unit test assertions more explicit by using assertions
on the named attributes of FakeSwiftCall rather than assertions on
position-indexed call tuples.
Change-Id: I871ddcc4ba559e7e4c0d0e28464780c6cd669797
2025年02月11日 10:30:57 +00:00
Alistair Coles
a740591883 Tighten up encrypter tests re. request footers
The encrypter middleware uses an update_footers callback to send
request footers. Previously, FakeSwift combined footers with captured
request headers in a single dict. Tests could not therefore
specifically assert that *footers* had been captured rather than
headers.
This patch modifies FakeSwift to capture footers separately for each
request. Footers are still merged with the request headers in order to
synthesise GET or HEAD response headers when a previously uploaded
object is returned.
Unfortunately the change cannot be as simple as adding another
attribute to the FakeSwiftCall namedtuple. A list of these namedtuples
is returned by FakeSwift.calls_with_headers. Some tests cast the
namedtuples to 3-tuples and will break if the length of the namedtuple
changes. Other tests access the attributes of the namedtuples by name
and will break if the list values are changed to plain 3-tuples.
Some test churn is therefore inevitable:
* FakeSwiftCall is changed from a namedtuple to a class. This prevents
 future tests assuming it is a fixed length tuple. It also supports a
 headers_and_footers property to return the combination of uploaded
 headers and footer that was previously (confusingly) returned by
 FakeSwiftCall.headers.
* A new property FakeSwift.call_list has been added which returns a
 list of FakeSwiftCalls.
* FakeSwift.calls_with_headers now returns a 3-tuple. Tests that
 previously assumed this was a namedtuple have been changed to use
 FakeSwift.call_list instead, which gives them objects with the same
 named attributes as the previous namedtuple. Tests that previously
 treated the namedtuple as a 3-tuple do not need to be changed.
* Tests that access the 'private' FakeSwift._calls have been changed
 to use FakeSwift.call_list.
Change-Id: If24b6fa50f1d67a7bbbf9a1794c70d37c41971f7
2025年02月11日 10:30:52 +00:00
Zuul
364a47b176 Merge "tests: Fix flaky reconciler test" 2025年02月10日 20:21:26 +00:00
Zuul
73201cc12d Merge "Deprecate expirer options" 2025年02月08日 02:26:03 +00:00
Clay Gerrard
b69a2bef45 Deprecate expirer options
The following configuration options are deprecated:
 * expiring_objects_container_divisor
 * expiring_objects_account_name
The upstream maintainers are not aware of any clusters where these have
been configured to non-default values.
UpgradeImpact:
Operators are encouraged to remove their "container_divisor" setting and
use the default value of 86400.
If a cluster was deployed with a non-standard "account_name", operators
should remove the option from all configs so they are using a supported
configuration going forward, but will need to deploy stand-alone expirer
processes with legacy expirer config to clean-up old expiration tasks
from the previously configured account name.
Co-Authored-By: Alistair Coles <alistairncoles@gmail.com>
Co-Authored-By: Jianjian Huo <jhuo@nvidia.com>
Change-Id: I5ea9e6dc8b44c8c5f55837debe24dd76be7d6248
2025年02月07日 08:33:34 -08:00
Callum Dickinson
965cc2fcbc Add per-container storage policy to account listing
Add the storage_policy attribute to the metadata returned
when listing containers using the GET account API function.
The storage policy of a container is a very useful attribute
for telemetry and billing purposes, as it determines the location
and method/redundancy of on-disk storage for the objects in the
container. Ceilometer currently cannot define the storage policy as a
metadata attribute in Gnocchi as GET account, the most efficient way
of discovering all containers in an account, does not return the
storage policy for each container.
Returning the storage policy for each container in GET account
is the ideal way of resolving this issue, as it allows Ceilometer
to find all containers' storage policies without performing additional
costly API calls.
Special care has been taken to ensure the change is backwards
compatible when migrating from pre-storage policy versions
of Swift, even though those versions are quite old now.
This special handling can be removed if support for migrating
from older versions is discontinued.
Closes-bug: #2097074
Change-Id: I52b37cfa49cac8675f5087bcbcfe18db0b46d887
2025年02月06日 11:05:23 +13:00
Tim Burke
3ccf749043 tests: Fix flaky reconciler test
Previously, test_object_move_no_such_object_no_tombstone_ancient
would fail intermittently, with an assertion that two timestamps
were almost (but not quite) equal.
This probably comes down to the fact that it's passing floats as
timestamps down into FakeInternalClient's parse(); specifically,
values like 1738046018.2900746 and 1738045066.1442454 are known
to previously fail.
Just fixing the usage doesn't fix the foot-gun, though -- so fix
up parse() to be internally consistent, even if passed a float.
Change-Id: Ide1271dc4ef54b64d2dc99ef658e8340abb0b6ce
2025年02月05日 12:53:02 -08:00
Tim Burke
0dfa38d025 docs: Fix version call-out for stale_worker_timeout
Related-Change: I8227939d04fda8db66fb2f131f2c71ce8741c7d9
Change-Id: I149a2df2d942bba02049947865b000c9cf1a89bc
2025年01月16日 14:21:55 -08:00
Tim Burke
ae6300af86 wsgi: Reap stale workers (after a timeout) following a reload
Add a new tunable, `stale_worker_timeout`, defaulting to 86400 (i.e. 24
hours). Once this time elapses following a reload, the manager process
will issue SIGKILLs to any remaining stale workers.
This gives operators a way to configure a limit for how long old code
and configs may still be running in their cluster.
To enable this, the temporary reload child (which waits for the reload
to complete then closes the accept socket on all the old workers) has
grown the ability to send state to the re-exec'ed manager. Currently,
this is limited to just the set of pre-re-exec child PIDs and their
reload times, though it was designed to be reasonably extensible.
This allows the new manager to recognize stale workers as they exit
instead of logging
 Ignoring wait() result from unknown PID ...
With the improved knowledge of subprocesses, we can kick the log level
for the above message up from info to warning; we no longer expect it
to trigger in practice.
Drive-by: Add logging to ServersPerPortStrategy.register_worker_exit
that's comparable to what WorkersStrategy does.
Change-Id: I8227939d04fda8db66fb2f131f2c71ce8741c7d9
2025年01月16日 13:44:21 +11:00
Zuul
734ed9cdd8 Merge "Remove py2-only code paths" 2025年01月15日 22:39:06 +00:00
Zuul
768571d807 Merge "CI: document bandit tests by reference" 2025年01月15日 22:04:57 +00:00
Tim Burke
a630e76d6c versioning: 411 PUTs with neither content-length nor transfer-encoding
... just like we would do in a normal container. Previously, we'd try to
read a byte from the client which, due to a bug in eventlet HTTP framing,
would either hang until we hit a timeout or worse read from the next
pipelined request.
This required that we reset a (repeatedly-reused!) request in s3api to
have an empty body, or it would start triggering 411s, too.
See also: https://github.com/eventlet/eventlet/pull/985
Closes-Bug: #2081103
Change-Id: I56c1ecc4edb953c0bade8744e4bed584099f29c7
2025年01月15日 12:52:09 -08:00
Zuul
9b4d008390 Merge "Leave updater per-device stats in recon for debugging" 2025年01月15日 18:31:47 +00:00
Alistair Coles
aa0429ce00 CI: document bandit tests by reference
The available bandit tests change with time (e.g. the
Related-Change). We shouldn't try to maintain the list.
Related-Change: Ie668d49a56c0a6542d28128656cfd44f7c089ec4
Change-Id: I6eb106abbac28ffbb9a3f64e8aa60218cbe75682
2025年01月14日 09:34:46 +00:00
Tim Burke
f95315b711 CI: Remove B320 and B410 bandit skips
They were removed upstream recently, so now Bandit is complaining about
the unknown test.
See https://github.com/PyCQA/bandit/pull/1212
Change-Id: Ie668d49a56c0a6542d28128656cfd44f7c089ec4
2025年01月13日 15:20:16 -08:00
Tim Burke
128124cdd8 Remove py2-only code paths
Change-Id: Ic66b9ae89837afe31929ce07cc625dfc28314ea3
2025年01月13日 13:36:41 -08:00
Zuul
94d3a5dee8 Merge "obj: Add option to tune down etag validation in object-server" 2025年01月08日 20:59:29 +00:00
Tim Burke
3d8fb046cb obj: Add option to tune down etag validation in object-server
Historically, the object-server would validate the ETag of an object
whenever it was streaming the complete object. This minimizes the
possibility of returning corrupted data to clients, but
- Clients that only ever make ranged requests get no benefit and
- MD5 can be rather CPU-intensive; this is especially noticeable
 in all-flash clusters/policies where Swift is not disk-constrained.
Add a new `etag_validate_pct` option to tune down this validation.
This takes values from 100 (default; all whole-object downloads are
validated) down to 0 (none are).
Note that even with etag validation turned off, the object-auditor
should eventually detect and quarantine corrupted objects. However,
transient read errors may cause clients to download corrupted data.
Hat-tip to Jianjian for all the profiling work!
Co-Authored-By: Jianjian Huo <jhuo@nvidia.com>
Change-Id: Iae48e8db642f6772114c0ae7c6bdd9c653cd035b
2025年01月08日 18:21:30 +00:00
Zuul
4d4e65904a Merge "Improve get_logger tests re. statsd prefix" 2025年01月08日 17:18:18 +00:00
Zuul
7828c233a1 Merge "tests: use a method to test a method" 2025年01月08日 10:56:34 +00:00