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
153 lines
5.2 KiB
Go
153 lines
5.2 KiB
Go
package broker
|
|
|
|
import (
|
|
"time"
|
|
|
|
"github.com/seaweedfs/seaweedfs/weed/mq/topic"
|
|
"github.com/seaweedfs/seaweedfs/weed/pb/filer_pb"
|
|
"github.com/seaweedfs/seaweedfs/weed/pb/mq_pb"
|
|
"github.com/seaweedfs/seaweedfs/weed/util"
|
|
"github.com/seaweedfs/seaweedfs/weed/util/log_buffer"
|
|
)
|
|
|
|
// OffsetAssignmentFunc is a function type for assigning offsets to messages
|
|
type OffsetAssignmentFunc func() (int64, error)
|
|
|
|
// AddToBufferWithOffset adds a message to the log buffer with offset assignment
|
|
// TODO: This is a temporary solution until LogBuffer can be modified to accept offset assignment
|
|
// ASSUMPTION: This function will be integrated into LogBuffer.AddToBuffer in the future
|
|
func (b *MessageQueueBroker) AddToBufferWithOffset(
|
|
logBuffer *log_buffer.LogBuffer,
|
|
message *mq_pb.DataMessage,
|
|
t topic.Topic,
|
|
p topic.Partition,
|
|
) error {
|
|
// Assign offset for this message
|
|
offset, err := b.offsetManager.AssignOffset(t, p)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
|
|
// PERFORMANCE OPTIMIZATION: Pre-process expensive operations OUTSIDE the lock
|
|
processingTsNs := message.TsNs
|
|
if processingTsNs == 0 {
|
|
processingTsNs = time.Now().UnixNano()
|
|
}
|
|
|
|
// Create LogEntry with assigned offset
|
|
logEntry := &filer_pb.LogEntry{
|
|
TsNs: processingTsNs,
|
|
PartitionKeyHash: util.HashToInt32(message.Key),
|
|
Data: message.Value,
|
|
Key: message.Key,
|
|
Offset: offset, // Add the assigned offset
|
|
}
|
|
|
|
// Use the existing LogBuffer infrastructure for the rest
|
|
// TODO: This is a workaround - ideally LogBuffer should handle offset assignment
|
|
// For now, we'll add the message with the pre-assigned offset
|
|
return b.addLogEntryToBuffer(logBuffer, logEntry)
|
|
}
|
|
|
|
// addLogEntryToBuffer adds a pre-constructed LogEntry to the buffer
|
|
// This is a helper function that directly uses LogBuffer.AddLogEntryToBuffer
|
|
func (b *MessageQueueBroker) addLogEntryToBuffer(
|
|
logBuffer *log_buffer.LogBuffer,
|
|
logEntry *filer_pb.LogEntry,
|
|
) error {
|
|
// Use the AddLogEntryToBuffer method to preserve offset information
|
|
// This ensures the offset is maintained throughout the entire data flow
|
|
return logBuffer.AddLogEntryToBuffer(logEntry)
|
|
}
|
|
|
|
// GetPartitionOffsetInfoInternal returns offset information for a partition (internal method)
|
|
func (b *MessageQueueBroker) GetPartitionOffsetInfoInternal(t topic.Topic, p topic.Partition) (*PartitionOffsetInfo, error) {
|
|
info, err := b.offsetManager.GetPartitionOffsetInfo(t, p)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
|
|
// CRITICAL FIX: Also check LogBuffer for in-memory messages
|
|
// The offset manager only tracks assigned offsets from persistent storage
|
|
// But the LogBuffer contains recently written messages that haven't been flushed yet
|
|
localPartition := b.localTopicManager.GetLocalPartition(t, p)
|
|
logBufferHWM := int64(-1)
|
|
if localPartition != nil && localPartition.LogBuffer != nil {
|
|
logBufferHWM = localPartition.LogBuffer.GetOffset()
|
|
} else {
|
|
}
|
|
|
|
// Use the MAX of offset manager HWM and LogBuffer HWM
|
|
// This ensures we report the correct HWM even if data hasn't been flushed to disk yet
|
|
// IMPORTANT: Use >= not > because when they're equal, we still want the correct value
|
|
highWaterMark := info.HighWaterMark
|
|
if logBufferHWM >= 0 && logBufferHWM > highWaterMark {
|
|
highWaterMark = logBufferHWM
|
|
} else if logBufferHWM >= 0 && logBufferHWM == highWaterMark && highWaterMark > 0 {
|
|
} else if logBufferHWM >= 0 {
|
|
}
|
|
|
|
// Latest offset is HWM - 1 (last assigned offset)
|
|
latestOffset := highWaterMark - 1
|
|
if highWaterMark == 0 {
|
|
latestOffset = -1 // No records
|
|
}
|
|
|
|
// Convert to broker-specific format
|
|
return &PartitionOffsetInfo{
|
|
Topic: t,
|
|
Partition: p,
|
|
EarliestOffset: info.EarliestOffset,
|
|
LatestOffset: latestOffset,
|
|
HighWaterMark: highWaterMark,
|
|
RecordCount: highWaterMark, // HWM equals record count (offsets 0 to HWM-1)
|
|
ActiveSubscriptions: info.ActiveSubscriptions,
|
|
}, nil
|
|
}
|
|
|
|
// PartitionOffsetInfo provides offset information for a partition (broker-specific)
|
|
type PartitionOffsetInfo struct {
|
|
Topic topic.Topic
|
|
Partition topic.Partition
|
|
EarliestOffset int64
|
|
LatestOffset int64
|
|
HighWaterMark int64
|
|
RecordCount int64
|
|
ActiveSubscriptions int64
|
|
}
|
|
|
|
// CreateOffsetSubscription creates an offset-based subscription through the broker
|
|
func (b *MessageQueueBroker) CreateOffsetSubscription(
|
|
subscriptionID string,
|
|
t topic.Topic,
|
|
p topic.Partition,
|
|
offsetType string, // Will be converted to schema_pb.OffsetType
|
|
startOffset int64,
|
|
) error {
|
|
// TODO: Convert string offsetType to schema_pb.OffsetType
|
|
// ASSUMPTION: For now using RESET_TO_EARLIEST as default
|
|
// This should be properly mapped based on the offsetType parameter
|
|
|
|
_, err := b.offsetManager.CreateSubscription(
|
|
subscriptionID,
|
|
t,
|
|
p,
|
|
0, // schema_pb.OffsetType_RESET_TO_EARLIEST
|
|
startOffset,
|
|
)
|
|
|
|
return err
|
|
}
|
|
|
|
// GetOffsetMetrics returns offset metrics for monitoring
|
|
func (b *MessageQueueBroker) GetOffsetMetrics() map[string]interface{} {
|
|
metrics := b.offsetManager.GetOffsetMetrics()
|
|
|
|
return map[string]interface{}{
|
|
"partition_count": metrics.PartitionCount,
|
|
"total_offsets": metrics.TotalOffsets,
|
|
"active_subscriptions": metrics.ActiveSubscriptions,
|
|
"average_latency": metrics.AverageLatency,
|
|
}
|
|
}
|