995dfc4d5d
* chore: remove unreachable dead code across the codebase Remove ~50,000 lines of unreachable code identified by static analysis. Major removals: - weed/filer/redis_lua: entire unused Redis Lua filer store implementation - weed/wdclient/net2, resource_pool: unused connection/resource pool packages - weed/plugin/worker/lifecycle: unused lifecycle plugin worker - weed/s3api: unused S3 policy templates, presigned URL IAM, streaming copy, multipart IAM, key rotation, and various SSE helper functions - weed/mq/kafka: unused partition mapping, compression, schema, and protocol functions - weed/mq/offset: unused SQL storage and migration code - weed/worker: unused registry, task, and monitoring functions - weed/query: unused SQL engine, parquet scanner, and type functions - weed/shell: unused EC proportional rebalance functions - weed/storage/erasure_coding/distribution: unused distribution analysis functions - Individual unreachable functions removed from 150+ files across admin, credential, filer, iam, kms, mount, mq, operation, pb, s3api, server, shell, storage, topology, and util packages * fix(s3): reset shared memory store in IAM test to prevent flaky failure TestLoadIAMManagerFromConfig_EmptyConfigWithFallbackKey was flaky because the MemoryStore credential backend is a singleton registered via init(). Earlier tests that create anonymous identities pollute the shared store, causing LookupAnonymous() to unexpectedly return true. Fix by calling Reset() on the memory store before the test runs. * style: run gofmt on changed files * fix: restore KMS functions used by integration tests * fix(plugin): prevent panic on send to closed worker session channel The Plugin.sendToWorker method could panic with "send on closed channel" when a worker disconnected while a message was being sent. The race was between streamSession.close() closing the outgoing channel and sendToWorker writing to it concurrently. Add a done channel to streamSession that is closed before the outgoing channel, and check it in sendToWorker's select to safely detect closed sessions without panicking.
93 lines
2.9 KiB
Go
93 lines
2.9 KiB
Go
package topic
|
|
|
|
import (
|
|
"fmt"
|
|
"sync/atomic"
|
|
"time"
|
|
|
|
"github.com/seaweedfs/seaweedfs/weed/pb/filer_pb"
|
|
"github.com/seaweedfs/seaweedfs/weed/pb/mq_pb"
|
|
"github.com/seaweedfs/seaweedfs/weed/util"
|
|
)
|
|
|
|
// OffsetAssignmentFunc is a function type for assigning offsets to messages
|
|
type OffsetAssignmentFunc func() (int64, error)
|
|
|
|
// PublishWithOffset publishes a message with offset assignment
|
|
// This method is used by the Kafka gateway integration for sequential offset assignment
|
|
func (p *LocalPartition) PublishWithOffset(message *mq_pb.DataMessage, assignOffsetFn OffsetAssignmentFunc) (int64, error) {
|
|
// Assign offset for this message
|
|
offset, err := assignOffsetFn()
|
|
if err != nil {
|
|
return 0, fmt.Errorf("failed to assign offset: %w", err)
|
|
}
|
|
|
|
// Add message to buffer with offset
|
|
err = p.addToBufferWithOffset(message, offset)
|
|
if err != nil {
|
|
return 0, fmt.Errorf("failed to add message to buffer: %w", err)
|
|
}
|
|
|
|
// Track publish activity for idle cleanup (consistent with Publish method)
|
|
p.UpdateActivity()
|
|
|
|
// Send to follower if needed (same logic as original Publish)
|
|
if p.publishFolloweMeStream != nil {
|
|
if followErr := p.publishFolloweMeStream.Send(&mq_pb.PublishFollowMeRequest{
|
|
Message: &mq_pb.PublishFollowMeRequest_Data{
|
|
Data: message,
|
|
},
|
|
}); followErr != nil {
|
|
return 0, fmt.Errorf("send to follower %s: %v", p.Follower, followErr)
|
|
}
|
|
} else {
|
|
atomic.StoreInt64(&p.AckTsNs, message.TsNs)
|
|
}
|
|
|
|
return offset, nil
|
|
}
|
|
|
|
// addToBufferWithOffset adds a message to the log buffer with a pre-assigned offset
|
|
func (p *LocalPartition) addToBufferWithOffset(message *mq_pb.DataMessage, offset int64) error {
|
|
// Ensure we have a timestamp
|
|
processingTsNs := message.TsNs
|
|
if processingTsNs == 0 {
|
|
processingTsNs = time.Now().UnixNano()
|
|
}
|
|
|
|
// Build a LogEntry that preserves the assigned sequential offset
|
|
logEntry := &filer_pb.LogEntry{
|
|
TsNs: processingTsNs,
|
|
PartitionKeyHash: util.HashToInt32(message.Key),
|
|
Data: message.Value,
|
|
Key: message.Key,
|
|
Offset: offset,
|
|
}
|
|
|
|
// Add the entry to the buffer in a way that preserves offset on disk and in-memory
|
|
if err := p.LogBuffer.AddLogEntryToBuffer(logEntry); err != nil {
|
|
return fmt.Errorf("failed to add log entry to buffer: %w", err)
|
|
}
|
|
|
|
return nil
|
|
}
|
|
|
|
// GetOffsetInfo returns offset information for this partition
|
|
// Used for debugging and monitoring partition offset state
|
|
func (p *LocalPartition) GetOffsetInfo() map[string]interface{} {
|
|
return map[string]interface{}{
|
|
"partition_ring_size": p.RingSize,
|
|
"partition_range_start": p.RangeStart,
|
|
"partition_range_stop": p.RangeStop,
|
|
"partition_unix_time": p.UnixTimeNs,
|
|
"buffer_name": p.LogBuffer.GetName(),
|
|
"buffer_offset": p.LogBuffer.GetOffset(),
|
|
}
|
|
}
|
|
|
|
// OffsetAwarePublisher wraps a LocalPartition with offset assignment capability
|
|
type OffsetAwarePublisher struct {
|
|
partition *LocalPartition
|
|
assignOffsetFn OffsetAssignmentFunc
|
|
}
|