From 23772d946bdf26a72fb611a9719afe743cdebd52 Mon Sep 17 00:00:00 2001
From: Adam Antal <aadam99@gmail.com>
Date: Fri, 22 Oct 2021 16:33:03 +0200
Subject: [PATCH] YARN-10948. Rename SchedulerQueue#activeQueue to
 activateQueue. Contributed by Adam Antal

---
 .../server/resourcemanager/scheduler/QueueStateManager.java   | 2 +-
 .../yarn/server/resourcemanager/scheduler/SchedulerQueue.java | 4 ++--
 .../resourcemanager/scheduler/capacity/AbstractCSQueue.java   | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/QueueStateManager.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/QueueStateManager.java
index 0127e1ecaa..ab0f445275 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/QueueStateManager.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/QueueStateManager.java
@@ -77,7 +77,7 @@ public synchronized void activateQueue(String queueName)
       throw new YarnException("The specified queue:" + queueName
           + " does not exist!");
     }
-    queue.activeQueue();
+    queue.activateQueue();
   }
 
   /**
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/SchedulerQueue.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/SchedulerQueue.java
index 9a67e0188a..33037fc43f 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/SchedulerQueue.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/SchedulerQueue.java
@@ -62,8 +62,8 @@ public interface SchedulerQueue<T extends SchedulerQueue> extends Queue {
   void stopQueue();
 
   /**
-   * Active the queue.
+   * Activate the queue.
    * @throws YarnException if the queue can not be activated.
    */
-  void activeQueue() throws YarnException;
+  void activateQueue() throws YarnException;
 }
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/AbstractCSQueue.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/AbstractCSQueue.java
index ca861fbaa8..2d9bf85b99 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/AbstractCSQueue.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/main/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/AbstractCSQueue.java
@@ -733,7 +733,7 @@ private void initializeQueueState(CapacitySchedulerConfiguration configuration)
       } else {
         if (configuredState == QueueState.RUNNING) {
           try {
-            activeQueue();
+            activateQueue();
           } catch (YarnException ex) {
             throw new IllegalArgumentException(ex.getMessage());
           }
@@ -1322,7 +1322,7 @@ public void updateQueueState(QueueState queueState) {
   }
 
   @Override
-  public void activeQueue() throws YarnException {
+  public void activateQueue() throws YarnException {
     this.writeLock.lock();
     try {
       if (getState() == QueueState.RUNNING) {