Merge pull request #6642 from vvoland/swarm-compose-work

swarm: revert compose/stack support for memory swappiness

Author: thaJeztah

cli/compose/convert/service.go

@@ -560,10 +560,6 @@ func convertResources(source composetypes.Resources) (*swarm.ResourceRequirement
 			GenericResources: generic,
 		}
 	}
-	// These fields are themselves pointers -- we can simply assign, no need to
-	// nil-check them. Nil is nil.
-	resources.SwapBytes = source.MemswapLimit
-	resources.MemorySwappiness = source.MemSwappiness
 	return resources, nil
 }
 

cli/compose/convert/service_test.go

@@ -81,9 +81,6 @@ func TestConvertExtraHosts(t *testing.T) {
 }
 
 func TestConvertResourcesFull(t *testing.T) {
-	// create some variables so we can get pointers
-	memswap := int64(72090)
-	swappiness := int64(27)
 	source := composetypes.Resources{
 		Limits: &composetypes.ResourceLimit{
 			NanoCPUs:    "0.003",
@@ -93,8 +90,6 @@ func TestConvertResourcesFull(t *testing.T) {
 			NanoCPUs:    "0.002",
 			MemoryBytes: composetypes.UnitBytes(200000000),
 		},
-		MemswapLimit:  &memswap,
-		MemSwappiness: &swappiness,
 	}
 	resources, err := convertResources(source)
 	assert.NilError(t, err)
@@ -108,8 +103,6 @@ func TestConvertResourcesFull(t *testing.T) {
 			NanoCPUs:    2000000,
 			MemoryBytes: 200000000,
 		},
-		SwapBytes:        &memswap,
-		MemorySwappiness: &swappiness,
 	}
 	assert.Check(t, is.DeepEqual(expected, resources))
 }

cli/compose/loader/full-example.yml

@@ -1,4 +1,4 @@
-version: "3.14"
+version: "3.13"
 
 services:
   foo:
@@ -79,8 +79,6 @@ services:
             - discrete_resource_spec:
                 kind: 'ssd'
                 value: 1
-        memswap_limit: 86000
-        mem_swappiness: 27
       restart_policy:
         condition: on-failure
         delay: 5s

cli/compose/loader/full-struct_test.go

@@ -11,7 +11,7 @@ import (
 
 func fullExampleConfig(workingDir, homeDir string) *types.Config {
 	return &types.Config{
-		Version:  "3.14",
+		Version:  "3.13",
 		Services: services(workingDir, homeDir),
 		Networks: networks(),
 		Volumes:  volumes(),
@@ -108,8 +108,6 @@ func services(workingDir, homeDir string) []types.ServiceConfig {
 							},
 						},
 					},
-					MemswapLimit:  int64Ptr(86000),
-					MemSwappiness: int64Ptr(27),
 				},
 				RestartPolicy: &types.RestartPolicy{
 					Condition:   "on-failure",

cli/compose/loader/loader_test.go

@@ -184,7 +184,7 @@ func strPtr(val string) *string {
 }
 
 var sampleConfig = types.Config{
-	Version: "3.14",
+	Version: "3.13",
 	Services: []types.ServiceConfig{
 		{
 			Name:        "foo",
@@ -970,10 +970,6 @@ func uint32Ptr(value uint32) *uint32 {
 	return &value
 }
 
-func int64Ptr(value int64) *int64 {
-	return &value
-}
-
 func TestFullExample(t *testing.T) {
 	skip.If(t, runtime.GOOS == "windows", "FIXME: substitutes platform-specific HOME-dirs and requires platform-specific golden files; see https://github.com/docker/cli/pull/4610")
 

cli/compose/loader/testdata/full-example.json.golden

@@ -181,9 +181,7 @@
                 }
               }
             ]
-          },
-          "memswap_limit": 86000,
-          "mem_swappiness": 27
+          }
         },
         "restart_policy": {
           "condition": "on-failure",
@@ -515,7 +513,7 @@
       "working_dir": "/code"
     }
   },
-  "version": "3.14",
+  "version": "3.13",
   "volumes": {
     "another-volume": {
       "name": "user_specified_name",

cli/compose/loader/testdata/full-example.yaml.golden

@@ -1,4 +1,4 @@
-version: "3.14"
+version: "3.13"
 services:
   foo:
     build:
@@ -73,8 +73,6 @@ services:
             - discrete_resource_spec:
                 kind: ssd
                 value: 1
-        memswap_limit: 86000
-        mem_swappiness: 27
       restart_policy:
         condition: on-failure
         delay: 5s