Deprecate the Master nomenclature (opensearch-project#548)

Signed-off-by: Subhobrata Dey <sbcd90@gmail.com>
toepkerd-zz · Sep 28, 2022 · c3821c2 · c3821c2
1 parent 39c39ee
commit c3821c2
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/alerting/src/main/kotlin/org/opensearch/alerting/alerts/AlertIndices.kt b/alerting/src/main/kotlin/org/opensearch/alerting/alerts/AlertIndices.kt
@@ -150,7 +150,7 @@ class AlertIndices(
 
     @Volatile private var requestTimeout = AlertingSettings.REQUEST_TIMEOUT.get(settings)
 
-    @Volatile private var isMaster = false
+    @Volatile private var isClusterManager = false
 
     // for JobsMonitor to report
     var lastRolloverTime: TimeValue? = null
@@ -192,12 +192,12 @@ class AlertIndices(
     }
 
     override fun clusterChanged(event: ClusterChangedEvent) {
-        // Instead of using a LocalNodeMasterListener to track master changes, this service will
+        // Instead of using a LocalNodeClusterManagerListener to track master changes, this service will
         // track them here to avoid conditions where master listener events run after other
         // listeners that depend on what happened in the master listener
-        if (this.isMaster != event.localNodeMaster()) {
-            this.isMaster = event.localNodeMaster()
-            if (this.isMaster) {
+        if (this.isClusterManager != event.localNodeClusterManager()) {
+            this.isClusterManager = event.localNodeClusterManager()
+            if (this.isClusterManager) {
                 onMaster()
             } else {
                 offMaster()

diff --git a/...tlin/org/opensearch/alerting/util/destinationmigration/DestinationMigrationCoordinator.kt b/...tlin/org/opensearch/alerting/util/destinationmigration/DestinationMigrationCoordinator.kt
@@ -52,7 +52,7 @@ class DestinationMigrationCoordinator(
             DestinationMigrationUtilService.finishFlag = false
         }
         if (
-            event.localNodeMaster() &&
+            event.localNodeClusterManager() &&
             !runningLock &&
             (scheduledMigration == null || scheduledMigration!!.isCancelled)
         ) {
@@ -62,7 +62,7 @@ class DestinationMigrationCoordinator(
             } finally {
                 runningLock = false
             }
-        } else if (!event.localNodeMaster()) {
+        } else if (!event.localNodeClusterManager()) {
             scheduledMigration?.cancel()
         }
     }