From d768a75587017cffd951a18d47e1707e7c9f853a Mon Sep 17 00:00:00 2001
From: Prakash Surya <prakash.surya@delphix.com>
Date: Mon, 6 Jun 2022 10:42:42 -0700
Subject: [PATCH] Use "-d" when ZETTACACHE_DEVICES is empty (#465)

---
 cmd/zfs_object_agent/scripts/start_zoa | 23 ++++++++++++++++++++++-
 etc/zfs/zoa.conf                       |  1 +
 2 files changed, 23 insertions(+), 1 deletion(-)

diff --git a/cmd/zfs_object_agent/scripts/start_zoa b/cmd/zfs_object_agent/scripts/start_zoa
index 5a64d256bb71..0681b4cc6578 100755
--- a/cmd/zfs_object_agent/scripts/start_zoa
+++ b/cmd/zfs_object_agent/scripts/start_zoa
@@ -7,6 +7,7 @@
 #  - ZOA_CONFIG: Configuration file to set tunables (toml/json/yaml)
 #  - ZOA_LOG_CONFIG : log4rs configuration
 #  - ZETTACACHE_DEVICES: File[s]/device[s] to use for ZettaCache
+#  - ZETTACACHE_DIRECTORY: Directory to use for ZettaCache device discovery.
 #
 
 DEV_WAIT=300
@@ -40,7 +41,27 @@ if [[ ! -z $ZOA_CONFIG ]]; then
 	PARAMS="${PARAMS} -t ${ZOA_CONFIG}"
 fi
 
-if [[ ! -z $ZETTACACHE_DEVICES ]]; then
+#
+# The "-c" and "-d" options are mutually exclusive. Thus, if both
+# ZETTACACHE_DEVICES and ZETTACACHE_DIRECTORY are provided, we could
+# wind up in a situation where starting the agent fails (e.g. if we
+# naively used both "-c" and "-d" simultaneously).
+#
+# Rather than failing, if ZETTACACHE_DEVICES is supplied, we prioritize
+# that over ZETTACACHE_DIRECTORY. This way, we prefer to not fail, and
+# prefer the more user supplied configuraiton that specifies exactly
+# which devices to use.
+#
+# Additionally, if neither ZETTACACHE_DEVICES nor ZETTACACHE_DIRECTORY
+# is supplied, we use "-d" but with a default value. This way, if the
+# agent/service is being used, and disks were dynamically added (e.g.
+# via "zcache add"), those devices should be automatically discovered
+# after an agent/service restart, rather than restarting without any
+# cache (which would effectively undo any prior "zcache add").
+#
+if [[ -z $ZETTACACHE_DEVICES ]]; then
+	PARAMS="$PARAMS -d ${ZETTACACHE_DIRECTORY:-/dev}"
+else
 	echo "ZettaCache: ${ZETTACACHE_DEVICES}"
 	ZETTACACHE_DEVICES=(${ZETTACACHE_DEVICES//,/\ })
 	for dev in "${ZETTACACHE_DEVICES[@]}"; do
diff --git a/etc/zfs/zoa.conf b/etc/zfs/zoa.conf
index c137bba655d0..cbac2e2a482a 100644
--- a/etc/zfs/zoa.conf
+++ b/etc/zfs/zoa.conf
@@ -1,3 +1,4 @@
 ZOA_CONFIG=/etc/zfs/zoa_config.toml
 ZOA_LOG_CONFIG=/etc/zfs/zoa_log4rs.yml
 ZETTACACHE_DEVICES=
+ZETTACACHE_DIRECTORY=