Some checks failed
go: build dev binaries / cleanup (push) Successful in 4s
Codespell / Check for spelling errors (push) Failing after 3s
docker: build dev containers / build-rust-binaries (amd64, x86_64-unknown-linux-musl) (push) Failing after 3s
docker: build dev containers / build-dev-containers (push) Has been skipped
docker: build dev containers / build-rust-binaries (arm64, true, aarch64-unknown-linux-musl) (push) Failing after 3s
End to End / FUSE Mount (push) Failing after 2s
EC Integration Tests / EC Integration Tests (push) Failing after 30s
FUSE DLM Integration Tests / FUSE DLM Integration Tests (push) Failing after 3s
FUSE Volume Server Failover Tests / FUSE Volume Server Failover (push) Failing after 3s
FUSE Integration Tests / FUSE Integration Testing (push) Failing after 2s
FUSE P2P Peer Chunk Sharing Integration Tests / FUSE P2P Peer Chunk Sharing (push) Failing after 3s
go: build binary / Go Vet (push) Failing after 2s
go: build binary / Go Vet 32-bit (push) Failing after 3s
go: build binary / Build (push) Failing after 4s
go: build binary / Build cross-platform (freebsd/amd64) (push) Failing after 3s
go: build binary / Build cross-platform (windows/amd64) (push) Failing after 3s
go: build binary / Build cross-platform (darwin/arm64) (push) Failing after 3s
go: build binary / Build cross-platform (windows/arm64) (push) Failing after 3s
go: build binary / Test (push) Failing after 2s
go: build binary / Test 32-bit (push) Failing after 3s
helm: lint and test charts / lint-test (push) Failing after 3s
Java Client Integration Tests / Java Integration Tests (11) (push) Failing after 3s
Java Client Integration Tests / Java Integration Tests (17) (push) Failing after 3s
go: build dev binaries / build_dev_linux_windows (amd64, linux) (push) Failing after 2s
go: build dev binaries / build_dev_linux_windows (amd64, windows) (push) Failing after 3s
go: build dev binaries / build_dev_darwin (amd64, darwin) (push) Has been skipped
go: build dev binaries / build_dev_darwin (arm64, darwin) (push) Has been skipped
Java Client Unit Tests / Java Unit Tests (11) (push) Failing after 3s
Java Client Unit Tests / Java Unit Tests (17) (push) Failing after 2s
Java Client Unit Tests / Java Unit Tests (21) (push) Failing after 3s
Java Client Unit Tests / Java Unit Tests (8) (push) Failing after 3s
Kafka Quick Test (Load Test with Schema Registry) / Kafka Client Load Test (Quick) (push) Failing after 3s
Kafka Gateway Tests / Kafka Unit Tests (unit-tests-1) (push) Failing after 11s
Kafka Gateway Tests / Kafka Integration Tests (Critical) (integration-1) (push) Failing after 3s
Kafka Gateway Tests / Kafka End-to-End Tests (with SMQ) (e2e-1) (push) Failing after 3s
Kafka Gateway Tests / Kafka Consumer Group Tests (Highly Isolated) (consumer-group-1) (push) Failing after 2s
Kafka Gateway Tests / Kafka Client Compatibility (with SMQ) (client-compat-1) (push) Failing after 3s
Kafka Gateway Tests / Kafka SMQ Integration Tests (Full Stack) (smq-integration-1) (push) Failing after 3s
Kafka Gateway Tests / Kafka Protocol Tests (Isolated) (protocol-1) (push) Failing after 3s
KMS Tests / KMS Provider Integration Tests (push) Failing after 2s
KMS Tests / S3 KMS End-to-End Tests (push) Failing after 3s
Master Cold Start Tests / Master Cold Start Tests (push) Failing after 4s
Metadata Subscribe Integration Tests / Metadata Subscribe Integration Tests (push) Failing after 3s
Multi-Master Tests / Multi-Master Failover Tests (push) Failing after 3s
Performance / CPU and Heap Profile (push) Failing after 2s
Performance / S3 Read/Write Benchmark (rust volume) (push) Failing after 3s
pjdfstest POSIX Compliance / pjdfstest (push) Failing after 2s
Plugin Worker Integration Tests / Plugin Worker: erasure_coding (push) Failing after 3s
Plugin Worker Integration Tests / Plugin Worker: vacuum (push) Failing after 3s
Rust Volume Server Tests / Rust Integration Tests (push) Failing after 3s
Rust Volume Server Tests / Go Tests with Rust Volume (grpc - Shard 1) (push) Failing after 2s
Rust Volume Server Tests / Go Tests with Rust Volume (http - Shard 1) (push) Failing after 3s
Rust Volume Server Tests / Go Tests with Rust Volume (grpc - Shard 2) (push) Failing after 3s
Rust Volume Server Tests / Go Tests with Rust Volume (http - Shard 2) (push) Failing after 3s
Rust Volume Server Tests / Go Tests with Rust Volume (grpc - Shard 3) (push) Failing after 3s
S3 IAM Integration Tests / S3 IAM Distributed Tests (push) Failing after 2s
S3 IAM Integration Tests / S3 IAM Performance Tests (push) Failing after 3s
Performance / Throughput Benchmark (go volume) (push) Failing after 3s
Performance / Throughput Benchmark (rust volume) (push) Failing after 2s
Performance / S3 Read/Write Benchmark (go volume) (push) Failing after 3s
Plugin Worker Integration Tests / Plugin Worker: volume_balance (push) Failing after 3s
PostgreSQL Gateway Tests / PostgreSQL Basic Tests (push) Failing after 3s
Rust Volume Server Tests / Rust Unit Tests (push) Failing after 2s
Rust Volume Server Tests / Go Tests with Rust Volume (http - Shard 3) (push) Failing after 3s
Rust Plugin Worker Tests / Rust Plugin Worker Build and Unit Tests (push) Failing after 3s
rust: build dev volume server binaries / cleanup (push) Successful in 3s
S3 ETag and ACL Tests / S3 ETag + ACL Integration Tests (push) Failing after 3s
S3 IAM Integration Tests / IAM Unit Tests (push) Failing after 3s
S3 IAM Integration Tests / S3 IAM Integration Tests (advanced) (push) Failing after 3s
S3 IAM Integration Tests / S3 IAM Integration Tests (basic) (push) Failing after 2s
S3 IAM Integration Tests / S3 IAM Integration Tests (group) (push) Failing after 3s
S3 IAM Integration Tests / S3 IAM Integration Tests (policy-enforcement) (push) Failing after 2s
S3 IAM Integration Tests / S3 IAM Integration Tests (sts) (push) Failing after 4s
S3 Keycloak Integration Tests / S3 Keycloak Integration Tests (push) Failing after 3s
S3 PyArrow Parquet Tests / PyArrow Parquet Tests (Python 3.11) (push) Failing after 3s
S3 PyArrow Parquet Tests / Go Unit Tests (Implicit Directory) (push) Has been cancelled
S3 PyArrow Parquet Tests / PyArrow Parquet Tests (Python 3.12) (push) Has been cancelled
rust: build dev volume server binaries / build-rust-volume-dev-darwin (darwin-amd64, x86_64-apple-darwin) (push) Has been cancelled
rust: build dev volume server binaries / build-rust-volume-dev-darwin (darwin-arm64, aarch64-apple-darwin) (push) Has been cancelled
rust: build dev volume server binaries / build-rust-volume-dev-linux (linux-amd64, x86_64-unknown-linux-gnu) (push) Has been cancelled
S3 PyArrow Parquet Tests / PyArrow Parquet Tests (Python 3.9) (push) Has been cancelled
S3 Proxy Signature Tests / S3 Proxy Signature Verification Tests (push) Has been cancelled
S3 SDK V2 Route Disambiguation Tests / S3 SDK V2 Routing Tests (push) Has been cancelled
S3 SSE Tests / S3 SSE Integration Tests (quick) (push) Has been cancelled
S3 SSE Tests / S3 SSE Compatibility Test (push) Has been cancelled
S3 SSE Tests / S3 SSE Metadata Persistence Test (push) Has been cancelled
S3 SSE Tests / S3 SSE Copy Operations Test (push) Has been cancelled
S3 SSE Tests / S3 SSE Multipart Upload Test (push) Has been cancelled
S3 SSE Tests / S3 SSE Performance Test (push) Has been cancelled
S3 SSE Tests / S3 Volume Encryption Test (push) Has been cancelled
S3 SSE Tests / S3 SSE Integration Tests (comprehensive) (push) Has been cancelled
Spark Integration Tests / Spark Integration Tests (push) Failing after 2s
Telemetry Integration Tests / telemetry-integration-test (push) Failing after 3s
Volume Server Integration Tests / Volume Server Integration Tests (grpc - Shard 1) (push) Failing after 3s
Volume Server Integration Tests / Volume Server Integration Tests (http - Shard 1) (push) Failing after 3s
Ceph S3 tests / Basic S3 tests (KV store) (push) Has been cancelled
Ceph S3 tests / S3 Versioning & Object Lock tests (push) Has been cancelled
S3 Policy Integration Tests / S3 Policy Unit Tests (push) Failing after 3s
Ceph S3 tests / S3 CORS tests (push) Has been cancelled
Ceph S3 tests / SeaweedFS Custom S3 Copy tests (push) Has been cancelled
Ceph S3 tests / Basic S3 tests (SQL store) (push) Has been cancelled
test s3 over https using aws-cli / awscli-tests (push) Has been cancelled
TLS Rotation Integration Tests / TLS Rotation Integration Tests (push) Has been cancelled
Vacuum Integration Tests / Vacuum Integration Tests (push) Has been cancelled
S3 Policy Integration Tests / S3 Policy Variables Integration Tests (push) Failing after 3s
S3 Policy Integration Tests / S3 Policy Enforcement Integration Tests (advanced-policy) (push) Failing after 3s
S3 Policy Integration Tests / S3 Policy Enforcement Integration Tests (basic-policy) (push) Failing after 2s
S3 Policy Integration Tests / S3 Policy Enforcement Integration Tests (contextual-policy) (push) Failing after 4s
S3 Policy Integration Tests / Trusted Proxy Detection Tests (push) Failing after 2s
S3 Policy Integration Tests / S3 Policy Shell Integration Tests (push) Failing after 3s
Samba on FUSE Integration / samba-integration (push) Failing after 2s
SFTP Integration Tests / SFTP Integration Testing (push) Failing after 3s
terraform: validate and test modules / fmt, validate, plan-level tests (push) Failing after 3s
terraform: validate and test modules / local cluster smoke test (real weed) (push) Failing after 2s
Volume Server Integration Tests / Volume Server Integration Tests (grpc - Shard 3) (push) Failing after 3s
Volume Server Integration Tests / Volume Server Integration Tests (grpc - Shard 2) (push) Failing after 3s
Volume Server Integration Tests / Volume Server Integration Tests (http - Shard 2) (push) Failing after 2s
Volume Server Integration Tests / Volume Server Integration Tests (http - Shard 3) (push) Failing after 5s
mount: windows conformance / WinFsp conformance (push) Has been cancelled
mount: windows / Mount on Windows (push) Has been cancelled
291 lines
10 KiB
Python
291 lines
10 KiB
Python
#!/usr/bin/env python3
|
|
"""
|
|
Patch Ceph s3-tests helpers to avoid bucket name mismatches and make bucket
|
|
creation idempotent when a fixed bucket name is provided.
|
|
|
|
Why:
|
|
- Some tests call get_new_bucket() to get a name, then call
|
|
get_new_bucket_resource(name=<that name>) which unconditionally calls
|
|
CreateBucket again. If the bucket already exists, boto3 raises a
|
|
ClientError. We want to treat that as idempotent and reuse the bucket.
|
|
- We must NOT silently generate a different bucket name when a name is
|
|
explicitly provided, otherwise subsequent test steps still reference the
|
|
original string and read from the wrong (empty) bucket.
|
|
|
|
What this does:
|
|
- get_new_bucket_resource(name=...):
|
|
- Try to create the exact bucket name.
|
|
- If error code is BucketAlreadyOwnedByYou OR BucketAlreadyExists, simply
|
|
reuse and return the bucket object for that SAME name.
|
|
- Only when name is None, generate a new unique name with retries.
|
|
- get_new_bucket(client=None, name=None):
|
|
- If name is None, generate unique names with retries until creation
|
|
succeeds, and return the actual name string to the caller.
|
|
|
|
This keeps bucket names consistent across the test helper calls and prevents
|
|
404s or KeyErrors later in the tests that depend on that bucket name.
|
|
"""
|
|
|
|
import os
|
|
import sys
|
|
|
|
|
|
def patch_s3_tests_init_file(file_path: str) -> bool:
|
|
if not os.path.exists(file_path):
|
|
print(f"Error: File {file_path} not found")
|
|
return False
|
|
|
|
print(f"Patching {file_path}...")
|
|
with open(file_path, "r", encoding="utf-8") as f:
|
|
content = f.read()
|
|
|
|
# If already patched, skip
|
|
if "max_retries = 10" in content and "BucketAlreadyOwnedByYou" in content and "BucketAlreadyExists" in content:
|
|
print("Already patched. Skipping.")
|
|
return True
|
|
|
|
old_resource_func = '''def get_new_bucket_resource(name=None):
|
|
"""
|
|
Get a bucket that exists and is empty.
|
|
|
|
Always recreates a bucket from scratch. This is useful to also
|
|
reset ACLs and such.
|
|
"""
|
|
s3 = boto3.resource('s3',
|
|
aws_access_key_id=config.main_access_key,
|
|
aws_secret_access_key=config.main_secret_key,
|
|
endpoint_url=config.default_endpoint,
|
|
use_ssl=config.default_is_secure,
|
|
verify=config.default_ssl_verify)
|
|
if name is None:
|
|
name = get_new_bucket_name()
|
|
bucket = s3.Bucket(name)
|
|
bucket_location = bucket.create()
|
|
return bucket'''
|
|
|
|
new_resource_func = '''def get_new_bucket_resource(name=None):
|
|
"""
|
|
Get a bucket that exists and is empty.
|
|
|
|
Always recreates a bucket from scratch. This is useful to also
|
|
reset ACLs and such.
|
|
"""
|
|
s3 = boto3.resource('s3',
|
|
aws_access_key_id=config.main_access_key,
|
|
aws_secret_access_key=config.main_secret_key,
|
|
endpoint_url=config.default_endpoint,
|
|
use_ssl=config.default_is_secure,
|
|
verify=config.default_ssl_verify)
|
|
|
|
from botocore.exceptions import ClientError
|
|
|
|
# If a name is provided, do not change it. Reuse that exact bucket name.
|
|
if name is not None:
|
|
bucket = s3.Bucket(name)
|
|
try:
|
|
bucket.create()
|
|
except ClientError as e:
|
|
code = e.response.get('Error', {}).get('Code')
|
|
if code in ('BucketAlreadyOwnedByYou', 'BucketAlreadyExists'):
|
|
# Treat as idempotent create for an explicitly provided name.
|
|
# We must not change the name or tests will read from the wrong bucket.
|
|
return bucket
|
|
# Other errors should surface
|
|
raise
|
|
else:
|
|
return bucket
|
|
|
|
# Only generate unique names when no name was provided
|
|
max_retries = 10
|
|
for attempt in range(max_retries):
|
|
gen_name = get_new_bucket_name()
|
|
bucket = s3.Bucket(gen_name)
|
|
try:
|
|
bucket.create()
|
|
return bucket
|
|
except ClientError as e:
|
|
code = e.response.get('Error', {}).get('Code')
|
|
if code in ('BucketAlreadyExists', 'BucketAlreadyOwnedByYou'):
|
|
if attempt == max_retries - 1:
|
|
raise Exception(f"Failed to create unique bucket after {max_retries} attempts")
|
|
continue
|
|
else:
|
|
raise'''
|
|
|
|
old_client_func = '''def get_new_bucket(client=None, name=None):
|
|
"""
|
|
Get a bucket that exists and is empty.
|
|
|
|
Always recreates a bucket from scratch. This is useful to also
|
|
reset ACLs and such.
|
|
"""
|
|
if client is None:
|
|
client = get_client()
|
|
if name is None:
|
|
name = get_new_bucket_name()
|
|
|
|
client.create_bucket(Bucket=name)
|
|
return name'''
|
|
|
|
new_client_func = '''def get_new_bucket(client=None, name=None):
|
|
"""
|
|
Get a bucket that exists and is empty.
|
|
|
|
Always recreates a bucket from scratch. This is useful to also
|
|
reset ACLs and such.
|
|
"""
|
|
if client is None:
|
|
client = get_client()
|
|
|
|
from botocore.exceptions import ClientError
|
|
|
|
# If a name is provided, just try to create it once and fall back to idempotent reuse
|
|
if name is not None:
|
|
try:
|
|
client.create_bucket(Bucket=name)
|
|
except ClientError as e:
|
|
code = e.response.get('Error', {}).get('Code')
|
|
if code in ('BucketAlreadyOwnedByYou', 'BucketAlreadyExists'):
|
|
return name
|
|
raise
|
|
else:
|
|
return name
|
|
|
|
# Otherwise, generate a unique name with retries and return the actual name string
|
|
max_retries = 10
|
|
for attempt in range(max_retries):
|
|
gen_name = get_new_bucket_name()
|
|
try:
|
|
client.create_bucket(Bucket=gen_name)
|
|
return gen_name
|
|
except ClientError as e:
|
|
code = e.response.get('Error', {}).get('Code')
|
|
if code in ('BucketAlreadyExists', 'BucketAlreadyOwnedByYou'):
|
|
if attempt == max_retries - 1:
|
|
raise Exception(f"Failed to create unique bucket after {max_retries} attempts")
|
|
continue
|
|
else:
|
|
raise'''
|
|
|
|
updated = content
|
|
updated = updated.replace(old_resource_func, new_resource_func)
|
|
updated = updated.replace(old_client_func, new_client_func)
|
|
|
|
if updated == content:
|
|
print("Patterns not found; appending override implementations to end of file.")
|
|
append_patch = '''
|
|
|
|
# --- SeaweedFS override start ---
|
|
from botocore.exceptions import ClientError as _Sw_ClientError
|
|
|
|
|
|
# Idempotent create for provided name; generate unique only when no name given
|
|
# Keep the bucket name stable when provided by the caller
|
|
|
|
def _sw_get_new_bucket_resource(name=None):
|
|
s3 = boto3.resource('s3',
|
|
aws_access_key_id=config.main_access_key,
|
|
aws_secret_access_key=config.main_secret_key,
|
|
endpoint_url=config.default_endpoint,
|
|
use_ssl=config.default_is_secure,
|
|
verify=config.default_ssl_verify)
|
|
if name is not None:
|
|
bucket = s3.Bucket(name)
|
|
try:
|
|
bucket.create()
|
|
except _Sw_ClientError as e:
|
|
code = e.response.get('Error', {}).get('Code')
|
|
if code in ('BucketAlreadyOwnedByYou', 'BucketAlreadyExists'):
|
|
return bucket
|
|
raise
|
|
else:
|
|
return bucket
|
|
# name not provided: generate unique
|
|
max_retries = 10
|
|
for attempt in range(max_retries):
|
|
gen_name = get_new_bucket_name()
|
|
bucket = s3.Bucket(gen_name)
|
|
try:
|
|
bucket.create()
|
|
return bucket
|
|
except _Sw_ClientError as e:
|
|
code = e.response.get('Error', {}).get('Code')
|
|
if code in ('BucketAlreadyExists', 'BucketAlreadyOwnedByYou'):
|
|
if attempt == max_retries - 1:
|
|
raise Exception(f"Failed to create unique bucket after {max_retries} attempts")
|
|
continue
|
|
else:
|
|
raise
|
|
|
|
|
|
from botocore.exceptions import ClientError as _Sw2_ClientError
|
|
|
|
|
|
def _sw_get_new_bucket(client=None, name=None):
|
|
if client is None:
|
|
client = get_client()
|
|
if name is not None:
|
|
try:
|
|
client.create_bucket(Bucket=name)
|
|
except _Sw2_ClientError as e:
|
|
code = e.response.get('Error', {}).get('Code')
|
|
if code in ('BucketAlreadyOwnedByYou', 'BucketAlreadyExists'):
|
|
return name
|
|
raise
|
|
else:
|
|
return name
|
|
max_retries = 10
|
|
for attempt in range(max_retries):
|
|
gen_name = get_new_bucket_name()
|
|
try:
|
|
client.create_bucket(Bucket=gen_name)
|
|
return gen_name
|
|
except _Sw2_ClientError as e:
|
|
code = e.response.get('Error', {}).get('Code')
|
|
if code in ('BucketAlreadyExists', 'BucketAlreadyOwnedByYou'):
|
|
if attempt == max_retries - 1:
|
|
raise Exception(f"Failed to create unique bucket after {max_retries} attempts")
|
|
continue
|
|
else:
|
|
raise
|
|
|
|
# Override original helper functions
|
|
get_new_bucket_resource = _sw_get_new_bucket_resource
|
|
get_new_bucket = _sw_get_new_bucket
|
|
# --- SeaweedFS override end ---
|
|
'''
|
|
with open(file_path, "a", encoding="utf-8") as f:
|
|
f.write(append_patch)
|
|
print("Appended override implementations.")
|
|
return True
|
|
|
|
with open(file_path, "w", encoding="utf-8") as f:
|
|
f.write(updated)
|
|
|
|
print("Successfully patched s3-tests helpers.")
|
|
return True
|
|
|
|
|
|
def main() -> int:
|
|
s3_tests_path = os.environ.get("S3_TESTS_PATH", "s3-tests")
|
|
init_file_path = os.path.join(s3_tests_path, "s3tests", "functional", "__init__.py")
|
|
print("Applying s3-tests patch for bucket creation idempotency...")
|
|
print(f"Target repo path: {s3_tests_path}")
|
|
if not os.path.exists(s3_tests_path):
|
|
print(f"Warning: s3-tests directory not found at {s3_tests_path}")
|
|
print("Skipping patch - directory structure may have changed in the upstream repository")
|
|
return 0 # Return success to not break CI
|
|
if not os.path.exists(init_file_path):
|
|
print(f"Warning: Target file {init_file_path} not found")
|
|
print("This may indicate the s3-tests repository structure has changed.")
|
|
print("Skipping patch - tests may still work without it")
|
|
return 0 # Return success to not break CI
|
|
ok = patch_s3_tests_init_file(init_file_path)
|
|
return 0 if ok else 1
|
|
|
|
|
|
if __name__ == "__main__":
|
|
sys.exit(main())
|
|
|
|
|