diff --git a/assemble/bin/accumulo-cluster b/assemble/bin/accumulo-cluster
index a87ad4938a9..3d657332139 100755
--- a/assemble/bin/accumulo-cluster
+++ b/assemble/bin/accumulo-cluster
@@ -26,43 +26,85 @@
 #                                and addresses to override the default lookups
 #
 
-function print_usage {
+function print_usage() {
   cat <<EOF
-Usage: accumulo-cluster <command> (<argument> ...) [<option> ...]
-
-Options:
-  --dry-run                  Prints information and commands, but does not execute them
-
-Commands:
-  create-config              Creates cluster config
-  start-here                 Deprecated. Alias for "start --local --all"
-  stop-here                  Deprecated. Alias for "stop --local --all"
-  restart [--local] [--all | [--manager] [--gc] [--monitor] [--tservers[=group]] [--sservers[=group]] [--compactors[=group]]
-                             Restarts the Accumulo cluster
-  start [--local] [--all | [--manager] [--gc] [--monitor] [--tservers[=group]] [--sservers[=group]] [--compactors[=group]]
-                             Starts Accumulo cluster services
-  stop [--local] [--all | [--manager] [--gc] [--monitor] [--tservers[=group]] [--sservers[=group]] [--compactors[=group]]
-                             Stops Accumulo cluster services
-  kill [--local] [--all | [--manager] [--gc] [--monitor] [--tservers[=group]] [--sservers[=group]] [--compactors[=group]]
-                             Kills Accumulo cluster services
-
-  Examples:
-
-  accumulo-cluster start                                   # start all servers
-  accumulo-cluster start --dry-run                         # print debug information and commands to be executed
-  accumulo-cluster start --local                           # start all local services
-  accumulo-cluster start --local --manager                 # start local manager services
-  accumulo-cluster start --tservers                        # start all tservers
-  accumulo-cluster start --tservers=group1                 # start all group1 tservers
-  accumulo-cluster start --local --manager --tservers      # Start the local manager and local tservers
+$(cyan Usage): $(green accumulo-cluster) <$(yellow command)> [<$(yellow option)> ...]
+
+$(cyan Options):
+  $(cyan General options):
+    $(green --dry-run)                Prints information and commands, but does not execute them
+    $(green --local)                  Operates on matching local services only (no SSH)
+
+  $(cyan 'Service type selection options (if none are used, all service types are selected)'):
+    $(green --manager)                Selects the manager service (oversees cluster operations)
+    $(green --gc)                     Selects the gc service (cleans up unused files)
+    $(green --monitor)                Selects the monitor web service (shows cluster information)
+    $(green --tservers)[$(yellow '=group')]       Selects the tablet server services (read/write operations on tablets)
+    $(green --sservers)[$(yellow '=group')]       Selects the scan server services (read-only eventually consistent scans)
+    $(green --compactors)[$(yellow '=group')]     Selects the compactor services (external compactions)
+    $(yellow NOTE): some server types support an optional $(yellow group) name. If it is not provided or is empty, then
+          all groups are considered. Declare multiple groups as a single space-separated parameter. Later
+          options overwrite earlier ones, so $(yellow '--sservers="g1 g2" --sserver') operates on all sserver groups.
+
+$(cyan Commands):
+  $(green create-config)              Creates cluster config (ignores service selection options)
+  $(green start)                      Starts Accumulo cluster services
+  $(green stop)                       Stops Accumulo cluster services
+  $(green restart)                    Restarts Accumulo cluster services
+  $(green kill)                       Kills Accumulo cluster services
+
+$(cyan Examples):
+  $(purple 'accumulo-cluster start')                              $(blue '# start all servers')
+  $(purple 'accumulo-cluster start --dry-run')                    $(blue '# print debug information and commands to be executed')
+  $(purple 'accumulo-cluster start --local')                      $(blue '# start all local services')
+  $(purple 'accumulo-cluster start --local --manager')            $(blue '# start local manager services')
+  $(purple 'accumulo-cluster start --tservers')                   $(blue '# start all tservers')
+  $(purple 'accumulo-cluster start --sservers=group1')            $(blue '# start all group1 sservers')
+  $(purple 'accumulo-cluster start --sservers="group1 group2"')   $(blue '# start all group1 and group2 sservers')
+  $(purple 'accumulo-cluster start --local --manager --tservers') $(blue '# Start the local manager and local tservers')
 
 EOF
 }
 
-function parse_args {
+function checkTerminalSupportsColor() {
+  local c
+  # get the number of colors supported
+  c=$(tput colors 2>/dev/null) || c=-1
+  # if STDOUT is a terminal and the number of colors is at least 8
+  [[ -t 1 && $c -ge 8 ]]
+}
+
+function decolorize() {
+  # this only decolorizes escape sequences that we've added
+  # namely, the color codes 0;31m through 0;37m and the 0m reset
+  # it also can't deal with arrays, so can only work on a single param
+  if [[ $# -ne 1 ]]; then
+    echo "$(red ERROR): Couldn't decolorize multiple items: $*"
+  fi
+  local myvar=$1
+  myvar="${myvar//[[:cntrl:]]\[0;3[1-7]m/}" # remove the color codes
+  myvar="${myvar//[[:cntrl:]]\[0m/}"        # remove the reset code
+  echo "$myvar"
+}
+function colorize() {
+  local c=$1
+  shift
+  [[ $COLOR_ENABLED == 1 ]] && echo -e "\\e[0;${c}m${*}\\e[0m" || echo "$@"
+}
+function red() { colorize 31 "$@"; }
+function green() { colorize 32 "$@"; }
+function yellow() { colorize 33 "$@"; }
+function blue() { colorize 34 "$@"; }
+function purple() { colorize 35 "$@"; }
+function cyan() { colorize 36 "$@"; }
+function white() { colorize 37 "$@"; }
+
+function parse_args() {
+  local originalArgs=("$@")
+
   DEBUG=0
   ARG_LOCAL=0
-  ARG_ALL=0
+  ARG_ALL=1
   ARG_MANAGER=0
   ARG_GC=0
   ARG_MONITOR=0
@@ -73,18 +115,26 @@ function parse_args {
   ARG_COMPACTOR=0
   ARG_COMPACTOR_GROUP=""
 
-  PARSE_OUTPUT=$(getopt -o "" --long "dry-run,all,local,manager,gc,monitor,tservers::,sservers::,compactors::" -n 'accumulo-cluster' -- "$@")
+  # the correct version of getopt will always exit with exit code 4 when provided the `-T` flag
+  getopt -T &>/dev/null
+  if (($? != 4)); then
+    echo "$(red ERROR): Missing $(yellow util-linux) (or equivalent) version of $(green getopt). Unable to continue."
+    exit 2
+  fi
+
+  if ! PARSE_OUTPUT=$(getopt -o "" --long "dry-run,local,manager,gc,monitor,tservers::,sservers::,compactors::" -n 'accumulo-cluster' -- "$@"); then
+    print_usage
+    exit 1
+  fi
+
   eval set -- "$PARSE_OUTPUT"
 
   while true; do
     case "$1" in
       --dry-run)
         DEBUG=1
-        debug "args: $PARSE_OUTPUT"
-        shift 1
-        ;;
-      --all)
-        ARG_ALL=1
+        debug "original args: $(quote "${originalArgs[@]}")"
+        debug "parsed args: $PARSE_OUTPUT"
         shift 1
         ;;
       --local)
@@ -92,36 +142,36 @@ function parse_args {
         shift 1
         ;;
       --manager)
+        ARG_ALL=0
         ARG_MANAGER=1
         shift 1
         ;;
       --gc)
+        ARG_ALL=0
         ARG_GC=1
         shift 1
         ;;
       --monitor)
+        ARG_ALL=0
         ARG_MONITOR=1
         shift 1
         ;;
       --tservers)
+        ARG_ALL=0
         ARG_TSERVER=1
-        if [[ -n $2 ]]; then
-          ARG_TSERVER_GROUP=$2
-        fi
+        ARG_TSERVER_GROUP=$2
         shift 2
         ;;
       --sservers)
+        ARG_ALL=0
         ARG_SSERVER=1
-        if [[ -n $2 ]]; then
-          ARG_SSERVER_GROUP=$2
-        fi
+        ARG_SSERVER_GROUP=$2
         shift 2
         ;;
       --compactors)
+        ARG_ALL=0
         ARG_COMPACTOR=1
-        if [[ -n $2 ]]; then
-          ARG_COMPACTOR_GROUP=$2
-        fi
+        ARG_COMPACTOR_GROUP=$2
         shift 2
         ;;
       --)
@@ -129,78 +179,86 @@ function parse_args {
         break
         ;;
       *)
-        echo "Unhandled option: $1"
+        echo "$(red ERROR): Unhandled option: $(yellow "$1")"
         print_usage
         exit 1
         ;;
     esac
   done
 
-  # All and any of the others are mutually exclusive
-  if [[ $ARG_ALL == 1 && ($ARG_MANAGER == 1 ||
-    $ARG_GC == 1 || $ARG_MONITOR == 1 || $ARG_TSERVER == 1 ||
-    $ARG_SSERVER == 1 || $ARG_COMPACTOR == 1) ]]; then
-    echo "--all cannot be used with other options"
-    print_usage
-    exit 1
-  fi
-
-  # Handle the case where no args were passed
-  if [[ $ARG_MANAGER == 0 && $ARG_GC == 0 &&
-    $ARG_MONITOR == 0 && $ARG_TSERVER == 0 &&
-    $ARG_SSERVER == 0 && $ARG_COMPACTOR == 0 ]]; then
-    ARG_ALL=1
+  if [[ $# -eq 0 ]]; then
+    invalid_args "<command> cannot be empty"
+  elif [[ $# -ne 1 ]]; then
+    # use getopt to display the remaining non-option parameters quoted for readability
+    local remaining
+    remaining="$(getopt -o "" -- "$@")"
+    invalid_args "Only one <$(yellow command)> is allowed, but found:$(yellow "${remaining#*--}")"
   fi
+  ARG_CMD=$1
+  debug "ARG_CMD=$ARG_CMD"
+  debug "ARG_ALL=$ARG_ALL"
+  debug "ARG_LOCAL=$ARG_LOCAL"
+  debug "ARG_MANAGER=$ARG_MANAGER"
+  debug "ARG_GC=$ARG_GC"
+  debug "ARG_MONITOR=$ARG_MONITOR"
+  debug "ARG_TSERVER=$ARG_TSERVER"
+  debug "ARG_TSERVER_GROUP=$ARG_TSERVER_GROUP"
+  debug "ARG_SSERVER=$ARG_SSERVER"
+  debug "ARG_SSERVER_GROUP=$ARG_SSERVER_GROUP"
+  debug "ARG_COMPACTOR=$ARG_COMPACTOR"
+  debug "ARG_COMPACTOR_GROUP=$ARG_COMPACTOR_GROUP"
 
-  if isDebug; then
-    echo "DEBUG=$DEBUG"
-    echo "ARG_ALL=$ARG_ALL"
-    echo "ARG_LOCAL=$ARG_LOCAL"
-    echo "ARG_MANAGER=$ARG_MANAGER"
-    echo "ARG_GC=$ARG_GC"
-    echo "ARG_MONITOR=$ARG_MONITOR"
-    echo "ARG_TSERVER=$ARG_TSERVER"
-    echo "ARG_TSERVER_GROUP=$ARG_TSERVER_GROUP"
-    echo "ARG_SSERVER=$ARG_SSERVER"
-    echo "ARG_SSERVER_GROUP=$ARG_SSERVER_GROUP"
-    echo "ARG_COMPACTOR=$ARG_COMPACTOR"
-    echo "ARG_COMPACTOR_GROUP=$ARG_COMPACTOR_GROUP"
-  fi
 }
 
-function invalid_args {
-  echo -e "Invalid arguments: $1\n"
+function invalid_args() {
+  echo "$(red ERROR): $(yellow invalid arguments): $*"
+  echo
   print_usage 1>&2
   exit 1
 }
 
-function parse_fail {
-  echo "Failed to parse $conf/cluster.yaml"
+function parse_fail() {
+  echo "$(red ERROR): Failed to parse $(yellow "$conf/cluster.yaml")"
   exit 1
 }
 
-isDebug() {
+function isDebug() {
   [[ $DEBUG == 1 ]]
 }
 
 # if debug is on, print and return true; otherwise, return false
-debug() {
-  isDebug && echo "DEBUG: $*"
+function debug() {
+  isDebug && echo "$(blue DEBUG): $(cyan "$*")"
+}
+
+function quote() {
+  # use getopt to quote, because it uses quotes, rather than escaping spaces, and that's easier to
+  # read; POSIXLY_CORRECT makes it ignore unrecognized options, so it still quotes things that start
+  # with '-', but it only does this after the first non-option argument, so we provide an empty
+  # string to trick it, and then we remove it in the regex that removes " -- '' " from the front of
+  # the parsed output, which is now quoted
+  local quoted
+  quoted=$(POSIXLY_CORRECT=1 getopt -o "" -- '' "$@") &&
+    [[ $quoted =~ ^[[:space:]]*--[[:space:]]*\'\'[[:space:]]*(.*)$ ]] && echo "${BASH_REMATCH[1]}" &&
+    return
+  echo "$(red ERROR): $(yellow internal script error): unable to quote: $(yellow "$*")"
+  exit 1
 }
 
 # call debug to print, or execute if debug is off
-debugOrRun() {
-  debug "$(printf "%q " "$@")" || "$@"
+function debugOrRun() {
+  debug "$(quote "$@")" || "$@"
 }
 
 function canRunOnHost() {
 
+  # always true when non-local
   if [[ $ARG_LOCAL == 0 ]]; then
     return 0
   fi
 
   if [[ -z $1 ]]; then
-    echo "Host argument expected"
+    echo "$(red ERROR): Host argument expected but missing"
     exit 1
   fi
 
@@ -215,7 +273,7 @@ function canRunOnHost() {
   [[ $found == 1 ]]
 }
 
-function parse_config {
+function parse_config() {
 
   local manager1
   local tservers_found
@@ -223,43 +281,51 @@ function parse_config {
   local G
 
   if [[ ! -f $conf/cluster.yaml ]]; then
-    echo "ERROR: A 'cluster.yaml' file was not found at $conf/cluster.yaml"
-    echo "Please make sure it exists and is configured with the host information. Run 'accumulo-cluster create-config' to create an example configuration."
+    echo "$(red ERROR): File not found $(yellow "$conf/cluster.yaml")"
+    echo "$(red ERROR): Please make sure it exists and is configured with the host information."
+    echo "$(red ERROR): Run $(yellow accumulo-cluster create-config) to create an example configuration."
     exit 1
   fi
 
   trap 'rm -f "$CONFIG_FILE"' EXIT
-  CONFIG_FILE=$(mktemp) || exit 1
-  $accumulo_cmd org.apache.accumulo.core.conf.cluster.ClusterConfigParser "$conf/cluster.yaml" "$CONFIG_FILE" || parse_fail
+  CONFIG_FILE=$(mktemp --tmpdir "ClusterConfigParser-XXXXXXXX.out") || exit 1
+  "$accumulo_cmd" org.apache.accumulo.core.conf.cluster.ClusterConfigParser "$conf/cluster.yaml" "$CONFIG_FILE" || parse_fail
   #shellcheck source=/dev/null
   . "$CONFIG_FILE"
-  debug "Parsed config:" && cat "$CONFIG_FILE"
+  debug "Parsed config from $(white "$conf/cluster.yaml")"
+  local line
+  if isDebug; then
+    while read -r line; do
+      debug "$(white "$line")"
+    done <"$CONFIG_FILE"
+  fi
   rm -f "$CONFIG_FILE"
 
+  # this might not be possible, since the ClusterConfigParser would probably fail instead
   if [[ -z $MANAGER_HOSTS ]]; then
-    echo "ERROR: managers not found in $conf/cluster.yaml"
+    echo "$(red ERROR): $(yellow managers) not found in $(yellow "$conf/cluster.yaml")"
     exit 1
   fi
 
   if [[ -z $COMPACTOR_GROUPS ]]; then
-    echo "WARN: No compactor groups configured"
+    echo "$(yellow WARN): No compactor groups configured"
   else
     for group in $COMPACTOR_GROUPS; do
       G="COMPACTOR_HOSTS_$group"
       if [[ -z ${!G} ]]; then
-        echo "WARN: External compactor group $group configured, but no compactors configured for it"
+        echo "$(yellow WARN): External compactor group $(yellow "$group") configured, but no compactors configured for it"
       fi
     done
   fi
 
   tservers_found="false"
   if [[ -z $TSERVER_GROUPS ]]; then
-    echo "WARN: No tablet server groups configured"
+    echo "$(yellow WARN): No tablet server groups configured"
   else
     for group in $TSERVER_GROUPS; do
       G="TSERVER_HOSTS_$group"
       if [[ -z ${!G} ]]; then
-        echo "WARN: tablet server group $group configured, but no hosts configured for it"
+        echo "$(yellow WARN): tablet server group $(yellow "$group") configured, but no hosts configured for it"
       else
         tservers_found="true"
       fi
@@ -267,7 +333,7 @@ function parse_config {
   fi
 
   if [[ $tservers_found != "true" ]]; then
-    echo "ERROR: There are no tablet servers configured, Accumulo requires at least 1 tablets server to host system tables"
+    echo "$(red ERROR): There are no tablet servers configured, Accumulo requires at least $(yellow 1) tablets server to host system tables"
     exit 1
   fi
 
@@ -275,7 +341,7 @@ function parse_config {
     for group in $SSERVER_GROUPS; do
       G="SSERVER_HOSTS_$group"
       if [[ -z ${!G} ]]; then
-        echo "WARN: scan server group $group configured, but no hosts configured for it"
+        echo "$(yellow WARN): scan server group $(yellow "$group") configured, but no hosts configured for it"
       fi
     done
   fi
@@ -283,12 +349,12 @@ function parse_config {
   manager1=$(echo "$MANAGER_HOSTS" | cut -d" " -f1)
 
   if [[ -z $MONITOR_HOSTS ]]; then
-    echo "WARN: monitors not found in $conf/cluster.yaml, using first manager host $manager1"
+    echo "$(yellow WARN): monitors not found in $(yellow "$conf/cluster.yaml"), using first manager host $(green "$manager1")"
     MONITOR_HOSTS=$manager1
   fi
 
   if [[ -z $GC_HOSTS ]]; then
-    echo "WARN: gc not found in $conf/cluster.yaml, using first manager host $manager1"
+    echo "$(yellow WARN): gc not found in $(yellow "$conf/cluster.yaml"), using first manager host $(green "$manager1")"
     GC_HOSTS=$manager1
   fi
 
@@ -302,8 +368,10 @@ function execute_command() {
   shift 4
 
   local S
+  local servers_per_host
 
   S="${service^^}S_PER_HOST_$group"
+  S="${S//-/_}" # replace dashes in service/group name with underscores
   servers_per_host="${!S:-1}"
 
   if [[ $ARG_LOCAL == 1 ]]; then
@@ -330,10 +398,8 @@ function control_services() {
   unset DISPLAY
   local operation=$1
 
-  if [[ $operation != "start" &&
-    $operation != "stop" &&
-    $operation != "kill" ]]; then
-    echo "Invalid operation: $operation"
+  if [[ $operation != "start" && $operation != "stop" && $operation != "kill" ]]; then
+    echo "$(red ERROR): Invalid operation: $(yellow "$operation")"
     exit 1
   fi
 
@@ -342,10 +408,10 @@ function control_services() {
   local group
   local tserver
   local G
-  if [[ $ARG_ALL == 1 && $operation == "stop" ]]; then
+  if [[ $ARG_ALL == 1 && $ARG_LOCAL == 0 && $operation == "stop" ]]; then
     echo "Stopping Accumulo cluster..."
     if ! isDebug; then
-      if ! $accumulo_cmd admin stopAll; then
+      if ! "$accumulo_cmd" admin stopAll; then
         echo "Invalid password or unable to connect to the manager"
         echo "Initiating forced shutdown in 15 seconds (Ctrl-C to abort)"
         sleep 10
@@ -367,7 +433,7 @@ function control_services() {
         for tserver in ${!G}; do
           if echo "$tserver" | grep -q "$addr"; then
             if ! isDebug; then
-              $accumulo_cmd admin stop "$addr"
+              "$accumulo_cmd" admin stop "$addr"
             else
               debug "Stopping tservers on $addr via admin command"
             fi
@@ -387,12 +453,17 @@ function control_services() {
       tserver_groups=$ARG_TSERVER_GROUP
     fi
     for group in $tserver_groups; do
-      echo "${cmd}ing tablet servers for group $group"
-      count=1
+      local msg
+      local msgNoColor
+      msg="Executing $(green "$ARG_CMD") on $(purple tablet servers) for group $(yellow "$group") ..."
+      msgNoColor=$(decolorize "$msg")
+      count=${#msgNoColor}
+      ((count > 71)) && count=69 # only print up to 3 more dots if the line is too long
+      echo -n "$msg"
       hosts="TSERVER_HOSTS_$group"
       for tserver in ${!hosts}; do
         if canRunOnHost "$tserver"; then
-          isDebug || echo -n "."
+          echo -n "."
           execute_command "$operation" "$tserver" tserver "$group" "-o" "tserver.group=$group"
           if ((++count % 72 == 0)); then
             echo
@@ -400,14 +471,15 @@ function control_services() {
           fi
         fi
       done
+      echo "done"
     done
-    echo "done"
   fi
 
   local manager
   if [[ $ARG_ALL == 1 || $ARG_MANAGER == 1 ]]; then
     for manager in $MANAGER_HOSTS; do
       if canRunOnHost "$manager"; then
+        echo "Executing $(green "$ARG_CMD") on $(purple managers)"
         execute_command "$operation" "$manager" manager "default"
       fi
     done
@@ -417,6 +489,7 @@ function control_services() {
   if [[ $ARG_ALL == 1 || $ARG_GC == 1 ]]; then
     for gc in $GC_HOSTS; do
       if canRunOnHost "$gc"; then
+        echo "Executing $(green "$ARG_CMD") on $(purple garbage collectors)"
         execute_command "$operation" "$gc" gc "default"
       fi
     done
@@ -426,6 +499,7 @@ function control_services() {
   if [[ $ARG_ALL == 1 || $ARG_MONITOR == 1 ]]; then
     for monitor in $MONITOR_HOSTS; do
       if canRunOnHost "$monitor"; then
+        echo "Executing $(green "$ARG_CMD") on $(purple monitors)"
         execute_command "$operation" "$monitor" monitor "default"
       fi
     done
@@ -439,7 +513,7 @@ function control_services() {
       sserver_groups=$ARG_SSERVER_GROUP
     fi
     for group in $sserver_groups; do
-      echo "${cmd}ing scan servers for group $group"
+      echo "Executing $(green "$ARG_CMD") on $(purple scan servers) for group $(yellow "$group")"
       hosts="SSERVER_HOSTS_$group"
       for sserver in ${!hosts}; do
         if canRunOnHost "$sserver"; then
@@ -457,7 +531,7 @@ function control_services() {
       compactor_groups=$ARG_COMPACTOR_GROUP
     fi
     for group in $compactor_groups; do
-      echo "${cmd}ing compactors for group $group"
+      echo "Executing $(green "$ARG_CMD") on $(purple compactors) for group $(yellow "$group")"
       hosts="COMPACTOR_HOSTS_$group"
       for compactor in ${!hosts}; do
         if canRunOnHost "$compactor"; then
@@ -470,7 +544,7 @@ function control_services() {
   if [[ $ARG_LOCAL == 0 && $ARG_ALL == 1 && ($operation == "stop" || $operation == "kill") ]]; then
     if ! isDebug; then
       echo "Cleaning all server entries in ZooKeeper"
-      $accumulo_cmd org.apache.accumulo.server.util.ZooZap -manager -tservers -compactors -sservers
+      "$accumulo_cmd" org.apache.accumulo.server.util.ZooZap -manager -tservers -compactors -sservers
     fi
   fi
 
@@ -478,13 +552,11 @@ function control_services() {
 
 function main() {
 
-  if [[ -z $1 ]]; then
-    invalid_args "<command> cannot be empty"
-  fi
-
-  local SOURCE
+  checkTerminalSupportsColor && COLOR_ENABLED=1 || COLOR_ENABLED=0
+  parse_args "$@"
 
   # Resolve base directory
+  local SOURCE
   SOURCE="${BASH_SOURCE[0]}"
   while [[ -L $SOURCE ]]; do
     bin="$(cd -P "$(dirname "$SOURCE")" && pwd)"
@@ -498,14 +570,10 @@ function main() {
   accumulo_cmd="$bin/accumulo"
   SSH=('ssh' '-qnf' '-o' 'ConnectTimeout=2')
 
-  cmd=$1
-  shift
-  parse_args "$@"
-
   mapfile -t LOCAL_HOST_ADDRESSES < <(get_localhost_addresses)
-  isDebug && echo "DEBUG: LOCAL_HOST_ADDRESSES=${LOCAL_HOST_ADDRESSES[*]}"
+  debug "LOCAL_HOST_ADDRESSES=${LOCAL_HOST_ADDRESSES[*]}"
 
-  case "$cmd" in
+  case "$ARG_CMD" in
     create-config)
       if [[ -f "$conf"/cluster.yaml ]]; then
         echo "ERROR : $conf/cluster.yaml already exists, not overwriting"
@@ -561,21 +629,8 @@ EOF
       parse_config
       control_services kill
       ;;
-    start-here)
-      parse_config
-      ARG_ALL=1
-      ARG_LOCAL=1
-      control_services start
-      ;;
-    stop-here)
-      parse_config
-      ARG_ALL=1
-      ARG_LOCAL=1
-      control_services stop
-      control_services kill
-      ;;
     *)
-      invalid_args "$cmd is an invalid <command>"
+      invalid_args "'$ARG_CMD' is an invalid <command>"
       ;;
   esac
 }
diff --git a/assemble/bin/accumulo-service b/assemble/bin/accumulo-service
index ae5c424de8c..51d277efb63 100755
--- a/assemble/bin/accumulo-service
+++ b/assemble/bin/accumulo-service
@@ -60,14 +60,14 @@ function rotate_log() {
 
 function get_group() {
   # Find the group parameter if any
-  GROUP_PATTERN="^(compactor.group|sserver.group|tserver.group)=(.*)$"
-  group="default"
+  local group="default"
+  local param
   for param in "$@"; do
-    if [[ $param =~ $GROUP_PATTERN ]]; then
-      group="${BASH_REMATCH[2]}"
+    if [[ $param =~ ^[a-z]*[.]group=(.*)$ ]]; then
+      group="${BASH_REMATCH[1]}"
     fi
   done
-  echo "${group}"
+  echo "$group"
 }
 
 function start_service() {
@@ -111,7 +111,7 @@ function start_service() {
     rotate_log "$outfile"
     rotate_log "$errfile"
 
-    nohup "${bin}/accumulo" "$service_type" "$@" "${PROPERTY_OVERRIDES[@]}" >"$outfile" 2>"$errfile" </dev/null &
+    nohup "${bin}/accumulo" "$service_type" "$@" >"$outfile" 2>"$errfile" </dev/null &
     echo "$!" >"${pid_file}"
 
   done
diff --git a/assemble/conf/accumulo-env.sh b/assemble/conf/accumulo-env.sh
index b39b1b94e7c..77810691d26 100644
--- a/assemble/conf/accumulo-env.sh
+++ b/assemble/conf/accumulo-env.sh
@@ -104,7 +104,7 @@ case "${ACCUMULO_RESOURCE_GROUP:-default}" in
     esac
     ;;
   *)
-    echo "ACCUMULO_RESOURCE_GROUP named $ACCUMULO_RESOURCE_GROUP is not configured"
+    echo "ACCUMULO_RESOURCE_GROUP named $ACCUMULO_RESOURCE_GROUP is not configured in accumulo-env.sh"
     exit 1
     ;;
 esac
diff --git a/core/src/main/java/org/apache/accumulo/core/Constants.java b/core/src/main/java/org/apache/accumulo/core/Constants.java
index 6270fcb6c1b..32e70834031 100644
--- a/core/src/main/java/org/apache/accumulo/core/Constants.java
+++ b/core/src/main/java/org/apache/accumulo/core/Constants.java
@@ -88,6 +88,8 @@ public class Constants {
 
   public static final String ZTABLE_LOCKS = "/table_locks";
   public static final String ZMINI_LOCK = "/mini";
+  public static final String ZADMIN_LOCK = "/admin/lock";
+  public static final String ZTEST_LOCK = "/test/lock";
 
   public static final String BULK_PREFIX = "b-";
   public static final String BULK_RENAME_FILE = "renames.json";
diff --git a/core/src/main/java/org/apache/accumulo/core/classloader/ClassLoaderUtil.java b/core/src/main/java/org/apache/accumulo/core/classloader/ClassLoaderUtil.java
index dc84a6325b8..d87c07e2690 100644
--- a/core/src/main/java/org/apache/accumulo/core/classloader/ClassLoaderUtil.java
+++ b/core/src/main/java/org/apache/accumulo/core/classloader/ClassLoaderUtil.java
@@ -69,7 +69,7 @@ static ContextClassLoaderFactory getContextFactory() {
   }
 
   // for testing
-  static synchronized void resetContextFactoryForTests() {
+  public static synchronized void resetContextFactoryForTests() {
     FACTORY = null;
   }
 
diff --git a/core/src/main/java/org/apache/accumulo/core/client/admin/TabletMergeability.java b/core/src/main/java/org/apache/accumulo/core/client/admin/TabletMergeability.java
new file mode 100644
index 00000000000..c9d4de31e83
--- /dev/null
+++ b/core/src/main/java/org/apache/accumulo/core/client/admin/TabletMergeability.java
@@ -0,0 +1,136 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.accumulo.core.client.admin;
+
+import java.io.Serializable;
+import java.time.Duration;
+import java.util.Objects;
+import java.util.Optional;
+
+import com.google.common.base.Preconditions;
+
+/**
+ * @since 4.0.0
+ */
+public class TabletMergeability implements Serializable {
+  private static final long serialVersionUID = 1L;
+
+  private static final TabletMergeability NEVER = new TabletMergeability();
+  private static final TabletMergeability ALWAYS = new TabletMergeability(Duration.ZERO);
+
+  private final Duration delay;
+
+  private TabletMergeability(Duration delay) {
+    this.delay = Objects.requireNonNull(delay);
+  }
+
+  // Edge case for NEVER
+  private TabletMergeability() {
+    this.delay = null;
+  }
+
+  /**
+   * Determines if the configured delay signals a tablet is never eligible to be automatically
+   * merged.
+   *
+   * @return true if never mergeable, else false
+   */
+  public boolean isNever() {
+    return this.delay == null;
+  }
+
+  /**
+   * Determines if the configured delay signals a tablet is always eligible to be automatically
+   * merged now. (Has a delay of 0)
+   *
+   * @return true if always mergeable now, else false
+   */
+  public boolean isAlways() {
+    return delay != null && this.delay.isZero();
+  }
+
+  /**
+   * Returns an Optional duration of the delay which is one of:
+   *
+   * <ul>
+   * <li>empty (never)</li>
+   * <li>0 (now)</li>
+   * <li>positive delay</li>
+   * </ul>
+   *
+   * @return the configured mergeability delay
+   */
+  public Optional<Duration> getDelay() {
+    return Optional.ofNullable(delay);
+  }
+
+  @Override
+  public boolean equals(Object o) {
+    if (o == null || getClass() != o.getClass()) {
+      return false;
+    }
+    TabletMergeability that = (TabletMergeability) o;
+    return Objects.equals(delay, that.delay);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hashCode(delay);
+  }
+
+  @Override
+  public String toString() {
+    if (delay == null) {
+      return "TabletMergeability=NEVER";
+    }
+    return "TabletMergeability=AFTER:" + delay.toMillis() + "ms";
+  }
+
+  /**
+   * Signifies that a tablet is never eligible to be automatically merged.
+   *
+   * @return a {@link TabletMergeability} with an empty delay signaling never merge
+   */
+  public static TabletMergeability never() {
+    return NEVER;
+  }
+
+  /**
+   * Signifies that a tablet is eligible now to be automatically merged
+   *
+   * @return a {@link TabletMergeability} with a delay of 0 signaling never merge
+   */
+  public static TabletMergeability always() {
+    return ALWAYS;
+  }
+
+  /**
+   * Creates a {@link TabletMergeability} that signals a tablet has a delay to a point in the future
+   * before it is automatically eligible to be merged. The duration must be positive value.
+   *
+   * @param delay the duration of the delay
+   *
+   * @return a {@link TabletMergeability} from the given delay.
+   */
+  public static TabletMergeability after(Duration delay) {
+    Preconditions.checkArgument(delay.toNanos() >= 0, "Duration of delay must be greater than 0.");
+    return new TabletMergeability(delay);
+  }
+
+}
diff --git a/core/src/main/java/org/apache/accumulo/core/clientImpl/ClientContext.java b/core/src/main/java/org/apache/accumulo/core/clientImpl/ClientContext.java
index 3c93a6d39e2..e898a1424ce 100644
--- a/core/src/main/java/org/apache/accumulo/core/clientImpl/ClientContext.java
+++ b/core/src/main/java/org/apache/accumulo/core/clientImpl/ClientContext.java
@@ -21,7 +21,6 @@
 import static com.google.common.base.Preconditions.checkArgument;
 import static com.google.common.base.Suppliers.memoize;
 import static com.google.common.base.Suppliers.memoizeWithExpiration;
-import static java.nio.charset.StandardCharsets.UTF_8;
 import static java.util.concurrent.TimeUnit.MILLISECONDS;
 import static java.util.concurrent.TimeUnit.SECONDS;
 import static org.apache.accumulo.core.util.threads.ThreadPoolNames.CONDITIONAL_WRITER_CLEANUP_POOL;
@@ -44,11 +43,11 @@
 import java.util.concurrent.Future;
 import java.util.concurrent.SynchronousQueue;
 import java.util.concurrent.ThreadPoolExecutor;
+import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.function.Function;
 import java.util.function.Supplier;
 import java.util.stream.Collectors;
 
-import org.apache.accumulo.core.Constants;
 import org.apache.accumulo.core.client.AccumuloClient;
 import org.apache.accumulo.core.client.AccumuloException;
 import org.apache.accumulo.core.client.AccumuloSecurityException;
@@ -79,8 +78,6 @@
 import org.apache.accumulo.core.data.TableId;
 import org.apache.accumulo.core.fate.zookeeper.ZooCache;
 import org.apache.accumulo.core.fate.zookeeper.ZooCache.ZcStat;
-import org.apache.accumulo.core.fate.zookeeper.ZooCacheFactory;
-import org.apache.accumulo.core.fate.zookeeper.ZooReader;
 import org.apache.accumulo.core.fate.zookeeper.ZooUtil;
 import org.apache.accumulo.core.lock.ServiceLock;
 import org.apache.accumulo.core.lock.ServiceLockData;
@@ -105,6 +102,7 @@
 import org.apache.accumulo.core.util.tables.TableZooHelper;
 import org.apache.accumulo.core.util.threads.ThreadPools;
 import org.apache.accumulo.core.util.threads.Threads;
+import org.apache.accumulo.core.zookeeper.ZooSession;
 import org.apache.hadoop.conf.Configuration;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -127,14 +125,12 @@ public class ClientContext implements AccumuloClient {
   private static final Logger log = LoggerFactory.getLogger(ClientContext.class);
 
   private final ClientInfo info;
-  private InstanceId instanceId;
-  private final ZooReader zooReader;
-  private final ZooCache zooCache;
+  private final Supplier<ZooCache> zooCache;
 
   private Credentials creds;
   private BatchWriterConfig batchWriterConfig;
   private ConditionalWriterConfig conditionalWriterConfig;
-  private final AccumuloConfiguration serverConf;
+  private final AccumuloConfiguration accumuloConf;
   private final Configuration hadoopConf;
 
   // These fields are very frequently accessed (each time a connection is created) and expensive to
@@ -162,6 +158,9 @@ public class ClientContext implements AccumuloClient {
   private MeterRegistry micrometer;
   private Caches caches;
 
+  private final AtomicBoolean zooKeeperOpened = new AtomicBoolean(false);
+  private final Supplier<ZooSession> zooSession;
+
   private void ensureOpen() {
     if (closed) {
       throw new IllegalStateException("This client was closed.");
@@ -228,13 +227,19 @@ public ClientContext(SingletonReservation reservation, ClientInfo info,
       AccumuloConfiguration serverConf, UncaughtExceptionHandler ueh) {
     this.info = info;
     this.hadoopConf = info.getHadoopConf();
-    zooReader = new ZooReader(info.getZooKeepers(), info.getZooKeepersSessionTimeOut());
-    zooCache =
-        new ZooCacheFactory().getZooCache(info.getZooKeepers(), info.getZooKeepersSessionTimeOut());
-    this.serverConf = serverConf;
+
+    this.zooSession = memoize(() -> {
+      var zk = info
+          .getZooKeeperSupplier(getClass().getSimpleName() + "(" + info.getPrincipal() + ")").get();
+      zooKeeperOpened.set(true);
+      return zk;
+    });
+
+    this.zooCache = memoize(() -> new ZooCache(getZooSession()));
+    this.accumuloConf = serverConf;
     timeoutSupplier = memoizeWithExpiration(
         () -> getConfiguration().getTimeInMillis(Property.GENERAL_RPC_TIMEOUT), 100, MILLISECONDS);
-    sslSupplier = Suppliers.memoize(() -> SslConnectionParams.forClient(getConfiguration()));
+    sslSupplier = memoize(() -> SslConnectionParams.forClient(getConfiguration()));
     saslSupplier = memoizeWithExpiration(
         () -> SaslConnectionParams.from(getConfiguration(), getCredentials().getToken()), 100,
         MILLISECONDS);
@@ -242,7 +247,8 @@ public ClientContext(SingletonReservation reservation, ClientInfo info,
     this.singletonReservation = Objects.requireNonNull(reservation);
     this.tableops = new TableOperationsImpl(this);
     this.namespaceops = new NamespaceOperationsImpl(this, tableops);
-    this.serverPaths = Suppliers.memoize(() -> new ServiceLockPaths(this));
+    this.serverPaths =
+        Suppliers.memoize(() -> new ServiceLockPaths(this.getZooKeeperRoot(), this.getZooCache()));
     if (ueh == Threads.UEH) {
       clientThreadPools = ThreadPools.getServerThreadPools();
     } else {
@@ -333,7 +339,7 @@ public synchronized void setCredentials(Credentials newCredentials) {
    */
   public AccumuloConfiguration getConfiguration() {
     ensureOpen();
-    return serverConf;
+    return accumuloConf;
   }
 
   /**
@@ -484,26 +490,7 @@ public synchronized TCredentials rpcCreds() {
    * @return a UUID
    */
   public InstanceId getInstanceID() {
-    if (instanceId == null) {
-      // lookup by name
-      final String instanceName = info.getInstanceName();
-      String instanceNamePath = Constants.ZROOT + Constants.ZINSTANCES + "/" + instanceName;
-      byte[] data = zooCache.get(instanceNamePath);
-      if (data == null) {
-        throw new RuntimeException(
-            "Instance name " + instanceName + " does not exist in zookeeper. "
-                + "Run \"accumulo org.apache.accumulo.server.util.ListInstances\" to see a list.");
-      }
-      String instanceIdString = new String(data, UTF_8);
-      // verify that the instanceId found via the instanceName actually exists as an instance
-      if (zooCache.get(Constants.ZROOT + "/" + instanceIdString) == null) {
-        throw new RuntimeException("Instance id " + instanceIdString
-            + (instanceName == null ? "" : " pointed to by the name " + instanceName)
-            + " does not exist in zookeeper");
-      }
-      instanceId = InstanceId.of(instanceIdString);
-    }
-    return instanceId;
+    return info.getInstanceId();
   }
 
   public String getZooKeeperRoot() {
@@ -541,7 +528,7 @@ public int getZooKeepersSessionTimeOut() {
   }
 
   public ZooCache getZooCache() {
-    return zooCache;
+    return zooCache.get();
   }
 
   private TableZooHelper tableZooHelper;
@@ -796,6 +783,9 @@ public AuthenticationToken token() {
   @Override
   public synchronized void close() {
     closed = true;
+    if (zooKeeperOpened.get()) {
+      zooSession.get().close();
+    }
     if (thriftTransportPool != null) {
       thriftTransportPool.shutdown();
     }
@@ -816,7 +806,7 @@ public static class ClientBuilderImpl<T>
       SslOptions<T>, SaslOptions<T>, ClientFactory<T>, FromOptions<T> {
 
     private Properties properties = new Properties();
-    private AuthenticationToken token = null;
+    private Optional<AuthenticationToken> tokenOpt = Optional.empty();
     private final Function<ClientBuilderImpl<T>,T> builderFunction;
     private UncaughtExceptionHandler ueh = null;
 
@@ -825,12 +815,9 @@ public ClientBuilderImpl(Function<ClientBuilderImpl<T>,T> builderFunction) {
     }
 
     private ClientInfo getClientInfo() {
-      if (token != null) {
-        ClientProperty.validate(properties, false);
-        return new ClientInfoImpl(properties, token);
-      }
-      ClientProperty.validate(properties);
-      return new ClientInfoImpl(properties);
+      // validate the token in the properties if not provided here
+      ClientProperty.validate(properties, tokenOpt.isEmpty());
+      return new ClientInfoImpl(properties, tokenOpt);
     }
 
     private UncaughtExceptionHandler getUncaughtExceptionHandler() {
@@ -1001,7 +988,7 @@ public ConnectionOptions<T> as(CharSequence principal, AuthenticationToken token
       }
       setProperty(ClientProperty.AUTH_PRINCIPAL, principal.toString());
       ClientProperty.setAuthenticationToken(properties, token);
-      this.token = token;
+      this.tokenOpt = Optional.of(token);
       return this;
     }
 
@@ -1025,9 +1012,9 @@ public ClientFactory<T> withUncaughtExceptionHandler(UncaughtExceptionHandler ue
 
   }
 
-  public ZooReader getZooReader() {
+  public ZooSession getZooSession() {
     ensureOpen();
-    return zooReader;
+    return zooSession.get();
   }
 
   protected long getTransportPoolMaxAgeMillis() {
@@ -1069,7 +1056,13 @@ && getConfiguration().getBoolean(Property.GENERAL_MICROMETER_CACHE_METRICS_ENABL
   public synchronized ZookeeperLockChecker getTServerLockChecker() {
     ensureOpen();
     if (this.zkLockChecker == null) {
-      this.zkLockChecker = new ZookeeperLockChecker(this);
+      // make this use its own ZooSession and ZooCache, because this is used by the
+      // tablet location cache, which is a static singleton reused by multiple clients
+      // so, it can't rely on being able to continue to use the same client's ZooCache,
+      // because that client could be closed, and its ZooSession also closed
+      // this needs to be fixed; TODO https://github.com/apache/accumulo/issues/2301
+      var zk = info.getZooKeeperSupplier(ZookeeperLockChecker.class.getSimpleName()).get();
+      this.zkLockChecker = new ZookeeperLockChecker(new ZooCache(zk), getZooKeeperRoot());
     }
     return this.zkLockChecker;
   }
diff --git a/core/src/main/java/org/apache/accumulo/core/clientImpl/ClientInfo.java b/core/src/main/java/org/apache/accumulo/core/clientImpl/ClientInfo.java
index 7306d8f8045..cebe40ec2ad 100644
--- a/core/src/main/java/org/apache/accumulo/core/clientImpl/ClientInfo.java
+++ b/core/src/main/java/org/apache/accumulo/core/clientImpl/ClientInfo.java
@@ -20,10 +20,14 @@
 
 import java.net.URL;
 import java.nio.file.Path;
+import java.util.Optional;
 import java.util.Properties;
+import java.util.function.Supplier;
 
 import org.apache.accumulo.core.client.Accumulo;
 import org.apache.accumulo.core.client.security.tokens.AuthenticationToken;
+import org.apache.accumulo.core.data.InstanceId;
+import org.apache.accumulo.core.zookeeper.ZooSession;
 import org.apache.hadoop.conf.Configuration;
 
 /**
@@ -38,6 +42,16 @@ public interface ClientInfo {
    */
   String getInstanceName();
 
+  /**
+   * @return Accumulo instanceId
+   */
+  InstanceId getInstanceId();
+
+  /**
+   * @return a Supplier for creating new ZooKeeper client instances based on the configuration
+   */
+  Supplier<ZooSession> getZooKeeperSupplier(String clientName);
+
   /**
    * @return Zookeeper connection information for Accumulo instance
    */
@@ -77,27 +91,27 @@ public interface ClientInfo {
    * @return ClientInfo given properties
    */
   static ClientInfo from(Properties properties) {
-    return new ClientInfoImpl(properties);
+    return new ClientInfoImpl(properties, Optional.empty());
   }
 
   /**
    * @return ClientInfo given URL path to client config file
    */
   static ClientInfo from(URL propertiesURL) {
-    return new ClientInfoImpl(propertiesURL);
+    return new ClientInfoImpl(ClientInfoImpl.toProperties(propertiesURL), Optional.empty());
   }
 
   /**
    * @return ClientInfo given properties and token
    */
   static ClientInfo from(Properties properties, AuthenticationToken token) {
-    return new ClientInfoImpl(properties, token);
+    return new ClientInfoImpl(properties, Optional.of(token));
   }
 
   /**
    * @return ClientInfo given path to client config file
    */
   static ClientInfo from(Path propertiesFile) {
-    return new ClientInfoImpl(propertiesFile);
+    return new ClientInfoImpl(ClientInfoImpl.toProperties(propertiesFile), Optional.empty());
   }
 }
diff --git a/core/src/main/java/org/apache/accumulo/core/clientImpl/ClientInfoImpl.java b/core/src/main/java/org/apache/accumulo/core/clientImpl/ClientInfoImpl.java
index 372906ca6a5..04911060c3f 100644
--- a/core/src/main/java/org/apache/accumulo/core/clientImpl/ClientInfoImpl.java
+++ b/core/src/main/java/org/apache/accumulo/core/clientImpl/ClientInfoImpl.java
@@ -18,48 +18,70 @@
  */
 package org.apache.accumulo.core.clientImpl;
 
+import static com.google.common.base.Suppliers.memoize;
+import static java.util.Objects.requireNonNull;
+
 import java.io.FileInputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.net.URL;
 import java.nio.file.Path;
 import java.nio.file.Paths;
+import java.util.Optional;
 import java.util.Properties;
+import java.util.function.Function;
+import java.util.function.Supplier;
 
 import org.apache.accumulo.core.client.security.tokens.AuthenticationToken;
 import org.apache.accumulo.core.conf.ClientProperty;
 import org.apache.accumulo.core.conf.ConfigurationTypeHelper;
+import org.apache.accumulo.core.data.InstanceId;
+import org.apache.accumulo.core.fate.zookeeper.ZooUtil;
+import org.apache.accumulo.core.zookeeper.ZooSession;
 import org.apache.hadoop.conf.Configuration;
 
+import com.google.common.base.Suppliers;
+
 import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
 
 public class ClientInfoImpl implements ClientInfo {
 
   private final Properties properties;
-  private AuthenticationToken token;
-  private final Configuration hadoopConf;
-
-  public ClientInfoImpl(Path propertiesFile) {
-    this(ClientInfoImpl.toProperties(propertiesFile));
-  }
 
-  public ClientInfoImpl(URL propertiesURL) {
-    this(ClientInfoImpl.toProperties(propertiesURL));
+  // suppliers for lazily loading
+  private final Supplier<AuthenticationToken> tokenSupplier;
+  private final Supplier<Configuration> hadoopConf;
+  private final Supplier<InstanceId> instanceId;
+  private final Function<String,ZooSession> zooSessionForName;
+
+  public ClientInfoImpl(Properties properties, Optional<AuthenticationToken> tokenOpt) {
+    this.properties = requireNonNull(properties);
+    // convert the optional to a supplier to delay retrieval from the properties unless needed
+    this.tokenSupplier = requireNonNull(tokenOpt).map(Suppliers::ofInstance)
+        .orElse(memoize(() -> ClientProperty.getAuthenticationToken(properties)));
+    this.hadoopConf = memoize(Configuration::new);
+    this.zooSessionForName =
+        name -> new ZooSession(name, getZooKeepers(), getZooKeepersSessionTimeOut(), null);
+    this.instanceId = memoize(() -> {
+      try (var zk = getZooKeeperSupplier(getClass().getSimpleName() + ".getInstanceName()").get()) {
+        return ZooUtil.getInstanceId(zk, getInstanceName());
+      }
+    });
   }
 
-  public ClientInfoImpl(Properties properties) {
-    this(properties, null);
+  @Override
+  public String getInstanceName() {
+    return getString(ClientProperty.INSTANCE_NAME);
   }
 
-  public ClientInfoImpl(Properties properties, AuthenticationToken token) {
-    this.properties = properties;
-    this.token = token;
-    this.hadoopConf = new Configuration();
+  @Override
+  public InstanceId getInstanceId() {
+    return instanceId.get();
   }
 
   @Override
-  public String getInstanceName() {
-    return getString(ClientProperty.INSTANCE_NAME);
+  public Supplier<ZooSession> getZooKeeperSupplier(String clientName) {
+    return () -> zooSessionForName.apply(clientName);
   }
 
   @Override
@@ -87,10 +109,7 @@ public Properties getProperties() {
 
   @Override
   public AuthenticationToken getAuthenticationToken() {
-    if (token == null) {
-      token = ClientProperty.getAuthenticationToken(properties);
-    }
-    return token;
+    return tokenSupplier.get();
   }
 
   @Override
@@ -134,6 +153,6 @@ public static Properties toProperties(URL propertiesURL) {
 
   @Override
   public Configuration getHadoopConf() {
-    return this.hadoopConf;
+    return hadoopConf.get();
   }
 }
diff --git a/core/src/main/java/org/apache/accumulo/core/clientImpl/InstanceOperationsImpl.java b/core/src/main/java/org/apache/accumulo/core/clientImpl/InstanceOperationsImpl.java
index 9b260d2ba05..7c22b7d8a87 100644
--- a/core/src/main/java/org/apache/accumulo/core/clientImpl/InstanceOperationsImpl.java
+++ b/core/src/main/java/org/apache/accumulo/core/clientImpl/InstanceOperationsImpl.java
@@ -19,7 +19,6 @@
 package org.apache.accumulo.core.clientImpl;
 
 import static com.google.common.base.Preconditions.checkArgument;
-import static java.nio.charset.StandardCharsets.UTF_8;
 import static org.apache.accumulo.core.rpc.ThriftUtil.createClient;
 import static org.apache.accumulo.core.rpc.ThriftUtil.createTransport;
 import static org.apache.accumulo.core.rpc.ThriftUtil.getClient;
@@ -60,7 +59,6 @@
 import org.apache.accumulo.core.clientImpl.thrift.ThriftSecurityException;
 import org.apache.accumulo.core.conf.DeprecatedPropertyUtil;
 import org.apache.accumulo.core.data.InstanceId;
-import org.apache.accumulo.core.fate.zookeeper.ZooCache;
 import org.apache.accumulo.core.lock.ServiceLockData;
 import org.apache.accumulo.core.lock.ServiceLockData.ThriftService;
 import org.apache.accumulo.core.lock.ServiceLockPaths.AddressSelector;
@@ -467,22 +465,6 @@ public void waitForBalance() throws AccumuloException {
 
   }
 
-  /**
-   * Given a zooCache and instanceId, look up the instance name.
-   */
-  public static String lookupInstanceName(ZooCache zooCache, InstanceId instanceId) {
-    checkArgument(zooCache != null, "zooCache is null");
-    checkArgument(instanceId != null, "instanceId is null");
-    for (String name : zooCache.getChildren(Constants.ZROOT + Constants.ZINSTANCES)) {
-      var bytes = zooCache.get(Constants.ZROOT + Constants.ZINSTANCES + "/" + name);
-      InstanceId iid = InstanceId.of(new String(bytes, UTF_8));
-      if (iid.equals(instanceId)) {
-        return name;
-      }
-    }
-    return null;
-  }
-
   @Override
   public InstanceId getInstanceId() {
     return context.getInstanceID();
diff --git a/core/src/main/java/org/apache/accumulo/core/clientImpl/NamespaceOperationsImpl.java b/core/src/main/java/org/apache/accumulo/core/clientImpl/NamespaceOperationsImpl.java
index 378147bea65..2e80915fb85 100644
--- a/core/src/main/java/org/apache/accumulo/core/clientImpl/NamespaceOperationsImpl.java
+++ b/core/src/main/java/org/apache/accumulo/core/clientImpl/NamespaceOperationsImpl.java
@@ -56,7 +56,7 @@
 import org.apache.accumulo.core.data.constraints.Constraint;
 import org.apache.accumulo.core.iterators.IteratorUtil.IteratorScope;
 import org.apache.accumulo.core.iterators.SortedKeyValueIterator;
-import org.apache.accumulo.core.manager.thrift.FateOperation;
+import org.apache.accumulo.core.manager.thrift.TFateOperation;
 import org.apache.accumulo.core.rpc.clients.ThriftClientTypes;
 import org.apache.accumulo.core.trace.TraceUtil;
 import org.apache.accumulo.core.util.LocalityGroupUtil;
@@ -126,7 +126,7 @@ public void create(String namespace)
     NEW_NAMESPACE_NAME.validate(namespace);
 
     try {
-      doNamespaceFateOperation(FateOperation.NAMESPACE_CREATE,
+      doNamespaceFateOperation(TFateOperation.NAMESPACE_CREATE,
           Arrays.asList(ByteBuffer.wrap(namespace.getBytes(UTF_8))), Collections.emptyMap(),
           namespace);
     } catch (NamespaceNotFoundException e) {
@@ -156,7 +156,7 @@ public void delete(String namespace) throws AccumuloException, AccumuloSecurityE
     Map<String,String> opts = new HashMap<>();
 
     try {
-      doNamespaceFateOperation(FateOperation.NAMESPACE_DELETE, args, opts, namespace);
+      doNamespaceFateOperation(TFateOperation.NAMESPACE_DELETE, args, opts, namespace);
     } catch (NamespaceExistsException e) {
       // should not happen
       throw new AssertionError(e);
@@ -174,7 +174,7 @@ public void rename(String oldNamespaceName, String newNamespaceName)
     List<ByteBuffer> args = Arrays.asList(ByteBuffer.wrap(oldNamespaceName.getBytes(UTF_8)),
         ByteBuffer.wrap(newNamespaceName.getBytes(UTF_8)));
     Map<String,String> opts = new HashMap<>();
-    doNamespaceFateOperation(FateOperation.NAMESPACE_RENAME, args, opts, oldNamespaceName);
+    doNamespaceFateOperation(TFateOperation.NAMESPACE_RENAME, args, opts, oldNamespaceName);
   }
 
   @Override
@@ -385,7 +385,7 @@ public int addConstraint(String namespace, String constraintClassName)
     return super.addConstraint(namespace, constraintClassName);
   }
 
-  private String doNamespaceFateOperation(FateOperation op, List<ByteBuffer> args,
+  private String doNamespaceFateOperation(TFateOperation op, List<ByteBuffer> args,
       Map<String,String> opts, String namespace) throws AccumuloSecurityException,
       AccumuloException, NamespaceExistsException, NamespaceNotFoundException {
     // caller should validate the namespace name
diff --git a/core/src/main/java/org/apache/accumulo/core/clientImpl/TableOperationsImpl.java b/core/src/main/java/org/apache/accumulo/core/clientImpl/TableOperationsImpl.java
index 36de59f9e81..0b1ff708519 100644
--- a/core/src/main/java/org/apache/accumulo/core/clientImpl/TableOperationsImpl.java
+++ b/core/src/main/java/org/apache/accumulo/core/clientImpl/TableOperationsImpl.java
@@ -140,11 +140,11 @@
 import org.apache.accumulo.core.iterators.IteratorUtil.IteratorScope;
 import org.apache.accumulo.core.iterators.SortedKeyValueIterator;
 import org.apache.accumulo.core.manager.state.tables.TableState;
-import org.apache.accumulo.core.manager.thrift.FateOperation;
 import org.apache.accumulo.core.manager.thrift.FateService;
 import org.apache.accumulo.core.manager.thrift.ManagerClientService;
 import org.apache.accumulo.core.manager.thrift.TFateId;
 import org.apache.accumulo.core.manager.thrift.TFateInstanceType;
+import org.apache.accumulo.core.manager.thrift.TFateOperation;
 import org.apache.accumulo.core.metadata.AccumuloTable;
 import org.apache.accumulo.core.metadata.TServerInstance;
 import org.apache.accumulo.core.metadata.TabletState;
@@ -274,7 +274,7 @@ public void create(String tableName, NewTableConfiguration ntc)
     Map<String,String> opts = ntc.getProperties();
 
     try {
-      doTableFateOperation(tableName, AccumuloException.class, FateOperation.TABLE_CREATE, args,
+      doTableFateOperation(tableName, AccumuloException.class, TFateOperation.TABLE_CREATE, args,
           opts);
     } catch (TableNotFoundException e) {
       // should not happen
@@ -304,7 +304,7 @@ private TFateId beginFateOperation(TFateInstanceType type)
 
   // This method is for retrying in the case of network failures;
   // anything else it passes to the caller to deal with
-  private void executeFateOperation(TFateId opid, FateOperation op, List<ByteBuffer> args,
+  private void executeFateOperation(TFateId opid, TFateOperation op, List<ByteBuffer> args,
       Map<String,String> opts, boolean autoCleanUp)
       throws ThriftSecurityException, TException, ThriftTableOperationException {
     while (true) {
@@ -372,7 +372,7 @@ public String doBulkFateOperation(List<ByteBuffer> args, String tableName)
     EXISTING_TABLE_NAME.validate(tableName);
 
     try {
-      return doFateOperation(FateOperation.TABLE_BULK_IMPORT2, args, Collections.emptyMap(),
+      return doFateOperation(TFateOperation.TABLE_BULK_IMPORT2, args, Collections.emptyMap(),
           tableName);
     } catch (TableExistsException | NamespaceExistsException e) {
       // should not happen
@@ -427,14 +427,14 @@ private <T> T handleFateOperation(FateOperationExecutor<T> executor, String tabl
     }
   }
 
-  String doFateOperation(FateOperation op, List<ByteBuffer> args, Map<String,String> opts,
+  String doFateOperation(TFateOperation op, List<ByteBuffer> args, Map<String,String> opts,
       String tableOrNamespaceName)
       throws AccumuloSecurityException, TableExistsException, TableNotFoundException,
       AccumuloException, NamespaceExistsException, NamespaceNotFoundException {
     return doFateOperation(op, args, opts, tableOrNamespaceName, true);
   }
 
-  String doFateOperation(FateOperation op, List<ByteBuffer> args, Map<String,String> opts,
+  String doFateOperation(TFateOperation op, List<ByteBuffer> args, Map<String,String> opts,
       String tableOrNamespaceName, boolean wait)
       throws AccumuloSecurityException, TableExistsException, TableNotFoundException,
       AccumuloException, NamespaceExistsException, NamespaceNotFoundException {
@@ -521,7 +521,7 @@ public void addSplits(String tableName, SortedSet<Text> splits)
             return handleFateOperation(() -> {
               TFateInstanceType t = FateInstanceType.fromNamespaceOrTableName(tableName).toThrift();
               TFateId opid = beginFateOperation(t);
-              executeFateOperation(opid, FateOperation.TABLE_SPLIT, args, Map.of(), false);
+              executeFateOperation(opid, TFateOperation.TABLE_SPLIT, args, Map.of(), false);
               return new Pair<>(opid, splitsForTablet.getValue());
             }, tableName);
           } catch (TableExistsException | NamespaceExistsException | NamespaceNotFoundException
@@ -645,8 +645,8 @@ public void merge(String tableName, Text start, Text end)
         end == null ? EMPTY : TextUtil.getByteBuffer(end));
     Map<String,String> opts = new HashMap<>();
     try {
-      doTableFateOperation(tableName, TableNotFoundException.class, FateOperation.TABLE_MERGE, args,
-          opts);
+      doTableFateOperation(tableName, TableNotFoundException.class, TFateOperation.TABLE_MERGE,
+          args, opts);
     } catch (TableExistsException e) {
       // should not happen
       throw new AssertionError(e);
@@ -665,7 +665,7 @@ public void deleteRows(String tableName, Text start, Text end)
     Map<String,String> opts = new HashMap<>();
     try {
       doTableFateOperation(tableName, TableNotFoundException.class,
-          FateOperation.TABLE_DELETE_RANGE, args, opts);
+          TFateOperation.TABLE_DELETE_RANGE, args, opts);
     } catch (TableExistsException e) {
       // should not happen
       throw new AssertionError(e);
@@ -760,7 +760,7 @@ public void delete(String tableName)
     List<ByteBuffer> args = List.of(ByteBuffer.wrap(tableName.getBytes(UTF_8)));
     Map<String,String> opts = new HashMap<>();
     try {
-      doTableFateOperation(tableName, TableNotFoundException.class, FateOperation.TABLE_DELETE,
+      doTableFateOperation(tableName, TableNotFoundException.class, TFateOperation.TABLE_DELETE,
           args, opts);
     } catch (TableExistsException e) {
       // should not happen
@@ -800,7 +800,7 @@ public void clone(String srcTableName, String newTableName, CloneConfiguration c
 
     prependPropertiesToExclude(opts, config.getPropertiesToExclude());
 
-    doTableFateOperation(newTableName, AccumuloException.class, FateOperation.TABLE_CLONE, args,
+    doTableFateOperation(newTableName, AccumuloException.class, TFateOperation.TABLE_CLONE, args,
         opts);
   }
 
@@ -813,7 +813,7 @@ public void rename(String oldTableName, String newTableName) throws AccumuloSecu
     List<ByteBuffer> args = Arrays.asList(ByteBuffer.wrap(oldTableName.getBytes(UTF_8)),
         ByteBuffer.wrap(newTableName.getBytes(UTF_8)));
     Map<String,String> opts = new HashMap<>();
-    doTableFateOperation(oldTableName, TableNotFoundException.class, FateOperation.TABLE_RENAME,
+    doTableFateOperation(oldTableName, TableNotFoundException.class, TFateOperation.TABLE_RENAME,
         args, opts);
   }
 
@@ -892,7 +892,7 @@ public void compact(String tableName, CompactionConfig config)
     Map<String,String> opts = new HashMap<>();
 
     try {
-      doFateOperation(FateOperation.TABLE_COMPACT, args, opts, tableName, config.getWait());
+      doFateOperation(TFateOperation.TABLE_COMPACT, args, opts, tableName, config.getWait());
     } catch (TableExistsException | NamespaceExistsException e) {
       // should not happen
       throw new AssertionError(e);
@@ -912,7 +912,7 @@ public void cancelCompaction(String tableName)
 
     try {
       doTableFateOperation(tableName, TableNotFoundException.class,
-          FateOperation.TABLE_CANCEL_COMPACT, args, opts);
+          TFateOperation.TABLE_CANCEL_COMPACT, args, opts);
     } catch (TableExistsException e) {
       // should not happen
       throw new AssertionError(e);
@@ -1455,17 +1455,17 @@ private void changeTableState(String tableName, boolean wait, TableState newStat
 
     TableId tableId = context.getTableId(tableName);
 
-    FateOperation op = null;
+    TFateOperation op = null;
     switch (newState) {
       case OFFLINE:
-        op = FateOperation.TABLE_OFFLINE;
+        op = TFateOperation.TABLE_OFFLINE;
         if (tableName.equals(AccumuloTable.METADATA.tableName())
             || tableName.equals(AccumuloTable.ROOT.tableName())) {
           throw new AccumuloException("Cannot set table to offline state");
         }
         break;
       case ONLINE:
-        op = FateOperation.TABLE_ONLINE;
+        op = TFateOperation.TABLE_ONLINE;
         if (tableName.equals(AccumuloTable.METADATA.tableName())
             || tableName.equals(AccumuloTable.ROOT.tableName())) {
           // Don't submit a Fate operation for this, these tables can only be online.
@@ -1694,7 +1694,7 @@ public void importTable(String tableName, Set<String> importDirs, ImportConfigur
     checkedImportDirs.stream().map(s -> s.getBytes(UTF_8)).map(ByteBuffer::wrap).forEach(args::add);
 
     try {
-      doTableFateOperation(tableName, AccumuloException.class, FateOperation.TABLE_IMPORT, args,
+      doTableFateOperation(tableName, AccumuloException.class, TFateOperation.TABLE_IMPORT, args,
           Collections.emptyMap());
     } catch (TableNotFoundException e) {
       // should not happen
@@ -1727,7 +1727,7 @@ public void exportTable(String tableName, String exportDir)
     Map<String,String> opts = Collections.emptyMap();
 
     try {
-      doTableFateOperation(tableName, TableNotFoundException.class, FateOperation.TABLE_EXPORT,
+      doTableFateOperation(tableName, TableNotFoundException.class, TFateOperation.TABLE_EXPORT,
           args, opts);
     } catch (TableExistsException e) {
       // should not happen
@@ -1782,7 +1782,7 @@ public int addConstraint(String tableName, String constraintClassName)
   }
 
   private void doTableFateOperation(String tableOrNamespaceName,
-      Class<? extends Exception> namespaceNotFoundExceptionClass, FateOperation op,
+      Class<? extends Exception> namespaceNotFoundExceptionClass, TFateOperation op,
       List<ByteBuffer> args, Map<String,String> opts) throws AccumuloSecurityException,
       AccumuloException, TableExistsException, TableNotFoundException {
     try {
@@ -2212,7 +2212,7 @@ public void setTabletAvailability(String tableName, Range range, TabletAvailabil
 
     try {
       doTableFateOperation(tableName, AccumuloException.class,
-          FateOperation.TABLE_TABLET_AVAILABILITY, args, opts);
+          TFateOperation.TABLE_TABLET_AVAILABILITY, args, opts);
     } catch (TableNotFoundException | TableExistsException e) {
       // should not happen
       throw new AssertionError(e);
diff --git a/core/src/main/java/org/apache/accumulo/core/clientImpl/ZookeeperLockChecker.java b/core/src/main/java/org/apache/accumulo/core/clientImpl/ZookeeperLockChecker.java
index e3b212ce72b..314a82788aa 100644
--- a/core/src/main/java/org/apache/accumulo/core/clientImpl/ZookeeperLockChecker.java
+++ b/core/src/main/java/org/apache/accumulo/core/clientImpl/ZookeeperLockChecker.java
@@ -18,11 +18,15 @@
  */
 package org.apache.accumulo.core.clientImpl;
 
+import static java.util.Objects.requireNonNull;
+
 import java.util.Set;
 
 import org.apache.accumulo.core.Constants;
 import org.apache.accumulo.core.clientImpl.ClientTabletCacheImpl.TabletServerLockChecker;
+import org.apache.accumulo.core.fate.zookeeper.ZooCache;
 import org.apache.accumulo.core.lock.ServiceLock;
+import org.apache.accumulo.core.lock.ServiceLockPaths;
 import org.apache.accumulo.core.lock.ServiceLockPaths.AddressSelector;
 import org.apache.accumulo.core.lock.ServiceLockPaths.ServiceLockPath;
 
@@ -30,17 +34,21 @@
 
 public class ZookeeperLockChecker implements TabletServerLockChecker {
 
-  private final ClientContext ctx;
+  private final ZooCache zc;
+  private final String root;
+  private final ServiceLockPaths lockPaths;
 
-  ZookeeperLockChecker(ClientContext context) {
-    this.ctx = context;
+  ZookeeperLockChecker(ZooCache zooCache, String zkRoot) {
+    this.zc = requireNonNull(zooCache);
+    this.root = requireNonNull(zkRoot);
+    this.lockPaths = new ServiceLockPaths(this.root, this.zc);
   }
 
   public boolean doesTabletServerLockExist(String server) {
     // ServiceLockPaths only returns items that have a lock
     var hostAndPort = HostAndPort.fromString(server);
     Set<ServiceLockPath> tservers =
-        ctx.getServerPaths().getTabletServer(rg -> true, AddressSelector.exact(hostAndPort), true);
+        lockPaths.getTabletServer(rg -> true, AddressSelector.exact(hostAndPort), true);
     return !tservers.isEmpty();
   }
 
@@ -49,9 +57,9 @@ public boolean isLockHeld(String server, String session) {
     // ServiceLockPaths only returns items that have a lock
     var hostAndPort = HostAndPort.fromString(server);
     Set<ServiceLockPath> tservers =
-        ctx.getServerPaths().getTabletServer(rg -> true, AddressSelector.exact(hostAndPort), true);
+        lockPaths.getTabletServer(rg -> true, AddressSelector.exact(hostAndPort), true);
     for (ServiceLockPath slp : tservers) {
-      if (ServiceLock.getSessionId(ctx.getZooCache(), slp) == Long.parseLong(session, 16)) {
+      if (ServiceLock.getSessionId(zc, slp) == Long.parseLong(session, 16)) {
         return true;
       }
     }
@@ -62,7 +70,6 @@ public boolean isLockHeld(String server, String session) {
   public void invalidateCache(String tserver) {
     // The path for the tserver contains a resource group. The resource group is unknown, so can not
     // construct a prefix. Therefore clear any path that contains the tserver.
-    ctx.getZooCache().clear(path -> path.startsWith(ctx.getZooKeeperRoot() + Constants.ZTSERVERS)
-        && path.contains(tserver));
+    zc.clear(path -> path.startsWith(root + Constants.ZTSERVERS) && path.contains(tserver));
   }
 }
diff --git a/core/src/main/java/org/apache/accumulo/core/conf/Property.java b/core/src/main/java/org/apache/accumulo/core/conf/Property.java
index ecff4a14247..555785f5806 100644
--- a/core/src/main/java/org/apache/accumulo/core/conf/Property.java
+++ b/core/src/main/java/org/apache/accumulo/core/conf/Property.java
@@ -294,6 +294,9 @@ public enum Property {
           + " user-implementations of pluggable Accumulo features, such as the balancer"
           + " or volume chooser.",
       "2.0.0"),
+  GENERAL_CACHE_MANAGER_IMPL("general.block.cache.manager.class",
+      TinyLfuBlockCacheManager.class.getName(), PropertyType.STRING,
+      "Specifies the class name of the block cache factory implementation.", "2.1.4"),
   GENERAL_DELEGATION_TOKEN_LIFETIME("general.delegation.token.lifetime", "7d",
       PropertyType.TIMEDURATION,
       "The length of time that delegation tokens and secret keys are valid.", "1.7.0"),
@@ -462,14 +465,12 @@ public enum Property {
       "The number of threads used to seed fate split task, the actual split work is done by fate"
           + " threads.",
       "4.0.0"),
-
-  MANAGER_COMPACTION_SERVICE_PRIORITY_QUEUE_INITIAL_SIZE(
-      "manager.compaction.major.service.queue.initial.size", "10000", PropertyType.COUNT,
-      "The initial size of each resource groups compaction job priority queue.", "4.0.0"),
-  MANAGER_COMPACTION_SERVICE_PRIORITY_QUEUE_SIZE_FACTOR(
-      "manager.compaction.major.service.queue.size.factor", "3.0", PropertyType.FRACTION,
-      "The dynamic resizing of the compaction job priority queue is based on"
-          + " the number of compactors for the group multiplied by this factor.",
+  MANAGER_COMPACTION_SERVICE_PRIORITY_QUEUE_SIZE("manager.compaction.major.service.queue.size",
+      "1M", PropertyType.MEMORY,
+      "The data size of each resource groups compaction job priority queue.  The memory size of "
+          + "each compaction job is estimated and the sum of these sizes per resource group will not "
+          + "exceed this setting. When the size is exceeded the lowest priority jobs are dropped as "
+          + "needed.",
       "4.0.0"),
   SPLIT_PREFIX("split.", null, PropertyType.PREFIX,
       "System wide properties related to splitting tablets.", "3.1.0"),
@@ -480,22 +481,16 @@ public enum Property {
           + " as un-splittable.",
       "3.1.0"),
   // properties that are specific to scan server behavior
-  @Experimental
   SSERV_PREFIX("sserver.", null, PropertyType.PREFIX,
       "Properties in this category affect the behavior of the scan servers.", "2.1.0"),
-  @Experimental
   SSERV_DATACACHE_SIZE("sserver.cache.data.size", "10%", PropertyType.MEMORY,
       "Specifies the size of the cache for RFile data blocks on each scan server.", "2.1.0"),
-  @Experimental
   SSERV_INDEXCACHE_SIZE("sserver.cache.index.size", "25%", PropertyType.MEMORY,
       "Specifies the size of the cache for RFile index blocks on each scan server.", "2.1.0"),
-  @Experimental
   SSERV_SUMMARYCACHE_SIZE("sserver.cache.summary.size", "10%", PropertyType.MEMORY,
       "Specifies the size of the cache for summary data on each scan server.", "2.1.0"),
-  @Experimental
   SSERV_DEFAULT_BLOCKSIZE("sserver.default.blocksize", "1M", PropertyType.BYTES,
       "Specifies a default blocksize for the scan server caches.", "2.1.0"),
-  @Experimental
   SSERV_GROUP_NAME("sserver.group", ScanServerSelector.DEFAULT_SCAN_SERVER_GROUP_NAME,
       PropertyType.STRING,
       "Resource group name for this ScanServer. Resource groups support at least two use cases:"
@@ -503,12 +498,10 @@ public enum Property {
           + " configure the ConfigurableScanServerSelector to specify the resource group to use for"
           + " eventual consistency scans.",
       "3.0.0"),
-  @Experimental
   SSERV_CACHED_TABLET_METADATA_EXPIRATION("sserver.cache.metadata.expiration", "5m",
       PropertyType.TIMEDURATION,
       "The time after which cached tablet metadata will be expired if not previously refreshed.",
       "2.1.0"),
-  @Experimental
   SSERV_CACHED_TABLET_METADATA_REFRESH_PERCENT("sserver.cache.metadata.refresh.percent", ".75",
       PropertyType.FRACTION,
       "The time after which cached tablet metadata will be refreshed, expressed as a "
@@ -516,21 +509,16 @@ public enum Property {
           + "expiration time, will trigger a background refresh for future hits. "
           + "Value must be less than 100%. Set to 0 will disable refresh.",
       "2.1.3"),
-  @Experimental
   SSERV_PORTSEARCH("sserver.port.search", "true", PropertyType.BOOLEAN,
       "if the sserver.port.client ports are in use, search higher ports until one is available.",
       "2.1.0"),
-  @Experimental
   SSERV_CLIENTPORT("sserver.port.client", "9996", PropertyType.PORT,
       "The port used for handling client connections on the tablet servers.", "2.1.0"),
-  @Experimental
   SSERV_MINTHREADS("sserver.server.threads.minimum", "2", PropertyType.COUNT,
       "The minimum number of threads to use to handle incoming requests.", "2.1.0"),
-  @Experimental
   SSERV_MINTHREADS_TIMEOUT("sserver.server.threads.timeout", "0s", PropertyType.TIMEDURATION,
       "The time after which incoming request threads terminate with no work available.  Zero (0) will keep the threads alive indefinitely.",
       "2.1.0"),
-  @Experimental
   SSERV_SCAN_EXECUTORS_PREFIX("sserver.scan.executors.", null, PropertyType.PREFIX,
       "Prefix for defining executors to service scans. See "
           + "[scan executors]({% durl administration/scan-executors %}) for an overview of why and"
@@ -541,7 +529,6 @@ public enum Property {
           + "`sserver.scan.executors.<name>.prioritizer=<class name>`, and "
           + "`sserver.scan.executors.<name>.prioritizer.opts.<key>=<value>`.",
       "2.1.0"),
-  @Experimental
   SSERV_SCAN_EXECUTORS_DEFAULT_THREADS("sserver.scan.executors.default.threads", "16",
       PropertyType.COUNT, "The number of threads for the scan executor that tables use by default.",
       "2.1.0"),
@@ -551,18 +538,14 @@ public enum Property {
           + "results in FIFO priority.  Set to a class that implements "
           + ScanPrioritizer.class.getName() + " to configure one.",
       "2.1.0"),
-  @Experimental
   SSERV_SCAN_EXECUTORS_META_THREADS("sserver.scan.executors.meta.threads", "8", PropertyType.COUNT,
       "The number of threads for the metadata table scan executor.", "2.1.0"),
-  @Experimental
   SSERV_SCAN_REFERENCE_EXPIRATION_TIME("sserver.scan.reference.expiration", "5m",
       PropertyType.TIMEDURATION,
       "The amount of time a scan reference is unused before its deleted from metadata table.",
       "2.1.0"),
-  @Experimental
   SSERV_THREADCHECK("sserver.server.threadcheck.time", "1s", PropertyType.TIMEDURATION,
       "The time between adjustments of the thrift server thread pool.", "2.1.0"),
-  @Experimental
   SSERV_WAL_SORT_MAX_CONCURRENT("sserver.wal.sort.concurrent.max", "2", PropertyType.COUNT,
       "The maximum number of threads to use to sort logs during recovery.", "4.0.0"),
   // properties that are specific to tablet server behavior
@@ -572,9 +555,6 @@ public enum Property {
       "Time to wait for clients to continue scans before closing a session.", "1.3.5"),
   TSERV_DEFAULT_BLOCKSIZE("tserver.default.blocksize", "1M", PropertyType.BYTES,
       "Specifies a default blocksize for the tserver caches.", "1.3.5"),
-  TSERV_CACHE_MANAGER_IMPL("tserver.cache.manager.class", TinyLfuBlockCacheManager.class.getName(),
-      PropertyType.STRING, "Specifies the class name of the block cache factory implementation.",
-      "2.0.0"),
   TSERV_DATACACHE_SIZE("tserver.cache.data.size", "10%", PropertyType.MEMORY,
       "Specifies the size of the cache for RFile data blocks.", "1.3.5"),
   TSERV_INDEXCACHE_SIZE("tserver.cache.index.size", "25%", PropertyType.MEMORY,
@@ -848,6 +828,12 @@ public enum Property {
           + " The resources that are used by default can be seen in"
           + " `accumulo/server/monitor/src/main/resources/templates/default.ftl`.",
       "2.0.0"),
+  MONITOR_DEAD_LIST_RG_EXCLUSIONS("monitor.dead.server.rg.exclusions", "", PropertyType.STRING,
+      "The Monitor displays information about servers that it believes have died recently."
+          + " This property accepts a comma separated list of resource group names. If"
+          + " the dead servers resource group matches a resource group in this list,"
+          + " then it will be suppressed from the dead servers list in the monitor.",
+      "4.0.0"),
   // per table properties
   TABLE_PREFIX("table.", null, PropertyType.PREFIX,
       "Properties in this category affect tablet server treatment of tablets,"
@@ -1147,7 +1133,6 @@ public enum Property {
           + "constraint.",
       "2.0.0"),
   // Compactor properties
-  @Experimental
   COMPACTOR_PREFIX("compactor.", null, PropertyType.PREFIX,
       "Properties in this category affect the behavior of the accumulo compactor server.", "2.1.0"),
   COMPACTOR_CANCEL_CHECK_INTERVAL("compactor.cancel.check.interval", "5m",
@@ -1156,11 +1141,9 @@ public enum Property {
           + " should be cancelled. This checks for situations like was the tablet deleted (split "
           + " and merge do this), was the table deleted, was a user compaction canceled, etc.",
       "2.1.4"),
-  @Experimental
   COMPACTOR_PORTSEARCH("compactor.port.search", "true", PropertyType.BOOLEAN,
       "If the compactor.port.client ports are in use, search higher ports until one is available.",
       "2.1.0"),
-  @Experimental
   COMPACTOR_CLIENTPORT("compactor.port.client", "9133", PropertyType.PORT,
       "The port used for handling client connections on the compactor servers.", "2.1.0"),
   COMPACTOR_MIN_JOB_WAIT_TIME("compactor.wait.time.job.min", "1s", PropertyType.TIMEDURATION,
@@ -1171,21 +1154,16 @@ public enum Property {
       "Compactors do exponential backoff when their request for work repeatedly come back empty. "
           + "This is the maximum amount of time to wait between checks for the next compaction job.",
       "2.1.3"),
-  @Experimental
   COMPACTOR_MINTHREADS("compactor.threads.minimum", "1", PropertyType.COUNT,
       "The minimum number of threads to use to handle incoming requests.", "2.1.0"),
-  @Experimental
   COMPACTOR_MINTHREADS_TIMEOUT("compactor.threads.timeout", "0s", PropertyType.TIMEDURATION,
       "The time after which incoming request threads terminate with no work available.  Zero (0) will keep the threads alive indefinitely.",
       "2.1.0"),
-  @Experimental
   COMPACTOR_THREADCHECK("compactor.threadcheck.time", "1s", PropertyType.TIMEDURATION,
       "The time between adjustments of the server thread pool.", "2.1.0"),
-  @Experimental
   COMPACTOR_GROUP_NAME("compactor.group", Constants.DEFAULT_RESOURCE_GROUP_NAME,
       PropertyType.STRING, "Resource group name for this Compactor.", "3.0.0"),
   // CompactionCoordinator properties
-  @Experimental
   COMPACTION_COORDINATOR_PREFIX("compaction.coordinator.", null, PropertyType.PREFIX,
       "Properties in this category affect the behavior of the accumulo compaction coordinator server.",
       "2.1.0"),
@@ -1201,7 +1179,6 @@ public enum Property {
       "64", PropertyType.COUNT,
       "The number of threads used to reserve files for compaction in a tablet for user tables.",
       "4.0.0"),
-  @Experimental
   COMPACTION_COORDINATOR_DEAD_COMPACTOR_CHECK_INTERVAL(
       "compaction.coordinator.compactor.dead.check.interval", "5m", PropertyType.TIMEDURATION,
       "The interval at which to check for dead compactors.", "2.1.0");
@@ -1481,10 +1458,10 @@ public static boolean isValidTablePropertyKey(String key) {
       RPC_MAX_MESSAGE_SIZE,
 
       // compaction coordiantor properties
-      MANAGER_COMPACTION_SERVICE_PRIORITY_QUEUE_INITIAL_SIZE,
+      MANAGER_COMPACTION_SERVICE_PRIORITY_QUEUE_SIZE,
 
       // block cache options
-      TSERV_CACHE_MANAGER_IMPL, TSERV_DATACACHE_SIZE, TSERV_INDEXCACHE_SIZE,
+      GENERAL_CACHE_MANAGER_IMPL, TSERV_DATACACHE_SIZE, TSERV_INDEXCACHE_SIZE,
       TSERV_SUMMARYCACHE_SIZE, SSERV_DATACACHE_SIZE, SSERV_INDEXCACHE_SIZE, SSERV_SUMMARYCACHE_SIZE,
 
       // blocksize options
@@ -1499,8 +1476,7 @@ public static boolean isValidTablePropertyKey(String key) {
       COMPACTOR_MINTHREADS_TIMEOUT,
 
       // others
-      TSERV_NATIVEMAP_ENABLED, TSERV_SCAN_MAX_OPENFILES, MANAGER_RECOVERY_WAL_EXISTENCE_CACHE_TIME,
-      TSERV_SESSION_MAXIDLE, TSERV_UPDATE_SESSION_MAXIDLE);
+      TSERV_NATIVEMAP_ENABLED, TSERV_SCAN_MAX_OPENFILES, MANAGER_RECOVERY_WAL_EXISTENCE_CACHE_TIME);
 
   /**
    * Checks if the given property may be changed via Zookeeper, but not recognized until the restart
diff --git a/core/src/main/java/org/apache/accumulo/core/conf/SiteConfiguration.java b/core/src/main/java/org/apache/accumulo/core/conf/SiteConfiguration.java
index ed1775cbdb0..1196bd2152e 100644
--- a/core/src/main/java/org/apache/accumulo/core/conf/SiteConfiguration.java
+++ b/core/src/main/java/org/apache/accumulo/core/conf/SiteConfiguration.java
@@ -39,6 +39,7 @@
 import org.apache.commons.configuration2.MapConfiguration;
 import org.apache.commons.configuration2.PropertiesConfiguration;
 import org.apache.commons.configuration2.ex.ConfigurationException;
+import org.apache.commons.configuration2.io.FileHandler;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -211,8 +212,9 @@ private SiteConfiguration(Map<String,String> config) {
   private static AbstractConfiguration getPropsFileConfig(URL accumuloPropsLocation) {
     var config = new PropertiesConfiguration();
     if (accumuloPropsLocation != null) {
+      var fileHandler = new FileHandler(config);
       try (var reader = new InputStreamReader(accumuloPropsLocation.openStream(), UTF_8)) {
-        config.read(reader);
+        fileHandler.load(reader);
       } catch (ConfigurationException | IOException e) {
         throw new IllegalArgumentException(e);
       }
diff --git a/core/src/main/java/org/apache/accumulo/core/fate/AbstractFateStore.java b/core/src/main/java/org/apache/accumulo/core/fate/AbstractFateStore.java
index 749a3260649..9b7d7965d61 100644
--- a/core/src/main/java/org/apache/accumulo/core/fate/AbstractFateStore.java
+++ b/core/src/main/java/org/apache/accumulo/core/fate/AbstractFateStore.java
@@ -101,10 +101,6 @@ public FateId newRandomId(FateInstanceType instanceType) {
   // Keeps track of the number of concurrent callers to waitForStatusChange()
   private final AtomicInteger concurrentStatusChangeCallers = new AtomicInteger(0);
 
-  public AbstractFateStore() {
-    this(createDummyLockID(), null, DEFAULT_MAX_DEFERRED, DEFAULT_FATE_ID_GENERATOR);
-  }
-
   public AbstractFateStore(ZooUtil.LockID lockID, Predicate<ZooUtil.LockID> isLockHeld) {
     this(lockID, isLockHeld, DEFAULT_MAX_DEFERRED, DEFAULT_FATE_ID_GENERATOR);
   }
@@ -114,9 +110,7 @@ public AbstractFateStore(ZooUtil.LockID lockID, Predicate<ZooUtil.LockID> isLock
     this.maxDeferred = maxDeferred;
     this.fateIdGenerator = Objects.requireNonNull(fateIdGenerator);
     this.deferred = Collections.synchronizedMap(new HashMap<>());
-    this.lockID = Objects.requireNonNull(lockID);
-    // If the store is used for a Fate which runs a dead reservation cleaner,
-    // this should be non-null, otherwise null is fine
+    this.lockID = lockID;
     this.isLockHeld = isLockHeld;
   }
 
@@ -291,6 +285,10 @@ protected void verifyFateKey(FateId fateId, Optional<FateKey> fateKeySeen,
         "Collision detected for fate id " + fateId);
   }
 
+  protected void verifyLock(ZooUtil.LockID lockID, FateId fateId) {
+    Preconditions.checkState(lockID != null, "Tried to reserve " + fateId + " with null lockID");
+  }
+
   protected abstract Stream<FateIdStatus> getTransactions(EnumSet<TStatus> statuses);
 
   protected abstract TStatus _getStatus(FateId fateId);
@@ -450,14 +448,4 @@ protected static Serializable deserializeTxInfo(TxInfo txInfo, byte[] data) {
       throw new IllegalStateException("Bad node data " + txInfo);
     }
   }
-
-  /**
-   * this is a temporary method used to create a dummy lock when using a FateStore outside the
-   * context of a Manager (one example is testing) so reservations can still be made.
-   *
-   * @return a dummy {@link ZooUtil.LockID}
-   */
-  public static ZooUtil.LockID createDummyLockID() {
-    return new ZooUtil.LockID("/path", "node", 123);
-  }
 }
diff --git a/core/src/main/java/org/apache/accumulo/core/fate/AdminUtil.java b/core/src/main/java/org/apache/accumulo/core/fate/AdminUtil.java
index 0fe448d7d55..c54ee85d1a8 100644
--- a/core/src/main/java/org/apache/accumulo/core/fate/AdminUtil.java
+++ b/core/src/main/java/org/apache/accumulo/core/fate/AdminUtil.java
@@ -31,6 +31,7 @@
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.Optional;
 import java.util.Set;
 import java.util.stream.Stream;
 
@@ -40,17 +41,14 @@
 import org.apache.accumulo.core.fate.ReadOnlyFateStore.TStatus;
 import org.apache.accumulo.core.fate.zookeeper.FateLock;
 import org.apache.accumulo.core.fate.zookeeper.FateLock.FateLockPath;
-import org.apache.accumulo.core.fate.zookeeper.ZooReader;
-import org.apache.accumulo.core.fate.zookeeper.ZooReaderWriter;
 import org.apache.accumulo.core.fate.zookeeper.ZooUtil.NodeMissingPolicy;
-import org.apache.accumulo.core.lock.ServiceLock;
 import org.apache.accumulo.core.lock.ServiceLockPaths.ServiceLockPath;
+import org.apache.accumulo.core.util.Retry;
+import org.apache.accumulo.core.zookeeper.ZooSession;
 import org.apache.zookeeper.KeeperException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
-
 /**
  * A utility to administer FATE operations
  */
@@ -76,14 +74,15 @@ public static class TransactionStatus {
     private final FateId fateId;
     private final FateInstanceType instanceType;
     private final TStatus status;
-    private final String txName;
+    private final Fate.FateOperation txName;
     private final List<String> hlocks;
     private final List<String> wlocks;
     private final String top;
     private final long timeCreated;
 
     private TransactionStatus(FateId fateId, FateInstanceType instanceType, TStatus status,
-        String txName, List<String> hlocks, List<String> wlocks, String top, Long timeCreated) {
+        Fate.FateOperation txName, List<String> hlocks, List<String> wlocks, String top,
+        Long timeCreated) {
 
       this.fateId = fateId;
       this.instanceType = instanceType;
@@ -115,7 +114,7 @@ public TStatus getStatus() {
     /**
      * @return The name of the transaction running.
      */
-    public String getTxName() {
+    public Fate.FateOperation getTxName() {
       return txName;
     }
 
@@ -201,20 +200,21 @@ public Map<FateId,List<String>> getDanglingWaitingLocks() {
   /**
    * Returns a list of the FATE transactions, optionally filtered by fate id, status, and fate
    * instance type. This method does not process lock information, if lock information is desired,
-   * use {@link #getStatus(ReadOnlyFateStore, ZooReader, ServiceLockPath, Set, EnumSet, EnumSet)}
+   * use {@link #getStatus(ReadOnlyFateStore, ZooSession, ServiceLockPath, Set, EnumSet, EnumSet)}
    *
-   * @param fateStores read-only fate stores
+   * @param readOnlyFateStores read-only fate stores
    * @param fateIdFilter filter results to include only provided fate transaction ids
    * @param statusFilter filter results to include only provided status types
    * @param typesFilter filter results to include only provided fate instance types
    * @return list of FATE transactions that match filter criteria
    */
   public List<TransactionStatus> getTransactionStatus(
-      Map<FateInstanceType,ReadOnlyFateStore<T>> fateStores, Set<FateId> fateIdFilter,
+      Map<FateInstanceType,ReadOnlyFateStore<T>> readOnlyFateStores, Set<FateId> fateIdFilter,
       EnumSet<TStatus> statusFilter, EnumSet<FateInstanceType> typesFilter) {
 
-    FateStatus status = getTransactionStatus(fateStores, fateIdFilter, statusFilter, typesFilter,
-        Collections.<FateId,List<String>>emptyMap(), Collections.<FateId,List<String>>emptyMap());
+    FateStatus status = getTransactionStatus(readOnlyFateStores, fateIdFilter, statusFilter,
+        typesFilter, Collections.<FateId,List<String>>emptyMap(),
+        Collections.<FateId,List<String>>emptyMap());
 
     return status.getTransactions();
   }
@@ -223,7 +223,7 @@ public List<TransactionStatus> getTransactionStatus(
    * Get the FATE transaction status and lock information stored in zookeeper, optionally filtered
    * by fate id, status, and fate instance type
    *
-   * @param mfs read-only MetaFateStore
+   * @param readOnlyMFS read-only MetaFateStore
    * @param zk zookeeper reader.
    * @param lockPath the zookeeper path for locks
    * @param fateIdFilter filter results to include only provided fate transaction ids
@@ -233,54 +233,57 @@ public List<TransactionStatus> getTransactionStatus(
    * @throws KeeperException if zookeeper exception occurs
    * @throws InterruptedException if process is interrupted.
    */
-  public FateStatus getStatus(ReadOnlyFateStore<T> mfs, ZooReader zk, ServiceLockPath lockPath,
-      Set<FateId> fateIdFilter, EnumSet<TStatus> statusFilter,
+  public FateStatus getStatus(ReadOnlyFateStore<T> readOnlyMFS, ZooSession zk,
+      ServiceLockPath lockPath, Set<FateId> fateIdFilter, EnumSet<TStatus> statusFilter,
       EnumSet<FateInstanceType> typesFilter) throws KeeperException, InterruptedException {
     Map<FateId,List<String>> heldLocks = new HashMap<>();
     Map<FateId,List<String>> waitingLocks = new HashMap<>();
 
     findLocks(zk, lockPath, heldLocks, waitingLocks);
 
-    return getTransactionStatus(Map.of(FateInstanceType.META, mfs), fateIdFilter, statusFilter,
-        typesFilter, heldLocks, waitingLocks);
+    return getTransactionStatus(Map.of(FateInstanceType.META, readOnlyMFS), fateIdFilter,
+        statusFilter, typesFilter, heldLocks, waitingLocks);
   }
 
-  public FateStatus getStatus(ReadOnlyFateStore<T> ufs, Set<FateId> fateIdFilter,
+  public FateStatus getStatus(ReadOnlyFateStore<T> readOnlyUFS, Set<FateId> fateIdFilter,
       EnumSet<TStatus> statusFilter, EnumSet<FateInstanceType> typesFilter)
       throws KeeperException, InterruptedException {
 
-    return getTransactionStatus(Map.of(FateInstanceType.USER, ufs), fateIdFilter, statusFilter,
-        typesFilter, new HashMap<>(), new HashMap<>());
+    return getTransactionStatus(Map.of(FateInstanceType.USER, readOnlyUFS), fateIdFilter,
+        statusFilter, typesFilter, new HashMap<>(), new HashMap<>());
   }
 
-  public FateStatus getStatus(Map<FateInstanceType,ReadOnlyFateStore<T>> fateStores, ZooReader zk,
-      ServiceLockPath lockPath, Set<FateId> fateIdFilter, EnumSet<TStatus> statusFilter,
-      EnumSet<FateInstanceType> typesFilter) throws KeeperException, InterruptedException {
+  public FateStatus getStatus(Map<FateInstanceType,ReadOnlyFateStore<T>> readOnlyFateStores,
+      ZooSession zk, ServiceLockPath lockPath, Set<FateId> fateIdFilter,
+      EnumSet<TStatus> statusFilter, EnumSet<FateInstanceType> typesFilter)
+      throws KeeperException, InterruptedException {
     Map<FateId,List<String>> heldLocks = new HashMap<>();
     Map<FateId,List<String>> waitingLocks = new HashMap<>();
 
     findLocks(zk, lockPath, heldLocks, waitingLocks);
 
-    return getTransactionStatus(fateStores, fateIdFilter, statusFilter, typesFilter, heldLocks,
-        waitingLocks);
+    return getTransactionStatus(readOnlyFateStores, fateIdFilter, statusFilter, typesFilter,
+        heldLocks, waitingLocks);
   }
 
   /**
    * Walk through the lock nodes in zookeeper to find and populate held locks and waiting locks.
    *
-   * @param zk zookeeper reader
+   * @param zk zookeeper client
    * @param lockPath the zookeeper path for locks
    * @param heldLocks map for returning transactions with held locks
    * @param waitingLocks map for returning transactions with waiting locks
    * @throws KeeperException if initial lock list cannot be read.
    * @throws InterruptedException if thread interrupt detected while processing.
    */
-  private void findLocks(ZooReader zk, final ServiceLockPath lockPath,
+  private void findLocks(ZooSession zk, final ServiceLockPath lockPath,
       final Map<FateId,List<String>> heldLocks, final Map<FateId,List<String>> waitingLocks)
       throws KeeperException, InterruptedException {
 
+    var zr = zk.asReader();
+
     // stop with exception if lock ids cannot be retrieved from zookeeper
-    List<String> lockedIds = zk.getChildren(lockPath.toString());
+    List<String> lockedIds = zr.getChildren(lockPath.toString());
 
     for (String id : lockedIds) {
 
@@ -288,14 +291,14 @@ private void findLocks(ZooReader zk, final ServiceLockPath lockPath,
 
         FateLockPath fLockPath = FateLock.path(lockPath + "/" + id);
         List<String> lockNodes =
-            FateLock.validateAndSort(fLockPath, zk.getChildren(fLockPath.toString()));
+            FateLock.validateAndSort(fLockPath, zr.getChildren(fLockPath.toString()));
 
         int pos = 0;
         boolean sawWriteLock = false;
 
         for (String node : lockNodes) {
           try {
-            byte[] data = zk.getData(lockPath + "/" + id + "/" + node);
+            byte[] data = zr.getData(lockPath + "/" + id + "/" + node);
             // Example data: "READ:<FateId>". FateId contains ':' hence the limit of 2
             String[] lda = new String(data, UTF_8).split(":", 2);
             FateId fateId = FateId.from(lda[1]);
@@ -339,7 +342,7 @@ private void findLocks(ZooReader zk, final ServiceLockPath lockPath,
   /**
    * Returns fate status, possibly filtered
    *
-   * @param fateStores read-only access to populated transaction stores.
+   * @param readOnlyFateStores read-only access to populated transaction stores.
    * @param fateIdFilter Optional. List of transactions to filter results - if null, all
    *        transactions are returned
    * @param statusFilter Optional. List of status types to filter results - if null, all
@@ -351,17 +354,19 @@ private void findLocks(ZooReader zk, final ServiceLockPath lockPath,
    * @return current fate and lock status
    */
   public static <T> FateStatus getTransactionStatus(
-      Map<FateInstanceType,ReadOnlyFateStore<T>> fateStores, Set<FateId> fateIdFilter,
+      Map<FateInstanceType,ReadOnlyFateStore<T>> readOnlyFateStores, Set<FateId> fateIdFilter,
       EnumSet<TStatus> statusFilter, EnumSet<FateInstanceType> typesFilter,
       Map<FateId,List<String>> heldLocks, Map<FateId,List<String>> waitingLocks) {
     final List<TransactionStatus> statuses = new ArrayList<>();
 
-    fateStores.forEach((type, store) -> {
+    readOnlyFateStores.forEach((type, store) -> {
       try (Stream<FateId> fateIds = store.list().map(FateIdStatus::getFateId)) {
         fateIds.forEach(fateId -> {
 
           ReadOnlyFateTxStore<T> txStore = store.read(fateId);
-          String txName = (String) txStore.getTransactionInfo(Fate.TxInfo.TX_NAME);
+          // tx name will not be set if the tx is not seeded with work (it is NEW)
+          Fate.FateOperation txName = txStore.getTransactionInfo(Fate.TxInfo.TX_NAME) == null ? null
+              : ((Fate.FateOperation) txStore.getTransactionInfo(Fate.TxInfo.TX_NAME));
 
           List<String> hlocks = heldLocks.remove(fateId);
 
@@ -409,17 +414,17 @@ private static boolean includeByInstanceType(FateInstanceType type,
     return typesFilter == null || typesFilter.isEmpty() || typesFilter.contains(type);
   }
 
-  public void printAll(Map<FateInstanceType,ReadOnlyFateStore<T>> fateStores, ZooReader zk,
+  public void printAll(Map<FateInstanceType,ReadOnlyFateStore<T>> readOnlyFateStores, ZooSession zk,
       ServiceLockPath tableLocksPath) throws KeeperException, InterruptedException {
-    print(fateStores, zk, tableLocksPath, new Formatter(System.out), null, null, null);
+    print(readOnlyFateStores, zk, tableLocksPath, new Formatter(System.out), null, null, null);
   }
 
-  public void print(Map<FateInstanceType,ReadOnlyFateStore<T>> fateStores, ZooReader zk,
+  public void print(Map<FateInstanceType,ReadOnlyFateStore<T>> readOnlyFateStores, ZooSession zk,
       ServiceLockPath tableLocksPath, Formatter fmt, Set<FateId> fateIdFilter,
       EnumSet<TStatus> statusFilter, EnumSet<FateInstanceType> typesFilter)
       throws KeeperException, InterruptedException {
     FateStatus fateStatus =
-        getStatus(fateStores, zk, tableLocksPath, fateIdFilter, statusFilter, typesFilter);
+        getStatus(readOnlyFateStores, zk, tableLocksPath, fateIdFilter, statusFilter, typesFilter);
 
     for (TransactionStatus txStatus : fateStatus.getTransactions()) {
       fmt.format(
@@ -430,11 +435,7 @@ public void print(Map<FateInstanceType,ReadOnlyFateStore<T>> fateStores, ZooRead
     fmt.format(" %s transactions", fateStatus.getTransactions().size());
   }
 
-  public boolean prepDelete(Map<FateInstanceType,FateStore<T>> stores, ZooReaderWriter zk,
-      ServiceLockPath path, String fateIdStr) {
-    if (!checkGlobalLock(zk, path)) {
-      return false;
-    }
+  public boolean prepDelete(Map<FateInstanceType,FateStore<T>> stores, String fateIdStr) {
 
     FateId fateId;
     try {
@@ -448,36 +449,37 @@ public boolean prepDelete(Map<FateInstanceType,FateStore<T>> stores, ZooReaderWr
     // determine which store to use
     FateStore<T> store = stores.get(fateId.getType());
 
-    FateTxStore<T> txStore = store.reserve(fateId);
-    try {
-      TStatus ts = txStore.getStatus();
-      switch (ts) {
-        case UNKNOWN:
-          System.out.println("Invalid transaction ID: " + fateId);
-          break;
-
-        case SUBMITTED:
-        case IN_PROGRESS:
-        case NEW:
-        case FAILED:
-        case FAILED_IN_PROGRESS:
-        case SUCCESSFUL:
-          System.out.printf("Deleting transaction: %s (%s)%n", fateIdStr, ts);
-          txStore.forceDelete();
-          state = true;
-          break;
+    Optional<FateTxStore<T>> opTxStore = tryReserve(store, fateId, "delete");
+    if (opTxStore.isPresent()) {
+      var txStore = opTxStore.orElseThrow();
+
+      try {
+        TStatus ts = txStore.getStatus();
+        switch (ts) {
+          case UNKNOWN:
+            System.out.println("Invalid transaction ID: " + fateId);
+            break;
+
+          case SUBMITTED:
+          case IN_PROGRESS:
+          case NEW:
+          case FAILED:
+          case FAILED_IN_PROGRESS:
+          case SUCCESSFUL:
+            System.out.printf("Deleting transaction: %s (%s)%n", fateIdStr, ts);
+            txStore.forceDelete();
+            state = true;
+            break;
+        }
+      } finally {
+        txStore.unreserve(Duration.ZERO);
       }
-    } finally {
-      txStore.unreserve(Duration.ZERO);
     }
+
     return state;
   }
 
-  public boolean prepFail(Map<FateInstanceType,FateStore<T>> stores, ZooReaderWriter zk,
-      ServiceLockPath zLockManagerPath, String fateIdStr) {
-    if (!checkGlobalLock(zk, zLockManagerPath)) {
-      return false;
-    }
+  public boolean prepFail(Map<FateInstanceType,FateStore<T>> stores, String fateIdStr) {
 
     FateId fateId;
     try {
@@ -491,86 +493,93 @@ public boolean prepFail(Map<FateInstanceType,FateStore<T>> stores, ZooReaderWrit
     // determine which store to use
     FateStore<T> store = stores.get(fateId.getType());
 
-    FateTxStore<T> txStore = store.reserve(fateId);
-    try {
-      TStatus ts = txStore.getStatus();
-      switch (ts) {
-        case UNKNOWN:
-          System.out.println("Invalid fate ID: " + fateId);
-          break;
-
-        case SUBMITTED:
-        case IN_PROGRESS:
-        case NEW:
-          System.out.printf("Failing transaction: %s (%s)%n", fateId, ts);
-          txStore.setStatus(TStatus.FAILED_IN_PROGRESS);
-          state = true;
-          break;
-
-        case SUCCESSFUL:
-          System.out.printf("Transaction already completed: %s (%s)%n", fateId, ts);
-          break;
-
-        case FAILED:
-        case FAILED_IN_PROGRESS:
-          System.out.printf("Transaction already failed: %s (%s)%n", fateId, ts);
-          state = true;
-          break;
+    Optional<FateTxStore<T>> opTxStore = tryReserve(store, fateId, "fail");
+    if (opTxStore.isPresent()) {
+      var txStore = opTxStore.orElseThrow();
+
+      try {
+        TStatus ts = txStore.getStatus();
+        switch (ts) {
+          case UNKNOWN:
+            System.out.println("Invalid fate ID: " + fateId);
+            break;
+
+          case SUBMITTED:
+          case IN_PROGRESS:
+          case NEW:
+            System.out.printf("Failing transaction: %s (%s)%n", fateId, ts);
+            txStore.setStatus(TStatus.FAILED_IN_PROGRESS);
+            state = true;
+            break;
+
+          case SUCCESSFUL:
+            System.out.printf("Transaction already completed: %s (%s)%n", fateId, ts);
+            break;
+
+          case FAILED:
+          case FAILED_IN_PROGRESS:
+            System.out.printf("Transaction already failed: %s (%s)%n", fateId, ts);
+            state = true;
+            break;
+        }
+      } finally {
+        txStore.unreserve(Duration.ZERO);
       }
-    } finally {
-      txStore.unreserve(Duration.ZERO);
     }
 
     return state;
   }
 
-  public void deleteLocks(ZooReaderWriter zk, ServiceLockPath path, String fateIdStr)
+  /**
+   * Try to reserve the transaction for a minute. If it could not be reserved, return an empty
+   * optional
+   */
+  private Optional<FateTxStore<T>> tryReserve(FateStore<T> store, FateId fateId, String op) {
+    var retry = Retry.builder().maxRetriesWithinDuration(Duration.ofMinutes(1))
+        .retryAfter(Duration.ofMillis(25)).incrementBy(Duration.ofMillis(25))
+        .maxWait(Duration.ofSeconds(15)).backOffFactor(1.5).logInterval(Duration.ofSeconds(15))
+        .createRetry();
+
+    Optional<FateTxStore<T>> reserveAttempt = store.tryReserve(fateId);
+    while (reserveAttempt.isEmpty() && retry.canRetry()) {
+      retry.useRetry();
+      try {
+        retry.waitForNextAttempt(log, "Attempting to reserve " + fateId);
+      } catch (InterruptedException e) {
+        Thread.currentThread().interrupt();
+        throw new IllegalArgumentException(e);
+      }
+      reserveAttempt = store.tryReserve(fateId);
+    }
+    if (reserveAttempt.isPresent()) {
+      retry.logCompletion(log, "Attempting to reserve " + fateId);
+    } else {
+      log.error("Could not {} {} in a reasonable time. This indicates the Manager is currently "
+          + "working on it. The Manager may need to be stopped and the command rerun to complete "
+          + "this.", op, fateId);
+    }
+
+    return reserveAttempt;
+  }
+
+  public void deleteLocks(ZooSession zk, ServiceLockPath path, String fateIdStr)
       throws KeeperException, InterruptedException {
+    var zrw = zk.asReaderWriter();
+
     // delete any locks assoc w/ fate operation
-    List<String> lockedIds = zk.getChildren(path.toString());
+    List<String> lockedIds = zrw.getChildren(path.toString());
 
     for (String id : lockedIds) {
-      List<String> lockNodes = zk.getChildren(path + "/" + id);
+      List<String> lockNodes = zrw.getChildren(path + "/" + id);
       for (String node : lockNodes) {
         String lockPath = path + "/" + id + "/" + node;
-        byte[] data = zk.getData(path + "/" + id + "/" + node);
+        byte[] data = zrw.getData(path + "/" + id + "/" + node);
         // Example data: "READ:<FateId>". FateId contains ':' hence the limit of 2
         String[] lda = new String(data, UTF_8).split(":", 2);
         if (lda[1].equals(fateIdStr)) {
-          zk.recursiveDelete(lockPath, NodeMissingPolicy.SKIP);
+          zrw.recursiveDelete(lockPath, NodeMissingPolicy.SKIP);
         }
       }
     }
   }
-
-  @SuppressFBWarnings(value = "DM_EXIT",
-      justification = "TODO - should probably avoid System.exit here; "
-          + "this code is used by the fate admin shell command")
-  public boolean checkGlobalLock(ZooReaderWriter zk, ServiceLockPath zLockManagerPath) {
-    try {
-      if (ServiceLock.getLockData(zk.getZooKeeper(), zLockManagerPath).isPresent()) {
-        System.err.println("ERROR: Manager lock is held, not running");
-        if (this.exitOnError) {
-          System.exit(1);
-        } else {
-          return false;
-        }
-      }
-    } catch (KeeperException e) {
-      System.err.println("ERROR: Could not read manager lock, not running " + e.getMessage());
-      if (this.exitOnError) {
-        System.exit(1);
-      } else {
-        return false;
-      }
-    } catch (InterruptedException e) {
-      System.err.println("ERROR: Could not read manager lock, not running" + e.getMessage());
-      if (this.exitOnError) {
-        System.exit(1);
-      } else {
-        return false;
-      }
-    }
-    return true;
-  }
 }
diff --git a/core/src/main/java/org/apache/accumulo/core/fate/Fate.java b/core/src/main/java/org/apache/accumulo/core/fate/Fate.java
index a45cb3a4054..ac579176293 100644
--- a/core/src/main/java/org/apache/accumulo/core/fate/Fate.java
+++ b/core/src/main/java/org/apache/accumulo/core/fate/Fate.java
@@ -54,6 +54,7 @@
 import org.apache.accumulo.core.fate.FateStore.FateTxStore;
 import org.apache.accumulo.core.fate.ReadOnlyFateStore.TStatus;
 import org.apache.accumulo.core.logging.FateLogger;
+import org.apache.accumulo.core.manager.thrift.TFateOperation;
 import org.apache.accumulo.core.util.ShutdownUtil;
 import org.apache.accumulo.core.util.Timer;
 import org.apache.accumulo.core.util.UtilWaitThread;
@@ -78,6 +79,9 @@ public class Fate<T> {
   private final ExecutorService deadResCleanerExecutor;
 
   private static final EnumSet<TStatus> FINISHED_STATES = EnumSet.of(FAILED, SUCCESSFUL, UNKNOWN);
+  public static final Duration INITIAL_DELAY = Duration.ofSeconds(3);
+  private static final Duration DEAD_RES_CLEANUP_DELAY = Duration.ofMinutes(3);
+  private static final Duration POOL_WATCHER_DELAY = Duration.ofSeconds(30);
 
   private final AtomicBoolean keepRunning = new AtomicBoolean(true);
   private final TransferQueue<FateId> workQueue;
@@ -88,6 +92,53 @@ public enum TxInfo {
     TX_NAME, AUTO_CLEAN, EXCEPTION, TX_AGEOFF, RETURN_VALUE
   }
 
+  public enum FateOperation {
+    COMMIT_COMPACTION(null),
+    NAMESPACE_CREATE(TFateOperation.NAMESPACE_CREATE),
+    NAMESPACE_DELETE(TFateOperation.NAMESPACE_DELETE),
+    NAMESPACE_RENAME(TFateOperation.NAMESPACE_RENAME),
+    SHUTDOWN_TSERVER(null),
+    SYSTEM_SPLIT(null),
+    TABLE_BULK_IMPORT2(TFateOperation.TABLE_BULK_IMPORT2),
+    TABLE_CANCEL_COMPACT(TFateOperation.TABLE_CANCEL_COMPACT),
+    TABLE_CLONE(TFateOperation.TABLE_CLONE),
+    TABLE_COMPACT(TFateOperation.TABLE_COMPACT),
+    TABLE_CREATE(TFateOperation.TABLE_CREATE),
+    TABLE_DELETE(TFateOperation.TABLE_DELETE),
+    TABLE_DELETE_RANGE(TFateOperation.TABLE_DELETE_RANGE),
+    TABLE_EXPORT(TFateOperation.TABLE_EXPORT),
+    TABLE_IMPORT(TFateOperation.TABLE_IMPORT),
+    TABLE_MERGE(TFateOperation.TABLE_MERGE),
+    TABLE_OFFLINE(TFateOperation.TABLE_OFFLINE),
+    TABLE_ONLINE(TFateOperation.TABLE_ONLINE),
+    TABLE_RENAME(TFateOperation.TABLE_RENAME),
+    TABLE_SPLIT(TFateOperation.TABLE_SPLIT),
+    TABLE_TABLET_AVAILABILITY(TFateOperation.TABLE_TABLET_AVAILABILITY);
+
+    private final TFateOperation top;
+    private static final EnumSet<FateOperation> nonThriftOps =
+        EnumSet.of(COMMIT_COMPACTION, SHUTDOWN_TSERVER, SYSTEM_SPLIT);
+
+    FateOperation(TFateOperation top) {
+      this.top = top;
+    }
+
+    public static FateOperation fromThrift(TFateOperation top) {
+      return FateOperation.valueOf(top.name());
+    }
+
+    public static EnumSet<FateOperation> getNonThriftOps() {
+      return nonThriftOps;
+    }
+
+    public TFateOperation toThrift() {
+      if (top == null) {
+        throw new IllegalStateException(this + " does not have an equivalent thrift form");
+      }
+      return top;
+    }
+  }
+
   /**
    * A single thread that finds transactions to work on and queues them up. Do not want each worker
    * thread going to the store and looking for work as it would place more load on the store.
@@ -409,7 +460,7 @@ public Fate(T environment, FateStore<T> store, boolean runDeadResCleaner,
           idleCountHistory.add(workQueue.getWaitingConsumerCount());
         }
       }
-    }, 3, 30, SECONDS));
+    }, INITIAL_DELAY.toSeconds(), getPoolWatcherDelay().toSeconds(), SECONDS));
     this.transactionExecutor = pool;
 
     ScheduledExecutorService deadResCleanerExecutor = null;
@@ -418,8 +469,9 @@ public Fate(T environment, FateStore<T> store, boolean runDeadResCleaner,
       // reservations held by dead processes, if they exist.
       deadResCleanerExecutor = ThreadPools.getServerThreadPools().createScheduledExecutorService(1,
           store.type() + "-dead-reservation-cleaner-pool");
-      ScheduledFuture<?> deadReservationCleaner = deadResCleanerExecutor.scheduleWithFixedDelay(
-          new DeadReservationCleaner(), 3, getDeadResCleanupDelay().toSeconds(), SECONDS);
+      ScheduledFuture<?> deadReservationCleaner =
+          deadResCleanerExecutor.scheduleWithFixedDelay(new DeadReservationCleaner(),
+              INITIAL_DELAY.toSeconds(), getDeadResCleanupDelay().toSeconds(), SECONDS);
       ThreadPools.watchCriticalScheduledTask(deadReservationCleaner);
     }
     this.deadResCleanerExecutor = deadResCleanerExecutor;
@@ -429,7 +481,11 @@ public Fate(T environment, FateStore<T> store, boolean runDeadResCleaner,
   }
 
   public Duration getDeadResCleanupDelay() {
-    return Duration.ofMinutes(3);
+    return DEAD_RES_CLEANUP_DELAY;
+  }
+
+  public Duration getPoolWatcherDelay() {
+    return POOL_WATCHER_DELAY;
   }
 
   // get a transaction id back to the requester before doing any work
@@ -437,14 +493,15 @@ public FateId startTransaction() {
     return store.create();
   }
 
-  public void seedTransaction(String txName, FateKey fateKey, Repo<T> repo, boolean autoCleanUp) {
+  public void seedTransaction(FateOperation txName, FateKey fateKey, Repo<T> repo,
+      boolean autoCleanUp) {
     store.seedTransaction(txName, fateKey, repo, autoCleanUp);
   }
 
   // start work in the transaction.. it is safe to call this
   // multiple times for a transaction... but it will only seed once
-  public void seedTransaction(String txName, FateId fateId, Repo<T> repo, boolean autoCleanUp,
-      String goalMessage) {
+  public void seedTransaction(FateOperation txName, FateId fateId, Repo<T> repo,
+      boolean autoCleanUp, String goalMessage) {
     log.info("Seeding {} {}", fateId, goalMessage);
     store.seedTransaction(txName, fateId, repo, autoCleanUp);
   }
diff --git a/core/src/main/java/org/apache/accumulo/core/fate/FateStore.java b/core/src/main/java/org/apache/accumulo/core/fate/FateStore.java
index d434770461e..160d8727127 100644
--- a/core/src/main/java/org/apache/accumulo/core/fate/FateStore.java
+++ b/core/src/main/java/org/apache/accumulo/core/fate/FateStore.java
@@ -50,8 +50,8 @@ public interface FateStore<T> extends ReadOnlyFateStore<T> {
   FateId create();
 
   /**
-   * Seeds a transaction with the given repo if it does not exists. A fateId will be derived from
-   * the fateKey. If seeded, sets the following data for the fateId in the store.
+   * Seeds a transaction with the given repo if it does not exist. A fateId will be derived from the
+   * fateKey. If seeded, sets the following data for the fateId in the store.
    *
    * <ul>
    * <li>Set the tx name</li>
@@ -66,7 +66,7 @@ public interface FateStore<T> extends ReadOnlyFateStore<T> {
    *         empty optional otherwise. If there was a failure this could return an empty optional
    *         when it actually succeeded.
    */
-  Optional<FateId> seedTransaction(String txName, FateKey fateKey, Repo<T> repo,
+  Optional<FateId> seedTransaction(Fate.FateOperation txName, FateKey fateKey, Repo<T> repo,
       boolean autoCleanUp);
 
   /**
@@ -84,7 +84,8 @@ Optional<FateId> seedTransaction(String txName, FateKey fateKey, Repo<T> repo,
    *         failures. When there are no failures returns true if seeded and false otherwise. If
    *         there was a failure this could return false when it actually succeeded.
    */
-  boolean seedTransaction(String txName, FateId fateId, Repo<T> repo, boolean autoCleanUp);
+  boolean seedTransaction(Fate.FateOperation txName, FateId fateId, Repo<T> repo,
+      boolean autoCleanUp);
 
   /**
    * An interface that allows read/write access to the data related to a single fate operation.
diff --git a/core/src/main/java/org/apache/accumulo/core/fate/user/UserFateStore.java b/core/src/main/java/org/apache/accumulo/core/fate/user/UserFateStore.java
index 195848e276b..977adb2440f 100644
--- a/core/src/main/java/org/apache/accumulo/core/fate/user/UserFateStore.java
+++ b/core/src/main/java/org/apache/accumulo/core/fate/user/UserFateStore.java
@@ -40,6 +40,7 @@
 import org.apache.accumulo.core.data.Range;
 import org.apache.accumulo.core.data.Value;
 import org.apache.accumulo.core.fate.AbstractFateStore;
+import org.apache.accumulo.core.fate.Fate;
 import org.apache.accumulo.core.fate.Fate.TxInfo;
 import org.apache.accumulo.core.fate.FateId;
 import org.apache.accumulo.core.fate.FateInstanceType;
@@ -52,7 +53,6 @@
 import org.apache.accumulo.core.fate.user.schema.FateSchema.TxInfoColumnFamily;
 import org.apache.accumulo.core.fate.zookeeper.ZooUtil;
 import org.apache.accumulo.core.iterators.user.WholeRowIterator;
-import org.apache.accumulo.core.metadata.AccumuloTable;
 import org.apache.accumulo.core.security.Authorizations;
 import org.apache.accumulo.core.util.ColumnFQ;
 import org.apache.accumulo.core.util.UtilWaitThread;
@@ -74,6 +74,17 @@ public class UserFateStore<T> extends AbstractFateStore<T> {
   private static final com.google.common.collect.Range<Integer> REPO_RANGE =
       com.google.common.collect.Range.closed(1, MAX_REPOS);
 
+  /**
+   * Constructs a UserFateStore
+   *
+   * @param context the {@link ClientContext}
+   * @param tableName the name of the table which will store the Fate data
+   * @param lockID the {@link ZooUtil.LockID} held by the process creating this store. Should be
+   *        null if this store will be used as read-only (will not be used to reserve transactions)
+   * @param isLockHeld the {@link Predicate} used to determine if the lockID is held or not at the
+   *        time of invocation. If the store is used for a {@link Fate} which runs a dead
+   *        reservation cleaner, this should be non-null, otherwise null is fine
+   */
   public UserFateStore(ClientContext context, String tableName, ZooUtil.LockID lockID,
       Predicate<ZooUtil.LockID> isLockHeld) {
     this(context, tableName, lockID, isLockHeld, DEFAULT_MAX_DEFERRED, DEFAULT_FATE_ID_GENERATOR);
@@ -87,11 +98,6 @@ public UserFateStore(ClientContext context, String tableName, ZooUtil.LockID loc
     this.tableName = Objects.requireNonNull(tableName);
   }
 
-  public UserFateStore(ClientContext context, ZooUtil.LockID lockID,
-      Predicate<ZooUtil.LockID> isLockHeld) {
-    this(context, AccumuloTable.FATE.tableName(), lockID, isLockHeld);
-  }
-
   @Override
   public FateId create() {
 
@@ -126,7 +132,7 @@ public FateId getFateId() {
   }
 
   @Override
-  public Optional<FateId> seedTransaction(String txName, FateKey fateKey, Repo<T> repo,
+  public Optional<FateId> seedTransaction(Fate.FateOperation txName, FateKey fateKey, Repo<T> repo,
       boolean autoCleanUp) {
     final var fateId = fateIdGenerator.fromTypeAndKey(type(), fateKey);
     Supplier<FateMutator<T>> mutatorFactory = () -> newMutator(fateId).requireAbsent()
@@ -139,14 +145,15 @@ public Optional<FateId> seedTransaction(String txName, FateKey fateKey, Repo<T>
   }
 
   @Override
-  public boolean seedTransaction(String txName, FateId fateId, Repo<T> repo, boolean autoCleanUp) {
+  public boolean seedTransaction(Fate.FateOperation txName, FateId fateId, Repo<T> repo,
+      boolean autoCleanUp) {
     Supplier<FateMutator<T>> mutatorFactory =
         () -> newMutator(fateId).requireStatus(TStatus.NEW).requireUnreserved().requireAbsentKey();
     return seedTransaction(mutatorFactory, fateId.canonical(), txName, repo, autoCleanUp);
   }
 
   private boolean seedTransaction(Supplier<FateMutator<T>> mutatorFactory, String logId,
-      String txName, Repo<T> repo, boolean autoCleanUp) {
+      Fate.FateOperation txName, Repo<T> repo, boolean autoCleanUp) {
     int maxAttempts = 5;
     for (int attempt = 0; attempt < maxAttempts; attempt++) {
       var mutator = mutatorFactory.get();
@@ -182,6 +189,7 @@ private boolean seedTransaction(Supplier<FateMutator<T>> mutatorFactory, String
 
   @Override
   public Optional<FateTxStore<T>> tryReserve(FateId fateId) {
+    verifyLock(lockID, fateId);
     // Create a unique FateReservation for this reservation attempt
     FateReservation reservation = FateReservation.from(lockID, UUID.randomUUID());
 
diff --git a/core/src/main/java/org/apache/accumulo/core/fate/zookeeper/DistributedReadWriteLock.java b/core/src/main/java/org/apache/accumulo/core/fate/zookeeper/DistributedReadWriteLock.java
index 28ff670e3aa..221494c9115 100644
--- a/core/src/main/java/org/apache/accumulo/core/fate/zookeeper/DistributedReadWriteLock.java
+++ b/core/src/main/java/org/apache/accumulo/core/fate/zookeeper/DistributedReadWriteLock.java
@@ -142,7 +142,8 @@ public void lock() {
             return;
           }
         } catch (InterruptedException ex) {
-          // ignored
+          Thread.currentThread().interrupt();
+          log.warn("Interrupted while waiting to acquire lock", ex);
         }
       }
     }
diff --git a/core/src/main/java/org/apache/accumulo/core/fate/zookeeper/MetaFateStore.java b/core/src/main/java/org/apache/accumulo/core/fate/zookeeper/MetaFateStore.java
index 4a691417c64..242e0b5e74f 100644
--- a/core/src/main/java/org/apache/accumulo/core/fate/zookeeper/MetaFateStore.java
+++ b/core/src/main/java/org/apache/accumulo/core/fate/zookeeper/MetaFateStore.java
@@ -56,6 +56,7 @@
 import org.apache.accumulo.core.fate.Repo;
 import org.apache.accumulo.core.fate.StackOverflowException;
 import org.apache.accumulo.core.fate.zookeeper.ZooUtil.NodeExistsPolicy;
+import org.apache.accumulo.core.zookeeper.ZooSession;
 import org.apache.hadoop.io.DataInputBuffer;
 import org.apache.zookeeper.KeeperException;
 import org.apache.zookeeper.KeeperException.NoNodeException;
@@ -75,39 +76,47 @@ public class MetaFateStore<T> extends AbstractFateStore<T> {
   private static final Logger log = LoggerFactory.getLogger(MetaFateStore.class);
   private static final FateInstanceType fateInstanceType = FateInstanceType.META;
   private String path;
-  private ZooReaderWriter zk;
+  private ZooSession zk;
+  private ZooReaderWriter zrw;
 
   private String getTXPath(FateId fateId) {
     return path + "/tx_" + fateId.getTxUUIDStr();
   }
 
-  public MetaFateStore(String path, ZooReaderWriter zk, ZooUtil.LockID lockID,
+  /**
+   * Constructs a MetaFateStore
+   *
+   * @param path the path in ZK where the fate data will reside
+   * @param zk the {@link ZooSession}
+   * @param lockID the {@link ZooUtil.LockID} held by the process creating this store. Should be
+   *        null if this store will be used as read-only (will not be used to reserve transactions)
+   * @param isLockHeld the {@link Predicate} used to determine if the lockID is held or not at the
+   *        time of invocation. If the store is used for a {@link Fate} which runs a dead
+   *        reservation cleaner, this should be non-null, otherwise null is fine
+   */
+  public MetaFateStore(String path, ZooSession zk, ZooUtil.LockID lockID,
       Predicate<ZooUtil.LockID> isLockHeld) throws KeeperException, InterruptedException {
     this(path, zk, lockID, isLockHeld, DEFAULT_MAX_DEFERRED, DEFAULT_FATE_ID_GENERATOR);
   }
 
   @VisibleForTesting
-  public MetaFateStore(String path, ZooReaderWriter zk, ZooUtil.LockID lockID,
+  public MetaFateStore(String path, ZooSession zk, ZooUtil.LockID lockID,
       Predicate<ZooUtil.LockID> isLockHeld, int maxDeferred, FateIdGenerator fateIdGenerator)
       throws KeeperException, InterruptedException {
     super(lockID, isLockHeld, maxDeferred, fateIdGenerator);
     this.path = path;
     this.zk = zk;
+    this.zrw = zk.asReaderWriter();
 
-    zk.putPersistentData(path, new byte[0], NodeExistsPolicy.SKIP);
+    this.zrw.putPersistentData(path, new byte[0], NodeExistsPolicy.SKIP);
   }
 
-  /**
-   * For testing only
-   */
-  MetaFateStore() {}
-
   @Override
   public FateId create() {
     while (true) {
       try {
         FateId fateId = fateIdGenerator.newRandomId(fateInstanceType);
-        zk.putPersistentData(getTXPath(fateId),
+        zrw.putPersistentData(getTXPath(fateId),
             new FateData<T>(TStatus.NEW, null, null, createEmptyRepoDeque(), createEmptyTxInfo())
                 .serialize(),
             NodeExistsPolicy.FAIL);
@@ -121,20 +130,20 @@ public FateId create() {
   }
 
   private Optional<FateTxStore<T>> createAndReserve(FateKey fateKey) {
-    final var reservation = FateReservation.from(lockID, UUID.randomUUID());
     final var fateId = fateIdGenerator.fromTypeAndKey(type(), fateKey);
+    verifyLock(lockID, fateId);
+    final var reservation = FateReservation.from(lockID, UUID.randomUUID());
 
     try {
       byte[] newSerFateData =
-          zk.mutateOrCreate(getTXPath(fateId), new FateData<>(TStatus.NEW, reservation, fateKey,
+          zrw.mutateOrCreate(getTXPath(fateId), new FateData<>(TStatus.NEW, reservation, fateKey,
               createEmptyRepoDeque(), createEmptyTxInfo()).serialize(), currSerFateData -> {
                 // We are only returning a non-null value for the following cases:
                 // 1) The existing node for fateId is exactly the same as the value set for the
                 // node if it doesn't yet exist:
                 // TStatus = TStatus.NEW, FateReservation = reservation, FateKey = fateKey
                 // This might occur if there was a ZK server fault and the same write is running a
-                // 2nd
-                // time
+                // 2nd time
                 // 2) The existing node for fateId has:
                 // TStatus = TStatus.NEW, no FateReservation present, FateKey = fateKey
                 // The fateId is NEW/unseeded and not reserved, so we can allow it to be reserved
@@ -172,7 +181,7 @@ private Optional<FateTxStore<T>> createAndReserve(FateKey fateKey) {
   }
 
   @Override
-  public Optional<FateId> seedTransaction(String txName, FateKey fateKey, Repo<T> repo,
+  public Optional<FateId> seedTransaction(Fate.FateOperation txName, FateKey fateKey, Repo<T> repo,
       boolean autoCleanUp) {
     return createAndReserve(fateKey).map(txStore -> {
       try {
@@ -185,7 +194,8 @@ public Optional<FateId> seedTransaction(String txName, FateKey fateKey, Repo<T>
   }
 
   @Override
-  public boolean seedTransaction(String txName, FateId fateId, Repo<T> repo, boolean autoCleanUp) {
+  public boolean seedTransaction(Fate.FateOperation txName, FateId fateId, Repo<T> repo,
+      boolean autoCleanUp) {
     return tryReserve(fateId).map(txStore -> {
       try {
         if (txStore.getStatus() == NEW) {
@@ -199,7 +209,7 @@ public boolean seedTransaction(String txName, FateId fateId, Repo<T> repo, boole
     }).orElse(false);
   }
 
-  private void seedTransaction(String txName, Repo<T> repo, boolean autoCleanUp,
+  private void seedTransaction(Fate.FateOperation txName, Repo<T> repo, boolean autoCleanUp,
       FateTxStore<T> txStore) {
     if (txStore.top() == null) {
       try {
@@ -219,6 +229,7 @@ private void seedTransaction(String txName, Repo<T> repo, boolean autoCleanUp,
 
   @Override
   public Optional<FateTxStore<T>> tryReserve(FateId fateId) {
+    verifyLock(lockID, fateId);
     // uniquely identify this attempt to reserve the fate operation data
     FateReservation reservation = FateReservation.from(lockID, UUID.randomUUID());
 
@@ -425,7 +436,7 @@ private void _delete(Set<TStatus> requiredStatus) {
             "Tried to delete fate data for %s when the transaction status is %s", fateId,
             fateData.status);
         try {
-          zk.deleteStrict(getTXPath(fateId), stat.getVersion());
+          zrw.deleteStrict(getTXPath(fateId), stat.getVersion());
           this.deleted = true;
         } catch (KeeperException.BadVersionException e) {
           log.trace(
@@ -465,7 +476,7 @@ public long timeCreated() {
       verifyReservedAndNotDeleted(false);
 
       try {
-        Stat stat = zk.getZooKeeper().exists(getTXPath(fateId), false);
+        Stat stat = zk.exists(getTXPath(fateId), null);
         return stat.getCtime();
       } catch (Exception e) {
         return 0;
@@ -528,7 +539,7 @@ protected Optional<FateKey> getKey(FateId fateId) {
 
   private FateData<T> getFateData(FateId fateId) {
     try {
-      return new FateData<>(zk.getData(getTXPath(fateId)));
+      return new FateData<>(zrw.getData(getTXPath(fateId)));
     } catch (NoNodeException nne) {
       return new FateData<>(TStatus.UNKNOWN, null, null, createEmptyRepoDeque(),
           createEmptyTxInfo());
@@ -539,7 +550,7 @@ private FateData<T> getFateData(FateId fateId) {
 
   private FateData<T> getFateData(FateId fateId, Stat stat) {
     try {
-      return new FateData<>(zk.getData(getTXPath(fateId), stat));
+      return new FateData<>(zrw.getData(getTXPath(fateId), stat));
     } catch (NoNodeException nne) {
       return new FateData<>(TStatus.UNKNOWN, null, null, createEmptyRepoDeque(),
           createEmptyTxInfo());
@@ -556,7 +567,7 @@ protected FateTxStore<T> newUnreservedFateTxStore(FateId fateId) {
   @Override
   protected Stream<FateIdStatus> getTransactions(EnumSet<TStatus> statuses) {
     try {
-      Stream<FateIdStatus> stream = zk.getChildren(path).stream().map(strTxid -> {
+      Stream<FateIdStatus> stream = zrw.getChildren(path).stream().map(strTxid -> {
         String txUUIDStr = strTxid.split("_")[1];
         FateId fateId = FateId.from(fateInstanceType, txUUIDStr);
         // Memoizing for two reasons. First the status or reservation may never be requested, so
@@ -611,7 +622,7 @@ private Map<TxInfo,Serializable> createEmptyTxInfo() {
   private byte[] mutate(FateId fateId, UnaryOperator<FateData<T>> fateDataOp)
       throws KeeperException {
     try {
-      return zk.mutateExisting(getTXPath(fateId), currSerFateData -> {
+      return zrw.mutateExisting(getTXPath(fateId), currSerFateData -> {
         FateData<T> currFateData = new FateData<>(currSerFateData);
         FateData<T> newFateData = fateDataOp.apply(currFateData);
         if (newFateData == null) {
diff --git a/core/src/main/java/org/apache/accumulo/core/fate/zookeeper/ZooCache.java b/core/src/main/java/org/apache/accumulo/core/fate/zookeeper/ZooCache.java
index 596037c1de1..6e2d334db77 100644
--- a/core/src/main/java/org/apache/accumulo/core/fate/zookeeper/ZooCache.java
+++ b/core/src/main/java/org/apache/accumulo/core/fate/zookeeper/ZooCache.java
@@ -19,6 +19,7 @@
 package org.apache.accumulo.core.fate.zookeeper;
 
 import static java.nio.charset.StandardCharsets.UTF_8;
+import static java.util.Objects.requireNonNull;
 import static org.apache.accumulo.core.util.LazySingletons.RANDOM;
 
 import java.time.Duration;
@@ -28,17 +29,18 @@
 import java.util.concurrent.ConcurrentMap;
 import java.util.concurrent.atomic.AtomicLong;
 import java.util.concurrent.locks.LockSupport;
+import java.util.function.Consumer;
 import java.util.function.Predicate;
 
 import org.apache.accumulo.core.lock.ServiceLock;
 import org.apache.accumulo.core.lock.ServiceLockData;
 import org.apache.accumulo.core.lock.ServiceLockPaths.ServiceLockPath;
 import org.apache.accumulo.core.util.cache.Caches;
+import org.apache.accumulo.core.zookeeper.ZooSession;
 import org.apache.zookeeper.KeeperException;
 import org.apache.zookeeper.KeeperException.Code;
 import org.apache.zookeeper.WatchedEvent;
 import org.apache.zookeeper.Watcher;
-import org.apache.zookeeper.ZooKeeper;
 import org.apache.zookeeper.data.Stat;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -52,10 +54,13 @@
  * A cache for values stored in ZooKeeper. Values are kept up to date as they change.
  */
 public class ZooCache {
+
+  public interface ZooCacheWatcher extends Consumer<WatchedEvent> {}
+
   private static final Logger log = LoggerFactory.getLogger(ZooCache.class);
 
   private final ZCacheWatcher watcher = new ZCacheWatcher();
-  private final Watcher externalWatcher;
+  private final Optional<ZooCacheWatcher> externalWatcher;
 
   private static final AtomicLong nextCacheId = new AtomicLong(0);
   private final String cacheId = "ZC" + nextCacheId.incrementAndGet();
@@ -65,7 +70,7 @@ public class ZooCache {
   // their compute functions.
   private final ConcurrentMap<String,ZcNode> nodeCache;
 
-  private final ZooReader zReader;
+  private final ZooSession zk;
 
   private volatile boolean closed = false;
 
@@ -101,19 +106,6 @@ public long getMzxid() {
 
   private final AtomicLong updateCount = new AtomicLong(0);
 
-  /**
-   * Returns a ZooKeeper session. Calls should be made within run of ZooRunnable after caches are
-   * checked. This will be performed at each retry of the run method. Calls to this method should be
-   * made, ideally, after cache checks since other threads may have succeeded when updating the
-   * cache. Doing this will ensure that we don't pay the cost of retrieving a ZooKeeper session on
-   * each retry until we've ensured the caches aren't populated for a given node.
-   *
-   * @return ZooKeeper session.
-   */
-  private ZooKeeper getZooKeeper() {
-    return zReader.getZooKeeper();
-  }
-
   private class ZCacheWatcher implements Watcher {
     @Override
     public void process(WatchedEvent event) {
@@ -160,31 +152,39 @@ public void process(WatchedEvent event) {
           break;
       }
 
-      if (externalWatcher != null) {
-        externalWatcher.process(event);
-      }
+      externalWatcher.ifPresent(w -> w.accept(event));
     }
   }
 
+  /**
+   * Creates a new cache without an external watcher.
+   *
+   * @param zk the ZooKeeper instance
+   * @throws NullPointerException if zk is {@code null}
+   */
+  public ZooCache(ZooSession zk) {
+    this(zk, Optional.empty(), Duration.ofMinutes(3));
+  }
+
   /**
    * Creates a new cache. The given watcher is called whenever a watched node changes.
    *
-   * @param reader ZooKeeper reader
+   * @param zk the ZooKeeper instance
    * @param watcher watcher object
+   * @throws NullPointerException if zk or watcher is {@code null}
    */
-  public ZooCache(ZooReader reader, Watcher watcher) {
-    this(reader, watcher, Duration.ofMinutes(3));
+  public ZooCache(ZooSession zk, ZooCacheWatcher watcher) {
+    this(zk, Optional.of(watcher), Duration.ofMinutes(3));
   }
 
-  public ZooCache(ZooReader reader, Watcher watcher, Duration timeout) {
-    this.zReader = reader;
+  public ZooCache(ZooSession zk, Optional<ZooCacheWatcher> watcher, Duration timeout) {
+    this.zk = requireNonNull(zk);
     this.externalWatcher = watcher;
     RemovalListener<String,ZcNode> removalListerner = (path, zcNode, reason) -> {
       try {
         log.trace("{} removing watches for {} because {} accesses {}", cacheId, path, reason,
             zcNode == null ? -1 : zcNode.getAccessCount());
-        reader.getZooKeeper().removeWatches(path, ZooCache.this.watcher, Watcher.WatcherType.Any,
-            false);
+        zk.removeWatches(path, ZooCache.this.watcher, Watcher.WatcherType.Any, false);
       } catch (InterruptedException | KeeperException | RuntimeException e) {
         log.warn("{} failed to remove watches on path {} in zookeeper", cacheId, path, e);
       }
@@ -316,20 +316,18 @@ public List<String> run() throws KeeperException, InterruptedException {
           if (zcn != null && zcn.cachedChildren()) {
             return zcn;
           }
-
           try {
-            final ZooKeeper zooKeeper = getZooKeeper();
             // Register a watcher on the node to monitor creation/deletion events for the node. It
             // is possible that an event from this watch could trigger prior to calling getChildren.
             // That is ok because the compute() call on the map has a lock and processing the event
             // will block until compute() returns. After compute() returns the event processing
             // would clear the map entry.
-            Stat stat = zooKeeper.exists(zPath, watcher);
+            Stat stat = zk.exists(zPath, watcher);
             if (stat == null) {
               log.trace("{} getChildren saw that {} does not exists", cacheId, zPath);
               return ZcNode.NON_EXISTENT;
             }
-            List<String> children = zooKeeper.getChildren(zPath, watcher);
+            List<String> children = zk.getChildren(zPath, watcher);
             log.trace("{} adding {} children of {} to cache", cacheId, children.size(), zPath);
             return new ZcNode(children, zcn);
           } catch (KeeperException.NoNodeException nne) {
@@ -402,8 +400,7 @@ public byte[] run() throws KeeperException, InterruptedException {
            * non-existence can not be cached.
            */
           try {
-            final ZooKeeper zooKeeper = getZooKeeper();
-            Stat stat = zooKeeper.exists(zPath, watcher);
+            Stat stat = zk.exists(zPath, watcher);
             if (stat == null) {
               if (log.isTraceEnabled()) {
                 log.trace("{} zookeeper did not contain {}", cacheId, zPath);
@@ -413,7 +410,7 @@ public byte[] run() throws KeeperException, InterruptedException {
               byte[] data = null;
               ZcStat zstat = null;
               try {
-                data = zooKeeper.getData(zPath, watcher, stat);
+                data = zk.getData(zPath, watcher, stat);
                 zstat = new ZcStat(stat);
               } catch (KeeperException.BadVersionException | KeeperException.NoNodeException e1) {
                 throw new ConcurrentModificationException(e1);
@@ -520,13 +517,10 @@ public void clear(Predicate<String> pathPredicate) {
 
     Predicate<String> pathPredicateToUse;
     if (log.isTraceEnabled()) {
-      pathPredicateToUse = path -> {
-        boolean testResult = pathPredicate.test(path);
-        if (testResult) {
-          log.trace("{} removing {} from cache", cacheId, path);
-        }
-        return testResult;
-      };
+      pathPredicateToUse = pathPredicate.and(path -> {
+        log.trace("removing {} from cache", path);
+        return true;
+      });
     } else {
       pathPredicateToUse = pathPredicate;
     }
diff --git a/core/src/main/java/org/apache/accumulo/core/fate/zookeeper/ZooCacheFactory.java b/core/src/main/java/org/apache/accumulo/core/fate/zookeeper/ZooCacheFactory.java
deleted file mode 100644
index 2e1987af344..00000000000
--- a/core/src/main/java/org/apache/accumulo/core/fate/zookeeper/ZooCacheFactory.java
+++ /dev/null
@@ -1,128 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.accumulo.core.fate.zookeeper;
-
-import java.util.HashMap;
-import java.util.Map;
-
-import org.apache.accumulo.core.singletons.SingletonManager;
-import org.apache.accumulo.core.singletons.SingletonService;
-
-/**
- * A factory for {@link ZooCache} instances.
- * <p>
- * Implementation note: We were using the instances map to track all the instances that have been
- * created, so we could explicitly close them when the SingletonManager detected that the last
- * legacy client (using Connector/ZooKeeperInstance) has gone away. This class may no longer be
- * needed, since the legacy client code has been removed, so long as the ZooCache instances it is
- * tracking are managed as resources within ClientContext or ServerContext, and explicitly closed
- * when those are closed.
- */
-public class ZooCacheFactory {
-
-  private static final Map<String,ZooCache> instances = new HashMap<>();
-  private static boolean enabled = true;
-
-  public ZooCacheFactory() {}
-
-  private static boolean isEnabled() {
-    synchronized (instances) {
-      return enabled;
-    }
-  }
-
-  private static void enable() {
-    synchronized (instances) {
-      enabled = true;
-    }
-  }
-
-  private static void disable() {
-    synchronized (instances) {
-      try {
-        instances.values().forEach(ZooCache::close);
-      } finally {
-        instances.clear();
-        enabled = false;
-      }
-    }
-  }
-
-  static {
-    // important because of ZOOKEEPER-2368.. when zookeeper client is closed it does not generate an
-    // event!
-    SingletonManager.register(new SingletonService() {
-
-      @Override
-      public synchronized boolean isEnabled() {
-        return ZooCacheFactory.isEnabled();
-      }
-
-      @Override
-      public synchronized void enable() {
-        ZooCacheFactory.enable();
-      }
-
-      @Override
-      public synchronized void disable() {
-        ZooCacheFactory.disable();
-      }
-    });
-
-  }
-
-  /**
-   * Gets a {@link ZooCache}. The same object may be returned for multiple calls with the same
-   * arguments.
-   *
-   * @param zooKeepers comma-separated list of ZooKeeper host[:port]s
-   * @param sessionTimeout session timeout
-   * @return cache object
-   */
-  public ZooCache getZooCache(String zooKeepers, int sessionTimeout) {
-    String key = zooKeepers + ":" + sessionTimeout;
-    synchronized (instances) {
-      if (!isEnabled()) {
-        throw new IllegalStateException("The Accumulo singleton for zookeeper caching is "
-            + "disabled. This is likely caused by all AccumuloClients being closed");
-      }
-      return instances.computeIfAbsent(key, k -> getNewZooCache(zooKeepers, sessionTimeout));
-    }
-  }
-
-  /**
-   * Always return a new {@link ZooCache}.
-   *
-   * @param zooKeepers comma-separated list of ZooKeeper host[:port]s
-   * @param sessionTimeout session timeout
-   * @return a new instance
-   */
-  public ZooCache getNewZooCache(String zooKeepers, int sessionTimeout) {
-    return new ZooCache(new ZooReader(zooKeepers, sessionTimeout), null);
-  }
-
-  /**
-   * Resets the factory. All cached objects are flushed.
-   */
-  void reset() {
-    synchronized (instances) {
-      instances.clear();
-    }
-  }
-}
diff --git a/core/src/main/java/org/apache/accumulo/core/fate/zookeeper/ZooReader.java b/core/src/main/java/org/apache/accumulo/core/fate/zookeeper/ZooReader.java
index 9d9738de1bf..7f67241b4a2 100644
--- a/core/src/main/java/org/apache/accumulo/core/fate/zookeeper/ZooReader.java
+++ b/core/src/main/java/org/apache/accumulo/core/fate/zookeeper/ZooReader.java
@@ -29,10 +29,10 @@
 import org.apache.accumulo.core.clientImpl.AcceptableThriftTableOperationException;
 import org.apache.accumulo.core.util.Retry;
 import org.apache.accumulo.core.util.Retry.RetryFactory;
+import org.apache.accumulo.core.zookeeper.ZooSession;
 import org.apache.zookeeper.KeeperException;
 import org.apache.zookeeper.KeeperException.Code;
 import org.apache.zookeeper.Watcher;
-import org.apache.zookeeper.ZooKeeper;
 import org.apache.zookeeper.data.Stat;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -45,36 +45,26 @@ public class ZooReader {
           .incrementBy(Duration.ofMillis(250)).maxWait(Duration.ofMinutes(2)).backOffFactor(1.5)
           .logInterval(Duration.ofMinutes(3)).createFactory();
 
-  protected final String connectString;
-  protected final int timeout;
+  private final ZooSession zk;
 
-  public ZooReader(String connectString, int timeout) {
-    this.connectString = requireNonNull(connectString);
-    this.timeout = timeout;
-  }
-
-  public ZooReaderWriter asWriter(String secret) {
-    return new ZooReaderWriter(connectString, timeout, secret);
+  /**
+   * Decorate a ZooKeeper with additional, more convenient functionality.
+   *
+   * @param zk the ZooKeeper instance
+   * @throws NullPointerException if zk is {@code null}
+   */
+  public ZooReader(ZooSession zk) {
+    this.zk = requireNonNull(zk);
   }
 
-  protected ZooKeeper getZooKeeper() {
-    return ZooSession.getAnonymousSession(connectString, timeout);
+  protected ZooSession getZooKeeper() {
+    return zk;
   }
 
   protected RetryFactory getRetryFactory() {
     return RETRY_FACTORY;
   }
 
-  /**
-   * Returns the requested ZooKeeper client session timeout. The client may negotiate a different
-   * value and the actual negotiated value may change after a re-connect.
-   *
-   * @return the timeout in milliseconds
-   */
-  public int getSessionTimeout() {
-    return timeout;
-  }
-
   public byte[] getData(String zPath) throws KeeperException, InterruptedException {
     return retryLoop(zk -> zk.getData(zPath, null, null));
   }
@@ -135,11 +125,11 @@ public void sync(final String path) throws KeeperException, InterruptedException
   }
 
   protected interface ZKFunction<R> {
-    R apply(ZooKeeper zk) throws KeeperException, InterruptedException;
+    R apply(ZooSession zk) throws KeeperException, InterruptedException;
   }
 
   protected interface ZKFunctionMutator<R> {
-    R apply(ZooKeeper zk)
+    R apply(ZooSession zk)
         throws KeeperException, InterruptedException, AcceptableThriftTableOperationException;
   }
 
diff --git a/core/src/main/java/org/apache/accumulo/core/fate/zookeeper/ZooReaderWriter.java b/core/src/main/java/org/apache/accumulo/core/fate/zookeeper/ZooReaderWriter.java
index ed0566bbba8..2f105262253 100644
--- a/core/src/main/java/org/apache/accumulo/core/fate/zookeeper/ZooReaderWriter.java
+++ b/core/src/main/java/org/apache/accumulo/core/fate/zookeeper/ZooReaderWriter.java
@@ -18,20 +18,17 @@
  */
 package org.apache.accumulo.core.fate.zookeeper;
 
-import static java.nio.charset.StandardCharsets.UTF_8;
 import static java.util.Objects.requireNonNull;
 
 import java.util.List;
 
 import org.apache.accumulo.core.clientImpl.AcceptableThriftTableOperationException;
-import org.apache.accumulo.core.conf.AccumuloConfiguration;
-import org.apache.accumulo.core.conf.Property;
 import org.apache.accumulo.core.fate.zookeeper.ZooUtil.NodeExistsPolicy;
 import org.apache.accumulo.core.fate.zookeeper.ZooUtil.NodeMissingPolicy;
+import org.apache.accumulo.core.zookeeper.ZooSession;
 import org.apache.zookeeper.CreateMode;
 import org.apache.zookeeper.KeeperException;
 import org.apache.zookeeper.KeeperException.Code;
-import org.apache.zookeeper.ZooKeeper;
 import org.apache.zookeeper.data.ACL;
 import org.apache.zookeeper.data.Stat;
 
@@ -40,32 +37,14 @@ public interface Mutator {
     byte[] mutate(byte[] currentValue) throws AcceptableThriftTableOperationException;
   }
 
-  public ZooReaderWriter(AccumuloConfiguration conf) {
-    this(conf.get(Property.INSTANCE_ZK_HOST),
-        (int) conf.getTimeInMillis(Property.INSTANCE_ZK_TIMEOUT),
-        conf.get(Property.INSTANCE_SECRET));
-  }
-
-  private final String secret;
-  private final byte[] auth;
-
-  ZooReaderWriter(String connectString, int timeoutInMillis, String secret) {
-    super(connectString, timeoutInMillis);
-    this.secret = requireNonNull(secret);
-    this.auth = ("accumulo:" + secret).getBytes(UTF_8);
-  }
-
-  @Override
-  public ZooReaderWriter asWriter(String secret) {
-    if (this.secret.equals(secret)) {
-      return this;
-    }
-    return super.asWriter(secret);
-  }
-
-  @Override
-  public ZooKeeper getZooKeeper() {
-    return ZooSession.getAuthenticatedSession(connectString, timeout, "digest", auth);
+  /**
+   * Decorate a ZooKeeper with additional, more convenient functionality.
+   *
+   * @param zk the ZooKeeper instance
+   * @throws NullPointerException if zk is {@code null}
+   */
+  public ZooReaderWriter(ZooSession zk) {
+    super(zk);
   }
 
   /**
diff --git a/core/src/main/java/org/apache/accumulo/core/fate/zookeeper/ZooSession.java b/core/src/main/java/org/apache/accumulo/core/fate/zookeeper/ZooSession.java
deleted file mode 100644
index b53fb597fbf..00000000000
--- a/core/src/main/java/org/apache/accumulo/core/fate/zookeeper/ZooSession.java
+++ /dev/null
@@ -1,252 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.accumulo.core.fate.zookeeper;
-
-import static java.nio.charset.StandardCharsets.UTF_8;
-import static java.util.concurrent.TimeUnit.NANOSECONDS;
-import static org.apache.accumulo.core.util.LazySingletons.RANDOM;
-
-import java.io.IOException;
-import java.net.UnknownHostException;
-import java.util.HashMap;
-import java.util.Map;
-
-import org.apache.accumulo.core.singletons.SingletonManager;
-import org.apache.accumulo.core.singletons.SingletonService;
-import org.apache.accumulo.core.util.AddressUtil;
-import org.apache.accumulo.core.util.UtilWaitThread;
-import org.apache.zookeeper.WatchedEvent;
-import org.apache.zookeeper.Watcher;
-import org.apache.zookeeper.Watcher.Event.KeeperState;
-import org.apache.zookeeper.ZooKeeper;
-import org.apache.zookeeper.ZooKeeper.States;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-public class ZooSession {
-
-  public static class ZooSessionShutdownException extends RuntimeException {
-
-    public ZooSessionShutdownException(String msg) {
-      super(msg);
-    }
-
-    private static final long serialVersionUID = 1L;
-
-  }
-
-  private static final Logger log = LoggerFactory.getLogger(ZooSession.class);
-
-  private static class ZooSessionInfo {
-    public ZooSessionInfo(ZooKeeper zooKeeper) {
-      this.zooKeeper = zooKeeper;
-    }
-
-    final ZooKeeper zooKeeper;
-  }
-
-  private static Map<String,ZooSessionInfo> sessions = new HashMap<>();
-
-  static {
-    SingletonManager.register(new SingletonService() {
-
-      @Override
-      public boolean isEnabled() {
-        return ZooSession.isEnabled();
-      }
-
-      @Override
-      public void enable() {
-        ZooSession.enable();
-      }
-
-      @Override
-      public void disable() {
-        ZooSession.disable();
-      }
-    });
-  }
-
-  private static String sessionKey(String keepers, int timeout, String scheme, byte[] auth) {
-    return keepers + ":" + timeout + ":" + (scheme == null ? "" : scheme) + ":"
-        + (auth == null ? "" : new String(auth, UTF_8));
-  }
-
-  private static class ZooWatcher implements Watcher {
-
-    @Override
-    public void process(WatchedEvent event) {
-      if (event.getState() == KeeperState.Expired) {
-        log.debug("Session expired; {}", event);
-      }
-    }
-
-  }
-
-  /**
-   * @param connectString in the form of host1:port1,host2:port2/chroot/path
-   * @param timeout in milliseconds
-   * @param scheme authentication type, e.g. 'digest', may be null
-   * @param auth authentication-scheme-specific token, may be null
-   * @param watcher ZK notifications, may be null
-   */
-  static ZooKeeper connect(String connectString, int timeout, String scheme, byte[] auth,
-      Watcher watcher) {
-    final int TIME_BETWEEN_CONNECT_CHECKS_MS = 100;
-    int connectTimeWait = Math.min(10_000, timeout);
-    boolean tryAgain = true;
-    long sleepTime = 100;
-    ZooKeeper zooKeeper = null;
-
-    long startTime = System.nanoTime();
-
-    while (tryAgain) {
-      try {
-        zooKeeper = new ZooKeeper(connectString, timeout, watcher);
-        // it may take some time to get connected to zookeeper if some of the servers are down
-        for (int i = 0; i < connectTimeWait / TIME_BETWEEN_CONNECT_CHECKS_MS && tryAgain; i++) {
-          if (zooKeeper.getState().equals(States.CONNECTED)) {
-            if (auth != null) {
-              ZooUtil.auth(zooKeeper, scheme, auth);
-            }
-            tryAgain = false;
-          } else {
-            UtilWaitThread.sleep(TIME_BETWEEN_CONNECT_CHECKS_MS);
-          }
-        }
-
-      } catch (IOException e) {
-        if (e instanceof UnknownHostException) {
-          /*
-           * Make sure we wait at least as long as the JVM TTL for negative DNS responses
-           */
-          int ttl = AddressUtil.getAddressCacheNegativeTtl((UnknownHostException) e);
-          sleepTime = Math.max(sleepTime, (ttl + 1) * 1000L);
-        }
-        log.warn("Connection to zooKeeper failed, will try again in "
-            + String.format("%.2f secs", sleepTime / 1000.0), e);
-      } finally {
-        if (tryAgain && zooKeeper != null) {
-          try {
-            zooKeeper.close();
-            zooKeeper = null;
-          } catch (InterruptedException e) {
-            log.warn("interrupted", e);
-          }
-        }
-      }
-
-      long stopTime = System.nanoTime();
-      long duration = NANOSECONDS.toMillis(stopTime - startTime);
-
-      if (duration > 2L * timeout) {
-        throw new IllegalStateException("Failed to connect to zookeeper (" + connectString
-            + ") within 2x zookeeper timeout period " + timeout);
-      }
-
-      if (tryAgain) {
-        if (2L * timeout < duration + sleepTime + connectTimeWait) {
-          sleepTime = 2L * timeout - duration - connectTimeWait;
-        }
-        if (sleepTime < 0) {
-          connectTimeWait -= sleepTime;
-          sleepTime = 0;
-        }
-        UtilWaitThread.sleep(sleepTime);
-        if (sleepTime < 10000) {
-          sleepTime = sleepTime + (long) (sleepTime * RANDOM.get().nextDouble());
-        }
-      }
-    }
-
-    return zooKeeper;
-  }
-
-  public static ZooKeeper getAuthenticatedSession(String connectString, int timeout, String scheme,
-      byte[] auth) {
-    return getSession(connectString, timeout, scheme, auth);
-  }
-
-  public static ZooKeeper getAnonymousSession(String connectString, int timeout) {
-    return getSession(connectString, timeout, null, null);
-  }
-
-  private static synchronized ZooKeeper getSession(String connectString, int timeout, String scheme,
-      byte[] auth) {
-
-    if (sessions == null) {
-      throw new ZooSessionShutdownException(
-          "The Accumulo singleton that that tracks zookeeper session is disabled.  This is likely "
-              + "caused by all AccumuloClients being closed or garbage collected.");
-    }
-
-    String sessionKey = sessionKey(connectString, timeout, scheme, auth);
-
-    // a read-only session can use a session with authorizations, so cache a copy for it w/out auths
-    String readOnlySessionKey = sessionKey(connectString, timeout, null, null);
-    ZooSessionInfo zsi = sessions.get(sessionKey);
-    if (zsi != null && zsi.zooKeeper.getState() == States.CLOSED) {
-      log.debug("Removing closed ZooKeeper session to {}", connectString);
-      if (auth != null && sessions.get(readOnlySessionKey) == zsi) {
-        sessions.remove(readOnlySessionKey);
-      }
-      zsi = null;
-      sessions.remove(sessionKey);
-    }
-
-    if (zsi == null) {
-      ZooWatcher watcher = new ZooWatcher();
-      log.debug("Connecting to {} with timeout {} with auth", connectString, timeout);
-      zsi = new ZooSessionInfo(connect(connectString, timeout, scheme, auth, watcher));
-      sessions.put(sessionKey, zsi);
-      if (auth != null && !sessions.containsKey(readOnlySessionKey)) {
-        sessions.put(readOnlySessionKey, zsi);
-      }
-    }
-    return zsi.zooKeeper;
-  }
-
-  private static synchronized boolean isEnabled() {
-    return sessions != null;
-  }
-
-  private static synchronized void enable() {
-    if (sessions != null) {
-      return;
-    }
-
-    sessions = new HashMap<>();
-  }
-
-  private static synchronized void disable() {
-    if (sessions == null) {
-      return;
-    }
-
-    for (ZooSessionInfo zsi : sessions.values()) {
-      try {
-        zsi.zooKeeper.close();
-      } catch (Exception e) {
-        log.debug("Error closing zookeeper during shutdown", e);
-      }
-    }
-
-    sessions = null;
-  }
-}
diff --git a/core/src/main/java/org/apache/accumulo/core/fate/zookeeper/ZooUtil.java b/core/src/main/java/org/apache/accumulo/core/fate/zookeeper/ZooUtil.java
index 263f17e440c..156b4f14a6b 100644
--- a/core/src/main/java/org/apache/accumulo/core/fate/zookeeper/ZooUtil.java
+++ b/core/src/main/java/org/apache/accumulo/core/fate/zookeeper/ZooUtil.java
@@ -19,31 +19,38 @@
 package org.apache.accumulo.core.fate.zookeeper;
 
 import static java.nio.charset.StandardCharsets.UTF_8;
+import static java.util.Objects.requireNonNull;
 
-import java.security.NoSuchAlgorithmException;
 import java.time.Instant;
 import java.time.OffsetDateTime;
 import java.time.ZoneOffset;
 import java.time.format.DateTimeFormatter;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
+import java.util.Map;
 import java.util.Objects;
+import java.util.TreeMap;
 
 import org.apache.accumulo.core.Constants;
 import org.apache.accumulo.core.data.InstanceId;
+import org.apache.accumulo.core.zookeeper.ZooSession;
 import org.apache.zookeeper.KeeperException;
 import org.apache.zookeeper.KeeperException.Code;
 import org.apache.zookeeper.ZooDefs.Ids;
 import org.apache.zookeeper.ZooDefs.Perms;
-import org.apache.zookeeper.ZooKeeper;
 import org.apache.zookeeper.data.ACL;
-import org.apache.zookeeper.data.Id;
 import org.apache.zookeeper.data.Stat;
-import org.apache.zookeeper.server.auth.DigestAuthenticationProvider;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public class ZooUtil {
 
+  private static final Logger log = LoggerFactory.getLogger(ZooUtil.class);
+
+  private ZooUtil() {}
+
   public enum NodeExistsPolicy {
     SKIP, OVERWRITE, FAIL
   }
@@ -57,9 +64,9 @@ public enum NodeMissingPolicy {
       DateTimeFormatter.ofPattern("EEE MMM dd HH:mm:ss 'UTC' yyyy");
 
   public static class LockID {
-    public long eid;
-    public String path;
-    public String node;
+    public final long eid;
+    public final String path;
+    public final String node;
 
     public LockID(String root, String serializedLID) {
       String[] sa = serializedLID.split("\\$");
@@ -85,13 +92,12 @@ public LockID(String path, String node, long eid) {
     }
 
     public String serialize(String root) {
-
       return path.substring(root.length()) + "/" + node + "$" + Long.toHexString(eid);
     }
 
     @Override
     public String toString() {
-      return " path = " + path + " node = " + node + " eid = " + Long.toHexString(eid);
+      return "path = " + path + " node = " + node + " eid = " + Long.toHexString(eid);
     }
 
     @Override
@@ -134,7 +140,7 @@ public static String getRoot(final InstanceId instanceId) {
   /**
    * This method will delete a node and all its children.
    */
-  public static void recursiveDelete(ZooKeeper zooKeeper, String zPath, NodeMissingPolicy policy)
+  public static void recursiveDelete(ZooSession zooKeeper, String zPath, NodeMissingPolicy policy)
       throws KeeperException, InterruptedException {
     if (policy == NodeMissingPolicy.CREATE) {
       throw new IllegalArgumentException(policy.name() + " is invalid for this operation");
@@ -187,27 +193,76 @@ private static String getFmtTime(final long epoch) {
     return fmt.format(timestamp);
   }
 
-  /**
-   * Get the ZooKeeper digest based on the instance secret that is used within ZooKeeper for
-   * authentication. This method is primary intended to be used to validate ZooKeeper ACLs. Use
-   * {@link #digestAuth(ZooKeeper, String)} to add authorizations to ZooKeeper.
-   */
-  public static Id getZkDigestAuthId(final String secret) {
+  public static String getInstanceName(ZooSession zk, InstanceId instanceId) {
+    requireNonNull(zk);
+    var instanceIdBytes = requireNonNull(instanceId).canonical().getBytes(UTF_8);
+    for (String name : getInstanceNames(zk)) {
+      var bytes = getInstanceIdBytesFromName(zk, name);
+      if (Arrays.equals(bytes, instanceIdBytes)) {
+        return name;
+      }
+    }
+    return null;
+  }
+
+  private static List<String> getInstanceNames(ZooSession zk) {
     try {
-      final String scheme = "digest";
-      String auth = DigestAuthenticationProvider.generateDigest("accumulo:" + secret);
-      return new Id(scheme, auth);
-    } catch (NoSuchAlgorithmException ex) {
-      throw new IllegalArgumentException("Could not generate ZooKeeper digest string", ex);
+      return zk.asReader().getChildren(Constants.ZROOT + Constants.ZINSTANCES);
+    } catch (InterruptedException e) {
+      Thread.currentThread().interrupt();
+      throw new IllegalStateException("Interrupted reading instance names from ZooKeeper", e);
+    } catch (KeeperException e) {
+      throw new IllegalStateException("Failed to read instance names from ZooKeeper", e);
     }
   }
 
-  public static void digestAuth(ZooKeeper zoo, String secret) {
-    auth(zoo, "digest", ("accumulo:" + secret).getBytes(UTF_8));
+  private static byte[] getInstanceIdBytesFromName(ZooSession zk, String name) {
+    try {
+      return zk.asReader()
+          .getData(Constants.ZROOT + Constants.ZINSTANCES + "/" + requireNonNull(name));
+    } catch (InterruptedException e) {
+      Thread.currentThread().interrupt();
+      throw new IllegalStateException(
+          "Interrupted reading InstanceId from ZooKeeper for instance named " + name, e);
+    } catch (KeeperException e) {
+      log.warn("Failed to read InstanceId from ZooKeeper for instance named {}", name, e);
+      return null;
+    }
+  }
+
+  public static Map<String,InstanceId> getInstanceMap(ZooSession zk) {
+    Map<String,InstanceId> idMap = new TreeMap<>();
+    getInstanceNames(zk).forEach(name -> {
+      byte[] instanceId = getInstanceIdBytesFromName(zk, name);
+      if (instanceId != null) {
+        idMap.put(name, InstanceId.of(new String(instanceId, UTF_8)));
+      }
+    });
+    return idMap;
   }
 
-  public static void auth(ZooKeeper zoo, String scheme, byte[] auth) {
-    zoo.addAuthInfo(scheme, auth);
+  public static InstanceId getInstanceId(ZooSession zk, String name) {
+    byte[] data = getInstanceIdBytesFromName(zk, name);
+    if (data == null) {
+      throw new IllegalStateException("Instance name " + name + " does not exist in ZooKeeper. "
+          + "Run \"accumulo org.apache.accumulo.server.util.ListInstances\" to see a list.");
+    }
+    String instanceIdString = new String(data, UTF_8);
+    try {
+      // verify that the instanceId found via the name actually exists
+      if (zk.asReader().getData(Constants.ZROOT + "/" + instanceIdString) == null) {
+        throw new IllegalStateException("InstanceId " + instanceIdString
+            + " pointed to by the name " + name + " does not exist in ZooKeeper");
+      }
+    } catch (InterruptedException e) {
+      Thread.currentThread().interrupt();
+      throw new IllegalStateException("Interrupted verifying InstanceId " + instanceIdString
+          + " pointed to by instance named " + name + " actually exists in ZooKeeper", e);
+    } catch (KeeperException e) {
+      throw new IllegalStateException("Failed to verify InstanceId " + instanceIdString
+          + " pointed to by instance named " + name + " actually exists in ZooKeeper", e);
+    }
+    return InstanceId.of(instanceIdString);
   }
 
 }
diff --git a/core/src/main/java/org/apache/accumulo/core/file/blockfile/cache/impl/BlockCacheManagerFactory.java b/core/src/main/java/org/apache/accumulo/core/file/blockfile/cache/impl/BlockCacheManagerFactory.java
index 655b7b3ad60..7475ab8a69e 100644
--- a/core/src/main/java/org/apache/accumulo/core/file/blockfile/cache/impl/BlockCacheManagerFactory.java
+++ b/core/src/main/java/org/apache/accumulo/core/file/blockfile/cache/impl/BlockCacheManagerFactory.java
@@ -39,7 +39,7 @@ public class BlockCacheManagerFactory {
    */
   public static synchronized BlockCacheManager getInstance(AccumuloConfiguration conf)
       throws ReflectiveOperationException {
-    String impl = conf.get(Property.TSERV_CACHE_MANAGER_IMPL);
+    String impl = conf.get(Property.GENERAL_CACHE_MANAGER_IMPL);
     Class<? extends BlockCacheManager> clazz =
         ClassLoaderUtil.loadClass(impl, BlockCacheManager.class);
     LOG.info("Created new block cache manager of type: {}", clazz.getSimpleName());
@@ -55,7 +55,7 @@ public static synchronized BlockCacheManager getInstance(AccumuloConfiguration c
    */
   public static synchronized BlockCacheManager getClientInstance(AccumuloConfiguration conf)
       throws ReflectiveOperationException {
-    String impl = conf.get(Property.TSERV_CACHE_MANAGER_IMPL);
+    String impl = conf.get(Property.GENERAL_CACHE_MANAGER_IMPL);
     Class<? extends BlockCacheManager> clazz =
         Class.forName(impl).asSubclass(BlockCacheManager.class);
     LOG.info("Created new block cache factory of type: {}", clazz.getSimpleName());
diff --git a/core/src/main/java/org/apache/accumulo/core/file/rfile/RFile.java b/core/src/main/java/org/apache/accumulo/core/file/rfile/RFile.java
index 04c185e321d..3956510e5d5 100644
--- a/core/src/main/java/org/apache/accumulo/core/file/rfile/RFile.java
+++ b/core/src/main/java/org/apache/accumulo/core/file/rfile/RFile.java
@@ -1294,24 +1294,32 @@ public Reader(CachableBlockFile.CachableBuilder b) throws IOException {
       this(new CachableBlockFile.Reader(b));
     }
 
-    private void closeLocalityGroupReaders() {
+    private void closeLocalityGroupReaders(boolean ignoreIOExceptions) throws IOException {
       for (LocalityGroupReader lgr : currentReaders) {
         try {
           lgr.close();
         } catch (IOException e) {
-          log.warn("Errored out attempting to close LocalityGroupReader.", e);
+          if (ignoreIOExceptions) {
+            log.warn("Errored out attempting to close LocalityGroupReader.", e);
+          } else {
+            throw e;
+          }
         }
       }
     }
 
     @Override
-    public void closeDeepCopies() {
+    public void closeDeepCopies() throws IOException {
+      closeDeepCopies(false);
+    }
+
+    private void closeDeepCopies(boolean ignoreIOExceptions) throws IOException {
       if (deepCopy) {
         throw new IllegalStateException("Calling closeDeepCopies on a deep copy is not supported");
       }
 
       for (Reader deepCopy : deepCopies) {
-        deepCopy.closeLocalityGroupReaders();
+        deepCopy.closeLocalityGroupReaders(ignoreIOExceptions);
       }
 
       deepCopies.clear();
@@ -1323,8 +1331,9 @@ public void close() throws IOException {
         throw new IllegalStateException("Calling close on a deep copy is not supported");
       }
 
-      closeDeepCopies();
-      closeLocalityGroupReaders();
+      // Closes as much as possible igoring and logging exceptions along the way
+      closeDeepCopies(true);
+      closeLocalityGroupReaders(true);
 
       if (sampleReaders != null) {
         for (LocalityGroupReader lgr : sampleReaders) {
diff --git a/core/src/main/java/org/apache/accumulo/core/lock/ServiceLock.java b/core/src/main/java/org/apache/accumulo/core/lock/ServiceLock.java
index 1cc2a1b300d..3c7d72bd0fc 100644
--- a/core/src/main/java/org/apache/accumulo/core/lock/ServiceLock.java
+++ b/core/src/main/java/org/apache/accumulo/core/lock/ServiceLock.java
@@ -36,6 +36,7 @@
 import org.apache.accumulo.core.lock.ServiceLockPaths.ServiceLockPath;
 import org.apache.accumulo.core.util.Timer;
 import org.apache.accumulo.core.util.UuidUtil;
+import org.apache.accumulo.core.zookeeper.ZooSession;
 import org.apache.zookeeper.CreateMode;
 import org.apache.zookeeper.KeeperException;
 import org.apache.zookeeper.KeeperException.Code;
@@ -43,7 +44,6 @@
 import org.apache.zookeeper.Watcher;
 import org.apache.zookeeper.Watcher.Event.EventType;
 import org.apache.zookeeper.Watcher.Event.KeeperState;
-import org.apache.zookeeper.ZooKeeper;
 import org.apache.zookeeper.data.Stat;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -87,7 +87,7 @@ public interface AccumuloLockWatcher extends LockWatcher {
   }
 
   private final ServiceLockPath path;
-  protected final ZooKeeper zooKeeper;
+  protected final ZooSession zooKeeper;
   private final Prefix vmLockPrefix;
 
   private LockWatcher lockWatcher;
@@ -98,7 +98,7 @@ public interface AccumuloLockWatcher extends LockWatcher {
   private String createdNodeName;
   private String watchingNodeName;
 
-  public ServiceLock(ZooKeeper zookeeper, ServiceLockPath path, UUID uuid) {
+  public ServiceLock(ZooSession zookeeper, ServiceLockPath path, UUID uuid) {
     this.zooKeeper = requireNonNull(zookeeper);
     this.path = requireNonNull(path);
     try {
@@ -653,7 +653,7 @@ public static boolean isLockHeld(ZooCache zc, LockID lid) {
     return zc.get(lid.path + "/" + lid.node, stat) != null && stat.getEphemeralOwner() == lid.eid;
   }
 
-  public static Optional<ServiceLockData> getLockData(ZooKeeper zk, ServiceLockPath path)
+  public static Optional<ServiceLockData> getLockData(ZooSession zk, ServiceLockPath path)
       throws KeeperException, InterruptedException {
 
     List<String> children = validateAndSort(path, zk.getChildren(path.toString(), null));
@@ -664,7 +664,7 @@ public static Optional<ServiceLockData> getLockData(ZooKeeper zk, ServiceLockPat
 
     String lockNode = children.get(0);
 
-    byte[] data = zk.getData(path + "/" + lockNode, false, null);
+    byte[] data = zk.getData(path + "/" + lockNode, null, null);
     if (data == null) {
       data = new byte[0];
     }
@@ -787,7 +787,7 @@ public boolean verifyLockAtSource() {
       return false;
     }
     try {
-      return null != this.zooKeeper.exists(lockPath, false);
+      return null != this.zooKeeper.exists(lockPath, null);
     } catch (KeeperException | InterruptedException | RuntimeException e) {
       LOG.error("Error verfiying lock at {}", lockPath, e);
       return false;
diff --git a/core/src/main/java/org/apache/accumulo/core/lock/ServiceLockPaths.java b/core/src/main/java/org/apache/accumulo/core/lock/ServiceLockPaths.java
index 01c1c61032f..8fd3f361dcc 100644
--- a/core/src/main/java/org/apache/accumulo/core/lock/ServiceLockPaths.java
+++ b/core/src/main/java/org/apache/accumulo/core/lock/ServiceLockPaths.java
@@ -18,10 +18,11 @@
  */
 package org.apache.accumulo.core.lock;
 
+import static java.util.Objects.requireNonNull;
+
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;
-import java.util.Objects;
 import java.util.Optional;
 import java.util.Set;
 import java.util.concurrent.ConcurrentHashMap;
@@ -33,7 +34,6 @@
 import java.util.function.Predicate;
 
 import org.apache.accumulo.core.Constants;
-import org.apache.accumulo.core.clientImpl.ClientContext;
 import org.apache.accumulo.core.fate.zookeeper.ZooCache;
 import org.apache.accumulo.core.fate.zookeeper.ZooCache.ZcStat;
 import org.apache.accumulo.core.util.threads.ThreadPoolNames;
@@ -68,11 +68,12 @@ protected ServiceLockPath(String path) {
      * Create a ServiceLockPath for a management process
      */
     private ServiceLockPath(String root, String type) {
-      Objects.requireNonNull(root);
-      this.type = Objects.requireNonNull(type);
+      requireNonNull(root);
+      this.type = requireNonNull(type);
       Preconditions.checkArgument(this.type.equals(Constants.ZGC_LOCK)
           || this.type.equals(Constants.ZMANAGER_LOCK) || this.type.equals(Constants.ZMONITOR_LOCK)
-          || this.type.equals(Constants.ZTABLE_LOCKS), "Unsupported type: " + type);
+          || this.type.equals(Constants.ZTABLE_LOCKS) || this.type.equals(Constants.ZADMIN_LOCK)
+          || this.type.equals(Constants.ZTEST_LOCK), "Unsupported type: " + type);
       // These server types support only one active instance, so they use a lock at
       // a known path, not the server's address.
       this.resourceGroup = null;
@@ -84,13 +85,13 @@ private ServiceLockPath(String root, String type) {
      * Create a ServiceLockPath for ZTABLE_LOCKS
      */
     private ServiceLockPath(String root, String type, String content) {
-      Objects.requireNonNull(root);
-      this.type = Objects.requireNonNull(type);
+      requireNonNull(root);
+      this.type = requireNonNull(type);
       Preconditions.checkArgument(
           this.type.equals(Constants.ZTABLE_LOCKS) || this.type.equals(Constants.ZMINI_LOCK),
           "Unsupported type: " + type);
       this.resourceGroup = null;
-      this.server = Objects.requireNonNull(content);
+      this.server = requireNonNull(content);
       this.path = root + this.type + "/" + this.server;
     }
 
@@ -98,14 +99,14 @@ private ServiceLockPath(String root, String type, String content) {
      * Create a ServiceLockPath for a worker process
      */
     private ServiceLockPath(String root, String type, String resourceGroup, String server) {
-      Objects.requireNonNull(root);
-      this.type = Objects.requireNonNull(type);
+      requireNonNull(root);
+      this.type = requireNonNull(type);
       Preconditions.checkArgument(
           this.type.equals(Constants.ZCOMPACTORS) || this.type.equals(Constants.ZSSERVERS)
               || this.type.equals(Constants.ZTSERVERS) || this.type.equals(Constants.ZDEADTSERVERS),
           "Unsupported type: " + type);
-      this.resourceGroup = Objects.requireNonNull(resourceGroup);
-      this.server = Objects.requireNonNull(server);
+      this.resourceGroup = requireNonNull(resourceGroup);
+      this.server = requireNonNull(server);
       this.path = root + this.type + "/" + this.resourceGroup + "/" + this.server;
     }
 
@@ -184,10 +185,12 @@ public String toString() {
 
   private final ExecutorService fetchExectuor;
 
-  private final ClientContext ctx;
+  private final String zkRoot;
+  private final ZooCache zooCache;
 
-  public ServiceLockPaths(ClientContext context) {
-    this.ctx = context;
+  public ServiceLockPaths(String zkRoot, ZooCache zc) {
+    this.zkRoot = requireNonNull(zkRoot);
+    this.zooCache = requireNonNull(zc);
     this.fetchExectuor = ThreadPools.getServerThreadPools()
         .getPoolBuilder(ThreadPoolNames.SERVICE_LOCK_POOL).numCoreThreads(16).build();
   }
@@ -201,6 +204,10 @@ private static String determineServerType(final String path) {
       return Constants.ZMONITOR_LOCK;
     } else if (path.contains(Constants.ZMINI_LOCK)) {
       return Constants.ZMINI_LOCK;
+    } else if (path.contains(Constants.ZADMIN_LOCK)) {
+      return Constants.ZADMIN_LOCK;
+    } else if (path.contains(Constants.ZTEST_LOCK)) {
+      return Constants.ZTEST_LOCK;
     } else if (path.contains(Constants.ZCOMPACTORS)) {
       return Constants.ZCOMPACTORS;
     } else if (path.contains(Constants.ZSSERVERS)) {
@@ -219,8 +226,8 @@ private static String determineServerType(final String path) {
    * Parse a ZooKeeper path string and return a ServiceLockPath
    */
   public static ServiceLockPath parse(Optional<String> serverType, String path) {
-    Objects.requireNonNull(serverType);
-    Objects.requireNonNull(path);
+    requireNonNull(serverType);
+    requireNonNull(path);
 
     final String type = serverType.orElseGet(() -> determineServerType(path));
 
@@ -228,6 +235,8 @@ public static ServiceLockPath parse(Optional<String> serverType, String path) {
       case Constants.ZGC_LOCK:
       case Constants.ZMANAGER_LOCK:
       case Constants.ZMONITOR_LOCK:
+      case Constants.ZADMIN_LOCK:
+      case Constants.ZTEST_LOCK:
         return new ServiceLockPath(path.substring(0, path.indexOf(type)), type);
       default: {
         final String[] pathParts = path.replaceFirst("/", "").split("/");
@@ -253,50 +262,58 @@ public static ServiceLockPath parse(Optional<String> serverType, String path) {
   }
 
   public ServiceLockPath createGarbageCollectorPath() {
-    return new ServiceLockPath(ctx.getZooKeeperRoot(), Constants.ZGC_LOCK);
+    return new ServiceLockPath(zkRoot, Constants.ZGC_LOCK);
   }
 
   public ServiceLockPath createManagerPath() {
-    return new ServiceLockPath(ctx.getZooKeeperRoot(), Constants.ZMANAGER_LOCK);
+    return new ServiceLockPath(zkRoot, Constants.ZMANAGER_LOCK);
   }
 
   public ServiceLockPath createMiniPath(String miniUUID) {
-    return new ServiceLockPath(ctx.getZooKeeperRoot(), Constants.ZMINI_LOCK, miniUUID);
+    return new ServiceLockPath(zkRoot, Constants.ZMINI_LOCK, miniUUID);
   }
 
   public ServiceLockPath createMonitorPath() {
-    return new ServiceLockPath(ctx.getZooKeeperRoot(), Constants.ZMONITOR_LOCK);
+    return new ServiceLockPath(zkRoot, Constants.ZMONITOR_LOCK);
   }
 
   public ServiceLockPath createCompactorPath(String resourceGroup, HostAndPort serverAddress) {
-    return new ServiceLockPath(ctx.getZooKeeperRoot(), Constants.ZCOMPACTORS, resourceGroup,
+    return new ServiceLockPath(zkRoot, Constants.ZCOMPACTORS, resourceGroup,
         serverAddress.toString());
   }
 
   public ServiceLockPath createScanServerPath(String resourceGroup, HostAndPort serverAddress) {
-    return new ServiceLockPath(ctx.getZooKeeperRoot(), Constants.ZSSERVERS, resourceGroup,
+    return new ServiceLockPath(zkRoot, Constants.ZSSERVERS, resourceGroup,
         serverAddress.toString());
   }
 
   public ServiceLockPath createTableLocksPath() {
-    return new ServiceLockPath(ctx.getZooKeeperRoot(), Constants.ZTABLE_LOCKS);
+    return new ServiceLockPath(zkRoot, Constants.ZTABLE_LOCKS);
   }
 
   public ServiceLockPath createTableLocksPath(String tableId) {
-    return new ServiceLockPath(ctx.getZooKeeperRoot(), Constants.ZTABLE_LOCKS, tableId);
+    return new ServiceLockPath(zkRoot, Constants.ZTABLE_LOCKS, tableId);
   }
 
   public ServiceLockPath createTabletServerPath(String resourceGroup, HostAndPort serverAddress) {
-    return new ServiceLockPath(ctx.getZooKeeperRoot(), Constants.ZTSERVERS, resourceGroup,
+    return new ServiceLockPath(zkRoot, Constants.ZTSERVERS, resourceGroup,
         serverAddress.toString());
   }
 
   public ServiceLockPath createDeadTabletServerPath(String resourceGroup,
       HostAndPort serverAddress) {
-    return new ServiceLockPath(ctx.getZooKeeperRoot(), Constants.ZDEADTSERVERS, resourceGroup,
+    return new ServiceLockPath(zkRoot, Constants.ZDEADTSERVERS, resourceGroup,
         serverAddress.toString());
   }
 
+  public ServiceLockPath createAdminLockPath() {
+    return new ServiceLockPath(zkRoot, Constants.ZADMIN_LOCK);
+  }
+
+  public ServiceLockPath createTestLockPath() {
+    return new ServiceLockPath(zkRoot, Constants.ZTEST_LOCK);
+  }
+
   public Set<ServiceLockPath> getCompactor(ResourceGroupPredicate resourceGroupPredicate,
       AddressSelector address, boolean withLock) {
     return get(Constants.ZCOMPACTORS, resourceGroupPredicate, address, withLock);
@@ -421,13 +438,12 @@ private Set<ServiceLockPath> get(final String serverType,
       ResourceGroupPredicate resourceGroupPredicate, AddressSelector addressSelector,
       boolean withLock) {
 
-    Objects.requireNonNull(serverType);
-    Objects.requireNonNull(resourceGroupPredicate);
-    Objects.requireNonNull(addressSelector);
+    requireNonNull(serverType);
+    requireNonNull(resourceGroupPredicate);
+    requireNonNull(addressSelector);
 
     final Set<ServiceLockPath> results = ConcurrentHashMap.newKeySet();
-    final String typePath = ctx.getZooKeeperRoot() + serverType;
-    final ZooCache cache = ctx.getZooCache();
+    final String typePath = zkRoot + serverType;
 
     if (serverType.equals(Constants.ZGC_LOCK) || serverType.equals(Constants.ZMANAGER_LOCK)
         || serverType.equals(Constants.ZMONITOR_LOCK)) {
@@ -436,14 +452,14 @@ private Set<ServiceLockPath> get(final String serverType,
       if (!withLock) {
         results.add(slp);
       } else {
-        Optional<ServiceLockData> sld = ServiceLock.getLockData(cache, slp, stat);
+        Optional<ServiceLockData> sld = ServiceLock.getLockData(zooCache, slp, stat);
         if (!sld.isEmpty()) {
           results.add(slp);
         }
       }
     } else if (serverType.equals(Constants.ZCOMPACTORS) || serverType.equals(Constants.ZSSERVERS)
         || serverType.equals(Constants.ZTSERVERS) || serverType.equals(Constants.ZDEADTSERVERS)) {
-      final List<String> resourceGroups = cache.getChildren(typePath);
+      final List<String> resourceGroups = zooCache.getChildren(typePath);
       for (final String group : resourceGroups) {
         if (resourceGroupPredicate.test(group)) {
           final Collection<String> servers;
@@ -451,7 +467,7 @@ private Set<ServiceLockPath> get(final String serverType,
 
           if (addressSelector.getExactAddress() != null) {
             var server = addressSelector.getExactAddress().toString();
-            if (withLock || cache.get(typePath + "/" + group + "/" + server) != null) {
+            if (withLock || zooCache.get(typePath + "/" + group + "/" + server) != null) {
               // When withLock is true the server in the list may not exist in zookeeper, if it does
               // not exist then no lock will be found later when looking for a lock in zookeeper.
               servers = List.of(server);
@@ -460,7 +476,7 @@ private Set<ServiceLockPath> get(final String serverType,
             }
             addressPredicate = s -> true;
           } else {
-            servers = cache.getChildren(typePath + "/" + group);
+            servers = zooCache.getChildren(typePath + "/" + group);
             addressPredicate = addressSelector.getPredicate();
           }
 
@@ -484,7 +500,7 @@ private Set<ServiceLockPath> get(final String serverType,
                 // connection at the same time though.
                 var futureTask = new FutureTask<>(() -> {
                   final ZcStat stat = new ZcStat();
-                  Optional<ServiceLockData> sld = ServiceLock.getLockData(cache, slp, stat);
+                  Optional<ServiceLockData> sld = ServiceLock.getLockData(zooCache, slp, stat);
                   if (sld.isPresent()) {
                     results.add(slp);
                   }
diff --git a/core/src/main/java/org/apache/accumulo/core/lock/ServiceLockSupport.java b/core/src/main/java/org/apache/accumulo/core/lock/ServiceLockSupport.java
new file mode 100644
index 00000000000..dda14f50c01
--- /dev/null
+++ b/core/src/main/java/org/apache/accumulo/core/lock/ServiceLockSupport.java
@@ -0,0 +1,177 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.accumulo.core.lock;
+
+import java.util.function.Consumer;
+import java.util.function.Supplier;
+
+import org.apache.accumulo.core.client.admin.servers.ServerId.Type;
+import org.apache.accumulo.core.fate.zookeeper.ZooReaderWriter;
+import org.apache.accumulo.core.fate.zookeeper.ZooUtil.NodeExistsPolicy;
+import org.apache.accumulo.core.lock.ServiceLock.AccumuloLockWatcher;
+import org.apache.accumulo.core.lock.ServiceLock.LockLossReason;
+import org.apache.accumulo.core.lock.ServiceLock.LockWatcher;
+import org.apache.accumulo.core.lock.ServiceLockPaths.ServiceLockPath;
+import org.apache.accumulo.core.util.Halt;
+import org.apache.zookeeper.KeeperException;
+import org.apache.zookeeper.KeeperException.NoAuthException;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class ServiceLockSupport {
+
+  private static final Logger LOG = LoggerFactory.getLogger(ServiceLockSupport.class);
+
+  /**
+   * Ensures that the resource group node in ZooKeeper is created for this server
+   */
+  public static void createNonHaServiceLockPath(Type server, ZooReaderWriter zrw,
+      ServiceLockPath slp) throws KeeperException, InterruptedException {
+    // The ServiceLockPath contains a resource group in the path which is not created
+    // at initialization time. If it does not exist, then create it.
+    String rgPath = slp.toString().substring(0, slp.toString().lastIndexOf("/" + slp.getServer()));
+    LOG.debug("Creating {} resource group path in zookeeper: {}", server, rgPath);
+    try {
+      zrw.mkdirs(rgPath);
+      zrw.putPersistentData(slp.toString(), new byte[] {}, NodeExistsPolicy.SKIP);
+    } catch (NoAuthException e) {
+      LOG.error("Failed to write to ZooKeeper. Ensure that"
+          + " accumulo.properties, specifically instance.secret, is consistent.");
+      throw e;
+    }
+  }
+
+  /**
+   * Lock Watcher used by Highly Available services. These are services where only instance is
+   * running at a time, but another backup service can be started that will be used if the active
+   * service instance fails and loses its lock in ZK.
+   */
+  public static class HAServiceLockWatcher implements AccumuloLockWatcher {
+
+    private static final Logger LOG = LoggerFactory.getLogger(HAServiceLockWatcher.class);
+
+    private final Type server;
+    private volatile boolean acquiredLock = false;
+    private volatile boolean failedToAcquireLock = false;
+
+    public HAServiceLockWatcher(Type server) {
+      this.server = server;
+    }
+
+    @Override
+    public void lostLock(LockLossReason reason) {
+      Halt.halt(server + " lock in zookeeper lost (reason = " + reason + "), exiting!", -1);
+    }
+
+    @Override
+    public void unableToMonitorLockNode(final Exception e) {
+      // ACCUMULO-3651 Changed level to error and added FATAL to message for slf4j compatibility
+      Halt.halt(-1, () -> LOG.error("FATAL: No longer able to monitor {} lock node", server, e));
+
+    }
+
+    @Override
+    public synchronized void acquiredLock() {
+      LOG.debug("Acquired {} lock", server);
+
+      if (acquiredLock || failedToAcquireLock) {
+        Halt.halt("Zoolock in unexpected state AL " + acquiredLock + " " + failedToAcquireLock, -1);
+      }
+
+      acquiredLock = true;
+      notifyAll();
+    }
+
+    @Override
+    public synchronized void failedToAcquireLock(Exception e) {
+      LOG.warn("Failed to get {} lock", server, e);
+
+      if (e instanceof NoAuthException) {
+        String msg =
+            "Failed to acquire " + server + " lock due to incorrect ZooKeeper authentication.";
+        LOG.error("{} Ensure instance.secret is consistent across Accumulo configuration", msg, e);
+        Halt.halt(msg, -1);
+      }
+
+      if (acquiredLock) {
+        Halt.halt("Zoolock in unexpected state acquiredLock true with FAL " + failedToAcquireLock,
+            -1);
+      }
+
+      failedToAcquireLock = true;
+      notifyAll();
+    }
+
+    public synchronized void waitForChange() {
+      while (!acquiredLock && !failedToAcquireLock) {
+        try {
+          LOG.info("{} lock held by someone else, waiting for a change in state", server);
+          wait();
+        } catch (InterruptedException e) {
+          // empty
+        }
+      }
+    }
+
+    public boolean isLockAcquired() {
+      return acquiredLock;
+    }
+
+    public boolean isFailedToAcquireLock() {
+      return failedToAcquireLock;
+    }
+
+  }
+
+  /**
+   * Lock Watcher used by non-HA services
+   */
+  public static class ServiceLockWatcher implements LockWatcher {
+
+    private static final Logger LOG = LoggerFactory.getLogger(ServiceLockWatcher.class);
+
+    private final Type server;
+    private final Supplier<Boolean> shuttingDown;
+    private final Consumer<Type> lostLockAction;
+
+    public ServiceLockWatcher(Type server, Supplier<Boolean> shuttingDown,
+        Consumer<Type> lostLockAction) {
+      this.server = server;
+      this.shuttingDown = shuttingDown;
+      this.lostLockAction = lostLockAction;
+    }
+
+    @Override
+    public void lostLock(final LockLossReason reason) {
+      Halt.halt(1, () -> {
+        if (!shuttingDown.get()) {
+          LOG.error("{} lost lock (reason = {}), exiting.", server, reason);
+        }
+        lostLockAction.accept(server);
+      });
+    }
+
+    @Override
+    public void unableToMonitorLockNode(final Exception e) {
+      Halt.halt(1, () -> LOG.error("Lost ability to monitor {} lock, exiting.", server, e));
+    }
+
+  }
+
+}
diff --git a/core/src/main/java/org/apache/accumulo/core/logging/FateLogger.java b/core/src/main/java/org/apache/accumulo/core/logging/FateLogger.java
index 9a5984f4ed6..d25e87f15e9 100644
--- a/core/src/main/java/org/apache/accumulo/core/logging/FateLogger.java
+++ b/core/src/main/java/org/apache/accumulo/core/logging/FateLogger.java
@@ -150,8 +150,8 @@ public FateId create() {
       }
 
       @Override
-      public Optional<FateId> seedTransaction(String txName, FateKey fateKey, Repo<T> repo,
-          boolean autoCleanUp) {
+      public Optional<FateId> seedTransaction(Fate.FateOperation txName, FateKey fateKey,
+          Repo<T> repo, boolean autoCleanUp) {
         var optional = store.seedTransaction(txName, fateKey, repo, autoCleanUp);
         if (storeLog.isTraceEnabled()) {
           optional.ifPresentOrElse(fateId -> {
@@ -166,7 +166,7 @@ public Optional<FateId> seedTransaction(String txName, FateKey fateKey, Repo<T>
       }
 
       @Override
-      public boolean seedTransaction(String txName, FateId fateId, Repo<T> repo,
+      public boolean seedTransaction(Fate.FateOperation txName, FateId fateId, Repo<T> repo,
           boolean autoCleanUp) {
         boolean seeded = store.seedTransaction(txName, fateId, repo, autoCleanUp);
         if (storeLog.isTraceEnabled()) {
diff --git a/core/src/main/java/org/apache/accumulo/core/metadata/schema/Ample.java b/core/src/main/java/org/apache/accumulo/core/metadata/schema/Ample.java
index 7135b5a978f..c78e5661bb8 100644
--- a/core/src/main/java/org/apache/accumulo/core/metadata/schema/Ample.java
+++ b/core/src/main/java/org/apache/accumulo/core/metadata/schema/Ample.java
@@ -24,6 +24,7 @@
 import java.util.Set;
 import java.util.function.Consumer;
 import java.util.function.Predicate;
+import java.util.function.Supplier;
 
 import org.apache.accumulo.core.client.ConditionalWriter;
 import org.apache.accumulo.core.client.admin.TabletAvailability;
@@ -392,6 +393,8 @@ interface TabletUpdates<T> {
 
     T putCloned();
 
+    T putTabletMergeability(TabletMergeabilityMetadata tabletMergeability);
+
     /**
      * By default the server lock is automatically added to mutations unless this method is set to
      * false.
@@ -623,6 +626,16 @@ ConditionalTabletMutator requireSame(TabletMetadata tabletMetadata, ColumnType t
      *        let the rejected status carry forward in this case.
      */
     void submit(RejectionHandler rejectionHandler);
+
+    /**
+     * Overloaded version of {@link #submit(RejectionHandler)} that takes a short description of the
+     * operation to assist with debugging.
+     *
+     * @param rejectionHandler The rejection handler
+     * @param description A short description of the operation (e.g., "bulk import", "compaction")
+     */
+    void submit(RejectionHandler rejectionHandler, Supplier<String> description);
+
   }
 
   /**
diff --git a/core/src/main/java/org/apache/accumulo/core/metadata/schema/MetadataSchema.java b/core/src/main/java/org/apache/accumulo/core/metadata/schema/MetadataSchema.java
index 5360c98274b..885fd326239 100644
--- a/core/src/main/java/org/apache/accumulo/core/metadata/schema/MetadataSchema.java
+++ b/core/src/main/java/org/apache/accumulo/core/metadata/schema/MetadataSchema.java
@@ -158,6 +158,10 @@ public static class TabletColumnFamily {
       public static final String REQUESTED_QUAL = "requestToHost";
       public static final ColumnFQ REQUESTED_COLUMN = new ColumnFQ(NAME, new Text(REQUESTED_QUAL));
 
+      public static final String MERGEABILITY_QUAL = "mergeability";
+      public static final ColumnFQ MERGEABILITY_COLUMN =
+          new ColumnFQ(NAME, new Text(MERGEABILITY_QUAL));
+
       public static Value encodePrevEndRow(Text per) {
         if (per == null) {
           return new Value(new byte[] {0});
diff --git a/core/src/main/java/org/apache/accumulo/core/metadata/schema/RootTabletMetadata.java b/core/src/main/java/org/apache/accumulo/core/metadata/schema/RootTabletMetadata.java
index 5d6f63a73b8..5eb075c809c 100644
--- a/core/src/main/java/org/apache/accumulo/core/metadata/schema/RootTabletMetadata.java
+++ b/core/src/main/java/org/apache/accumulo/core/metadata/schema/RootTabletMetadata.java
@@ -71,7 +71,7 @@ public static String zooPath(ClientContext ctx) {
   public static RootTabletMetadata read(ClientContext ctx) {
     try {
       final String zpath = zooPath(ctx);
-      ZooReader zooReader = ctx.getZooReader();
+      ZooReader zooReader = ctx.getZooSession().asReader();
       // attempt (see ZOOKEEPER-1675) to ensure the latest root table metadata is read from
       // zookeeper
       zooReader.sync(zpath);
diff --git a/core/src/main/java/org/apache/accumulo/core/metadata/schema/TabletMergeabilityMetadata.java b/core/src/main/java/org/apache/accumulo/core/metadata/schema/TabletMergeabilityMetadata.java
new file mode 100644
index 00000000000..0880e402d96
--- /dev/null
+++ b/core/src/main/java/org/apache/accumulo/core/metadata/schema/TabletMergeabilityMetadata.java
@@ -0,0 +1,144 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.accumulo.core.metadata.schema;
+
+import static org.apache.accumulo.core.util.LazySingletons.GSON;
+
+import java.io.Serializable;
+import java.time.Duration;
+import java.util.Objects;
+import java.util.Optional;
+import java.util.concurrent.TimeUnit;
+
+import org.apache.accumulo.core.client.admin.TabletMergeability;
+import org.apache.accumulo.core.data.Value;
+import org.apache.accumulo.core.util.time.SteadyTime;
+
+import com.google.common.base.Preconditions;
+
+public class TabletMergeabilityMetadata implements Serializable {
+  private static final long serialVersionUID = 1L;
+
+  private static final TabletMergeabilityMetadata NEVER =
+      new TabletMergeabilityMetadata(TabletMergeability.never());;
+
+  private final TabletMergeability tabletMergeability;
+  private final SteadyTime steadyTime;
+
+  private TabletMergeabilityMetadata(TabletMergeability tabletMergeability, SteadyTime steadyTime) {
+    this.tabletMergeability = Objects.requireNonNull(tabletMergeability);
+    this.steadyTime = steadyTime;
+    // This makes sure that SteadyTime is set if TabletMergeability has a delay, and is null
+    // if TabletMergeability is NEVER as we don't need to store it in that case
+    Preconditions.checkArgument(tabletMergeability.isNever() == (steadyTime == null),
+        "SteadyTime must be set if and only if TabletMergeability delay is >= 0");
+  }
+
+  private TabletMergeabilityMetadata(TabletMergeability tabletMergeability) {
+    this(tabletMergeability, null);
+  }
+
+  public TabletMergeability getTabletMergeability() {
+    return tabletMergeability;
+  }
+
+  public Optional<SteadyTime> getSteadyTime() {
+    return Optional.ofNullable(steadyTime);
+  }
+
+  public boolean isMergeable(SteadyTime currentTime) {
+    if (tabletMergeability.isNever()) {
+      return false;
+    }
+    // Steady time should never be null unless TabletMergeability is NEVER
+    Preconditions.checkState(steadyTime != null, "SteadyTime should be set");
+    var totalDelay = steadyTime.getDuration().plus(tabletMergeability.getDelay().orElseThrow());
+    return currentTime.getDuration().compareTo(totalDelay) >= 0;
+  }
+
+  private static class GSonData {
+    boolean never;
+    Long delay;
+    Long steadyTime;
+  }
+
+  String toJson() {
+    GSonData jData = new GSonData();
+    jData.never = tabletMergeability.isNever();
+    jData.delay = tabletMergeability.getDelay().map(Duration::toNanos).orElse(null);
+    jData.steadyTime = steadyTime != null ? steadyTime.getNanos() : null;
+    return GSON.get().toJson(jData);
+  }
+
+  static TabletMergeabilityMetadata fromJson(String json) {
+    GSonData jData = GSON.get().fromJson(json, GSonData.class);
+    if (jData.never) {
+      Preconditions.checkArgument(jData.delay == null && jData.steadyTime == null,
+          "delay and steadyTime should be null if mergeability 'never' is true");
+    } else {
+      Preconditions.checkArgument(jData.delay != null && jData.steadyTime != null,
+          "delay and steadyTime should both be set if mergeability 'never' is false");
+    }
+    TabletMergeability tabletMergeability = jData.never ? TabletMergeability.never()
+        : TabletMergeability.after(Duration.ofNanos(jData.delay));
+    SteadyTime steadyTime =
+        jData.steadyTime != null ? SteadyTime.from(jData.steadyTime, TimeUnit.NANOSECONDS) : null;
+    return new TabletMergeabilityMetadata(tabletMergeability, steadyTime);
+  }
+
+  @Override
+  public boolean equals(Object o) {
+    if (o == null || getClass() != o.getClass()) {
+      return false;
+    }
+    TabletMergeabilityMetadata that = (TabletMergeabilityMetadata) o;
+    return Objects.equals(tabletMergeability, that.tabletMergeability)
+        && Objects.equals(steadyTime, that.steadyTime);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(tabletMergeability, steadyTime);
+  }
+
+  @Override
+  public String toString() {
+    return "TabletMergeabilityMetadata{" + tabletMergeability + ", " + steadyTime + '}';
+  }
+
+  public static TabletMergeabilityMetadata never() {
+    return NEVER;
+  }
+
+  public static TabletMergeabilityMetadata always(SteadyTime currentTime) {
+    return new TabletMergeabilityMetadata(TabletMergeability.always(), currentTime);
+  }
+
+  public static TabletMergeabilityMetadata after(Duration delay, SteadyTime currentTime) {
+    return new TabletMergeabilityMetadata(TabletMergeability.after(delay), currentTime);
+  }
+
+  public static Value toValue(TabletMergeabilityMetadata tmm) {
+    return new Value(tmm.toJson());
+  }
+
+  public static TabletMergeabilityMetadata fromValue(Value value) {
+    return TabletMergeabilityMetadata.fromJson(value.toString());
+  }
+}
diff --git a/core/src/main/java/org/apache/accumulo/core/metadata/schema/TabletMetadata.java b/core/src/main/java/org/apache/accumulo/core/metadata/schema/TabletMetadata.java
index 795ebfafed4..2b59f78431d 100644
--- a/core/src/main/java/org/apache/accumulo/core/metadata/schema/TabletMetadata.java
+++ b/core/src/main/java/org/apache/accumulo/core/metadata/schema/TabletMetadata.java
@@ -25,6 +25,7 @@
 import static org.apache.accumulo.core.metadata.schema.MetadataSchema.TabletsSection.ServerColumnFamily.SELECTED_QUAL;
 import static org.apache.accumulo.core.metadata.schema.MetadataSchema.TabletsSection.ServerColumnFamily.TIME_QUAL;
 import static org.apache.accumulo.core.metadata.schema.MetadataSchema.TabletsSection.TabletColumnFamily.AVAILABILITY_QUAL;
+import static org.apache.accumulo.core.metadata.schema.MetadataSchema.TabletsSection.TabletColumnFamily.MERGEABILITY_QUAL;
 import static org.apache.accumulo.core.metadata.schema.MetadataSchema.TabletsSection.TabletColumnFamily.PREV_ROW_QUAL;
 import static org.apache.accumulo.core.metadata.schema.MetadataSchema.TabletsSection.TabletColumnFamily.REQUESTED_QUAL;
 
@@ -123,6 +124,7 @@ public class TabletMetadata {
   private final Set<FateId> compacted;
   private final Set<FateId> userCompactionsRequested;
   private final UnSplittableMetadata unSplittableMetadata;
+  private final TabletMergeabilityMetadata mergeability;
   private final Supplier<Long> fileSize;
 
   private TabletMetadata(Builder tmBuilder) {
@@ -155,6 +157,7 @@ private TabletMetadata(Builder tmBuilder) {
     this.compacted = tmBuilder.compacted.build();
     this.userCompactionsRequested = tmBuilder.userCompactionsRequested.build();
     this.unSplittableMetadata = tmBuilder.unSplittableMetadata;
+    this.mergeability = Objects.requireNonNull(tmBuilder.mergeability);
     this.fileSize = Suppliers.memoize(() -> {
       // This code was using a java stream. While profiling SplitMillionIT, the stream was showing
       // up as hot when scanning 1 million tablets. Converted to a for loop to improve performance.
@@ -198,7 +201,8 @@ public enum ColumnType {
     SELECTED,
     COMPACTED,
     USER_COMPACTION_REQUESTED,
-    UNSPLITTABLE
+    UNSPLITTABLE,
+    MERGEABILITY
   }
 
   public static class Location {
@@ -439,6 +443,11 @@ public UnSplittableMetadata getUnSplittable() {
     return unSplittableMetadata;
   }
 
+  public TabletMergeabilityMetadata getTabletMergeability() {
+    ensureFetched(ColumnType.MERGEABILITY);
+    return mergeability;
+  }
+
   @Override
   public String toString() {
     return new ToStringBuilder(this, ToStringStyle.SHORT_PREFIX_STYLE).append("tableId", tableId)
@@ -453,7 +462,8 @@ public String toString() {
         .append("operationId", operationId).append("selectedFiles", selectedFiles)
         .append("futureAndCurrentLocationSet", futureAndCurrentLocationSet)
         .append("userCompactionsRequested", userCompactionsRequested)
-        .append("unSplittableMetadata", unSplittableMetadata).toString();
+        .append("unSplittableMetadata", unSplittableMetadata).append("mergeability", mergeability)
+        .toString();
   }
 
   public List<Entry<Key,Value>> getKeyValues() {
@@ -527,6 +537,9 @@ public static <E extends Entry<Key,Value>> TabletMetadata convertRow(Iterator<E>
             case REQUESTED_QUAL:
               tmBuilder.onDemandHostingRequested(true);
               break;
+            case MERGEABILITY_QUAL:
+              tmBuilder.mergeability(TabletMergeabilityMetadata.fromValue(kv.getValue()));
+              break;
             default:
               throw new IllegalStateException("Unexpected TabletColumnFamily qualifier: " + qual);
           }
@@ -689,7 +702,7 @@ static class Builder {
     private final ImmutableSet.Builder<FateId> compacted = ImmutableSet.builder();
     private final ImmutableSet.Builder<FateId> userCompactionsRequested = ImmutableSet.builder();
     private UnSplittableMetadata unSplittableMetadata;
-    // private Supplier<Long> fileSize;
+    private TabletMergeabilityMetadata mergeability = TabletMergeabilityMetadata.never();
 
     void table(TableId tableId) {
       this.tableId = tableId;
@@ -799,6 +812,10 @@ void unSplittableMetadata(UnSplittableMetadata unSplittableMetadata) {
       this.unSplittableMetadata = unSplittableMetadata;
     }
 
+    void mergeability(TabletMergeabilityMetadata mergeability) {
+      this.mergeability = mergeability;
+    }
+
     void keyValue(Entry<Key,Value> kv) {
       if (this.keyValues == null) {
         this.keyValues = ImmutableList.builder();
diff --git a/core/src/main/java/org/apache/accumulo/core/metadata/schema/TabletMetadataBuilder.java b/core/src/main/java/org/apache/accumulo/core/metadata/schema/TabletMetadataBuilder.java
index 44f1915e0ea..8ca33d9eb79 100644
--- a/core/src/main/java/org/apache/accumulo/core/metadata/schema/TabletMetadataBuilder.java
+++ b/core/src/main/java/org/apache/accumulo/core/metadata/schema/TabletMetadataBuilder.java
@@ -30,6 +30,7 @@
 import static org.apache.accumulo.core.metadata.schema.TabletMetadata.ColumnType.LOADED;
 import static org.apache.accumulo.core.metadata.schema.TabletMetadata.ColumnType.LOCATION;
 import static org.apache.accumulo.core.metadata.schema.TabletMetadata.ColumnType.LOGS;
+import static org.apache.accumulo.core.metadata.schema.TabletMetadata.ColumnType.MERGEABILITY;
 import static org.apache.accumulo.core.metadata.schema.TabletMetadata.ColumnType.MERGED;
 import static org.apache.accumulo.core.metadata.schema.TabletMetadata.ColumnType.OPID;
 import static org.apache.accumulo.core.metadata.schema.TabletMetadata.ColumnType.PREV_ROW;
@@ -312,6 +313,14 @@ public TabletMetadataBuilder putCloned() {
     return this;
   }
 
+  @Override
+  public TabletMetadataBuilder
+      putTabletMergeability(TabletMergeabilityMetadata tabletMergeability) {
+    fetched.add(MERGEABILITY);
+    internalBuilder.putTabletMergeability(tabletMergeability);
+    return this;
+  }
+
   @Override
   public TabletMetadataBuilder automaticallyPutServerLock(boolean b) {
     throw new UnsupportedOperationException();
diff --git a/core/src/main/java/org/apache/accumulo/core/metadata/schema/TabletMutatorBase.java b/core/src/main/java/org/apache/accumulo/core/metadata/schema/TabletMutatorBase.java
index 6052c73a799..4f39eda7b7e 100644
--- a/core/src/main/java/org/apache/accumulo/core/metadata/schema/TabletMutatorBase.java
+++ b/core/src/main/java/org/apache/accumulo/core/metadata/schema/TabletMutatorBase.java
@@ -390,6 +390,13 @@ public T automaticallyPutServerLock(boolean b) {
     return getThis();
   }
 
+  @Override
+  public T putTabletMergeability(TabletMergeabilityMetadata tabletMergeability) {
+    TabletColumnFamily.MERGEABILITY_COLUMN.put(mutation,
+        TabletMergeabilityMetadata.toValue(tabletMergeability));
+    return getThis();
+  }
+
   public void setCloseAfterMutate(AutoCloseable closeable) {
     this.closeAfterMutate = closeable;
   }
diff --git a/core/src/main/java/org/apache/accumulo/core/metadata/schema/TabletsMetadata.java b/core/src/main/java/org/apache/accumulo/core/metadata/schema/TabletsMetadata.java
index a3914ea0ed0..04115dfaeac 100644
--- a/core/src/main/java/org/apache/accumulo/core/metadata/schema/TabletsMetadata.java
+++ b/core/src/main/java/org/apache/accumulo/core/metadata/schema/TabletsMetadata.java
@@ -77,6 +77,7 @@
 import org.apache.accumulo.core.metadata.schema.MetadataSchema.TabletsSection.ScanFileColumnFamily;
 import org.apache.accumulo.core.metadata.schema.MetadataSchema.TabletsSection.SplitColumnFamily;
 import org.apache.accumulo.core.metadata.schema.MetadataSchema.TabletsSection.SuspendLocationColumn;
+import org.apache.accumulo.core.metadata.schema.MetadataSchema.TabletsSection.TabletColumnFamily;
 import org.apache.accumulo.core.metadata.schema.MetadataSchema.TabletsSection.UserCompactionRequestedColumnFamily;
 import org.apache.accumulo.core.metadata.schema.TabletMetadata.ColumnType;
 import org.apache.accumulo.core.metadata.schema.filters.TabletMetadataFilter;
@@ -394,6 +395,9 @@ public Options fetch(ColumnType... colsToFetch) {
           case UNSPLITTABLE:
             qualifiers.add(SplitColumnFamily.UNSPLITTABLE_COLUMN);
             break;
+          case MERGEABILITY:
+            qualifiers.add(TabletColumnFamily.MERGEABILITY_COLUMN);
+            break;
           default:
             throw new IllegalArgumentException("Unknown col type " + colToFetch);
         }
diff --git a/core/src/main/java/org/apache/accumulo/core/security/ColumnVisibility.java b/core/src/main/java/org/apache/accumulo/core/security/ColumnVisibility.java
index 51f7ce5348f..54e5c473393 100644
--- a/core/src/main/java/org/apache/accumulo/core/security/ColumnVisibility.java
+++ b/core/src/main/java/org/apache/accumulo/core/security/ColumnVisibility.java
@@ -20,25 +20,13 @@
 
 import static java.nio.charset.StandardCharsets.UTF_8;
 
-import java.io.Serializable;
-import java.util.ArrayList;
 import java.util.Arrays;
-import java.util.Collections;
-import java.util.Comparator;
-import java.util.List;
-import java.util.TreeSet;
-import java.util.function.Supplier;
 
 import org.apache.accumulo.access.AccessExpression;
 import org.apache.accumulo.access.InvalidAccessExpressionException;
-import org.apache.accumulo.core.data.ArrayByteSequence;
-import org.apache.accumulo.core.data.ByteSequence;
 import org.apache.accumulo.core.util.BadArgumentException;
 import org.apache.accumulo.core.util.TextUtil;
 import org.apache.hadoop.io.Text;
-import org.apache.hadoop.io.WritableComparator;
-
-import com.google.common.base.Suppliers;
 
 /**
  * Validate the column visibility is a valid expression and set the visibility for a Mutation. See
@@ -72,18 +60,14 @@
  * <p>
  * In addition to the base set of visibilities, any character can be used in the expression if it is
  * quoted. If the quoted term contains '&quot;' or '\', then escape the character with '\'. The
- * {@link #quote(String)} method can be used to properly quote and escape terms automatically. The
- * following is an example of a quoted term:
+ * {@link AccessExpression#quote(String)} method can be used to properly quote and escape terms
+ * automatically. The following is an example of a quoted term:
  *
  * <pre>
  * &quot;A#C&quot; &amp; B
  * </pre>
  */
 public class ColumnVisibility {
-
-  // This functionality is deprecated so its setup as a supplier so it is only computed if the
-  // deprecated functionality is called.
-  private final Supplier<Node> nodeSupplier;
   private final byte[] expression;
 
   /**
@@ -95,387 +79,6 @@ public byte[] getExpression() {
     return expression;
   }
 
-  /**
-   * The node types in a parse tree for a visibility expression.
-   */
-  @Deprecated(since = "3.1.0")
-  public enum NodeType {
-    EMPTY, TERM, OR, AND,
-  }
-
-  /**
-   * All empty nodes are equal and represent the same value.
-   */
-  private static final Node EMPTY_NODE = new Node(NodeType.EMPTY, 0);
-
-  /**
-   * A node in the parse tree for a visibility expression.
-   */
-  @Deprecated(since = "3.1.0")
-  public static class Node {
-    /**
-     * An empty list of nodes.
-     */
-    public static final List<Node> EMPTY = Collections.emptyList();
-    final NodeType type;
-    final int start;
-    int end;
-    List<Node> children = EMPTY;
-
-    public Node(NodeType type, int start) {
-      this.type = type;
-      this.start = start;
-      this.end = start + 1;
-    }
-
-    public Node(int start, int end) {
-      this.type = NodeType.TERM;
-      this.start = start;
-      this.end = end;
-    }
-
-    public void add(Node child) {
-      if (children == EMPTY) {
-        children = new ArrayList<>();
-      }
-
-      children.add(child);
-    }
-
-    public NodeType getType() {
-      return type;
-    }
-
-    public List<Node> getChildren() {
-      return children;
-    }
-
-    public int getTermStart() {
-      return start;
-    }
-
-    public int getTermEnd() {
-      return end;
-    }
-
-    public ByteSequence getTerm(byte[] expression) {
-      if (type != NodeType.TERM) {
-        throw new IllegalStateException();
-      }
-
-      if (expression[start] == '"') {
-        // its a quoted term
-        int qStart = start + 1;
-        int qEnd = end - 1;
-
-        return new ArrayByteSequence(expression, qStart, qEnd - qStart);
-      }
-      return new ArrayByteSequence(expression, start, end - start);
-    }
-  }
-
-  /**
-   * A node comparator. Nodes sort according to node type, terms sort lexicographically. AND and OR
-   * nodes sort by number of children, or if the same by corresponding children.
-   */
-  @Deprecated(since = "3.1.0")
-  public static class NodeComparator implements Comparator<Node>, Serializable {
-
-    private static final long serialVersionUID = 1L;
-    final byte[] text;
-
-    /**
-     * Creates a new comparator.
-     *
-     * @param text expression string, encoded in UTF-8
-     */
-    public NodeComparator(byte[] text) {
-      this.text = text;
-    }
-
-    @Override
-    public int compare(Node a, Node b) {
-      int diff = a.type.ordinal() - b.type.ordinal();
-      if (diff != 0) {
-        return diff;
-      }
-      switch (a.type) {
-        case EMPTY:
-          return 0; // All empty nodes are the same
-        case TERM:
-          return WritableComparator.compareBytes(text, a.start, a.end - a.start, text, b.start,
-              b.end - b.start);
-        case OR:
-        case AND:
-          diff = a.children.size() - b.children.size();
-          if (diff != 0) {
-            return diff;
-          }
-          for (int i = 0; i < a.children.size(); i++) {
-            diff = compare(a.children.get(i), b.children.get(i));
-            if (diff != 0) {
-              return diff;
-            }
-          }
-      }
-      return 0;
-    }
-  }
-
-  /*
-   * Convenience method that delegates to normalize with a new NodeComparator constructed using the
-   * supplied expression.
-   */
-  @Deprecated(since = "3.1.0")
-  public static Node normalize(Node root, byte[] expression) {
-    return normalize(root, expression, new NodeComparator(expression));
-  }
-
-  // @formatter:off
-  /*
-   * Walks an expression's AST in order to:
-   *  1) roll up expressions with the same operant (`a&(b&c) becomes a&b&c`)
-   *  2) sort labels lexicographically (permutations of `a&b&c` are re-ordered to appear as `a&b&c`)
-   *  3) dedupes labels (`a&b&a` becomes `a&b`)
-   */
-  // @formatter:on
-  @Deprecated(since = "3.1.0")
-  public static Node normalize(Node root, byte[] expression, NodeComparator comparator) {
-    if (root.type != NodeType.TERM) {
-      TreeSet<Node> rolledUp = new TreeSet<>(comparator);
-      java.util.Iterator<Node> itr = root.children.iterator();
-      while (itr.hasNext()) {
-        Node c = normalize(itr.next(), expression, comparator);
-        if (c.type == root.type) {
-          rolledUp.addAll(c.children);
-          itr.remove();
-        }
-      }
-      rolledUp.addAll(root.children);
-      root.children.clear();
-      root.children.addAll(rolledUp);
-
-      // need to promote a child if it's an only child
-      if (root.children.size() == 1) {
-        return root.children.get(0);
-      }
-    }
-
-    return root;
-  }
-
-  /*
-   * Walks an expression's AST and appends a string representation to a supplied StringBuilder. This
-   * method adds parens where necessary.
-   */
-  @Deprecated(since = "3.1.0")
-  public static void stringify(Node root, byte[] expression, StringBuilder out) {
-    if (root.type == NodeType.TERM) {
-      out.append(new String(expression, root.start, root.end - root.start, UTF_8));
-    } else {
-      String sep = "";
-      for (Node c : root.children) {
-        out.append(sep);
-        boolean parens = (c.type != NodeType.TERM && root.type != c.type);
-        if (parens) {
-          out.append("(");
-        }
-        stringify(c, expression, out);
-        if (parens) {
-          out.append(")");
-        }
-        sep = root.type == NodeType.AND ? "&" : "|";
-      }
-    }
-  }
-
-  /**
-   * Generates a byte[] that represents a normalized, but logically equivalent, form of this
-   * evaluator's expression.
-   *
-   * @return normalized expression in byte[] form
-   */
-  @Deprecated(since = "3.1.0")
-  public byte[] flatten() {
-    return AccessExpression.of(expression, true).getExpression().getBytes(UTF_8);
-  }
-
-  @Deprecated
-  private static class ColumnVisibilityParser {
-    private int index = 0;
-    private int parens = 0;
-
-    public ColumnVisibilityParser() {}
-
-    Node parse(byte[] expression) {
-      if (expression.length > 0) {
-        Node node = parse_(expression);
-        if (node == null) {
-          throw new BadArgumentException("operator or missing parens",
-              new String(expression, UTF_8), index - 1);
-        }
-        if (parens != 0) {
-          throw new BadArgumentException("parenthesis mis-match", new String(expression, UTF_8),
-              index - 1);
-        }
-        return node;
-      }
-      return null;
-    }
-
-    Node processTerm(int start, int end, Node expr, byte[] expression) {
-      if (start != end) {
-        if (expr != null) {
-          throw new BadArgumentException("expression needs | or &", new String(expression, UTF_8),
-              start);
-        }
-        return new Node(start, end);
-      }
-      if (expr == null) {
-        throw new BadArgumentException("empty term", new String(expression, UTF_8), start);
-      }
-      return expr;
-    }
-
-    Node parse_(byte[] expression) {
-      Node result = null;
-      Node expr = null;
-      int wholeTermStart = index;
-      int subtermStart = index;
-      boolean subtermComplete = false;
-
-      while (index < expression.length) {
-        switch (expression[index++]) {
-          case '&':
-            expr = processTerm(subtermStart, index - 1, expr, expression);
-            if (result != null) {
-              if (!result.type.equals(NodeType.AND)) {
-                throw new BadArgumentException("cannot mix & and |", new String(expression, UTF_8),
-                    index - 1);
-              }
-            } else {
-              result = new Node(NodeType.AND, wholeTermStart);
-            }
-            result.add(expr);
-            expr = null;
-            subtermStart = index;
-            subtermComplete = false;
-            break;
-          case '|':
-            expr = processTerm(subtermStart, index - 1, expr, expression);
-            if (result != null) {
-              if (!result.type.equals(NodeType.OR)) {
-                throw new BadArgumentException("cannot mix | and &", new String(expression, UTF_8),
-                    index - 1);
-              }
-            } else {
-              result = new Node(NodeType.OR, wholeTermStart);
-            }
-            result.add(expr);
-            expr = null;
-            subtermStart = index;
-            subtermComplete = false;
-            break;
-          case '(':
-            parens++;
-            if (subtermStart != index - 1 || expr != null) {
-              throw new BadArgumentException("expression needs & or |",
-                  new String(expression, UTF_8), index - 1);
-            }
-            expr = parse_(expression);
-            subtermStart = index;
-            subtermComplete = false;
-            break;
-          case ')':
-            parens--;
-            Node child = processTerm(subtermStart, index - 1, expr, expression);
-            if (child == null && result == null) {
-              throw new BadArgumentException("empty expression not allowed",
-                  new String(expression, UTF_8), index);
-            }
-            if (result == null) {
-              return child;
-            }
-            if (result.type == child.type) {
-              for (Node c : child.children) {
-                result.add(c);
-              }
-            } else {
-              result.add(child);
-            }
-            result.end = index - 1;
-            return result;
-          case '"':
-            if (subtermStart != index - 1) {
-              throw new BadArgumentException("expression needs & or |",
-                  new String(expression, UTF_8), index - 1);
-            }
-
-            while (index < expression.length && expression[index] != '"') {
-              if (expression[index] == '\\') {
-                index++;
-                if (index == expression.length
-                    || (expression[index] != '\\' && expression[index] != '"')) {
-                  throw new BadArgumentException("invalid escaping within quotes",
-                      new String(expression, UTF_8), index - 1);
-                }
-              }
-              index++;
-            }
-
-            if (index == expression.length) {
-              throw new BadArgumentException("unclosed quote", new String(expression, UTF_8),
-                  subtermStart);
-            }
-
-            if (subtermStart + 1 == index) {
-              throw new BadArgumentException("empty term", new String(expression, UTF_8),
-                  subtermStart);
-            }
-
-            index++;
-
-            subtermComplete = true;
-
-            break;
-          default:
-            if (subtermComplete) {
-              throw new BadArgumentException("expression needs & or |",
-                  new String(expression, UTF_8), index - 1);
-            }
-
-            byte c = expression[index - 1];
-            if (!Authorizations.isValidAuthChar(c)) {
-              throw new BadArgumentException("bad character (" + c + ")",
-                  new String(expression, UTF_8), index - 1);
-            }
-        }
-      }
-      Node child = processTerm(subtermStart, index, expr, expression);
-      if (result != null) {
-        result.add(child);
-        result.end = index;
-      } else {
-        result = child;
-      }
-      if (result.type != NodeType.TERM) {
-        if (result.children.size() < 2) {
-          throw new BadArgumentException("missing term", new String(expression, UTF_8), index);
-        }
-      }
-      return result;
-    }
-  }
-
-  private Node createNodeTree(byte[] expression) {
-    if (expression != null && expression.length > 0) {
-      ColumnVisibilityParser p = new ColumnVisibilityParser();
-      return p.parse(expression);
-    } else {
-      return EMPTY_NODE;
-    }
-  }
-
   private static final byte[] EMPTY_BYTES = new byte[0];
 
   /**
@@ -486,7 +89,6 @@ private Node createNodeTree(byte[] expression) {
    */
   public ColumnVisibility() {
     expression = EMPTY_BYTES;
-    nodeSupplier = Suppliers.memoize(() -> createNodeTree(expression));
   }
 
   /**
@@ -524,7 +126,6 @@ public ColumnVisibility(byte[] expression) {
       // exceptions itself.
       throw new BadArgumentException(e);
     }
-    nodeSupplier = Suppliers.memoize(() -> createNodeTree(this.expression));
   }
 
   /**
@@ -537,7 +138,6 @@ public ColumnVisibility(byte[] expression) {
   public ColumnVisibility(AccessExpression expression) {
     // AccessExpression is a validated immutable object, so no need to re validate
     this.expression = expression.getExpression().getBytes(UTF_8);
-    nodeSupplier = Suppliers.memoize(() -> createNodeTree(this.expression));
   }
 
   @Override
@@ -571,53 +171,4 @@ public boolean equals(ColumnVisibility otherLe) {
   public int hashCode() {
     return Arrays.hashCode(expression);
   }
-
-  /**
-   * Gets the parse tree for this column visibility.
-   *
-   * @return parse tree node
-   */
-  @Deprecated(since = "3.1.0")
-  public Node getParseTree() {
-    return nodeSupplier.get();
-  }
-
-  /**
-   * Properly quotes terms in a column visibility expression. If no quoting is needed, then nothing
-   * is done.
-   *
-   * <p>
-   * Examples of using quote :
-   *
-   * <pre>
-   * import static org.apache.accumulo.core.security.ColumnVisibility.quote;
-   *   .
-   *   .
-   *   .
-   * String s = quote(&quot;A#C&quot;) + &quot;&amp;&quot; + quote(&quot;FOO&quot;);
-   * ColumnVisibility cv = new ColumnVisibility(s);
-   * </pre>
-   *
-   * @param term term to quote
-   * @return quoted term (unquoted if unnecessary)
-   * @deprecated use {@link AccessExpression#quote(String)}
-   */
-  @Deprecated(since = "3.1.0")
-  public static String quote(String term) {
-    return AccessExpression.quote(term);
-  }
-
-  /**
-   * Properly quotes terms in a column visibility expression. If no quoting is needed, then nothing
-   * is done.
-   *
-   * @param term term to quote, encoded as UTF-8 bytes
-   * @return quoted term (unquoted if unnecessary), encoded as UTF-8 bytes
-   * @see #quote(String)
-   * @deprecated use {@link AccessExpression#quote(byte[])}
-   */
-  @Deprecated(since = "3.1.0")
-  public static byte[] quote(byte[] term) {
-    return AccessExpression.quote(term);
-  }
 }
diff --git a/core/src/main/java/org/apache/accumulo/core/security/VisibilityEvaluator.java b/core/src/main/java/org/apache/accumulo/core/security/VisibilityEvaluator.java
deleted file mode 100644
index 3c97c26e696..00000000000
--- a/core/src/main/java/org/apache/accumulo/core/security/VisibilityEvaluator.java
+++ /dev/null
@@ -1,110 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.accumulo.core.security;
-
-import org.apache.accumulo.access.AccessEvaluator;
-import org.apache.accumulo.access.InvalidAccessExpressionException;
-import org.apache.accumulo.core.data.ArrayByteSequence;
-
-/**
- * A class which evaluates visibility expressions against a set of authorizations.
- *
- * @deprecated since 3.1.0 Use Accumulo Access library instead
- */
-@Deprecated(since = "3.1.0")
-public class VisibilityEvaluator {
-  private final AccessEvaluator accessEvaluator;
-
-  /**
-   * Properly escapes an authorization string. The string can be quoted if desired.
-   *
-   * @param auth authorization string, as UTF-8 encoded bytes
-   * @param quote true to wrap escaped authorization in quotes
-   * @return escaped authorization string
-   */
-  public static byte[] escape(byte[] auth, boolean quote) {
-    int escapeCount = 0;
-
-    for (byte value : auth) {
-      if (value == '"' || value == '\\') {
-        escapeCount++;
-      }
-    }
-
-    if (escapeCount > 0 || quote) {
-      byte[] escapedAuth = new byte[auth.length + escapeCount + (quote ? 2 : 0)];
-      int index = quote ? 1 : 0;
-      for (byte b : auth) {
-        if (b == '"' || b == '\\') {
-          escapedAuth[index++] = '\\';
-        }
-        escapedAuth[index++] = b;
-      }
-
-      if (quote) {
-        escapedAuth[0] = '"';
-        escapedAuth[escapedAuth.length - 1] = '"';
-      }
-
-      auth = escapedAuth;
-    }
-    return auth;
-  }
-
-  /**
-   * Creates a new evaluator for the authorizations found in the given container.
-   *
-   * @since 1.7.0
-   */
-  public VisibilityEvaluator(AuthorizationContainer authsContainer) {
-    // TODO need to look into efficiency and correctness of this
-    this.accessEvaluator =
-        AccessEvaluator.of(auth -> authsContainer.contains(new ArrayByteSequence(auth)));
-  }
-
-  /**
-   * Creates a new evaluator for the given collection of authorizations. Each authorization string
-   * is escaped before handling, and the original strings are unchanged.
-   *
-   * @param authorizations authorizations object
-   */
-  public VisibilityEvaluator(Authorizations authorizations) {
-    this.accessEvaluator = AccessEvaluator.of(authorizations.toAccessAuthorizations());
-  }
-
-  /**
-   * Evaluates the given column visibility against the authorizations provided to this evaluator. A
-   * visibility passes evaluation if all authorizations in it are contained in those known to the
-   * evaluator, and all AND and OR subexpressions have at least two children.
-   *
-   * @param visibility column visibility to evaluate
-   * @return true if visibility passes evaluation
-   * @throws VisibilityParseException if an AND or OR subexpression has less than two children, or a
-   *         subexpression is of an unknown type
-   */
-  public boolean evaluate(ColumnVisibility visibility) throws VisibilityParseException {
-    try {
-      return accessEvaluator.canAccess(visibility.getExpression());
-    } catch (InvalidAccessExpressionException e) {
-      // This is thrown for compatability with the exception this class used to evaluate expressions
-      // itself.
-      throw new VisibilityParseException(e);
-    }
-  }
-}
diff --git a/core/src/main/java/org/apache/accumulo/core/trace/TraceUtil.java b/core/src/main/java/org/apache/accumulo/core/trace/TraceUtil.java
index 78d658a38e1..63d7a793079 100644
--- a/core/src/main/java/org/apache/accumulo/core/trace/TraceUtil.java
+++ b/core/src/main/java/org/apache/accumulo/core/trace/TraceUtil.java
@@ -21,7 +21,9 @@
 import java.lang.reflect.InvocationHandler;
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Proxy;
+import java.util.HashSet;
 import java.util.Map;
+import java.util.Set;
 import java.util.concurrent.Callable;
 
 import org.apache.accumulo.core.Constants;
@@ -214,8 +216,19 @@ public static <T> T wrapService(final T instance) {
   private static <T> T wrapRpc(final InvocationHandler handler, final T instance) {
     @SuppressWarnings("unchecked")
     T proxiedInstance = (T) Proxy.newProxyInstance(instance.getClass().getClassLoader(),
-        instance.getClass().getInterfaces(), handler);
+        getInterfaces(instance.getClass()).toArray(new Class<?>[0]), handler);
     return proxiedInstance;
   }
 
+  private static Set<Class<?>> getInterfaces(Class<?> clazz) {
+    var set = new HashSet<Class<?>>();
+    if (clazz != null) {
+      set.addAll(getInterfaces(clazz.getSuperclass()));
+      for (Class<?> interfaze : clazz.getInterfaces()) {
+        set.add(interfaze);
+      }
+    }
+    return set;
+  }
+
 }
diff --git a/core/src/main/java/org/apache/accumulo/core/util/MonitorUtil.java b/core/src/main/java/org/apache/accumulo/core/util/MonitorUtil.java
index 6ea9d343759..87ed8448e3c 100644
--- a/core/src/main/java/org/apache/accumulo/core/util/MonitorUtil.java
+++ b/core/src/main/java/org/apache/accumulo/core/util/MonitorUtil.java
@@ -32,7 +32,7 @@ public class MonitorUtil {
 
   public static String getLocation(ClientContext context)
       throws KeeperException, InterruptedException {
-    return getLocation(context.getZooReader(), context);
+    return getLocation(context.getZooSession().asReader(), context);
   }
 
   @VisibleForTesting
diff --git a/core/src/main/java/org/apache/accumulo/core/util/compaction/RunningCompactionInfo.java b/core/src/main/java/org/apache/accumulo/core/util/compaction/RunningCompactionInfo.java
index 6b7bed87c03..85eda552869 100644
--- a/core/src/main/java/org/apache/accumulo/core/util/compaction/RunningCompactionInfo.java
+++ b/core/src/main/java/org/apache/accumulo/core/util/compaction/RunningCompactionInfo.java
@@ -75,7 +75,7 @@ public RunningCompactionInfo(TExternalCompaction ec) {
     if (lastEntry != null) {
       last = lastEntry.getValue();
       updateMillis = lastEntry.getKey();
-      duration = last.getCompactionAgeNanos();
+      duration = NANOSECONDS.toMillis(last.getCompactionAgeNanos());
     } else {
       log.debug("No updates found for {}", ecid);
       lastUpdate = 1;
@@ -84,7 +84,7 @@ public RunningCompactionInfo(TExternalCompaction ec) {
       duration = 0;
       return;
     }
-    long durationMinutes = NANOSECONDS.toMinutes(duration);
+    long durationMinutes = MILLISECONDS.toMinutes(duration);
     if (durationMinutes > 15) {
       log.warn("Compaction {} has been running for {} minutes", ecid, durationMinutes);
     }
diff --git a/core/src/main/java/org/apache/accumulo/core/util/time/SteadyTime.java b/core/src/main/java/org/apache/accumulo/core/util/time/SteadyTime.java
index d16f15c2019..57b348b23d3 100644
--- a/core/src/main/java/org/apache/accumulo/core/util/time/SteadyTime.java
+++ b/core/src/main/java/org/apache/accumulo/core/util/time/SteadyTime.java
@@ -18,6 +18,7 @@
  */
 package org.apache.accumulo.core.util.time;
 
+import java.io.Serializable;
 import java.time.Duration;
 import java.util.Objects;
 import java.util.concurrent.TimeUnit;
@@ -30,7 +31,8 @@
  * is not expected to represent real world date times, its main use is for computing deltas similar
  * System.nanoTime but across JVM processes.
  */
-public class SteadyTime implements Comparable<SteadyTime> {
+public class SteadyTime implements Comparable<SteadyTime>, Serializable {
+  private static final long serialVersionUID = 1L;
 
   private final Duration time;
 
diff --git a/core/src/main/java/org/apache/accumulo/core/zookeeper/ZooSession.java b/core/src/main/java/org/apache/accumulo/core/zookeeper/ZooSession.java
new file mode 100644
index 00000000000..032eecc4534
--- /dev/null
+++ b/core/src/main/java/org/apache/accumulo/core/zookeeper/ZooSession.java
@@ -0,0 +1,312 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.accumulo.core.zookeeper;
+
+import static java.nio.charset.StandardCharsets.UTF_8;
+import static java.util.Objects.requireNonNull;
+import static java.util.concurrent.TimeUnit.NANOSECONDS;
+import static org.apache.accumulo.core.util.LazySingletons.RANDOM;
+
+import java.io.IOException;
+import java.net.UnknownHostException;
+import java.util.List;
+import java.util.UUID;
+import java.util.concurrent.atomic.AtomicBoolean;
+import java.util.concurrent.atomic.AtomicLong;
+import java.util.concurrent.atomic.AtomicReference;
+
+import org.apache.accumulo.core.conf.AccumuloConfiguration;
+import org.apache.accumulo.core.conf.Property;
+import org.apache.accumulo.core.fate.zookeeper.ZooReader;
+import org.apache.accumulo.core.fate.zookeeper.ZooReaderWriter;
+import org.apache.accumulo.core.util.AddressUtil;
+import org.apache.accumulo.core.util.UtilWaitThread;
+import org.apache.zookeeper.AsyncCallback.StringCallback;
+import org.apache.zookeeper.AsyncCallback.VoidCallback;
+import org.apache.zookeeper.CreateMode;
+import org.apache.zookeeper.KeeperException;
+import org.apache.zookeeper.WatchedEvent;
+import org.apache.zookeeper.Watcher;
+import org.apache.zookeeper.Watcher.Event.KeeperState;
+import org.apache.zookeeper.Watcher.WatcherType;
+import org.apache.zookeeper.ZooKeeper;
+import org.apache.zookeeper.data.ACL;
+import org.apache.zookeeper.data.Stat;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+/**
+ * A ZooKeeper client facade that maintains a ZooKeeper delegate instance. If the delegate instance
+ * loses its session, it is replaced with a new instance to establish a new session. Any Watchers
+ * registered on a session will need to monitor for the session expired event triggered from the old
+ * delegate, and must be reset on the new session if you intend them to monitor any further events.
+ * That is no different than if you created a new ZooKeeper instance directly after the first one
+ * expired.
+ */
+public class ZooSession implements AutoCloseable {
+
+  public static class ZKUtil {
+    public static void deleteRecursive(ZooSession zk, final String pathRoot)
+        throws InterruptedException, KeeperException {
+      org.apache.zookeeper.ZKUtil.deleteRecursive(zk.verifyConnected(), pathRoot);
+    }
+
+    public static void visitSubTreeDFS(ZooSession zk, final String path, boolean watch,
+        StringCallback cb) throws KeeperException, InterruptedException {
+      org.apache.zookeeper.ZKUtil.visitSubTreeDFS(zk.verifyConnected(), path, watch, cb);
+    }
+  }
+
+  private static class ZooSessionWatcher implements Watcher {
+
+    private final String connectionName;
+    private final AtomicReference<KeeperState> lastState = new AtomicReference<>(null);
+
+    public ZooSessionWatcher(String connectionName) {
+      this.connectionName = connectionName;
+    }
+
+    @Override
+    public void process(WatchedEvent event) {
+      final var newState = event.getState();
+      var oldState = lastState.getAndUpdate(s -> newState);
+      if (oldState == null) {
+        log.debug("{} state changed to {}", connectionName, newState);
+      } else if (newState != oldState) {
+        log.debug("{} state changed from {} to {}", connectionName, oldState, newState);
+      }
+    }
+  }
+
+  private static final Logger log = LoggerFactory.getLogger(ZooSession.class);
+
+  private static void closeZk(ZooKeeper zk) {
+    if (zk != null) {
+      try {
+        zk.close();
+      } catch (InterruptedException e) {
+        // ZooKeeper doesn't actually throw this; it's just there for backwards compatibility
+        Thread.currentThread().interrupt();
+      }
+    }
+  }
+
+  private static void digestAuth(ZooKeeper zoo, String secret) {
+    zoo.addAuthInfo("digest", ("accumulo:" + requireNonNull(secret)).getBytes(UTF_8));
+  }
+
+  private final AtomicBoolean closed = new AtomicBoolean();
+  private final AtomicLong connectCounter;
+  private final String connectString;
+  private final AtomicReference<ZooKeeper> delegate = new AtomicReference<>();
+  private final String instanceSecret;
+  private final String sessionName;
+  private final int timeout;
+  private final ZooReaderWriter zrw;
+
+  /**
+   * Construct a new ZooKeeper client, retrying indefinitely if it doesn't work right away. The
+   * caller is responsible for closing instances returned from this method.
+   *
+   * @param clientName a convenient name for logging its connection state changes
+   * @param conf a convenient carrier of ZK connection information using Accumulo properties
+   */
+  public ZooSession(String clientName, AccumuloConfiguration conf) {
+    this(clientName, conf.get(Property.INSTANCE_ZK_HOST),
+        (int) conf.getTimeInMillis(Property.INSTANCE_ZK_TIMEOUT),
+        conf.get(Property.INSTANCE_SECRET));
+  }
+
+  /**
+   * Construct a new ZooKeeper client, retrying indefinitely if it doesn't work right away. The
+   * caller is responsible for closing instances returned from this method.
+   *
+   * @param clientName a convenient name for logging its connection state changes
+   * @param connectString in the form of host1:port1,host2:port2/chroot/path
+   * @param timeout in milliseconds
+   * @param instanceSecret instance secret (may be null)
+   */
+  public ZooSession(String clientName, String connectString, int timeout, String instanceSecret) {
+    // information needed to construct a ZooKeeper instance and add authentication
+    this.connectString = connectString;
+    this.timeout = timeout;
+    this.instanceSecret = instanceSecret;
+
+    // information for logging which instance of ZooSession this is
+    this.sessionName =
+        String.format("%s[%s_%s]", getClass().getSimpleName(), clientName, UUID.randomUUID());
+    this.connectCounter = new AtomicLong(); // incremented when we need to create a new delegate
+    this.zrw = new ZooReaderWriter(this);
+  }
+
+  private ZooKeeper verifyConnected() {
+    if (closed.get()) {
+      throw new IllegalStateException(sessionName + " was closed");
+    }
+    return delegate.updateAndGet(zk -> (zk != null && zk.getState().isAlive()) ? zk : reconnect());
+  }
+
+  private synchronized ZooKeeper reconnect() {
+    ZooKeeper zk;
+    if ((zk = delegate.get()) != null && zk.getState().isAlive()) {
+      return zk;
+    }
+    zk = null;
+    var reconnectName = String.format("%s#%s", sessionName, connectCounter.getAndIncrement());
+    log.debug("{} (re-)connecting to {} with timeout {}{}", reconnectName, connectString, timeout,
+        instanceSecret == null ? "" : " with auth");
+    final int TIME_BETWEEN_CONNECT_CHECKS_MS = 100;
+    int connectTimeWait = Math.min(10_000, timeout);
+    boolean tryAgain = true;
+    long sleepTime = 100;
+
+    long startTime = System.nanoTime();
+
+    while (tryAgain) {
+      try {
+        zk = new ZooKeeper(connectString, timeout, new ZooSessionWatcher(reconnectName));
+        // it may take some time to get connected to zookeeper if some of the servers are down
+        for (int i = 0; i < connectTimeWait / TIME_BETWEEN_CONNECT_CHECKS_MS && tryAgain; i++) {
+          if (zk.getState().isConnected()) {
+            if (instanceSecret != null) {
+              digestAuth(zk, instanceSecret);
+            }
+            tryAgain = false;
+          } else {
+            UtilWaitThread.sleep(TIME_BETWEEN_CONNECT_CHECKS_MS);
+          }
+        }
+
+      } catch (IOException e) {
+        if (e instanceof UnknownHostException) {
+          /*
+           * Make sure we wait at least as long as the JVM TTL for negative DNS responses
+           */
+          int ttl = AddressUtil.getAddressCacheNegativeTtl((UnknownHostException) e);
+          sleepTime = Math.max(sleepTime, (ttl + 1) * 1000L);
+        }
+        log.warn("Connection to zooKeeper failed, will try again in "
+            + String.format("%.2f secs", sleepTime / 1000.0), e);
+      } finally {
+        if (tryAgain && zk != null) {
+          closeZk(zk);
+          zk = null;
+        }
+      }
+
+      long stopTime = System.nanoTime();
+      long duration = NANOSECONDS.toMillis(stopTime - startTime);
+
+      if (duration > 2L * timeout) {
+        throw new IllegalStateException("Failed to connect to zookeeper (" + connectString
+            + ") within 2x zookeeper timeout period " + timeout);
+      }
+
+      if (tryAgain) {
+        if (2L * timeout < duration + sleepTime + connectTimeWait) {
+          sleepTime = 2L * timeout - duration - connectTimeWait;
+        }
+        if (sleepTime < 0) {
+          connectTimeWait -= sleepTime;
+          sleepTime = 0;
+        }
+        UtilWaitThread.sleep(sleepTime);
+        if (sleepTime < 10000) {
+          sleepTime = sleepTime + (long) (sleepTime * RANDOM.get().nextDouble());
+        }
+      }
+    }
+    return zk;
+  }
+
+  public void addAuthInfo(String scheme, byte[] auth) {
+    verifyConnected().addAuthInfo(scheme, auth);
+  }
+
+  public String create(final String path, byte[] data, List<ACL> acl, CreateMode createMode)
+      throws KeeperException, InterruptedException {
+    return verifyConnected().create(path, data, acl, createMode);
+  }
+
+  public void delete(final String path, int version) throws InterruptedException, KeeperException {
+    verifyConnected().delete(path, version);
+  }
+
+  public Stat exists(final String path, Watcher watcher)
+      throws KeeperException, InterruptedException {
+    return verifyConnected().exists(path, watcher);
+  }
+
+  public List<ACL> getACL(final String path, Stat stat)
+      throws KeeperException, InterruptedException {
+    return verifyConnected().getACL(path, stat);
+  }
+
+  public List<String> getChildren(final String path, Watcher watcher)
+      throws KeeperException, InterruptedException {
+    return verifyConnected().getChildren(path, watcher);
+  }
+
+  public byte[] getData(final String path, Watcher watcher, Stat stat)
+      throws KeeperException, InterruptedException {
+    return verifyConnected().getData(path, watcher, stat);
+  }
+
+  public long getSessionId() {
+    return verifyConnected().getSessionId();
+  }
+
+  public int getSessionTimeout() {
+    return verifyConnected().getSessionTimeout();
+  }
+
+  public void removeWatches(String path, Watcher watcher, WatcherType watcherType, boolean local)
+      throws InterruptedException, KeeperException {
+    verifyConnected().removeWatches(path, watcher, watcherType, local);
+  }
+
+  public Stat setData(final String path, byte[] data, int version)
+      throws KeeperException, InterruptedException {
+    return verifyConnected().setData(path, data, version);
+  }
+
+  public void sync(final String path, VoidCallback cb, Object ctx) {
+    verifyConnected().sync(path, cb, ctx);
+  }
+
+  @Override
+  public void close() {
+    if (closed.compareAndSet(false, true)) {
+      closeZk(delegate.getAndSet(null));
+    }
+  }
+
+  public void addAccumuloDigestAuth(String auth) {
+    digestAuth(verifyConnected(), auth);
+  }
+
+  public ZooReader asReader() {
+    return zrw;
+  }
+
+  public ZooReaderWriter asReaderWriter() {
+    return zrw;
+  }
+
+}
diff --git a/core/src/main/thrift-gen-java/org/apache/accumulo/core/manager/thrift/FateService.java b/core/src/main/thrift-gen-java/org/apache/accumulo/core/manager/thrift/FateService.java
index b38fb423bcb..9fd6e7808f2 100644
--- a/core/src/main/thrift-gen-java/org/apache/accumulo/core/manager/thrift/FateService.java
+++ b/core/src/main/thrift-gen-java/org/apache/accumulo/core/manager/thrift/FateService.java
@@ -31,7 +31,7 @@ public interface Iface {
 
     public TFateId beginFateOperation(org.apache.accumulo.core.clientImpl.thrift.TInfo tinfo, org.apache.accumulo.core.securityImpl.thrift.TCredentials credentials, TFateInstanceType type) throws org.apache.accumulo.core.clientImpl.thrift.ThriftSecurityException, org.apache.accumulo.core.clientImpl.thrift.ThriftNotActiveServiceException, org.apache.thrift.TException;
 
-    public void executeFateOperation(org.apache.accumulo.core.clientImpl.thrift.TInfo tinfo, org.apache.accumulo.core.securityImpl.thrift.TCredentials credentials, TFateId opid, FateOperation op, java.util.List<java.nio.ByteBuffer> arguments, java.util.Map<java.lang.String,java.lang.String> options, boolean autoClean) throws org.apache.accumulo.core.clientImpl.thrift.ThriftSecurityException, org.apache.accumulo.core.clientImpl.thrift.ThriftTableOperationException, org.apache.accumulo.core.clientImpl.thrift.ThriftNotActiveServiceException, org.apache.thrift.TException;
+    public void executeFateOperation(org.apache.accumulo.core.clientImpl.thrift.TInfo tinfo, org.apache.accumulo.core.securityImpl.thrift.TCredentials credentials, TFateId opid, TFateOperation op, java.util.List<java.nio.ByteBuffer> arguments, java.util.Map<java.lang.String,java.lang.String> options, boolean autoClean) throws org.apache.accumulo.core.clientImpl.thrift.ThriftSecurityException, org.apache.accumulo.core.clientImpl.thrift.ThriftTableOperationException, org.apache.accumulo.core.clientImpl.thrift.ThriftNotActiveServiceException, org.apache.thrift.TException;
 
     public java.lang.String waitForFateOperation(org.apache.accumulo.core.clientImpl.thrift.TInfo tinfo, org.apache.accumulo.core.securityImpl.thrift.TCredentials credentials, TFateId opid) throws org.apache.accumulo.core.clientImpl.thrift.ThriftSecurityException, org.apache.accumulo.core.clientImpl.thrift.ThriftTableOperationException, org.apache.accumulo.core.clientImpl.thrift.ThriftNotActiveServiceException, org.apache.thrift.TException;
 
@@ -45,7 +45,7 @@ public interface AsyncIface {
 
     public void beginFateOperation(org.apache.accumulo.core.clientImpl.thrift.TInfo tinfo, org.apache.accumulo.core.securityImpl.thrift.TCredentials credentials, TFateInstanceType type, org.apache.thrift.async.AsyncMethodCallback<TFateId> resultHandler) throws org.apache.thrift.TException;
 
-    public void executeFateOperation(org.apache.accumulo.core.clientImpl.thrift.TInfo tinfo, org.apache.accumulo.core.securityImpl.thrift.TCredentials credentials, TFateId opid, FateOperation op, java.util.List<java.nio.ByteBuffer> arguments, java.util.Map<java.lang.String,java.lang.String> options, boolean autoClean, org.apache.thrift.async.AsyncMethodCallback<Void> resultHandler) throws org.apache.thrift.TException;
+    public void executeFateOperation(org.apache.accumulo.core.clientImpl.thrift.TInfo tinfo, org.apache.accumulo.core.securityImpl.thrift.TCredentials credentials, TFateId opid, TFateOperation op, java.util.List<java.nio.ByteBuffer> arguments, java.util.Map<java.lang.String,java.lang.String> options, boolean autoClean, org.apache.thrift.async.AsyncMethodCallback<Void> resultHandler) throws org.apache.thrift.TException;
 
     public void waitForFateOperation(org.apache.accumulo.core.clientImpl.thrift.TInfo tinfo, org.apache.accumulo.core.securityImpl.thrift.TCredentials credentials, TFateId opid, org.apache.thrift.async.AsyncMethodCallback<java.lang.String> resultHandler) throws org.apache.thrift.TException;
 
@@ -110,13 +110,13 @@ public TFateId recv_beginFateOperation() throws org.apache.accumulo.core.clientI
     }
 
     @Override
-    public void executeFateOperation(org.apache.accumulo.core.clientImpl.thrift.TInfo tinfo, org.apache.accumulo.core.securityImpl.thrift.TCredentials credentials, TFateId opid, FateOperation op, java.util.List<java.nio.ByteBuffer> arguments, java.util.Map<java.lang.String,java.lang.String> options, boolean autoClean) throws org.apache.accumulo.core.clientImpl.thrift.ThriftSecurityException, org.apache.accumulo.core.clientImpl.thrift.ThriftTableOperationException, org.apache.accumulo.core.clientImpl.thrift.ThriftNotActiveServiceException, org.apache.thrift.TException
+    public void executeFateOperation(org.apache.accumulo.core.clientImpl.thrift.TInfo tinfo, org.apache.accumulo.core.securityImpl.thrift.TCredentials credentials, TFateId opid, TFateOperation op, java.util.List<java.nio.ByteBuffer> arguments, java.util.Map<java.lang.String,java.lang.String> options, boolean autoClean) throws org.apache.accumulo.core.clientImpl.thrift.ThriftSecurityException, org.apache.accumulo.core.clientImpl.thrift.ThriftTableOperationException, org.apache.accumulo.core.clientImpl.thrift.ThriftNotActiveServiceException, org.apache.thrift.TException
     {
       send_executeFateOperation(tinfo, credentials, opid, op, arguments, options, autoClean);
       recv_executeFateOperation();
     }
 
-    public void send_executeFateOperation(org.apache.accumulo.core.clientImpl.thrift.TInfo tinfo, org.apache.accumulo.core.securityImpl.thrift.TCredentials credentials, TFateId opid, FateOperation op, java.util.List<java.nio.ByteBuffer> arguments, java.util.Map<java.lang.String,java.lang.String> options, boolean autoClean) throws org.apache.thrift.TException
+    public void send_executeFateOperation(org.apache.accumulo.core.clientImpl.thrift.TInfo tinfo, org.apache.accumulo.core.securityImpl.thrift.TCredentials credentials, TFateId opid, TFateOperation op, java.util.List<java.nio.ByteBuffer> arguments, java.util.Map<java.lang.String,java.lang.String> options, boolean autoClean) throws org.apache.thrift.TException
     {
       executeFateOperation_args args = new executeFateOperation_args();
       args.setTinfo(tinfo);
@@ -302,7 +302,7 @@ public TFateId getResult() throws org.apache.accumulo.core.clientImpl.thrift.Thr
     }
 
     @Override
-    public void executeFateOperation(org.apache.accumulo.core.clientImpl.thrift.TInfo tinfo, org.apache.accumulo.core.securityImpl.thrift.TCredentials credentials, TFateId opid, FateOperation op, java.util.List<java.nio.ByteBuffer> arguments, java.util.Map<java.lang.String,java.lang.String> options, boolean autoClean, org.apache.thrift.async.AsyncMethodCallback<Void> resultHandler) throws org.apache.thrift.TException {
+    public void executeFateOperation(org.apache.accumulo.core.clientImpl.thrift.TInfo tinfo, org.apache.accumulo.core.securityImpl.thrift.TCredentials credentials, TFateId opid, TFateOperation op, java.util.List<java.nio.ByteBuffer> arguments, java.util.Map<java.lang.String,java.lang.String> options, boolean autoClean, org.apache.thrift.async.AsyncMethodCallback<Void> resultHandler) throws org.apache.thrift.TException {
       checkReady();
       executeFateOperation_call method_call = new executeFateOperation_call(tinfo, credentials, opid, op, arguments, options, autoClean, resultHandler, this, ___protocolFactory, ___transport);
       this.___currentMethod = method_call;
@@ -313,11 +313,11 @@ public static class executeFateOperation_call extends org.apache.thrift.async.TA
       private org.apache.accumulo.core.clientImpl.thrift.TInfo tinfo;
       private org.apache.accumulo.core.securityImpl.thrift.TCredentials credentials;
       private TFateId opid;
-      private FateOperation op;
+      private TFateOperation op;
       private java.util.List<java.nio.ByteBuffer> arguments;
       private java.util.Map<java.lang.String,java.lang.String> options;
       private boolean autoClean;
-      public executeFateOperation_call(org.apache.accumulo.core.clientImpl.thrift.TInfo tinfo, org.apache.accumulo.core.securityImpl.thrift.TCredentials credentials, TFateId opid, FateOperation op, java.util.List<java.nio.ByteBuffer> arguments, java.util.Map<java.lang.String,java.lang.String> options, boolean autoClean, org.apache.thrift.async.AsyncMethodCallback<Void> resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException {
+      public executeFateOperation_call(org.apache.accumulo.core.clientImpl.thrift.TInfo tinfo, org.apache.accumulo.core.securityImpl.thrift.TCredentials credentials, TFateId opid, TFateOperation op, java.util.List<java.nio.ByteBuffer> arguments, java.util.Map<java.lang.String,java.lang.String> options, boolean autoClean, org.apache.thrift.async.AsyncMethodCallback<Void> resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException {
         super(client, protocolFactory, transport, resultHandler, false);
         this.tinfo = tinfo;
         this.credentials = credentials;
@@ -2312,9 +2312,9 @@ public static class executeFateOperation_args implements org.apache.thrift.TBase
     public @org.apache.thrift.annotation.Nullable TFateId opid; // required
     /**
      * 
-     * @see FateOperation
+     * @see TFateOperation
      */
-    public @org.apache.thrift.annotation.Nullable FateOperation op; // required
+    public @org.apache.thrift.annotation.Nullable TFateOperation op; // required
     public @org.apache.thrift.annotation.Nullable java.util.List<java.nio.ByteBuffer> arguments; // required
     public @org.apache.thrift.annotation.Nullable java.util.Map<java.lang.String,java.lang.String> options; // required
     public boolean autoClean; // required
@@ -2326,7 +2326,7 @@ public enum _Fields implements org.apache.thrift.TFieldIdEnum {
       OPID((short)3, "opid"),
       /**
        * 
-       * @see FateOperation
+       * @see TFateOperation
        */
       OP((short)4, "op"),
       ARGUMENTS((short)5, "arguments"),
@@ -2416,7 +2416,7 @@ public java.lang.String getFieldName() {
       tmpMap.put(_Fields.OPID, new org.apache.thrift.meta_data.FieldMetaData("opid", org.apache.thrift.TFieldRequirementType.DEFAULT, 
           new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, TFateId.class)));
       tmpMap.put(_Fields.OP, new org.apache.thrift.meta_data.FieldMetaData("op", org.apache.thrift.TFieldRequirementType.DEFAULT, 
-          new org.apache.thrift.meta_data.EnumMetaData(org.apache.thrift.protocol.TType.ENUM, FateOperation.class)));
+          new org.apache.thrift.meta_data.EnumMetaData(org.apache.thrift.protocol.TType.ENUM, TFateOperation.class)));
       tmpMap.put(_Fields.ARGUMENTS, new org.apache.thrift.meta_data.FieldMetaData("arguments", org.apache.thrift.TFieldRequirementType.DEFAULT, 
           new org.apache.thrift.meta_data.ListMetaData(org.apache.thrift.protocol.TType.LIST, 
               new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING              , true))));
@@ -2437,7 +2437,7 @@ public executeFateOperation_args(
       org.apache.accumulo.core.clientImpl.thrift.TInfo tinfo,
       org.apache.accumulo.core.securityImpl.thrift.TCredentials credentials,
       TFateId opid,
-      FateOperation op,
+      TFateOperation op,
       java.util.List<java.nio.ByteBuffer> arguments,
       java.util.Map<java.lang.String,java.lang.String> options,
       boolean autoClean)
@@ -2575,18 +2575,18 @@ public void setOpidIsSet(boolean value) {
 
     /**
      * 
-     * @see FateOperation
+     * @see TFateOperation
      */
     @org.apache.thrift.annotation.Nullable
-    public FateOperation getOp() {
+    public TFateOperation getOp() {
       return this.op;
     }
 
     /**
      * 
-     * @see FateOperation
+     * @see TFateOperation
      */
-    public executeFateOperation_args setOp(@org.apache.thrift.annotation.Nullable FateOperation op) {
+    public executeFateOperation_args setOp(@org.apache.thrift.annotation.Nullable TFateOperation op) {
       this.op = op;
       return this;
     }
@@ -2737,7 +2737,7 @@ public void setFieldValue(_Fields field, @org.apache.thrift.annotation.Nullable
         if (value == null) {
           unsetOp();
         } else {
-          setOp((FateOperation)value);
+          setOp((TFateOperation)value);
         }
         break;
 
@@ -3173,7 +3173,7 @@ public void read(org.apache.thrift.protocol.TProtocol iprot, executeFateOperatio
               break;
             case 4: // OP
               if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
-                struct.op = org.apache.accumulo.core.manager.thrift.FateOperation.findByValue(iprot.readI32());
+                struct.op = org.apache.accumulo.core.manager.thrift.TFateOperation.findByValue(iprot.readI32());
                 struct.setOpIsSet(true);
               } else { 
                 org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
@@ -3386,7 +3386,7 @@ public void read(org.apache.thrift.protocol.TProtocol prot, executeFateOperation
           struct.setOpidIsSet(true);
         }
         if (incoming.get(3)) {
-          struct.op = org.apache.accumulo.core.manager.thrift.FateOperation.findByValue(iprot.readI32());
+          struct.op = org.apache.accumulo.core.manager.thrift.TFateOperation.findByValue(iprot.readI32());
           struct.setOpIsSet(true);
         }
         if (incoming.get(4)) {
diff --git a/core/src/main/thrift-gen-java/org/apache/accumulo/core/manager/thrift/FateOperation.java b/core/src/main/thrift-gen-java/org/apache/accumulo/core/manager/thrift/TFateOperation.java
similarity index 91%
rename from core/src/main/thrift-gen-java/org/apache/accumulo/core/manager/thrift/FateOperation.java
rename to core/src/main/thrift-gen-java/org/apache/accumulo/core/manager/thrift/TFateOperation.java
index d03349ede08..b9cd11ca850 100644
--- a/core/src/main/thrift-gen-java/org/apache/accumulo/core/manager/thrift/FateOperation.java
+++ b/core/src/main/thrift-gen-java/org/apache/accumulo/core/manager/thrift/TFateOperation.java
@@ -25,7 +25,7 @@
 package org.apache.accumulo.core.manager.thrift;
 
 
-public enum FateOperation implements org.apache.thrift.TEnum {
+public enum TFateOperation implements org.apache.thrift.TEnum {
   TABLE_CREATE(0),
   TABLE_CLONE(1),
   TABLE_DELETE(2),
@@ -34,7 +34,6 @@ public enum FateOperation implements org.apache.thrift.TEnum {
   TABLE_OFFLINE(5),
   TABLE_MERGE(6),
   TABLE_DELETE_RANGE(7),
-  OBSOLETE_TABLE_BULK_IMPORT(8),
   TABLE_COMPACT(9),
   TABLE_IMPORT(10),
   TABLE_EXPORT(11),
@@ -48,7 +47,7 @@ public enum FateOperation implements org.apache.thrift.TEnum {
 
   private final int value;
 
-  private FateOperation(int value) {
+  private TFateOperation(int value) {
     this.value = value;
   }
 
@@ -65,7 +64,7 @@ public int getValue() {
    * @return null if the value is not found.
    */
   @org.apache.thrift.annotation.Nullable
-  public static FateOperation findByValue(int value) { 
+  public static TFateOperation findByValue(int value) { 
     switch (value) {
       case 0:
         return TABLE_CREATE;
@@ -83,8 +82,6 @@ public static FateOperation findByValue(int value) {
         return TABLE_MERGE;
       case 7:
         return TABLE_DELETE_RANGE;
-      case 8:
-        return OBSOLETE_TABLE_BULK_IMPORT;
       case 9:
         return TABLE_COMPACT;
       case 10:
diff --git a/core/src/main/thrift/manager.thrift b/core/src/main/thrift/manager.thrift
index 11e2f78353a..08d93dc1852 100644
--- a/core/src/main/thrift/manager.thrift
+++ b/core/src/main/thrift/manager.thrift
@@ -49,26 +49,26 @@ enum TabletLoadState {
   UNLOAD_ERROR
 }
 
-enum FateOperation {
-  TABLE_CREATE
-  TABLE_CLONE
-  TABLE_DELETE
-  TABLE_RENAME
-  TABLE_ONLINE
-  TABLE_OFFLINE
-  TABLE_MERGE
-  TABLE_DELETE_RANGE
-  OBSOLETE_TABLE_BULK_IMPORT
-  TABLE_COMPACT
-  TABLE_IMPORT
-  TABLE_EXPORT
-  TABLE_CANCEL_COMPACT
-  NAMESPACE_CREATE
-  NAMESPACE_DELETE
-  NAMESPACE_RENAME
-  TABLE_BULK_IMPORT2
-  TABLE_TABLET_AVAILABILITY
-  TABLE_SPLIT
+enum TFateOperation {
+  TABLE_CREATE = 0
+  TABLE_CLONE = 1
+  TABLE_DELETE = 2
+  TABLE_RENAME = 3
+  TABLE_ONLINE = 4
+  TABLE_OFFLINE = 5
+  TABLE_MERGE = 6
+  TABLE_DELETE_RANGE = 7
+  // 8 was bulk v1 that was removed
+  TABLE_COMPACT = 9
+  TABLE_IMPORT = 10
+  TABLE_EXPORT = 11
+  TABLE_CANCEL_COMPACT = 12
+  NAMESPACE_CREATE = 13
+  NAMESPACE_DELETE = 14
+  NAMESPACE_RENAME = 15
+  TABLE_BULK_IMPORT2 = 16
+  TABLE_TABLET_AVAILABILITY = 17
+  TABLE_SPLIT = 18
 }
 
 enum ManagerState {
@@ -192,7 +192,7 @@ service FateService {
     1:client.TInfo tinfo
     2:security.TCredentials credentials
     3:TFateId opid
-    4:FateOperation op
+    4:TFateOperation op
     5:list<binary> arguments
     6:map<string, string> options
     7:bool autoClean
diff --git a/core/src/test/java/org/apache/accumulo/core/clientImpl/ZookeeperLockCheckerTest.java b/core/src/test/java/org/apache/accumulo/core/clientImpl/ZookeeperLockCheckerTest.java
index 217303b2d9c..bb7402f78dc 100644
--- a/core/src/test/java/org/apache/accumulo/core/clientImpl/ZookeeperLockCheckerTest.java
+++ b/core/src/test/java/org/apache/accumulo/core/clientImpl/ZookeeperLockCheckerTest.java
@@ -58,7 +58,7 @@ public void tearDown() {
 
   @Test
   public void testInvalidateCache() {
-    var zklc = new ZookeeperLockChecker(context);
+    var zklc = new ZookeeperLockChecker(zc, context.getZooKeeperRoot());
 
     verify(zc);
     reset(zc);
diff --git a/core/src/test/java/org/apache/accumulo/core/data/constraints/VisibilityConstraintTest.java b/core/src/test/java/org/apache/accumulo/core/data/constraints/VisibilityConstraintTest.java
index 2f318777013..dd8583b7ea4 100644
--- a/core/src/test/java/org/apache/accumulo/core/data/constraints/VisibilityConstraintTest.java
+++ b/core/src/test/java/org/apache/accumulo/core/data/constraints/VisibilityConstraintTest.java
@@ -20,9 +20,9 @@
 
 import static java.nio.charset.StandardCharsets.UTF_8;
 import static org.easymock.EasyMock.createMock;
-import static org.easymock.EasyMock.createNiceMock;
 import static org.easymock.EasyMock.expect;
 import static org.easymock.EasyMock.replay;
+import static org.easymock.EasyMock.verify;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertNull;
 
@@ -32,16 +32,16 @@
 import org.apache.accumulo.core.data.ArrayByteSequence;
 import org.apache.accumulo.core.data.Mutation;
 import org.apache.accumulo.core.data.constraints.Constraint.Environment;
-import org.apache.accumulo.core.security.AuthorizationContainer;
 import org.apache.accumulo.core.security.ColumnVisibility;
+import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
 public class VisibilityConstraintTest {
 
-  VisibilityConstraint vc;
-  Environment env;
-  Mutation mutation;
+  private VisibilityConstraint vc;
+  private Environment env;
+  private Mutation mutation;
 
   static final ColumnVisibility good = new ColumnVisibility("good|bad");
   static final ColumnVisibility bad = new ColumnVisibility("good&bad");
@@ -57,17 +57,18 @@ public void setUp() {
     vc = new VisibilityConstraint();
     mutation = new Mutation("r");
 
-    ArrayByteSequence bs = new ArrayByteSequence("good".getBytes(UTF_8));
-
-    AuthorizationContainer ac = createNiceMock(AuthorizationContainer.class);
-    expect(ac.contains(bs)).andReturn(true);
-    replay(ac);
-
     env = createMock(Environment.class);
-    expect(env.getAuthorizationsContainer()).andReturn(ac);
+    expect(env.getAuthorizationsContainer())
+        .andReturn(new ArrayByteSequence("good".getBytes(UTF_8))::equals).anyTimes();
+
     replay(env);
   }
 
+  @AfterEach
+  public void tearDown() {
+    verify(env);
+  }
+
   @Test
   public void testNoVisibility() {
     mutation.put(D, D, D);
diff --git a/core/src/test/java/org/apache/accumulo/core/fate/FateOperationTest.java b/core/src/test/java/org/apache/accumulo/core/fate/FateOperationTest.java
new file mode 100644
index 00000000000..fd344477038
--- /dev/null
+++ b/core/src/test/java/org/apache/accumulo/core/fate/FateOperationTest.java
@@ -0,0 +1,48 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.accumulo.core.fate;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+import org.apache.accumulo.core.manager.thrift.TFateOperation;
+import org.junit.jupiter.api.Test;
+
+public class FateOperationTest {
+
+  @Test
+  public void testFateOperation() {
+    // ensures that all TFateOperation have an equivalent FateOperation
+    assertTrue(TFateOperation.values().length > 0);
+    for (var top : TFateOperation.values()) {
+      assertEquals(top, Fate.FateOperation.fromThrift(top).toThrift());
+    }
+    // ensures that all FateOperation are valid: either specified not to have an equivalent thrift
+    // form or do have an equivalent thrift form
+    assertTrue(Fate.FateOperation.values().length > 0);
+    for (var op : Fate.FateOperation.values()) {
+      if (Fate.FateOperation.getNonThriftOps().contains(op)) {
+        assertThrows(IllegalStateException.class, op::toThrift);
+      } else {
+        assertEquals(op, Fate.FateOperation.fromThrift(op.toThrift()));
+      }
+    }
+  }
+}
diff --git a/core/src/test/java/org/apache/accumulo/core/fate/TestStore.java b/core/src/test/java/org/apache/accumulo/core/fate/TestStore.java
index 40d0d755b13..1d2389d6fbc 100644
--- a/core/src/test/java/org/apache/accumulo/core/fate/TestStore.java
+++ b/core/src/test/java/org/apache/accumulo/core/fate/TestStore.java
@@ -53,13 +53,13 @@ public FateId create() {
   }
 
   @Override
-  public Optional<FateId> seedTransaction(String txName, FateKey fateKey, Repo<String> repo,
-      boolean autoCleanUp) {
+  public Optional<FateId> seedTransaction(Fate.FateOperation txName, FateKey fateKey,
+      Repo<String> repo, boolean autoCleanUp) {
     return Optional.empty();
   }
 
   @Override
-  public boolean seedTransaction(String txName, FateId fateId, Repo<String> repo,
+  public boolean seedTransaction(Fate.FateOperation txName, FateId fateId, Repo<String> repo,
       boolean autoCleanUp) {
     return false;
   }
diff --git a/core/src/test/java/org/apache/accumulo/core/fate/zookeeper/ZooCacheFactoryTest.java b/core/src/test/java/org/apache/accumulo/core/fate/zookeeper/ZooCacheFactoryTest.java
deleted file mode 100644
index 7db2dd9df2e..00000000000
--- a/core/src/test/java/org/apache/accumulo/core/fate/zookeeper/ZooCacheFactoryTest.java
+++ /dev/null
@@ -1,83 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.accumulo.core.fate.zookeeper;
-
-import static org.junit.jupiter.api.Assertions.assertNotNull;
-import static org.junit.jupiter.api.Assertions.assertNotSame;
-import static org.junit.jupiter.api.Assertions.assertSame;
-
-import org.junit.jupiter.api.AfterEach;
-import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Test;
-
-public class ZooCacheFactoryTest {
-  private ZooCacheFactory zcf;
-
-  @BeforeEach
-  public void setUp() {
-    zcf = new ZooCacheFactory();
-  }
-
-  @AfterEach
-  public void tearDown() {
-    zcf.reset();
-  }
-
-  @Test
-  public void testGetZooCache() {
-    String zks1 = "zk1";
-    int timeout1 = 1000;
-    ZooCache zc1 = zcf.getZooCache(zks1, timeout1);
-    ZooCache zc1a = zcf.getZooCache(zks1, timeout1);
-    assertSame(zc1, zc1a);
-
-    String zks2 = "zk2";
-    int timeout2 = 1000;
-    ZooCache zc2 = zcf.getZooCache(zks2, timeout2);
-    assertNotSame(zc1, zc2);
-
-    String zks3 = "zk1";
-    int timeout3 = 2000;
-    ZooCache zc3 = zcf.getZooCache(zks3, timeout3);
-    assertNotSame(zc1, zc3);
-  }
-
-  @Test
-  public void testGetNewZooCache() {
-    String zks1 = "zk1";
-    int timeout1 = 1000;
-    ZooCache zc1 = zcf.getNewZooCache(zks1, timeout1);
-    assertNotNull(zc1);
-    ZooCache zc1a = zcf.getZooCache(zks1, timeout1);
-    assertNotSame(zc1, zc1a);
-    ZooCache zc1b = zcf.getNewZooCache(zks1, timeout1);
-    assertNotSame(zc1, zc1b);
-    assertNotSame(zc1a, zc1b);
-  }
-
-  @Test
-  public void testReset() {
-    String zks1 = "zk1";
-    int timeout1 = 1000;
-    ZooCache zc1 = zcf.getZooCache(zks1, timeout1);
-    zcf.reset();
-    ZooCache zc1a = zcf.getZooCache(zks1, timeout1);
-    assertNotSame(zc1, zc1a);
-  }
-}
diff --git a/core/src/test/java/org/apache/accumulo/core/fate/zookeeper/ZooCacheTest.java b/core/src/test/java/org/apache/accumulo/core/fate/zookeeper/ZooCacheTest.java
index 3aced2e103e..6d091d3aae1 100644
--- a/core/src/test/java/org/apache/accumulo/core/fate/zookeeper/ZooCacheTest.java
+++ b/core/src/test/java/org/apache/accumulo/core/fate/zookeeper/ZooCacheTest.java
@@ -20,11 +20,9 @@
 
 import static org.easymock.EasyMock.anyObject;
 import static org.easymock.EasyMock.capture;
-import static org.easymock.EasyMock.createMock;
 import static org.easymock.EasyMock.createStrictMock;
 import static org.easymock.EasyMock.eq;
 import static org.easymock.EasyMock.expect;
-import static org.easymock.EasyMock.expectLastCall;
 import static org.easymock.EasyMock.replay;
 import static org.easymock.EasyMock.verify;
 import static org.junit.jupiter.api.Assertions.assertArrayEquals;
@@ -37,10 +35,11 @@
 import java.util.List;
 
 import org.apache.accumulo.core.fate.zookeeper.ZooCache.ZcStat;
+import org.apache.accumulo.core.fate.zookeeper.ZooCache.ZooCacheWatcher;
+import org.apache.accumulo.core.zookeeper.ZooSession;
 import org.apache.zookeeper.KeeperException;
 import org.apache.zookeeper.WatchedEvent;
 import org.apache.zookeeper.Watcher;
-import org.apache.zookeeper.ZooKeeper;
 import org.apache.zookeeper.data.Stat;
 import org.easymock.Capture;
 import org.easymock.EasyMock;
@@ -52,19 +51,13 @@ public class ZooCacheTest {
   private static final byte[] DATA = {(byte) 1, (byte) 2, (byte) 3, (byte) 4};
   private static final List<String> CHILDREN = java.util.Arrays.asList("huey", "dewey", "louie");
 
-  private ZooReader zr;
-  private ZooKeeper zk;
+  private ZooSession zk;
   private ZooCache zc;
 
   @BeforeEach
   public void setUp() {
-    zr = createMock(ZooReader.class);
-    zk = createStrictMock(ZooKeeper.class);
-    expect(zr.getZooKeeper()).andReturn(zk);
-    expectLastCall().anyTimes();
-    replay(zr);
-
-    zc = new ZooCache(zr, null);
+    zk = createStrictMock(ZooSession.class);
+    zc = new ZooCache(zk);
   }
 
   @Test
@@ -249,7 +242,7 @@ public void testGetChildren_NoNode() throws Exception {
     assertTrue(zc.dataCached(ZPATH));
   }
 
-  private static class TestWatcher implements Watcher {
+  private static class TestWatcher implements ZooCacheWatcher {
     private final WatchedEvent expectedEvent;
     private boolean wasCalled;
 
@@ -259,7 +252,7 @@ private static class TestWatcher implements Watcher {
     }
 
     @Override
-    public void process(WatchedEvent event) {
+    public void accept(WatchedEvent event) {
       assertSame(expectedEvent, event);
       wasCalled = true;
     }
@@ -294,7 +287,7 @@ private void testWatchDataNode(byte[] initialData, Watcher.Event.EventType event
     WatchedEvent event =
         new WatchedEvent(eventType, Watcher.Event.KeeperState.SyncConnected, ZPATH);
     TestWatcher exw = new TestWatcher(event);
-    zc = new ZooCache(zr, exw);
+    zc = new ZooCache(zk, exw);
 
     Watcher w = watchData(initialData);
     w.process(event);
@@ -408,7 +401,7 @@ private void testGetBoth(boolean getDataFirst) throws Exception {
   private void testWatchDataNode_Clear(Watcher.Event.KeeperState state) throws Exception {
     WatchedEvent event = new WatchedEvent(Watcher.Event.EventType.None, state, null);
     TestWatcher exw = new TestWatcher(event);
-    zc = new ZooCache(zr, exw);
+    zc = new ZooCache(zk, exw);
 
     Watcher w = watchData(DATA);
     assertTrue(zc.dataCached(ZPATH));
@@ -442,7 +435,7 @@ private void testWatchChildrenNode(List<String> initialChildren,
     WatchedEvent event =
         new WatchedEvent(eventType, Watcher.Event.KeeperState.SyncConnected, ZPATH);
     TestWatcher exw = new TestWatcher(event);
-    zc = new ZooCache(zr, exw);
+    zc = new ZooCache(zk, exw);
 
     Watcher w = watchChildren(initialChildren);
     w.process(event);
diff --git a/core/src/test/java/org/apache/accumulo/core/fate/zookeeper/ZooReaderWriterTest.java b/core/src/test/java/org/apache/accumulo/core/fate/zookeeper/ZooReaderWriterTest.java
index 0379c413fef..0dcabd6d10f 100644
--- a/core/src/test/java/org/apache/accumulo/core/fate/zookeeper/ZooReaderWriterTest.java
+++ b/core/src/test/java/org/apache/accumulo/core/fate/zookeeper/ZooReaderWriterTest.java
@@ -21,7 +21,6 @@
 import static org.easymock.EasyMock.anyObject;
 import static org.easymock.EasyMock.anyString;
 import static org.easymock.EasyMock.createMock;
-import static org.easymock.EasyMock.createMockBuilder;
 import static org.easymock.EasyMock.expect;
 import static org.easymock.EasyMock.expectLastCall;
 import static org.easymock.EasyMock.replay;
@@ -32,6 +31,7 @@
 import org.apache.accumulo.core.fate.zookeeper.ZooReaderWriter.Mutator;
 import org.apache.accumulo.core.util.Retry;
 import org.apache.accumulo.core.util.Retry.RetryFactory;
+import org.apache.accumulo.core.zookeeper.ZooSession;
 import org.apache.zookeeper.CreateMode;
 import org.apache.zookeeper.KeeperException;
 import org.apache.zookeeper.KeeperException.BadVersionException;
@@ -39,7 +39,6 @@
 import org.apache.zookeeper.KeeperException.ConnectionLossException;
 import org.apache.zookeeper.KeeperException.NodeExistsException;
 import org.apache.zookeeper.KeeperException.SessionExpiredException;
-import org.apache.zookeeper.ZooKeeper;
 import org.apache.zookeeper.data.Stat;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
@@ -47,21 +46,23 @@
 public class ZooReaderWriterTest {
 
   private ZooReaderWriter zrw;
-  private ZooKeeper zk;
+  private ZooSession zk;
   private RetryFactory retryFactory;
   private Retry retry;
 
   @BeforeEach
   public void setup() {
-    zk = createMock(ZooKeeper.class);
-    zrw = createMockBuilder(ZooReaderWriter.class)
-        .addMockedMethods("getRetryFactory", "getZooKeeper").createMock();
+    zk = createMock(ZooSession.class);
     retryFactory = createMock(RetryFactory.class);
     retry = createMock(Retry.class);
-
-    expect(zrw.getZooKeeper()).andReturn(zk).anyTimes();
-    expect(zrw.getRetryFactory()).andReturn(retryFactory).anyTimes();
     expect(retryFactory.createRetry()).andReturn(retry).anyTimes();
+    zrw = new ZooReaderWriter(zk) {
+      @Override
+      protected RetryFactory getRetryFactory() {
+        return retryFactory;
+      }
+    };
+    expect(zk.asReaderWriter()).andReturn(zrw).anyTimes();
   }
 
   @Test
@@ -71,11 +72,11 @@ public void testDeleteSucceedOnInitialNoNode() throws Exception {
     zk.delete(path, -1);
     expectLastCall().andThrow(KeeperException.create(Code.NONODE));
 
-    replay(zk, zrw, retryFactory, retry);
+    replay(zk, retryFactory, retry);
 
     zrw.delete(path);
 
-    verify(zk, zrw, retryFactory, retry);
+    verify(zk, retryFactory, retry);
   }
 
   @Test
@@ -92,11 +93,11 @@ public void testDeleteSucceedOnRetry() throws Exception {
     zk.delete(path, -1);
     expectLastCall().andThrow(KeeperException.create(Code.NONODE));
 
-    replay(zk, zrw, retryFactory, retry);
+    replay(zk, retryFactory, retry);
 
     zrw.delete(path);
 
-    verify(zk, zrw, retryFactory, retry);
+    verify(zk, retryFactory, retry);
   }
 
   @Test
@@ -110,11 +111,11 @@ public void testMutateNodeCreationFails() throws Exception {
     expect(retry.canRetry()).andReturn(false);
     expect(retry.retriesCompleted()).andReturn(1L).once();
 
-    replay(zk, zrw, retryFactory, retry);
+    replay(zk, retryFactory, retry);
 
     assertThrows(SessionExpiredException.class, () -> zrw.mutateOrCreate(path, value, mutator));
 
-    verify(zk, zrw, retryFactory, retry);
+    verify(zk, retryFactory, retry);
   }
 
   @Test
@@ -137,11 +138,11 @@ public void testMutateWithBadVersion() throws Exception {
     retry.waitForNextAttempt(anyObject(), anyObject());
     expectLastCall().once();
 
-    replay(zk, zrw, retryFactory, retry);
+    replay(zk, retryFactory, retry);
 
     assertArrayEquals(new byte[] {1}, zrw.mutateOrCreate(path, value, mutator));
 
-    verify(zk, zrw, retryFactory, retry);
+    verify(zk, retryFactory, retry);
   }
 
   @Test
@@ -167,10 +168,10 @@ public void testMutateWithRetryOnSetData() throws Exception {
     // Let 2nd setData succeed
     expect(zk.setData(path, mutatedBytes, 0)).andReturn(null);
 
-    replay(zk, zrw, retryFactory, retry);
+    replay(zk, retryFactory, retry);
 
     assertArrayEquals(new byte[] {1}, zrw.mutateOrCreate(path, value, mutator));
 
-    verify(zk, zrw, retryFactory, retry);
+    verify(zk, retryFactory, retry);
   }
 }
diff --git a/core/src/test/java/org/apache/accumulo/core/fate/zookeeper/ZooSessionTest.java b/core/src/test/java/org/apache/accumulo/core/fate/zookeeper/ZooSessionTest.java
deleted file mode 100644
index efb73e95591..00000000000
--- a/core/src/test/java/org/apache/accumulo/core/fate/zookeeper/ZooSessionTest.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.accumulo.core.fate.zookeeper;
-
-import static java.util.concurrent.TimeUnit.SECONDS;
-import static org.junit.jupiter.api.Assertions.assertThrows;
-
-import org.apache.zookeeper.ZooKeeper;
-import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.Timeout;
-
-public class ZooSessionTest {
-
-  private static final int TIMEOUT_SECONDS = 10;
-  private static final String UNKNOWN_HOST = "hostname.that.should.not.exist.example.com:2181";
-
-  @Test
-  @Timeout(TIMEOUT_SECONDS * 4)
-  public void testUnknownHost() {
-    assertThrows(RuntimeException.class, () -> {
-      ZooKeeper session = ZooSession.connect(UNKNOWN_HOST, (int) SECONDS.toMillis(TIMEOUT_SECONDS),
-          null, null, null);
-      session.close();
-    });
-  }
-
-}
diff --git a/core/src/test/java/org/apache/accumulo/core/fate/zookeeper/ZooUtilTest.java b/core/src/test/java/org/apache/accumulo/core/fate/zookeeper/ZooUtilTest.java
index 4f9315b9f5e..00dafa8e5cf 100644
--- a/core/src/test/java/org/apache/accumulo/core/fate/zookeeper/ZooUtilTest.java
+++ b/core/src/test/java/org/apache/accumulo/core/fate/zookeeper/ZooUtilTest.java
@@ -18,12 +18,25 @@
  */
 package org.apache.accumulo.core.fate.zookeeper;
 
+import static java.nio.charset.StandardCharsets.UTF_8;
+import static org.easymock.EasyMock.createMock;
+import static org.easymock.EasyMock.eq;
+import static org.easymock.EasyMock.expect;
+import static org.easymock.EasyMock.isNull;
+import static org.easymock.EasyMock.replay;
+import static org.easymock.EasyMock.verify;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertThrows;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Map;
+import java.util.UUID;
 
+import org.apache.accumulo.core.Constants;
+import org.apache.accumulo.core.data.InstanceId;
+import org.apache.accumulo.core.zookeeper.ZooSession;
 import org.apache.zookeeper.KeeperException;
 import org.apache.zookeeper.ZooDefs;
 import org.apache.zookeeper.data.ACL;
@@ -66,4 +79,30 @@ private boolean validateACL(List<ACL> acl) throws KeeperException.InvalidACLExce
     }
     return true;
   }
+
+  @Test
+  public void fetchInstancesFromZk() throws Exception {
+
+    String instAName = "INST_A";
+    InstanceId instA = InstanceId.of(UUID.randomUUID());
+    String instBName = "INST_B";
+    InstanceId instB = InstanceId.of(UUID.randomUUID());
+
+    ZooSession zk = createMock(ZooSession.class);
+    String namePath = Constants.ZROOT + Constants.ZINSTANCES;
+    expect(zk.asReader()).andReturn(new ZooReader(zk)).anyTimes();
+    expect(zk.getChildren(eq(namePath), isNull())).andReturn(List.of(instAName, instBName)).once();
+    expect(zk.getData(eq(namePath + "/" + instAName), isNull(), isNull()))
+        .andReturn(instA.canonical().getBytes(UTF_8)).once();
+    expect(zk.getData(eq(namePath + "/" + instBName), isNull(), isNull()))
+        .andReturn(instB.canonical().getBytes(UTF_8)).once();
+    replay(zk);
+
+    Map<String,InstanceId> instanceMap = ZooUtil.getInstanceMap(zk);
+
+    log.trace("id map returned: {}", instanceMap);
+    assertEquals(Map.of(instAName, instA, instBName, instB), instanceMap);
+    verify(zk);
+  }
+
 }
diff --git a/core/src/test/java/org/apache/accumulo/core/file/blockfile/cache/BlockCacheFactoryTest.java b/core/src/test/java/org/apache/accumulo/core/file/blockfile/cache/BlockCacheFactoryTest.java
index 8338d2735a7..c697ca17a26 100644
--- a/core/src/test/java/org/apache/accumulo/core/file/blockfile/cache/BlockCacheFactoryTest.java
+++ b/core/src/test/java/org/apache/accumulo/core/file/blockfile/cache/BlockCacheFactoryTest.java
@@ -38,7 +38,7 @@ public class BlockCacheFactoryTest {
   public void testCreateLruBlockCacheFactory() throws Exception {
     DefaultConfiguration dc = DefaultConfiguration.getInstance();
     ConfigurationCopy cc = new ConfigurationCopy(dc);
-    cc.set(Property.TSERV_CACHE_MANAGER_IMPL, LruBlockCacheManager.class.getName());
+    cc.set(Property.GENERAL_CACHE_MANAGER_IMPL, LruBlockCacheManager.class.getName());
     BlockCacheManagerFactory.getInstance(cc);
   }
 
@@ -46,7 +46,7 @@ public void testCreateLruBlockCacheFactory() throws Exception {
   public void testCreateTinyLfuBlockCacheFactory() throws Exception {
     DefaultConfiguration dc = DefaultConfiguration.getInstance();
     ConfigurationCopy cc = new ConfigurationCopy(dc);
-    cc.set(Property.TSERV_CACHE_MANAGER_IMPL, TinyLfuBlockCacheManager.class.getName());
+    cc.set(Property.GENERAL_CACHE_MANAGER_IMPL, TinyLfuBlockCacheManager.class.getName());
     BlockCacheManagerFactory.getInstance(cc);
   }
 
diff --git a/core/src/test/java/org/apache/accumulo/core/file/blockfile/cache/TestLruBlockCache.java b/core/src/test/java/org/apache/accumulo/core/file/blockfile/cache/TestLruBlockCache.java
index e12dacfe71f..d5a23c1bd84 100644
--- a/core/src/test/java/org/apache/accumulo/core/file/blockfile/cache/TestLruBlockCache.java
+++ b/core/src/test/java/org/apache/accumulo/core/file/blockfile/cache/TestLruBlockCache.java
@@ -55,7 +55,7 @@ public class TestLruBlockCache {
   @Test
   public void testConfiguration() {
     ConfigurationCopy cc = new ConfigurationCopy();
-    cc.set(Property.TSERV_CACHE_MANAGER_IMPL, LruBlockCacheManager.class.getName());
+    cc.set(Property.GENERAL_CACHE_MANAGER_IMPL, LruBlockCacheManager.class.getName());
     cc.set(Property.TSERV_DEFAULT_BLOCKSIZE, Long.toString(1019));
     cc.set(Property.TSERV_INDEXCACHE_SIZE, Long.toString(1000023));
     cc.set(Property.TSERV_DATACACHE_SIZE, Long.toString(1000027));
@@ -97,7 +97,7 @@ public void testBackgroundEvictionThread() throws Exception {
 
     DefaultConfiguration dc = DefaultConfiguration.getInstance();
     ConfigurationCopy cc = new ConfigurationCopy(dc);
-    cc.set(Property.TSERV_CACHE_MANAGER_IMPL, LruBlockCacheManager.class.getName());
+    cc.set(Property.GENERAL_CACHE_MANAGER_IMPL, LruBlockCacheManager.class.getName());
     BlockCacheManager manager = BlockCacheManagerFactory.getInstance(cc);
     cc.set(Property.TSERV_DEFAULT_BLOCKSIZE, Long.toString(blockSize));
     cc.set(Property.TSERV_INDEXCACHE_SIZE, Long.toString(maxSize));
@@ -131,7 +131,7 @@ public void testCacheSimple() throws Exception {
 
     DefaultConfiguration dc = DefaultConfiguration.getInstance();
     ConfigurationCopy cc = new ConfigurationCopy(dc);
-    cc.set(Property.TSERV_CACHE_MANAGER_IMPL, LruBlockCacheManager.class.getName());
+    cc.set(Property.GENERAL_CACHE_MANAGER_IMPL, LruBlockCacheManager.class.getName());
     BlockCacheManager manager = BlockCacheManagerFactory.getInstance(cc);
     cc.set(Property.TSERV_DEFAULT_BLOCKSIZE, Long.toString(blockSize));
     cc.set(Property.TSERV_INDEXCACHE_SIZE, Long.toString(maxSize));
@@ -189,7 +189,7 @@ public void testCacheEvictionSimple() throws Exception {
 
     DefaultConfiguration dc = DefaultConfiguration.getInstance();
     ConfigurationCopy cc = new ConfigurationCopy(dc);
-    cc.set(Property.TSERV_CACHE_MANAGER_IMPL, LruBlockCacheManager.class.getName());
+    cc.set(Property.GENERAL_CACHE_MANAGER_IMPL, LruBlockCacheManager.class.getName());
     BlockCacheManager manager = BlockCacheManagerFactory.getInstance(cc);
     cc.set(Property.TSERV_DEFAULT_BLOCKSIZE, Long.toString(blockSize));
     cc.set(Property.TSERV_INDEXCACHE_SIZE, Long.toString(maxSize));
@@ -239,7 +239,7 @@ public void testCacheEvictionTwoPriorities() throws Exception {
 
     DefaultConfiguration dc = DefaultConfiguration.getInstance();
     ConfigurationCopy cc = new ConfigurationCopy(dc);
-    cc.set(Property.TSERV_CACHE_MANAGER_IMPL, LruBlockCacheManager.class.getName());
+    cc.set(Property.GENERAL_CACHE_MANAGER_IMPL, LruBlockCacheManager.class.getName());
     BlockCacheManager manager = BlockCacheManagerFactory.getInstance(cc);
     cc.set(Property.TSERV_DEFAULT_BLOCKSIZE, Long.toString(blockSize));
     cc.set(Property.TSERV_INDEXCACHE_SIZE, Long.toString(maxSize));
@@ -307,7 +307,7 @@ public void testCacheEvictionThreePriorities() throws Exception {
 
     DefaultConfiguration dc = DefaultConfiguration.getInstance();
     ConfigurationCopy cc = new ConfigurationCopy(dc);
-    cc.set(Property.TSERV_CACHE_MANAGER_IMPL, LruBlockCacheManager.class.getName());
+    cc.set(Property.GENERAL_CACHE_MANAGER_IMPL, LruBlockCacheManager.class.getName());
     BlockCacheManager manager = BlockCacheManagerFactory.getInstance(cc);
     cc.set(Property.TSERV_DEFAULT_BLOCKSIZE, Long.toString(blockSize));
     cc.set(Property.TSERV_INDEXCACHE_SIZE, Long.toString(maxSize));
@@ -432,7 +432,7 @@ public void testScanResistance() throws Exception {
 
     DefaultConfiguration dc = DefaultConfiguration.getInstance();
     ConfigurationCopy cc = new ConfigurationCopy(dc);
-    cc.set(Property.TSERV_CACHE_MANAGER_IMPL, LruBlockCacheManager.class.getName());
+    cc.set(Property.GENERAL_CACHE_MANAGER_IMPL, LruBlockCacheManager.class.getName());
     BlockCacheManager manager = BlockCacheManagerFactory.getInstance(cc);
     cc.set(Property.TSERV_DEFAULT_BLOCKSIZE, Long.toString(blockSize));
     cc.set(Property.TSERV_INDEXCACHE_SIZE, Long.toString(maxSize));
diff --git a/core/src/test/java/org/apache/accumulo/core/file/rfile/AbstractRFileTest.java b/core/src/test/java/org/apache/accumulo/core/file/rfile/AbstractRFileTest.java
index 5c8df59a8b1..96f6180f29b 100644
--- a/core/src/test/java/org/apache/accumulo/core/file/rfile/AbstractRFileTest.java
+++ b/core/src/test/java/org/apache/accumulo/core/file/rfile/AbstractRFileTest.java
@@ -164,7 +164,7 @@ public void openReader(boolean cfsi, Range fence) throws IOException {
 
       DefaultConfiguration dc = DefaultConfiguration.getInstance();
       ConfigurationCopy cc = new ConfigurationCopy(dc);
-      cc.set(Property.TSERV_CACHE_MANAGER_IMPL, TinyLfuBlockCacheManager.class.getName());
+      cc.set(Property.GENERAL_CACHE_MANAGER_IMPL, TinyLfuBlockCacheManager.class.getName());
       try {
         manager = BlockCacheManagerFactory.getInstance(cc);
       } catch (ReflectiveOperationException e) {
diff --git a/core/src/test/java/org/apache/accumulo/core/file/rfile/RFileTest.java b/core/src/test/java/org/apache/accumulo/core/file/rfile/RFileTest.java
index 81c76d58ff6..babd6215167 100644
--- a/core/src/test/java/org/apache/accumulo/core/file/rfile/RFileTest.java
+++ b/core/src/test/java/org/apache/accumulo/core/file/rfile/RFileTest.java
@@ -1584,7 +1584,7 @@ private void runVersionTest(int version, ConfigurationCopy aconf) throws Excepti
     byte[] data = baos.toByteArray();
     SeekableByteArrayInputStream bais = new SeekableByteArrayInputStream(data);
     FSDataInputStream in2 = new FSDataInputStream(bais);
-    aconf.set(Property.TSERV_CACHE_MANAGER_IMPL, TinyLfuBlockCacheManager.class.getName());
+    aconf.set(Property.GENERAL_CACHE_MANAGER_IMPL, TinyLfuBlockCacheManager.class.getName());
     aconf.set(Property.TSERV_DEFAULT_BLOCKSIZE, Long.toString(100000));
     aconf.set(Property.TSERV_DATACACHE_SIZE, Long.toString(100000000));
     aconf.set(Property.TSERV_INDEXCACHE_SIZE, Long.toString(100000000));
diff --git a/core/src/test/java/org/apache/accumulo/core/lock/ServiceLockPathsTest.java b/core/src/test/java/org/apache/accumulo/core/lock/ServiceLockPathsTest.java
index e35cbd616b6..02323762370 100644
--- a/core/src/test/java/org/apache/accumulo/core/lock/ServiceLockPathsTest.java
+++ b/core/src/test/java/org/apache/accumulo/core/lock/ServiceLockPathsTest.java
@@ -28,6 +28,10 @@
 import static org.apache.accumulo.core.Constants.ZSSERVERS;
 import static org.apache.accumulo.core.Constants.ZTABLE_LOCKS;
 import static org.apache.accumulo.core.Constants.ZTSERVERS;
+import static org.easymock.EasyMock.createMock;
+import static org.easymock.EasyMock.expect;
+import static org.easymock.EasyMock.replay;
+import static org.easymock.EasyMock.verify;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertNotNull;
 import static org.junit.jupiter.api.Assertions.assertNull;
@@ -41,13 +45,14 @@
 import java.util.Set;
 import java.util.UUID;
 
-import org.apache.accumulo.core.clientImpl.ClientContext;
 import org.apache.accumulo.core.fate.zookeeper.ZooCache;
 import org.apache.accumulo.core.fate.zookeeper.ZooCache.ZcStat;
 import org.apache.accumulo.core.lock.ServiceLockData.ThriftService;
 import org.apache.accumulo.core.lock.ServiceLockPaths.AddressSelector;
 import org.apache.accumulo.core.lock.ServiceLockPaths.ServiceLockPath;
 import org.easymock.EasyMock;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
 import com.google.common.net.HostAndPort;
@@ -60,17 +65,26 @@ public class ServiceLockPathsTest {
   private static final String HOSTNAME_NO_LOCK = "localhost:9877";
   private static final HostAndPort hp = HostAndPort.fromString(HOSTNAME);
 
-  @Test
-  public void testPathGeneration() {
+  private ZooCache zc;
+  private ServiceLockPaths paths;
 
-    ClientContext ctx = EasyMock.createMock(ClientContext.class);
-    EasyMock.expect(ctx.getZooKeeperRoot()).andReturn(ROOT).anyTimes();
+  @BeforeEach
+  public void setupMocks() {
+    zc = createMock(ZooCache.class);
+    paths = new ServiceLockPaths(ROOT, zc);
+  }
 
-    EasyMock.replay(ctx);
+  @AfterEach
+  public void verifyMocks() {
+    verify(zc);
+  }
+
+  @Test
+  public void testPathGeneration() {
+    replay(zc);
 
-    ServiceLockPaths paths = new ServiceLockPaths(ctx);
     // Test management process path creation
-    ServiceLockPath slp = paths.createGarbageCollectorPath();
+    var slp = paths.createGarbageCollectorPath();
     assertNull(slp.getServer());
     assertNull(slp.getResourceGroup());
     assertEquals(ZGC_LOCK, slp.getType());
@@ -132,323 +146,190 @@ public void testPathGeneration() {
     assertEquals(TEST_RESOURCE_GROUP, slp.getResourceGroup());
     assertEquals(ZTSERVERS, slp.getType());
     assertEquals(ROOT + ZTSERVERS + "/" + TEST_RESOURCE_GROUP + "/" + HOSTNAME, slp.toString());
-
-    EasyMock.verify(ctx);
   }
 
   @Test
   public void testGetGarbageCollectorNotRunning() {
+    expect(zc.getChildren(ROOT + ZGC_LOCK)).andReturn(List.of()).anyTimes();
+    replay(zc);
 
-    ClientContext ctx = EasyMock.createMock(ClientContext.class);
-    ZooCache zc = EasyMock.createMock(ZooCache.class);
-
-    EasyMock.expect(ctx.getZooKeeperRoot()).andReturn(ROOT).anyTimes();
-    EasyMock.expect(ctx.getZooCache()).andReturn(zc).anyTimes();
-    EasyMock.expect(zc.getChildren(ROOT + ZGC_LOCK)).andReturn(List.of()).anyTimes();
-    EasyMock.expect(ctx.getServerPaths()).andReturn(new ServiceLockPaths(ctx)).anyTimes();
-    EasyMock.replay(ctx, zc);
-
-    ServiceLockPath slp = ctx.getServerPaths().getGarbageCollector(true);
+    var slp = paths.getGarbageCollector(true);
     assertNull(slp);
-
-    EasyMock.verify(ctx, zc);
-
   }
 
   @Test
   public void testGetGarbageCollectorNoLock() {
+    expect(zc.getChildren(ROOT + ZGC_LOCK)).andReturn(List.of(HOSTNAME_NO_LOCK)).anyTimes();
+    replay(zc);
 
-    ClientContext ctx = EasyMock.createMock(ClientContext.class);
-    ZooCache zc = EasyMock.createMock(ZooCache.class);
-
-    EasyMock.expect(ctx.getZooKeeperRoot()).andReturn(ROOT).anyTimes();
-    EasyMock.expect(ctx.getZooCache()).andReturn(zc).anyTimes();
-    EasyMock.expect(zc.getChildren(ROOT + ZGC_LOCK)).andReturn(List.of(HOSTNAME_NO_LOCK))
-        .anyTimes();
-    EasyMock.expect(ctx.getServerPaths()).andReturn(new ServiceLockPaths(ctx)).anyTimes();
-    EasyMock.replay(ctx, zc);
-
-    ServiceLockPath slp = ctx.getServerPaths().getGarbageCollector(false);
+    var slp = paths.getGarbageCollector(false);
     assertNotNull(slp);
     assertNull(slp.getServer());
     assertNull(slp.getResourceGroup());
     assertEquals(ZGC_LOCK, slp.getType());
     assertEquals(ROOT + ZGC_LOCK, slp.toString());
-
-    EasyMock.verify(ctx, zc);
-
   }
 
   @Test
   public void testGetGarbageCollector() {
-
     UUID uuid = UUID.randomUUID();
     String svcLock1 = ServiceLock.ZLOCK_PREFIX + uuid.toString() + "#0000000001";
     String svcLock2 = ServiceLock.ZLOCK_PREFIX + uuid.toString() + "#0000000002";
-    ServiceLockData sld =
-        new ServiceLockData(uuid, HOSTNAME, ThriftService.GC, TEST_RESOURCE_GROUP);
-
-    ClientContext ctx = EasyMock.createMock(ClientContext.class);
-    ZooCache zc = EasyMock.createMock(ZooCache.class);
-
-    EasyMock.expect(ctx.getZooKeeperRoot()).andReturn(ROOT).anyTimes();
-    EasyMock.expect(ctx.getZooCache()).andReturn(zc).anyTimes();
-    EasyMock.expect(zc.getChildren(ROOT + ZGC_LOCK)).andReturn(List.of(svcLock1, svcLock2))
-        .anyTimes();
-    EasyMock
-        .expect(zc.get(EasyMock.eq(ROOT + ZGC_LOCK + "/" + svcLock1), EasyMock.isA(ZcStat.class)))
+    var sld = new ServiceLockData(uuid, HOSTNAME, ThriftService.GC, TEST_RESOURCE_GROUP);
+
+    expect(zc.getChildren(ROOT + ZGC_LOCK)).andReturn(List.of(svcLock1, svcLock2)).anyTimes();
+    expect(zc.get(EasyMock.eq(ROOT + ZGC_LOCK + "/" + svcLock1), EasyMock.isA(ZcStat.class)))
         .andReturn(sld.serialize());
-    EasyMock.expect(ctx.getServerPaths()).andReturn(new ServiceLockPaths(ctx)).anyTimes();
-    EasyMock.replay(ctx, zc);
+    replay(zc);
 
-    ServiceLockPath slp = ctx.getServerPaths().getGarbageCollector(true);
+    var slp = paths.getGarbageCollector(true);
     assertNotNull(slp);
     assertNull(slp.getServer());
     assertNull(slp.getResourceGroup());
     assertEquals(ZGC_LOCK, slp.getType());
     assertEquals(ROOT + ZGC_LOCK, slp.toString());
-
-    EasyMock.verify(ctx, zc);
-
   }
 
   @Test
   public void testGetManagerNotRunning() {
+    expect(zc.getChildren(ROOT + ZMANAGER_LOCK)).andReturn(List.of()).anyTimes();
+    replay(zc);
 
-    ClientContext ctx = EasyMock.createMock(ClientContext.class);
-    ZooCache zc = EasyMock.createMock(ZooCache.class);
-
-    EasyMock.expect(ctx.getZooKeeperRoot()).andReturn(ROOT).anyTimes();
-    EasyMock.expect(ctx.getZooCache()).andReturn(zc).anyTimes();
-    EasyMock.expect(zc.getChildren(ROOT + ZMANAGER_LOCK)).andReturn(List.of()).anyTimes();
-    EasyMock.expect(ctx.getServerPaths()).andReturn(new ServiceLockPaths(ctx)).anyTimes();
-    EasyMock.replay(ctx, zc);
-
-    ServiceLockPath slp = ctx.getServerPaths().getManager(true);
+    var slp = paths.getManager(true);
     assertNull(slp);
-
-    EasyMock.verify(ctx, zc);
-
   }
 
   @Test
   public void testGetManagerNoLock() {
+    expect(zc.getChildren(ROOT + ZMANAGER_LOCK)).andReturn(List.of(HOSTNAME_NO_LOCK)).anyTimes();
+    replay(zc);
 
-    ClientContext ctx = EasyMock.createMock(ClientContext.class);
-    ZooCache zc = EasyMock.createMock(ZooCache.class);
-
-    EasyMock.expect(ctx.getZooKeeperRoot()).andReturn(ROOT).anyTimes();
-    EasyMock.expect(ctx.getZooCache()).andReturn(zc).anyTimes();
-    EasyMock.expect(zc.getChildren(ROOT + ZMANAGER_LOCK)).andReturn(List.of(HOSTNAME_NO_LOCK))
-        .anyTimes();
-    EasyMock.expect(ctx.getServerPaths()).andReturn(new ServiceLockPaths(ctx)).anyTimes();
-    EasyMock.replay(ctx, zc);
-
-    ServiceLockPath slp = ctx.getServerPaths().getManager(false);
+    var slp = paths.getManager(false);
     assertNotNull(slp);
     assertNull(slp.getServer());
     assertNull(slp.getResourceGroup());
     assertEquals(ZMANAGER_LOCK, slp.getType());
     assertEquals(ROOT + ZMANAGER_LOCK, slp.toString());
-
-    EasyMock.verify(ctx, zc);
-
   }
 
   @Test
   public void testGetManager() {
-
     UUID uuid = UUID.randomUUID();
     String svcLock1 = ServiceLock.ZLOCK_PREFIX + uuid.toString() + "#0000000001";
     String svcLock2 = ServiceLock.ZLOCK_PREFIX + uuid.toString() + "#0000000002";
-    ServiceLockData sld =
-        new ServiceLockData(uuid, HOSTNAME, ThriftService.MANAGER, TEST_RESOURCE_GROUP);
-
-    ClientContext ctx = EasyMock.createMock(ClientContext.class);
-    ZooCache zc = EasyMock.createMock(ZooCache.class);
-
-    EasyMock.expect(ctx.getZooKeeperRoot()).andReturn(ROOT).anyTimes();
-    EasyMock.expect(ctx.getZooCache()).andReturn(zc).anyTimes();
-    EasyMock.expect(zc.getChildren(ROOT + ZMANAGER_LOCK)).andReturn(List.of(svcLock1, svcLock2))
-        .anyTimes();
-    EasyMock
-        .expect(
-            zc.get(EasyMock.eq(ROOT + ZMANAGER_LOCK + "/" + svcLock1), EasyMock.isA(ZcStat.class)))
+    var sld = new ServiceLockData(uuid, HOSTNAME, ThriftService.MANAGER, TEST_RESOURCE_GROUP);
+
+    expect(zc.getChildren(ROOT + ZMANAGER_LOCK)).andReturn(List.of(svcLock1, svcLock2)).anyTimes();
+    expect(zc.get(EasyMock.eq(ROOT + ZMANAGER_LOCK + "/" + svcLock1), EasyMock.isA(ZcStat.class)))
         .andReturn(sld.serialize());
-    EasyMock.expect(ctx.getServerPaths()).andReturn(new ServiceLockPaths(ctx)).anyTimes();
-    EasyMock.replay(ctx, zc);
+    replay(zc);
 
-    ServiceLockPath slp = ctx.getServerPaths().getManager(true);
+    var slp = paths.getManager(true);
     assertNotNull(slp);
     assertNull(slp.getServer());
     assertNull(slp.getResourceGroup());
     assertEquals(ZMANAGER_LOCK, slp.getType());
     assertEquals(ROOT + ZMANAGER_LOCK, slp.toString());
-
-    EasyMock.verify(ctx, zc);
-
   }
 
   @Test
   public void testGetMonitorNotRunning() {
+    expect(zc.getChildren(ROOT + ZMONITOR_LOCK)).andReturn(List.of()).anyTimes();
+    replay(zc);
 
-    ClientContext ctx = EasyMock.createMock(ClientContext.class);
-    ZooCache zc = EasyMock.createMock(ZooCache.class);
-
-    EasyMock.expect(ctx.getZooKeeperRoot()).andReturn(ROOT).anyTimes();
-    EasyMock.expect(ctx.getZooCache()).andReturn(zc).anyTimes();
-    EasyMock.expect(zc.getChildren(ROOT + ZMONITOR_LOCK)).andReturn(List.of()).anyTimes();
-    EasyMock.expect(ctx.getServerPaths()).andReturn(new ServiceLockPaths(ctx)).anyTimes();
-    EasyMock.replay(ctx, zc);
-
-    ServiceLockPath slp = ctx.getServerPaths().getMonitor(true);
+    var slp = paths.getMonitor(true);
     assertNull(slp);
-
-    EasyMock.verify(ctx, zc);
-
   }
 
   @Test
   public void testGetMonitorNoLock() {
+    expect(zc.getChildren(ROOT + ZMONITOR_LOCK)).andReturn(List.of(HOSTNAME_NO_LOCK)).anyTimes();
+    replay(zc);
 
-    ClientContext ctx = EasyMock.createMock(ClientContext.class);
-    ZooCache zc = EasyMock.createMock(ZooCache.class);
-
-    EasyMock.expect(ctx.getZooKeeperRoot()).andReturn(ROOT).anyTimes();
-    EasyMock.expect(ctx.getZooCache()).andReturn(zc).anyTimes();
-    EasyMock.expect(zc.getChildren(ROOT + ZMONITOR_LOCK)).andReturn(List.of(HOSTNAME_NO_LOCK))
-        .anyTimes();
-    EasyMock.expect(ctx.getServerPaths()).andReturn(new ServiceLockPaths(ctx)).anyTimes();
-    EasyMock.replay(ctx, zc);
-
-    ServiceLockPath slp = ctx.getServerPaths().getMonitor(false);
+    var slp = paths.getMonitor(false);
     assertNotNull(slp);
     assertNull(slp.getServer());
     assertNull(slp.getResourceGroup());
     assertEquals(ZMONITOR_LOCK, slp.getType());
     assertEquals(ROOT + ZMONITOR_LOCK, slp.toString());
-
-    EasyMock.verify(ctx, zc);
-
   }
 
   @Test
   public void testGetMonitor() {
-
     UUID uuid = UUID.randomUUID();
     String svcLock1 = ServiceLock.ZLOCK_PREFIX + uuid.toString() + "#0000000001";
     String svcLock2 = ServiceLock.ZLOCK_PREFIX + uuid.toString() + "#0000000002";
-    ServiceLockData sld =
-        new ServiceLockData(uuid, HOSTNAME, ThriftService.NONE, TEST_RESOURCE_GROUP);
-
-    ClientContext ctx = EasyMock.createMock(ClientContext.class);
-    ZooCache zc = EasyMock.createMock(ZooCache.class);
-
-    EasyMock.expect(ctx.getZooKeeperRoot()).andReturn(ROOT).anyTimes();
-    EasyMock.expect(ctx.getZooCache()).andReturn(zc).anyTimes();
-    EasyMock.expect(zc.getChildren(ROOT + ZMONITOR_LOCK)).andReturn(List.of(svcLock1, svcLock2))
-        .anyTimes();
-    EasyMock
-        .expect(
-            zc.get(EasyMock.eq(ROOT + ZMONITOR_LOCK + "/" + svcLock1), EasyMock.isA(ZcStat.class)))
+    var sld = new ServiceLockData(uuid, HOSTNAME, ThriftService.NONE, TEST_RESOURCE_GROUP);
+
+    expect(zc.getChildren(ROOT + ZMONITOR_LOCK)).andReturn(List.of(svcLock1, svcLock2)).anyTimes();
+    expect(zc.get(EasyMock.eq(ROOT + ZMONITOR_LOCK + "/" + svcLock1), EasyMock.isA(ZcStat.class)))
         .andReturn(sld.serialize());
-    EasyMock.expect(ctx.getServerPaths()).andReturn(new ServiceLockPaths(ctx)).anyTimes();
-    EasyMock.replay(ctx, zc);
+    replay(zc);
 
-    ServiceLockPath slp = ctx.getServerPaths().getMonitor(true);
+    var slp = paths.getMonitor(true);
     assertNotNull(slp);
     assertNull(slp.getServer());
     assertNull(slp.getResourceGroup());
     assertEquals(ZMONITOR_LOCK, slp.getType());
     assertEquals(ROOT + ZMONITOR_LOCK, slp.toString());
-
-    EasyMock.verify(ctx, zc);
-
   }
 
   @Test
   public void testGetCompactorsNotRunning() {
+    expect(zc.getChildren(ROOT + ZCOMPACTORS)).andReturn(List.of()).anyTimes();
+    replay(zc);
 
-    ClientContext ctx = EasyMock.createMock(ClientContext.class);
-    ZooCache zc = EasyMock.createMock(ZooCache.class);
-
-    EasyMock.expect(ctx.getZooKeeperRoot()).andReturn(ROOT).anyTimes();
-    EasyMock.expect(ctx.getZooCache()).andReturn(zc).anyTimes();
-    EasyMock.expect(zc.getChildren(ROOT + ZCOMPACTORS)).andReturn(List.of()).anyTimes();
-    EasyMock.expect(ctx.getServerPaths()).andReturn(new ServiceLockPaths(ctx)).anyTimes();
-    EasyMock.replay(ctx, zc);
-
-    assertThrows(NullPointerException.class,
-        () -> ctx.getServerPaths().getCompactor(null, null, true));
+    assertThrows(NullPointerException.class, () -> paths.getCompactor(null, null, true));
     assertThrows(NullPointerException.class,
-        () -> ctx.getServerPaths().getCompactor(rg -> rg.equals(TEST_RESOURCE_GROUP), null, true));
-    assertTrue(
-        ctx.getServerPaths().getCompactor(rg -> true, AddressSelector.all(), true).isEmpty());
-    assertTrue(ctx.getServerPaths()
-        .getCompactor(rg -> rg.equals(TEST_RESOURCE_GROUP), AddressSelector.all(), true).isEmpty());
-    assertTrue(ctx.getServerPaths()
-        .getCompactor(rg -> rg.equals(TEST_RESOURCE_GROUP), AddressSelector.exact(hp), true)
+        () -> paths.getCompactor(rg -> rg.equals(TEST_RESOURCE_GROUP), null, true));
+    assertTrue(paths.getCompactor(rg -> true, AddressSelector.all(), true).isEmpty());
+    assertTrue(paths.getCompactor(rg -> rg.equals(TEST_RESOURCE_GROUP), AddressSelector.all(), true)
         .isEmpty());
-
-    EasyMock.verify(ctx, zc);
-
+    assertTrue(
+        paths.getCompactor(rg -> rg.equals(TEST_RESOURCE_GROUP), AddressSelector.exact(hp), true)
+            .isEmpty());
   }
 
   @Test
   public void testGetCompactors() {
-
     UUID uuid = UUID.randomUUID();
     String svcLock1 = ServiceLock.ZLOCK_PREFIX + uuid.toString() + "#0000000001";
     String svcLock2 = ServiceLock.ZLOCK_PREFIX + uuid.toString() + "#0000000002";
-    ServiceLockData sld1 =
-        new ServiceLockData(uuid, HOSTNAME, ThriftService.COMPACTOR, TEST_RESOURCE_GROUP);
-    ServiceLockData sld2 =
+    var sld1 = new ServiceLockData(uuid, HOSTNAME, ThriftService.COMPACTOR, TEST_RESOURCE_GROUP);
+    var sld2 =
         new ServiceLockData(uuid, HOSTNAME, ThriftService.COMPACTOR, DEFAULT_RESOURCE_GROUP_NAME);
 
-    ClientContext ctx = EasyMock.createMock(ClientContext.class);
-    ZooCache zc = EasyMock.createMock(ZooCache.class);
-
-    EasyMock.expect(ctx.getZooKeeperRoot()).andReturn(ROOT).anyTimes();
-    EasyMock.expect(ctx.getZooCache()).andReturn(zc).anyTimes();
-    EasyMock.expect(zc.getChildren(ROOT + ZCOMPACTORS))
+    expect(zc.getChildren(ROOT + ZCOMPACTORS))
         .andReturn(List.of(TEST_RESOURCE_GROUP, DEFAULT_RESOURCE_GROUP_NAME)).anyTimes();
-    EasyMock.expect(zc.getChildren(ROOT + ZCOMPACTORS + "/" + TEST_RESOURCE_GROUP))
+    expect(zc.getChildren(ROOT + ZCOMPACTORS + "/" + TEST_RESOURCE_GROUP))
         .andReturn(List.of(HOSTNAME, HOSTNAME_NO_LOCK)).anyTimes();
-    EasyMock.expect(zc.getChildren(ROOT + ZCOMPACTORS + "/" + DEFAULT_RESOURCE_GROUP_NAME))
+    expect(zc.getChildren(ROOT + ZCOMPACTORS + "/" + DEFAULT_RESOURCE_GROUP_NAME))
         .andReturn(List.of(HOSTNAME, HOSTNAME_NO_LOCK)).anyTimes();
-    EasyMock
-        .expect(
-            zc.getChildren(ROOT + ZCOMPACTORS + "/" + TEST_RESOURCE_GROUP + "/" + HOSTNAME_NO_LOCK))
+    expect(zc.getChildren(ROOT + ZCOMPACTORS + "/" + TEST_RESOURCE_GROUP + "/" + HOSTNAME_NO_LOCK))
         .andReturn(List.of()).anyTimes();
-    EasyMock
-        .expect(zc.getChildren(
-            ROOT + ZCOMPACTORS + "/" + DEFAULT_RESOURCE_GROUP_NAME + "/" + HOSTNAME_NO_LOCK))
+    expect(zc.getChildren(
+        ROOT + ZCOMPACTORS + "/" + DEFAULT_RESOURCE_GROUP_NAME + "/" + HOSTNAME_NO_LOCK))
         .andReturn(List.of()).anyTimes();
-    EasyMock.expect(zc.getChildren(ROOT + ZCOMPACTORS + "/" + TEST_RESOURCE_GROUP + "/" + HOSTNAME))
+    expect(zc.getChildren(ROOT + ZCOMPACTORS + "/" + TEST_RESOURCE_GROUP + "/" + HOSTNAME))
         .andReturn(List.of(svcLock1, svcLock2)).anyTimes();
-    EasyMock
-        .expect(
-            zc.getChildren(ROOT + ZCOMPACTORS + "/" + DEFAULT_RESOURCE_GROUP_NAME + "/" + HOSTNAME))
+    expect(zc.getChildren(ROOT + ZCOMPACTORS + "/" + DEFAULT_RESOURCE_GROUP_NAME + "/" + HOSTNAME))
         .andReturn(List.of(svcLock1, svcLock2)).anyTimes();
-    EasyMock.expect(zc.get(
+    expect(zc.get(
         EasyMock
             .eq(ROOT + ZCOMPACTORS + "/" + TEST_RESOURCE_GROUP + "/" + HOSTNAME + "/" + svcLock1),
         EasyMock.isA(ZcStat.class))).andReturn(sld1.serialize()).anyTimes();
-    EasyMock
-        .expect(zc.get(EasyMock.eq(ROOT + ZCOMPACTORS + "/" + DEFAULT_RESOURCE_GROUP_NAME + "/"
-            + HOSTNAME + "/" + svcLock1), EasyMock.isA(ZcStat.class)))
-        .andReturn(sld2.serialize()).anyTimes();
-    EasyMock.expect(ctx.getServerPaths()).andReturn(new ServiceLockPaths(ctx)).anyTimes();
-    EasyMock
-        .expect(zc.getChildren(ROOT + ZCOMPACTORS + "/" + TEST_RESOURCE_GROUP + "/localhost:1234"))
+    expect(zc.get(EasyMock.eq(
+        ROOT + ZCOMPACTORS + "/" + DEFAULT_RESOURCE_GROUP_NAME + "/" + HOSTNAME + "/" + svcLock1),
+        EasyMock.isA(ZcStat.class))).andReturn(sld2.serialize()).anyTimes();
+
+    expect(zc.getChildren(ROOT + ZCOMPACTORS + "/" + TEST_RESOURCE_GROUP + "/localhost:1234"))
         .andReturn(null).anyTimes();
-    EasyMock.expect(zc.get(ROOT + ZCOMPACTORS + "/" + TEST_RESOURCE_GROUP + "/localhost:1234"))
+    expect(zc.get(ROOT + ZCOMPACTORS + "/" + TEST_RESOURCE_GROUP + "/localhost:1234"))
         .andReturn(null).anyTimes();
-    EasyMock.replay(ctx, zc);
+    replay(zc);
 
     // query for all
-    Set<ServiceLockPath> results =
-        ctx.getServerPaths().getCompactor(rg -> true, AddressSelector.all(), false);
+    Set<ServiceLockPath> results = paths.getCompactor(rg -> true, AddressSelector.all(), false);
     assertEquals(4, results.size());
     for (ServiceLockPath path : results) {
       assertEquals(ZCOMPACTORS, path.getType());
@@ -465,10 +346,10 @@ public void testGetCompactors() {
     }
 
     // query for all with locks
-    results = ctx.getServerPaths().getCompactor(rg -> true, AddressSelector.all(), true);
+    results = paths.getCompactor(rg -> true, AddressSelector.all(), true);
     assertEquals(2, results.size());
     Iterator<ServiceLockPath> iter = results.iterator();
-    ServiceLockPath slp1 = iter.next();
+    var slp1 = iter.next();
     assertEquals(HOSTNAME, slp1.getServer());
     assertEquals(ZCOMPACTORS, slp1.getType());
     if (slp1.getResourceGroup().equals(TEST_RESOURCE_GROUP)) {
@@ -480,7 +361,7 @@ public void testGetCompactors() {
     } else {
       fail("wrong resource group");
     }
-    ServiceLockPath slp2 = iter.next();
+    var slp2 = iter.next();
     assertEquals(HOSTNAME, slp2.getServer());
     assertEquals(ZCOMPACTORS, slp2.getType());
     if (slp2.getResourceGroup().equals(TEST_RESOURCE_GROUP)) {
@@ -494,13 +375,12 @@ public void testGetCompactors() {
     }
 
     // query for all in non-existent resource group
-    results = ctx.getServerPaths().getCompactor(rg -> rg.equals("FAKE_RESOURCE_GROUP"),
-        AddressSelector.all(), true);
+    results =
+        paths.getCompactor(rg -> rg.equals("FAKE_RESOURCE_GROUP"), AddressSelector.all(), true);
     assertEquals(0, results.size());
 
     // query for all in test resource group
-    results = ctx.getServerPaths().getCompactor(rg -> rg.equals(TEST_RESOURCE_GROUP),
-        AddressSelector.all(), true);
+    results = paths.getCompactor(rg -> rg.equals(TEST_RESOURCE_GROUP), AddressSelector.all(), true);
     assertEquals(1, results.size());
     iter = results.iterator();
     slp1 = iter.next();
@@ -510,8 +390,8 @@ public void testGetCompactors() {
     assertEquals(ROOT + ZCOMPACTORS + "/" + TEST_RESOURCE_GROUP + "/" + HOSTNAME, slp1.toString());
 
     // query for a specific server
-    results = ctx.getServerPaths().getCompactor(rg -> rg.equals(TEST_RESOURCE_GROUP),
-        AddressSelector.exact(hp), true);
+    results =
+        paths.getCompactor(rg -> rg.equals(TEST_RESOURCE_GROUP), AddressSelector.exact(hp), true);
     assertEquals(1, results.size());
     iter = results.iterator();
     slp1 = iter.next();
@@ -522,99 +402,70 @@ public void testGetCompactors() {
 
     // query for a wrong server
     for (boolean withLock : new boolean[] {true, false}) {
-      results = ctx.getServerPaths().getCompactor(rg -> rg.equals(TEST_RESOURCE_GROUP),
+      results = paths.getCompactor(rg -> rg.equals(TEST_RESOURCE_GROUP),
           AddressSelector.exact(HostAndPort.fromString("localhost:1234")), withLock);
       assertEquals(0, results.size());
-      results = ctx.getServerPaths().getCompactor(rg -> rg.equals(TEST_RESOURCE_GROUP),
+      results = paths.getCompactor(rg -> rg.equals(TEST_RESOURCE_GROUP),
           AddressSelector.matching(hp -> hp.equals("localhost:1234")), withLock);
       assertEquals(0, results.size());
     }
-
-    EasyMock.verify(ctx, zc);
-
   }
 
   @Test
   public void testGetScanServersNotRunning() {
+    expect(zc.getChildren(ROOT + ZSSERVERS)).andReturn(List.of()).anyTimes();
+    replay(zc);
 
-    ClientContext ctx = EasyMock.createMock(ClientContext.class);
-    ZooCache zc = EasyMock.createMock(ZooCache.class);
-
-    EasyMock.expect(ctx.getZooKeeperRoot()).andReturn(ROOT).anyTimes();
-    EasyMock.expect(ctx.getZooCache()).andReturn(zc).anyTimes();
-    EasyMock.expect(zc.getChildren(ROOT + ZSSERVERS)).andReturn(List.of()).anyTimes();
-    EasyMock.expect(ctx.getServerPaths()).andReturn(new ServiceLockPaths(ctx)).anyTimes();
-    EasyMock.replay(ctx, zc);
-
+    assertThrows(NullPointerException.class, () -> paths.getScanServer(null, null, true));
     assertThrows(NullPointerException.class,
-        () -> ctx.getServerPaths().getScanServer(null, null, true));
-    assertThrows(NullPointerException.class,
-        () -> ctx.getServerPaths().getScanServer(rg -> rg.equals(TEST_RESOURCE_GROUP), null, true));
+        () -> paths.getScanServer(rg -> rg.equals(TEST_RESOURCE_GROUP), null, true));
+    assertTrue(paths.getScanServer(rg -> true, AddressSelector.all(), true).isEmpty());
     assertTrue(
-        ctx.getServerPaths().getScanServer(rg -> true, AddressSelector.all(), true).isEmpty());
-    assertTrue(ctx.getServerPaths()
-        .getScanServer(rg -> rg.equals(TEST_RESOURCE_GROUP), AddressSelector.all(), true)
-        .isEmpty());
-    assertTrue(ctx.getServerPaths()
-        .getScanServer(rg -> rg.equals(TEST_RESOURCE_GROUP), AddressSelector.exact(hp), true)
-        .isEmpty());
-
-    EasyMock.verify(ctx, zc);
-
+        paths.getScanServer(rg -> rg.equals(TEST_RESOURCE_GROUP), AddressSelector.all(), true)
+            .isEmpty());
+    assertTrue(
+        paths.getScanServer(rg -> rg.equals(TEST_RESOURCE_GROUP), AddressSelector.exact(hp), true)
+            .isEmpty());
   }
 
   @Test
   public void testGetScanServers() {
-
     UUID uuid = UUID.randomUUID();
     String svcLock1 = ServiceLock.ZLOCK_PREFIX + uuid.toString() + "#0000000001";
     String svcLock2 = ServiceLock.ZLOCK_PREFIX + uuid.toString() + "#0000000002";
-    ServiceLockData sld1 =
-        new ServiceLockData(uuid, HOSTNAME, ThriftService.TABLET_SCAN, TEST_RESOURCE_GROUP);
-    ServiceLockData sld2 =
+    var sld1 = new ServiceLockData(uuid, HOSTNAME, ThriftService.TABLET_SCAN, TEST_RESOURCE_GROUP);
+    var sld2 =
         new ServiceLockData(uuid, HOSTNAME, ThriftService.TABLET_SCAN, DEFAULT_RESOURCE_GROUP_NAME);
 
-    ClientContext ctx = EasyMock.createMock(ClientContext.class);
-    ZooCache zc = EasyMock.createMock(ZooCache.class);
-
-    EasyMock.expect(ctx.getZooKeeperRoot()).andReturn(ROOT).anyTimes();
-    EasyMock.expect(ctx.getZooCache()).andReturn(zc).anyTimes();
-    EasyMock.expect(zc.getChildren(ROOT + ZSSERVERS))
+    expect(zc.getChildren(ROOT + ZSSERVERS))
         .andReturn(List.of(TEST_RESOURCE_GROUP, DEFAULT_RESOURCE_GROUP_NAME)).anyTimes();
-    EasyMock.expect(zc.getChildren(ROOT + ZSSERVERS + "/" + TEST_RESOURCE_GROUP))
+    expect(zc.getChildren(ROOT + ZSSERVERS + "/" + TEST_RESOURCE_GROUP))
         .andReturn(List.of(HOSTNAME, HOSTNAME_NO_LOCK)).anyTimes();
-    EasyMock.expect(zc.getChildren(ROOT + ZSSERVERS + "/" + DEFAULT_RESOURCE_GROUP_NAME))
+    expect(zc.getChildren(ROOT + ZSSERVERS + "/" + DEFAULT_RESOURCE_GROUP_NAME))
         .andReturn(List.of(HOSTNAME, HOSTNAME_NO_LOCK)).anyTimes();
-    EasyMock
-        .expect(
-            zc.getChildren(ROOT + ZSSERVERS + "/" + TEST_RESOURCE_GROUP + "/" + HOSTNAME_NO_LOCK))
+    expect(zc.getChildren(ROOT + ZSSERVERS + "/" + TEST_RESOURCE_GROUP + "/" + HOSTNAME_NO_LOCK))
         .andReturn(List.of()).anyTimes();
-    EasyMock
-        .expect(zc.getChildren(
-            ROOT + ZSSERVERS + "/" + DEFAULT_RESOURCE_GROUP_NAME + "/" + HOSTNAME_NO_LOCK))
+    expect(zc
+        .getChildren(ROOT + ZSSERVERS + "/" + DEFAULT_RESOURCE_GROUP_NAME + "/" + HOSTNAME_NO_LOCK))
         .andReturn(List.of()).anyTimes();
-    EasyMock.expect(zc.getChildren(ROOT + ZSSERVERS + "/" + TEST_RESOURCE_GROUP + "/" + HOSTNAME))
+    expect(zc.getChildren(ROOT + ZSSERVERS + "/" + TEST_RESOURCE_GROUP + "/" + HOSTNAME))
         .andReturn(List.of(svcLock1, svcLock2)).anyTimes();
-    EasyMock
-        .expect(
-            zc.getChildren(ROOT + ZSSERVERS + "/" + DEFAULT_RESOURCE_GROUP_NAME + "/" + HOSTNAME))
+    expect(zc.getChildren(ROOT + ZSSERVERS + "/" + DEFAULT_RESOURCE_GROUP_NAME + "/" + HOSTNAME))
         .andReturn(List.of(svcLock1, svcLock2)).anyTimes();
-    EasyMock.expect(zc.get(
+    expect(zc.get(
         EasyMock.eq(ROOT + ZSSERVERS + "/" + TEST_RESOURCE_GROUP + "/" + HOSTNAME + "/" + svcLock1),
         EasyMock.isA(ZcStat.class))).andReturn(sld1.serialize()).anyTimes();
-    EasyMock.expect(zc.get(
+    expect(zc.get(
         EasyMock.eq(
             ROOT + ZSSERVERS + "/" + DEFAULT_RESOURCE_GROUP_NAME + "/" + HOSTNAME + "/" + svcLock1),
         EasyMock.isA(ZcStat.class))).andReturn(sld2.serialize()).anyTimes();
-    EasyMock.expect(ctx.getServerPaths()).andReturn(new ServiceLockPaths(ctx)).anyTimes();
-    EasyMock
-        .expect(zc.getChildren(ROOT + ZSSERVERS + "/" + TEST_RESOURCE_GROUP + "/localhost:1234"))
+
+    expect(zc.getChildren(ROOT + ZSSERVERS + "/" + TEST_RESOURCE_GROUP + "/localhost:1234"))
         .andReturn(null).anyTimes();
-    EasyMock.replay(ctx, zc);
+    replay(zc);
 
     // query for all
-    Set<ServiceLockPath> results =
-        ctx.getServerPaths().getScanServer(rg -> true, AddressSelector.all(), false);
+    Set<ServiceLockPath> results = paths.getScanServer(rg -> true, AddressSelector.all(), false);
     assertEquals(4, results.size());
     for (ServiceLockPath path : results) {
       assertEquals(ZSSERVERS, path.getType());
@@ -631,10 +482,10 @@ public void testGetScanServers() {
     }
 
     // query for all with lock
-    results = ctx.getServerPaths().getScanServer(rg -> true, AddressSelector.all(), true);
+    results = paths.getScanServer(rg -> true, AddressSelector.all(), true);
     assertEquals(2, results.size());
     Iterator<ServiceLockPath> iter = results.iterator();
-    ServiceLockPath slp1 = iter.next();
+    var slp1 = iter.next();
     assertEquals(HOSTNAME, slp1.getServer());
     assertEquals(ZSSERVERS, slp1.getType());
     if (slp1.getResourceGroup().equals(TEST_RESOURCE_GROUP)) {
@@ -645,7 +496,7 @@ public void testGetScanServers() {
     } else {
       fail("wrong resource group");
     }
-    ServiceLockPath slp2 = iter.next();
+    var slp2 = iter.next();
     assertEquals(HOSTNAME, slp2.getServer());
     assertEquals(ZSSERVERS, slp2.getType());
     if (slp2.getResourceGroup().equals(TEST_RESOURCE_GROUP)) {
@@ -658,13 +509,13 @@ public void testGetScanServers() {
     }
 
     // query for all in non-existent resource group
-    results = ctx.getServerPaths().getScanServer(rg -> rg.equals("FAKE_RESOURCE_GROUP"),
-        AddressSelector.all(), true);
+    results =
+        paths.getScanServer(rg -> rg.equals("FAKE_RESOURCE_GROUP"), AddressSelector.all(), true);
     assertEquals(0, results.size());
 
     // query for all in test resource group
-    results = ctx.getServerPaths().getScanServer(rg -> rg.equals(TEST_RESOURCE_GROUP),
-        AddressSelector.all(), true);
+    results =
+        paths.getScanServer(rg -> rg.equals(TEST_RESOURCE_GROUP), AddressSelector.all(), true);
     assertEquals(1, results.size());
     iter = results.iterator();
     slp1 = iter.next();
@@ -674,8 +525,8 @@ public void testGetScanServers() {
     assertEquals(ROOT + ZSSERVERS + "/" + TEST_RESOURCE_GROUP + "/" + HOSTNAME, slp1.toString());
 
     // query for a specific server
-    results = ctx.getServerPaths().getScanServer(rg -> rg.equals(TEST_RESOURCE_GROUP),
-        AddressSelector.exact(hp), true);
+    results =
+        paths.getScanServer(rg -> rg.equals(TEST_RESOURCE_GROUP), AddressSelector.exact(hp), true);
     assertEquals(1, results.size());
     iter = results.iterator();
     slp1 = iter.next();
@@ -685,95 +536,66 @@ public void testGetScanServers() {
     assertEquals(ROOT + ZSSERVERS + "/" + TEST_RESOURCE_GROUP + "/" + HOSTNAME, slp1.toString());
 
     // query for a wrong server
-    results = ctx.getServerPaths().getScanServer(rg -> rg.equals(TEST_RESOURCE_GROUP),
+    results = paths.getScanServer(rg -> rg.equals(TEST_RESOURCE_GROUP),
         AddressSelector.exact(HostAndPort.fromString("localhost:1234")), true);
     assertEquals(0, results.size());
-
-    EasyMock.verify(ctx, zc);
-
   }
 
   @Test
   public void testGetTabletServersNotRunning() {
+    expect(zc.getChildren(ROOT + ZTSERVERS)).andReturn(List.of()).anyTimes();
+    replay(zc);
 
-    ClientContext ctx = EasyMock.createMock(ClientContext.class);
-    ZooCache zc = EasyMock.createMock(ZooCache.class);
-
-    EasyMock.expect(ctx.getZooKeeperRoot()).andReturn(ROOT).anyTimes();
-    EasyMock.expect(ctx.getZooCache()).andReturn(zc).anyTimes();
-    EasyMock.expect(zc.getChildren(ROOT + ZTSERVERS)).andReturn(List.of()).anyTimes();
-    EasyMock.expect(ctx.getServerPaths()).andReturn(new ServiceLockPaths(ctx)).anyTimes();
-    EasyMock.replay(ctx, zc);
-
+    assertThrows(NullPointerException.class, () -> paths.getTabletServer(null, null, true));
     assertThrows(NullPointerException.class,
-        () -> ctx.getServerPaths().getTabletServer(null, null, true));
-    assertThrows(NullPointerException.class, () -> ctx.getServerPaths()
-        .getTabletServer(rg -> rg.equals(TEST_RESOURCE_GROUP), null, true));
+        () -> paths.getTabletServer(rg -> rg.equals(TEST_RESOURCE_GROUP), null, true));
+    assertTrue(paths.getTabletServer(rg -> true, AddressSelector.all(), true).isEmpty());
     assertTrue(
-        ctx.getServerPaths().getTabletServer(rg -> true, AddressSelector.all(), true).isEmpty());
-    assertTrue(ctx.getServerPaths()
-        .getTabletServer(rg -> rg.equals(TEST_RESOURCE_GROUP), AddressSelector.all(), true)
-        .isEmpty());
-    assertTrue(ctx.getServerPaths()
-        .getTabletServer(rg -> rg.equals(TEST_RESOURCE_GROUP), AddressSelector.exact(hp), true)
-        .isEmpty());
-
-    EasyMock.verify(ctx, zc);
-
+        paths.getTabletServer(rg -> rg.equals(TEST_RESOURCE_GROUP), AddressSelector.all(), true)
+            .isEmpty());
+    assertTrue(
+        paths.getTabletServer(rg -> rg.equals(TEST_RESOURCE_GROUP), AddressSelector.exact(hp), true)
+            .isEmpty());
   }
 
   @Test
   public void testGetTabletServers() {
-
     UUID uuid = UUID.randomUUID();
     String svcLock1 = ServiceLock.ZLOCK_PREFIX + uuid.toString() + "#0000000001";
     String svcLock2 = ServiceLock.ZLOCK_PREFIX + uuid.toString() + "#0000000002";
-    ServiceLockData sld1 =
-        new ServiceLockData(uuid, HOSTNAME, ThriftService.TABLET_SCAN, TEST_RESOURCE_GROUP);
-    ServiceLockData sld2 =
+    var sld1 = new ServiceLockData(uuid, HOSTNAME, ThriftService.TABLET_SCAN, TEST_RESOURCE_GROUP);
+    var sld2 =
         new ServiceLockData(uuid, HOSTNAME, ThriftService.TABLET_SCAN, DEFAULT_RESOURCE_GROUP_NAME);
 
-    ClientContext ctx = EasyMock.createMock(ClientContext.class);
-    ZooCache zc = EasyMock.createMock(ZooCache.class);
-
-    EasyMock.expect(ctx.getZooKeeperRoot()).andReturn(ROOT).anyTimes();
-    EasyMock.expect(ctx.getZooCache()).andReturn(zc).anyTimes();
-    EasyMock.expect(zc.getChildren(ROOT + ZTSERVERS))
+    expect(zc.getChildren(ROOT + ZTSERVERS))
         .andReturn(List.of(TEST_RESOURCE_GROUP, DEFAULT_RESOURCE_GROUP_NAME)).anyTimes();
-    EasyMock.expect(zc.getChildren(ROOT + ZTSERVERS + "/" + TEST_RESOURCE_GROUP))
+    expect(zc.getChildren(ROOT + ZTSERVERS + "/" + TEST_RESOURCE_GROUP))
         .andReturn(List.of(HOSTNAME, HOSTNAME_NO_LOCK)).anyTimes();
-    EasyMock.expect(zc.getChildren(ROOT + ZTSERVERS + "/" + DEFAULT_RESOURCE_GROUP_NAME))
+    expect(zc.getChildren(ROOT + ZTSERVERS + "/" + DEFAULT_RESOURCE_GROUP_NAME))
         .andReturn(List.of(HOSTNAME, HOSTNAME_NO_LOCK)).anyTimes();
-    EasyMock
-        .expect(
-            zc.getChildren(ROOT + ZTSERVERS + "/" + TEST_RESOURCE_GROUP + "/" + HOSTNAME_NO_LOCK))
+    expect(zc.getChildren(ROOT + ZTSERVERS + "/" + TEST_RESOURCE_GROUP + "/" + HOSTNAME_NO_LOCK))
         .andReturn(List.of()).anyTimes();
-    EasyMock
-        .expect(zc.getChildren(
-            ROOT + ZTSERVERS + "/" + DEFAULT_RESOURCE_GROUP_NAME + "/" + HOSTNAME_NO_LOCK))
+    expect(zc
+        .getChildren(ROOT + ZTSERVERS + "/" + DEFAULT_RESOURCE_GROUP_NAME + "/" + HOSTNAME_NO_LOCK))
         .andReturn(List.of()).anyTimes();
-    EasyMock.expect(zc.getChildren(ROOT + ZTSERVERS + "/" + TEST_RESOURCE_GROUP + "/" + HOSTNAME))
+    expect(zc.getChildren(ROOT + ZTSERVERS + "/" + TEST_RESOURCE_GROUP + "/" + HOSTNAME))
         .andReturn(List.of(svcLock1, svcLock2)).anyTimes();
-    EasyMock
-        .expect(
-            zc.getChildren(ROOT + ZTSERVERS + "/" + DEFAULT_RESOURCE_GROUP_NAME + "/" + HOSTNAME))
+    expect(zc.getChildren(ROOT + ZTSERVERS + "/" + DEFAULT_RESOURCE_GROUP_NAME + "/" + HOSTNAME))
         .andReturn(List.of(svcLock1, svcLock2)).anyTimes();
-    EasyMock.expect(zc.get(
+    expect(zc.get(
         EasyMock.eq(ROOT + ZTSERVERS + "/" + TEST_RESOURCE_GROUP + "/" + HOSTNAME + "/" + svcLock1),
         EasyMock.isA(ZcStat.class))).andReturn(sld1.serialize()).anyTimes();
-    EasyMock.expect(zc.get(
+    expect(zc.get(
         EasyMock.eq(
             ROOT + ZTSERVERS + "/" + DEFAULT_RESOURCE_GROUP_NAME + "/" + HOSTNAME + "/" + svcLock1),
         EasyMock.isA(ZcStat.class))).andReturn(sld2.serialize()).anyTimes();
-    EasyMock.expect(ctx.getServerPaths()).andReturn(new ServiceLockPaths(ctx)).anyTimes();
-    EasyMock
-        .expect(zc.getChildren(ROOT + ZTSERVERS + "/" + TEST_RESOURCE_GROUP + "/localhost:1234"))
+
+    expect(zc.getChildren(ROOT + ZTSERVERS + "/" + TEST_RESOURCE_GROUP + "/localhost:1234"))
         .andReturn(null).anyTimes();
-    EasyMock.replay(ctx, zc);
+    replay(zc);
 
     // query for all
-    Set<ServiceLockPath> results =
-        ctx.getServerPaths().getTabletServer(rg -> true, AddressSelector.all(), false);
+    Set<ServiceLockPath> results = paths.getTabletServer(rg -> true, AddressSelector.all(), false);
     assertEquals(4, results.size());
     for (ServiceLockPath path : results) {
       assertEquals(ZTSERVERS, path.getType());
@@ -790,10 +612,10 @@ public void testGetTabletServers() {
     }
 
     // query for all with lock
-    results = ctx.getServerPaths().getTabletServer(rg -> true, AddressSelector.all(), true);
+    results = paths.getTabletServer(rg -> true, AddressSelector.all(), true);
     assertEquals(2, results.size());
     Iterator<ServiceLockPath> iter = results.iterator();
-    ServiceLockPath slp1 = iter.next();
+    var slp1 = iter.next();
     assertEquals(HOSTNAME, slp1.getServer());
     assertEquals(ZTSERVERS, slp1.getType());
     if (slp1.getResourceGroup().equals(TEST_RESOURCE_GROUP)) {
@@ -804,7 +626,7 @@ public void testGetTabletServers() {
     } else {
       fail("wrong resource group");
     }
-    ServiceLockPath slp2 = iter.next();
+    var slp2 = iter.next();
     assertEquals(HOSTNAME, slp2.getServer());
     assertEquals(ZTSERVERS, slp2.getType());
     if (slp2.getResourceGroup().equals(TEST_RESOURCE_GROUP)) {
@@ -817,13 +639,13 @@ public void testGetTabletServers() {
     }
 
     // query for all in non-existent resource group
-    results = ctx.getServerPaths().getTabletServer(rg -> rg.equals("FAKE_RESOURCE_GROUP"),
-        AddressSelector.all(), true);
+    results =
+        paths.getTabletServer(rg -> rg.equals("FAKE_RESOURCE_GROUP"), AddressSelector.all(), true);
     assertEquals(0, results.size());
 
     // query for all in test resource group
-    results = ctx.getServerPaths().getTabletServer(rg -> rg.equals(TEST_RESOURCE_GROUP),
-        AddressSelector.all(), true);
+    results =
+        paths.getTabletServer(rg -> rg.equals(TEST_RESOURCE_GROUP), AddressSelector.all(), true);
     assertEquals(1, results.size());
     iter = results.iterator();
     slp1 = iter.next();
@@ -833,8 +655,8 @@ public void testGetTabletServers() {
     assertEquals(ROOT + ZTSERVERS + "/" + TEST_RESOURCE_GROUP + "/" + HOSTNAME, slp1.toString());
 
     // query for a specific server
-    results = ctx.getServerPaths().getTabletServer(rg -> rg.equals(TEST_RESOURCE_GROUP),
-        AddressSelector.exact(hp), true);
+    results = paths.getTabletServer(rg -> rg.equals(TEST_RESOURCE_GROUP), AddressSelector.exact(hp),
+        true);
     assertEquals(1, results.size());
     iter = results.iterator();
     slp1 = iter.next();
@@ -844,93 +666,68 @@ public void testGetTabletServers() {
     assertEquals(ROOT + ZTSERVERS + "/" + TEST_RESOURCE_GROUP + "/" + HOSTNAME, slp1.toString());
 
     // query for a wrong server
-    results = ctx.getServerPaths().getTabletServer(rg -> rg.equals(TEST_RESOURCE_GROUP),
+    results = paths.getTabletServer(rg -> rg.equals(TEST_RESOURCE_GROUP),
         AddressSelector.exact(HostAndPort.fromString("localhost:1234")), true);
     assertEquals(0, results.size());
-
-    EasyMock.verify(ctx, zc);
-
   }
 
   @Test
   public void testGetDeadTabletServersNone() {
+    expect(zc.getChildren(ROOT + ZDEADTSERVERS)).andReturn(List.of()).anyTimes();
+    replay(zc);
 
-    ClientContext ctx = EasyMock.createMock(ClientContext.class);
-    ZooCache zc = EasyMock.createMock(ZooCache.class);
-
-    EasyMock.expect(ctx.getZooKeeperRoot()).andReturn(ROOT).anyTimes();
-    EasyMock.expect(ctx.getZooCache()).andReturn(zc).anyTimes();
-    EasyMock.expect(zc.getChildren(ROOT + ZDEADTSERVERS)).andReturn(List.of()).anyTimes();
-    EasyMock.expect(ctx.getServerPaths()).andReturn(new ServiceLockPaths(ctx)).anyTimes();
-    EasyMock.replay(ctx, zc);
-
+    assertThrows(NullPointerException.class, () -> paths.getDeadTabletServer(null, null, false));
     assertThrows(NullPointerException.class,
-        () -> ctx.getServerPaths().getDeadTabletServer(null, null, false));
-    assertThrows(NullPointerException.class, () -> ctx.getServerPaths()
-        .getDeadTabletServer(rg -> rg.equals(TEST_RESOURCE_GROUP), null, false));
-    assertTrue(ctx.getServerPaths().getDeadTabletServer(rg -> true, AddressSelector.all(), false)
-        .isEmpty());
-    assertTrue(ctx.getServerPaths()
+        () -> paths.getDeadTabletServer(rg -> rg.equals(TEST_RESOURCE_GROUP), null, false));
+    assertTrue(paths.getDeadTabletServer(rg -> true, AddressSelector.all(), false).isEmpty());
+    assertTrue(paths
         .getDeadTabletServer(rg -> rg.equals(TEST_RESOURCE_GROUP), AddressSelector.all(), false)
         .isEmpty());
-    assertTrue(ctx.getServerPaths()
+    assertTrue(paths
         .getDeadTabletServer(rg -> rg.equals(TEST_RESOURCE_GROUP), AddressSelector.exact(hp), false)
         .isEmpty());
-
-    EasyMock.verify(ctx, zc);
-
   }
 
   @Test
   public void testGetDeadTabletServers() {
-
     UUID uuid = UUID.randomUUID();
     String svcLock1 = ServiceLock.ZLOCK_PREFIX + uuid.toString() + "#0000000001";
     String svcLock2 = ServiceLock.ZLOCK_PREFIX + uuid.toString() + "#0000000002";
-    ServiceLockData sld1 =
-        new ServiceLockData(uuid, HOSTNAME, ThriftService.TABLET_SCAN, TEST_RESOURCE_GROUP);
-    ServiceLockData sld2 =
+    var sld1 = new ServiceLockData(uuid, HOSTNAME, ThriftService.TABLET_SCAN, TEST_RESOURCE_GROUP);
+    var sld2 =
         new ServiceLockData(uuid, HOSTNAME, ThriftService.TABLET_SCAN, DEFAULT_RESOURCE_GROUP_NAME);
 
-    ClientContext ctx = EasyMock.createMock(ClientContext.class);
-    ZooCache zc = EasyMock.createMock(ZooCache.class);
-
-    EasyMock.expect(ctx.getZooKeeperRoot()).andReturn(ROOT).anyTimes();
-    EasyMock.expect(ctx.getZooCache()).andReturn(zc).anyTimes();
-    EasyMock.expect(zc.getChildren(ROOT + ZDEADTSERVERS))
+    expect(zc.getChildren(ROOT + ZDEADTSERVERS))
         .andReturn(List.of(TEST_RESOURCE_GROUP, DEFAULT_RESOURCE_GROUP_NAME)).anyTimes();
-    EasyMock.expect(zc.getChildren(ROOT + ZDEADTSERVERS + "/" + TEST_RESOURCE_GROUP))
+    expect(zc.getChildren(ROOT + ZDEADTSERVERS + "/" + TEST_RESOURCE_GROUP))
         .andReturn(List.of(HOSTNAME)).anyTimes();
-    EasyMock.expect(zc.getChildren(ROOT + ZDEADTSERVERS + "/" + DEFAULT_RESOURCE_GROUP_NAME))
+    expect(zc.getChildren(ROOT + ZDEADTSERVERS + "/" + DEFAULT_RESOURCE_GROUP_NAME))
         .andReturn(List.of(HOSTNAME)).anyTimes();
-    EasyMock
-        .expect(zc.getChildren(ROOT + ZDEADTSERVERS + "/" + TEST_RESOURCE_GROUP + "/" + HOSTNAME))
+    expect(zc.getChildren(ROOT + ZDEADTSERVERS + "/" + TEST_RESOURCE_GROUP + "/" + HOSTNAME))
         .andReturn(List.of(svcLock1, svcLock2)).anyTimes();
-    EasyMock.expect(zc.get(ROOT + ZDEADTSERVERS + "/" + TEST_RESOURCE_GROUP + "/" + HOSTNAME))
+    expect(zc.get(ROOT + ZDEADTSERVERS + "/" + TEST_RESOURCE_GROUP + "/" + HOSTNAME))
         .andReturn(new byte[0]).anyTimes();
-    EasyMock
-        .expect(zc
-            .getChildren(ROOT + ZDEADTSERVERS + "/" + DEFAULT_RESOURCE_GROUP_NAME + "/" + HOSTNAME))
+    expect(
+        zc.getChildren(ROOT + ZDEADTSERVERS + "/" + DEFAULT_RESOURCE_GROUP_NAME + "/" + HOSTNAME))
         .andReturn(List.of(svcLock1, svcLock2)).anyTimes();
-    EasyMock.expect(zc.get(
+    expect(zc.get(
         EasyMock
             .eq(ROOT + ZDEADTSERVERS + "/" + TEST_RESOURCE_GROUP + "/" + HOSTNAME + "/" + svcLock1),
         EasyMock.isA(ZcStat.class))).andReturn(sld1.serialize()).anyTimes();
-    EasyMock
-        .expect(zc.get(EasyMock.eq(ROOT + ZDEADTSERVERS + "/" + DEFAULT_RESOURCE_GROUP_NAME + "/"
-            + HOSTNAME + "/" + svcLock1), EasyMock.isA(ZcStat.class)))
-        .andReturn(sld2.serialize()).anyTimes();
-    EasyMock.expect(ctx.getServerPaths()).andReturn(new ServiceLockPaths(ctx)).anyTimes();
-    EasyMock.expect(zc.get(ROOT + ZDEADTSERVERS + "/" + TEST_RESOURCE_GROUP + "/localhost:1234"))
+    expect(zc.get(EasyMock.eq(
+        ROOT + ZDEADTSERVERS + "/" + DEFAULT_RESOURCE_GROUP_NAME + "/" + HOSTNAME + "/" + svcLock1),
+        EasyMock.isA(ZcStat.class))).andReturn(sld2.serialize()).anyTimes();
+
+    expect(zc.get(ROOT + ZDEADTSERVERS + "/" + TEST_RESOURCE_GROUP + "/localhost:1234"))
         .andReturn(null).anyTimes();
-    EasyMock.replay(ctx, zc);
+    replay(zc);
 
     // query for all
     Set<ServiceLockPath> results =
-        ctx.getServerPaths().getDeadTabletServer(rg -> true, AddressSelector.all(), false);
+        paths.getDeadTabletServer(rg -> true, AddressSelector.all(), false);
     assertEquals(2, results.size());
     Iterator<ServiceLockPath> iter = results.iterator();
-    ServiceLockPath slp1 = iter.next();
+    var slp1 = iter.next();
     assertEquals(HOSTNAME, slp1.getServer());
     assertEquals(ZDEADTSERVERS, slp1.getType());
     if (slp1.getResourceGroup().equals(TEST_RESOURCE_GROUP)) {
@@ -942,7 +739,7 @@ public void testGetDeadTabletServers() {
     } else {
       fail("wrong resource group");
     }
-    ServiceLockPath slp2 = iter.next();
+    var slp2 = iter.next();
     assertEquals(HOSTNAME, slp2.getServer());
     assertEquals(ZDEADTSERVERS, slp2.getType());
     if (slp2.getResourceGroup().equals(TEST_RESOURCE_GROUP)) {
@@ -956,13 +753,13 @@ public void testGetDeadTabletServers() {
     }
 
     // query for all in non-existent resource group
-    results = ctx.getServerPaths().getDeadTabletServer(rg -> rg.equals("FAKE_RESOURCE_GROUP"),
+    results = paths.getDeadTabletServer(rg -> rg.equals("FAKE_RESOURCE_GROUP"),
         AddressSelector.all(), false);
     assertEquals(0, results.size());
 
     // query for all in test resource group
-    results = ctx.getServerPaths().getDeadTabletServer(rg -> rg.equals(TEST_RESOURCE_GROUP),
-        AddressSelector.all(), false);
+    results = paths.getDeadTabletServer(rg -> rg.equals(TEST_RESOURCE_GROUP), AddressSelector.all(),
+        false);
     assertEquals(1, results.size());
     iter = results.iterator();
     slp1 = iter.next();
@@ -973,7 +770,7 @@ public void testGetDeadTabletServers() {
         slp1.toString());
 
     // query for a specific server
-    results = ctx.getServerPaths().getDeadTabletServer(rg -> rg.equals(TEST_RESOURCE_GROUP),
+    results = paths.getDeadTabletServer(rg -> rg.equals(TEST_RESOURCE_GROUP),
         AddressSelector.exact(hp), false);
     assertEquals(1, results.size());
     iter = results.iterator();
@@ -985,31 +782,24 @@ public void testGetDeadTabletServers() {
         slp1.toString());
 
     // query for a wrong server
-    results = ctx.getServerPaths().getDeadTabletServer(rg -> rg.equals(TEST_RESOURCE_GROUP),
+    results = paths.getDeadTabletServer(rg -> rg.equals(TEST_RESOURCE_GROUP),
         AddressSelector.exact(HostAndPort.fromString("localhost:1234")), false);
     assertEquals(0, results.size());
-
-    EasyMock.verify(ctx, zc);
-
   }
 
   @Test
   public void testTableLocksPath() {
-
-    ClientContext ctx = EasyMock.createMock(ClientContext.class);
-    EasyMock.expect(ctx.getZooKeeperRoot()).andReturn(ROOT).anyTimes();
-    EasyMock.expect(ctx.getServerPaths()).andReturn(new ServiceLockPaths(ctx)).anyTimes();
-    EasyMock.replay(ctx);
+    replay(zc);
 
     // Only table lock creation is supported because the existing code
     // uses a ServiceLockPath with it.
-    ServiceLockPath slp = ctx.getServerPaths().createTableLocksPath();
+    var slp = paths.createTableLocksPath();
     assertNull(slp.getServer());
     assertNull(slp.getResourceGroup());
     assertEquals(ZTABLE_LOCKS, slp.getType());
     assertEquals(ROOT + ZTABLE_LOCKS, slp.toString());
 
-    slp = ctx.getServerPaths().createTableLocksPath("1");
+    slp = paths.createTableLocksPath("1");
     assertEquals("1", slp.getServer());
     assertNull(slp.getResourceGroup());
     assertEquals(ZTABLE_LOCKS, slp.getType());
@@ -1022,25 +812,18 @@ public void testTableLocksPath() {
         () -> ServiceLockPaths.parse(Optional.of(ZTABLE_LOCKS), ROOT + ZTABLE_LOCKS));
     assertThrows(IllegalArgumentException.class,
         () -> ServiceLockPaths.parse(Optional.of(ZTABLE_LOCKS), ROOT + ZTABLE_LOCKS + "/1"));
-
-    EasyMock.verify(ctx);
-
   }
 
   @Test
   public void testMiniPath() {
+    replay(zc);
 
-    ClientContext ctx = EasyMock.createMock(ClientContext.class);
-    EasyMock.expect(ctx.getZooKeeperRoot()).andReturn(ROOT).anyTimes();
-    EasyMock.expect(ctx.getServerPaths()).andReturn(new ServiceLockPaths(ctx)).anyTimes();
-    EasyMock.replay(ctx);
-
-    assertThrows(NullPointerException.class, () -> ctx.getServerPaths().createMiniPath(null));
+    assertThrows(NullPointerException.class, () -> paths.createMiniPath(null));
 
     // Only mini lock creation is supported because the existing code
     // uses a ServiceLockPath with it.
     String miniUUID = UUID.randomUUID().toString();
-    ServiceLockPath slp = ctx.getServerPaths().createMiniPath(miniUUID);
+    var slp = paths.createMiniPath(miniUUID);
     assertEquals(miniUUID, slp.getServer());
     assertNull(slp.getResourceGroup());
     assertEquals(ZMINI_LOCK, slp.getType());
@@ -1056,9 +839,5 @@ public void testMiniPath() {
     assertNull(slp.getResourceGroup());
     assertEquals(ZMINI_LOCK, slp.getType());
     assertEquals(ROOT + ZMINI_LOCK + "/" + miniUUID, slp.toString());
-
-    EasyMock.verify(ctx);
-
   }
-
 }
diff --git a/core/src/test/java/org/apache/accumulo/core/metadata/schema/TabletMetadataTest.java b/core/src/test/java/org/apache/accumulo/core/metadata/schema/TabletMetadataTest.java
index 9f4ba14def1..1381f44f334 100644
--- a/core/src/test/java/org/apache/accumulo/core/metadata/schema/TabletMetadataTest.java
+++ b/core/src/test/java/org/apache/accumulo/core/metadata/schema/TabletMetadataTest.java
@@ -44,6 +44,7 @@
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import java.lang.reflect.Constructor;
+import java.time.Duration;
 import java.util.AbstractMap;
 import java.util.EnumSet;
 import java.util.LinkedHashSet;
@@ -643,6 +644,8 @@ public void testBuilder() {
         .putFile(sf1, dfv1).putFile(sf2, dfv2).putBulkFile(rf1, loadedFateId1)
         .putBulkFile(rf2, loadedFateId2).putFlushId(27).putDirName("dir1").putScan(sf3).putScan(sf4)
         .putCompacted(compactFateId1).putCompacted(compactFateId2).putCloned()
+        .putTabletMergeability(
+            TabletMergeabilityMetadata.always(SteadyTime.from(1, TimeUnit.SECONDS)))
         .build(ECOMP, HOSTING_REQUESTED, MERGED, USER_COMPACTION_REQUESTED, UNSPLITTABLE);
 
     assertEquals(extent, tm.getExtent());
@@ -662,6 +665,8 @@ public void testBuilder() {
     assertFalse(tm.hasMerged());
     assertNull(tm.getUnSplittable());
     assertEquals("OK", tm.getCloned());
+    assertEquals(TabletMergeabilityMetadata.always(SteadyTime.from(1, TimeUnit.SECONDS)),
+        tm.getTabletMergeability());
     assertThrows(IllegalStateException.class, tm::getOperationId);
     assertThrows(IllegalStateException.class, tm::getSuspend);
     assertThrows(IllegalStateException.class, tm::getTime);
@@ -688,6 +693,7 @@ public void testBuilder() {
     assertThrows(IllegalStateException.class, tm2::hasMerged);
     assertThrows(IllegalStateException.class, tm2::getUserCompactionsRequested);
     assertThrows(IllegalStateException.class, tm2::getUnSplittable);
+    assertThrows(IllegalStateException.class, tm2::getTabletAvailability);
 
     var ecid1 = ExternalCompactionId.generate(UUID.randomUUID());
     CompactionMetadata ecm =
@@ -707,7 +713,10 @@ public void testBuilder() {
         .putSuspension(ser1, SteadyTime.from(45L, TimeUnit.MILLISECONDS))
         .putTime(new MetadataTime(479, TimeType.LOGICAL)).putWal(le1).putWal(le2)
         .setHostingRequested().putSelectedFiles(selFiles).setMerged()
-        .putUserCompactionRequested(selFilesFateId).setUnSplittable(unsplittableMeta).build();
+        .putUserCompactionRequested(selFilesFateId).setUnSplittable(unsplittableMeta)
+        .putTabletMergeability(TabletMergeabilityMetadata.after(Duration.ofDays(3),
+            SteadyTime.from(45L, TimeUnit.MILLISECONDS)))
+        .build();
 
     assertEquals(Set.of(ecid1), tm3.getExternalCompactions().keySet());
     assertEquals(Set.of(sf1, sf2), tm3.getExternalCompactions().get(ecid1).getJobFiles());
@@ -724,6 +733,11 @@ public void testBuilder() {
     assertTrue(tm3.hasMerged());
     assertTrue(tm3.getUserCompactionsRequested().contains(selFilesFateId));
     assertEquals(unsplittableMeta, tm3.getUnSplittable());
+    var tmm = tm3.getTabletMergeability();
+    assertEquals(Duration.ofDays(3), tmm.getTabletMergeability().getDelay().orElseThrow());
+    assertEquals(SteadyTime.from(45L, TimeUnit.MILLISECONDS), tmm.getSteadyTime().orElseThrow());
+    assertTrue(tmm.isMergeable(SteadyTime.from(Duration.ofHours(73))));
+    assertFalse(tmm.isMergeable(SteadyTime.from(Duration.ofHours(72))));
   }
 
 }
diff --git a/core/src/test/java/org/apache/accumulo/core/security/ColumnVisibilityTest.java b/core/src/test/java/org/apache/accumulo/core/security/ColumnVisibilityTest.java
index 229e97ab16f..67d68e40b73 100644
--- a/core/src/test/java/org/apache/accumulo/core/security/ColumnVisibilityTest.java
+++ b/core/src/test/java/org/apache/accumulo/core/security/ColumnVisibilityTest.java
@@ -19,26 +19,14 @@
 package org.apache.accumulo.core.security;
 
 import static java.nio.charset.StandardCharsets.UTF_8;
-import static org.junit.jupiter.api.Assertions.assertArrayEquals;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertThrows;
-import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import org.apache.hadoop.io.Text;
 import org.junit.jupiter.api.Test;
 
 public class ColumnVisibilityTest {
 
-  @SuppressWarnings("deprecation")
-  private static org.apache.accumulo.core.security.ColumnVisibility.NodeType AND =
-      org.apache.accumulo.core.security.ColumnVisibility.NodeType.AND;
-  @SuppressWarnings("deprecation")
-  private static org.apache.accumulo.core.security.ColumnVisibility.NodeType OR =
-      org.apache.accumulo.core.security.ColumnVisibility.NodeType.OR;
-  @SuppressWarnings("deprecation")
-  private static org.apache.accumulo.core.security.ColumnVisibility.NodeType TERM =
-      org.apache.accumulo.core.security.ColumnVisibility.NodeType.TERM;
-
   private void shouldThrow(String... strings) {
     for (String s : strings) {
       final byte[] sBytes = s.getBytes(UTF_8);
@@ -66,14 +54,6 @@ public void testEmpty() {
     assertEquals(a, d);
   }
 
-  @Test
-  @SuppressWarnings("deprecation")
-  public void testEmptyFlatten() {
-    // empty visibility is valid
-    new ColumnVisibility().flatten();
-    new ColumnVisibility("").flatten();
-  }
-
   @Test
   public void testSimple() {
     shouldNotThrow("test", "(one)");
@@ -92,14 +72,6 @@ public void testBadCharacters() {
     shouldThrow("a*b");
   }
 
-  @SuppressWarnings("deprecation")
-  public void normalized(String... values) {
-    for (int i = 0; i < values.length; i += 2) {
-      ColumnVisibility cv = new ColumnVisibility(values[i].getBytes(UTF_8));
-      assertArrayEquals(cv.flatten(), values[i + 1].getBytes(UTF_8));
-    }
-  }
-
   @Test
   public void testComplexCompound() {
     shouldNotThrow("(a|b)&(x|y)");
@@ -109,17 +81,6 @@ public void testComplexCompound() {
         "((one|foo)|bar)&two");
   }
 
-  @Test
-  public void testNormalization() {
-    normalized("a", "a", "(a)", "a", "b|a", "a|b", "(b)|a", "a|b", "(b|(a|c))&x", "x&(a|b|c)",
-        "(((a)))", "a");
-    final String normForm = "a&b&c";
-    normalized("b&c&a", normForm, "c&b&a", normForm, "a&(b&c)", normForm, "(a&c)&b", normForm);
-
-    // this an expression that's basically `expr | expr`
-    normalized("(d&c&b&a)|(b&c&a&d)", "a&b&c&d");
-  }
-
   @Test
   public void testDanglingOperators() {
     shouldThrow("a|b&");
@@ -165,105 +126,4 @@ public void testQuotes() {
     shouldNotThrow("A&\"B\\\\D\"");
     shouldNotThrow("A&\"B\\\"D\"");
   }
-
-  @Test
-  @SuppressWarnings("deprecation")
-  public void testToString() {
-    ColumnVisibility cv = new ColumnVisibility(ColumnVisibility.quote("a"));
-    assertEquals("[a]", cv.toString());
-
-    // multi-byte
-    cv = new ColumnVisibility(ColumnVisibility.quote("五"));
-    assertEquals("[\"五\"]", cv.toString());
-  }
-
-  @Test
-  @SuppressWarnings("deprecation")
-  public void testParseTree() {
-    var node = parse("(W)|(U&V)");
-    assertNode(node, OR, 0, 9);
-    assertNode(node.getChildren().get(0), TERM, 1, 2);
-    assertNode(node.getChildren().get(1), AND, 5, 8);
-  }
-
-  @Test
-  public void testParseTreeWithNoChildren() {
-    var node = parse("ABC");
-    assertNode(node, TERM, 0, 3);
-  }
-
-  @Test
-  @SuppressWarnings("deprecation")
-  public void testParseTreeWithTwoChildren() {
-    var node = parse("ABC|DEF");
-    assertNode(node, OR, 0, 7);
-    assertNode(node.getChildren().get(0), TERM, 0, 3);
-    assertNode(node.getChildren().get(1), TERM, 4, 7);
-  }
-
-  @Test
-  @SuppressWarnings("deprecation")
-  public void testParseTreeWithParenthesesAndTwoChildren() {
-    var node = parse("(ABC|DEF)");
-    assertNode(node, OR, 1, 8);
-    assertNode(node.getChildren().get(0), TERM, 1, 4);
-    assertNode(node.getChildren().get(1), TERM, 5, 8);
-  }
-
-  @Test
-  @SuppressWarnings("deprecation")
-  public void testParseTreeWithParenthesizedChildren() {
-    var node = parse("ABC|(DEF&GHI)");
-    assertNode(node, OR, 0, 13);
-    assertNode(node.getChildren().get(0), TERM, 0, 3);
-    assertNode(node.getChildren().get(1), AND, 5, 12);
-    assertNode(node.getChildren().get(1).children.get(0), TERM, 5, 8);
-    assertNode(node.getChildren().get(1).children.get(1), TERM, 9, 12);
-  }
-
-  @Test
-  @SuppressWarnings("deprecation")
-  public void testParseTreeWithMoreParentheses() {
-    var node = parse("(W)|(U&V)");
-    assertNode(node, OR, 0, 9);
-    assertNode(node.getChildren().get(0), TERM, 1, 2);
-    assertNode(node.getChildren().get(1), AND, 5, 8);
-    assertNode(node.getChildren().get(1).children.get(0), TERM, 5, 6);
-    assertNode(node.getChildren().get(1).children.get(1), TERM, 7, 8);
-  }
-
-  @Test
-  @SuppressWarnings("deprecation")
-  public void testEmptyParseTreesAreEqual() {
-    var comparator =
-        new org.apache.accumulo.core.security.ColumnVisibility.NodeComparator(new byte[] {});
-    var empty = new ColumnVisibility().getParseTree();
-    assertEquals(0, comparator.compare(empty, parse("")));
-  }
-
-  @Test
-  @SuppressWarnings("deprecation")
-  public void testParseTreesOrdering() {
-    byte[] expression = "(b&c&d)|((a|m)&y&z)|(e&f)".getBytes(UTF_8);
-    byte[] flattened = new ColumnVisibility(expression).flatten();
-
-    // Convert to String for indexOf convenience
-    String flat = new String(flattened, UTF_8);
-    assertTrue(flat.indexOf('e') < flat.indexOf('|'), "shortest expressions sort first");
-    assertTrue(flat.indexOf('b') < flat.indexOf('a'), "shortest children sort first");
-  }
-
-  @SuppressWarnings("deprecation")
-  private org.apache.accumulo.core.security.ColumnVisibility.Node parse(String s) {
-    ColumnVisibility v = new ColumnVisibility(s);
-    return v.getParseTree();
-  }
-
-  @SuppressWarnings("deprecation")
-  private void assertNode(org.apache.accumulo.core.security.ColumnVisibility.Node node,
-      org.apache.accumulo.core.security.ColumnVisibility.NodeType nodeType, int start, int end) {
-    assertEquals(node.type, nodeType);
-    assertEquals(start, node.start);
-    assertEquals(end, node.end);
-  }
 }
diff --git a/core/src/test/java/org/apache/accumulo/core/security/VisibilityEvaluatorTest.java b/core/src/test/java/org/apache/accumulo/core/security/VisibilityEvaluatorTest.java
deleted file mode 100644
index 31ae8ea3ed4..00000000000
--- a/core/src/test/java/org/apache/accumulo/core/security/VisibilityEvaluatorTest.java
+++ /dev/null
@@ -1,113 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.accumulo.core.security;
-
-import static org.apache.accumulo.core.security.ColumnVisibility.quote;
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertFalse;
-import static org.junit.jupiter.api.Assertions.assertTrue;
-
-import org.apache.accumulo.core.util.ByteArraySet;
-import org.junit.jupiter.api.Test;
-
-@SuppressWarnings("deprecation")
-public class VisibilityEvaluatorTest {
-
-  @Test
-  public void testVisibilityEvaluator() throws VisibilityParseException {
-    VisibilityEvaluator ct = new VisibilityEvaluator(
-        new Authorizations(ByteArraySet.fromStrings("one", "two", "three", "four")));
-
-    // test for empty vis
-    assertTrue(ct.evaluate(new ColumnVisibility(new byte[0])));
-
-    // test for and
-    assertTrue(ct.evaluate(new ColumnVisibility("one&two")), "'and' test");
-
-    // test for or
-    assertTrue(ct.evaluate(new ColumnVisibility("foor|four")), "'or' test");
-
-    // test for and and or
-    assertTrue(ct.evaluate(new ColumnVisibility("(one&two)|(foo&bar)")), "'and' and 'or' test");
-
-    // test for false negatives
-    for (String marking : new String[] {"one", "one|five", "five|one", "(one)",
-        "(one&two)|(foo&bar)", "(one|foo)&three", "one|foo|bar", "(one|foo)|bar",
-        "((one|foo)|bar)&two"}) {
-      assertTrue(ct.evaluate(new ColumnVisibility(marking)), marking);
-    }
-
-    // test for false positives
-    for (String marking : new String[] {"five", "one&five", "five&one", "((one|foo)|bar)&goober"}) {
-      assertFalse(ct.evaluate(new ColumnVisibility(marking)), marking);
-    }
-  }
-
-  @Test
-  public void testQuotedExpressions() throws VisibilityParseException {
-
-    Authorizations auths = new Authorizations("A#C", "A\"C", "A\\C", "AC");
-    VisibilityEvaluator ct = new VisibilityEvaluator(auths);
-    runQuoteTest(ct);
-
-    // construct VisibilityEvaluator using another constructor and run test again
-    ct = new VisibilityEvaluator((AuthorizationContainer) auths);
-    runQuoteTest(ct);
-  }
-
-  private void runQuoteTest(VisibilityEvaluator ct) throws VisibilityParseException {
-    assertTrue(ct.evaluate(new ColumnVisibility(quote("A#C") + "|" + quote("A?C"))));
-    assertTrue(ct.evaluate(
-        new ColumnVisibility(new ColumnVisibility(quote("A#C") + "|" + quote("A?C")).flatten())));
-    assertTrue(ct.evaluate(new ColumnVisibility(quote("A\"C") + "&" + quote("A\\C"))));
-    assertTrue(ct.evaluate(
-        new ColumnVisibility(new ColumnVisibility(quote("A\"C") + "&" + quote("A\\C")).flatten())));
-    assertTrue(
-        ct.evaluate(new ColumnVisibility("(" + quote("A\"C") + "|B)&(" + quote("A#C") + "|D)")));
-
-    assertFalse(ct.evaluate(new ColumnVisibility(quote("A#C") + "&B")));
-
-    assertTrue(ct.evaluate(new ColumnVisibility(quote("A#C"))));
-    assertTrue(ct.evaluate(new ColumnVisibility("(" + quote("A#C") + ")")));
-  }
-
-  @Test
-  public void testQuote() {
-    assertEquals("\"A#C\"", quote("A#C"));
-    assertEquals("\"A\\\"C\"", quote("A\"C"));
-    assertEquals("\"A\\\"\\\\C\"", quote("A\"\\C"));
-    assertEquals("ACS", quote("ACS"));
-    assertEquals("\"九\"", quote("九"));
-    assertEquals("\"五十\"", quote("五十"));
-  }
-
-  @Test
-  public void testNonAscii() throws VisibilityParseException {
-    VisibilityEvaluator ct = new VisibilityEvaluator(new Authorizations("五", "六", "八", "九", "五十"));
-
-    assertTrue(ct.evaluate(new ColumnVisibility(quote("五") + "|" + quote("四"))));
-    assertFalse(ct.evaluate(new ColumnVisibility(quote("五") + "&" + quote("四"))));
-    assertTrue(
-        ct.evaluate(new ColumnVisibility(quote("五") + "&(" + quote("四") + "|" + quote("九") + ")")));
-    assertTrue(ct.evaluate(new ColumnVisibility("\"五\"&(\"四\"|\"五十\")")));
-    assertFalse(
-        ct.evaluate(new ColumnVisibility(quote("五") + "&(" + quote("四") + "|" + quote("三") + ")")));
-    assertFalse(ct.evaluate(new ColumnVisibility("\"五\"&(\"四\"|\"三\")")));
-  }
-}
diff --git a/core/src/test/java/org/apache/accumulo/core/zookeeper/ZooSessionTest.java b/core/src/test/java/org/apache/accumulo/core/zookeeper/ZooSessionTest.java
new file mode 100644
index 00000000000..2373961e83a
--- /dev/null
+++ b/core/src/test/java/org/apache/accumulo/core/zookeeper/ZooSessionTest.java
@@ -0,0 +1,62 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.accumulo.core.zookeeper;
+
+import static java.util.concurrent.TimeUnit.SECONDS;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.Timeout;
+
+class ZooSessionTest {
+
+  private static final int ZK_TIMEOUT_SECONDS = 5;
+
+  private String UNKNOWN_HOST = "hostname.that.should.not.exist.example.com:2181";
+  private int millisTimeout = (int) SECONDS.toMillis(ZK_TIMEOUT_SECONDS);
+
+  @Test
+  @Timeout(ZK_TIMEOUT_SECONDS * 4)
+  public void testConnectUnknownHost() {
+
+    try (var zk = new ZooSession(getClass().getSimpleName(), UNKNOWN_HOST, millisTimeout, null)) {
+      var e = assertThrows(IllegalStateException.class, () -> {
+        zk.getSessionId();
+      });
+      assertTrue(e.getMessage().contains("Failed to connect to zookeeper (" + UNKNOWN_HOST
+          + ") within 2x zookeeper timeout period " + millisTimeout));
+    }
+  }
+
+  @Test
+  public void testClosed() {
+    ZooSession zk;
+    try (var zk2 = zk = new ZooSession("testClosed", UNKNOWN_HOST, millisTimeout, null)) {
+      assertNotNull(zk);
+    }
+    var e = assertThrows(IllegalStateException.class, () -> {
+      zk.getSessionId();
+    });
+    assertTrue(e.getMessage().startsWith("ZooSession[testClosed_"), e.getMessage());
+    assertTrue(e.getMessage().endsWith("] was closed"), e.getMessage());
+  }
+
+}
diff --git a/minicluster/pom.xml b/minicluster/pom.xml
index 50ca43cdc71..9904356bfff 100644
--- a/minicluster/pom.xml
+++ b/minicluster/pom.xml
@@ -96,10 +96,6 @@
       <groupId>org.apache.zookeeper</groupId>
       <artifactId>zookeeper</artifactId>
     </dependency>
-    <dependency>
-      <groupId>org.apache.zookeeper</groupId>
-      <artifactId>zookeeper-jute</artifactId>
-    </dependency>
     <dependency>
       <groupId>org.slf4j</groupId>
       <artifactId>slf4j-api</artifactId>
diff --git a/minicluster/src/main/java/org/apache/accumulo/cluster/standalone/StandaloneAccumuloCluster.java b/minicluster/src/main/java/org/apache/accumulo/cluster/standalone/StandaloneAccumuloCluster.java
index 155b97f544d..7de3600a920 100644
--- a/minicluster/src/main/java/org/apache/accumulo/cluster/standalone/StandaloneAccumuloCluster.java
+++ b/minicluster/src/main/java/org/apache/accumulo/cluster/standalone/StandaloneAccumuloCluster.java
@@ -27,6 +27,7 @@
 import java.util.Collections;
 import java.util.List;
 import java.util.Properties;
+import java.util.function.Supplier;
 
 import org.apache.accumulo.cluster.AccumuloCluster;
 import org.apache.accumulo.cluster.ClusterUser;
@@ -44,6 +45,8 @@
 import org.apache.hadoop.fs.FileSystem;
 import org.apache.hadoop.fs.Path;
 
+import com.google.common.base.Suppliers;
+
 import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
 
 /**
@@ -55,14 +58,14 @@ public class StandaloneAccumuloCluster implements AccumuloCluster {
       Collections.unmodifiableList(Arrays.asList(ServerType.MANAGER, ServerType.TABLET_SERVER,
           ServerType.GARBAGE_COLLECTOR, ServerType.MONITOR));
 
-  private ClientInfo info;
+  private final ClientInfo info;
   private String accumuloHome, clientAccumuloConfDir, serverAccumuloConfDir, hadoopConfDir;
-  private Path tmp;
-  private List<ClusterUser> users;
+  private final Path tmp;
+  private final List<ClusterUser> users;
   private String clientCmdPrefix;
   private String serverCmdPrefix;
-  private SiteConfiguration siteConfig;
-  private ServerContext context;
+  private final SiteConfiguration siteConfig;
+  private final Supplier<ServerContext> contextSupplier;
 
   @SuppressFBWarnings(value = "PATH_TRAVERSAL_IN",
       justification = "code runs in same security context as user who provided input file name")
@@ -74,6 +77,7 @@ public StandaloneAccumuloCluster(ClientInfo info, Path tmp, List<ClusterUser> us
     this.serverAccumuloConfDir = serverAccumuloConfDir;
     siteConfig =
         SiteConfiguration.fromFile(new File(serverAccumuloConfDir, "accumulo.properties")).build();
+    this.contextSupplier = Suppliers.memoize(() -> ServerContext.withClientInfo(siteConfig, info));
   }
 
   public String getAccumuloHome() {
@@ -129,12 +133,8 @@ public String getZooKeepers() {
   }
 
   @Override
-  public synchronized ServerContext getServerContext() {
-    if (context == null) {
-      context = ServerContext.override(siteConfig, info.getInstanceName(), info.getZooKeepers(),
-          info.getZooKeepersSessionTimeOut());
-    }
-    return context;
+  public ServerContext getServerContext() {
+    return contextSupplier.get();
   }
 
   @Override
diff --git a/minicluster/src/main/java/org/apache/accumulo/miniclusterImpl/MiniAccumuloClusterControl.java b/minicluster/src/main/java/org/apache/accumulo/miniclusterImpl/MiniAccumuloClusterControl.java
index 7c15d4c5bae..53ffdf1443f 100644
--- a/minicluster/src/main/java/org/apache/accumulo/miniclusterImpl/MiniAccumuloClusterControl.java
+++ b/minicluster/src/main/java/org/apache/accumulo/miniclusterImpl/MiniAccumuloClusterControl.java
@@ -37,6 +37,7 @@
 import org.apache.accumulo.minicluster.ServerType;
 import org.apache.accumulo.miniclusterImpl.MiniAccumuloClusterImpl.ProcessInfo;
 import org.apache.accumulo.server.util.Admin;
+import org.apache.accumulo.server.util.ZooZap;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -270,6 +271,11 @@ public synchronized void stop(ServerType server, String hostname) throws IOExcep
         if (managerProcess != null) {
           try {
             cluster.stopProcessWithTimeout(managerProcess, 30, TimeUnit.SECONDS);
+            try {
+              new ZooZap().zap(cluster.getServerContext().getSiteConfiguration(), "-manager");
+            } catch (RuntimeException e) {
+              log.error("Error zapping Manager zookeeper lock", e);
+            }
           } catch (ExecutionException | TimeoutException e) {
             log.warn("Manager did not fully stop after 30 seconds", e);
           } catch (InterruptedException e) {
diff --git a/minicluster/src/main/java/org/apache/accumulo/miniclusterImpl/MiniAccumuloClusterImpl.java b/minicluster/src/main/java/org/apache/accumulo/miniclusterImpl/MiniAccumuloClusterImpl.java
index e8a55081c31..4eddb61c9e2 100644
--- a/minicluster/src/main/java/org/apache/accumulo/miniclusterImpl/MiniAccumuloClusterImpl.java
+++ b/minicluster/src/main/java/org/apache/accumulo/miniclusterImpl/MiniAccumuloClusterImpl.java
@@ -57,6 +57,7 @@
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.concurrent.atomic.AtomicReference;
 import java.util.function.Function;
+import java.util.function.Predicate;
 import java.util.function.Supplier;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
@@ -80,8 +81,7 @@
 import org.apache.accumulo.core.data.InstanceId;
 import org.apache.accumulo.core.data.TableId;
 import org.apache.accumulo.core.fate.zookeeper.ZooReaderWriter;
-import org.apache.accumulo.core.fate.zookeeper.ZooSession;
-import org.apache.accumulo.core.fate.zookeeper.ZooUtil;
+import org.apache.accumulo.core.fate.zookeeper.ZooUtil.NodeExistsPolicy;
 import org.apache.accumulo.core.lock.ServiceLock;
 import org.apache.accumulo.core.lock.ServiceLock.AccumuloLockWatcher;
 import org.apache.accumulo.core.lock.ServiceLock.LockLossReason;
@@ -100,6 +100,7 @@
 import org.apache.accumulo.core.util.Pair;
 import org.apache.accumulo.core.util.compaction.CompactionPlannerInitParams;
 import org.apache.accumulo.core.util.compaction.CompactionServicesConfig;
+import org.apache.accumulo.core.zookeeper.ZooSession;
 import org.apache.accumulo.manager.state.SetGoalState;
 import org.apache.accumulo.minicluster.MiniAccumuloCluster;
 import org.apache.accumulo.minicluster.ServerType;
@@ -109,6 +110,7 @@
 import org.apache.accumulo.server.init.Initialize;
 import org.apache.accumulo.server.util.AccumuloStatus;
 import org.apache.accumulo.server.util.PortUtils;
+import org.apache.accumulo.server.util.ZooZap;
 import org.apache.accumulo.start.Main;
 import org.apache.accumulo.start.spi.KeywordExecutable;
 import org.apache.accumulo.start.util.MiniDFSUtil;
@@ -119,9 +121,7 @@
 import org.apache.hadoop.fs.Path;
 import org.apache.hadoop.hdfs.DFSConfigKeys;
 import org.apache.hadoop.hdfs.MiniDFSCluster;
-import org.apache.zookeeper.CreateMode;
 import org.apache.zookeeper.KeeperException;
-import org.apache.zookeeper.ZooKeeper;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -154,9 +154,9 @@ public class MiniAccumuloClusterImpl implements AccumuloCluster {
   private final MiniAccumuloClusterControl clusterControl;
 
   private boolean initialized = false;
-  private ExecutorService executor;
+  private volatile ExecutorService executor;
   private ServiceLock miniLock;
-  private ZooKeeper zk;
+  private ZooSession miniLockZk;
   private AccumuloClient client;
 
   /**
@@ -524,7 +524,7 @@ public synchronized void start() throws IOException, InterruptedException {
 
       InstanceId instanceIdFromFile =
           VolumeManager.getInstanceIDFromHdfs(instanceIdPath, hadoopConf);
-      ZooReaderWriter zrw = getServerContext().getZooReaderWriter();
+      ZooReaderWriter zrw = getServerContext().getZooSession().asReaderWriter();
 
       String instanceName = null;
       try {
@@ -682,7 +682,7 @@ public void unableToMonitorLockNode(Exception e) {
 
       @Override
       public void acquiredLock() {
-        log.warn("Acquired ZK lock for MiniAccumuloClusterImpl");
+        log.debug("Acquired ZK lock for MiniAccumuloClusterImpl");
         lockAcquired.set(true);
         lockWatcherInvoked.countDown();
       }
@@ -708,8 +708,8 @@ public void failedToAcquireLock(Exception e) {
     final int timeout = (int) ConfigurationTypeHelper.getTimeInMillis(properties.getOrDefault(
         Property.INSTANCE_ZK_TIMEOUT.getKey(), Property.INSTANCE_ZK_TIMEOUT.getDefaultValue()));
     final String secret = properties.get(Property.INSTANCE_SECRET.getKey());
-    final byte[] auth = ("accumulo:" + secret).getBytes(UTF_8);
-    zk = ZooSession.getAuthenticatedSession(config.getZooKeepers(), timeout, "digest", auth);
+    miniLockZk = new ZooSession(MiniAccumuloClusterImpl.class.getSimpleName() + ".lock",
+        config.getZooKeepers(), timeout, secret);
 
     // It's possible start was called twice...
     if (miniLock == null) {
@@ -722,20 +722,15 @@ public void failedToAcquireLock(Exception e) {
       String miniZDirPath =
           miniZInstancePath.substring(0, miniZInstancePath.indexOf("/" + miniUUID.toString()));
       try {
-        if (zk.exists(miniZDirPath, null) == null) {
-          zk.create(miniZDirPath, new byte[0], ZooUtil.PUBLIC, CreateMode.PERSISTENT);
-          log.info("Created: {}", miniZDirPath);
-        }
-        if (zk.exists(miniZInstancePath, null) == null) {
-          zk.create(miniZInstancePath, new byte[0], ZooUtil.PUBLIC, CreateMode.PERSISTENT);
-          log.info("Created: {}", miniZInstancePath);
-        }
+        var zrw = miniLockZk.asReaderWriter();
+        zrw.putPersistentData(miniZDirPath, new byte[0], NodeExistsPolicy.SKIP);
+        zrw.putPersistentData(miniZInstancePath, new byte[0], NodeExistsPolicy.SKIP);
       } catch (KeeperException | InterruptedException e) {
         throw new IllegalStateException("Error creating path in ZooKeeper", e);
       }
       ServiceLockData sld = new ServiceLockData(miniUUID, "localhost", ThriftService.NONE,
           Constants.DEFAULT_RESOURCE_GROUP_NAME);
-      miniLock = new ServiceLock(zk, slp, miniUUID);
+      miniLock = new ServiceLock(miniLockZk, slp, miniUUID);
       miniLock.lock(miniLockWatcher, sld);
 
       lockWatcherInvoked.await();
@@ -981,9 +976,9 @@ public synchronized void stop() throws IOException, InterruptedException {
       miniLock = null;
       this.getServerContext().clearServiceLock();
     }
-    if (zk != null) {
-      zk.close();
-      zk = null;
+    if (miniLockZk != null) {
+      miniLockZk.close();
+      miniLockZk = null;
     }
     if (client != null) {
       client.close();
@@ -995,10 +990,45 @@ public synchronized void stop() throws IOException, InterruptedException {
     control.stop(ServerType.GARBAGE_COLLECTOR, null);
     control.stop(ServerType.MANAGER, null);
     control.stop(ServerType.TABLET_SERVER, null);
-    control.stop(ServerType.ZOOKEEPER, null);
     control.stop(ServerType.COMPACTOR, null);
     control.stop(ServerType.SCAN_SERVER, null);
 
+    // The method calls above kill the server
+    // Clean up the locks in ZooKeeper fo that if the cluster
+    // is restarted, then the processes will start right away
+    // and not wait for the old locks to be cleaned up.
+    try {
+      new ZooZap().zap(getServerContext().getSiteConfiguration(), "-manager", "-tservers",
+          "-compactors", "-sservers");
+    } catch (RuntimeException e) {
+      log.error("Error zapping zookeeper locks", e);
+    }
+    control.stop(ServerType.ZOOKEEPER, null);
+
+    // Clear the location of the servers in ZooCache.
+    // When ZooKeeper was stopped in the previous method call,
+    // the local ZooKeeper watcher did not fire. If MAC is
+    // restarted, then ZooKeeper will start on the same port with
+    // the same data, but no Watchers will fire.
+    boolean startCalled = true;
+    try {
+      getServerContext().getZooKeeperRoot();
+    } catch (IllegalStateException e) {
+      if (e.getMessage().startsWith("Accumulo not initialized")) {
+        startCalled = false;
+      }
+    }
+    if (startCalled) {
+      final ServerContext ctx = getServerContext();
+      final String zRoot = ctx.getZooKeeperRoot();
+      Predicate<String> pred = path -> false;
+      for (String lockPath : Set.of(Constants.ZMANAGER_LOCK, Constants.ZGC_LOCK,
+          Constants.ZCOMPACTORS, Constants.ZSSERVERS, Constants.ZTSERVERS)) {
+        pred = pred.or(path -> path.startsWith(zRoot + lockPath));
+      }
+      ctx.getZooCache().clear(pred);
+    }
+
     // ACCUMULO-2985 stop the ExecutorService after we finished using it to stop accumulo procs
     if (executor != null) {
       List<Runnable> tasksRemaining = executor.shutdownNow();
diff --git a/minicluster/src/main/java/org/apache/accumulo/miniclusterImpl/MiniAccumuloConfigImpl.java b/minicluster/src/main/java/org/apache/accumulo/miniclusterImpl/MiniAccumuloConfigImpl.java
index 5b81fac4684..b5c6667519f 100644
--- a/minicluster/src/main/java/org/apache/accumulo/miniclusterImpl/MiniAccumuloConfigImpl.java
+++ b/minicluster/src/main/java/org/apache/accumulo/miniclusterImpl/MiniAccumuloConfigImpl.java
@@ -188,8 +188,8 @@ MiniAccumuloConfigImpl initialize() {
 
       mergeProp(Property.COMPACTOR_PORTSEARCH.getKey(), "true");
 
-      mergeProp(Property.MANAGER_COMPACTION_SERVICE_PRIORITY_QUEUE_INITIAL_SIZE.getKey(),
-          Property.MANAGER_COMPACTION_SERVICE_PRIORITY_QUEUE_INITIAL_SIZE.getDefaultValue());
+      mergeProp(Property.MANAGER_COMPACTION_SERVICE_PRIORITY_QUEUE_SIZE.getKey(),
+          Property.MANAGER_COMPACTION_SERVICE_PRIORITY_QUEUE_SIZE.getDefaultValue());
       mergeProp(Property.COMPACTION_SERVICE_DEFAULT_PLANNER.getKey(),
           Property.COMPACTION_SERVICE_DEFAULT_PLANNER.getDefaultValue());
 
diff --git a/server/base/src/main/java/org/apache/accumulo/server/AbstractServer.java b/server/base/src/main/java/org/apache/accumulo/server/AbstractServer.java
index 1dac3b0a601..2eb814ac23e 100644
--- a/server/base/src/main/java/org/apache/accumulo/server/AbstractServer.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/AbstractServer.java
@@ -20,6 +20,7 @@
 
 import static java.util.concurrent.TimeUnit.MILLISECONDS;
 
+import java.util.List;
 import java.util.OptionalInt;
 import java.util.concurrent.ScheduledFuture;
 import java.util.concurrent.atomic.AtomicReference;
@@ -31,6 +32,7 @@
 import org.apache.accumulo.core.conf.AccumuloConfiguration;
 import org.apache.accumulo.core.conf.Property;
 import org.apache.accumulo.core.conf.SiteConfiguration;
+import org.apache.accumulo.core.conf.cluster.ClusterConfigParser;
 import org.apache.accumulo.core.lock.ServiceLock;
 import org.apache.accumulo.core.metrics.MetricsProducer;
 import org.apache.accumulo.core.trace.TraceUtil;
@@ -68,6 +70,7 @@ protected AbstractServer(String appName, ConfigOpts opts,
     var siteConfig = opts.getSiteConfiguration();
     this.hostname = siteConfig.get(Property.GENERAL_PROCESS_BIND_ADDRESS);
     this.resourceGroup = getResourceGroupPropertyValue(siteConfig);
+    ClusterConfigParser.validateGroupNames(List.of(resourceGroup));
     SecurityUtil.serverLogin(siteConfig);
     context = serverContextFactory.apply(siteConfig);
     log = LoggerFactory.getLogger(getClass());
diff --git a/server/base/src/main/java/org/apache/accumulo/server/ServerContext.java b/server/base/src/main/java/org/apache/accumulo/server/ServerContext.java
index fc0dd5f3736..acb6c80c311 100644
--- a/server/base/src/main/java/org/apache/accumulo/server/ServerContext.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/ServerContext.java
@@ -43,6 +43,7 @@
 
 import org.apache.accumulo.core.Constants;
 import org.apache.accumulo.core.clientImpl.ClientContext;
+import org.apache.accumulo.core.clientImpl.ClientInfo;
 import org.apache.accumulo.core.conf.AccumuloConfiguration;
 import org.apache.accumulo.core.conf.DefaultConfiguration;
 import org.apache.accumulo.core.conf.Property;
@@ -51,8 +52,6 @@
 import org.apache.accumulo.core.data.InstanceId;
 import org.apache.accumulo.core.data.NamespaceId;
 import org.apache.accumulo.core.data.TableId;
-import org.apache.accumulo.core.fate.zookeeper.ZooReader;
-import org.apache.accumulo.core.fate.zookeeper.ZooReaderWriter;
 import org.apache.accumulo.core.fate.zookeeper.ZooUtil;
 import org.apache.accumulo.core.lock.ServiceLock;
 import org.apache.accumulo.core.metadata.schema.Ample;
@@ -94,7 +93,6 @@ public class ServerContext extends ClientContext {
   private static final Logger log = LoggerFactory.getLogger(ServerContext.class);
 
   private final ServerInfo info;
-  private final ZooReaderWriter zooReaderWriter;
   private final ServerDirs serverDirs;
   private final Supplier<ZooPropStore> propStore;
   private final Supplier<String> zkUserPath;
@@ -112,16 +110,18 @@ public class ServerContext extends ClientContext {
   private final Supplier<MetricsInfo> metricsInfoSupplier;
 
   public ServerContext(SiteConfiguration siteConfig) {
-    this(new ServerInfo(siteConfig));
+    this(ServerInfo.fromServerConfig(siteConfig));
   }
 
   private ServerContext(ServerInfo info) {
     super(SingletonReservation.noop(), info, info.getSiteConfiguration(), Threads.UEH);
     this.info = info;
-    zooReaderWriter = new ZooReaderWriter(info.getSiteConfiguration());
     serverDirs = info.getServerDirs();
 
-    propStore = memoize(() -> ZooPropStore.initialize(getInstanceID(), getZooReaderWriter()));
+    // the PropStore shouldn't close the ZooKeeper, since ServerContext is responsible for that
+    @SuppressWarnings("resource")
+    var tmpPropStore = memoize(() -> ZooPropStore.initialize(getInstanceID(), getZooSession()));
+    propStore = tmpPropStore;
     zkUserPath = memoize(() -> ZooUtil.getRoot(getInstanceID()) + Constants.ZUSERS);
 
     tableManager = memoize(() -> new TableManager(this));
@@ -144,21 +144,24 @@ private ServerContext(ServerInfo info) {
    */
   public static ServerContext initialize(SiteConfiguration siteConfig, String instanceName,
       InstanceId instanceID) {
-    return new ServerContext(new ServerInfo(siteConfig, instanceName, instanceID));
+    return new ServerContext(ServerInfo.initialize(siteConfig, instanceName, instanceID));
+  }
+
+  /**
+   * Used by server-side utilities that have a client configuration. The instance name is obtained
+   * from the client configuration, and the instanceId is looked up in ZooKeeper from the name.
+   */
+  public static ServerContext withClientInfo(SiteConfiguration siteConfig, ClientInfo info) {
+    return new ServerContext(ServerInfo.fromServerAndClientConfig(siteConfig, info));
   }
 
   /**
    * Override properties for testing
    */
-  public static ServerContext override(SiteConfiguration siteConfig, String instanceName,
+  public static ServerContext forTesting(SiteConfiguration siteConfig, String instanceName,
       String zooKeepers, int zkSessionTimeOut) {
     return new ServerContext(
-        new ServerInfo(siteConfig, instanceName, zooKeepers, zkSessionTimeOut));
-  }
-
-  @Override
-  public InstanceId getInstanceID() {
-    return info.getInstanceID();
+        ServerInfo.forTesting(siteConfig, instanceName, zooKeepers, zkSessionTimeOut));
   }
 
   public SiteConfiguration getSiteConfiguration() {
@@ -214,15 +217,6 @@ public VolumeManager getVolumeManager() {
     return info.getVolumeManager();
   }
 
-  @Override
-  public ZooReader getZooReader() {
-    return getZooReaderWriter();
-  }
-
-  public ZooReaderWriter getZooReaderWriter() {
-    return zooReaderWriter;
-  }
-
   /**
    * Retrieve the SSL/TLS configuration for starting up a listening service
    */
@@ -320,7 +314,7 @@ public void waitForZookeeperAndHdfs() {
     log.info("Attempting to talk to zookeeper");
     while (true) {
       try {
-        getZooReaderWriter().getChildren(Constants.ZROOT);
+        getZooSession().asReaderWriter().getChildren(Constants.ZROOT);
         break;
       } catch (InterruptedException | KeeperException ex) {
         log.info("Waiting for accumulo to be initialized");
diff --git a/server/base/src/main/java/org/apache/accumulo/server/ServerInfo.java b/server/base/src/main/java/org/apache/accumulo/server/ServerInfo.java
index aa7d2149dde..2f8241d3df1 100644
--- a/server/base/src/main/java/org/apache/accumulo/server/ServerInfo.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/ServerInfo.java
@@ -18,115 +18,135 @@
  */
 package org.apache.accumulo.server;
 
-import static java.nio.charset.StandardCharsets.UTF_8;
+import static com.google.common.base.Suppliers.memoize;
+import static java.util.Objects.requireNonNull;
 
 import java.io.IOException;
 import java.io.UncheckedIOException;
 import java.util.Properties;
+import java.util.function.Function;
+import java.util.function.Supplier;
+import java.util.function.ToIntFunction;
 
-import org.apache.accumulo.core.Constants;
 import org.apache.accumulo.core.client.security.tokens.AuthenticationToken;
 import org.apache.accumulo.core.clientImpl.ClientConfConverter;
 import org.apache.accumulo.core.clientImpl.ClientInfo;
 import org.apache.accumulo.core.clientImpl.Credentials;
-import org.apache.accumulo.core.clientImpl.InstanceOperationsImpl;
 import org.apache.accumulo.core.conf.ClientProperty;
 import org.apache.accumulo.core.conf.Property;
 import org.apache.accumulo.core.conf.SiteConfiguration;
 import org.apache.accumulo.core.data.InstanceId;
-import org.apache.accumulo.core.fate.zookeeper.ZooCache;
-import org.apache.accumulo.core.fate.zookeeper.ZooCacheFactory;
 import org.apache.accumulo.core.fate.zookeeper.ZooUtil;
 import org.apache.accumulo.core.singletons.SingletonManager;
 import org.apache.accumulo.core.singletons.SingletonManager.Mode;
+import org.apache.accumulo.core.zookeeper.ZooSession;
 import org.apache.accumulo.server.fs.VolumeManager;
 import org.apache.accumulo.server.fs.VolumeManagerImpl;
 import org.apache.accumulo.server.security.SystemCredentials;
 import org.apache.hadoop.conf.Configuration;
-import org.apache.hadoop.fs.Path;
 
 public class ServerInfo implements ClientInfo {
 
-  private final SiteConfiguration siteConfig;
-  private final Configuration hadoopConf;
-  private final InstanceId instanceID;
-  private final String instanceName;
-  private final String zooKeepers;
-  private final int zooKeepersSessionTimeOut;
-  private final VolumeManager volumeManager;
-  private final ZooCache zooCache;
-  private final ServerDirs serverDirs;
-  private final Credentials credentials;
-
-  ServerInfo(SiteConfiguration siteConfig, String instanceName, String zooKeepers,
-      int zooKeepersSessionTimeOut) {
-    SingletonManager.setMode(Mode.SERVER);
-    this.siteConfig = siteConfig;
-    this.hadoopConf = new Configuration();
-    this.instanceName = instanceName;
-    this.zooKeepers = zooKeepers;
-    this.zooKeepersSessionTimeOut = zooKeepersSessionTimeOut;
-    try {
-      volumeManager = VolumeManagerImpl.get(siteConfig, hadoopConf);
-    } catch (IOException e) {
-      throw new UncheckedIOException(e);
-    }
-    zooCache = new ZooCacheFactory().getZooCache(zooKeepers, zooKeepersSessionTimeOut);
-    String instanceNamePath = Constants.ZROOT + Constants.ZINSTANCES + "/" + instanceName;
-    byte[] iidb = zooCache.get(instanceNamePath);
-    if (iidb == null) {
-      throw new IllegalStateException(
-          "Instance name " + instanceName + " does not exist in zookeeper. "
-              + "Run \"accumulo org.apache.accumulo.server.util.ListInstances\" to see a list.");
-    }
-    instanceID = InstanceId.of(new String(iidb, UTF_8));
-    if (zooCache.get(ZooUtil.getRoot(instanceID)) == null) {
-      if (instanceName == null) {
-        throw new IllegalStateException(
-            "Instance id " + instanceID + " does not exist in zookeeper");
+  private static final Function<ServerInfo,String> GET_ZK_HOSTS_FROM_CONFIG =
+      si -> si.getSiteConfiguration().get(Property.INSTANCE_ZK_HOST);
+
+  private static final ToIntFunction<ServerInfo> GET_ZK_TIMEOUT_FROM_CONFIG =
+      si -> (int) si.getSiteConfiguration().getTimeInMillis(Property.INSTANCE_ZK_TIMEOUT);
+
+  // set things up using the config file, the instanceId from HDFS, and ZK for the instanceName
+  static ServerInfo fromServerConfig(SiteConfiguration siteConfig) {
+    final Function<ServerInfo,String> instanceNameFromZk = si -> {
+      try (var zk =
+          si.getZooKeeperSupplier(ServerInfo.class.getSimpleName() + ".getInstanceId()").get()) {
+        return ZooUtil.getInstanceName(zk, si.getInstanceId());
       }
-      throw new IllegalStateException("Instance id " + instanceID + " pointed to by the name "
-          + instanceName + " does not exist in zookeeper");
-    }
-    serverDirs = new ServerDirs(siteConfig, hadoopConf);
-    credentials = SystemCredentials.get(instanceID, siteConfig);
+    };
+    final Function<ServerInfo,
+        InstanceId> instanceIdFromHdfs = si -> VolumeManager.getInstanceIDFromHdfs(
+            si.getServerDirs().getInstanceIdLocation(si.getVolumeManager().getFirst()),
+            si.getHadoopConf());
+    return new ServerInfo(siteConfig, GET_ZK_HOSTS_FROM_CONFIG, GET_ZK_TIMEOUT_FROM_CONFIG,
+        instanceNameFromZk, instanceIdFromHdfs);
+  }
+
+  // set things up using a provided instanceName and InstanceId to initialize the system, but still
+  // have a ServerContext that is functional without bootstrapping issues, so long as you don't call
+  // functions from it that require an instance to have already been initialized
+  static ServerInfo initialize(SiteConfiguration siteConfig, String instanceName,
+      InstanceId instanceId) {
+    requireNonNull(instanceName);
+    requireNonNull(instanceId);
+    return new ServerInfo(siteConfig, GET_ZK_HOSTS_FROM_CONFIG, GET_ZK_TIMEOUT_FROM_CONFIG,
+        si -> instanceName, si -> instanceId);
+  }
+
+  // set things up using the config file, and the client config for a server-side CLI utility
+  static ServerInfo fromServerAndClientConfig(SiteConfiguration siteConfig, ClientInfo info) {
+    // ClientInfo.getInstanceId looks up the ID in ZK using the provided instance name
+    return new ServerInfo(siteConfig, si -> info.getZooKeepers(),
+        si -> info.getZooKeepersSessionTimeOut(), si -> info.getInstanceName(),
+        si -> info.getInstanceId());
+  }
+
+  static ServerInfo forTesting(SiteConfiguration siteConfig, String instanceName, String zooKeepers,
+      int zooKeepersSessionTimeOut) {
+    var props = new Properties();
+    props.put(ClientProperty.INSTANCE_NAME, requireNonNull(instanceName));
+    props.put(ClientProperty.INSTANCE_ZOOKEEPERS, requireNonNull(zooKeepers));
+    props.put(ClientProperty.INSTANCE_ZOOKEEPERS_TIMEOUT, zooKeepersSessionTimeOut);
+    return fromServerAndClientConfig(siteConfig, ClientInfo.from(props));
   }
 
-  ServerInfo(SiteConfiguration config) {
-    SingletonManager.setMode(Mode.SERVER);
-    siteConfig = config;
-    hadoopConf = new Configuration();
-    try {
-      volumeManager = VolumeManagerImpl.get(siteConfig, hadoopConf);
-    } catch (IOException e) {
-      throw new UncheckedIOException(e);
-    }
-    serverDirs = new ServerDirs(siteConfig, hadoopConf);
-    Path instanceIdPath = serverDirs.getInstanceIdLocation(volumeManager.getFirst());
-    instanceID = VolumeManager.getInstanceIDFromHdfs(instanceIdPath, hadoopConf);
-    zooKeepers = config.get(Property.INSTANCE_ZK_HOST);
-    zooKeepersSessionTimeOut = (int) config.getTimeInMillis(Property.INSTANCE_ZK_TIMEOUT);
-    zooCache = new ZooCacheFactory().getZooCache(zooKeepers, zooKeepersSessionTimeOut);
-    instanceName = InstanceOperationsImpl.lookupInstanceName(zooCache, instanceID);
-    credentials = SystemCredentials.get(instanceID, siteConfig);
-  }
-
-  ServerInfo(SiteConfiguration config, String instanceName, InstanceId instanceID) {
+  // required parameter
+  private final SiteConfiguration siteConfig;
+
+  // suppliers for lazily loading
+  private final Supplier<Configuration> hadoopConf;
+  private final Supplier<VolumeManager> volumeManager;
+  private final Supplier<ServerDirs> serverDirs;
+  private final Supplier<String> zooKeepers;
+  private final Supplier<Integer> zooKeepersSessionTimeOut; // can't memoize IntSupplier
+  private final Supplier<InstanceId> instanceId;
+  private final Supplier<String> instanceName;
+  private final Supplier<Credentials> credentials;
+  private final Function<String,ZooSession> zooSessionForName;
+
+  // set up everything to be lazily loaded with memoized suppliers, so if nothing is used, the cost
+  // is low; to support different scenarios, plug in the functionality to retrieve certain items
+  // from ZooKeeper, HDFS, or from the input, using functions that take "this" and emit the desired
+  // object to be memoized on demand; these functions should not have cyclic dependencies on one
+  // another, but because things are lazily loaded, it is okay if one depends on another in one
+  // direction only
+  private ServerInfo(SiteConfiguration siteConfig, Function<ServerInfo,String> zkHostsFunction,
+      ToIntFunction<ServerInfo> zkTimeoutFunction, Function<ServerInfo,String> instanceNameFunction,
+      Function<ServerInfo,InstanceId> instanceIdFunction) {
     SingletonManager.setMode(Mode.SERVER);
-    siteConfig = config;
-    hadoopConf = new Configuration();
-    try {
-      volumeManager = VolumeManagerImpl.get(siteConfig, hadoopConf);
-    } catch (IOException e) {
-      throw new UncheckedIOException(e);
-    }
-    this.instanceID = instanceID;
-    zooKeepers = config.get(Property.INSTANCE_ZK_HOST);
-    zooKeepersSessionTimeOut = (int) config.getTimeInMillis(Property.INSTANCE_ZK_TIMEOUT);
-    zooCache = new ZooCacheFactory().getZooCache(zooKeepers, zooKeepersSessionTimeOut);
-    this.instanceName = instanceName;
-    serverDirs = new ServerDirs(siteConfig, hadoopConf);
-    credentials = SystemCredentials.get(instanceID, siteConfig);
+    this.siteConfig = requireNonNull(siteConfig);
+    requireNonNull(zkHostsFunction);
+    requireNonNull(zkTimeoutFunction);
+    requireNonNull(instanceNameFunction);
+    requireNonNull(instanceIdFunction);
+
+    this.hadoopConf = memoize(Configuration::new);
+    this.volumeManager = memoize(() -> {
+      try {
+        return VolumeManagerImpl.get(getSiteConfiguration(), getHadoopConf());
+      } catch (IOException e) {
+        throw new UncheckedIOException(e);
+      }
+    });
+    this.serverDirs = memoize(() -> new ServerDirs(getSiteConfiguration(), getHadoopConf()));
+    this.credentials =
+        memoize(() -> SystemCredentials.get(getInstanceId(), getSiteConfiguration()));
+
+    this.zooSessionForName = name -> new ZooSession(name, getZooKeepers(),
+        getZooKeepersSessionTimeOut(), getSiteConfiguration().get(Property.INSTANCE_SECRET));
+
+    // from here on, set up the suppliers based on what was passed in, to support different cases
+    this.zooKeepers = memoize(() -> zkHostsFunction.apply(this));
+    this.zooKeepersSessionTimeOut = memoize(() -> zkTimeoutFunction.applyAsInt(this));
+    this.instanceId = memoize(() -> instanceIdFunction.apply(this));
+    this.instanceName = memoize(() -> instanceNameFunction.apply(this));
   }
 
   public SiteConfiguration getSiteConfiguration() {
@@ -134,21 +154,27 @@ public SiteConfiguration getSiteConfiguration() {
   }
 
   public VolumeManager getVolumeManager() {
-    return volumeManager;
+    return volumeManager.get();
+  }
+
+  @Override
+  public InstanceId getInstanceId() {
+    return instanceId.get();
   }
 
-  public InstanceId getInstanceID() {
-    return instanceID;
+  @Override
+  public Supplier<ZooSession> getZooKeeperSupplier(String clientName) {
+    return () -> zooSessionForName.apply(clientName);
   }
 
   @Override
   public String getZooKeepers() {
-    return zooKeepers;
+    return zooKeepers.get();
   }
 
   @Override
   public int getZooKeepersSessionTimeOut() {
-    return zooKeepersSessionTimeOut;
+    return zooKeepersSessionTimeOut.get();
   }
 
   @Override
@@ -180,19 +206,20 @@ public Properties getProperties() {
 
   @Override
   public String getInstanceName() {
-    return instanceName;
+    return instanceName.get();
   }
 
   public Credentials getCredentials() {
-    return credentials;
+    return credentials.get();
   }
 
   @Override
   public Configuration getHadoopConf() {
-    return this.hadoopConf;
+    return hadoopConf.get();
   }
 
   public ServerDirs getServerDirs() {
-    return serverDirs;
+    return serverDirs.get();
   }
+
 }
diff --git a/server/base/src/main/java/org/apache/accumulo/server/cli/ServerUtilOpts.java b/server/base/src/main/java/org/apache/accumulo/server/cli/ServerUtilOpts.java
index 4eb7b4b184d..c83da8226b1 100644
--- a/server/base/src/main/java/org/apache/accumulo/server/cli/ServerUtilOpts.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/cli/ServerUtilOpts.java
@@ -29,13 +29,9 @@ public class ServerUtilOpts extends ClientOpts {
 
   public synchronized ServerContext getServerContext() {
     if (context == null) {
-      if (getClientConfigFile() == null) {
-        context = new ServerContext(SiteConfiguration.auto());
-      } else {
-        ClientInfo info = ClientInfo.from(getClientProps());
-        context = ServerContext.override(SiteConfiguration.auto(), info.getInstanceName(),
-            info.getZooKeepers(), info.getZooKeepersSessionTimeOut());
-      }
+      context = getClientConfigFile() == null ? new ServerContext(SiteConfiguration.auto())
+          : ServerContext.withClientInfo(SiteConfiguration.auto(),
+              ClientInfo.from(getClientProps()));
     }
     return context;
   }
diff --git a/server/base/src/main/java/org/apache/accumulo/server/compaction/CompactionConfigStorage.java b/server/base/src/main/java/org/apache/accumulo/server/compaction/CompactionConfigStorage.java
index 0b0bedb645c..970a4f1c9bf 100644
--- a/server/base/src/main/java/org/apache/accumulo/server/compaction/CompactionConfigStorage.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/compaction/CompactionConfigStorage.java
@@ -69,7 +69,7 @@ public static CompactionConfig getConfig(ServerContext context, FateId fateId)
   public static CompactionConfig getConfig(ServerContext context, FateId fateId,
       Predicate<TableId> tableIdPredicate) throws InterruptedException, KeeperException {
     try {
-      byte[] data = context.getZooReaderWriter().getData(createPath(context, fateId));
+      byte[] data = context.getZooSession().asReader().getData(createPath(context, fateId));
       try (ByteArrayInputStream bais = new ByteArrayInputStream(data);
           DataInputStream dis = new DataInputStream(bais)) {
         var tableId = TableId.of(dis.readUTF());
@@ -89,13 +89,13 @@ public static CompactionConfig getConfig(ServerContext context, FateId fateId,
 
   public static void setConfig(ServerContext context, FateId fateId, byte[] encConfig)
       throws InterruptedException, KeeperException {
-    context.getZooReaderWriter().putPrivatePersistentData(createPath(context, fateId), encConfig,
-        ZooUtil.NodeExistsPolicy.SKIP);
+    context.getZooSession().asReaderWriter().putPrivatePersistentData(createPath(context, fateId),
+        encConfig, ZooUtil.NodeExistsPolicy.SKIP);
   }
 
   public static void deleteConfig(ServerContext context, FateId fateId)
       throws InterruptedException, KeeperException {
-    context.getZooReaderWriter().delete(createPath(context, fateId));
+    context.getZooSession().asReaderWriter().delete(createPath(context, fateId));
   }
 
   public static Map<FateId,CompactionConfig> getAllConfig(ServerContext context,
@@ -103,7 +103,7 @@ public static Map<FateId,CompactionConfig> getAllConfig(ServerContext context,
 
     Map<FateId,CompactionConfig> configs = new HashMap<>();
 
-    var children = context.getZooReaderWriter()
+    var children = context.getZooSession().asReader()
         .getChildren(context.getZooKeeperRoot() + Constants.ZCOMPACTIONS);
     for (var child : children) {
       String[] fields = child.split(DELIMITER);
diff --git a/server/base/src/main/java/org/apache/accumulo/server/conf/store/impl/ZooPropLoader.java b/server/base/src/main/java/org/apache/accumulo/server/conf/store/impl/ZooPropLoader.java
index c5842e5b663..2ae183122bf 100644
--- a/server/base/src/main/java/org/apache/accumulo/server/conf/store/impl/ZooPropLoader.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/conf/store/impl/ZooPropLoader.java
@@ -24,6 +24,7 @@
 import java.util.concurrent.Executor;
 
 import org.apache.accumulo.core.fate.zookeeper.ZooReaderWriter;
+import org.apache.accumulo.core.zookeeper.ZooSession;
 import org.apache.accumulo.server.conf.codec.VersionedPropCodec;
 import org.apache.accumulo.server.conf.codec.VersionedProperties;
 import org.apache.accumulo.server.conf.store.PropStoreKey;
@@ -44,9 +45,9 @@ public class ZooPropLoader implements CacheLoader<PropStoreKey<?>,VersionedPrope
   // used to set watcher, does not react to events.
   private final PropStoreWatcher propStoreWatcher;
 
-  public ZooPropLoader(final ZooReaderWriter zrw, final VersionedPropCodec propCodec,
+  public ZooPropLoader(final ZooSession zk, final VersionedPropCodec propCodec,
       final PropStoreWatcher propStoreWatcher) {
-    this.zrw = zrw;
+    this.zrw = zk.asReaderWriter();
     this.propCodec = propCodec;
     this.propStoreWatcher = propStoreWatcher;
   }
diff --git a/server/base/src/main/java/org/apache/accumulo/server/conf/store/impl/ZooPropStore.java b/server/base/src/main/java/org/apache/accumulo/server/conf/store/impl/ZooPropStore.java
index 9f733e8495a..6369eda0afb 100644
--- a/server/base/src/main/java/org/apache/accumulo/server/conf/store/impl/ZooPropStore.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/conf/store/impl/ZooPropStore.java
@@ -31,6 +31,7 @@
 import org.apache.accumulo.core.fate.zookeeper.ZooReader;
 import org.apache.accumulo.core.fate.zookeeper.ZooReaderWriter;
 import org.apache.accumulo.core.fate.zookeeper.ZooUtil;
+import org.apache.accumulo.core.zookeeper.ZooSession;
 import org.apache.accumulo.server.conf.codec.VersionedPropCodec;
 import org.apache.accumulo.server.conf.codec.VersionedProperties;
 import org.apache.accumulo.server.conf.store.PropCache;
@@ -56,38 +57,28 @@ public class ZooPropStore implements PropStore, PropChangeListener {
   private final PropCacheCaffeineImpl cache;
   private final ReadyMonitor zkReadyMon;
 
-  /**
-   * Create instance using ZooPropStore.Builder
-   *
-   * @param instanceId the instance id
-   * @param zrw a wrapper set of utilities for accessing ZooKeeper.
-   */
-  private ZooPropStore(final InstanceId instanceId, final ZooReaderWriter zrw) {
-    this(instanceId, zrw, null, null, null);
-  }
-
   /**
    * For testing create an instance with the optionally pass synthetic clock (Ticker), a
    * ReadyMonitor and a PropStore watcher allowing them to be mocked. If the optional components are
    * passed as null an internal instance is created.
    *
    * @param instanceId the instance id
-   * @param zrw a wrapper set of utilities for accessing ZooKeeper.
+   * @param zk a ZooKeeper client
    * @param monitor a ready monitor. Optional, if null, one is created.
    * @param watcher a watcher. Optional, if null, one is created.
    * @param ticker a synthetic clock used for testing. Optional, if null, one is created.
    */
-  ZooPropStore(final InstanceId instanceId, final ZooReaderWriter zrw, final ReadyMonitor monitor,
+  ZooPropStore(final InstanceId instanceId, final ZooSession zk, final ReadyMonitor monitor,
       final PropStoreWatcher watcher, final Ticker ticker) {
 
-    this.zrw = zrw;
+    this.zrw = zk.asReaderWriter();
 
     this.zkReadyMon = requireNonNullElseGet(monitor,
-        () -> new ReadyMonitor("prop-store", Math.round(zrw.getSessionTimeout() * 1.75)));
+        () -> new ReadyMonitor("prop-store", Math.round(zk.getSessionTimeout() * 1.75)));
 
     this.propStoreWatcher = requireNonNullElseGet(watcher, () -> new PropStoreWatcher(zkReadyMon));
 
-    ZooPropLoader propLoader = new ZooPropLoader(zrw, codec, this.propStoreWatcher);
+    ZooPropLoader propLoader = new ZooPropLoader(zk, codec, this.propStoreWatcher);
 
     if (ticker == null) {
       this.cache = new PropCacheCaffeineImpl.Builder(propLoader).build();
@@ -115,8 +106,8 @@ private ZooPropStore(final InstanceId instanceId, final ZooReaderWriter zrw) {
   }
 
   public static ZooPropStore initialize(@NonNull final InstanceId instanceId,
-      @NonNull final ZooReaderWriter zrw) {
-    return new ZooPropStore(instanceId, zrw);
+      @NonNull final ZooSession zk) {
+    return new ZooPropStore(instanceId, zk, null, null, null);
   }
 
   @Override
diff --git a/server/base/src/main/java/org/apache/accumulo/server/conf/util/ZooInfoViewer.java b/server/base/src/main/java/org/apache/accumulo/server/conf/util/ZooInfoViewer.java
index 535a0899f6b..bd8bd9e0d5f 100644
--- a/server/base/src/main/java/org/apache/accumulo/server/conf/util/ZooInfoViewer.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/conf/util/ZooInfoViewer.java
@@ -21,7 +21,6 @@
 import static java.nio.charset.StandardCharsets.UTF_8;
 import static org.apache.accumulo.core.Constants.ZINSTANCES;
 import static org.apache.accumulo.core.Constants.ZROOT;
-import static org.apache.accumulo.server.conf.util.ZooPropUtils.readInstancesFromZk;
 import static org.apache.accumulo.server.zookeeper.ZooAclUtil.checkWritableAuth;
 import static org.apache.accumulo.server.zookeeper.ZooAclUtil.extractAuthName;
 import static org.apache.accumulo.server.zookeeper.ZooAclUtil.translateZooPerm;
@@ -50,8 +49,9 @@
 import org.apache.accumulo.core.data.NamespaceId;
 import org.apache.accumulo.core.data.TableId;
 import org.apache.accumulo.core.fate.zookeeper.ZooReader;
-import org.apache.accumulo.core.fate.zookeeper.ZooReaderWriter;
 import org.apache.accumulo.core.fate.zookeeper.ZooUtil;
+import org.apache.accumulo.core.zookeeper.ZooSession;
+import org.apache.accumulo.core.zookeeper.ZooSession.ZKUtil;
 import org.apache.accumulo.server.ServerContext;
 import org.apache.accumulo.server.conf.codec.VersionedProperties;
 import org.apache.accumulo.server.conf.store.NamespacePropKey;
@@ -63,8 +63,6 @@
 import org.apache.accumulo.server.zookeeper.ZooAclUtil;
 import org.apache.accumulo.start.spi.KeywordExecutable;
 import org.apache.zookeeper.KeeperException;
-import org.apache.zookeeper.ZKUtil;
-import org.apache.zookeeper.ZooKeeper;
 import org.apache.zookeeper.data.ACL;
 import org.apache.zookeeper.data.Stat;
 import org.slf4j.Logger;
@@ -83,8 +81,7 @@ public class ZooInfoViewer implements KeywordExecutable {
       DateTimeFormatter.ISO_OFFSET_DATE_TIME.withZone(ZoneId.from(ZoneOffset.UTC));
   private static final Logger log = LoggerFactory.getLogger(ZooInfoViewer.class);
 
-  private final NullWatcher nullWatcher =
-      new NullWatcher(new ReadyMonitor(ZooInfoViewer.class.getSimpleName(), 20_000L));
+  private NullWatcher nullWatcher;
 
   private static final String INDENT = "  ";
 
@@ -105,6 +102,7 @@ public String description() {
 
   @Override
   public void execute(String[] args) throws Exception {
+    nullWatcher = new NullWatcher(new ReadyMonitor(ZooInfoViewer.class.getSimpleName(), 20_000L));
 
     ZooInfoViewer.Opts opts = new ZooInfoViewer.Opts();
     opts.parseArgs(ZooInfoViewer.class.getName(), args);
@@ -113,13 +111,15 @@ public void execute(String[] args) throws Exception {
     log.info("print properties: {}", opts.printProps);
     log.info("print instances: {}", opts.printInstanceIds);
 
-    var conf = opts.getSiteConfiguration();
-
-    try (ServerContext context = new ServerContext(conf)) {
+    try (ServerContext context = getContext(opts)) {
       generateReport(context, opts);
     }
   }
 
+  ServerContext getContext(ZooInfoViewer.Opts opts) {
+    return new ServerContext(opts.getSiteConfiguration());
+  }
+
   void generateReport(final ServerContext context, final ZooInfoViewer.Opts opts) throws Exception {
 
     OutputStream outStream;
@@ -139,7 +139,7 @@ void generateReport(final ServerContext context, final ZooInfoViewer.Opts opts)
       writer.println("Report Time: " + tsFormat.format(Instant.now()));
       writer.println("-----------------------------------------------");
       if (opts.printInstanceIds) {
-        Map<String,InstanceId> instanceMap = readInstancesFromZk(context.getZooReader());
+        Map<String,InstanceId> instanceMap = ZooUtil.getInstanceMap(context.getZooSession());
         printInstanceIds(instanceMap, writer);
       }
 
@@ -161,7 +161,7 @@ void generateReport(final ServerContext context, final ZooInfoViewer.Opts opts)
   private void printProps(final ServerContext context, final Opts opts, final PrintWriter writer)
       throws Exception {
     var iid = context.getInstanceID();
-    var zooReader = context.getZooReader();
+    var zooReader = context.getZooSession().asReader();
 
     if (opts.printAllProps()) {
       log.info("all: {}", opts.printAllProps());
@@ -228,55 +228,57 @@ private void printAcls(final ServerContext context, final Opts opts, final Print
 
     writer.printf("ZooKeeper acls for instance ID: %s\n\n", iid.canonical());
 
-    ZooKeeper zooKeeper = new ZooReaderWriter(opts.getSiteConfiguration()).getZooKeeper();
-
-    String instanceRoot = ZooUtil.getRoot(iid);
+    var conf = opts.getSiteConfiguration();
+    try (var zk = new ZooSession(getClass().getSimpleName(), conf)) {
 
-    final Stat stat = new Stat();
+      String instanceRoot = ZooUtil.getRoot(iid);
 
-    recursiveAclRead(zooKeeper, ZROOT + ZINSTANCES, stat, aclMap);
+      final Stat stat = new Stat();
 
-    recursiveAclRead(zooKeeper, instanceRoot, stat, aclMap);
+      recursiveAclRead(zk, ZROOT + ZINSTANCES, stat, aclMap);
 
-    // print formatting
-    aclMap.forEach((path, acl) -> {
-      if (acl == null) {
-        writer.printf("ERROR_ACCUMULO_MISSING_SOME: '%s' : none\n", path);
-      } else {
-        // sort for consistent presentation
-        acl.sort(Comparator.comparing(a -> a.getId().getId()));
-        ZooAclUtil.ZkAccumuloAclStatus aclStatus = checkWritableAuth(acl);
+      recursiveAclRead(zk, instanceRoot, stat, aclMap);
 
-        String authStatus;
-        if (aclStatus.accumuloHasFull()) {
-          authStatus = "ACCUMULO_OKAY";
+      // print formatting
+      aclMap.forEach((path, acl) -> {
+        if (acl == null) {
+          writer.printf("ERROR_ACCUMULO_MISSING_SOME: '%s' : none\n", path);
         } else {
-          authStatus = "ERROR_ACCUMULO_MISSING_SOME";
-        }
+          // sort for consistent presentation
+          acl.sort(Comparator.comparing(a -> a.getId().getId()));
+          ZooAclUtil.ZkAccumuloAclStatus aclStatus = checkWritableAuth(acl);
+
+          String authStatus;
+          if (aclStatus.accumuloHasFull()) {
+            authStatus = "ACCUMULO_OKAY";
+          } else {
+            authStatus = "ERROR_ACCUMULO_MISSING_SOME";
+          }
 
-        String otherUpdate;
-        if (aclStatus.othersMayUpdate() || aclStatus.anyCanRead()) {
-          otherUpdate = "NOT_PRIVATE";
-        } else {
-          otherUpdate = "PRIVATE";
-        }
+          String otherUpdate;
+          if (aclStatus.othersMayUpdate() || aclStatus.anyCanRead()) {
+            otherUpdate = "NOT_PRIVATE";
+          } else {
+            otherUpdate = "PRIVATE";
+          }
 
-        writer.printf("%s:%s %s", authStatus, otherUpdate, path);
-        boolean addSeparator = false;
-        for (ACL a : acl) {
-          if (addSeparator) {
-            writer.printf(",");
+          writer.printf("%s:%s %s", authStatus, otherUpdate, path);
+          boolean addSeparator = false;
+          for (ACL a : acl) {
+            if (addSeparator) {
+              writer.printf(",");
+            }
+            writer.printf(" %s:%s", translateZooPerm(a.getPerms()), extractAuthName(a));
+            addSeparator = true;
           }
-          writer.printf(" %s:%s", translateZooPerm(a.getPerms()), extractAuthName(a));
-          addSeparator = true;
         }
-      }
-      writer.println("");
-    });
-    writer.flush();
+        writer.println("");
+      });
+      writer.flush();
+    }
   }
 
-  private void recursiveAclRead(final ZooKeeper zooKeeper, final String rootPath, final Stat stat,
+  private void recursiveAclRead(final ZooSession zooKeeper, final String rootPath, final Stat stat,
       final Map<String,List<ACL>> aclMap) {
     try {
       ZKUtil.visitSubTreeDFS(zooKeeper, rootPath, false, (rc, path, ctx, name) -> {
@@ -345,7 +347,7 @@ private Map<String,VersionedProperties> fetchNamespaceProps(InstanceId iid, ZooR
   private Map<String,VersionedProperties> fetchTableProps(final ServerContext context,
       final List<String> tables) {
     var iid = context.getInstanceID();
-    var zooReader = context.getZooReader();
+    var zooReader = context.getZooSession().asReader();
 
     Set<String> cmdOptTables = new TreeSet<>(tables);
 
diff --git a/server/base/src/main/java/org/apache/accumulo/server/conf/util/ZooPropEditor.java b/server/base/src/main/java/org/apache/accumulo/server/conf/util/ZooPropEditor.java
index 8d394cb0d67..e96a90370b2 100644
--- a/server/base/src/main/java/org/apache/accumulo/server/conf/util/ZooPropEditor.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/conf/util/ZooPropEditor.java
@@ -35,7 +35,7 @@
 import org.apache.accumulo.core.data.NamespaceId;
 import org.apache.accumulo.core.data.TableId;
 import org.apache.accumulo.core.fate.zookeeper.ZooReader;
-import org.apache.accumulo.core.fate.zookeeper.ZooReaderWriter;
+import org.apache.accumulo.core.zookeeper.ZooSession;
 import org.apache.accumulo.server.ServerContext;
 import org.apache.accumulo.server.conf.codec.VersionedProperties;
 import org.apache.accumulo.server.conf.store.NamespacePropKey;
@@ -58,8 +58,7 @@
 public class ZooPropEditor implements KeywordExecutable {
 
   private static final Logger LOG = LoggerFactory.getLogger(ZooPropEditor.class);
-  private final NullWatcher nullWatcher =
-      new NullWatcher(new ReadyMonitor(ZooInfoViewer.class.getSimpleName(), 20_000L));
+  private NullWatcher nullWatcher;
 
   /**
    * No-op constructor - provided so ServiceLoader autoload does not consume resources.
@@ -79,13 +78,16 @@ public String description() {
 
   @Override
   public void execute(String[] args) throws Exception {
+    nullWatcher = new NullWatcher(new ReadyMonitor(ZooInfoViewer.class.getSimpleName(), 20_000L));
+
     ZooPropEditor.Opts opts = new ZooPropEditor.Opts();
     opts.parseArgs(ZooPropEditor.class.getName(), args);
 
-    ZooReaderWriter zrw = new ZooReaderWriter(opts.getSiteConfiguration());
-
     var siteConfig = opts.getSiteConfiguration();
-    try (ServerContext context = new ServerContext(siteConfig)) {
+    try (var zk = new ZooSession(getClass().getSimpleName(), siteConfig);
+        var context = new ServerContext(siteConfig)) {
+      var zrw = zk.asReaderWriter();
+
       PropStoreKey<?> propKey = getPropKey(context, opts);
       switch (opts.getCmdMode()) {
         case SET:
diff --git a/server/base/src/main/java/org/apache/accumulo/server/conf/util/ZooPropUtils.java b/server/base/src/main/java/org/apache/accumulo/server/conf/util/ZooPropUtils.java
deleted file mode 100644
index a892ca64a91..00000000000
--- a/server/base/src/main/java/org/apache/accumulo/server/conf/util/ZooPropUtils.java
+++ /dev/null
@@ -1,84 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.accumulo.server.conf.util;
-
-import static java.nio.charset.StandardCharsets.UTF_8;
-import static org.apache.accumulo.core.Constants.ZINSTANCES;
-import static org.apache.accumulo.core.Constants.ZROOT;
-
-import java.util.List;
-import java.util.Map;
-import java.util.TreeMap;
-import java.util.UUID;
-
-import org.apache.accumulo.core.data.InstanceId;
-import org.apache.accumulo.core.fate.zookeeper.ZooReader;
-import org.apache.zookeeper.KeeperException;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-public class ZooPropUtils {
-  private static final Logger LOG = LoggerFactory.getLogger(ZooPropUtils.class);
-
-  private ZooPropUtils() {}
-
-  /**
-   * Read the instance names and instance ids from ZooKeeper. The storage structure in ZooKeeper is:
-   *
-   * <pre>
-   *   /accumulo/instances/instance_name  - with the instance id stored as data.
-   * </pre>
-   *
-   * @return a map of (instance name, instance id) entries
-   */
-  public static Map<String,InstanceId> readInstancesFromZk(final ZooReader zooReader) {
-    String instanceRoot = ZROOT + ZINSTANCES;
-    Map<String,InstanceId> idMap = new TreeMap<>();
-    try {
-      List<String> names = zooReader.getChildren(instanceRoot);
-      names.forEach(name -> {
-        InstanceId iid = getInstanceIdForName(zooReader, name);
-        idMap.put(name, iid);
-      });
-    } catch (InterruptedException ex) {
-      Thread.currentThread().interrupt();
-      throw new IllegalStateException("Interrupted reading instance name info from ZooKeeper", ex);
-    } catch (KeeperException ex) {
-      throw new IllegalStateException("Failed to read instance name info from ZooKeeper", ex);
-    }
-    return idMap;
-  }
-
-  private static InstanceId getInstanceIdForName(ZooReader zooReader, String name) {
-    String instanceRoot = ZROOT + ZINSTANCES;
-    String path = "";
-    try {
-      path = instanceRoot + "/" + name;
-      byte[] uuid = zooReader.getData(path);
-      return InstanceId.of(UUID.fromString(new String(uuid, UTF_8)));
-    } catch (InterruptedException ex) {
-      Thread.currentThread().interrupt();
-      throw new IllegalStateException("Interrupted reading instance id from ZooKeeper", ex);
-    } catch (KeeperException ex) {
-      LOG.warn("Failed to read instance id for " + path);
-      return null;
-    }
-  }
-
-}
diff --git a/server/base/src/main/java/org/apache/accumulo/server/constraints/MetadataConstraints.java b/server/base/src/main/java/org/apache/accumulo/server/constraints/MetadataConstraints.java
index f91828361f0..0d2988423c4 100644
--- a/server/base/src/main/java/org/apache/accumulo/server/constraints/MetadataConstraints.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/constraints/MetadataConstraints.java
@@ -59,6 +59,7 @@
 import org.apache.accumulo.core.metadata.schema.MetadataSchema.TabletsSection.Upgrade12to13;
 import org.apache.accumulo.core.metadata.schema.MetadataSchema.TabletsSection.UserCompactionRequestedColumnFamily;
 import org.apache.accumulo.core.metadata.schema.SelectedFiles;
+import org.apache.accumulo.core.metadata.schema.TabletMergeabilityMetadata;
 import org.apache.accumulo.core.metadata.schema.TabletOperationId;
 import org.apache.accumulo.core.metadata.schema.TabletOperationType;
 import org.apache.accumulo.core.metadata.schema.UnSplittableMetadata;
@@ -97,6 +98,7 @@ public class MetadataConstraints implements Constraint {
           TabletColumnFamily.REQUESTED_COLUMN,
           ServerColumnFamily.SELECTED_COLUMN,
           SplitColumnFamily.UNSPLITTABLE_COLUMN,
+          TabletColumnFamily.MERGEABILITY_COLUMN,
           Upgrade12to13.COMPACT_COL);
 
   @SuppressWarnings("deprecation")
@@ -297,6 +299,8 @@ public String getViolationDescription(short violationCode) {
         return "Invalid unsplittable column";
       case 4005:
         return "Malformed availability value";
+      case 4006:
+        return "Malformed mergeability value";
 
     }
     return null;
@@ -376,6 +380,13 @@ private void validateTabletFamily(ArrayList<Short> violations, ColumnUpdate colu
           addViolation(violations, 4005);
         }
         break;
+      case (TabletColumnFamily.MERGEABILITY_QUAL):
+        try {
+          TabletMergeabilityMetadata.fromValue(new Value(columnUpdate.getValue()));
+        } catch (IllegalArgumentException e) {
+          addViolation(violations, 4006);
+        }
+        break;
     }
   }
 
diff --git a/server/base/src/main/java/org/apache/accumulo/server/init/FileSystemInitializer.java b/server/base/src/main/java/org/apache/accumulo/server/init/FileSystemInitializer.java
index b315f1a58c3..ef6536da098 100644
--- a/server/base/src/main/java/org/apache/accumulo/server/init/FileSystemInitializer.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/init/FileSystemInitializer.java
@@ -44,6 +44,7 @@
 import org.apache.accumulo.core.metadata.schema.DataFileValue;
 import org.apache.accumulo.core.metadata.schema.MetadataSchema;
 import org.apache.accumulo.core.metadata.schema.MetadataTime;
+import org.apache.accumulo.core.metadata.schema.TabletMergeabilityMetadata;
 import org.apache.accumulo.core.metadata.schema.TabletMetadata;
 import org.apache.accumulo.core.spi.crypto.CryptoService;
 import org.apache.accumulo.core.spi.fs.VolumeChooserEnvironment;
@@ -93,7 +94,8 @@ private Map<Key,Value> createEntries() {
       KeyExtent keyExtent = new KeyExtent(tableId, endRow, prevEndRow);
       var builder = TabletMetadata.builder(keyExtent).putDirName(dirName)
           .putTime(new MetadataTime(0, TimeType.LOGICAL))
-          .putTabletAvailability(TabletAvailability.HOSTED).putPrevEndRow(prevEndRow);
+          .putTabletAvailability(TabletAvailability.HOSTED)
+          .putTabletMergeability(TabletMergeabilityMetadata.never()).putPrevEndRow(prevEndRow);
       for (String file : files) {
         builder.putFile(new ReferencedTabletFile(new Path(file)).insert(), new DataFileValue(0, 0));
       }
diff --git a/server/base/src/main/java/org/apache/accumulo/server/init/Initialize.java b/server/base/src/main/java/org/apache/accumulo/server/init/Initialize.java
index f849599233c..0b1a5045df3 100644
--- a/server/base/src/main/java/org/apache/accumulo/server/init/Initialize.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/init/Initialize.java
@@ -47,6 +47,7 @@
 import org.apache.accumulo.core.singletons.SingletonManager.Mode;
 import org.apache.accumulo.core.spi.fs.VolumeChooserEnvironment.Scope;
 import org.apache.accumulo.core.volume.VolumeConfiguration;
+import org.apache.accumulo.core.zookeeper.ZooSession;
 import org.apache.accumulo.server.AccumuloDataVersion;
 import org.apache.accumulo.server.ServerContext;
 import org.apache.accumulo.server.ServerDirs;
@@ -525,7 +526,6 @@ public void execute(final String[] args) {
     Opts opts = new Opts();
     opts.parseArgs("accumulo init", args);
     var siteConfig = SiteConfiguration.auto();
-    ZooReaderWriter zoo = new ZooReaderWriter(siteConfig);
     SecurityUtil.serverLogin(siteConfig);
     Configuration hadoopConfig = new Configuration();
     InitialConfiguration initConfig = new InitialConfiguration(hadoopConfig, siteConfig);
@@ -539,7 +539,9 @@ public void execute(final String[] args) {
         success = addVolumes(fs, initConfig, serverDirs);
       }
       if (!opts.resetSecurity && !opts.addVolumes) {
-        success = doInit(zoo, opts, fs, initConfig);
+        try (var zk = new ZooSession(getClass().getSimpleName(), siteConfig)) {
+          success = doInit(zk.asReaderWriter(), opts, fs, initConfig);
+        }
       }
     } catch (IOException e) {
       log.error("Problem trying to get Volume configuration", e);
diff --git a/server/base/src/main/java/org/apache/accumulo/server/init/ZooKeeperInitializer.java b/server/base/src/main/java/org/apache/accumulo/server/init/ZooKeeperInitializer.java
index c3a5553de97..3089189f94e 100644
--- a/server/base/src/main/java/org/apache/accumulo/server/init/ZooKeeperInitializer.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/init/ZooKeeperInitializer.java
@@ -97,7 +97,7 @@ void initialize(final ServerContext context, final boolean clearInstanceName,
       throws KeeperException, InterruptedException {
     // setup basic data in zookeeper
 
-    ZooReaderWriter zoo = context.getZooReaderWriter();
+    ZooReaderWriter zoo = context.getZooSession().asReaderWriter();
     InstanceId instanceId = context.getInstanceID();
 
     zoo.putPersistentData(Constants.ZROOT + Constants.ZINSTANCES, new byte[0],
diff --git a/server/base/src/main/java/org/apache/accumulo/server/log/WalStateManager.java b/server/base/src/main/java/org/apache/accumulo/server/log/WalStateManager.java
index b2cc9336de0..da4f51dd356 100644
--- a/server/base/src/main/java/org/apache/accumulo/server/log/WalStateManager.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/log/WalStateManager.java
@@ -93,7 +93,7 @@ public enum WalState {
 
   public WalStateManager(ServerContext context) {
     this.context = context;
-    this.zoo = context.getZooReaderWriter();
+    this.zoo = context.getZooSession().asReaderWriter();
   }
 
   private String root() throws WalMarkerException {
diff --git a/server/base/src/main/java/org/apache/accumulo/server/manager/LiveTServerSet.java b/server/base/src/main/java/org/apache/accumulo/server/manager/LiveTServerSet.java
index b6e51b412f7..f20aa6dfb55 100644
--- a/server/base/src/main/java/org/apache/accumulo/server/manager/LiveTServerSet.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/manager/LiveTServerSet.java
@@ -30,6 +30,7 @@
 import java.util.Optional;
 import java.util.Set;
 import java.util.concurrent.TimeUnit;
+import java.util.function.Supplier;
 
 import org.apache.accumulo.core.Constants;
 import org.apache.accumulo.core.clientImpl.thrift.ThriftSecurityException;
@@ -37,6 +38,7 @@
 import org.apache.accumulo.core.dataImpl.KeyExtent;
 import org.apache.accumulo.core.fate.zookeeper.ZooCache;
 import org.apache.accumulo.core.fate.zookeeper.ZooCache.ZcStat;
+import org.apache.accumulo.core.fate.zookeeper.ZooCache.ZooCacheWatcher;
 import org.apache.accumulo.core.lock.ServiceLock;
 import org.apache.accumulo.core.lock.ServiceLockData;
 import org.apache.accumulo.core.lock.ServiceLockPaths;
@@ -60,14 +62,14 @@
 import org.apache.zookeeper.KeeperException;
 import org.apache.zookeeper.KeeperException.NotEmptyException;
 import org.apache.zookeeper.WatchedEvent;
-import org.apache.zookeeper.Watcher;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import com.google.common.annotations.VisibleForTesting;
+import com.google.common.base.Suppliers;
 import com.google.common.net.HostAndPort;
 
-public class LiveTServerSet implements Watcher {
+public class LiveTServerSet implements ZooCacheWatcher {
 
   public interface Listener {
     void update(LiveTServerSet current, Set<TServerInstance> deleted, Set<TServerInstance> added);
@@ -77,7 +79,6 @@ public interface Listener {
 
   private final Listener cback;
   private final ServerContext context;
-  private ZooCache zooCache;
 
   public class TServerConnection {
     private final HostAndPort address;
@@ -208,16 +209,16 @@ static class TServerInfo {
   // The set of entries in zookeeper without locks, and the first time each was noticed
   private final Map<ServiceLockPath,Long> locklessServers = new HashMap<>();
 
+  private final Supplier<ZooCache> zcSupplier;
+
   public LiveTServerSet(ServerContext context, Listener cback) {
     this.cback = cback;
     this.context = context;
+    this.zcSupplier = Suppliers.memoize(() -> new ZooCache(context.getZooSession(), this));
   }
 
-  public synchronized ZooCache getZooCache() {
-    if (zooCache == null) {
-      zooCache = new ZooCache(context.getZooReader(), this);
-    }
-    return zooCache;
+  public ZooCache getZooCache() {
+    return zcSupplier.get();
   }
 
   public synchronized void startListeningForTabletServerChanges() {
@@ -249,7 +250,7 @@ public synchronized void scanServers() {
 
   private void deleteServerNode(String serverNode) throws InterruptedException, KeeperException {
     try {
-      context.getZooReaderWriter().delete(serverNode);
+      context.getZooSession().asReaderWriter().delete(serverNode);
     } catch (NotEmptyException ex) {
       // acceptable race condition:
       // tserver created the lock under this server's node after our last check
@@ -304,7 +305,7 @@ private synchronized void checkServer(final Set<TServerInstance> updates,
   }
 
   @Override
-  public void process(WatchedEvent event) {
+  public void accept(WatchedEvent event) {
 
     // its important that these event are propagated by ZooCache, because this ensures when reading
     // zoocache that is has already processed the event and cleared
@@ -475,7 +476,7 @@ public synchronized void remove(TServerInstance server) {
       ServiceLockPath slp = paths.iterator().next();
       log.info("Removing zookeeper lock for {}", slp);
       try {
-        context.getZooReaderWriter().recursiveDelete(slp.toString(), SKIP);
+        context.getZooSession().asReaderWriter().recursiveDelete(slp.toString(), SKIP);
       } catch (Exception e) {
         String msg = "error removing tablet server lock";
         // ACCUMULO-3651 Changed level to error and added FATAL to message for slf4j compatibility
diff --git a/server/base/src/main/java/org/apache/accumulo/server/manager/state/DeadServerList.java b/server/base/src/main/java/org/apache/accumulo/server/manager/state/DeadServerList.java
index 966167d527f..d12f4e9363a 100644
--- a/server/base/src/main/java/org/apache/accumulo/server/manager/state/DeadServerList.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/manager/state/DeadServerList.java
@@ -47,18 +47,15 @@ public class DeadServerList {
   // and replace the "UNKNOWN" value with the ResourceGroup
   private static final String RESOURCE_GROUP = "UNKNOWN";
   private final ServerContext ctx;
-  private final String root;
   private final ZooReaderWriter zoo;
   private final String path;
 
   public DeadServerList(ServerContext context) {
     this.ctx = context;
-    zoo = this.ctx.getZooReaderWriter();
-    root = this.ctx.getZooKeeperRoot();
-
-    this.path = root + Constants.ZDEADTSERVERS + "/" + RESOURCE_GROUP;
+    this.zoo = context.getZooSession().asReaderWriter();
+    this.path = context.getZooKeeperRoot() + Constants.ZDEADTSERVERS + "/" + RESOURCE_GROUP;
     try {
-      ctx.getZooReaderWriter().mkdirs(path);
+      zoo.mkdirs(path);
     } catch (Exception ex) {
       log.error("Unable to make parent directories of " + path, ex);
     }
diff --git a/server/base/src/main/java/org/apache/accumulo/server/metadata/ConditionalTabletMutatorImpl.java b/server/base/src/main/java/org/apache/accumulo/server/metadata/ConditionalTabletMutatorImpl.java
index 4ae46676024..ac0dc4b1126 100644
--- a/server/base/src/main/java/org/apache/accumulo/server/metadata/ConditionalTabletMutatorImpl.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/metadata/ConditionalTabletMutatorImpl.java
@@ -36,6 +36,7 @@
 import java.util.function.BiConsumer;
 import java.util.function.Consumer;
 import java.util.function.Function;
+import java.util.function.Supplier;
 
 import org.apache.accumulo.core.client.IteratorSetting;
 import org.apache.accumulo.core.client.admin.TabletAvailability;
@@ -86,17 +87,20 @@ public class ConditionalTabletMutatorImpl extends TabletMutatorBase<Ample.Condit
   private final ServerContext context;
   private final ServiceLock lock;
   private final KeyExtent extent;
+  private final BiConsumer<KeyExtent,Supplier<String>> descriptionConsumer;
 
   private boolean sawOperationRequirement = false;
   private boolean checkPrevEndRow = true;
 
   protected ConditionalTabletMutatorImpl(ServerContext context, KeyExtent extent,
       Consumer<ConditionalMutation> mutationConsumer,
-      BiConsumer<KeyExtent,Ample.RejectionHandler> rejectionHandlerConsumer) {
+      BiConsumer<KeyExtent,Ample.RejectionHandler> rejectionHandlerConsumer,
+      BiConsumer<KeyExtent,Supplier<String>> descriptionConsumer) {
     super(new ConditionalMutation(extent.toMetaRow()));
     this.mutation = (ConditionalMutation) super.mutation;
     this.mutationConsumer = mutationConsumer;
     this.rejectionHandlerConsumer = rejectionHandlerConsumer;
+    this.descriptionConsumer = descriptionConsumer;
     this.extent = extent;
     this.context = context;
     this.lock = this.context.getServiceLock();
@@ -390,4 +394,10 @@ public void submit(Ample.RejectionHandler rejectionCheck) {
     mutationConsumer.accept(mutation);
     rejectionHandlerConsumer.accept(extent, rejectionCheck);
   }
+
+  @Override
+  public void submit(Ample.RejectionHandler rejectionHandler, Supplier<String> description) {
+    descriptionConsumer.accept(extent, description);
+    this.submit(rejectionHandler);
+  }
 }
diff --git a/server/base/src/main/java/org/apache/accumulo/server/metadata/ConditionalTabletsMutatorImpl.java b/server/base/src/main/java/org/apache/accumulo/server/metadata/ConditionalTabletsMutatorImpl.java
index 660453f2998..777364e0c48 100644
--- a/server/base/src/main/java/org/apache/accumulo/server/metadata/ConditionalTabletsMutatorImpl.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/metadata/ConditionalTabletsMutatorImpl.java
@@ -30,6 +30,7 @@
 import java.util.Optional;
 import java.util.Set;
 import java.util.function.Function;
+import java.util.function.Supplier;
 import java.util.stream.Collectors;
 
 import org.apache.accumulo.core.client.AccumuloException;
@@ -66,6 +67,7 @@ public class ConditionalTabletsMutatorImpl implements Ample.ConditionalTabletsMu
   private boolean active = true;
 
   final Map<KeyExtent,Ample.RejectionHandler> rejectedHandlers = new HashMap<>();
+  private final Map<KeyExtent,Supplier<String>> operationDescriptions = new HashMap<>();
   private final Function<DataLevel,String> tableMapper;
 
   public ConditionalTabletsMutatorImpl(ServerContext context) {
@@ -93,7 +95,8 @@ public Ample.OperationRequirements mutateTablet(KeyExtent extent) {
 
     Preconditions.checkState(extents.putIfAbsent(extent.toMetaRow(), extent) == null,
         "Duplicate extents not handled %s", extent);
-    return new ConditionalTabletMutatorImpl(context, extent, mutations::add, rejectedHandlers::put);
+    return new ConditionalTabletMutatorImpl(context, extent, mutations::add, rejectedHandlers::put,
+        operationDescriptions::put);
   }
 
   protected ConditionalWriter createConditionalWriter(Ample.DataLevel dataLevel)
@@ -262,16 +265,20 @@ public Status getStatus() {
                 status = Status.ACCEPTED;
               }
 
+              Supplier<String> descSupplier = operationDescriptions.get(extent);
+              String desc = (descSupplier == null) ? null : descSupplier.get();
+
               if (log.isTraceEnabled()) {
                 // log detailed info about tablet metadata and mutation
-                log.trace("Mutation was rejected, status:{} {} {}", status, tabletMetadata,
-                    result.getMutation().prettyPrint());
+                log.trace("Mutation was rejected, status:{}. Operation description: {} {} {}",
+                    status, desc, tabletMetadata, result.getMutation().prettyPrint());
               } else if (log.isDebugEnabled()) {
                 // log a single line of info that makes it apparent this happened and gives enough
                 // information to investigate
-                log.debug("Mutation was rejected, status:{} extent:{} row:{}", status,
-                    tabletMetadata == null ? null : tabletMetadata.getExtent(),
-                    new String(result.getMutation().getRow(), UTF_8));
+                log.debug(
+                    "Mutation was rejected, status:{} extent:{} row:{} operation description: {}",
+                    status, tabletMetadata == null ? null : tabletMetadata.getExtent(),
+                    new String(result.getMutation().getRow(), UTF_8), desc);
               }
             }
 
diff --git a/server/base/src/main/java/org/apache/accumulo/server/metadata/RootConditionalWriter.java b/server/base/src/main/java/org/apache/accumulo/server/metadata/RootConditionalWriter.java
index 0e28d1a7a71..9f61097f8e9 100644
--- a/server/base/src/main/java/org/apache/accumulo/server/metadata/RootConditionalWriter.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/metadata/RootConditionalWriter.java
@@ -97,7 +97,7 @@ public Result write(ConditionalMutation mutation) {
     List<TCMResult> results = new ArrayList<>();
 
     try {
-      context.getZooReaderWriter().mutateExisting(zpath, currVal -> {
+      context.getZooSession().asReaderWriter().mutateExisting(zpath, currVal -> {
         String currJson = new String(currVal, UTF_8);
 
         var rtm = new RootTabletMetadata(currJson);
diff --git a/server/base/src/main/java/org/apache/accumulo/server/metadata/RootTabletMutatorImpl.java b/server/base/src/main/java/org/apache/accumulo/server/metadata/RootTabletMutatorImpl.java
index 6bf8cbca260..3f429b3c715 100644
--- a/server/base/src/main/java/org/apache/accumulo/server/metadata/RootTabletMutatorImpl.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/metadata/RootTabletMutatorImpl.java
@@ -106,7 +106,7 @@ public void mutate() {
 
       // TODO examine implementation of getZooReaderWriter().mutate()
       // TODO for efficiency this should maybe call mutateExisting
-      context.getZooReaderWriter().mutateOrCreate(zpath, new byte[0], currVal -> {
+      context.getZooSession().asReaderWriter().mutateOrCreate(zpath, new byte[0], currVal -> {
         String currJson = new String(currVal, UTF_8);
         var rtm = new RootTabletMetadata(currJson);
         rtm.update(mutation);
diff --git a/server/base/src/main/java/org/apache/accumulo/server/metadata/ServerAmpleImpl.java b/server/base/src/main/java/org/apache/accumulo/server/metadata/ServerAmpleImpl.java
index dcea93dea97..59671a0070c 100644
--- a/server/base/src/main/java/org/apache/accumulo/server/metadata/ServerAmpleImpl.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/metadata/ServerAmpleImpl.java
@@ -106,7 +106,7 @@ private void mutateRootGcCandidates(Consumer<RootGcCandidates> mutator) {
     String zpath = context.getZooKeeperRoot() + ZROOT_TABLET_GC_CANDIDATES;
     try {
       // TODO calling create seems unnecessary and is possibly racy and inefficient
-      context.getZooReaderWriter().mutateOrCreate(zpath, new byte[0], currVal -> {
+      context.getZooSession().asReaderWriter().mutateOrCreate(zpath, new byte[0], currVal -> {
         String currJson = new String(currVal, UTF_8);
         RootGcCandidates rgcc = new RootGcCandidates(currJson);
         log.debug("Root GC candidates before change : {}", currJson);
@@ -231,7 +231,7 @@ public void deleteGcCandidates(DataLevel level, Collection<GcCandidate> candidat
   @Override
   public Iterator<GcCandidate> getGcCandidates(DataLevel level) {
     if (level == DataLevel.ROOT) {
-      var zooReader = context.getZooReader();
+      var zooReader = context.getZooSession().asReader();
       byte[] jsonBytes;
       try {
         jsonBytes =
diff --git a/server/base/src/main/java/org/apache/accumulo/server/security/AuditedSecurityOperation.java b/server/base/src/main/java/org/apache/accumulo/server/security/AuditedSecurityOperation.java
index a89fb39689d..0d10b2025fd 100644
--- a/server/base/src/main/java/org/apache/accumulo/server/security/AuditedSecurityOperation.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/security/AuditedSecurityOperation.java
@@ -38,7 +38,7 @@
 import org.apache.accumulo.core.dataImpl.thrift.TColumn;
 import org.apache.accumulo.core.dataImpl.thrift.TKeyExtent;
 import org.apache.accumulo.core.dataImpl.thrift.TRange;
-import org.apache.accumulo.core.manager.thrift.FateOperation;
+import org.apache.accumulo.core.manager.thrift.TFateOperation;
 import org.apache.accumulo.core.metadata.AccumuloTable;
 import org.apache.accumulo.core.security.Authorizations;
 import org.apache.accumulo.core.security.SystemPermission;
@@ -685,14 +685,14 @@ public boolean hasSystemPermission(TCredentials credentials, String user,
       "action: %s; targetTable: %s:%s";
 
   @Override
-  public boolean canChangeTableState(TCredentials credentials, TableId tableId, FateOperation op,
+  public boolean canChangeTableState(TCredentials credentials, TableId tableId, TFateOperation op,
       NamespaceId namespaceId) throws ThriftSecurityException {
     String tableName = getTableName(tableId);
     String operation = null;
-    if (op == FateOperation.TABLE_ONLINE) {
+    if (op == TFateOperation.TABLE_ONLINE) {
       operation = "onlineTable";
     }
-    if (op == FateOperation.TABLE_OFFLINE) {
+    if (op == TFateOperation.TABLE_OFFLINE) {
       operation = "offlineTable";
     }
     try {
diff --git a/server/base/src/main/java/org/apache/accumulo/server/security/SecurityOperation.java b/server/base/src/main/java/org/apache/accumulo/server/security/SecurityOperation.java
index e1fd176bae0..da12470b87b 100644
--- a/server/base/src/main/java/org/apache/accumulo/server/security/SecurityOperation.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/security/SecurityOperation.java
@@ -41,8 +41,7 @@
 import org.apache.accumulo.core.dataImpl.thrift.TColumn;
 import org.apache.accumulo.core.dataImpl.thrift.TKeyExtent;
 import org.apache.accumulo.core.dataImpl.thrift.TRange;
-import org.apache.accumulo.core.fate.zookeeper.ZooCache;
-import org.apache.accumulo.core.manager.thrift.FateOperation;
+import org.apache.accumulo.core.manager.thrift.TFateOperation;
 import org.apache.accumulo.core.metadata.AccumuloTable;
 import org.apache.accumulo.core.security.Authorizations;
 import org.apache.accumulo.core.security.NamespacePermission;
@@ -74,7 +73,6 @@ public class SecurityOperation {
   private final PermissionHandler permHandle;
   private final boolean isKerberos;
   private final Supplier<String> rootUserName;
-  private final ZooCache zooCache;
   private final String zkUserPath;
 
   protected final ServerContext context;
@@ -105,8 +103,8 @@ protected SecurityOperation(ServerContext context, Authorizor author, Authentica
       PermissionHandler pm) {
     this.context = context;
     zkUserPath = context.zkUserPath();
-    zooCache = new ZooCache(context.getZooReader(), null);
-    rootUserName = Suppliers.memoize(() -> new String(zooCache.get(zkUserPath), UTF_8));
+    rootUserName =
+        Suppliers.memoize(() -> new String(context.getZooCache().get(zkUserPath), UTF_8));
     authorizor = author;
     authenticator = authent;
     permHandle = pm;
@@ -524,7 +522,7 @@ public boolean canDeleteTable(TCredentials c, TableId tableId, NamespaceId names
         || hasTablePermission(c, tableId, namespaceId, TablePermission.DROP_TABLE, false);
   }
 
-  public boolean canChangeTableState(TCredentials c, TableId tableId, FateOperation op,
+  public boolean canChangeTableState(TCredentials c, TableId tableId, TFateOperation op,
       NamespaceId namespaceId) throws ThriftSecurityException {
     authenticate(c);
     return hasSystemPermissionWithNamespaceId(c, SystemPermission.SYSTEM, namespaceId, false)
diff --git a/server/base/src/main/java/org/apache/accumulo/server/security/delegation/ZooAuthenticationKeyDistributor.java b/server/base/src/main/java/org/apache/accumulo/server/security/delegation/ZooAuthenticationKeyDistributor.java
index ef4a1e204de..47ecefa9f88 100644
--- a/server/base/src/main/java/org/apache/accumulo/server/security/delegation/ZooAuthenticationKeyDistributor.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/security/delegation/ZooAuthenticationKeyDistributor.java
@@ -34,6 +34,7 @@
 import org.apache.accumulo.core.fate.zookeeper.ZooReaderWriter;
 import org.apache.accumulo.core.fate.zookeeper.ZooUtil;
 import org.apache.accumulo.core.fate.zookeeper.ZooUtil.NodeExistsPolicy;
+import org.apache.accumulo.core.zookeeper.ZooSession;
 import org.apache.zookeeper.KeeperException;
 import org.apache.zookeeper.data.ACL;
 import org.apache.zookeeper.data.Id;
@@ -47,15 +48,13 @@
 public class ZooAuthenticationKeyDistributor {
   private static final Logger log = LoggerFactory.getLogger(ZooAuthenticationKeyDistributor.class);
 
-  private final ZooReaderWriter zk;
+  private final ZooReaderWriter zrw;
   private final String baseNode;
   private final AtomicBoolean initialized = new AtomicBoolean(false);
 
-  public ZooAuthenticationKeyDistributor(ZooReaderWriter zk, String baseNode) {
-    requireNonNull(zk);
-    requireNonNull(baseNode);
-    this.zk = zk;
-    this.baseNode = baseNode;
+  public ZooAuthenticationKeyDistributor(ZooSession zk, String baseNode) {
+    this.zrw = zk.asReaderWriter();
+    this.baseNode = requireNonNull(baseNode);
   }
 
   /**
@@ -67,8 +66,8 @@ public synchronized void initialize() throws KeeperException, InterruptedExcepti
       return;
     }
 
-    if (zk.exists(baseNode)) {
-      List<ACL> acls = zk.getACL(baseNode);
+    if (zrw.exists(baseNode)) {
+      List<ACL> acls = zrw.getACL(baseNode);
       if (acls.size() == 1) {
         ACL actualAcl = acls.get(0), expectedAcl = ZooUtil.PRIVATE.get(0);
         Id actualId = actualAcl.getId();
@@ -86,7 +85,7 @@ public synchronized void initialize() throws KeeperException, InterruptedExcepti
       throw new IllegalStateException(
           "Delegation token secret key node in ZooKeeper is not protected.");
     } else {
-      zk.putPrivatePersistentData(baseNode, new byte[0], NodeExistsPolicy.FAIL);
+      zrw.putPrivatePersistentData(baseNode, new byte[0], NodeExistsPolicy.FAIL);
     }
 
     initialized.set(true);
@@ -100,7 +99,7 @@ public synchronized void initialize() throws KeeperException, InterruptedExcepti
    */
   public List<AuthenticationKey> getCurrentKeys() throws KeeperException, InterruptedException {
     checkState(initialized.get(), "Not initialized");
-    List<String> children = zk.getChildren(baseNode);
+    List<String> children = zrw.getChildren(baseNode);
 
     // Shortcircuit to avoid a list creation
     if (children.isEmpty()) {
@@ -110,7 +109,7 @@ public List<AuthenticationKey> getCurrentKeys() throws KeeperException, Interrup
     // Deserialize each byte[] into an AuthenticationKey
     List<AuthenticationKey> keys = new ArrayList<>(children.size());
     for (String child : children) {
-      byte[] data = zk.getData(qualifyPath(child));
+      byte[] data = zrw.getData(qualifyPath(child));
       if (data != null) {
         AuthenticationKey key = new AuthenticationKey();
         try {
@@ -138,7 +137,7 @@ public synchronized void advertise(AuthenticationKey newKey)
 
     // Make sure the node doesn't already exist
     String path = qualifyPath(newKey);
-    if (zk.exists(path)) {
+    if (zrw.exists(path)) {
       log.warn("AuthenticationKey with ID '{}' already exists in ZooKeeper", newKey.getKeyId());
       return;
     }
@@ -157,7 +156,7 @@ public synchronized void advertise(AuthenticationKey newKey)
         path);
 
     // Put it into ZK with the private ACL
-    zk.putPrivatePersistentData(path, serializedKey, NodeExistsPolicy.FAIL);
+    zrw.putPrivatePersistentData(path, serializedKey, NodeExistsPolicy.FAIL);
   }
 
   /**
@@ -174,7 +173,7 @@ public synchronized void remove(AuthenticationKey key)
     requireNonNull(key);
 
     String path = qualifyPath(key);
-    if (!zk.exists(path)) {
+    if (!zrw.exists(path)) {
       log.warn("AuthenticationKey with ID '{}' doesn't exist in ZooKeeper", key.getKeyId());
       return;
     }
@@ -182,7 +181,7 @@ public synchronized void remove(AuthenticationKey key)
     log.debug("Removing AuthenticationKey with keyId {} from ZooKeeper at {}", key.getKeyId(),
         path);
 
-    zk.delete(path);
+    zrw.delete(path);
   }
 
   String qualifyPath(String keyId) {
diff --git a/server/base/src/main/java/org/apache/accumulo/server/security/delegation/ZooAuthenticationKeyWatcher.java b/server/base/src/main/java/org/apache/accumulo/server/security/delegation/ZooAuthenticationKeyWatcher.java
index abc060da49a..8f765d06d12 100644
--- a/server/base/src/main/java/org/apache/accumulo/server/security/delegation/ZooAuthenticationKeyWatcher.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/security/delegation/ZooAuthenticationKeyWatcher.java
@@ -23,6 +23,7 @@
 import java.io.IOException;
 
 import org.apache.accumulo.core.fate.zookeeper.ZooReader;
+import org.apache.accumulo.core.zookeeper.ZooSession;
 import org.apache.zookeeper.KeeperException;
 import org.apache.zookeeper.KeeperException.NoNodeException;
 import org.apache.zookeeper.WatchedEvent;
@@ -42,10 +43,10 @@ public class ZooAuthenticationKeyWatcher implements Watcher {
   private final ZooReader zk;
   private final String baseNode;
 
-  public ZooAuthenticationKeyWatcher(AuthenticationTokenSecretManager secretManager, ZooReader zk,
+  public ZooAuthenticationKeyWatcher(AuthenticationTokenSecretManager secretManager, ZooSession zk,
       String baseNode) {
     this.secretManager = secretManager;
-    this.zk = zk;
+    this.zk = zk.asReader();
     this.baseNode = baseNode;
   }
 
diff --git a/server/base/src/main/java/org/apache/accumulo/server/security/handler/KerberosAuthenticator.java b/server/base/src/main/java/org/apache/accumulo/server/security/handler/KerberosAuthenticator.java
index 7aa23061c54..f38cb30d611 100644
--- a/server/base/src/main/java/org/apache/accumulo/server/security/handler/KerberosAuthenticator.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/security/handler/KerberosAuthenticator.java
@@ -59,7 +59,7 @@ public class KerberosAuthenticator implements Authenticator {
   @Override
   public void initialize(ServerContext context) {
     this.context = context;
-    zooCache = new ZooCache(context.getZooReader(), null);
+    zooCache = new ZooCache(context.getZooSession());
     impersonation = new UserImpersonation(context.getConfiguration());
     zkAuthenticator.initialize(context);
     zkUserPath = context.zkUserPath();
@@ -73,7 +73,7 @@ public boolean validSecurityHandlers() {
   private void createUserNodeInZk(String principal) throws KeeperException, InterruptedException {
     synchronized (zooCache) {
       zooCache.clear();
-      ZooReaderWriter zoo = context.getZooReaderWriter();
+      ZooReaderWriter zoo = context.getZooSession().asReaderWriter();
       zoo.putPrivatePersistentData(zkUserPath + "/" + principal, new byte[0],
           NodeExistsPolicy.FAIL);
     }
@@ -83,7 +83,7 @@ private void createUserNodeInZk(String principal) throws KeeperException, Interr
   public void initializeSecurity(String principal, byte[] token) {
     try {
       // remove old settings from zookeeper first, if any
-      ZooReaderWriter zoo = context.getZooReaderWriter();
+      ZooReaderWriter zoo = context.getZooSession().asReaderWriter();
       synchronized (zooCache) {
         zooCache.clear();
         if (zoo.exists(zkUserPath)) {
diff --git a/server/base/src/main/java/org/apache/accumulo/server/security/handler/ZKAuthenticator.java b/server/base/src/main/java/org/apache/accumulo/server/security/handler/ZKAuthenticator.java
index 10b7c4b880d..1bcb54f0e26 100644
--- a/server/base/src/main/java/org/apache/accumulo/server/security/handler/ZKAuthenticator.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/security/handler/ZKAuthenticator.java
@@ -49,7 +49,7 @@ public final class ZKAuthenticator implements Authenticator {
   @Override
   public void initialize(ServerContext context) {
     this.context = context;
-    zooCache = new ZooCache(context.getZooReader(), null);
+    zooCache = new ZooCache(context.getZooSession());
     zkUserPath = context.zkUserPath();
   }
 
@@ -57,7 +57,7 @@ public void initialize(ServerContext context) {
   public void initializeSecurity(String principal, byte[] token) {
     try {
       // remove old settings from zookeeper first, if any
-      ZooReaderWriter zoo = context.getZooReaderWriter();
+      ZooReaderWriter zoo = context.getZooSession().asReaderWriter();
       synchronized (zooCache) {
         zooCache.clear();
         if (zoo.exists(zkUserPath)) {
@@ -84,7 +84,7 @@ private void constructUser(String user, byte[] pass)
       throws KeeperException, InterruptedException {
     synchronized (zooCache) {
       zooCache.clear();
-      ZooReaderWriter zoo = context.getZooReaderWriter();
+      ZooReaderWriter zoo = context.getZooSession().asReaderWriter();
       zoo.putPrivatePersistentData(zkUserPath + "/" + user, pass, NodeExistsPolicy.FAIL);
     }
   }
@@ -122,7 +122,7 @@ public void dropUser(String user) throws AccumuloSecurityException {
     try {
       synchronized (zooCache) {
         zooCache.clear();
-        context.getZooReaderWriter().recursiveDelete(zkUserPath + "/" + user,
+        context.getZooSession().asReaderWriter().recursiveDelete(zkUserPath + "/" + user,
             NodeMissingPolicy.FAIL);
       }
     } catch (InterruptedException e) {
@@ -148,8 +148,9 @@ public void changePassword(String principal, AuthenticationToken token)
       try {
         synchronized (zooCache) {
           zooCache.clear(zkUserPath + "/" + principal);
-          context.getZooReaderWriter().putPrivatePersistentData(zkUserPath + "/" + principal,
-              ZKSecurityTool.createPass(pt.getPassword()), NodeExistsPolicy.OVERWRITE);
+          context.getZooSession().asReaderWriter().putPrivatePersistentData(
+              zkUserPath + "/" + principal, ZKSecurityTool.createPass(pt.getPassword()),
+              NodeExistsPolicy.OVERWRITE);
         }
       } catch (KeeperException e) {
         log.error("{}", e.getMessage(), e);
diff --git a/server/base/src/main/java/org/apache/accumulo/server/security/handler/ZKAuthorizor.java b/server/base/src/main/java/org/apache/accumulo/server/security/handler/ZKAuthorizor.java
index 8c0691d86c0..5d18ac46253 100644
--- a/server/base/src/main/java/org/apache/accumulo/server/security/handler/ZKAuthorizor.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/security/handler/ZKAuthorizor.java
@@ -49,7 +49,7 @@ public class ZKAuthorizor implements Authorizor {
   @Override
   public void initialize(ServerContext context) {
     this.context = context;
-    zooCache = new ZooCache(context.getZooReader(), null);
+    zooCache = new ZooCache(context.getZooSession());
     zkUserPath = context.zkUserPath();
   }
 
@@ -70,7 +70,7 @@ public boolean validSecurityHandlers(Authenticator auth, PermissionHandler pm) {
   @Override
   public void initializeSecurity(TCredentials itw, String rootuser)
       throws AccumuloSecurityException {
-    ZooReaderWriter zoo = context.getZooReaderWriter();
+    ZooReaderWriter zoo = context.getZooSession().asReaderWriter();
 
     // create the root user with no record-level authorizations
     try {
@@ -90,7 +90,7 @@ public void initializeSecurity(TCredentials itw, String rootuser)
 
   @Override
   public void initUser(String user) throws AccumuloSecurityException {
-    ZooReaderWriter zoo = context.getZooReaderWriter();
+    ZooReaderWriter zoo = context.getZooSession().asReaderWriter();
     try {
       zoo.putPersistentData(zkUserPath + "/" + user, new byte[0], NodeExistsPolicy.SKIP);
     } catch (KeeperException e) {
@@ -106,7 +106,7 @@ public void initUser(String user) throws AccumuloSecurityException {
   public void dropUser(String user) throws AccumuloSecurityException {
     try {
       synchronized (zooCache) {
-        ZooReaderWriter zoo = context.getZooReaderWriter();
+        ZooReaderWriter zoo = context.getZooSession().asReaderWriter();
         zoo.recursiveDelete(zkUserPath + "/" + user + ZKUserAuths, NodeMissingPolicy.SKIP);
         zooCache.clear(zkUserPath + "/" + user);
       }
@@ -129,7 +129,8 @@ public void changeAuthorizations(String user, Authorizations authorizations)
     try {
       synchronized (zooCache) {
         zooCache.clear();
-        context.getZooReaderWriter().putPersistentData(zkUserPath + "/" + user + ZKUserAuths,
+        context.getZooSession().asReaderWriter().putPersistentData(
+            zkUserPath + "/" + user + ZKUserAuths,
             ZKSecurityTool.convertAuthorizations(authorizations), NodeExistsPolicy.OVERWRITE);
       }
     } catch (KeeperException e) {
diff --git a/server/base/src/main/java/org/apache/accumulo/server/security/handler/ZKPermHandler.java b/server/base/src/main/java/org/apache/accumulo/server/security/handler/ZKPermHandler.java
index f5b3768a854..1cc933c347f 100644
--- a/server/base/src/main/java/org/apache/accumulo/server/security/handler/ZKPermHandler.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/security/handler/ZKPermHandler.java
@@ -64,8 +64,8 @@ public class ZKPermHandler implements PermissionHandler {
 
   @Override
   public void initialize(ServerContext context) {
-    zooCache = new ZooCache(context.getZooReader(), null);
-    zoo = context.getZooReaderWriter();
+    zooCache = new ZooCache(context.getZooSession());
+    zoo = context.getZooSession().asReaderWriter();
     zkUserPath = context.zkUserPath();
     ZKTablePath = context.getZooKeeperRoot() + Constants.ZTABLES;
     ZKNamespacePath = context.getZooKeeperRoot() + Constants.ZNAMESPACES;
diff --git a/server/base/src/main/java/org/apache/accumulo/server/tables/TableManager.java b/server/base/src/main/java/org/apache/accumulo/server/tables/TableManager.java
index 86e33cc8f2a..3bd0f091deb 100644
--- a/server/base/src/main/java/org/apache/accumulo/server/tables/TableManager.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/tables/TableManager.java
@@ -36,6 +36,7 @@
 import org.apache.accumulo.core.data.NamespaceId;
 import org.apache.accumulo.core.data.TableId;
 import org.apache.accumulo.core.fate.zookeeper.ZooCache;
+import org.apache.accumulo.core.fate.zookeeper.ZooCache.ZooCacheWatcher;
 import org.apache.accumulo.core.fate.zookeeper.ZooReaderWriter;
 import org.apache.accumulo.core.fate.zookeeper.ZooUtil;
 import org.apache.accumulo.core.fate.zookeeper.ZooUtil.NodeExistsPolicy;
@@ -50,7 +51,6 @@
 import org.apache.accumulo.server.util.PropUtil;
 import org.apache.zookeeper.KeeperException;
 import org.apache.zookeeper.WatchedEvent;
-import org.apache.zookeeper.Watcher;
 import org.apache.zookeeper.Watcher.Event.EventType;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -77,7 +77,7 @@ public static void prepareNewNamespaceState(final ServerContext context, Namespa
     final PropStore propStore = context.getPropStore();
     final InstanceId instanceId = context.getInstanceID();
     log.debug("Creating ZooKeeper entries for new namespace {} (ID: {})", namespace, namespaceId);
-    context.getZooReaderWriter().putPersistentData(
+    context.getZooSession().asReaderWriter().putPersistentData(
         context.getZooKeeperRoot() + Constants.ZNAMESPACES + "/" + namespaceId, new byte[0],
         existsPolicy);
     var propKey = NamespacePropKey.of(instanceId, namespaceId);
@@ -113,7 +113,7 @@ public static void prepareNewTableState(ZooReaderWriter zoo, PropStore propStore
   public static void prepareNewTableState(final ServerContext context, TableId tableId,
       NamespaceId namespaceId, String tableName, TableState state, NodeExistsPolicy existsPolicy)
       throws KeeperException, InterruptedException {
-    prepareNewTableState(context.getZooReaderWriter(), context.getPropStore(),
+    prepareNewTableState(context.getZooSession().asReaderWriter(), context.getPropStore(),
         context.getInstanceID(), tableId, namespaceId, tableName, state, existsPolicy);
   }
 
@@ -121,8 +121,8 @@ public TableManager(ServerContext context) {
     this.context = context;
     zkRoot = context.getZooKeeperRoot();
     instanceID = context.getInstanceID();
-    zoo = context.getZooReaderWriter();
-    zooStateCache = new ZooCache(zoo, new TableStateWatcher());
+    zoo = context.getZooSession().asReaderWriter();
+    zooStateCache = new ZooCache(context.getZooSession(), new TableStateWatcher());
     updateTableStateCache();
   }
 
@@ -249,9 +249,9 @@ public boolean addObserver(TableObserver to) {
     }
   }
 
-  private class TableStateWatcher implements Watcher {
+  private class TableStateWatcher implements ZooCacheWatcher {
     @Override
-    public void process(WatchedEvent event) {
+    public void accept(WatchedEvent event) {
       if (log.isTraceEnabled()) {
         log.trace("{}", event);
       }
diff --git a/server/base/src/main/java/org/apache/accumulo/server/tablets/UniqueNameAllocator.java b/server/base/src/main/java/org/apache/accumulo/server/tablets/UniqueNameAllocator.java
index 7aead5026ec..f88ee0fcaef 100644
--- a/server/base/src/main/java/org/apache/accumulo/server/tablets/UniqueNameAllocator.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/tablets/UniqueNameAllocator.java
@@ -57,10 +57,11 @@ public synchronized String getNextName() {
     while (next >= maxAllocated) {
       final int allocate = getAllocation();
       try {
-        byte[] max = context.getZooReaderWriter().mutateExisting(nextNamePath, currentValue -> {
-          long l = Long.parseLong(new String(currentValue, UTF_8), Character.MAX_RADIX);
-          return Long.toString(l + allocate, Character.MAX_RADIX).getBytes(UTF_8);
-        });
+        byte[] max =
+            context.getZooSession().asReaderWriter().mutateExisting(nextNamePath, currentValue -> {
+              long l = Long.parseLong(new String(currentValue, UTF_8), Character.MAX_RADIX);
+              return Long.toString(l + allocate, Character.MAX_RADIX).getBytes(UTF_8);
+            });
 
         maxAllocated = Long.parseLong(new String(max, UTF_8), Character.MAX_RADIX);
         next = maxAllocated - allocate;
diff --git a/server/base/src/main/java/org/apache/accumulo/server/util/Admin.java b/server/base/src/main/java/org/apache/accumulo/server/util/Admin.java
index d24824df4b8..bb350ec5326 100644
--- a/server/base/src/main/java/org/apache/accumulo/server/util/Admin.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/util/Admin.java
@@ -20,7 +20,6 @@
 
 import static java.nio.charset.StandardCharsets.UTF_8;
 import static java.util.Objects.requireNonNull;
-import static org.apache.accumulo.core.fate.AbstractFateStore.createDummyLockID;
 
 import java.io.BufferedWriter;
 import java.io.File;
@@ -42,6 +41,8 @@
 import java.util.SortedSet;
 import java.util.TreeMap;
 import java.util.TreeSet;
+import java.util.UUID;
+import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.atomic.AtomicInteger;
 import java.util.function.BiConsumer;
 import java.util.function.Consumer;
@@ -73,8 +74,9 @@
 import org.apache.accumulo.core.fate.user.UserFateStore;
 import org.apache.accumulo.core.fate.zookeeper.MetaFateStore;
 import org.apache.accumulo.core.fate.zookeeper.ZooCache;
-import org.apache.accumulo.core.fate.zookeeper.ZooReaderWriter;
+import org.apache.accumulo.core.fate.zookeeper.ZooUtil;
 import org.apache.accumulo.core.lock.ServiceLock;
+import org.apache.accumulo.core.lock.ServiceLockData;
 import org.apache.accumulo.core.lock.ServiceLockPaths.AddressSelector;
 import org.apache.accumulo.core.lock.ServiceLockPaths.ServiceLockPath;
 import org.apache.accumulo.core.manager.thrift.FateService;
@@ -91,7 +93,9 @@
 import org.apache.accumulo.core.singletons.SingletonManager.Mode;
 import org.apache.accumulo.core.trace.TraceUtil;
 import org.apache.accumulo.core.util.AddressUtil;
+import org.apache.accumulo.core.util.Halt;
 import org.apache.accumulo.core.util.tables.TableMap;
+import org.apache.accumulo.core.zookeeper.ZooSession;
 import org.apache.accumulo.server.ServerContext;
 import org.apache.accumulo.server.cli.ServerUtilOpts;
 import org.apache.accumulo.server.security.SecurityUtil;
@@ -124,6 +128,7 @@
 @AutoService(KeywordExecutable.class)
 public class Admin implements KeywordExecutable {
   private static final Logger log = LoggerFactory.getLogger(Admin.class);
+  private final CountDownLatch lockAcquiredLatch = new CountDownLatch(1);
 
   static class AdminOpts extends ServerUtilOpts {
     @Parameter(names = {"-f", "--force"},
@@ -331,11 +336,11 @@ static class FateOpsCommand {
     boolean cancel;
 
     @Parameter(names = {"-f", "--fail"},
-        description = "<FateId>... Transition FaTE transaction status to FAILED_IN_PROGRESS (requires Manager to be down)")
+        description = "<FateId>... Transition FaTE transaction status to FAILED_IN_PROGRESS")
     boolean fail;
 
     @Parameter(names = {"-d", "--delete"},
-        description = "<FateId>... Delete FaTE transaction and its associated table locks (requires Manager to be down)")
+        description = "<FateId>... Delete FaTE transaction and its associated table locks")
     boolean delete;
 
     @Parameter(names = {"-p", "--print", "-print", "-l", "--list", "-list"},
@@ -359,6 +364,36 @@ static class FateOpsCommand {
     List<String> instanceTypes = new ArrayList<>();
   }
 
+  class AdminLockWatcher implements ServiceLock.AccumuloLockWatcher {
+    @Override
+    public void lostLock(ServiceLock.LockLossReason reason) {
+      String msg = "Admin lost lock: " + reason.toString();
+      if (reason == ServiceLock.LockLossReason.LOCK_DELETED) {
+        Halt.halt(msg, 0);
+      } else {
+        Halt.halt(msg, 1);
+      }
+    }
+
+    @Override
+    public void unableToMonitorLockNode(Exception e) {
+      String msg = "Admin unable to monitor lock: " + e.getMessage();
+      log.warn(msg);
+      Halt.halt(msg, 1);
+    }
+
+    @Override
+    public void acquiredLock() {
+      lockAcquiredLatch.countDown();
+      log.debug("Acquired ZooKeeper lock for Admin");
+    }
+
+    @Override
+    public void failedToAcquireLock(Exception e) {
+      log.warn("Failed to acquire ZooKeeper lock for Admin, msg: " + e.getMessage());
+    }
+  }
+
   public static void main(String[] args) {
     new Admin().execute(args);
   }
@@ -572,7 +607,8 @@ private static void flushAll(final ClientContext context) {
     try {
       flusher.join(3000);
     } catch (InterruptedException e) {
-      // ignore
+      Thread.currentThread().interrupt();
+      log.warn("Interrupted while waiting to join Flush thread", e);
     }
 
     while (flusher.isAlive() && System.currentTimeMillis() - start < 15000) {
@@ -580,7 +616,8 @@ private static void flushAll(final ClientContext context) {
       try {
         flusher.join(1000);
       } catch (InterruptedException e) {
-        // ignore
+        Thread.currentThread().interrupt();
+        log.warn("Interrupted while waiting to join Flush thread", e);
       }
 
       if (flushCount == flushesStarted.get()) {
@@ -588,6 +625,14 @@ private static void flushAll(final ClientContext context) {
         break;
       }
     }
+
+    flusher.interrupt();
+    try {
+      flusher.join();
+    } catch (InterruptedException e) {
+      Thread.currentThread().interrupt();
+      log.warn("Interrupted while waiting to join Flush thread", e);
+    }
   }
 
   private static void stopServer(final ClientContext context, final boolean tabletServersToo)
@@ -877,50 +922,107 @@ private void executeFateOpsCommand(ServerContext context, FateOpsCommand fateOps
 
     AdminUtil<Admin> admin = new AdminUtil<>(true);
     final String zkRoot = context.getZooKeeperRoot();
-    var zLockManagerPath = context.getServerPaths().createManagerPath();
     var zTableLocksPath = context.getServerPaths().createTableLocksPath();
     String fateZkPath = zkRoot + Constants.ZFATE;
-    ZooReaderWriter zk = context.getZooReaderWriter();
-    MetaFateStore<Admin> mfs = new MetaFateStore<>(fateZkPath, zk, createDummyLockID(), null);
-    UserFateStore<Admin> ufs = new UserFateStore<>(context, createDummyLockID(), null);
-    Map<FateInstanceType,FateStore<Admin>> fateStores =
-        Map.of(FateInstanceType.META, mfs, FateInstanceType.USER, ufs);
-    Map<FateInstanceType,ReadOnlyFateStore<Admin>> readOnlyFateStores =
-        Map.of(FateInstanceType.META, mfs, FateInstanceType.USER, ufs);
-
-    if (fateOpsCommand.cancel) {
-      cancelSubmittedFateTxs(context, fateOpsCommand.fateIdList);
-    } else if (fateOpsCommand.fail) {
-      for (String fateIdStr : fateOpsCommand.fateIdList) {
-        if (!admin.prepFail(fateStores, zk, zLockManagerPath, fateIdStr)) {
-          throw new AccumuloException("Could not fail transaction: " + fateIdStr);
+    var zk = context.getZooSession();
+    ServiceLock adminLock = null;
+    Map<FateInstanceType,FateStore<Admin>> fateStores;
+    Map<FateInstanceType,ReadOnlyFateStore<Admin>> readOnlyFateStores = null;
+
+    try {
+      if (fateOpsCommand.cancel) {
+        cancelSubmittedFateTxs(context, fateOpsCommand.fateIdList);
+      } else if (fateOpsCommand.fail) {
+        adminLock = createAdminLock(context);
+        fateStores = createFateStores(context, zk, fateZkPath, adminLock);
+        for (String fateIdStr : fateOpsCommand.fateIdList) {
+          if (!admin.prepFail(fateStores, fateIdStr)) {
+            throw new AccumuloException("Could not fail transaction: " + fateIdStr);
+          }
+        }
+      } else if (fateOpsCommand.delete) {
+        adminLock = createAdminLock(context);
+        fateStores = createFateStores(context, zk, fateZkPath, adminLock);
+        for (String fateIdStr : fateOpsCommand.fateIdList) {
+          if (!admin.prepDelete(fateStores, fateIdStr)) {
+            throw new AccumuloException("Could not delete transaction: " + fateIdStr);
+          }
+          admin.deleteLocks(zk, zTableLocksPath, fateIdStr);
         }
       }
-    } else if (fateOpsCommand.delete) {
-      for (String fateIdStr : fateOpsCommand.fateIdList) {
-        if (!admin.prepDelete(fateStores, zk, zLockManagerPath, fateIdStr)) {
-          throw new AccumuloException("Could not delete transaction: " + fateIdStr);
+
+      if (fateOpsCommand.print) {
+        final Set<FateId> fateIdFilter = new TreeSet<>();
+        fateOpsCommand.fateIdList.forEach(fateIdStr -> fateIdFilter.add(FateId.from(fateIdStr)));
+        EnumSet<ReadOnlyFateStore.TStatus> statusFilter =
+            getCmdLineStatusFilters(fateOpsCommand.states);
+        EnumSet<FateInstanceType> typesFilter =
+            getCmdLineInstanceTypeFilters(fateOpsCommand.instanceTypes);
+        readOnlyFateStores = createReadOnlyFateStores(context, zk, fateZkPath);
+        admin.print(readOnlyFateStores, zk, zTableLocksPath, new Formatter(System.out),
+            fateIdFilter, statusFilter, typesFilter);
+        // print line break at the end
+        System.out.println();
+      }
+
+      if (fateOpsCommand.summarize) {
+        if (readOnlyFateStores == null) {
+          readOnlyFateStores = createReadOnlyFateStores(context, zk, fateZkPath);
         }
-        admin.deleteLocks(zk, zTableLocksPath, fateIdStr);
+        summarizeFateTx(context, fateOpsCommand, admin, readOnlyFateStores, zTableLocksPath);
+      }
+    } finally {
+      if (adminLock != null) {
+        adminLock.unlock();
       }
     }
+  }
 
-    if (fateOpsCommand.print) {
-      final Set<FateId> fateIdFilter = new TreeSet<>();
-      fateOpsCommand.fateIdList.forEach(fateIdStr -> fateIdFilter.add(FateId.from(fateIdStr)));
-      EnumSet<ReadOnlyFateStore.TStatus> statusFilter =
-          getCmdLineStatusFilters(fateOpsCommand.states);
-      EnumSet<FateInstanceType> typesFilter =
-          getCmdLineInstanceTypeFilters(fateOpsCommand.instanceTypes);
-      admin.print(readOnlyFateStores, zk, zTableLocksPath, new Formatter(System.out), fateIdFilter,
-          statusFilter, typesFilter);
-      // print line break at the end
-      System.out.println();
-    }
+  private Map<FateInstanceType,FateStore<Admin>> createFateStores(ServerContext context,
+      ZooSession zk, String fateZkPath, ServiceLock adminLock)
+      throws InterruptedException, KeeperException {
+    var lockId = adminLock.getLockID();
+    MetaFateStore<Admin> mfs = new MetaFateStore<>(fateZkPath, zk, lockId, null);
+    UserFateStore<Admin> ufs =
+        new UserFateStore<>(context, AccumuloTable.FATE.tableName(), lockId, null);
+    return Map.of(FateInstanceType.META, mfs, FateInstanceType.USER, ufs);
+  }
+
+  private Map<FateInstanceType,ReadOnlyFateStore<Admin>>
+      createReadOnlyFateStores(ServerContext context, ZooSession zk, String fateZkPath)
+          throws InterruptedException, KeeperException {
+    MetaFateStore<Admin> readOnlyMFS = new MetaFateStore<>(fateZkPath, zk, null, null);
+    UserFateStore<Admin> readOnlyUFS =
+        new UserFateStore<>(context, AccumuloTable.FATE.tableName(), null, null);
+    return Map.of(FateInstanceType.META, readOnlyMFS, FateInstanceType.USER, readOnlyUFS);
+  }
 
-    if (fateOpsCommand.summarize) {
-      summarizeFateTx(context, fateOpsCommand, admin, readOnlyFateStores, zTableLocksPath);
+  private ServiceLock createAdminLock(ServerContext context) throws InterruptedException {
+    var zk = context.getZooSession();
+    UUID uuid = UUID.randomUUID();
+    ServiceLockPath slp = context.getServerPaths().createAdminLockPath();
+    ServiceLock adminLock = new ServiceLock(zk, slp, uuid);
+    AdminLockWatcher lw = new AdminLockWatcher();
+    ServiceLockData.ServiceDescriptors descriptors = new ServiceLockData.ServiceDescriptors();
+    descriptors
+        .addService(new ServiceLockData.ServiceDescriptor(uuid, ServiceLockData.ThriftService.NONE,
+            "fake_admin_util_host", Constants.DEFAULT_RESOURCE_GROUP_NAME));
+    ServiceLockData sld = new ServiceLockData(descriptors);
+    String lockPath = slp.toString();
+    String parentLockPath = lockPath.substring(0, lockPath.lastIndexOf("/"));
+
+    try {
+      var zrw = zk.asReaderWriter();
+      zrw.putPersistentData(parentLockPath, new byte[0], ZooUtil.NodeExistsPolicy.SKIP);
+      zrw.putPersistentData(lockPath, new byte[0], ZooUtil.NodeExistsPolicy.SKIP);
+    } catch (KeeperException | InterruptedException e) {
+      throw new IllegalStateException("Error creating path in ZooKeeper", e);
     }
+
+    adminLock.lock(lw, sld);
+    lockAcquiredLatch.await();
+
+    return adminLock;
   }
 
   private void validateFateUserInput(FateOpsCommand cmd) {
@@ -968,7 +1070,7 @@ private void summarizeFateTx(ServerContext context, FateOpsCommand cmd, AdminUti
       Map<FateInstanceType,ReadOnlyFateStore<Admin>> fateStores, ServiceLockPath tableLocksPath)
       throws InterruptedException, AccumuloException, AccumuloSecurityException, KeeperException {
 
-    ZooReaderWriter zk = context.getZooReaderWriter();
+    var zk = context.getZooSession();
     var transactions = admin.getStatus(fateStores, zk, tableLocksPath, null, null, null);
 
     // build id map - relies on unique ids for tables and namespaces
diff --git a/server/base/src/main/java/org/apache/accumulo/server/util/ChangeSecret.java b/server/base/src/main/java/org/apache/accumulo/server/util/ChangeSecret.java
index 5a794c3eebe..c6523cf3ed5 100644
--- a/server/base/src/main/java/org/apache/accumulo/server/util/ChangeSecret.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/util/ChangeSecret.java
@@ -28,13 +28,14 @@
 
 import org.apache.accumulo.core.Constants;
 import org.apache.accumulo.core.conf.AccumuloConfiguration;
+import org.apache.accumulo.core.conf.Property;
 import org.apache.accumulo.core.data.InstanceId;
 import org.apache.accumulo.core.fate.zookeeper.ZooReader;
-import org.apache.accumulo.core.fate.zookeeper.ZooReaderWriter;
 import org.apache.accumulo.core.fate.zookeeper.ZooUtil.NodeExistsPolicy;
 import org.apache.accumulo.core.fate.zookeeper.ZooUtil.NodeMissingPolicy;
 import org.apache.accumulo.core.trace.TraceUtil;
 import org.apache.accumulo.core.volume.Volume;
+import org.apache.accumulo.core.zookeeper.ZooSession;
 import org.apache.accumulo.server.ServerContext;
 import org.apache.accumulo.server.ServerDirs;
 import org.apache.accumulo.server.fs.VolumeManager;
@@ -100,56 +101,74 @@ private static void recurse(ZooReader zoo, String root, Visitor v) {
 
   private static void verifyAccumuloIsDown(ServerContext context, String oldPassword)
       throws Exception {
-    ZooReader zooReader = context.getZooReader().asWriter(oldPassword);
-    String root = context.getZooKeeperRoot();
-    final List<String> ephemerals = new ArrayList<>();
-    recurse(zooReader, root, (zoo, path) -> {
-      Stat stat = zoo.getStatus(path);
-      if (stat.getEphemeralOwner() != 0) {
-        ephemerals.add(path);
-      }
-    });
-    if (!ephemerals.isEmpty()) {
-      System.err.println("The following ephemeral nodes exist, something is still running:");
-      for (String path : ephemerals) {
-        System.err.println(path);
+    var conf = context.getSiteConfiguration();
+    try (var oldZk =
+        new ZooSession(ChangeSecret.class.getSimpleName() + ".verifyAccumuloIsDown(oldPassword)",
+            conf.get(Property.INSTANCE_ZK_HOST),
+            (int) conf.getTimeInMillis(Property.INSTANCE_ZK_TIMEOUT), oldPassword)) {
+      String root = context.getZooKeeperRoot();
+      final List<String> ephemerals = new ArrayList<>();
+      recurse(oldZk.asReaderWriter(), root, (zoo, path) -> {
+        Stat stat = zoo.getStatus(path);
+        if (stat.getEphemeralOwner() != 0) {
+          ephemerals.add(path);
+        }
+      });
+      if (!ephemerals.isEmpty()) {
+        System.err.println("The following ephemeral nodes exist, something is still running:");
+        for (String path : ephemerals) {
+          System.err.println(path);
+        }
+        throw new Exception("Accumulo must be shut down in order to run this tool.");
       }
-      throw new Exception("Accumulo must be shut down in order to run this tool.");
     }
   }
 
   private static void rewriteZooKeeperInstance(final ServerContext context,
       final InstanceId newInstanceId, String oldPass, String newPass) throws Exception {
-    final ZooReaderWriter orig = context.getZooReader().asWriter(oldPass);
-    final ZooReaderWriter new_ = context.getZooReader().asWriter(newPass);
-
-    String root = context.getZooKeeperRoot();
-    recurse(orig, root, (zoo, path) -> {
-      String newPath = path.replace(context.getInstanceID().canonical(), newInstanceId.canonical());
-      byte[] data = zoo.getData(path);
-      List<ACL> acls = orig.getZooKeeper().getACL(path, new Stat());
-      if (acls.containsAll(Ids.READ_ACL_UNSAFE)) {
-        new_.putPersistentData(newPath, data, NodeExistsPolicy.FAIL);
-      } else {
-        // upgrade
-        if (acls.containsAll(Ids.OPEN_ACL_UNSAFE)) {
-          // make user nodes private, they contain the user's password
-          String[] parts = path.split("/");
-          if (parts[parts.length - 2].equals("users")) {
-            new_.putPrivatePersistentData(newPath, data, NodeExistsPolicy.FAIL);
+    var conf = context.getSiteConfiguration();
+    try (
+        var oldZk = new ZooSession(
+            ChangeSecret.class.getSimpleName() + ".rewriteZooKeeperInstance(oldPass)",
+            conf.get(Property.INSTANCE_ZK_HOST),
+            (int) conf.getTimeInMillis(Property.INSTANCE_ZK_TIMEOUT), oldPass);
+        var newZk = new ZooSession(
+            ChangeSecret.class.getSimpleName() + ".rewriteZooKeeperInstance(newPass)",
+            conf.get(Property.INSTANCE_ZK_HOST),
+            (int) conf.getTimeInMillis(Property.INSTANCE_ZK_TIMEOUT), newPass)) {
+
+      final var orig = oldZk.asReaderWriter();
+      final var new_ = newZk.asReaderWriter();
+      String root = context.getZooKeeperRoot();
+      recurse(orig, root, (zoo, path) -> {
+        String newPath =
+            path.replace(context.getInstanceID().canonical(), newInstanceId.canonical());
+        byte[] data = zoo.getData(path);
+        List<ACL> acls = oldZk.getACL(path, new Stat());
+        if (acls.containsAll(Ids.READ_ACL_UNSAFE)) {
+          new_.putPersistentData(newPath, data, NodeExistsPolicy.FAIL);
+        } else {
+          // upgrade
+          if (acls.containsAll(Ids.OPEN_ACL_UNSAFE)) {
+            // make user nodes private, they contain the user's password
+            String[] parts = path.split("/");
+            if (parts[parts.length - 2].equals("users")) {
+              new_.putPrivatePersistentData(newPath, data, NodeExistsPolicy.FAIL);
+            } else {
+              // everything else can have the readable acl
+              new_.putPersistentData(newPath, data, NodeExistsPolicy.FAIL);
+            }
           } else {
-            // everything else can have the readable acl
-            new_.putPersistentData(newPath, data, NodeExistsPolicy.FAIL);
+            new_.putPrivatePersistentData(newPath, data, NodeExistsPolicy.FAIL);
           }
-        } else {
-          new_.putPrivatePersistentData(newPath, data, NodeExistsPolicy.FAIL);
         }
-      }
-    });
-    String path = Constants.ZROOT + Constants.ZINSTANCES + "/" + context.getInstanceName();
-    orig.recursiveDelete(path, NodeMissingPolicy.SKIP);
-    new_.putPersistentData(path, newInstanceId.canonical().getBytes(UTF_8),
-        NodeExistsPolicy.OVERWRITE);
+      });
+      String path = Constants.ZROOT + Constants.ZINSTANCES + "/" + context.getInstanceName();
+      orig.recursiveDelete(path, NodeMissingPolicy.SKIP);
+      new_.putPersistentData(path, newInstanceId.canonical().getBytes(UTF_8),
+          NodeExistsPolicy.OVERWRITE);
+
+    }
   }
 
   private static void updateHdfs(ServerDirs serverDirs, VolumeManager fs, InstanceId newInstanceId)
@@ -201,7 +220,13 @@ private static void checkHdfsAccessPermissions(FileStatus stat, FsAction mode) t
   }
 
   private static void deleteInstance(ServerContext context, String oldPass) throws Exception {
-    ZooReaderWriter orig = context.getZooReader().asWriter(oldPass);
-    orig.recursiveDelete(context.getZooKeeperRoot(), NodeMissingPolicy.SKIP);
+    var conf = context.getSiteConfiguration();
+    try (var oldZk = new ZooSession(ChangeSecret.class.getSimpleName() + ".deleteInstance()",
+        conf.get(Property.INSTANCE_ZK_HOST),
+        (int) conf.getTimeInMillis(Property.INSTANCE_ZK_TIMEOUT), oldPass)) {
+
+      var orig = oldZk.asReaderWriter();
+      orig.recursiveDelete(context.getZooKeeperRoot(), NodeMissingPolicy.SKIP);
+    }
   }
 }
diff --git a/server/base/src/main/java/org/apache/accumulo/server/util/DeleteZooInstance.java b/server/base/src/main/java/org/apache/accumulo/server/util/DeleteZooInstance.java
index 0fdbe4972a8..2b94c45496a 100644
--- a/server/base/src/main/java/org/apache/accumulo/server/util/DeleteZooInstance.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/util/DeleteZooInstance.java
@@ -27,7 +27,6 @@
 
 import org.apache.accumulo.core.Constants;
 import org.apache.accumulo.core.fate.zookeeper.ZooReaderWriter;
-import org.apache.accumulo.core.fate.zookeeper.ZooUtil;
 import org.apache.accumulo.core.fate.zookeeper.ZooUtil.NodeMissingPolicy;
 import org.apache.accumulo.server.ServerContext;
 import org.apache.zookeeper.KeeperException;
@@ -41,9 +40,8 @@ public class DeleteZooInstance {
   public static void execute(final ServerContext context, final boolean clean,
       final String instance, final String auth) throws InterruptedException, KeeperException {
 
-    final ZooReaderWriter zk = context.getZooReaderWriter();
     if (auth != null) {
-      ZooUtil.digestAuth(zk.getZooKeeper(), auth);
+      context.getZooSession().addAccumuloDigestAuth(auth);
     }
 
     if (clean) {
@@ -52,28 +50,29 @@ public static void execute(final ServerContext context, final boolean clean,
         throw new IllegalArgumentException(
             "Cannot set clean flag to true and also an instance name");
       }
-      cleanAllOld(context, zk);
+      cleanAllOld(context);
     } else {
       // If all old is false then we require a specific instance
       Objects.requireNonNull(instance, "Instance name must not be null");
-      removeInstance(context, zk, instance);
+      removeInstance(context, instance);
     }
   }
 
-  private static void removeInstance(ServerContext context, final ZooReaderWriter zk,
-      final String instance) throws InterruptedException, KeeperException {
+  private static void removeInstance(ServerContext context, final String instance)
+      throws InterruptedException, KeeperException {
+    var zrw = context.getZooSession().asReaderWriter();
     // try instance name:
-    Set<String> instances = new HashSet<>(getInstances(zk));
-    Set<String> uuids = new HashSet<>(zk.getChildren(Constants.ZROOT));
+    Set<String> instances = new HashSet<>(getInstances(zrw));
+    Set<String> uuids = new HashSet<>(zrw.getChildren(Constants.ZROOT));
     uuids.remove("instances");
     if (instances.contains(instance)) {
       String path = getInstancePath(instance);
-      byte[] data = zk.getData(path);
+      byte[] data = zrw.getData(path);
       if (data != null) {
         final String instanceId = new String(data, UTF_8);
         if (checkCurrentInstance(context, instance, instanceId)) {
-          deleteRetry(zk, path);
-          deleteRetry(zk, getRootChildPath(instanceId));
+          deleteRetry(zrw, path);
+          deleteRetry(zrw, getRootChildPath(instanceId));
           System.out.println("Deleted instance: " + instance);
         }
       }
@@ -81,33 +80,34 @@ private static void removeInstance(ServerContext context, final ZooReaderWriter
       // look for the real instance name
       for (String zkInstance : instances) {
         String path = getInstancePath(zkInstance);
-        byte[] data = zk.getData(path);
+        byte[] data = zrw.getData(path);
         if (data != null) {
           final String instanceId = new String(data, UTF_8);
           if (instance.equals(instanceId) && checkCurrentInstance(context, instance, instanceId)) {
-            deleteRetry(zk, path);
+            deleteRetry(zrw, path);
             System.out.println("Deleted instance: " + instance);
           }
         }
       }
-      deleteRetry(zk, getRootChildPath(instance));
+      deleteRetry(zrw, getRootChildPath(instance));
     }
   }
 
-  private static void cleanAllOld(ServerContext context, final ZooReaderWriter zk)
+  private static void cleanAllOld(ServerContext context)
       throws InterruptedException, KeeperException {
-    for (String child : zk.getChildren(Constants.ZROOT)) {
+    var zrw = context.getZooSession().asReaderWriter();
+    for (String child : zrw.getChildren(Constants.ZROOT)) {
       if (Constants.ZINSTANCES.equals("/" + child)) {
-        for (String instanceName : getInstances(zk)) {
+        for (String instanceName : getInstances(zrw)) {
           String instanceNamePath = getInstancePath(instanceName);
-          byte[] id = zk.getData(instanceNamePath);
+          byte[] id = zrw.getData(instanceNamePath);
           if (id != null && !new String(id, UTF_8).equals(context.getInstanceID().canonical())) {
-            deleteRetry(zk, instanceNamePath);
+            deleteRetry(zrw, instanceNamePath);
             System.out.println("Deleted instance: " + instanceName);
           }
         }
       } else if (!child.equals(context.getInstanceID().canonical())) {
-        deleteRetry(zk, getRootChildPath(child));
+        deleteRetry(zrw, getRootChildPath(child));
       }
     }
   }
diff --git a/server/base/src/main/java/org/apache/accumulo/server/util/DumpZookeeper.java b/server/base/src/main/java/org/apache/accumulo/server/util/DumpZookeeper.java
index f3b18eda536..bf9e80574e1 100644
--- a/server/base/src/main/java/org/apache/accumulo/server/util/DumpZookeeper.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/util/DumpZookeeper.java
@@ -25,6 +25,7 @@
 
 import org.apache.accumulo.core.cli.ConfigOpts;
 import org.apache.accumulo.core.fate.zookeeper.ZooReaderWriter;
+import org.apache.accumulo.core.zookeeper.ZooSession;
 import org.apache.accumulo.start.spi.KeywordExecutable;
 import org.apache.zookeeper.KeeperException;
 import org.apache.zookeeper.data.Stat;
@@ -35,7 +36,7 @@
 @AutoService(KeywordExecutable.class)
 public class DumpZookeeper implements KeywordExecutable {
 
-  private static ZooReaderWriter zk = null;
+  private static ZooReaderWriter zrw = null;
 
   @Override
   public String keyword() {
@@ -72,11 +73,14 @@ public void execute(String[] args) throws KeeperException, InterruptedException
     opts.parseArgs(DumpZookeeper.class.getName(), args);
 
     PrintStream out = System.out;
-    zk = new ZooReaderWriter(opts.getSiteConfiguration());
-    if (opts.xml) {
-      writeXml(out, opts.root);
-    } else {
-      writeHumanReadable(out, opts.root);
+    var conf = opts.getSiteConfiguration();
+    try (var zk = new ZooSession(getClass().getSimpleName(), conf)) {
+      zrw = zk.asReaderWriter();
+      if (opts.xml) {
+        writeXml(out, opts.root);
+      } else {
+        writeHumanReadable(out, opts.root);
+      }
     }
   }
 
@@ -87,7 +91,7 @@ public static void main(String[] args) throws KeeperException, InterruptedExcept
   private static void writeXml(PrintStream out, String root)
       throws KeeperException, InterruptedException {
     write(out, 0, "<dump root='%s'>", root);
-    for (String child : zk.getChildren(root)) {
+    for (String child : zrw.getChildren(root)) {
       if (!child.equals("zookeeper")) {
         childXml(out, root, child, 1);
       }
@@ -101,7 +105,7 @@ private static void childXml(PrintStream out, String root, String child, int ind
     if (root.endsWith("/")) {
       path = root + child;
     }
-    Stat stat = zk.getStatus(path);
+    Stat stat = zrw.getStatus(path);
     if (stat == null) {
       return;
     }
@@ -125,7 +129,7 @@ private static void childXml(PrintStream out, String root, String child, int ind
         write(out, indent, "<%s name='%s' encoding='%s' value='%s'>", type, child, value.encoding,
             value.value);
       }
-      for (String c : zk.getChildren(path)) {
+      for (String c : zrw.getChildren(path)) {
         childXml(out, path, c, indent + 1);
       }
       write(out, indent, "</node>");
@@ -133,7 +137,7 @@ private static void childXml(PrintStream out, String root, String child, int ind
   }
 
   private static Encoded value(String path) throws KeeperException, InterruptedException {
-    byte[] data = zk.getData(path);
+    byte[] data = zrw.getData(path);
     for (byte element : data) {
       // does this look like simple ascii?
       if (element < ' ' || element > '~') {
@@ -153,7 +157,7 @@ private static void write(PrintStream out, int indent, String fmt, Object... arg
   private static void writeHumanReadable(PrintStream out, String root)
       throws KeeperException, InterruptedException {
     write(out, 0, "%s:", root);
-    for (String child : zk.getChildren(root)) {
+    for (String child : zrw.getChildren(root)) {
       if (!child.equals("zookeeper")) {
         childHumanReadable(out, root, child, 1);
       }
@@ -166,7 +170,7 @@ private static void childHumanReadable(PrintStream out, String root, String chil
     if (root.endsWith("/")) {
       path = root + child;
     }
-    Stat stat = zk.getStatus(path);
+    Stat stat = zrw.getStatus(path);
     if (stat == null) {
       return;
     }
@@ -180,7 +184,7 @@ private static void childHumanReadable(PrintStream out, String root, String chil
       write(out, indent, "%s:  %s", node, value(path).value);
     }
     if (stat.getNumChildren() > 0) {
-      for (String c : zk.getChildren(path)) {
+      for (String c : zrw.getChildren(path)) {
         childHumanReadable(out, path, c, indent + 1);
       }
     }
diff --git a/server/base/src/main/java/org/apache/accumulo/server/util/ListInstances.java b/server/base/src/main/java/org/apache/accumulo/server/util/ListInstances.java
index af98fd0d201..e65a5e02a61 100644
--- a/server/base/src/main/java/org/apache/accumulo/server/util/ListInstances.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/util/ListInstances.java
@@ -40,6 +40,7 @@
 import org.apache.accumulo.core.lock.ServiceLockData;
 import org.apache.accumulo.core.lock.ServiceLockData.ThriftService;
 import org.apache.accumulo.core.lock.ServiceLockPaths;
+import org.apache.accumulo.core.zookeeper.ZooSession;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -68,7 +69,7 @@ static class Opts extends Help {
   static Opts opts = new Opts();
   static int errors = 0;
 
-  public static void main(String[] args) {
+  public static void main(String[] args) throws InterruptedException {
     opts.parseArgs(ListInstances.class.getName(), args);
 
     if (opts.keepers == null) {
@@ -81,43 +82,46 @@ public static void main(String[] args) {
     boolean printErrors = opts.printErrors;
 
     listInstances(keepers, printAll, printErrors);
-
   }
 
-  static synchronized void listInstances(String keepers, boolean printAll, boolean printErrors) {
+  static synchronized void listInstances(String keepers, boolean printAll, boolean printErrors)
+      throws InterruptedException {
     errors = 0;
 
     System.out.println("INFO : Using ZooKeepers " + keepers);
-    ZooReader rdr = new ZooReader(keepers, ZOOKEEPER_TIMER_MILLIS);
-    ZooCache cache = new ZooCache(rdr, null);
+    try (var zk = new ZooSession(ListInstances.class.getSimpleName(), keepers,
+        ZOOKEEPER_TIMER_MILLIS, null)) {
+      ZooReader rdr = zk.asReader();
+      ZooCache cache = new ZooCache(zk);
 
-    TreeMap<String,InstanceId> instanceNames = getInstanceNames(rdr, printErrors);
+      TreeMap<String,InstanceId> instanceNames = getInstanceNames(rdr, printErrors);
 
-    System.out.println();
-    printHeader();
+      System.out.println();
+      printHeader();
 
-    for (Entry<String,InstanceId> entry : instanceNames.entrySet()) {
-      printInstanceInfo(cache, entry.getKey(), entry.getValue(), printErrors);
-    }
+      for (Entry<String,InstanceId> entry : instanceNames.entrySet()) {
+        printInstanceInfo(cache, entry.getKey(), entry.getValue(), printErrors);
+      }
 
-    TreeSet<InstanceId> instancedIds = getInstanceIDs(rdr, printErrors);
-    instancedIds.removeAll(instanceNames.values());
+      TreeSet<InstanceId> instancedIds = getInstanceIDs(rdr, printErrors);
+      instancedIds.removeAll(instanceNames.values());
 
-    if (printAll) {
-      for (InstanceId uuid : instancedIds) {
-        printInstanceInfo(cache, null, uuid, printErrors);
+      if (printAll) {
+        for (InstanceId uuid : instancedIds) {
+          printInstanceInfo(cache, null, uuid, printErrors);
+        }
+      } else if (!instancedIds.isEmpty()) {
+        System.out.println();
+        System.out.println("INFO : " + instancedIds.size()
+            + " unnamed instances were not printed, run with --print-all to see all instances");
+      } else {
+        System.out.println();
       }
-    } else if (!instancedIds.isEmpty()) {
-      System.out.println();
-      System.out.println("INFO : " + instancedIds.size()
-          + " unnamed instances were not printed, run with --print-all to see all instances");
-    } else {
-      System.out.println();
-    }
 
-    if (!printErrors && errors > 0) {
-      System.err.println(
-          "WARN : There were " + errors + " errors, run with --print-errors to see more info");
+      if (!printErrors && errors > 0) {
+        System.err.println(
+            "WARN : There were " + errors + " errors, run with --print-errors to see more info");
+      }
     }
   }
 
diff --git a/server/base/src/main/java/org/apache/accumulo/server/util/PropUtil.java b/server/base/src/main/java/org/apache/accumulo/server/util/PropUtil.java
index 85e03ea1c29..b49acae2481 100644
--- a/server/base/src/main/java/org/apache/accumulo/server/util/PropUtil.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/util/PropUtil.java
@@ -39,7 +39,7 @@ private PropUtil() {}
    */
   public static void setProperties(final ServerContext context, final PropStoreKey<?> propStoreKey,
       final Map<String,String> properties) throws IllegalArgumentException {
-    PropUtil.validateProperties(propStoreKey, properties);
+    PropUtil.validateProperties(context, propStoreKey, properties);
     context.getPropStore().putAll(propStoreKey, properties);
   }
 
@@ -51,12 +51,13 @@ public static void removeProperties(final ServerContext context,
   public static void replaceProperties(final ServerContext context,
       final PropStoreKey<?> propStoreKey, final long version, final Map<String,String> properties)
       throws IllegalArgumentException {
-    PropUtil.validateProperties(propStoreKey, properties);
+    PropUtil.validateProperties(context, propStoreKey, properties);
     context.getPropStore().replaceAll(propStoreKey, version, properties);
   }
 
-  protected static void validateProperties(final PropStoreKey<?> propStoreKey,
-      final Map<String,String> properties) throws IllegalArgumentException {
+  protected static void validateProperties(final ServerContext context,
+      final PropStoreKey<?> propStoreKey, final Map<String,String> properties)
+      throws IllegalArgumentException {
     for (Map.Entry<String,String> prop : properties.entrySet()) {
       if (!Property.isValidProperty(prop.getKey(), prop.getValue())) {
         String exceptionMessage = "Invalid property for : ";
@@ -66,10 +67,12 @@ protected static void validateProperties(final PropStoreKey<?> propStoreKey,
         throw new IllegalArgumentException(exceptionMessage + propStoreKey + " name: "
             + prop.getKey() + ", value: " + prop.getValue());
       } else if (prop.getKey().equals(Property.TABLE_CLASSLOADER_CONTEXT.getKey())
-          && !Property.TABLE_CLASSLOADER_CONTEXT.getDefaultValue().equals(prop.getValue())
-          && !ClassLoaderUtil.isValidContext(prop.getValue())) {
-        throw new IllegalArgumentException(
-            "Unable to resolve classloader for context: " + prop.getValue());
+          && !Property.TABLE_CLASSLOADER_CONTEXT.getDefaultValue().equals(prop.getValue())) {
+        ClassLoaderUtil.initContextFactory(context.getConfiguration());
+        if (!ClassLoaderUtil.isValidContext(prop.getValue())) {
+          throw new IllegalArgumentException(
+              "Unable to resolve classloader for context: " + prop.getValue());
+        }
       }
     }
   }
diff --git a/server/base/src/main/java/org/apache/accumulo/server/util/RestoreZookeeper.java b/server/base/src/main/java/org/apache/accumulo/server/util/RestoreZookeeper.java
index ff09cd3b45f..ab33f0c7dcc 100644
--- a/server/base/src/main/java/org/apache/accumulo/server/util/RestoreZookeeper.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/util/RestoreZookeeper.java
@@ -32,6 +32,7 @@
 import org.apache.accumulo.core.conf.AccumuloConfiguration;
 import org.apache.accumulo.core.fate.zookeeper.ZooReaderWriter;
 import org.apache.accumulo.core.fate.zookeeper.ZooUtil.NodeExistsPolicy;
+import org.apache.accumulo.core.zookeeper.ZooSession;
 import org.apache.zookeeper.KeeperException;
 import org.xml.sax.Attributes;
 import org.xml.sax.helpers.DefaultHandler;
@@ -109,20 +110,21 @@ private void create(String path, String value, String encoding) {
       justification = "code runs in same security context as user who provided input")
   public static void execute(final AccumuloConfiguration conf, final String file,
       final boolean overwrite) throws Exception {
-    var zoo = new ZooReaderWriter(conf);
+    try (var zk = new ZooSession(RestoreZookeeper.class.getSimpleName(), conf)) {
+      var zrw = zk.asReaderWriter();
 
-    InputStream in = System.in;
-    if (file != null) {
-      in = new FileInputStream(file);
-    }
+      InputStream in = System.in;
+      if (file != null) {
+        in = new FileInputStream(file);
+      }
 
-    SAXParserFactory factory = SAXParserFactory.newInstance();
-    // Prevent external entities by failing on any doctypes. We don't expect any doctypes, so this
-    // is a simple switch to remove any chance of external entities causing problems.
-    factory.setFeature("http://apache.org/xml/features/disallow-doctype-decl", true);
-    SAXParser parser = factory.newSAXParser();
-    parser.parse(in, new Restore(zoo, overwrite));
-    in.close();
+      SAXParserFactory factory = SAXParserFactory.newInstance();
+      // Prevent external entities by failing on any doctypes. We don't expect any doctypes, so this
+      // is a simple switch to remove any chance of external entities causing problems.
+      factory.setFeature("http://apache.org/xml/features/disallow-doctype-decl", true);
+      SAXParser parser = factory.newSAXParser();
+      parser.parse(in, new Restore(zrw, overwrite));
+      in.close();
+    }
   }
-
 }
diff --git a/server/base/src/main/java/org/apache/accumulo/server/util/ServiceStatusCmd.java b/server/base/src/main/java/org/apache/accumulo/server/util/ServiceStatusCmd.java
index f950975c802..aea14d09ffd 100644
--- a/server/base/src/main/java/org/apache/accumulo/server/util/ServiceStatusCmd.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/util/ServiceStatusCmd.java
@@ -57,19 +57,18 @@ public ServiceStatusCmd() {}
    */
   public void execute(final ServerContext context, final Opts opts) {
 
-    ZooReader zooReader = context.getZooReader();
-
-    final String zooRoot = context.getZooKeeperRoot();
-    LOG.trace("zooRoot: {}", zooRoot);
+    if (LOG.isTraceEnabled()) {
+      LOG.trace("zooRoot: {}", context.getZooKeeperRoot());
+    }
 
     final Map<ServiceStatusReport.ReportKey,StatusSummary> services = new TreeMap<>();
 
-    services.put(ServiceStatusReport.ReportKey.MANAGER, getManagerStatus(zooReader, context));
-    services.put(ServiceStatusReport.ReportKey.MONITOR, getMonitorStatus(zooReader, context));
+    services.put(ServiceStatusReport.ReportKey.MANAGER, getManagerStatus(context));
+    services.put(ServiceStatusReport.ReportKey.MONITOR, getMonitorStatus(context));
     services.put(ServiceStatusReport.ReportKey.T_SERVER, getTServerStatus(context));
     services.put(ServiceStatusReport.ReportKey.S_SERVER, getScanServerStatus(context));
     services.put(ServiceStatusReport.ReportKey.COMPACTOR, getCompactorStatus(context));
-    services.put(ServiceStatusReport.ReportKey.GC, getGcStatus(zooReader, context));
+    services.put(ServiceStatusReport.ReportKey.GC, getGcStatus(context));
 
     ServiceStatusReport report = new ServiceStatusReport(services, opts.noHosts);
 
@@ -87,9 +86,9 @@ public void execute(final ServerContext context, final Opts opts) {
    * lock data providing a service descriptor with host and port.
    */
   @VisibleForTesting
-  StatusSummary getManagerStatus(ZooReader zooReader, ServerContext context) {
+  StatusSummary getManagerStatus(ServerContext context) {
     String lockPath = context.getServerPaths().createManagerPath().toString();
-    return getStatusSummary(ServiceStatusReport.ReportKey.MANAGER, zooReader, lockPath);
+    return getStatusSummary(ServiceStatusReport.ReportKey.MANAGER, context, lockPath);
   }
 
   /**
@@ -97,9 +96,9 @@ StatusSummary getManagerStatus(ZooReader zooReader, ServerContext context) {
    * lock data providing a service descriptor with host and port.
    */
   @VisibleForTesting
-  StatusSummary getMonitorStatus(final ZooReader zooReader, ServerContext context) {
+  StatusSummary getMonitorStatus(ServerContext context) {
     String lockPath = context.getServerPaths().createMonitorPath().toString();
-    return getStatusSummary(ServiceStatusReport.ReportKey.MONITOR, zooReader, lockPath);
+    return getStatusSummary(ServiceStatusReport.ReportKey.MONITOR, context, lockPath);
   }
 
   /**
@@ -141,9 +140,9 @@ StatusSummary getScanServerStatus(ServerContext context) {
    * providing GC_CLIENT=host:port
    */
   @VisibleForTesting
-  StatusSummary getGcStatus(final ZooReader zooReader, ServerContext context) {
+  StatusSummary getGcStatus(ServerContext context) {
     String lockPath = context.getServerPaths().createGarbageCollectorPath().toString();
-    return getStatusSummary(ServiceStatusReport.ReportKey.GC, zooReader, lockPath);
+    return getStatusSummary(ServiceStatusReport.ReportKey.GC, context, lockPath);
   }
 
   /**
@@ -170,8 +169,8 @@ StatusSummary getCompactorStatus(ServerContext context) {
    * @return service status
    */
   private StatusSummary getStatusSummary(ServiceStatusReport.ReportKey displayNames,
-      ZooReader zooReader, String lockPath) {
-    var result = readAllNodesData(zooReader, lockPath);
+      ServerContext context, String lockPath) {
+    var result = readAllNodesData(context.getZooSession().asReader(), lockPath);
     Map<String,Set<String>> byGroup = new TreeMap<>();
     result.getData().forEach(data -> {
       ServiceLockData.ServiceDescriptors sld = ServiceLockData.parseServiceDescriptors(data);
@@ -183,30 +182,6 @@ private StatusSummary getStatusSummary(ServiceStatusReport.ReportKey displayName
     return new StatusSummary(displayNames, byGroup.keySet(), byGroup, result.getErrorCount());
   }
 
-  /**
-   * Read the node names from ZooKeeper. Exceptions are counted but ignored.
-   *
-   * @return Result with error count, Set of the node names.
-   */
-  @VisibleForTesting
-  Result<Set<String>> readNodeNames(final ZooReader zooReader, final String path) {
-    Set<String> nodeNames = new TreeSet<>();
-    final AtomicInteger errorCount = new AtomicInteger(0);
-    try {
-      var children = zooReader.getChildren(path);
-      if (children != null) {
-        nodeNames.addAll(children);
-      }
-    } catch (KeeperException | InterruptedException ex) {
-      if (Thread.currentThread().isInterrupted()) {
-        Thread.currentThread().interrupt();
-        throw new IllegalStateException(ex);
-      }
-      errorCount.incrementAndGet();
-    }
-    return new Result<>(errorCount.get(), nodeNames);
-  }
-
   /**
    * Read the data from a ZooKeeper node, tracking if an error occurred. ZooKeeper's exceptions are
    * counted but otherwise ignored.
diff --git a/server/base/src/main/java/org/apache/accumulo/server/util/SystemPropUtil.java b/server/base/src/main/java/org/apache/accumulo/server/util/SystemPropUtil.java
index 0bb2e8a8e3b..b8589ab21ab 100644
--- a/server/base/src/main/java/org/apache/accumulo/server/util/SystemPropUtil.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/util/SystemPropUtil.java
@@ -37,7 +37,8 @@ public class SystemPropUtil {
   public static void setSystemProperty(ServerContext context, String property, String value)
       throws IllegalArgumentException {
     final SystemPropKey key = SystemPropKey.of(context);
-    context.getPropStore().putAll(key, Map.of(validateSystemProperty(key, property, value), value));
+    context.getPropStore().putAll(key,
+        Map.of(validateSystemProperty(context, key, property, value), value));
   }
 
   public static void modifyProperties(ServerContext context, long version,
@@ -46,7 +47,7 @@ public static void modifyProperties(ServerContext context, long version,
     final Map<String,
         String> checkedProperties = properties.entrySet().stream()
             .collect(Collectors.toMap(
-                entry -> validateSystemProperty(key, entry.getKey(), entry.getValue()),
+                entry -> validateSystemProperty(context, key, entry.getKey(), entry.getValue()),
                 Map.Entry::getValue));
     context.getPropStore().replaceAll(key, version, checkedProperties);
   }
@@ -66,8 +67,8 @@ public static void removePropWithoutDeprecationWarning(ServerContext context, St
     context.getPropStore().removeProperties(SystemPropKey.of(context), List.of(property));
   }
 
-  private static String validateSystemProperty(SystemPropKey key, String property,
-      final String value) throws IllegalArgumentException {
+  private static String validateSystemProperty(ServerContext context, SystemPropKey key,
+      String property, final String value) throws IllegalArgumentException {
     // Retrieve the replacement name for this property, if there is one.
     // Do this before we check if the name is a valid zookeeper name.
     final var original = property;
@@ -88,7 +89,7 @@ private static String validateSystemProperty(SystemPropKey key, String property,
       throw iae;
     }
     if (Property.isValidTablePropertyKey(property)) {
-      PropUtil.validateProperties(key, Map.of(property, value));
+      PropUtil.validateProperties(context, key, Map.of(property, value));
     }
 
     // Find the property taking prefix into account
diff --git a/server/base/src/main/java/org/apache/accumulo/server/util/TabletServerLocks.java b/server/base/src/main/java/org/apache/accumulo/server/util/TabletServerLocks.java
index 369be4bee33..f075f50cf9a 100644
--- a/server/base/src/main/java/org/apache/accumulo/server/util/TabletServerLocks.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/util/TabletServerLocks.java
@@ -39,7 +39,7 @@ public static void execute(final ServerContext context, final String lock, final
       throws Exception {
 
     ZooCache cache = context.getZooCache();
-    ZooReaderWriter zoo = context.getZooReaderWriter();
+    ZooReaderWriter zoo = context.getZooSession().asReaderWriter();
 
     if (delete == null) {
       Set<ServiceLockPath> tabletServers =
diff --git a/server/base/src/main/java/org/apache/accumulo/server/util/ZooZap.java b/server/base/src/main/java/org/apache/accumulo/server/util/ZooZap.java
index 304af5d5ef7..17706c1c9cb 100644
--- a/server/base/src/main/java/org/apache/accumulo/server/util/ZooZap.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/util/ZooZap.java
@@ -33,6 +33,7 @@
 import org.apache.accumulo.core.lock.ServiceLockPaths.ServiceLockPath;
 import org.apache.accumulo.core.singletons.SingletonManager;
 import org.apache.accumulo.core.singletons.SingletonManager.Mode;
+import org.apache.accumulo.core.zookeeper.ZooSession;
 import org.apache.accumulo.server.ServerContext;
 import org.apache.accumulo.server.security.SecurityUtil;
 import org.apache.accumulo.start.spi.KeywordExecutable;
@@ -86,6 +87,19 @@ public static void main(String[] args) throws Exception {
 
   @Override
   public void execute(String[] args) throws Exception {
+    try {
+      var siteConf = SiteConfiguration.auto();
+      // Login as the server on secure HDFS
+      if (siteConf.getBoolean(Property.INSTANCE_RPC_SASL_ENABLED)) {
+        SecurityUtil.serverLogin(siteConf);
+      }
+      zap(siteConf, args);
+    } finally {
+      SingletonManager.setMode(Mode.CLOSED);
+    }
+  }
+
+  public void zap(SiteConfiguration siteConf, String... args) {
     Opts opts = new Opts();
     opts.parseArgs(keyword(), args);
 
@@ -94,19 +108,18 @@ public void execute(String[] args) throws Exception {
       return;
     }
 
-    try {
-      var siteConf = SiteConfiguration.auto();
+    try (var zk = new ZooSession(getClass().getSimpleName(), siteConf)) {
       // Login as the server on secure HDFS
       if (siteConf.getBoolean(Property.INSTANCE_RPC_SASL_ENABLED)) {
         SecurityUtil.serverLogin(siteConf);
       }
 
       try (var context = new ServerContext(siteConf)) {
-        final ZooReaderWriter zoo = context.getZooReaderWriter();
+        final ZooReaderWriter zrw = context.getZooSession().asReaderWriter();
         if (opts.zapManager) {
           ServiceLockPath managerLockPath = context.getServerPaths().createManagerPath();
           try {
-            zapDirectory(zoo, managerLockPath, opts);
+            zapDirectory(zrw, managerLockPath, opts);
           } catch (KeeperException | InterruptedException e) {
             e.printStackTrace();
           }
@@ -128,10 +141,10 @@ public void execute(String[] args) throws Exception {
               message("Deleting " + tserverPath + " from zookeeper", opts);
 
               if (opts.zapManager) {
-                zoo.recursiveDelete(tserverPath.toString(), NodeMissingPolicy.SKIP);
+                zrw.recursiveDelete(tserverPath.toString(), NodeMissingPolicy.SKIP);
               } else {
-                if (!zoo.getChildren(tserverPath.toString()).isEmpty()) {
-                  if (!ServiceLock.deleteLock(zoo, tserverPath, "tserver")) {
+                if (!zrw.getChildren(tserverPath.toString()).isEmpty()) {
+                  if (!ServiceLock.deleteLock(zrw, tserverPath, "tserver")) {
                     message("Did not delete " + tserverPath, opts);
                   }
                 }
@@ -151,7 +164,7 @@ public void execute(String[] args) throws Exception {
           try {
             for (String group : compactorResourceGroupPaths) {
               message("Deleting " + group + " from zookeeper", opts);
-              zoo.recursiveDelete(group, NodeMissingPolicy.SKIP);
+              zrw.recursiveDelete(group, NodeMissingPolicy.SKIP);
             }
           } catch (KeeperException | InterruptedException e) {
             log.error("Error deleting compactors from zookeeper, {}", e.getMessage(), e);
@@ -165,8 +178,8 @@ public void execute(String[] args) throws Exception {
                 context.getServerPaths().getScanServer(rgp, AddressSelector.all(), false);
             for (ServiceLockPath sserverPath : sserverLockPaths) {
               message("Deleting " + sserverPath + " from zookeeper", opts);
-              if (!zoo.getChildren(sserverPath.toString()).isEmpty()) {
-                ServiceLock.deleteLock(zoo, sserverPath);
+              if (!zrw.getChildren(sserverPath.toString()).isEmpty()) {
+                ServiceLock.deleteLock(zrw, sserverPath);
               }
             }
           } catch (KeeperException | InterruptedException e) {
@@ -175,10 +188,7 @@ public void execute(String[] args) throws Exception {
         }
       }
 
-    } finally {
-      SingletonManager.setMode(Mode.CLOSED);
     }
-
   }
 
   private static void zapDirectory(ZooReaderWriter zoo, ServiceLockPath path, Opts opts)
diff --git a/server/base/src/main/java/org/apache/accumulo/server/util/checkCommand/RootMetadataCheckRunner.java b/server/base/src/main/java/org/apache/accumulo/server/util/checkCommand/RootMetadataCheckRunner.java
index 99dee426ca4..9ebc3189124 100644
--- a/server/base/src/main/java/org/apache/accumulo/server/util/checkCommand/RootMetadataCheckRunner.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/util/checkCommand/RootMetadataCheckRunner.java
@@ -87,7 +87,7 @@ public Admin.CheckCommand.CheckStatus runCheck(ServerContext context, ServerUtil
 
     log.trace("********** Looking for invalid columns **********");
     final String path = context.getZooKeeperRoot() + RootTable.ZROOT_TABLET;
-    final String json = new String(context.getZooReader().getData(path), UTF_8);
+    final String json = new String(context.getZooSession().asReader().getData(path), UTF_8);
     final var rtm = new RootTabletMetadata(json);
     status = checkColumns(context, rtm.getKeyValues().iterator(), status);
 
@@ -100,7 +100,7 @@ public Admin.CheckCommand.CheckStatus checkRequiredColumns(ServerContext context
       Admin.CheckCommand.CheckStatus status)
       throws TableNotFoundException, InterruptedException, KeeperException {
     final String path = context.getZooKeeperRoot() + RootTable.ZROOT_TABLET;
-    final String json = new String(context.getZooReader().getData(path), UTF_8);
+    final String json = new String(context.getZooSession().asReader().getData(path), UTF_8);
     final var rtm = new RootTabletMetadata(json);
     final Set<Text> rowsSeen = new HashSet<>();
     final Set<ColumnFQ> requiredColFQs = new HashSet<>(requiredColFQs());
diff --git a/server/base/src/main/java/org/apache/accumulo/server/util/checkCommand/TableLocksCheckRunner.java b/server/base/src/main/java/org/apache/accumulo/server/util/checkCommand/TableLocksCheckRunner.java
index c7c04079c56..f8efa64c6ae 100644
--- a/server/base/src/main/java/org/apache/accumulo/server/util/checkCommand/TableLocksCheckRunner.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/util/checkCommand/TableLocksCheckRunner.java
@@ -24,13 +24,11 @@
 import org.apache.accumulo.core.Constants;
 import org.apache.accumulo.core.client.AccumuloException;
 import org.apache.accumulo.core.client.AccumuloSecurityException;
-import org.apache.accumulo.core.fate.AbstractFateStore;
 import org.apache.accumulo.core.fate.AdminUtil;
 import org.apache.accumulo.core.fate.FateId;
 import org.apache.accumulo.core.fate.FateInstanceType;
 import org.apache.accumulo.core.fate.user.UserFateStore;
 import org.apache.accumulo.core.fate.zookeeper.MetaFateStore;
-import org.apache.accumulo.core.fate.zookeeper.ZooReaderWriter;
 import org.apache.accumulo.core.metadata.AccumuloTable;
 import org.apache.accumulo.server.ServerContext;
 import org.apache.accumulo.server.cli.ServerUtilOpts;
@@ -65,17 +63,17 @@ private static Admin.CheckCommand.CheckStatus checkTableLocks(ServerContext cont
     final String zkRoot = context.getZooKeeperRoot();
     final var zTableLocksPath = context.getServerPaths().createTableLocksPath();
     final String fateZkPath = zkRoot + Constants.ZFATE;
-    final ZooReaderWriter zk = context.getZooReaderWriter();
-    final MetaFateStore<Admin> mfs =
-        new MetaFateStore<>(fateZkPath, zk, AbstractFateStore.createDummyLockID(), null);
-    final UserFateStore<Admin> ufs = new UserFateStore<>(context, AccumuloTable.FATE.tableName(),
-        AbstractFateStore.createDummyLockID(), null);
+    final var zk = context.getZooSession();
+    final MetaFateStore<Admin> mfs = new MetaFateStore<>(fateZkPath, zk, null, null);
+    final UserFateStore<Admin> ufs =
+        new UserFateStore<>(context, AccumuloTable.FATE.tableName(), null, null);
 
     log.trace("Ensuring table and namespace locks are valid...");
 
     var tableIds = context.tableOperations().tableIdMap().values();
     var namespaceIds = context.namespaceOperations().namespaceIdMap().values();
-    List<String> lockedIds = zk.getChildren(zTableLocksPath.toString());
+    List<String> lockedIds =
+        context.getZooSession().asReader().getChildren(zTableLocksPath.toString());
     boolean locksExist = !lockedIds.isEmpty();
 
     if (locksExist) {
diff --git a/server/base/src/main/java/org/apache/accumulo/server/util/fateCommand/FateSummaryReport.java b/server/base/src/main/java/org/apache/accumulo/server/util/fateCommand/FateSummaryReport.java
index f17695265aa..13b252e693d 100644
--- a/server/base/src/main/java/org/apache/accumulo/server/util/fateCommand/FateSummaryReport.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/util/fateCommand/FateSummaryReport.java
@@ -33,6 +33,7 @@
 import java.util.TreeSet;
 
 import org.apache.accumulo.core.fate.AdminUtil;
+import org.apache.accumulo.core.fate.Fate;
 import org.apache.accumulo.core.fate.FateId;
 import org.apache.accumulo.core.fate.FateInstanceType;
 import org.apache.accumulo.core.fate.ReadOnlyFateStore;
@@ -87,8 +88,9 @@ public void gatherTxnStatus(AdminUtil.TransactionStatus txnStatus) {
     }
     String top = txnStatus.getTop();
     stepCounts.merge(Objects.requireNonNullElse(top, "?"), 1, Integer::sum);
-    String runningRepo = txnStatus.getTxName();
-    cmdCounts.merge(Objects.requireNonNullElse(runningRepo, "?"), 1, Integer::sum);
+    Fate.FateOperation runningRepo = txnStatus.getTxName();
+
+    cmdCounts.merge(runningRepo == null ? "?" : runningRepo.name(), 1, Integer::sum);
 
     // filter transactions if provided
     if (!fateIdFilter.isEmpty() && !fateIdFilter.contains(txnStatus.getFateId().canonical())) {
diff --git a/server/base/src/main/java/org/apache/accumulo/server/util/fateCommand/FateTxnDetails.java b/server/base/src/main/java/org/apache/accumulo/server/util/fateCommand/FateTxnDetails.java
index ddf5beac8f3..8d1218e6183 100644
--- a/server/base/src/main/java/org/apache/accumulo/server/util/fateCommand/FateTxnDetails.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/util/fateCommand/FateTxnDetails.java
@@ -74,7 +74,7 @@ public FateTxnDetails(final long reportTime, final AdminUtil.TransactionStatus t
       step = txnStatus.getTop();
     }
     if (txnStatus.getTxName() != null) {
-      txName = txnStatus.getTxName();
+      txName = txnStatus.getTxName().name();
     }
     if (txnStatus.getFateId() != null) {
       fateId = txnStatus.getFateId().canonical();
diff --git a/server/base/src/main/java/org/apache/accumulo/server/zookeeper/DistributedWorkQueue.java b/server/base/src/main/java/org/apache/accumulo/server/zookeeper/DistributedWorkQueue.java
index 73c9796ab32..fb374ce2293 100644
--- a/server/base/src/main/java/org/apache/accumulo/server/zookeeper/DistributedWorkQueue.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/zookeeper/DistributedWorkQueue.java
@@ -188,7 +188,7 @@ public DistributedWorkQueue(String path, AccumuloConfiguration config, ServerCon
     this.context = context;
     this.timerInitialDelay = timerInitialDelay;
     this.timerPeriod = timerPeriod;
-    zoo = context.getZooReaderWriter();
+    zoo = context.getZooSession().asReaderWriter();
   }
 
   public ServerContext getContext() {
diff --git a/server/base/src/test/java/org/apache/accumulo/server/MockServerContext.java b/server/base/src/test/java/org/apache/accumulo/server/MockServerContext.java
index 338acf94860..46d3a7966b6 100644
--- a/server/base/src/test/java/org/apache/accumulo/server/MockServerContext.java
+++ b/server/base/src/test/java/org/apache/accumulo/server/MockServerContext.java
@@ -23,13 +23,13 @@
 
 import java.util.Properties;
 
-import org.apache.accumulo.core.Constants;
 import org.apache.accumulo.core.conf.ConfigurationCopy;
 import org.apache.accumulo.core.conf.DefaultConfiguration;
 import org.apache.accumulo.core.conf.Property;
 import org.apache.accumulo.core.data.InstanceId;
 import org.apache.accumulo.core.fate.zookeeper.ZooReaderWriter;
 import org.apache.accumulo.core.fate.zookeeper.ZooUtil;
+import org.apache.accumulo.core.zookeeper.ZooSession;
 import org.apache.accumulo.server.conf.store.PropStore;
 import org.easymock.EasyMock;
 
@@ -47,22 +47,20 @@ public static ServerContext get() {
     return context;
   }
 
-  public static ServerContext getWithZK(InstanceId instanceID, String zk, int zkTimeout) {
+  public static ServerContext getWithMockZK(ZooSession zk) {
     var sc = get();
-    expect(sc.getZooKeeperRoot()).andReturn(ZooUtil.getRoot(instanceID)).anyTimes();
-    expect(sc.getInstanceID()).andReturn(instanceID).anyTimes();
-    expect(sc.zkUserPath()).andReturn(ZooUtil.getRoot(instanceID) + Constants.ZUSERS).anyTimes();
-    expect(sc.getZooKeepers()).andReturn(zk).anyTimes();
-    expect(sc.getZooKeepersSessionTimeOut()).andReturn(zkTimeout).anyTimes();
+    var zrw = new ZooReaderWriter(zk);
+    expect(sc.getZooSession()).andReturn(zk).anyTimes();
+    expect(zk.asReader()).andReturn(zrw).anyTimes();
+    expect(zk.asReaderWriter()).andReturn(zrw).anyTimes();
     return sc;
   }
 
   public static ServerContext getMockContextWithPropStore(final InstanceId instanceID,
-      ZooReaderWriter zrw, PropStore propStore) {
+      PropStore propStore) {
 
     ServerContext sc = createMock(ServerContext.class);
     expect(sc.getInstanceID()).andReturn(instanceID).anyTimes();
-    expect(sc.getZooReaderWriter()).andReturn(zrw).anyTimes();
     expect(sc.getZooKeeperRoot()).andReturn(ZooUtil.getRoot(instanceID)).anyTimes();
     expect(sc.getPropStore()).andReturn(propStore).anyTimes();
     return sc;
diff --git a/server/base/src/test/java/org/apache/accumulo/server/conf/AccumuloConfigurationIsPropertySetTest.java b/server/base/src/test/java/org/apache/accumulo/server/conf/AccumuloConfigurationIsPropertySetTest.java
index 3097ab6994c..755df592459 100644
--- a/server/base/src/test/java/org/apache/accumulo/server/conf/AccumuloConfigurationIsPropertySetTest.java
+++ b/server/base/src/test/java/org/apache/accumulo/server/conf/AccumuloConfigurationIsPropertySetTest.java
@@ -98,7 +98,7 @@ public void setupMocks() {
     propStore.registerAsListener(anyObject(), anyObject());
     expectLastCall().anyTimes();
 
-    context = getMockContextWithPropStore(instanceId, null, propStore);
+    context = getMockContextWithPropStore(instanceId, propStore);
     SiteConfiguration siteConfig = SiteConfiguration.empty().build();
     expect(context.getSiteConfiguration()).andReturn(siteConfig).anyTimes();
   }
diff --git a/server/base/src/test/java/org/apache/accumulo/server/conf/NamespaceConfigurationTest.java b/server/base/src/test/java/org/apache/accumulo/server/conf/NamespaceConfigurationTest.java
index 7fce935b7ee..2b57617b38c 100644
--- a/server/base/src/test/java/org/apache/accumulo/server/conf/NamespaceConfigurationTest.java
+++ b/server/base/src/test/java/org/apache/accumulo/server/conf/NamespaceConfigurationTest.java
@@ -41,7 +41,6 @@
 import org.apache.accumulo.core.conf.Property;
 import org.apache.accumulo.core.data.InstanceId;
 import org.apache.accumulo.core.data.NamespaceId;
-import org.apache.accumulo.core.fate.zookeeper.ZooReaderWriter;
 import org.apache.accumulo.server.ServerContext;
 import org.apache.accumulo.server.conf.codec.VersionedProperties;
 import org.apache.accumulo.server.conf.store.NamespacePropKey;
@@ -69,9 +68,7 @@ public void setUp() {
     propStore.registerAsListener(anyObject(), anyObject());
     expectLastCall().anyTimes();
 
-    ZooReaderWriter zrw = createMock(ZooReaderWriter.class);
-
-    context = getMockContextWithPropStore(iid, zrw, propStore);
+    context = getMockContextWithPropStore(iid, propStore);
 
     parent = createMock(AccumuloConfiguration.class);
     reset(propStore);
diff --git a/server/base/src/test/java/org/apache/accumulo/server/conf/SystemConfigurationTest.java b/server/base/src/test/java/org/apache/accumulo/server/conf/SystemConfigurationTest.java
index 17a8a561fa6..7249231b0b6 100644
--- a/server/base/src/test/java/org/apache/accumulo/server/conf/SystemConfigurationTest.java
+++ b/server/base/src/test/java/org/apache/accumulo/server/conf/SystemConfigurationTest.java
@@ -31,6 +31,7 @@
 import static org.easymock.EasyMock.expectLastCall;
 import static org.easymock.EasyMock.replay;
 import static org.easymock.EasyMock.reset;
+import static org.easymock.EasyMock.verify;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertFalse;
 import static org.junit.jupiter.api.Assertions.assertTrue;
@@ -47,6 +48,7 @@
 import org.apache.accumulo.server.conf.store.PropStore;
 import org.apache.accumulo.server.conf.store.SystemPropKey;
 import org.apache.accumulo.server.conf.store.impl.ZooPropStore;
+import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
@@ -54,6 +56,7 @@ public class SystemConfigurationTest {
 
   private InstanceId instanceId;
 
+  private ServerContext context;
   private PropStore propStore;
 
   private SystemConfiguration sysConfig;
@@ -61,7 +64,7 @@ public class SystemConfigurationTest {
   @BeforeEach
   public void initMocks() {
     instanceId = InstanceId.of(UUID.randomUUID());
-    ServerContext context = createMock(ServerContext.class);
+    context = createMock(ServerContext.class);
     expect(context.getInstanceID()).andReturn(instanceId).anyTimes();
     propStore = createMock(ZooPropStore.class);
     expect(context.getPropStore()).andReturn(propStore).anyTimes();
@@ -78,7 +81,7 @@ public void initMocks() {
     VersionedProperties sysProps =
         new VersionedProperties(1, Instant.now(), Map.of(GC_PORT.getKey(), "1234",
             TSERV_SCAN_MAX_OPENFILES.getKey(), "19", TABLE_BLOOM_ENABLED.getKey(), "true"));
-    expect(propStore.get(eq(sysPropKey))).andReturn(sysProps).times(2);
+    expect(propStore.get(eq(sysPropKey))).andReturn(sysProps).once();
     replay(propStore);
 
     ConfigurationCopy defaultConfig =
@@ -88,6 +91,11 @@ public void initMocks() {
     sysConfig = new SystemConfiguration(context, sysPropKey, defaultConfig);
   }
 
+  @AfterEach
+  public void verifyMocks() {
+    verify(context, propStore);
+  }
+
   @Test
   public void testFromDefault() {
     assertEquals("true", sysConfig.get(TABLE_BLOOM_ENABLED));
@@ -96,7 +104,6 @@ public void testFromDefault() {
 
   @Test
   public void testFromFixed() {
-
     var sysPropKey = SystemPropKey.of(instanceId);
 
     assertEquals("9997", sysConfig.get(TSERV_CLIENTPORT)); // default
@@ -132,6 +139,5 @@ public void testFromFixed() {
     assertTrue(sysConfig.isPropertySet(TSERV_SCAN_MAX_OPENFILES)); // fixed sys config
     assertTrue(sysConfig.isPropertySet(TABLE_BLOOM_ENABLED)); // sys config
     assertTrue(sysConfig.isPropertySet(TABLE_BLOOM_SIZE)); // default
-
   }
 }
diff --git a/server/base/src/test/java/org/apache/accumulo/server/conf/store/impl/PropStoreEventTest.java b/server/base/src/test/java/org/apache/accumulo/server/conf/store/impl/PropStoreEventTest.java
index 6ffdfb5437d..99c4b04bacf 100644
--- a/server/base/src/test/java/org/apache/accumulo/server/conf/store/impl/PropStoreEventTest.java
+++ b/server/base/src/test/java/org/apache/accumulo/server/conf/store/impl/PropStoreEventTest.java
@@ -40,6 +40,7 @@
 import org.apache.accumulo.core.data.TableId;
 import org.apache.accumulo.core.fate.zookeeper.ZooReaderWriter;
 import org.apache.accumulo.core.fate.zookeeper.ZooUtil;
+import org.apache.accumulo.core.zookeeper.ZooSession;
 import org.apache.accumulo.server.ServerContext;
 import org.apache.accumulo.server.conf.codec.VersionedPropCodec;
 import org.apache.accumulo.server.conf.codec.VersionedProperties;
@@ -61,6 +62,7 @@ public class PropStoreEventTest {
 
   // mocks
   private ServerContext context;
+  private ZooSession zk;
   private ZooReaderWriter zrw;
   private ReadyMonitor readyMonitor;
 
@@ -68,8 +70,10 @@ public class PropStoreEventTest {
   public void initCommonMocks() throws Exception {
     instanceId = InstanceId.of(UUID.randomUUID());
     context = createMock(ServerContext.class);
+    zk = createMock(ZooSession.class);
     zrw = createMock(ZooReaderWriter.class);
-    expect(context.getZooReaderWriter()).andReturn(zrw).anyTimes();
+    expect(zk.asReaderWriter()).andReturn(zrw).anyTimes();
+    expect(context.getZooSession()).andReturn(zk).anyTimes();
     expect(context.getZooKeepersSessionTimeOut()).andReturn(500).anyTimes();
     expect(context.getInstanceID()).andReturn(instanceId).anyTimes();
 
@@ -81,7 +85,7 @@ public void initCommonMocks() throws Exception {
 
   @AfterEach
   public void verifyMocks() {
-    verify(context, zrw, readyMonitor);
+    verify(context, zk, zrw, readyMonitor);
   }
 
   @Test
@@ -97,9 +101,9 @@ public void zkChangeEventTest() throws Exception {
     readyMonitor.setReady();
     expectLastCall().once();
 
-    replay(context, zrw, readyMonitor, zkEvent);
+    replay(context, zk, zrw, readyMonitor, zkEvent);
 
-    PropStore propStore = new ZooPropStore(instanceId, zrw, readyMonitor, watcher, null);
+    PropStore propStore = new ZooPropStore(instanceId, zk, readyMonitor, watcher, null);
     StoreTestListener listener = new StoreTestListener();
 
     propStore.registerAsListener(tablePropKey, listener);
@@ -127,9 +131,9 @@ public void deleteEventTest() throws Exception {
     readyMonitor.setReady();
     expectLastCall().once();
 
-    replay(context, zrw, readyMonitor, zkEvent);
+    replay(context, zk, zrw, readyMonitor, zkEvent);
 
-    PropStore propStore = new ZooPropStore(instanceId, zrw, readyMonitor, watcher, null);
+    PropStore propStore = new ZooPropStore(instanceId, zk, readyMonitor, watcher, null);
 
     StoreTestListener listener = new StoreTestListener();
 
@@ -159,9 +163,9 @@ public void disconnectEventTest() throws Exception {
     readyMonitor.clearReady();
     expectLastCall();
 
-    replay(context, zrw, readyMonitor, zkEvent);
+    replay(context, zk, zrw, readyMonitor, zkEvent);
 
-    PropStore propStore = new ZooPropStore(instanceId, zrw, readyMonitor, watcher, null);
+    PropStore propStore = new ZooPropStore(instanceId, zk, readyMonitor, watcher, null);
 
     StoreTestListener listener = new StoreTestListener();
 
@@ -193,9 +197,9 @@ public void closedEventTest() throws Exception {
     readyMonitor.setClosed();
     expectLastCall();
 
-    replay(context, zrw, readyMonitor, zkEvent);
+    replay(context, zk, zrw, readyMonitor, zkEvent);
 
-    PropStore propStore = new ZooPropStore(instanceId, zrw, readyMonitor, watcher, null);
+    PropStore propStore = new ZooPropStore(instanceId, zk, readyMonitor, watcher, null);
 
     StoreTestListener listener = new StoreTestListener();
 
@@ -217,9 +221,9 @@ public void cacheChangeEventTest() throws Exception {
     readyMonitor.setReady();
     expectLastCall().once();
 
-    replay(context, zrw, readyMonitor);
+    replay(context, zk, zrw, readyMonitor);
 
-    PropStore propStore = new ZooPropStore(instanceId, zrw, readyMonitor, watcher, null);
+    PropStore propStore = new ZooPropStore(instanceId, zk, readyMonitor, watcher, null);
 
     StoreTestListener listener = new StoreTestListener();
 
@@ -254,9 +258,9 @@ public void validateWatcherSetTest() throws Exception {
 
     PropStoreWatcher watcher = new PropStoreWatcher(readyMonitor);
 
-    replay(context, zrw, readyMonitor);
+    replay(context, zk, zrw, readyMonitor);
 
-    ZooPropLoader loader = new ZooPropLoader(zrw, propCodec, watcher);
+    ZooPropLoader loader = new ZooPropLoader(zk, propCodec, watcher);
 
     PropCacheCaffeineImpl cache = new PropCacheCaffeineImpl.Builder(loader).build();
 
diff --git a/server/base/src/test/java/org/apache/accumulo/server/conf/store/impl/ZooPropLoaderTest.java b/server/base/src/test/java/org/apache/accumulo/server/conf/store/impl/ZooPropLoaderTest.java
index c47fc49752c..333535207ae 100644
--- a/server/base/src/test/java/org/apache/accumulo/server/conf/store/impl/ZooPropLoaderTest.java
+++ b/server/base/src/test/java/org/apache/accumulo/server/conf/store/impl/ZooPropLoaderTest.java
@@ -45,7 +45,7 @@
 import org.apache.accumulo.core.data.InstanceId;
 import org.apache.accumulo.core.data.TableId;
 import org.apache.accumulo.core.fate.zookeeper.ZooReaderWriter;
-import org.apache.accumulo.server.ServerContext;
+import org.apache.accumulo.core.zookeeper.ZooSession;
 import org.apache.accumulo.server.conf.codec.VersionedPropCodec;
 import org.apache.accumulo.server.conf.codec.VersionedProperties;
 import org.apache.accumulo.server.conf.store.PropStoreKey;
@@ -62,7 +62,7 @@ public class ZooPropLoaderTest {
 
   private PropCacheCaffeineImplTest.TestTicker ticker;
   private InstanceId instanceId;
-  private ServerContext context;
+  private ZooSession zk;
   private PropStoreKey<?> propStoreKey;
   private VersionedPropCodec propCodec;
 
@@ -81,21 +81,21 @@ public void initCommonMocks() {
     propCodec = VersionedPropCodec.getDefault();
 
     // mocks
-    context = createMock(ServerContext.class);
-    expect(context.getInstanceID()).andReturn(instanceId).anyTimes();
-
+    zk = createMock(ZooSession.class);
     zrw = createMock(ZooReaderWriter.class);
+    expect(zk.asReaderWriter()).andReturn(zrw).anyTimes();
+    replay(zk);
 
     propStoreWatcher = createMock(PropStoreWatcher.class);
 
     // loader used in tests
-    loader = new ZooPropLoader(zrw, propCodec, propStoreWatcher);
+    loader = new ZooPropLoader(zk, propCodec, propStoreWatcher);
 
   }
 
   @AfterEach
   public void verifyCommonMocks() {
-    verify(context, zrw, propStoreWatcher);
+    verify(zk, zrw, propStoreWatcher);
   }
 
   @Test
@@ -114,7 +114,7 @@ public void loadTest() throws Exception {
       return (bytes);
     }).once();
 
-    replay(context, zrw, propStoreWatcher);
+    replay(zrw, propStoreWatcher);
 
     assertNotNull(loader.load(propStoreKey));
   }
@@ -147,7 +147,7 @@ public void loadAndCacheTest() throws Exception {
           return (bytes);
         }).once();
 
-    replay(context, zrw, propStoreWatcher);
+    replay(zrw, propStoreWatcher);
 
     PropCacheCaffeineImpl cache =
         new PropCacheCaffeineImpl.Builder(loader).forTests(ticker).build();
@@ -175,7 +175,7 @@ public void loadFailTest() throws Exception {
     propStoreWatcher.signalZkChangeEvent(eq(propStoreKey));
     expectLastCall();
 
-    replay(context, zrw, propStoreWatcher);
+    replay(zrw, propStoreWatcher);
 
     PropCacheCaffeineImpl cache =
         new PropCacheCaffeineImpl.Builder(loader).forTests(ticker).build();
@@ -206,7 +206,7 @@ public void expireTest() throws Exception {
           return (bytes);
         }).times(2);
 
-    replay(context, zrw, propStoreWatcher);
+    replay(zrw, propStoreWatcher);
 
     PropCacheCaffeineImpl cache =
         new PropCacheCaffeineImpl.Builder(loader).forTests(ticker).build();
@@ -253,7 +253,7 @@ public void reloadExceptionTest() throws Exception {
     propStoreWatcher.signalCacheChangeEvent(anyObject());
     expectLastCall().anyTimes();
 
-    replay(context, zrw, propStoreWatcher);
+    replay(zrw, propStoreWatcher);
 
     PropCacheCaffeineImpl cache =
         new PropCacheCaffeineImpl.Builder(loader).forTests(ticker).build();
@@ -275,7 +275,7 @@ public void reloadExceptionTest() throws Exception {
   @Test
   public void getIfCachedTest() {
 
-    replay(context, zrw, propStoreWatcher);
+    replay(zrw, propStoreWatcher);
 
     PropCacheCaffeineImpl cache =
         new PropCacheCaffeineImpl.Builder(loader).forTests(ticker).build();
@@ -316,7 +316,7 @@ public void removeTest() throws Exception {
           return (bytes);
         }).once();
 
-    replay(context, zrw, propStoreWatcher);
+    replay(zrw, propStoreWatcher);
 
     PropCacheCaffeineImpl cache =
         new PropCacheCaffeineImpl.Builder(loader).forTests(ticker).build();
@@ -364,7 +364,7 @@ public void removeAllTest() throws Exception {
           return (bytes);
         }).once();
 
-    replay(context, zrw, propStoreWatcher);
+    replay(zrw, propStoreWatcher);
 
     PropCacheCaffeineImpl cache =
         new PropCacheCaffeineImpl.Builder(loader).forTests(ticker).build();
@@ -382,7 +382,7 @@ public void removeAllTest() throws Exception {
 
   @Test
   public void getIfCachedNotPresentTest() {
-    replay(context, zrw, propStoreWatcher);
+    replay(zrw, propStoreWatcher);
 
     PropCacheCaffeineImpl cache =
         new PropCacheCaffeineImpl.Builder(loader).forTests(ticker).build();
@@ -413,7 +413,7 @@ public void captureExampleTest() throws Exception {
       return propCodec.toBytes(vProps);
     }).anyTimes();
 
-    replay(context, zrw, propStoreWatcher);
+    replay(zrw, propStoreWatcher);
 
     Stat statCheck = new Stat();
     statCheck.setVersion(9);
diff --git a/server/base/src/test/java/org/apache/accumulo/server/conf/store/impl/ZooPropStoreTest.java b/server/base/src/test/java/org/apache/accumulo/server/conf/store/impl/ZooPropStoreTest.java
index a09f2bef8b5..c91e4e8b0bf 100644
--- a/server/base/src/test/java/org/apache/accumulo/server/conf/store/impl/ZooPropStoreTest.java
+++ b/server/base/src/test/java/org/apache/accumulo/server/conf/store/impl/ZooPropStoreTest.java
@@ -46,6 +46,7 @@
 import org.apache.accumulo.core.data.TableId;
 import org.apache.accumulo.core.fate.zookeeper.ZooReaderWriter;
 import org.apache.accumulo.core.fate.zookeeper.ZooUtil;
+import org.apache.accumulo.core.zookeeper.ZooSession;
 import org.apache.accumulo.server.ServerContext;
 import org.apache.accumulo.server.conf.codec.VersionedPropCodec;
 import org.apache.accumulo.server.conf.codec.VersionedProperties;
@@ -65,15 +66,18 @@ public class ZooPropStoreTest {
 
   // mocks
   private ServerContext context;
+  private ZooSession zk;
   private ZooReaderWriter zrw;
 
   @BeforeEach
   public void init() throws Exception {
     instanceId = InstanceId.of(UUID.randomUUID());
     context = createMock(ServerContext.class);
+    zk = createMock(ZooSession.class);
     zrw = createMock(ZooReaderWriter.class);
-    expect(context.getZooReaderWriter()).andReturn(zrw).anyTimes();
-    expect(zrw.getSessionTimeout()).andReturn(2_000).anyTimes();
+    expect(context.getZooSession()).andReturn(zk).anyTimes();
+    expect(zk.asReaderWriter()).andReturn(zrw).anyTimes();
+    expect(zk.getSessionTimeout()).andReturn(2_000).anyTimes();
     expect(context.getInstanceID()).andReturn(instanceId).anyTimes();
 
     expect(zrw.exists(eq(ZooUtil.getRoot(instanceId)), anyObject())).andReturn(true).anyTimes();
@@ -81,7 +85,7 @@ public void init() throws Exception {
 
   @AfterEach
   public void verifyMock() {
-    verify(context, zrw);
+    verify(context, zk, zrw);
   }
 
   @Test
@@ -93,9 +97,9 @@ public void create() throws Exception {
     expect(zrw.putPrivatePersistentData(eq(propStoreKey.getPath()), capture(bytes), anyObject()))
         .andReturn(true).once();
 
-    replay(context, zrw);
+    replay(context, zk, zrw);
 
-    PropStore propStore = ZooPropStore.initialize(instanceId, zrw);
+    PropStore propStore = ZooPropStore.initialize(instanceId, zk);
 
     propStore.create(propStoreKey,
         Map.of(TABLE_BULK_MAX_TABLETS.getKey(), "1234", TABLE_FILE_BLOCK_SIZE.getKey(), "512M"));
@@ -132,9 +136,9 @@ public void getTest() throws Exception {
           return propCodec.toBytes(vProps);
         }).once();
 
-    replay(context, zrw);
+    replay(context, zk, zrw);
 
-    PropStore propStore = ZooPropStore.initialize(instanceId, zrw);
+    PropStore propStore = ZooPropStore.initialize(instanceId, zk);
 
     assertNotNull(propStore.get(propStoreKey)); // first call will fetch from ZooKeeper
     assertNotNull(propStore.get(propStoreKey)); // next call will fetch from cache.
@@ -167,9 +171,9 @@ public void versionTest() throws Exception {
           return propCodec.toBytes(new VersionedProperties(props));
         }).once();
 
-    replay(context, zrw);
+    replay(context, zk, zrw);
 
-    PropStore propStore = ZooPropStore.initialize(instanceId, zrw);
+    PropStore propStore = ZooPropStore.initialize(instanceId, zk);
     var vProps = propStore.get(propStoreKey);
     assertNotNull(vProps);
     assertEquals(expectedVersion, vProps.getDataVersion());
@@ -215,16 +219,14 @@ public void putAllTest() throws Exception {
           return true;
         }).once();
 
-    replay(context, zrw);
+    replay(context, zk, zrw);
 
-    PropStore propStore = ZooPropStore.initialize(instanceId, zrw);
+    PropStore propStore = ZooPropStore.initialize(instanceId, zk);
 
     Map<String,String> updateProps =
         Map.of(TABLE_BULK_MAX_TABLETS.getKey(), "4321", TABLE_SPLIT_THRESHOLD.getKey(), "123M");
 
     propStore.putAll(propStoreKey, updateProps);
-
-    verify(zrw);
   }
 
   @Test
@@ -260,15 +262,14 @@ public void removeTest() throws Exception {
           return true;
         }).once();
 
-    replay(context, zrw);
+    replay(context, zk, zrw);
 
-    PropStore propStore = ZooPropStore.initialize(instanceId, zrw);
+    PropStore propStore = ZooPropStore.initialize(instanceId, zk);
 
     Set<String> deleteNames =
         Set.of(TABLE_BULK_MAX_TABLETS.getKey(), TABLE_SPLIT_THRESHOLD.getKey());
 
     propStore.removeProperties(propStoreKey, deleteNames);
-    verify(zrw);
   }
 
   @Test
@@ -295,9 +296,9 @@ public void removeWithExceptionsTest() throws Exception {
     expect(zrw.getData(eq(propStoreKey.getPath()), anyObject(Stat.class)))
         .andThrow(new InterruptedException("mock forced interrupt exception")).once();
 
-    replay(context, zrw);
+    replay(context, zk, zrw);
 
-    PropStore propStore = ZooPropStore.initialize(instanceId, zrw);
+    PropStore propStore = ZooPropStore.initialize(instanceId, zk);
 
     Set<String> deleteNames =
         Set.of(TABLE_BULK_MAX_TABLETS.getKey(), TABLE_SPLIT_THRESHOLD.getKey());
@@ -345,12 +346,12 @@ public void validateWatcherSetTest() throws Exception {
           return propCodec.toBytes(new VersionedProperties(13, Instant.now(), props));
         }).once();
 
-    replay(context, zrw);
+    replay(context, zk, zrw);
 
     ReadyMonitor monitor = new TestReadyMonitor("testmon", 2000);
     PropStoreWatcher watcher = new TestWatcher(monitor);
 
-    ZooPropStore propStore = new ZooPropStore(instanceId, zrw, monitor, watcher, null);
+    ZooPropStore propStore = new ZooPropStore(instanceId, zk, monitor, watcher, null);
 
     assertNotNull(propStore.get(tablePropKey));
 
@@ -408,9 +409,9 @@ public void deleteTest() throws Exception {
     zrw.delete(eq(propStoreKey.getPath()));
     expectLastCall().once();
 
-    replay(context, zrw);
+    replay(context, zk, zrw);
 
-    PropStore propStore = ZooPropStore.initialize(instanceId, zrw);
+    PropStore propStore = ZooPropStore.initialize(instanceId, zk);
 
     assertNotNull(propStore.get(propStoreKey)); // first call will fetch from ZooKeeper
     assertNotNull(propStore.get(propStoreKey)); // next call will fetch from cache.
diff --git a/server/base/src/test/java/org/apache/accumulo/server/conf/util/ZooInfoViewerTest.java b/server/base/src/test/java/org/apache/accumulo/server/conf/util/ZooInfoViewerTest.java
index 0fb5e9ab768..bbaed9f4bf0 100644
--- a/server/base/src/test/java/org/apache/accumulo/server/conf/util/ZooInfoViewerTest.java
+++ b/server/base/src/test/java/org/apache/accumulo/server/conf/util/ZooInfoViewerTest.java
@@ -27,7 +27,9 @@
 import static org.easymock.EasyMock.createMock;
 import static org.easymock.EasyMock.eq;
 import static org.easymock.EasyMock.expect;
+import static org.easymock.EasyMock.expectLastCall;
 import static org.easymock.EasyMock.isA;
+import static org.easymock.EasyMock.isNull;
 import static org.easymock.EasyMock.newCapture;
 import static org.easymock.EasyMock.replay;
 import static org.easymock.EasyMock.verify;
@@ -46,9 +48,10 @@
 import org.apache.accumulo.core.data.InstanceId;
 import org.apache.accumulo.core.data.NamespaceId;
 import org.apache.accumulo.core.data.TableId;
-import org.apache.accumulo.core.fate.zookeeper.ZooReader;
 import org.apache.accumulo.core.fate.zookeeper.ZooUtil;
+import org.apache.accumulo.core.zookeeper.ZooSession;
 import org.apache.accumulo.server.MockServerContext;
+import org.apache.accumulo.server.ServerContext;
 import org.apache.accumulo.server.conf.codec.VersionedPropCodec;
 import org.apache.accumulo.server.conf.codec.VersionedProperties;
 import org.apache.accumulo.server.conf.store.NamespacePropKey;
@@ -136,25 +139,32 @@ public void allOpts() {
   @Test
   public void instanceIdOutputTest() throws Exception {
     String uuid = UUID.randomUUID().toString();
-    var context = MockServerContext.getWithZK(InstanceId.of(uuid), "fakeHost", 2000);
-    ZooReader zooReader = createMock(ZooReader.class);
-    expect(context.getZooReader()).andReturn(zooReader).anyTimes();
+    ZooSession zk = createMock(ZooSession.class);
+    var context = MockServerContext.getWithMockZK(zk);
+    expect(context.getInstanceID()).andReturn(InstanceId.of(uuid)).anyTimes();
     var instanceName = "test";
-    expect(zooReader.getChildren(eq(ZROOT + ZINSTANCES))).andReturn(List.of(instanceName)).once();
-    expect(zooReader.getData(eq(ZROOT + ZINSTANCES + "/" + instanceName)))
+    expect(zk.getChildren(eq(ZROOT + ZINSTANCES), isNull())).andReturn(List.of(instanceName))
+        .once();
+    expect(zk.getData(eq(ZROOT + ZINSTANCES + "/" + instanceName), isNull(), isNull()))
         .andReturn(uuid.getBytes(UTF_8)).once();
-    replay(context, zooReader);
+    context.close();
+    expectLastCall().once();
+
+    replay(context, zk);
 
     String testFileName = "./target/zoo-info-viewer-" + System.currentTimeMillis() + ".txt";
 
-    ZooInfoViewer.Opts opts = new ZooInfoViewer.Opts();
-    opts.parseArgs(ZooInfoViewer.class.getName(),
-        new String[] {"--print-instances", "--outfile", testFileName});
+    class ZooInfoViewerTestClazz extends ZooInfoViewer {
+      @Override
+      ServerContext getContext(ZooInfoViewer.Opts ots) {
+        return context;
+      }
+    }
 
-    ZooInfoViewer viewer = new ZooInfoViewer();
-    viewer.generateReport(context, opts);
+    ZooInfoViewer viewer = new ZooInfoViewerTestClazz();
+    viewer.execute(new String[] {"--print-instances", "--outfile", testFileName});
 
-    verify(context, zooReader);
+    verify(context, zk);
 
     String line;
     try (Scanner scanner = new Scanner(new File(testFileName))) {
@@ -174,14 +184,14 @@ public void instanceIdOutputTest() throws Exception {
   @Test
   public void instanceNameOutputTest() throws Exception {
     String uuid = UUID.randomUUID().toString();
-    var context = MockServerContext.getWithZK(InstanceId.of(uuid), "fakeHost", 2000);
-    ZooReader zooReader = createMock(ZooReader.class);
-    expect(context.getZooReader()).andReturn(zooReader).anyTimes();
+    ZooSession zk = createMock(ZooSession.class);
+    var context = MockServerContext.getWithMockZK(zk);
     var instanceName = "test";
-    expect(zooReader.getChildren(eq(ZROOT + ZINSTANCES))).andReturn(List.of(instanceName)).once();
-    expect(zooReader.getData(eq(ZROOT + ZINSTANCES + "/" + instanceName)))
+    expect(zk.getChildren(eq(ZROOT + ZINSTANCES), isNull())).andReturn(List.of(instanceName))
+        .once();
+    expect(zk.getData(eq(ZROOT + ZINSTANCES + "/" + instanceName), isNull(), isNull()))
         .andReturn(uuid.getBytes(UTF_8)).once();
-    replay(context, zooReader);
+    replay(context, zk);
 
     String testFileName = "./target/zoo-info-viewer-" + System.currentTimeMillis() + ".txt";
 
@@ -192,7 +202,7 @@ public void instanceNameOutputTest() throws Exception {
     ZooInfoViewer viewer = new ZooInfoViewer();
     viewer.generateReport(context, opts);
 
-    verify(context, zooReader);
+    verify(context, zk);
 
     String line;
     try (Scanner scanner = new Scanner(new File(testFileName))) {
@@ -215,19 +225,19 @@ public void instanceNameOutputTest() throws Exception {
   public void propTest() throws Exception {
     String uuid = UUID.randomUUID().toString();
     InstanceId iid = InstanceId.of(uuid);
-    var context = MockServerContext.getWithZK(iid, "fakeHost", 2000);
-    ZooReader zooReader = createMock(ZooReader.class);
-    expect(context.getZooReader()).andReturn(zooReader).anyTimes();
+    ZooSession zk = createMock(ZooSession.class);
+    var context = MockServerContext.getWithMockZK(zk);
+    expect(context.getInstanceID()).andReturn(iid).anyTimes();
     var instanceName = "test";
-    expect(zooReader.getChildren(eq(ZROOT + ZINSTANCES))).andReturn(List.of(instanceName))
+    expect(zk.getChildren(eq(ZROOT + ZINSTANCES), isNull())).andReturn(List.of(instanceName))
         .anyTimes();
-    expect(zooReader.getData(eq(ZROOT + ZINSTANCES + "/" + instanceName)))
+    expect(zk.getData(eq(ZROOT + ZINSTANCES + "/" + instanceName), isNull(), isNull()))
         .andReturn(uuid.getBytes(UTF_8)).anyTimes();
 
     var sysPropBytes = propCodec
         .toBytes(new VersionedProperties(123, Instant.now(), Map.of("s1", "sv1", "s2", "sv2")));
     Capture<Stat> sStat = newCapture();
-    expect(zooReader.getData(eq(SystemPropKey.of(iid).getPath()), isA(PropStoreWatcher.class),
+    expect(zk.getData(eq(SystemPropKey.of(iid).getPath()), isA(PropStoreWatcher.class),
         capture(sStat))).andAnswer(() -> {
           Stat s = sStat.getValue();
           s.setCtime(System.currentTimeMillis());
@@ -245,8 +255,8 @@ public void propTest() throws Exception {
         propCodec.toBytes(new VersionedProperties(123, Instant.now(), Map.of("n1", "nv1")));
     NamespaceId nsId = NamespaceId.of("a");
     Capture<Stat> nsStat = newCapture();
-    expect(zooReader.getData(eq(NamespacePropKey.of(iid, nsId).getPath()),
-        isA(PropStoreWatcher.class), capture(nsStat))).andAnswer(() -> {
+    expect(zk.getData(eq(NamespacePropKey.of(iid, nsId).getPath()), isA(PropStoreWatcher.class),
+        capture(nsStat))).andAnswer(() -> {
           Stat s = nsStat.getValue();
           s.setCtime(System.currentTimeMillis());
           s.setMtime(System.currentTimeMillis());
@@ -265,7 +275,7 @@ public void propTest() throws Exception {
     var tPropBytes = propCodec.toBytes(tProps);
     TableId tid = TableId.of("t");
     Capture<Stat> stat = newCapture();
-    expect(zooReader.getData(eq(TablePropKey.of(iid, tid).getPath()), isA(PropStoreWatcher.class),
+    expect(zk.getData(eq(TablePropKey.of(iid, tid).getPath()), isA(PropStoreWatcher.class),
         capture(stat))).andAnswer(() -> {
           Stat s = stat.getValue();
           s.setCtime(System.currentTimeMillis());
@@ -276,24 +286,30 @@ public void propTest() throws Exception {
           return tPropBytes;
         }).once();
 
-    expect(zooReader.getData(tBasePath + "/t" + ZTABLE_NAMESPACE))
+    expect(zk.getData(tBasePath + "/t" + ZTABLE_NAMESPACE, null, null))
         .andReturn("+default".getBytes(UTF_8)).anyTimes();
 
-    replay(context, zooReader);
+    context.close();
+    expectLastCall().once();
+
+    replay(context, zk);
 
     NamespacePropKey nsKey = NamespacePropKey.of(iid, nsId);
     log.trace("namespace base path: {}", nsKey.getPath());
 
     String testFileName = "./target/zoo-info-viewer-" + System.currentTimeMillis() + ".txt";
 
-    ZooInfoViewer.Opts opts = new ZooInfoViewer.Opts();
-    opts.parseArgs(ZooInfoViewer.class.getName(),
-        new String[] {"--print-props", "--outfile", testFileName});
+    class ZooInfoViewerTestClazz extends ZooInfoViewer {
+      @Override
+      ServerContext getContext(ZooInfoViewer.Opts ots) {
+        return context;
+      }
+    }
 
-    ZooInfoViewer viewer = new ZooInfoViewer();
-    viewer.generateReport(context, opts);
+    ZooInfoViewer viewer = new ZooInfoViewerTestClazz();
+    viewer.execute(new String[] {"--print-props", "--outfile", testFileName});
 
-    verify(context, zooReader);
+    verify(context, zk);
 
     Map<String,String> props = new HashMap<>();
     try (Scanner scanner = new Scanner(new File(testFileName))) {
diff --git a/server/base/src/test/java/org/apache/accumulo/server/conf/util/ZooPropUtilsTest.java b/server/base/src/test/java/org/apache/accumulo/server/conf/util/ZooPropUtilsTest.java
deleted file mode 100644
index e77832ceabc..00000000000
--- a/server/base/src/test/java/org/apache/accumulo/server/conf/util/ZooPropUtilsTest.java
+++ /dev/null
@@ -1,68 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.accumulo.server.conf.util;
-
-import static java.nio.charset.StandardCharsets.UTF_8;
-import static org.apache.accumulo.core.Constants.ZINSTANCES;
-import static org.apache.accumulo.core.Constants.ZROOT;
-import static org.easymock.EasyMock.createMock;
-import static org.easymock.EasyMock.eq;
-import static org.easymock.EasyMock.expect;
-import static org.easymock.EasyMock.replay;
-import static org.easymock.EasyMock.verify;
-import static org.junit.jupiter.api.Assertions.assertEquals;
-
-import java.util.List;
-import java.util.Map;
-import java.util.UUID;
-
-import org.apache.accumulo.core.data.InstanceId;
-import org.apache.accumulo.core.fate.zookeeper.ZooReader;
-import org.junit.jupiter.api.Test;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-class ZooPropUtilsTest {
-  private static final Logger LOG = LoggerFactory.getLogger(ZooPropUtilsTest.class);
-
-  @Test
-  public void fetchInstancesFromZk() throws Exception {
-
-    String instAName = "INST_A";
-    InstanceId instA = InstanceId.of(UUID.randomUUID());
-    String instBName = "INST_B";
-    InstanceId instB = InstanceId.of(UUID.randomUUID());
-
-    ZooReader zooReader = createMock(ZooReader.class);
-    String namePath = ZROOT + ZINSTANCES;
-    expect(zooReader.getChildren(eq(namePath))).andReturn(List.of(instAName, instBName)).once();
-    expect(zooReader.getData(eq(namePath + "/" + instAName)))
-        .andReturn(instA.canonical().getBytes(UTF_8)).once();
-    expect(zooReader.getData(eq(namePath + "/" + instBName)))
-        .andReturn(instB.canonical().getBytes(UTF_8)).once();
-    replay(zooReader);
-
-    Map<String,InstanceId> instanceMap = ZooPropUtils.readInstancesFromZk(zooReader);
-
-    LOG.trace("id map returned: {}", instanceMap);
-    assertEquals(Map.of(instAName, instA, instBName, instB), instanceMap);
-    verify(zooReader);
-  }
-
-}
diff --git a/server/base/src/test/java/org/apache/accumulo/server/constraints/MetadataConstraintsTest.java b/server/base/src/test/java/org/apache/accumulo/server/constraints/MetadataConstraintsTest.java
index dfcf970330c..5407d10de58 100644
--- a/server/base/src/test/java/org/apache/accumulo/server/constraints/MetadataConstraintsTest.java
+++ b/server/base/src/test/java/org/apache/accumulo/server/constraints/MetadataConstraintsTest.java
@@ -26,6 +26,7 @@
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import java.lang.reflect.Method;
+import java.time.Duration;
 import java.util.Base64;
 import java.util.List;
 import java.util.Set;
@@ -56,6 +57,7 @@
 import org.apache.accumulo.core.metadata.schema.MetadataSchema.TabletsSection.TabletColumnFamily;
 import org.apache.accumulo.core.metadata.schema.MetadataSchema.TabletsSection.UserCompactionRequestedColumnFamily;
 import org.apache.accumulo.core.metadata.schema.SelectedFiles;
+import org.apache.accumulo.core.metadata.schema.TabletMergeabilityMetadata;
 import org.apache.accumulo.core.metadata.schema.UnSplittableMetadata;
 import org.apache.accumulo.core.util.time.SteadyTime;
 import org.apache.accumulo.server.ServerContext;
@@ -639,6 +641,53 @@ public void testDirectoryColumn() {
     assertEquals((short) 3102, violations.get(0));
   }
 
+  @Test
+  public void testMergeabilityColumn() {
+    MetadataConstraints mc = new MetadataConstraints();
+    Mutation m;
+    List<Short> violations;
+
+    // Delay must be >= 0
+    m = new Mutation(new Text("0;foo"));
+    TabletColumnFamily.MERGEABILITY_COLUMN.put(m,
+        new Value("{\"delay\":-1,\"steadyTime\":1,\"never\"=false}"));
+    assertViolation(mc, m, (short) 4006);
+
+    // SteadyTime must be null if never is true
+    m = new Mutation(new Text("0;foo"));
+    TabletColumnFamily.MERGEABILITY_COLUMN.put(m, new Value("{\"steadyTime\":1,\"never\"=true}"));
+    assertViolation(mc, m, (short) 4006);
+
+    // delay must be null if never is true
+    m = new Mutation(new Text("0;foo"));
+    TabletColumnFamily.MERGEABILITY_COLUMN.put(m, new Value("{\"delay\":1,\"never\"=true}"));
+    assertViolation(mc, m, (short) 4006);
+
+    // SteadyTime must be set if delay positive
+    m = new Mutation(new Text("0;foo"));
+    TabletColumnFamily.MERGEABILITY_COLUMN.put(m, new Value("{\"delay\":10,\"never\"=false}"));
+    assertViolation(mc, m, (short) 4006);
+
+    m = new Mutation(new Text("0;foo"));
+    TabletColumnFamily.MERGEABILITY_COLUMN.put(m,
+        TabletMergeabilityMetadata.toValue(TabletMergeabilityMetadata.never()));
+    violations = mc.check(createEnv(), m);
+    assertTrue(violations.isEmpty());
+
+    m = new Mutation(new Text("0;foo"));
+    TabletColumnFamily.MERGEABILITY_COLUMN.put(m, TabletMergeabilityMetadata
+        .toValue(TabletMergeabilityMetadata.always(SteadyTime.from(1, TimeUnit.SECONDS))));
+    violations = mc.check(createEnv(), m);
+    assertTrue(violations.isEmpty());
+
+    m = new Mutation(new Text("0;foo"));
+    TabletColumnFamily.MERGEABILITY_COLUMN.put(m,
+        TabletMergeabilityMetadata.toValue(TabletMergeabilityMetadata.after(Duration.ofDays(3),
+            SteadyTime.from(Duration.ofHours(1)))));
+    violations = mc.check(createEnv(), m);
+    assertTrue(violations.isEmpty());
+  }
+
   // Encode a row how it would appear in Json
   private static String encodeRowForMetadata(String row) {
     try {
diff --git a/server/base/src/test/java/org/apache/accumulo/server/init/InitializeTest.java b/server/base/src/test/java/org/apache/accumulo/server/init/InitializeTest.java
index f56510394ba..c0b4817a2f9 100644
--- a/server/base/src/test/java/org/apache/accumulo/server/init/InitializeTest.java
+++ b/server/base/src/test/java/org/apache/accumulo/server/init/InitializeTest.java
@@ -31,9 +31,11 @@
 import org.apache.accumulo.core.conf.Property;
 import org.apache.accumulo.core.conf.SiteConfiguration;
 import org.apache.accumulo.core.fate.zookeeper.ZooReaderWriter;
+import org.apache.accumulo.core.zookeeper.ZooSession;
 import org.apache.accumulo.server.fs.VolumeManager;
 import org.apache.hadoop.conf.Configuration;
 import org.apache.hadoop.fs.Path;
+import org.apache.zookeeper.data.Stat;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
@@ -45,7 +47,8 @@ public class InitializeTest {
   private Configuration conf;
   private VolumeManager fs;
   private SiteConfiguration sconf;
-  private ZooReaderWriter zoo;
+  private ZooSession zk;
+  private ZooReaderWriter zrw;
   private InitialConfiguration initConfig;
 
   @BeforeEach
@@ -59,18 +62,19 @@ public void setUp() {
     expect(sconf.get(Property.INSTANCE_SECRET))
         .andReturn(Property.INSTANCE_SECRET.getDefaultValue()).anyTimes();
     expect(sconf.get(Property.INSTANCE_ZK_HOST)).andReturn("zk1").anyTimes();
-    zoo = createMock(ZooReaderWriter.class);
+    zk = createMock(ZooSession.class);
+    zrw = new ZooReaderWriter(zk);
   }
 
   @AfterEach
   public void tearDown() {
-    verify(sconf, zoo, fs);
+    verify(sconf, zk, fs);
   }
 
   @Test
   public void testIsInitialized_HasInstanceId() throws Exception {
     expect(fs.exists(anyObject(Path.class))).andReturn(true);
-    replay(sconf, zoo, fs);
+    replay(sconf, zk, fs);
     assertTrue(Initialize.isInitialized(fs, initConfig));
   }
 
@@ -78,40 +82,40 @@ public void testIsInitialized_HasInstanceId() throws Exception {
   public void testIsInitialized_HasDataVersion() throws Exception {
     expect(fs.exists(anyObject(Path.class))).andReturn(false);
     expect(fs.exists(anyObject(Path.class))).andReturn(true);
-    replay(sconf, zoo, fs);
+    replay(sconf, zk, fs);
     assertTrue(Initialize.isInitialized(fs, initConfig));
   }
 
   @Test
   public void testCheckInit_NoZK() throws Exception {
-    expect(zoo.exists("/")).andReturn(false);
-    replay(sconf, zoo, fs);
-    assertThrows(IllegalStateException.class, () -> Initialize.checkInit(zoo, fs, initConfig));
+    expect(zk.exists("/", null)).andReturn(null);
+    replay(sconf, zk, fs);
+    assertThrows(IllegalStateException.class, () -> Initialize.checkInit(zrw, fs, initConfig));
   }
 
   @Test
   public void testCheckInit_AlreadyInit() throws Exception {
-    expect(zoo.exists("/")).andReturn(true);
+    expect(zk.exists("/", null)).andReturn(new Stat());
     expect(fs.exists(anyObject(Path.class))).andReturn(true);
-    replay(sconf, zoo, fs);
-    assertThrows(IOException.class, () -> Initialize.checkInit(zoo, fs, initConfig));
+    replay(sconf, zk, fs);
+    assertThrows(IOException.class, () -> Initialize.checkInit(zrw, fs, initConfig));
   }
 
   @Test
   public void testCheckInit_FSException() throws Exception {
-    expect(zoo.exists("/")).andReturn(true);
+    expect(zk.exists("/", null)).andReturn(new Stat());
     expect(fs.exists(anyObject(Path.class))).andThrow(new IOException());
-    replay(sconf, zoo, fs);
-    assertThrows(IOException.class, () -> Initialize.checkInit(zoo, fs, initConfig));
+    replay(sconf, zk, fs);
+    assertThrows(IOException.class, () -> Initialize.checkInit(zrw, fs, initConfig));
   }
 
   @Test
   public void testCheckInit_OK() throws Exception {
-    expect(zoo.exists("/")).andReturn(true);
+    expect(zk.exists("/", null)).andReturn(new Stat());
     // check for volumes initialized calls exists twice for each volume
     // once for instance_id, and once for version
     expect(fs.exists(anyObject(Path.class))).andReturn(false).times(4);
-    replay(sconf, zoo, fs);
-    Initialize.checkInit(zoo, fs, initConfig);
+    replay(sconf, zk, fs);
+    Initialize.checkInit(zrw, fs, initConfig);
   }
 }
diff --git a/server/base/src/test/java/org/apache/accumulo/server/rpc/TServerUtilsTest.java b/server/base/src/test/java/org/apache/accumulo/server/rpc/TServerUtilsTest.java
index aee14ba4d4b..dc61b8c91e2 100644
--- a/server/base/src/test/java/org/apache/accumulo/server/rpc/TServerUtilsTest.java
+++ b/server/base/src/test/java/org/apache/accumulo/server/rpc/TServerUtilsTest.java
@@ -46,6 +46,7 @@
 import org.apache.accumulo.core.metrics.MetricsInfo;
 import org.apache.accumulo.core.metrics.MetricsProducer;
 import org.apache.accumulo.core.trace.TraceUtil;
+import org.apache.accumulo.core.zookeeper.ZooSession;
 import org.apache.accumulo.server.ServerContext;
 import org.apache.accumulo.server.client.ClientServiceHandler;
 import org.apache.thrift.server.TServer;
@@ -58,14 +59,17 @@
 public class TServerUtilsTest {
 
   private ServerContext context;
+  private ZooSession zk;
   private MetricsInfo metricsInfo;
   private final ConfigurationCopy conf = new ConfigurationCopy(DefaultConfiguration.getInstance());
 
   @BeforeEach
   public void createMockServerContext() {
     context = createMock(ServerContext.class);
-    expect(context.getZooReader()).andReturn(null).anyTimes();
-    expect(context.getZooReaderWriter()).andReturn(null).anyTimes();
+    zk = createMock(ZooSession.class);
+    expect(context.getZooSession()).andReturn(zk).anyTimes();
+    expect(zk.asReader()).andReturn(null).anyTimes();
+    expect(zk.asReaderWriter()).andReturn(null).anyTimes();
     expect(context.getProperties()).andReturn(new Properties()).anyTimes();
     expect(context.getZooKeepers()).andReturn("").anyTimes();
     expect(context.getInstanceName()).andReturn("instance").anyTimes();
diff --git a/server/base/src/test/java/org/apache/accumulo/server/security/delegation/ZooAuthenticationKeyDistributorTest.java b/server/base/src/test/java/org/apache/accumulo/server/security/delegation/ZooAuthenticationKeyDistributorTest.java
index a2653513706..59ded20cacb 100644
--- a/server/base/src/test/java/org/apache/accumulo/server/security/delegation/ZooAuthenticationKeyDistributorTest.java
+++ b/server/base/src/test/java/org/apache/accumulo/server/security/delegation/ZooAuthenticationKeyDistributorTest.java
@@ -41,9 +41,11 @@
 import org.apache.accumulo.core.fate.zookeeper.ZooReaderWriter;
 import org.apache.accumulo.core.fate.zookeeper.ZooUtil;
 import org.apache.accumulo.core.fate.zookeeper.ZooUtil.NodeExistsPolicy;
+import org.apache.accumulo.core.zookeeper.ZooSession;
 import org.apache.zookeeper.KeeperException.AuthFailedException;
 import org.apache.zookeeper.data.ACL;
 import org.apache.zookeeper.data.Id;
+import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
@@ -62,103 +64,96 @@ public static void setupKeyGenerator() throws Exception {
     keyGen.init(KEY_LENGTH);
   }
 
+  private ZooSession zk;
   private ZooReaderWriter zrw;
   private String baseNode = Constants.ZDELEGATION_TOKEN_KEYS;
 
   @BeforeEach
   public void setupMocks() {
     zrw = createMock(ZooReaderWriter.class);
+    zk = createMock(ZooSession.class);
+    expect(zk.asReaderWriter()).andReturn(zrw).anyTimes();
+  }
+
+  @AfterEach
+  public void verifyMocks() {
+    verify(zk, zrw);
   }
 
   @Test
   public void testInitialize() throws Exception {
-    ZooAuthenticationKeyDistributor distributor =
-        new ZooAuthenticationKeyDistributor(zrw, baseNode);
-
     // Attempt to create the directory and fail
     expect(zrw.exists(baseNode)).andReturn(false);
-    expect(
-        zrw.putPrivatePersistentData(eq(baseNode), aryEq(new byte[0]), eq(NodeExistsPolicy.FAIL)))
+    expect(zrw.putPrivatePersistentData(baseNode, new byte[0], NodeExistsPolicy.FAIL))
         .andThrow(new AuthFailedException());
 
-    replay(zrw);
+    replay(zk, zrw);
 
+    var distributor = new ZooAuthenticationKeyDistributor(zk, baseNode);
     assertThrows(AuthFailedException.class, distributor::initialize);
-
-    verify(zrw);
   }
 
   @Test
   public void testInitializeCreatesParentNode() throws Exception {
-    ZooAuthenticationKeyDistributor distributor =
-        new ZooAuthenticationKeyDistributor(zrw, baseNode);
-
     // Attempt to create the directory and fail
     expect(zrw.exists(baseNode)).andReturn(false);
     expect(zrw.putPrivatePersistentData(eq(baseNode), anyObject(), eq(NodeExistsPolicy.FAIL)))
         .andReturn(true);
 
-    replay(zrw);
+    replay(zk, zrw);
 
+    var distributor = new ZooAuthenticationKeyDistributor(zk, baseNode);
     distributor.initialize();
-
-    verify(zrw);
   }
 
   @Test
   public void testInitializedNotCalledAdvertise() {
-    ZooAuthenticationKeyDistributor distributor =
-        new ZooAuthenticationKeyDistributor(zrw, baseNode);
+    replay(zk, zrw);
+    var distributor = new ZooAuthenticationKeyDistributor(zk, baseNode);
     assertThrows(IllegalStateException.class,
         () -> distributor.advertise(new AuthenticationKey(1, 0L, 5L, keyGen.generateKey())));
   }
 
   @Test
   public void testInitializedNotCalledCurrentKeys() {
-    ZooAuthenticationKeyDistributor distributor =
-        new ZooAuthenticationKeyDistributor(zrw, baseNode);
+    replay(zk, zrw);
+    var distributor = new ZooAuthenticationKeyDistributor(zk, baseNode);
     assertThrows(IllegalStateException.class, distributor::getCurrentKeys);
   }
 
   @Test
   public void testInitializedNotCalledRemove() {
-    ZooAuthenticationKeyDistributor distributor =
-        new ZooAuthenticationKeyDistributor(zrw, baseNode);
+    replay(zk, zrw);
+    var distributor = new ZooAuthenticationKeyDistributor(zk, baseNode);
     assertThrows(IllegalStateException.class,
         () -> distributor.remove(new AuthenticationKey(1, 0L, 5L, keyGen.generateKey())));
   }
 
   @Test
   public void testMissingAcl() throws Exception {
-    ZooAuthenticationKeyDistributor distributor =
-        new ZooAuthenticationKeyDistributor(zrw, baseNode);
     // Attempt to create the directory and fail
     expect(zrw.exists(baseNode)).andReturn(true);
     expect(zrw.getACL(eq(baseNode))).andReturn(Collections.emptyList());
 
-    replay(zrw);
+    replay(zk, zrw);
+    var distributor = new ZooAuthenticationKeyDistributor(zk, baseNode);
     assertThrows(IllegalStateException.class, distributor::initialize);
-    verify(zrw);
   }
 
   @Test
   public void testBadAcl() throws Exception {
-    ZooAuthenticationKeyDistributor distributor =
-        new ZooAuthenticationKeyDistributor(zrw, baseNode);
     // Attempt to create the directory and fail
     expect(zrw.exists(baseNode)).andReturn(true);
     expect(zrw.getACL(eq(baseNode))).andReturn(Collections.singletonList(
         new ACL(ZooUtil.PRIVATE.get(0).getPerms(), new Id("digest", "somethingweird"))));
 
-    replay(zrw);
+    replay(zk, zrw);
+    var distributor = new ZooAuthenticationKeyDistributor(zk, baseNode);
     assertThrows(IllegalStateException.class, distributor::initialize);
-    verify(zrw);
   }
 
   @Test
   public void testAdvertiseKey() throws Exception {
-    ZooAuthenticationKeyDistributor distributor =
-        new ZooAuthenticationKeyDistributor(zrw, baseNode);
     AuthenticationKey key = new AuthenticationKey(1, 0L, 10L, keyGen.generateKey());
     ByteArrayOutputStream baos = new ByteArrayOutputStream();
     key.write(new DataOutputStream(baos));
@@ -173,18 +168,15 @@ public void testAdvertiseKey() throws Exception {
     expect(zrw.putPrivatePersistentData(eq(path), aryEq(serialized), eq(NodeExistsPolicy.FAIL)))
         .andReturn(true);
 
-    replay(zrw);
+    replay(zk, zrw);
 
+    var distributor = new ZooAuthenticationKeyDistributor(zk, baseNode);
     distributor.initialize();
     distributor.advertise(key);
-
-    verify(zrw);
   }
 
   @Test
   public void testAlreadyAdvertisedKey() throws Exception {
-    ZooAuthenticationKeyDistributor distributor =
-        new ZooAuthenticationKeyDistributor(zrw, baseNode);
     AuthenticationKey key = new AuthenticationKey(1, 0L, 10L, keyGen.generateKey());
     String path = baseNode + "/" + key.getKeyId();
 
@@ -194,18 +186,15 @@ public void testAlreadyAdvertisedKey() throws Exception {
         new ACL(ZooUtil.PRIVATE.get(0).getPerms(), new Id("digest", "accumulo:DEFAULT"))));
     expect(zrw.exists(path)).andReturn(true);
 
-    replay(zrw);
+    replay(zk, zrw);
 
+    var distributor = new ZooAuthenticationKeyDistributor(zk, baseNode);
     distributor.initialize();
     distributor.advertise(key);
-
-    verify(zrw);
   }
 
   @Test
   public void testRemoveKey() throws Exception {
-    ZooAuthenticationKeyDistributor distributor =
-        new ZooAuthenticationKeyDistributor(zrw, baseNode);
     AuthenticationKey key = new AuthenticationKey(1, 0L, 10L, keyGen.generateKey());
     String path = baseNode + "/" + key.getKeyId();
 
@@ -217,18 +206,15 @@ public void testRemoveKey() throws Exception {
     zrw.delete(path);
     expectLastCall().once();
 
-    replay(zrw);
+    replay(zk, zrw);
 
+    var distributor = new ZooAuthenticationKeyDistributor(zk, baseNode);
     distributor.initialize();
     distributor.remove(key);
-
-    verify(zrw);
   }
 
   @Test
   public void testRemoveMissingKey() throws Exception {
-    ZooAuthenticationKeyDistributor distributor =
-        new ZooAuthenticationKeyDistributor(zrw, baseNode);
     AuthenticationKey key = new AuthenticationKey(1, 0L, 10L, keyGen.generateKey());
     String path = baseNode + "/" + key.getKeyId();
 
@@ -238,18 +224,15 @@ public void testRemoveMissingKey() throws Exception {
         new ACL(ZooUtil.PRIVATE.get(0).getPerms(), new Id("digest", "accumulo:DEFAULT"))));
     expect(zrw.exists(path)).andReturn(false);
 
-    replay(zrw);
+    replay(zk, zrw);
 
+    var distributor = new ZooAuthenticationKeyDistributor(zk, baseNode);
     distributor.initialize();
     distributor.remove(key);
-
-    verify(zrw);
   }
 
   @Test
   public void testGetCurrentKeys() throws Exception {
-    ZooAuthenticationKeyDistributor distributor =
-        new ZooAuthenticationKeyDistributor(zrw, baseNode);
     List<AuthenticationKey> keys = new ArrayList<>(5);
     List<byte[]> serializedKeys = new ArrayList<>(5);
     List<String> children = new ArrayList<>(5);
@@ -270,11 +253,10 @@ public void testGetCurrentKeys() throws Exception {
       expect(zrw.getData(baseNode + "/" + i)).andReturn(serializedKeys.get(i - 1));
     }
 
-    replay(zrw);
+    replay(zk, zrw);
 
+    var distributor = new ZooAuthenticationKeyDistributor(zk, baseNode);
     distributor.initialize();
     assertEquals(keys, distributor.getCurrentKeys());
-
-    verify(zrw);
   }
 }
diff --git a/server/base/src/test/java/org/apache/accumulo/server/security/delegation/ZooAuthenticationKeyWatcherTest.java b/server/base/src/test/java/org/apache/accumulo/server/security/delegation/ZooAuthenticationKeyWatcherTest.java
index df71d4fe8c0..fba25de8e9b 100644
--- a/server/base/src/test/java/org/apache/accumulo/server/security/delegation/ZooAuthenticationKeyWatcherTest.java
+++ b/server/base/src/test/java/org/apache/accumulo/server/security/delegation/ZooAuthenticationKeyWatcherTest.java
@@ -43,10 +43,13 @@
 import org.apache.accumulo.core.data.InstanceId;
 import org.apache.accumulo.core.fate.zookeeper.ZooReader;
 import org.apache.accumulo.core.fate.zookeeper.ZooUtil;
+import org.apache.accumulo.core.zookeeper.ZooSession;
 import org.apache.zookeeper.KeeperException.NoNodeException;
 import org.apache.zookeeper.WatchedEvent;
 import org.apache.zookeeper.Watcher.Event.EventType;
 import org.apache.zookeeper.Watcher.Event.KeeperState;
+import org.apache.zookeeper.data.Stat;
+import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
@@ -65,7 +68,7 @@ public static void setupKeyGenerator() throws Exception {
     keyGen.init(KEY_LENGTH);
   }
 
-  private ZooReader zk;
+  private ZooSession zk;
   private InstanceId instanceId;
   private String baseNode;
   private long tokenLifetime = DAYS.toMillis(7);
@@ -74,11 +77,20 @@ public static void setupKeyGenerator() throws Exception {
 
   @BeforeEach
   public void setupMocks() {
-    zk = createMock(ZooReader.class);
+    zk = createMock(ZooSession.class);
     instanceId = InstanceId.of(UUID.randomUUID());
     baseNode = ZooUtil.getRoot(instanceId) + Constants.ZDELEGATION_TOKEN_KEYS;
     secretManager = new AuthenticationTokenSecretManager(instanceId, tokenLifetime);
+
+    expect(zk.asReader()).andReturn(new ZooReader(zk)).once();
+    replay(zk);
     keyWatcher = new ZooAuthenticationKeyWatcher(secretManager, zk, baseNode);
+    reset(zk);
+  }
+
+  @AfterEach
+  public void verifyMocks() {
+    verify(zk);
   }
 
   @Test
@@ -90,7 +102,6 @@ public void testBaseNodeCreated() throws Exception {
 
     keyWatcher.process(event);
 
-    verify(zk);
     assertTrue(secretManager.getKeys().isEmpty());
   }
 
@@ -103,13 +114,12 @@ public void testBaseNodeCreatedWithChildren() throws Exception {
     List<String> children = Arrays.asList("1", "2");
 
     expect(zk.getChildren(baseNode, keyWatcher)).andReturn(children);
-    expect(zk.getData(baseNode + "/1", keyWatcher)).andReturn(serializedKey1);
-    expect(zk.getData(baseNode + "/2", keyWatcher)).andReturn(serializedKey2);
+    expect(zk.getData(baseNode + "/1", keyWatcher, null)).andReturn(serializedKey1);
+    expect(zk.getData(baseNode + "/2", keyWatcher, null)).andReturn(serializedKey2);
     replay(zk);
 
     keyWatcher.process(event);
 
-    verify(zk);
     assertEquals(2, secretManager.getKeys().size());
     assertEquals(key1, secretManager.getKeys().get(key1.getKeyId()));
     assertEquals(key2, secretManager.getKeys().get(key2.getKeyId()));
@@ -124,13 +134,12 @@ public void testBaseNodeChildrenChanged() throws Exception {
     List<String> children = Arrays.asList("1", "2");
 
     expect(zk.getChildren(baseNode, keyWatcher)).andReturn(children);
-    expect(zk.getData(baseNode + "/1", keyWatcher)).andReturn(serializedKey1);
-    expect(zk.getData(baseNode + "/2", keyWatcher)).andReturn(serializedKey2);
+    expect(zk.getData(baseNode + "/1", keyWatcher, null)).andReturn(serializedKey1);
+    expect(zk.getData(baseNode + "/2", keyWatcher, null)).andReturn(serializedKey2);
     replay(zk);
 
     keyWatcher.process(event);
 
-    verify(zk);
     assertEquals(2, secretManager.getKeys().size());
     assertEquals(key1, secretManager.getKeys().get(key1.getKeyId()));
     assertEquals(key2, secretManager.getKeys().get(key2.getKeyId()));
@@ -150,7 +159,6 @@ public void testBaseNodeDeleted() {
 
     keyWatcher.process(event);
 
-    verify(zk);
     assertEquals(0, secretManager.getKeys().size());
     assertFalse(secretManager.isCurrentKeySet());
   }
@@ -163,7 +171,6 @@ public void testBaseNodeDataChanged() {
 
     keyWatcher.process(event);
 
-    verify(zk);
     assertEquals(0, secretManager.getKeys().size());
     assertFalse(secretManager.isCurrentKeySet());
   }
@@ -177,12 +184,11 @@ public void testChildChanged() throws Exception {
     assertEquals(1, secretManager.getKeys().size());
     byte[] serializedKey2 = serialize(key2);
 
-    expect(zk.getData(event.getPath(), keyWatcher)).andReturn(serializedKey2);
+    expect(zk.getData(event.getPath(), keyWatcher, null)).andReturn(serializedKey2);
     replay(zk);
 
     keyWatcher.process(event);
 
-    verify(zk);
     assertEquals(2, secretManager.getKeys().size());
     assertEquals(key1, secretManager.getKeys().get(key1.getKeyId()));
     assertEquals(key2, secretManager.getKeys().get(key2.getKeyId()));
@@ -202,7 +208,6 @@ public void testChildDeleted() {
 
     keyWatcher.process(event);
 
-    verify(zk);
     assertEquals(1, secretManager.getKeys().size());
     assertEquals(key2, secretManager.getKeys().get(key2.getKeyId()));
     assertEquals(key2, secretManager.getCurrentKey());
@@ -222,7 +227,6 @@ public void testChildChildrenChanged() {
     // Does nothing
     keyWatcher.process(event);
 
-    verify(zk);
     assertEquals(2, secretManager.getKeys().size());
     assertEquals(key1, secretManager.getKeys().get(key1.getKeyId()));
     assertEquals(key2, secretManager.getKeys().get(key2.getKeyId()));
@@ -231,13 +235,12 @@ public void testChildChildrenChanged() {
 
   @Test
   public void testInitialUpdateNoNode() throws Exception {
-    expect(zk.exists(baseNode, keyWatcher)).andReturn(false);
+    expect(zk.exists(baseNode, keyWatcher)).andReturn(null);
 
     replay(zk);
 
     keyWatcher.updateAuthKeys();
 
-    verify(zk);
     assertEquals(0, secretManager.getKeys().size());
     assertNull(secretManager.getCurrentKey());
   }
@@ -248,17 +251,17 @@ public void testInitialUpdateWithKeys() throws Exception {
     AuthenticationKey key1 = new AuthenticationKey(1, 0L, 10000L, keyGen.generateKey()),
         key2 = new AuthenticationKey(5, key1.getExpirationDate(), 20000L, keyGen.generateKey());
 
-    expect(zk.exists(baseNode, keyWatcher)).andReturn(true);
+    expect(zk.exists(baseNode, keyWatcher)).andReturn(new Stat());
     expect(zk.getChildren(baseNode, keyWatcher)).andReturn(children);
-    expect(zk.getData(baseNode + "/" + key1.getKeyId(), keyWatcher)).andReturn(serialize(key1));
-    expect(zk.getData(baseNode + "/" + key2.getKeyId(), keyWatcher)).andReturn(serialize(key2));
+    expect(zk.getData(baseNode + "/" + key1.getKeyId(), keyWatcher, null))
+        .andReturn(serialize(key1));
+    expect(zk.getData(baseNode + "/" + key2.getKeyId(), keyWatcher, null))
+        .andReturn(serialize(key2));
 
     replay(zk);
 
     keyWatcher.updateAuthKeys();
 
-    verify(zk);
-
     assertEquals(2, secretManager.getKeys().size());
     assertEquals(key1, secretManager.getKeys().get(key1.getKeyId()));
     assertEquals(key2, secretManager.getKeys().get(key2.getKeyId()));
@@ -283,10 +286,12 @@ private void lostZooKeeperBase(WatchedEvent disconnectEvent, WatchedEvent reconn
     AuthenticationKey key1 = new AuthenticationKey(1, 0L, 10000L, keyGen.generateKey()),
         key2 = new AuthenticationKey(5, key1.getExpirationDate(), 20000L, keyGen.generateKey());
 
-    expect(zk.exists(baseNode, keyWatcher)).andReturn(true);
+    expect(zk.exists(baseNode, keyWatcher)).andReturn(new Stat());
     expect(zk.getChildren(baseNode, keyWatcher)).andReturn(children);
-    expect(zk.getData(baseNode + "/" + key1.getKeyId(), keyWatcher)).andReturn(serialize(key1));
-    expect(zk.getData(baseNode + "/" + key2.getKeyId(), keyWatcher)).andReturn(serialize(key2));
+    expect(zk.getData(baseNode + "/" + key1.getKeyId(), keyWatcher, null))
+        .andReturn(serialize(key1));
+    expect(zk.getData(baseNode + "/" + key2.getKeyId(), keyWatcher, null))
+        .andReturn(serialize(key2));
 
     replay(zk);
 
@@ -294,8 +299,6 @@ private void lostZooKeeperBase(WatchedEvent disconnectEvent, WatchedEvent reconn
     keyWatcher.updateAuthKeys();
     keyWatcher.process(disconnectEvent);
 
-    verify(zk);
-
     // We should have no auth keys when we're disconnected
     assertEquals(0, secretManager.getKeys().size(),
         "Secret manager should be empty after a disconnect");
@@ -303,18 +306,18 @@ private void lostZooKeeperBase(WatchedEvent disconnectEvent, WatchedEvent reconn
 
     reset(zk);
 
-    expect(zk.exists(baseNode, keyWatcher)).andReturn(true);
+    expect(zk.exists(baseNode, keyWatcher)).andReturn(new Stat());
     expect(zk.getChildren(baseNode, keyWatcher)).andReturn(children);
-    expect(zk.getData(baseNode + "/" + key1.getKeyId(), keyWatcher)).andReturn(serialize(key1));
-    expect(zk.getData(baseNode + "/" + key2.getKeyId(), keyWatcher)).andReturn(serialize(key2));
+    expect(zk.getData(baseNode + "/" + key1.getKeyId(), keyWatcher, null))
+        .andReturn(serialize(key1));
+    expect(zk.getData(baseNode + "/" + key2.getKeyId(), keyWatcher, null))
+        .andReturn(serialize(key2));
 
     replay(zk);
 
     // Reconnect again, get all the keys
     keyWatcher.process(reconnectEvent);
 
-    verify(zk);
-
     // Verify we have both keys
     assertEquals(2, secretManager.getKeys().size());
     assertEquals(key1, secretManager.getKeys().get(key1.getKeyId()));
@@ -326,11 +329,11 @@ public void missingKeyAfterGetChildren() throws Exception {
     List<String> children = Arrays.asList("1");
     AuthenticationKey key1 = new AuthenticationKey(1, 0L, 10000L, keyGen.generateKey());
 
-    expect(zk.exists(baseNode, keyWatcher)).andReturn(true);
+    expect(zk.exists(baseNode, keyWatcher)).andReturn(new Stat());
     // We saw key1
     expect(zk.getChildren(baseNode, keyWatcher)).andReturn(children);
     // but it was gone when we tried to access it (manager deleted it)
-    expect(zk.getData(baseNode + "/" + key1.getKeyId(), keyWatcher))
+    expect(zk.getData(baseNode + "/" + key1.getKeyId(), keyWatcher, null))
         .andThrow(new NoNodeException());
 
     replay(zk);
@@ -338,8 +341,6 @@ public void missingKeyAfterGetChildren() throws Exception {
     // Initialize
     keyWatcher.updateAuthKeys();
 
-    verify(zk);
-
     // We should have no auth keys after initializing things
     assertEquals(0, secretManager.getKeys().size(),
         "Secret manager should be empty after a disconnect");
diff --git a/server/base/src/test/java/org/apache/accumulo/server/security/handler/ZKAuthenticatorTest.java b/server/base/src/test/java/org/apache/accumulo/server/security/handler/ZKAuthenticatorTest.java
index 6621feb93ff..a3f91a7cf82 100644
--- a/server/base/src/test/java/org/apache/accumulo/server/security/handler/ZKAuthenticatorTest.java
+++ b/server/base/src/test/java/org/apache/accumulo/server/security/handler/ZKAuthenticatorTest.java
@@ -39,16 +39,15 @@
 import org.apache.accumulo.core.client.AccumuloException;
 import org.apache.accumulo.core.client.security.tokens.PasswordToken;
 import org.apache.accumulo.core.data.InstanceId;
-import org.apache.accumulo.core.fate.zookeeper.ZooReaderWriter;
 import org.apache.accumulo.core.fate.zookeeper.ZooUtil;
 import org.apache.accumulo.core.security.Authorizations;
 import org.apache.accumulo.core.security.SystemPermission;
 import org.apache.accumulo.core.security.TablePermission;
 import org.apache.accumulo.core.util.ByteArraySet;
+import org.apache.accumulo.core.zookeeper.ZooSession;
 import org.apache.accumulo.server.MockServerContext;
 import org.apache.accumulo.server.ServerContext;
 import org.apache.zookeeper.Watcher;
-import org.apache.zookeeper.ZooKeeper;
 import org.apache.zookeeper.data.Stat;
 import org.junit.jupiter.api.Test;
 
@@ -143,17 +142,16 @@ public void testUserAuthentication() throws Exception {
 
     // mocking zk interaction
     var instanceId = InstanceId.of("example");
-    ServerContext context = MockServerContext.getWithZK(instanceId, "", 30_000);
-    ZooReaderWriter zr = createMock(ZooReaderWriter.class);
-    expect(context.getZooReader()).andReturn(zr).anyTimes();
-    ZooKeeper zk = createMock(ZooKeeper.class);
+    ZooSession zk = createMock(ZooSession.class);
+    ServerContext context = MockServerContext.getWithMockZK(zk);
+    expect(context.zkUserPath()).andReturn(ZooUtil.getRoot(instanceId) + Constants.ZUSERS)
+        .anyTimes();
     expect(zk.getChildren(anyObject(), anyObject())).andReturn(Arrays.asList(principal)).anyTimes();
     expect(zk.exists(matches(ZooUtil.getRoot(instanceId) + Constants.ZUSERS + "/" + principal),
         anyObject(Watcher.class))).andReturn(new Stat()).anyTimes();
-    expect(zr.getZooKeeper()).andReturn(zk).anyTimes();
     expect(zk.getData(matches(ZooUtil.getRoot(instanceId) + Constants.ZUSERS + "/" + principal),
         anyObject(), anyObject())).andReturn(newHash).once();
-    replay(context, zr, zk);
+    replay(context, zk);
 
     // creating authenticator
     ZKAuthenticator auth = new ZKAuthenticator();
@@ -162,6 +160,6 @@ public void testUserAuthentication() throws Exception {
     PasswordToken token = new PasswordToken(rawPass.clone());
     // verifying that if the new type of hash is stored in zk authentication works as expected
     assertTrue(auth.authenticateUser(principal, token));
-    verify(context, zr, zk);
+    verify(context, zk);
   }
 }
diff --git a/server/base/src/test/java/org/apache/accumulo/server/util/AdminTest.java b/server/base/src/test/java/org/apache/accumulo/server/util/AdminTest.java
index 694541105ab..3e77560e49f 100644
--- a/server/base/src/test/java/org/apache/accumulo/server/util/AdminTest.java
+++ b/server/base/src/test/java/org/apache/accumulo/server/util/AdminTest.java
@@ -101,8 +101,6 @@ public void testQualifySessionId() throws KeeperException, InterruptedException
 
     String serverPath = group + "/" + server;
     String validZLockEphemeralNode = "zlock#" + UUID.randomUUID() + "#0000000000";
-    expect(ctx.getZooKeeperRoot()).andReturn(root).anyTimes();
-    expect(ctx.getZooCache()).andReturn(zc).anyTimes();
     expect(zc.getChildren(type)).andReturn(List.of(Constants.DEFAULT_RESOURCE_GROUP_NAME))
         .anyTimes();
     expect(zc.getChildren(group)).andReturn(List.of(server)).anyTimes();
@@ -116,7 +114,7 @@ public void testQualifySessionId() throws KeeperException, InterruptedException
           stat.setEphemeralOwner(session);
           return new byte[0];
         });
-    expect(ctx.getServerPaths()).andReturn(new ServiceLockPaths(ctx)).anyTimes();
+    expect(ctx.getServerPaths()).andReturn(new ServiceLockPaths(root, zc)).anyTimes();
     replay(ctx, zc);
 
     assertEquals(server + "[" + Long.toHexString(session) + "]",
@@ -137,11 +135,9 @@ public void testCannotQualifySessionId() throws KeeperException, InterruptedExce
     String server = "localhost:12345";
 
     String serverPath = group + "/" + server;
-    expect(ctx.getZooKeeperRoot()).andReturn(root).anyTimes();
-    expect(ctx.getZooCache()).andReturn(zc).anyTimes();
     expect(zc.getChildren(type)).andReturn(List.of(Constants.DEFAULT_RESOURCE_GROUP_NAME));
     expect(zc.getChildren(serverPath)).andReturn(Collections.emptyList());
-    expect(ctx.getServerPaths()).andReturn(new ServiceLockPaths(ctx)).anyTimes();
+    expect(ctx.getServerPaths()).andReturn(new ServiceLockPaths(root, zc)).anyTimes();
     replay(ctx, zc);
 
     // A server that isn't in ZooKeeper. Can't qualify it, should return the original
diff --git a/server/base/src/test/java/org/apache/accumulo/server/util/PropUtilTest.java b/server/base/src/test/java/org/apache/accumulo/server/util/PropUtilTest.java
new file mode 100644
index 00000000000..e16fc75e450
--- /dev/null
+++ b/server/base/src/test/java/org/apache/accumulo/server/util/PropUtilTest.java
@@ -0,0 +1,102 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.accumulo.server.util;
+
+import static org.easymock.EasyMock.createMock;
+import static org.easymock.EasyMock.expect;
+import static org.easymock.EasyMock.replay;
+import static org.easymock.EasyMock.verify;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+
+import java.util.Map;
+
+import org.apache.accumulo.core.classloader.ClassLoaderUtil;
+import org.apache.accumulo.core.conf.AccumuloConfiguration;
+import org.apache.accumulo.core.conf.Property;
+import org.apache.accumulo.core.data.InstanceId;
+import org.apache.accumulo.core.data.TableId;
+import org.apache.accumulo.core.spi.common.ContextClassLoaderFactory;
+import org.apache.accumulo.server.ServerContext;
+import org.apache.accumulo.server.conf.store.TablePropKey;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
+public class PropUtilTest {
+
+  private static final String TEST_CONTEXT_NAME = "TestContext";
+  private static final String INVALID_TEST_CONTEXT_NAME = "InvalidTestContext";
+
+  public static class TestContextClassLoaderFactory implements ContextClassLoaderFactory {
+
+    @Override
+    public ClassLoader getClassLoader(String contextName) {
+      if (contextName.equals(TEST_CONTEXT_NAME)) {
+        return this.getClass().getClassLoader();
+      }
+      return null;
+    }
+
+  }
+
+  @BeforeEach
+  public void before() {
+    ClassLoaderUtil.resetContextFactoryForTests();
+  }
+
+  @Test
+  public void testSetClasspathContextFails() {
+    ServerContext ctx = createMock(ServerContext.class);
+    AccumuloConfiguration conf = createMock(AccumuloConfiguration.class);
+    InstanceId iid = createMock(InstanceId.class);
+    TableId tid = createMock(TableId.class);
+    TablePropKey tkey = TablePropKey.of(iid, tid);
+
+    expect(ctx.getConfiguration()).andReturn(conf).once();
+    expect(conf.get(Property.GENERAL_CONTEXT_CLASSLOADER_FACTORY))
+        .andReturn(TestContextClassLoaderFactory.class.getName());
+
+    replay(ctx, conf, iid, tid);
+    IllegalArgumentException e =
+        assertThrows(IllegalArgumentException.class, () -> PropUtil.validateProperties(ctx, tkey,
+            Map.of(Property.TABLE_CLASSLOADER_CONTEXT.getKey(), INVALID_TEST_CONTEXT_NAME)));
+    assertEquals("Unable to resolve classloader for context: " + INVALID_TEST_CONTEXT_NAME,
+        e.getMessage());
+    verify(ctx, conf, iid, tid);
+  }
+
+  @Test
+  public void testSetClasspathContext() {
+    ServerContext ctx = createMock(ServerContext.class);
+    AccumuloConfiguration conf = createMock(AccumuloConfiguration.class);
+    InstanceId iid = createMock(InstanceId.class);
+    TableId tid = createMock(TableId.class);
+    TablePropKey tkey = TablePropKey.of(iid, tid);
+
+    expect(ctx.getConfiguration()).andReturn(conf).once();
+    expect(conf.get(Property.GENERAL_CONTEXT_CLASSLOADER_FACTORY))
+        .andReturn(TestContextClassLoaderFactory.class.getName());
+
+    replay(ctx, conf, iid, tid);
+    PropUtil.validateProperties(ctx, tkey,
+        Map.of(Property.TABLE_CLASSLOADER_CONTEXT.getKey(), TEST_CONTEXT_NAME));
+    verify(ctx, conf, iid, tid);
+  }
+
+}
diff --git a/server/base/src/test/java/org/apache/accumulo/server/util/ServiceStatusCmdTest.java b/server/base/src/test/java/org/apache/accumulo/server/util/ServiceStatusCmdTest.java
index 344e09a5388..163bfed546c 100644
--- a/server/base/src/test/java/org/apache/accumulo/server/util/ServiceStatusCmdTest.java
+++ b/server/base/src/test/java/org/apache/accumulo/server/util/ServiceStatusCmdTest.java
@@ -20,9 +20,11 @@
 
 import static java.nio.charset.StandardCharsets.UTF_8;
 import static org.apache.accumulo.core.Constants.ZGC_LOCK;
+import static org.easymock.EasyMock.anyObject;
 import static org.easymock.EasyMock.createMock;
 import static org.easymock.EasyMock.eq;
 import static org.easymock.EasyMock.expect;
+import static org.easymock.EasyMock.isA;
 import static org.easymock.EasyMock.replay;
 import static org.easymock.EasyMock.verify;
 import static org.junit.jupiter.api.Assertions.assertEquals;
@@ -42,11 +44,11 @@
 import org.apache.accumulo.core.fate.zookeeper.ZooReader;
 import org.apache.accumulo.core.fate.zookeeper.ZooUtil;
 import org.apache.accumulo.core.lock.ServiceLockPaths;
+import org.apache.accumulo.core.zookeeper.ZooSession;
 import org.apache.accumulo.server.ServerContext;
 import org.apache.accumulo.server.util.serviceStatus.ServiceStatusReport;
 import org.apache.accumulo.server.util.serviceStatus.StatusSummary;
 import org.apache.zookeeper.KeeperException;
-import org.easymock.EasyMock;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
@@ -57,36 +59,33 @@ public class ServiceStatusCmdTest {
 
   private static final Logger LOG = LoggerFactory.getLogger(ServiceStatusCmdTest.class);
 
-  private ServerContext context;
   private String zRoot;
-  private ZooReader zooReader;
+  private ServerContext context;
+  private ZooSession zooReader;
   private ZooCache zooCache;
 
   @BeforeEach
   public void populateContext() {
-    InstanceId iid = InstanceId.of(UUID.randomUUID());
-    zRoot = ZooUtil.getRoot(iid);
+    zRoot = ZooUtil.getRoot(InstanceId.of(UUID.randomUUID()));
     context = createMock(ServerContext.class);
-    expect(context.getInstanceID()).andReturn(iid).anyTimes();
-    expect(context.getZooKeeperRoot()).andReturn(zRoot).anyTimes();
-
-    zooReader = createMock(ZooReader.class);
+    zooReader = createMock(ZooSession.class);
     zooCache = createMock(ZooCache.class);
-
-    expect(context.getZooReader()).andReturn(zooReader).anyTimes();
+    expect(zooReader.asReader()).andReturn(new ZooReader(zooReader)).anyTimes();
     expect(context.getZooCache()).andReturn(zooCache).anyTimes();
-    expect(context.getServerPaths()).andReturn(new ServiceLockPaths(context)).anyTimes();
-
+    expect(context.getZooSession()).andReturn(zooReader).anyTimes();
+    expect(context.getZooKeeperRoot()).andReturn(zRoot).anyTimes();
+    expect(context.getServerPaths()).andReturn(new ServiceLockPaths(zRoot, zooCache)).anyTimes();
     replay(context);
   }
 
   @AfterEach
   public void validateMocks() {
-    verify(context, zooReader);
+    verify(context, zooReader, zooCache);
   }
 
   @Test
-  void testManagerHosts() throws Exception {
+  public void testManagerHosts() throws Exception {
+    replay(zooCache);
     String lock1Name = "zlock#" + UUID.randomUUID() + "#0000000001";
     String lock2Name = "zlock#" + UUID.randomUUID() + "#0000000002";
     String lock3Name = "zlock#" + UUID.randomUUID() + "#0000000003";
@@ -99,19 +98,18 @@ void testManagerHosts() throws Exception {
         "{\"descriptors\":[{\"uuid\":\"6effb690-c29c-4e0b-92ff-f6b308385a42\",\"service\":\"MANAGER\",\"address\":\"hostA:9999\",\"group\":\"manager1\"}]}";
 
     String lockPath = zRoot + Constants.ZMANAGER_LOCK;
-    expect(zooReader.getChildren(eq(lockPath))).andReturn(List.of(lock1Name, lock2Name, lock3Name))
-        .anyTimes();
-    expect(zooReader.getData(eq(lockPath + "/" + lock1Name))).andReturn(lock1data.getBytes(UTF_8))
-        .anyTimes();
-    expect(zooReader.getData(eq(lockPath + "/" + lock2Name))).andReturn(lock2Data.getBytes(UTF_8))
-        .anyTimes();
-    expect(zooReader.getData(eq(lockPath + "/" + lock3Name))).andReturn(lock3Data.getBytes(UTF_8))
-        .anyTimes();
-
-    replay(zooCache, zooReader);
+    expect(zooReader.getChildren(lockPath, null))
+        .andReturn(List.of(lock1Name, lock2Name, lock3Name));
+    expect(zooReader.getData(lockPath + "/" + lock1Name, null, null))
+        .andReturn(lock1data.getBytes(UTF_8));
+    expect(zooReader.getData(lockPath + "/" + lock2Name, null, null))
+        .andReturn(lock2Data.getBytes(UTF_8));
+    expect(zooReader.getData(lockPath + "/" + lock3Name, null, null))
+        .andReturn(lock3Data.getBytes(UTF_8));
+    replay(zooReader);
 
     ServiceStatusCmd cmd = new ServiceStatusCmd();
-    StatusSummary status = cmd.getManagerStatus(zooReader, context);
+    StatusSummary status = cmd.getManagerStatus(context);
     LOG.info("manager status data: {}", status);
 
     assertEquals(3, status.getServiceCount());
@@ -134,7 +132,8 @@ void testManagerHosts() throws Exception {
   }
 
   @Test
-  void testMonitorHosts() throws Exception {
+  public void testMonitorHosts() throws Exception {
+    replay(zooCache);
     String lock1Name = "zlock#" + UUID.randomUUID() + "#0000000001";
     String lock2Name = "zlock#" + UUID.randomUUID() + "#0000000002";
 
@@ -144,16 +143,16 @@ void testMonitorHosts() throws Exception {
         "{\"descriptors\":[{\"uuid\":\"87465459-9c8f-4f95-b4c6-ef3029030d05\",\"service\":\"NONE\",\"address\":\"hostB\",\"group\":\"default\"}]}";
 
     String lockPath = zRoot + Constants.ZMONITOR_LOCK;
-    expect(zooReader.getChildren(eq(lockPath))).andReturn(List.of(lock1Name, lock2Name)).anyTimes();
-    expect(zooReader.getData(eq(lockPath + "/" + lock1Name))).andReturn(host1.getBytes(UTF_8))
-        .anyTimes();
-    expect(zooReader.getData(eq(lockPath + "/" + lock2Name))).andReturn(host2.getBytes(UTF_8))
-        .anyTimes();
+    expect(zooReader.getChildren(lockPath, null)).andReturn(List.of(lock1Name, lock2Name));
+    expect(zooReader.getData(lockPath + "/" + lock1Name, null, null))
+        .andReturn(host1.getBytes(UTF_8));
+    expect(zooReader.getData(lockPath + "/" + lock2Name, null, null))
+        .andReturn(host2.getBytes(UTF_8));
 
     replay(zooReader);
 
     ServiceStatusCmd cmd = new ServiceStatusCmd();
-    StatusSummary status = cmd.getMonitorStatus(zooReader, context);
+    StatusSummary status = cmd.getMonitorStatus(context);
     LOG.info("monitor status data: {}", status);
 
     assertEquals(2, status.getServiceCount());
@@ -175,7 +174,8 @@ void testMonitorHosts() throws Exception {
   }
 
   @Test
-  void testTServerHosts() throws Exception {
+  public void testTServerHosts() throws Exception {
+    replay(zooReader);
     String lock1Name = "zlock#" + UUID.randomUUID() + "#0000000001";
     String lock2Name = "zlock#" + UUID.randomUUID() + "#0000000002";
     String lock3Name = "zlock#" + UUID.randomUUID() + "#0000000003";
@@ -219,38 +219,33 @@ void testTServerHosts() throws Exception {
             + host3 + "\",\"group\":\"default\"}]}";
 
     String basePath = zRoot + Constants.ZTSERVERS;
-
-    expect(zooCache.getChildren(zRoot)).andReturn(List.of(Constants.ZTSERVERS)).anyTimes();
-    expect(zooCache.getChildren(basePath)).andReturn(List.of(Constants.DEFAULT_RESOURCE_GROUP_NAME))
-        .anyTimes();
+    expect(zooCache.getChildren(basePath))
+        .andReturn(List.of(Constants.DEFAULT_RESOURCE_GROUP_NAME));
     expect(zooCache.getChildren(basePath + "/" + Constants.DEFAULT_RESOURCE_GROUP_NAME))
-        .andReturn(List.of(host1, host2, host3)).anyTimes();
+        .andReturn(List.of(host1, host2, host3));
 
     expect(
         zooCache.getChildren(basePath + "/" + Constants.DEFAULT_RESOURCE_GROUP_NAME + "/" + host1))
-        .andReturn(List.of(lock1Name)).anyTimes();
+        .andReturn(List.of(lock1Name));
     expect(zooCache.get(
-        EasyMock.eq(
-            basePath + "/" + Constants.DEFAULT_RESOURCE_GROUP_NAME + "/" + host1 + "/" + lock1Name),
-        EasyMock.isA(ZcStat.class))).andReturn(lockData1.getBytes(UTF_8)).anyTimes();
+        eq(basePath + "/" + Constants.DEFAULT_RESOURCE_GROUP_NAME + "/" + host1 + "/" + lock1Name),
+        isA(ZcStat.class))).andReturn(lockData1.getBytes(UTF_8));
 
     expect(
         zooCache.getChildren(basePath + "/" + Constants.DEFAULT_RESOURCE_GROUP_NAME + "/" + host2))
-        .andReturn(List.of(lock2Name)).anyTimes();
+        .andReturn(List.of(lock2Name));
     expect(zooCache.get(
-        EasyMock.eq(
-            basePath + "/" + Constants.DEFAULT_RESOURCE_GROUP_NAME + "/" + host2 + "/" + lock2Name),
-        EasyMock.isA(ZcStat.class))).andReturn(lockData2.getBytes(UTF_8)).anyTimes();
+        eq(basePath + "/" + Constants.DEFAULT_RESOURCE_GROUP_NAME + "/" + host2 + "/" + lock2Name),
+        isA(ZcStat.class))).andReturn(lockData2.getBytes(UTF_8));
 
     expect(
         zooCache.getChildren(basePath + "/" + Constants.DEFAULT_RESOURCE_GROUP_NAME + "/" + host3))
-        .andReturn(List.of(lock3Name)).anyTimes();
+        .andReturn(List.of(lock3Name));
     expect(zooCache.get(
-        EasyMock.eq(
-            basePath + "/" + Constants.DEFAULT_RESOURCE_GROUP_NAME + "/" + host3 + "/" + lock3Name),
-        EasyMock.isA(ZcStat.class))).andReturn(lockData3.getBytes(UTF_8)).anyTimes();
+        eq(basePath + "/" + Constants.DEFAULT_RESOURCE_GROUP_NAME + "/" + host3 + "/" + lock3Name),
+        isA(ZcStat.class))).andReturn(lockData3.getBytes(UTF_8));
 
-    replay(zooCache, zooReader);
+    replay(zooCache);
 
     ServiceStatusCmd cmd = new ServiceStatusCmd();
     StatusSummary status = cmd.getTServerStatus(context);
@@ -275,12 +270,11 @@ void testTServerHosts() throws Exception {
     assertEquals(expected.getServiceCount(), status.getServiceCount());
     assertEquals(expected.getErrorCount(), status.getErrorCount());
     assertEquals(expected, status);
-
-    verify(zooCache);
   }
 
   @Test
-  void testScanServerHosts() throws Exception {
+  public void testScanServerHosts() throws Exception {
+    replay(zooReader);
     UUID uuid1 = UUID.randomUUID();
     String lock1Name = "zlock#" + uuid1 + "#0000000001";
     UUID uuid2 = UUID.randomUUID();
@@ -316,40 +310,35 @@ void testScanServerHosts() throws Exception {
             + host4 + "\",\"group\":\"default\"}]}";
 
     String lockPath = zRoot + Constants.ZSSERVERS;
-    expect(zooCache.getChildren(zRoot)).andReturn(List.of(Constants.ZSSERVERS)).anyTimes();
     expect(zooCache.getChildren(lockPath))
-        .andReturn(List.of(Constants.DEFAULT_RESOURCE_GROUP_NAME, "sg1")).anyTimes();
+        .andReturn(List.of(Constants.DEFAULT_RESOURCE_GROUP_NAME, "sg1"));
     expect(zooCache.getChildren(lockPath + "/" + Constants.DEFAULT_RESOURCE_GROUP_NAME))
-        .andReturn(List.of(host2, host4)).anyTimes();
-    expect(zooCache.getChildren(lockPath + "/sg1")).andReturn(List.of(host1, host3)).anyTimes();
+        .andReturn(List.of(host2, host4));
+    expect(zooCache.getChildren(lockPath + "/sg1")).andReturn(List.of(host1, host3));
 
-    expect(zooCache.getChildren(lockPath + "/sg1/" + host1)).andReturn(List.of(lock1Name))
-        .anyTimes();
-    expect(zooCache.get(EasyMock.eq(lockPath + "/sg1/" + host1 + "/" + lock1Name),
-        EasyMock.isA(ZcStat.class))).andReturn(lockData1.getBytes(UTF_8)).anyTimes();
+    expect(zooCache.getChildren(lockPath + "/sg1/" + host1)).andReturn(List.of(lock1Name));
+    expect(zooCache.get(eq(lockPath + "/sg1/" + host1 + "/" + lock1Name), isA(ZcStat.class)))
+        .andReturn(lockData1.getBytes(UTF_8));
 
     expect(
         zooCache.getChildren(lockPath + "/" + Constants.DEFAULT_RESOURCE_GROUP_NAME + "/" + host2))
-        .andReturn(List.of(lock2Name)).anyTimes();
+        .andReturn(List.of(lock2Name));
     expect(zooCache.get(
-        EasyMock.eq(
-            lockPath + "/" + Constants.DEFAULT_RESOURCE_GROUP_NAME + "/" + host2 + "/" + lock2Name),
-        EasyMock.isA(ZcStat.class))).andReturn(lockData2.getBytes(UTF_8)).anyTimes();
+        eq(lockPath + "/" + Constants.DEFAULT_RESOURCE_GROUP_NAME + "/" + host2 + "/" + lock2Name),
+        isA(ZcStat.class))).andReturn(lockData2.getBytes(UTF_8));
 
-    expect(zooCache.getChildren(lockPath + "/sg1/" + host3)).andReturn(List.of(lock3Name))
-        .anyTimes();
-    expect(zooCache.get(EasyMock.eq(lockPath + "/sg1/" + host3 + "/" + lock3Name),
-        EasyMock.isA(ZcStat.class))).andReturn(lockData3.getBytes(UTF_8)).anyTimes();
+    expect(zooCache.getChildren(lockPath + "/sg1/" + host3)).andReturn(List.of(lock3Name));
+    expect(zooCache.get(eq(lockPath + "/sg1/" + host3 + "/" + lock3Name), isA(ZcStat.class)))
+        .andReturn(lockData3.getBytes(UTF_8));
 
     expect(
         zooCache.getChildren(lockPath + "/" + Constants.DEFAULT_RESOURCE_GROUP_NAME + "/" + host4))
-        .andReturn(List.of(lock4Name)).anyTimes();
+        .andReturn(List.of(lock4Name));
     expect(zooCache.get(
-        EasyMock.eq(
-            lockPath + "/" + Constants.DEFAULT_RESOURCE_GROUP_NAME + "/" + host4 + "/" + lock4Name),
-        EasyMock.isA(ZcStat.class))).andReturn(lockData4.getBytes(UTF_8)).anyTimes();
+        eq(lockPath + "/" + Constants.DEFAULT_RESOURCE_GROUP_NAME + "/" + host4 + "/" + lock4Name),
+        isA(ZcStat.class))).andReturn(lockData4.getBytes(UTF_8));
 
-    replay(zooCache, zooReader);
+    replay(zooCache);
 
     ServiceStatusCmd cmd = new ServiceStatusCmd();
     StatusSummary status = cmd.getScanServerStatus(context);
@@ -363,37 +352,67 @@ void testScanServerHosts() throws Exception {
         Set.of("default", "sg1"), hostByGroup, 0);
 
     assertEquals(expected, status);
-    verify(zooCache);
 
   }
 
   @Test
   public void testCompactorStatus() throws Exception {
-    String lockPath = zRoot + Constants.ZCOMPACTORS;
+    replay(zooReader);
 
-    expect(zooCache.getChildren(zRoot)).andReturn(List.of(Constants.ZCOMPACTORS)).anyTimes();
-    expect(zooCache.getChildren(lockPath)).andReturn(List.of("q1", "q2")).anyTimes();
-    expect(zooCache.getChildren(lockPath + "/q1")).andReturn(List.of("hostA:8080", "hostC:8081"))
-        .anyTimes();
-    expect(zooCache.getChildren(lockPath + "/q2")).andReturn(List.of("hostB:9090", "hostD:9091"))
-        .anyTimes();
-    expect(zooCache.getChildren(lockPath + "/q1/hostA:8080")).andReturn(List.of()).anyTimes();
-    expect(zooCache.getChildren(lockPath + "/q1/hostC:8081")).andReturn(List.of()).anyTimes();
-    expect(zooCache.getChildren(lockPath + "/q2/hostB:9090")).andReturn(List.of()).anyTimes();
-    expect(zooCache.getChildren(lockPath + "/q2/hostD:9091")).andReturn(List.of()).anyTimes();
+    UUID uuid1 = UUID.randomUUID();
+    String lock1Name = "zlock#" + uuid1 + "#0000000001";
+    UUID uuid2 = UUID.randomUUID();
+    String lock2Name = "zlock#" + uuid2 + "#0000000022";
+    UUID uuid3 = UUID.randomUUID();
+    String lock3Name = "zlock#" + uuid3 + "#0000000033";
+    UUID uuid4 = UUID.randomUUID();
+    String lock4Name = "zlock#" + uuid4 + "#0000000044";
 
-    replay(zooCache, zooReader);
+    String lock1data =
+        "{\"descriptors\":[{\"uuid\":\"6effb690-c29c-4e0b-92ff-f6b308385a42\",\"service\":\"COMPACTOR\",\"address\":\"hostA:8080\",\"group\":\"q1\"}]}";
+    String lock2data =
+        "{\"descriptors\":[{\"uuid\":\"6effb690-c29c-4e0b-92ff-f6b308385a42\",\"service\":\"COMPACTOR\",\"address\":\"hostC:8081\",\"group\":\"q1\"}]}";
+    String lock3data =
+        "{\"descriptors\":[{\"uuid\":\"6effb690-c29c-4e0b-92ff-f6b308385a42\",\"service\":\"COMPACTOR\",\"address\":\"hostB:9090\",\"group\":\"q2\"}]}";
+    String lock4data =
+        "{\"descriptors\":[{\"uuid\":\"6effb690-c29c-4e0b-92ff-f6b308385a42\",\"service\":\"COMPACTOR\",\"address\":\"hostD:9091\",\"group\":\"q2\"}]}";
+
+    String lockPath = zRoot + Constants.ZCOMPACTORS;
+    expect(zooCache.getChildren(lockPath)).andReturn(List.of("q1", "q2", "q3"));
+    expect(zooCache.getChildren(lockPath + "/q1")).andReturn(List.of("hostA:8080", "hostC:8081"));
+    expect(zooCache.getChildren(lockPath + "/q2")).andReturn(List.of("hostB:9090", "hostD:9091"));
+    // Create compactor group with dead compactor
+    expect(zooCache.getChildren(lockPath + "/q3")).andReturn(List.of("deadHost:8080"));
+
+    expect(zooCache.getChildren(lockPath + "/q1/hostA:8080")).andReturn(List.of(lock1Name));
+    expect(zooCache.get(eq(lockPath + "/q1/hostA:8080/" + lock1Name), anyObject(ZcStat.class)))
+        .andReturn(lock1data.getBytes(UTF_8));
+    expect(zooCache.getChildren(lockPath + "/q1/hostC:8081")).andReturn(List.of(lock2Name));
+    expect(zooCache.get(eq(lockPath + "/q1/hostC:8081/" + lock2Name), anyObject(ZcStat.class)))
+        .andReturn(lock2data.getBytes(UTF_8));
+    expect(zooCache.getChildren(lockPath + "/q2/hostB:9090")).andReturn(List.of(lock3Name));
+    expect(zooCache.get(eq(lockPath + "/q2/hostB:9090/" + lock3Name), anyObject(ZcStat.class)))
+        .andReturn(lock3data.getBytes(UTF_8));
+    expect(zooCache.getChildren(lockPath + "/q2/hostD:9091")).andReturn(List.of(lock4Name));
+    expect(zooCache.get(eq(lockPath + "/q2/hostD:9091/" + lock4Name), anyObject(ZcStat.class)))
+        .andReturn(lock4data.getBytes(UTF_8));
+    expect(zooCache.getChildren(lockPath + "/q3/deadHost:8080")).andReturn(List.of());
+
+    replay(zooCache);
 
     ServiceStatusCmd cmd = new ServiceStatusCmd();
     StatusSummary status = cmd.getCompactorStatus(context);
+
     LOG.info("compactor group counts: {}", status);
-    assertEquals(0, status.getResourceGroups().size());
+    assertEquals(2, status.getResourceGroups().size());
 
-    verify(zooCache);
+    LOG.info("Live compactor counts: {}", status.getServiceCount());
+    assertEquals(4, status.getServiceCount());
   }
 
   @Test
   public void testGcHosts() throws Exception {
+    replay(zooCache);
 
     String lockPath = zRoot + ZGC_LOCK;
     UUID uuid1 = UUID.randomUUID();
@@ -411,16 +430,16 @@ public void testGcHosts() throws Exception {
         "{\"descriptors\":[{\"uuid\":\"5c901352-b027-4f78-8ee1-05ae163fbb0e\",\"service\":\"GC\",\"address\":\""
             + host1 + "\",\"group\":\"gc1\"}]}";
 
-    expect(zooReader.getChildren(eq(lockPath))).andReturn(List.of(lock1Name, lock2Name)).once();
-    expect(zooReader.getData(eq(lockPath + "/" + lock1Name))).andReturn(lockData1.getBytes(UTF_8))
-        .once();
-    expect(zooReader.getData(eq(lockPath + "/" + lock2Name))).andReturn(lockData2.getBytes(UTF_8))
-        .once();
+    expect(zooReader.getChildren(lockPath, null)).andReturn(List.of(lock1Name, lock2Name));
+    expect(zooReader.getData(lockPath + "/" + lock1Name, null, null))
+        .andReturn(lockData1.getBytes(UTF_8));
+    expect(zooReader.getData(lockPath + "/" + lock2Name, null, null))
+        .andReturn(lockData2.getBytes(UTF_8));
 
     replay(zooReader);
 
     ServiceStatusCmd cmd = new ServiceStatusCmd();
-    StatusSummary status = cmd.getGcStatus(zooReader, context);
+    StatusSummary status = cmd.getGcStatus(context);
     LOG.info("gc server counts: {}", status);
     assertEquals(2, status.getResourceGroups().size());
     assertEquals(2, status.getServiceCount());
@@ -438,7 +457,8 @@ public void testGcHosts() throws Exception {
    * error is skipped and available hosts are returned.
    */
   @Test
-  void zkNodeDeletedTest() throws Exception {
+  public void zkNodeDeletedTest() throws Exception {
+    replay(zooCache);
     String lock1Name = "zlock#" + UUID.randomUUID() + "#0000000001";
     String lock2Name = "zlock#" + UUID.randomUUID() + "#0000000002";
     String lock3Name = "zlock#" + UUID.randomUUID() + "#0000000003";
@@ -454,21 +474,19 @@ void zkNodeDeletedTest() throws Exception {
             + host3 + "\",\"group\":\"manager1\"}]}";
 
     String lockPath = zRoot + Constants.ZMANAGER_LOCK;
-    expect(zooReader.getChildren(eq(lockPath))).andReturn(List.of(lock1Name, lock2Name, lock3Name))
-        .anyTimes();
-    // expect(zooReader.getData(eq(lockPath + "/" + lock1Name)))
-    // .andThrow(new KeeperException.NoNodeException("no node forced exception")).once();
-    expect(zooReader.getData(eq(lockPath + "/" + lock1Name)))
-        .andThrow(new KeeperException.NoNodeException("no node forced exception")).once();
-    expect(zooReader.getData(eq(lockPath + "/" + lock2Name))).andReturn(lock2Data.getBytes(UTF_8))
-        .anyTimes();
-    expect(zooReader.getData(eq(lockPath + "/" + lock3Name))).andReturn(lock3Data.getBytes(UTF_8))
-        .anyTimes();
+    expect(zooReader.getChildren(lockPath, null))
+        .andReturn(List.of(lock1Name, lock2Name, lock3Name));
+    expect(zooReader.getData(lockPath + "/" + lock1Name, null, null))
+        .andThrow(new KeeperException.NoNodeException("no node forced exception"));
+    expect(zooReader.getData(lockPath + "/" + lock2Name, null, null))
+        .andReturn(lock2Data.getBytes(UTF_8));
+    expect(zooReader.getData(lockPath + "/" + lock3Name, null, null))
+        .andReturn(lock3Data.getBytes(UTF_8));
 
     replay(zooReader);
 
     ServiceStatusCmd cmd = new ServiceStatusCmd();
-    StatusSummary status = cmd.getManagerStatus(zooReader, context);
+    StatusSummary status = cmd.getManagerStatus(context);
     LOG.info("manager status data: {}", status);
 
     assertEquals(2, status.getServiceByGroups().size());
@@ -483,7 +501,7 @@ void zkNodeDeletedTest() throws Exception {
 
   @Test
   public void testServiceStatusCommandOpts() {
-    replay(zooReader); // needed for @AfterAll verify
+    replay(zooReader, zooCache);
     ServiceStatusCmd.Opts opts = new ServiceStatusCmd.Opts();
     assertFalse(opts.json);
     assertFalse(opts.noHosts);
diff --git a/server/base/src/test/java/org/apache/accumulo/server/util/fateCommand/TxnDetailsTest.java b/server/base/src/test/java/org/apache/accumulo/server/util/fateCommand/TxnDetailsTest.java
index fb3d77a706e..c8f2573bab3 100644
--- a/server/base/src/test/java/org/apache/accumulo/server/util/fateCommand/TxnDetailsTest.java
+++ b/server/base/src/test/java/org/apache/accumulo/server/util/fateCommand/TxnDetailsTest.java
@@ -34,6 +34,7 @@
 import java.util.concurrent.TimeUnit;
 
 import org.apache.accumulo.core.fate.AdminUtil;
+import org.apache.accumulo.core.fate.Fate;
 import org.apache.accumulo.core.fate.FateId;
 import org.apache.accumulo.core.fate.ReadOnlyFateStore;
 import org.junit.jupiter.api.Test;
@@ -57,7 +58,7 @@ void orderingByDuration() {
     expect(status1.getTimeCreated()).andReturn(now - TimeUnit.DAYS.toMillis(1)).anyTimes();
     expect(status1.getStatus()).andReturn(ReadOnlyFateStore.TStatus.IN_PROGRESS).anyTimes();
     expect(status1.getTop()).andReturn("step1").anyTimes();
-    expect(status1.getTxName()).andReturn("runningTx1").anyTimes();
+    expect(status1.getTxName()).andReturn(Fate.FateOperation.TABLE_CREATE).anyTimes();
     expect(status1.getFateId()).andReturn(FateId.from("FATE:USER:" + uuid1)).anyTimes();
     expect(status1.getHeldLocks()).andReturn(List.of()).anyTimes();
     expect(status1.getWaitingLocks()).andReturn(List.of()).anyTimes();
@@ -66,7 +67,7 @@ void orderingByDuration() {
     expect(status2.getTimeCreated()).andReturn(now - TimeUnit.DAYS.toMillis(7)).anyTimes();
     expect(status2.getStatus()).andReturn(ReadOnlyFateStore.TStatus.IN_PROGRESS).anyTimes();
     expect(status2.getTop()).andReturn("step2").anyTimes();
-    expect(status2.getTxName()).andReturn("runningTx2").anyTimes();
+    expect(status2.getTxName()).andReturn(Fate.FateOperation.TABLE_DELETE).anyTimes();
     expect(status2.getFateId()).andReturn(FateId.from("FATE:USER:" + uuid2)).anyTimes();
     expect(status2.getHeldLocks()).andReturn(List.of()).anyTimes();
     expect(status2.getWaitingLocks()).andReturn(List.of()).anyTimes();
@@ -100,7 +101,7 @@ public void lockTest() {
     expect(status1.getTimeCreated()).andReturn(now - TimeUnit.DAYS.toMillis(1)).anyTimes();
     expect(status1.getStatus()).andReturn(ReadOnlyFateStore.TStatus.IN_PROGRESS).anyTimes();
     expect(status1.getTop()).andReturn("step1").anyTimes();
-    expect(status1.getTxName()).andReturn("runningTx").anyTimes();
+    expect(status1.getTxName()).andReturn(Fate.FateOperation.TABLE_COMPACT).anyTimes();
     expect(status1.getFateId()).andReturn(FateId.from("FATE:USER:" + UUID.randomUUID())).anyTimes();
     // incomplete lock info (W unknown ns id, no table))
     expect(status1.getHeldLocks()).andReturn(List.of("R:1", "R:2", "W:a")).anyTimes();
diff --git a/server/compactor/src/main/java/org/apache/accumulo/compactor/Compactor.java b/server/compactor/src/main/java/org/apache/accumulo/compactor/Compactor.java
index ca19dec0984..e61ab5a1124 100644
--- a/server/compactor/src/main/java/org/apache/accumulo/compactor/Compactor.java
+++ b/server/compactor/src/main/java/org/apache/accumulo/compactor/Compactor.java
@@ -47,6 +47,7 @@
 import org.apache.accumulo.core.client.AccumuloSecurityException;
 import org.apache.accumulo.core.client.IteratorSetting;
 import org.apache.accumulo.core.client.TableNotFoundException;
+import org.apache.accumulo.core.client.admin.servers.ServerId.Type;
 import org.apache.accumulo.core.clientImpl.thrift.SecurityErrorCode;
 import org.apache.accumulo.core.clientImpl.thrift.TInfo;
 import org.apache.accumulo.core.clientImpl.thrift.TableOperation;
@@ -74,13 +75,14 @@
 import org.apache.accumulo.core.file.FileSKVIterator;
 import org.apache.accumulo.core.iteratorsImpl.system.SystemIteratorUtil;
 import org.apache.accumulo.core.lock.ServiceLock;
-import org.apache.accumulo.core.lock.ServiceLock.LockLossReason;
 import org.apache.accumulo.core.lock.ServiceLock.LockWatcher;
 import org.apache.accumulo.core.lock.ServiceLockData;
 import org.apache.accumulo.core.lock.ServiceLockData.ServiceDescriptor;
 import org.apache.accumulo.core.lock.ServiceLockData.ServiceDescriptors;
 import org.apache.accumulo.core.lock.ServiceLockData.ThriftService;
 import org.apache.accumulo.core.lock.ServiceLockPaths.ServiceLockPath;
+import org.apache.accumulo.core.lock.ServiceLockSupport;
+import org.apache.accumulo.core.lock.ServiceLockSupport.ServiceLockWatcher;
 import org.apache.accumulo.core.manager.state.tables.TableState;
 import org.apache.accumulo.core.metadata.ReferencedTabletFile;
 import org.apache.accumulo.core.metadata.StoredTabletFile;
@@ -99,7 +101,6 @@
 import org.apache.accumulo.core.tabletserver.thrift.TCompactionStats;
 import org.apache.accumulo.core.tabletserver.thrift.TExternalCompactionJob;
 import org.apache.accumulo.core.trace.TraceUtil;
-import org.apache.accumulo.core.util.Halt;
 import org.apache.accumulo.core.util.Timer;
 import org.apache.accumulo.core.util.UtilWaitThread;
 import org.apache.accumulo.core.util.compaction.ExternalCompactionUtil;
@@ -273,42 +274,13 @@ protected void checkIfCanceled() {
   protected void announceExistence(HostAndPort clientAddress)
       throws KeeperException, InterruptedException {
 
-    ZooReaderWriter zoo = getContext().getZooReaderWriter();
-
+    final ZooReaderWriter zoo = getContext().getZooSession().asReaderWriter();
     final ServiceLockPath path =
         getContext().getServerPaths().createCompactorPath(getResourceGroup(), clientAddress);
-    // The ServiceLockPath contains a resource group in the path which is not created
-    // at initialization time. If it does not exist, then create it.
-    final String compactorGroupPath =
-        path.toString().substring(0, path.toString().lastIndexOf("/" + path.getServer()));
-    LOG.debug("Creating compactor resource group path in zookeeper: {}", compactorGroupPath);
-    try {
-      zoo.mkdirs(compactorGroupPath);
-      zoo.putPersistentData(path.toString(), new byte[] {}, NodeExistsPolicy.SKIP);
-    } catch (KeeperException e) {
-      if (e.code() == KeeperException.Code.NOAUTH) {
-        LOG.error("Failed to write to ZooKeeper. Ensure that"
-            + " accumulo.properties, specifically instance.secret, is consistent.");
-      }
-      throw e;
-    }
-
-    compactorLock =
-        new ServiceLock(getContext().getZooReaderWriter().getZooKeeper(), path, compactorId);
-    LockWatcher lw = new LockWatcher() {
-      @Override
-      public void lostLock(final LockLossReason reason) {
-        Halt.halt(1, () -> {
-          LOG.error("Compactor lost lock (reason = {}), exiting.", reason);
-          getContext().getLowMemoryDetector().logGCInfo(getConfiguration());
-        });
-      }
-
-      @Override
-      public void unableToMonitorLockNode(final Exception e) {
-        Halt.halt(1, () -> LOG.error("Lost ability to monitor Compactor lock, exiting.", e));
-      }
-    };
+    ServiceLockSupport.createNonHaServiceLockPath(Type.COMPACTOR, zoo, path);
+    compactorLock = new ServiceLock(getContext().getZooSession(), path, compactorId);
+    LockWatcher lw = new ServiceLockWatcher(Type.COMPACTOR, () -> false,
+        (type) -> getContext().getLowMemoryDetector().logGCInfo(getConfiguration()));
 
     try {
       for (int i = 0; i < 25; i++) {
diff --git a/server/gc/src/main/java/org/apache/accumulo/gc/GCRun.java b/server/gc/src/main/java/org/apache/accumulo/gc/GCRun.java
index 4e85fc0a7b0..f298e724d10 100644
--- a/server/gc/src/main/java/org/apache/accumulo/gc/GCRun.java
+++ b/server/gc/src/main/java/org/apache/accumulo/gc/GCRun.java
@@ -220,7 +220,7 @@ public Stream<Reference> getReferences() {
   @Override
   public Map<TableId,TableState> getTableIDs() throws InterruptedException {
     final String tablesPath = context.getZooKeeperRoot() + Constants.ZTABLES;
-    final ZooReader zr = context.getZooReader();
+    final ZooReader zr = context.getZooSession().asReader();
     int retries = 1;
     IllegalStateException ioe = null;
     while (retries <= 10) {
diff --git a/server/gc/src/main/java/org/apache/accumulo/gc/SimpleGarbageCollector.java b/server/gc/src/main/java/org/apache/accumulo/gc/SimpleGarbageCollector.java
index 65f80b1864b..62449eabb65 100644
--- a/server/gc/src/main/java/org/apache/accumulo/gc/SimpleGarbageCollector.java
+++ b/server/gc/src/main/java/org/apache/accumulo/gc/SimpleGarbageCollector.java
@@ -35,6 +35,7 @@
 import org.apache.accumulo.core.Constants;
 import org.apache.accumulo.core.cli.ConfigOpts;
 import org.apache.accumulo.core.client.AccumuloClient;
+import org.apache.accumulo.core.client.admin.servers.ServerId.Type;
 import org.apache.accumulo.core.clientImpl.thrift.TInfo;
 import org.apache.accumulo.core.conf.AccumuloConfiguration;
 import org.apache.accumulo.core.conf.Property;
@@ -43,17 +44,15 @@
 import org.apache.accumulo.core.gc.thrift.GCStatus;
 import org.apache.accumulo.core.gc.thrift.GcCycleStats;
 import org.apache.accumulo.core.lock.ServiceLock;
-import org.apache.accumulo.core.lock.ServiceLock.LockLossReason;
-import org.apache.accumulo.core.lock.ServiceLock.LockWatcher;
 import org.apache.accumulo.core.lock.ServiceLockData;
 import org.apache.accumulo.core.lock.ServiceLockData.ThriftService;
+import org.apache.accumulo.core.lock.ServiceLockSupport.HAServiceLockWatcher;
 import org.apache.accumulo.core.metadata.AccumuloTable;
 import org.apache.accumulo.core.metadata.schema.Ample.DataLevel;
 import org.apache.accumulo.core.metrics.MetricsInfo;
 import org.apache.accumulo.core.securityImpl.thrift.TCredentials;
 import org.apache.accumulo.core.spi.balancer.TableLoadBalancer;
 import org.apache.accumulo.core.trace.TraceUtil;
-import org.apache.accumulo.core.util.Halt;
 import org.apache.accumulo.core.util.Timer;
 import org.apache.accumulo.core.util.compaction.ExternalCompactionUtil;
 import org.apache.accumulo.core.util.threads.ThreadPools;
@@ -370,31 +369,32 @@ boolean moveToTrash(Path path) throws IOException {
   private void getZooLock(HostAndPort addr) throws KeeperException, InterruptedException {
     var path = getContext().getServerPaths().createGarbageCollectorPath();
 
-    LockWatcher lockWatcher = new LockWatcher() {
-      @Override
-      public void lostLock(LockLossReason reason) {
-        Halt.halt("GC lock in zookeeper lost (reason = " + reason + "), exiting!", 1);
-      }
+    UUID zooLockUUID = UUID.randomUUID();
+    gcLock = new ServiceLock(getContext().getZooSession(), path, zooLockUUID);
+    HAServiceLockWatcher gcLockWatcher = new HAServiceLockWatcher(Type.GARBAGE_COLLECTOR);
+
+    while (true) {
+      gcLock.lock(gcLockWatcher, new ServiceLockData(zooLockUUID, addr.toString(), ThriftService.GC,
+          this.getResourceGroup()));
 
-      @Override
-      public void unableToMonitorLockNode(final Exception e) {
-        // ACCUMULO-3651 Level changed to error and FATAL added to message for slf4j compatibility
-        Halt.halt(-1, () -> log.error("FATAL: No longer able to monitor lock node ", e));
+      gcLockWatcher.waitForChange();
 
+      if (gcLockWatcher.isLockAcquired()) {
+        break;
       }
-    };
 
-    UUID zooLockUUID = UUID.randomUUID();
-    gcLock = new ServiceLock(getContext().getZooReaderWriter().getZooKeeper(), path, zooLockUUID);
-    while (true) {
-      if (gcLock.tryLock(lockWatcher, new ServiceLockData(zooLockUUID, addr.toString(),
-          ThriftService.GC, this.getResourceGroup()))) {
-        log.debug("Got GC ZooKeeper lock");
-        return;
+      if (!gcLockWatcher.isFailedToAcquireLock()) {
+        throw new IllegalStateException("gc lock in unknown state");
       }
+
+      gcLock.tryToCancelAsyncLockOrUnlock();
+
       log.debug("Failed to get GC ZooKeeper lock, will retry");
-      sleepUninterruptibly(1, TimeUnit.SECONDS);
+      sleepUninterruptibly(1000, TimeUnit.MILLISECONDS);
     }
+
+    log.info("Got GC lock.");
+
   }
 
   private HostAndPort startStatsService() {
diff --git a/server/manager/src/main/java/org/apache/accumulo/manager/FateServiceHandler.java b/server/manager/src/main/java/org/apache/accumulo/manager/FateServiceHandler.java
index 32303ade9d0..7cdde03dc52 100644
--- a/server/manager/src/main/java/org/apache/accumulo/manager/FateServiceHandler.java
+++ b/server/manager/src/main/java/org/apache/accumulo/manager/FateServiceHandler.java
@@ -69,16 +69,18 @@
 import org.apache.accumulo.core.data.TableId;
 import org.apache.accumulo.core.dataImpl.KeyExtent;
 import org.apache.accumulo.core.dataImpl.thrift.TRange;
+import org.apache.accumulo.core.fate.Fate;
 import org.apache.accumulo.core.fate.FateId;
 import org.apache.accumulo.core.fate.FateInstanceType;
 import org.apache.accumulo.core.fate.ReadOnlyFateStore.TStatus;
 import org.apache.accumulo.core.manager.state.tables.TableState;
 import org.apache.accumulo.core.manager.thrift.BulkImportState;
-import org.apache.accumulo.core.manager.thrift.FateOperation;
 import org.apache.accumulo.core.manager.thrift.FateService;
 import org.apache.accumulo.core.manager.thrift.TFateId;
 import org.apache.accumulo.core.manager.thrift.TFateInstanceType;
+import org.apache.accumulo.core.manager.thrift.TFateOperation;
 import org.apache.accumulo.core.manager.thrift.ThriftPropertyException;
+import org.apache.accumulo.core.metadata.schema.TabletMergeabilityMetadata;
 import org.apache.accumulo.core.securityImpl.thrift.TCredentials;
 import org.apache.accumulo.core.util.ByteBufferUtil;
 import org.apache.accumulo.core.util.TextUtil;
@@ -131,10 +133,11 @@ public TFateId beginFateOperation(TInfo tinfo, TCredentials credentials, TFateIn
   }
 
   @Override
-  public void executeFateOperation(TInfo tinfo, TCredentials c, TFateId opid, FateOperation op,
+  public void executeFateOperation(TInfo tinfo, TCredentials c, TFateId opid, TFateOperation top,
       List<ByteBuffer> arguments, Map<String,String> options, boolean autoCleanup)
       throws ThriftSecurityException, ThriftTableOperationException, ThriftPropertyException {
     authenticate(c);
+    Fate.FateOperation op = Fate.FateOperation.fromThrift(top);
     String goalMessage = op.toString() + " ";
     String txUUIDStr = opid.getTxUUIDStr();
     FateInstanceType type = FateInstanceType.fromThrift(opid.getType());
@@ -151,7 +154,7 @@ public void executeFateOperation(TInfo tinfo, TCredentials c, TFateId opid, Fate
         }
 
         goalMessage += "Create " + namespace + " namespace.";
-        manager.fate(type).seedTransaction(op.toString(), fateId,
+        manager.fate(type).seedTransaction(op, fateId,
             new TraceRepo<>(new CreateNamespace(c.getPrincipal(), namespace, options)), autoCleanup,
             goalMessage);
         break;
@@ -170,7 +173,7 @@ public void executeFateOperation(TInfo tinfo, TCredentials c, TFateId opid, Fate
         }
 
         goalMessage += "Rename " + oldName + " namespace to " + newName;
-        manager.fate(type).seedTransaction(op.toString(), fateId,
+        manager.fate(type).seedTransaction(op, fateId,
             new TraceRepo<>(new RenameNamespace(namespaceId, oldName, newName)), autoCleanup,
             goalMessage);
         break;
@@ -188,7 +191,7 @@ public void executeFateOperation(TInfo tinfo, TCredentials c, TFateId opid, Fate
         }
 
         goalMessage += "Delete namespace Id: " + namespaceId;
-        manager.fate(type).seedTransaction(op.toString(), fateId,
+        manager.fate(type).seedTransaction(op, fateId,
             new TraceRepo<>(new DeleteNamespace(namespaceId)), autoCleanup, goalMessage);
         break;
       }
@@ -251,10 +254,10 @@ public void executeFateOperation(TInfo tinfo, TCredentials c, TFateId opid, Fate
         goalMessage += "Create table " + tableName + " " + initialTableState + " with " + splitCount
             + " splits and initial tabletAvailability of " + initialTabletAvailability;
 
-        manager.fate(type).seedTransaction(op.toString(), fateId,
+        manager.fate(type).seedTransaction(op, fateId,
             new TraceRepo<>(new CreateTable(c.getPrincipal(), tableName, timeType, options,
                 splitsPath, splitCount, splitsDirsPath, initialTableState,
-                initialTabletAvailability, namespaceId)),
+                initialTabletAvailability, namespaceId, TabletMergeabilityMetadata.never())),
             autoCleanup, goalMessage);
 
         break;
@@ -287,7 +290,7 @@ public void executeFateOperation(TInfo tinfo, TCredentials c, TFateId opid, Fate
         goalMessage += "Rename table " + oldTableName + "(" + tableId + ") to " + oldTableName;
 
         try {
-          manager.fate(type).seedTransaction(op.toString(), fateId,
+          manager.fate(type).seedTransaction(op, fateId,
               new TraceRepo<>(new RenameTable(namespaceId, tableId, oldTableName, newTableName)),
               autoCleanup, goalMessage);
         } catch (NamespaceNotFoundException e) {
@@ -359,8 +362,8 @@ public void executeFateOperation(TInfo tinfo, TCredentials c, TFateId opid, Fate
         }
 
         manager.fate(type).seedTransaction(
-            op.toString(), fateId, new TraceRepo<>(new CloneTable(c.getPrincipal(), namespaceId,
-                srcTableId, tableName, propertiesToSet, propertiesToExclude, keepOffline)),
+            op, fateId, new TraceRepo<>(new CloneTable(c.getPrincipal(), namespaceId, srcTableId,
+                tableName, propertiesToSet, propertiesToExclude, keepOffline)),
             autoCleanup, goalMessage);
 
         break;
@@ -388,7 +391,7 @@ public void executeFateOperation(TInfo tinfo, TCredentials c, TFateId opid, Fate
         }
 
         goalMessage += "Delete table " + tableName + "(" + tableId + ")";
-        manager.fate(type).seedTransaction(op.toString(), fateId,
+        manager.fate(type).seedTransaction(op, fateId,
             new TraceRepo<>(new PreDeleteTable(namespaceId, tableId)), autoCleanup, goalMessage);
         break;
       }
@@ -400,7 +403,8 @@ public void executeFateOperation(TInfo tinfo, TCredentials c, TFateId opid, Fate
 
         final boolean canOnlineOfflineTable;
         try {
-          canOnlineOfflineTable = manager.security.canChangeTableState(c, tableId, op, namespaceId);
+          canOnlineOfflineTable =
+              manager.security.canChangeTableState(c, tableId, top, namespaceId);
         } catch (ThriftSecurityException e) {
           throwIfTableMissingSecurityException(e, tableId, null, TableOperation.ONLINE);
           throw e;
@@ -413,7 +417,7 @@ public void executeFateOperation(TInfo tinfo, TCredentials c, TFateId opid, Fate
         goalMessage += "Online table " + tableId;
         final EnumSet<TableState> expectedCurrStates =
             EnumSet.of(TableState.ONLINE, TableState.OFFLINE);
-        manager.fate(type).seedTransaction(op.toString(), fateId,
+        manager.fate(type).seedTransaction(op, fateId,
             new TraceRepo<>(
                 new ChangeTableState(namespaceId, tableId, tableOp, expectedCurrStates)),
             autoCleanup, goalMessage);
@@ -428,7 +432,8 @@ public void executeFateOperation(TInfo tinfo, TCredentials c, TFateId opid, Fate
 
         final boolean canOnlineOfflineTable;
         try {
-          canOnlineOfflineTable = manager.security.canChangeTableState(c, tableId, op, namespaceId);
+          canOnlineOfflineTable =
+              manager.security.canChangeTableState(c, tableId, top, namespaceId);
         } catch (ThriftSecurityException e) {
           throwIfTableMissingSecurityException(e, tableId, null, TableOperation.OFFLINE);
           throw e;
@@ -441,7 +446,7 @@ public void executeFateOperation(TInfo tinfo, TCredentials c, TFateId opid, Fate
         goalMessage += "Offline table " + tableId;
         final EnumSet<TableState> expectedCurrStates =
             EnumSet.of(TableState.ONLINE, TableState.OFFLINE);
-        manager.fate(type).seedTransaction(op.toString(), fateId,
+        manager.fate(type).seedTransaction(op, fateId,
             new TraceRepo<>(
                 new ChangeTableState(namespaceId, tableId, tableOp, expectedCurrStates)),
             autoCleanup, goalMessage);
@@ -477,7 +482,7 @@ public void executeFateOperation(TInfo tinfo, TCredentials c, TFateId opid, Fate
             startRowStr, endRowStr);
         goalMessage += "Merge table " + tableName + "(" + tableId + ") splits from " + startRowStr
             + " to " + endRowStr;
-        manager.fate(type).seedTransaction(op.toString(), fateId, new TraceRepo<>(
+        manager.fate(type).seedTransaction(op, fateId, new TraceRepo<>(
             new TableRangeOp(MergeInfo.Operation.MERGE, namespaceId, tableId, startRow, endRow)),
             autoCleanup, goalMessage);
         break;
@@ -509,7 +514,7 @@ public void executeFateOperation(TInfo tinfo, TCredentials c, TFateId opid, Fate
 
         goalMessage +=
             "Delete table " + tableName + "(" + tableId + ") range " + startRow + " to " + endRow;
-        manager.fate(type).seedTransaction(op.toString(), fateId, new TraceRepo<>(
+        manager.fate(type).seedTransaction(op, fateId, new TraceRepo<>(
             new TableRangeOp(MergeInfo.Operation.DELETE, namespaceId, tableId, startRow, endRow)),
             autoCleanup, goalMessage);
         break;
@@ -535,7 +540,7 @@ public void executeFateOperation(TInfo tinfo, TCredentials c, TFateId opid, Fate
         }
 
         goalMessage += "Compact table (" + tableId + ") with config " + compactionConfig;
-        manager.fate(type).seedTransaction(op.toString(), fateId,
+        manager.fate(type).seedTransaction(op, fateId,
             new TraceRepo<>(new CompactRange(namespaceId, tableId, compactionConfig)), autoCleanup,
             goalMessage);
         break;
@@ -559,7 +564,7 @@ public void executeFateOperation(TInfo tinfo, TCredentials c, TFateId opid, Fate
         }
 
         goalMessage += "Cancel compaction of table (" + tableId + ")";
-        manager.fate(type).seedTransaction(op.toString(), fateId,
+        manager.fate(type).seedTransaction(op, fateId,
             new TraceRepo<>(new CancelCompactions(namespaceId, tableId)), autoCleanup, goalMessage);
         break;
       }
@@ -600,10 +605,10 @@ public void executeFateOperation(TInfo tinfo, TCredentials c, TFateId opid, Fate
         }
 
         goalMessage += "Import table with new name: " + tableName + " from " + exportDirs;
-        manager.fate(type).seedTransaction(op.toString(), fateId,
-            new TraceRepo<>(new ImportTable(c.getPrincipal(), tableName, exportDirs, namespaceId,
-                keepMappings, keepOffline)),
-            autoCleanup, goalMessage);
+        manager.fate(type)
+            .seedTransaction(op, fateId, new TraceRepo<>(new ImportTable(c.getPrincipal(),
+                tableName, exportDirs, namespaceId, keepMappings, keepOffline)), autoCleanup,
+                goalMessage);
         break;
       }
       case TABLE_EXPORT: {
@@ -630,7 +635,7 @@ public void executeFateOperation(TInfo tinfo, TCredentials c, TFateId opid, Fate
         }
 
         goalMessage += "Export table " + tableName + "(" + tableId + ") to " + exportDir;
-        manager.fate(type).seedTransaction(op.toString(), fateId,
+        manager.fate(type).seedTransaction(op, fateId,
             new TraceRepo<>(new ExportTable(namespaceId, tableName, tableId, exportDir)),
             autoCleanup, goalMessage);
         break;
@@ -667,7 +672,7 @@ public void executeFateOperation(TInfo tinfo, TCredentials c, TFateId opid, Fate
         manager.updateBulkImportStatus(dir, BulkImportState.INITIAL);
 
         goalMessage += "Bulk import (v2)  " + dir + " to " + tableName + "(" + tableId + ")";
-        manager.fate(type).seedTransaction(op.toString(), fateId,
+        manager.fate(type).seedTransaction(op, fateId,
             new TraceRepo<>(new PrepBulkImport(tableId, dir, setTime)), autoCleanup, goalMessage);
         break;
       }
@@ -710,7 +715,7 @@ public void executeFateOperation(TInfo tinfo, TCredentials c, TFateId opid, Fate
 
         goalMessage += "Set availability for table: " + tableName + "(" + tableId + ") range: "
             + tRange + " to: " + tabletAvailability.name();
-        manager.fate(type).seedTransaction(op.toString(), fateId,
+        manager.fate(type).seedTransaction(op, fateId,
             new TraceRepo<>(new LockTable(tableId, namespaceId, tRange, tabletAvailability)),
             autoCleanup, goalMessage);
         break;
@@ -781,8 +786,8 @@ public void executeFateOperation(TInfo tinfo, TCredentials c, TFateId opid, Fate
         }
 
         goalMessage = "Splitting " + extent + " for user into " + (splits.size() + 1) + " tablets";
-        manager.fate(type).seedTransaction(op.toString(), fateId, new PreSplit(extent, splits),
-            autoCleanup, goalMessage);
+        manager.fate(type).seedTransaction(op, fateId, new PreSplit(extent, splits), autoCleanup,
+            goalMessage);
         break;
       }
       default:
diff --git a/server/manager/src/main/java/org/apache/accumulo/manager/Manager.java b/server/manager/src/main/java/org/apache/accumulo/manager/Manager.java
index 062e3062026..eb22227bb91 100644
--- a/server/manager/src/main/java/org/apache/accumulo/manager/Manager.java
+++ b/server/manager/src/main/java/org/apache/accumulo/manager/Manager.java
@@ -61,6 +61,7 @@
 import org.apache.accumulo.core.Constants;
 import org.apache.accumulo.core.cli.ConfigOpts;
 import org.apache.accumulo.core.client.admin.CompactionConfig;
+import org.apache.accumulo.core.client.admin.servers.ServerId.Type;
 import org.apache.accumulo.core.clientImpl.ClientContext;
 import org.apache.accumulo.core.clientImpl.thrift.TableOperation;
 import org.apache.accumulo.core.clientImpl.thrift.TableOperationExceptionType;
@@ -82,13 +83,13 @@
 import org.apache.accumulo.core.fate.zookeeper.ZooUtil;
 import org.apache.accumulo.core.fate.zookeeper.ZooUtil.NodeExistsPolicy;
 import org.apache.accumulo.core.lock.ServiceLock;
-import org.apache.accumulo.core.lock.ServiceLock.LockLossReason;
 import org.apache.accumulo.core.lock.ServiceLockData;
 import org.apache.accumulo.core.lock.ServiceLockData.ServiceDescriptor;
 import org.apache.accumulo.core.lock.ServiceLockData.ServiceDescriptors;
 import org.apache.accumulo.core.lock.ServiceLockData.ThriftService;
 import org.apache.accumulo.core.lock.ServiceLockPaths.AddressSelector;
 import org.apache.accumulo.core.lock.ServiceLockPaths.ServiceLockPath;
+import org.apache.accumulo.core.lock.ServiceLockSupport.HAServiceLockWatcher;
 import org.apache.accumulo.core.manager.balancer.AssignmentParamsImpl;
 import org.apache.accumulo.core.manager.balancer.BalanceParamsImpl;
 import org.apache.accumulo.core.manager.balancer.TServerStatusImpl;
@@ -114,7 +115,6 @@
 import org.apache.accumulo.core.spi.balancer.data.TabletMigration;
 import org.apache.accumulo.core.spi.balancer.data.TabletServerId;
 import org.apache.accumulo.core.trace.TraceUtil;
-import org.apache.accumulo.core.util.Halt;
 import org.apache.accumulo.core.util.Retry;
 import org.apache.accumulo.core.util.Timer;
 import org.apache.accumulo.core.util.threads.ThreadPools;
@@ -158,7 +158,6 @@
 import org.apache.thrift.server.TServer;
 import org.apache.thrift.transport.TTransportException;
 import org.apache.zookeeper.KeeperException;
-import org.apache.zookeeper.KeeperException.NoAuthException;
 import org.apache.zookeeper.WatchedEvent;
 import org.apache.zookeeper.Watcher;
 import org.slf4j.Logger;
@@ -488,7 +487,7 @@ protected Manager(ConfigOpts opts, Function<SiteConfiguration,ServerContext> ser
       log.info("SASL is enabled, creating delegation token key manager and distributor");
       final long tokenUpdateInterval =
           aconf.getTimeInMillis(Property.GENERAL_DELEGATION_TOKEN_UPDATE_INTERVAL);
-      keyDistributor = new ZooAuthenticationKeyDistributor(context.getZooReaderWriter(),
+      keyDistributor = new ZooAuthenticationKeyDistributor(context.getZooSession(),
           context.getZooKeeperRoot() + Constants.ZDELEGATION_TOKEN_KEYS);
       authenticationTokenKeyManager = new AuthenticationTokenKeyManager(context.getSecretManager(),
           keyDistributor, tokenUpdateInterval, tokenLifetime);
@@ -507,7 +506,7 @@ public TServerConnection getConnection(TServerInstance server) {
 
   void setManagerGoalState(ManagerGoalState state) {
     try {
-      getContext().getZooReaderWriter().putPersistentData(
+      getContext().getZooSession().asReaderWriter().putPersistentData(
           getContext().getZooKeeperRoot() + Constants.ZMANAGER_GOAL_STATE,
           state.name().getBytes(UTF_8), NodeExistsPolicy.OVERWRITE);
     } catch (Exception ex) {
@@ -518,7 +517,7 @@ void setManagerGoalState(ManagerGoalState state) {
   ManagerGoalState getManagerGoalState() {
     while (true) {
       try {
-        byte[] data = getContext().getZooReaderWriter()
+        byte[] data = getContext().getZooSession().asReaderWriter()
             .getData(getContext().getZooKeeperRoot() + Constants.ZMANAGER_GOAL_STATE);
         return ManagerGoalState.valueOf(new String(data, UTF_8));
       } catch (Exception e) {
@@ -635,7 +634,7 @@ private class ScanServerZKCleaner implements Runnable {
     @Override
     public void run() {
 
-      final ZooReaderWriter zrw = getContext().getZooReaderWriter();
+      final ZooReaderWriter zrw = getContext().getZooSession().asReaderWriter();
 
       while (stillManager()) {
         try {
@@ -1197,7 +1196,7 @@ public void run() {
     // Don't call start the CompactionCoordinator until we have tservers.
     compactionCoordinator.start();
 
-    ZooReaderWriter zReaderWriter = context.getZooReaderWriter();
+    ZooReaderWriter zReaderWriter = context.getZooSession().asReaderWriter();
 
     try {
       zReaderWriter.getChildren(zroot + Constants.ZRECOVERY, new Watcher() {
@@ -1269,8 +1268,8 @@ boolean canSuspendTablets() {
       Predicate<ZooUtil.LockID> isLockHeld =
           lock -> ServiceLock.isLockHeld(context.getZooCache(), lock);
       var metaInstance = initializeFateInstance(context,
-          new MetaFateStore<>(context.getZooKeeperRoot() + Constants.ZFATE,
-              context.getZooReaderWriter(), managerLock.getLockID(), isLockHeld));
+          new MetaFateStore<>(context.getZooKeeperRoot() + Constants.ZFATE, context.getZooSession(),
+              managerLock.getLockID(), isLockHeld));
       var userInstance = initializeFateInstance(context, new UserFateStore<>(context,
           AccumuloTable.FATE.tableName(), managerLock.getLockID(), isLockHeld));
 
@@ -1488,68 +1487,9 @@ public ServiceLock getManagerLock() {
     return managerLock;
   }
 
-  private static class ManagerLockWatcher implements ServiceLock.AccumuloLockWatcher {
-
-    boolean acquiredLock = false;
-    boolean failedToAcquireLock = false;
-
-    @Override
-    public void lostLock(LockLossReason reason) {
-      Halt.halt("Manager lock in zookeeper lost (reason = " + reason + "), exiting!", -1);
-    }
-
-    @Override
-    public void unableToMonitorLockNode(final Exception e) {
-      // ACCUMULO-3651 Changed level to error and added FATAL to message for slf4j compatibility
-      Halt.halt(-1, () -> log.error("FATAL: No longer able to monitor manager lock node", e));
-
-    }
-
-    @Override
-    public synchronized void acquiredLock() {
-      log.debug("Acquired manager lock");
-
-      if (acquiredLock || failedToAcquireLock) {
-        Halt.halt("Zoolock in unexpected state AL " + acquiredLock + " " + failedToAcquireLock, -1);
-      }
-
-      acquiredLock = true;
-      notifyAll();
-    }
-
-    @Override
-    public synchronized void failedToAcquireLock(Exception e) {
-      log.warn("Failed to get manager lock", e);
-
-      if (e instanceof NoAuthException) {
-        String msg = "Failed to acquire manager lock due to incorrect ZooKeeper authentication.";
-        log.error("{} Ensure instance.secret is consistent across Accumulo configuration", msg, e);
-        Halt.halt(msg, -1);
-      }
-
-      if (acquiredLock) {
-        Halt.halt("Zoolock in unexpected state acquiredLock true with FAL " + failedToAcquireLock,
-            -1);
-      }
-
-      failedToAcquireLock = true;
-      notifyAll();
-    }
-
-    public synchronized void waitForChange() {
-      while (!acquiredLock && !failedToAcquireLock) {
-        try {
-          wait();
-        } catch (InterruptedException e) {
-          // empty
-        }
-      }
-    }
-  }
-
   private ServiceLockData getManagerLock(final ServiceLockPath zManagerLoc)
       throws KeeperException, InterruptedException {
-    var zooKeeper = getContext().getZooReaderWriter().getZooKeeper();
+    var zooKeeper = getContext().getZooSession();
     log.info("trying to get manager lock");
 
     final String managerClientAddress =
@@ -1560,24 +1500,22 @@ private ServiceLockData getManagerLock(final ServiceLockPath zManagerLoc)
     ServiceDescriptors descriptors = new ServiceDescriptors();
     descriptors.addService(new ServiceDescriptor(zooLockUUID, ThriftService.MANAGER,
         managerClientAddress, this.getResourceGroup()));
-
     ServiceLockData sld = new ServiceLockData(descriptors);
-
     managerLock = new ServiceLock(zooKeeper, zManagerLoc, zooLockUUID);
+    HAServiceLockWatcher managerLockWatcher = new HAServiceLockWatcher(Type.MANAGER);
 
     while (true) {
 
-      ManagerLockWatcher managerLockWatcher = new ManagerLockWatcher();
       managerLock.lock(managerLockWatcher, sld);
 
       managerLockWatcher.waitForChange();
 
-      if (managerLockWatcher.acquiredLock) {
+      if (managerLockWatcher.isLockAcquired()) {
         startServiceLockVerificationThread();
         break;
       }
 
-      if (!managerLockWatcher.failedToAcquireLock) {
+      if (!managerLockWatcher.isFailedToAcquireLock()) {
         throw new IllegalStateException("manager lock in unknown state");
       }
 
diff --git a/server/manager/src/main/java/org/apache/accumulo/manager/ManagerClientServiceHandler.java b/server/manager/src/main/java/org/apache/accumulo/manager/ManagerClientServiceHandler.java
index a669798e8b0..2bf22a28418 100644
--- a/server/manager/src/main/java/org/apache/accumulo/manager/ManagerClientServiceHandler.java
+++ b/server/manager/src/main/java/org/apache/accumulo/manager/ManagerClientServiceHandler.java
@@ -112,7 +112,7 @@ public long initiateFlush(TInfo tinfo, TCredentials c, String tableIdStr)
     String zTablePath = manager.getContext().getZooKeeperRoot() + Constants.ZTABLES + "/" + tableId
         + Constants.ZTABLE_FLUSH_ID;
 
-    ZooReaderWriter zoo = manager.getContext().getZooReaderWriter();
+    ZooReaderWriter zoo = manager.getContext().getZooSession().asReaderWriter();
     byte[] fid;
     try {
       fid = zoo.mutateExisting(zTablePath, currentValue -> {
@@ -321,7 +321,7 @@ public void shutdownTabletServer(TInfo info, TCredentials c, String tabletServer
 
     String msg = "Shutdown tserver " + tabletServer;
 
-    fate.seedTransaction("ShutdownTServer", fateId,
+    fate.seedTransaction(Fate.FateOperation.SHUTDOWN_TSERVER, fateId,
         new TraceRepo<>(
             new ShutdownTServer(doomed, manager.tserverSet.getResourceGroup(doomed), force)),
         false, msg);
diff --git a/server/manager/src/main/java/org/apache/accumulo/manager/ManagerTime.java b/server/manager/src/main/java/org/apache/accumulo/manager/ManagerTime.java
index b7cb2bfcdcb..807c9aed1b0 100644
--- a/server/manager/src/main/java/org/apache/accumulo/manager/ManagerTime.java
+++ b/server/manager/src/main/java/org/apache/accumulo/manager/ManagerTime.java
@@ -90,7 +90,7 @@ public class ManagerTime {
 
   public ManagerTime(Manager manager, AccumuloConfiguration conf) throws IOException {
     this.zPath = manager.getContext().getZooKeeperRoot() + Constants.ZMANAGER_TICK;
-    this.zk = manager.getContext().getZooReaderWriter();
+    this.zk = manager.getContext().getZooSession().asReaderWriter();
     this.manager = manager;
 
     try {
diff --git a/server/manager/src/main/java/org/apache/accumulo/manager/TabletGroupWatcher.java b/server/manager/src/main/java/org/apache/accumulo/manager/TabletGroupWatcher.java
index 6496f500e9f..e29413e82aa 100644
--- a/server/manager/src/main/java/org/apache/accumulo/manager/TabletGroupWatcher.java
+++ b/server/manager/src/main/java/org/apache/accumulo/manager/TabletGroupWatcher.java
@@ -350,12 +350,10 @@ public void hostOndemand(Collection<KeyExtent> extents) {
     // Do not add any code here, it may interfere with the finally block removing extents from
     // hostingRequestInProgress
     try (var mutator = manager.getContext().getAmple().conditionallyMutateTablets()) {
-      inProgress.forEach(ke -> {
-        mutator.mutateTablet(ke).requireAbsentOperation()
-            .requireTabletAvailability(TabletAvailability.ONDEMAND).requireAbsentLocation()
-            .setHostingRequested().submit(TabletMetadata::getHostingRequested);
-
-      });
+      inProgress.forEach(ke -> mutator.mutateTablet(ke).requireAbsentOperation()
+          .requireTabletAvailability(TabletAvailability.ONDEMAND).requireAbsentLocation()
+          .setHostingRequested()
+          .submit(TabletMetadata::getHostingRequested, () -> "host ondemand"));
 
       List<Range> ranges = new ArrayList<>();
 
@@ -1094,7 +1092,7 @@ private void replaceVolumes(List<VolumeUtil.VolumeReplacements> volumeReplacemen
               "replaceVolume conditional mutation rejection check {} logsRemoved:{} filesRemoved:{}",
               tm.getExtent(), logsRemoved, filesRemoved);
           return logsRemoved && filesRemoved;
-        });
+        }, () -> "replace volume");
       }
 
       tabletsMutator.process().forEach((extent, result) -> {
diff --git a/server/manager/src/main/java/org/apache/accumulo/manager/compaction/coordinator/CompactionCoordinator.java b/server/manager/src/main/java/org/apache/accumulo/manager/compaction/coordinator/CompactionCoordinator.java
index 6f2eca37565..f1e6f54a5cd 100644
--- a/server/manager/src/main/java/org/apache/accumulo/manager/compaction/coordinator/CompactionCoordinator.java
+++ b/server/manager/src/main/java/org/apache/accumulo/manager/compaction/coordinator/CompactionCoordinator.java
@@ -194,7 +194,7 @@ public class CompactionCoordinator
   private final Manager manager;
 
   private final LoadingCache<String,Integer> compactorCounts;
-  private final int jobQueueInitialSize;
+  private final long jobQueueInitialSize;
 
   private volatile long coordinatorStartTime;
 
@@ -208,8 +208,8 @@ public CompactionCoordinator(ServerContext ctx, SecurityOperation security,
     this.security = security;
     this.manager = Objects.requireNonNull(manager);
 
-    this.jobQueueInitialSize = ctx.getConfiguration()
-        .getCount(Property.MANAGER_COMPACTION_SERVICE_PRIORITY_QUEUE_INITIAL_SIZE);
+    this.jobQueueInitialSize =
+        ctx.getConfiguration().getAsBytes(Property.MANAGER_COMPACTION_SERVICE_PRIORITY_QUEUE_SIZE);
 
     this.jobQueues = new CompactionJobQueues(jobQueueInitialSize);
 
@@ -635,8 +635,9 @@ public CompactionMetadata get() {
             }
 
             tabletMutator.putExternalCompaction(externalCompactionId, ecm);
-            tabletMutator
-                .submit(tm -> tm.getExternalCompactions().containsKey(externalCompactionId));
+            tabletMutator.submit(
+                tm -> tm.getExternalCompactions().containsKey(externalCompactionId),
+                () -> "compaction reservation");
 
             var result = tabletsMutator.process().get(extent);
 
@@ -838,8 +839,8 @@ public void compactionCompleted(TInfo tinfo, TCredentials credentials,
     // Start a fate transaction to commit the compaction.
     CompactionMetadata ecm = tabletMeta.getExternalCompactions().get(ecid);
     var renameOp = new RenameCompactionFile(new CompactionCommitData(ecid, extent, ecm, stats));
-    localFate.seedTransaction("COMMIT_COMPACTION", FateKey.forCompactionCommit(ecid), renameOp,
-        true);
+    localFate.seedTransaction(Fate.FateOperation.COMMIT_COMPACTION,
+        FateKey.forCompactionCommit(ecid), renameOp, true);
   }
 
   @Override
@@ -1119,9 +1120,7 @@ private void deleteEmpty(ZooReaderWriter zoorw, String path)
   private void cleanUpEmptyCompactorPathInZK() {
     final String compactorQueuesPath = this.ctx.getZooKeeperRoot() + Constants.ZCOMPACTORS;
 
-    final var zoorw = this.ctx.getZooReaderWriter();
-    final double queueSizeFactor = ctx.getConfiguration()
-        .getFraction(Property.MANAGER_COMPACTION_SERVICE_PRIORITY_QUEUE_SIZE_FACTOR);
+    final var zoorw = this.ctx.getZooSession().asReaderWriter();
 
     try {
       var groups = zoorw.getChildren(compactorQueuesPath);
@@ -1138,7 +1137,6 @@ private void cleanUpEmptyCompactorPathInZK() {
           CompactionJobPriorityQueue queue = getJobQueues().getQueue(cgid);
           if (queue != null) {
             queue.clearIfInactive(Duration.ofMinutes(10));
-            queue.setMaxSize(this.jobQueueInitialSize);
           }
         } else {
           int aliveCompactorsForGroup = 0;
@@ -1151,16 +1149,8 @@ private void cleanUpEmptyCompactorPathInZK() {
               aliveCompactorsForGroup++;
             }
           }
-          CompactionJobPriorityQueue queue = getJobQueues().getQueue(cgid);
-          if (queue != null) {
-            queue.setMaxSize(Math.min(
-                Math.max(1, (int) (aliveCompactorsForGroup * queueSizeFactor)), Integer.MAX_VALUE));
-          }
-
         }
-
       }
-
     } catch (KeeperException | RuntimeException e) {
       LOG.warn("Failed to clean up compactors", e);
     } catch (InterruptedException e) {
diff --git a/server/manager/src/main/java/org/apache/accumulo/manager/compaction/coordinator/commit/CommitCompaction.java b/server/manager/src/main/java/org/apache/accumulo/manager/compaction/coordinator/commit/CommitCompaction.java
index cb9492d7e30..29e626d9540 100644
--- a/server/manager/src/main/java/org/apache/accumulo/manager/compaction/coordinator/commit/CommitCompaction.java
+++ b/server/manager/src/main/java/org/apache/accumulo/manager/compaction/coordinator/commit/CommitCompaction.java
@@ -128,8 +128,9 @@ private TabletMetadata commitCompaction(ServerContext ctx, ExternalCompactionId
         // make the needed updates to the tablet
         updateTabletForCompaction(commitData.stats, ecid, tablet, newDatafile, ecm, tabletMutator);
 
-        tabletMutator
-            .submit(tabletMetadata -> !tabletMetadata.getExternalCompactions().containsKey(ecid));
+        tabletMutator.submit(
+            tabletMetadata -> !tabletMetadata.getExternalCompactions().containsKey(ecid),
+            () -> "commit compaction " + ecid);
 
         if (LOG.isDebugEnabled()) {
           LOG.debug("Compaction completed {} added {} removed {}", tablet.getExtent(), newDatafile,
diff --git a/server/manager/src/main/java/org/apache/accumulo/manager/compaction/queue/CompactionJobPriorityQueue.java b/server/manager/src/main/java/org/apache/accumulo/manager/compaction/queue/CompactionJobPriorityQueue.java
index 1f9738dac78..f183b50b86f 100644
--- a/server/manager/src/main/java/org/apache/accumulo/manager/compaction/queue/CompactionJobPriorityQueue.java
+++ b/server/manager/src/main/java/org/apache/accumulo/manager/compaction/queue/CompactionJobPriorityQueue.java
@@ -31,11 +31,9 @@
 import java.util.Objects;
 import java.util.Optional;
 import java.util.Set;
-import java.util.TreeMap;
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.TimeUnit;
-import java.util.concurrent.atomic.AtomicInteger;
 import java.util.concurrent.atomic.AtomicLong;
 import java.util.concurrent.atomic.AtomicReference;
 
@@ -116,8 +114,8 @@ public boolean equals(Object o) {
   // behavior is not supported with a PriorityQueue. Second a PriorityQueue does not support
   // efficiently removing entries from anywhere in the queue. Efficient removal is needed for the
   // case where tablets decided to issues different compaction jobs than what is currently queued.
-  private final TreeMap<CjpqKey,CompactionJobQueues.MetaJob> jobQueue;
-  private final AtomicInteger maxSize;
+  private final SizeTrackingTreeMap<CjpqKey,CompactionJobQueues.MetaJob> jobQueue;
+  private final AtomicLong maxSize;
   private final AtomicLong rejectedJobs;
   private final AtomicLong dequeuedJobs;
   private final ArrayDeque<CompletableFuture<CompactionJobQueues.MetaJob>> futures;
@@ -142,9 +140,10 @@ private TabletJobs(long generation, HashSet<CjpqKey> jobs) {
 
   private final AtomicLong nextSeq = new AtomicLong(0);
 
-  public CompactionJobPriorityQueue(CompactorGroupId groupId, int maxSize) {
-    this.jobQueue = new TreeMap<>();
-    this.maxSize = new AtomicInteger(maxSize);
+  public CompactionJobPriorityQueue(CompactorGroupId groupId, long maxSize,
+      SizeTrackingTreeMap.Weigher<CompactionJobQueues.MetaJob> weigher) {
+    this.jobQueue = new SizeTrackingTreeMap<>(weigher);
+    this.maxSize = new AtomicLong(maxSize);
     this.tabletJobs = new HashMap<>();
     this.groupId = groupId;
     this.rejectedJobs = new AtomicLong(0);
@@ -230,11 +229,11 @@ public synchronized int add(TabletMetadata tabletMetadata, Collection<Compaction
     return jobsAdded;
   }
 
-  public synchronized int getMaxSize() {
+  public synchronized long getMaxSize() {
     return maxSize.get();
   }
 
-  public synchronized void setMaxSize(int maxSize) {
+  public synchronized void setMaxSize(long maxSize) {
     Preconditions.checkArgument(maxSize > 0,
         "Maximum size of the Compaction job priority queue must be greater than 0");
     this.maxSize.set(maxSize);
@@ -249,7 +248,7 @@ public long getDequeuedJobs() {
   }
 
   public synchronized long getQueuedJobs() {
-    return jobQueue.size();
+    return jobQueue.entrySize();
   }
 
   public synchronized long getLowestPriority() {
@@ -332,7 +331,7 @@ private void removePreviousSubmissions(KeyExtent extent, boolean removeJobAges)
   }
 
   private CjpqKey addJobToQueue(TabletMetadata tabletMetadata, CompactionJob job) {
-    if (jobQueue.size() >= maxSize.get()) {
+    if (jobQueue.dataSize() >= maxSize.get()) {
       var lastEntry = jobQueue.lastKey();
       if (job.getPriority() <= lastEntry.job.getPriority()) {
         // the queue is full and this job has a lower or same priority than the lowest job in the
diff --git a/server/manager/src/main/java/org/apache/accumulo/manager/compaction/queue/CompactionJobQueues.java b/server/manager/src/main/java/org/apache/accumulo/manager/compaction/queue/CompactionJobQueues.java
index b9fe1ed424c..2e2dc3cef95 100644
--- a/server/manager/src/main/java/org/apache/accumulo/manager/compaction/queue/CompactionJobQueues.java
+++ b/server/manager/src/main/java/org/apache/accumulo/manager/compaction/queue/CompactionJobQueues.java
@@ -48,18 +48,20 @@ public class CompactionJobQueues {
   private final ConcurrentHashMap<CompactorGroupId,CompactionJobPriorityQueue> priorityQueues =
       new ConcurrentHashMap<>();
 
-  private final int queueSize;
+  private final long queueSize;
 
   private final Map<DataLevel,AtomicLong> currentGenerations;
 
-  public CompactionJobQueues(int queueSize) {
+  private SizeTrackingTreeMap.Weigher<MetaJob> weigher =
+      val -> val.getTabletMetadata().toString().length() + val.getJob().toString().length();
+
+  public CompactionJobQueues(long queueSize) {
     this.queueSize = queueSize;
     Map<DataLevel,AtomicLong> cg = new EnumMap<>(DataLevel.class);
     for (var level : DataLevel.values()) {
       cg.put(level, new AtomicLong());
     }
     currentGenerations = Collections.unmodifiableMap(cg);
-
   }
 
   public void beginFullScan(DataLevel level) {
@@ -164,7 +166,7 @@ public TabletMetadata getTabletMetadata() {
    */
   public CompletableFuture<MetaJob> getAsync(CompactorGroupId groupId) {
     var pq = priorityQueues.computeIfAbsent(groupId,
-        gid -> new CompactionJobPriorityQueue(gid, queueSize));
+        gid -> new CompactionJobPriorityQueue(gid, queueSize, weigher));
     return pq.getAsync();
   }
 
@@ -187,7 +189,7 @@ private void add(TabletMetadata tabletMetadata, CompactorGroupId groupId,
     }
 
     var pq = priorityQueues.computeIfAbsent(groupId,
-        gid -> new CompactionJobPriorityQueue(gid, queueSize));
+        gid -> new CompactionJobPriorityQueue(gid, queueSize, weigher));
     pq.add(tabletMetadata, jobs,
         currentGenerations.get(DataLevel.of(tabletMetadata.getTableId())).get());
   }
diff --git a/server/manager/src/main/java/org/apache/accumulo/manager/compaction/queue/SizeTrackingTreeMap.java b/server/manager/src/main/java/org/apache/accumulo/manager/compaction/queue/SizeTrackingTreeMap.java
new file mode 100644
index 00000000000..306a56fb647
--- /dev/null
+++ b/server/manager/src/main/java/org/apache/accumulo/manager/compaction/queue/SizeTrackingTreeMap.java
@@ -0,0 +1,129 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.accumulo.manager.compaction.queue;
+
+import java.util.AbstractMap;
+import java.util.Map;
+import java.util.TreeMap;
+
+import com.google.common.base.Preconditions;
+
+/**
+ * This class wraps a treemap and tracks the data size of everything added and removed from the
+ * treemap.
+ */
+class SizeTrackingTreeMap<K,V> {
+
+  private static class ValueWrapper<V2> {
+    final V2 val;
+    final long computedSize;
+
+    private ValueWrapper(V2 val, long computedSize) {
+      this.val = val;
+      this.computedSize = computedSize;
+    }
+  }
+
+  private final TreeMap<K,ValueWrapper<V>> map = new TreeMap<>();
+  private long dataSize = 0;
+  private Weigher<V> weigher;
+
+  private Map.Entry<K,V> unwrap(Map.Entry<K,ValueWrapper<V>> wrapperEntry) {
+    if (wrapperEntry == null) {
+      return null;
+    }
+    return new AbstractMap.SimpleImmutableEntry<>(wrapperEntry.getKey(),
+        wrapperEntry.getValue().val);
+  }
+
+  private void incrementDataSize(ValueWrapper<V> val) {
+    Preconditions.checkState(dataSize >= 0);
+    dataSize += val.computedSize;
+  }
+
+  private void decrementDataSize(Map.Entry<K,ValueWrapper<V>> entry) {
+    if (entry != null) {
+      decrementDataSize(entry.getValue());
+    }
+  }
+
+  private void decrementDataSize(ValueWrapper<V> val) {
+    if (val != null) {
+      Preconditions.checkState(dataSize >= val.computedSize);
+      dataSize -= val.computedSize;
+    }
+  }
+
+  interface Weigher<V2> {
+    long weigh(V2 val);
+  }
+
+  public SizeTrackingTreeMap(Weigher<V> weigher) {
+    this.weigher = weigher;
+  }
+
+  public boolean isEmpty() {
+    return map.isEmpty();
+  }
+
+  public long dataSize() {
+    return dataSize;
+  }
+
+  public int entrySize() {
+    return map.size();
+  }
+
+  public K lastKey() {
+    return map.lastKey();
+  }
+
+  public Map.Entry<K,V> firstEntry() {
+    return unwrap(map.firstEntry());
+  }
+
+  public void remove(K key) {
+    var prev = map.remove(key);
+    decrementDataSize(prev);
+  }
+
+  public Map.Entry<K,V> pollFirstEntry() {
+    var first = map.pollFirstEntry();
+    decrementDataSize(first);
+    return unwrap(first);
+  }
+
+  public Map.Entry<K,V> pollLastEntry() {
+    var last = map.pollLastEntry();
+    decrementDataSize(last);
+    return unwrap(last);
+  }
+
+  public void put(K key, V val) {
+    var wrapped = new ValueWrapper<>(val, weigher.weigh(val));
+    var prev = map.put(key, wrapped);
+    decrementDataSize(prev);
+    incrementDataSize(wrapped);
+  }
+
+  public void clear() {
+    map.clear();
+    dataSize = 0;
+  }
+}
diff --git a/server/manager/src/main/java/org/apache/accumulo/manager/metrics/fate/FateMetricValues.java b/server/manager/src/main/java/org/apache/accumulo/manager/metrics/fate/FateMetricValues.java
index 19ba6243067..473f1284a58 100644
--- a/server/manager/src/main/java/org/apache/accumulo/manager/metrics/fate/FateMetricValues.java
+++ b/server/manager/src/main/java/org/apache/accumulo/manager/metrics/fate/FateMetricValues.java
@@ -25,6 +25,7 @@
 import java.util.TreeMap;
 
 import org.apache.accumulo.core.fate.AdminUtil;
+import org.apache.accumulo.core.fate.Fate;
 import org.apache.accumulo.core.fate.ReadOnlyFateStore;
 import org.apache.accumulo.core.fate.ReadOnlyFateStore.TStatus;
 
@@ -101,11 +102,9 @@ public Map<String,Long> getOpTypeCounters() {
 
       // incr count for op type for for in_progress transactions.
       if (ReadOnlyFateStore.TStatus.IN_PROGRESS.equals(tx.getStatus())) {
-        String opType = tx.getTxName();
-        if (opType == null || opType.isEmpty()) {
-          opType = "UNKNOWN";
-        }
-        opTypeCounters.merge(opType, 1L, Long::sum);
+        Fate.FateOperation opType = tx.getTxName();
+        String opTypeStr = opType == null ? "UNKNOWN" : opType.name();
+        opTypeCounters.merge(opTypeStr, 1L, Long::sum);
       }
     }
 
diff --git a/server/manager/src/main/java/org/apache/accumulo/manager/metrics/fate/FateMetrics.java b/server/manager/src/main/java/org/apache/accumulo/manager/metrics/fate/FateMetrics.java
index 200b3ff2b48..23cc841e9ce 100644
--- a/server/manager/src/main/java/org/apache/accumulo/manager/metrics/fate/FateMetrics.java
+++ b/server/manager/src/main/java/org/apache/accumulo/manager/metrics/fate/FateMetrics.java
@@ -53,7 +53,7 @@ public abstract class FateMetrics<T extends FateMetricValues> implements Metrics
   private static final String OP_TYPE_TAG = "op.type";
 
   protected final ServerContext context;
-  protected final ReadOnlyFateStore<FateMetrics<T>> fateStore;
+  protected final ReadOnlyFateStore<FateMetrics<T>> readOnlyFateStore;
   protected final long refreshDelay;
 
   protected final AtomicLong totalCurrentOpsCount = new AtomicLong(0);
@@ -62,14 +62,14 @@ public abstract class FateMetrics<T extends FateMetricValues> implements Metrics
   public FateMetrics(final ServerContext context, final long minimumRefreshDelay) {
     this.context = context;
     this.refreshDelay = Math.max(DEFAULT_MIN_REFRESH_DELAY, minimumRefreshDelay);
-    this.fateStore = Objects.requireNonNull(buildStore(context));
+    this.readOnlyFateStore = Objects.requireNonNull(buildReadOnlyStore(context));
 
     for (TStatus status : TStatus.values()) {
       txStatusCounters.put(status, new AtomicLong(0));
     }
   }
 
-  protected abstract ReadOnlyFateStore<FateMetrics<T>> buildStore(ServerContext context);
+  protected abstract ReadOnlyFateStore<FateMetrics<T>> buildReadOnlyStore(ServerContext context);
 
   protected abstract T getMetricValues();
 
@@ -95,7 +95,7 @@ protected void update(T metricValues) {
 
   @Override
   public void registerMetrics(final MeterRegistry registry) {
-    String type = fateStore.type().name().toLowerCase();
+    String type = readOnlyFateStore.type().name().toLowerCase();
 
     Gauge.builder(FATE_OPS.getName(), totalCurrentOpsCount, AtomicLong::get)
         .description(FATE_OPS.getDescription()).register(registry);
diff --git a/server/manager/src/main/java/org/apache/accumulo/manager/metrics/fate/meta/MetaFateMetricValues.java b/server/manager/src/main/java/org/apache/accumulo/manager/metrics/fate/meta/MetaFateMetricValues.java
index a0923d18642..812abba18da 100644
--- a/server/manager/src/main/java/org/apache/accumulo/manager/metrics/fate/meta/MetaFateMetricValues.java
+++ b/server/manager/src/main/java/org/apache/accumulo/manager/metrics/fate/meta/MetaFateMetricValues.java
@@ -81,7 +81,7 @@ public static MetaFateMetricValues getMetaStoreMetrics(final ServerContext conte
     try {
       builder = getFateMetrics(metaFateStore, new Builder());
 
-      Stat node = context.getZooReaderWriter().getZooKeeper().exists(fateRootPath, false);
+      Stat node = context.getZooSession().exists(fateRootPath, null);
       builder.withZkFateChildOpsTotal(node.getCversion());
 
       if (log.isTraceEnabled()) {
diff --git a/server/manager/src/main/java/org/apache/accumulo/manager/metrics/fate/meta/MetaFateMetrics.java b/server/manager/src/main/java/org/apache/accumulo/manager/metrics/fate/meta/MetaFateMetrics.java
index d26cf259d9b..b87f3d48223 100644
--- a/server/manager/src/main/java/org/apache/accumulo/manager/metrics/fate/meta/MetaFateMetrics.java
+++ b/server/manager/src/main/java/org/apache/accumulo/manager/metrics/fate/meta/MetaFateMetrics.java
@@ -24,7 +24,6 @@
 import java.util.concurrent.atomic.AtomicLong;
 
 import org.apache.accumulo.core.Constants;
-import org.apache.accumulo.core.fate.AbstractFateStore;
 import org.apache.accumulo.core.fate.ReadOnlyFateStore;
 import org.apache.accumulo.core.fate.zookeeper.MetaFateStore;
 import org.apache.accumulo.manager.metrics.fate.FateMetrics;
@@ -62,10 +61,10 @@ public void registerMetrics(MeterRegistry registry) {
   }
 
   @Override
-  protected ReadOnlyFateStore<FateMetrics<MetaFateMetricValues>> buildStore(ServerContext context) {
+  protected ReadOnlyFateStore<FateMetrics<MetaFateMetricValues>>
+      buildReadOnlyStore(ServerContext context) {
     try {
-      return new MetaFateStore<>(getFateRootPath(context), context.getZooReaderWriter(),
-          AbstractFateStore.createDummyLockID(), null);
+      return new MetaFateStore<>(getFateRootPath(context), context.getZooSession(), null, null);
     } catch (KeeperException ex) {
       throw new IllegalStateException(
           "FATE Metrics - Failed to create zoo store - metrics unavailable", ex);
@@ -78,7 +77,7 @@ protected ReadOnlyFateStore<FateMetrics<MetaFateMetricValues>> buildStore(Server
 
   @Override
   protected MetaFateMetricValues getMetricValues() {
-    return MetaFateMetricValues.getMetaStoreMetrics(context, fateRootPath, fateStore);
+    return MetaFateMetricValues.getMetaStoreMetrics(context, fateRootPath, readOnlyFateStore);
   }
 
   private static String getFateRootPath(ServerContext context) {
diff --git a/server/manager/src/main/java/org/apache/accumulo/manager/metrics/fate/user/UserFateMetrics.java b/server/manager/src/main/java/org/apache/accumulo/manager/metrics/fate/user/UserFateMetrics.java
index 92ac8568810..e4fad01899c 100644
--- a/server/manager/src/main/java/org/apache/accumulo/manager/metrics/fate/user/UserFateMetrics.java
+++ b/server/manager/src/main/java/org/apache/accumulo/manager/metrics/fate/user/UserFateMetrics.java
@@ -18,9 +18,9 @@
  */
 package org.apache.accumulo.manager.metrics.fate.user;
 
-import org.apache.accumulo.core.fate.AbstractFateStore;
 import org.apache.accumulo.core.fate.ReadOnlyFateStore;
 import org.apache.accumulo.core.fate.user.UserFateStore;
+import org.apache.accumulo.core.metadata.AccumuloTable;
 import org.apache.accumulo.manager.metrics.fate.FateMetrics;
 import org.apache.accumulo.server.ServerContext;
 
@@ -31,12 +31,13 @@ public UserFateMetrics(ServerContext context, long minimumRefreshDelay) {
   }
 
   @Override
-  protected ReadOnlyFateStore<FateMetrics<UserFateMetricValues>> buildStore(ServerContext context) {
-    return new UserFateStore<>(context, AbstractFateStore.createDummyLockID(), null);
+  protected ReadOnlyFateStore<FateMetrics<UserFateMetricValues>>
+      buildReadOnlyStore(ServerContext context) {
+    return new UserFateStore<>(context, AccumuloTable.FATE.tableName(), null, null);
   }
 
   @Override
   protected UserFateMetricValues getMetricValues() {
-    return UserFateMetricValues.getUserStoreMetrics(fateStore);
+    return UserFateMetricValues.getUserStoreMetrics(readOnlyFateStore);
   }
 }
diff --git a/server/manager/src/main/java/org/apache/accumulo/manager/recovery/RecoveryManager.java b/server/manager/src/main/java/org/apache/accumulo/manager/recovery/RecoveryManager.java
index 7270d8018f4..7a4d5db9c37 100644
--- a/server/manager/src/main/java/org/apache/accumulo/manager/recovery/RecoveryManager.java
+++ b/server/manager/src/main/java/org/apache/accumulo/manager/recovery/RecoveryManager.java
@@ -76,7 +76,7 @@ public RecoveryManager(Manager manager, long timeToCacheExistsInMillis) {
 
     executor =
         ThreadPools.getServerThreadPools().createScheduledExecutorService(4, "Walog sort starter");
-    zooCache = new ZooCache(manager.getContext().getZooReader(), null);
+    zooCache = new ZooCache(manager.getContext().getZooSession());
     try {
       List<String> workIDs =
           new DistributedWorkQueue(manager.getContext().getZooKeeperRoot() + Constants.ZRECOVERY,
diff --git a/server/manager/src/main/java/org/apache/accumulo/manager/split/SeedSplitTask.java b/server/manager/src/main/java/org/apache/accumulo/manager/split/SeedSplitTask.java
index 7b56ea43880..8270bc423f3 100644
--- a/server/manager/src/main/java/org/apache/accumulo/manager/split/SeedSplitTask.java
+++ b/server/manager/src/main/java/org/apache/accumulo/manager/split/SeedSplitTask.java
@@ -19,6 +19,7 @@
 package org.apache.accumulo.manager.split;
 
 import org.apache.accumulo.core.dataImpl.KeyExtent;
+import org.apache.accumulo.core.fate.Fate;
 import org.apache.accumulo.core.fate.FateInstanceType;
 import org.apache.accumulo.core.fate.FateKey;
 import org.apache.accumulo.manager.Manager;
@@ -41,8 +42,8 @@ public SeedSplitTask(Manager manager, KeyExtent extent) {
   public void run() {
     try {
       var fateInstanceType = FateInstanceType.fromTableId((extent.tableId()));
-      manager.fate(fateInstanceType).seedTransaction("SYSTEM_SPLIT", FateKey.forSplit(extent),
-          new FindSplits(extent), true);
+      manager.fate(fateInstanceType).seedTransaction(Fate.FateOperation.SYSTEM_SPLIT,
+          FateKey.forSplit(extent), new FindSplits(extent), true);
     } catch (Exception e) {
       log.error("Failed to split {}", extent, e);
     }
diff --git a/server/manager/src/main/java/org/apache/accumulo/manager/state/SetGoalState.java b/server/manager/src/main/java/org/apache/accumulo/manager/state/SetGoalState.java
index 0914e675c1a..114b08af094 100644
--- a/server/manager/src/main/java/org/apache/accumulo/manager/state/SetGoalState.java
+++ b/server/manager/src/main/java/org/apache/accumulo/manager/state/SetGoalState.java
@@ -46,7 +46,7 @@ public static void main(String[] args) throws Exception {
       SecurityUtil.serverLogin(siteConfig);
       try (var context = new ServerContext(siteConfig)) {
         context.waitForZookeeperAndHdfs();
-        context.getZooReaderWriter().putPersistentData(
+        context.getZooSession().asReaderWriter().putPersistentData(
             context.getZooKeeperRoot() + Constants.ZMANAGER_GOAL_STATE, args[0].getBytes(UTF_8),
             NodeExistsPolicy.OVERWRITE);
       }
diff --git a/server/manager/src/main/java/org/apache/accumulo/manager/tableOps/TableInfo.java b/server/manager/src/main/java/org/apache/accumulo/manager/tableOps/TableInfo.java
index 5294c3ef04b..8852a41cd94 100644
--- a/server/manager/src/main/java/org/apache/accumulo/manager/tableOps/TableInfo.java
+++ b/server/manager/src/main/java/org/apache/accumulo/manager/tableOps/TableInfo.java
@@ -26,6 +26,7 @@
 import org.apache.accumulo.core.client.admin.TimeType;
 import org.apache.accumulo.core.data.NamespaceId;
 import org.apache.accumulo.core.data.TableId;
+import org.apache.accumulo.core.metadata.schema.TabletMergeabilityMetadata;
 import org.apache.hadoop.fs.Path;
 
 public class TableInfo implements Serializable {
@@ -51,6 +52,8 @@ public class TableInfo implements Serializable {
 
   private TabletAvailability initialTabletAvailability;
 
+  private TabletMergeabilityMetadata initialTabletMergeability;
+
   public TabletAvailability getInitialTabletAvailability() {
     return initialTabletAvailability;
   }
@@ -133,4 +136,11 @@ public void setInitialSplitSize(int initialSplitSize) {
     this.initialSplitSize = initialSplitSize;
   }
 
+  public TabletMergeabilityMetadata getInitialTabletMergeability() {
+    return initialTabletMergeability;
+  }
+
+  public void setInitialTabletMergeability(TabletMergeabilityMetadata initialTabletMergeability) {
+    this.initialTabletMergeability = initialTabletMergeability;
+  }
 }
diff --git a/server/manager/src/main/java/org/apache/accumulo/manager/tableOps/Utils.java b/server/manager/src/main/java/org/apache/accumulo/manager/tableOps/Utils.java
index 36622789443..20a962cbbe1 100644
--- a/server/manager/src/main/java/org/apache/accumulo/manager/tableOps/Utils.java
+++ b/server/manager/src/main/java/org/apache/accumulo/manager/tableOps/Utils.java
@@ -74,19 +74,20 @@ public static void checkTableNameDoesNotExist(ServerContext context, String tabl
     final Map<NamespaceId,String> namespaces = new HashMap<>();
     final boolean namespaceInTableName = tableName.contains(".");
     try {
-      for (String tid : context.getZooReader()
+      for (String tid : context.getZooSession().asReader()
           .getChildren(context.getZooKeeperRoot() + Constants.ZTABLES)) {
 
         final String zTablePath = context.getZooKeeperRoot() + Constants.ZTABLES + "/" + tid;
         try {
-          final byte[] tname = context.getZooReader().getData(zTablePath + Constants.ZTABLE_NAME);
+          final byte[] tname =
+              context.getZooSession().asReader().getData(zTablePath + Constants.ZTABLE_NAME);
           Preconditions.checkState(tname != null, "Malformed table entry in ZooKeeper at %s",
               zTablePath);
 
           String namespaceName = Namespace.DEFAULT.name();
           if (namespaceInTableName) {
             final byte[] nId =
-                context.getZooReader().getData(zTablePath + Constants.ZTABLE_NAMESPACE);
+                context.getZooSession().asReader().getData(zTablePath + Constants.ZTABLE_NAMESPACE);
             if (nId != null) {
               final NamespaceId namespaceId = NamespaceId.of(new String(nId, UTF_8));
               if (!namespaceId.equals(Namespace.DEFAULT.id())) {
@@ -127,7 +128,7 @@ public static void checkTableNameDoesNotExist(ServerContext context, String tabl
   public static <T extends AbstractId<T>> T getNextId(String name, ServerContext context,
       Function<String,T> newIdFunction) throws AcceptableThriftTableOperationException {
     try {
-      ZooReaderWriter zoo = context.getZooReaderWriter();
+      ZooReaderWriter zoo = context.getZooSession().asReaderWriter();
       final String ntp = context.getZooKeeperRoot() + Constants.ZTABLES;
       byte[] nid = zoo.mutateOrCreate(ntp, ZERO_BYTE, currentValue -> {
         BigInteger nextId = new BigInteger(new String(currentValue, UTF_8), Character.MAX_RADIX);
@@ -149,7 +150,7 @@ public static long reserveTable(Manager env, TableId tableId, FateId fateId, Loc
       boolean tableMustExist, TableOperation op) throws Exception {
     if (getLock(env.getContext(), tableId, fateId, lockType).tryLock()) {
       if (tableMustExist) {
-        ZooReaderWriter zk = env.getContext().getZooReaderWriter();
+        ZooReaderWriter zk = env.getContext().getZooSession().asReaderWriter();
         if (!zk.exists(env.getContext().getZooKeeperRoot() + Constants.ZTABLES + "/" + tableId)) {
           throw new AcceptableThriftTableOperationException(tableId.canonical(), "", op,
               TableOperationExceptionType.NOTFOUND, "Table does not exist");
@@ -178,7 +179,7 @@ public static long reserveNamespace(Manager env, NamespaceId namespaceId, FateId
       LockType lockType, boolean mustExist, TableOperation op) throws Exception {
     if (getLock(env.getContext(), namespaceId, fateId, lockType).tryLock()) {
       if (mustExist) {
-        ZooReaderWriter zk = env.getContext().getZooReaderWriter();
+        ZooReaderWriter zk = env.getContext().getZooSession().asReaderWriter();
         if (!zk.exists(
             env.getContext().getZooKeeperRoot() + Constants.ZNAMESPACES + "/" + namespaceId)) {
           throw new AcceptableThriftTableOperationException(namespaceId.canonical(), "", op,
@@ -197,7 +198,7 @@ public static long reserveHdfsDirectory(Manager env, String directory, FateId fa
     String resvPath = env.getContext().getZooKeeperRoot() + Constants.ZHDFS_RESERVATIONS + "/"
         + Base64.getEncoder().encodeToString(directory.getBytes(UTF_8));
 
-    ZooReaderWriter zk = env.getContext().getZooReaderWriter();
+    ZooReaderWriter zk = env.getContext().getZooSession().asReaderWriter();
 
     if (ZooReservation.attempt(zk, resvPath, fateId, "")) {
       return 0;
@@ -210,7 +211,7 @@ public static void unreserveHdfsDirectory(Manager env, String directory, FateId
       throws KeeperException, InterruptedException {
     String resvPath = env.getContext().getZooKeeperRoot() + Constants.ZHDFS_RESERVATIONS + "/"
         + Base64.getEncoder().encodeToString(directory.getBytes(UTF_8));
-    ZooReservation.release(env.getContext().getZooReaderWriter(), resvPath, fateId);
+    ZooReservation.release(env.getContext().getZooSession().asReaderWriter(), resvPath, fateId);
   }
 
   private static Lock getLock(ServerContext context, AbstractId<?> id, FateId fateId,
@@ -218,7 +219,7 @@ private static Lock getLock(ServerContext context, AbstractId<?> id, FateId fate
     byte[] lockData = fateId.canonical().getBytes(UTF_8);
     var fLockPath =
         FateLock.path(context.getZooKeeperRoot() + Constants.ZTABLE_LOCKS + "/" + id.canonical());
-    FateLock qlock = new FateLock(context.getZooReaderWriter(), fLockPath);
+    FateLock qlock = new FateLock(context.getZooSession().asReaderWriter(), fLockPath);
     DistributedLock lock = DistributedReadWriteLock.recoverLock(qlock, lockData);
     if (lock != null) {
 
diff --git a/server/manager/src/main/java/org/apache/accumulo/manager/tableOps/availability/SetTabletAvailability.java b/server/manager/src/main/java/org/apache/accumulo/manager/tableOps/availability/SetTabletAvailability.java
index bd94afd15b4..db4fcdbeaf2 100644
--- a/server/manager/src/main/java/org/apache/accumulo/manager/tableOps/availability/SetTabletAvailability.java
+++ b/server/manager/src/main/java/org/apache/accumulo/manager/tableOps/availability/SetTabletAvailability.java
@@ -136,7 +136,8 @@ public long isReady(FateId fateId, Manager manager) throws Exception {
             tabletExtent);
         mutator.mutateTablet(tabletExtent).requireAbsentOperation()
             .putTabletAvailability(tabletAvailability)
-            .submit(tabletMeta -> tabletMeta.getTabletAvailability() == tabletAvailability);
+            .submit(tabletMeta -> tabletMeta.getTabletAvailability() == tabletAvailability,
+                () -> "set tablet availability");
       }
     }
 
diff --git a/server/manager/src/main/java/org/apache/accumulo/manager/tableOps/bulkVer2/CleanUpBulkImport.java b/server/manager/src/main/java/org/apache/accumulo/manager/tableOps/bulkVer2/CleanUpBulkImport.java
index 32003695251..e5cdfdb085a 100644
--- a/server/manager/src/main/java/org/apache/accumulo/manager/tableOps/bulkVer2/CleanUpBulkImport.java
+++ b/server/manager/src/main/java/org/apache/accumulo/manager/tableOps/bulkVer2/CleanUpBulkImport.java
@@ -111,7 +111,7 @@ private static void removeBulkLoadEntries(Ample ample, TableId tableId, FateId f
                 tabletsMutator.mutateTablet(tablet.getExtent()).requireAbsentOperation();
             tablet.getLoaded().entrySet().stream().filter(entry -> entry.getValue().equals(fateId))
                 .map(Map.Entry::getKey).forEach(tabletMutator::deleteBulkFile);
-            tabletMutator.submit(tm -> false);
+            tabletMutator.submit(tm -> false, () -> "remove bulk load entries " + fateId);
           }
         }
 
diff --git a/server/manager/src/main/java/org/apache/accumulo/manager/tableOps/bulkVer2/LoadFiles.java b/server/manager/src/main/java/org/apache/accumulo/manager/tableOps/bulkVer2/LoadFiles.java
index 5ff2ca3ec39..c38fb54ce69 100644
--- a/server/manager/src/main/java/org/apache/accumulo/manager/tableOps/bulkVer2/LoadFiles.java
+++ b/server/manager/src/main/java/org/apache/accumulo/manager/tableOps/bulkVer2/LoadFiles.java
@@ -251,7 +251,7 @@ void load(List<TabletMetadata> tablets, Files files) {
         Preconditions.checkState(
             loadingFiles.put(tablet.getExtent(), List.copyOf(filesToLoad.keySet())) == null);
 
-        tabletMutator.submit(tm -> false);
+        tabletMutator.submit(tm -> false, () -> "bulk load files " + fateId);
       }
     }
 
diff --git a/server/manager/src/main/java/org/apache/accumulo/manager/tableOps/compact/CompactionDriver.java b/server/manager/src/main/java/org/apache/accumulo/manager/tableOps/compact/CompactionDriver.java
index 464f3651210..2881449fa88 100644
--- a/server/manager/src/main/java/org/apache/accumulo/manager/tableOps/compact/CompactionDriver.java
+++ b/server/manager/src/main/java/org/apache/accumulo/manager/tableOps/compact/CompactionDriver.java
@@ -96,7 +96,7 @@ public long isReady(FateId fateId, Manager manager) throws Exception {
       return 0;
     }
 
-    ZooReaderWriter zoo = manager.getContext().getZooReaderWriter();
+    ZooReaderWriter zoo = manager.getContext().getZooSession().asReaderWriter();
 
     if (isCancelled(fateId, manager.getContext())) {
       // compaction was canceled
@@ -211,7 +211,8 @@ public int updateAndCheckTablets(Manager manager, FateId fateId)
           // this tablet has no files try to mark it as done
           tabletsMutator.mutateTablet(tablet.getExtent()).requireAbsentOperation()
               .requireSame(tablet, FILES, COMPACTED).putCompacted(fateId)
-              .submit(tabletMetadata -> tabletMetadata.getCompacted().contains(fateId));
+              .submit(tabletMetadata -> tabletMetadata.getCompacted().contains(fateId),
+                  () -> "no files, attempting to mark as compacted. " + fateId);
           noFiles++;
         } else if (tablet.getSelectedFiles() == null && tablet.getExternalCompactions().isEmpty()) {
           // there are no selected files
@@ -242,7 +243,8 @@ public int updateAndCheckTablets(Manager manager, FateId fateId)
             // no files were selected so mark the tablet as compacted
             tabletsMutator.mutateTablet(tablet.getExtent()).requireAbsentOperation()
                 .requireSame(tablet, FILES, SELECTED, ECOMP, COMPACTED).putCompacted(fateId)
-                .submit(tabletMetadata -> tabletMetadata.getCompacted().contains(fateId));
+                .submit(tabletMetadata -> tabletMetadata.getCompacted().contains(fateId),
+                    () -> "no files, attempting to mark as compacted. " + fateId);
 
             noneSelected++;
           } else {
@@ -260,9 +262,11 @@ public int updateAndCheckTablets(Manager manager, FateId fateId)
 
             selectionsSubmitted.put(tablet.getExtent(), filesToCompact);
 
-            mutator.submit(tabletMetadata -> tabletMetadata.getSelectedFiles() != null
-                && tabletMetadata.getSelectedFiles().getFateId().equals(fateId)
-                || tabletMetadata.getCompacted().contains(fateId));
+            mutator.submit(
+                tabletMetadata -> tabletMetadata.getSelectedFiles() != null
+                    && tabletMetadata.getSelectedFiles().getFateId().equals(fateId)
+                    || tabletMetadata.getCompacted().contains(fateId),
+                () -> "selecting files for compaction. " + fateId);
 
             if (minSelected == null || tablet.getExtent().compareTo(minSelected) < 0) {
               minSelected = tablet.getExtent();
@@ -298,7 +302,8 @@ public int updateAndCheckTablets(Manager manager, FateId fateId)
             var mutator = tabletsMutator.mutateTablet(tablet.getExtent()).requireAbsentOperation()
                 .requireSame(tablet, ECOMP, USER_COMPACTION_REQUESTED)
                 .putUserCompactionRequested(fateId);
-            mutator.submit(tm -> tm.getUserCompactionsRequested().contains(fateId));
+            mutator.submit(tm -> tm.getUserCompactionsRequested().contains(fateId),
+                () -> "marking as needing a user requested compaction. " + fateId);
             userCompactionRequested++;
           } else {
             // Marker was already added and we are waiting
@@ -400,7 +405,8 @@ private void cleanupTabletMetadata(FateId fateId, Manager manager) throws Except
               mutator.deleteUserCompactionRequested(fateId);
             }
 
-            mutator.submit(needsNoUpdate::test);
+            mutator.submit(needsNoUpdate::test,
+                () -> "cleanup metadata for failed compaction. " + fateId);
           }
         }
       }
diff --git a/server/manager/src/main/java/org/apache/accumulo/manager/tableOps/create/CreateTable.java b/server/manager/src/main/java/org/apache/accumulo/manager/tableOps/create/CreateTable.java
index 3f5a379c8a4..f0d74597db6 100644
--- a/server/manager/src/main/java/org/apache/accumulo/manager/tableOps/create/CreateTable.java
+++ b/server/manager/src/main/java/org/apache/accumulo/manager/tableOps/create/CreateTable.java
@@ -30,6 +30,7 @@
 import org.apache.accumulo.core.fate.FateId;
 import org.apache.accumulo.core.fate.Repo;
 import org.apache.accumulo.core.fate.zookeeper.DistributedReadWriteLock.LockType;
+import org.apache.accumulo.core.metadata.schema.TabletMergeabilityMetadata;
 import org.apache.accumulo.manager.Manager;
 import org.apache.accumulo.manager.tableOps.ManagerRepo;
 import org.apache.accumulo.manager.tableOps.TableInfo;
@@ -47,7 +48,8 @@ public class CreateTable extends ManagerRepo {
 
   public CreateTable(String user, String tableName, TimeType timeType, Map<String,String> props,
       Path splitPath, int splitCount, Path splitDirsPath, InitialTableState initialTableState,
-      TabletAvailability initialTabletAvailability, NamespaceId namespaceId) {
+      TabletAvailability initialTabletAvailability, NamespaceId namespaceId,
+      TabletMergeabilityMetadata initialTabletMergeability) {
     tableInfo = new TableInfo();
     tableInfo.setTableName(tableName);
     tableInfo.setTimeType(timeType);
@@ -59,6 +61,7 @@ public CreateTable(String user, String tableName, TimeType timeType, Map<String,
     tableInfo.setInitialTableState(initialTableState);
     tableInfo.setSplitDirsPath(splitDirsPath);
     tableInfo.setInitialTabletAvailability(initialTabletAvailability);
+    tableInfo.setInitialTabletMergeability(initialTabletMergeability);
   }
 
   @Override
diff --git a/server/manager/src/main/java/org/apache/accumulo/manager/tableOps/create/PopulateMetadata.java b/server/manager/src/main/java/org/apache/accumulo/manager/tableOps/create/PopulateMetadata.java
index 08cfcd194f6..2b987c7a4e0 100644
--- a/server/manager/src/main/java/org/apache/accumulo/manager/tableOps/create/PopulateMetadata.java
+++ b/server/manager/src/main/java/org/apache/accumulo/manager/tableOps/create/PopulateMetadata.java
@@ -92,6 +92,7 @@ private void writeSplitsToMetadataTable(ServerContext context, SortedSet<Text> s
         tabletMutator.putDirName(dirName);
         tabletMutator.putTime(new MetadataTime(0, tableInfo.getTimeType()));
         tabletMutator.putTabletAvailability(tableInfo.getInitialTabletAvailability());
+        tabletMutator.putTabletMergeability(tableInfo.getInitialTabletMergeability());
         tabletMutator.mutate();
 
         prevSplit = split;
diff --git a/server/manager/src/main/java/org/apache/accumulo/manager/tableOps/delete/PreDeleteTable.java b/server/manager/src/main/java/org/apache/accumulo/manager/tableOps/delete/PreDeleteTable.java
index ce8dbfcff85..6ce86cd47b3 100644
--- a/server/manager/src/main/java/org/apache/accumulo/manager/tableOps/delete/PreDeleteTable.java
+++ b/server/manager/src/main/java/org/apache/accumulo/manager/tableOps/delete/PreDeleteTable.java
@@ -63,7 +63,7 @@ private void preventFutureCompactions(Manager environment)
       throws KeeperException, InterruptedException {
     String deleteMarkerPath =
         createDeleteMarkerPath(environment.getContext().getInstanceID(), tableId);
-    ZooReaderWriter zoo = environment.getContext().getZooReaderWriter();
+    ZooReaderWriter zoo = environment.getContext().getZooSession().asReaderWriter();
     zoo.putPersistentData(deleteMarkerPath, new byte[] {}, NodeExistsPolicy.SKIP);
   }
 
diff --git a/server/manager/src/main/java/org/apache/accumulo/manager/tableOps/delete/ReserveTablets.java b/server/manager/src/main/java/org/apache/accumulo/manager/tableOps/delete/ReserveTablets.java
index f065206b2ff..6f9d65d0b87 100644
--- a/server/manager/src/main/java/org/apache/accumulo/manager/tableOps/delete/ReserveTablets.java
+++ b/server/manager/src/main/java/org/apache/accumulo/manager/tableOps/delete/ReserveTablets.java
@@ -96,7 +96,8 @@ public long isReady(FateId fateId, Manager manager) throws Exception {
           // must wait for the tablet to have no location before proceeding to actually delete. See
           // the documentation about the opid column in the MetadataSchema class for more details.
           conditionalMutator.mutateTablet(tabletMeta.getExtent()).requireAbsentOperation()
-              .putOperation(opid).submit(tm -> opid.equals(tm.getOperationId()));
+              .putOperation(opid)
+              .submit(tm -> opid.equals(tm.getOperationId()), () -> "put opid " + opid);
           submitted++;
         }
       }
diff --git a/server/manager/src/main/java/org/apache/accumulo/manager/tableOps/merge/DeleteRows.java b/server/manager/src/main/java/org/apache/accumulo/manager/tableOps/merge/DeleteRows.java
index 2c5221b7ce8..3bf6bce841b 100644
--- a/server/manager/src/main/java/org/apache/accumulo/manager/tableOps/merge/DeleteRows.java
+++ b/server/manager/src/main/java/org/apache/accumulo/manager/tableOps/merge/DeleteRows.java
@@ -178,16 +178,20 @@ private Optional<KeyExtent> deleteTabletFiles(Manager manager, FateId fateId) {
           }
         }
 
-        filesToDelete.forEach(file -> log.debug("{} deleting file {} for {}", fateId, file,
-            tabletMetadata.getExtent()));
-        filesToAddMap.forEach((file, dfv) -> log.debug("{} adding file {} {} for {}", fateId, file,
-            dfv, tabletMetadata.getExtent()));
-
-        filesToDelete.forEach(tabletMutator::deleteFile);
-        filesToAddMap.forEach(tabletMutator::putFile);
-
-        tabletMutator.submit(tm -> tm.getFiles().containsAll(filesToAddMap.keySet())
-            && Collections.disjoint(tm.getFiles(), filesToDelete));
+        filesToDelete.forEach(file -> {
+          log.debug("{} deleting file {} for {}", fateId, file, tabletMetadata.getExtent());
+          tabletMutator.deleteFile(file);
+        });
+
+        filesToAddMap.forEach((file, dfv) -> {
+          log.debug("{} adding file {} {} for {}", fateId, file, dfv, tabletMetadata.getExtent());
+          tabletMutator.putFile(file, dfv);
+        });
+
+        tabletMutator.submit(
+            tm -> tm.getFiles().containsAll(filesToAddMap.keySet())
+                && Collections.disjoint(tm.getFiles(), filesToDelete),
+            () -> "delete tablet files (as part of merge or deleterow operation) " + fateId);
       }
 
       var results = tabletsMutator.process();
diff --git a/server/manager/src/main/java/org/apache/accumulo/manager/tableOps/merge/MergeTablets.java b/server/manager/src/main/java/org/apache/accumulo/manager/tableOps/merge/MergeTablets.java
index cdd54ac1439..5b490ab567e 100644
--- a/server/manager/src/main/java/org/apache/accumulo/manager/tableOps/merge/MergeTablets.java
+++ b/server/manager/src/main/java/org/apache/accumulo/manager/tableOps/merge/MergeTablets.java
@@ -186,6 +186,7 @@ public Repo<Manager> call(FateId fateId, Manager manager) throws Exception {
         tabletMutator.putTabletAvailability(
             DeleteRows.getMergeTabletAvailability(range, tabletAvailabilities));
         tabletMutator.putPrevEndRow(firstTabletMeta.getPrevEndRow());
+        tabletMutator.putTabletMergeability(lastTabletMeta.getTabletMergeability());
 
         // scan entries are related to a hosted tablet, this tablet is not hosted so can safely
         // delete these
diff --git a/server/manager/src/main/java/org/apache/accumulo/manager/tableOps/namespace/create/PopulateZookeeperWithNamespace.java b/server/manager/src/main/java/org/apache/accumulo/manager/tableOps/namespace/create/PopulateZookeeperWithNamespace.java
index 2451d31c345..8b78568fec6 100644
--- a/server/manager/src/main/java/org/apache/accumulo/manager/tableOps/namespace/create/PopulateZookeeperWithNamespace.java
+++ b/server/manager/src/main/java/org/apache/accumulo/manager/tableOps/namespace/create/PopulateZookeeperWithNamespace.java
@@ -54,7 +54,7 @@ public Repo<Manager> call(FateId fateId, Manager manager) throws Exception {
     Utils.getTableNameLock().lock();
     try {
       var context = manager.getContext();
-      NamespaceMapping.put(context.getZooReaderWriter(),
+      NamespaceMapping.put(context.getZooSession().asReaderWriter(),
           context.getZooKeeperRoot() + Constants.ZNAMESPACES, namespaceInfo.namespaceId,
           namespaceInfo.namespaceName);
       TableManager.prepareNewNamespaceState(context, namespaceInfo.namespaceId,
diff --git a/server/manager/src/main/java/org/apache/accumulo/manager/tableOps/namespace/rename/RenameNamespace.java b/server/manager/src/main/java/org/apache/accumulo/manager/tableOps/namespace/rename/RenameNamespace.java
index 7949af46bff..f7caa953f87 100644
--- a/server/manager/src/main/java/org/apache/accumulo/manager/tableOps/namespace/rename/RenameNamespace.java
+++ b/server/manager/src/main/java/org/apache/accumulo/manager/tableOps/namespace/rename/RenameNamespace.java
@@ -53,7 +53,7 @@ public RenameNamespace(NamespaceId namespaceId, String oldName, String newName)
   @Override
   public Repo<Manager> call(FateId fateId, Manager manager) throws Exception {
 
-    ZooReaderWriter zoo = manager.getContext().getZooReaderWriter();
+    ZooReaderWriter zoo = manager.getContext().getZooSession().asReaderWriter();
 
     Utils.getTableNameLock().lock();
     try {
diff --git a/server/manager/src/main/java/org/apache/accumulo/manager/tableOps/rename/RenameTable.java b/server/manager/src/main/java/org/apache/accumulo/manager/tableOps/rename/RenameTable.java
index 1d5a9ff52f1..ceaae0804b0 100644
--- a/server/manager/src/main/java/org/apache/accumulo/manager/tableOps/rename/RenameTable.java
+++ b/server/manager/src/main/java/org/apache/accumulo/manager/tableOps/rename/RenameTable.java
@@ -75,7 +75,7 @@ public Repo<Manager> call(FateId fateId, Manager manager) throws Exception {
           "Namespace in new table name does not match the old table name");
     }
 
-    ZooReaderWriter zoo = manager.getContext().getZooReaderWriter();
+    ZooReaderWriter zoo = manager.getContext().getZooSession().asReaderWriter();
 
     Utils.getTableNameLock().lock();
     try {
diff --git a/server/manager/src/main/java/org/apache/accumulo/manager/tableOps/split/FindSplits.java b/server/manager/src/main/java/org/apache/accumulo/manager/tableOps/split/FindSplits.java
index 60073e987a2..c614ce4be2e 100644
--- a/server/manager/src/main/java/org/apache/accumulo/manager/tableOps/split/FindSplits.java
+++ b/server/manager/src/main/java/org/apache/accumulo/manager/tableOps/split/FindSplits.java
@@ -48,7 +48,7 @@ public class FindSplits extends ManagerRepo {
   private final SplitInfo splitInfo;
 
   public FindSplits(KeyExtent extent) {
-    this.splitInfo = new SplitInfo(extent, new TreeSet<>());
+    this.splitInfo = new SplitInfo(extent, new TreeSet<>(), true);
   }
 
   @Override
@@ -156,7 +156,7 @@ public Repo<Manager> call(FateId fateId, Manager manager) throws Exception {
       return null;
     }
 
-    return new PreSplit(extent, splits);
+    return new PreSplit(extent, splits, true);
   }
 
 }
diff --git a/server/manager/src/main/java/org/apache/accumulo/manager/tableOps/split/PreSplit.java b/server/manager/src/main/java/org/apache/accumulo/manager/tableOps/split/PreSplit.java
index 6d89878f955..41d8d039ea7 100644
--- a/server/manager/src/main/java/org/apache/accumulo/manager/tableOps/split/PreSplit.java
+++ b/server/manager/src/main/java/org/apache/accumulo/manager/tableOps/split/PreSplit.java
@@ -50,12 +50,16 @@ public class PreSplit extends ManagerRepo {
 
   private final SplitInfo splitInfo;
 
-  public PreSplit(KeyExtent expectedExtent, SortedSet<Text> splits) {
+  public PreSplit(KeyExtent expectedExtent, SortedSet<Text> splits, boolean systemCreated) {
     Objects.requireNonNull(expectedExtent);
     Objects.requireNonNull(splits);
     Preconditions.checkArgument(!splits.isEmpty());
     Preconditions.checkArgument(!expectedExtent.isRootTablet());
-    this.splitInfo = new SplitInfo(expectedExtent, splits);
+    this.splitInfo = new SplitInfo(expectedExtent, splits, systemCreated);
+  }
+
+  public PreSplit(KeyExtent expectedExtent, SortedSet<Text> splits) {
+    this(expectedExtent, splits, false);
   }
 
   @Override
diff --git a/server/manager/src/main/java/org/apache/accumulo/manager/tableOps/split/SplitInfo.java b/server/manager/src/main/java/org/apache/accumulo/manager/tableOps/split/SplitInfo.java
index 7d97e6a34e1..14bac1fe7ef 100644
--- a/server/manager/src/main/java/org/apache/accumulo/manager/tableOps/split/SplitInfo.java
+++ b/server/manager/src/main/java/org/apache/accumulo/manager/tableOps/split/SplitInfo.java
@@ -36,12 +36,14 @@ public class SplitInfo implements Serializable {
   private final byte[] prevEndRow;
   private final byte[] endRow;
   private final byte[][] splits;
+  private final boolean systemCreated;
 
-  public SplitInfo(KeyExtent extent, SortedSet<Text> splits) {
+  public SplitInfo(KeyExtent extent, SortedSet<Text> splits, boolean systemCreated) {
     this.tableId = extent.tableId();
     this.prevEndRow = extent.prevEndRow() == null ? null : TextUtil.getBytes(extent.prevEndRow());
     this.endRow = extent.endRow() == null ? null : TextUtil.getBytes(extent.endRow());
     this.splits = new byte[splits.size()][];
+    this.systemCreated = systemCreated;
 
     int index = 0;
     for (var split : splits) {
@@ -85,4 +87,7 @@ SortedSet<KeyExtent> getTablets() {
     return tablets;
   }
 
+  boolean isSystemCreated() {
+    return systemCreated;
+  }
 }
diff --git a/server/manager/src/main/java/org/apache/accumulo/manager/tableOps/split/UpdateTablets.java b/server/manager/src/main/java/org/apache/accumulo/manager/tableOps/split/UpdateTablets.java
index ce48d480b14..7da6f36af6d 100644
--- a/server/manager/src/main/java/org/apache/accumulo/manager/tableOps/split/UpdateTablets.java
+++ b/server/manager/src/main/java/org/apache/accumulo/manager/tableOps/split/UpdateTablets.java
@@ -35,6 +35,7 @@
 import org.apache.accumulo.core.metadata.schema.Ample;
 import org.apache.accumulo.core.metadata.schema.Ample.ConditionalResult.Status;
 import org.apache.accumulo.core.metadata.schema.DataFileValue;
+import org.apache.accumulo.core.metadata.schema.TabletMergeabilityMetadata;
 import org.apache.accumulo.core.metadata.schema.TabletMetadata;
 import org.apache.accumulo.core.metadata.schema.TabletOperationId;
 import org.apache.accumulo.core.metadata.schema.TabletOperationType;
@@ -218,7 +219,9 @@ private void addNewTablets(FateId fateId, Manager manager, TabletMetadata tablet
             .debug("{} copying compacted marker to new child tablet {}", fateId, compactedFateId));
 
         mutator.putTabletAvailability(tabletMetadata.getTabletAvailability());
-
+        mutator.putTabletMergeability(
+            splitInfo.isSystemCreated() ? TabletMergeabilityMetadata.always(manager.getSteadyTime())
+                : TabletMergeabilityMetadata.never());
         tabletMetadata.getLoaded().forEach((k, v) -> mutator.putBulkFile(k.getTabletFile(), v));
 
         newTabletsFiles.get(newExtent).forEach(mutator::putFile);
diff --git a/server/manager/src/main/java/org/apache/accumulo/manager/tserverOps/ShutdownTServer.java b/server/manager/src/main/java/org/apache/accumulo/manager/tserverOps/ShutdownTServer.java
index 3f66f14d8a1..e4cd9b39c7a 100644
--- a/server/manager/src/main/java/org/apache/accumulo/manager/tserverOps/ShutdownTServer.java
+++ b/server/manager/src/main/java/org/apache/accumulo/manager/tserverOps/ShutdownTServer.java
@@ -97,7 +97,7 @@ public long isReady(FateId fateId, Manager manager) {
   public Repo<Manager> call(FateId fateId, Manager manager) throws Exception {
     // suppress assignment of tablets to the server
     if (force) {
-      ZooReaderWriter zoo = manager.getContext().getZooReaderWriter();
+      ZooReaderWriter zoo = manager.getContext().getZooSession().asReaderWriter();
       var path =
           manager.getContext().getServerPaths().createTabletServerPath(resourceGroup, hostAndPort);
       ServiceLock.deleteLock(zoo, path);
diff --git a/server/manager/src/main/java/org/apache/accumulo/manager/upgrade/PreUpgradeValidation.java b/server/manager/src/main/java/org/apache/accumulo/manager/upgrade/PreUpgradeValidation.java
index 2449355dad7..aaa6e8a6c16 100644
--- a/server/manager/src/main/java/org/apache/accumulo/manager/upgrade/PreUpgradeValidation.java
+++ b/server/manager/src/main/java/org/apache/accumulo/manager/upgrade/PreUpgradeValidation.java
@@ -23,14 +23,13 @@
 import java.util.Set;
 import java.util.concurrent.atomic.AtomicBoolean;
 
-import org.apache.accumulo.core.fate.zookeeper.ZooReaderWriter;
+import org.apache.accumulo.core.zookeeper.ZooSession;
+import org.apache.accumulo.core.zookeeper.ZooSession.ZKUtil;
 import org.apache.accumulo.manager.EventCoordinator;
 import org.apache.accumulo.server.AccumuloDataVersion;
 import org.apache.accumulo.server.ServerContext;
 import org.apache.zookeeper.KeeperException;
-import org.apache.zookeeper.ZKUtil;
 import org.apache.zookeeper.ZooDefs;
-import org.apache.zookeeper.ZooKeeper;
 import org.apache.zookeeper.data.ACL;
 import org.apache.zookeeper.data.Stat;
 import org.slf4j.Logger;
@@ -61,8 +60,7 @@ public void validate(final ServerContext context, final EventCoordinator eventCo
   private void validateACLs(ServerContext context) {
 
     final AtomicBoolean aclErrorOccurred = new AtomicBoolean(false);
-    final ZooReaderWriter zrw = context.getZooReaderWriter();
-    final ZooKeeper zk = zrw.getZooKeeper();
+    final ZooSession zk = context.getZooSession();
     final String rootPath = context.getZooKeeperRoot();
     final Set<String> users = Set.of("accumulo", "anyone");
 
diff --git a/server/manager/src/main/java/org/apache/accumulo/manager/upgrade/UpgradeCoordinator.java b/server/manager/src/main/java/org/apache/accumulo/manager/upgrade/UpgradeCoordinator.java
index 611f035491f..13a8e8f67d6 100644
--- a/server/manager/src/main/java/org/apache/accumulo/manager/upgrade/UpgradeCoordinator.java
+++ b/server/manager/src/main/java/org/apache/accumulo/manager/upgrade/UpgradeCoordinator.java
@@ -319,8 +319,8 @@ private void abortIfFateTransactions(ServerContext context) {
       // as tablets are not assigned when this is called. The Fate code is not used to read from
       // zookeeper below because the serialization format changed in zookeeper, that is why a direct
       // read is performed.
-      if (!context.getZooReader().getChildren(context.getZooKeeperRoot() + Constants.ZFATE)
-          .isEmpty()) {
+      if (!context.getZooSession().asReader()
+          .getChildren(context.getZooKeeperRoot() + Constants.ZFATE).isEmpty()) {
         throw new AccumuloException("Aborting upgrade because there are"
             + " outstanding FATE transactions from a previous Accumulo version."
             + " You can start the tservers and then use the shell to delete completed "
diff --git a/server/manager/src/main/java/org/apache/accumulo/manager/upgrade/Upgrader10to11.java b/server/manager/src/main/java/org/apache/accumulo/manager/upgrade/Upgrader10to11.java
index 4629f4842ac..236e229e341 100644
--- a/server/manager/src/main/java/org/apache/accumulo/manager/upgrade/Upgrader10to11.java
+++ b/server/manager/src/main/java/org/apache/accumulo/manager/upgrade/Upgrader10to11.java
@@ -79,7 +79,7 @@ public Upgrader10to11() {
   public void upgradeZookeeper(final ServerContext context) {
     log.info("upgrade of ZooKeeper entries");
 
-    var zrw = context.getZooReaderWriter();
+    var zrw = context.getZooSession().asReaderWriter();
     var iid = context.getInstanceID();
 
     // if the replication base path (../tables/+rep) assume removed or never existed.
diff --git a/server/manager/src/main/java/org/apache/accumulo/manager/upgrade/Upgrader11to12.java b/server/manager/src/main/java/org/apache/accumulo/manager/upgrade/Upgrader11to12.java
index ca3e72dc536..89a0713ff0b 100644
--- a/server/manager/src/main/java/org/apache/accumulo/manager/upgrade/Upgrader11to12.java
+++ b/server/manager/src/main/java/org/apache/accumulo/manager/upgrade/Upgrader11to12.java
@@ -104,7 +104,7 @@ public void upgradeZookeeper(@NonNull ServerContext context) {
     var rootBase = zooRoot + ZROOT_TABLET;
 
     try {
-      var zrw = context.getZooReaderWriter();
+      var zrw = context.getZooSession().asReaderWriter();
 
       // clean up nodes no longer in use
       zrw.recursiveDelete(zooRoot + ZTRACERS, ZooUtil.NodeMissingPolicy.SKIP);
@@ -308,16 +308,17 @@ public void createScanServerRefTable(ServerContext context) {
   private void removeZKProblemReports(ServerContext context) {
     String zpath = context.getZooKeeperRoot() + ZPROBLEMS;
     try {
-      if (!context.getZooReaderWriter().exists(zpath)) {
+      if (!context.getZooSession().asReaderWriter().exists(zpath)) {
         // could be running a second time and the node was already deleted
         return;
       }
-      var children = context.getZooReaderWriter().getChildren(zpath);
+      var children = context.getZooSession().asReaderWriter().getChildren(zpath);
       for (var child : children) {
         var pr = ProblemReport.decodeZooKeeperEntry(context, child);
         logProblemDeletion(pr);
       }
-      context.getZooReaderWriter().recursiveDelete(zpath, ZooUtil.NodeMissingPolicy.SKIP);
+      context.getZooSession().asReaderWriter().recursiveDelete(zpath,
+          ZooUtil.NodeMissingPolicy.SKIP);
     } catch (Exception e) {
       throw new IllegalStateException(e);
     }
@@ -421,7 +422,7 @@ static ProblemReport decodeZooKeeperEntry(ServerContext context, String node)
       String resource = dis.readUTF();
 
       String zpath = context.getZooKeeperRoot() + ZPROBLEMS + "/" + node;
-      byte[] enc = context.getZooReaderWriter().getData(zpath);
+      byte[] enc = context.getZooSession().asReaderWriter().getData(zpath);
 
       return new ProblemReport(tableId, ProblemType.valueOf(problemType), resource, enc);
 
diff --git a/server/manager/src/main/java/org/apache/accumulo/manager/upgrade/Upgrader12to13.java b/server/manager/src/main/java/org/apache/accumulo/manager/upgrade/Upgrader12to13.java
index 91dea17cd22..d2d73dd6364 100644
--- a/server/manager/src/main/java/org/apache/accumulo/manager/upgrade/Upgrader12to13.java
+++ b/server/manager/src/main/java/org/apache/accumulo/manager/upgrade/Upgrader12to13.java
@@ -118,7 +118,7 @@ public void upgradeMetadata(ServerContext context) {
 
   private static void addCompactionsNode(ServerContext context) {
     try {
-      context.getZooReaderWriter().putPersistentData(
+      context.getZooSession().asReaderWriter().putPersistentData(
           ZooUtil.getRoot(context.getInstanceID()) + Constants.ZCOMPACTIONS, new byte[0],
           ZooUtil.NodeExistsPolicy.SKIP);
     } catch (KeeperException | InterruptedException e) {
@@ -152,7 +152,7 @@ private void removeCompactColumnsFromRootTabletMetadata(ServerContext context) {
     var rootBase = ZooUtil.getRoot(context.getInstanceID()) + ZROOT_TABLET;
 
     try {
-      var zrw = context.getZooReaderWriter();
+      var zrw = context.getZooSession().asReaderWriter();
       Stat stat = new Stat();
       byte[] rootData = zrw.getData(rootBase, stat);
 
@@ -245,7 +245,7 @@ private void removeBulkFileColumnsFromTable(ServerContext context, String tableN
   private void removeUnusedZKNodes(ServerContext context) {
     try {
       final String zkRoot = ZooUtil.getRoot(context.getInstanceID());
-      final var zrw = context.getZooReaderWriter();
+      final var zrw = context.getZooSession().asReaderWriter();
 
       final String ZCOORDINATOR = "/coordinators";
       final String BULK_ARBITRATOR_TYPE = "bulkTx";
@@ -356,7 +356,7 @@ private void validateEmptyZKWorkerServerPaths(ServerContext context) {
     // are empty. This means that for the Accumulo 4.0 upgrade, the Manager
     // should be started first before any other process.
     final String zkRoot = ZooUtil.getRoot(context.getInstanceID());
-    final ZooReader zr = context.getZooReader();
+    final ZooReader zr = context.getZooSession().asReader();
     for (String serverPath : new String[] {Constants.ZCOMPACTORS, Constants.ZSSERVERS,
         Constants.ZTSERVERS, Constants.ZDEADTSERVERS}) {
       try {
diff --git a/server/manager/src/test/java/org/apache/accumulo/manager/compaction/queue/CompactionJobPriorityQueueTest.java b/server/manager/src/test/java/org/apache/accumulo/manager/compaction/queue/CompactionJobPriorityQueueTest.java
index 37213cdc488..01c18798754 100644
--- a/server/manager/src/test/java/org/apache/accumulo/manager/compaction/queue/CompactionJobPriorityQueueTest.java
+++ b/server/manager/src/test/java/org/apache/accumulo/manager/compaction/queue/CompactionJobPriorityQueueTest.java
@@ -74,7 +74,7 @@ public void testTabletFileReplacement() {
 
     EasyMock.replay(tm, cj1, cj2);
 
-    CompactionJobPriorityQueue queue = new CompactionJobPriorityQueue(GROUP, 2);
+    CompactionJobPriorityQueue queue = new CompactionJobPriorityQueue(GROUP, 2, mj -> 1);
     assertEquals(1, queue.add(tm, List.of(cj1), 1L));
 
     MetaJob job = queue.peek();
@@ -129,7 +129,7 @@ public void testAddEqualToMaxSize() {
 
     EasyMock.replay(tm, cj1, cj2);
 
-    CompactionJobPriorityQueue queue = new CompactionJobPriorityQueue(GROUP, 2);
+    CompactionJobPriorityQueue queue = new CompactionJobPriorityQueue(GROUP, 2, mj -> 1);
     assertEquals(2, queue.add(tm, List.of(cj1, cj2), 1L));
 
     EasyMock.verify(tm, cj1, cj2);
@@ -186,7 +186,7 @@ public void testAddMoreThanMax() {
 
     EasyMock.replay(tm, cj1, cj2, cj3);
 
-    CompactionJobPriorityQueue queue = new CompactionJobPriorityQueue(GROUP, 2);
+    CompactionJobPriorityQueue queue = new CompactionJobPriorityQueue(GROUP, 2, mj -> 1);
     assertEquals(2, queue.add(tm, List.of(cj1, cj2, cj3), 1L));
 
     EasyMock.verify(tm, cj1, cj2, cj3);
@@ -247,7 +247,7 @@ public void test() {
 
     TreeSet<CompactionJob> expected = new TreeSet<>(CompactionJobPrioritizer.JOB_COMPARATOR);
 
-    CompactionJobPriorityQueue queue = new CompactionJobPriorityQueue(GROUP, 100);
+    CompactionJobPriorityQueue queue = new CompactionJobPriorityQueue(GROUP, 1000, mj -> 10);
 
     // create and add 1000 jobs
     for (int x = 0; x < 1000; x++) {
@@ -256,7 +256,7 @@ public void test() {
       expected.add(pair.getSecond());
     }
 
-    assertEquals(100, queue.getMaxSize());
+    assertEquals(1000, queue.getMaxSize());
     assertEquals(100, queue.getQueuedJobs());
     assertEquals(900, queue.getRejectedJobs());
     // There should be 1000 total job ages even though 900 were rejected
@@ -268,7 +268,7 @@ public void test() {
     assertTrue(stats.getMaxAge().toMillis() > 0);
     assertTrue(stats.getAvgAge().toMillis() > 0);
 
-    // iterate over the expected set and make sure that they next job in the queue
+    // iterate over the expected set and make sure that the next job in the queue
     // matches
     int matchesSeen = 0;
     for (CompactionJob expectedJob : expected) {
@@ -312,7 +312,7 @@ public void test() {
    */
   @Test
   public void testAsyncCancelCleanup() {
-    CompactionJobPriorityQueue queue = new CompactionJobPriorityQueue(GROUP, 100);
+    CompactionJobPriorityQueue queue = new CompactionJobPriorityQueue(GROUP, 100, mj -> 1);
 
     List<CompletableFuture<MetaJob>> futures = new ArrayList<>();
 
@@ -342,7 +342,7 @@ public void testAsyncCancelCleanup() {
 
   @Test
   public void testChangeMaxSize() {
-    CompactionJobPriorityQueue queue = new CompactionJobPriorityQueue(GROUP, 100);
+    CompactionJobPriorityQueue queue = new CompactionJobPriorityQueue(GROUP, 100, mj -> 1);
     assertEquals(100, queue.getMaxSize());
     queue.setMaxSize(50);
     assertEquals(50, queue.getMaxSize());
@@ -351,5 +351,4 @@ public void testChangeMaxSize() {
     // Make sure previous value was not changed after invalid setting
     assertEquals(50, queue.getMaxSize());
   }
-
 }
diff --git a/server/manager/src/test/java/org/apache/accumulo/manager/compaction/queue/CompactionJobQueuesTest.java b/server/manager/src/test/java/org/apache/accumulo/manager/compaction/queue/CompactionJobQueuesTest.java
index 3d8933fa386..f63e56cc490 100644
--- a/server/manager/src/test/java/org/apache/accumulo/manager/compaction/queue/CompactionJobQueuesTest.java
+++ b/server/manager/src/test/java/org/apache/accumulo/manager/compaction/queue/CompactionJobQueuesTest.java
@@ -81,7 +81,7 @@ public void testFullScanHandling() throws Exception {
     var cg2 = CompactorGroupId.of("CG2");
     var cg3 = CompactorGroupId.of("CG3");
 
-    CompactionJobQueues jobQueues = new CompactionJobQueues(100);
+    CompactionJobQueues jobQueues = new CompactionJobQueues(1000000);
 
     jobQueues.beginFullScan(DataLevel.USER);
 
@@ -247,7 +247,7 @@ public void testFullScanLevels() throws Exception {
 
     var cg1 = CompactorGroupId.of("CG1");
 
-    CompactionJobQueues jobQueues = new CompactionJobQueues(100);
+    CompactionJobQueues jobQueues = new CompactionJobQueues(1000000);
 
     jobQueues.add(tm1, List.of(newJob((short) 1, 5, cg1)));
     jobQueues.add(tm2, List.of(newJob((short) 2, 6, cg1)));
@@ -283,7 +283,7 @@ public void testAddPollRaceCondition() throws Exception {
 
     final int numToAdd = 100_000;
 
-    CompactionJobQueues jobQueues = new CompactionJobQueues(numToAdd + 1);
+    CompactionJobQueues jobQueues = new CompactionJobQueues(10000000);
     CompactorGroupId[] groups =
         Stream.of("G1", "G2", "G3").map(CompactorGroupId::of).toArray(CompactorGroupId[]::new);
 
@@ -342,7 +342,7 @@ public void testAddPollRaceCondition() throws Exception {
 
   @Test
   public void testGetAsync() throws Exception {
-    CompactionJobQueues jobQueues = new CompactionJobQueues(100);
+    CompactionJobQueues jobQueues = new CompactionJobQueues(1000000);
 
     var tid = TableId.of("1");
     var extent1 = new KeyExtent(tid, new Text("z"), new Text("q"));
diff --git a/server/manager/src/test/java/org/apache/accumulo/manager/compaction/queue/SizeTrackingTreeMapTest.java b/server/manager/src/test/java/org/apache/accumulo/manager/compaction/queue/SizeTrackingTreeMapTest.java
new file mode 100644
index 00000000000..384363228f0
--- /dev/null
+++ b/server/manager/src/test/java/org/apache/accumulo/manager/compaction/queue/SizeTrackingTreeMapTest.java
@@ -0,0 +1,113 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.accumulo.manager.compaction.queue;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.NoSuchElementException;
+import java.util.TreeMap;
+
+import org.junit.jupiter.api.Test;
+
+public class SizeTrackingTreeMapTest {
+  @Test
+  public void testSizeTracking() {
+    List<String> computeSizeCalls = new ArrayList<>();
+    var stmap = new SizeTrackingTreeMap<Integer,String>(val -> {
+      computeSizeCalls.add(val);
+      return val.length();
+    });
+
+    TreeMap<Integer,String> expected = new TreeMap<>();
+
+    check(expected, stmap);
+    assertEquals(List.of(), computeSizeCalls);
+
+    stmap.put(3, "1234567890");
+    expected.put(3, "1234567890");
+    check(expected, stmap);
+    assertEquals(List.of("1234567890"), computeSizeCalls);
+
+    stmap.put(4, "12345");
+    expected.put(4, "12345");
+    check(expected, stmap);
+    assertEquals(List.of("1234567890", "12345"), computeSizeCalls);
+
+    // remove a key that does not exist
+    stmap.remove(2);
+    expected.remove(2);
+    check(expected, stmap);
+    assertEquals(List.of("1234567890", "12345"), computeSizeCalls);
+
+    // remove a key that does exist
+    stmap.remove(3);
+    expected.remove(3);
+    check(expected, stmap);
+    assertEquals(List.of("1234567890", "12345"), computeSizeCalls);
+
+    // update an existing key, should decrement the old size and increment the new size
+    stmap.put(4, "123");
+    expected.put(4, "123");
+    check(expected, stmap);
+    assertEquals(List.of("1234567890", "12345", "123"), computeSizeCalls);
+
+    stmap.put(7, "123456789012345");
+    expected.put(7, "123456789012345");
+    check(expected, stmap);
+    assertEquals(List.of("1234567890", "12345", "123", "123456789012345"), computeSizeCalls);
+
+    stmap.put(11, "1234567");
+    expected.put(11, "1234567");
+    check(expected, stmap);
+    assertEquals(List.of("1234567890", "12345", "123", "123456789012345", "1234567"),
+        computeSizeCalls);
+
+    assertEquals(expected.pollFirstEntry(), stmap.pollFirstEntry());
+    check(expected, stmap);
+    assertEquals(List.of("1234567890", "12345", "123", "123456789012345", "1234567"),
+        computeSizeCalls);
+
+    assertEquals(expected.pollLastEntry(), stmap.pollLastEntry());
+    check(expected, stmap);
+    assertEquals(List.of("1234567890", "12345", "123", "123456789012345", "1234567"),
+        computeSizeCalls);
+
+    expected.clear();
+    stmap.clear();
+    check(expected, stmap);
+    assertEquals(List.of("1234567890", "12345", "123", "123456789012345", "1234567"),
+        computeSizeCalls);
+  }
+
+  private void check(TreeMap<Integer,String> expected, SizeTrackingTreeMap<Integer,String> stmap) {
+    long expectedDataSize = expected.values().stream().mapToLong(String::length).sum();
+    assertEquals(expectedDataSize, stmap.dataSize());
+    assertEquals(expected.size(), stmap.entrySize());
+    assertEquals(expected.isEmpty(), stmap.isEmpty());
+    assertEquals(expected.firstEntry(), stmap.firstEntry());
+    if (expected.isEmpty()) {
+      assertThrows(NoSuchElementException.class, stmap::lastKey);
+    } else {
+      assertEquals(expected.lastKey(), stmap.lastKey());
+    }
+  }
+}
diff --git a/server/manager/src/test/java/org/apache/accumulo/manager/tableOps/compact/CompactionDriverTest.java b/server/manager/src/test/java/org/apache/accumulo/manager/tableOps/compact/CompactionDriverTest.java
index 11ca402c887..c95dcd9ad6a 100644
--- a/server/manager/src/test/java/org/apache/accumulo/manager/tableOps/compact/CompactionDriverTest.java
+++ b/server/manager/src/test/java/org/apache/accumulo/manager/tableOps/compact/CompactionDriverTest.java
@@ -37,115 +37,82 @@
 import org.apache.accumulo.core.fate.FateId;
 import org.apache.accumulo.core.fate.FateInstanceType;
 import org.apache.accumulo.core.fate.zookeeper.ZooReaderWriter;
+import org.apache.accumulo.core.zookeeper.ZooSession;
 import org.apache.accumulo.manager.Manager;
 import org.apache.accumulo.manager.tableOps.delete.PreDeleteTable;
 import org.apache.accumulo.server.ServerContext;
-import org.apache.zookeeper.KeeperException;
+import org.apache.zookeeper.data.Stat;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
 public class CompactionDriverTest {
 
-  public static class CancelledCompactionDriver extends CompactionDriver {
+  private static final InstanceId instance = InstanceId.of(UUID.randomUUID());
+  private static final TableId tableId = TableId.of("testTable");
 
+  private static class CompactionTestDriver extends CompactionDriver {
     private static final long serialVersionUID = 1L;
+    private final boolean cancelled;
 
-    public CancelledCompactionDriver(NamespaceId namespaceId, TableId tableId, byte[] startRow,
-        byte[] endRow) {
-      super(namespaceId, tableId, startRow, endRow);
+    static CompactionDriver cancelled() {
+      return new CompactionTestDriver(true);
     }
 
-    @Override
-    protected boolean isCancelled(FateId fateId, ServerContext context)
-        throws InterruptedException, KeeperException {
-      return true;
+    static CompactionDriver notCancelled() {
+      return new CompactionTestDriver(false);
     }
 
-  }
-
-  public static class NotCancelledCompactionDriver extends CompactionDriver {
-
-    private static final long serialVersionUID = 1L;
-
-    public NotCancelledCompactionDriver(NamespaceId namespaceId, TableId tableId, byte[] startRow,
-        byte[] endRow) {
-      super(namespaceId, tableId, startRow, endRow);
+    private CompactionTestDriver(boolean cancelled) {
+      super(NamespaceId.of("testNamespace"), tableId, new byte[0], new byte[0]);
+      this.cancelled = cancelled;
     }
 
     @Override
-    protected boolean isCancelled(FateId fateId, ServerContext context)
-        throws InterruptedException, KeeperException {
-      return false;
+    protected boolean isCancelled(FateId fateId, ServerContext context) {
+      return cancelled;
     }
-
   }
 
-  @Test
-  public void testCancelId() throws Exception {
-
-    final InstanceId instance = InstanceId.of(UUID.randomUUID());
-    final NamespaceId namespaceId = NamespaceId.of("13");
-    final TableId tableId = TableId.of("42");
-    final FateId compactionFateId = FateId.from(FateInstanceType.USER, UUID.randomUUID());
-    final byte[] startRow = new byte[0];
-    final byte[] endRow = new byte[0];
+  private Manager manager;
+  private ServerContext ctx;
+  private ZooSession zk;
 
-    Manager manager = createMock(Manager.class);
-    ServerContext ctx = createMock(ServerContext.class);
-    ZooReaderWriter zrw = createMock(ZooReaderWriter.class);
+  @BeforeEach
+  public void setup() {
+    manager = createMock(Manager.class);
+    ctx = createMock(ServerContext.class);
+    zk = createMock(ZooSession.class);
     expect(ctx.getInstanceID()).andReturn(instance).anyTimes();
-    expect(ctx.getZooReaderWriter()).andReturn(zrw).anyTimes();
+    expect(ctx.getZooSession()).andReturn(zk).anyTimes();
+    expect(zk.asReaderWriter()).andReturn(new ZooReaderWriter(zk)).anyTimes();
     expect(manager.getContext()).andReturn(ctx).anyTimes();
+  }
 
-    replay(manager, ctx, zrw);
-
-    final CancelledCompactionDriver driver =
-        new CancelledCompactionDriver(namespaceId, tableId, startRow, endRow);
-
-    var e = assertThrows(AcceptableThriftTableOperationException.class,
-        () -> driver.isReady(compactionFateId, manager));
-
-    assertEquals(e.getTableId(), tableId.toString());
-    assertEquals(e.getOp(), TableOperation.COMPACT);
-    assertEquals(e.getType(), TableOperationExceptionType.OTHER);
-    assertEquals(TableOperationsImpl.COMPACTION_CANCELED_MSG, e.getDescription());
+  @AfterEach
+  public void teardown() {
+    verify(manager, ctx, zk);
+  }
 
-    verify(manager, ctx, zrw);
+  @Test
+  public void testCancelId() throws Exception {
+    runDriver(CompactionTestDriver.cancelled(), TableOperationsImpl.COMPACTION_CANCELED_MSG);
   }
 
   @Test
   public void testTableBeingDeleted() throws Exception {
-
-    final InstanceId instance = InstanceId.of(UUID.randomUUID());
-    final NamespaceId namespaceId = NamespaceId.of("14");
-    final TableId tableId = TableId.of("43");
-    final FateId compactionFateId = FateId.from(FateInstanceType.USER, UUID.randomUUID());
-    final byte[] startRow = new byte[0];
-    final byte[] endRow = new byte[0];
-
-    Manager manager = createMock(Manager.class);
-    ServerContext ctx = createMock(ServerContext.class);
-    ZooReaderWriter zrw = createMock(ZooReaderWriter.class);
-    expect(ctx.getInstanceID()).andReturn(instance).anyTimes();
-    expect(ctx.getZooReaderWriter()).andReturn(zrw).anyTimes();
-    expect(manager.getContext()).andReturn(ctx).anyTimes();
-
     String deleteMarkerPath = PreDeleteTable.createDeleteMarkerPath(instance, tableId);
-    expect(zrw.exists(deleteMarkerPath)).andReturn(true);
-
-    replay(manager, ctx, zrw);
-
-    final NotCancelledCompactionDriver driver =
-        new NotCancelledCompactionDriver(namespaceId, tableId, startRow, endRow);
+    expect(zk.exists(deleteMarkerPath, null)).andReturn(new Stat());
+    runDriver(CompactionTestDriver.notCancelled(), TableOperationsImpl.TABLE_DELETED_MSG);
+  }
 
+  private void runDriver(CompactionDriver driver, String expectedMessage) {
+    replay(manager, ctx, zk);
     var e = assertThrows(AcceptableThriftTableOperationException.class,
-        () -> driver.isReady(compactionFateId, manager));
-
+        () -> driver.isReady(FateId.from(FateInstanceType.USER, UUID.randomUUID()), manager));
     assertEquals(e.getTableId(), tableId.toString());
     assertEquals(e.getOp(), TableOperation.COMPACT);
     assertEquals(e.getType(), TableOperationExceptionType.OTHER);
-    assertEquals(TableOperationsImpl.TABLE_DELETED_MSG, e.getDescription());
-
-    verify(manager, ctx, zrw);
+    assertEquals(expectedMessage, e.getDescription());
   }
-
 }
diff --git a/server/manager/src/test/java/org/apache/accumulo/manager/tableOps/merge/MergeTabletsTest.java b/server/manager/src/test/java/org/apache/accumulo/manager/tableOps/merge/MergeTabletsTest.java
index 76a475105e6..08d951e21f7 100644
--- a/server/manager/src/test/java/org/apache/accumulo/manager/tableOps/merge/MergeTabletsTest.java
+++ b/server/manager/src/test/java/org/apache/accumulo/manager/tableOps/merge/MergeTabletsTest.java
@@ -32,6 +32,7 @@
 import static org.apache.accumulo.core.metadata.schema.TabletMetadata.ColumnType.LOADED;
 import static org.apache.accumulo.core.metadata.schema.TabletMetadata.ColumnType.LOCATION;
 import static org.apache.accumulo.core.metadata.schema.TabletMetadata.ColumnType.LOGS;
+import static org.apache.accumulo.core.metadata.schema.TabletMetadata.ColumnType.MERGEABILITY;
 import static org.apache.accumulo.core.metadata.schema.TabletMetadata.ColumnType.MERGED;
 import static org.apache.accumulo.core.metadata.schema.TabletMetadata.ColumnType.OPID;
 import static org.apache.accumulo.core.metadata.schema.TabletMetadata.ColumnType.PREV_ROW;
@@ -73,6 +74,7 @@
 import org.apache.accumulo.core.metadata.schema.ExternalCompactionId;
 import org.apache.accumulo.core.metadata.schema.MetadataTime;
 import org.apache.accumulo.core.metadata.schema.SelectedFiles;
+import org.apache.accumulo.core.metadata.schema.TabletMergeabilityMetadata;
 import org.apache.accumulo.core.metadata.schema.TabletMetadata;
 import org.apache.accumulo.core.metadata.schema.TabletMetadataBuilder;
 import org.apache.accumulo.core.metadata.schema.TabletOperationId;
@@ -110,7 +112,7 @@ public class MergeTabletsTest {
   private static final Set<TabletMetadata.ColumnType> COLUMNS_HANDLED_BY_MERGE =
       EnumSet.of(TIME, LOGS, FILES, PREV_ROW, OPID, LOCATION, ECOMP, SELECTED, LOADED,
           USER_COMPACTION_REQUESTED, MERGED, LAST, SCANS, DIR, CLONED, FLUSH_ID, FLUSH_NONCE,
-          SUSPEND, AVAILABILITY, HOSTING_REQUESTED, COMPACTED, UNSPLITTABLE);
+          SUSPEND, AVAILABILITY, HOSTING_REQUESTED, COMPACTED, UNSPLITTABLE, MERGEABILITY);
 
   /**
    * The purpose of this test is to catch new tablet metadata columns that were added w/o
@@ -150,15 +152,18 @@ public void testManyColumns() throws Exception {
     var availability = TabletAvailability.HOSTED;
     var lastLocation = TabletMetadata.Location.last("1.2.3.4:1234", "123456789");
     var suspendingTServer = SuspendingTServer.fromValue(new Value("1.2.3.4:5|56"));
-
-    var tablet1 = TabletMetadata.builder(ke1).putOperation(opid).putDirName("td1")
-        .putFile(file3, dfv3).putTime(MetadataTime.parse("L3"))
-        .putTabletAvailability(TabletAvailability.HOSTED).build(LOCATION, LOGS, FILES, ECOMP,
-            MERGED, COMPACTED, SELECTED, USER_COMPACTION_REQUESTED, LOADED, CLONED);
-    var tablet2 = TabletMetadata.builder(ke2).putOperation(opid).putDirName("td2")
-        .putFile(file4, dfv4).putTime(MetadataTime.parse("L2"))
-        .putTabletAvailability(TabletAvailability.HOSTED).build(LOCATION, LOGS, FILES, ECOMP,
-            MERGED, COMPACTED, SELECTED, USER_COMPACTION_REQUESTED, LOADED, CLONED);
+    var mergeability = TabletMergeabilityMetadata.always(SteadyTime.from(1, TimeUnit.SECONDS));
+
+    var tablet1 =
+        TabletMetadata.builder(ke1).putOperation(opid).putDirName("td1").putFile(file3, dfv3)
+            .putTime(MetadataTime.parse("L3")).putTabletAvailability(TabletAvailability.HOSTED)
+            .putTabletMergeability(mergeability).build(LOCATION, LOGS, FILES, ECOMP, MERGED,
+                COMPACTED, SELECTED, USER_COMPACTION_REQUESTED, LOADED, CLONED);
+    var tablet2 =
+        TabletMetadata.builder(ke2).putOperation(opid).putDirName("td2").putFile(file4, dfv4)
+            .putTime(MetadataTime.parse("L2")).putTabletAvailability(TabletAvailability.HOSTED)
+            .putTabletMergeability(mergeability).build(LOCATION, LOGS, FILES, ECOMP, MERGED,
+                COMPACTED, SELECTED, USER_COMPACTION_REQUESTED, LOADED, CLONED);
 
     var tabletFiles = Map.of(file1, dfv1, file2, dfv2);
 
@@ -193,6 +198,7 @@ public void testManyColumns() throws Exception {
     EasyMock.expect(lastTabletMeta.getSuspend()).andReturn(suspendingTServer).atLeastOnce();
     EasyMock.expect(lastTabletMeta.getLast()).andReturn(lastLocation).atLeastOnce();
     EasyMock.expect(lastTabletMeta.getUnSplittable()).andReturn(unsplittableMeta).atLeastOnce();
+    EasyMock.expect(lastTabletMeta.getTabletMergeability()).andReturn(mergeability).atLeastOnce();
 
     EasyMock.replay(lastTabletMeta, compactions);
 
@@ -228,6 +234,10 @@ public void testManyColumns() throws Exception {
       EasyMock.expect(tabletMutator.deleteSuspension()).andReturn(tabletMutator);
       EasyMock.expect(tabletMutator.deleteLocation(lastLocation)).andReturn(tabletMutator);
       EasyMock.expect(tabletMutator.deleteUnSplittable()).andReturn(tabletMutator);
+      EasyMock
+          .expect(tabletMutator.putTabletMergeability(
+              TabletMergeabilityMetadata.always(SteadyTime.from(1, TimeUnit.SECONDS))))
+          .andReturn(tabletMutator).once();
 
     });
 
@@ -376,17 +386,17 @@ public void testTime() throws Exception {
           .putTime(MetadataTime.parse(times[0])).putTabletAvailability(TabletAvailability.HOSTED)
           .build(LOCATION, LOGS, FILES, ECOMP, MERGED, COMPACTED, SELECTED,
               USER_COMPACTION_REQUESTED, LOADED, CLONED, SCANS, HOSTING_REQUESTED, SUSPEND, LAST,
-              UNSPLITTABLE);
+              UNSPLITTABLE, MERGEABILITY);
       var tablet2 = TabletMetadata.builder(ke2).putOperation(opid).putDirName("td2")
           .putTime(MetadataTime.parse(times[1])).putTabletAvailability(TabletAvailability.HOSTED)
           .build(LOCATION, LOGS, FILES, ECOMP, MERGED, COMPACTED, SELECTED,
               USER_COMPACTION_REQUESTED, LOADED, CLONED, SCANS, HOSTING_REQUESTED, SUSPEND, LAST,
-              UNSPLITTABLE);
+              UNSPLITTABLE, MERGEABILITY);
       var tablet3 = TabletMetadata.builder(ke3).putOperation(opid).putDirName("td3")
           .putTime(MetadataTime.parse(times[2])).putTabletAvailability(TabletAvailability.HOSTED)
           .build(LOCATION, LOGS, FILES, ECOMP, MERGED, COMPACTED, SELECTED,
               USER_COMPACTION_REQUESTED, LOADED, CLONED, SCANS, HOSTING_REQUESTED, SUSPEND, LAST,
-              UNSPLITTABLE);
+              UNSPLITTABLE, MERGEABILITY);
 
       testMerge(List.of(tablet1, tablet2, tablet3), tableId, null, null, tabletMutator -> {
         EasyMock.expect(tabletMutator.putTime(MetadataTime.parse("L30"))).andReturn(tabletMutator)
@@ -396,6 +406,9 @@ public void testTime() throws Exception {
         EasyMock.expect(tabletMutator.putPrevEndRow(ke1.prevEndRow())).andReturn(tabletMutator)
             .once();
         EasyMock.expect(tabletMutator.setMerged()).andReturn(tabletMutator).once();
+        // Current default if not set is NEVER
+        EasyMock.expect(tabletMutator.putTabletMergeability(TabletMergeabilityMetadata.never()))
+            .andReturn(tabletMutator).once();
       });
     }
 
@@ -447,7 +460,7 @@ private static void testMerge(List<TabletMetadata> inputTablets, TableId tableId
     EasyMock.expectLastCall().once();
 
     // setup processing of conditional mutations
-    Ample.ConditionalResult cr = EasyMock.niceMock(Ample.ConditionalResult.class);
+    Ample.ConditionalResult cr = EasyMock.createMock(Ample.ConditionalResult.class);
     EasyMock.expect(cr.getStatus()).andReturn(Ample.ConditionalResult.Status.ACCEPTED)
         .atLeastOnce();
     EasyMock.expect(tabletsMutator.process()).andReturn(Map.of(lastExtent, cr)).atLeastOnce();
diff --git a/server/manager/src/test/java/org/apache/accumulo/manager/tableOps/split/UpdateTabletsTest.java b/server/manager/src/test/java/org/apache/accumulo/manager/tableOps/split/UpdateTabletsTest.java
index a317f8375a9..41f9824b7ce 100644
--- a/server/manager/src/test/java/org/apache/accumulo/manager/tableOps/split/UpdateTabletsTest.java
+++ b/server/manager/src/test/java/org/apache/accumulo/manager/tableOps/split/UpdateTabletsTest.java
@@ -31,6 +31,7 @@
 import java.util.SortedSet;
 import java.util.TreeSet;
 import java.util.UUID;
+import java.util.concurrent.TimeUnit;
 
 import org.apache.accumulo.core.client.admin.TabletAvailability;
 import org.apache.accumulo.core.data.TableId;
@@ -49,12 +50,14 @@
 import org.apache.accumulo.core.metadata.schema.ExternalCompactionId;
 import org.apache.accumulo.core.metadata.schema.MetadataTime;
 import org.apache.accumulo.core.metadata.schema.SelectedFiles;
+import org.apache.accumulo.core.metadata.schema.TabletMergeabilityMetadata;
 import org.apache.accumulo.core.metadata.schema.TabletMetadata;
 import org.apache.accumulo.core.metadata.schema.TabletMetadata.ColumnType;
 import org.apache.accumulo.core.metadata.schema.TabletOperationId;
 import org.apache.accumulo.core.metadata.schema.TabletOperationType;
 import org.apache.accumulo.core.metadata.schema.UnSplittableMetadata;
 import org.apache.accumulo.core.tabletserver.log.LogEntry;
+import org.apache.accumulo.core.util.time.SteadyTime;
 import org.apache.accumulo.manager.Manager;
 import org.apache.accumulo.manager.split.Splitter;
 import org.apache.accumulo.server.ServerContext;
@@ -83,13 +86,13 @@ Splitter.FileInfo newFileInfo(String start, String end) {
    * developer has determined that split code can handle that column OR has opened an issue about
    * handling it.
    */
-  private static final Set<ColumnType> COLUMNS_HANDLED_BY_SPLIT =
-      EnumSet.of(ColumnType.TIME, ColumnType.LOGS, ColumnType.FILES, ColumnType.PREV_ROW,
-          ColumnType.OPID, ColumnType.LOCATION, ColumnType.ECOMP, ColumnType.SELECTED,
-          ColumnType.LOADED, ColumnType.USER_COMPACTION_REQUESTED, ColumnType.MERGED,
-          ColumnType.LAST, ColumnType.SCANS, ColumnType.DIR, ColumnType.CLONED, ColumnType.FLUSH_ID,
-          ColumnType.FLUSH_NONCE, ColumnType.SUSPEND, ColumnType.AVAILABILITY,
-          ColumnType.HOSTING_REQUESTED, ColumnType.COMPACTED, ColumnType.UNSPLITTABLE);
+  private static final Set<ColumnType> COLUMNS_HANDLED_BY_SPLIT = EnumSet.of(ColumnType.TIME,
+      ColumnType.LOGS, ColumnType.FILES, ColumnType.PREV_ROW, ColumnType.OPID, ColumnType.LOCATION,
+      ColumnType.ECOMP, ColumnType.SELECTED, ColumnType.LOADED,
+      ColumnType.USER_COMPACTION_REQUESTED, ColumnType.MERGED, ColumnType.LAST, ColumnType.SCANS,
+      ColumnType.DIR, ColumnType.CLONED, ColumnType.FLUSH_ID, ColumnType.FLUSH_NONCE,
+      ColumnType.SUSPEND, ColumnType.AVAILABILITY, ColumnType.HOSTING_REQUESTED,
+      ColumnType.COMPACTED, ColumnType.UNSPLITTABLE, ColumnType.MERGEABILITY);
 
   /**
    * The purpose of this test is to catch new tablet metadata columns that were added w/o
@@ -230,6 +233,8 @@ public void testManyColumns() throws Exception {
     EasyMock.expect(splitter.getCachedFileInfo(tableId, file3)).andReturn(newFileInfo("d", "f"));
     EasyMock.expect(splitter.getCachedFileInfo(tableId, file4)).andReturn(newFileInfo("d", "j"));
     EasyMock.expect(manager.getSplitter()).andReturn(splitter).atLeastOnce();
+    EasyMock.expect(manager.getSteadyTime()).andReturn(SteadyTime.from(100_000, TimeUnit.SECONDS))
+        .atLeastOnce();
 
     ServiceLock managerLock = EasyMock.mock(ServiceLock.class);
     EasyMock.expect(context.getServiceLock()).andReturn(managerLock).anyTimes();
@@ -294,6 +299,11 @@ public void testManyColumns() throws Exception {
     EasyMock.expect(tablet1Mutator.putFile(file1, new DataFileValue(333, 33, 20)))
         .andReturn(tablet1Mutator);
     EasyMock.expect(tablet1Mutator.putFile(file2, dfv2)).andReturn(tablet1Mutator);
+    // SplitInfo marked as system generated so should be set to ALWAYS (0 delay)
+    EasyMock
+        .expect(tablet1Mutator.putTabletMergeability(
+            TabletMergeabilityMetadata.always(SteadyTime.from(100_000, TimeUnit.SECONDS))))
+        .andReturn(tablet1Mutator);
     tablet1Mutator.submit(EasyMock.anyObject());
     EasyMock.expectLastCall().once();
     EasyMock.expect(tabletsMutator.mutateTablet(newExtent1)).andReturn(tablet1Mutator);
@@ -310,6 +320,11 @@ public void testManyColumns() throws Exception {
     EasyMock.expect(tablet2Mutator.putCompacted(ucfid1)).andReturn(tablet2Mutator);
     EasyMock.expect(tablet2Mutator.putCompacted(ucfid3)).andReturn(tablet2Mutator);
     EasyMock.expect(tablet2Mutator.putTabletAvailability(availability)).andReturn(tablet2Mutator);
+    // SplitInfo marked as system generated so should be set to ALWAYS (0 delay)
+    EasyMock
+        .expect(tablet2Mutator.putTabletMergeability(
+            TabletMergeabilityMetadata.always(SteadyTime.from(100_000, TimeUnit.SECONDS))))
+        .andReturn(tablet2Mutator);
     EasyMock.expect(tablet2Mutator.putBulkFile(loaded1.getTabletFile(), flid1))
         .andReturn(tablet2Mutator);
     EasyMock.expect(tablet2Mutator.putBulkFile(loaded2.getTabletFile(), flid2))
@@ -353,7 +368,8 @@ public void testManyColumns() throws Exception {
     EasyMock.expect(tabletsMutator.mutateTablet(origExtent)).andReturn(tablet3Mutator);
 
     // setup processing of conditional mutations
-    Ample.ConditionalResult cr = EasyMock.niceMock(Ample.ConditionalResult.class);
+    Ample.ConditionalResult cr = EasyMock.createMock(Ample.ConditionalResult.class);
+    EasyMock.expect(cr.getExtent()).andReturn(origExtent).atLeastOnce();
     EasyMock.expect(cr.getStatus()).andReturn(Ample.ConditionalResult.Status.ACCEPTED)
         .atLeastOnce();
     EasyMock.expect(tabletsMutator.process())
@@ -367,7 +383,7 @@ public void testManyColumns() throws Exception {
     // the original tablet
     SortedSet<Text> splits = new TreeSet<>(List.of(newExtent1.endRow(), newExtent2.endRow()));
     UpdateTablets updateTablets =
-        new UpdateTablets(new SplitInfo(origExtent, splits), List.of(dir1, dir2));
+        new UpdateTablets(new SplitInfo(origExtent, splits, true), List.of(dir1, dir2));
     updateTablets.call(fateId, manager);
 
     EasyMock.verify(manager, context, ample, tabletMeta, splitter, tabletsMutator, tablet1Mutator,
@@ -446,7 +462,7 @@ private static void testError(KeyExtent origExtent, TabletMetadata tm1, FateId f
     // the original tablet
     SortedSet<Text> splits = new TreeSet<>(List.of(new Text("c")));
     UpdateTablets updateTablets =
-        new UpdateTablets(new SplitInfo(origExtent, splits), List.of("d1"));
+        new UpdateTablets(new SplitInfo(origExtent, splits, true), List.of("d1"));
     updateTablets.call(fateId, manager);
 
     EasyMock.verify(manager, context, ample);
diff --git a/server/manager/src/test/java/org/apache/accumulo/manager/upgrade/Upgrader10to11Test.java b/server/manager/src/test/java/org/apache/accumulo/manager/upgrade/Upgrader10to11Test.java
index 0b756f000bb..cbfb5dd32a3 100644
--- a/server/manager/src/test/java/org/apache/accumulo/manager/upgrade/Upgrader10to11Test.java
+++ b/server/manager/src/test/java/org/apache/accumulo/manager/upgrade/Upgrader10to11Test.java
@@ -38,14 +38,16 @@
 
 import org.apache.accumulo.core.data.InstanceId;
 import org.apache.accumulo.core.fate.zookeeper.ZooReaderWriter;
-import org.apache.accumulo.core.fate.zookeeper.ZooUtil;
 import org.apache.accumulo.core.manager.state.tables.TableState;
 import org.apache.accumulo.core.metadata.AccumuloTable;
+import org.apache.accumulo.core.zookeeper.ZooSession;
 import org.apache.accumulo.server.ServerContext;
 import org.apache.accumulo.server.conf.codec.VersionedProperties;
 import org.apache.accumulo.server.conf.store.PropStore;
 import org.apache.accumulo.server.conf.store.TablePropKey;
 import org.apache.zookeeper.KeeperException;
+import org.apache.zookeeper.data.Stat;
+import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.slf4j.Logger;
@@ -54,101 +56,96 @@
 class Upgrader10to11Test {
   private static final Logger log = LoggerFactory.getLogger(Upgrader10to11Test.class);
 
-  private InstanceId instanceId = null;
-  private ServerContext context = null;
-  private ZooReaderWriter zrw = null;
-
-  private PropStore propStore = null;
+  private InstanceId instanceId;
+  private ServerContext context;
+  private ZooSession zk;
+  private PropStore propStore;
 
   @BeforeEach
   public void initMocks() {
     instanceId = InstanceId.of(UUID.randomUUID());
     context = createMock(ServerContext.class);
-    zrw = createMock(ZooReaderWriter.class);
+    zk = createMock(ZooSession.class);
     propStore = createMock(PropStore.class);
 
-    expect(context.getZooReaderWriter()).andReturn(zrw).anyTimes();
+    expect(context.getZooSession()).andReturn(zk).anyTimes();
+    expect(zk.asReaderWriter()).andReturn(new ZooReaderWriter(zk)).anyTimes();
     expect(context.getInstanceID()).andReturn(instanceId).anyTimes();
   }
 
+  @AfterEach
+  public void verifyMocks() {
+    verify(context, zk, propStore);
+  }
+
   @Test
   void upgradeZooKeeperGoPath() throws Exception {
-
     expect(context.getPropStore()).andReturn(propStore).anyTimes();
-    expect(zrw.exists(buildRepTablePath(instanceId))).andReturn(true).once();
-    expect(zrw.getData(buildRepTablePath(instanceId) + ZTABLE_STATE))
+    expect(zk.exists(buildRepTablePath(instanceId), null)).andReturn(new Stat()).once();
+    expect(zk.getData(buildRepTablePath(instanceId) + ZTABLE_STATE, null, null))
         .andReturn(TableState.OFFLINE.name().getBytes(UTF_8)).once();
-    zrw.recursiveDelete(buildRepTablePath(instanceId), ZooUtil.NodeMissingPolicy.SKIP);
+    expect(zk.getChildren(buildRepTablePath(instanceId), null)).andReturn(List.of());
+    zk.delete(buildRepTablePath(instanceId), -1);
     expectLastCall().once();
 
     expect(propStore.get(TablePropKey.of(instanceId, AccumuloTable.METADATA.tableId())))
         .andReturn(new VersionedProperties()).once();
 
-    replay(context, zrw, propStore);
+    replay(context, zk, propStore);
 
     Upgrader10to11 upgrader = new Upgrader10to11();
     upgrader.upgradeZookeeper(context);
-
-    verify(context, zrw);
   }
 
   @Test
   void upgradeZookeeperNoReplTableNode() throws Exception {
-
-    expect(zrw.exists(buildRepTablePath(instanceId))).andReturn(false).once();
-    replay(context, zrw);
+    expect(zk.exists(buildRepTablePath(instanceId), null)).andReturn(null).once();
+    replay(context, zk, propStore);
 
     Upgrader10to11 upgrader = new Upgrader10to11();
     upgrader.upgradeZookeeper(context);
-
-    verify(context, zrw);
   }
 
   @Test
   void checkReplicationStateOffline() throws Exception {
 
     expect(context.getPropStore()).andReturn(propStore).anyTimes();
-    expect(zrw.exists(buildRepTablePath(instanceId))).andReturn(true).once();
-    expect(zrw.getData(buildRepTablePath(instanceId) + ZTABLE_STATE))
+    expect(zk.exists(buildRepTablePath(instanceId), null)).andReturn(new Stat()).once();
+    expect(zk.getData(buildRepTablePath(instanceId) + ZTABLE_STATE, null, null))
         .andReturn(TableState.OFFLINE.name().getBytes(UTF_8)).once();
-    zrw.recursiveDelete(buildRepTablePath(instanceId), ZooUtil.NodeMissingPolicy.SKIP);
+    expect(zk.getChildren(buildRepTablePath(instanceId), null)).andReturn(List.of());
+    zk.delete(buildRepTablePath(instanceId), -1);
     expectLastCall().once();
     expect(propStore.get(TablePropKey.of(instanceId, AccumuloTable.METADATA.tableId())))
         .andReturn(new VersionedProperties()).once();
 
-    replay(context, zrw, propStore);
+    replay(context, zk, propStore);
 
     Upgrader10to11 upgrader = new Upgrader10to11();
 
     upgrader.upgradeZookeeper(context);
-
-    verify(context, zrw);
   }
 
   @Test
   void checkReplicationStateOnline() throws Exception {
-    expect(zrw.exists(buildRepTablePath(instanceId))).andReturn(true).once();
-    expect(zrw.getData(buildRepTablePath(instanceId) + ZTABLE_STATE))
+    expect(zk.exists(buildRepTablePath(instanceId), null)).andReturn(new Stat()).once();
+    expect(zk.getData(buildRepTablePath(instanceId) + ZTABLE_STATE, null, null))
         .andReturn(TableState.ONLINE.name().getBytes(UTF_8)).anyTimes();
-    replay(context, zrw);
+    replay(context, zk, propStore);
 
     Upgrader10to11 upgrader = new Upgrader10to11();
     assertThrows(IllegalStateException.class, () -> upgrader.upgradeZookeeper(context));
-
-    verify(context, zrw);
   }
 
   @Test
   void checkReplicationStateNoNode() throws Exception {
-    expect(zrw.exists(buildRepTablePath(instanceId))).andReturn(true).once();
-    expect(zrw.getData(buildRepTablePath(instanceId) + ZTABLE_STATE))
+    expect(zk.exists(buildRepTablePath(instanceId), null)).andReturn(new Stat()).once();
+    expect(zk.getData(buildRepTablePath(instanceId) + ZTABLE_STATE, null, null))
         .andThrow(new KeeperException.NoNodeException("force no node exception")).anyTimes();
-    replay(context, zrw);
+    replay(context, zk, propStore);
 
     Upgrader10to11 upgrader = new Upgrader10to11();
     assertThrows(IllegalStateException.class, () -> upgrader.upgradeZookeeper(context));
-
-    verify(context, zrw);
   }
 
   @Test
@@ -188,5 +185,7 @@ public void filterTest() {
 
     assertEquals(6, filtered.size());
     log.info("F:{}", filtered);
+
+    replay(context, zk, propStore);
   }
 }
diff --git a/server/manager/src/test/java/org/apache/accumulo/manager/upgrade/Upgrader11to12Test.java b/server/manager/src/test/java/org/apache/accumulo/manager/upgrade/Upgrader11to12Test.java
index 4d8b8a7889d..791548916a6 100644
--- a/server/manager/src/test/java/org/apache/accumulo/manager/upgrade/Upgrader11to12Test.java
+++ b/server/manager/src/test/java/org/apache/accumulo/manager/upgrade/Upgrader11to12Test.java
@@ -43,7 +43,6 @@
 import java.util.Map;
 import java.util.TreeMap;
 import java.util.UUID;
-import java.util.function.Supplier;
 import java.util.stream.Collectors;
 
 import org.apache.accumulo.core.Constants;
@@ -63,6 +62,7 @@
 import org.apache.accumulo.core.metadata.schema.MetadataSchema.TabletsSection.ExternalCompactionColumnFamily;
 import org.apache.accumulo.core.metadata.schema.MetadataSchema.TabletsSection.LastLocationColumnFamily;
 import org.apache.accumulo.core.metadata.schema.RootTabletMetadata;
+import org.apache.accumulo.core.zookeeper.ZooSession;
 import org.apache.accumulo.server.ServerContext;
 import org.apache.hadoop.fs.Path;
 import org.apache.hadoop.io.Text;
@@ -352,11 +352,13 @@ public void upgradeZooKeeperTest() throws Exception {
     Upgrader11to12 upgrader = new Upgrader11to12();
 
     ServerContext context = createMock(ServerContext.class);
+    ZooSession zk = createStrictMock(ZooSession.class);
     ZooReaderWriter zrw = createStrictMock(ZooReaderWriter.class);
     final var zkRoot = ZooUtil.getRoot(iid);
 
     expect(context.getInstanceID()).andReturn(iid).anyTimes();
-    expect(context.getZooReaderWriter()).andReturn(zrw).anyTimes();
+    expect(context.getZooSession()).andReturn(zk).anyTimes();
+    expect(zk.asReaderWriter()).andReturn(zrw).anyTimes();
     expect(context.getZooKeeperRoot()).andReturn(zkRoot).anyTimes();
 
     zrw.recursiveDelete(zkRoot + "/tracers", ZooUtil.NodeMissingPolicy.SKIP);
@@ -382,30 +384,26 @@ public void upgradeZooKeeperTest() throws Exception {
     expect(zrw.getChildren(eq(zkRoot + Constants.ZNAMESPACES)))
         .andReturn(List.copyOf(mockNamespaces.keySet())).once();
     for (String ns : mockNamespaces.keySet()) {
-      Supplier<String> pathMatcher =
-          () -> eq(zkRoot + Constants.ZNAMESPACES + "/" + ns + ZNAMESPACE_NAME);
-      expect(zrw.getData(pathMatcher.get())).andReturn(mockNamespaces.get(ns).getBytes(UTF_8))
-          .once();
+      expect(zrw.getData(zkRoot + Constants.ZNAMESPACES + "/" + ns + ZNAMESPACE_NAME))
+          .andReturn(mockNamespaces.get(ns).getBytes(UTF_8)).once();
     }
     byte[] mapping = NamespaceMapping.serialize(mockNamespaces);
     expect(zrw.putPersistentData(eq(zkRoot + Constants.ZNAMESPACES), aryEq(mapping),
         eq(ZooUtil.NodeExistsPolicy.OVERWRITE))).andReturn(true).once();
     for (String ns : mockNamespaces.keySet()) {
-      Supplier<String> pathMatcher =
-          () -> eq(zkRoot + Constants.ZNAMESPACES + "/" + ns + ZNAMESPACE_NAME);
-      zrw.delete(pathMatcher.get());
+      zrw.delete(zkRoot + Constants.ZNAMESPACES + "/" + ns + ZNAMESPACE_NAME);
       expectLastCall().once();
     }
 
-    expect(zrw.exists(eq(zkRoot + "/problems"))).andReturn(false).once();
+    expect(zrw.exists(zkRoot + "/problems")).andReturn(false).once();
 
-    replay(context, zrw);
+    replay(context, zk, zrw);
 
     upgrader.upgradeZookeeper(context);
 
     assertEquals(zKRootV2, new String(byteCapture.getValue(), UTF_8));
 
-    verify(context, zrw);
+    verify(context, zk, zrw);
   }
 
   @Test
diff --git a/server/monitor/pom.xml b/server/monitor/pom.xml
index 1dd6bcc42a4..ef5e563ca12 100644
--- a/server/monitor/pom.xml
+++ b/server/monitor/pom.xml
@@ -76,6 +76,10 @@
       <groupId>org.apache.accumulo</groupId>
       <artifactId>accumulo-start</artifactId>
     </dependency>
+    <dependency>
+      <groupId>org.apache.commons</groupId>
+      <artifactId>commons-lang3</artifactId>
+    </dependency>
     <dependency>
       <groupId>org.apache.logging.log4j</groupId>
       <artifactId>log4j-web</artifactId>
diff --git a/server/monitor/src/main/java/org/apache/accumulo/monitor/Monitor.java b/server/monitor/src/main/java/org/apache/accumulo/monitor/Monitor.java
index 1ac2914df88..b728b8a2b77 100644
--- a/server/monitor/src/main/java/org/apache/accumulo/monitor/Monitor.java
+++ b/server/monitor/src/main/java/org/apache/accumulo/monitor/Monitor.java
@@ -45,6 +45,7 @@
 import org.apache.accumulo.core.Constants;
 import org.apache.accumulo.core.cli.ConfigOpts;
 import org.apache.accumulo.core.client.admin.servers.ServerId;
+import org.apache.accumulo.core.client.admin.servers.ServerId.Type;
 import org.apache.accumulo.core.compaction.thrift.CompactionCoordinatorService;
 import org.apache.accumulo.core.compaction.thrift.CompactorService;
 import org.apache.accumulo.core.compaction.thrift.TExternalCompaction;
@@ -56,9 +57,9 @@
 import org.apache.accumulo.core.gc.thrift.GCMonitorService;
 import org.apache.accumulo.core.gc.thrift.GCStatus;
 import org.apache.accumulo.core.lock.ServiceLock;
-import org.apache.accumulo.core.lock.ServiceLock.LockLossReason;
 import org.apache.accumulo.core.lock.ServiceLockData;
 import org.apache.accumulo.core.lock.ServiceLockData.ThriftService;
+import org.apache.accumulo.core.lock.ServiceLockSupport.HAServiceLockWatcher;
 import org.apache.accumulo.core.manager.thrift.ManagerClientService;
 import org.apache.accumulo.core.manager.thrift.ManagerMonitorInfo;
 import org.apache.accumulo.core.manager.thrift.TableInfo;
@@ -72,7 +73,6 @@
 import org.apache.accumulo.core.tabletserver.thrift.ActiveCompaction;
 import org.apache.accumulo.core.tabletserver.thrift.TabletServerClientService.Client;
 import org.apache.accumulo.core.trace.TraceUtil;
-import org.apache.accumulo.core.util.Halt;
 import org.apache.accumulo.core.util.Pair;
 import org.apache.accumulo.core.util.threads.Threads;
 import org.apache.accumulo.monitor.rest.compactions.external.ExternalCompactionInfo;
@@ -323,7 +323,7 @@ private GCStatus fetchGcStatus() {
     HostAndPort address = null;
     try {
       // Read the gc location from its lock
-      ZooReaderWriter zk = context.getZooReaderWriter();
+      ZooReaderWriter zk = context.getZooSession().asReaderWriter();
       var path = context.getServerPaths().createGarbageCollectorPath();
       List<String> locks = ServiceLock.validateAndSort(path, zk.getChildren(path.toString()));
       if (locks != null && !locks.isEmpty()) {
@@ -399,7 +399,7 @@ public void run() {
     try {
       URL url = new URL(server.isSecure() ? "https" : "http", advertiseHost, server.getPort(), "/");
       final String path = context.getZooKeeperRoot() + Constants.ZMONITOR_HTTP_ADDR;
-      final ZooReaderWriter zoo = context.getZooReaderWriter();
+      final ZooReaderWriter zoo = context.getZooSession().asReaderWriter();
       // Delete before we try to re-create in case the previous session hasn't yet expired
       zoo.delete(path);
       zoo.putEphemeralData(path, url.toString().getBytes(UTF_8));
@@ -714,7 +714,7 @@ private void getMonitorLock(HostAndPort monitorLocation)
     final var monitorLockPath = context.getServerPaths().createMonitorPath();
 
     // Ensure that everything is kosher with ZK as this has changed.
-    ZooReaderWriter zoo = context.getZooReaderWriter();
+    ZooReaderWriter zoo = context.getZooSession().asReaderWriter();
     if (zoo.exists(monitorPath)) {
       byte[] data = zoo.getData(monitorPath);
       // If the node isn't empty, it's from a previous install (has hostname:port for HTTP server)
@@ -741,11 +741,10 @@ private void getMonitorLock(HostAndPort monitorLocation)
 
     // Get a ZooLock for the monitor
     UUID zooLockUUID = UUID.randomUUID();
-    monitorLock = new ServiceLock(zoo.getZooKeeper(), monitorLockPath, zooLockUUID);
+    monitorLock = new ServiceLock(context.getZooSession(), monitorLockPath, zooLockUUID);
+    HAServiceLockWatcher monitorLockWatcher = new HAServiceLockWatcher(Type.MONITOR);
 
     while (true) {
-      MoniterLockWatcher monitorLockWatcher = new MoniterLockWatcher();
-
       monitorLock.lock(monitorLockWatcher,
           new ServiceLockData(zooLockUUID,
               monitorLocation.getHost() + ":" + monitorLocation.getPort(), ThriftService.NONE,
@@ -753,11 +752,11 @@ private void getMonitorLock(HostAndPort monitorLocation)
 
       monitorLockWatcher.waitForChange();
 
-      if (monitorLockWatcher.acquiredLock) {
+      if (monitorLockWatcher.isLockAcquired()) {
         break;
       }
 
-      if (!monitorLockWatcher.failedToAcquireLock) {
+      if (!monitorLockWatcher.isFailedToAcquireLock()) {
         throw new IllegalStateException("monitor lock in unknown state");
       }
 
@@ -771,57 +770,6 @@ private void getMonitorLock(HostAndPort monitorLocation)
     log.info("Got Monitor lock.");
   }
 
-  /**
-   * Async Watcher for monitor lock
-   */
-  private static class MoniterLockWatcher implements ServiceLock.AccumuloLockWatcher {
-
-    boolean acquiredLock = false;
-    boolean failedToAcquireLock = false;
-
-    @Override
-    public void lostLock(LockLossReason reason) {
-      Halt.halt("Monitor lock in zookeeper lost (reason = " + reason + "), exiting!", -1);
-    }
-
-    @Override
-    public void unableToMonitorLockNode(final Exception e) {
-      Halt.halt(-1, () -> log.error("No longer able to monitor Monitor lock node", e));
-
-    }
-
-    @Override
-    public synchronized void acquiredLock() {
-      if (acquiredLock || failedToAcquireLock) {
-        Halt.halt("Zoolock in unexpected state AL " + acquiredLock + " " + failedToAcquireLock, -1);
-      }
-
-      acquiredLock = true;
-      notifyAll();
-    }
-
-    @Override
-    public synchronized void failedToAcquireLock(Exception e) {
-      log.warn("Failed to get monitor lock " + e);
-
-      if (acquiredLock) {
-        Halt.halt("Zoolock in unexpected state FAL " + acquiredLock + " " + failedToAcquireLock,
-            -1);
-      }
-
-      failedToAcquireLock = true;
-      notifyAll();
-    }
-
-    public synchronized void waitForChange() {
-      while (!acquiredLock && !failedToAcquireLock) {
-        try {
-          wait();
-        } catch (InterruptedException e) {}
-      }
-    }
-  }
-
   public ManagerMonitorInfo getMmi() {
     return mmi;
   }
diff --git a/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/manager/ManagerResource.java b/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/manager/ManagerResource.java
index 6abfc6e2fba..eab9eee7e93 100644
--- a/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/manager/ManagerResource.java
+++ b/server/monitor/src/main/java/org/apache/accumulo/monitor/rest/manager/ManagerResource.java
@@ -20,6 +20,7 @@
 
 import java.lang.management.ManagementFactory;
 import java.util.ArrayList;
+import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
@@ -32,6 +33,7 @@
 import jakarta.ws.rs.core.MediaType;
 
 import org.apache.accumulo.core.client.admin.servers.ServerId;
+import org.apache.accumulo.core.conf.Property;
 import org.apache.accumulo.core.gc.thrift.GCStatus;
 import org.apache.accumulo.core.manager.thrift.DeadServer;
 import org.apache.accumulo.core.manager.thrift.ManagerMonitorInfo;
@@ -46,6 +48,7 @@
 import org.apache.accumulo.monitor.rest.tservers.ServerShuttingDownInformation;
 import org.apache.accumulo.monitor.rest.tservers.ServersShuttingDown;
 import org.apache.accumulo.server.manager.state.TabletServerState;
+import org.apache.commons.lang3.StringUtils;
 
 /**
  * Responsible for generating a new Manager information JSON object
@@ -173,10 +176,23 @@ public static DeadServerList getDeadTservers(Monitor monitor) {
     }
 
     DeadServerList deadServers = new DeadServerList();
+
+    String prop = monitor.getConfiguration().get(Property.MONITOR_DEAD_LIST_RG_EXCLUSIONS);
+    Set<String> exclusions = null;
+    if (StringUtils.isNotBlank(prop)) {
+      String[] rgs = prop.split(",");
+      exclusions = new HashSet<>(rgs.length);
+      for (String s : rgs) {
+        exclusions.add(s.trim());
+      }
+    }
+
     // Add new dead servers to the list
     for (DeadServer dead : mmi.deadTabletServers) {
-      deadServers
-          .addDeadServer(new DeadServerInformation(dead.server, dead.lastStatus, dead.status));
+      if (exclusions == null || !exclusions.contains(dead.getResourceGroup())) {
+        deadServers
+            .addDeadServer(new DeadServerInformation(dead.server, dead.lastStatus, dead.status));
+      }
     }
     return deadServers;
   }
diff --git a/server/monitor/src/main/resources/org/apache/accumulo/monitor/resources/js/bulkImport.js b/server/monitor/src/main/resources/org/apache/accumulo/monitor/resources/js/bulkImport.js
index 1422bf8b2f0..b5c0e189120 100644
--- a/server/monitor/src/main/resources/org/apache/accumulo/monitor/resources/js/bulkImport.js
+++ b/server/monitor/src/main/resources/org/apache/accumulo/monitor/resources/js/bulkImport.js
@@ -37,7 +37,7 @@ function refresh() {
 /**
  * Initializes the bulk import DataTables
  */
-$(document).ready(function () {
+$(function () {
 
   const url = '/rest/bulkImports';
   console.debug('REST url used to fetch data for the DataTables in bulkImport.js: ' + url);
diff --git a/server/monitor/src/main/resources/org/apache/accumulo/monitor/resources/js/compactions.js b/server/monitor/src/main/resources/org/apache/accumulo/monitor/resources/js/compactions.js
index 1275518c20a..a299544e206 100644
--- a/server/monitor/src/main/resources/org/apache/accumulo/monitor/resources/js/compactions.js
+++ b/server/monitor/src/main/resources/org/apache/accumulo/monitor/resources/js/compactions.js
@@ -22,7 +22,7 @@ var compactionsList;
 /**
  * Creates active compactions table
  */
-$(document).ready(function () {
+$(function () {
   // Create a table for compactions list
   compactionsList = $('#compactionsList').DataTable({
     "ajax": {
diff --git a/server/monitor/src/main/resources/org/apache/accumulo/monitor/resources/js/ec.js b/server/monitor/src/main/resources/org/apache/accumulo/monitor/resources/js/ec.js
index 9977e6f3068..7d5b0893730 100644
--- a/server/monitor/src/main/resources/org/apache/accumulo/monitor/resources/js/ec.js
+++ b/server/monitor/src/main/resources/org/apache/accumulo/monitor/resources/js/ec.js
@@ -27,7 +27,7 @@ var runningTableData;
 /**
  * Creates active compactions table
  */
-$(document).ready(function () {
+$(function () {
   if (sessionStorage.ecDetailsJSON === undefined) {
     sessionStorage.ecDetailsJSON = JSON.stringify([]);
   }
@@ -85,7 +85,6 @@ $(document).ready(function () {
     "columnDefs": [{
         "targets": "duration",
         "render": function (data, type, row) {
-          data = data / 1_000_000; // convert from nanos to millis
           if (type === 'display') data = timeDuration(data);
           return data;
         }
diff --git a/server/monitor/src/main/resources/org/apache/accumulo/monitor/resources/js/gc.js b/server/monitor/src/main/resources/org/apache/accumulo/monitor/resources/js/gc.js
index 6b1a8d41195..631d7c84fc7 100644
--- a/server/monitor/src/main/resources/org/apache/accumulo/monitor/resources/js/gc.js
+++ b/server/monitor/src/main/resources/org/apache/accumulo/monitor/resources/js/gc.js
@@ -22,7 +22,7 @@ var gcTable;
 /**
  * Creates active compactions table
  */
-$(document).ready(function () {
+$(function () {
   // Create a table for compactions list
   gcTable = $('#gcActivity').DataTable({
     "ajax": {
diff --git a/server/monitor/src/main/resources/org/apache/accumulo/monitor/resources/js/manager.js b/server/monitor/src/main/resources/org/apache/accumulo/monitor/resources/js/manager.js
index 716140c4f17..0ff5592976e 100644
--- a/server/monitor/src/main/resources/org/apache/accumulo/monitor/resources/js/manager.js
+++ b/server/monitor/src/main/resources/org/apache/accumulo/monitor/resources/js/manager.js
@@ -90,7 +90,7 @@ function refreshManagerTables() {
 /**
  * Creates initial tables
  */
-$(document).ready(function () {
+$(function () {
 
   // Generates the manager table
   managerStatusTable = $('#managerStatus').DataTable({
diff --git a/server/monitor/src/main/resources/org/apache/accumulo/monitor/resources/js/navbar.js b/server/monitor/src/main/resources/org/apache/accumulo/monitor/resources/js/navbar.js
index 30983e6bef3..75593783369 100644
--- a/server/monitor/src/main/resources/org/apache/accumulo/monitor/resources/js/navbar.js
+++ b/server/monitor/src/main/resources/org/apache/accumulo/monitor/resources/js/navbar.js
@@ -122,7 +122,7 @@ function updateServerNotifications(statusData) {
 /**
  * Creates the initial sidebar
  */
-$(document).ready(function () {
+$(function () {
   refreshSidebar();
 });
 
diff --git a/server/monitor/src/main/resources/org/apache/accumulo/monitor/resources/js/overview.js b/server/monitor/src/main/resources/org/apache/accumulo/monitor/resources/js/overview.js
index ca4623a81d7..f4a9b196793 100644
--- a/server/monitor/src/main/resources/org/apache/accumulo/monitor/resources/js/overview.js
+++ b/server/monitor/src/main/resources/org/apache/accumulo/monitor/resources/js/overview.js
@@ -21,7 +21,7 @@
 /**
  * Creates overview initial table
  */
-$(document).ready(function () {
+$(function () {
   refreshOverview();
 });
 
diff --git a/server/monitor/src/main/resources/org/apache/accumulo/monitor/resources/js/scans.js b/server/monitor/src/main/resources/org/apache/accumulo/monitor/resources/js/scans.js
index d9b1db7934b..afcdf1e4fc5 100644
--- a/server/monitor/src/main/resources/org/apache/accumulo/monitor/resources/js/scans.js
+++ b/server/monitor/src/main/resources/org/apache/accumulo/monitor/resources/js/scans.js
@@ -23,7 +23,7 @@ var scansList;
 /**
  * Creates scans initial table
  */
-$(document).ready(function () {
+$(function () {
   // Create a table for scans list
   scansList = $('#scansList').DataTable({
     "ajax": {
diff --git a/server/monitor/src/main/resources/org/apache/accumulo/monitor/resources/js/systemAlert.js b/server/monitor/src/main/resources/org/apache/accumulo/monitor/resources/js/systemAlert.js
index 6a0c7ef9d2c..1aa876a6886 100644
--- a/server/monitor/src/main/resources/org/apache/accumulo/monitor/resources/js/systemAlert.js
+++ b/server/monitor/src/main/resources/org/apache/accumulo/monitor/resources/js/systemAlert.js
@@ -154,7 +154,7 @@ function updateSystemAlerts() {
   updateManagerAlerts();
 }
 
-$(document).ready(function () {
+$(function () {
 
   // dismiss the alert when clicked
   $('#systemAlertCloseButton').click(function () {
diff --git a/server/monitor/src/main/resources/org/apache/accumulo/monitor/resources/js/tservers.js b/server/monitor/src/main/resources/org/apache/accumulo/monitor/resources/js/tservers.js
index d1d3ed13756..0e9667bc241 100644
--- a/server/monitor/src/main/resources/org/apache/accumulo/monitor/resources/js/tservers.js
+++ b/server/monitor/src/main/resources/org/apache/accumulo/monitor/resources/js/tservers.js
@@ -129,7 +129,7 @@ function clearDeadTServers(server) {
 /**
  * Creates initial tables
  */
-$(document).ready(function () {
+$(function () {
 
   refreshRecoveryList();
 
diff --git a/server/monitor/src/main/resources/org/apache/accumulo/monitor/templates/default.ftl b/server/monitor/src/main/resources/org/apache/accumulo/monitor/templates/default.ftl
index b1ccc25118a..a263f93d03d 100644
--- a/server/monitor/src/main/resources/org/apache/accumulo/monitor/templates/default.ftl
+++ b/server/monitor/src/main/resources/org/apache/accumulo/monitor/templates/default.ftl
@@ -49,7 +49,7 @@
       /**
        * Sets up autorefresh on initial load
        */
-      $(document).ready(function() {
+      $(function() {
         setupAutoRefresh();
       });
     </script>
diff --git a/server/monitor/src/main/resources/org/apache/accumulo/monitor/templates/server.ftl b/server/monitor/src/main/resources/org/apache/accumulo/monitor/templates/server.ftl
index d316bd75e1a..b412b564b36 100644
--- a/server/monitor/src/main/resources/org/apache/accumulo/monitor/templates/server.ftl
+++ b/server/monitor/src/main/resources/org/apache/accumulo/monitor/templates/server.ftl
@@ -19,7 +19,7 @@
 
 -->
       <script>
-        $(document).ready(function () {
+        $(function () {
           // initialize DataTables
           initServerTables('${server}');
         });
diff --git a/server/monitor/src/main/resources/org/apache/accumulo/monitor/templates/table.ftl b/server/monitor/src/main/resources/org/apache/accumulo/monitor/templates/table.ftl
index 55081360289..0cafbc58112 100644
--- a/server/monitor/src/main/resources/org/apache/accumulo/monitor/templates/table.ftl
+++ b/server/monitor/src/main/resources/org/apache/accumulo/monitor/templates/table.ftl
@@ -22,7 +22,7 @@
         /**
          * Creates participating Tservers initial table, passes the tableID from the template
          */
-        $(document).ready(function () {
+        $(function () {
           initTableServerTable('${tableID}');
         });
       </script>
diff --git a/server/monitor/src/main/resources/org/apache/accumulo/monitor/templates/tables.ftl b/server/monitor/src/main/resources/org/apache/accumulo/monitor/templates/tables.ftl
index fd0e0c876a2..b81633254e6 100644
--- a/server/monitor/src/main/resources/org/apache/accumulo/monitor/templates/tables.ftl
+++ b/server/monitor/src/main/resources/org/apache/accumulo/monitor/templates/tables.ftl
@@ -25,7 +25,7 @@
          *   - uses ajax call for data source and saves sort state in session
          *   - defines custom number formats
          */
-        $(document).ready(function () {
+        $(function () {
 
           tableList = $('#tableList').DataTable({
             "ajax": {
diff --git a/server/tserver/src/main/java/org/apache/accumulo/tserver/ActiveAssignmentRunnable.java b/server/tserver/src/main/java/org/apache/accumulo/tserver/ActiveAssignmentRunnable.java
index 3ce9cc16899..b5cedfbb4e3 100644
--- a/server/tserver/src/main/java/org/apache/accumulo/tserver/ActiveAssignmentRunnable.java
+++ b/server/tserver/src/main/java/org/apache/accumulo/tserver/ActiveAssignmentRunnable.java
@@ -39,12 +39,9 @@ public class ActiveAssignmentRunnable implements Runnable {
 
   public ActiveAssignmentRunnable(ConcurrentHashMap<KeyExtent,RunnableStartedAt> activeAssignments,
       KeyExtent extent, Runnable delegate) {
-    requireNonNull(activeAssignments);
-    requireNonNull(extent);
-    requireNonNull(delegate);
-    this.activeAssignments = activeAssignments;
-    this.extent = extent;
-    this.delegate = delegate;
+    this.activeAssignments = requireNonNull(activeAssignments);
+    this.extent = requireNonNull(extent);
+    this.delegate = requireNonNull(delegate);
   }
 
   @Override
diff --git a/server/tserver/src/main/java/org/apache/accumulo/tserver/ScanServer.java b/server/tserver/src/main/java/org/apache/accumulo/tserver/ScanServer.java
index 021ee3dbde9..8a409d566b6 100644
--- a/server/tserver/src/main/java/org/apache/accumulo/tserver/ScanServer.java
+++ b/server/tserver/src/main/java/org/apache/accumulo/tserver/ScanServer.java
@@ -50,6 +50,7 @@
 import org.apache.accumulo.core.Constants;
 import org.apache.accumulo.core.cli.ConfigOpts;
 import org.apache.accumulo.core.client.AccumuloException;
+import org.apache.accumulo.core.client.admin.servers.ServerId.Type;
 import org.apache.accumulo.core.clientImpl.thrift.TInfo;
 import org.apache.accumulo.core.clientImpl.thrift.ThriftSecurityException;
 import org.apache.accumulo.core.conf.AccumuloConfiguration;
@@ -69,13 +70,14 @@
 import org.apache.accumulo.core.fate.zookeeper.ZooUtil.NodeExistsPolicy;
 import org.apache.accumulo.core.file.blockfile.cache.impl.BlockCacheConfiguration;
 import org.apache.accumulo.core.lock.ServiceLock;
-import org.apache.accumulo.core.lock.ServiceLock.LockLossReason;
 import org.apache.accumulo.core.lock.ServiceLock.LockWatcher;
 import org.apache.accumulo.core.lock.ServiceLockData;
 import org.apache.accumulo.core.lock.ServiceLockData.ServiceDescriptor;
 import org.apache.accumulo.core.lock.ServiceLockData.ServiceDescriptors;
 import org.apache.accumulo.core.lock.ServiceLockData.ThriftService;
 import org.apache.accumulo.core.lock.ServiceLockPaths.ServiceLockPath;
+import org.apache.accumulo.core.lock.ServiceLockSupport;
+import org.apache.accumulo.core.lock.ServiceLockSupport.ServiceLockWatcher;
 import org.apache.accumulo.core.metadata.ScanServerRefTabletFile;
 import org.apache.accumulo.core.metadata.StoredTabletFile;
 import org.apache.accumulo.core.metadata.schema.Ample;
@@ -91,7 +93,6 @@
 import org.apache.accumulo.core.tabletscan.thrift.TooManyFilesException;
 import org.apache.accumulo.core.tabletserver.thrift.NoSuchScanIDException;
 import org.apache.accumulo.core.tabletserver.thrift.NotServingTabletException;
-import org.apache.accumulo.core.util.Halt;
 import org.apache.accumulo.core.util.Timer;
 import org.apache.accumulo.core.util.UtilWaitThread;
 import org.apache.accumulo.core.util.cache.Caches.CacheName;
@@ -120,7 +121,6 @@
 import org.apache.accumulo.tserver.tablet.TabletBase;
 import org.apache.thrift.TException;
 import org.apache.thrift.TProcessor;
-import org.apache.zookeeper.KeeperException;
 import org.checkerframework.checker.nullness.qual.Nullable;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -216,7 +216,7 @@ public ScanServer(ConfigOpts opts, String[] args) {
 
     this.resourceManager = new TabletServerResourceManager(context, this);
 
-    this.managerLockCache = new ZooCache(context.getZooReader(), null);
+    this.managerLockCache = new ZooCache(context.getZooSession());
 
     var readWriteLock = new ReentrantReadWriteLock();
     reservationsReadLock = readWriteLock.readLock();
@@ -327,47 +327,16 @@ public String getClientAddressString() {
    * Set up nodes and locks in ZooKeeper for this Compactor
    */
   private ServiceLock announceExistence() {
-    ZooReaderWriter zoo = getContext().getZooReaderWriter();
+    final ZooReaderWriter zoo = getContext().getZooSession().asReaderWriter();
     try {
 
       final ServiceLockPath zLockPath =
           context.getServerPaths().createScanServerPath(getResourceGroup(), clientAddress);
+      ServiceLockSupport.createNonHaServiceLockPath(Type.SCAN_SERVER, zoo, zLockPath);
       serverLockUUID = UUID.randomUUID();
-      // The ServiceLockPath contains a resource group in the path which is not created
-      // at initialization time. If it does not exist, then create it.
-      String sserverGroupPath = zLockPath.toString().substring(0,
-          zLockPath.toString().lastIndexOf("/" + zLockPath.getServer()));
-      LOG.debug("Creating sserver resource group path in zookeeper: {}", sserverGroupPath);
-      try {
-        zoo.mkdirs(sserverGroupPath);
-        // Old zk nodes can be cleaned up by ZooZap
-        zoo.putPersistentData(zLockPath.toString(), new byte[] {}, NodeExistsPolicy.SKIP);
-      } catch (KeeperException e) {
-        if (e.code() == KeeperException.Code.NOAUTH) {
-          LOG.error("Failed to write to ZooKeeper. Ensure that"
-              + " accumulo.properties, specifically instance.secret, is consistent.");
-        }
-        throw e;
-      }
-      scanServerLock = new ServiceLock(zoo.getZooKeeper(), zLockPath, serverLockUUID);
-
-      LockWatcher lw = new LockWatcher() {
-
-        @Override
-        public void lostLock(final LockLossReason reason) {
-          Halt.halt(serverStopRequested ? 0 : 1, () -> {
-            if (!serverStopRequested) {
-              LOG.error("Lost tablet server lock (reason = {}), exiting.", reason);
-            }
-            context.getLowMemoryDetector().logGCInfo(getConfiguration());
-          });
-        }
-
-        @Override
-        public void unableToMonitorLockNode(final Exception e) {
-          Halt.halt(1, () -> LOG.error("Lost ability to monitor scan server lock, exiting.", e));
-        }
-      };
+      scanServerLock = new ServiceLock(getContext().getZooSession(), zLockPath, serverLockUUID);
+      LockWatcher lw = new ServiceLockWatcher(Type.SCAN_SERVER, () -> serverStopRequested,
+          (type) -> context.getLowMemoryDetector().logGCInfo(getConfiguration()));
 
       for (int i = 0; i < 120 / 5; i++) {
         zoo.putPersistentData(zLockPath.toString(), new byte[0], NodeExistsPolicy.SKIP);
diff --git a/server/tserver/src/main/java/org/apache/accumulo/tserver/TabletClientHandler.java b/server/tserver/src/main/java/org/apache/accumulo/tserver/TabletClientHandler.java
index 117d87a96d5..388bf514091 100644
--- a/server/tserver/src/main/java/org/apache/accumulo/tserver/TabletClientHandler.java
+++ b/server/tserver/src/main/java/org/apache/accumulo/tserver/TabletClientHandler.java
@@ -157,7 +157,21 @@ public long startUpdate(TInfo tinfo, TCredentials credentials, TDurability tdura
 
     UpdateSession us =
         new UpdateSession(new TservConstraintEnv(server.getContext(), security, credentials),
-            credentials, durability);
+            credentials, durability) {
+          @Override
+          public boolean cleanup() {
+            // This is called when a client abandons a session. When this happens need to decrement
+            // any queued mutations.
+            if (queuedMutationSize > 0) {
+              log.trace(
+                  "cleaning up abandoned update session, decrementing totalQueuedMutationSize by {}",
+                  queuedMutationSize);
+              server.updateTotalQueuedMutationSize(-queuedMutationSize);
+              queuedMutationSize = 0;
+            }
+            return true;
+          }
+        };
     return server.sessionManager.createSession(us, false);
   }
 
@@ -166,8 +180,8 @@ private void setUpdateTablet(UpdateSession us, KeyExtent keyExtent) {
     if (us.currentTablet != null && us.currentTablet.getExtent().equals(keyExtent)) {
       return;
     }
-    if (us.currentTablet == null
-        && (us.failures.containsKey(keyExtent) || us.authFailures.containsKey(keyExtent))) {
+    if (us.currentTablet == null && (us.failures.containsKey(keyExtent)
+        || us.authFailures.containsKey(keyExtent) || us.unhandledException != null)) {
       // if there were previous failures, then do not accept additional writes
       return;
     }
@@ -236,6 +250,11 @@ public void applyUpdates(TInfo tinfo, long updateID, TKeyExtent tkeyExtent,
         List<Mutation> mutations = us.queuedMutations.get(us.currentTablet);
         for (TMutation tmutation : tmutations) {
           Mutation mutation = new ServerMutation(tmutation);
+          // Deserialize the mutation in an attempt to check for data corruption that happened on
+          // the network. This will avoid writing a corrupt mutation to the write ahead log and
+          // failing after its written to the write ahead log when it is deserialized to update the
+          // in memory map.
+          mutation.getUpdates();
           mutations.add(mutation);
           additionalMutationSize += mutation.numBytes();
         }
@@ -255,6 +274,15 @@ public void applyUpdates(TInfo tinfo, long updateID, TKeyExtent tkeyExtent,
           }
         }
       }
+    } catch (RuntimeException e) {
+      // This method is a thrift oneway method so an exception from it will not make it back to the
+      // client. Need to record the exception and set the session such that any future updates to
+      // the session are ignored.
+      us.unhandledException = e;
+      us.currentTablet = null;
+
+      // Rethrowing it will cause logging from thrift, so not adding logging here.
+      throw e;
     } finally {
       if (reserved) {
         server.sessionManager.unreserveSession(us);
@@ -371,6 +399,7 @@ private void flush(UpdateSession us) {
         }
       } catch (Exception e) {
         TraceUtil.setException(span2, e, true);
+        log.error("Error logging mutations sent from {}", TServerUtils.clientAddress.get(), e);
         throw e;
       } finally {
         span2.end();
@@ -398,6 +427,10 @@ private void flush(UpdateSession us) {
         us.commitTimes.addStat(t2 - t1);
 
         updateAvgCommitTime(t2 - t1, sendableMutations);
+      } catch (Exception e) {
+        TraceUtil.setException(span3, e, true);
+        log.error("Error committing mutations sent from {}", TServerUtils.clientAddress.get(), e);
+        throw e;
       } finally {
         span3.end();
       }
@@ -450,6 +483,20 @@ public UpdateErrors closeUpdate(TInfo tinfo, long updateID) throws NoSuchScanIDE
     }
 
     try {
+      if (us.unhandledException != null) {
+        // Since flush() is not being called, any memory added to the global queued mutations
+        // counter will not be decremented. So do that here before throwing an exception.
+        server.updateTotalQueuedMutationSize(-us.queuedMutationSize);
+        us.queuedMutationSize = 0;
+        // make this memory available for GC
+        us.queuedMutations.clear();
+
+        // Something unexpected happened during this write session, so throw an exception here to
+        // cause a TApplicationException on the client side.
+        throw new IllegalStateException(
+            "Write session " + updateID + " saw an unexpected exception", us.unhandledException);
+      }
+
       // clients may or may not see data from an update session while
       // it is in progress, however when the update session is closed
       // want to ensure that reads wait for the write to finish
@@ -660,6 +707,7 @@ private void writeConditionalMutations(Map<KeyExtent,List<ServerConditionalMutat
       updateAvgCommitTime(t2 - t1, sendableMutations);
     } catch (Exception e) {
       TraceUtil.setException(span3, e, true);
+      log.error("Error committing mutations sent from {}", TServerUtils.clientAddress.get(), e);
       throw e;
     } finally {
       span3.end();
diff --git a/server/tserver/src/main/java/org/apache/accumulo/tserver/TabletServer.java b/server/tserver/src/main/java/org/apache/accumulo/tserver/TabletServer.java
index a7282c0688a..aea44fcdafc 100644
--- a/server/tserver/src/main/java/org/apache/accumulo/tserver/TabletServer.java
+++ b/server/tserver/src/main/java/org/apache/accumulo/tserver/TabletServer.java
@@ -66,6 +66,7 @@
 import org.apache.accumulo.core.cli.ConfigOpts;
 import org.apache.accumulo.core.client.Durability;
 import org.apache.accumulo.core.client.admin.servers.ServerId;
+import org.apache.accumulo.core.client.admin.servers.ServerId.Type;
 import org.apache.accumulo.core.clientImpl.ClientTabletCache;
 import org.apache.accumulo.core.clientImpl.DurabilityImpl;
 import org.apache.accumulo.core.conf.AccumuloConfiguration;
@@ -79,13 +80,14 @@
 import org.apache.accumulo.core.fate.zookeeper.ZooUtil.NodeExistsPolicy;
 import org.apache.accumulo.core.file.blockfile.cache.impl.BlockCacheConfiguration;
 import org.apache.accumulo.core.lock.ServiceLock;
-import org.apache.accumulo.core.lock.ServiceLock.LockLossReason;
 import org.apache.accumulo.core.lock.ServiceLock.LockWatcher;
 import org.apache.accumulo.core.lock.ServiceLockData;
 import org.apache.accumulo.core.lock.ServiceLockData.ServiceDescriptor;
 import org.apache.accumulo.core.lock.ServiceLockData.ServiceDescriptors;
 import org.apache.accumulo.core.lock.ServiceLockData.ThriftService;
 import org.apache.accumulo.core.lock.ServiceLockPaths.ServiceLockPath;
+import org.apache.accumulo.core.lock.ServiceLockSupport;
+import org.apache.accumulo.core.lock.ServiceLockSupport.ServiceLockWatcher;
 import org.apache.accumulo.core.manager.thrift.Compacting;
 import org.apache.accumulo.core.manager.thrift.ManagerClientService;
 import org.apache.accumulo.core.manager.thrift.TableInfo;
@@ -103,7 +105,6 @@
 import org.apache.accumulo.core.tabletserver.UnloaderParamsImpl;
 import org.apache.accumulo.core.tabletserver.log.LogEntry;
 import org.apache.accumulo.core.util.ComparablePair;
-import org.apache.accumulo.core.util.Halt;
 import org.apache.accumulo.core.util.MapCounter;
 import org.apache.accumulo.core.util.Pair;
 import org.apache.accumulo.core.util.Retry;
@@ -232,7 +233,7 @@ protected TabletServer(ConfigOpts opts,
       Function<SiteConfiguration,ServerContext> serverContextFactory, String[] args) {
     super("tserver", opts, serverContextFactory, args);
     context = super.getContext();
-    this.managerLockCache = new ZooCache(context.getZooReader(), null);
+    this.managerLockCache = new ZooCache(context.getZooSession());
     final AccumuloConfiguration aconf = getConfiguration();
     log.info("Version " + Constants.VERSION);
     log.info("Instance " + getInstanceID());
@@ -333,9 +334,8 @@ private void logBusyTablets(List<ComparablePair<Long,KeyExtent>> busyTablets,
     if (aconf.getBoolean(Property.INSTANCE_RPC_SASL_ENABLED)) {
       log.info("SASL is enabled, creating ZooKeeper watcher for AuthenticationKeys");
       // Watcher to notice new AuthenticationKeys which enable delegation tokens
-      authKeyWatcher =
-          new ZooAuthenticationKeyWatcher(context.getSecretManager(), context.getZooReaderWriter(),
-              context.getZooKeeperRoot() + Constants.ZDELEGATION_TOKEN_KEYS);
+      authKeyWatcher = new ZooAuthenticationKeyWatcher(context.getSecretManager(),
+          context.getZooSession(), context.getZooKeeperRoot() + Constants.ZDELEGATION_TOKEN_KEYS);
     } else {
       authKeyWatcher = null;
     }
@@ -379,7 +379,12 @@ void requestStop() {
   }
 
   public long updateTotalQueuedMutationSize(long additionalMutationSize) {
-    return totalQueuedMutationSize.addAndGet(additionalMutationSize);
+    var newTotal = totalQueuedMutationSize.addAndGet(additionalMutationSize);
+    if (log.isTraceEnabled()) {
+      log.trace("totalQueuedMutationSize is now {} after adding {}", newTotal,
+          additionalMutationSize);
+    }
+    return newTotal;
   }
 
   @Override
@@ -484,47 +489,17 @@ public ZooCache getManagerLockCache() {
   }
 
   private void announceExistence() {
-    ZooReaderWriter zoo = getContext().getZooReaderWriter();
+    final ZooReaderWriter zoo = getContext().getZooSession().asReaderWriter();
     try {
 
       final ServiceLockPath zLockPath =
           context.getServerPaths().createTabletServerPath(getResourceGroup(), clientAddress);
-      // The ServiceLockPath contains a resource group in the path which is not created
-      // at initialization time. If it does not exist, then create it.
-      String tserverGroupPath = zLockPath.toString().substring(0,
-          zLockPath.toString().lastIndexOf("/" + zLockPath.getServer()));
-      log.debug("Creating tserver resource group path in zookeeper: {}", tserverGroupPath);
-      try {
-        zoo.mkdirs(tserverGroupPath);
-        zoo.putPersistentData(zLockPath.toString(), new byte[] {}, NodeExistsPolicy.SKIP);
-      } catch (KeeperException e) {
-        if (e.code() == KeeperException.Code.NOAUTH) {
-          log.error("Failed to write to ZooKeeper. Ensure that"
-              + " accumulo.properties, specifically instance.secret, is consistent.");
-        }
-        throw e;
-      }
+      ServiceLockSupport.createNonHaServiceLockPath(Type.TABLET_SERVER, zoo, zLockPath);
       UUID tabletServerUUID = UUID.randomUUID();
-      tabletServerLock = new ServiceLock(zoo.getZooKeeper(), zLockPath, tabletServerUUID);
-
-      LockWatcher lw = new LockWatcher() {
+      tabletServerLock = new ServiceLock(getContext().getZooSession(), zLockPath, tabletServerUUID);
 
-        @Override
-        public void lostLock(final LockLossReason reason) {
-          Halt.halt(serverStopRequested ? 0 : 1, () -> {
-            if (!serverStopRequested) {
-              log.error("Lost tablet server lock (reason = {}), exiting.", reason);
-            }
-            context.getLowMemoryDetector().logGCInfo(getConfiguration());
-          });
-        }
-
-        @Override
-        public void unableToMonitorLockNode(final Exception e) {
-          Halt.halt(1, () -> log.error("Lost ability to monitor tablet server lock, exiting.", e));
-
-        }
-      };
+      LockWatcher lw = new ServiceLockWatcher(Type.TABLET_SERVER, () -> serverStopRequested,
+          (type) -> context.getLowMemoryDetector().logGCInfo(getConfiguration()));
 
       for (int i = 0; i < 120 / 5; i++) {
         zoo.putPersistentData(zLockPath.toString(), new byte[0], NodeExistsPolicy.SKIP);
diff --git a/server/tserver/src/main/java/org/apache/accumulo/tserver/TabletServerResourceManager.java b/server/tserver/src/main/java/org/apache/accumulo/tserver/TabletServerResourceManager.java
index 04742d810b5..953bbd4cfae 100644
--- a/server/tserver/src/main/java/org/apache/accumulo/tserver/TabletServerResourceManager.java
+++ b/server/tserver/src/main/java/org/apache/accumulo/tserver/TabletServerResourceManager.java
@@ -417,8 +417,8 @@ public TabletServerResourceManager(ServerContext context, TabletHostingServer ts
 
     // We can use the same map for both metadata and normal assignments since the keyspace (extent)
     // is guaranteed to be unique. Schedule the task once, the task will reschedule itself.
-    ThreadPools.watchCriticalScheduledTask(context.getScheduledExecutor().schedule(
-        new AssignmentWatcher(acuConf, context, activeAssignments), 5000, TimeUnit.MILLISECONDS));
+    ThreadPools.watchCriticalScheduledTask(context.getScheduledExecutor()
+        .schedule(new AssignmentWatcher(context, activeAssignments), 5000, TimeUnit.MILLISECONDS));
   }
 
   public int getOpenFiles() {
@@ -436,16 +436,14 @@ public static class AssignmentWatcher implements Runnable {
     private static long longAssignments = 0;
 
     private final Map<KeyExtent,RunnableStartedAt> activeAssignments;
-    private final AccumuloConfiguration conf;
     private final ServerContext context;
 
     public static long getLongAssignments() {
       return longAssignments;
     }
 
-    public AssignmentWatcher(AccumuloConfiguration conf, ServerContext context,
+    public AssignmentWatcher(ServerContext context,
         Map<KeyExtent,RunnableStartedAt> activeAssignments) {
-      this.conf = conf;
       this.context = context;
       this.activeAssignments = activeAssignments;
     }
@@ -453,7 +451,7 @@ public AssignmentWatcher(AccumuloConfiguration conf, ServerContext context,
     @Override
     public void run() {
       final long millisBeforeWarning =
-          this.conf.getTimeInMillis(Property.TSERV_ASSIGNMENT_DURATION_WARNING);
+          context.getConfiguration().getTimeInMillis(Property.TSERV_ASSIGNMENT_DURATION_WARNING);
       try {
         long now = System.currentTimeMillis();
         KeyExtent extent;
diff --git a/server/tserver/src/main/java/org/apache/accumulo/tserver/log/TabletServerLogger.java b/server/tserver/src/main/java/org/apache/accumulo/tserver/log/TabletServerLogger.java
index cbc4f20e80a..eadbea14f93 100644
--- a/server/tserver/src/main/java/org/apache/accumulo/tserver/log/TabletServerLogger.java
+++ b/server/tserver/src/main/java/org/apache/accumulo/tserver/log/TabletServerLogger.java
@@ -43,6 +43,7 @@
 import org.apache.accumulo.core.dataImpl.KeyExtent;
 import org.apache.accumulo.core.file.blockfile.impl.BasicCacheProvider;
 import org.apache.accumulo.core.file.blockfile.impl.CacheProvider;
+import org.apache.accumulo.core.lock.ServiceLock;
 import org.apache.accumulo.core.logging.LoggingBlockCache;
 import org.apache.accumulo.core.spi.cache.CacheType;
 import org.apache.accumulo.core.tabletserver.log.LogEntry;
@@ -305,7 +306,9 @@ private synchronized void startLogMaker() {
           try {
             nextLog.offer(t, 12, TimeUnit.HOURS);
           } catch (InterruptedException ex) {
-            // ignore
+            // Throw an Error, not an Exception, so the AccumuloUncaughtExceptionHandler
+            // will log this then halt the VM.
+            throw new Error("Next log maker thread interrupted", ex);
           }
 
           continue;
@@ -340,7 +343,9 @@ private synchronized void startLogMaker() {
           try {
             nextLog.offer(t, 12, TimeUnit.HOURS);
           } catch (InterruptedException ex) {
-            // ignore
+            // Throw an Error, not an Exception, so the AccumuloUncaughtExceptionHandler
+            // will log this then halt the VM.
+            throw new Error("Next log maker thread interrupted", ex);
           }
 
           continue;
@@ -351,7 +356,9 @@ private synchronized void startLogMaker() {
             log.info("Our WAL was not used for 12 hours: {}", alog.getLogEntry());
           }
         } catch (InterruptedException e) {
-          // ignore - server is shutting down
+          // Throw an Error, not an Exception, so the AccumuloUncaughtExceptionHandler
+          // will log this then halt the VM.
+          throw new Error("Next log maker thread interrupted", e);
         }
       }
     });
@@ -391,6 +398,7 @@ private void write(final Collection<CommitSession> sessions, boolean mincFinish,
 
     boolean success = false;
     while (!success) {
+      boolean sawWriteFailure = false;
       try {
         // get a reference to the loggers that no other thread can touch
         AtomicInteger currentId = new AtomicInteger(-1);
@@ -428,7 +436,7 @@ private void write(final Collection<CommitSession> sessions, boolean mincFinish,
         writeRetry.logRetry(log, "Logs closed while writing", ex);
       } catch (Exception t) {
         writeRetry.logRetry(log, "Failed to write to WAL", t);
-
+        sawWriteFailure = true;
         try {
           // Backoff
           writeRetry.waitForNextAttempt(log, "write to WAL");
@@ -444,6 +452,14 @@ private void write(final Collection<CommitSession> sessions, boolean mincFinish,
       // the logs haven't changed.
       final int finalCurrent = currentLogId;
       if (!success) {
+        final ServiceLock tabletServerLock = tserver.getLock();
+        if (sawWriteFailure) {
+          log.info("WAL write failure, validating server lock in ZooKeeper");
+          if (tabletServerLock == null || !tabletServerLock.verifyLockAtSource()) {
+            Halt.halt("Writing to WAL has failed and TabletServer lock does not exist", -1);
+          }
+        }
+
         testLockAndRun(logIdLock, new TestCallWithWriteLock() {
 
           @Override
diff --git a/server/tserver/src/main/java/org/apache/accumulo/tserver/session/SessionManager.java b/server/tserver/src/main/java/org/apache/accumulo/tserver/session/SessionManager.java
index 7921926149d..43a6792fd1f 100644
--- a/server/tserver/src/main/java/org/apache/accumulo/tserver/session/SessionManager.java
+++ b/server/tserver/src/main/java/org/apache/accumulo/tserver/session/SessionManager.java
@@ -63,20 +63,14 @@ public class SessionManager {
   private static final Logger log = LoggerFactory.getLogger(SessionManager.class);
 
   private final ConcurrentMap<Long,Session> sessions = new ConcurrentHashMap<>();
-  private final long maxIdle;
-  private final long maxUpdateIdle;
   private final BlockingQueue<Session> deferredCleanupQueue = new ArrayBlockingQueue<>(5000);
   private final ServerContext ctx;
   private volatile LongConsumer zombieCountConsumer = null;
 
   public SessionManager(ServerContext context) {
     this.ctx = context;
-    final AccumuloConfiguration aconf = context.getConfiguration();
-    maxUpdateIdle = aconf.getTimeInMillis(Property.TSERV_UPDATE_SESSION_MAXIDLE);
-    maxIdle = aconf.getTimeInMillis(Property.TSERV_SESSION_MAXIDLE);
-
-    Runnable r = () -> sweep(maxIdle, maxUpdateIdle);
-
+    long maxIdle = ctx.getConfiguration().getTimeInMillis(Property.TSERV_SESSION_MAXIDLE);
+    Runnable r = () -> sweep(ctx);
     ThreadPools.watchCriticalScheduledTask(context.getScheduledExecutor().scheduleWithFixedDelay(r,
         0, Math.max(maxIdle / 2, 1000), MILLISECONDS));
   }
@@ -98,7 +92,7 @@ public long createSession(Session session, boolean reserve) {
   }
 
   public long getMaxIdleTime() {
-    return maxIdle;
+    return ctx.getConfiguration().getTimeInMillis(Property.TSERV_SESSION_MAXIDLE);
   }
 
   /**
@@ -294,7 +288,10 @@ private void cleanup(Session session) {
     cleanup(deferredCleanupQueue, session);
   }
 
-  private void sweep(final long maxIdle, final long maxUpdateIdle) {
+  private void sweep(final ServerContext context) {
+    final AccumuloConfiguration conf = context.getConfiguration();
+    final long maxUpdateIdle = conf.getTimeInMillis(Property.TSERV_UPDATE_SESSION_MAXIDLE);
+    final long maxIdle = conf.getTimeInMillis(Property.TSERV_SESSION_MAXIDLE);
     List<Session> sessionsToCleanup = new LinkedList<>();
     Iterator<Session> iter = sessions.values().iterator();
     while (iter.hasNext()) {
diff --git a/server/tserver/src/main/java/org/apache/accumulo/tserver/session/UpdateSession.java b/server/tserver/src/main/java/org/apache/accumulo/tserver/session/UpdateSession.java
index ca487294d7f..dc32765c28b 100644
--- a/server/tserver/src/main/java/org/apache/accumulo/tserver/session/UpdateSession.java
+++ b/server/tserver/src/main/java/org/apache/accumulo/tserver/session/UpdateSession.java
@@ -50,6 +50,7 @@ public class UpdateSession extends Session {
   public long flushTime = 0;
   public long queuedMutationSize = 0;
   public final Durability durability;
+  public Exception unhandledException = null;
 
   public UpdateSession(TservConstraintEnv env, TCredentials credentials, Durability durability) {
     super(credentials);
diff --git a/server/tserver/src/main/java/org/apache/accumulo/tserver/tablet/Tablet.java b/server/tserver/src/main/java/org/apache/accumulo/tserver/tablet/Tablet.java
index d69dd1b74b8..549331b247a 100644
--- a/server/tserver/src/main/java/org/apache/accumulo/tserver/tablet/Tablet.java
+++ b/server/tserver/src/main/java/org/apache/accumulo/tserver/tablet/Tablet.java
@@ -621,7 +621,7 @@ public long getFlushID() throws NoNodeException {
     try {
       String zTablePath = tabletServer.getContext().getZooKeeperRoot() + Constants.ZTABLES + "/"
           + extent.tableId() + Constants.ZTABLE_FLUSH_ID;
-      String id = new String(context.getZooReaderWriter().getData(zTablePath), UTF_8);
+      String id = new String(context.getZooSession().asReaderWriter().getData(zTablePath), UTF_8);
       return Long.parseLong(id);
     } catch (InterruptedException | NumberFormatException e) {
       throw new RuntimeException("Exception on " + extent + " getting flush ID", e);
@@ -752,22 +752,21 @@ public void commit(CommitSession commitSession, List<Mutation> mutations) {
       totalBytes += mutation.numBytes();
     }
 
-    getTabletMemory().mutate(commitSession, mutations, totalCount);
-
-    synchronized (this) {
-      if (isCloseComplete()) {
-        throw new IllegalStateException(
-            "Tablet " + extent + " closed with outstanding messages to the logger");
+    try {
+      getTabletMemory().mutate(commitSession, mutations, totalCount);
+      synchronized (this) {
+        getTabletMemory().updateMemoryUsageStats();
+        if (isCloseComplete()) {
+          throw new IllegalStateException(
+              "Tablet " + extent + " closed with outstanding messages to the logger");
+        }
+        numEntries += totalCount;
+        numEntriesInMemory += totalCount;
+        ingestCount += totalCount;
+        ingestBytes += totalBytes;
       }
-      // decrement here in case an exception is thrown below
+    } finally {
       decrementWritesInProgress(commitSession);
-
-      getTabletMemory().updateMemoryUsageStats();
-
-      numEntries += totalCount;
-      numEntriesInMemory += totalCount;
-      ingestCount += totalCount;
-      ingestBytes += totalBytes;
     }
   }
 
diff --git a/server/tserver/src/test/java/org/apache/accumulo/tserver/AssignmentWatcherTest.java b/server/tserver/src/test/java/org/apache/accumulo/tserver/AssignmentWatcherTest.java
index 86899b5b668..4a90cca43f9 100644
--- a/server/tserver/src/test/java/org/apache/accumulo/tserver/AssignmentWatcherTest.java
+++ b/server/tserver/src/test/java/org/apache/accumulo/tserver/AssignmentWatcherTest.java
@@ -18,51 +18,43 @@
  */
 package org.apache.accumulo.tserver;
 
-import java.util.HashMap;
+import static org.easymock.EasyMock.createMock;
+import static org.easymock.EasyMock.expect;
+import static org.easymock.EasyMock.replay;
+import static org.easymock.EasyMock.verify;
+
 import java.util.Map;
 import java.util.concurrent.Executors;
 import java.util.concurrent.ScheduledThreadPoolExecutor;
 
-import org.apache.accumulo.core.conf.AccumuloConfiguration;
+import org.apache.accumulo.core.conf.ConfigurationCopy;
 import org.apache.accumulo.core.conf.Property;
 import org.apache.accumulo.core.data.TableId;
 import org.apache.accumulo.core.dataImpl.KeyExtent;
 import org.apache.accumulo.server.ServerContext;
 import org.apache.accumulo.tserver.TabletServerResourceManager.AssignmentWatcher;
-import org.easymock.EasyMock;
-import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
 public class AssignmentWatcherTest {
 
-  private Map<KeyExtent,RunnableStartedAt> assignments;
-  private ServerContext context;
-  private AccumuloConfiguration conf;
-  private AssignmentWatcher watcher;
-
-  @BeforeEach
-  public void setup() {
-    assignments = new HashMap<>();
-    context = EasyMock.createMock(ServerContext.class);
-    conf = EasyMock.createNiceMock(AccumuloConfiguration.class);
-    watcher = new AssignmentWatcher(conf, context, assignments);
-  }
-
   @Test
   public void testAssignmentWarning() {
-    ActiveAssignmentRunnable task = EasyMock.createMock(ActiveAssignmentRunnable.class);
-    RunnableStartedAt run = new RunnableStartedAt(task, System.currentTimeMillis());
-    EasyMock.expect(context.getConfiguration()).andReturn(conf).anyTimes();
-    EasyMock.expect(conf.getCount(EasyMock.isA(Property.class))).andReturn(1).anyTimes();
-    EasyMock.expect(conf.getTimeInMillis(EasyMock.isA(Property.class))).andReturn(0L).anyTimes();
-    EasyMock.expect(context.getScheduledExecutor())
-        .andReturn((ScheduledThreadPoolExecutor) Executors.newScheduledThreadPool(1)).anyTimes();
-    assignments.put(new KeyExtent(TableId.of("1"), null, null), run);
+    var e = (ScheduledThreadPoolExecutor) Executors.newScheduledThreadPool(1);
+    var c = new ConfigurationCopy(Map.of(Property.TSERV_ASSIGNMENT_DURATION_WARNING.getKey(), "0"));
+    ServerContext context = createMock(ServerContext.class);
+    expect(context.getScheduledExecutor()).andReturn(e);
+    expect(context.getConfiguration()).andReturn(c);
+
+    ActiveAssignmentRunnable task = createMock(ActiveAssignmentRunnable.class);
+    expect(task.getException()).andReturn(new Exception("Assignment warning happened"));
+
+    var assignments = Map.of(new KeyExtent(TableId.of("1"), null, null),
+        new RunnableStartedAt(task, System.currentTimeMillis()));
+    var watcher = new AssignmentWatcher(context, assignments);
 
-    EasyMock.expect(task.getException()).andReturn(new Exception("Assignment warning happened"));
-    EasyMock.replay(context, task);
+    replay(context, task);
     watcher.run();
-    EasyMock.verify(context, task);
+    verify(context, task);
   }
 
 }
diff --git a/shell/src/main/java/org/apache/accumulo/shell/Shell.java b/shell/src/main/java/org/apache/accumulo/shell/Shell.java
index dc39096b007..f07c5a77e09 100644
--- a/shell/src/main/java/org/apache/accumulo/shell/Shell.java
+++ b/shell/src/main/java/org/apache/accumulo/shell/Shell.java
@@ -176,6 +176,7 @@
 import org.jline.terminal.Attributes;
 import org.jline.terminal.Terminal;
 import org.jline.terminal.TerminalBuilder;
+import org.jline.terminal.TerminalBuilder.SystemOutput;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -229,6 +230,7 @@ public class Shell extends ShellOptions implements KeywordExecutable {
   protected String execCommand = null;
   protected boolean verbose = true;
 
+  private boolean canPaginate = false;
   private boolean tabCompletion;
   private boolean disableAuthTimeout;
   private long authTimeout;
@@ -300,7 +302,8 @@ private AuthenticationToken getAuthenticationToken(String principal, String auth
    */
   public boolean config(String... args) throws IOException {
     if (this.terminal == null) {
-      this.terminal = TerminalBuilder.builder().jansi(false).build();
+      this.terminal =
+          TerminalBuilder.builder().jansi(false).systemOutput(SystemOutput.SysOut).build();
     }
     if (this.reader == null) {
       this.reader = LineReaderBuilder.builder().terminal(this.terminal).build();
@@ -378,6 +381,8 @@ public boolean config(String... args) throws IOException {
       }
     }
 
+    canPaginate = terminal.getSize().getRows() > 0;
+
     // decide whether to execute commands from a file and quit
     if (options.getExecFile() != null) {
       execFile = options.getExecFile();
@@ -1030,7 +1035,7 @@ public final void printLines(Iterator<String> lines, boolean paginate, PrintLine
         if (out == null) {
           if (peek != null) {
             writer.println(peek);
-            if (paginate) {
+            if (canPaginate && paginate) {
               linesPrinted += peek.isEmpty() ? 0 : Math.ceil(peek.length() * 1.0 / termWidth);
 
               // check if displaying the next line would result in
diff --git a/shell/src/test/java/org/apache/accumulo/shell/format/DeleterFormatterTest.java b/shell/src/test/java/org/apache/accumulo/shell/format/DeleterFormatterTest.java
index bb6825ed49c..86b8374004a 100644
--- a/shell/src/test/java/org/apache/accumulo/shell/format/DeleterFormatterTest.java
+++ b/shell/src/test/java/org/apache/accumulo/shell/format/DeleterFormatterTest.java
@@ -21,7 +21,6 @@
 import static java.nio.charset.StandardCharsets.UTF_8;
 import static org.easymock.EasyMock.anyObject;
 import static org.easymock.EasyMock.createMock;
-import static org.easymock.EasyMock.createNiceMock;
 import static org.easymock.EasyMock.expect;
 import static org.easymock.EasyMock.expectLastCall;
 import static org.easymock.EasyMock.replay;
@@ -85,12 +84,17 @@ public void set(String in) {
   }
 
   @BeforeEach
-  public void setUp() throws IOException {
+  public void setUp() throws Exception {
     input = new SettableInputStream();
     baos = new ByteArrayOutputStream();
 
-    writer = createNiceMock(BatchWriter.class);
-    shellState = createNiceMock(Shell.class);
+    writer = createMock(BatchWriter.class);
+    writer.addMutation(anyObject());
+    expectLastCall().anyTimes();
+    writer.close();
+    expectLastCall().anyTimes();
+
+    shellState = createMock(Shell.class);
 
     terminal = new DumbTerminal(input, baos);
     terminal.setSize(new Size(80, 24));
@@ -197,7 +201,7 @@ public void testYes() throws IOException {
   @Test
   public void testMutationException() throws MutationsRejectedException {
     MutationsRejectedException mre = createMock(MutationsRejectedException.class);
-    BatchWriter exceptionWriter = createNiceMock(BatchWriter.class);
+    BatchWriter exceptionWriter = createMock(BatchWriter.class);
     exceptionWriter.close();
     expectLastCall().andThrow(mre);
     exceptionWriter.addMutation(anyObject(Mutation.class));
diff --git a/test/src/main/java/org/apache/accumulo/test/CorruptMutationIT.java b/test/src/main/java/org/apache/accumulo/test/CorruptMutationIT.java
new file mode 100644
index 00000000000..fdab6e21425
--- /dev/null
+++ b/test/src/main/java/org/apache/accumulo/test/CorruptMutationIT.java
@@ -0,0 +1,149 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.accumulo.test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+
+import java.util.List;
+import java.util.Set;
+import java.util.stream.Collectors;
+
+import org.apache.accumulo.core.client.Accumulo;
+import org.apache.accumulo.core.client.AccumuloClient;
+import org.apache.accumulo.core.client.BatchWriter;
+import org.apache.accumulo.core.client.Scanner;
+import org.apache.accumulo.core.clientImpl.ClientContext;
+import org.apache.accumulo.core.clientImpl.thrift.TInfo;
+import org.apache.accumulo.core.conf.Property;
+import org.apache.accumulo.core.data.Mutation;
+import org.apache.accumulo.core.data.Value;
+import org.apache.accumulo.core.dataImpl.KeyExtent;
+import org.apache.accumulo.core.dataImpl.thrift.TMutation;
+import org.apache.accumulo.core.metadata.schema.TabletMetadata;
+import org.apache.accumulo.core.rpc.ThriftUtil;
+import org.apache.accumulo.core.rpc.clients.ThriftClientTypes;
+import org.apache.accumulo.core.tabletingest.thrift.TDurability;
+import org.apache.accumulo.core.tabletingest.thrift.TabletIngestClientService;
+import org.apache.accumulo.core.trace.TraceUtil;
+import org.apache.accumulo.harness.AccumuloClusterHarness;
+import org.apache.accumulo.miniclusterImpl.MiniAccumuloConfigImpl;
+import org.apache.hadoop.conf.Configuration;
+import org.apache.thrift.TApplicationException;
+import org.apache.thrift.TServiceClient;
+import org.junit.jupiter.api.Test;
+
+public class CorruptMutationIT extends AccumuloClusterHarness {
+
+  @Override
+  public void configureMiniCluster(MiniAccumuloConfigImpl cfg, Configuration hadoopCoreSite) {
+    cfg.setProperty(Property.TSERV_TOTAL_MUTATION_QUEUE_MAX, "10");
+  }
+
+  @Test
+  public void testCorruptMutation() throws Exception {
+
+    String table = getUniqueNames(1)[0];
+    try (AccumuloClient c = Accumulo.newClient().from(getClientProps()).build()) {
+      c.tableOperations().create(table);
+      try (BatchWriter writer = c.createBatchWriter(table)) {
+        Mutation m = new Mutation("1");
+        m.put("f1", "q1", new Value("v1"));
+        writer.addMutation(m);
+      }
+
+      var ctx = (ClientContext) c;
+      var tableId = ctx.getTableId(table);
+      var extent = new KeyExtent(tableId, null, null);
+      var tabletMetadata = ctx.getAmple().readTablet(extent, TabletMetadata.ColumnType.LOCATION);
+      var location = tabletMetadata.getLocation();
+      assertNotNull(location);
+      assertEquals(TabletMetadata.LocationType.CURRENT, location.getType());
+
+      TabletIngestClientService.Iface client =
+          ThriftUtil.getClient(ThriftClientTypes.TABLET_INGEST, location.getHostAndPort(), ctx);
+      // Make the same RPC calls made by the BatchWriter, but pass a corrupt serialized mutation in
+      // this try block.
+      try {
+        TInfo tinfo = TraceUtil.traceInfo();
+
+        long sessionId = client.startUpdate(tinfo, ctx.rpcCreds(), TDurability.DEFAULT);
+
+        // Write two valid mutations to the session. The tserver buffers data it receives via
+        // applyUpdates and may not write them until closeUpdate RPC is called. Because
+        // TSERV_TOTAL_MUTATION_QUEUE_MAX was set so small, these values should be written.
+        client.applyUpdates(tinfo, sessionId, extent.toThrift(),
+            List.of(createTMutation("abc", "z1"), createTMutation("def", "z2")));
+
+        // Simulate data corruption in the serialized mutation
+        TMutation badMutation = createTMutation("ghi", "z3");
+        badMutation.entries = -42;
+
+        // Write some good and bad mutations to the session. The server side will see an error here,
+        // however since this is a thrift oneway method no exception is expected here. This should
+        // leave the session in a broken state where it no longer accepts any new data.
+        client.applyUpdates(tinfo, sessionId, extent.toThrift(),
+            List.of(createTMutation("jkl", "z4"), badMutation, createTMutation("mno", "z5")));
+
+        // Write two more valid mutations to the session, these should be dropped on the server side
+        // because of the previous error. So should never see these updates.
+        client.applyUpdates(tinfo, sessionId, extent.toThrift(),
+            List.of(createTMutation("pqr", "z6"), createTMutation("stu", "z7")));
+
+        // Since client.applyUpdates experienced an error, should see an error when closing the
+        // session.
+        assertThrows(TApplicationException.class, () -> client.closeUpdate(tinfo, sessionId));
+      } finally {
+        ThriftUtil.returnClient((TServiceClient) client, ctx);
+      }
+
+      // The values that a scan must see
+      Set<String> expectedValues = Set.of("v1", "v2", "z1", "z2");
+
+      // The failed mutation should not have left the tablet in a bad state. Do some follow-on
+      // actions to ensure the tablet is still functional.
+      try (BatchWriter writer = c.createBatchWriter(table)) {
+        Mutation m = new Mutation("2");
+        m.put("f1", "q1", new Value("v2"));
+        writer.addMutation(m);
+      }
+
+      try (Scanner scanner = c.createScanner(table)) {
+        var valuesSeen =
+            scanner.stream().map(e -> e.getValue().toString()).collect(Collectors.toSet());
+        assertEquals(expectedValues, valuesSeen);
+      }
+
+      c.tableOperations().flush(table, null, null, true);
+
+      try (Scanner scanner = c.createScanner(table)) {
+        var valuesSeen =
+            scanner.stream().map(e -> e.getValue().toString()).collect(Collectors.toSet());
+        assertEquals(expectedValues, valuesSeen);
+      }
+    }
+  }
+
+  private static TMutation createTMutation(String row, String value) {
+    Mutation m = new Mutation(row);
+    m.put("x", "y", value);
+    return m.toThrift();
+  }
+}
diff --git a/test/src/main/java/org/apache/accumulo/test/SelfStoppingScanServer.java b/test/src/main/java/org/apache/accumulo/test/SelfStoppingScanServer.java
index 73284dc8c50..fe9e15ec04c 100644
--- a/test/src/main/java/org/apache/accumulo/test/SelfStoppingScanServer.java
+++ b/test/src/main/java/org/apache/accumulo/test/SelfStoppingScanServer.java
@@ -22,18 +22,15 @@
 
 import org.apache.accumulo.core.cli.ConfigOpts;
 import org.apache.accumulo.core.clientImpl.thrift.TInfo;
-import org.apache.accumulo.core.tabletscan.thrift.TabletScanClientService;
 import org.apache.accumulo.core.tabletserver.thrift.NoSuchScanIDException;
 import org.apache.accumulo.tserver.ScanServer;
-import org.apache.accumulo.tserver.TabletHostingServer;
 import org.apache.thrift.TException;
 
 /**
  * ScanServer implementation that will stop itself after the the 3rd scan batch scan
  *
  */
-public class SelfStoppingScanServer extends ScanServer
-    implements TabletScanClientService.Iface, TabletHostingServer {
+public class SelfStoppingScanServer extends ScanServer {
 
   private final AtomicInteger scanCount = new AtomicInteger(0);
 
diff --git a/test/src/main/java/org/apache/accumulo/test/ample/TestAmpleIT.java b/test/src/main/java/org/apache/accumulo/test/ample/TestAmpleIT.java
index 2c8359bf4ef..45593012357 100644
--- a/test/src/main/java/org/apache/accumulo/test/ample/TestAmpleIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/ample/TestAmpleIT.java
@@ -119,6 +119,7 @@ public void testCreateMetadata() throws Exception {
           assertNotNull(tm.getExtent());
           assertNotNull(tm.getTabletAvailability());
           assertNotNull(tm.getTime());
+          assertNotNull(tm.getTabletMergeability());
           count.incrementAndGet();
         });
       }
diff --git a/test/src/main/java/org/apache/accumulo/test/ample/metadata/TestAmple.java b/test/src/main/java/org/apache/accumulo/test/ample/metadata/TestAmple.java
index 0b1c2b9e84c..4d8f8c44fd4 100644
--- a/test/src/main/java/org/apache/accumulo/test/ample/metadata/TestAmple.java
+++ b/test/src/main/java/org/apache/accumulo/test/ample/metadata/TestAmple.java
@@ -53,6 +53,7 @@
 import org.apache.accumulo.core.metadata.schema.MetadataSchema.TabletsSection;
 import org.apache.accumulo.core.metadata.schema.MetadataSchema.TabletsSection.ServerColumnFamily;
 import org.apache.accumulo.core.metadata.schema.MetadataTime;
+import org.apache.accumulo.core.metadata.schema.TabletMergeabilityMetadata;
 import org.apache.accumulo.core.metadata.schema.TabletsMetadata;
 import org.apache.accumulo.core.metadata.schema.TabletsMetadata.TableOptions;
 import org.apache.accumulo.core.security.Authorizations;
@@ -149,6 +150,7 @@ public void createMetadata(TableId tableId) {
         tabletMutator.putDirName(dirName);
         tabletMutator.putTime(new MetadataTime(0, TimeType.MILLIS));
         tabletMutator.putTabletAvailability(TabletAvailability.HOSTED);
+        tabletMutator.putTabletMergeability(TabletMergeabilityMetadata.never());
         tabletMutator.mutate();
       } catch (Exception e) {
         throw new IllegalStateException(e);
diff --git a/test/src/main/java/org/apache/accumulo/test/compaction/CompactionPriorityQueueMetricsIT.java b/test/src/main/java/org/apache/accumulo/test/compaction/CompactionPriorityQueueMetricsIT.java
index bdee45f9353..2a032565953 100644
--- a/test/src/main/java/org/apache/accumulo/test/compaction/CompactionPriorityQueueMetricsIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/compaction/CompactionPriorityQueueMetricsIT.java
@@ -109,7 +109,7 @@ public class CompactionPriorityQueueMetricsIT extends SharedMiniClusterBase {
   public static final String QUEUE1 = "METRICSQ1";
   public static final String QUEUE1_METRIC_LABEL = MetricsUtil.formatString(QUEUE1);
   public static final String QUEUE1_SERVICE = "Q1";
-  public static final int QUEUE1_SIZE = 6;
+  public static final int QUEUE1_SIZE = 10 * 1024;
 
   // Metrics collector Thread
   final LinkedBlockingQueue<TestStatsDSink.Metric> queueMetrics = new LinkedBlockingQueue<>();
@@ -202,7 +202,7 @@ public void configureMiniCluster(MiniAccumuloConfigImpl cfg, Configuration conf)
           Property.COMPACTION_SERVICE_PREFIX.getKey() + QUEUE1_SERVICE + ".planner.opts.groups",
           "[{'group':'" + QUEUE1 + "'}]");
 
-      cfg.setProperty(Property.MANAGER_COMPACTION_SERVICE_PRIORITY_QUEUE_INITIAL_SIZE, "6");
+      cfg.setProperty(Property.MANAGER_COMPACTION_SERVICE_PRIORITY_QUEUE_SIZE, "10K");
       cfg.getClusterServerConfiguration().addCompactorResourceGroup(QUEUE1, 0);
 
       // This test waits for dead compactors to be absent in zookeeper. The following setting will
diff --git a/test/src/main/java/org/apache/accumulo/test/compaction/ExternalCompactionProgressIT.java b/test/src/main/java/org/apache/accumulo/test/compaction/ExternalCompactionProgressIT.java
index 189ec857488..4ddcd01f9a2 100644
--- a/test/src/main/java/org/apache/accumulo/test/compaction/ExternalCompactionProgressIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/compaction/ExternalCompactionProgressIT.java
@@ -19,7 +19,7 @@
 package org.apache.accumulo.test.compaction;
 
 import static com.google.common.util.concurrent.Uninterruptibles.sleepUninterruptibly;
-import static java.util.concurrent.TimeUnit.NANOSECONDS;
+import static java.util.concurrent.TimeUnit.MILLISECONDS;
 import static org.apache.accumulo.core.metrics.Metric.COMPACTOR_ENTRIES_READ;
 import static org.apache.accumulo.core.metrics.Metric.COMPACTOR_ENTRIES_WRITTEN;
 import static org.apache.accumulo.test.compaction.ExternalCompactionTestUtils.GROUP1;
@@ -194,7 +194,7 @@ private static Thread getMetricsCheckerThread(AtomicLong totalEntriesRead,
           }
           TestStatsDSink.Metric metric = TestStatsDSink.parseStatsDMetric(s);
           final String metricName = metric.getName();
-          if (!metricName.startsWith("accumulo.compactor.entries")) {
+          if (!metricName.startsWith("accumulo.compaction.entries")) {
             continue;
           }
           int value = Integer.parseInt(metric.getValue());
@@ -335,7 +335,7 @@ private void checkRunning() throws TException {
         RunningCompactionInfo rci = new RunningCompactionInfo(ec);
         RunningCompactionInfo previousRci = runningMap.put(ecid, rci);
         log.debug("ECID {} has been running for {} seconds", ecid,
-            NANOSECONDS.toSeconds(rci.duration));
+            MILLISECONDS.toSeconds(rci.duration));
         if (previousRci == null) {
           log.debug("New ECID {} with inputFiles: {}", ecid, rci.numFiles);
         } else {
diff --git a/test/src/main/java/org/apache/accumulo/test/compaction/ExternalCompaction_1_IT.java b/test/src/main/java/org/apache/accumulo/test/compaction/ExternalCompaction_1_IT.java
index c8905cd850a..99002079d4a 100644
--- a/test/src/main/java/org/apache/accumulo/test/compaction/ExternalCompaction_1_IT.java
+++ b/test/src/main/java/org/apache/accumulo/test/compaction/ExternalCompaction_1_IT.java
@@ -18,7 +18,6 @@
  */
 package org.apache.accumulo.test.compaction;
 
-import static org.apache.accumulo.core.fate.AbstractFateStore.createDummyLockID;
 import static org.apache.accumulo.test.compaction.ExternalCompactionTestUtils.GROUP1;
 import static org.apache.accumulo.test.compaction.ExternalCompactionTestUtils.GROUP2;
 import static org.apache.accumulo.test.compaction.ExternalCompactionTestUtils.GROUP3;
@@ -74,6 +73,7 @@
 import org.apache.accumulo.core.data.Range;
 import org.apache.accumulo.core.data.TableId;
 import org.apache.accumulo.core.data.Value;
+import org.apache.accumulo.core.fate.Fate;
 import org.apache.accumulo.core.fate.FateId;
 import org.apache.accumulo.core.fate.FateInstanceType;
 import org.apache.accumulo.core.fate.FateKey;
@@ -86,6 +86,7 @@
 import org.apache.accumulo.core.iterators.IteratorEnvironment;
 import org.apache.accumulo.core.iterators.IteratorUtil.IteratorScope;
 import org.apache.accumulo.core.iterators.SortedKeyValueIterator;
+import org.apache.accumulo.core.lock.ServiceLock;
 import org.apache.accumulo.core.metadata.AccumuloTable;
 import org.apache.accumulo.core.metadata.ReferencedTabletFile;
 import org.apache.accumulo.core.metadata.schema.CompactionMetadata;
@@ -101,17 +102,20 @@
 import org.apache.accumulo.minicluster.ServerType;
 import org.apache.accumulo.miniclusterImpl.MiniAccumuloConfigImpl;
 import org.apache.accumulo.server.util.FindCompactionTmpFiles;
+import org.apache.accumulo.test.fate.TestLock;
 import org.apache.accumulo.test.functional.CompactionIT.ErrorThrowingSelector;
 import org.apache.accumulo.test.util.Wait;
 import org.apache.hadoop.conf.Configuration;
 import org.apache.hadoop.fs.Path;
 import org.apache.hadoop.io.Text;
+import org.junit.jupiter.api.AfterAll;
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Test;
 
 import com.google.common.base.Preconditions;
 
 public class ExternalCompaction_1_IT extends SharedMiniClusterBase {
+  private static ServiceLock testLock;
 
   public static class ExternalCompaction1Config implements MiniClusterConfigurationCallback {
     @Override
@@ -123,6 +127,14 @@ public void configureMiniCluster(MiniAccumuloConfigImpl cfg, Configuration coreS
   @BeforeAll
   public static void beforeTests() throws Exception {
     startMiniClusterWithConfig(new ExternalCompaction1Config());
+    testLock = new TestLock().createTestLock(getCluster().getServerContext());
+  }
+
+  @AfterAll
+  public static void afterTests() throws Exception {
+    if (testLock != null) {
+      testLock.unlock();
+    }
   }
 
   public static class TestFilter extends Filter {
@@ -236,7 +248,7 @@ public void testExternalCompaction() throws Exception {
   public void testCompactionCommitAndDeadDetectionRoot() throws Exception {
     var ctx = getCluster().getServerContext();
     FateStore<Manager> metaFateStore = new MetaFateStore<>(ctx.getZooKeeperRoot() + Constants.ZFATE,
-        ctx.getZooReaderWriter(), createDummyLockID(), null);
+        ctx.getZooSession(), testLock.getLockID(), null);
 
     try (AccumuloClient c = Accumulo.newClient().from(getClientProps()).build()) {
       var tableId = ctx.getTableId(AccumuloTable.ROOT.tableName());
@@ -255,7 +267,7 @@ public void testCompactionCommitAndDeadDetectionRoot() throws Exception {
   public void testCompactionCommitAndDeadDetectionMeta() throws Exception {
     var ctx = getCluster().getServerContext();
     FateStore<Manager> metaFateStore = new MetaFateStore<>(ctx.getZooKeeperRoot() + Constants.ZFATE,
-        ctx.getZooReaderWriter(), createDummyLockID(), null);
+        ctx.getZooSession(), testLock.getLockID(), null);
 
     try (AccumuloClient c = Accumulo.newClient().from(getClientProps()).build()) {
       // Metadata table by default already has 2 tablets
@@ -277,7 +289,8 @@ public void testCompactionCommitAndDeadDetectionUser() throws Exception {
     final String tableName = getUniqueNames(1)[0];
 
     try (AccumuloClient c = Accumulo.newClient().from(getClientProps()).build()) {
-      UserFateStore<Manager> userFateStore = new UserFateStore<>(ctx, createDummyLockID(), null);
+      UserFateStore<Manager> userFateStore =
+          new UserFateStore<>(ctx, AccumuloTable.FATE.tableName(), testLock.getLockID(), null);
       SortedSet<Text> splits = new TreeSet<>();
       splits.add(new Text(row(MAX_DATA / 2)));
       c.tableOperations().create(tableName, new NewTableConfiguration().withSplits(splits));
@@ -300,10 +313,11 @@ public void testCompactionCommitAndDeadDetectionAll() throws Exception {
     final String userTable = getUniqueNames(1)[0];
 
     try (AccumuloClient c = Accumulo.newClient().from(getClientProps()).build()) {
-      UserFateStore<Manager> userFateStore = new UserFateStore<>(ctx, createDummyLockID(), null);
+      UserFateStore<Manager> userFateStore =
+          new UserFateStore<>(ctx, AccumuloTable.FATE.tableName(), testLock.getLockID(), null);
       FateStore<Manager> metaFateStore =
-          new MetaFateStore<>(ctx.getZooKeeperRoot() + Constants.ZFATE, ctx.getZooReaderWriter(),
-              createDummyLockID(), null);
+          new MetaFateStore<>(ctx.getZooKeeperRoot() + Constants.ZFATE, ctx.getZooSession(),
+              testLock.getLockID(), null);
 
       SortedSet<Text> splits = new TreeSet<>();
       splits.add(new Text(row(MAX_DATA / 2)));
@@ -363,7 +377,7 @@ private FateId createCompactionCommitAndDeadMetadata(AccumuloClient c,
     // should never run. Its purpose is to prevent the dead compaction detector
     // from deleting the id.
     Repo<Manager> repo = new FakeRepo();
-    var fateId = fateStore.seedTransaction("COMPACTION_COMMIT",
+    var fateId = fateStore.seedTransaction(Fate.FateOperation.COMMIT_COMPACTION,
         FateKey.forCompactionCommit(allCids.get(tableId).get(0)), repo, true).orElseThrow();
 
     // Read the tablet metadata
diff --git a/test/src/main/java/org/apache/accumulo/test/compaction/ExternalDoNothingCompactor.java b/test/src/main/java/org/apache/accumulo/test/compaction/ExternalDoNothingCompactor.java
index afd4b271e25..6f937a68adb 100644
--- a/test/src/main/java/org/apache/accumulo/test/compaction/ExternalDoNothingCompactor.java
+++ b/test/src/main/java/org/apache/accumulo/test/compaction/ExternalDoNothingCompactor.java
@@ -28,7 +28,6 @@
 
 import org.apache.accumulo.compactor.Compactor;
 import org.apache.accumulo.core.cli.ConfigOpts;
-import org.apache.accumulo.core.compaction.thrift.CompactorService.Iface;
 import org.apache.accumulo.core.compaction.thrift.TCompactionState;
 import org.apache.accumulo.core.compaction.thrift.TCompactionStatusUpdate;
 import org.apache.accumulo.core.dataImpl.KeyExtent;
@@ -45,7 +44,7 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-public class ExternalDoNothingCompactor extends Compactor implements Iface {
+public class ExternalDoNothingCompactor extends Compactor {
 
   private static final Logger LOG = LoggerFactory.getLogger(ExternalDoNothingCompactor.class);
 
diff --git a/test/src/main/java/org/apache/accumulo/test/conf/PropStoreConfigIT.java b/test/src/main/java/org/apache/accumulo/test/conf/PropStoreConfigIT.java
index 0fb40ab9dea..2edf7eb0879 100644
--- a/test/src/main/java/org/apache/accumulo/test/conf/PropStoreConfigIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/conf/PropStoreConfigIT.java
@@ -243,7 +243,7 @@ public void permissionsTest() throws Exception {
       Thread.sleep(SECONDS.toMillis(3L));
 
       ServerContext serverContext = getCluster().getServerContext();
-      ZooReaderWriter zrw = serverContext.getZooReaderWriter();
+      ZooReaderWriter zrw = serverContext.getZooSession().asReaderWriter();
 
       // validate that a world-readable node has expected perms to validate test method
       var noAcl = zrw.getACL(ZooUtil.getRoot(serverContext.getInstanceID()));
diff --git a/test/src/main/java/org/apache/accumulo/test/conf/store/PropCacheCaffeineImplZkIT.java b/test/src/main/java/org/apache/accumulo/test/conf/store/PropCacheCaffeineImplZkIT.java
index bb96d3c7471..1bbb80ba31c 100644
--- a/test/src/main/java/org/apache/accumulo/test/conf/store/PropCacheCaffeineImplZkIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/conf/store/PropCacheCaffeineImplZkIT.java
@@ -24,10 +24,6 @@
 import static org.apache.accumulo.core.conf.Property.TSERV_NATIVEMAP_ENABLED;
 import static org.apache.accumulo.core.conf.Property.TSERV_SCAN_MAX_OPENFILES;
 import static org.apache.accumulo.harness.AccumuloITBase.ZOOKEEPER_TESTING_SERVER;
-import static org.easymock.EasyMock.createNiceMock;
-import static org.easymock.EasyMock.expect;
-import static org.easymock.EasyMock.replay;
-import static org.easymock.EasyMock.verify;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 import static org.junit.jupiter.api.Assertions.fail;
 
@@ -41,7 +37,8 @@
 import org.apache.accumulo.core.data.TableId;
 import org.apache.accumulo.core.fate.zookeeper.ZooReaderWriter;
 import org.apache.accumulo.core.fate.zookeeper.ZooUtil;
-import org.apache.accumulo.server.ServerContext;
+import org.apache.accumulo.core.zookeeper.ZooSession;
+import org.apache.accumulo.core.zookeeper.ZooSession.ZKUtil;
 import org.apache.accumulo.server.conf.codec.VersionedPropCodec;
 import org.apache.accumulo.server.conf.codec.VersionedProperties;
 import org.apache.accumulo.server.conf.store.TablePropKey;
@@ -51,9 +48,7 @@
 import org.apache.accumulo.server.conf.store.impl.ZooPropLoader;
 import org.apache.accumulo.test.zookeeper.ZooKeeperTestingServer;
 import org.apache.zookeeper.CreateMode;
-import org.apache.zookeeper.ZKUtil;
 import org.apache.zookeeper.ZooDefs;
-import org.apache.zookeeper.ZooKeeper;
 import org.junit.jupiter.api.AfterAll;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeAll;
@@ -72,34 +67,25 @@ public class PropCacheCaffeineImplZkIT {
 
   private static ZooKeeperTestingServer testZk = null;
   private static ZooReaderWriter zrw;
-  private static ZooKeeper zooKeeper;
+  private static ZooSession zk;
 
   private final TableId tIdA = TableId.of("A");
   private final TableId tIdB = TableId.of("B");
-  private static ServerContext context;
 
   @TempDir
   private static File tempDir;
 
   @BeforeAll
   public static void setupZk() throws Exception {
-    // using default zookeeper port - we don't have a full configuration
     testZk = new ZooKeeperTestingServer(tempDir);
-    zooKeeper = testZk.newClient();
-
-    zrw = testZk.getZooReaderWriter();
-    context = createNiceMock(ServerContext.class);
-    expect(context.getInstanceID()).andReturn(INSTANCE_ID).anyTimes();
-    expect(context.getZooReaderWriter()).andReturn(zrw).anyTimes();
-
-    replay(context);
+    zk = testZk.newClient();
+    zrw = zk.asReaderWriter();
   }
 
   @AfterAll
   public static void shutdownZK() throws Exception {
-    verify(context);
     try {
-      zooKeeper.close();
+      zk.close();
     } finally {
       testZk.close();
     }
@@ -108,24 +94,22 @@ public static void shutdownZK() throws Exception {
   @BeforeEach
   public void setupZnodes() throws Exception {
     zrw.mkdirs(ZooUtil.getRoot(INSTANCE_ID) + Constants.ZCONFIG);
-    zooKeeper.create(ZooUtil.getRoot(INSTANCE_ID) + Constants.ZTABLES, new byte[0],
+    zk.create(ZooUtil.getRoot(INSTANCE_ID) + Constants.ZTABLES, new byte[0],
         ZooDefs.Ids.OPEN_ACL_UNSAFE, CreateMode.PERSISTENT);
-    zooKeeper.create(ZooUtil.getRoot(INSTANCE_ID) + Constants.ZTABLES + "/" + tIdA.canonical(),
+    zk.create(ZooUtil.getRoot(INSTANCE_ID) + Constants.ZTABLES + "/" + tIdA.canonical(),
         new byte[0], ZooDefs.Ids.OPEN_ACL_UNSAFE, CreateMode.PERSISTENT);
-    zooKeeper.create(
-        ZooUtil.getRoot(INSTANCE_ID) + Constants.ZTABLES + "/" + tIdA.canonical() + "/conf",
+    zk.create(ZooUtil.getRoot(INSTANCE_ID) + Constants.ZTABLES + "/" + tIdA.canonical() + "/conf",
         new byte[0], ZooDefs.Ids.OPEN_ACL_UNSAFE, CreateMode.PERSISTENT);
 
-    zooKeeper.create(ZooUtil.getRoot(INSTANCE_ID) + Constants.ZTABLES + "/" + tIdB.canonical(),
+    zk.create(ZooUtil.getRoot(INSTANCE_ID) + Constants.ZTABLES + "/" + tIdB.canonical(),
         new byte[0], ZooDefs.Ids.OPEN_ACL_UNSAFE, CreateMode.PERSISTENT);
-    zooKeeper.create(
-        ZooUtil.getRoot(INSTANCE_ID) + Constants.ZTABLES + "/" + tIdB.canonical() + "/conf",
+    zk.create(ZooUtil.getRoot(INSTANCE_ID) + Constants.ZTABLES + "/" + tIdB.canonical() + "/conf",
         new byte[0], ZooDefs.Ids.OPEN_ACL_UNSAFE, CreateMode.PERSISTENT);
   }
 
   @AfterEach
   public void cleanupZnodes() throws Exception {
-    ZKUtil.deleteRecursive(zooKeeper, "/accumulo");
+    ZKUtil.deleteRecursive(zk, "/accumulo");
   }
 
   @Test
@@ -145,12 +129,11 @@ public void init() throws Exception {
 
     assertTrue(created, "expected properties to be created");
 
-    ReadyMonitor readyMonitor = new ReadyMonitor("test", zooKeeper.getSessionTimeout());
+    ReadyMonitor readyMonitor = new ReadyMonitor("test", zk.getSessionTimeout());
 
     PropStoreWatcher propStoreWatcher = new PropStoreWatcher(readyMonitor);
 
-    ZooPropLoader propLoader =
-        new ZooPropLoader(zrw, VersionedPropCodec.getDefault(), propStoreWatcher);
+    var propLoader = new ZooPropLoader(zk, VersionedPropCodec.getDefault(), propStoreWatcher);
     PropCacheCaffeineImpl cache = new PropCacheCaffeineImpl.Builder(propLoader).build();
 
     VersionedProperties readProps = cache.get(propStoreKey);
diff --git a/test/src/main/java/org/apache/accumulo/test/conf/store/PropStoreZooKeeperIT.java b/test/src/main/java/org/apache/accumulo/test/conf/store/PropStoreZooKeeperIT.java
index f185f933e09..d74dac8cc79 100644
--- a/test/src/main/java/org/apache/accumulo/test/conf/store/PropStoreZooKeeperIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/conf/store/PropStoreZooKeeperIT.java
@@ -19,6 +19,7 @@
 package org.apache.accumulo.test.conf.store;
 
 import static org.apache.accumulo.harness.AccumuloITBase.ZOOKEEPER_TESTING_SERVER;
+import static org.easymock.EasyMock.createMock;
 import static org.easymock.EasyMock.expect;
 import static org.easymock.EasyMock.replay;
 import static org.junit.jupiter.api.Assertions.assertEquals;
@@ -40,6 +41,8 @@
 import org.apache.accumulo.core.data.InstanceId;
 import org.apache.accumulo.core.data.TableId;
 import org.apache.accumulo.core.fate.zookeeper.ZooUtil;
+import org.apache.accumulo.core.zookeeper.ZooSession;
+import org.apache.accumulo.core.zookeeper.ZooSession.ZKUtil;
 import org.apache.accumulo.server.ServerContext;
 import org.apache.accumulo.server.conf.codec.VersionedPropCodec;
 import org.apache.accumulo.server.conf.codec.VersionedProperties;
@@ -51,11 +54,8 @@
 import org.apache.accumulo.test.zookeeper.ZooKeeperTestingServer;
 import org.apache.zookeeper.CreateMode;
 import org.apache.zookeeper.KeeperException;
-import org.apache.zookeeper.ZKUtil;
 import org.apache.zookeeper.ZooDefs;
-import org.apache.zookeeper.ZooKeeper;
 import org.apache.zookeeper.data.Stat;
-import org.easymock.EasyMock;
 import org.junit.jupiter.api.AfterAll;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeAll;
@@ -72,7 +72,7 @@ public class PropStoreZooKeeperIT {
   private static final Logger log = LoggerFactory.getLogger(PropStoreZooKeeperIT.class);
   private static final VersionedPropCodec propCodec = VersionedPropCodec.getDefault();
   private static ZooKeeperTestingServer testZk = null;
-  private static ZooKeeper zooKeeper;
+  private static ZooSession zk;
   private ServerContext context;
   private InstanceId instanceId = null;
   private PropStore propStore = null;
@@ -84,16 +84,14 @@ public class PropStoreZooKeeperIT {
 
   @BeforeAll
   public static void setupZk() throws Exception {
-    // using default zookeeper port - we don't have a full configuration
     testZk = new ZooKeeperTestingServer(tempDir);
-    zooKeeper = testZk.newClient();
-    ZooUtil.digestAuth(zooKeeper, ZooKeeperTestingServer.SECRET);
+    zk = testZk.newClient();
   }
 
   @AfterAll
   public static void shutdownZK() throws Exception {
     try {
-      zooKeeper.close();
+      zk.close();
     } finally {
       testZk.close();
     }
@@ -101,34 +99,31 @@ public static void shutdownZK() throws Exception {
 
   @BeforeEach
   public void setupZnodes() throws Exception {
-    var zrw = testZk.getZooReaderWriter();
     instanceId = InstanceId.of(UUID.randomUUID());
-    context = EasyMock.createNiceMock(ServerContext.class);
+    context = createMock(ServerContext.class);
     expect(context.getInstanceID()).andReturn(instanceId).anyTimes();
-    expect(context.getZooReaderWriter()).andReturn(zrw).anyTimes();
+    expect(context.getZooSession()).andReturn(zk).anyTimes();
 
     replay(context);
 
-    zrw.mkdirs(ZooUtil.getRoot(instanceId) + Constants.ZCONFIG);
-    zooKeeper.create(ZooUtil.getRoot(instanceId) + Constants.ZTABLES, new byte[0],
+    zk.asReaderWriter().mkdirs(ZooUtil.getRoot(instanceId) + Constants.ZCONFIG);
+    zk.create(ZooUtil.getRoot(instanceId) + Constants.ZTABLES, new byte[0],
         ZooDefs.Ids.OPEN_ACL_UNSAFE, CreateMode.PERSISTENT);
-    zooKeeper.create(ZooUtil.getRoot(instanceId) + Constants.ZTABLES + "/" + tIdA.canonical(),
-        new byte[0], ZooDefs.Ids.OPEN_ACL_UNSAFE, CreateMode.PERSISTENT);
-    zooKeeper.create(
-        ZooUtil.getRoot(instanceId) + Constants.ZTABLES + "/" + tIdA.canonical() + "/conf",
+    zk.create(ZooUtil.getRoot(instanceId) + Constants.ZTABLES + "/" + tIdA.canonical(), new byte[0],
+        ZooDefs.Ids.OPEN_ACL_UNSAFE, CreateMode.PERSISTENT);
+    zk.create(ZooUtil.getRoot(instanceId) + Constants.ZTABLES + "/" + tIdA.canonical() + "/conf",
         new byte[0], ZooDefs.Ids.OPEN_ACL_UNSAFE, CreateMode.PERSISTENT);
 
-    zooKeeper.create(ZooUtil.getRoot(instanceId) + Constants.ZTABLES + "/" + tIdB.canonical(),
-        new byte[0], ZooDefs.Ids.OPEN_ACL_UNSAFE, CreateMode.PERSISTENT);
-    zooKeeper.create(
-        ZooUtil.getRoot(instanceId) + Constants.ZTABLES + "/" + tIdB.canonical() + "/conf",
+    zk.create(ZooUtil.getRoot(instanceId) + Constants.ZTABLES + "/" + tIdB.canonical(), new byte[0],
+        ZooDefs.Ids.OPEN_ACL_UNSAFE, CreateMode.PERSISTENT);
+    zk.create(ZooUtil.getRoot(instanceId) + Constants.ZTABLES + "/" + tIdB.canonical() + "/conf",
         new byte[0], ZooDefs.Ids.OPEN_ACL_UNSAFE, CreateMode.PERSISTENT);
-    propStore = ZooPropStore.initialize(instanceId, context.getZooReaderWriter());
+    propStore = ZooPropStore.initialize(instanceId, context.getZooSession());
   }
 
   @AfterEach
   public void cleanupZnodes() throws Exception {
-    ZKUtil.deleteRecursive(zooKeeper, "/accumulo");
+    ZKUtil.deleteRecursive(zk, "/accumulo");
   }
 
   /**
@@ -139,7 +134,7 @@ public void createNoProps() throws InterruptedException, KeeperException {
     var propKey = TablePropKey.of(instanceId, tIdA);
 
     // read from ZK, after delete no node and node not created.
-    assertNull(zooKeeper.exists(propKey.getPath(), false));
+    assertNull(zk.exists(propKey.getPath(), null));
     assertThrows(IllegalStateException.class, () -> propStore.get(propKey));
   }
 
@@ -147,12 +142,12 @@ public void createNoProps() throws InterruptedException, KeeperException {
   public void failOnDuplicate() throws InterruptedException, KeeperException {
     var propKey = TablePropKey.of(instanceId, tIdA);
 
-    assertNull(zooKeeper.exists(propKey.getPath(), false)); // check node does not exist in ZK
+    assertNull(zk.exists(propKey.getPath(), null)); // check node does not exist in ZK
 
     propStore.create(propKey, Map.of());
     Thread.sleep(25); // yield.
 
-    assertNotNull(zooKeeper.exists(propKey.getPath(), false)); // check not created
+    assertNotNull(zk.exists(propKey.getPath(), null)); // check not created
     assertThrows(IllegalStateException.class, () -> propStore.create(propKey, null));
 
     assertNotNull(propStore.get(propKey));
@@ -170,7 +165,7 @@ public void createWithProps() throws InterruptedException, KeeperException, IOEx
     assertEquals("true", vProps.asMap().get(Property.TABLE_BLOOM_ENABLED.getKey()));
 
     // check using direct read from ZK
-    byte[] bytes = zooKeeper.getData(propKey.getPath(), false, new Stat());
+    byte[] bytes = zk.getData(propKey.getPath(), null, new Stat());
     var readFromZk = propCodec.fromBytes(0, bytes);
     var propsA = propStore.get(propKey);
     assertEquals(readFromZk.asMap(), propsA.asMap());
@@ -292,7 +287,7 @@ public void deleteThroughWatcher() throws InterruptedException {
     assertEquals("true", propsA.asMap().get(Property.TABLE_BLOOM_ENABLED.getKey()));
 
     // use alternate prop store - change will propagate via ZooKeeper
-    PropStore propStore2 = ZooPropStore.initialize(instanceId, context.getZooReaderWriter());
+    PropStore propStore2 = ZooPropStore.initialize(instanceId, context.getZooSession());
 
     propStore2.delete(tableAPropKey);
 
@@ -350,8 +345,8 @@ public void externalChange() throws IOException, InterruptedException, KeeperExc
 
     byte[] updatedBytes = propCodec.toBytes(pendingProps);
     // force external write to ZooKeeper
-    context.getZooReaderWriter().overwritePersistentData(tableAPropKey.getPath(), updatedBytes,
-        (int) firstRead.getDataVersion());
+    context.getZooSession().asReaderWriter().overwritePersistentData(tableAPropKey.getPath(),
+        updatedBytes, (int) firstRead.getDataVersion());
 
     Thread.sleep(150);
 
diff --git a/test/src/main/java/org/apache/accumulo/test/conf/store/ZooBasedConfigIT.java b/test/src/main/java/org/apache/accumulo/test/conf/store/ZooBasedConfigIT.java
index 285790b4b7e..36a7b9adbdf 100644
--- a/test/src/main/java/org/apache/accumulo/test/conf/store/ZooBasedConfigIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/conf/store/ZooBasedConfigIT.java
@@ -46,6 +46,8 @@
 import org.apache.accumulo.core.data.TableId;
 import org.apache.accumulo.core.fate.zookeeper.ZooReaderWriter;
 import org.apache.accumulo.core.fate.zookeeper.ZooUtil;
+import org.apache.accumulo.core.zookeeper.ZooSession;
+import org.apache.accumulo.core.zookeeper.ZooSession.ZKUtil;
 import org.apache.accumulo.server.ServerContext;
 import org.apache.accumulo.server.conf.NamespaceConfiguration;
 import org.apache.accumulo.server.conf.SystemConfiguration;
@@ -59,9 +61,7 @@
 import org.apache.accumulo.server.conf.store.impl.ZooPropStore;
 import org.apache.accumulo.test.zookeeper.ZooKeeperTestingServer;
 import org.apache.zookeeper.CreateMode;
-import org.apache.zookeeper.ZKUtil;
 import org.apache.zookeeper.ZooDefs;
-import org.apache.zookeeper.ZooKeeper;
 import org.apache.zookeeper.data.Stat;
 import org.junit.jupiter.api.AfterAll;
 import org.junit.jupiter.api.AfterEach;
@@ -82,7 +82,7 @@ public class ZooBasedConfigIT {
   private static final InstanceId INSTANCE_ID = InstanceId.of(UUID.randomUUID());
   private static ZooKeeperTestingServer testZk = null;
   private static ZooReaderWriter zrw;
-  private static ZooKeeper zooKeeper;
+  private static ZooSession zk;
   private ServerContext context;
 
   // fake ids
@@ -99,17 +99,15 @@ public class ZooBasedConfigIT {
 
   @BeforeAll
   public static void setupZk() throws Exception {
-    // using default zookeeper port - we don't have a full configuration
     testZk = new ZooKeeperTestingServer(tempDir);
-    zooKeeper = testZk.newClient();
-    ZooUtil.digestAuth(zooKeeper, ZooKeeperTestingServer.SECRET);
-    zrw = testZk.getZooReaderWriter();
+    zk = testZk.newClient();
+    zrw = zk.asReaderWriter();
   }
 
   @AfterAll
   public static void shutdownZK() throws Exception {
     try {
-      zooKeeper.close();
+      zk.close();
     } finally {
       testZk.close();
     }
@@ -118,19 +116,20 @@ public static void shutdownZK() throws Exception {
   @BeforeEach
   public void initPaths() throws Exception {
     context = createMock(ServerContext.class);
+    expect(context.getZooSession()).andReturn(zk);
     zrw.mkdirs(ZooUtil.getRoot(INSTANCE_ID));
 
-    zooKeeper.create(ZooUtil.getRoot(INSTANCE_ID) + Constants.ZTABLES, new byte[0],
+    zk.create(ZooUtil.getRoot(INSTANCE_ID) + Constants.ZTABLES, new byte[0],
         ZooDefs.Ids.OPEN_ACL_UNSAFE, CreateMode.PERSISTENT);
 
-    zooKeeper.create(ZooUtil.getRoot(INSTANCE_ID) + Constants.ZTABLES + "/" + tidA.canonical(),
+    zk.create(ZooUtil.getRoot(INSTANCE_ID) + Constants.ZTABLES + "/" + tidA.canonical(),
         new byte[0], ZooDefs.Ids.OPEN_ACL_UNSAFE, CreateMode.PERSISTENT);
-    zooKeeper.create(ZooUtil.getRoot(INSTANCE_ID) + Constants.ZTABLES + "/" + tidB.canonical(),
+    zk.create(ZooUtil.getRoot(INSTANCE_ID) + Constants.ZTABLES + "/" + tidB.canonical(),
         new byte[0], ZooDefs.Ids.OPEN_ACL_UNSAFE, CreateMode.PERSISTENT);
 
-    zooKeeper.create(ZooUtil.getRoot(INSTANCE_ID) + Constants.ZNAMESPACES, new byte[0],
+    zk.create(ZooUtil.getRoot(INSTANCE_ID) + Constants.ZNAMESPACES, new byte[0],
         ZooDefs.Ids.OPEN_ACL_UNSAFE, CreateMode.PERSISTENT);
-    zooKeeper.create(ZooUtil.getRoot(INSTANCE_ID) + Constants.ZNAMESPACES + "/" + nsId.canonical(),
+    zk.create(ZooUtil.getRoot(INSTANCE_ID) + Constants.ZNAMESPACES + "/" + nsId.canonical(),
         new byte[0], ZooDefs.Ids.OPEN_ACL_UNSAFE, CreateMode.PERSISTENT);
 
     ticker = new TestTicker();
@@ -139,12 +138,10 @@ public void initPaths() throws Exception {
 
     // setup context mock with enough to create prop store
     expect(context.getInstanceID()).andReturn(INSTANCE_ID).anyTimes();
-    expect(context.getZooReaderWriter()).andReturn(zrw).anyTimes();
-    expect(context.getZooKeepersSessionTimeOut()).andReturn(zrw.getSessionTimeout()).anyTimes();
 
     replay(context);
 
-    propStore = ZooPropStore.initialize(context.getInstanceID(), zrw);
+    propStore = ZooPropStore.initialize(context.getInstanceID(), zk);
 
     reset(context);
 
@@ -153,9 +150,7 @@ public void initPaths() throws Exception {
 
     // setup context mock with prop store and the rest of the env needed.
     expect(context.getInstanceID()).andReturn(INSTANCE_ID).anyTimes();
-    expect(context.getZooReaderWriter()).andReturn(zrw).anyTimes();
-    expect(context.getZooKeepersSessionTimeOut()).andReturn(zooKeeper.getSessionTimeout())
-        .anyTimes();
+    expect(context.getZooKeepersSessionTimeOut()).andReturn(zk.getSessionTimeout()).anyTimes();
     expect(context.getPropStore()).andReturn(propStore).anyTimes();
     expect(context.getSiteConfiguration()).andReturn(SiteConfiguration.empty().build()).anyTimes();
 
@@ -163,7 +158,7 @@ public void initPaths() throws Exception {
 
   @AfterEach
   public void cleanupZnodes() throws Exception {
-    ZKUtil.deleteRecursive(zooKeeper, "/accumulo");
+    ZKUtil.deleteRecursive(zk, "/accumulo");
     verify(context);
   }
 
@@ -175,7 +170,7 @@ public void cleanupZnodes() throws Exception {
   public void upgradeSysTestNoProps() throws Exception {
     replay(context);
     // force create empty sys config node.
-    zooKeeper.create(ZooUtil.getRoot(INSTANCE_ID) + Constants.ZCONFIG, new byte[0],
+    zk.create(ZooUtil.getRoot(INSTANCE_ID) + Constants.ZCONFIG, new byte[0],
         ZooDefs.Ids.OPEN_ACL_UNSAFE, CreateMode.PERSISTENT);
     var propKey = SystemPropKey.of(INSTANCE_ID);
     ZooBasedConfiguration zbc = new SystemConfiguration(context, propKey, parent);
diff --git a/test/src/main/java/org/apache/accumulo/test/fate/FastFate.java b/test/src/main/java/org/apache/accumulo/test/fate/FastFate.java
index 71b198c0ac9..f15fb6caaa1 100644
--- a/test/src/main/java/org/apache/accumulo/test/fate/FastFate.java
+++ b/test/src/main/java/org/apache/accumulo/test/fate/FastFate.java
@@ -27,7 +27,8 @@
 import org.apache.accumulo.core.fate.Repo;
 
 /**
- * A FATE which performs the dead reservation cleanup with a much shorter delay between
+ * A FATE which performs the dead reservation cleanup with a much shorter delay between. Useful for
+ * shortening test times for tests that are waiting for a cleanup to occur.
  */
 public class FastFate<T> extends Fate<T> {
 
@@ -38,6 +39,6 @@ public FastFate(T environment, FateStore<T> store, boolean runDeadResCleaner,
 
   @Override
   public Duration getDeadResCleanupDelay() {
-    return Duration.ofSeconds(15);
+    return Duration.ofSeconds(5);
   }
 }
diff --git a/test/src/main/java/org/apache/accumulo/test/fate/FateIT.java b/test/src/main/java/org/apache/accumulo/test/fate/FateIT.java
index f493292368c..292bc477f0e 100644
--- a/test/src/main/java/org/apache/accumulo/test/fate/FateIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/fate/FateIT.java
@@ -25,6 +25,7 @@
 import static org.apache.accumulo.core.fate.ReadOnlyFateStore.TStatus.NEW;
 import static org.apache.accumulo.core.fate.ReadOnlyFateStore.TStatus.SUBMITTED;
 import static org.apache.accumulo.core.fate.ReadOnlyFateStore.TStatus.UNKNOWN;
+import static org.apache.accumulo.test.fate.FateStoreUtil.TEST_FATE_OP;
 import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertFalse;
@@ -237,14 +238,14 @@ protected void testTransactionStatus(FateStore<TestEnv> store, ServerContext sct
     try {
 
       // Wait for the transaction runner to be scheduled.
-      Thread.sleep(3000);
+      Thread.sleep(Fate.INITIAL_DELAY.toMillis() * 2);
 
       callStarted = new CountDownLatch(1);
       finishCall = new CountDownLatch(1);
 
       FateId fateId = fate.startTransaction();
       assertEquals(TStatus.NEW, getTxStatus(sctx, fateId));
-      fate.seedTransaction("TestOperation", fateId, new TestRepo("testTransactionStatus"), true,
+      fate.seedTransaction(TEST_FATE_OP, fateId, new TestRepo("testTransactionStatus"), true,
           "Test Op");
       assertEquals(TStatus.SUBMITTED, getTxStatus(sctx, fateId));
       // wait for call() to be called
@@ -294,7 +295,7 @@ protected void testCancelWhileNew(FateStore<TestEnv> store, ServerContext sctx)
     try {
 
       // Wait for the transaction runner to be scheduled.
-      Thread.sleep(3000);
+      Thread.sleep(Fate.INITIAL_DELAY.toMillis() * 2);
 
       callStarted = new CountDownLatch(1);
       finishCall = new CountDownLatch(1);
@@ -306,7 +307,7 @@ protected void testCancelWhileNew(FateStore<TestEnv> store, ServerContext sctx)
       assertTrue(fate.cancel(fateId));
       assertTrue(
           FAILED_IN_PROGRESS == getTxStatus(sctx, fateId) || FAILED == getTxStatus(sctx, fateId));
-      fate.seedTransaction("TestOperation", fateId, new TestRepo("testCancelWhileNew"), true,
+      fate.seedTransaction(TEST_FATE_OP, fateId, new TestRepo("testCancelWhileNew"), true,
           "Test Op");
       Wait.waitFor(() -> FAILED == getTxStatus(sctx, fateId));
       // nothing should have run
@@ -329,7 +330,7 @@ protected void testCancelWhileSubmittedAndRunning(FateStore<TestEnv> store, Serv
     try {
 
       // Wait for the transaction runner to be scheduled.
-      Thread.sleep(3000);
+      Thread.sleep(Fate.INITIAL_DELAY.toMillis() * 2);
 
       callStarted = new CountDownLatch(1);
       finishCall = new CountDownLatch(1);
@@ -337,8 +338,8 @@ protected void testCancelWhileSubmittedAndRunning(FateStore<TestEnv> store, Serv
       FateId fateId = fate.startTransaction();
       LOG.debug("Starting test testCancelWhileSubmitted with {}", fateId);
       assertEquals(NEW, getTxStatus(sctx, fateId));
-      fate.seedTransaction("TestOperation", fateId,
-          new TestRepo("testCancelWhileSubmittedAndRunning"), false, "Test Op");
+      fate.seedTransaction(TEST_FATE_OP, fateId, new TestRepo("testCancelWhileSubmittedAndRunning"),
+          false, "Test Op");
       Wait.waitFor(() -> IN_PROGRESS == getTxStatus(sctx, fateId));
       // This is false because the transaction runner has reserved the FaTe
       // transaction.
@@ -364,7 +365,7 @@ protected void testCancelWhileInCall(FateStore<TestEnv> store, ServerContext sct
     try {
 
       // Wait for the transaction runner to be scheduled.
-      Thread.sleep(3000);
+      Thread.sleep(Fate.INITIAL_DELAY.toMillis() * 2);
 
       callStarted = new CountDownLatch(1);
       finishCall = new CountDownLatch(1);
@@ -372,7 +373,7 @@ protected void testCancelWhileInCall(FateStore<TestEnv> store, ServerContext sct
       FateId fateId = fate.startTransaction();
       LOG.debug("Starting test testCancelWhileInCall with {}", fateId);
       assertEquals(NEW, getTxStatus(sctx, fateId));
-      fate.seedTransaction("TestOperation", fateId, new TestRepo("testCancelWhileInCall"), true,
+      fate.seedTransaction(TEST_FATE_OP, fateId, new TestRepo("testCancelWhileInCall"), true,
           "Test Op");
       assertEquals(SUBMITTED, getTxStatus(sctx, fateId));
       // wait for call() to be called
@@ -401,7 +402,7 @@ protected void testDeferredOverflow(FateStore<TestEnv> store, ServerContext sctx
     try {
 
       // Wait for the transaction runner to be scheduled.
-      Thread.sleep(3000);
+      Thread.sleep(Fate.INITIAL_DELAY.toMillis() * 2);
 
       DeferredTestRepo.executedCalls.set(0);
       // Initialize the repo to have a delay of 30 seconds
@@ -478,7 +479,7 @@ protected void testRepoFails(FateStore<TestEnv> store, ServerContext sctx) throw
     try {
 
       // Wait for the transaction runner to be scheduled.
-      Thread.sleep(3000);
+      Thread.sleep(Fate.INITIAL_DELAY.toMillis() * 2);
 
       List<String> expectedUndoOrder = List.of("OP3", "OP2", "OP1");
       /*
@@ -488,8 +489,8 @@ protected void testRepoFails(FateStore<TestEnv> store, ServerContext sctx) throw
       undoLatch = new CountDownLatch(TestOperationFails.TOTAL_NUM_OPS);
       FateId fateId = fate.startTransaction();
       assertEquals(NEW, getTxStatus(sctx, fateId));
-      fate.seedTransaction("TestOperationFails", fateId,
-          new TestOperationFails(1, ExceptionLocation.CALL), false, "Test Op Fails");
+      fate.seedTransaction(TEST_FATE_OP, fateId, new TestOperationFails(1, ExceptionLocation.CALL),
+          false, "Test Op Fails");
       // Wait for all the undo() calls to complete
       undoLatch.await();
       assertEquals(expectedUndoOrder, TestOperationFails.undoOrder);
@@ -502,7 +503,7 @@ protected void testRepoFails(FateStore<TestEnv> store, ServerContext sctx) throw
       undoLatch = new CountDownLatch(TestOperationFails.TOTAL_NUM_OPS);
       fateId = fate.startTransaction();
       assertEquals(NEW, getTxStatus(sctx, fateId));
-      fate.seedTransaction("TestOperationFails", fateId,
+      fate.seedTransaction(TEST_FATE_OP, fateId,
           new TestOperationFails(1, ExceptionLocation.IS_READY), false, "Test Op Fails");
       // Wait for all the undo() calls to complete
       undoLatch.await();
@@ -546,8 +547,8 @@ private void submitDeferred(Fate<TestEnv> fate, ServerContext sctx, Set<FateId>
     FateId fateId = fate.startTransaction();
     transactions.add(fateId);
     assertEquals(TStatus.NEW, getTxStatus(sctx, fateId));
-    fate.seedTransaction("TestOperation", fateId, new DeferredTestRepo("testDeferredOverflow"),
-        true, "Test Op");
+    fate.seedTransaction(TEST_FATE_OP, fateId, new DeferredTestRepo("testDeferredOverflow"), true,
+        "Test Op");
     assertEquals(TStatus.SUBMITTED, getTxStatus(sctx, fateId));
   }
 
diff --git a/test/src/main/java/org/apache/accumulo/test/fate/FateOpsCommandsIT.java b/test/src/main/java/org/apache/accumulo/test/fate/FateOpsCommandsIT.java
index e72a5fb4217..b0f3d7ffeae 100644
--- a/test/src/main/java/org/apache/accumulo/test/fate/FateOpsCommandsIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/fate/FateOpsCommandsIT.java
@@ -18,7 +18,7 @@
  */
 package org.apache.accumulo.test.fate;
 
-import static org.apache.accumulo.core.fate.AbstractFateStore.createDummyLockID;
+import static org.apache.accumulo.test.fate.FateStoreUtil.TEST_FATE_OP;
 import static org.easymock.EasyMock.expect;
 import static org.easymock.EasyMock.replay;
 import static org.easymock.EasyMock.verify;
@@ -29,6 +29,7 @@
 import static org.junit.jupiter.api.Assertions.assertTrue;
 import static org.junit.jupiter.api.Assertions.fail;
 
+import java.io.IOException;
 import java.lang.reflect.Method;
 import java.time.Duration;
 import java.util.ArrayList;
@@ -50,8 +51,7 @@
 import org.apache.accumulo.core.client.IteratorSetting;
 import org.apache.accumulo.core.client.admin.NewTableConfiguration;
 import org.apache.accumulo.core.clientImpl.ClientContext;
-import org.apache.accumulo.core.conf.ConfigurationCopy;
-import org.apache.accumulo.core.conf.Property;
+import org.apache.accumulo.core.conf.DefaultConfiguration;
 import org.apache.accumulo.core.fate.AbstractFateStore;
 import org.apache.accumulo.core.fate.AdminUtil;
 import org.apache.accumulo.core.fate.Fate;
@@ -61,42 +61,37 @@
 import org.apache.accumulo.core.fate.ReadOnlyFateStore;
 import org.apache.accumulo.core.fate.user.UserFateStore;
 import org.apache.accumulo.core.fate.zookeeper.MetaFateStore;
-import org.apache.accumulo.core.fate.zookeeper.ZooReaderWriter;
 import org.apache.accumulo.core.fate.zookeeper.ZooUtil;
 import org.apache.accumulo.core.iterators.IteratorUtil;
 import org.apache.accumulo.core.lock.ServiceLockPaths.AddressSelector;
+import org.apache.accumulo.core.metadata.AccumuloTable;
+import org.apache.accumulo.core.zookeeper.ZooSession;
 import org.apache.accumulo.minicluster.ServerType;
 import org.apache.accumulo.miniclusterImpl.MiniAccumuloClusterImpl.ProcessInfo;
-import org.apache.accumulo.miniclusterImpl.MiniAccumuloConfigImpl;
 import org.apache.accumulo.server.ServerContext;
 import org.apache.accumulo.server.util.Admin;
 import org.apache.accumulo.server.util.fateCommand.FateSummaryReport;
 import org.apache.accumulo.server.util.fateCommand.FateTxnDetails;
+import org.apache.accumulo.test.fate.MultipleStoresIT.LatchTestEnv;
+import org.apache.accumulo.test.fate.MultipleStoresIT.LatchTestRepo;
 import org.apache.accumulo.test.functional.ConfigurableMacBase;
 import org.apache.accumulo.test.functional.ReadWriteIT;
 import org.apache.accumulo.test.functional.SlowIterator;
 import org.apache.accumulo.test.util.Wait;
-import org.apache.hadoop.conf.Configuration;
 import org.easymock.EasyMock;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
 public abstract class FateOpsCommandsIT extends ConfigurableMacBase
-    implements FateTestRunner<FateTestRunner.TestEnv> {
+    implements FateTestRunner<LatchTestEnv> {
 
   @Override
   protected Duration defaultTimeout() {
     return Duration.ofMinutes(3);
   }
 
-  @Override
-  public void configure(MiniAccumuloConfigImpl cfg, Configuration hadoopCoreSite) {
-    // Used for tests that shutdown the manager so the sleep time after shutdown isn't too long
-    cfg.setProperty(Property.INSTANCE_ZK_TIMEOUT.getKey(), "10s");
-  }
-
   @BeforeEach
-  public void shutdownCompactor() throws Exception {
+  public void beforeEachSetup() throws Exception {
     // Occasionally, the summary/print cmds will see a COMMIT_COMPACTION transaction which was
     // initiated on starting the manager, causing the test to fail. Stopping the compactor fixes
     // this issue.
@@ -110,10 +105,10 @@ public void testFateSummaryCommand() throws Exception {
     executeTest(this::testFateSummaryCommand);
   }
 
-  protected void testFateSummaryCommand(FateStore<TestEnv> store, ServerContext sctx)
+  protected void testFateSummaryCommand(FateStore<LatchTestEnv> store, ServerContext sctx)
       throws Exception {
     // Configure Fate
-    Fate<TestEnv> fate = initializeFate(store);
+    Fate<LatchTestEnv> fate = initFateNoDeadResCleaner(store);
 
     // validate blank report, no transactions have started
     ProcessInfo p = getCluster().exec(Admin.class, "fate", "--summary", "-j");
@@ -298,7 +293,7 @@ protected void testFateSummaryCommand(FateStore<TestEnv> store, ServerContext sc
       validateFateDetails(report.getFateDetails(), 2, fateIdsStarted);
     }
 
-    fate.shutdown(10, TimeUnit.MINUTES);
+    fate.shutdown(1, TimeUnit.MINUTES);
   }
 
   @Test
@@ -306,10 +301,10 @@ public void testFateSummaryCommandPlainText() throws Exception {
     executeTest(this::testFateSummaryCommandPlainText);
   }
 
-  protected void testFateSummaryCommandPlainText(FateStore<TestEnv> store, ServerContext sctx)
+  protected void testFateSummaryCommandPlainText(FateStore<LatchTestEnv> store, ServerContext sctx)
       throws Exception {
     // Configure Fate
-    Fate<TestEnv> fate = initializeFate(store);
+    Fate<LatchTestEnv> fate = initFateNoDeadResCleaner(store);
 
     // Start some transactions
     FateId fateId1 = fate.startTransaction();
@@ -326,7 +321,7 @@ protected void testFateSummaryCommandPlainText(FateStore<TestEnv> store, ServerC
             "Fate ID Filters: [" + fateId2.canonical() + ", " + fateId1.canonical() + "]"));
     assertTrue(result.contains("Instance Types Filters: [" + store.type().name() + "]"));
 
-    fate.shutdown(10, TimeUnit.MINUTES);
+    fate.shutdown(1, TimeUnit.MINUTES);
   }
 
   @Test
@@ -334,10 +329,10 @@ public void testFatePrintCommand() throws Exception {
     executeTest(this::testFatePrintCommand);
   }
 
-  protected void testFatePrintCommand(FateStore<TestEnv> store, ServerContext sctx)
+  protected void testFatePrintCommand(FateStore<LatchTestEnv> store, ServerContext sctx)
       throws Exception {
     // Configure Fate
-    Fate<TestEnv> fate = initializeFate(store);
+    Fate<LatchTestEnv> fate = initFateNoDeadResCleaner(store);
 
     // validate no transactions
     ProcessInfo p = getCluster().exec(Admin.class, "fate", "--print");
@@ -428,7 +423,7 @@ protected void testFatePrintCommand(FateStore<TestEnv> store, ServerContext sctx
       assertTrue(fateIdsFromResult.isEmpty());
     }
 
-    fate.shutdown(10, TimeUnit.MINUTES);
+    fate.shutdown(1, TimeUnit.MINUTES);
   }
 
   @Test
@@ -436,7 +431,7 @@ public void testTransactionNameAndStep() throws Exception {
     executeTest(this::testTransactionNameAndStep);
   }
 
-  protected void testTransactionNameAndStep(FateStore<TestEnv> store, ServerContext sctx)
+  protected void testTransactionNameAndStep(FateStore<LatchTestEnv> store, ServerContext sctx)
       throws Exception {
     // Since the other tests just use NEW transactions for simplicity, there are some fields of the
     // summary and print outputs which are null and not tested for (transaction name and transaction
@@ -504,10 +499,10 @@ public void testFateCancelCommand() throws Exception {
     executeTest(this::testFateCancelCommand);
   }
 
-  protected void testFateCancelCommand(FateStore<TestEnv> store, ServerContext sctx)
+  protected void testFateCancelCommand(FateStore<LatchTestEnv> store, ServerContext sctx)
       throws Exception {
     // Configure Fate
-    Fate<TestEnv> fate = initializeFate(store);
+    Fate<LatchTestEnv> fate = initFateNoDeadResCleaner(store);
 
     // Start some transactions
     FateId fateId1 = fate.startTransaction();
@@ -529,18 +524,19 @@ protected void testFateCancelCommand(FateStore<TestEnv> store, ServerContext sct
     assertEquals(Map.of(fateId1.canonical(), "FAILED", fateId2.canonical(), "NEW"),
         fateIdsFromSummary);
 
-    fate.shutdown(10, TimeUnit.MINUTES);
+    fate.shutdown(1, TimeUnit.MINUTES);
   }
 
   @Test
-  public void testFateFailCommand() throws Exception {
-    executeTest(this::testFateFailCommand);
+  public void testFateFailCommandTimeout() throws Exception {
+    stopManagerAndExecuteTest(this::testFateFailCommandTimeout);
   }
 
-  protected void testFateFailCommand(FateStore<TestEnv> store, ServerContext sctx)
+  protected void testFateFailCommandTimeout(FateStore<LatchTestEnv> store, ServerContext sctx)
       throws Exception {
     // Configure Fate
-    Fate<TestEnv> fate = initializeFate(store);
+    LatchTestEnv env = new LatchTestEnv();
+    FastFate<LatchTestEnv> fate = initFateWithDeadResCleaner(store, env);
 
     // Start some transactions
     FateId fateId1 = fate.startTransaction();
@@ -551,19 +547,50 @@ protected void testFateFailCommand(FateStore<TestEnv> store, ServerContext sctx)
     assertEquals(Map.of(fateId1.canonical(), "NEW", fateId2.canonical(), "NEW"),
         fateIdsFromSummary);
 
-    // Attempt to --fail the transaction. Should not work as the Manager is still up
+    // Seed the transaction with the latch repo, so we can have an IN_PROGRESS transaction
+    fate.seedTransaction(TEST_FATE_OP, fateId1, new LatchTestRepo(), true, "test");
+    // Wait for 'fate' to reserve fateId1 (will be IN_PROGRESS on fateId1)
+    Wait.waitFor(() -> env.numWorkers.get() == 1);
+
+    // Try to fail fateId1
+    // This should not work as it is already reserved and being worked on by our running FATE
+    // ('fate'). Admin should try to reserve it for a bit, but should fail and exit
     ProcessInfo p = getCluster().exec(Admin.class, "fate", fateId1.canonical(), "--fail");
-    assertEquals(1, p.getProcess().waitFor());
+    assertEquals(0, p.getProcess().waitFor());
+    String result = p.readStdOut();
+
+    assertTrue(result.contains("Could not fail " + fateId1 + " in a reasonable time"));
     fateIdsFromSummary = getFateIdsFromSummary();
-    assertEquals(Map.of(fateId1.canonical(), "NEW", fateId2.canonical(), "NEW"),
+    assertEquals(Map.of(fateId1.canonical(), "IN_PROGRESS", fateId2.canonical(), "NEW"),
         fateIdsFromSummary);
 
-    // Stop MANAGER so --fail can be called
-    getCluster().getClusterControl().stopAllServers(ServerType.MANAGER);
-    Thread.sleep(20_000);
+    // Finish work and shutdown
+    env.workersLatch.countDown();
+    fate.shutdown(1, TimeUnit.MINUTES);
+  }
+
+  @Test
+  public void testFateFailCommandSuccess() throws Exception {
+    executeTest(this::testFateFailCommandSuccess);
+  }
+
+  protected void testFateFailCommandSuccess(FateStore<LatchTestEnv> store, ServerContext sctx)
+      throws Exception {
+    // Configure Fate
+    Fate<LatchTestEnv> fate = initFateNoDeadResCleaner(store);
+
+    // Start some transactions
+    FateId fateId1 = fate.startTransaction();
+    FateId fateId2 = fate.startTransaction();
+
+    // Check that summary output lists both the transactions with a NEW status
+    Map<String,String> fateIdsFromSummary = getFateIdsFromSummary();
+    assertEquals(Map.of(fateId1.canonical(), "NEW", fateId2.canonical(), "NEW"),
+        fateIdsFromSummary);
 
-    // Fail the first transaction and ensure that it was failed
-    p = getCluster().exec(Admin.class, "fate", fateId1.canonical(), "--fail");
+    // Try to fail fateId1
+    // This should work since nothing has fateId1 reserved (it is NEW)
+    ProcessInfo p = getCluster().exec(Admin.class, "fate", fateId1.canonical(), "--fail");
     assertEquals(0, p.getProcess().waitFor());
     String result = p.readStdOut();
 
@@ -574,18 +601,19 @@ protected void testFateFailCommand(FateStore<TestEnv> store, ServerContext sctx)
         || fateIdsFromSummary
             .equals(Map.of(fateId1.canonical(), "FAILED", fateId2.canonical(), "NEW")));
 
-    fate.shutdown(10, TimeUnit.MINUTES);
+    fate.shutdown(1, TimeUnit.MINUTES);
   }
 
   @Test
-  public void testFateDeleteCommand() throws Exception {
-    executeTest(this::testFateDeleteCommand);
+  public void testFateDeleteCommandTimeout() throws Exception {
+    stopManagerAndExecuteTest(this::testFateDeleteCommandTimeout);
   }
 
-  protected void testFateDeleteCommand(FateStore<TestEnv> store, ServerContext sctx)
+  protected void testFateDeleteCommandTimeout(FateStore<LatchTestEnv> store, ServerContext sctx)
       throws Exception {
     // Configure Fate
-    Fate<TestEnv> fate = initializeFate(store);
+    LatchTestEnv env = new LatchTestEnv();
+    FastFate<LatchTestEnv> fate = initFateWithDeadResCleaner(store, env);
 
     // Start some transactions
     FateId fateId1 = fate.startTransaction();
@@ -596,19 +624,50 @@ protected void testFateDeleteCommand(FateStore<TestEnv> store, ServerContext sct
     assertEquals(Map.of(fateId1.canonical(), "NEW", fateId2.canonical(), "NEW"),
         fateIdsFromSummary);
 
-    // Attempt to --delete the transaction. Should not work as the Manager is still up
+    // Seed the transaction with the latch repo, so we can have an IN_PROGRESS transaction
+    fate.seedTransaction(TEST_FATE_OP, fateId1, new LatchTestRepo(), true, "test");
+    // Wait for 'fate' to reserve fateId1 (will be IN_PROGRESS on fateId1)
+    Wait.waitFor(() -> env.numWorkers.get() == 1);
+
+    // Try to delete fateId1
+    // This should not work as it is already reserved and being worked on by our running FATE
+    // ('fate'). Admin should try to reserve it for a bit, but should fail and exit
     ProcessInfo p = getCluster().exec(Admin.class, "fate", fateId1.canonical(), "--delete");
-    assertEquals(1, p.getProcess().waitFor());
+    assertEquals(0, p.getProcess().waitFor());
+    String result = p.readStdOut();
+
+    assertTrue(result.contains("Could not delete " + fateId1 + " in a reasonable time"));
     fateIdsFromSummary = getFateIdsFromSummary();
-    assertEquals(Map.of(fateId1.canonical(), "NEW", fateId2.canonical(), "NEW"),
+    assertEquals(Map.of(fateId1.canonical(), "IN_PROGRESS", fateId2.canonical(), "NEW"),
         fateIdsFromSummary);
 
-    // Stop MANAGER so --delete can be called
-    getCluster().getClusterControl().stopAllServers(ServerType.MANAGER);
-    Thread.sleep(20_000);
+    // Finish work and shutdown
+    env.workersLatch.countDown();
+    fate.shutdown(1, TimeUnit.MINUTES);
+  }
+
+  @Test
+  public void testFateDeleteCommandSuccess() throws Exception {
+    executeTest(this::testFateDeleteCommandSuccess);
+  }
+
+  protected void testFateDeleteCommandSuccess(FateStore<LatchTestEnv> store, ServerContext sctx)
+      throws Exception {
+    // Configure Fate
+    Fate<LatchTestEnv> fate = initFateNoDeadResCleaner(store);
+
+    // Start some transactions
+    FateId fateId1 = fate.startTransaction();
+    FateId fateId2 = fate.startTransaction();
 
-    // Delete the first transaction and ensure that it was deleted
-    p = getCluster().exec(Admin.class, "fate", fateId1.canonical(), "--delete");
+    // Check that summary output lists both the transactions with a NEW status
+    Map<String,String> fateIdsFromSummary = getFateIdsFromSummary();
+    assertEquals(Map.of(fateId1.canonical(), "NEW", fateId2.canonical(), "NEW"),
+        fateIdsFromSummary);
+
+    // Try to delete fateId1
+    // This should work since nothing has fateId1 reserved (it is NEW)
+    ProcessInfo p = getCluster().exec(Admin.class, "fate", fateId1.canonical(), "--delete");
     assertEquals(0, p.getProcess().waitFor());
     String result = p.readStdOut();
 
@@ -616,7 +675,7 @@ protected void testFateDeleteCommand(FateStore<TestEnv> store, ServerContext sct
     fateIdsFromSummary = getFateIdsFromSummary();
     assertEquals(Map.of(fateId2.canonical(), "NEW"), fateIdsFromSummary);
 
-    fate.shutdown(10, TimeUnit.MINUTES);
+    fate.shutdown(1, TimeUnit.MINUTES);
   }
 
   @Test
@@ -624,7 +683,7 @@ public void testFatePrintAndSummaryCommandsWithInProgressTxns() throws Exception
     executeTest(this::testFatePrintAndSummaryCommandsWithInProgressTxns);
   }
 
-  protected void testFatePrintAndSummaryCommandsWithInProgressTxns(FateStore<TestEnv> store,
+  protected void testFatePrintAndSummaryCommandsWithInProgressTxns(FateStore<LatchTestEnv> store,
       ServerContext sctx) throws Exception {
     // This test was written for an issue with the 'admin fate --print' and 'admin fate --summary'
     // commands where transactions could complete mid-print causing the command to fail. These
@@ -632,21 +691,20 @@ protected void testFatePrintAndSummaryCommandsWithInProgressTxns(FateStore<TestE
     // If a transaction completed between getting the list and probing for info on that
     // transaction, the command would fail. This test ensures that this problem has been fixed
     // (if the tx no longer exists, it should just be ignored so the print/summary can complete).
-    FateStore<TestEnv> mockedStore;
+    FateStore<LatchTestEnv> mockedStore;
 
     // This error was occurring in AdminUtil.getTransactionStatus(), so we will test this method.
     if (store.type().equals(FateInstanceType.USER)) {
       Method listMethod = UserFateStore.class.getMethod("list");
       mockedStore = EasyMock.createMockBuilder(UserFateStore.class)
-          .withConstructor(ClientContext.class, ZooUtil.LockID.class, Predicate.class)
-          .withArgs(sctx, createDummyLockID(), null).addMockedMethod(listMethod).createMock();
+          .withConstructor(ClientContext.class, String.class, ZooUtil.LockID.class, Predicate.class)
+          .withArgs(sctx, AccumuloTable.FATE.tableName(), null, null).addMockedMethod(listMethod)
+          .createMock();
     } else {
       Method listMethod = MetaFateStore.class.getMethod("list");
       mockedStore = EasyMock.createMockBuilder(MetaFateStore.class)
-          .withConstructor(String.class, ZooReaderWriter.class, ZooUtil.LockID.class,
-              Predicate.class)
-          .withArgs(sctx.getZooKeeperRoot() + Constants.ZFATE, sctx.getZooReaderWriter(),
-              createDummyLockID(), null)
+          .withConstructor(String.class, ZooSession.class, ZooUtil.LockID.class, Predicate.class)
+          .withArgs(sctx.getZooKeeperRoot() + Constants.ZFATE, sctx.getZooSession(), null, null)
           .addMockedMethod(listMethod).createMock();
     }
 
@@ -781,11 +839,17 @@ private void validateFateDetails(Set<FateTxnDetails> details, int expDetailsSize
     }
   }
 
-  private Fate<TestEnv> initializeFate(FateStore<TestEnv> store) {
-    ConfigurationCopy config = new ConfigurationCopy();
-    config.set(Property.GENERAL_THREADPOOL_SIZE, "2");
-    config.set(Property.MANAGER_FATE_THREADPOOL_SIZE, "1");
-    return new Fate<>(new TestEnv(), store, false, Object::toString, config);
+  protected FastFate<LatchTestEnv> initFateWithDeadResCleaner(FateStore<LatchTestEnv> store,
+      LatchTestEnv env) {
+    // Using FastFate so the cleanup will run often. This ensures that the cleanup will run when
+    // there are reservations present and that the cleanup will not unexpectedly delete these live
+    // reservations
+    return new FastFate<>(env, store, true, Object::toString, DefaultConfiguration.getInstance());
+  }
+
+  protected Fate<LatchTestEnv> initFateNoDeadResCleaner(FateStore<LatchTestEnv> store) {
+    return new Fate<>(new LatchTestEnv(), store, false, Object::toString,
+        DefaultConfiguration.getInstance());
   }
 
   private boolean wordIsTStatus(String word) {
@@ -796,4 +860,19 @@ private boolean wordIsTStatus(String word) {
     }
     return true;
   }
+
+  /**
+   * Stop the MANAGER. For some of our tests, we want to be able to seed transactions with our own
+   * test repos. We want our fate to reserve these transactions (and not the real fates running in
+   * the Manager as that will lead to exceptions since the real fates wouldn't be able to handle our
+   * test repos). So, we essentially have the fates created here acting as the real fates: they have
+   * the same threads running that the real fates would, use a fate store with a ZK lock, use the
+   * same locations to store fate data that the Manager does, and are running in a separate process
+   * from the Admin process. Note that we cannot simply use different locations for our fate data
+   * from Manager to keep our test env separate from Manager. Admin uses the real fate data
+   * locations, so our test must also use the real locations.
+   */
+  protected void stopManager() throws IOException {
+    getCluster().getClusterControl().stopAllServers(ServerType.MANAGER);
+  }
 }
diff --git a/test/src/main/java/org/apache/accumulo/test/fate/FateStoreIT.java b/test/src/main/java/org/apache/accumulo/test/fate/FateStoreIT.java
index 1980dcf4eee..d029ebb4892 100644
--- a/test/src/main/java/org/apache/accumulo/test/fate/FateStoreIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/fate/FateStoreIT.java
@@ -19,6 +19,7 @@
 package org.apache.accumulo.test.fate;
 
 import static java.nio.charset.StandardCharsets.UTF_8;
+import static org.apache.accumulo.test.fate.FateStoreUtil.TEST_FATE_OP;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertFalse;
 import static org.junit.jupiter.api.Assertions.assertInstanceOf;
@@ -298,8 +299,8 @@ protected void testCreateWithKey(FateStore<TestEnv> store, ServerContext sctx) {
     FateKey fateKey2 =
         FateKey.forCompactionCommit(ExternalCompactionId.generate(UUID.randomUUID()));
 
-    var fateId1 = store.seedTransaction("TEST", fateKey1, new TestRepo(), true).orElseThrow();
-    var fateId2 = store.seedTransaction("TEST", fateKey2, new TestRepo(), true).orElseThrow();
+    var fateId1 = store.seedTransaction(TEST_FATE_OP, fateKey1, new TestRepo(), true).orElseThrow();
+    var fateId2 = store.seedTransaction(TEST_FATE_OP, fateKey2, new TestRepo(), true).orElseThrow();
 
     assertNotEquals(fateId1, fateId2);
 
@@ -333,11 +334,11 @@ protected void testCreateWithKeyDuplicate(FateStore<TestEnv> store, ServerContex
         new KeyExtent(TableId.of(getUniqueNames(1)[0]), new Text("zzz"), new Text("aaa"));
 
     FateKey fateKey = FateKey.forSplit(ke);
-    var fateId = store.seedTransaction("TEST", fateKey, new TestRepo(), true).orElseThrow();
+    var fateId = store.seedTransaction(TEST_FATE_OP, fateKey, new TestRepo(), true).orElseThrow();
 
     // second call is empty
-    assertTrue(store.seedTransaction("TEST", fateKey, new TestRepo(), true).isEmpty());
-    assertFalse(store.seedTransaction("TEST", fateId, new TestRepo(), true));
+    assertTrue(store.seedTransaction(TEST_FATE_OP, fateKey, new TestRepo(), true).isEmpty());
+    assertFalse(store.seedTransaction(TEST_FATE_OP, fateId, new TestRepo(), true));
 
     var txStore = store.reserve(fateId);
     try {
@@ -362,7 +363,7 @@ protected void testCreateWithKeyInProgress(FateStore<TestEnv> store, ServerConte
         new KeyExtent(TableId.of(getUniqueNames(1)[0]), new Text("zzz"), new Text("aaa"));
     FateKey fateKey = FateKey.forSplit(ke);
 
-    var fateId = store.seedTransaction("TEST", fateKey, new TestRepo(), true).orElseThrow();
+    var fateId = store.seedTransaction(TEST_FATE_OP, fateKey, new TestRepo(), true).orElseThrow();
 
     var txStore = store.reserve(fateId);
     try {
@@ -371,7 +372,7 @@ protected void testCreateWithKeyInProgress(FateStore<TestEnv> store, ServerConte
 
       // We have an existing transaction with the same key in progress
       // so should return an empty Optional
-      assertTrue(store.seedTransaction("TEST", fateKey, new TestRepo(), true).isEmpty());
+      assertTrue(store.seedTransaction(TEST_FATE_OP, fateKey, new TestRepo(), true).isEmpty());
       assertEquals(TStatus.IN_PROGRESS, txStore.getStatus());
     } finally {
       txStore.setStatus(TStatus.SUCCESSFUL);
@@ -383,7 +384,8 @@ protected void testCreateWithKeyInProgress(FateStore<TestEnv> store, ServerConte
 
     try {
       // After deletion, make sure we can create again with the same key
-      var fateId2 = store.seedTransaction("TEST", fateKey, new TestRepo(), true).orElseThrow();
+      var fateId2 =
+          store.seedTransaction(TEST_FATE_OP, fateKey, new TestRepo(), true).orElseThrow();
       txStore = store.reserve(fateId);
       assertEquals(fateId, fateId2);
       assertTrue(txStore.timeCreated() > 0);
@@ -424,10 +426,10 @@ protected void testCreateWithKeyCollision(FateStore<TestEnv> store, ServerContex
     FateKey fateKey1 = FateKey.forSplit(ke1);
     FateKey fateKey2 = FateKey.forSplit(ke2);
 
-    var fateId1 = store.seedTransaction("TEST", fateKey1, new TestRepo(), true).orElseThrow();
+    var fateId1 = store.seedTransaction(TEST_FATE_OP, fateKey1, new TestRepo(), true).orElseThrow();
     var txStore = store.reserve(fateId1);
     try {
-      assertTrue(store.seedTransaction("TEST", fateKey2, new TestRepo(), true).isEmpty());
+      assertTrue(store.seedTransaction(TEST_FATE_OP, fateKey2, new TestRepo(), true).isEmpty());
       assertEquals(fateKey1, txStore.getKey().orElseThrow());
     } finally {
       txStore.delete();
@@ -447,14 +449,14 @@ protected void testCollisionWithRandomFateId(FateStore<TestEnv> store, ServerCon
         new KeyExtent(TableId.of(getUniqueNames(1)[0]), new Text("zzz"), new Text("aaa"));
 
     FateKey fateKey = FateKey.forSplit(ke);
-    var fateId = store.seedTransaction("TEST", fateKey, new TestRepo(), true).orElseThrow();
+    var fateId = store.seedTransaction(TEST_FATE_OP, fateKey, new TestRepo(), true).orElseThrow();
 
     // After seeding a fate transaction using a key we can simulate a collision with
     // a random FateId by deleting the key out of Fate and calling seed again to
     // verify it detects the key is missing. Then we can continue and see if we can still use
     // the existing transaction.
     deleteKey(fateId, sctx);
-    assertTrue(store.seedTransaction("TEST", fateKey, new TestRepo(), true).isEmpty());
+    assertTrue(store.seedTransaction(TEST_FATE_OP, fateKey, new TestRepo(), true).isEmpty());
 
     var txStore = store.reserve(fateId);
     // We should still be able to use the existing transaction
@@ -600,8 +602,8 @@ protected void testConcurrent(FateStore<TestEnv> store, ServerContext sctx) thro
       // have 10 threads all try to seed the same fate key, only one should succeed.
       List<Future<Optional<FateId>>> futures = new ArrayList<>(10);
       for (int i = 0; i < 10; i++) {
-        futures.add(
-            executor.submit(() -> store.seedTransaction("TEST", fateKey, new TestRepo(), true)));
+        futures.add(executor
+            .submit(() -> store.seedTransaction(TEST_FATE_OP, fateKey, new TestRepo(), true)));
       }
 
       int idsSeen = 0;
@@ -683,7 +685,7 @@ protected void testListFateKeys(FateStore<TestEnv> store, ServerContext sctx) th
 
     Map<FateKey,FateId> fateKeyIds = new HashMap<>();
     for (FateKey fateKey : List.of(fateKey1, fateKey2, fateKey3, fateKey4)) {
-      var fateId = store.seedTransaction("TEST", fateKey, new TestRepo(), true).orElseThrow();
+      var fateId = store.seedTransaction(TEST_FATE_OP, fateKey, new TestRepo(), true).orElseThrow();
       fateKeyIds.put(fateKey, fateId);
     }
 
diff --git a/test/src/main/java/org/apache/accumulo/test/fate/FateStoreUtil.java b/test/src/main/java/org/apache/accumulo/test/fate/FateStoreUtil.java
index 1f96bd9b94f..6c7b482d884 100644
--- a/test/src/main/java/org/apache/accumulo/test/fate/FateStoreUtil.java
+++ b/test/src/main/java/org/apache/accumulo/test/fate/FateStoreUtil.java
@@ -30,8 +30,9 @@
 import org.apache.accumulo.core.client.admin.TabletInformation;
 import org.apache.accumulo.core.clientImpl.ClientContext;
 import org.apache.accumulo.core.data.Range;
-import org.apache.accumulo.core.fate.zookeeper.ZooReaderWriter;
+import org.apache.accumulo.core.fate.Fate;
 import org.apache.accumulo.core.metadata.AccumuloTable;
+import org.apache.accumulo.core.zookeeper.ZooSession;
 import org.apache.accumulo.test.zookeeper.ZooKeeperTestingServer;
 import org.junit.jupiter.api.Tag;
 import org.junit.jupiter.api.io.TempDir;
@@ -39,9 +40,14 @@
 import com.google.common.collect.MoreCollectors;
 
 /**
- * A class with utility methods for testing UserFateStore and MetaFateStore
+ * A class with utilities for testing {@link org.apache.accumulo.core.fate.user.UserFateStore} and
+ * {@link org.apache.accumulo.core.fate.zookeeper.MetaFateStore}
  */
 public class FateStoreUtil {
+  // A FateOperation for testing purposes when a FateOperation is needed but whose value doesn't
+  // matter
+  public static final Fate.FateOperation TEST_FATE_OP = Fate.FateOperation.TABLE_CREATE;
+
   /**
    * Create the fate table with the exact configuration as the real Fate user instance table
    * including table properties and TabletAvailability. For use in testing UserFateStore
@@ -73,7 +79,7 @@ public static void createFateTable(ClientContext client, String table) throws Ex
   @Tag(ZOOKEEPER_TESTING_SERVER)
   public static class MetaFateZKSetup {
     private static ZooKeeperTestingServer szk;
-    private static ZooReaderWriter zk;
+    private static ZooSession zk;
     private static final String ZK_ROOT = "/accumulo/" + UUID.randomUUID();
     private static String ZK_FATE_PATH;
 
@@ -82,10 +88,11 @@ public static class MetaFateZKSetup {
      */
     public static void setup(@TempDir File tempDir) throws Exception {
       szk = new ZooKeeperTestingServer(tempDir);
-      zk = szk.getZooReaderWriter();
+      zk = szk.newClient();
       ZK_FATE_PATH = ZK_ROOT + Constants.ZFATE;
-      zk.mkdirs(ZK_FATE_PATH);
-      zk.mkdirs(ZK_ROOT + Constants.ZTABLE_LOCKS);
+      var zrw = zk.asReaderWriter();
+      zrw.mkdirs(ZK_FATE_PATH);
+      zrw.mkdirs(ZK_ROOT + Constants.ZTABLE_LOCKS);
     }
 
     /**
@@ -99,7 +106,7 @@ public static String getZkRoot() {
       return ZK_ROOT;
     }
 
-    public static ZooReaderWriter getZooReaderWriter() {
+    public static ZooSession getZk() {
       return zk;
     }
 
diff --git a/test/src/main/java/org/apache/accumulo/test/fate/FateTestRunner.java b/test/src/main/java/org/apache/accumulo/test/fate/FateTestRunner.java
index 244f7991116..dc9b7d22fc6 100644
--- a/test/src/main/java/org/apache/accumulo/test/fate/FateTestRunner.java
+++ b/test/src/main/java/org/apache/accumulo/test/fate/FateTestRunner.java
@@ -34,6 +34,11 @@ default void executeTest(FateTestExecutor<T> testMethod) throws Exception {
         AbstractFateStore.DEFAULT_FATE_ID_GENERATOR);
   }
 
+  default void stopManagerAndExecuteTest(FateTestExecutor<MultipleStoresIT.LatchTestEnv> testMethod)
+      throws Exception {
+    throw new UnsupportedOperationException("Not implemented");
+  }
+
   interface FateTestExecutor<T> {
     void execute(FateStore<T> store, ServerContext sctx) throws Exception;
   }
diff --git a/test/src/main/java/org/apache/accumulo/test/fate/ManagerRepoIT.java b/test/src/main/java/org/apache/accumulo/test/fate/ManagerRepoIT.java
index a0cf45ee796..3b524d90bcb 100644
--- a/test/src/main/java/org/apache/accumulo/test/fate/ManagerRepoIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/fate/ManagerRepoIT.java
@@ -198,7 +198,7 @@ public void testSplitOffline() throws Exception {
       assertEquals(opid, testAmple.readTablet(extent).getOperationId());
 
       var eoRepo = new AllocateDirsAndEnsureOnline(
-          new SplitInfo(extent, new TreeSet<>(List.of(new Text("sp1")))));
+          new SplitInfo(extent, new TreeSet<>(List.of(new Text("sp1"))), true));
 
       // The repo should delete the opid and throw an exception
       assertThrows(ThriftTableOperationException.class, () -> eoRepo.call(fateId, manager));
diff --git a/test/src/main/java/org/apache/accumulo/test/fate/MultipleStoresIT.java b/test/src/main/java/org/apache/accumulo/test/fate/MultipleStoresIT.java
index 292f1fdfb43..f4eb390701e 100644
--- a/test/src/main/java/org/apache/accumulo/test/fate/MultipleStoresIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/fate/MultipleStoresIT.java
@@ -18,6 +18,7 @@
  */
 package org.apache.accumulo.test.fate;
 
+import static org.apache.accumulo.test.fate.FateStoreUtil.TEST_FATE_OP;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertFalse;
 import static org.junit.jupiter.api.Assertions.assertThrows;
@@ -253,10 +254,10 @@ private void testMultipleFateInstances(TestStoreFactory<SleepingTestEnv> testSto
       // Start half the txns using fate1, and the other half using fate2
       if (i % 2 == 0) {
         fateId = fate1.startTransaction();
-        fate1.seedTransaction("op" + i, fateId, new SleepingTestRepo(), true, "test");
+        fate1.seedTransaction(TEST_FATE_OP, fateId, new SleepingTestRepo(), true, "test");
       } else {
         fateId = fate2.startTransaction();
-        fate2.seedTransaction("op" + i, fateId, new SleepingTestRepo(), true, "test");
+        fate2.seedTransaction(TEST_FATE_OP, fateId, new SleepingTestRepo(), true, "test");
       }
       allIds.add(fateId);
     }
@@ -311,7 +312,7 @@ private void testDeadReservationsCleanup(TestStoreFactory<LatchTestEnv> testStor
     for (int i = 0; i < numFateIds; i++) {
       FateId fateId;
       fateId = fate1.startTransaction();
-      fate1.seedTransaction("op" + i, fateId, new LatchTestRepo(), true, "test");
+      fate1.seedTransaction(TEST_FATE_OP, fateId, new LatchTestRepo(), true, "test");
       allIds.add(fateId);
     }
     assertEquals(numFateIds, allIds.size());
@@ -341,8 +342,8 @@ private void testDeadReservationsCleanup(TestStoreFactory<LatchTestEnv> testStor
 
     // Create the new Fate/start the Fate threads (the work finder and the workers).
     // Don't run another dead reservation cleaner since we already have one running from fate1.
-    FastFate<LatchTestEnv> fate2 = new FastFate<>(testEnv2, store2, false, Object::toString,
-        DefaultConfiguration.getInstance());
+    Fate<LatchTestEnv> fate2 =
+        new Fate<>(testEnv2, store2, false, Object::toString, DefaultConfiguration.getInstance());
 
     // Wait for the "dead" reservations to be deleted and picked up again (reserved using
     // fate2/store2/lock2 now).
@@ -461,5 +462,5 @@ protected interface MultipleStoresTestExecutor<T extends MultipleStoresTestEnv>
     void execute(TestStoreFactory<T> fateStoreFactory) throws Exception;
   }
 
-  protected static class MultipleStoresTestEnv {}
+  protected static class MultipleStoresTestEnv extends FateTestRunner.TestEnv {}
 }
diff --git a/test/src/main/java/org/apache/accumulo/test/fate/TestLock.java b/test/src/main/java/org/apache/accumulo/test/fate/TestLock.java
new file mode 100644
index 00000000000..733b21379dd
--- /dev/null
+++ b/test/src/main/java/org/apache/accumulo/test/fate/TestLock.java
@@ -0,0 +1,115 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.accumulo.test.fate;
+
+import java.util.UUID;
+import java.util.concurrent.CountDownLatch;
+
+import org.apache.accumulo.core.Constants;
+import org.apache.accumulo.core.fate.user.UserFateStore;
+import org.apache.accumulo.core.fate.zookeeper.MetaFateStore;
+import org.apache.accumulo.core.fate.zookeeper.ZooUtil;
+import org.apache.accumulo.core.fate.zookeeper.ZooUtil.NodeExistsPolicy;
+import org.apache.accumulo.core.lock.ServiceLock;
+import org.apache.accumulo.core.lock.ServiceLockData;
+import org.apache.accumulo.core.lock.ServiceLockPaths;
+import org.apache.accumulo.server.ServerContext;
+import org.apache.zookeeper.KeeperException;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class TestLock {
+  private static final Logger log = LoggerFactory.getLogger(TestLock.class);
+  final CountDownLatch lockAcquiredLatch;
+
+  public TestLock() {
+    this.lockAcquiredLatch = new CountDownLatch(1);
+  }
+
+  /**
+   * Used to create a dummy lock id to be passed in the creation of a {@link UserFateStore} or a
+   * {@link MetaFateStore}. Useful as a quicker and simpler alternative to
+   * {@link TestLock#createTestLock(ServerContext)} for tests where reserving transactions is needed
+   * AND the reservations for the test will be stored in a different location from the Managers fate
+   * stores. Can always use {@link TestLock#createTestLock(ServerContext)} to be safe if unsure
+   * which to use.
+   */
+  public static ZooUtil.LockID createDummyLockID() {
+    return new ZooUtil.LockID("/path", "node", 123);
+  }
+
+  /**
+   * Used to create a real lock (one held in ZK) to be passed in the creation of a
+   * {@link UserFateStore} or a {@link MetaFateStore}. Useful for tests where reserving transactions
+   * is needed AND the reservations for the test will be stored in the same location as the Managers
+   * fate stores. This is needed so the Manager will recognize and not delete these reservations.
+   * See similar {@link TestLock#createDummyLockID()}
+   */
+  public ServiceLock createTestLock(ServerContext context) throws InterruptedException {
+    var zk = context.getZooSession();
+    UUID uuid = UUID.randomUUID();
+    ServiceLockPaths.ServiceLockPath slp = context.getServerPaths().createTestLockPath();
+    ServiceLock lock = new ServiceLock(zk, slp, uuid);
+    TestLockWatcher lw = new TestLockWatcher();
+    ServiceLockData.ServiceDescriptors descriptors = new ServiceLockData.ServiceDescriptors();
+    descriptors
+        .addService(new ServiceLockData.ServiceDescriptor(uuid, ServiceLockData.ThriftService.NONE,
+            "fake_test_host", Constants.DEFAULT_RESOURCE_GROUP_NAME));
+    ServiceLockData sld = new ServiceLockData(descriptors);
+    String lockPath = slp.toString();
+    String parentLockPath = lockPath.substring(0, lockPath.lastIndexOf("/"));
+
+    try {
+      var zrw = zk.asReaderWriter();
+      zrw.putPersistentData(parentLockPath, new byte[0], NodeExistsPolicy.SKIP);
+      zrw.putPersistentData(lockPath, new byte[0], NodeExistsPolicy.SKIP);
+    } catch (KeeperException | InterruptedException e) {
+      throw new IllegalStateException("Error creating path in ZooKeeper", e);
+    }
+
+    lock.lock(lw, sld);
+    lockAcquiredLatch.await();
+
+    return lock;
+  }
+
+  class TestLockWatcher implements ServiceLock.AccumuloLockWatcher {
+
+    @Override
+    public void lostLock(ServiceLock.LockLossReason reason) {
+      log.warn("Lost lock: " + reason.toString());
+    }
+
+    @Override
+    public void unableToMonitorLockNode(Exception e) {
+      log.warn("Unable to monitor lock: " + e.getMessage());
+    }
+
+    @Override
+    public void acquiredLock() {
+      lockAcquiredLatch.countDown();
+      log.debug("Acquired ZooKeeper lock for test");
+    }
+
+    @Override
+    public void failedToAcquireLock(Exception e) {
+      log.warn("Failed to acquire ZooKeeper lock for test, msg: " + e.getMessage());
+    }
+  }
+}
diff --git a/test/src/main/java/org/apache/accumulo/test/fate/meta/MetaFateExecutionOrderIT.java b/test/src/main/java/org/apache/accumulo/test/fate/meta/MetaFateExecutionOrderIT.java
index 9aa742348b9..99d14656ec3 100644
--- a/test/src/main/java/org/apache/accumulo/test/fate/meta/MetaFateExecutionOrderIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/fate/meta/MetaFateExecutionOrderIT.java
@@ -18,7 +18,7 @@
  */
 package org.apache.accumulo.test.fate.meta;
 
-import static org.apache.accumulo.core.fate.AbstractFateStore.createDummyLockID;
+import static org.apache.accumulo.test.fate.TestLock.createDummyLockID;
 
 import java.util.UUID;
 
@@ -26,7 +26,6 @@
 import org.apache.accumulo.core.data.InstanceId;
 import org.apache.accumulo.core.fate.AbstractFateStore;
 import org.apache.accumulo.core.fate.zookeeper.MetaFateStore;
-import org.apache.accumulo.core.fate.zookeeper.ZooReaderWriter;
 import org.apache.accumulo.core.fate.zookeeper.ZooUtil;
 import org.apache.accumulo.server.ServerContext;
 import org.apache.accumulo.test.fate.FateExecutionOrderIT;
@@ -42,8 +41,8 @@ public void executeTest(FateTestExecutor<FeoTestEnv> testMethod, int maxDeferred
       AbstractFateStore.FateIdGenerator fateIdGenerator) throws Exception {
     ServerContext sctx = getCluster().getServerContext();
     String path = ZK_ROOT + Constants.ZFATE;
-    ZooReaderWriter zk = sctx.getZooReaderWriter();
-    zk.mkdirs(ZK_ROOT);
+    var zk = sctx.getZooSession();
+    zk.asReaderWriter().mkdirs(ZK_ROOT);
     testMethod.execute(new MetaFateStore<>(path, zk, createDummyLockID(), null), sctx);
   }
 }
diff --git a/test/src/main/java/org/apache/accumulo/test/fate/meta/MetaFateIT.java b/test/src/main/java/org/apache/accumulo/test/fate/meta/MetaFateIT.java
index ded495b9581..5c7a0c26fb1 100644
--- a/test/src/main/java/org/apache/accumulo/test/fate/meta/MetaFateIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/fate/meta/MetaFateIT.java
@@ -18,7 +18,7 @@
  */
 package org.apache.accumulo.test.fate.meta;
 
-import static org.apache.accumulo.core.fate.AbstractFateStore.createDummyLockID;
+import static org.apache.accumulo.test.fate.TestLock.createDummyLockID;
 import static org.easymock.EasyMock.createMock;
 import static org.easymock.EasyMock.expect;
 import static org.easymock.EasyMock.replay;
@@ -32,7 +32,7 @@
 import org.apache.accumulo.core.fate.FateId;
 import org.apache.accumulo.core.fate.ReadOnlyFateStore.TStatus;
 import org.apache.accumulo.core.fate.zookeeper.MetaFateStore;
-import org.apache.accumulo.core.fate.zookeeper.ZooReaderWriter;
+import org.apache.accumulo.core.zookeeper.ZooSession;
 import org.apache.accumulo.server.ServerContext;
 import org.apache.accumulo.test.fate.FateIT;
 import org.apache.accumulo.test.fate.FateStoreUtil;
@@ -60,21 +60,22 @@ public static void teardown() throws Exception {
   public void executeTest(FateTestExecutor<TestEnv> testMethod, int maxDeferred,
       FateIdGenerator fateIdGenerator) throws Exception {
     String zkRoot = FateStoreUtil.MetaFateZKSetup.getZkRoot();
-    var zooReaderWriter = FateStoreUtil.MetaFateZKSetup.getZooReaderWriter();
+    var zk = FateStoreUtil.MetaFateZKSetup.getZk();
     String fatePath = FateStoreUtil.MetaFateZKSetup.getZkFatePath();
     ServerContext sctx = createMock(ServerContext.class);
     expect(sctx.getZooKeeperRoot()).andReturn(zkRoot).anyTimes();
-    expect(sctx.getZooReaderWriter()).andReturn(zooReaderWriter).anyTimes();
+    expect(sctx.getZooSession()).andReturn(zk).anyTimes();
     replay(sctx);
 
-    testMethod.execute(new MetaFateStore<>(fatePath, zooReaderWriter, createDummyLockID(), null,
-        maxDeferred, fateIdGenerator), sctx);
+    testMethod.execute(
+        new MetaFateStore<>(fatePath, zk, createDummyLockID(), null, maxDeferred, fateIdGenerator),
+        sctx);
   }
 
   @Override
   protected TStatus getTxStatus(ServerContext sctx, FateId fateId) {
     try {
-      return getTxStatus(sctx.getZooReaderWriter(), fateId);
+      return getTxStatus(sctx.getZooSession(), fateId);
     } catch (KeeperException | InterruptedException e) {
       throw new IllegalStateException(e);
     }
@@ -84,9 +85,10 @@ protected TStatus getTxStatus(ServerContext sctx, FateId fateId) {
    * Get the status of the TX from ZK directly. Unable to call MetaFateStore.getStatus because this
    * test thread does not have the reservation (the FaTE thread does)
    */
-  private static TStatus getTxStatus(ZooReaderWriter zrw, FateId fateId)
+  private static TStatus getTxStatus(ZooSession zk, FateId fateId)
       throws KeeperException, InterruptedException {
     String zkRoot = FateStoreUtil.MetaFateZKSetup.getZkRoot();
+    var zrw = zk.asReaderWriter();
     zrw.sync(zkRoot);
     String txdir = String.format("%s%s/tx_%s", zkRoot, Constants.ZFATE, fateId.getTxUUIDStr());
 
diff --git a/test/src/main/java/org/apache/accumulo/test/fate/meta/MetaFateOpsCommandsIT.java b/test/src/main/java/org/apache/accumulo/test/fate/meta/MetaFateOpsCommandsIT.java
index c4c1e5b24a5..7009e55dd28 100644
--- a/test/src/main/java/org/apache/accumulo/test/fate/meta/MetaFateOpsCommandsIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/fate/meta/MetaFateOpsCommandsIT.java
@@ -18,22 +18,58 @@
  */
 package org.apache.accumulo.test.fate.meta;
 
-import static org.apache.accumulo.core.fate.AbstractFateStore.createDummyLockID;
+import java.util.function.Predicate;
 
 import org.apache.accumulo.core.Constants;
 import org.apache.accumulo.core.fate.AbstractFateStore;
+import org.apache.accumulo.core.fate.FateStore;
 import org.apache.accumulo.core.fate.zookeeper.MetaFateStore;
-import org.apache.accumulo.core.fate.zookeeper.ZooReaderWriter;
+import org.apache.accumulo.core.fate.zookeeper.ZooUtil;
+import org.apache.accumulo.core.lock.ServiceLock;
 import org.apache.accumulo.server.ServerContext;
 import org.apache.accumulo.test.fate.FateOpsCommandsIT;
+import org.apache.accumulo.test.fate.MultipleStoresIT.LatchTestEnv;
+import org.apache.accumulo.test.fate.TestLock;
 
 public class MetaFateOpsCommandsIT extends FateOpsCommandsIT {
+  /**
+   * This should be used for tests that will not seed a txn with work/reserve a txn. Note that this
+   * should be used in conjunction with
+   * {@link FateOpsCommandsIT#initFateNoDeadResCleaner(FateStore)}
+   */
   @Override
-  public void executeTest(FateTestExecutor<TestEnv> testMethod, int maxDeferred,
+  public void executeTest(FateTestExecutor<LatchTestEnv> testMethod, int maxDeferred,
       AbstractFateStore.FateIdGenerator fateIdGenerator) throws Exception {
-    ServerContext sctx = getCluster().getServerContext();
-    String path = sctx.getZooKeeperRoot() + Constants.ZFATE;
-    ZooReaderWriter zk = sctx.getZooReaderWriter();
-    testMethod.execute(new MetaFateStore<>(path, zk, createDummyLockID(), null), sctx);
+    ServerContext context = getCluster().getServerContext();
+    String path = context.getZooKeeperRoot() + Constants.ZFATE;
+    var zk = context.getZooSession();
+    // test should not be reserving txns or checking reservations, so null lockID and isLockHeld
+    testMethod.execute(new MetaFateStore<>(path, zk, null, null), context);
+  }
+
+  /**
+   * This should be used for tests that will seed a txn with work/reserve a txn. Note that this
+   * should be used in conjunction with
+   * {@link FateOpsCommandsIT#initFateWithDeadResCleaner(FateStore, LatchTestEnv)}
+   */
+  @Override
+  public void stopManagerAndExecuteTest(FateTestExecutor<LatchTestEnv> testMethod)
+      throws Exception {
+    stopManager();
+    ServerContext context = getCluster().getServerContext();
+    String path = context.getZooKeeperRoot() + Constants.ZFATE;
+    var zk = context.getZooSession();
+    ServiceLock testLock = null;
+    try {
+      testLock = new TestLock().createTestLock(context);
+      ZooUtil.LockID lockID = testLock.getLockID();
+      Predicate<ZooUtil.LockID> isLockHeld =
+          lock -> ServiceLock.isLockHeld(context.getZooCache(), lock);
+      testMethod.execute(new MetaFateStore<>(path, zk, lockID, isLockHeld), context);
+    } finally {
+      if (testLock != null) {
+        testLock.unlock();
+      }
+    }
   }
 }
diff --git a/test/src/main/java/org/apache/accumulo/test/fate/meta/MetaFateStatusEnforcementIT.java b/test/src/main/java/org/apache/accumulo/test/fate/meta/MetaFateStatusEnforcementIT.java
index 4800e6816e6..e5165d982ab 100644
--- a/test/src/main/java/org/apache/accumulo/test/fate/meta/MetaFateStatusEnforcementIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/fate/meta/MetaFateStatusEnforcementIT.java
@@ -18,9 +18,10 @@
  */
 package org.apache.accumulo.test.fate.meta;
 
+import static org.apache.accumulo.test.fate.TestLock.createDummyLockID;
+
 import java.io.File;
 
-import org.apache.accumulo.core.fate.AbstractFateStore;
 import org.apache.accumulo.core.fate.zookeeper.MetaFateStore;
 import org.apache.accumulo.test.fate.FateStatusEnforcementIT;
 import org.apache.accumulo.test.fate.FateStoreUtil;
@@ -46,8 +47,7 @@ public static void afterAllTeardown() throws Exception {
   @BeforeEach
   public void beforeEachSetup() throws Exception {
     store = new MetaFateStore<>(FateStoreUtil.MetaFateZKSetup.getZkFatePath(),
-        FateStoreUtil.MetaFateZKSetup.getZooReaderWriter(), AbstractFateStore.createDummyLockID(),
-        null);
+        FateStoreUtil.MetaFateZKSetup.getZk(), createDummyLockID(), null);
     fateId = store.create();
     txStore = store.reserve(fateId);
   }
diff --git a/test/src/main/java/org/apache/accumulo/test/fate/meta/MetaFateStoreFateIT.java b/test/src/main/java/org/apache/accumulo/test/fate/meta/MetaFateStoreFateIT.java
index 66d01b1489a..5bb43d4b8ca 100644
--- a/test/src/main/java/org/apache/accumulo/test/fate/meta/MetaFateStoreFateIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/fate/meta/MetaFateStoreFateIT.java
@@ -18,8 +18,8 @@
  */
 package org.apache.accumulo.test.fate.meta;
 
-import static org.apache.accumulo.core.fate.AbstractFateStore.createDummyLockID;
 import static org.apache.accumulo.harness.AccumuloITBase.ZOOKEEPER_TESTING_SERVER;
+import static org.apache.accumulo.test.fate.TestLock.createDummyLockID;
 import static org.easymock.EasyMock.createMock;
 import static org.easymock.EasyMock.expect;
 import static org.easymock.EasyMock.replay;
@@ -71,13 +71,11 @@ public void executeTest(FateTestExecutor<TestEnv> testMethod, int maxDeferred,
       FateIdGenerator fateIdGenerator) throws Exception {
     ServerContext sctx = createMock(ServerContext.class);
     expect(sctx.getZooKeeperRoot()).andReturn(FateStoreUtil.MetaFateZKSetup.getZkRoot()).anyTimes();
-    expect(sctx.getZooReaderWriter()).andReturn(FateStoreUtil.MetaFateZKSetup.getZooReaderWriter())
-        .anyTimes();
+    expect(sctx.getZooSession()).andReturn(FateStoreUtil.MetaFateZKSetup.getZk()).anyTimes();
     replay(sctx);
-    MetaFateStore<TestEnv> store =
-        new MetaFateStore<>(FateStoreUtil.MetaFateZKSetup.getZkFatePath(),
-            FateStoreUtil.MetaFateZKSetup.getZooReaderWriter(), createDummyLockID(), null,
-            maxDeferred, fateIdGenerator);
+    MetaFateStore<TestEnv> store = new MetaFateStore<>(
+        FateStoreUtil.MetaFateZKSetup.getZkFatePath(), FateStoreUtil.MetaFateZKSetup.getZk(),
+        createDummyLockID(), null, maxDeferred, fateIdGenerator);
 
     // Check that the store has no transactions before and after each test
     assertEquals(0, store.list().count());
@@ -117,7 +115,7 @@ protected void deleteKey(FateId fateId, ServerContext sctx) {
       String txPath =
           FateStoreUtil.MetaFateZKSetup.getZkFatePath() + "/tx_" + fateId.getTxUUIDStr();
       Object currentNode = serializedCons.newInstance(
-          new Object[] {FateStoreUtil.MetaFateZKSetup.getZooReaderWriter().getData(txPath)});
+          new Object[] {FateStoreUtil.MetaFateZKSetup.getZk().asReader().getData(txPath)});
       TStatus currentStatus = (TStatus) status.get(currentNode);
       Optional<FateStore.FateReservation> currentReservation =
           getCurrentReservation(reservation, currentNode);
@@ -129,7 +127,7 @@ protected void deleteKey(FateId fateId, ServerContext sctx) {
       Object newNode = fateDataCons.newInstance(currentStatus, currentReservation.orElse(null),
           null, currentRepoDeque, currentTxInfo);
 
-      FateStoreUtil.MetaFateZKSetup.getZooReaderWriter().putPersistentData(txPath,
+      FateStoreUtil.MetaFateZKSetup.getZk().asReaderWriter().putPersistentData(txPath,
           (byte[]) nodeSerialize.invoke(newNode), NodeExistsPolicy.OVERWRITE);
     } catch (Exception e) {
       throw new IllegalStateException(e);
diff --git a/test/src/main/java/org/apache/accumulo/test/fate/meta/MetaMultipleStoresIT.java b/test/src/main/java/org/apache/accumulo/test/fate/meta/MetaMultipleStoresIT.java
index d5d1903493b..b7d11278737 100644
--- a/test/src/main/java/org/apache/accumulo/test/fate/meta/MetaMultipleStoresIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/fate/meta/MetaMultipleStoresIT.java
@@ -62,7 +62,7 @@ static class SleepingEnvMetaStoreFactory implements TestStoreFactory<SleepingTes
     public FateStore<SleepingTestEnv> create(ZooUtil.LockID lockID,
         Predicate<ZooUtil.LockID> isLockHeld) throws InterruptedException, KeeperException {
       return new MetaFateStore<>(FateStoreUtil.MetaFateZKSetup.getZkFatePath(),
-          FateStoreUtil.MetaFateZKSetup.getZooReaderWriter(), lockID, isLockHeld);
+          FateStoreUtil.MetaFateZKSetup.getZk(), lockID, isLockHeld);
     }
   }
 
@@ -71,7 +71,7 @@ static class LatchEnvMetaStoreFactory implements TestStoreFactory<LatchTestEnv>
     public FateStore<LatchTestEnv> create(ZooUtil.LockID lockID,
         Predicate<ZooUtil.LockID> isLockHeld) throws InterruptedException, KeeperException {
       return new MetaFateStore<>(FateStoreUtil.MetaFateZKSetup.getZkFatePath(),
-          FateStoreUtil.MetaFateZKSetup.getZooReaderWriter(), lockID, isLockHeld);
+          FateStoreUtil.MetaFateZKSetup.getZk(), lockID, isLockHeld);
     }
   }
 }
diff --git a/test/src/main/java/org/apache/accumulo/test/fate/meta/ZooMutatorIT.java b/test/src/main/java/org/apache/accumulo/test/fate/meta/ZooMutatorIT.java
index fdfb0ec37e8..f3e67b8dc6d 100644
--- a/test/src/main/java/org/apache/accumulo/test/fate/meta/ZooMutatorIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/fate/meta/ZooMutatorIT.java
@@ -81,8 +81,8 @@ public class ZooMutatorIT extends WithTestNames {
   public void concurrentMutatorTest() throws Exception {
     File newFolder = new File(tempDir, testName() + "/");
     assertTrue(newFolder.isDirectory() || newFolder.mkdir(), "failed to create dir: " + newFolder);
-    try (ZooKeeperTestingServer szk = new ZooKeeperTestingServer(newFolder)) {
-      ZooReaderWriter zk = szk.getZooReaderWriter();
+    try (var testZk = new ZooKeeperTestingServer(newFolder); var zk = testZk.newClient()) {
+      var zrw = zk.asReaderWriter();
 
       var executor = Executors.newFixedThreadPool(16);
 
@@ -101,7 +101,7 @@ public void concurrentMutatorTest() throws Exception {
             int count = -1;
             while (count < 200) {
               byte[] val =
-                  zk.mutateOrCreate("/test-zm", initialData.getBytes(UTF_8), this::nextValue);
+                  zrw.mutateOrCreate("/test-zm", initialData.getBytes(UTF_8), this::nextValue);
               int nextCount = getCount(val);
               assertTrue(nextCount > count, "nextCount <= count " + nextCount + " " + count);
               count = nextCount;
@@ -120,7 +120,7 @@ public void concurrentMutatorTest() throws Exception {
       }
       executor.shutdown();
 
-      byte[] actual = zk.getData("/test-zm");
+      byte[] actual = zrw.getData("/test-zm");
       int settledCount = getCount(actual);
 
       assertTrue(settledCount >= 200);
diff --git a/test/src/main/java/org/apache/accumulo/test/fate/user/UserFateExecutionOrderIT.java b/test/src/main/java/org/apache/accumulo/test/fate/user/UserFateExecutionOrderIT.java
index 969d589e584..ec16596df67 100644
--- a/test/src/main/java/org/apache/accumulo/test/fate/user/UserFateExecutionOrderIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/fate/user/UserFateExecutionOrderIT.java
@@ -18,8 +18,8 @@
  */
 package org.apache.accumulo.test.fate.user;
 
-import static org.apache.accumulo.core.fate.AbstractFateStore.createDummyLockID;
 import static org.apache.accumulo.test.fate.FateStoreUtil.createFateTable;
+import static org.apache.accumulo.test.fate.TestLock.createDummyLockID;
 
 import org.apache.accumulo.core.client.Accumulo;
 import org.apache.accumulo.core.clientImpl.ClientContext;
diff --git a/test/src/main/java/org/apache/accumulo/test/fate/user/UserFateIT.java b/test/src/main/java/org/apache/accumulo/test/fate/user/UserFateIT.java
index 014b6c97bcb..26b8103e4d6 100644
--- a/test/src/main/java/org/apache/accumulo/test/fate/user/UserFateIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/fate/user/UserFateIT.java
@@ -18,8 +18,8 @@
  */
 package org.apache.accumulo.test.fate.user;
 
-import static org.apache.accumulo.core.fate.AbstractFateStore.createDummyLockID;
 import static org.apache.accumulo.test.fate.FateStoreUtil.createFateTable;
+import static org.apache.accumulo.test.fate.TestLock.createDummyLockID;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
diff --git a/test/src/main/java/org/apache/accumulo/test/fate/user/UserFateOpsCommandsIT.java b/test/src/main/java/org/apache/accumulo/test/fate/user/UserFateOpsCommandsIT.java
index 3fe3192e6ba..92f5fae847f 100644
--- a/test/src/main/java/org/apache/accumulo/test/fate/user/UserFateOpsCommandsIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/fate/user/UserFateOpsCommandsIT.java
@@ -18,18 +18,56 @@
  */
 package org.apache.accumulo.test.fate.user;
 
-import static org.apache.accumulo.core.fate.AbstractFateStore.createDummyLockID;
+import java.util.function.Predicate;
 
 import org.apache.accumulo.core.fate.AbstractFateStore;
+import org.apache.accumulo.core.fate.FateStore;
 import org.apache.accumulo.core.fate.user.UserFateStore;
+import org.apache.accumulo.core.fate.zookeeper.ZooUtil;
+import org.apache.accumulo.core.lock.ServiceLock;
+import org.apache.accumulo.core.metadata.AccumuloTable;
 import org.apache.accumulo.test.fate.FateOpsCommandsIT;
+import org.apache.accumulo.test.fate.MultipleStoresIT.LatchTestEnv;
+import org.apache.accumulo.test.fate.TestLock;
 
 public class UserFateOpsCommandsIT extends FateOpsCommandsIT {
+  /**
+   * This should be used for tests that will not seed a txn with work/reserve a txn. Note that this
+   * should be used in conjunction with
+   * {@link FateOpsCommandsIT#initFateNoDeadResCleaner(FateStore)}
+   */
   @Override
-  public void executeTest(FateTestExecutor<TestEnv> testMethod, int maxDeferred,
+  public void executeTest(FateTestExecutor<LatchTestEnv> testMethod, int maxDeferred,
       AbstractFateStore.FateIdGenerator fateIdGenerator) throws Exception {
-    testMethod.execute(
-        new UserFateStore<>(getCluster().getServerContext(), createDummyLockID(), null),
-        getCluster().getServerContext());
+    var context = getCluster().getServerContext();
+    // the test should not be reserving or checking reservations, so null lockID and isLockHeld
+    testMethod.execute(new UserFateStore<>(context, AccumuloTable.FATE.tableName(), null, null),
+        context);
+  }
+
+  /**
+   * This should be used for tests that will seed a txn with work/reserve a txn. Note that this
+   * should be used in conjunction with
+   * {@link FateOpsCommandsIT#initFateWithDeadResCleaner(FateStore, LatchTestEnv)}
+   */
+  @Override
+  public void stopManagerAndExecuteTest(FateTestExecutor<LatchTestEnv> testMethod)
+      throws Exception {
+    stopManager();
+    var context = getCluster().getServerContext();
+    ServiceLock testLock = null;
+    try {
+      testLock = new TestLock().createTestLock(context);
+      ZooUtil.LockID lockID = testLock.getLockID();
+      Predicate<ZooUtil.LockID> isLockHeld =
+          lock -> ServiceLock.isLockHeld(context.getZooCache(), lock);
+      testMethod.execute(
+          new UserFateStore<>(context, AccumuloTable.FATE.tableName(), lockID, isLockHeld),
+          context);
+    } finally {
+      if (testLock != null) {
+        testLock.unlock();
+      }
+    }
   }
 }
diff --git a/test/src/main/java/org/apache/accumulo/test/fate/user/UserFateStatusEnforcementIT.java b/test/src/main/java/org/apache/accumulo/test/fate/user/UserFateStatusEnforcementIT.java
index 22ecb9fe6e2..904882fcf29 100644
--- a/test/src/main/java/org/apache/accumulo/test/fate/user/UserFateStatusEnforcementIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/fate/user/UserFateStatusEnforcementIT.java
@@ -19,10 +19,10 @@
 package org.apache.accumulo.test.fate.user;
 
 import static org.apache.accumulo.test.fate.FateStoreUtil.createFateTable;
+import static org.apache.accumulo.test.fate.TestLock.createDummyLockID;
 
 import org.apache.accumulo.core.client.Accumulo;
 import org.apache.accumulo.core.clientImpl.ClientContext;
-import org.apache.accumulo.core.fate.AbstractFateStore;
 import org.apache.accumulo.core.fate.user.UserFateStore;
 import org.apache.accumulo.harness.SharedMiniClusterBase;
 import org.apache.accumulo.test.fate.FateStatusEnforcementIT;
@@ -50,7 +50,7 @@ public void beforeEachSetup() throws Exception {
     client = (ClientContext) Accumulo.newClient().from(getClientProps()).build();
     table = getUniqueNames(1)[0];
     createFateTable(client, table);
-    store = new UserFateStore<>(client, table, AbstractFateStore.createDummyLockID(), null);
+    store = new UserFateStore<>(client, table, createDummyLockID(), null);
     fateId = store.create();
     txStore = store.reserve(fateId);
   }
diff --git a/test/src/main/java/org/apache/accumulo/test/fate/user/UserFateStoreFateIT.java b/test/src/main/java/org/apache/accumulo/test/fate/user/UserFateStoreFateIT.java
index 17cc06a5ac2..71af0824961 100644
--- a/test/src/main/java/org/apache/accumulo/test/fate/user/UserFateStoreFateIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/fate/user/UserFateStoreFateIT.java
@@ -18,9 +18,9 @@
  */
 package org.apache.accumulo.test.fate.user;
 
-import static org.apache.accumulo.core.fate.AbstractFateStore.createDummyLockID;
 import static org.apache.accumulo.core.fate.user.UserFateStore.getRowId;
 import static org.apache.accumulo.test.fate.FateStoreUtil.createFateTable;
+import static org.apache.accumulo.test.fate.TestLock.createDummyLockID;
 
 import org.apache.accumulo.core.client.Accumulo;
 import org.apache.accumulo.core.client.BatchWriter;
diff --git a/test/src/main/java/org/apache/accumulo/test/functional/AddSplitIT.java b/test/src/main/java/org/apache/accumulo/test/functional/AddSplitIT.java
index 76c62a5460c..72ff2bb8ca3 100644
--- a/test/src/main/java/org/apache/accumulo/test/functional/AddSplitIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/functional/AddSplitIT.java
@@ -18,6 +18,8 @@
  */
 package org.apache.accumulo.test.functional;
 
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
 import java.time.Duration;
 import java.util.Collection;
 import java.util.Iterator;
@@ -30,7 +32,10 @@
 import org.apache.accumulo.core.client.Scanner;
 import org.apache.accumulo.core.data.Key;
 import org.apache.accumulo.core.data.Mutation;
+import org.apache.accumulo.core.data.TableId;
 import org.apache.accumulo.core.data.Value;
+import org.apache.accumulo.core.metadata.schema.TabletMergeabilityMetadata;
+import org.apache.accumulo.core.metadata.schema.TabletsMetadata;
 import org.apache.accumulo.core.security.Authorizations;
 import org.apache.accumulo.harness.AccumuloClusterHarness;
 import org.apache.hadoop.io.Text;
@@ -87,6 +92,13 @@ public void addSplitTest() throws Exception {
       }
 
       verifyData(c, tableName, 2L);
+
+      TableId id = TableId.of(c.tableOperations().tableIdMap().get(tableName));
+      try (TabletsMetadata tm = getServerContext().getAmple().readTablets().forTable(id).build()) {
+        // Default for user created tablets should be mergeability set to NEVER
+        tm.stream().forEach(tablet -> assertEquals(TabletMergeabilityMetadata.never(),
+            tablet.getTabletMergeability()));
+      }
     }
   }
 
diff --git a/test/src/main/java/org/apache/accumulo/test/functional/AmpleConditionalWriterIT.java b/test/src/main/java/org/apache/accumulo/test/functional/AmpleConditionalWriterIT.java
index d8e0e9d2e17..f594f7b9ec7 100644
--- a/test/src/main/java/org/apache/accumulo/test/functional/AmpleConditionalWriterIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/functional/AmpleConditionalWriterIT.java
@@ -173,7 +173,8 @@ public void testLocations() throws Exception {
       // test require absent with a future location set
       try (var ctmi = new ConditionalTabletsMutatorImpl(context)) {
         ctmi.mutateTablet(e1).requireAbsentOperation().requireAbsentLocation()
-            .putLocation(Location.future(ts2)).submit(tm -> false);
+            .putLocation(Location.future(ts2)).submit(tm -> false,
+                () -> "Testing that requireAbsentLocation() fails when a future location is set");
         assertEquals(Status.REJECTED, ctmi.process().get(e1).getStatus());
       }
       assertEquals(Location.future(ts1), context.getAmple().readTablet(e1).getLocation());
@@ -196,7 +197,8 @@ public void testLocations() throws Exception {
       try (var ctmi = new ConditionalTabletsMutatorImpl(context)) {
         ctmi.mutateTablet(e1).requireAbsentOperation().requireAbsentLocation()
             .putLocation(Location.future(ts2)).submit(tm -> false);
-        assertEquals(Status.REJECTED, ctmi.process().get(e1).getStatus());
+        assertEquals(Status.REJECTED, ctmi.process().get(e1).getStatus(),
+            () -> "Testing that requireAbsentLocation() fails when a current location is set");
       }
       assertEquals(Location.current(ts1), context.getAmple().readTablet(e1).getLocation());
 
diff --git a/test/src/main/java/org/apache/accumulo/test/functional/BackupManagerIT.java b/test/src/main/java/org/apache/accumulo/test/functional/BackupManagerIT.java
index fd8ccb90883..5f788cd18fe 100644
--- a/test/src/main/java/org/apache/accumulo/test/functional/BackupManagerIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/functional/BackupManagerIT.java
@@ -44,7 +44,7 @@ public void test() throws Exception {
     // create a backup
     Process backup = exec(Manager.class);
     try (AccumuloClient client = Accumulo.newClient().from(getClientProperties()).build()) {
-      ZooReaderWriter writer = getCluster().getServerContext().getZooReaderWriter();
+      ZooReaderWriter writer = getServerContext().getZooSession().asReaderWriter();
 
       // wait for 2 lock entries
       var path = getServerContext().getServerPaths().createManagerPath();
@@ -58,7 +58,7 @@ public void test() throws Exception {
           ServiceLock.validateAndSort(path, writer.getChildren(path.toString()));
       String lockPath = path + "/" + children.get(0);
       byte[] data = writer.getData(lockPath);
-      writer.getZooKeeper().setData(lockPath, data, -1);
+      getServerContext().getZooSession().setData(lockPath, data, -1);
       // let it propagate
       Thread.sleep(500);
       // kill the manager by removing its lock
diff --git a/test/src/main/java/org/apache/accumulo/test/functional/CacheTestClean.java b/test/src/main/java/org/apache/accumulo/test/functional/CacheTestClean.java
index 70eec7e062e..4ca4a21c29d 100644
--- a/test/src/main/java/org/apache/accumulo/test/functional/CacheTestClean.java
+++ b/test/src/main/java/org/apache/accumulo/test/functional/CacheTestClean.java
@@ -22,8 +22,8 @@
 import java.io.IOException;
 
 import org.apache.accumulo.core.conf.SiteConfiguration;
-import org.apache.accumulo.core.fate.zookeeper.ZooReaderWriter;
 import org.apache.accumulo.core.fate.zookeeper.ZooUtil.NodeMissingPolicy;
+import org.apache.accumulo.core.zookeeper.ZooSession;
 import org.apache.commons.io.FileUtils;
 
 import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
@@ -36,15 +36,17 @@ public static void main(String[] args) throws Exception {
     File reportDir = new File(args[1]);
 
     var siteConfig = SiteConfiguration.auto();
-    ZooReaderWriter zoo = new ZooReaderWriter(siteConfig);
+    try (var zk = new ZooSession(CacheTestClean.class.getSimpleName(), siteConfig)) {
+      var zrw = zk.asReaderWriter();
 
-    if (zoo.exists(rootDir)) {
-      zoo.recursiveDelete(rootDir, NodeMissingPolicy.FAIL);
-    }
+      if (zrw.exists(rootDir)) {
+        zrw.recursiveDelete(rootDir, NodeMissingPolicy.FAIL);
+      }
 
-    FileUtils.deleteQuietly(reportDir);
-    if (!reportDir.mkdirs()) {
-      throw new IOException("Unable to (re-)create " + reportDir);
+      FileUtils.deleteQuietly(reportDir);
+      if (!reportDir.mkdirs()) {
+        throw new IOException("Unable to (re-)create " + reportDir);
+      }
     }
   }
 }
diff --git a/test/src/main/java/org/apache/accumulo/test/functional/CacheTestReader.java b/test/src/main/java/org/apache/accumulo/test/functional/CacheTestReader.java
index be17ed550fb..4d554c5c3e7 100644
--- a/test/src/main/java/org/apache/accumulo/test/functional/CacheTestReader.java
+++ b/test/src/main/java/org/apache/accumulo/test/functional/CacheTestReader.java
@@ -29,7 +29,7 @@
 import java.util.UUID;
 
 import org.apache.accumulo.core.fate.zookeeper.ZooCache;
-import org.apache.accumulo.core.fate.zookeeper.ZooReader;
+import org.apache.accumulo.core.zookeeper.ZooSession;
 import org.slf4j.LoggerFactory;
 
 import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
@@ -46,48 +46,49 @@ public static void main(String[] args) throws Exception {
     File myfile = new File(reportDir + "/" + UUID.randomUUID());
     myfile.deleteOnExit();
 
-    ZooCache zc = new ZooCache(new ZooReader(keepers, 30000), null);
+    try (var zk = new ZooSession(CacheTestReader.class.getSimpleName(), keepers, 30_000, null)) {
+      ZooCache zc = new ZooCache(zk);
 
-    while (true) {
-      if (myfile.exists() && !myfile.delete()) {
-        LoggerFactory.getLogger(CacheTestReader.class).warn("Unable to delete {}", myfile);
-      }
+      while (true) {
+        if (myfile.exists() && !myfile.delete()) {
+          LoggerFactory.getLogger(CacheTestReader.class).warn("Unable to delete {}", myfile);
+        }
 
-      if (zc.get(rootDir + "/die") != null) {
-        return;
-      }
+        if (zc.get(rootDir + "/die") != null) {
+          return;
+        }
 
-      Map<String,String> readData = new TreeMap<>();
+        Map<String,String> readData = new TreeMap<>();
 
-      for (int i = 0; i < numData; i++) {
-        byte[] v = zc.get(rootDir + "/data" + i);
-        if (v != null) {
-          readData.put(rootDir + "/data" + i, new String(v, UTF_8));
+        for (int i = 0; i < numData; i++) {
+          byte[] v = zc.get(rootDir + "/data" + i);
+          if (v != null) {
+            readData.put(rootDir + "/data" + i, new String(v, UTF_8));
+          }
         }
-      }
 
-      byte[] v = zc.get(rootDir + "/dataS");
-      if (v != null) {
-        readData.put(rootDir + "/dataS", new String(v, UTF_8));
-      }
+        byte[] v = zc.get(rootDir + "/dataS");
+        if (v != null) {
+          readData.put(rootDir + "/dataS", new String(v, UTF_8));
+        }
 
-      List<String> children = zc.getChildren(rootDir + "/dir");
-      if (children != null) {
-        for (String child : children) {
-          readData.put(rootDir + "/dir/" + child, "");
+        List<String> children = zc.getChildren(rootDir + "/dir");
+        if (children != null) {
+          for (String child : children) {
+            readData.put(rootDir + "/dir/" + child, "");
+          }
         }
-      }
 
-      FileOutputStream fos = new FileOutputStream(myfile);
-      ObjectOutputStream oos = new ObjectOutputStream(fos);
+        FileOutputStream fos = new FileOutputStream(myfile);
+        ObjectOutputStream oos = new ObjectOutputStream(fos);
 
-      oos.writeObject(readData);
+        oos.writeObject(readData);
 
-      fos.close();
-      oos.close();
+        fos.close();
+        oos.close();
 
-      Thread.sleep(20);
+        Thread.sleep(20);
+      }
     }
-
   }
 }
diff --git a/test/src/main/java/org/apache/accumulo/test/functional/CacheTestWriter.java b/test/src/main/java/org/apache/accumulo/test/functional/CacheTestWriter.java
index 7bf485f4072..a024f47838c 100644
--- a/test/src/main/java/org/apache/accumulo/test/functional/CacheTestWriter.java
+++ b/test/src/main/java/org/apache/accumulo/test/functional/CacheTestWriter.java
@@ -31,9 +31,9 @@
 import java.util.UUID;
 
 import org.apache.accumulo.core.conf.SiteConfiguration;
-import org.apache.accumulo.core.fate.zookeeper.ZooReaderWriter;
 import org.apache.accumulo.core.fate.zookeeper.ZooUtil.NodeExistsPolicy;
 import org.apache.accumulo.core.fate.zookeeper.ZooUtil.NodeMissingPolicy;
+import org.apache.accumulo.core.zookeeper.ZooSession;
 
 import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
 
@@ -44,127 +44,129 @@ public class CacheTestWriter {
   @SuppressFBWarnings(value = {"PATH_TRAVERSAL_IN", "OBJECT_DESERIALIZATION"},
       justification = "path provided by test; object deserialization is okay for test")
   public static void main(String[] args) throws Exception {
-    var zk = new ZooReaderWriter(SiteConfiguration.auto());
-
-    String rootDir = args[0];
-    File reportDir = new File(args[1]);
-    int numReaders = Integer.parseInt(args[2]);
-    int numVerifications = Integer.parseInt(args[3]);
-    int numData = NUM_DATA;
+    var conf = SiteConfiguration.auto();
+    try (var zk = new ZooSession(CacheTestWriter.class.getSimpleName(), conf)) {
+      var zrw = zk.asReaderWriter();
+
+      String rootDir = args[0];
+      File reportDir = new File(args[1]);
+      int numReaders = Integer.parseInt(args[2]);
+      int numVerifications = Integer.parseInt(args[3]);
+      int numData = NUM_DATA;
+
+      boolean dataSExists = false;
+      int count = 0;
+
+      zrw.putPersistentData(rootDir, new byte[0], NodeExistsPolicy.FAIL);
+      for (int i = 0; i < numData; i++) {
+        zrw.putPersistentData(rootDir + "/data" + i, new byte[0], NodeExistsPolicy.FAIL);
+      }
 
-    boolean dataSExists = false;
-    int count = 0;
+      zrw.putPersistentData(rootDir + "/dir", new byte[0], NodeExistsPolicy.FAIL);
 
-    zk.putPersistentData(rootDir, new byte[0], NodeExistsPolicy.FAIL);
-    for (int i = 0; i < numData; i++) {
-      zk.putPersistentData(rootDir + "/data" + i, new byte[0], NodeExistsPolicy.FAIL);
-    }
+      ArrayList<String> children = new ArrayList<>();
 
-    zk.putPersistentData(rootDir + "/dir", new byte[0], NodeExistsPolicy.FAIL);
+      while (count++ < numVerifications) {
 
-    ArrayList<String> children = new ArrayList<>();
+        Map<String,String> expectedData = null;
+        // change children in dir
 
-    while (count++ < numVerifications) {
+        for (int u = 0; u < RANDOM.get().nextInt(4) + 1; u++) {
+          expectedData = new TreeMap<>();
 
-      Map<String,String> expectedData = null;
-      // change children in dir
+          if (RANDOM.get().nextFloat() < .5) {
+            String child = UUID.randomUUID().toString();
+            zrw.putPersistentData(rootDir + "/dir/" + child, new byte[0], NodeExistsPolicy.SKIP);
+            children.add(child);
+          } else if (!children.isEmpty()) {
+            int index = RANDOM.get().nextInt(children.size());
+            String child = children.remove(index);
+            zrw.recursiveDelete(rootDir + "/dir/" + child, NodeMissingPolicy.FAIL);
+          }
 
-      for (int u = 0; u < RANDOM.get().nextInt(4) + 1; u++) {
-        expectedData = new TreeMap<>();
+          for (String child : children) {
+            expectedData.put(rootDir + "/dir/" + child, "");
+          }
 
-        if (RANDOM.get().nextFloat() < .5) {
-          String child = UUID.randomUUID().toString();
-          zk.putPersistentData(rootDir + "/dir/" + child, new byte[0], NodeExistsPolicy.SKIP);
-          children.add(child);
-        } else if (!children.isEmpty()) {
-          int index = RANDOM.get().nextInt(children.size());
-          String child = children.remove(index);
-          zk.recursiveDelete(rootDir + "/dir/" + child, NodeMissingPolicy.FAIL);
-        }
+          // change values
+          for (int i = 0; i < numData; i++) {
+            byte[] data = Long.toString(RANDOM.get().nextLong(), 16).getBytes(UTF_8);
+            zrw.putPersistentData(rootDir + "/data" + i, data, NodeExistsPolicy.OVERWRITE);
+            expectedData.put(rootDir + "/data" + i, new String(data, UTF_8));
+          }
 
-        for (String child : children) {
-          expectedData.put(rootDir + "/dir/" + child, "");
-        }
+          // test a data node that does not always exists...
+          if (RANDOM.get().nextFloat() < .5) {
 
-        // change values
-        for (int i = 0; i < numData; i++) {
-          byte[] data = Long.toString(RANDOM.get().nextLong(), 16).getBytes(UTF_8);
-          zk.putPersistentData(rootDir + "/data" + i, data, NodeExistsPolicy.OVERWRITE);
-          expectedData.put(rootDir + "/data" + i, new String(data, UTF_8));
-        }
+            byte[] data = Long.toString(RANDOM.get().nextLong(), 16).getBytes(UTF_8);
 
-        // test a data node that does not always exists...
-        if (RANDOM.get().nextFloat() < .5) {
+            if (dataSExists) {
+              zrw.putPersistentData(rootDir + "/dataS", data, NodeExistsPolicy.OVERWRITE);
+            } else {
+              zrw.putPersistentData(rootDir + "/dataS", data, NodeExistsPolicy.SKIP);
+              dataSExists = true;
+            }
 
-          byte[] data = Long.toString(RANDOM.get().nextLong(), 16).getBytes(UTF_8);
+            expectedData.put(rootDir + "/dataS", new String(data, UTF_8));
 
-          if (dataSExists) {
-            zk.putPersistentData(rootDir + "/dataS", data, NodeExistsPolicy.OVERWRITE);
           } else {
-            zk.putPersistentData(rootDir + "/dataS", data, NodeExistsPolicy.SKIP);
-            dataSExists = true;
-          }
-
-          expectedData.put(rootDir + "/dataS", new String(data, UTF_8));
-
-        } else {
-          if (dataSExists) {
-            zk.recursiveDelete(rootDir + "/dataS", NodeMissingPolicy.FAIL);
-            dataSExists = false;
+            if (dataSExists) {
+              zrw.recursiveDelete(rootDir + "/dataS", NodeMissingPolicy.FAIL);
+              dataSExists = false;
+            }
           }
         }
-      }
 
-      // change children in dir and change values
+        // change children in dir and change values
 
-      System.out.println("expectedData " + expectedData);
+        System.out.println("expectedData " + expectedData);
 
-      // wait for all readers to see changes
-      while (true) {
+        // wait for all readers to see changes
+        while (true) {
 
-        File[] files = reportDir.listFiles();
-        if (files == null) {
-          throw new IllegalStateException("report directory is inaccessible");
-        }
+          File[] files = reportDir.listFiles();
+          if (files == null) {
+            throw new IllegalStateException("report directory is inaccessible");
+          }
 
-        System.out.println("files.length " + files.length);
+          System.out.println("files.length " + files.length);
 
-        if (files.length == numReaders) {
-          boolean ok = true;
+          if (files.length == numReaders) {
+            boolean ok = true;
 
-          for (File file : files) {
-            try {
-              FileInputStream fis = new FileInputStream(file);
-              ObjectInputStream ois = new ObjectInputStream(fis);
+            for (File file : files) {
+              try {
+                FileInputStream fis = new FileInputStream(file);
+                ObjectInputStream ois = new ObjectInputStream(fis);
 
-              @SuppressWarnings("unchecked")
-              Map<String,String> readerMap = (Map<String,String>) ois.readObject();
+                @SuppressWarnings("unchecked")
+                Map<String,String> readerMap = (Map<String,String>) ois.readObject();
 
-              fis.close();
-              ois.close();
+                fis.close();
+                ois.close();
 
-              System.out.println("read " + readerMap);
+                System.out.println("read " + readerMap);
 
-              if (!readerMap.equals(expectedData)) {
-                System.out.println("maps not equals");
+                if (!readerMap.equals(expectedData)) {
+                  System.out.println("maps not equals");
+                  ok = false;
+                }
+              } catch (IOException ioe) {
+                // log.warn("Failed to read "+files[i], ioe);
                 ok = false;
               }
-            } catch (IOException ioe) {
-              // log.warn("Failed to read "+files[i], ioe);
-              ok = false;
             }
-          }
 
-          if (ok) {
-            break;
+            if (ok) {
+              break;
+            }
           }
-        }
 
-        Thread.sleep(5);
+          Thread.sleep(5);
+        }
       }
-    }
 
-    zk.putPersistentData(rootDir + "/die", new byte[0], NodeExistsPolicy.FAIL);
+      zrw.putPersistentData(rootDir + "/die", new byte[0], NodeExistsPolicy.FAIL);
+    }
   }
-
 }
diff --git a/test/src/main/java/org/apache/accumulo/test/functional/FateConcurrencyIT.java b/test/src/main/java/org/apache/accumulo/test/functional/FateConcurrencyIT.java
index 5e5775110f9..515f4a62133 100644
--- a/test/src/main/java/org/apache/accumulo/test/functional/FateConcurrencyIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/functional/FateConcurrencyIT.java
@@ -21,7 +21,6 @@
 import static java.util.concurrent.TimeUnit.MILLISECONDS;
 import static java.util.concurrent.TimeUnit.MINUTES;
 import static java.util.concurrent.TimeUnit.NANOSECONDS;
-import static org.apache.accumulo.core.fate.AbstractFateStore.createDummyLockID;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertNotNull;
 import static org.junit.jupiter.api.Assertions.assertTrue;
@@ -46,20 +45,21 @@
 import org.apache.accumulo.core.client.TableNotFoundException;
 import org.apache.accumulo.core.clientImpl.ClientContext;
 import org.apache.accumulo.core.clientImpl.Namespace;
-import org.apache.accumulo.core.conf.Property;
 import org.apache.accumulo.core.data.InstanceId;
 import org.apache.accumulo.core.data.TableId;
 import org.apache.accumulo.core.fate.AdminUtil;
+import org.apache.accumulo.core.fate.Fate;
 import org.apache.accumulo.core.fate.FateInstanceType;
 import org.apache.accumulo.core.fate.ReadOnlyFateStore;
 import org.apache.accumulo.core.fate.user.UserFateStore;
 import org.apache.accumulo.core.fate.zookeeper.MetaFateStore;
-import org.apache.accumulo.core.fate.zookeeper.ZooReaderWriter;
 import org.apache.accumulo.core.fate.zookeeper.ZooUtil;
 import org.apache.accumulo.core.manager.state.tables.TableState;
+import org.apache.accumulo.core.metadata.AccumuloTable;
 import org.apache.accumulo.core.util.compaction.ExternalCompactionUtil;
 import org.apache.accumulo.harness.AccumuloClusterHarness;
 import org.apache.accumulo.miniclusterImpl.MiniAccumuloClusterImpl;
+import org.apache.accumulo.server.ServerContext;
 import org.apache.accumulo.test.util.SlowOps;
 import org.apache.accumulo.test.util.Wait;
 import org.apache.zookeeper.KeeperException;
@@ -89,12 +89,10 @@ public class FateConcurrencyIT extends AccumuloClusterHarness {
   private static final long SLOW_SCAN_SLEEP_MS = 250L;
 
   private AccumuloClient client;
-  private ClientContext context;
+  private ServerContext context;
 
   private static final ExecutorService pool = Executors.newCachedThreadPool();
 
-  private String secret;
-
   private long maxWaitMillis;
 
   private SlowOps slowOps;
@@ -107,8 +105,7 @@ protected Duration defaultTimeout() {
   @BeforeEach
   public void setup() {
     client = Accumulo.newClient().from(getClientProps()).build();
-    context = (ClientContext) client;
-    secret = cluster.getSiteConfiguration().get(Property.INSTANCE_SECRET);
+    context = getServerContext();
     maxWaitMillis = Math.max(MINUTES.toMillis(1), defaultTimeout().toMillis() / 2);
   }
 
@@ -261,18 +258,19 @@ public void getFateStatus() {
       try {
 
         InstanceId instanceId = context.getInstanceID();
-        ZooReaderWriter zk = context.getZooReader().asWriter(secret);
-        MetaFateStore<String> mfs = new MetaFateStore<>(
-            ZooUtil.getRoot(instanceId) + Constants.ZFATE, zk, createDummyLockID(), null);
-        UserFateStore<String> ufs = new UserFateStore<>(context, createDummyLockID(), null);
+        var zk = context.getZooSession();
+        MetaFateStore<String> readOnlyMFS =
+            new MetaFateStore<>(ZooUtil.getRoot(instanceId) + Constants.ZFATE, zk, null, null);
+        UserFateStore<String> readOnlyUFS =
+            new UserFateStore<>(context, AccumuloTable.FATE.tableName(), null, null);
         var lockPath = context.getServerPaths().createTableLocksPath(tableId.toString());
-        Map<FateInstanceType,ReadOnlyFateStore<String>> fateStores =
-            Map.of(FateInstanceType.META, mfs, FateInstanceType.USER, ufs);
+        Map<FateInstanceType,ReadOnlyFateStore<String>> readOnlyFateStores =
+            Map.of(FateInstanceType.META, readOnlyMFS, FateInstanceType.USER, readOnlyUFS);
 
-        withLocks = admin.getStatus(fateStores, zk, lockPath, null, null, null);
+        withLocks = admin.getStatus(readOnlyFateStores, zk, lockPath, null, null, null);
 
         // call method that does not use locks.
-        noLocks = admin.getTransactionStatus(fateStores, null, null, null);
+        noLocks = admin.getTransactionStatus(readOnlyFateStores, null, null, null);
 
         // no zk exception, no need to retry
         break;
@@ -354,11 +352,12 @@ private boolean lookupFateInZookeeper(final String tableName) throws KeeperExcep
       log.trace("tid: {}", tableId);
 
       InstanceId instanceId = context.getInstanceID();
-      ZooReaderWriter zk = context.getZooReader().asWriter(secret);
-      MetaFateStore<String> mfs = new MetaFateStore<>(ZooUtil.getRoot(instanceId) + Constants.ZFATE,
-          zk, createDummyLockID(), null);
+      var zk = context.getZooSession();
+      MetaFateStore<String> readOnlyMFS =
+          new MetaFateStore<>(ZooUtil.getRoot(instanceId) + Constants.ZFATE, zk, null, null);
       var lockPath = context.getServerPaths().createTableLocksPath(tableId.toString());
-      AdminUtil.FateStatus fateStatus = admin.getStatus(mfs, zk, lockPath, null, null, null);
+      AdminUtil.FateStatus fateStatus =
+          admin.getStatus(readOnlyMFS, zk, lockPath, null, null, null);
 
       log.trace("current fates: {}", fateStatus.getTransactions().size());
 
@@ -385,8 +384,9 @@ private boolean lookupFateInAccumulo(final String tableName) throws KeeperExcept
 
       log.trace("tid: {}", tableId);
 
-      UserFateStore<String> ufs = new UserFateStore<>(context, createDummyLockID(), null);
-      AdminUtil.FateStatus fateStatus = admin.getStatus(ufs, null, null, null);
+      UserFateStore<String> readOnlyUFS =
+          new UserFateStore<>(context, AccumuloTable.FATE.tableName(), null, null);
+      AdminUtil.FateStatus fateStatus = admin.getStatus(readOnlyUFS, null, null, null);
 
       log.trace("current fates: {}", fateStatus.getTransactions().size());
 
@@ -421,10 +421,10 @@ private boolean isCompaction(AdminUtil.TransactionStatus tx) {
     log.trace("Fate id: {}, status: {}", tx.getFateId(), tx.getStatus());
 
     String top = tx.getTop();
-    String txName = tx.getTxName();
+    Fate.FateOperation txName = tx.getTxName();
 
     return top != null && txName != null && top.contains("CompactionDriver")
-        && tx.getTxName().equals("TABLE_COMPACT");
+        && txName == Fate.FateOperation.TABLE_COMPACT;
   }
 
   /**
diff --git a/test/src/main/java/org/apache/accumulo/test/functional/FunctionalTestUtils.java b/test/src/main/java/org/apache/accumulo/test/functional/FunctionalTestUtils.java
index 28b08dbbf02..a910a040a78 100644
--- a/test/src/main/java/org/apache/accumulo/test/functional/FunctionalTestUtils.java
+++ b/test/src/main/java/org/apache/accumulo/test/functional/FunctionalTestUtils.java
@@ -19,7 +19,6 @@
 package org.apache.accumulo.test.functional;
 
 import static java.nio.charset.StandardCharsets.UTF_8;
-import static org.apache.accumulo.core.fate.AbstractFateStore.createDummyLockID;
 import static org.apache.accumulo.core.metadata.schema.TabletMetadata.ColumnType.FLUSH_ID;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertFalse;
@@ -65,7 +64,6 @@
 import org.apache.accumulo.core.fate.ReadOnlyFateStore;
 import org.apache.accumulo.core.fate.user.UserFateStore;
 import org.apache.accumulo.core.fate.zookeeper.MetaFateStore;
-import org.apache.accumulo.core.fate.zookeeper.ZooReaderWriter;
 import org.apache.accumulo.core.metadata.AccumuloTable;
 import org.apache.accumulo.core.metadata.StoredTabletFile;
 import org.apache.accumulo.core.metadata.schema.MetadataSchema.TabletsSection;
@@ -233,14 +231,15 @@ private static FateStatus getFateStatus(AccumuloCluster cluster) {
     try {
       AdminUtil<String> admin = new AdminUtil<>(false);
       ServerContext context = cluster.getServerContext();
-      ZooReaderWriter zk = context.getZooReaderWriter();
-      MetaFateStore<String> mfs = new MetaFateStore<>(context.getZooKeeperRoot() + Constants.ZFATE,
-          zk, createDummyLockID(), null);
-      UserFateStore<String> ufs = new UserFateStore<>(context, createDummyLockID(), null);
-      Map<FateInstanceType,ReadOnlyFateStore<String>> fateStores =
-          Map.of(FateInstanceType.META, mfs, FateInstanceType.USER, ufs);
+      var zk = context.getZooSession();
+      MetaFateStore<String> readOnlyMFS =
+          new MetaFateStore<>(context.getZooKeeperRoot() + Constants.ZFATE, zk, null, null);
+      UserFateStore<String> readOnlyUFS =
+          new UserFateStore<>(context, AccumuloTable.FATE.tableName(), null, null);
+      Map<FateInstanceType,ReadOnlyFateStore<String>> readOnlyFateStores =
+          Map.of(FateInstanceType.META, readOnlyMFS, FateInstanceType.USER, readOnlyUFS);
       var lockPath = context.getServerPaths().createTableLocksPath();
-      return admin.getStatus(fateStores, zk, lockPath, null, null, null);
+      return admin.getStatus(readOnlyFateStores, zk, lockPath, null, null, null);
     } catch (KeeperException | InterruptedException e) {
       throw new RuntimeException(e);
     }
diff --git a/test/src/main/java/org/apache/accumulo/test/functional/GarbageCollectorIT.java b/test/src/main/java/org/apache/accumulo/test/functional/GarbageCollectorIT.java
index ff0c4a35a4a..1d1fa0425cb 100644
--- a/test/src/main/java/org/apache/accumulo/test/functional/GarbageCollectorIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/functional/GarbageCollectorIT.java
@@ -116,7 +116,7 @@ private void killMacGc() throws ProcessNotFoundException, InterruptedException,
         getCluster().getProcesses().get(ServerType.GARBAGE_COLLECTOR).iterator().next());
     // delete lock in zookeeper if there, this will allow next GC to start quickly
     var path = getServerContext().getServerPaths().createGarbageCollectorPath();
-    ZooReaderWriter zk = getServerContext().getZooReaderWriter();
+    ZooReaderWriter zk = getServerContext().getZooSession().asReaderWriter();
     try {
       ServiceLock.deleteLock(zk, path);
     } catch (IllegalStateException e) {
@@ -410,7 +410,7 @@ public void testProperPortAdvertisement() throws Exception {
 
     try (AccumuloClient client = Accumulo.newClient().from(getClientProperties()).build()) {
 
-      ZooReaderWriter zk = cluster.getServerContext().getZooReaderWriter();
+      ZooReaderWriter zk = cluster.getServerContext().getZooSession().asReaderWriter();
       var path = getServerContext().getServerPaths().createGarbageCollectorPath();
       for (int i = 0; i < 5; i++) {
         List<String> locks;
diff --git a/test/src/main/java/org/apache/accumulo/test/functional/HalfDeadServerWatcherIT.java b/test/src/main/java/org/apache/accumulo/test/functional/HalfDeadServerWatcherIT.java
index 3f791f411bd..123d611b495 100644
--- a/test/src/main/java/org/apache/accumulo/test/functional/HalfDeadServerWatcherIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/functional/HalfDeadServerWatcherIT.java
@@ -104,7 +104,7 @@ public void evaluateOnDemandTabletsForUnload() {
           final String zooRoot = this.getContext().getZooKeeperRoot();
           final String tableZPath = zooRoot + Constants.ZTABLES + "/" + tid.canonical();
           try {
-            this.getContext().getZooReaderWriter().exists(tableZPath, new StuckWatcher());
+            this.getContext().getZooSession().asReader().exists(tableZPath, new StuckWatcher());
           } catch (KeeperException | InterruptedException e) {
             LOG.error("Error setting watch at: {}", tableZPath, e);
           }
@@ -192,7 +192,7 @@ public boolean testTabletServerWithStuckWatcherDies() throws Exception {
           (rg) -> rg.equals(Constants.DEFAULT_RESOURCE_GROUP_NAME),
           AddressSelector.exact(HostAndPort.fromString(tserver.toHostPortString())), true);
       assertEquals(1, serverPaths.size());
-      ctx.getZooReaderWriter().recursiveDelete(serverPaths.iterator().next().toString(),
+      ctx.getZooSession().asReaderWriter().recursiveDelete(serverPaths.iterator().next().toString(),
           NodeMissingPolicy.FAIL);
 
       Wait.waitFor(() -> pingServer(client, tserver.toHostPortString()) == false, 60_000);
diff --git a/test/src/main/java/org/apache/accumulo/test/functional/ManagerApiIT.java b/test/src/main/java/org/apache/accumulo/test/functional/ManagerApiIT.java
index 5554441fefd..8001bc77cac 100644
--- a/test/src/main/java/org/apache/accumulo/test/functional/ManagerApiIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/functional/ManagerApiIT.java
@@ -25,6 +25,7 @@
 import java.util.Arrays;
 import java.util.Map;
 import java.util.concurrent.atomic.AtomicLong;
+import java.util.function.Function;
 
 import org.apache.accumulo.core.client.Accumulo;
 import org.apache.accumulo.core.client.AccumuloClient;
@@ -92,28 +93,18 @@ public static void teardown() throws Exception {
     SharedMiniClusterBase.stopMiniCluster();
   }
 
-  private ThriftClientTypes.Exec<Void,ManagerClientService.Client> op;
+  private Function<Credentials,ThriftClientTypes.Exec<Void,ManagerClientService.Client>> op;
 
   @Test
   public void testPermissions_setManagerGoalState() throws Exception {
     // To setManagerGoalState, user needs SystemPermission.SYSTEM
-    op = client -> {
-      client.setManagerGoalState(TraceUtil.traceInfo(), regularUser.toThrift(instanceId),
+    op = user -> client -> {
+      client.setManagerGoalState(TraceUtil.traceInfo(), user.toThrift(instanceId),
           ManagerGoalState.NORMAL);
       return null;
     };
     expectPermissionDenied(op, regularUser);
-    op = client -> {
-      client.setManagerGoalState(TraceUtil.traceInfo(), rootUser.toThrift(instanceId),
-          ManagerGoalState.NORMAL);
-      return null;
-    };
     expectPermissionSuccess(op, rootUser);
-    op = client -> {
-      client.setManagerGoalState(TraceUtil.traceInfo(), privilegedUser.toThrift(instanceId),
-          ManagerGoalState.NORMAL);
-      return null;
-    };
     expectPermissionSuccess(op, privilegedUser);
   }
 
@@ -139,32 +130,16 @@ public void testPermissions_initiateFlush() throws Exception {
       tableId = client.tableOperations().tableIdMap().get(tableName);
     }
 
-    op = client -> {
-      client.initiateFlush(TraceUtil.traceInfo(), regularUser.toThrift(instanceId), tableId);
+    op = user -> client -> {
+      client.initiateFlush(TraceUtil.traceInfo(), user.toThrift(instanceId), tableId);
       return null;
     };
     expectPermissionDenied(op, regularUser);
     // privileged users can grant themselves permission, but it's not default
-    op = client -> {
-      client.initiateFlush(TraceUtil.traceInfo(), privilegedUser.toThrift(instanceId), tableId);
-      return null;
-    };
     expectPermissionDenied(op, privilegedUser);
-    op = client -> {
-      client.initiateFlush(TraceUtil.traceInfo(), regUserWithWrite.toThrift(instanceId), tableId);
-      return null;
-    };
     expectPermissionSuccess(op, regUserWithWrite);
-    op = client -> {
-      client.initiateFlush(TraceUtil.traceInfo(), regUserWithAlter.toThrift(instanceId), tableId);
-      return null;
-    };
     expectPermissionSuccess(op, regUserWithAlter);
     // root user can because they created the table
-    op = client -> {
-      client.initiateFlush(TraceUtil.traceInfo(), rootUser.toThrift(instanceId), tableId);
-      return null;
-    };
     expectPermissionSuccess(op, rootUser);
   }
 
@@ -191,48 +166,23 @@ public void testPermissions_waitForFlush() throws Exception {
     }
     AtomicLong flushId = new AtomicLong();
     // initiateFlush as the root user to get the flushId, then test waitForFlush with other users
-    op = client -> {
-      flushId
-          .set(client.initiateFlush(TraceUtil.traceInfo(), rootUser.toThrift(instanceId), tableId));
+    op = user -> client -> {
+      flushId.set(client.initiateFlush(TraceUtil.traceInfo(), user.toThrift(instanceId), tableId));
       return null;
     };
     expectPermissionSuccess(op, rootUser);
-    op = client -> {
-      client.waitForFlush(TraceUtil.traceInfo(), regularUser.toThrift(instanceId), tableId,
+    op = user -> client -> {
+      client.waitForFlush(TraceUtil.traceInfo(), user.toThrift(instanceId), tableId,
           TextUtil.getByteBuffer(new Text("myrow")), TextUtil.getByteBuffer(new Text("myrow~")),
           flushId.get(), 1);
       return null;
     };
     expectPermissionDenied(op, regularUser);
     // privileged users can grant themselves permission, but it's not default
-    op = client -> {
-      client.waitForFlush(TraceUtil.traceInfo(), privilegedUser.toThrift(instanceId), tableId,
-          TextUtil.getByteBuffer(new Text("myrow")), TextUtil.getByteBuffer(new Text("myrow~")),
-          flushId.get(), 1);
-      return null;
-    };
     expectPermissionDenied(op, privilegedUser);
-    op = client -> {
-      client.waitForFlush(TraceUtil.traceInfo(), regUserWithWrite.toThrift(instanceId), tableId,
-          TextUtil.getByteBuffer(new Text("myrow")), TextUtil.getByteBuffer(new Text("myrow~")),
-          flushId.get(), 1);
-      return null;
-    };
     expectPermissionSuccess(op, regUserWithWrite);
-    op = client -> {
-      client.waitForFlush(TraceUtil.traceInfo(), regUserWithAlter.toThrift(instanceId), tableId,
-          TextUtil.getByteBuffer(new Text("myrow")), TextUtil.getByteBuffer(new Text("myrow~")),
-          flushId.get(), 1);
-      return null;
-    };
     expectPermissionSuccess(op, regUserWithAlter);
     // root user can because they created the table
-    op = client -> {
-      client.waitForFlush(TraceUtil.traceInfo(), rootUser.toThrift(instanceId), tableId,
-          TextUtil.getByteBuffer(new Text("myrow")), TextUtil.getByteBuffer(new Text("myrow~")),
-          flushId.get(), 1);
-      return null;
-    };
     expectPermissionSuccess(op, rootUser);
   }
 
@@ -240,20 +190,15 @@ public void testPermissions_waitForFlush() throws Exception {
   public void testPermissions_modifySystemProperties() throws Exception {
     // To setSystemProperty, user needs SystemPermission.SYSTEM
     String propKey = Property.TSERV_TOTAL_MUTATION_QUEUE_MAX.getKey();
-    op = client -> {
-      client.modifySystemProperties(TraceUtil.traceInfo(), regularUser.toThrift(instanceId),
+    op = user -> client -> {
+      client.modifySystemProperties(TraceUtil.traceInfo(), user.toThrift(instanceId),
           new TVersionedProperties(0, Map.of(propKey, "10000")));
       return null;
     };
     expectPermissionDenied(op, regularUser);
-    op = client -> {
-      client.modifySystemProperties(TraceUtil.traceInfo(), rootUser.toThrift(instanceId),
-          new TVersionedProperties(0, Map.of(propKey, "10000")));
-      return null;
-    };
     expectPermissionSuccess(op, rootUser);
-    op = client -> {
-      client.modifySystemProperties(TraceUtil.traceInfo(), privilegedUser.toThrift(instanceId),
+    op = user -> client -> {
+      client.modifySystemProperties(TraceUtil.traceInfo(), user.toThrift(instanceId),
           new TVersionedProperties(1, Map.of(propKey, "10000")));
       return null;
     };
@@ -272,20 +217,14 @@ public void testPermissions_removeSystemProperty() throws Exception {
       client.instanceOperations().setProperty(propKey1, "10000"); // ensure it exists
       client.instanceOperations().setProperty(propKey2, "10000"); // ensure it exists
     }
-    op = client -> {
-      client.removeSystemProperty(TraceUtil.traceInfo(), regularUser.toThrift(instanceId),
-          propKey1);
+    op = user -> client -> {
+      client.removeSystemProperty(TraceUtil.traceInfo(), user.toThrift(instanceId), propKey1);
       return null;
     };
     expectPermissionDenied(op, regularUser);
-    op = client -> {
-      client.removeSystemProperty(TraceUtil.traceInfo(), rootUser.toThrift(instanceId), propKey1);
-      return null;
-    };
     expectPermissionSuccess(op, rootUser);
-    op = client -> {
-      client.removeSystemProperty(TraceUtil.traceInfo(), privilegedUser.toThrift(instanceId),
-          propKey2);
+    op = user -> client -> {
+      client.removeSystemProperty(TraceUtil.traceInfo(), user.toThrift(instanceId), propKey2);
       return null;
     };
     expectPermissionSuccess(op, privilegedUser);
@@ -295,23 +234,12 @@ public void testPermissions_removeSystemProperty() throws Exception {
   public void testPermissions_setSystemProperty() throws Exception {
     // To setSystemProperty, user needs SystemPermission.SYSTEM
     String propKey = Property.TSERV_TOTAL_MUTATION_QUEUE_MAX.getKey();
-    op = client -> {
-      client.setSystemProperty(TraceUtil.traceInfo(), regularUser.toThrift(instanceId), propKey,
-          "10000");
+    op = user -> client -> {
+      client.setSystemProperty(TraceUtil.traceInfo(), user.toThrift(instanceId), propKey, "10000");
       return null;
     };
     expectPermissionDenied(op, regularUser);
-    op = client -> {
-      client.setSystemProperty(TraceUtil.traceInfo(), rootUser.toThrift(instanceId), propKey,
-          "10000");
-      return null;
-    };
     expectPermissionSuccess(op, rootUser);
-    op = client -> {
-      client.setSystemProperty(TraceUtil.traceInfo(), privilegedUser.toThrift(instanceId), propKey,
-          "10000");
-      return null;
-    };
     expectPermissionSuccess(op, privilegedUser);
     try (AccumuloClient client = Accumulo.newClient().from(getClientProps()).build()) {
       client.instanceOperations().removeProperty(propKey); // clean up property
@@ -323,37 +251,27 @@ public void testPermissions_shutdownTabletServer() throws Exception {
     // To shutdownTabletServer, user needs SystemPermission.SYSTEM
     // this server won't exist, so shutting it down is a NOOP on success
     String fakeHostAndPort = getUniqueNames(1)[0] + ":0";
-    op = client -> {
-      client.shutdownTabletServer(TraceUtil.traceInfo(), regularUser.toThrift(instanceId),
-          fakeHostAndPort, false);
+    op = user -> client -> {
+      client.shutdownTabletServer(TraceUtil.traceInfo(), user.toThrift(instanceId), fakeHostAndPort,
+          false);
       return null;
     };
     expectPermissionDenied(op, regularUser);
-    op = client -> {
-      client.shutdownTabletServer(TraceUtil.traceInfo(), rootUser.toThrift(instanceId),
-          fakeHostAndPort, false);
-      return null;
-    };
     expectPermissionSuccess(op, rootUser);
-    op = client -> {
-      client.shutdownTabletServer(TraceUtil.traceInfo(), privilegedUser.toThrift(instanceId),
-          fakeHostAndPort, false);
-      return null;
-    };
     expectPermissionSuccess(op, privilegedUser);
   }
 
   @Test
   public void shutdownTabletServer() throws Exception {
-    op = client -> {
-      client.shutdownTabletServer(TraceUtil.traceInfo(), rootUser.toThrift(instanceId),
+    op = user -> client -> {
+      client.shutdownTabletServer(TraceUtil.traceInfo(), user.toThrift(instanceId),
           "fakeTabletServer:9997", true);
       return null;
     };
     try (AccumuloClient client = Accumulo.newClient().from(getClientProps())
         .as(rootUser.getPrincipal(), rootUser.getToken()).build()) {
       ClientContext context = (ClientContext) client;
-      ThriftClientTypes.MANAGER.execute(context, op);
+      ThriftClientTypes.MANAGER.execute(context, op.apply(rootUser));
     }
   }
 
@@ -368,32 +286,29 @@ public void z99_testPermissions_shutdown() throws Exception {
         .as(privilegedUser.getPrincipal(), privilegedUser.getToken());
     try (var rootClient = rootUserBuilder.build(); var privClient = privUserBuilder.build()) {
       // To shutdown, user needs SystemPermission.SYSTEM
-      op = client -> {
-        client.shutdown(TraceUtil.traceInfo(), regularUser.toThrift(instanceId), false);
+      op = user -> client -> {
+        client.shutdown(TraceUtil.traceInfo(), user.toThrift(instanceId), false);
         return null;
       };
       expectPermissionDenied(op, regularUser);
-      // We should be able to do both of the following RPC calls before it actually shuts down
-      op = client -> {
-        client.shutdown(TraceUtil.traceInfo(), rootUser.toThrift(instanceId), false);
-        return null;
-      };
-      expectPermissionSuccess(op, (ClientContext) rootClient);
-      op = client -> {
-        client.shutdown(TraceUtil.traceInfo(), privilegedUser.toThrift(instanceId), false);
-        return null;
-      };
-      expectPermissionSuccess(op, (ClientContext) privClient);
+      expectPermissionSuccess(op.apply(rootUser), (ClientContext) rootClient);
+
+      // make sure it's stopped, then start it again to test with the privileged user
+      getCluster().stop();
+      getCluster().start();
+
+      // make sure regular user is still denied after restart
+      expectPermissionDenied(op, regularUser);
+      expectPermissionSuccess(op.apply(privilegedUser), (ClientContext) privClient);
     }
   }
 
   private static void expectPermissionSuccess(
-      ThriftClientTypes.Exec<Void,ManagerClientService.Client> op, Credentials user)
-      throws Exception {
+      Function<Credentials,ThriftClientTypes.Exec<Void,ManagerClientService.Client>> op,
+      Credentials user) throws Exception {
     try (AccumuloClient client = Accumulo.newClient().from(getClientProps())
         .as(user.getPrincipal(), user.getToken()).build()) {
-      ClientContext context = (ClientContext) client;
-      ThriftClientTypes.MANAGER.execute(context, op);
+      ThriftClientTypes.MANAGER.execute((ClientContext) client, op.apply(user));
     }
   }
 
@@ -404,9 +319,9 @@ private static void expectPermissionSuccess(
   }
 
   private static void expectPermissionDenied(
-      ThriftClientTypes.Exec<Void,ManagerClientService.Client> op, Credentials user) {
-    AccumuloSecurityException e =
-        assertThrows(AccumuloSecurityException.class, () -> expectPermissionSuccess(op, user));
+      Function<Credentials,ThriftClientTypes.Exec<Void,ManagerClientService.Client>> op,
+      Credentials user) {
+    var e = assertThrows(AccumuloSecurityException.class, () -> expectPermissionSuccess(op, user));
     assertSame(SecurityErrorCode.PERMISSION_DENIED, e.getSecurityErrorCode());
   }
 
diff --git a/test/src/main/java/org/apache/accumulo/test/functional/ManagerAssignmentIT.java b/test/src/main/java/org/apache/accumulo/test/functional/ManagerAssignmentIT.java
index 5ed4913f8b3..13e9d77465c 100644
--- a/test/src/main/java/org/apache/accumulo/test/functional/ManagerAssignmentIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/functional/ManagerAssignmentIT.java
@@ -83,6 +83,7 @@
 import org.apache.accumulo.minicluster.ServerType;
 import org.apache.accumulo.test.util.Wait;
 import org.apache.hadoop.io.Text;
+import org.junit.jupiter.api.AfterAll;
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
@@ -92,6 +93,8 @@
 
 public class ManagerAssignmentIT extends SharedMiniClusterBase {
 
+  private static AccumuloClient client;
+
   @BeforeAll
   public static void beforeAll() throws Exception {
     SharedMiniClusterBase.startMiniClusterWithConfig((cfg, core) -> {
@@ -102,119 +105,121 @@ public static void beforeAll() throws Exception {
       cfg.setProperty(Property.TSERV_ONDEMAND_UNLOADER_INTERVAL, "10s");
       cfg.setProperty(DefaultOnDemandTabletUnloader.INACTIVITY_THRESHOLD, "15");
     });
+    client = Accumulo.newClient().from(getClientProps()).build();
+  }
+
+  @AfterAll
+  public static void afterAll() {
+    client.close();
   }
 
   @BeforeEach
   public void before() throws Exception {
-    try (AccumuloClient client = Accumulo.newClient().from(getClientProps()).build()) {
-      Wait.waitFor(() -> countTabletsWithLocation(client, AccumuloTable.ROOT.tableId()) > 0);
-      Wait.waitFor(() -> countTabletsWithLocation(client, AccumuloTable.METADATA.tableId()) > 0);
-    }
+    Wait.waitFor(() -> countTabletsWithLocation(client, AccumuloTable.ROOT.tableId()) > 0);
+    Wait.waitFor(() -> countTabletsWithLocation(client, AccumuloTable.METADATA.tableId()) > 0);
   }
 
   @Test
   public void test() throws Exception {
-    try (AccumuloClient c = Accumulo.newClient().from(getClientProps()).build()) {
-
-      // Confirm that the root and metadata tables are hosted
-      Locations rootLocations = c.tableOperations().locate(AccumuloTable.ROOT.tableName(),
-          Collections.singletonList(new Range()));
-      rootLocations.groupByTablet().keySet()
-          .forEach(tid -> assertNotNull(rootLocations.getTabletLocation(tid)));
-
-      Locations metadataLocations = c.tableOperations().locate(AccumuloTable.METADATA.tableName(),
-          Collections.singletonList(new Range()));
-      metadataLocations.groupByTablet().keySet()
-          .forEach(tid -> assertNotNull(metadataLocations.getTabletLocation(tid)));
-
-      String tableName = super.getUniqueNames(1)[0];
-      c.tableOperations().create(tableName);
-
-      String tableId = c.tableOperations().tableIdMap().get(tableName);
-
-      // wait for the tablet to exist in the metadata table. The tablet
-      // will not be hosted so the current location will be empty.
-      Wait.waitFor(() -> getTabletMetadata(c, tableId, null) != null, 10000, 250);
-      TabletMetadata newTablet = getTabletMetadata(c, tableId, null);
-      assertNotNull(newTablet.getExtent());
-      assertFalse(newTablet.hasCurrent());
-      assertNull(newTablet.getLast());
-      assertNull(newTablet.getLocation());
-      assertEquals(TabletAvailability.ONDEMAND, newTablet.getTabletAvailability());
-
-      // calling the batch writer will cause the tablet to be hosted
-      try (BatchWriter bw = c.createBatchWriter(tableName)) {
-        Mutation m = new Mutation("a");
-        m.put("b", "c", "d");
-        bw.addMutation(m);
-      }
-      // give it a last location
-      c.tableOperations().flush(tableName, null, null, true);
-
-      TabletMetadata flushed = getTabletMetadata(c, tableId, null);
-      assertTrue(flushed.hasCurrent());
-      assertNotNull(flushed.getLocation());
-      assertEquals(flushed.getLocation().getHostPort(), flushed.getLast().getHostPort());
-      assertFalse(flushed.getLocation().getType().equals(LocationType.FUTURE));
-      assertEquals(TabletAvailability.ONDEMAND, flushed.getTabletAvailability());
-
-      // take the tablet offline
-      c.tableOperations().offline(tableName, true);
-      TabletMetadata offline = getTabletMetadata(c, tableId, null);
-      assertFalse(offline.hasCurrent());
-      assertNull(offline.getLocation());
-      assertEquals(flushed.getLocation().getHostPort(), offline.getLast().getHostPort());
-      assertEquals(TabletAvailability.ONDEMAND, offline.getTabletAvailability());
-
-      // put it back online
-      c.tableOperations().online(tableName, true);
-      TabletMetadata online = getTabletMetadata(c, tableId, null);
-      assertTrue(online.hasCurrent());
-      assertNotNull(online.getLocation());
-      assertEquals(online.getLocation().getHostPort(), online.getLast().getHostPort());
-      assertEquals(TabletAvailability.ONDEMAND, online.getTabletAvailability());
-
-      // set the tablet availability to HOSTED
-      c.tableOperations().setTabletAvailability(tableName, new Range(), TabletAvailability.HOSTED);
-
-      Predicate<TabletMetadata> hostedOrCurrentNotNull =
-          t -> (t.getTabletAvailability() == TabletAvailability.HOSTED && t.hasCurrent());
-
-      Wait.waitFor(() -> hostedOrCurrentNotNull.test(getTabletMetadata(c, tableId, null)), 60000,
-          250);
-
-      final TabletMetadata always = getTabletMetadata(c, tableId, null);
-      assertTrue(hostedOrCurrentNotNull.test(always));
-      assertTrue(always.hasCurrent());
-      assertEquals(flushed.getLocation().getHostPort(), always.getLast().getHostPort());
-      assertEquals(TabletAvailability.HOSTED, always.getTabletAvailability());
-
-      // set the hosting availability to never
-      c.tableOperations().setTabletAvailability(tableName, new Range(),
-          TabletAvailability.UNHOSTED);
-      Predicate<TabletMetadata> unhostedOrCurrentNull =
-          t -> (t.getTabletAvailability() == TabletAvailability.UNHOSTED && !t.hasCurrent());
-      Wait.waitFor(() -> unhostedOrCurrentNull.test(getTabletMetadata(c, tableId, null)), 60000,
-          250);
-
-      final TabletMetadata unhosted = getTabletMetadata(c, tableId, null);
-      assertTrue(unhostedOrCurrentNull.test(unhosted));
-      assertNull(unhosted.getLocation());
-      assertEquals(flushed.getLocation().getHostPort(), unhosted.getLast().getHostPort());
-      assertEquals(TabletAvailability.UNHOSTED, unhosted.getTabletAvailability());
-
-      // set the tablet availability to ONDEMAND
-      c.tableOperations().setTabletAvailability(tableName, new Range(),
-          TabletAvailability.ONDEMAND);
-      Predicate<TabletMetadata> ondemandHosted =
-          t -> t.getTabletAvailability() == TabletAvailability.ONDEMAND;
-      Wait.waitFor(() -> ondemandHosted.test(getTabletMetadata(c, tableId, null)), 60000, 250);
-      final TabletMetadata ondemand = getTabletMetadata(c, tableId, null);
-      assertTrue(ondemandHosted.test(ondemand));
-      assertNull(ondemand.getLocation());
-      assertEquals(flushed.getLocation().getHostPort(), ondemand.getLast().getHostPort());
-      assertEquals(TabletAvailability.ONDEMAND, ondemand.getTabletAvailability());
+    // Confirm that the root and metadata tables are hosted
+    Locations rootLocations = client.tableOperations().locate(AccumuloTable.ROOT.tableName(),
+        Collections.singletonList(new Range()));
+    rootLocations.groupByTablet().keySet()
+        .forEach(tid -> assertNotNull(rootLocations.getTabletLocation(tid)));
+
+    Locations metadataLocations = client.tableOperations()
+        .locate(AccumuloTable.METADATA.tableName(), Collections.singletonList(new Range()));
+    metadataLocations.groupByTablet().keySet()
+        .forEach(tid -> assertNotNull(metadataLocations.getTabletLocation(tid)));
+
+    String tableName = super.getUniqueNames(1)[0];
+    client.tableOperations().create(tableName);
+
+    String tableId = client.tableOperations().tableIdMap().get(tableName);
+
+    // wait for the tablet to exist in the metadata table. The tablet
+    // will not be hosted so the current location will be empty.
+    Wait.waitFor(() -> getTabletMetadata(client, tableId, null) != null, 10000, 250);
+    TabletMetadata newTablet = getTabletMetadata(client, tableId, null);
+    assertNotNull(newTablet.getExtent());
+    assertFalse(newTablet.hasCurrent());
+    assertNull(newTablet.getLast());
+    assertNull(newTablet.getLocation());
+    assertEquals(TabletAvailability.ONDEMAND, newTablet.getTabletAvailability());
+
+    // calling the batch writer will cause the tablet to be hosted
+    try (BatchWriter bw = client.createBatchWriter(tableName)) {
+      Mutation m = new Mutation("a");
+      m.put("b", "c", "d");
+      bw.addMutation(m);
     }
+    // give it a last location
+    client.tableOperations().flush(tableName, null, null, true);
+
+    TabletMetadata flushed = getTabletMetadata(client, tableId, null);
+    assertTrue(flushed.hasCurrent());
+    assertNotNull(flushed.getLocation());
+    assertEquals(flushed.getLocation().getHostPort(), flushed.getLast().getHostPort());
+    assertFalse(flushed.getLocation().getType().equals(LocationType.FUTURE));
+    assertEquals(TabletAvailability.ONDEMAND, flushed.getTabletAvailability());
+
+    // take the tablet offline
+    client.tableOperations().offline(tableName, true);
+    TabletMetadata offline = getTabletMetadata(client, tableId, null);
+    assertFalse(offline.hasCurrent());
+    assertNull(offline.getLocation());
+    assertEquals(flushed.getLocation().getHostPort(), offline.getLast().getHostPort());
+    assertEquals(TabletAvailability.ONDEMAND, offline.getTabletAvailability());
+
+    // put it back online
+    client.tableOperations().online(tableName, true);
+    TabletMetadata online = getTabletMetadata(client, tableId, null);
+    assertTrue(online.hasCurrent());
+    assertNotNull(online.getLocation());
+    assertEquals(online.getLocation().getHostPort(), online.getLast().getHostPort());
+    assertEquals(TabletAvailability.ONDEMAND, online.getTabletAvailability());
+
+    // set the tablet availability to HOSTED
+    client.tableOperations().setTabletAvailability(tableName, new Range(),
+        TabletAvailability.HOSTED);
+
+    Predicate<TabletMetadata> hostedOrCurrentNotNull =
+        t -> (t.getTabletAvailability() == TabletAvailability.HOSTED && t.hasCurrent());
+
+    Wait.waitFor(() -> hostedOrCurrentNotNull.test(getTabletMetadata(client, tableId, null)), 60000,
+        250);
+
+    final TabletMetadata always = getTabletMetadata(client, tableId, null);
+    assertTrue(hostedOrCurrentNotNull.test(always));
+    assertTrue(always.hasCurrent());
+    assertEquals(flushed.getLocation().getHostPort(), always.getLast().getHostPort());
+    assertEquals(TabletAvailability.HOSTED, always.getTabletAvailability());
+
+    // set the hosting availability to never
+    client.tableOperations().setTabletAvailability(tableName, new Range(),
+        TabletAvailability.UNHOSTED);
+    Predicate<TabletMetadata> unhostedOrCurrentNull =
+        t -> (t.getTabletAvailability() == TabletAvailability.UNHOSTED && !t.hasCurrent());
+    Wait.waitFor(() -> unhostedOrCurrentNull.test(getTabletMetadata(client, tableId, null)), 60000,
+        250);
+
+    final TabletMetadata unhosted = getTabletMetadata(client, tableId, null);
+    assertTrue(unhostedOrCurrentNull.test(unhosted));
+    assertNull(unhosted.getLocation());
+    assertEquals(flushed.getLocation().getHostPort(), unhosted.getLast().getHostPort());
+    assertEquals(TabletAvailability.UNHOSTED, unhosted.getTabletAvailability());
+
+    // set the tablet availability to ONDEMAND
+    client.tableOperations().setTabletAvailability(tableName, new Range(),
+        TabletAvailability.ONDEMAND);
+    Predicate<TabletMetadata> ondemandHosted =
+        t -> t.getTabletAvailability() == TabletAvailability.ONDEMAND;
+    Wait.waitFor(() -> ondemandHosted.test(getTabletMetadata(client, tableId, null)), 60000, 250);
+    final TabletMetadata ondemand = getTabletMetadata(client, tableId, null);
+    assertTrue(ondemandHosted.test(ondemand));
+    assertNull(ondemand.getLocation());
+    assertEquals(flushed.getLocation().getHostPort(), ondemand.getLast().getHostPort());
+    assertEquals(TabletAvailability.ONDEMAND, ondemand.getTabletAvailability());
   }
 
   private String prepTableForScanTest(AccumuloClient c, String tableName) throws Exception {
@@ -261,179 +266,167 @@ private String prepTableForScanTest(AccumuloClient c, String tableName) throws E
 
   @Test
   public void testScannerAssignsOneOnDemandTablets() throws Exception {
-    try (AccumuloClient c = Accumulo.newClient().from(getClientProps()).build()) {
-      String tableName = super.getUniqueNames(1)[0];
+    String tableName = super.getUniqueNames(1)[0];
 
-      String tableId = prepTableForScanTest(c, tableName);
+    String tableId = prepTableForScanTest(client, tableName);
 
-      Range scanRange = new Range("a", "c");
-      Scanner s = c.createScanner(tableName);
-      s.setRange(scanRange);
-      // Should return keys for a, b, c
-      assertEquals(3, Iterables.size(s));
+    Range scanRange = new Range("a", "c");
+    Scanner s = client.createScanner(tableName);
+    s.setRange(scanRange);
+    // Should return keys for a, b, c
+    assertEquals(3, Iterables.size(s));
 
-      List<TabletStats> stats = getTabletStats(c, tableId);
-      // There should be one tablet online
-      assertEquals(1, stats.size());
-      assertTrue(ClientTabletCache.getInstance((ClientContext) c, TableId.of(tableId))
-          .getTabletHostingRequestCount() > 0);
+    List<TabletStats> stats = getTabletStats(client, tableId);
+    // There should be one tablet online
+    assertEquals(1, stats.size());
+    assertTrue(ClientTabletCache.getInstance((ClientContext) client, TableId.of(tableId))
+        .getTabletHostingRequestCount() > 0);
 
-    }
   }
 
   @Test
   public void testScannerAssignsMultipleOnDemandTablets() throws Exception {
-    try (AccumuloClient c = Accumulo.newClient().from(getClientProps()).build()) {
-      String tableName = super.getUniqueNames(1)[0];
+    String tableName = super.getUniqueNames(1)[0];
 
-      String tableId = prepTableForScanTest(c, tableName);
+    String tableId = prepTableForScanTest(client, tableName);
 
-      try (Scanner s = c.createScanner(tableName)) {
-        s.setRange(new Range("a", "s"));
-        assertEquals(19, Iterables.size(s));
-      }
+    try (Scanner s = client.createScanner(tableName)) {
+      s.setRange(new Range("a", "s"));
+      assertEquals(19, Iterables.size(s));
+    }
 
-      List<TabletStats> stats = getTabletStats(c, tableId);
-      assertEquals(3, stats.size());
-      long hostingRequestCount = ClientTabletCache
-          .getInstance((ClientContext) c, TableId.of(tableId)).getTabletHostingRequestCount();
-      assertTrue(hostingRequestCount > 0);
-
-      // Run another scan, the t tablet should get loaded
-      // all others should be loaded.
-      try (Scanner s = c.createScanner(tableName)) {
-        s.setRange(new Range("a", "t"));
-        assertEquals(20, Iterables.size(s));
-      }
+    List<TabletStats> stats = getTabletStats(client, tableId);
+    assertEquals(3, stats.size());
+    long hostingRequestCount = ClientTabletCache
+        .getInstance((ClientContext) client, TableId.of(tableId)).getTabletHostingRequestCount();
+    assertTrue(hostingRequestCount > 0);
+
+    // Run another scan, the t tablet should get loaded
+    // all others should be loaded.
+    try (Scanner s = client.createScanner(tableName)) {
+      s.setRange(new Range("a", "t"));
+      assertEquals(20, Iterables.size(s));
+    }
 
-      stats = getTabletStats(c, tableId);
-      assertEquals(3, stats.size());
-      // No more tablets should have been brought online
-      assertEquals(hostingRequestCount, ClientTabletCache
-          .getInstance((ClientContext) c, TableId.of(tableId)).getTabletHostingRequestCount());
+    stats = getTabletStats(client, tableId);
+    assertEquals(3, stats.size());
+    // No more tablets should have been brought online
+    assertEquals(hostingRequestCount, ClientTabletCache
+        .getInstance((ClientContext) client, TableId.of(tableId)).getTabletHostingRequestCount());
 
-    }
   }
 
   @Test
   public void testBatchScannerAssignsOneOnDemandTablets() throws Exception {
-    try (AccumuloClient c = Accumulo.newClient().from(getClientProps()).build()) {
-      String tableName = super.getUniqueNames(1)[0];
+    String tableName = super.getUniqueNames(1)[0];
 
-      String tableId = prepTableForScanTest(c, tableName);
+    String tableId = prepTableForScanTest(client, tableName);
 
-      try (BatchScanner s = c.createBatchScanner(tableName)) {
-        s.setRanges(List.of(new Range("a", "c")));
-        // Should return keys for a, b, c
-        assertEquals(3, Iterables.size(s));
-      }
+    try (BatchScanner s = client.createBatchScanner(tableName)) {
+      s.setRanges(List.of(new Range("a", "c")));
+      // Should return keys for a, b, c
+      assertEquals(3, Iterables.size(s));
+    }
 
-      List<TabletStats> stats = getTabletStats(c, tableId);
-      // There should be one tablet online
-      assertEquals(1, stats.size());
-      assertTrue(ClientTabletCache.getInstance((ClientContext) c, TableId.of(tableId))
-          .getTabletHostingRequestCount() > 0);
+    List<TabletStats> stats = getTabletStats(client, tableId);
+    // There should be one tablet online
+    assertEquals(1, stats.size());
+    assertTrue(ClientTabletCache.getInstance((ClientContext) client, TableId.of(tableId))
+        .getTabletHostingRequestCount() > 0);
 
-    }
   }
 
   @Test
   public void testBatchScannerAssignsMultipleOnDemandTablets() throws Exception {
-    try (AccumuloClient c = Accumulo.newClient().from(getClientProps()).build()) {
-      String tableName = super.getUniqueNames(1)[0];
+    String tableName = super.getUniqueNames(1)[0];
 
-      String tableId = prepTableForScanTest(c, tableName);
+    String tableId = prepTableForScanTest(client, tableName);
 
-      try (BatchScanner s = c.createBatchScanner(tableName)) {
-        s.setRanges(List.of(new Range("a", "s")));
-        assertEquals(19, Iterables.size(s));
-      }
+    try (BatchScanner s = client.createBatchScanner(tableName)) {
+      s.setRanges(List.of(new Range("a", "s")));
+      assertEquals(19, Iterables.size(s));
+    }
 
-      List<TabletStats> stats = getTabletStats(c, tableId);
-      assertEquals(3, stats.size());
-      long hostingRequestCount = ClientTabletCache
-          .getInstance((ClientContext) c, TableId.of(tableId)).getTabletHostingRequestCount();
-      assertTrue(hostingRequestCount > 0);
+    List<TabletStats> stats = getTabletStats(client, tableId);
+    assertEquals(3, stats.size());
+    long hostingRequestCount = ClientTabletCache
+        .getInstance((ClientContext) client, TableId.of(tableId)).getTabletHostingRequestCount();
+    assertTrue(hostingRequestCount > 0);
 
-      // Run another scan, all tablets should be loaded
-      try (BatchScanner s = c.createBatchScanner(tableName)) {
-        s.setRanges(List.of(new Range("a", "t")));
-        assertEquals(20, Iterables.size(s));
-      }
+    // Run another scan, all tablets should be loaded
+    try (BatchScanner s = client.createBatchScanner(tableName)) {
+      s.setRanges(List.of(new Range("a", "t")));
+      assertEquals(20, Iterables.size(s));
+    }
 
-      stats = getTabletStats(c, tableId);
-      assertEquals(3, stats.size());
-      // No more tablets should have been brought online
-      assertEquals(hostingRequestCount, ClientTabletCache
-          .getInstance((ClientContext) c, TableId.of(tableId)).getTabletHostingRequestCount());
+    stats = getTabletStats(client, tableId);
+    assertEquals(3, stats.size());
+    // No more tablets should have been brought online
+    assertEquals(hostingRequestCount, ClientTabletCache
+        .getInstance((ClientContext) client, TableId.of(tableId)).getTabletHostingRequestCount());
 
-    }
   }
 
   @Test
   public void testBatchWriterAssignsTablets() throws Exception {
-    try (AccumuloClient c = Accumulo.newClient().from(getClientProps()).build()) {
-      String tableName = super.getUniqueNames(1)[0];
+    String tableName = super.getUniqueNames(1)[0];
 
-      prepTableForScanTest(c, tableName);
-    }
+    prepTableForScanTest(client, tableName);
   }
 
   @Test
   public void testOpidPreventsAssignment() throws Exception {
-    try (AccumuloClient c = Accumulo.newClient().from(getClientProps()).build()) {
-      String tableName = super.getUniqueNames(1)[0];
+    String tableName = super.getUniqueNames(1)[0];
 
-      var tableId = TableId.of(prepTableForScanTest(c, tableName));
+    var tableId = TableId.of(prepTableForScanTest(client, tableName));
 
-      FateInstanceType type = FateInstanceType.fromTableId(tableId);
-      FateId fateId = FateId.from(type, UUID.randomUUID());
+    FateInstanceType type = FateInstanceType.fromTableId(tableId);
+    FateId fateId = FateId.from(type, UUID.randomUUID());
 
-      assertEquals(0, countTabletsWithLocation(c, tableId));
+    assertEquals(0, countTabletsWithLocation(client, tableId));
 
-      assertEquals(Set.of("f", "m", "t"), c.tableOperations().listSplits(tableName).stream()
-          .map(Text::toString).collect(Collectors.toSet()));
+    assertEquals(Set.of("f", "m", "t"), client.tableOperations().listSplits(tableName).stream()
+        .map(Text::toString).collect(Collectors.toSet()));
 
-      c.securityOperations().grantTablePermission(getPrincipal(),
-          AccumuloTable.METADATA.tableName(), TablePermission.WRITE);
+    client.securityOperations().grantTablePermission(getPrincipal(),
+        AccumuloTable.METADATA.tableName(), TablePermission.WRITE);
 
-      var ample = getCluster().getServerContext().getAmple();
-      var extent = new KeyExtent(tableId, new Text("m"), new Text("f"));
-      var opid = TabletOperationId.from(TabletOperationType.SPLITTING, fateId);
+    var ample = getCluster().getServerContext().getAmple();
+    var extent = new KeyExtent(tableId, new Text("m"), new Text("f"));
+    var opid = TabletOperationId.from(TabletOperationType.SPLITTING, fateId);
 
-      // Set the OperationId on one tablet, which will cause that tablet
-      // to not be assigned
-      ample.mutateTablet(extent).putOperation(opid).mutate();
+    // Set the OperationId on one tablet, which will cause that tablet
+    // to not be assigned
+    ample.mutateTablet(extent).putOperation(opid).mutate();
 
-      // Host all tablets. Can not call the setTabletAvailability api because it will block when an
-      // opid is present, so must directly set it in the metadata table.
-      ample.readTablets().forTable(tableId).build()
-          .forEach(tabletMetadata -> ample.mutateTablet(tabletMetadata.getExtent())
-              .putTabletAvailability(TabletAvailability.HOSTED).mutate());
+    // Host all tablets. Can not call the setTabletAvailability api because it will block when an
+    // opid is present, so must directly set it in the metadata table.
+    ample.readTablets().forTable(tableId).build()
+        .forEach(tabletMetadata -> ample.mutateTablet(tabletMetadata.getExtent())
+            .putTabletAvailability(TabletAvailability.HOSTED).mutate());
 
-      Wait.waitFor(() -> countTabletsWithLocation(c, tableId) == 3);
-      assertNull(
-          ample.readTablet(new KeyExtent(tableId, new Text("m"), new Text("f"))).getLocation());
+    Wait.waitFor(() -> countTabletsWithLocation(client, tableId) == 3);
+    assertNull(
+        ample.readTablet(new KeyExtent(tableId, new Text("m"), new Text("f"))).getLocation());
 
-      // Delete the OperationId column, tablet should be assigned
-      ample.mutateTablet(extent).deleteOperation().mutate();
-      Wait.waitFor(() -> countTabletsWithLocation(c, tableId) == 4);
+    // Delete the OperationId column, tablet should be assigned
+    ample.mutateTablet(extent).deleteOperation().mutate();
+    Wait.waitFor(() -> countTabletsWithLocation(client, tableId) == 4);
 
-      // Set the OperationId on one tablet, which will cause that tablet
-      // to be unhosted
-      ample.mutateTablet(extent).putOperation(opid).mutate();
+    // Set the OperationId on one tablet, which will cause that tablet
+    // to be unhosted
+    ample.mutateTablet(extent).putOperation(opid).mutate();
 
-      // there are four tablets, three should be assigned as one has a OperationId
-      Wait.waitFor(() -> countTabletsWithLocation(c, tableId) == 3);
-      assertNull(
-          ample.readTablet(new KeyExtent(tableId, new Text("m"), new Text("f"))).getLocation());
+    // there are four tablets, three should be assigned as one has a OperationId
+    Wait.waitFor(() -> countTabletsWithLocation(client, tableId) == 3);
+    assertNull(
+        ample.readTablet(new KeyExtent(tableId, new Text("m"), new Text("f"))).getLocation());
 
-      // Delete the OperationId column, tablet should be assigned again
-      ample.mutateTablet(extent).deleteOperation().mutate();
+    // Delete the OperationId column, tablet should be assigned again
+    ample.mutateTablet(extent).deleteOperation().mutate();
 
-      // after the operation id is deleted the tablet should be assigned
-      Wait.waitFor(() -> countTabletsWithLocation(c, tableId) == 4);
-    }
+    // after the operation id is deleted the tablet should be assigned
+    Wait.waitFor(() -> countTabletsWithLocation(client, tableId) == 4);
   }
 
   public static void loadDataForScan(AccumuloClient c, String tableName)
@@ -475,150 +468,144 @@ public void testShutdownOnlyTServerWithUserTable() throws Exception {
 
     String tableName = getUniqueNames(1)[0];
 
-    try (AccumuloClient client = Accumulo.newClient().from(getClientProps()).build()) {
-
-      Wait.waitFor(
-          () -> client.instanceOperations().getServers(ServerId.Type.TABLET_SERVER).size() == 1,
-          SECONDS.toMillis(60), SECONDS.toMillis(2));
+    Wait.waitFor(
+        () -> client.instanceOperations().getServers(ServerId.Type.TABLET_SERVER).size() == 1,
+        SECONDS.toMillis(60), SECONDS.toMillis(2));
 
-      client.tableOperations().create(tableName);
-      TableId tid = TableId.of(client.tableOperations().tableIdMap().get(tableName));
+    client.tableOperations().create(tableName);
+    TableId tid = TableId.of(client.tableOperations().tableIdMap().get(tableName));
 
-      // wait for everything to be hosted and balanced
-      client.instanceOperations().waitForBalance();
+    // wait for everything to be hosted and balanced
+    client.instanceOperations().waitForBalance();
 
-      try (var writer = client.createBatchWriter(tableName)) {
-        for (int i = 0; i < 1000000; i++) {
-          Mutation m = new Mutation(String.format("%08d", i));
-          m.put("", "", "");
-          writer.addMutation(m);
-        }
+    try (var writer = client.createBatchWriter(tableName)) {
+      for (int i = 0; i < 1000000; i++) {
+        Mutation m = new Mutation(String.format("%08d", i));
+        m.put("", "", "");
+        writer.addMutation(m);
       }
-      client.tableOperations().flush(tableName, null, null, true);
-
-      final CountDownLatch latch = new CountDownLatch(10);
-
-      Runnable task = () -> {
-        while (true) {
-          try (var scanner = new IsolatedScanner(client.createScanner(tableName))) {
-            // TODO maybe do not close scanner? The following limit was placed on the stream to
-            // avoid reading all the data possibly leaving a scan session active on the tserver
-            AtomicInteger count = new AtomicInteger(0);
-            scanner.forEach(e -> {
-              // let the test thread know that this thread has read some data
-              if (count.incrementAndGet() == 1_000) {
-                latch.countDown();
-              }
-            });
-          } catch (Exception e) {
-            e.printStackTrace();
-            break;
-          }
+    }
+    client.tableOperations().flush(tableName, null, null, true);
+
+    final CountDownLatch latch = new CountDownLatch(10);
+
+    Runnable task = () -> {
+      while (true) {
+        try (var scanner = new IsolatedScanner(client.createScanner(tableName))) {
+          // TODO maybe do not close scanner? The following limit was placed on the stream to
+          // avoid reading all the data possibly leaving a scan session active on the tserver
+          AtomicInteger count = new AtomicInteger(0);
+          scanner.forEach(e -> {
+            // let the test thread know that this thread has read some data
+            if (count.incrementAndGet() == 1_000) {
+              latch.countDown();
+            }
+          });
+        } catch (Exception e) {
+          e.printStackTrace();
+          break;
         }
-      };
-
-      ExecutorService service = Executors.newFixedThreadPool(10);
-      for (int i = 0; i < 10; i++) {
-        service.execute(task);
       }
+    };
 
-      // Wait until all threads are reading some data
-      latch.await();
-
-      // getClusterControl().stopAllServers(ServerType.TABLET_SERVER)
-      // could potentially send a kill -9 to the process. Shut the tablet
-      // servers down in a more graceful way.
-      final Map<String,Map<KeyExtent,List<Range>>> binnedRanges = new HashMap<>();
-      ClientTabletCache.getInstance((ClientContext) client, tid).binRanges((ClientContext) client,
-          Collections.singletonList(TabletsSection.getRange()), binnedRanges);
-      binnedRanges.keySet().forEach((location) -> {
-        HostAndPort address = HostAndPort.fromString(location);
-        String addressWithSession = address.toString();
-        var zLockPath = getCluster().getServerContext().getServerPaths()
-            .createTabletServerPath(Constants.DEFAULT_RESOURCE_GROUP_NAME, address);
-        long sessionId =
-            ServiceLock.getSessionId(getCluster().getServerContext().getZooCache(), zLockPath);
-        if (sessionId != 0) {
-          addressWithSession = address + "[" + Long.toHexString(sessionId) + "]";
-        }
+    ExecutorService service = Executors.newFixedThreadPool(10);
+    for (int i = 0; i < 10; i++) {
+      service.execute(task);
+    }
 
-        final String finalAddress = addressWithSession;
-        System.out.println("Attempting to shutdown TabletServer at: " + address);
-        try {
-          ThriftClientTypes.MANAGER.executeVoid((ClientContext) client,
-              c -> c.shutdownTabletServer(TraceUtil.traceInfo(),
-                  getCluster().getServerContext().rpcCreds(), finalAddress, false));
-        } catch (AccumuloException | AccumuloSecurityException e) {
-          fail("Error shutting down TabletServer", e);
-        }
+    // Wait until all threads are reading some data
+    latch.await();
+
+    // getClusterControl().stopAllServers(ServerType.TABLET_SERVER)
+    // could potentially send a kill -9 to the process. Shut the tablet
+    // servers down in a more graceful way.
+    final Map<String,Map<KeyExtent,List<Range>>> binnedRanges = new HashMap<>();
+    ClientTabletCache.getInstance((ClientContext) client, tid).binRanges((ClientContext) client,
+        Collections.singletonList(TabletsSection.getRange()), binnedRanges);
+    binnedRanges.keySet().forEach((location) -> {
+      HostAndPort address = HostAndPort.fromString(location);
+      String addressWithSession = address.toString();
+      var zLockPath = getCluster().getServerContext().getServerPaths()
+          .createTabletServerPath(Constants.DEFAULT_RESOURCE_GROUP_NAME, address);
+      long sessionId =
+          ServiceLock.getSessionId(getCluster().getServerContext().getZooCache(), zLockPath);
+      if (sessionId != 0) {
+        addressWithSession = address + "[" + Long.toHexString(sessionId) + "]";
+      }
 
-      });
+      final String finalAddress = addressWithSession;
+      System.out.println("Attempting to shutdown TabletServer at: " + address);
+      try {
+        ThriftClientTypes.MANAGER.executeVoid((ClientContext) client,
+            c -> c.shutdownTabletServer(TraceUtil.traceInfo(),
+                getCluster().getServerContext().rpcCreds(), finalAddress, false));
+      } catch (AccumuloException | AccumuloSecurityException e) {
+        fail("Error shutting down TabletServer", e);
+      }
 
-      Wait.waitFor(
-          () -> client.instanceOperations().getServers(ServerId.Type.TABLET_SERVER).size() == 0);
-
-      // restart the tablet server for the other tests. Need to call stopAllServers
-      // to clear out the process list because we shutdown the TabletServer outside
-      // of MAC control.
-      getCluster().getClusterControl().stopAllServers(ServerType.TABLET_SERVER);
-      getCluster().getClusterControl().start(ServerType.TABLET_SERVER);
-      Wait.waitFor(
-          () -> client.instanceOperations().getServers(ServerId.Type.TABLET_SERVER).size() == 1,
-          60_000);
-    }
+    });
+
+    Wait.waitFor(
+        () -> client.instanceOperations().getServers(ServerId.Type.TABLET_SERVER).size() == 0);
+
+    // restart the tablet server for the other tests. Need to call stopAllServers
+    // to clear out the process list because we shutdown the TabletServer outside
+    // of MAC control.
+    getCluster().getClusterControl().stopAllServers(ServerType.TABLET_SERVER);
+    getCluster().getClusterControl().start(ServerType.TABLET_SERVER);
+    Wait.waitFor(
+        () -> client.instanceOperations().getServers(ServerId.Type.TABLET_SERVER).size() == 1,
+        60_000);
   }
 
   @Test
   public void testShutdownOnlyTServerWithoutUserTable() throws Exception {
 
-    try (AccumuloClient client = Accumulo.newClient().from(getClientProps()).build()) {
-
-      Wait.waitFor(
-          () -> client.instanceOperations().getServers(ServerId.Type.TABLET_SERVER).size() == 1,
-          SECONDS.toMillis(60), SECONDS.toMillis(2));
-
-      client.instanceOperations().waitForBalance();
-
-      // getClusterControl().stopAllServers(ServerType.TABLET_SERVER)
-      // could potentially send a kill -9 to the process. Shut the tablet
-      // servers down in a more graceful way.
-
-      Locations locs = client.tableOperations().locate(AccumuloTable.ROOT.tableName(),
-          Collections.singletonList(TabletsSection.getRange()));
-      locs.groupByTablet().keySet().stream().map(locs::getTabletLocation).forEach(location -> {
-        HostAndPort address = HostAndPort.fromString(location);
-        String addressWithSession = address.toString();
-        var zLockPath = getCluster().getServerContext().getServerPaths()
-            .createTabletServerPath(Constants.DEFAULT_RESOURCE_GROUP_NAME, address);
-        long sessionId =
-            ServiceLock.getSessionId(getCluster().getServerContext().getZooCache(), zLockPath);
-        if (sessionId != 0) {
-          addressWithSession = address + "[" + Long.toHexString(sessionId) + "]";
-        }
+    Wait.waitFor(
+        () -> client.instanceOperations().getServers(ServerId.Type.TABLET_SERVER).size() == 1,
+        SECONDS.toMillis(60), SECONDS.toMillis(2));
+
+    client.instanceOperations().waitForBalance();
+
+    // getClusterControl().stopAllServers(ServerType.TABLET_SERVER)
+    // could potentially send a kill -9 to the process. Shut the tablet
+    // servers down in a more graceful way.
+
+    Locations locs = client.tableOperations().locate(AccumuloTable.ROOT.tableName(),
+        Collections.singletonList(TabletsSection.getRange()));
+    locs.groupByTablet().keySet().stream().map(locs::getTabletLocation).forEach(location -> {
+      HostAndPort address = HostAndPort.fromString(location);
+      String addressWithSession = address.toString();
+      var zLockPath = getCluster().getServerContext().getServerPaths()
+          .createTabletServerPath(Constants.DEFAULT_RESOURCE_GROUP_NAME, address);
+      long sessionId =
+          ServiceLock.getSessionId(getCluster().getServerContext().getZooCache(), zLockPath);
+      if (sessionId != 0) {
+        addressWithSession = address + "[" + Long.toHexString(sessionId) + "]";
+      }
 
-        final String finalAddress = addressWithSession;
-        System.out.println("Attempting to shutdown TabletServer at: " + address);
-        try {
-          ThriftClientTypes.MANAGER.executeVoid((ClientContext) client,
-              c -> c.shutdownTabletServer(TraceUtil.traceInfo(),
-                  getCluster().getServerContext().rpcCreds(), finalAddress, false));
-        } catch (AccumuloException | AccumuloSecurityException e) {
-          fail("Error shutting down TabletServer", e);
-        }
+      final String finalAddress = addressWithSession;
+      System.out.println("Attempting to shutdown TabletServer at: " + address);
+      try {
+        ThriftClientTypes.MANAGER.executeVoid((ClientContext) client,
+            c -> c.shutdownTabletServer(TraceUtil.traceInfo(),
+                getCluster().getServerContext().rpcCreds(), finalAddress, false));
+      } catch (AccumuloException | AccumuloSecurityException e) {
+        fail("Error shutting down TabletServer", e);
+      }
 
-      });
-      Wait.waitFor(
-          () -> client.instanceOperations().getServers(ServerId.Type.TABLET_SERVER).size() == 0);
-
-      // restart the tablet server for the other tests. Need to call stopAllServers
-      // to clear out the process list because we shutdown the TabletServer outside
-      // of MAC control.
-      getCluster().getClusterControl().stopAllServers(ServerType.TABLET_SERVER);
-      getCluster().getClusterControl().start(ServerType.TABLET_SERVER);
-      Wait.waitFor(
-          () -> client.instanceOperations().getServers(ServerId.Type.TABLET_SERVER).size() == 1,
-          60_000);
-    }
+    });
+    Wait.waitFor(
+        () -> client.instanceOperations().getServers(ServerId.Type.TABLET_SERVER).size() == 0);
+
+    // restart the tablet server for the other tests. Need to call stopAllServers
+    // to clear out the process list because we shutdown the TabletServer outside
+    // of MAC control.
+    getCluster().getClusterControl().stopAllServers(ServerType.TABLET_SERVER);
+    getCluster().getClusterControl().start(ServerType.TABLET_SERVER);
+    Wait.waitFor(
+        () -> client.instanceOperations().getServers(ServerId.Type.TABLET_SERVER).size() == 1,
+        60_000);
   }
 
   public static TabletMetadata getTabletMetadata(AccumuloClient c, String tableId, Text endRow) {
diff --git a/test/src/main/java/org/apache/accumulo/test/functional/MemoryConsumingCompactor.java b/test/src/main/java/org/apache/accumulo/test/functional/MemoryConsumingCompactor.java
index d7257302459..3467ffd05b8 100644
--- a/test/src/main/java/org/apache/accumulo/test/functional/MemoryConsumingCompactor.java
+++ b/test/src/main/java/org/apache/accumulo/test/functional/MemoryConsumingCompactor.java
@@ -37,7 +37,7 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-public class MemoryConsumingCompactor extends Compactor implements CompactorService.Iface {
+public class MemoryConsumingCompactor extends Compactor {
 
   private static final Logger LOG = LoggerFactory.getLogger(MemoryConsumingCompactor.class);
 
diff --git a/test/src/main/java/org/apache/accumulo/test/functional/MetadataIT.java b/test/src/main/java/org/apache/accumulo/test/functional/MetadataIT.java
index 5a4dd306cce..e805143e672 100644
--- a/test/src/main/java/org/apache/accumulo/test/functional/MetadataIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/functional/MetadataIT.java
@@ -54,6 +54,7 @@
 import org.apache.accumulo.core.metadata.schema.MetadataSchema.DeletesSection;
 import org.apache.accumulo.core.metadata.schema.MetadataSchema.TabletsSection;
 import org.apache.accumulo.core.metadata.schema.MetadataSchema.TabletsSection.DataFileColumnFamily;
+import org.apache.accumulo.core.metadata.schema.TabletMergeabilityMetadata;
 import org.apache.accumulo.core.metadata.schema.TabletMetadata;
 import org.apache.accumulo.core.metadata.schema.TabletsMetadata;
 import org.apache.accumulo.core.security.Authorizations;
@@ -284,10 +285,12 @@ private void testCommonSystemTableConfig(ClientContext client, TableId tableId,
     assertEquals(maxVersions,
         tableProps.get(Property.TABLE_ITERATOR_PREFIX.getKey() + "majc.vers.opt.maxVersions"));
 
-    // Verify all tablets are HOSTED
+    // Verify all tablets are HOSTED and Mergeablity is NEVER
     try (var tablets = client.getAmple().readTablets().forTable(tableId).build()) {
       assertTrue(
           tablets.stream().allMatch(tm -> tm.getTabletAvailability() == TabletAvailability.HOSTED));
+      assertTrue(tablets.stream()
+          .allMatch(tm -> tm.getTabletMergeability().equals(TabletMergeabilityMetadata.never())));
     }
   }
 }
diff --git a/test/src/main/java/org/apache/accumulo/test/functional/SplitIT.java b/test/src/main/java/org/apache/accumulo/test/functional/SplitIT.java
index 720e56f93f7..a985d3969a6 100644
--- a/test/src/main/java/org/apache/accumulo/test/functional/SplitIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/functional/SplitIT.java
@@ -57,6 +57,7 @@
 import org.apache.accumulo.core.client.admin.CompactionConfig;
 import org.apache.accumulo.core.client.admin.InstanceOperations;
 import org.apache.accumulo.core.client.admin.NewTableConfiguration;
+import org.apache.accumulo.core.client.admin.TabletMergeability;
 import org.apache.accumulo.core.client.rfile.RFile;
 import org.apache.accumulo.core.client.rfile.RFileWriter;
 import org.apache.accumulo.core.conf.Property;
@@ -68,6 +69,7 @@
 import org.apache.accumulo.core.metadata.AccumuloTable;
 import org.apache.accumulo.core.metadata.schema.DataFileValue;
 import org.apache.accumulo.core.metadata.schema.MetadataSchema.TabletsSection.TabletColumnFamily;
+import org.apache.accumulo.core.metadata.schema.TabletMergeabilityMetadata;
 import org.apache.accumulo.core.security.Authorizations;
 import org.apache.accumulo.core.util.Pair;
 import org.apache.accumulo.harness.AccumuloClusterHarness;
@@ -250,6 +252,7 @@ public void tabletShouldSplit() throws Exception {
         KeyExtent extent = new KeyExtent(id, null, null);
         s.setRange(extent.toMetaRange());
         TabletColumnFamily.PREV_ROW_COLUMN.fetch(s);
+        TabletColumnFamily.MERGEABILITY_COLUMN.fetch(s);
         int count = 0;
         int shortened = 0;
         for (Entry<Key,Value> entry : s) {
@@ -257,6 +260,15 @@ public void tabletShouldSplit() throws Exception {
           if (extent.endRow() != null && extent.endRow().toString().length() < 14) {
             shortened++;
           }
+          if (TabletColumnFamily.MERGEABILITY_COLUMN.getColumnQualifier()
+              .equals(entry.getKey().getColumnQualifier())) {
+            // Default tablet should be set to NEVER, all newly generated system splits should be
+            // set to ALWAYS
+            var mergeability =
+                extent.endRow() == null ? TabletMergeability.never() : TabletMergeability.always();
+            assertEquals(mergeability,
+                TabletMergeabilityMetadata.fromValue(entry.getValue()).getTabletMergeability());
+          }
           count++;
         }
 
diff --git a/test/src/main/java/org/apache/accumulo/test/functional/WatchTheWatchCountIT.java b/test/src/main/java/org/apache/accumulo/test/functional/WatchTheWatchCountIT.java
index b90d8b7c6ea..e5550308055 100644
--- a/test/src/main/java/org/apache/accumulo/test/functional/WatchTheWatchCountIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/functional/WatchTheWatchCountIT.java
@@ -64,8 +64,8 @@ public void test() throws Exception {
       }
       c.tableOperations().list();
       String zooKeepers = ClientProperty.INSTANCE_ZOOKEEPERS.getValue(props);
-      // base number of watchers 90 to 125, and 15 to 25 per table in a single-node instance.
-      final long MIN = 125L;
+      // expect about 30-45 base + about 12 per table in a single-node 3-tserver instance
+      final long MIN = 75L;
       final long MAX = 200L;
       long total = 0;
       final HostAndPort hostAndPort = HostAndPort.fromString(zooKeepers);
diff --git a/test/src/main/java/org/apache/accumulo/test/functional/ZombieTServer.java b/test/src/main/java/org/apache/accumulo/test/functional/ZombieTServer.java
index 5477968edc1..2155fc93e03 100644
--- a/test/src/main/java/org/apache/accumulo/test/functional/ZombieTServer.java
+++ b/test/src/main/java/org/apache/accumulo/test/functional/ZombieTServer.java
@@ -133,10 +133,10 @@ public static void main(String[] args) throws Exception {
 
     var zLockPath = context.getServerPaths()
         .createTabletServerPath(Constants.DEFAULT_RESOURCE_GROUP_NAME, serverPort.address);
-    ZooReaderWriter zoo = context.getZooReaderWriter();
+    ZooReaderWriter zoo = context.getZooSession().asReaderWriter();
     zoo.putPersistentData(zLockPath.toString(), new byte[] {}, NodeExistsPolicy.SKIP);
 
-    ServiceLock zlock = new ServiceLock(zoo.getZooKeeper(), zLockPath, UUID.randomUUID());
+    ServiceLock zlock = new ServiceLock(context.getZooSession(), zLockPath, UUID.randomUUID());
 
     MetricsInfo metricsInfo = context.getMetricsInfo();
     metricsInfo.init(MetricsInfo.serviceTags(context.getInstanceName(), "zombie.server",
diff --git a/test/src/main/java/org/apache/accumulo/test/lock/ServiceLockIT.java b/test/src/main/java/org/apache/accumulo/test/lock/ServiceLockIT.java
index 3380402168e..af97575f23d 100644
--- a/test/src/main/java/org/apache/accumulo/test/lock/ServiceLockIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/lock/ServiceLockIT.java
@@ -39,19 +39,17 @@
 import java.util.concurrent.locks.LockSupport;
 
 import org.apache.accumulo.core.Constants;
-import org.apache.accumulo.core.fate.zookeeper.ZooReaderWriter;
 import org.apache.accumulo.core.lock.ServiceLock;
 import org.apache.accumulo.core.lock.ServiceLock.AccumuloLockWatcher;
 import org.apache.accumulo.core.lock.ServiceLock.LockLossReason;
 import org.apache.accumulo.core.lock.ServiceLockData;
 import org.apache.accumulo.core.lock.ServiceLockData.ThriftService;
 import org.apache.accumulo.core.lock.ServiceLockPaths.ServiceLockPath;
+import org.apache.accumulo.core.zookeeper.ZooSession;
 import org.apache.accumulo.test.zookeeper.ZooKeeperTestingServer;
 import org.apache.zookeeper.CreateMode;
 import org.apache.zookeeper.KeeperException;
-import org.apache.zookeeper.Watcher;
 import org.apache.zookeeper.ZooDefs;
-import org.apache.zookeeper.ZooKeeper;
 import org.apache.zookeeper.data.ACL;
 import org.junit.jupiter.api.AfterAll;
 import org.junit.jupiter.api.BeforeAll;
@@ -76,23 +74,29 @@ protected TestServiceLockPath(String path) {
   @TempDir
   private static File tempDir;
 
-  private static ZooKeeperTestingServer szk = null;
+  private static ZooKeeperTestingServer testZk = null;
+  private static ZooSession zk = null;
 
   @BeforeAll
   public static void setup() throws Exception {
-    szk = new ZooKeeperTestingServer(tempDir);
+    testZk = new ZooKeeperTestingServer(tempDir);
+    zk = testZk.newClient();
   }
 
   @AfterAll
   public static void teardown() throws Exception {
-    szk.close();
+    try {
+      zk.close();
+    } finally {
+      testZk.close();
+    }
   }
 
-  static class ZooKeeperWrapper extends ZooKeeper {
+  static class ZooKeeperWrapper extends ZooSession {
 
-    public ZooKeeperWrapper(String connectString, int sessionTimeout, Watcher watcher)
-        throws IOException {
-      super(connectString, sessionTimeout, watcher);
+    public ZooKeeperWrapper(String clientName, String connectString, int sessionTimeout,
+        String auth) throws IOException {
+      super(clientName, connectString, sessionTimeout, auth);
     }
 
     public void createOnce(String path, byte[] data, List<ACL> acl, CreateMode createMode)
@@ -183,7 +187,7 @@ public synchronized void unableToMonitorLockNode(Exception e) {
 
   private ServiceLock getZooLock(ServiceLockPath parent, UUID randomUUID)
       throws IOException, InterruptedException {
-    return new ServiceLock(szk.newClient(), parent, randomUUID);
+    return new ServiceLock(testZk.newClient(), parent, randomUUID);
   }
 
   private static ServiceLock getZooLock(ZooKeeperWrapper zkw, ServiceLockPath parent, UUID uuid) {
@@ -201,14 +205,14 @@ public void testDeleteParent() throws Exception {
     assertFalse(zl.isLocked());
     assertFalse(zl.verifyLockAtSource());
 
-    ZooReaderWriter zk = szk.getZooReaderWriter();
+    var zrw = zk.asReaderWriter();
 
     // intentionally created parent after lock
-    zk.mkdirs(parent.toString());
+    zrw.mkdirs(parent.toString());
 
-    zk.delete(parent.toString());
+    zrw.delete(parent.toString());
 
-    zk.mkdirs(parent.toString());
+    zrw.mkdirs(parent.toString());
 
     TestALW lw = new TestALW();
 
@@ -258,8 +262,8 @@ public void testDeleteLock() throws Exception {
     var parent = new TestServiceLockPath(
         "/zltestDeleteLock-" + this.hashCode() + "-l" + pdCount.incrementAndGet());
 
-    ZooReaderWriter zk = szk.getZooReaderWriter();
-    zk.mkdirs(parent.toString());
+    var zrw = zk.asReaderWriter();
+    zrw.mkdirs(parent.toString());
 
     ServiceLock zl = getZooLock(parent, UUID.randomUUID());
 
@@ -279,7 +283,7 @@ public void testDeleteLock() throws Exception {
     assertNull(lw.exception);
     assertNull(lw.reason);
 
-    zk.delete(zl.getLockPath());
+    zrw.delete(zl.getLockPath());
 
     lw.waitForChanges(2);
 
@@ -294,8 +298,8 @@ public void testDeleteWaiting() throws Exception {
     var parent = new TestServiceLockPath(
         "/zltestDeleteWaiting-" + this.hashCode() + "-l" + pdCount.incrementAndGet());
 
-    ZooReaderWriter zk = szk.getZooReaderWriter();
-    zk.mkdirs(parent.toString());
+    var zrw = zk.asReaderWriter();
+    zrw.mkdirs(parent.toString());
 
     ServiceLock zl = getZooLock(parent, UUID.randomUUID());
 
@@ -333,9 +337,9 @@ public void testDeleteWaiting() throws Exception {
     zl3.lock(lw3, new ServiceLockData(UUID.randomUUID(), "test3", ThriftService.TSERV,
         Constants.DEFAULT_RESOURCE_GROUP_NAME));
 
-    List<String> children = ServiceLock.validateAndSort(parent, zk.getChildren(parent.toString()));
+    List<String> children = ServiceLock.validateAndSort(parent, zrw.getChildren(parent.toString()));
 
-    zk.delete(parent + "/" + children.get(1));
+    zrw.delete(parent + "/" + children.get(1));
 
     lw2.waitForChanges(1);
 
@@ -343,7 +347,7 @@ public void testDeleteWaiting() throws Exception {
     assertNotNull(lw2.exception);
     assertNull(lw2.reason);
 
-    zk.delete(parent + "/" + children.get(0));
+    zrw.delete(parent + "/" + children.get(0));
 
     lw.waitForChanges(2);
 
@@ -369,7 +373,7 @@ public void testUnexpectedEvent() throws Exception {
     var parent = new TestServiceLockPath(
         "/zltestUnexpectedEvent-" + this.hashCode() + "-l" + pdCount.incrementAndGet());
 
-    try (var zk = szk.newClient()) {
+    try (var zk = testZk.newClient()) {
 
       zk.create(parent.toString(), new byte[0], ZooDefs.Ids.OPEN_ACL_UNSAFE, CreateMode.PERSISTENT);
 
@@ -413,8 +417,8 @@ public void testUnexpectedEvent() throws Exception {
   public void testLockSerial() throws Exception {
     var parent = new TestServiceLockPath("/zlretryLockSerial");
 
-    try (ZooKeeperWrapper zk1 = szk.newClient(ZooKeeperWrapper::new);
-        ZooKeeperWrapper zk2 = szk.newClient(ZooKeeperWrapper::new)) {
+    try (ZooKeeperWrapper zk1 = testZk.newClient(ZooKeeperWrapper::new);
+        ZooKeeperWrapper zk2 = testZk.newClient(ZooKeeperWrapper::new)) {
 
       // Create the parent node
       zk1.createOnce(parent.toString(), new byte[0], ZooDefs.Ids.OPEN_ACL_UNSAFE,
@@ -458,7 +462,7 @@ public void testLockSerial() throws Exception {
       assertTrue(zlw1.isLockHeld());
       assertFalse(zlw2.isLockHeld());
 
-      List<String> children = zk1.getChildren(parent.toString(), false);
+      List<String> children = zk1.getChildren(parent.toString(), null);
       assertTrue(children.contains("zlock#00000000-0000-0000-0000-aaaaaaaaaaaa#0000000000"));
       assertFalse(children.contains("zlock#00000000-0000-0000-0000-aaaaaaaaaaaa#0000000001"),
           "this node should have been deleted");
@@ -520,17 +524,15 @@ public boolean holdsLock() {
 
     @Override
     public void run() {
-      try {
-        try (ZooKeeperWrapper zk = szk.newClient(ZooKeeperWrapper::new)) {
-          ServiceLock zl = getZooLock(zk, parent, uuid);
-          getLockLatch.countDown(); // signal we are done
-          getLockLatch.await(); // wait for others to finish
-          zl.lock(lockWatcher, new ServiceLockData(UUID.randomUUID(), "test1", ThriftService.TSERV,
-              Constants.DEFAULT_RESOURCE_GROUP_NAME)); // race to the lock
-          lockCompletedLatch.countDown();
-          unlockLatch.await();
-          zl.unlock();
-        }
+      try (ZooKeeperWrapper zk = testZk.newClient(ZooKeeperWrapper::new)) {
+        ServiceLock zl = getZooLock(zk, parent, uuid);
+        getLockLatch.countDown(); // signal we are done
+        getLockLatch.await(); // wait for others to finish
+        zl.lock(lockWatcher, new ServiceLockData(UUID.randomUUID(), "test1", ThriftService.TSERV,
+            Constants.DEFAULT_RESOURCE_GROUP_NAME)); // race to the lock
+        lockCompletedLatch.countDown();
+        unlockLatch.await();
+        zl.unlock();
       } catch (Exception e) {
         LOG.error("Error in LockWorker.run() for {}", uuid, e);
         ex = e;
@@ -567,7 +569,7 @@ private int parseLockWorkerName(String child) {
   public void testLockParallel() throws Exception {
     var parent = new TestServiceLockPath("/zlParallel");
 
-    try (ZooKeeperWrapper zk = szk.newClient(ZooKeeperWrapper::new)) {
+    try (ZooKeeperWrapper zk = testZk.newClient(ZooKeeperWrapper::new)) {
       // Create the parent node
       zk.createOnce(parent.toString(), new byte[0], ZooDefs.Ids.OPEN_ACL_UNSAFE,
           CreateMode.PERSISTENT);
@@ -598,7 +600,7 @@ public void testLockParallel() throws Exception {
             ServiceLock.validateAndSort(parent, zk.getChildren(parent.toString(), null));
         while (children.size() != i) {
           Thread.sleep(100);
-          children = zk.getChildren(parent.toString(), false);
+          children = zk.getChildren(parent.toString(), null);
         }
         assertEquals(i, children.size());
         String first = children.get(0);
@@ -617,7 +619,7 @@ public void testLockParallel() throws Exception {
 
       workers.forEach(w -> assertFalse(w.holdsLock()));
       workers.forEach(w -> assertNull(w.getException()));
-      assertEquals(0, zk.getChildren(parent.toString(), false).size());
+      assertEquals(0, zk.getChildren(parent.toString(), null).size());
 
       threads.forEach(Uninterruptibles::joinUninterruptibly);
     }
@@ -632,7 +634,7 @@ public void testTryLock() throws Exception {
 
     ServiceLock zl = getZooLock(parent, UUID.randomUUID());
 
-    try (var zk = szk.newClient()) {
+    try (var zk = testZk.newClient()) {
 
       for (int i = 0; i < 10; i++) {
         zk.create(parent.toString(), new byte[0], ZooDefs.Ids.OPEN_ACL_UNSAFE,
@@ -666,7 +668,7 @@ public void testChangeData() throws Exception {
     var parent = new TestServiceLockPath(
         "/zltestChangeData-" + this.hashCode() + "-l" + pdCount.incrementAndGet());
 
-    try (var zk = szk.newClient()) {
+    try (var zk = testZk.newClient()) {
       zk.create(parent.toString(), new byte[0], ZooDefs.Ids.OPEN_ACL_UNSAFE, CreateMode.PERSISTENT);
 
       ServiceLock zl = getZooLock(parent, UUID.randomUUID());
diff --git a/test/src/main/java/org/apache/accumulo/test/performance/NullTserver.java b/test/src/main/java/org/apache/accumulo/test/performance/NullTserver.java
index 9ddff41e0dd..6335a8dd620 100644
--- a/test/src/main/java/org/apache/accumulo/test/performance/NullTserver.java
+++ b/test/src/main/java/org/apache/accumulo/test/performance/NullTserver.java
@@ -74,6 +74,7 @@
 import org.apache.accumulo.core.tabletserver.thrift.TabletServerClientService;
 import org.apache.accumulo.core.tabletserver.thrift.TabletStats;
 import org.apache.accumulo.core.util.threads.ThreadPools;
+import org.apache.accumulo.core.zookeeper.ZooSession;
 import org.apache.accumulo.server.ServerContext;
 import org.apache.accumulo.server.client.ClientServiceHandler;
 import org.apache.accumulo.server.manager.state.Assignment;
@@ -84,7 +85,6 @@
 import org.apache.thrift.TException;
 import org.apache.thrift.TMultiplexedProcessor;
 import org.apache.zookeeper.KeeperException;
-import org.apache.zookeeper.ZooKeeper;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -291,7 +291,7 @@ public static void main(String[] args) throws Exception {
     int zkTimeOut =
         (int) DefaultConfiguration.getInstance().getTimeInMillis(Property.INSTANCE_ZK_TIMEOUT);
     var siteConfig = SiteConfiguration.auto();
-    ServerContext context = ServerContext.override(siteConfig, opts.iname, opts.keepers, zkTimeOut);
+    var context = ServerContext.forTesting(siteConfig, opts.iname, opts.keepers, zkTimeOut);
     ClientServiceHandler csh = new ClientServiceHandler(context);
     NullTServerTabletClientHandler tch = new NullTServerTabletClientHandler();
 
@@ -343,11 +343,11 @@ public void failedToAcquireLock(Exception e) {
 
     ServiceLock miniLock = null;
     try {
-      ZooKeeper zk = context.getZooReaderWriter().getZooKeeper();
+      ZooSession zk = context.getZooSession();
       UUID nullTServerUUID = UUID.randomUUID();
       ServiceLockPath slp = context.getServerPaths().createMiniPath(nullTServerUUID.toString());
       try {
-        context.getZooReaderWriter().mkdirs(slp.toString());
+        zk.asReaderWriter().mkdirs(slp.toString());
       } catch (KeeperException | InterruptedException e) {
         throw new IllegalStateException("Error creating path in ZooKeeper", e);
       }
diff --git a/test/src/main/java/org/apache/accumulo/test/shell/MockShell.java b/test/src/main/java/org/apache/accumulo/test/shell/MockShell.java
index a8ffc850d36..965be08ddf2 100644
--- a/test/src/main/java/org/apache/accumulo/test/shell/MockShell.java
+++ b/test/src/main/java/org/apache/accumulo/test/shell/MockShell.java
@@ -30,7 +30,6 @@
 import org.apache.accumulo.shell.Shell;
 import org.jline.reader.LineReader;
 import org.jline.reader.LineReaderBuilder;
-import org.jline.terminal.Size;
 import org.jline.terminal.Terminal;
 import org.jline.terminal.impl.DumbTerminal;
 import org.slf4j.Logger;
@@ -53,7 +52,6 @@ public class MockShell {
     output = new TestOutputStream();
     input = new StringInputStream();
     terminal = new DumbTerminal(input, output);
-    terminal.setSize(new Size(80, 24));
     reader = LineReaderBuilder.builder().terminal(terminal).build();
     shell = new Shell(reader);
     shell.setLogErrorsToConsole();
diff --git a/test/src/main/java/org/apache/accumulo/test/shell/ShellServerIT.java b/test/src/main/java/org/apache/accumulo/test/shell/ShellServerIT.java
index 791be6ff837..5634a5b8716 100644
--- a/test/src/main/java/org/apache/accumulo/test/shell/ShellServerIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/shell/ShellServerIT.java
@@ -227,7 +227,7 @@ public void exporttableImporttable() throws Exception {
       }
       Thread.sleep(20);
       ts.exec("importtable " + table2 + " " + import_, true);
-      ts.exec("config -t " + table2 + " -np", true, "345M", true);
+      ts.exec("config -t " + table2, true, "345M", true);
       ts.exec("getsplits -t " + table2, true, "row5", true);
       ts.exec("constraint --list -t " + table2, true, "VisibilityConstraint=2", true);
       ts.exec("online " + table, true);
@@ -253,14 +253,14 @@ public void propStressTest() throws Exception {
       for (int i = 0; i < 50; i++) {
         String expected = (100 + i) + "M";
         ts.exec("config -t " + table + " -s table.split.threshold=" + expected, true);
-        ts.exec("config -t " + table + " -np -f table.split.threshold", true, expected, true);
+        ts.exec("config -t " + table + " -f table.split.threshold", true, expected, true);
 
         ts.exec("config -t " + table + " -s table.scan.max.memory=" + expected, true);
-        ts.exec("config -t " + table + " -np -f table.scan.max.memory", true, expected, true);
+        ts.exec("config -t " + table + " -f table.scan.max.memory", true, expected, true);
 
         String bExpected = ((i % 2) == 0) ? "true" : "false";
         ts.exec("config -t " + table + " -s table.bloom.enabled=" + bExpected, true);
-        ts.exec("config -t " + table + " -np -f table.bloom.enabled", true, bExpected, true);
+        ts.exec("config -t " + table + " -f table.bloom.enabled", true, bExpected, true);
       }
     }
   }
@@ -667,7 +667,7 @@ public void clonetable() throws Exception {
     ts.exec("table " + clone);
     ts.exec("scan", true, "value", true);
     ts.exec("constraint --list -t " + clone, true, "VisibilityConstraint=2", true);
-    ts.exec("config -t " + clone + " -np", true, "123M", true);
+    ts.exec("config -t " + clone, true, "123M", true);
     ts.exec("getsplits -t " + clone, true, "a\nb\nc\n");
     ts.exec("deletetable -f " + table);
     ts.exec("deletetable -f " + clone);
@@ -696,7 +696,7 @@ public void clonetableOffline() throws Exception {
     ts.exec("table " + clone);
     ts.exec("scan", false, "TableOfflineException", true);
     ts.exec("constraint --list -t " + clone, true, "VisibilityConstraint=2", true);
-    ts.exec("config -t " + clone + " -np", true, "123M", true);
+    ts.exec("config -t " + clone, true, "123M", true);
     ts.exec("getsplits -t " + clone, true, "a\nb\nc\n");
     ts.exec("deletetable -f " + table);
     ts.exec("deletetable -f " + clone);
@@ -1040,7 +1040,7 @@ public void deletemany() throws Exception {
     assertEquals(10, countkeys(table));
     ts.exec("deletemany -f -b row8");
     assertEquals(8, countkeys(table));
-    ts.exec("scan -t " + table + " -np", true, "row8", false);
+    ts.exec("scan -t " + table, true, "row8", false);
     make10();
     ts.exec("deletemany -f -b row4 -e row5");
     assertEquals(8, countkeys(table));
@@ -1125,7 +1125,7 @@ public void formatter() {
     expectedDefault.add("row2 cf1:cq []\t2468ace");
     ArrayList<String> actualDefault = new ArrayList<>(4);
     boolean isFirst = true;
-    for (String s : ts.exec("scan -np", true).split("[\n\r]+")) {
+    for (String s : ts.exec("scan", true).split("[\n\r]+")) {
       if (isFirst) {
         isFirst = false;
       } else {
@@ -1141,7 +1141,7 @@ public void formatter() {
     ts.exec("formatter -t formatter_test -f " + HexFormatter.class.getName(), true);
     ArrayList<String> actualFormatted = new ArrayList<>(4);
     isFirst = true;
-    for (String s : ts.exec("scan -np", true).split("[\n\r]+")) {
+    for (String s : ts.exec("scan", true).split("[\n\r]+")) {
       if (isFirst) {
         isFirst = false;
       } else {
@@ -1395,7 +1395,7 @@ public void grep() throws Exception {
 
   @Test
   public void help() throws Exception {
-    ts.exec("help -np", true, "Help Commands", true);
+    ts.exec("help", true, "Help Commands", true);
     ts.exec("?", true, "Help Commands", true);
     for (String c : ("bye exit quit about help info ? "
         + "deleteiter deletescaniter listiter setiter setscaniter "
@@ -1460,7 +1460,7 @@ public void importDirectoryWithOptions() throws Exception {
     ts.exec("createtable " + table, true);
     ts.exec("notable", true);
     ts.exec("importdirectory -t " + table + " -i " + importDir + " true", true);
-    ts.exec("scan -t " + table + " -np -b 0 -e 2", true, "0-->" + nonce, true);
+    ts.exec("scan -t " + table + " -b 0 -e 2", true, "0-->" + nonce, true);
     ts.exec("scan -t " + table + " -b 00000098 -e 00000100", true, "99-->" + nonce, true);
     // Attempt to re-import without -i option, error should occur
     ts.exec("importdirectory -t " + table + " " + importDir + " true", false);
@@ -1784,7 +1784,7 @@ public void verifyPerTableClasspath(final String table, final File fooConstraint
 
     Thread.sleep(250);
 
-    ts.exec("scan -np", true, "foo", false);
+    ts.exec("scan ", true, "foo", false);
 
     ts.exec("constraint -a FooConstraint", true);
 
@@ -1893,7 +1893,7 @@ public void namespaces() throws Exception {
   }
 
   private int countkeys(String table) {
-    ts.exec("scan -np -t " + table);
+    ts.exec("scan -t " + table);
     return ts.output.get().split("\n").length - 1;
   }
 
@@ -1901,17 +1901,17 @@ private int countkeys(String table) {
   public void scans() throws Exception {
     ts.exec("createtable t");
     make10();
-    String result = ts.exec("scan -np -b row1 -e row1");
+    String result = ts.exec("scan -b row1 -e row1");
     assertEquals(2, result.split("\n").length);
-    result = ts.exec("scan -np -b row3 -e row5");
+    result = ts.exec("scan -b row3 -e row5");
     assertEquals(4, result.split("\n").length);
-    result = ts.exec("scan -np -r row3");
+    result = ts.exec("scan -r row3");
     assertEquals(2, result.split("\n").length);
-    result = ts.exec("scan -np -b row:");
+    result = ts.exec("scan -b row:");
     assertEquals(1, result.split("\n").length);
-    result = ts.exec("scan -np -b row");
+    result = ts.exec("scan -b row");
     assertEquals(11, result.split("\n").length);
-    result = ts.exec("scan -np -e row:");
+    result = ts.exec("scan -e row:");
     assertEquals(11, result.split("\n").length);
     ts.exec("deletetable -f t");
   }
@@ -1976,21 +1976,21 @@ public void scansWithClassLoaderContext() throws IOException {
 
     // The implementation of ValueReversingIterator in the FAKE context does nothing, the value is
     // not reversed.
-    result = ts.exec("scan -pn baz -np -b row1 -e row1");
+    result = ts.exec("scan -pn baz -b row1 -e row1");
     assertEquals(2, result.split("\n").length);
     assertTrue(result.contains("value"));
-    result = ts.exec("scan -pn baz -np -b row3 -e row5");
+    result = ts.exec("scan -pn baz -b row3 -e row5");
     assertEquals(4, result.split("\n").length);
     assertTrue(result.contains("value"));
-    result = ts.exec("scan -pn baz -np -r row3");
+    result = ts.exec("scan -pn baz -r row3");
     assertEquals(2, result.split("\n").length);
     assertTrue(result.contains("value"));
-    result = ts.exec("scan -pn baz -np -b row:");
+    result = ts.exec("scan -pn baz -b row:");
     assertEquals(1, result.split("\n").length);
-    result = ts.exec("scan -pn baz -np -b row");
+    result = ts.exec("scan -pn baz -b row");
     assertEquals(11, result.split("\n").length);
     assertTrue(result.contains("value"));
-    result = ts.exec("scan -pn baz -np -e row:");
+    result = ts.exec("scan -pn baz -e row:");
     assertEquals(11, result.split("\n").length);
     assertTrue(result.contains("value"));
 
@@ -1998,25 +1998,25 @@ public void scansWithClassLoaderContext() throws IOException {
 
     // Override the table classloader context with the REAL implementation of
     // ValueReversingIterator, which does reverse the value.
-    result = ts.exec("scan -pn baz -np -b row1 -e row1 -cc " + REAL_CONTEXT);
+    result = ts.exec("scan -pn baz -b row1 -e row1 -cc " + REAL_CONTEXT);
     assertEquals(2, result.split("\n").length);
     assertTrue(result.contains("eulav"));
     assertFalse(result.contains("value"));
-    result = ts.exec("scan -pn baz -np -b row3 -e row5 -cc " + REAL_CONTEXT);
+    result = ts.exec("scan -pn baz -b row3 -e row5 -cc " + REAL_CONTEXT);
     assertEquals(4, result.split("\n").length);
     assertTrue(result.contains("eulav"));
     assertFalse(result.contains("value"));
-    result = ts.exec("scan -pn baz -np -r row3 -cc " + REAL_CONTEXT);
+    result = ts.exec("scan -pn baz -r row3 -cc " + REAL_CONTEXT);
     assertEquals(2, result.split("\n").length);
     assertTrue(result.contains("eulav"));
     assertFalse(result.contains("value"));
-    result = ts.exec("scan -pn baz -np -b row: -cc " + REAL_CONTEXT);
+    result = ts.exec("scan -pn baz -b row: -cc " + REAL_CONTEXT);
     assertEquals(1, result.split("\n").length);
-    result = ts.exec("scan -pn baz -np -b row -cc " + REAL_CONTEXT);
+    result = ts.exec("scan -pn baz -b row -cc " + REAL_CONTEXT);
     assertEquals(11, result.split("\n").length);
     assertTrue(result.contains("eulav"));
     assertFalse(result.contains("value"));
-    result = ts.exec("scan -pn baz -np -e row: -cc " + REAL_CONTEXT);
+    result = ts.exec("scan -pn baz -e row: -cc " + REAL_CONTEXT);
     assertEquals(11, result.split("\n").length);
     assertTrue(result.contains("eulav"));
     assertFalse(result.contains("value"));
@@ -2168,7 +2168,7 @@ private void make10() {
   private List<String> getFiles(String tableId) {
     ts.output.clear();
 
-    ts.exec("scan -t " + AccumuloTable.METADATA.tableName() + " -np -c file -b " + tableId + " -e "
+    ts.exec("scan -t " + AccumuloTable.METADATA.tableName() + " -c file -b " + tableId + " -e "
         + tableId + "~");
 
     log.debug("countFiles(): {}", ts.output.get());
diff --git a/test/src/main/java/org/apache/accumulo/test/zookeeper/ZooCacheIT.java b/test/src/main/java/org/apache/accumulo/test/zookeeper/ZooCacheIT.java
index 645b7c70d2f..ef15a309598 100644
--- a/test/src/main/java/org/apache/accumulo/test/zookeeper/ZooCacheIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/zookeeper/ZooCacheIT.java
@@ -29,10 +29,13 @@
 import java.util.Collections;
 import java.util.HashSet;
 import java.util.List;
+import java.util.Optional;
 import java.util.Set;
 
 import org.apache.accumulo.core.fate.zookeeper.ZooCache;
+import org.apache.accumulo.core.fate.zookeeper.ZooCache.ZooCacheWatcher;
 import org.apache.accumulo.core.fate.zookeeper.ZooReaderWriter;
+import org.apache.accumulo.core.zookeeper.ZooSession;
 import org.apache.accumulo.test.util.Wait;
 import org.apache.zookeeper.Watcher;
 import org.junit.jupiter.api.AfterEach;
@@ -44,8 +47,9 @@
 @Tag(ZOOKEEPER_TESTING_SERVER)
 public class ZooCacheIT {
 
-  private ZooKeeperTestingServer szk = null;
-  private ZooReaderWriter zk = null;
+  private ZooKeeperTestingServer szk;
+  private ZooSession zk;
+  private ZooReaderWriter zrw;
 
   @TempDir
   private File tempDir;
@@ -53,29 +57,34 @@ public class ZooCacheIT {
   @BeforeEach
   public void setup() throws Exception {
     szk = new ZooKeeperTestingServer(tempDir);
-    zk = szk.getZooReaderWriter();
+    zk = szk.newClient();
+    zrw = zk.asReaderWriter();
   }
 
   @AfterEach
   public void teardown() throws Exception {
-    szk.close();
+    try {
+      zk.close();
+    } finally {
+      szk.close();
+    }
   }
 
   @Test
   public void testGetChildren() throws Exception {
 
     Set<String> watchesRemoved = Collections.synchronizedSet(new HashSet<>());
-    Watcher watcher = event -> {
+    ZooCacheWatcher watcher = event -> {
       if (event.getType() == Watcher.Event.EventType.ChildWatchRemoved
           || event.getType() == Watcher.Event.EventType.DataWatchRemoved) {
         watchesRemoved.add(event.getPath());
       }
     };
-    ZooCache zooCache = new ZooCache(zk, watcher, Duration.ofSeconds(3));
+    ZooCache zooCache = new ZooCache(zk, Optional.of(watcher), Duration.ofSeconds(3));
 
-    zk.mkdirs("/test2");
-    zk.mkdirs("/test3/c1");
-    zk.mkdirs("/test3/c2");
+    zrw.mkdirs("/test2");
+    zrw.mkdirs("/test3/c1");
+    zrw.mkdirs("/test3/c2");
 
     // cache non-existence of /test1 and existence of /test2 and /test3
     long uc1 = zooCache.getUpdateCount();
@@ -98,7 +107,7 @@ public void testGetChildren() throws Exception {
     assertEquals(uc4, zooCache.getUpdateCount());
 
     // Had cached non-existence of "/test1", should get a notification that it was created
-    zk.mkdirs("/test1");
+    zrw.mkdirs("/test1");
 
     Wait.waitFor(() -> {
       var children = zooCache.getChildren("/test1");
@@ -113,7 +122,7 @@ public void testGetChildren() throws Exception {
     assertEquals(uc5, zooCache.getUpdateCount());
 
     // add a child to /test3, should get a notification of the change
-    zk.mkdirs("/test3/c3");
+    zrw.mkdirs("/test3/c3");
     Wait.waitFor(() -> {
       var children = zooCache.getChildren("/test3");
       return children != null && children.size() == 3;
@@ -126,7 +135,7 @@ public void testGetChildren() throws Exception {
     assertEquals(uc6, zooCache.getUpdateCount());
 
     // remove a child from /test3
-    zk.delete("/test3/c2");
+    zrw.delete("/test3/c2");
     Wait.waitFor(() -> {
       var children = zooCache.getChildren("/test3");
       return children != null && children.size() == 2;
@@ -139,7 +148,7 @@ public void testGetChildren() throws Exception {
     assertEquals(uc7, zooCache.getUpdateCount());
 
     // remove /test2, should start caching that it does not exist
-    zk.delete("/test2");
+    zrw.delete("/test2");
     Wait.waitFor(() -> zooCache.getChildren("/test2") == null);
     long uc8 = zooCache.getUpdateCount();
     assertTrue(uc7 < uc8);
@@ -149,7 +158,7 @@ public void testGetChildren() throws Exception {
     assertEquals(uc8, zooCache.getUpdateCount());
 
     // add /test2 back, should update
-    zk.mkdirs("/test2");
+    zrw.mkdirs("/test2");
     Wait.waitFor(() -> zooCache.getChildren("/test2") != null);
     long uc9 = zooCache.getUpdateCount();
     assertTrue(uc8 < uc9);
@@ -159,12 +168,12 @@ public void testGetChildren() throws Exception {
     assertEquals(uc9, zooCache.getUpdateCount());
 
     // make multiple changes. the cache should see all of these
-    zk.delete("/test1");
-    zk.mkdirs("/test2/ca");
-    zk.delete("/test3/c1");
-    zk.mkdirs("/test3/c4");
-    zk.delete("/test3/c4");
-    zk.mkdirs("/test3/c5");
+    zrw.delete("/test1");
+    zrw.mkdirs("/test2/ca");
+    zrw.delete("/test3/c1");
+    zrw.mkdirs("/test3/c4");
+    zrw.delete("/test3/c4");
+    zrw.mkdirs("/test3/c5");
 
     Wait.waitFor(() -> {
       var children1 = zooCache.getChildren("/test1");
diff --git a/test/src/main/java/org/apache/accumulo/test/zookeeper/ZooKeeperTestingServer.java b/test/src/main/java/org/apache/accumulo/test/zookeeper/ZooKeeperTestingServer.java
index ae352ff2354..f659ea97971 100644
--- a/test/src/main/java/org/apache/accumulo/test/zookeeper/ZooKeeperTestingServer.java
+++ b/test/src/main/java/org/apache/accumulo/test/zookeeper/ZooKeeperTestingServer.java
@@ -20,15 +20,10 @@
 
 import java.io.File;
 import java.io.IOException;
-import java.util.concurrent.CountDownLatch;
 
-import org.apache.accumulo.core.fate.zookeeper.ZooReader;
-import org.apache.accumulo.core.fate.zookeeper.ZooReaderWriter;
-import org.apache.accumulo.core.fate.zookeeper.ZooUtil;
+import org.apache.accumulo.core.zookeeper.ZooSession;
 import org.apache.accumulo.server.util.PortUtils;
 import org.apache.curator.test.TestingServer;
-import org.apache.zookeeper.Watcher;
-import org.apache.zookeeper.ZooKeeper;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -74,8 +69,8 @@ public ZooKeeperTestingServer(final File tmpDir) {
   }
 
   @FunctionalInterface
-  public interface ZooKeeperConstructor<T extends ZooKeeper> {
-    public T construct(String connectString, int sessionTimeout, Watcher watcher)
+  public interface ZooSessionConstructor<T extends ZooSession> {
+    public T construct(String clientName, String connectString, int timeout, String instanceSecret)
         throws IOException;
   }
 
@@ -85,29 +80,18 @@ public T construct(String connectString, int sessionTimeout, Watcher watcher)
    * used by this class to wait for the client to connect. This can be used to construct a subclass
    * of the ZooKeeper client that implements non-standard behavior for a test.
    */
-  public <T extends ZooKeeper> T newClient(ZooKeeperConstructor<T> f)
+  public <T extends ZooSession> T newClient(ZooSessionConstructor<T> f)
       throws IOException, InterruptedException {
-    var connectionLatch = new CountDownLatch(1);
-    var zoo = f.construct(zkServer.getConnectString(), 30_000, watchedEvent -> {
-      if (watchedEvent.getState() == Watcher.Event.KeeperState.SyncConnected) {
-        connectionLatch.countDown();
-      }
-    });
-    connectionLatch.await();
-    ZooUtil.digestAuth(zoo, SECRET);
-    return zoo;
+    return f.construct(ZooKeeperTestingServer.class.getSimpleName(), zkServer.getConnectString(),
+        30_000, SECRET);
   }
 
   /**
    * Create a new instance of a standard ZooKeeper client that is already connected to the testing
-   * server.
+   * server. The caller is responsible for closing the object.
    */
-  public ZooKeeper newClient() throws IOException, InterruptedException {
-    return newClient(ZooKeeper::new);
-  }
-
-  public ZooReaderWriter getZooReaderWriter() {
-    return new ZooReader(zkServer.getConnectString(), 30000).asWriter(SECRET);
+  public ZooSession newClient() throws IOException, InterruptedException {
+    return newClient(ZooSession::new);
   }
 
   @Override