* Lazy Versioning Check, Conditional SSE Entry Fetch, HEAD Request Optimization * revert Reverted the conditional versioning check to always check versioning status Reverted the conditional SSE entry fetch to always fetch entry metadata Reverted the conditional versioning check to always check versioning status Reverted the conditional SSE entry fetch to always fetch entry metadata * Lazy Entry Fetch for SSE, Skip Conditional Header Check * SSE-KMS headers are present, this is not an SSE-C request (mutually exclusive) * SSE-C is mutually exclusive with SSE-S3 and SSE-KMS * refactor * Removed Premature Mutual Exclusivity Check * check for the presence of the X-Amz-Server-Side-Encryption header * not used * fmt * directly read write volume servers * HTTP Range Request Support * set header * md5 * copy object * fix sse * fmt * implement sse * sse continue * fixed the suffix range bug (bytes=-N for "last N bytes") * debug logs * Missing PartsCount Header * profiling * url encoding * test_multipart_get_part * headers * debug * adjust log level * handle part number * Update s3api_object_handlers.go * nil safety * set ModifiedTsNs * remove * nil check * fix sse header * same logic as filer * decode values * decode ivBase64 * s3: Fix SSE decryption JWT authentication and streaming errors Critical fix for SSE (Server-Side Encryption) test failures: 1. **JWT Authentication Bug** (Root Cause): - Changed from GenJwtForFilerServer to GenJwtForVolumeServer - S3 API now uses correct JWT when directly reading from volume servers - Matches filer's authentication pattern for direct volume access - Fixes 'unexpected EOF' and 500 errors in SSE tests 2. **Streaming Error Handling**: - Added error propagation in getEncryptedStreamFromVolumes goroutine - Use CloseWithError() to properly communicate stream failures - Added debug logging for streaming errors 3. **Response Header Timing**: - Removed premature WriteHeader(http.StatusOK) call - Let Go's http package write status automatically on first write - Prevents header lock when errors occur during streaming 4. **Enhanced SSE Decryption Debugging**: - Added IV/Key validation and logging for SSE-C, SSE-KMS, SSE-S3 - Better error messages for missing or invalid encryption metadata - Added glog.V(2) debugging for decryption setup This fixes SSE integration test failures where encrypted objects could not be retrieved due to volume server authentication failures. The JWT bug was causing volume servers to reject requests, resulting in truncated/empty streams (EOF) or internal errors. * s3: Fix SSE multipart upload metadata preservation Critical fix for SSE multipart upload test failures (SSE-C and SSE-KMS): **Root Cause - Incomplete SSE Metadata Copying**: The old code only tried to copy 'SeaweedFSSSEKMSKey' from the first part to the completed object. This had TWO bugs: 1. **Wrong Constant Name** (Key Mismatch Bug): - Storage uses: SeaweedFSSSEKMSKeyHeader = 'X-SeaweedFS-SSE-KMS-Key' - Old code read: SeaweedFSSSEKMSKey = 'x-seaweedfs-sse-kms-key' - Result: SSE-KMS metadata was NEVER copied → 500 errors 2. **Missing SSE-C and SSE-S3 Headers**: - SSE-C requires: IV, Algorithm, KeyMD5 - SSE-S3 requires: encrypted key data + standard headers - Old code: copied nothing for SSE-C/SSE-S3 → decryption failures **Fix - Complete SSE Header Preservation**: Now copies ALL SSE headers from first part to completed object: - SSE-C: SeaweedFSSSEIV, CustomerAlgorithm, CustomerKeyMD5 - SSE-KMS: SeaweedFSSSEKMSKeyHeader, AwsKmsKeyId, ServerSideEncryption - SSE-S3: SeaweedFSSSES3Key, ServerSideEncryption Applied consistently to all 3 code paths: 1. Versioned buckets (creates version file) 2. Suspended versioning (creates main object with null versionId) 3. Non-versioned buckets (creates main object) **Why This Is Correct**: The headers copied EXACTLY match what putToFiler stores during part upload (lines 496-521 in s3api_object_handlers_put.go). This ensures detectPrimarySSEType() can correctly identify encrypted multipart objects and trigger inline decryption with proper metadata. Fixes: TestSSEMultipartUploadIntegration (SSE-C and SSE-KMS subtests) * s3: Add debug logging for versioning state diagnosis Temporary debug logging to diagnose test_versioning_obj_plain_null_version_overwrite_suspended failure. Added glog.V(0) logging to show: 1. setBucketVersioningStatus: when versioning status is changed 2. PutObjectHandler: what versioning state is detected (Enabled/Suspended/none) 3. PutObjectHandler: which code path is taken (putVersionedObject vs putSuspendedVersioningObject) This will help identify if: - The versioning status is being set correctly in bucket config - The cache is returning stale/incorrect versioning state - The switch statement is correctly routing to suspended vs enabled handlers * s3: Enhanced versioning state tracing for suspended versioning diagnosis Added comprehensive logging across the entire versioning state flow: PutBucketVersioningHandler: - Log requested status (Enabled/Suspended) - Log when calling setBucketVersioningStatus - Log success/failure of status change setBucketVersioningStatus: - Log bucket and status being set - Log when config is updated - Log completion with error code updateBucketConfig: - Log versioning state being written to cache - Immediate cache verification after Set - Log if cache verification fails getVersioningState: - Log bucket name and state being returned - Log if object lock forces VersioningEnabled - Log errors This will reveal: 1. If PutBucketVersioning(Suspended) is reaching the handler 2. If the cache update succeeds 3. What state getVersioningState returns during PUT 4. Any cache consistency issues Expected to show why bucket still reports 'Enabled' after 'Suspended' call. * s3: Add SSE chunk detection debugging for multipart uploads Added comprehensive logging to diagnose why TestSSEMultipartUploadIntegration fails: detectPrimarySSEType now logs: 1. Total chunk count and extended header count 2. All extended headers with 'sse'/'SSE'/'encryption' in the name 3. For each chunk: index, SseType, and whether it has metadata 4. Final SSE type counts (SSE-C, SSE-KMS, SSE-S3) This will reveal if: - Chunks are missing SSE metadata after multipart completion - Extended headers are copied correctly from first part - The SSE detection logic is working correctly Expected to show if chunks have SseType=0 (none) or proper SSE types set. * s3: Trace SSE chunk metadata through multipart completion and retrieval Added end-to-end logging to track SSE chunk metadata lifecycle: **During Multipart Completion (filer_multipart.go)**: 1. Log finalParts chunks BEFORE mkFile - shows SseType and metadata 2. Log versionEntry.Chunks INSIDE mkFile callback - shows if mkFile preserves SSE info 3. Log success after mkFile completes **During GET Retrieval (s3api_object_handlers.go)**: 1. Log retrieved entry chunks - shows SseType and metadata after retrieval 2. Log detected SSE type result This will reveal at which point SSE chunk metadata is lost: - If finalParts have SSE metadata but versionEntry.Chunks don't → mkFile bug - If versionEntry.Chunks have SSE metadata but retrieved chunks don't → storage/retrieval bug - If chunks never have SSE metadata → multipart completion SSE processing bug Expected to show chunks with SseType=NONE during retrieval even though they were created with proper SseType during multipart completion. * s3: Fix SSE-C multipart IV base64 decoding bug **Critical Bug Found**: SSE-C multipart uploads were failing because: Root Cause: - entry.Extended[SeaweedFSSSEIV] stores base64-encoded IV (24 bytes for 16-byte IV) - SerializeSSECMetadata expects raw IV bytes (16 bytes) - During multipart completion, we were passing base64 IV directly → serialization error Error Message: "Failed to serialize SSE-C metadata for chunk in part X: invalid IV length: expected 16 bytes, got 24" Fix: - Base64-decode IV before passing to SerializeSSECMetadata - Added error handling for decode failures Impact: - SSE-C multipart uploads will now correctly serialize chunk metadata - Chunks will have proper SSE metadata for decryption during GET This fixes the SSE-C subtest of TestSSEMultipartUploadIntegration. SSE-KMS still has a separate issue (error code 23) being investigated. * fixes * kms sse * handle retry if not found in .versions folder and should read the normal object * quick check (no retries) to see if the .versions/ directory exists * skip retry if object is not found * explicit update to avoid sync delay * fix map update lock * Remove fmt.Printf debug statements * Fix SSE-KMS multipart base IV fallback to fail instead of regenerating * fmt * Fix ACL grants storage logic * header handling * nil handling * range read for sse content * test range requests for sse objects * fmt * unused code * upload in chunks * header case * fix url * bucket policy error vs bucket not found * jwt handling * fmt * jwt in request header * Optimize Case-Insensitive Prefix Check * dead code * Eliminated Unnecessary Stream Prefetch for Multipart SSE * range sse * sse * refactor * context * fmt * fix type * fix SSE-C IV Mismatch * Fix Headers Being Set After WriteHeader * fix url parsing * propergate sse headers * multipart sse-s3 * aws sig v4 authen * sse kms * set content range * better errors * Update s3api_object_handlers_copy.go * Update s3api_object_handlers.go * Update s3api_object_handlers.go * avoid magic number * clean up * Update s3api_bucket_policy_handlers.go * fix url parsing * context * data and metadata both use background context * adjust the offset * SSE Range Request IV Calculation * adjust logs * IV relative to offset in each part, not the whole file * collect logs * offset * fix offset * fix url * logs * variable * jwt * Multipart ETag semantics: conditionally set object-level Md5 for single-chunk uploads only. * sse * adjust IV and offset * multipart boundaries * ensures PUT and GET operations return consistent ETags * Metadata Header Case * CommonPrefixes Sorting with URL Encoding * always sort * remove the extra PathUnescape call * fix the multipart get part ETag * the FileChunk is created without setting ModifiedTsNs * Sort CommonPrefixes lexicographically to match AWS S3 behavior * set md5 for multipart uploads * prevents any potential data loss or corruption in the small-file inline storage path * compiles correctly * decryptedReader will now be properly closed after use * Fixed URL encoding and sort order for CommonPrefixes * Update s3api_object_handlers_list.go * SSE-x Chunk View Decryption * Different IV offset calculations for single-part vs multipart objects * still too verbose in logs * less logs * ensure correct conversion * fix listing * nil check * minor fixes * nil check * single character delimiter * optimize * range on empty object or zero-length * correct IV based on its position within that part, not its position in the entire object * adjust offset * offset Fetch FULL encrypted chunk (not just the range) Adjust IV by PartOffset/ChunkOffset only Decrypt full chunk Skip in the DECRYPTED stream to reach OffsetInChunk * look breaking * refactor * error on no content * handle intra-block byte skipping * Incomplete HTTP Response Error Handling * multipart SSE * Update s3api_object_handlers.go * address comments * less logs * handling directory * Optimized rejectDirectoryObjectWithoutSlash() to avoid unnecessary lookups * Revert "handling directory" This reverts commit 3a335f0ac33c63f51975abc63c40e5328857a74b. * constant * Consolidate nil entry checks in GetObjectHandler * add range tests * Consolidate redundant nil entry checks in HeadObjectHandler * adjust logs * SSE type * large files * large files Reverted the plain-object range test * ErrNoEncryptionConfig * Fixed SSERangeReader Infinite Loop Vulnerability * Fixed SSE-KMS Multipart ChunkReader HTTP Body Leak * handle empty directory in S3, added PyArrow tests * purge unused code * Update s3_parquet_test.py * Update requirements.txt * According to S3 specifications, when both partNumber and Range are present, the Range should apply within the selected part's boundaries, not to the full object. * handle errors * errors after writing header * https * fix: Wait for volume assignment readiness before running Parquet tests The test-implicit-dir-with-server test was failing with an Internal Error because volume assignment was not ready when tests started. This fix adds a check that attempts a volume assignment and waits for it to succeed before proceeding with tests. This ensures that: 1. Volume servers are registered with the master 2. Volume growth is triggered if needed 3. The system can successfully assign volumes for writes Fixes the timeout issue where boto3 would retry 4 times and fail with 'We encountered an internal error, please try again.' * sse tests * store derived IV * fix: Clean up gRPC ports between tests to prevent port conflicts The second test (test-implicit-dir-with-server) was failing because the volume server's gRPC port (18080 = VOLUME_PORT + 10000) was still in use from the first test. The cleanup code only killed HTTP port processes, not gRPC port processes. Added cleanup for gRPC ports in all stop targets: - Master gRPC: MASTER_PORT + 10000 (19333) - Volume gRPC: VOLUME_PORT + 10000 (18080) - Filer gRPC: FILER_PORT + 10000 (18888) This ensures clean state between test runs in CI. * add import * address comments * docs: Add placeholder documentation files for Parquet test suite Added three missing documentation files referenced in test/s3/parquet/README.md: 1. TEST_COVERAGE.md - Documents 43 total test cases (17 Go unit tests, 6 Python integration tests, 20 Python end-to-end tests) 2. FINAL_ROOT_CAUSE_ANALYSIS.md - Explains the s3fs compatibility issue with PyArrow, the implicit directory problem, and how the fix works 3. MINIO_DIRECTORY_HANDLING.md - Compares MinIO's directory handling approach with SeaweedFS's implementation Each file contains: - Title and overview - Key technical details relevant to the topic - TODO sections for future expansion These placeholder files resolve the broken README links and provide structure for future detailed documentation. * clean up if metadata operation failed * Update s3_parquet_test.py * clean up * Update Makefile * Update s3_parquet_test.py * Update Makefile * Handle ivSkip for non-block-aligned offsets * Update README.md * stop volume server faster * stop volume server in 1 second * different IV for each chunk in SSE-S3 and SSE-KMS * clean up if fails * testing upload * error propagation * fmt * simplify * fix copying * less logs * endian * Added marshaling error handling * handling invalid ranges * error handling for adding to log buffer * fix logging * avoid returning too quickly and ensure proper cleaning up * Activity Tracking for Disk Reads * Cleanup Unused Parameters * Activity Tracking for Kafka Publishers * Proper Test Error Reporting * refactoring * less logs * less logs * go fmt * guard it with if entry.Attributes.TtlSec > 0 to match the pattern used elsewhere. * Handle bucket-default encryption config errors explicitly for multipart * consistent activity tracking * obsolete code for s3 on filer read/write handlers * Update weed/s3api/s3api_object_handlers_list.go Co-authored-by: gemini-code-assist[bot] <176961590+gemini-code-assist[bot]@users.noreply.github.com> --------- Co-authored-by: gemini-code-assist[bot] <176961590+gemini-code-assist[bot]@users.noreply.github.com>
555 lines
20 KiB
Go
555 lines
20 KiB
Go
package log_buffer
|
||
|
||
import (
|
||
"crypto/rand"
|
||
"fmt"
|
||
"io"
|
||
"sync"
|
||
"testing"
|
||
"time"
|
||
|
||
"github.com/seaweedfs/seaweedfs/weed/pb/mq_pb"
|
||
|
||
"github.com/seaweedfs/seaweedfs/weed/pb/filer_pb"
|
||
)
|
||
|
||
func TestNewLogBufferFirstBuffer(t *testing.T) {
|
||
flushInterval := time.Second
|
||
lb := NewLogBuffer("test", flushInterval, func(logBuffer *LogBuffer, startTime time.Time, stopTime time.Time, buf []byte, minOffset, maxOffset int64) {
|
||
fmt.Printf("flush from %v to %v %d bytes\n", startTime, stopTime, len(buf))
|
||
}, nil, func() {
|
||
})
|
||
|
||
startTime := MessagePosition{Time: time.Now()}
|
||
|
||
messageSize := 1024
|
||
messageCount := 5000
|
||
|
||
receivedMessageCount := 0
|
||
var wg sync.WaitGroup
|
||
wg.Add(1)
|
||
go func() {
|
||
defer wg.Done()
|
||
lastProcessedTime, isDone, err := lb.LoopProcessLogData("test", startTime, 0, func() bool {
|
||
// stop if no more messages
|
||
return receivedMessageCount < messageCount
|
||
}, func(logEntry *filer_pb.LogEntry) (isDone bool, err error) {
|
||
receivedMessageCount++
|
||
if receivedMessageCount >= messageCount {
|
||
println("processed all messages")
|
||
return true, io.EOF
|
||
}
|
||
return false, nil
|
||
})
|
||
|
||
fmt.Printf("before flush: sent %d received %d\n", messageCount, receivedMessageCount)
|
||
fmt.Printf("lastProcessedTime %v isDone %v err: %v\n", lastProcessedTime, isDone, err)
|
||
if err != nil && err != io.EOF {
|
||
t.Errorf("unexpected error %v", err)
|
||
}
|
||
}()
|
||
|
||
var buf = make([]byte, messageSize)
|
||
for i := 0; i < messageCount; i++ {
|
||
rand.Read(buf)
|
||
if err := lb.AddToBuffer(&mq_pb.DataMessage{
|
||
Key: nil,
|
||
Value: buf,
|
||
TsNs: 0,
|
||
}); err != nil {
|
||
t.Fatalf("Failed to add buffer: %v", err)
|
||
}
|
||
}
|
||
wg.Wait()
|
||
|
||
if receivedMessageCount != messageCount {
|
||
t.Errorf("expect %d messages, but got %d", messageCount, receivedMessageCount)
|
||
}
|
||
}
|
||
|
||
// TestReadFromBuffer_OldOffsetReturnsResumeFromDiskError tests that requesting an old offset
|
||
// that has been flushed to disk properly returns ResumeFromDiskError instead of hanging forever.
|
||
// This reproduces the bug where Schema Registry couldn't read the _schemas topic.
|
||
func TestReadFromBuffer_OldOffsetReturnsResumeFromDiskError(t *testing.T) {
|
||
tests := []struct {
|
||
name string
|
||
bufferStartOffset int64
|
||
currentOffset int64
|
||
requestedOffset int64
|
||
hasData bool
|
||
expectError error
|
||
description string
|
||
}{
|
||
{
|
||
name: "Request offset 0 when buffer starts at 4 (Schema Registry bug scenario)",
|
||
bufferStartOffset: 4,
|
||
currentOffset: 10,
|
||
requestedOffset: 0,
|
||
hasData: true,
|
||
expectError: ResumeFromDiskError,
|
||
description: "When Schema Registry tries to read from offset 0, but data has been flushed to disk",
|
||
},
|
||
{
|
||
name: "Request offset before buffer start with empty buffer",
|
||
bufferStartOffset: 10,
|
||
currentOffset: 10,
|
||
requestedOffset: 5,
|
||
hasData: false,
|
||
expectError: ResumeFromDiskError,
|
||
description: "Old offset with no data in memory should trigger disk read",
|
||
},
|
||
{
|
||
name: "Request offset before buffer start with data",
|
||
bufferStartOffset: 100,
|
||
currentOffset: 150,
|
||
requestedOffset: 50,
|
||
hasData: true,
|
||
expectError: ResumeFromDiskError,
|
||
description: "Old offset with current data in memory should still trigger disk read",
|
||
},
|
||
{
|
||
name: "Request current offset (no disk read needed)",
|
||
bufferStartOffset: 4,
|
||
currentOffset: 10,
|
||
requestedOffset: 10,
|
||
hasData: true,
|
||
expectError: nil,
|
||
description: "Current offset should return data from memory without error",
|
||
},
|
||
{
|
||
name: "Request offset within buffer range",
|
||
bufferStartOffset: 4,
|
||
currentOffset: 10,
|
||
requestedOffset: 7,
|
||
hasData: true,
|
||
expectError: nil,
|
||
description: "Offset within buffer range should return data without error",
|
||
},
|
||
}
|
||
|
||
for _, tt := range tests {
|
||
t.Run(tt.name, func(t *testing.T) {
|
||
// Create a LogBuffer with minimal configuration
|
||
lb := NewLogBuffer("test", time.Hour, nil, nil, func() {})
|
||
|
||
// Simulate data that has been flushed to disk by setting bufferStartOffset
|
||
lb.bufferStartOffset = tt.bufferStartOffset
|
||
lb.offset = tt.currentOffset
|
||
|
||
// CRITICAL: Mark this as an offset-based buffer
|
||
lb.hasOffsets = true
|
||
|
||
// Add some data to the buffer if needed (at current offset position)
|
||
if tt.hasData {
|
||
testData := []byte("test message")
|
||
// Use AddLogEntryToBuffer to preserve offset information
|
||
if err := lb.AddLogEntryToBuffer(&filer_pb.LogEntry{
|
||
TsNs: time.Now().UnixNano(),
|
||
Key: []byte("key"),
|
||
Data: testData,
|
||
Offset: tt.currentOffset, // Add data at current offset
|
||
}); err != nil {
|
||
t.Fatalf("Failed to add log entry: %v", err)
|
||
}
|
||
}
|
||
|
||
// Create an offset-based position for the requested offset
|
||
requestPosition := NewMessagePositionFromOffset(tt.requestedOffset)
|
||
|
||
// Try to read from the buffer
|
||
buf, batchIdx, err := lb.ReadFromBuffer(requestPosition)
|
||
|
||
// Verify the error matches expectations
|
||
if tt.expectError != nil {
|
||
if err != tt.expectError {
|
||
t.Errorf("%s\nExpected error: %v\nGot error: %v\nbuf=%v, batchIdx=%d",
|
||
tt.description, tt.expectError, err, buf != nil, batchIdx)
|
||
} else {
|
||
t.Logf("✓ %s: correctly returned %v", tt.description, err)
|
||
}
|
||
} else {
|
||
if err != nil {
|
||
t.Errorf("%s\nExpected no error but got: %v\nbuf=%v, batchIdx=%d",
|
||
tt.description, err, buf != nil, batchIdx)
|
||
} else {
|
||
t.Logf("✓ %s: correctly returned data without error", tt.description)
|
||
}
|
||
}
|
||
})
|
||
}
|
||
}
|
||
|
||
// TestReadFromBuffer_OldOffsetWithNoPrevBuffers specifically tests the bug fix
|
||
// where requesting an old offset would return nil instead of ResumeFromDiskError
|
||
func TestReadFromBuffer_OldOffsetWithNoPrevBuffers(t *testing.T) {
|
||
// This is the exact scenario that caused the Schema Registry to hang:
|
||
// 1. Data was published to _schemas topic (offsets 0, 1, 2, 3)
|
||
// 2. Data was flushed to disk
|
||
// 3. LogBuffer's bufferStartOffset was updated to 4
|
||
// 4. Schema Registry tried to read from offset 0
|
||
// 5. ReadFromBuffer would return (nil, offset, nil) instead of ResumeFromDiskError
|
||
// 6. The subscriber would wait forever for data that would never come from memory
|
||
|
||
lb := NewLogBuffer("_schemas", time.Hour, nil, nil, func() {})
|
||
|
||
// Simulate the state after data has been flushed to disk:
|
||
// - bufferStartOffset = 10 (data 0-9 has been flushed)
|
||
// - offset = 15 (next offset to assign, current buffer has 10-14)
|
||
// - pos = 100 (some data in current buffer)
|
||
// Set prevBuffers to have non-overlapping ranges to avoid the safety check at line 420-428
|
||
lb.bufferStartOffset = 10
|
||
lb.offset = 15
|
||
lb.pos = 100
|
||
|
||
// Modify prevBuffers to have non-zero offset ranges that DON'T include the requested offset
|
||
// This bypasses the safety check and exposes the real bug
|
||
for i := range lb.prevBuffers.buffers {
|
||
lb.prevBuffers.buffers[i].startOffset = 20 + int64(i)*10 // 20, 30, 40, etc.
|
||
lb.prevBuffers.buffers[i].offset = 25 + int64(i)*10 // 25, 35, 45, etc.
|
||
lb.prevBuffers.buffers[i].size = 0 // Empty (flushed)
|
||
}
|
||
|
||
// Schema Registry requests offset 5 (which is before bufferStartOffset=10)
|
||
requestPosition := NewMessagePositionFromOffset(5)
|
||
|
||
// Before the fix, this would return (nil, offset, nil) causing an infinite wait
|
||
// After the fix, this should return ResumeFromDiskError
|
||
buf, batchIdx, err := lb.ReadFromBuffer(requestPosition)
|
||
|
||
t.Logf("DEBUG: ReadFromBuffer returned: buf=%v, batchIdx=%d, err=%v", buf != nil, batchIdx, err)
|
||
t.Logf("DEBUG: Buffer state: bufferStartOffset=%d, offset=%d, pos=%d",
|
||
lb.bufferStartOffset, lb.offset, lb.pos)
|
||
t.Logf("DEBUG: Requested offset 5, prevBuffers[0] range: [%d-%d]",
|
||
lb.prevBuffers.buffers[0].startOffset, lb.prevBuffers.buffers[0].offset)
|
||
|
||
if err != ResumeFromDiskError {
|
||
t.Errorf("CRITICAL BUG REPRODUCED: Expected ResumeFromDiskError but got err=%v, buf=%v, batchIdx=%d\n"+
|
||
"This causes Schema Registry to hang indefinitely waiting for data that's on disk!",
|
||
err, buf != nil, batchIdx)
|
||
t.Errorf("The buggy code falls through without returning ResumeFromDiskError!")
|
||
} else {
|
||
t.Logf("✓ BUG FIX VERIFIED: Correctly returns ResumeFromDiskError when requesting old offset 5")
|
||
t.Logf(" This allows the subscriber to read from disk instead of waiting forever")
|
||
}
|
||
}
|
||
|
||
// TestReadFromBuffer_EmptyBufferAtCurrentOffset tests Bug #2
|
||
// where an empty buffer at the current offset would return empty data instead of ResumeFromDiskError
|
||
func TestReadFromBuffer_EmptyBufferAtCurrentOffset(t *testing.T) {
|
||
lb := NewLogBuffer("_schemas", time.Hour, nil, nil, func() {})
|
||
|
||
// Simulate buffer state where data 0-3 was published and flushed, but buffer NOT advanced yet:
|
||
// - bufferStartOffset = 0 (buffer hasn't been advanced after flush)
|
||
// - offset = 4 (next offset to assign - data 0-3 exists)
|
||
// - pos = 0 (buffer is empty after flush)
|
||
// This happens in the window between flush and buffer advancement
|
||
lb.bufferStartOffset = 0
|
||
lb.offset = 4
|
||
lb.pos = 0
|
||
|
||
// Schema Registry requests offset 0 (which appears to be in range [0, 4])
|
||
requestPosition := NewMessagePositionFromOffset(0)
|
||
|
||
// BUG: Without fix, this returns empty buffer instead of checking disk
|
||
// FIX: Should return ResumeFromDiskError because buffer is empty (pos=0) despite valid range
|
||
buf, batchIdx, err := lb.ReadFromBuffer(requestPosition)
|
||
|
||
t.Logf("DEBUG: ReadFromBuffer returned: buf=%v, batchIdx=%d, err=%v", buf != nil, batchIdx, err)
|
||
t.Logf("DEBUG: Buffer state: bufferStartOffset=%d, offset=%d, pos=%d",
|
||
lb.bufferStartOffset, lb.offset, lb.pos)
|
||
|
||
if err != ResumeFromDiskError {
|
||
if buf == nil || len(buf.Bytes()) == 0 {
|
||
t.Errorf("CRITICAL BUG #2 REPRODUCED: Empty buffer should return ResumeFromDiskError, got err=%v, buf=%v\n"+
|
||
"Without the fix, Schema Registry gets empty data instead of reading from disk!",
|
||
err, buf != nil)
|
||
}
|
||
} else {
|
||
t.Logf("✓ BUG #2 FIX VERIFIED: Empty buffer correctly returns ResumeFromDiskError to check disk")
|
||
}
|
||
}
|
||
|
||
// TestReadFromBuffer_OffsetRanges tests various offset range scenarios
|
||
func TestReadFromBuffer_OffsetRanges(t *testing.T) {
|
||
lb := NewLogBuffer("test", time.Hour, nil, nil, func() {})
|
||
|
||
// Setup: buffer contains offsets 10-20
|
||
lb.bufferStartOffset = 10
|
||
lb.offset = 20
|
||
lb.pos = 100 // some data in buffer
|
||
|
||
testCases := []struct {
|
||
name string
|
||
requestedOffset int64
|
||
expectedError error
|
||
description string
|
||
}{
|
||
{
|
||
name: "Before buffer start",
|
||
requestedOffset: 5,
|
||
expectedError: ResumeFromDiskError,
|
||
description: "Offset 5 < bufferStartOffset 10 → read from disk",
|
||
},
|
||
{
|
||
name: "At buffer start",
|
||
requestedOffset: 10,
|
||
expectedError: nil,
|
||
description: "Offset 10 == bufferStartOffset 10 → read from buffer",
|
||
},
|
||
{
|
||
name: "Within buffer range",
|
||
requestedOffset: 15,
|
||
expectedError: nil,
|
||
description: "Offset 15 is within [10, 20] → read from buffer",
|
||
},
|
||
{
|
||
name: "At buffer end",
|
||
requestedOffset: 20,
|
||
expectedError: nil,
|
||
description: "Offset 20 == offset 20 → read from buffer",
|
||
},
|
||
{
|
||
name: "After buffer end",
|
||
requestedOffset: 25,
|
||
expectedError: nil,
|
||
description: "Offset 25 > offset 20 → future data, return nil without error",
|
||
},
|
||
}
|
||
|
||
for _, tc := range testCases {
|
||
t.Run(tc.name, func(t *testing.T) {
|
||
requestPosition := NewMessagePositionFromOffset(tc.requestedOffset)
|
||
_, _, err := lb.ReadFromBuffer(requestPosition)
|
||
|
||
if tc.expectedError != nil {
|
||
if err != tc.expectedError {
|
||
t.Errorf("%s\nExpected error: %v, got: %v", tc.description, tc.expectedError, err)
|
||
} else {
|
||
t.Logf("✓ %s", tc.description)
|
||
}
|
||
} else {
|
||
// For nil expectedError, we accept either nil or no error condition
|
||
// (future offsets return nil without error)
|
||
if err != nil && err != ResumeFromDiskError {
|
||
t.Errorf("%s\nExpected no ResumeFromDiskError, got: %v", tc.description, err)
|
||
} else {
|
||
t.Logf("✓ %s", tc.description)
|
||
}
|
||
}
|
||
})
|
||
}
|
||
}
|
||
|
||
// TestReadFromBuffer_InitializedFromDisk tests Bug #3
|
||
// where bufferStartOffset was incorrectly set to 0 after InitializeOffsetFromExistingData,
|
||
// causing reads for old offsets to return new data instead of triggering a disk read.
|
||
func TestReadFromBuffer_InitializedFromDisk(t *testing.T) {
|
||
// This reproduces the real Schema Registry bug scenario:
|
||
// 1. Broker restarts, finds 4 messages on disk (offsets 0-3)
|
||
// 2. InitializeOffsetFromExistingData sets offset=4
|
||
// - BUG: bufferStartOffset=0 (wrong!)
|
||
// - FIX: bufferStartOffset=4 (correct!)
|
||
// 3. First new message is written (offset 4)
|
||
// 4. Schema Registry reads offset 0
|
||
// 5. With FIX: requestedOffset=0 < bufferStartOffset=4 → ResumeFromDiskError (correct!)
|
||
// 6. Without FIX: requestedOffset=0 in range [0, 5] → returns wrong data (bug!)
|
||
|
||
lb := NewLogBuffer("_schemas", time.Hour, nil, nil, func() {})
|
||
|
||
// Use the actual InitializeOffsetFromExistingData to test the fix
|
||
err := lb.InitializeOffsetFromExistingData(func() (int64, error) {
|
||
return 3, nil // Simulate 4 messages on disk (offsets 0-3, highest=3)
|
||
})
|
||
if err != nil {
|
||
t.Fatalf("InitializeOffsetFromExistingData failed: %v", err)
|
||
}
|
||
|
||
t.Logf("After InitializeOffsetFromExistingData(highestOffset=3):")
|
||
t.Logf(" offset=%d (should be 4), bufferStartOffset=%d (FIX: should be 4, not 0)",
|
||
lb.offset, lb.bufferStartOffset)
|
||
|
||
// Now write a new message at offset 4
|
||
if err := lb.AddToBuffer(&mq_pb.DataMessage{
|
||
Key: []byte("new-key"),
|
||
Value: []byte("new-message-at-offset-4"),
|
||
TsNs: time.Now().UnixNano(),
|
||
}); err != nil {
|
||
t.Fatalf("Failed to add buffer: %v", err)
|
||
}
|
||
// After AddToBuffer: offset=5, pos>0
|
||
|
||
// Schema Registry tries to read offset 0 (should be on disk)
|
||
requestPosition := NewMessagePositionFromOffset(0)
|
||
|
||
buf, batchIdx, err := lb.ReadFromBuffer(requestPosition)
|
||
|
||
t.Logf("After writing new message:")
|
||
t.Logf(" bufferStartOffset=%d, offset=%d, pos=%d", lb.bufferStartOffset, lb.offset, lb.pos)
|
||
t.Logf(" Requested offset 0, got: buf=%v, batchIdx=%d, err=%v", buf != nil, batchIdx, err)
|
||
|
||
// EXPECTED BEHAVIOR (with fix):
|
||
// bufferStartOffset=4 after initialization, so requestedOffset=0 < bufferStartOffset=4
|
||
// → returns ResumeFromDiskError
|
||
|
||
// BUGGY BEHAVIOR (without fix):
|
||
// bufferStartOffset=0 after initialization, so requestedOffset=0 is in range [0, 5]
|
||
// → returns the NEW message (offset 4) instead of reading from disk!
|
||
|
||
if err != ResumeFromDiskError {
|
||
t.Errorf("CRITICAL BUG #3 REPRODUCED: Reading offset 0 after initialization from disk should return ResumeFromDiskError\n"+
|
||
"Instead got: err=%v, buf=%v, batchIdx=%d\n"+
|
||
"This means Schema Registry would receive WRONG data (offset 4) when requesting offset 0!",
|
||
err, buf != nil, batchIdx)
|
||
t.Errorf("Root cause: bufferStartOffset=%d should be 4 after InitializeOffsetFromExistingData(highestOffset=3)",
|
||
lb.bufferStartOffset)
|
||
} else {
|
||
t.Logf("✓ BUG #3 FIX VERIFIED: Reading old offset 0 correctly returns ResumeFromDiskError")
|
||
t.Logf(" This ensures Schema Registry reads correct data from disk instead of getting new messages")
|
||
}
|
||
}
|
||
|
||
// TestLoopProcessLogDataWithOffset_DiskReadRetry tests that when a subscriber
|
||
// reads from disk before flush completes, it continues to retry disk reads
|
||
// and eventually finds the data after flush completes.
|
||
// This reproduces the Schema Registry timeout issue on first start.
|
||
func TestLoopProcessLogDataWithOffset_DiskReadRetry(t *testing.T) {
|
||
diskReadCallCount := 0
|
||
diskReadMu := sync.Mutex{}
|
||
dataFlushedToDisk := false
|
||
var flushedData []*filer_pb.LogEntry
|
||
|
||
// Create a readFromDiskFn that simulates the race condition
|
||
readFromDiskFn := func(startPosition MessagePosition, stopTsNs int64, eachLogEntryFn EachLogEntryFuncType) (MessagePosition, bool, error) {
|
||
diskReadMu.Lock()
|
||
diskReadCallCount++
|
||
callNum := diskReadCallCount
|
||
hasData := dataFlushedToDisk
|
||
diskReadMu.Unlock()
|
||
|
||
t.Logf("DISK READ #%d: startOffset=%d, dataFlushedToDisk=%v", callNum, startPosition.Offset, hasData)
|
||
|
||
if !hasData {
|
||
// Simulate: data not yet on disk (flush hasn't completed)
|
||
t.Logf(" → No data found (flush not completed yet)")
|
||
return startPosition, false, nil
|
||
}
|
||
|
||
// Data is now on disk, process it
|
||
t.Logf(" → Found %d entries on disk", len(flushedData))
|
||
for _, entry := range flushedData {
|
||
if entry.Offset >= startPosition.Offset {
|
||
isDone, err := eachLogEntryFn(entry)
|
||
if err != nil || isDone {
|
||
return NewMessagePositionFromOffset(entry.Offset + 1), isDone, err
|
||
}
|
||
}
|
||
}
|
||
return NewMessagePositionFromOffset(int64(len(flushedData))), false, nil
|
||
}
|
||
|
||
flushFn := func(logBuffer *LogBuffer, startTime, stopTime time.Time, buf []byte, minOffset, maxOffset int64) {
|
||
t.Logf("FLUSH: minOffset=%d maxOffset=%d size=%d bytes", minOffset, maxOffset, len(buf))
|
||
// Simulate writing to disk
|
||
diskReadMu.Lock()
|
||
dataFlushedToDisk = true
|
||
// Parse the buffer and add entries to flushedData
|
||
// For this test, we'll just create mock entries
|
||
flushedData = append(flushedData, &filer_pb.LogEntry{
|
||
Key: []byte("key-0"),
|
||
Data: []byte("message-0"),
|
||
TsNs: time.Now().UnixNano(),
|
||
Offset: 0,
|
||
})
|
||
diskReadMu.Unlock()
|
||
}
|
||
|
||
logBuffer := NewLogBuffer("test", 1*time.Minute, flushFn, readFromDiskFn, nil)
|
||
defer logBuffer.ShutdownLogBuffer()
|
||
|
||
// Simulate the race condition:
|
||
// 1. Subscriber starts reading from offset 0
|
||
// 2. Data is not yet flushed
|
||
// 3. Loop calls readFromDiskFn → no data found
|
||
// 4. A bit later, data gets flushed
|
||
// 5. Loop should continue and call readFromDiskFn again
|
||
|
||
receivedMessages := 0
|
||
mu := sync.Mutex{}
|
||
maxIterations := 50 // Allow up to 50 iterations (500ms with 10ms sleep each)
|
||
iterationCount := 0
|
||
|
||
waitForDataFn := func() bool {
|
||
mu.Lock()
|
||
defer mu.Unlock()
|
||
iterationCount++
|
||
// Stop after receiving message or max iterations
|
||
return receivedMessages == 0 && iterationCount < maxIterations
|
||
}
|
||
|
||
eachLogEntryFn := func(logEntry *filer_pb.LogEntry, offset int64) (bool, error) {
|
||
mu.Lock()
|
||
receivedMessages++
|
||
mu.Unlock()
|
||
t.Logf("✉️ RECEIVED: offset=%d key=%s", offset, string(logEntry.Key))
|
||
return true, nil // Stop after first message
|
||
}
|
||
|
||
// Start the reader in a goroutine
|
||
var readerWg sync.WaitGroup
|
||
readerWg.Add(1)
|
||
go func() {
|
||
defer readerWg.Done()
|
||
startPosition := NewMessagePositionFromOffset(0)
|
||
_, isDone, err := logBuffer.LoopProcessLogDataWithOffset("test-subscriber", startPosition, 0, waitForDataFn, eachLogEntryFn)
|
||
t.Logf("📋 Reader finished: isDone=%v, err=%v", isDone, err)
|
||
}()
|
||
|
||
// Wait a bit to let the first disk read happen (returns no data)
|
||
time.Sleep(50 * time.Millisecond)
|
||
|
||
// Now add data and flush it
|
||
t.Logf("➕ Adding message to buffer...")
|
||
if err := logBuffer.AddToBuffer(&mq_pb.DataMessage{
|
||
Key: []byte("key-0"),
|
||
Value: []byte("message-0"),
|
||
TsNs: time.Now().UnixNano(),
|
||
}); err != nil {
|
||
t.Fatalf("Failed to add buffer: %v", err)
|
||
}
|
||
|
||
// Force flush
|
||
t.Logf("Force flushing...")
|
||
logBuffer.ForceFlush()
|
||
|
||
// Wait for reader to finish
|
||
readerWg.Wait()
|
||
|
||
// Check results
|
||
diskReadMu.Lock()
|
||
finalDiskReadCount := diskReadCallCount
|
||
diskReadMu.Unlock()
|
||
|
||
mu.Lock()
|
||
finalReceivedMessages := receivedMessages
|
||
finalIterations := iterationCount
|
||
mu.Unlock()
|
||
|
||
t.Logf("\nRESULTS:")
|
||
t.Logf(" Disk reads: %d", finalDiskReadCount)
|
||
t.Logf(" Received messages: %d", finalReceivedMessages)
|
||
t.Logf(" Loop iterations: %d", finalIterations)
|
||
|
||
if finalDiskReadCount < 2 {
|
||
t.Errorf("CRITICAL BUG REPRODUCED: Disk read was only called %d time(s)", finalDiskReadCount)
|
||
t.Errorf("Expected: Multiple disk reads as the loop continues after flush completes")
|
||
t.Errorf("This is why Schema Registry times out - it reads once before flush, never re-reads after flush")
|
||
}
|
||
|
||
if finalReceivedMessages == 0 {
|
||
t.Errorf("SCHEMA REGISTRY TIMEOUT REPRODUCED: No messages received even after flush")
|
||
t.Errorf("The subscriber is stuck because disk reads are not retried")
|
||
} else {
|
||
t.Logf("✓ SUCCESS: Message received after %d disk read attempts", finalDiskReadCount)
|
||
}
|
||
}
|