Merge pull request #261 from klihub/fixes/sysctl-adjustment

api,adaptation: fix sysctl adjustment collection, add unit test.

Author: samuelkarp

pkg/adaptation/adaptation_suite_test.go

@@ -559,6 +559,9 @@ var _ = Describe("Plugin container creation adjustments", func() {
 				Policy: api.LinuxSchedulerPolicy_SCHED_NONE,
 			})
 
+		case "linux sysctl":
+			a.SetLinuxSysctl("net.core.somaxconn", "256")
+
 		case "resources/cpu":
 			a.SetLinuxCPUShares(123)
 			a.SetLinuxCPUQuota(456)
@@ -862,6 +865,16 @@ var _ = Describe("Plugin container creation adjustments", func() {
 				},
 			),
 
+			Entry("adjust linux sysctl settings", "linux sysctl",
+				&api.ContainerAdjustment{
+					Linux: &api.LinuxContainerAdjustment{
+						Sysctl: map[string]string{
+							"net.core.somaxconn": "256",
+						},
+					},
+				},
+			),
+
 			Entry("adjust CPU resources", "resources/cpu",
 				&api.ContainerAdjustment{
 					Linux: &api.LinuxContainerAdjustment{

pkg/adaptation/result.go

@@ -85,6 +85,9 @@ func collectCreateContainerResult(request *CreateContainerRequest) *result {
 	if request.Container.Linux.NetDevices == nil {
 		request.Container.Linux.NetDevices = map[string]*LinuxNetDevice{}
 	}
+	if request.Container.Linux.Sysctl == nil {
+		request.Container.Linux.Sysctl = map[string]string{}
+	}
 
 	return &result{
 		request: resultRequest{
@@ -108,6 +111,7 @@ func collectCreateContainerResult(request *CreateContainerRequest) *result {
 					},
 					Namespaces: []*LinuxNamespace{},
 					NetDevices: map[string]*LinuxNetDevice{},
+					Sysctl:     map[string]string{},
 				},
 			},
 		},

pkg/api/strip.go

@@ -122,6 +122,12 @@ func (l *LinuxContainerAdjustment) Strip() *LinuxContainerAdjustment {
 		empty = false
 	}
 
+	if len(l.Sysctl) == 0 {
+		l.Sysctl = nil
+	} else {
+		empty = false
+	}
+
 	if empty {
 		return nil
 	}