(hbase) branch branch-3 updated: HBASE-29931 Test case TestRpcControllerFactory#testCountController failed (#7809)

[zhangduo]

This is an automated email from the ASF dual-hosted git repository.

zhangduo pushed a commit to branch branch-3
in repository https://gitbox.apache.org/repos/asf/hbase.git


The following commit(s) were added to refs/heads/branch-3 by this push:
     new 088c4cb1e35 HBASE-29931 Test case 
TestRpcControllerFactory#testCountController failed (#7809)
088c4cb1e35 is described below

commit 088c4cb1e3579dd36d6ad2c7343aeff1a98d0799
Author: Liu Xiao <42756849+liuxiao...@users.noreply.github.com>
AuthorDate: Fri Feb 27 23:16:27 2026 +0800

    HBASE-29931 Test case TestRpcControllerFactory#testCountController failed 
(#7809)
    
    Signed-off-by: Duo Zhang <zhang...@apache.org>
    (cherry picked from commit d070437f7176cb13f44b8ea1b1f93be15a820329)
---
 .../org/apache/hadoop/hbase/ipc/DelegatingHBaseRpcController.java  | 2 ++
 .../org/apache/hadoop/hbase/client/TestRpcControllerFactory.java   | 7 +++----
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git 
a/hbase-client/src/main/java/org/apache/hadoop/hbase/ipc/DelegatingHBaseRpcController.java
 
b/hbase-client/src/main/java/org/apache/hadoop/hbase/ipc/DelegatingHBaseRpcController.java
index a99c2081747..e651cf9183a 100644
--- 
a/hbase-client/src/main/java/org/apache/hadoop/hbase/ipc/DelegatingHBaseRpcController.java
+++ 
b/hbase-client/src/main/java/org/apache/hadoop/hbase/ipc/DelegatingHBaseRpcController.java
@@ -85,11 +85,13 @@ public class DelegatingHBaseRpcController implements 
HBaseRpcController {
     delegate.setCellScanner(cellScanner);
   }
 
+  @Deprecated
   @Override
   public void setPriority(int priority) {
     delegate.setPriority(priority);
   }
 
+  @Deprecated
   @Override
   public void setPriority(TableName tn) {
     delegate.setPriority(tn);
diff --git 
a/hbase-endpoint/src/test/java/org/apache/hadoop/hbase/client/TestRpcControllerFactory.java
 
b/hbase-endpoint/src/test/java/org/apache/hadoop/hbase/client/TestRpcControllerFactory.java
index cb6e14d1b27..2a79ec5af99 100644
--- 
a/hbase-endpoint/src/test/java/org/apache/hadoop/hbase/client/TestRpcControllerFactory.java
+++ 
b/hbase-endpoint/src/test/java/org/apache/hadoop/hbase/client/TestRpcControllerFactory.java
@@ -41,6 +41,7 @@ import org.apache.hadoop.hbase.ipc.RpcControllerFactory;
 import org.apache.hadoop.hbase.testclassification.ClientTests;
 import org.apache.hadoop.hbase.testclassification.MediumTests;
 import org.apache.hadoop.hbase.util.Bytes;
+import org.checkerframework.checker.nullness.qual.Nullable;
 import org.junit.AfterClass;
 import org.junit.BeforeClass;
 import org.junit.ClassRule;
@@ -94,7 +95,7 @@ public class TestRpcControllerFactory {
     }
 
     @Override
-    public void setPriority(int priority) {
+    public void setPriority(int priority, @Nullable TableName tableName) {
       INT_PRIORITY.incrementAndGet();
       GROUPED_PRIORITY.add(priority);
     }
@@ -201,9 +202,7 @@ public class TestRpcControllerFactory {
       Get get = new Get(row);
       get.setPriority(HConstants.ADMIN_QOS);
       table.get(get);
-      // we will reset the controller for setting the call timeout so it will 
lead to an extra
-      // setPriority
-      verifyPriorityGroupCount(HConstants.ADMIN_QOS, 2);
+      verifyPriorityGroupCount(HConstants.ADMIN_QOS, 1);
     }
   }