diff --git a/content/en/docs/concepts/shard.md b/content/en/docs/concepts/shard.md index 5e3e491ae..6a902e885 100644 --- a/content/en/docs/concepts/shard.md +++ b/content/en/docs/concepts/shard.md @@ -2,9 +2,9 @@ title: Shard --- -A *shard* is a division within a keyspace. A shard typically contains one MySQL master and many MySQL slaves. +A *shard* is a division within a keyspace. A shard typically contains one MySQL master and many MySQL replicas. -Each MySQL instance within a shard has the same data (excepting some replication lag). The slaves can serve read-only traffic (with eventual consistency guarantees), execute long-running data analysis tools, or perform administrative tasks (backup, restore, diff, etc.). +Each MySQL instance within a shard has the same data (excepting some replication lag). The replicas can serve read-only traffic (with eventual consistency guarantees), execute long-running data analysis tools, or perform administrative tasks (backup, restore, diff, etc.). An unsharded keyspace has effectively one shard. Vitess names the shard `0` by convention. When sharded, a keyspace has `N` shards with non-overlapping data. diff --git a/content/en/docs/concepts/tablet.md b/content/en/docs/concepts/tablet.md index e44d93e15..23589b0d9 100644 --- a/content/en/docs/concepts/tablet.md +++ b/content/en/docs/concepts/tablet.md @@ -11,8 +11,8 @@ Queries are routed to a tablet via a [VTGate](../vtgate) server. See the user guide [VTTablet Modes](../../user-guides/vttablet-modes) for more information. * **master** - A *replica* tablet that happens to currently be the MySQL master for its shard. -* **replica** - A MySQL slave that is eligible to be promoted to *master*. Conventionally, these are reserved for serving live, user-facing requests (like from the website's frontend). -* **rdonly** - A MySQL slave that cannot be promoted to *master*. Conventionally, these are used for background processing jobs, such as taking backups, dumping data to other systems, heavy analytical queries, MapReduce, and resharding. +* **replica** - A MySQL replica that is eligible to be promoted to *master*. Conventionally, these are reserved for serving live, user-facing requests (like from the website's frontend). +* **rdonly** - A MySQL replica that cannot be promoted to *master*. Conventionally, these are used for background processing jobs, such as taking backups, dumping data to other systems, heavy analytical queries, MapReduce, and resharding. * **backup** - A tablet that has stopped replication at a consistent snapshot, so it can upload a new backup for its shard. After it finishes, it will resume replication and return to its previous type. * **restore** - A tablet that has started up with no data, and is in the process of restoring itself from the latest backup. After it finishes, it will begin replicating at the GTID position of the backup, and become either *replica* or *rdonly*. * **drained** - A tablet that has been reserved by a Vitess background process (such as rdonly tablets for resharding). diff --git a/content/en/docs/reference/features/schema-management.md b/content/en/docs/reference/features/schema-management.md index ae8785bf3..0fc1cd972 100644 --- a/content/en/docs/reference/features/schema-management.md +++ b/content/en/docs/reference/features/schema-management.md @@ -42,9 +42,9 @@ GetSchema test-000000100 ### ValidateSchemaShard -The [`ValidateSchemaShard`](../../reference/vtctl/#validateschemashard) command confirms that for a given keyspace, all of the slave tablets in a specified shard have the same schema as the master tablet in that shard. When you call `ValidateSchemaShard`, you specify both the keyspace and the shard that you are validating. +The [`ValidateSchemaShard`](../../reference/vtctl/#validateschemashard) command confirms that for a given keyspace, all of the replica tablets in a specified shard have the same schema as the master tablet in that shard. When you call `ValidateSchemaShard`, you specify both the keyspace and the shard that you are validating. -The following command confirms that the master and slave tablets in shard `0` all have the same schema for the `user` keyspace: +The following command confirms that the master and replica tablets in shard `0` all have the same schema for the `user` keyspace: ``` sh ValidateSchemaShard user/0 @@ -88,7 +88,7 @@ Vitess' schema modification functionality is designed the following goals in min Note that, at this time, Vitess only supports [data definition statements](https://dev.mysql.com/doc/refman/5.6/en/sql-syntax-data-definition.html) that create, modify, or delete database tables. For instance, `ApplySchema` does not affect stored procedures or grants. -The [ApplySchema](../../reference/vtctl/#applyvschema) command applies a schema change to the specified keyspace on every master tablet, running in parallel on all shards. Changes are then propagated to slaves via replication. The command format is: `ApplySchema {-sql= || -sql_file=} ` +The [ApplySchema](../../reference/vtctl/#applyvschema) command applies a schema change to the specified keyspace on every master tablet, running in parallel on all shards. Changes are then propagated to replicas. The command format is: `ApplySchema {-sql= || -sql_file=} ` When the `ApplySchema` action actually applies a schema change to the specified keyspace, it performs the following steps: diff --git a/content/en/docs/reference/features/sharding.md b/content/en/docs/reference/features/sharding.md index 323304cc1..b378e5159 100644 --- a/content/en/docs/reference/features/sharding.md +++ b/content/en/docs/reference/features/sharding.md @@ -13,7 +13,7 @@ A keyspace in Vitess can be sharded or unsharded. An unsharded keyspace maps dir For example, if an application's "user" keyspace is split into two shards, each shard contains records for approximately half of the application's users. Similarly, each user's information is stored in only one shard. -Note that sharding is orthogonal to (MySQL) replication. A Vitess shard typically contains one MySQL master and many MySQL slaves. The master handles write operations, while slaves handle read-only traffic, batch processing operations, and other tasks. Each MySQL instance within the shard should have the same data, excepting some replication lag. +Note that sharding is orthogonal to (MySQL) replication. A Vitess shard typically contains one MySQL master and many MySQL replicas. The master handles write operations, while replicas handle read-only traffic, batch processing operations, and other tasks. Each MySQL instance within the shard should have the same data, excepting some replication lag. ### Supported Operations diff --git a/content/en/docs/reference/programs/mysqlctl.md b/content/en/docs/reference/programs/mysqlctl.md index 4d189576a..a7878d60c 100644 --- a/content/en/docs/reference/programs/mysqlctl.md +++ b/content/en/docs/reference/programs/mysqlctl.md @@ -146,7 +146,7 @@ The following global parameters apply to `mysqlctl`: | log_err_stacks | boolean | log stack traces for errors | | log_rotate_max_size | uint | size in bytes at which logs are rotated (glog.MaxSize) (default 1887436800) | | logtostderr | boolean | log to standard error instead of files | -| master_connect_retry | duration | how long to wait in between slave -> connection attempts. Only precise to the second. (default 10s) | +| master_connect_retry | duration | how long to wait in between replica reconnect attempts. Only precise to the second. (default 10s) | | mem-profile-rate | int | profile every n bytes allocated (default 524288) | | mutex-profile-fraction | int | profile every n mutex contention events (see runtime.SetMutexProfileFraction) | | mysql_auth_server_static_file | string | JSON File to read the users/passwords from. | diff --git a/content/en/docs/reference/programs/vtctl.md b/content/en/docs/reference/programs/vtctl.md index 7cea0d1e4..d50295050 100644 --- a/content/en/docs/reference/programs/vtctl.md +++ b/content/en/docs/reference/programs/vtctl.md @@ -280,7 +280,7 @@ The following global options apply to `vtctl`: | -log_err_stacks | | log stack traces for errors | | -log_rotate_max_size | uint | size in bytes at which logs are rotated (glog.MaxSize) (default 1887436800) | | -logtostderr | | log to standard error instead of files | -| -master_connect_retry | duration | how long to wait in between slave -> connection attempts. Only precise to the second. (default 10s) | +| -master_connect_retry | duration | how long to wait in between replica reconnect attempts. Only precise to the second. (default 10s) | | -mem-profile-rate | int | profile every n bytes allocated (default 524288) | | -min_number_serving_vttablets | int | the minimum number of vttablets that will be continue to be used even with low replication lag (default 2) | | -mutex-profile-fraction | int | profile every n mutex contention events (see runtime.SetMutexProfileFraction) | diff --git a/content/en/docs/reference/programs/vtctl/keyspaces.md b/content/en/docs/reference/programs/vtctl/keyspaces.md index f4775f4a9..55d527789 100644 --- a/content/en/docs/reference/programs/vtctl/keyspaces.md +++ b/content/en/docs/reference/programs/vtctl/keyspaces.md @@ -124,17 +124,15 @@ Makes the <destination keyspace/shard> serve the given type. This command * <destination keyspace/shard> – Required. The name of a sharded database that contains one or more tables as well as the shard associated with the command. The keyspace must be identified by a string that does not contain whitespace, while the shard is typically identified by a string in the format <range start>-<range end>. * <served tablet type> – Required. The vttablet's role. Valid values are: - * backup – A slaved copy of data that is offline to queries other than for backup purposes - * batch – A slaved copy of data for OLAP load patterns (typically for MapReduce jobs) + * backup – A replicated copy of data that is offline to queries other than for backup purposes + * batch – A replicated copy of data for OLAP load patterns (typically for MapReduce jobs) * drained – A tablet that is reserved for a background process. For example, a tablet used by a vtworker process, where the tablet is likely lagging in replication. - * experimental – A slaved copy of data that is ready but not serving query traffic. The value indicates a special characteristic of the tablet that indicates the tablet should not be considered a potential master. Vitess also does not worry about lag for experimental tablets when reparenting. + * experimental – A replicated copy of data that is ready but not serving query traffic. The value indicates a special characteristic of the tablet that indicates the tablet should not be considered a potential master. Vitess also does not worry about lag for experimental tablets when reparenting. * master – A primary copy of data - * rdonly – A slaved copy of data for OLAP load patterns - * replica – A slaved copy of data ready to be promoted to master + * rdonly – A replicated copy of data for OLAP load patterns + * replica – A replicated copy of data ready to be promoted to master * restore – A tablet that is restoring from a snapshot. Typically, this happens at tablet startup, then it goes to its right state. - * schema_apply – A slaved copy of data that had been serving query traffic but that is now applying a schema change. Following the change, the tablet will revert to its serving type. - * snapshot_source – A slaved copy of data where mysqld is not running and where Vitess is serving data files to clone slaves. Use this command to enter this mode: 
vtctl Snapshot -server-mode ...
Use this command to exit this mode: 
vtctl SnapshotSourceEnd ...
- * spare – A slaved copy of data that is ready but not serving query traffic. The data could be a potential master tablet. + * spare – A replicated copy of data that is ready but not serving query traffic. The data could be a potential master tablet. #### Errors @@ -189,17 +187,15 @@ Changes the ServedFromMap manually. This command is intended for emergency fixes * <keyspace name> – Required. The name of a sharded database that contains one or more tables. Vitess distributes keyspace shards into multiple machines and provides an SQL interface to query the data. The argument value must be a string that does not contain whitespace. * <tablet type> – Required. The vttablet's role. Valid values are: - * backup – A slaved copy of data that is offline to queries other than for backup purposes - * batch – A slaved copy of data for OLAP load patterns (typically for MapReduce jobs) + * backup – A replicated copy of data that is offline to queries other than for backup purposes + * batch – A replicated copy of data for OLAP load patterns (typically for MapReduce jobs) * drained – A tablet that is reserved for a background process. For example, a tablet used by a vtworker process, where the tablet is likely lagging in replication. - * experimental – A slaved copy of data that is ready but not serving query traffic. The value indicates a special characteristic of the tablet that indicates the tablet should not be considered a potential master. Vitess also does not worry about lag for experimental tablets when reparenting. + * experimental – A replicated copy of data that is ready but not serving query traffic. The value indicates a special characteristic of the tablet that indicates the tablet should not be considered a potential master. Vitess also does not worry about lag for experimental tablets when reparenting. * master – A primary copy of data - * rdonly – A slaved copy of data for OLAP load patterns - * replica – A slaved copy of data ready to be promoted to master + * rdonly – A replicated copy of data for OLAP load patterns + * replica – A replicated copy of data ready to be promoted to master * restore – A tablet that is restoring from a snapshot. Typically, this happens at tablet startup, then it goes to its right state. - * schema_apply – A slaved copy of data that had been serving query traffic but that is now applying a schema change. Following the change, the tablet will revert to its serving type. - * snapshot_source – A slaved copy of data where mysqld is not running and where Vitess is serving data files to clone slaves. Use this command to enter this mode: 
vtctl Snapshot -server-mode ...
Use this command to exit this mode: 
vtctl SnapshotSourceEnd ...
- * spare – A slaved copy of data that is ready but not serving query traffic. The data could be a potential master tablet. + * spare – A replicated copy of data that is ready but not serving query traffic. The data could be a potential master tablet. #### Errors @@ -324,17 +320,15 @@ Migrates a serving type from the source shard to the shards that it replicates t * <keyspace/shard> – Required. The name of a sharded database that contains one or more tables as well as the shard associated with the command. The keyspace must be identified by a string that does not contain whitespace, while the shard is typically identified by a string in the format <range start>-<range end>. * <served tablet type> – Required. The vttablet's role. Valid values are: - * backup – A slaved copy of data that is offline to queries other than for backup purposes - * batch – A slaved copy of data for OLAP load patterns (typically for MapReduce jobs) + * backup – A replicated copy of data that is offline to queries other than for backup purposes + * batch – A replicated copy of data for OLAP load patterns (typically for MapReduce jobs) * drained – A tablet that is reserved for a background process. For example, a tablet used by a vtworker process, where the tablet is likely lagging in replication. - * experimental – A slaved copy of data that is ready but not serving query traffic. The value indicates a special characteristic of the tablet that indicates the tablet should not be considered a potential master. Vitess also does not worry about lag for experimental tablets when reparenting. + * experimental – A replicated copy of data that is ready but not serving query traffic. The value indicates a special characteristic of the tablet that indicates the tablet should not be considered a potential master. Vitess also does not worry about lag for experimental tablets when reparenting. * master – A primary copy of data - * rdonly – A slaved copy of data for OLAP load patterns - * replica – A slaved copy of data ready to be promoted to master + * rdonly – A replicated copy of data for OLAP load patterns + * replica – A replicated copy of data ready to be promoted to master * restore – A tablet that is restoring from a snapshot. Typically, this happens at tablet startup, then it goes to its right state. - * schema_apply – A slaved copy of data that had been serving query traffic but that is now applying a schema change. Following the change, the tablet will revert to its serving type. - * snapshot_source – A slaved copy of data where mysqld is not running and where Vitess is serving data files to clone slaves. Use this command to enter this mode: 
vtctl Snapshot -server-mode ...
Use this command to exit this mode: 
vtctl SnapshotSourceEnd ...
- * spare – A slaved copy of data that is ready but not serving query traffic. The data could be a potential master tablet. + * spare – A replicated copy of data that is ready but not serving query traffic. The data could be a potential master tablet. #### Errors @@ -365,17 +359,15 @@ Makes the <destination keyspace/shard> serve the given type. This command * <destination keyspace/shard> – Required. The name of a sharded database that contains one or more tables as well as the shard associated with the command. The keyspace must be identified by a string that does not contain whitespace, while the shard is typically identified by a string in the format <range start>-<range end>. * <served tablet type> – Required. The vttablet's role. Valid values are: - * backup – A slaved copy of data that is offline to queries other than for backup purposes - * batch – A slaved copy of data for OLAP load patterns (typically for MapReduce jobs) + * backup – A replicated copy of data that is offline to queries other than for backup purposes + * batch – A replicated copy of data for OLAP load patterns (typically for MapReduce jobs) * drained – A tablet that is reserved for a background process. For example, a tablet used by a vtworker process, where the tablet is likely lagging in replication. - * experimental – A slaved copy of data that is ready but not serving query traffic. The value indicates a special characteristic of the tablet that indicates the tablet should not be considered a potential master. Vitess also does not worry about lag for experimental tablets when reparenting. + * experimental – A replicated copy of data that is ready but not serving query traffic. The value indicates a special characteristic of the tablet that indicates the tablet should not be considered a potential master. Vitess also does not worry about lag for experimental tablets when reparenting. * master – A primary copy of data - * rdonly – A slaved copy of data for OLAP load patterns - * replica – A slaved copy of data ready to be promoted to master + * rdonly – A replicated copy of data for OLAP load patterns + * replica – A replicated copy of data ready to be promoted to master * restore – A tablet that is restoring from a snapshot. Typically, this happens at tablet startup, then it goes to its right state. - * schema_apply – A slaved copy of data that had been serving query traffic but that is now applying a schema change. Following the change, the tablet will revert to its serving type. - * snapshot_source – A slaved copy of data where mysqld is not running and where Vitess is serving data files to clone slaves. Use this command to enter this mode: 
vtctl Snapshot -server-mode ...
Use this command to exit this mode: 
vtctl SnapshotSourceEnd ...
- * spare – A slaved copy of data that is ready but not serving query traffic. The data could be a potential master tablet. + * spare – A replicated copy of data that is ready but not serving query traffic. The data could be a potential master tablet. #### Errors @@ -449,17 +441,15 @@ Blocks until no new queries were observed on all tablets with the given tablet t * <keyspace/shard> – Required. The name of a sharded database that contains one or more tables as well as the shard associated with the command. The keyspace must be identified by a string that does not contain whitespace, while the shard is typically identified by a string in the format <range start>-<range end>. * <served tablet type> – Required. The vttablet's role. Valid values are: - * backup – A slaved copy of data that is offline to queries other than for backup purposes - * batch – A slaved copy of data for OLAP load patterns (typically for MapReduce jobs) + * backup – A replicated copy of data that is offline to queries other than for backup purposes + * batch – A replicated copy of data for OLAP load patterns (typically for MapReduce jobs) * drained – A tablet that is reserved for a background process. For example, a tablet used by a vtworker process, where the tablet is likely lagging in replication. - * experimental – A slaved copy of data that is ready but not serving query traffic. The value indicates a special characteristic of the tablet that indicates the tablet should not be considered a potential master. Vitess also does not worry about lag for experimental tablets when reparenting. + * experimental – A replicated copy of data that is ready but not serving query traffic. The value indicates a special characteristic of the tablet that indicates the tablet should not be considered a potential master. Vitess also does not worry about lag for experimental tablets when reparenting. * master – A primary copy of data - * rdonly – A slaved copy of data for OLAP load patterns - * replica – A slaved copy of data ready to be promoted to master + * rdonly – A replicated copy of data for OLAP load patterns + * replica – A replicated copy of data ready to be promoted to master * restore – A tablet that is restoring from a snapshot. Typically, this happens at tablet startup, then it goes to its right state. - * schema_apply – A slaved copy of data that had been serving query traffic but that is now applying a schema change. Following the change, the tablet will revert to its serving type. - * snapshot_source – A slaved copy of data where mysqld is not running and where Vitess is serving data files to clone slaves. Use this command to enter this mode: 
vtctl Snapshot -server-mode ...
Use this command to exit this mode: 
vtctl SnapshotSourceEnd ...
- * spare – A slaved copy of data that is ready but not serving query traffic. The data could be a potential master tablet. + * spare – A replicated copy of data that is ready but not serving query traffic. The data could be a potential master tablet. #### Errors diff --git a/content/en/docs/reference/programs/vtctl/schema-version-permissions.md b/content/en/docs/reference/programs/vtctl/schema-version-permissions.md index 110d093d5..ced738ef3 100644 --- a/content/en/docs/reference/programs/vtctl/schema-version-permissions.md +++ b/content/en/docs/reference/programs/vtctl/schema-version-permissions.md @@ -100,7 +100,7 @@ Reloads the schema on all the tablets in a keyspace. ### ValidateSchemaShard -Validates that the master schema matches all of the slaves. +Validates that the master schema matches all of the replicas. #### Example @@ -148,7 +148,7 @@ Validates that the master schema from shard 0 matches the schema on all of the o ### ApplySchema -Applies the schema change to the specified keyspace on every master, running in parallel on all shards. The changes are then propagated to slaves via replication. If -allow_long_unavailability is set, schema changes affecting a large number of rows (and possibly incurring a longer period of unavailability) will not be rejected. +Applies the schema change to the specified keyspace on every master, running in parallel on all shards. The changes are then propagated to replicas via replication. If -allow_long_unavailability is set, schema changes affecting a large number of rows (and possibly incurring a longer period of unavailability) will not be rejected. #### Example @@ -161,7 +161,7 @@ Applies the schema change to the specified keyspace on every master, running in | allow_long_unavailability | Boolean | Allow large schema changes which incur a longer unavailability of the database. | | sql | string | A list of semicolon-delimited SQL commands | | sql-file | string | Identifies the file that contains the SQL commands | -| wait_slave_timeout | Duration | The amount of time to wait for slaves to receive the schema change via replication. | +| wait_slave_timeout | Duration | The amount of time to wait for replicas to receive the schema change via replication. | #### Arguments @@ -187,7 +187,7 @@ Copies the schema from a source shard's master (or a specific tablet) to a desti | exclude_tables | string | Specifies a comma-separated list of tables to exclude. Each is either an exact match, or a regular expression of the form /regexp/ | | include-views | Boolean | Includes views in the output | | tables | string | Specifies a comma-separated list of tables to copy. Each is either an exact match, or a regular expression of the form /regexp/ | -| wait_slave_timeout | Duration | The amount of time to wait for slaves to receive the schema change via replication. | +| wait_slave_timeout | Duration | The amount of time to wait for replicas to receive the schema change via replication. | #### Arguments @@ -201,7 +201,7 @@ Copies the schema from a source shard's master (or a specific tablet) to a desti ### ValidateVersionShard -Validates that the master version matches all of the slaves. +Validates that the master version matches all of the replicas. #### Example @@ -249,7 +249,7 @@ Displays the permissions for a tablet. ### ValidatePermissionsShard -Validates that the master permissions match all the slaves. +Validates that the master permissions match all the replicas. #### Example diff --git a/content/en/docs/reference/programs/vtctl/shards.md b/content/en/docs/reference/programs/vtctl/shards.md index 116dbe113..185fe83f2 100644 --- a/content/en/docs/reference/programs/vtctl/shards.md +++ b/content/en/docs/reference/programs/vtctl/shards.md @@ -72,7 +72,7 @@ Validates that all nodes that are reachable from this shard are consistent. ### ShardReplicationPositions -Shows the replication status of each slave machine in the shard graph. In this case, the status refers to the replication lag between the master vttablet and the slave vttablet. In Vitess, data is always written to the master vttablet first and then replicated to all slave vttablets. Output is sorted by tablet type, then replication position. Use ctrl-C to interrupt command and see partial result if needed. +Shows the replication status of each replica machine in the shard graph. In this case, the status refers to the replication lag between the master vttablet and the replica vttablet. In Vitess, data is always written to the master vttablet first and then replicated to all replica vttablets. Output is sorted by tablet type, then replication position. Use ctrl-C to interrupt command and see partial result if needed. #### Example @@ -132,17 +132,15 @@ Sets the TabletControl record for a shard and type. Only use this for an emergen * <keyspace/shard> – Required. The name of a sharded database that contains one or more tables as well as the shard associated with the command. The keyspace must be identified by a string that does not contain whitespace, while the shard is typically identified by a string in the format <range start>-<range end>. * <tablet type> – Required. The vttablet's role. Valid values are: - * backup – A slaved copy of data that is offline to queries other than for backup purposes - * batch – A slaved copy of data for OLAP load patterns (typically for MapReduce jobs) + * backup – A replicated copy of data that is offline to queries other than for backup purposes + * batch – A replicated copy of data for OLAP load patterns (typically for MapReduce jobs) * drained – A tablet that is reserved for a background process. For example, a tablet used by a vtworker process, where the tablet is likely lagging in replication. - * experimental – A slaved copy of data that is ready but not serving query traffic. The value indicates a special characteristic of the tablet that indicates the tablet should not be considered a potential master. Vitess also does not worry about lag for experimental tablets when reparenting. + * experimental – A replicated copy of data that is ready but not serving query traffic. The value indicates a special characteristic of the tablet that indicates the tablet should not be considered a potential master. Vitess also does not worry about lag for experimental tablets when reparenting. * master – A primary copy of data - * rdonly – A slaved copy of data for OLAP load patterns - * replica – A slaved copy of data ready to be promoted to master + * rdonly – A replicated copy of data for OLAP load patterns + * replica – A replicated copy of data ready to be promoted to master * restore – A tablet that is restoring from a snapshot. Typically, this happens at tablet startup, then it goes to its right state. - * schema_apply – A slaved copy of data that had been serving query traffic but that is now applying a schema change. Following the change, the tablet will revert to its serving type. - * snapshot_source – A slaved copy of data where mysqld is not running and where Vitess is serving data files to clone slaves. Use this command to enter this mode: 
vtctl Snapshot -server-mode ...
Use this command to exit this mode: 
vtctl SnapshotSourceEnd ...
- * spare – A slaved copy of data that is ready but not serving query traffic. The data could be a potential master tablet. + * spare – A replicated copy of data that is ready but not serving query traffic. The data could be a potential master tablet. #### Errors @@ -316,7 +314,7 @@ Removes a backup for the BackupStorage. ### InitShardMaster -Sets the initial master for a shard. Will make all other tablets in the shard slaves of the provided master. WARNING: this could cause data loss on an already replicating shard. PlannedReparentShard or EmergencyReparentShard should be used instead. +Sets the initial master for a shard. Will make all other tablets in the shard replicas of the provided master. WARNING: this could cause data loss on an already replicating shard. PlannedReparentShard or EmergencyReparentShard should be used instead. #### Example @@ -327,7 +325,7 @@ Sets the initial master for a shard. Will make all other tablets in the shard sl | Name | Type | Definition | | :-------- | :--------- | :--------- | | force | Boolean | will force the reparent even if the provided tablet is not a master or the shard master | -| wait_slave_timeout | Duration | time to wait for slaves to catch up in reparenting | +| wait_slave_timeout | Duration | time to wait for replicas to catch up in reparenting | #### Arguments @@ -355,7 +353,7 @@ Reparents the shard to the new master, or away from old master. Both old and new | avoid_master | string | alias of a tablet that should not be the master, i.e. reparent to any other tablet if this one is the master | | keyspace_shard | string | keyspace/shard of the shard that needs to be reparented | | new_master | string | alias of a tablet that should be the new master | -| wait_slave_timeout | Duration | time to wait for slaves to catch up in reparenting | +| wait_slave_timeout | Duration | time to wait for replicas to catch up in reparenting | #### Errors @@ -378,7 +376,7 @@ Reparents the shard to the new master. Assumes the old master is dead and not re | :-------- | :--------- | :--------- | | keyspace_shard | string | keyspace/shard of the shard that needs to be reparented | | new_master | string | alias of a tablet that should be the new master | -| wait_slave_timeout | Duration | time to wait for slaves to catch up in reparenting | +| wait_slave_timeout | Duration | time to wait for replicas to catch up in reparenting | #### Errors diff --git a/content/en/docs/reference/programs/vtctl/tablets.md b/content/en/docs/reference/programs/vtctl/tablets.md index 77feffdb7..26819569c 100644 --- a/content/en/docs/reference/programs/vtctl/tablets.md +++ b/content/en/docs/reference/programs/vtctl/tablets.md @@ -38,17 +38,15 @@ Initializes a tablet in the topology. * <tablet alias> – Required. A Tablet Alias uniquely identifies a vttablet. The argument value is in the format <cell name>-<uid>. * <tablet type> – Required. The vttablet's role. Valid values are: - * backup – A slaved copy of data that is offline to queries other than for backup purposes - * batch – A slaved copy of data for OLAP load patterns (typically for MapReduce jobs) + * backup – A replicated copy of data that is offline to queries other than for backup purposes + * batch – A replicated copy of data for OLAP load patterns (typically for MapReduce jobs) * drained – A tablet that is reserved for a background process. For example, a tablet used by a vtworker process, where the tablet is likely lagging in replication. - * experimental – A slaved copy of data that is ready but not serving query traffic. The value indicates a special characteristic of the tablet that indicates the tablet should not be considered a potential master. Vitess also does not worry about lag for experimental tablets when reparenting. + * experimental – A replicated copy of data that is ready but not serving query traffic. The value indicates a special characteristic of the tablet that indicates the tablet should not be considered a potential master. Vitess also does not worry about lag for experimental tablets when reparenting. * master – A primary copy of data - * rdonly – A slaved copy of data for OLAP load patterns - * replica – A slaved copy of data ready to be promoted to master + * rdonly – A replicated copy of data for OLAP load patterns + * replica – A replicated copy of data ready to be promoted to master * restore – A tablet that is restoring from a snapshot. Typically, this happens at tablet startup, then it goes to its right state. - * schema_apply – A slaved copy of data that had been serving query traffic but that is now applying a schema change. Following the change, the tablet will revert to its serving type. - * snapshot_source – A slaved copy of data where mysqld is not running and where Vitess is serving data files to clone slaves. Use this command to enter this mode: 
vtctl Snapshot -server-mode ...
Use this command to exit this mode: 
vtctl SnapshotSourceEnd ...
- * spare – A slaved copy of data that is ready but not serving query traffic. The data could be a potential master tablet. + * spare – A replicated copy of data that is ready but not serving query traffic. The data could be a potential master tablet. #### Errors @@ -228,17 +226,15 @@ Changes the db type for the specified tablet, if possible. This command is used * <tablet alias> – Required. A Tablet Alias uniquely identifies a vttablet. The argument value is in the format <cell name>-<uid>. * <tablet type> – Required. The vttablet's role. Valid values are: - * backup – A slaved copy of data that is offline to queries other than for backup purposes - * batch – A slaved copy of data for OLAP load patterns (typically for MapReduce jobs) + * backup – A replicated copy of data that is offline to queries other than for backup purposes + * batch – A replicated copy of data for OLAP load patterns (typically for MapReduce jobs) * drained – A tablet that is reserved for a background process. For example, a tablet used by a vtworker process, where the tablet is likely lagging in replication. - * experimental – A slaved copy of data that is ready but not serving query traffic. The value indicates a special characteristic of the tablet that indicates the tablet should not be considered a potential master. Vitess also does not worry about lag for experimental tablets when reparenting. + * experimental – A replicated copy of data that is ready but not serving query traffic. The value indicates a special characteristic of the tablet that indicates the tablet should not be considered a potential master. Vitess also does not worry about lag for experimental tablets when reparenting. * master – A primary copy of data - * rdonly – A slaved copy of data for OLAP load patterns - * replica – A slaved copy of data ready to be promoted to master + * rdonly – A replicated copy of data for OLAP load patterns + * replica – A replicated copy of data ready to be promoted to master * restore – A tablet that is restoring from a snapshot. Typically, this happens at tablet startup, then it goes to its right state. - * schema_apply – A slaved copy of data that had been serving query traffic but that is now applying a schema change. Following the change, the tablet will revert to its serving type. - * snapshot_source – A slaved copy of data where mysqld is not running and where Vitess is serving data files to clone slaves. Use this command to enter this mode: 
vtctl Snapshot -server-mode ...
Use this command to exit this mode: 
vtctl SnapshotSourceEnd ...
- * spare – A slaved copy of data that is ready but not serving query traffic. The data could be a potential master tablet. + * spare – A replicated copy of data that is ready but not serving query traffic. The data could be a potential master tablet. #### Errors @@ -462,7 +458,7 @@ Stops mysqld and restores the data from the latest backup. ### ReparentTablet -Reparent a tablet to the current master in the shard. This only works if the current slave position matches the last known reparent action. +Reparent a tablet to the current master in the shard. This only works if the current replication position matches the last known reparent action. #### Example diff --git a/content/en/docs/reference/programs/vtctld.md b/content/en/docs/reference/programs/vtctld.md index 4cbaaacb3..1e227261c 100644 --- a/content/en/docs/reference/programs/vtctld.md +++ b/content/en/docs/reference/programs/vtctld.md @@ -112,7 +112,7 @@ vtctld \ | -log_err_stacks | boolean | log stack traces for errors | | -log_rotate_max_size | uint | size in bytes at which logs are rotated (glog.MaxSize) (default 1887436800) | | -logtostderr | boolean | log to standard error instead of files | -| -master_connect_retry | duration | how long to wait in between slave -> connection attempts. Only precise to the second. (default 10s) | +| -master_connect_retry | duration | how long to wait in between replica reconnect attempts. Only precise to the second. (default 10s) | | -mem-profile-rate | int | profile every n bytes allocated (default 524288) | | -min_number_serving_vttablets | int | the minimum number of vttablets that will be continue to be used even with low replication lag (default 2) | | -mutex-profile-fraction | int | profile every n mutex contention events (see runtime.SetMutexProfileFraction) | @@ -173,12 +173,12 @@ vtctld \ | -schema_change_check_interval | int | this value decides how often we check schema change dir, in seconds (default 60) | | -schema_change_controller | string | schema change controller is responsible for finding schema changes and responding to schema change events | | -schema_change_dir | string | directory contains schema changes for all keyspaces. Each keyspace has its own directory and schema changes are expected to live in '$KEYSPACE/input' dir. e.g. test_keyspace/input/*sql, each sql file represents a schema change | -| -schema_change_slave_timeout | duration | how long to wait for slaves to receive the schema change (default 10s) | +| -schema_change_slave_timeout | duration | how long to wait for replicas to receive the schema change (default 10s) | | -schema_change_user | string | The user who submits this schema change. | | -schema_swap_admin_query_timeout | duration | timeout for SQL queries used to save and retrieve meta information for schema swap process (default 30s) | | -schema_swap_backup_concurrency | int | number of simultaneous compression/checksum jobs to run for seed backup during schema swap (default 4) | | -schema_swap_delay_between_errors | duration | time to wait after a retryable error happened in the schema swap process (default 1m0s) | -| -schema_swap_reparent_timeout | duration | timeout to wait for slaves when doing reparent during schema swap (default 30s) | +| -schema_swap_reparent_timeout | duration | timeout to wait for replicas when doing reparent during schema swap (default 30s) | | -security_policy | string | the name of a registered security policy to use for controlling access to URLs - empty means allow all for anyone (built-in policies: deny-all, read-only) | | -service_map | value | comma separated list of services to enable (or disable if prefixed with '-') Example: grpc-vtworker | | -sql-max-length-errors | int | truncate queries in error logs to the given length (default unlimited) | diff --git a/content/en/docs/reference/programs/vttablet.md b/content/en/docs/reference/programs/vttablet.md index 7fc335d78..3247de34a 100644 --- a/content/en/docs/reference/programs/vttablet.md +++ b/content/en/docs/reference/programs/vttablet.md @@ -206,7 +206,7 @@ The following global options apply to `vttablet`: | -log_queries_to_file | string | Enable query logging to the specified file | | -log_rotate_max_size | uint | size in bytes at which logs are rotated (glog.MaxSize) (default 1887436800) | | -logtostderr | | log to standard error instead of files | -| -master_connect_retry | duration | how long to wait in between slave -> connection attempts. Only precise to the second. (default 10s) | +| -master_connect_retry | duration | how long to wait in between replica reconnect attempts. Only precise to the second. (default 10s) | | -mem-profile-rate | int | profile every n bytes allocated (default 524288) | | -min_number_serving_vttablets | int | the minimum number of vttablets that will be continue to be used even with low replication lag (default 2) | | -mutex-profile-fraction | int | profile every n mutex contention events (see runtime.SetMutexProfileFraction) | @@ -224,7 +224,6 @@ The following global options apply to `vttablet`: | -mycnf_relay_log_info_path | string | mysql relay log info path | | -mycnf_relay_log_path | string | mysql relay log path | | -mycnf_server_id | int | mysql server id of the server (if specified, mycnf-file will be ignored) | -| -mycnf_slave_load_tmp_dir | string | slave load tmp directory | | -mycnf_slow_log_path | string | mysql slow query log path | | -mycnf_socket_file | string | mysql socket file | | -mycnf_tmp_dir | string | mysql tmp directory |