Revert "Add memory swap to swarm"

This reverts commit 71828f2792.

Signed-off-by: Paweł Gronowski <pawel.gronowski@docker.com>

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

@@ -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

@@ -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

@@ -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",

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

@@ -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

cli/compose/schema/data/config_schema_v3.14.json

@@ -1,12 +1,12 @@
 {
   "$schema": "http://json-schema.org/draft-04/schema#",
-  "id": "config_schema_v3.14.json",
+  "id": "config_schema_v3.13.json",
   "type": "object",
 
   "properties": {
     "version": {
       "type": "string",
-      "default": "3.14"
+      "default": "3.13"
     },
 
     "services": {
@@ -413,12 +413,6 @@
                 "generic_resources": {"$ref": "#/definitions/generic_resources"}
               },
               "additionalProperties": false
-            },
-            "memswap_limit": {
-              "type": "integer"
-            },
-            "mem_swappiness": {
-              "type": "integer"
             }
           },
           "additionalProperties": false

cli/compose/types/types.go

@@ -307,10 +307,8 @@ type UpdateConfig struct {
 
 // Resources the resource limits and reservations
 type Resources struct {
-	Limits        *ResourceLimit `yaml:",omitempty" json:"limits,omitempty"`
-	Reservations  *Resource      `yaml:",omitempty" json:"reservations,omitempty"`
-	MemswapLimit  *int64         `mapstructure:"memswap_limit" yaml:"memswap_limit,omitempty" json:"memswap_limit,omitempty"`
-	MemSwappiness *int64         `mapstructure:"mem_swappiness" yaml:"mem_swappiness,omitempty" json:"mem_swappiness,omitempty"`
+	Limits       *ResourceLimit `yaml:",omitempty" json:"limits,omitempty"`
+	Reservations *Resource      `yaml:",omitempty" json:"reservations,omitempty"`
 }
 
 // ResourceLimit is a resource to be limited