scottk/kubernetes
1
0
Fork 0
mirror of https://github.com/optim-enterprises-bv/kubernetes.git synced 2025-11-25 02:45:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

migrated pkg/controller/endpointslice to contextual logging

Browse Source 
Signed-off-by: Naman <namanlakhwani@gmail.com>
This commit is contained in:
Naman
2023-01-24 19:09:00 +05:30
parent c95b16b280
commit 09849b09cf
15 changed files with 186 additions and 132 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
pkg/controller/endpointslice/topologycache/topologycache.go
View File

@@ -88,12 +88,12 @@ func (t *TopologyCache) GetOverloadedServices() []string {
// AddHints adds or updates topology hints on EndpointSlices and returns updated
// lists of EndpointSlices to create and update.
func (t *TopologyCache) AddHints(si *SliceInfo) ([]*discovery.EndpointSlice, []*discovery.EndpointSlice, []*EventBuilder) {
func (t *TopologyCache) AddHints(logger klog.Logger, si *SliceInfo) ([]*discovery.EndpointSlice, []*discovery.EndpointSlice, []*EventBuilder) {
totalEndpoints := si.getTotalReadyEndpoints()
allocations, allocationsEvent := t.getAllocations(totalEndpoints)
events := []*EventBuilder{}
if allocationsEvent != nil {
klog.InfoS(allocationsEvent.Message+", removing hints", "serviceKey", si.ServiceKey, "addressType", si.AddressType)
logger.Info(allocationsEvent.Message+", removing hints", "key", si.ServiceKey, "addressType", si.AddressType)
allocationsEvent.Message = FormatWithAddressType(allocationsEvent.Message, si.AddressType)
events = append(events, allocationsEvent)
t.RemoveHints(si.ServiceKey, si.AddressType)
@@ -116,7 +116,7 @@ func (t *TopologyCache) AddHints(si *SliceInfo) ([]*discovery.EndpointSlice, []*
continue
}
if endpoint.Zone == nil || *endpoint.Zone == "" {
klog.InfoS("Endpoint found without zone specified, removing hints", "serviceKey", si.ServiceKey, "addressType", si.AddressType)
logger.Info("Endpoint found without zone specified, removing hints", "key", si.ServiceKey, "addressType", si.AddressType)
events = append(events, &EventBuilder{
EventType: v1.EventTypeWarning,
Reason: "TopologyAwareHintsDisabled",
@@ -136,14 +136,14 @@ func (t *TopologyCache) AddHints(si *SliceInfo) ([]*discovery.EndpointSlice, []*
givingZones, receivingZones := getGivingAndReceivingZones(allocations, allocatedHintsByZone)
// step 3. Redistribute endpoints based on data from step 2.
redistributions := redistributeHints(allocatableSlices, givingZones, receivingZones)
redistributions := redistributeHints(logger, allocatableSlices, givingZones, receivingZones)
for zone, diff := range redistributions {
allocatedHintsByZone[zone] += diff
}
if len(allocatedHintsByZone) == 0 {
klog.V(2).InfoS("No hints allocated for zones, removing them", "serviceKey", si.ServiceKey, "addressType", si.AddressType)
logger.V(2).Info("No hints allocated for zones, removing them", "key", si.ServiceKey, "addressType", si.AddressType)
events = append(events, &EventBuilder{
EventType: v1.EventTypeWarning,
Reason: "TopologyAwareHintsDisabled",
@@ -159,7 +159,7 @@ func (t *TopologyCache) AddHints(si *SliceInfo) ([]*discovery.EndpointSlice, []*
// if hints were not enabled before, we publish an event to indicate we enabled them.
if !hintsEnabled {
klog.InfoS("Topology Aware Hints has been enabled, adding hints.", "serviceKey", si.ServiceKey, "addressType", si.AddressType)
logger.Info("Topology Aware Hints has been enabled, adding hints.", "key", si.ServiceKey, "addressType", si.AddressType)
events = append(events, &EventBuilder{
EventType: v1.EventTypeNormal,
Reason: "TopologyAwareHintsEnabled",
@@ -201,7 +201,7 @@ func (t *TopologyCache) RemoveHints(serviceKey string, addrType discovery.Addres
}
// SetNodes updates the Node distribution for the TopologyCache.
func (t *TopologyCache) SetNodes(nodes []*v1.Node) {
func (t *TopologyCache) SetNodes(logger klog.Logger, nodes []*v1.Node) {
cpuByZone := map[string]*resource.Quantity{}
sufficientNodeInfo := true
@@ -209,11 +209,11 @@ func (t *TopologyCache) SetNodes(nodes []*v1.Node) {
for _, node := range nodes {
if hasExcludedLabels(node.Labels) {
klog.V(2).Infof("Ignoring node %s because it has an excluded label", node.Name)
logger.V(2).Info("Ignoring node because it has an excluded label", "node", klog.KObj(node))
continue
}
if !isNodeReady(node) {
klog.V(2).Infof("Ignoring node %s because it is not ready: %v", node.Name, node.Status.Conditions)
logger.V(2).Info("Ignoring node because it is not ready", "node", klog.KObj(node))
continue
}
@@ -229,7 +229,7 @@ func (t *TopologyCache) SetNodes(nodes []*v1.Node) {
if !ok || zone == "" || nodeCPU.IsZero() {
cpuByZone = map[string]*resource.Quantity{}
sufficientNodeInfo = false
klog.Warningf("Can't get CPU or zone information for %s node", node.Name)
logger.Info("Can't get CPU or zone information for node", "node", klog.KObj(node))
break
}
@@ -245,7 +245,7 @@ func (t *TopologyCache) SetNodes(nodes []*v1.Node) {
defer t.lock.Unlock()
if totalCPU.IsZero() || !sufficientNodeInfo || len(cpuByZone) < 2 {
klog.V(2).Infof("Insufficient node info for topology hints (%d zones, %s CPU, %t)", len(cpuByZone), totalCPU.String(), sufficientNodeInfo)
logger.V(2).Info("Insufficient node info for topology hints", "totalZones", len(cpuByZone), "totalCPU", totalCPU.String(), "sufficientNodeInfo", sufficientNodeInfo)
t.sufficientNodeInfo = false
t.cpuByZone = nil
t.cpuRatiosByZone = nil

12
pkg/controller/endpointslice/topologycache/topologycache_test.go
View File

@@ -27,6 +27,7 @@ import (
discovery "k8s.io/api/discovery/v1"
"k8s.io/apimachinery/pkg/api/resource"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/klog/v2/ktesting"
"k8s.io/utils/pointer"
)
@@ -382,7 +383,8 @@ func TestAddHints(t *testing.T) {
cache := NewTopologyCache()
cache.cpuRatiosByZone = tc.cpuRatiosByZone
slicesToCreate, slicesToUpdate, events := cache.AddHints(tc.sliceInfo)
logger, _ := ktesting.NewTestContext(t)
slicesToCreate, slicesToUpdate, events := cache.AddHints(logger, tc.sliceInfo)
expectEquivalentSlices(t, slicesToCreate, tc.expectedSlicesToCreate)
expectEquivalentSlices(t, slicesToUpdate, tc.expectedSlicesToUpdate)
@@ -580,7 +582,8 @@ func TestSetNodes(t *testing.T) {
})
}
cache.SetNodes(nodes)
logger, _ := ktesting.NewTestContext(t)
cache.SetNodes(logger, nodes)
if cache.sufficientNodeInfo != tc.expectSufficientNodeInfo {
t.Errorf("Expected sufficientNodeInfo to be %t, got %t", tc.expectSufficientNodeInfo, cache.sufficientNodeInfo)
@@ -680,11 +683,12 @@ func TestTopologyCacheRace(t *testing.T) {
})
}
logger, _ := ktesting.NewTestContext(t)
go func() {
cache.SetNodes(nodes)
cache.SetNodes(logger, nodes)
}()
go func() {
cache.AddHints(sliceInfo)
cache.AddHints(logger, sliceInfo)
}()
}

4
pkg/controller/endpointslice/topologycache/utils.go
View File

@@ -77,7 +77,7 @@ func FormatWithAddressType(s string, addressType discovery.AddressType) string {
// It allocates endpoints from the provided givingZones to the provided
// receivingZones. This returns a map that represents the changes in allocated
// endpoints by zone.
func redistributeHints(slices []*discovery.EndpointSlice, givingZones, receivingZones map[string]int) map[string]int {
func redistributeHints(logger klog.Logger, slices []*discovery.EndpointSlice, givingZones, receivingZones map[string]int) map[string]int {
redistributions := map[string]int{}
for _, slice := range slices {
@@ -91,7 +91,7 @@ func redistributeHints(slices []*discovery.EndpointSlice, givingZones, receiving
}
if endpoint.Zone == nil || *endpoint.Zone == "" {
// This should always be caught earlier in AddHints()
klog.Warningf("Endpoint found without zone specified")
logger.Info("Endpoint found without zone specified")
continue
}

4
pkg/controller/endpointslice/topologycache/utils_test.go
View File

@@ -21,6 +21,7 @@ import (
"testing"
discovery "k8s.io/api/discovery/v1"
"k8s.io/klog/v2/ktesting"
"k8s.io/utils/pointer"
)
@@ -73,7 +74,8 @@ func Test_redistributeHints(t *testing.T) {
for _, tc := range testCases {
t.Run(tc.name, func(t *testing.T) {
actualRedistributions := redistributeHints(tc.slices, tc.givingZones, tc.receivingZones)
logger, _ := ktesting.NewTestContext(t)
actualRedistributions := redistributeHints(logger, tc.slices, tc.givingZones, tc.receivingZones)
if len(actualRedistributions) != len(tc.expectedRedistributions) {
t.Fatalf("Expected redistributions for %d zones, got %d (%+v)", len(tc.expectedRedistributions), len(actualRedistributions), actualRedistributions)