Merge pull request #246 from mtomaska/n_threads

Add --n-threads option to ovn-northd
openstack-k8s-operators · Mar 18, 2024 · cfd21c1 · cfd21c1
2 parents f132fab + d2fc1db
commit cfd21c1
Show file tree

Hide file tree

Showing 6 changed files with 27 additions and 1 deletion.
diff --git a/api/bases/ovn.openstack.org_ovnnorthds.yaml b/api/bases/ovn.openstack.org_ovnnorthds.yaml
@@ -56,6 +56,12 @@ spec:
                 default: info
                 description: LogLevel - Set log level info, dbg, emer etc
                 type: string
+              nThreads:
+                default: 1
+                description: NThreads sets number of threads used for building logical
+                  flows
+                format: int32
+                type: integer
               networkAttachment:
                 description: NetworkAttachment is a NetworkAttachment resource name
                   to expose the service to the given network. If specified the IP

diff --git a/api/v1beta1/ovnnorthd_types.go b/api/v1beta1/ovnnorthd_types.go
@@ -75,6 +75,11 @@ type OVNNorthdSpecCore struct {
 	// +operator-sdk:csv:customresourcedefinitions:type=spec
 	// TLS - Parameters related to TLS
 	TLS tls.SimpleService `json:"tls,omitempty"`
+
+	// +kubebuilder:validation:Optional
+	// +kubebuilder:default=1
+	// NThreads sets number of threads used for building logical flows
+	NThreads *int32 `json:"nThreads"`
 }
 
 // OVNNorthdStatus defines the observed state of OVNNorthd

diff --git a/api/v1beta1/zz_generated.deepcopy.go b/api/v1beta1/zz_generated.deepcopy.go
diff --git a/config/crd/bases/ovn.openstack.org_ovnnorthds.yaml b/config/crd/bases/ovn.openstack.org_ovnnorthds.yaml
@@ -56,6 +56,12 @@ spec:
                 default: info
                 description: LogLevel - Set log level info, dbg, emer etc
                 type: string
+              nThreads:
+                default: 1
+                description: NThreads sets number of threads used for building logical
+                  flows
+                format: int32
+                type: integer
               networkAttachment:
                 description: NetworkAttachment is a NetworkAttachment resource name
                   to expose the service to the given network. If specified the IP

diff --git a/pkg/ovnnorthd/deployment.go b/pkg/ovnnorthd/deployment.go
@@ -59,6 +59,7 @@ func Deployment(
 	args := []string{
 		"-vfile:off",
 		fmt.Sprintf("-vconsole:%s", instance.Spec.LogLevel),
+		fmt.Sprintf("--n-threads=%d", *instance.Spec.NThreads),
 		fmt.Sprintf("--ovnnb-db=%s", nbEndpoint),
 		fmt.Sprintf("--ovnsb-db=%s", sbEndpoint),
 	}

diff --git a/tests/functional/ovnnorthd_controller_test.go b/tests/functional/ovnnorthd_controller_test.go
@@ -68,6 +68,7 @@ var _ = Describe("OVNNorthd controller", func() {
 
 		When("OVNDBCluster instances are available", func() {
 			It("should create a Deployment with the ovn connection CLI args set based on the OVNDBCluster", func() {
+				OVNNorthd := ovn.GetOVNNorthd(ovnNorthdName)
 				dbs := CreateOVNDBClusters(namespace, map[string][]string{}, 1)
 				DeferCleanup(DeleteOVNDBClusters, dbs)
 
@@ -78,7 +79,9 @@ var _ = Describe("OVNNorthd controller", func() {
 
 				depl := th.GetDeployment(deplName)
 				Expect(depl.Spec.Template.Spec.Containers[0].Args).To(Equal([]string{
-					"-vfile:off", "-vconsole:info",
+					"-vfile:off",
+					"-vconsole:info",
+					fmt.Sprintf("--n-threads=%d", *OVNNorthd.Spec.NThreads),
 					"--ovnnb-db=tcp:ovsdbserver-nb-0." + namespace + ".svc.cluster.local:6641",
 					"--ovnsb-db=tcp:ovsdbserver-sb-0." + namespace + ".svc.cluster.local:6642",
 				}))