SERVER-49994 rename jstests that contain master/slave terminology

34 files changed, 50 insertions, 48 deletions

diff --git a/buildscripts/resmokeconfig/suites/replica_sets_kill_primary_jscore_passthrough.yml b/buildscripts/resmokeconfig/suites/replica_sets_kill_primary_jscore_passthrough.yml
index 29a9a293f8b..49557160de3 100644
--- a/buildscripts/resmokeconfig/suites/replica_sets_kill_primary_jscore_passthrough.yml
+++ b/buildscripts/resmokeconfig/suites/replica_sets_kill_primary_jscore_passthrough.yml
@@ -49,11 +49,11 @@ selector:
   - jstests/core/coveredIndex1.js
   - jstests/core/sortc.js
 
-  # Assert on the ismaster field of an isMaster response. If a primary steps down after accepting
-  # an isMaster command and returns before its connection is closed, the response can contain
-  # ismaster: false.
+  # Assert on the isWritablePrimary field of a hello response. If a primary steps down after
+  # accepting a hello command and returns before its connection is closed, the response can
+  # contain isWritablePrimary: false.
   - jstests/core/dbadmin.js
-  - jstests/core/ismaster.js
+  - jstests/core/hello_response_validation.js
 
   - jstests/core/bench_test*.js # benchRun() used for writes
   - jstests/core/benchrun_pipeline_updates.js # benchRun() used for writes
diff --git a/buildscripts/resmokeconfig/suites/replica_sets_multi_stmt_txn_kill_primary_jscore_passthrough.yml b/buildscripts/resmokeconfig/suites/replica_sets_multi_stmt_txn_kill_primary_jscore_passthrough.yml
index 14733d65941..25013723167 100644
--- a/buildscripts/resmokeconfig/suites/replica_sets_multi_stmt_txn_kill_primary_jscore_passthrough.yml
+++ b/buildscripts/resmokeconfig/suites/replica_sets_multi_stmt_txn_kill_primary_jscore_passthrough.yml
@@ -236,10 +236,10 @@ selector:
   - jstests/core/coveredIndex1.js
   - jstests/core/sortc.js
 
-  # Assert on the ismaster field of an isMaster response. If a primary steps down after accepting
-  # an isMaster command and returns before its connection is closed, the response can contain
-  # ismaster: false.
-  - jstests/core/ismaster.js
+  # Assert on the isWritablePrimary field of a hello response. If a primary steps down after
+  # accepting a hello command and returns before its connection is closed, the response can
+  # contain isWritablePrimary: false.
+  - jstests/core/hello_response_validation.js
 
   - jstests/core/bench_test*.js # benchRun() used for writes
   - jstests/core/benchrun_pipeline_updates.js # benchRun() used for writes
diff --git a/buildscripts/resmokeconfig/suites/replica_sets_multi_stmt_txn_stepdown_jscore_passthrough.yml b/buildscripts/resmokeconfig/suites/replica_sets_multi_stmt_txn_stepdown_jscore_passthrough.yml
index c6b41120c4f..446dc151877 100644
--- a/buildscripts/resmokeconfig/suites/replica_sets_multi_stmt_txn_stepdown_jscore_passthrough.yml
+++ b/buildscripts/resmokeconfig/suites/replica_sets_multi_stmt_txn_stepdown_jscore_passthrough.yml
@@ -237,10 +237,10 @@ selector:
   - jstests/core/coveredIndex1.js
   - jstests/core/sortc.js
 
-  # Assert on the ismaster field of an isMaster response. If a primary steps down after accepting
-  # an isMaster command and returns before its connection is closed, the response can contain
-  # ismaster: false.
-  - jstests/core/ismaster.js
+  # Assert on the isWritablePrimary field of a hello response. If a primary steps down after
+  # accepting a hello command and returns before its connection is closed, the response can
+  # contain isWritablePrimary: false.
+  - jstests/core/hello_response_validation.js
 
   - jstests/core/bench_test*.js # benchRun() used for writes
   - jstests/core/benchrun_pipeline_updates.js # benchRun() used for writes
diff --git a/buildscripts/resmokeconfig/suites/replica_sets_multi_stmt_txn_terminate_primary_jscore_passthrough.yml b/buildscripts/resmokeconfig/suites/replica_sets_multi_stmt_txn_terminate_primary_jscore_passthrough.yml
index 6a74ccd058c..2312c1a1260 100644
--- a/buildscripts/resmokeconfig/suites/replica_sets_multi_stmt_txn_terminate_primary_jscore_passthrough.yml
+++ b/buildscripts/resmokeconfig/suites/replica_sets_multi_stmt_txn_terminate_primary_jscore_passthrough.yml
@@ -234,10 +234,10 @@ selector:
   - jstests/core/coveredIndex1.js
   - jstests/core/sortc.js
 
-  # Assert on the ismaster field of an isMaster response. If a primary steps down after accepting
-  # an isMaster command and returns before its connection is closed, the response can contain
-  # ismaster: false.
-  - jstests/core/ismaster.js
+  # Assert on the isWritablePrimary field of a hello response. If a primary steps down after
+  # accepting a hello command and returns before its connection is closed, the response can
+  # contain isWritablePrimary: false.
+  - jstests/core/hello_response_validation.js
 
   - jstests/core/bench_test*.js # benchRun() used for writes
   - jstests/core/benchrun_pipeline_updates.js # benchRun() used for writes
diff --git a/buildscripts/resmokeconfig/suites/replica_sets_reconfig_jscore_stepdown_passthrough.yml b/buildscripts/resmokeconfig/suites/replica_sets_reconfig_jscore_stepdown_passthrough.yml
index cad11ed1fef..87502d81c3f 100644
--- a/buildscripts/resmokeconfig/suites/replica_sets_reconfig_jscore_stepdown_passthrough.yml
+++ b/buildscripts/resmokeconfig/suites/replica_sets_reconfig_jscore_stepdown_passthrough.yml
@@ -48,11 +48,11 @@ selector:
   - jstests/core/fsync.js
   - jstests/core/killop_drop_collection.js
 
-  # Assert on the ismaster field of an isMaster response. If a primary steps down after accepting
-  # an isMaster command and returns before its connection is closed, the response can contain
-  # ismaster: false.
+  # Assert on the isWritablePrimary field of a hello response. If a primary steps down after
+  # accepting a hello command and returns before its connection is closed, the response can
+  # contain isWritablePrimary: false.
   - jstests/core/dbadmin.js
-  - jstests/core/ismaster.js
+  - jstests/core/hello_response_validation.js
 
   # Spawns new mongo shells, which don't retry connecting on stepdown errors.
   - jstests/core/shell_connection_strings.js
diff --git a/buildscripts/resmokeconfig/suites/replica_sets_reconfig_kill_primary_jscore_passthrough.yml b/buildscripts/resmokeconfig/suites/replica_sets_reconfig_kill_primary_jscore_passthrough.yml
index 38fc7fe5b75..ce97e1fab9b 100644
--- a/buildscripts/resmokeconfig/suites/replica_sets_reconfig_kill_primary_jscore_passthrough.yml
+++ b/buildscripts/resmokeconfig/suites/replica_sets_reconfig_kill_primary_jscore_passthrough.yml
@@ -49,11 +49,11 @@ selector:
   - jstests/core/fsync.js
   - jstests/core/killop_drop_collection.js
 
-  # Assert on the ismaster field of an isMaster response. If a primary steps down after accepting
-  # an isMaster command and returns before its connection is closed, the response can contain
-  # ismaster: false.
+  # Assert on the isWritablePrimary field of a hello response. If a primary steps down after
+  # accepting a hello command and returns before its connection is closed, the response can
+  # contain isWritablePrimary: false.
   - jstests/core/dbadmin.js
-  - jstests/core/ismaster.js
+  - jstests/core/hello_response_validation.js
 
   # Spawns new mongo shells, which don't retry connecting on stepdown errors.
   - jstests/core/shell_connection_strings.js
diff --git a/buildscripts/resmokeconfig/suites/replica_sets_terminate_primary_jscore_passthrough.yml b/buildscripts/resmokeconfig/suites/replica_sets_terminate_primary_jscore_passthrough.yml
index 0228ac4f220..0719c3e8ded 100644
--- a/buildscripts/resmokeconfig/suites/replica_sets_terminate_primary_jscore_passthrough.yml
+++ b/buildscripts/resmokeconfig/suites/replica_sets_terminate_primary_jscore_passthrough.yml
@@ -49,11 +49,11 @@ selector:
   - jstests/core/coveredIndex1.js
   - jstests/core/sortc.js
 
-  # Assert on the ismaster field of an isMaster response. If a primary steps down after accepting
-  # an isMaster command and returns before its connection is closed, the response can contain
-  # ismaster: false.
+  # Assert on the isWritablePrimary field of a hello response. If a primary steps down after
+  # accepting a hello command and returns before its connection is closed, the response can
+  # contain isWritablePrimary: false.
   - jstests/core/dbadmin.js
-  - jstests/core/ismaster.js
+  - jstests/core/hello_response_validation.js
 
   - jstests/core/bench_test*.js # benchRun() used for writes
   - jstests/core/benchrun_pipeline_updates.js # benchRun() used for writes
diff --git a/buildscripts/resmokeconfig/suites/retryable_writes_jscore_stepdown_passthrough.yml b/buildscripts/resmokeconfig/suites/retryable_writes_jscore_stepdown_passthrough.yml
index d0cb71d09c4..352c6c380fe 100644
--- a/buildscripts/resmokeconfig/suites/retryable_writes_jscore_stepdown_passthrough.yml
+++ b/buildscripts/resmokeconfig/suites/retryable_writes_jscore_stepdown_passthrough.yml
@@ -50,11 +50,11 @@ selector:
   - jstests/core/coveredIndex1.js
   - jstests/core/sortc.js
 
-  # Assert on the ismaster field of an isMaster response. If a primary steps down after accepting
-  # an isMaster command and returns before its connection is closed, the response can contain
-  # ismaster: false.
+  # Assert on the isWritablePrimary field of a hello response. If a primary steps down after
+  # accepting a hello command and returns before its connection is closed, the response can
+  # contain isWritablePrimary: false.
   - jstests/core/dbadmin.js
-  - jstests/core/ismaster.js
+  - jstests/core/hello_response_validation.js
 
   # Spawns new mongo shells, which don't retry connecting on stepdown errors.
   - jstests/core/shell_connection_strings.js
diff --git a/buildscripts/resmokeconfig/suites/sharding_misc.yml b/buildscripts/resmokeconfig/suites/sharding_misc.yml
index aeeb2cfdc8d..8bc4a25947c 100644
--- a/buildscripts/resmokeconfig/suites/sharding_misc.yml
+++ b/buildscripts/resmokeconfig/suites/sharding_misc.yml
@@ -58,10 +58,10 @@ selector:
   - jstests/sharding/mongos_shard_failure_tolerance.js
   - jstests/sharding/index_and_collection_option_propagation.js
   - jstests/sharding/change_stream_update_lookup_read_concern.js
-  - jstests/sharding/count_slaveok.js
+  - jstests/sharding/count_secondaryok.js
   - jstests/sharding/rename.js
   - jstests/sharding/shard_identity_config_update.js
-  - jstests/sharding/recovering_slaveok.js
+  - jstests/sharding/recovering_secondaryok.js
   - jstests/sharding/all_config_servers_blackholed_from_mongos.js
   - jstests/sharding/authCommands.js
   - jstests/sharding/addshard4.js
@@ -94,7 +94,7 @@ selector:
   - jstests/sharding/migrateBig.js
   - jstests/sharding/change_stream_chunk_migration.js
   - jstests/sharding/large_chunk.js
-  - jstests/sharding/auth_slaveok_routing.js
+  - jstests/sharding/auth_secondaryok_routing.js
   - jstests/sharding/balancer_window.js
   - jstests/sharding/change_streams_primary_shard_unaware.js
   - jstests/sharding/diffservers1.js
@@ -319,7 +319,7 @@ selector:
   - jstests/sharding/authmr.js
   - jstests/sharding/sessions_collection_auto_healing.js
   - jstests/sharding/read_does_not_create_namespaces.js
-  - jstests/sharding/ismaster.js
+  - jstests/sharding/hello_response_validation.js
   - jstests/sharding/balancer_shell_commands.js
   - jstests/sharding/auth_sharding_cmd_metadata.js
   - jstests/sharding/autodiscover_config_rs_from_secondary.js
diff --git a/etc/backports_required_for_multiversion_tests.yml b/etc/backports_required_for_multiversion_tests.yml
index 2c07e4e6670..86ad5ec743f 100644
--- a/etc/backports_required_for_multiversion_tests.yml
+++ b/etc/backports_required_for_multiversion_tests.yml
@@ -41,15 +41,15 @@ all:
   - ticket: SERVER-50140
     test_file: jstests/replsets/initial_sync_fails_unclean_restart.js
   - ticket: SERVER-49987
-    test_file: jstests/core/ismaster.js
+    test_file: jstests/core/hello_response_validation.js
   - ticket: SERVER-49987
-    test_file: jstests/replsets/ismaster1.js
+    test_file: jstests/replsets/check_replication_hello_response_fields.js
   - ticket: SERVER-50640
     test_file: jstests/core/views/views_all_commands.js
   - ticket: SERVER-50640
     test_file: jstests/sharding/database_versioning_all_commands.js
   - ticket: SERVER-49988
-    test_file: jstests/sharding/ismaster.js
+    test_file: jstests/sharding/hello_response_validation.js
   - ticket: SERVER-50640
     test_file: jstests/sharding/read_write_concern_defaults_application.js
   - ticket: SERVER-50640
@@ -71,7 +71,7 @@ all:
   - ticket: SERVER-50417
     test_file: jstests/replsets/no_disconnect_on_stepdown.js
   - ticket: SERVER-50417
-    test_file: jstests/replsets/not_master_unacknowledged_write.js
+    test_file: jstests/replsets/not_primary_unacknowledged_write.js
   - ticket: SERVER-50417
     test_file: jstests/replsets/read_operations_during_step_down.js
   - ticket: SERVER-50417
@@ -79,7 +79,7 @@ all:
   - ticket: SERVER-50320
     test_file: jstests/replsets/change_sync_source_in_initial_sync.js
   - ticket: SERVER-50415
-    test_file: jstests/sharding/awaitable_isMaster_primary_failures.js
+    test_file: jstests/sharding/awaitable_hello_primary_failures.js
   - ticket: SERVER-50420
     test_file: jstests/replsets/server_status_repl_is_writable_primary.js
   - ticket: SERVER-51262
@@ -89,15 +89,15 @@ all:
   - ticket: SERVER-43904
     test_file: jstests/replsets/election_handoff_skips_unelectable_nodes.js
   - ticket: SERVER-51259
-    test_file: jstests/replsets/awaitable_ismaster_errors_on_horizon_change.js
+    test_file: jstests/replsets/awaitable_hello_errors_on_horizon_change.js
   - ticket: SERVER-51259
-    test_file: jstests/replsets/awaitable_ismaster_fcv_change.js
+    test_file: jstests/replsets/awaitable_hello_fcv_change.js
   - ticket: SERVER-51259
-    test_file: jstests/replsets/awaitable_ismaster_metrics_on_state_change.js
+    test_file: jstests/replsets/awaitable_hello_metrics_on_state_change.js
   - ticket: SERVER-51259
-    test_file: jstests/replsets/awaitable_ismaster_on_nodes_with_invalid_configs.js
+    test_file: jstests/replsets/awaitable_hello_on_nodes_with_invalid_configs.js
   - ticket: SERVER-51259
-    test_file: jstests/replsets/awaitable_ismaster_stepdown_stepup.js
+    test_file: jstests/replsets/awaitable_hello_stepdown_stepup.js
   - ticket: SERVER-51259
     test_file: jstests/replsets/quiesce_mode.js
   - ticket: SERVER-51259
diff --git a/jstests/core/ismaster.js b/jstests/core/hello_response_validation.js
index d4efc80462d..d4efc80462d 100644
--- a/jstests/core/ismaster.js
+++ b/jstests/core/hello_response_validation.js
diff --git a/jstests/noPassthrough/awaitable_ismaster.js b/jstests/noPassthrough/awaitable_hello.js
index 78ed61281bf..78ed61281bf 100644
--- a/jstests/noPassthrough/awaitable_ismaster.js
+++ b/jstests/noPassthrough/awaitable_hello.js
diff --git a/jstests/noPassthrough/awaitable_ismaster_metrics.js b/jstests/noPassthrough/awaitable_hello_metrics.js
index c8f6c67ef61..c8f6c67ef61 100644
--- a/jstests/noPassthrough/awaitable_ismaster_metrics.js
+++ b/jstests/noPassthrough/awaitable_hello_metrics.js
diff --git a/jstests/noPassthrough/internal_validate_features_as_master.js b/jstests/noPassthrough/internal_validate_features_as_master.js
index 710174cf8b3..8bc00fa0d40 100644
--- a/jstests/noPassthrough/internal_validate_features_as_master.js
+++ b/jstests/noPassthrough/internal_validate_features_as_master.js
@@ -1,4 +1,6 @@
-// Tests the internalValidateFeaturesAsMaster server parameter.
+// Tests that the internalValidateFeaturesAsMaster server parameter works properly even though
+// it is deprecated. The preferred parameter is internalValidateFeaturesAsPrimary, which is
+// tested in internal_validate_features_as_primary.js.
 
 (function() {
 "use strict";
diff --git a/jstests/noPassthrough/waitInIsMaster_failpoint.js b/jstests/noPassthrough/waitInHello_failpoint.js
index 6ace44cd1d2..6ace44cd1d2 100644
--- a/jstests/noPassthrough/waitInIsMaster_failpoint.js
+++ b/jstests/noPassthrough/waitInHello_failpoint.js
diff --git a/jstests/noPassthroughWithMongod/isMaster_feature_compatibility_version.js b/jstests/noPassthroughWithMongod/hello_feature_compatibility_version.js
index bbf82e8614c..bbf82e8614c 100644
--- a/jstests/noPassthroughWithMongod/isMaster_feature_compatibility_version.js
+++ b/jstests/noPassthroughWithMongod/hello_feature_compatibility_version.js
diff --git a/jstests/replsets/awaitable_ismaster_errors_on_horizon_change.js b/jstests/replsets/awaitable_hello_errors_on_horizon_change.js
index 15b8ec66b0f..15b8ec66b0f 100644
--- a/jstests/replsets/awaitable_ismaster_errors_on_horizon_change.js
+++ b/jstests/replsets/awaitable_hello_errors_on_horizon_change.js
diff --git a/jstests/replsets/awaitable_ismaster_fcv_change.js b/jstests/replsets/awaitable_hello_fcv_change.js
index 639c6475762..639c6475762 100644
--- a/jstests/replsets/awaitable_ismaster_fcv_change.js
+++ b/jstests/replsets/awaitable_hello_fcv_change.js
diff --git a/jstests/replsets/awaitable_ismaster_metrics_on_state_change.js b/jstests/replsets/awaitable_hello_metrics_on_state_change.js
index 4e2de906d96..4e2de906d96 100644
--- a/jstests/replsets/awaitable_ismaster_metrics_on_state_change.js
+++ b/jstests/replsets/awaitable_hello_metrics_on_state_change.js
diff --git a/jstests/replsets/awaitable_ismaster_on_nodes_with_invalid_configs.js b/jstests/replsets/awaitable_hello_on_nodes_with_invalid_configs.js
index ef884fe50d7..ef884fe50d7 100644
--- a/jstests/replsets/awaitable_ismaster_on_nodes_with_invalid_configs.js
+++ b/jstests/replsets/awaitable_hello_on_nodes_with_invalid_configs.js
diff --git a/jstests/replsets/awaitable_ismaster_stepdown_stepup.js b/jstests/replsets/awaitable_hello_stepdown_stepup.js
index 1c1cb64dd7f..1c1cb64dd7f 100644
--- a/jstests/replsets/awaitable_ismaster_stepdown_stepup.js
+++ b/jstests/replsets/awaitable_hello_stepdown_stepup.js
diff --git a/jstests/replsets/ismaster1.js b/jstests/replsets/check_replication_hello_response_fields.js
index ce19a9fd3c8..ce19a9fd3c8 100644
--- a/jstests/replsets/ismaster1.js
+++ b/jstests/replsets/check_replication_hello_response_fields.js
diff --git a/jstests/replsets/explain_slaveok.js b/jstests/replsets/explain_secondaryok.js
index f3215af9ab6..f3215af9ab6 100644
--- a/jstests/replsets/explain_slaveok.js
+++ b/jstests/replsets/explain_secondaryok.js
diff --git a/jstests/replsets/not_master_unacknowledged_write.js b/jstests/replsets/not_primary_unacknowledged_write.js
index d91711ee1d6..d91711ee1d6 100644
--- a/jstests/replsets/not_master_unacknowledged_write.js
+++ b/jstests/replsets/not_primary_unacknowledged_write.js
diff --git a/jstests/replsets/notmaster_errors_return_topology_version.js b/jstests/replsets/notprimary_errors_return_topology_version.js
index 8ce214fba1c..8ce214fba1c 100644
--- a/jstests/replsets/notmaster_errors_return_topology_version.js
+++ b/jstests/replsets/notprimary_errors_return_topology_version.js
diff --git a/jstests/replsets/plan_cache_slaveok.js b/jstests/replsets/plan_cache_secondaryok.js
index c20decf9eb1..c20decf9eb1 100644
--- a/jstests/replsets/plan_cache_slaveok.js
+++ b/jstests/replsets/plan_cache_secondaryok.js
diff --git a/jstests/replsets/slaveok_read_pref.js b/jstests/replsets/secondaryok_read_pref.js
index e35f36e9c97..a4e4ea3701c 100644
--- a/jstests/replsets/slaveok_read_pref.js
+++ b/jstests/replsets/secondaryok_read_pref.js
@@ -41,7 +41,7 @@ for (let readMode of ["commands", "legacy"]) {
                 const secondaryOkErr = assert.throws(() => cursor.itcount(), [], tojson(testType));
                 assert.commandFailedWithCode(secondaryOkErr, ErrorCodes.NotPrimaryNoSecondaryOk);
             } else {
-                // Succeeds for all non-primary readPrefs, and for no readPref iff slaveOk.
+                // Succeeds for all non-primary readPrefs, and for no readPref iff secondaryOk.
                 const docCount = assert.doesNotThrow(() => cursor.itcount(), [], tojson(testType));
                 assert.eq(docCount, 1);
             }
diff --git a/jstests/sharding/agg_mongos_slaveok.js b/jstests/sharding/agg_mongos_secondaryok.js
index 01fb4286429..01fb4286429 100644
--- a/jstests/sharding/agg_mongos_slaveok.js
+++ b/jstests/sharding/agg_mongos_secondaryok.js
diff --git a/jstests/sharding/auth_slaveok_routing.js b/jstests/sharding/auth_secondaryok_routing.js
index 9df5103e824..9df5103e824 100644
--- a/jstests/sharding/auth_slaveok_routing.js
+++ b/jstests/sharding/auth_secondaryok_routing.js
diff --git a/jstests/sharding/awaitable_isMaster_primary_failures.js b/jstests/sharding/awaitable_hello_primary_failures.js
index b6a387920c3..b6a387920c3 100644
--- a/jstests/sharding/awaitable_isMaster_primary_failures.js
+++ b/jstests/sharding/awaitable_hello_primary_failures.js
diff --git a/jstests/sharding/count_slaveok.js b/jstests/sharding/count_secondaryok.js
index 7ad5007be48..7ad5007be48 100644
--- a/jstests/sharding/count_slaveok.js
+++ b/jstests/sharding/count_secondaryok.js
diff --git a/jstests/sharding/exhaust_isMaster_topology_changes.js b/jstests/sharding/exhaust_hello_topology_changes.js
index b53e92f7244..b53e92f7244 100644
--- a/jstests/sharding/exhaust_isMaster_topology_changes.js
+++ b/jstests/sharding/exhaust_hello_topology_changes.js
diff --git a/jstests/sharding/ismaster.js b/jstests/sharding/hello_response_validation.js
index 185294200ac..185294200ac 100644
--- a/jstests/sharding/ismaster.js
+++ b/jstests/sharding/hello_response_validation.js
diff --git a/jstests/sharding/recovering_slaveok.js b/jstests/sharding/recovering_secondaryok.js
index 7956b154361..7956b154361 100644
--- a/jstests/sharding/recovering_slaveok.js
+++ b/jstests/sharding/recovering_secondaryok.js