Cleans up changes from memory circuit breaker PR (#1463)

* Cleans up whitespace, reduces delta of the changes. Follow-up from #1347 Signed-off-by: Tommy Markley <markleyt@amazon.com>
opensearch-project · Apr 14, 2022 · e6911a0 · e6911a0
1 parent a01e67a
commit e6911a0
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/src/core/server/opensearch/client/client_config.ts b/src/core/server/opensearch/client/client_config.ts
@@ -81,12 +81,12 @@ export function parseClientOptions(config: OpenSearchClientConfig, scoped: boole
   if (config.memoryCircuitBreaker != null) {
     clientOptions.memoryCircuitBreaker = config.memoryCircuitBreaker;
   }
-  if (config.requestTimeout != null) {
-    clientOptions.requestTimeout = getDurationAsMs(config.requestTimeout);
-  }
   if (config.pingTimeout != null) {
     clientOptions.pingTimeout = getDurationAsMs(config.pingTimeout);
   }
+  if (config.requestTimeout != null) {
+    clientOptions.requestTimeout = getDurationAsMs(config.requestTimeout);
+  }
   if (config.sniffInterval != null) {
     clientOptions.sniffInterval =
       typeof config.sniffInterval === 'boolean'

diff --git a/src/core/server/opensearch/opensearch_config.ts b/src/core/server/opensearch/opensearch_config.ts
@@ -253,8 +253,8 @@ export class OpenSearchConfig {
    * The `maxPercentage` field is to determine the threshold for maximum heap size for memory circuit breaker. By default the value is `1.0`.
    * The `enabled` field specifies whether the client should protect large response that can't fit into memory.
    */
-
   public readonly memoryCircuitBreaker: OpenSearchConfigType['memoryCircuitBreaker'];
+
   /**
    * Specifies whether the client should attempt to detect the rest of the cluster
    * when it is first instantiated.

diff --git a/src/dev/build/tasks/os_packages/docker_generator/resources/bin/opensearch-dashboards-docker b/src/dev/build/tasks/os_packages/docker_generator/resources/bin/opensearch-dashboards-docker
@@ -29,11 +29,11 @@ opensearch_dashboards_vars=(
     opensearch.customHeaders
     opensearch.hosts
     opensearch.logQueries
-    opensearch.password
-    opensearch.requestHeadersWhitelist
     opensearch.memoryCircuitBreaker.enabled
     opensearch.memoryCircuitBreaker.maxPercentage
+    opensearch.password
     opensearch.pingTimeout
+    opensearch.requestHeadersWhitelist
     opensearch.requestTimeout
     opensearch.shardTimeout
     opensearch.sniffInterval