From 3059f8dc777ad30a83c8d4dba58fdb4db340c704 Mon Sep 17 00:00:00 2001
From: Serapheim Dimitropoulos <serapheim@delphix.com>
Date: Thu, 29 Apr 2021 07:49:12 -0700
Subject: [PATCH] DLPX-72326 Use OOMD instead of the kernel's OOM killer

---
 files/common/etc/default/grub.d/override.cfg | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/files/common/etc/default/grub.d/override.cfg b/files/common/etc/default/grub.d/override.cfg
index c4cacc60..129aa4f8 100644
--- a/files/common/etc/default/grub.d/override.cfg
+++ b/files/common/etc/default/grub.d/override.cfg
@@ -118,3 +118,15 @@ GRUB_CMDLINE_LINUX_DEFAULT="$GRUB_CMDLINE_LINUX_DEFAULT init_on_alloc=0"
 # Disable the USB subsystem in its entirety for security reasons.
 #
 GRUB_CMDLINE_LINUX_DEFAULT="$GRUB_CMDLINE_LINUX_DEFAULT usbcore.nousb=1"
+
+#
+# Enable cgroups v2
+#
+# At the time of this writing we are using Ubuntu 18.04 which has
+# support for cgroups v2 but it is not enabled by default. We can
+# consider removing this when we move to future releases.
+#
+# The appstack doesn't have any hard requirements in the cgroup
+# version but OOMD needs the system to use v2 so it can operate.
+#
+GRUB_CMDLINE_LINUX_DEFAULT="$GRUB_CMDLINE_LINUX_DEFAULT systemd.unified_cgroup_hierarchy=1"