This is an automated email from the ASF dual-hosted git repository.
liuhan pushed a commit to branch reduce-handle-connect-time
in repository https://gitbox.apache.org/repos/asf/skywalking-rover.git
The following commit(s) were added to refs/heads/reduce-handle-connect-time by
this push:
new f0514b7 update conntrack
f0514b7 is described below
commit f0514b7728000ff1c72084e33a0623b18f6ac22a
Author: mrproliu <[email protected]>
AuthorDate: Sat Dec 28 16:40:53 2024 +0800
update conntrack
---
pkg/accesslog/collector/connection.go | 8 +++-----
pkg/tools/buffer/buffer.go | 2 +-
2 files changed, 4 insertions(+), 6 deletions(-)
diff --git a/pkg/accesslog/collector/connection.go
b/pkg/accesslog/collector/connection.go
index 93f8d39..5c4270b 100644
--- a/pkg/accesslog/collector/connection.go
+++ b/pkg/accesslog/collector/connection.go
@@ -53,7 +53,7 @@ var connectionLogger = logger.GetLogger("access_log",
"collector", "connection")
var connectionCollectInstance = NewConnectionCollector()
-var connectionAnalyzeRetryTime = time.Second * 2
+var connectionAnalyzeRetryTime = time.Second * 3
type ConnectCollector struct {
eventQueue *btf.EventQueue
@@ -380,7 +380,7 @@ func (c *ConnectionPartitionContext)
TryToUpdateSocketFromConntrack(event *event
return nil
}
}
- connectionLogger.Infof("try to update the remote address from
conntrack, connection ID: %d, randomID: %d, func: %s, local: %s:%d, remote:
%s:%d",
+ connectionLogger.Debugf("try to update the remote address from
conntrack, connection ID: %d, randomID: %d, func: %s, local: %s:%d, remote:
%s:%d",
event.ConID, event.RandomID,
enums.SocketFunctionName(event.FuncName), socket.SrcIP, socket.SrcPort,
socket.DestIP, socket.DestPort)
if c.connTracker != nil {
// if no contract and socket data is valid, then trying to get
the remote address from the socket
@@ -389,11 +389,9 @@ func (c *ConnectionPartitionContext)
TryToUpdateSocketFromConntrack(event *event
originalPort := socket.DestPort
err := c.connTracker.UpdateRealPeerAddress(socket)
if err != nil {
- log.Warnf("update the socket address from conntrack
failure, connection ID: %d, randomID: %d, error: %v",
- event.ConID, event.RandomID, err)
return fmt.Errorf("update the socket address from
conntrack failure, error: %v", err)
}
- connectionLogger.Infof("update the socket address from
conntrack success, "+
+ connectionLogger.Debugf("update the socket address from
conntrack success, "+
"connection ID: %d, randomID: %d, original remote:
%s:%d, new remote: %s:%d",
event.ConID, event.RandomID, originalIP, originalPort,
socket.DestIP, socket.DestPort)
}
diff --git a/pkg/tools/buffer/buffer.go b/pkg/tools/buffer/buffer.go
index 9d7305b..fe2b77a 100644
--- a/pkg/tools/buffer/buffer.go
+++ b/pkg/tools/buffer/buffer.go
@@ -173,7 +173,7 @@ func (i *DataIDRange) DeleteDetails(buf *Buffer) {
break
}
buf.detailEvents.Remove(e)
- log.Infof("delete detail event from buffer, data id:
%d, ref: %p, range: %d-%d(%t)",
+ log.Debugf("delete detail event from buffer, data id:
%d, ref: %p, range: %d-%d(%t)",
dataID, buf, i.From, i.To,
i.IsToBufferReadFinished)
}
e = next
