Merge ~mitchdz/ubuntu/+source/ec2-hibinit-agent:mitch/recreate_swap-focal into ubuntu/+source/ec2-hibinit-agent:ubuntu/focal-devel

[Mitchell Dzurick]

PPA - https://launchpad.net/~mitchdz/+archive/ubuntu/ec2-hibinit-agent-recreate-swap

[Graham Inggs (ginggs)]

Looks good to me!

review: Approve

diff --git a/debian/changelog b/debian/changelog
index ff32d5b..a8c5080 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+ec2-hibinit-agent (1.0.0-0ubuntu9.5) focal; urgency=medium
+
+  * d/p/lp2031345-recreate-swap-file.patch: Reduce SWAP size if current SWAP
+    is larger than needed (LP: #2031345)
+
+ -- Mitchell Dzurick <[e-mail]>  Mon, 28 Aug 2023 07:23:22 -0700
+
 ec2-hibinit-agent (1.0.0-0ubuntu9.4) focal; urgency=medium
 
     * d/p/lp2023924-remove-quotes-from-state-dir.patch: fixes an issue where a
diff --git a/debian/patches/lp2031345-recreate-swap-file.patch b/debian/patches/lp2031345-recreate-swap-file.patch
new file mode 100644
index 0000000..04590c7
--- /dev/null
+++ b/debian/patches/lp2031345-recreate-swap-file.patch
@@ -0,0 +1,30 @@
+Description: Recreating the swap file if the current size is sufficiently larger.
+Author: deborshi1988 <[e-mail]>
+Origin: backport, https://github.com/aws/amazon-ec2-hibinit-agent/commit/d2ce783d10d3a4437ebac468ed669666d8b6671b
+Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/ec2-hibinit-agent/+bug/2031345
+Last-Update: 2023-08-28
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+--- a/agent/hibinit-agent
++++ b/agent/hibinit-agent
+@@ -43,6 +43,7 @@
+ IMDS_BASEURL = 'http://169.254.169.254'
+ IMDS_API_TOKEN_PATH = 'latest/api/token'
+ IMDS_SPOT_ACTION_PATH = 'latest/meta-data/hibernation/configured'
++MAX_SWAP_SIZE_OFFSET_ALLOWED = 100 * 1024 
+ 
+ def log(message):
+     if log_to_syslog:
+@@ -440,7 +441,11 @@
+         cur_swap = os.path.getsize(SWAP_FILE)
+ 
+     bi = None
+-    if cur_swap >= target_swap_size - SWAP_RESERVED_SIZE:
++    if cur_swap > target_swap_size - SWAP_RESERVED_SIZE + MAX_SWAP_SIZE_OFFSET_ALLOWED:
++        log("Swap already exists! (have %d, need %d), deleting existing swap file %s since current swap is sufficiently large and wasting memory" %
++            (cur_swap, target_swap_size, SWAP_FILE))
++        os.remove(SWAP_FILE)
++    elif cur_swap >= target_swap_size - SWAP_RESERVED_SIZE:
+         log("There's sufficient swap available (have %d, need %d)" %
+             (cur_swap, target_swap_size))
+         update_kernel_swap_offset(config.swapon, config.swapoff, SWAP_FILE, config.grub_update)
diff --git a/debian/patches/series b/debian/patches/series
index 0656b89..f66ab04 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -11,3 +11,4 @@ lp1968805-Swapon-with-maximum-priority-before-hibernation.patch
 lp1941785-Add-support-for-IMDSv2.patch
 lp2023924-remove-quotes-from-state-dir.patch
 lp2024505-fix-locale-issue.patch
+lp2031345-recreate-swap-file.patch