From 6d28bc6dd9c240dab3291376cb9b40cfa0bf4a40 Mon Sep 17 00:00:00 2001
From: "Tak Lon (Stephen) Wu" <taklwu@apache.org>
Date: Thu, 2 Dec 2021 12:55:41 -0800
Subject: [PATCH] HBASE-26524 Addendum fix TestConstraints (#3912)

---
 .../org/apache/hadoop/hbase/constraint/Constraints.java    | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/constraint/Constraints.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/constraint/Constraints.java
index 301adc198c2..a9438e3f25e 100644
--- a/hbase-server/src/main/java/org/apache/hadoop/hbase/constraint/Constraints.java
+++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/constraint/Constraints.java
@@ -88,7 +88,12 @@ public final class Constraints {
    * added.
    */
   public static TableDescriptorBuilder disable(TableDescriptorBuilder builder) throws IOException {
-    return builder.removeCoprocessor(ConstraintProcessor.class.getName());
+    try {
+      return builder.removeCoprocessor(ConstraintProcessor.class.getName());
+    } catch (IllegalArgumentException e) {
+      LOG.warn("ConstraintProcessor was unset.", e);
+      return builder;
+    }
   }
 
   /**