fix review comments

Author: mismithhisler

client/fingerprint/storage.go

@@ -48,17 +48,8 @@ func (f *StorageFingerprint) Fingerprint(req *FingerprintRequest, resp *Fingerpr
 		total = uint64(cfg.DiskTotalMB) * bytesPerMegabyte
 	}
 
-	free := total - f.reservedDisk(req)
-
-	// DEPRECATED: remove in 1.13.0
-	if cfg.DiskFreeMB > 0 {
-		f.logger.Warn("disk_free_mb is deprecated, please use reserved.disk")
-		free = uint64(cfg.DiskFreeMB) * bytesPerMegabyte
-	}
-
 	resp.AddAttribute("unique.storage.volume", volume)
 	resp.AddAttribute("unique.storage.bytestotal", strconv.FormatUint(total, 10))
-	resp.AddAttribute("unique.storage.bytesfree", strconv.FormatUint(free, 10))
 
 	// set the disk size for the response
 	resp.NodeResources = &structs.NodeResources{
@@ -70,14 +61,3 @@ func (f *StorageFingerprint) Fingerprint(req *FingerprintRequest, resp *Fingerpr
 
 	return nil
 }
-
-func (f *StorageFingerprint) reservedDisk(req *FingerprintRequest) uint64 {
-	switch {
-	case req.Config.Node == nil:
-		return 0
-	case req.Config.Node.ReservedResources == nil:
-		return 0
-	default:
-		return uint64(req.Config.Node.ReservedResources.Disk.DiskMB)
-	}
-}

command/agent/agent.go

@@ -771,6 +771,12 @@ func (a *Agent) finalizeClientConfig(c *clientconfig.Config) error {
 		to configure Nomad to work with Consul.`)
 	}
 
+	// Log deprecation message about setting disk_free_mb
+	if c.DiskFreeMB != 0 {
+		a.logger.Warn(`disk_free_mb is deprecated and ignored by Nomad.
+		Please use client.reserved.disk to configure reservable disk for scheduling.`)
+	}
+
 	// If the operator has not set an intro token via the CLI or an environment
 	// variable, attempt to read the intro token from the file system. This
 	// cannot be used as a CLI override.

website/content/docs/configuration/client.mdx

@@ -97,8 +97,8 @@ client {
 
 - `disk_free_mb` `(int:0)` - Specifies the disk space free for scheduling
   allocations. If set, this value overrides any detected free disk space. This
-  value can be seen in `nomad node status` under Allocated Resources. Deprecated -
-  please use client.reserved.disk instead.
+  value can be seen in `nomad node status` under Allocated Resources. Deprecated.
+  Use [`client.reserved.disk`](#reserved-parameters) instead.
 
 - `min_dynamic_port` `(int:20000)` - Specifies the minimum dynamic port to be
   assigned. Individual ports and ranges of ports may be excluded from dynamic

website/content/docs/upgrade/upgrade-specific.mdx

@@ -19,8 +19,9 @@ used to document those details separately from the standard upgrade flow.
 Nomad now calculates the storage available for scheduling using only
 `totalBytes - client.reserved.disk`. The previous strategy using free disk
 space could lead to incorrect values when clients with running allocations
-restarted. We recommend that you reserve at least the amount of disk that
-is used by the host OS.
+restarted. The `unique.storage.bytesfree` attribute has also been removed.
+We recommend that you reserve at least the amount of disk that is used
+by the host OS.
 
 #### Sysbatch jobs will no longer accept `reschedule` blocks