From d848c632603a31631ea0a12382c52cce36adacae Mon Sep 17 00:00:00 2001
From: Wenjun Ruan <wenjun@apache.org>
Date: Mon, 4 Apr 2022 23:34:03 +0800
Subject: [PATCH] Optimize Node, remove duplicate Settings (#2703)

Removes duplicate Settings

Signed-off-by: ruanwenjun <wenjun@apache.org>
---
 .../opensearch/index/get/ShardGetService.java | 27 ++++++++-----------
 .../main/java/org/opensearch/node/Node.java   |  6 +----
 2 files changed, 12 insertions(+), 21 deletions(-)

diff --git a/server/src/main/java/org/opensearch/index/get/ShardGetService.java b/server/src/main/java/org/opensearch/index/get/ShardGetService.java
index e63d80336bc7a..6aa10bc450b51 100644
--- a/server/src/main/java/org/opensearch/index/get/ShardGetService.java
+++ b/server/src/main/java/org/opensearch/index/get/ShardGetService.java
@@ -216,25 +216,20 @@ private GetResult innerGet(
         fetchSourceContext = normalizeFetchSourceContent(fetchSourceContext, gFields);
 
         Term uidTerm = new Term(IdFieldMapper.NAME, Uid.encodeId(id));
-        Engine.GetResult get = indexShard.get(
-            new Engine.Get(realtime, true, id, uidTerm).version(version)
-                .versionType(versionType)
-                .setIfSeqNo(ifSeqNo)
-                .setIfPrimaryTerm(ifPrimaryTerm)
-        );
-        if (get.exists() == false) {
-            get.close();
-        }
-
-        if (get == null || get.exists() == false) {
-            return new GetResult(shardId.getIndexName(), id, UNASSIGNED_SEQ_NO, UNASSIGNED_PRIMARY_TERM, -1, false, null, null, null);
-        }
 
-        try {
+        try (
+            Engine.GetResult get = indexShard.get(
+                new Engine.Get(realtime, true, id, uidTerm).version(version)
+                    .versionType(versionType)
+                    .setIfSeqNo(ifSeqNo)
+                    .setIfPrimaryTerm(ifPrimaryTerm)
+            )
+        ) {
+            if (get == null || get.exists() == false) {
+                return new GetResult(shardId.getIndexName(), id, UNASSIGNED_SEQ_NO, UNASSIGNED_PRIMARY_TERM, -1, false, null, null, null);
+            }
             // break between having loaded it from translog (so we only have _source), and having a document to load
             return innerGetLoadFromStoredFields(id, gFields, fetchSourceContext, get, mapperService);
-        } finally {
-            get.close();
         }
     }
 
diff --git a/server/src/main/java/org/opensearch/node/Node.java b/server/src/main/java/org/opensearch/node/Node.java
index 6368e097f6a14..73c2f221bc7cc 100644
--- a/server/src/main/java/org/opensearch/node/Node.java
+++ b/server/src/main/java/org/opensearch/node/Node.java
@@ -348,11 +348,7 @@ protected Node(
             Settings tmpSettings = Settings.builder()
                 .put(initialEnvironment.settings())
                 .put(Client.CLIENT_TYPE_SETTING_S.getKey(), CLIENT_TYPE)
-                .build();
-
-            // Enabling shard indexing backpressure node-attribute
-            tmpSettings = Settings.builder()
-                .put(tmpSettings)
+                // Enabling shard indexing backpressure node-attribute
                 .put(NODE_ATTRIBUTES.getKey() + SHARD_INDEXING_PRESSURE_ENABLED_ATTRIBUTE_KEY, "true")
                 .build();