honeymoose
/
OpenSearch
mirror of https://github.com/honeymoose/OpenSearch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Rename BecomeMasterTask to BecomeClusterManagerTask in JoinTaskExecutor (#3099) 

Signed-off-by: Tianli Feng <ftianli@amazon.com>
This commit is contained in:
Tianli Feng 2022-04-28 10:57:49 -07:00 committed by GitHub
parent d86c88fe59
commit 017773c62d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 29 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
server/src/main/java/org/opensearch/cluster/coordination/JoinTaskExecutor.java
View File

@ -94,14 +94,19 @@ public class JoinTaskExecutor implements ClusterStateTaskExecutor<JoinTaskExecut
}
public boolean isBecomeMasterTask() {
return reason.equals(BECOME_MASTER_TASK_REASON);
return reason.equals(BECOME_MASTER_TASK_REASON) || reason.equals(BECOME_CLUSTER_MANAGER_TASK_REASON);
}
public boolean isFinishElectionTask() {
return reason.equals(FINISH_ELECTION_TASK_REASON);
}
/**
* @deprecated As of 2.0, because supporting inclusive language, replaced by {@link #BECOME_CLUSTER_MANAGER_TASK_REASON}
*/
@Deprecated
private static final String BECOME_MASTER_TASK_REASON = "_BECOME_MASTER_TASK_";
private static final String BECOME_CLUSTER_MANAGER_TASK_REASON = "_BECOME_CLUSTER_MANAGER_TASK_";
private static final String FINISH_ELECTION_TASK_REASON = "_FINISH_ELECTION_";
}
@ -331,10 +336,22 @@ public class JoinTaskExecutor implements ClusterStateTaskExecutor<JoinTaskExecut
return false;
}
/**
* a task indicates that the current node should become master
* @deprecated As of 2.0, because supporting inclusive language, replaced by {@link #newBecomeClusterManagerTask()}
*/
@Deprecated
public static Task newBecomeMasterTask() {
return new Task(null, Task.BECOME_MASTER_TASK_REASON);
}
/**
* a task indicates that the current node should become cluster-manager
*/
public static Task newBecomeClusterManagerTask() {
return new Task(null, Task.BECOME_CLUSTER_MANAGER_TASK_REASON);
}
/**
* a task that is used to signal the election is stopped and we should process pending joins.
* it may be used in combination with {@link JoinTaskExecutor#newBecomeMasterTask()}

11
server/src/test/java/org/opensearch/cluster/coordination/JoinTaskExecutorTests.java
View File

@ -50,6 +50,7 @@ import org.opensearch.test.VersionUtils;
import java.util.HashSet;
import static org.hamcrest.Matchers.is;
import static org.opensearch.test.VersionUtils.allVersions;
import static org.opensearch.test.VersionUtils.maxCompatibleVersion;
import static org.opensearch.test.VersionUtils.randomCompatibleVersion;
@ -198,4 +199,14 @@ public class JoinTaskExecutorTests extends OpenSearchTestCase {
assertThat(result.resultingState.getNodes().get(actualNode.getId()).getRoles(), equalTo(actualNode.getRoles()));
}
/**
* Validate isBecomeMasterTask() can identify "become cluster manager task" properly
*/
public void testIsBecomeClusterManagerTask() {
JoinTaskExecutor.Task joinTaskOfMaster = JoinTaskExecutor.newBecomeMasterTask();
assertThat(joinTaskOfMaster.isBecomeMasterTask(), is(true));
JoinTaskExecutor.Task joinTaskOfClusterManager = JoinTaskExecutor.newBecomeClusterManagerTask();
assertThat(joinTaskOfClusterManager.isBecomeMasterTask(), is(true));
}
}