in_tcp: fix parsed bytes to include separator length #10385
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Signed-off-by: Jinsu Lee <[email protected]>
binary85
requested review from
edsiper,
leonardo-albertovich,
fujimotos and
koleini
as code owners
|
configurations for test |
|
debug log output |
|
You can reproduce this problem with the above configuration and by executing this Go code. package main
import (
"fmt"
"net"
"time"
)
func main() {
serverAddr := "localhost:8091"
var logID uint64 = 0
for {
time.Sleep(1 * time.Second)
conn, err := net.Dial("tcp", serverAddr)
if err != nil {
fmt.Println("connect failed:", err)
continue
}
defer conn.Close()
fmt.Println("connected:", serverAddr)
message := "Hello, fluent-bit!"
ticker := time.NewTicker(1 * time.Second)
defer ticker.Stop()
failed := false
for {
select {
case <-ticker.C:
logID++
message = fmt.Sprintf("Hello, fluent-bit! %d", logID)
err := sendMessage(conn, message)
if err != nil {
fmt.Println("send message failed:", err)
failed = true
break
}
logID++
message = fmt.Sprintf("Hello, fluent-bit! %d", logID)
err = sendMessage(conn, message)
if err != nil {
fmt.Println("send message failed:", err)
failed = true
break
}
logID++
message = fmt.Sprintf("Hello, fluent-bit! %d", logID)
err = sendMessage(conn, message)
if err != nil {
fmt.Println("send message failed:", err)
failed = true
break
}
fmt.Println("sent message")
}
if failed {
conn.Close()
break
}
}
}
}
func sendMessage(conn net.Conn, message string) error {
separator := "$endlog$"
newline := "\r\n"
_, err := conn.Write([]byte(message))
if err != nil {
return err
}
_, err = conn.Write([]byte(separator))
if err != nil {
return err
}
_, err = conn.Write([]byte(newline))
if err != nil {
return err
}
return nil
} |
|
thank you |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fixed malfunction when using a seperator longer than 1 charactor in tcp INPUT none format log.
Consumed length does not include the length of the separator.
I use
$endlog$\r\nas a separator. As shown below, however part of the separator is included in the split logs, or some content from the previous log is replayed in the next one.{"log":"Hello, fluent-bit! 1"} {"log":"Hello, fluent-bit! 2"} {"log":"Hello, fluent-bit! 3"} {"log":"lo, fluent-bit! 3"} {"log":"endlog$\r\nHello, fluent-bit! 4"} {"log":"endlog$\r\nHello, fluent-bit! 5"} {"log":"endlog$\r\nHello, fluent-bit! 6"} {"log":"endlog$\r\nHello, fluent-bit! 7"} {"log":"Hello, fluent-bit! 8"} {"log":"t-bit! 8"} {"log":"endlog$\r\nHello, fluent-bit! 9"} {"log":"endlog$\r\nHello, fluent-bit! 10"} {"log":"endlog$\r\nHello, fluent-bit! 11"} {"log":"Hello, fluent-bit! 12"} {"log":"-bit! 12"} {"log":"endlog$\r\nHello, fluent-bit! 13"} {"log":"Hello, fluent-bit! 14"} {"log":"-bit! 14"} {"log":"Hello, fluent-bit! 15"} {"log":"-bit! 15"} {"log":"endlog$\r\nHello, fluent-bit! 16"} {"log":"Hello, fluent-bit! 17"} {"log":"-bit! 17"} {"log":"endlog$\r\nHello, fluent-bit! 18"} {"log":"endlog$\r\nHello, fluent-bit! 19"} {"log":"Hello, fluent-bit! 20"}After checking the code for parsing the "none" format of the TCP INPUT, I found that the length of the parsed data did not include the length of the separator.
Enter
[N/A]in the box, if an item is not applicable to your change.Testing
Before we can approve your change; please submit the following in a comment:
If this is a change to packaging of containers or native binaries then please confirm it works for all targets.
ok-package-testlabel to test for all targets (requires maintainer to do).Documentation
Backporting
Fluent Bit is licensed under Apache 2.0, by submitting this pull request I understand that this code will be released under the terms of that license.