Diff segment missing from backport of HBASE-26867

ndimiduk · ndimiduk · commit de88e5e74c87 · 2024-09-24T14:06:22.000+02:00
diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/procedure/flush/MasterFlushTableProcedureManager.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/procedure/flush/MasterFlushTableProcedureManager.java
@@ -146,13 +146,13 @@ public void execProcedure(ProcedureDescription desc) throws IOException {
 
     ForeignExceptionDispatcher monitor = new ForeignExceptionDispatcher(desc.getInstance());
 
-    HBaseProtos.NameStringPair family = null;
+    HBaseProtos.NameStringPair families = null;
     for (HBaseProtos.NameStringPair nsp : desc.getConfigurationList()) {
       if (HConstants.FAMILY_KEY_STR.equals(nsp.getName())) {
-        family = nsp;
+        families = nsp;
       }
     }
-    byte[] procArgs = family != null ? family.toByteArray() : new byte[0];
+    byte[] procArgs = families != null ? families.toByteArray() : new byte[0];
 
     // Kick of the global procedure from the master coordinator to the region servers.
     // We rely on the existing Distributed Procedure framework to prevent any concurrent

Original file line number	Diff line number	Diff line change
`@@ -146,13 +146,13 @@ public void execProcedure(ProcedureDescription desc) throws IOException {`
`146`	`146`
`147`	`147`	`ForeignExceptionDispatcher monitor = new ForeignExceptionDispatcher(desc.getInstance());`
`148`	`148`
`149`		`- HBaseProtos.NameStringPair family = null;`
	`149`	`+ HBaseProtos.NameStringPair families = null;`
`150`	`150`	`for (HBaseProtos.NameStringPair nsp : desc.getConfigurationList()) {`
`151`	`151`	`if (HConstants.FAMILY_KEY_STR.equals(nsp.getName())) {`
`152`		`- family = nsp;`
	`152`	`+ families = nsp;`
`153`	`153`	`}`
`154`	`154`	`}`
`155`		`- byte[] procArgs = family != null ? family.toByteArray() : new byte[0];`
	`155`	`+ byte[] procArgs = families != null ? families.toByteArray() : new byte[0];`
`156`	`156`
`157`	`157`	`// Kick of the global procedure from the master coordinator to the region servers.`
`158`	`158`	`// We rely on the existing Distributed Procedure framework to prevent any concurrent`