From 6cc2d790171ecde793c1022c22719e9b51cfb887 Mon Sep 17 00:00:00 2001
From: Xue Zhou <85715413+xuezhou25@users.noreply.github.com>
Date: Wed, 3 Aug 2022 18:19:28 -0700
Subject: [PATCH] Deprecate and rename abstract methods in interfaces that
 contain 'master' in name (#4121)

Signed-off-by: Xue Zhou <xuezhou@amazon.com>
(cherry picked from commit ba9cdcdb262176a4947f13471b27450d8ac6fe63)
---
 .../LocalNodeClusterManagerListener.java      |  8 ++---
 .../cluster/LocalNodeMasterListener.java      | 29 +++++++++++++++++++
 .../opensearch/cluster/ack/AckedRequest.java  | 14 ++++++++-
 .../service/ClusterApplierServiceTests.java   |  4 +--
 4 files changed, 48 insertions(+), 7 deletions(-)

diff --git a/server/src/main/java/org/opensearch/cluster/LocalNodeClusterManagerListener.java b/server/src/main/java/org/opensearch/cluster/LocalNodeClusterManagerListener.java
index c86aa00a6f2a2..c07dcc5daaee6 100644
--- a/server/src/main/java/org/opensearch/cluster/LocalNodeClusterManagerListener.java
+++ b/server/src/main/java/org/opensearch/cluster/LocalNodeClusterManagerListener.java
@@ -42,21 +42,21 @@ public interface LocalNodeClusterManagerListener extends ClusterStateListener {
     /**
      * Called when local node is elected to be the cluster-manager
      */
-    void onMaster();
+    void onClusterManager();
 
     /**
      * Called when the local node used to be the cluster-manager, a new cluster-manager was elected and it's no longer the local node.
      */
-    void offMaster();
+    void offClusterManager();
 
     @Override
     default void clusterChanged(ClusterChangedEvent event) {
         final boolean wasClusterManager = event.previousState().nodes().isLocalNodeElectedClusterManager();
         final boolean isClusterManager = event.localNodeClusterManager();
         if (wasClusterManager == false && isClusterManager) {
-            onMaster();
+            onClusterManager();
         } else if (wasClusterManager && isClusterManager == false) {
-            offMaster();
+            offClusterManager();
         }
     }
 }
diff --git a/server/src/main/java/org/opensearch/cluster/LocalNodeMasterListener.java b/server/src/main/java/org/opensearch/cluster/LocalNodeMasterListener.java
index 7b54b923449d8..eb9bfa67686b6 100644
--- a/server/src/main/java/org/opensearch/cluster/LocalNodeMasterListener.java
+++ b/server/src/main/java/org/opensearch/cluster/LocalNodeMasterListener.java
@@ -18,4 +18,33 @@
 @Deprecated
 public interface LocalNodeMasterListener extends LocalNodeClusterManagerListener {
 
+    /**
+     * Called when local node is elected to be the cluster-manager.
+     * @deprecated As of 2.2, because supporting inclusive language, replaced by {@link #onClusterManager()}
+     */
+    @Deprecated
+    void onMaster();
+
+    /**
+     * Called when the local node used to be the cluster-manager, a new cluster-manager was elected and it's no longer the local node.
+     * @deprecated As of 2.2, because supporting inclusive language, replaced by {@link #offClusterManager()}
+     */
+    @Deprecated
+    void offMaster();
+
+    /**
+     * Called when local node is elected to be the cluster-manager.
+     */
+    @Override
+    default void onClusterManager() {
+        onMaster();
+    }
+
+    /**
+     * Called when the local node used to be the cluster-manager, a new cluster-manager was elected and it's no longer the local node.
+     */
+    @Override
+    default void offClusterManager() {
+        offMaster();
+    }
 }
diff --git a/server/src/main/java/org/opensearch/cluster/ack/AckedRequest.java b/server/src/main/java/org/opensearch/cluster/ack/AckedRequest.java
index a3f74cb45a880..750f4b177cb86 100644
--- a/server/src/main/java/org/opensearch/cluster/ack/AckedRequest.java
+++ b/server/src/main/java/org/opensearch/cluster/ack/AckedRequest.java
@@ -48,6 +48,18 @@ public interface AckedRequest {
 
     /**
      * Returns the timeout for the request to be completed on the cluster-manager node
+     * @deprecated As of 2.2, because supporting inclusive language, replaced by {@link #clusterManagerNodeTimeout()}
      */
-    TimeValue masterNodeTimeout();
+    @Deprecated
+    default TimeValue masterNodeTimeout() {
+        throw new UnsupportedOperationException("Must be overridden");
+    }
+
+    /**
+     * Returns the timeout for the request to be completed on the cluster-manager node
+     */
+    // TODO: Remove default implementation after removing the deprecated masterNodeTimeout()
+    default TimeValue clusterManagerNodeTimeout() {
+        return masterNodeTimeout();
+    }
 }
diff --git a/server/src/test/java/org/opensearch/cluster/service/ClusterApplierServiceTests.java b/server/src/test/java/org/opensearch/cluster/service/ClusterApplierServiceTests.java
index 62dae0622eb85..e6da768650088 100644
--- a/server/src/test/java/org/opensearch/cluster/service/ClusterApplierServiceTests.java
+++ b/server/src/test/java/org/opensearch/cluster/service/ClusterApplierServiceTests.java
@@ -299,12 +299,12 @@ public void testLocalNodeClusterManagerListenerCallbacks() {
         AtomicBoolean isClusterManager = new AtomicBoolean();
         timedClusterApplierService.addLocalNodeClusterManagerListener(new LocalNodeClusterManagerListener() {
             @Override
-            public void onMaster() {
+            public void onClusterManager() {
                 isClusterManager.set(true);
             }
 
             @Override
-            public void offMaster() {
+            public void offClusterManager() {
                 isClusterManager.set(false);
             }
         });