mirror of
https://github.com/kubernetes-sigs/node-feature-discovery.git
synced 2024-12-14 11:57:51 +00:00
Add memory source and NUMA detection.
If multiple nodes are marked online in /sys/devices/system/node/online, it's a sign of NUMA architecture. Mark it using nfd-memory-numa label.
This commit is contained in:
parent
e7b5d6eebd
commit
00615be083
4 changed files with 65 additions and 4 deletions
10
README.md
10
README.md
|
@ -41,7 +41,7 @@ node-feature-discovery.
|
||||||
-h --help Show this screen.
|
-h --help Show this screen.
|
||||||
--version Output version and exit.
|
--version Output version and exit.
|
||||||
--sources=<sources> Comma separated list of feature sources.
|
--sources=<sources> Comma separated list of feature sources.
|
||||||
[Default: cpuid,rdt,pstate,network,storage]
|
[Default: cpuid,rdt,pstate,memory,network,storage]
|
||||||
--no-publish Do not publish discovered features to the
|
--no-publish Do not publish discovered features to the
|
||||||
cluster-local Kubernetes API server.
|
cluster-local Kubernetes API server.
|
||||||
--label-whitelist=<pattern> Regular expression to filter label names to
|
--label-whitelist=<pattern> Regular expression to filter label names to
|
||||||
|
@ -57,6 +57,7 @@ The current set of feature sources are the following:
|
||||||
- [CPUID][cpuid] for x86 CPU details
|
- [CPUID][cpuid] for x86 CPU details
|
||||||
- [Intel Resource Director Technology][intel-rdt]
|
- [Intel Resource Director Technology][intel-rdt]
|
||||||
- [Intel P-State driver][intel-pstate]
|
- [Intel P-State driver][intel-pstate]
|
||||||
|
- Memory
|
||||||
- Network
|
- Network
|
||||||
- Storage
|
- Storage
|
||||||
|
|
||||||
|
@ -80,6 +81,7 @@ the only label value published for features is the string `"true"`._
|
||||||
"node.alpha.kubernetes-incubator.io/nfd-cpuid-<feature-name>": "true",
|
"node.alpha.kubernetes-incubator.io/nfd-cpuid-<feature-name>": "true",
|
||||||
"node.alpha.kubernetes-incubator.io/nfd-rdt-<feature-name>": "true",
|
"node.alpha.kubernetes-incubator.io/nfd-rdt-<feature-name>": "true",
|
||||||
"node.alpha.kubernetes-incubator.io/nfd-pstate-<feature-name>": "true",
|
"node.alpha.kubernetes-incubator.io/nfd-pstate-<feature-name>": "true",
|
||||||
|
"node.alpha.kubernetes-incubator.io/nfd-memory-<feature-name>": "true",
|
||||||
"node.alpha.kubernetes-incubator.io/nfd-network-<feature-name>": "true",
|
"node.alpha.kubernetes-incubator.io/nfd-network-<feature-name>": "true",
|
||||||
"node.alpha.kubernetes-incubator.io/nfd-storage-<feature-name>": "true"
|
"node.alpha.kubernetes-incubator.io/nfd-storage-<feature-name>": "true"
|
||||||
}
|
}
|
||||||
|
@ -114,6 +116,12 @@ such as restricting discovered features with the --label-whitelist option._
|
||||||
| SSE4.2 | Streaming SIMD Extensions 4.2 (SSE4.2)
|
| SSE4.2 | Streaming SIMD Extensions 4.2 (SSE4.2)
|
||||||
| SGX | Software Guard Extensions (SGX)
|
| SGX | Software Guard Extensions (SGX)
|
||||||
|
|
||||||
|
### Memory Features
|
||||||
|
|
||||||
|
| Feature name | Description |
|
||||||
|
| :------------: | :---------------------------------------------------------------------------------: |
|
||||||
|
| numa | Multiple memory nodes i.e. NUMA architecture detected
|
||||||
|
|
||||||
### Network Features
|
### Network Features
|
||||||
|
|
||||||
| Feature name | Description |
|
| Feature name | Description |
|
||||||
|
|
4
main.go
4
main.go
|
@ -11,6 +11,7 @@ import (
|
||||||
"github.com/kubernetes-incubator/node-feature-discovery/source"
|
"github.com/kubernetes-incubator/node-feature-discovery/source"
|
||||||
"github.com/kubernetes-incubator/node-feature-discovery/source/cpuid"
|
"github.com/kubernetes-incubator/node-feature-discovery/source/cpuid"
|
||||||
"github.com/kubernetes-incubator/node-feature-discovery/source/fake"
|
"github.com/kubernetes-incubator/node-feature-discovery/source/fake"
|
||||||
|
"github.com/kubernetes-incubator/node-feature-discovery/source/memory"
|
||||||
"github.com/kubernetes-incubator/node-feature-discovery/source/network"
|
"github.com/kubernetes-incubator/node-feature-discovery/source/network"
|
||||||
"github.com/kubernetes-incubator/node-feature-discovery/source/panic_fake"
|
"github.com/kubernetes-incubator/node-feature-discovery/source/panic_fake"
|
||||||
"github.com/kubernetes-incubator/node-feature-discovery/source/pstate"
|
"github.com/kubernetes-incubator/node-feature-discovery/source/pstate"
|
||||||
|
@ -109,7 +110,7 @@ func argsParse(argv []string) (noPublish bool, sourcesArg []string, whiteListArg
|
||||||
-h --help Show this screen.
|
-h --help Show this screen.
|
||||||
--version Output version and exit.
|
--version Output version and exit.
|
||||||
--sources=<sources> Comma separated list of feature sources.
|
--sources=<sources> Comma separated list of feature sources.
|
||||||
[Default: cpuid,rdt,pstate,network,storage]
|
[Default: cpuid,rdt,pstate,memory,network,storage]
|
||||||
--no-publish Do not publish discovered features to the
|
--no-publish Do not publish discovered features to the
|
||||||
cluster-local Kubernetes API server.
|
cluster-local Kubernetes API server.
|
||||||
--label-whitelist=<pattern> Regular expression to filter label names to
|
--label-whitelist=<pattern> Regular expression to filter label names to
|
||||||
|
@ -144,6 +145,7 @@ func configureParameters(sourcesArg []string, whiteListArg string) (sources []so
|
||||||
cpuid.Source{},
|
cpuid.Source{},
|
||||||
rdt.Source{},
|
rdt.Source{},
|
||||||
pstate.Source{},
|
pstate.Source{},
|
||||||
|
memory.Source{},
|
||||||
network.Source{},
|
network.Source{},
|
||||||
storage.Source{},
|
storage.Source{},
|
||||||
fake.Source{},
|
fake.Source{},
|
||||||
|
|
|
@ -132,7 +132,7 @@ func TestArgsParse(t *testing.T) {
|
||||||
|
|
||||||
Convey("noPublish is set and sourcesArg is set to the default value", func() {
|
Convey("noPublish is set and sourcesArg is set to the default value", func() {
|
||||||
So(noPublish, ShouldBeTrue)
|
So(noPublish, ShouldBeTrue)
|
||||||
So(sourcesArg, ShouldResemble, []string{"cpuid", "rdt", "pstate", "network", "storage"})
|
So(sourcesArg, ShouldResemble, []string{"cpuid", "rdt", "pstate", "memory", "network", "storage"})
|
||||||
So(len(whiteListArg), ShouldEqual, 0)
|
So(len(whiteListArg), ShouldEqual, 0)
|
||||||
})
|
})
|
||||||
})
|
})
|
||||||
|
@ -152,7 +152,7 @@ func TestArgsParse(t *testing.T) {
|
||||||
|
|
||||||
Convey("whiteListArg is set to appropriate value and sourcesArg is set to default value", func() {
|
Convey("whiteListArg is set to appropriate value and sourcesArg is set to default value", func() {
|
||||||
So(noPublish, ShouldBeFalse)
|
So(noPublish, ShouldBeFalse)
|
||||||
So(sourcesArg, ShouldResemble, []string{"cpuid", "rdt", "pstate", "network", "storage"})
|
So(sourcesArg, ShouldResemble, []string{"cpuid", "rdt", "pstate", "memory", "network", "storage"})
|
||||||
So(whiteListArg, ShouldResemble, ".*rdt.*")
|
So(whiteListArg, ShouldResemble, ".*rdt.*")
|
||||||
})
|
})
|
||||||
})
|
})
|
||||||
|
|
51
source/memory/memory.go
Normal file
51
source/memory/memory.go
Normal file
|
@ -0,0 +1,51 @@
|
||||||
|
/*
|
||||||
|
Copyright 2018 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 memory
|
||||||
|
|
||||||
|
import (
|
||||||
|
"fmt"
|
||||||
|
"io/ioutil"
|
||||||
|
"strings"
|
||||||
|
)
|
||||||
|
|
||||||
|
// Source implements FeatureSource.
|
||||||
|
type Source struct{}
|
||||||
|
|
||||||
|
// Name returns an identifier string for this feature source.
|
||||||
|
func (s Source) Name() string { return "memory" }
|
||||||
|
|
||||||
|
// Discover returns feature names for memory: numa if more than one memory node is present.
|
||||||
|
func (s Source) Discover() ([]string, error) {
|
||||||
|
features := []string{}
|
||||||
|
|
||||||
|
// Find out how many nodes are online
|
||||||
|
// Multiple nodes is a sign of NUMA
|
||||||
|
bytes, err := ioutil.ReadFile("/sys/devices/system/node/online")
|
||||||
|
if err != nil {
|
||||||
|
return nil, fmt.Errorf("can't read /sys/devices/system/node/online: %s", err.Error())
|
||||||
|
}
|
||||||
|
// File content is expected to be:
|
||||||
|
// "0\n" in one-node case
|
||||||
|
// "0-K\n" in N-node case where K=N-1
|
||||||
|
// presence of newline requires TrimSpace
|
||||||
|
if strings.TrimSpace(string(bytes)) != "0" {
|
||||||
|
// more than one node means NUMA
|
||||||
|
features = append(features, "numa")
|
||||||
|
}
|
||||||
|
|
||||||
|
return features, nil
|
||||||
|
}
|
Loading…
Reference in a new issue