Refactor

Signed-off-by: Rishab Nahata <rnnahata@amazon.com>

server/src/main/java/org/opensearch/action/admin/cluster/decommission/awareness/put/DecommissionRequest.java

@@ -27,22 +27,22 @@
  */
 public class DecommissionRequest extends ClusterManagerNodeRequest<DecommissionRequest> {
 
-    public static final TimeValue TIMEOUT = TimeValue.timeValueMinutes(2L);
+    public static final TimeValue DEFAULT_REQUEST_TIMEOUT = TimeValue.timeValueMinutes(2L);
     public static final TimeValue DEFAULT_NODE_DRAINING_TIMEOUT = TimeValue.timeValueSeconds(120);
 
     private DecommissionAttribute decommissionAttribute;
-    private boolean retryOnClusterManagerChange = false;
-    private TimeValue timeout = TIMEOUT;
+    private boolean retryOnClusterManagerSwitch = false;
+    private TimeValue timeout = DEFAULT_REQUEST_TIMEOUT;
     private TimeValue delayTimeout = DEFAULT_NODE_DRAINING_TIMEOUT;
 
     // holder for no_delay param. To avoid draining time timeout.
     private boolean noDelay = false;
 
     public DecommissionRequest() {}
 
-    public DecommissionRequest(DecommissionAttribute decommissionAttribute, boolean retryOnClusterManagerChange, TimeValue timeout) {
+    public DecommissionRequest(DecommissionAttribute decommissionAttribute, boolean retryOnClusterManagerSwitch, TimeValue timeout) {
         this.decommissionAttribute = decommissionAttribute;
-        this.retryOnClusterManagerChange = retryOnClusterManagerChange;
+        this.retryOnClusterManagerSwitch = retryOnClusterManagerSwitch;
         this.timeout = timeout;
     }
 
@@ -55,7 +55,7 @@ public DecommissionRequest(StreamInput in) throws IOException {
         decommissionAttribute = new DecommissionAttribute(in);
         this.delayTimeout = in.readTimeValue();
         this.noDelay = in.readBoolean();
-        this.retryOnClusterManagerChange = in.readBoolean();
+        this.retryOnClusterManagerSwitch = in.readBoolean();
         this.timeout = in.readTimeValue();
 
     }
@@ -66,7 +66,7 @@ public void writeTo(StreamOutput out) throws IOException {
         decommissionAttribute.writeTo(out);
         out.writeTimeValue(delayTimeout);
         out.writeBoolean(noDelay);
-        out.writeBoolean(retryOnClusterManagerChange);
+        out.writeBoolean(retryOnClusterManagerSwitch);
         out.writeTimeValue(timeout);
     }
 
@@ -110,19 +110,19 @@ public boolean isNoDelay() {
     /**
      * Sets retryOnClusterManagerChange for decommission request
      *
-     * @param retryOnClusterManagerChange boolean for request to retry decommission action on cluster manager change
+     * @param retryOnClusterManagerSwitch boolean for request to retry decommission action on cluster manager switch
      * @return this request
      */
-    public DecommissionRequest setRetryOnClusterManagerChange(boolean retryOnClusterManagerChange) {
-        this.retryOnClusterManagerChange = retryOnClusterManagerChange;
+    public DecommissionRequest setRetryOnClusterManagerSwitch(boolean retryOnClusterManagerSwitch) {
+        this.retryOnClusterManagerSwitch = retryOnClusterManagerSwitch;
         return this;
     }
 
     /**
-     * @return Returns whether decommission is retry eligible on cluster manager change
+     * @return Returns whether decommission is retry eligible on cluster manager switch
      */
-    public boolean retryOnClusterManagerChange() {
-        return this.retryOnClusterManagerChange;
+    public boolean retryOnClusterManagerSwitch() {
+        return this.retryOnClusterManagerSwitch;
     }
 
     /**
@@ -176,7 +176,7 @@ public String toString() {
             + "decommissionAttribute="
             + decommissionAttribute
             + ", retryOnClusterManagerChange="
-            + retryOnClusterManagerChange
+            + retryOnClusterManagerSwitch
             + ", timeout="
             + timeout
             + ", delayTimeout="

server/src/main/java/org/opensearch/action/admin/cluster/decommission/awareness/put/DecommissionRequestBuilder.java

@@ -48,13 +48,13 @@ public DecommissionRequestBuilder setNoDelay(boolean noDelay) {
     }
 
     /**
-     * Sets retryOnClusterManagerChange for decommission request
+     * Sets retryOnClusterManagerSwitch for decommission request
      *
-     * @param retryOnClusterManagerChange boolean for request to retry decommission action on cluster manager change
+     * @param retryOnClusterManagerSwitch boolean for request to retry decommission action on cluster manager switch
      * @return current object
      */
-    public DecommissionRequestBuilder setRetryOnClusterManagerChange(boolean retryOnClusterManagerChange) {
-        request.setRetryOnClusterManagerChange(retryOnClusterManagerChange);
+    public DecommissionRequestBuilder setRetryOnClusterManagerSwitch(boolean retryOnClusterManagerSwitch) {
+        request.setRetryOnClusterManagerSwitch(retryOnClusterManagerSwitch);
         return this;
     }
 

server/src/main/java/org/opensearch/cluster/decommission/DecommissionController.java

@@ -102,7 +102,7 @@ public void retryDecommissionAction(
             listener.onFailure(new OpenSearchTimeoutException(errorMsg));
             return;
         }
-        decommissionRequest.setRetryOnClusterManagerChange(true);
+        decommissionRequest.setRetryOnClusterManagerSwitch(true);
         decommissionRequest.setTimeout(TimeValue.timeValueMillis(remainingTimeoutMS));
         transportService.sendRequest(
             transportService.getLocalNode(),

server/src/main/java/org/opensearch/cluster/decommission/DecommissionService.java

@@ -524,7 +524,7 @@ private static void ensureEligibleRetry(
         if (decommissionAttributeMetadata != null) {
             // we just need to check for INIT status as for other transient statuses we already handle it separately
             if (decommissionAttributeMetadata.status().equals(DecommissionStatus.INIT)
-                && decommissionRequest.retryOnClusterManagerChange() == false) {
+                && decommissionRequest.retryOnClusterManagerSwitch() == false) {
                 throw new DecommissioningFailedException(
                     decommissionRequest.getDecommissionAttribute(),
                     "concurrent request received to decommission attribute"

server/src/main/java/org/opensearch/rest/action/admin/cluster/RestDecommissionAction.java

@@ -21,7 +21,7 @@
 import java.util.List;
 
 import static java.util.Collections.singletonList;
-import static org.opensearch.action.admin.cluster.decommission.awareness.put.DecommissionRequest.TIMEOUT;
+import static org.opensearch.action.admin.cluster.decommission.awareness.put.DecommissionRequest.DEFAULT_REQUEST_TIMEOUT;
 import static org.opensearch.rest.RestRequest.Method.PUT;
 
 /**
@@ -60,7 +60,7 @@ DecommissionRequest createRequest(RestRequest request) throws IOException {
             decommissionRequest.setDelayTimeout(delayTimeout);
         }
         return decommissionRequest.setDecommissionAttribute(new DecommissionAttribute(attributeName, attributeValue))
-            .setRetryOnClusterManagerChange(false)
-            .setTimeout(TimeValue.parseTimeValue(request.param("timeout"), TIMEOUT, getClass().getSimpleName() + ".timeout"));
+            .setRetryOnClusterManagerSwitch(false)
+            .setTimeout(TimeValue.parseTimeValue(request.param("timeout"), DEFAULT_REQUEST_TIMEOUT, getClass().getSimpleName() + ".timeout"));
     }
 }