Github-Mirror/seaweedfs
1
0
Fork 0
mirror of https://github.com/seaweedfs/seaweedfs.git synced 2026-09-12 09:30:46 +02:00
Code Issues Packages Projects Releases Wiki Activity

fix v7 samara

Browse Source
This commit is contained in:
chrislu
2025-09-13 09:06:02 -07:00
parent 4f0dd2e527
commit 445d7343d7
3 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
weed/mq/kafka/protocol/fetch.go
+2 -2
View File
@@ -264,8 +264,8 @@ func (h *Handler) parseFetchRequest(apiVersion uint16, requestBody []byte) (*Fet
request.Topics[i].Partitions[j].PartitionID = int32(binary.BigEndian.Uint32(requestBody[offset : offset+4]))
offset += 4
// Current leader epoch (4 bytes) - only in v5+
if apiVersion >= 5 {
// Current leader epoch (4 bytes) - only in v9+
if apiVersion >= 9 {
if offset+4 > len(requestBody) {
return nil, fmt.Errorf("insufficient data for current leader epoch")
}
weed/mq/kafka/protocol/fetch_test.go
+4 -4
View File
@@ -61,8 +61,8 @@ func TestHandler_handleFetch(t *testing.T) {
requestBody = append(requestBody, 0, 0, 0, 1)
// Partition 0
requestBody = append(requestBody, 0, 0, 0, 0) // partition ID
requestBody = append(requestBody, 0, 0, 0, 0) // current leader epoch
requestBody = append(requestBody, 0, 0, 0, 0) // partition ID
// NOTE: current leader epoch only in v9+, not v7
requestBody = append(requestBody, 0, 0, 0, 0, 0, 0, 0, byte(baseOffset)) // fetch offset
requestBody = append(requestBody, 0, 0, 0, 0, 0, 0, 0, 0) // log start offset
requestBody = append(requestBody, 0, 0, 0x10, 0) // partition max bytes (1MB)
@@ -248,8 +248,8 @@ func TestHandler_handleFetch_EmptyPartition(t *testing.T) {
requestBody = append(requestBody, 0, 0, 0, 1)
// Partition 0 - fetch from offset 0
requestBody = append(requestBody, 0, 0, 0, 0) // partition ID
requestBody = append(requestBody, 0, 0, 0, 0) // current leader epoch
requestBody = append(requestBody, 0, 0, 0, 0) // partition ID
// NOTE: current leader epoch only in v9+, not v7
requestBody = append(requestBody, 0, 0, 0, 0, 0, 0, 0, 0) // fetch offset
requestBody = append(requestBody, 0, 0, 0, 0, 0, 0, 0, 0) // log start offset
requestBody = append(requestBody, 0, 0, 0x10, 0) // partition max bytes
weed/mq/kafka/protocol/handler.go
+5 -5
View File
@@ -734,15 +734,15 @@ func (h *Handler) HandleMetadataV0(correlationID uint32, requestBody []byte) ([]
// partition: error_code(2) + partition_id(4) + leader(4)
response = append(response, 0, 0) // error_code
response = append(response, 0, 0, 0, 0) // partition_id = 0
response = append(response, 0, 0, 0, 0) // leader = 0 (this broker)
response = append(response, 0, 0, 0, 1) // leader = 1 (this broker)
// replicas: array length(4) + one broker id (0)
// replicas: array length(4) + one broker id (1)
response = append(response, 0, 0, 0, 1)
response = append(response, 0, 0, 0, 1)
response = append(response, 0, 0, 0, 0)
// isr: array length(4) + one broker id (0)
// isr: array length(4) + one broker id (1)
response = append(response, 0, 0, 0, 1)
response = append(response, 0, 0, 0, 1)
response = append(response, 0, 0, 0, 0)
}
fmt.Printf("DEBUG: Metadata v0 response for %d topics: %v\n", len(topicsToReturn), topicsToReturn)