From 42d6af66a461900ffe48252e099738e7152f727c Mon Sep 17 00:00:00 2001
From: gargharsh3134 <51459091+gargharsh3134@users.noreply.github.com>
Date: Mon, 10 Jun 2024 19:47:59 +0530
Subject: [PATCH] Retaining old constructor of MasterService class to maintain
 compatibility (#14123)

Signed-off-by: Harsh Garg <gkharsh@amazon.com>
Co-authored-by: Harsh Garg <gkharsh@amazon.com>
---
 .../opensearch/cluster/service/ClusterManagerService.java    | 3 +--
 .../java/org/opensearch/cluster/service/MasterService.java   | 5 +++++
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/server/src/main/java/org/opensearch/cluster/service/ClusterManagerService.java b/server/src/main/java/org/opensearch/cluster/service/ClusterManagerService.java
index 731bf004bd56f..fa8c965b4d538 100644
--- a/server/src/main/java/org/opensearch/cluster/service/ClusterManagerService.java
+++ b/server/src/main/java/org/opensearch/cluster/service/ClusterManagerService.java
@@ -12,7 +12,6 @@
 import org.opensearch.common.annotation.PublicApi;
 import org.opensearch.common.settings.ClusterSettings;
 import org.opensearch.common.settings.Settings;
-import org.opensearch.telemetry.metrics.noop.NoopMetricsRegistry;
 import org.opensearch.threadpool.ThreadPool;
 
 /**
@@ -24,7 +23,7 @@
 public class ClusterManagerService extends MasterService {
 
     public ClusterManagerService(Settings settings, ClusterSettings clusterSettings, ThreadPool threadPool) {
-        super(settings, clusterSettings, threadPool, new ClusterManagerMetrics(NoopMetricsRegistry.INSTANCE));
+        super(settings, clusterSettings, threadPool);
     }
 
     public ClusterManagerService(
diff --git a/server/src/main/java/org/opensearch/cluster/service/MasterService.java b/server/src/main/java/org/opensearch/cluster/service/MasterService.java
index 6436dcfe33003..686e9793a8fd3 100644
--- a/server/src/main/java/org/opensearch/cluster/service/MasterService.java
+++ b/server/src/main/java/org/opensearch/cluster/service/MasterService.java
@@ -71,6 +71,7 @@
 import org.opensearch.core.concurrency.OpenSearchRejectedExecutionException;
 import org.opensearch.discovery.Discovery;
 import org.opensearch.node.Node;
+import org.opensearch.telemetry.metrics.noop.NoopMetricsRegistry;
 import org.opensearch.telemetry.metrics.tags.Tags;
 import org.opensearch.threadpool.Scheduler;
 import org.opensearch.threadpool.ThreadPool;
@@ -140,6 +141,10 @@ public class MasterService extends AbstractLifecycleComponent {
     private final ClusterStateStats stateStats;
     private final ClusterManagerMetrics clusterManagerMetrics;
 
+    public MasterService(Settings settings, ClusterSettings clusterSettings, ThreadPool threadPool) {
+        this(settings, clusterSettings, threadPool, new ClusterManagerMetrics(NoopMetricsRegistry.INSTANCE));
+    }
+
     public MasterService(
         Settings settings,
         ClusterSettings clusterSettings,