Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Replace non-inclusive terminology 'master' in code comments and internal variable/method/class names #2150

Closed
wants to merge 28 commits into from
+805 −759
Closed

Replace non-inclusive terminology 'master' in code comments and internal variable/method/class names #2150

Show file tree
Hide file tree
Changes from 16 commits
Commits
Show all changes
28 commits
Select commit Hold shift + click to select a range
45ee23d
Replace master in NoMasterBlockService class
Feb 15, 2022
b597d96
Replace master in Coordinator class
Feb 15, 2022
e71406e
Replace master in ClusterHealthResponse class
Feb 15, 2022
541ce80
Replace master in Method withMasterTimeout()
Feb 15, 2022
7679794
Replace master in TimedRequest class
Feb 15, 2022
c80b14f
Replace master in Method get/setMasterTimeout()
Feb 15, 2022
f1a63ef
Replace master of method SetRandomMasterTimeout()
Feb 15, 2022
998e88d
Replace master in subprojects - client modules plugins qa
Feb 15, 2022
50f0de0
Replace master in TestCluster classes
Feb 16, 2022
cbc71a2
Replace master in test.framework test classes
Feb 16, 2022
9835546
Replace master terminology in classes of server directories
Feb 17, 2022
9b4719b
adjust format by spotlessApply
tlfeng Feb 17, 2022
b41fe3b
Replace master terminology in classes of server directories - leftover
tlfeng Feb 17, 2022
e2e9347
Replace master in server classes - leftover
Feb 17, 2022
1e42576
Adjust format by spotlessApply task
Feb 17, 2022
9026aed
Replace master in server test classes
Feb 17, 2022
63282ff
Merge remote-tracking branch 'upstream/main' into replace-master-inte…
Feb 17, 2022
8af6374
Adjust format by spotlessApply task
Feb 17, 2022
ce8c7e9
Adjust format by spotlessApply task
Feb 17, 2022
7e352ef
Change 'clustermanager' to 'cluster_manager' or 'cluster manager' in …
Feb 18, 2022
9d3b42f
Merge branch 'main' into replace-master-internal
Mar 7, 2022
d8b016d
Merge branch 'main' into replace-master-internal
tlfeng Mar 8, 2022
91d768c
Rename initialMasterNodes
Mar 16, 2022
4f1211c
Merge remote-tracking branch 'origin/main' into replace-master-internal
Mar 16, 2022
717bc11
Rename clusterManagerNodeNames
Mar 16, 2022
36a5bbe
Merge branch 'main' into replace-master-internal
Mar 17, 2022
0817155
Merge branch 'main' into replace-master-internal
Mar 19, 2022
3c204eb
Restore rename DISCOVERED_MASTER in ClusterHealthResponse
Mar 19, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions buildSrc/src/main/groovy/org/opensearch/gradle/test/ClusterFormationTasks.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -389,9 +389,9 @@ class ClusterFormationTasks {
// Don't wait for state, just start up quickly. This will also allow new and old nodes in the BWC case to become the master
'discovery.initial_state_timeout' : '0s'
]
int minimumMasterNodes = node.config.minimumMasterNodes.call()
if (node.nodeVersion.before("7.0.0") && minimumMasterNodes > 0) {
esConfig['discovery.zen.minimum_master_nodes'] = minimumMasterNodes
int minimumClusterManagerNodes = node.config.minimumMasterNodes.call()
if (node.nodeVersion.before("7.0.0") && minimumClusterManagerNodes > 0) {
esConfig['discovery.zen.minimum_master_nodes'] = minimumClusterManagerNodes
}
if (node.nodeVersion.before("7.0.0") && esConfig.containsKey('discovery.zen.master_election.wait_for_joins_timeout') == false) {
// If a node decides to become master based on partial information from the pinging, don't let it hang for 30 seconds to correct
Expand Down
14 changes: 7 additions & 7 deletions client/rest-high-level/src/main/java/org/opensearch/client/ClusterRequestConverters.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ static Request clusterPutSettings(ClusterUpdateSettingsRequest clusterUpdateSett

RequestConverters.Params parameters = new RequestConverters.Params();
parameters.withTimeout(clusterUpdateSettingsRequest.timeout());
parameters.withMasterTimeout(clusterUpdateSettingsRequest.masterNodeTimeout());
parameters.withClusterManagerTimeout(clusterUpdateSettingsRequest.masterNodeTimeout());
request.addParameters(parameters.asMap());
request.setEntity(RequestConverters.createEntity(clusterUpdateSettingsRequest, RequestConverters.REQUEST_BODY_CONTENT_TYPE));
return request;
Expand All @@ -69,7 +69,7 @@ static Request clusterGetSettings(ClusterGetSettingsRequest clusterGetSettingsRe
RequestConverters.Params parameters = new RequestConverters.Params();
parameters.withLocal(clusterGetSettingsRequest.local());
parameters.withIncludeDefaults(clusterGetSettingsRequest.includeDefaults());
parameters.withMasterTimeout(clusterGetSettingsRequest.masterNodeTimeout());
parameters.withClusterManagerTimeout(clusterGetSettingsRequest.masterNodeTimeout());
request.addParameters(parameters.asMap());
return request;
}
Expand All @@ -88,7 +88,7 @@ static Request clusterHealth(ClusterHealthRequest healthRequest) {
.withWaitForNodes(healthRequest.waitForNodes())
.withWaitForEvents(healthRequest.waitForEvents())
.withTimeout(healthRequest.timeout())
.withMasterTimeout(healthRequest.masterNodeTimeout())
.withClusterManagerTimeout(healthRequest.masterNodeTimeout())
.withLocal(healthRequest.local())
.withLevel(healthRequest.level());
request.addParameters(params.asMap());
Expand All @@ -105,7 +105,7 @@ static Request putComponentTemplate(PutComponentTemplateRequest putComponentTemp
.build();
Request request = new Request(HttpPut.METHOD_NAME, endpoint);
RequestConverters.Params params = new RequestConverters.Params();
params.withMasterTimeout(putComponentTemplateRequest.masterNodeTimeout());
params.withClusterManagerTimeout(putComponentTemplateRequest.masterNodeTimeout());
if (putComponentTemplateRequest.create()) {
params.putParam("create", Boolean.TRUE.toString());
}
Expand All @@ -124,7 +124,7 @@ static Request getComponentTemplates(GetComponentTemplatesRequest getComponentTe
final Request request = new Request(HttpGet.METHOD_NAME, endpoint);
final RequestConverters.Params params = new RequestConverters.Params();
params.withLocal(getComponentTemplatesRequest.isLocal());
params.withMasterTimeout(getComponentTemplatesRequest.getMasterNodeTimeout());
params.withClusterManagerTimeout(getComponentTemplatesRequest.getMasterNodeTimeout());
request.addParameters(params.asMap());
return request;
}
Expand All @@ -136,7 +136,7 @@ static Request componentTemplatesExist(ComponentTemplatesExistRequest componentT
final Request request = new Request(HttpHead.METHOD_NAME, endpoint);
final RequestConverters.Params params = new RequestConverters.Params();
params.withLocal(componentTemplatesRequest.isLocal());
params.withMasterTimeout(componentTemplatesRequest.getMasterNodeTimeout());
params.withClusterManagerTimeout(componentTemplatesRequest.getMasterNodeTimeout());
request.addParameters(params.asMap());
return request;
}
Expand All @@ -146,7 +146,7 @@ static Request deleteComponentTemplate(DeleteComponentTemplateRequest deleteComp
String endpoint = new RequestConverters.EndpointBuilder().addPathPartAsIs("_component_template").addPathPart(name).build();
Request request = new Request(HttpDelete.METHOD_NAME, endpoint);
RequestConverters.Params params = new RequestConverters.Params();
params.withMasterTimeout(deleteComponentTemplateRequest.masterNodeTimeout());
params.withClusterManagerTimeout(deleteComponentTemplateRequest.masterNodeTimeout());
request.addParameters(params.asMap());
return request;
}
Expand Down
Loading