moving all getEnvironmentSettings calls out of constructor since sett…

…ings are populated after initialization Signed-off-by: Joshua Palis <[email protected]>
opensearch-project · Jun 8, 2023 · e8310bf · e8310bf
1 parent e158889
commit e8310bf
Show file tree

Hide file tree

Showing 5 changed files with 28 additions and 21 deletions.
diff --git a/src/main/java/org/opensearch/ad/transport/ADCancelTaskTransportAction.java b/src/main/java/org/opensearch/ad/transport/ADCancelTaskTransportAction.java
@@ -26,7 +26,6 @@
 import org.opensearch.ad.task.ADTaskCancellationState;
 import org.opensearch.ad.task.ADTaskManager;
 import org.opensearch.cluster.ClusterName;
-import org.opensearch.common.settings.Settings;
 import org.opensearch.sdk.ExtensionsRunner;
 import org.opensearch.sdk.SDKClusterService;
 import org.opensearch.tasks.Task;
@@ -38,7 +37,7 @@ public class ADCancelTaskTransportAction extends TransportAction<ADCancelTaskReq
  private final Logger logger = LogManager.getLogger(ADCancelTaskTransportAction.class);
  private ADTaskManager adTaskManager;
  private SDKClusterService clusterService;
- private Settings settings;
+ private ExtensionsRunner extensionsRunner;
 
  @Inject
  public ADCancelTaskTransportAction(
@@ -51,15 +50,19 @@ public ADCancelTaskTransportAction(
  super(ADCancelTaskAction.NAME, actionFilters, taskManager);
  this.adTaskManager = adTaskManager;
  this.clusterService = clusterService;
- this.settings = extensionsRunner.getEnvironmentSettings();
+ this.extensionsRunner = extensionsRunner;
  }
 
  protected ADCancelTaskResponse newResponse(
  ADCancelTaskRequest request,
  List<ADCancelTaskNodeResponse> responses,
  List<FailedNodeException> failures
  ) {
- return new ADCancelTaskResponse(new ClusterName(settings.get("cluster.name")), responses, failures);
+ return new ADCancelTaskResponse(
+ new ClusterName(extensionsRunner.getEnvironmentSettings().get("cluster.name")),
+ responses,
+ failures
+ );
  }
 
  @Override

diff --git a/src/main/java/org/opensearch/ad/transport/ADStatsNodesTransportAction.java b/src/main/java/org/opensearch/ad/transport/ADStatsNodesTransportAction.java
@@ -27,7 +27,6 @@
 import org.opensearch.ad.task.ADTaskManager;
 import org.opensearch.cluster.ClusterName;
 import org.opensearch.common.io.stream.StreamInput;
-import org.opensearch.common.settings.Settings;
 import org.opensearch.monitor.jvm.JvmService;
 import org.opensearch.sdk.ExtensionsRunner;
 import org.opensearch.sdk.SDKClusterService;
@@ -48,7 +47,7 @@ public class ADStatsNodesTransportAction extends TransportAction<ADStatsRequest,
  private final ADTaskManager adTaskManager;
 
  private final SDKClusterService sdkClusterService;
- private Settings settings;
+ private ExtensionsRunner extensionsRunner;
 
  /**
  * Constructor
@@ -76,15 +75,19 @@ public ADStatsNodesTransportAction(
  this.jvmService = jvmService;
  this.adTaskManager = adTaskManager;
  this.sdkClusterService = sdkClusterService;
- this.settings = extensionsRunner.getEnvironmentSettings();
+ this.extensionsRunner = extensionsRunner;
  }
 
  protected ADStatsNodesResponse newResponse(
  ADStatsRequest request,
  List<ADStatsNodeResponse> responses,
  List<FailedNodeException> failures
  ) {
- return new ADStatsNodesResponse(new ClusterName(settings.get("cluster.name")), responses, failures);
+ return new ADStatsNodesResponse(
+ new ClusterName(extensionsRunner.getEnvironmentSettings().get("cluster.name")),
+ responses,
+ failures
+ );
  }
 
  protected ADStatsNodeRequest newNodeRequest(ADStatsRequest request) {

diff --git a/src/main/java/org/opensearch/ad/transport/ADTaskProfileTransportAction.java b/src/main/java/org/opensearch/ad/transport/ADTaskProfileTransportAction.java
@@ -24,7 +24,6 @@
 import org.opensearch.ad.task.ADTaskManager;
 import org.opensearch.cluster.ClusterName;
 import org.opensearch.common.io.stream.StreamInput;
-import org.opensearch.common.settings.Settings;
 import org.opensearch.sdk.ExtensionsRunner;
 import org.opensearch.sdk.SDKClusterService;
 import org.opensearch.tasks.Task;
@@ -44,7 +43,7 @@ public class ADTaskProfileTransportAction extends TransportAction<ADTaskProfileR
  // private HashRing hashRing;
 
  private final SDKClusterService sdkClusterService;
- private Settings settings;
+ private ExtensionsRunner extensionsRunner;
 
  @Inject
  public ADTaskProfileTransportAction(
@@ -61,15 +60,19 @@ public ADTaskProfileTransportAction(
  /* MultiNode support https:/opensearch-project/opensearch-sdk-java/issues/200 */
  // this.hashRing = hashRing;
  this.sdkClusterService = sdkClusterService;
- this.settings = extensionsRunner.getEnvironmentSettings();
+ this.extensionsRunner = extensionsRunner;
  }
 
  protected ADTaskProfileResponse newResponse(
  ADTaskProfileRequest request,
  List<ADTaskProfileNodeResponse> responses,
  List<FailedNodeException> failures
  ) {
- return new ADTaskProfileResponse(new ClusterName(settings.get("cluster.name")), responses, failures);
+ return new ADTaskProfileResponse(
+ new ClusterName(extensionsRunner.getEnvironmentSettings().get("cluster.name")),
+ responses,
+ failures
+ );
  }
 
  protected ADTaskProfileNodeRequest newNodeRequest(ADTaskProfileRequest request) {

diff --git a/src/main/java/org/opensearch/ad/transport/DeleteModelTransportAction.java b/src/main/java/org/opensearch/ad/transport/DeleteModelTransportAction.java
@@ -27,7 +27,6 @@
 import org.opensearch.ad.ml.ModelManager;
 import org.opensearch.ad.task.ADTaskCacheManager;
 import org.opensearch.cluster.ClusterName;
-import org.opensearch.common.settings.Settings;
 import org.opensearch.sdk.ExtensionsRunner;
 import org.opensearch.sdk.SDKClusterService;
 import org.opensearch.tasks.Task;
@@ -45,7 +44,7 @@ public class DeleteModelTransportAction extends TransportAction<DeleteModelReque
  private ADTaskCacheManager adTaskCacheManager;
  private EntityColdStarter coldStarter;
  private SDKClusterService clusterService;
- private Settings settings;
+ private ExtensionsRunner extensionsRunner;
 
  @Inject
  public DeleteModelTransportAction(
@@ -69,7 +68,7 @@ public DeleteModelTransportAction(
  this.cache = cache;
  this.adTaskCacheManager = adTaskCacheManager;
  this.coldStarter = coldStarter;
- this.settings = extensionsRunner.getEnvironmentSettings();
+ this.extensionsRunner = extensionsRunner;
  }
 
  @Override
@@ -112,6 +111,6 @@ protected DeleteModelResponse newResponse(
  List<DeleteModelNodeResponse> responses,
  List<FailedNodeException> failures
  ) {
- return new DeleteModelResponse(new ClusterName(settings.get("cluster.name")), responses, failures);
+ return new DeleteModelResponse(new ClusterName(extensionsRunner.getEnvironmentSettings().get("cluster.name")), responses, failures);
  }
 }
diff --git a/src/main/java/org/opensearch/ad/transport/ProfileTransportAction.java b/src/main/java/org/opensearch/ad/transport/ProfileTransportAction.java
@@ -30,7 +30,6 @@
 import org.opensearch.ad.model.DetectorProfileName;
 import org.opensearch.ad.model.ModelProfile;
 import org.opensearch.cluster.ClusterName;
-import org.opensearch.common.settings.Settings;
 import org.opensearch.sdk.ExtensionsRunner;
 import org.opensearch.sdk.SDKClusterService;
 import org.opensearch.tasks.Task;
@@ -49,7 +48,7 @@ public class ProfileTransportAction extends TransportAction<ProfileRequest, Prof
  private SDKClusterService sdkClusterService;
  // the number of models to return. Defaults to 10.
  private volatile int numModelsToReturn;
- private Settings settings;
+ private ExtensionsRunner extensionsRunner;
 
  /**
  * Constructor
@@ -73,17 +72,17 @@ public ProfileTransportAction(
  CacheProvider cacheProvider
  ) {
  super(ProfileAction.NAME, actionFilters, taskManager);
+ this.extensionsRunner = extensionsRunner;
  this.modelManager = modelManager;
  this.featureManager = featureManager;
  this.cacheProvider = cacheProvider;
  this.sdkClusterService = sdkClusterService;
- this.settings = extensionsRunner.getEnvironmentSettings();
- this.numModelsToReturn = MAX_MODEL_SIZE_PER_NODE.get(settings);
+ this.numModelsToReturn = MAX_MODEL_SIZE_PER_NODE.get(extensionsRunner.getEnvironmentSettings());
  this.sdkClusterService.getClusterSettings().addSettingsUpdateConsumer(MAX_MODEL_SIZE_PER_NODE, it -> this.numModelsToReturn = it);
  }
 
  private ProfileResponse newResponse(ProfileRequest request, List<ProfileNodeResponse> responses, List<FailedNodeException> failures) {
- return new ProfileResponse(new ClusterName(settings.get("cluster.name")), responses, failures);
+ return new ProfileResponse(new ClusterName(extensionsRunner.getEnvironmentSettings().get("cluster.name")), responses, failures);
  }
 
  @Override