kotovalexarian-likes-github/moby--moby
1
0
Fork 0
mirror of https://github.com/moby/moby.git synced 2022-11-09 12:21:53 -05:00
Code Releases Activity

Merge pull request #2096 from fcrisciani/fix-transient-log

Browse source 
Fix crash if the len was < maxSetStringLen
This commit is contained in:
Flavio Crisciani 2018-03-01 09:44:49 -08:00 • committed by GitHub
commit 9bade4d29c
1 changed files with 8 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

10
libnetwork/service_common.go
View file

@ -287,7 +287,10 @@ func (c *controller) addServiceBinding(svcName, svcID, nID, eID, containerName s
ok, entries := s.assignIPToEndpoint(ip.String(), eID) ok, entries := s.assignIPToEndpoint(ip.String(), eID)
if !ok || entries > 1 { if !ok || entries > 1 {
setStr, b := s.printIPToEndpoint(ip.String()) setStr, b := s.printIPToEndpoint(ip.String())
logrus.Warnf("addServiceBinding %s possible transient state ok:%t entries:%d set:%t %s", eID, ok, entries, b, setStr[:maxSetStringLen]) if len(setStr) > maxSetStringLen {
setStr = setStr[:maxSetStringLen]
}
logrus.Warnf("addServiceBinding %s possible transient state ok:%t entries:%d set:%t %s", eID, ok, entries, b, setStr)
} }
// Add loadbalancer service and backend in all sandboxes in // Add loadbalancer service and backend in all sandboxes in
@ -355,7 +358,10 @@ func (c *controller) rmServiceBinding(svcName, svcID, nID, eID, containerName st
ok, entries := s.removeIPToEndpoint(ip.String(), eID) ok, entries := s.removeIPToEndpoint(ip.String(), eID)
if !ok || entries > 0 { if !ok || entries > 0 {
setStr, b := s.printIPToEndpoint(ip.String()) setStr, b := s.printIPToEndpoint(ip.String())
logrus.Warnf("rmServiceBinding %s possible transient state ok:%t entries:%d set:%t %s", eID, ok, entries, b, setStr[:maxSetStringLen]) if len(setStr) > maxSetStringLen {
setStr = setStr[:maxSetStringLen]
}
logrus.Warnf("rmServiceBinding %s possible transient state ok:%t entries:%d set:%t %s", eID, ok, entries, b, setStr)
} }
// Remove loadbalancer service(if needed) and backend in all // Remove loadbalancer service(if needed) and backend in all