mirror of
https://github.com/kubernetes-sigs/node-feature-discovery.git
synced 2025-03-09 02:07:03 +00:00
- This patch allows to expose Resource Hardware Topology information through CRDs in Node Feature Discovery. - In order to do this we introduce another software component called nfd-topology-updater in addition to the already existing software components nfd-master and nfd-worker. - nfd-master was enhanced to communicate with nfd-topology-updater over gRPC followed by creation of CRs corresponding to the nodes in the cluster exposing resource hardware topology information of that node. - Pin kubernetes dependency to one that include pod resource implementation - This code is responsible for obtaining hardware information from the system as well as pod resource information from the Pod Resource API in order to determine the allocatable resource information for each NUMA zone. This information along with Costs for NUMA zones (obtained by reading NUMA distances) is gathered by nfd-topology-updater running on all the nodes of the cluster and propagate NUMA zone costs to master in order to populate that information in the CRs corresponding to the nodes. - We use GHW facilities for obtaining system information like CPUs, topology, NUMA distances etc. - This also includes updates made to Makefile and Dockerfile and Manifests for deploying nfd-topology-updater. - This patch includes unit tests - As part of the Topology Aware Scheduling work, this patch captures the configured Topology manager scope in addition to the Topology manager policy. Based on the value of both attribues a single string will be populated to the CRD. The string value will be on of the following {SingleNUMANodeContainerLevel, SingleNUMANodePodLevel, BestEffort, Restricted, None} Co-Authored-by: Artyom Lukianov <alukiano@redhat.com> Co-Authored-by: Francesco Romani <fromani@redhat.com> Co-Authored-by: Talor Itzhak <titzhak@redhat.com> Signed-off-by: Swati Sehgal <swsehgal@redhat.com>
260 lines
6.9 KiB
Go
260 lines
6.9 KiB
Go
/*
|
|
Copyright 2021 The Kubernetes Authors.
|
|
|
|
Licensed under the Apache License, Version 2.0 (the "License");
|
|
you may not use this file except in compliance with the License.
|
|
You may obtain a copy of the License at
|
|
|
|
http://www.apache.org/licenses/LICENSE-2.0
|
|
|
|
Unless required by applicable law or agreed to in writing, software
|
|
distributed under the License is distributed on an "AS IS" BASIS,
|
|
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
See the License for the specific language governing permissions and
|
|
limitations under the License.
|
|
*/
|
|
|
|
package topologyupdater
|
|
|
|
import (
|
|
"fmt"
|
|
"time"
|
|
|
|
"k8s.io/klog/v2"
|
|
|
|
v1alpha1 "github.com/k8stopologyawareschedwg/noderesourcetopology-api/pkg/apis/topology/v1alpha1"
|
|
"golang.org/x/net/context"
|
|
|
|
nfdclient "sigs.k8s.io/node-feature-discovery/pkg/nfd-client"
|
|
"sigs.k8s.io/node-feature-discovery/pkg/podres"
|
|
"sigs.k8s.io/node-feature-discovery/pkg/resourcemonitor"
|
|
pb "sigs.k8s.io/node-feature-discovery/pkg/topologyupdater"
|
|
"sigs.k8s.io/node-feature-discovery/pkg/utils"
|
|
"sigs.k8s.io/node-feature-discovery/pkg/version"
|
|
)
|
|
|
|
// Command line arguments
|
|
type Args struct {
|
|
nfdclient.Args
|
|
NoPublish bool
|
|
Oneshot bool
|
|
}
|
|
|
|
type NfdTopologyUpdater interface {
|
|
nfdclient.NfdClient
|
|
Update(v1alpha1.ZoneList) error
|
|
}
|
|
|
|
type staticNodeInfo struct {
|
|
tmPolicy string
|
|
}
|
|
|
|
type nfdTopologyUpdater struct {
|
|
nfdclient.NfdBaseClient
|
|
nodeInfo *staticNodeInfo
|
|
args Args
|
|
resourcemonitorArgs resourcemonitor.Args
|
|
certWatch *utils.FsWatcher
|
|
client pb.NodeTopologyClient
|
|
stop chan struct{} // channel for signaling stop
|
|
}
|
|
|
|
// Create new NewTopologyUpdater instance.
|
|
func NewTopologyUpdater(args Args, resourcemonitorArgs resourcemonitor.Args, policy string) (NfdTopologyUpdater, error) {
|
|
base, err := nfdclient.NewNfdBaseClient(&args.Args)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
|
|
nfd := &nfdTopologyUpdater{
|
|
NfdBaseClient: base,
|
|
args: args,
|
|
resourcemonitorArgs: resourcemonitorArgs,
|
|
nodeInfo: &staticNodeInfo{
|
|
tmPolicy: policy,
|
|
},
|
|
stop: make(chan struct{}, 1),
|
|
}
|
|
return nfd, nil
|
|
}
|
|
|
|
// Run nfdTopologyUpdater client. Returns if a fatal error is encountered, or, after
|
|
// one request if OneShot is set to 'true' in the updater args.
|
|
func (w *nfdTopologyUpdater) Run() error {
|
|
klog.Infof("Node Feature Discovery Topology Updater %s", version.Get())
|
|
klog.Infof("NodeName: '%s'", nfdclient.NodeName())
|
|
|
|
podResClient, err := podres.GetPodResClient(w.resourcemonitorArgs.PodResourceSocketPath)
|
|
if err != nil {
|
|
klog.Fatalf("Failed to get PodResource Client: %v", err)
|
|
}
|
|
var resScan resourcemonitor.ResourcesScanner
|
|
|
|
resScan, err = resourcemonitor.NewPodResourcesScanner(w.resourcemonitorArgs.Namespace, podResClient)
|
|
if err != nil {
|
|
klog.Fatalf("Failed to initialize ResourceMonitor instance: %v", err)
|
|
}
|
|
|
|
// CAUTION: these resources are expected to change rarely - if ever.
|
|
// So we are intentionally do this once during the process lifecycle.
|
|
// TODO: Obtain node resources dynamically from the podresource API
|
|
// zonesChannel := make(chan v1alpha1.ZoneList)
|
|
var zones v1alpha1.ZoneList
|
|
|
|
resAggr, err := resourcemonitor.NewResourcesAggregator(podResClient)
|
|
if err != nil {
|
|
klog.Fatalf("Failed to obtain node resource information: %v", err)
|
|
return err
|
|
}
|
|
|
|
klog.V(2).Infof("resAggr is: %v\n", resAggr)
|
|
|
|
// Create watcher for TLS certificates
|
|
w.certWatch, err = utils.CreateFsWatcher(time.Second, w.args.CaFile, w.args.CertFile, w.args.KeyFile)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
|
|
crTrigger := time.After(0)
|
|
for {
|
|
select {
|
|
case <-crTrigger:
|
|
klog.Infof("Scanning\n")
|
|
podResources, err := resScan.Scan()
|
|
utils.KlogDump(1, "podResources are", " ", podResources)
|
|
if err != nil {
|
|
klog.Warningf("Scan failed: %v\n", err)
|
|
continue
|
|
}
|
|
zones = resAggr.Aggregate(podResources)
|
|
utils.KlogDump(1, "After aggregating resources identified zones are", " ", zones)
|
|
if err = w.Update(zones); err != nil {
|
|
return err
|
|
}
|
|
|
|
if w.args.Oneshot {
|
|
return nil
|
|
}
|
|
|
|
if w.resourcemonitorArgs.SleepInterval > 0 {
|
|
crTrigger = time.After(w.resourcemonitorArgs.SleepInterval)
|
|
}
|
|
|
|
case <-w.certWatch.Events:
|
|
klog.Infof("TLS certificate update, renewing connection to nfd-master")
|
|
w.Disconnect()
|
|
if err := w.Connect(); err != nil {
|
|
return err
|
|
}
|
|
|
|
case <-w.stop:
|
|
klog.Infof("shutting down nfd-topology-updater")
|
|
w.certWatch.Close()
|
|
return nil
|
|
}
|
|
}
|
|
|
|
}
|
|
|
|
func (w *nfdTopologyUpdater) Update(zones v1alpha1.ZoneList) error {
|
|
// Connect to NFD master
|
|
err := w.Connect()
|
|
if err != nil {
|
|
return fmt.Errorf("failed to connect: %w", err)
|
|
}
|
|
defer w.Disconnect()
|
|
|
|
if w.client == nil {
|
|
return nil
|
|
}
|
|
|
|
err = advertiseNodeTopology(w.client, zones, w.nodeInfo.tmPolicy, nfdclient.NodeName())
|
|
if err != nil {
|
|
return fmt.Errorf("failed to advertise node topology: %w", err)
|
|
}
|
|
|
|
return nil
|
|
}
|
|
|
|
// Stop NFD Topology Updater
|
|
func (w *nfdTopologyUpdater) Stop() {
|
|
select {
|
|
case w.stop <- struct{}{}:
|
|
default:
|
|
}
|
|
}
|
|
|
|
// connect creates a client connection to the NFD master
|
|
func (w *nfdTopologyUpdater) Connect() error {
|
|
// Return a dummy connection in case of dry-run
|
|
if w.args.NoPublish {
|
|
return nil
|
|
}
|
|
|
|
if err := w.NfdBaseClient.Connect(); err != nil {
|
|
return err
|
|
}
|
|
w.client = pb.NewNodeTopologyClient(w.ClientConn())
|
|
|
|
return nil
|
|
}
|
|
|
|
// disconnect closes the connection to NFD master
|
|
func (w *nfdTopologyUpdater) Disconnect() {
|
|
w.NfdBaseClient.Disconnect()
|
|
w.client = nil
|
|
}
|
|
|
|
// advertiseNodeTopology advertises the topology CR to a Kubernetes node
|
|
// via the NFD server.
|
|
func advertiseNodeTopology(client pb.NodeTopologyClient, zoneInfo v1alpha1.ZoneList, tmPolicy string, nodeName string) error {
|
|
ctx, cancel := context.WithTimeout(context.Background(), 10*time.Second)
|
|
defer cancel()
|
|
zones := make([]*pb.Zone, len(zoneInfo))
|
|
// TODO: Avoid copying of data to allow returning the zone info
|
|
// directly in a compatible data type (i.e. []*v1alpha1.Zone).
|
|
for i, zone := range zoneInfo {
|
|
resInfo := make([]*pb.ResourceInfo, len(zone.Resources))
|
|
for j, info := range zone.Resources {
|
|
resInfo[j] = &pb.ResourceInfo{
|
|
Name: info.Name,
|
|
Allocatable: info.Allocatable.String(),
|
|
Capacity: info.Capacity.String(),
|
|
}
|
|
}
|
|
|
|
zones[i] = &pb.Zone{
|
|
Name: zone.Name,
|
|
Type: zone.Type,
|
|
Parent: zone.Parent,
|
|
Resources: resInfo,
|
|
Costs: updateMap(zone.Costs),
|
|
}
|
|
}
|
|
|
|
topologyReq := &pb.NodeTopologyRequest{
|
|
Zones: zones,
|
|
NfdVersion: version.Get(),
|
|
NodeName: nodeName,
|
|
TopologyPolicies: []string{tmPolicy},
|
|
}
|
|
|
|
utils.KlogDump(1, "Sending NodeTopologyRequest to nfd-master:", " ", topologyReq)
|
|
|
|
_, err := client.UpdateNodeTopology(ctx, topologyReq)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
|
|
return nil
|
|
}
|
|
func updateMap(data []v1alpha1.CostInfo) []*pb.CostInfo {
|
|
ret := make([]*pb.CostInfo, len(data))
|
|
for i, cost := range data {
|
|
ret[i] = &pb.CostInfo{
|
|
Name: cost.Name,
|
|
Value: int32(cost.Value),
|
|
}
|
|
}
|
|
return ret
|
|
}
|