Merge pull request #34513 from MicrosoftDocs/main

Auto Publish – main to live - 2025-06-23 22:38 UTC

Author: Albertyang0

docs/database-engine/availability-groups/windows/contained-availability-groups-overview.md

@@ -57,28 +57,31 @@ Each contained AG has its own `master` and `msdb` system databases, named after
 
 The system databases in a newly created contained AG aren't copies from the instance where the `CREATE AVAILABILITY GROUP` command is run. They are initially empty templates without any data. Immediately after creation, the admin accounts on the instance creating the contained AG are copied into the contained AG `master`. That way, the administrator can log into the contained AG and set up the rest of the configuration. 
 
-If you create local users or configurations in your instance, they don't automatically appear when you create your contained system databases, and they aren't visible when you connect to the contained AG. Once the user database has been joined to a contained AG, it will immediately become inaccessible to these users. You need to manually re-create them in the contained system databases within the context of the contained AG, by connecting directly to the database or by using the listener endpoint. The exception to this is that all of the logins in the sysadmin role in the parent instance are copied into the new AG specific `master` database.
+If you create local users or configurations in your instance, they don't automatically appear when you create your contained system databases, and they aren't visible when you connect to the contained AG. Once the user database has been joined to a contained AG, it will immediately become inaccessible to these users. You need to manually re-create them in the contained system databases within the context of the contained AG, by connecting directly to the database or by using the listener endpoint. The exception to this is that all of the logins in the sysadmin role in the parent instance are copied into the new AG specific `master` database during creation of contained AG.
 
 > [!NOTE]  
 > Because the `master` database is separate for each contained availability group, server-scope activities performed in the context of the contained AG are only persisted in the contained system database. This includes auditing. If you audit server level activity with SQL Server Auditing, you must create the same server audits within each contained AG.
 
-#### Restore a contained system database
-
-You can restore a contained system database using one of two different ways.
+#### Initial Data synchronization
+The contained system databases only support auto seeding as initial data synchronization way. 
 
-- **Restore a contained database using a secondary replica**:
+In [!INCLUDE [sssql22-md](../../../includes/sssql22-md.md)] and earlier versions, contained availability groups must use automatic seeding during creation. When using the `CREATE AVAILABILITY GROUP` statement or the New Availability Group wizard in SQL Server Management Studio, only include user databases that support auto seeding. To add large databases using manual seeding (`JOIN ONLY`), wait until after the contained AG is created.
 
-  1. Restore the contained `master` and `msdb` database onto a server instance that hosts the secondary replica, using `RESTORE WITH NORECOVERY` for every restore operation. For more information, see [Prepare a secondary database for an Always On availability group](manually-prepare-a-secondary-database-for-an-availability-group-sql-server.md).
+In [!INCLUDE [sssql25-md](../../../includes/sssql25-md.md)], contained system databases always use automatic seeding, even if the `CREATE AVAILABILITY GROUP` statement specifies manual seeding. You can set seeding mode to manual to create a contained AG, and later add user databases using synchronization methods other than auto seeding.
 
-  1. Join each contained database to the availability group. For more information, see [Join a secondary database to an Always On availability group](join-a-secondary-database-to-an-availability-group-sql-server.md).
+#### Restore a contained system database
 
-- **Restore a contained database by dropping the contained AG**:
+To restore backups of contained system databases, follow these steps:
 
   1. Drop the contained AG.
 
-  1. Restore the contained `master` and `msdb` database in each of the instances participating in the contained AG.
+  1. Restore the contained `master` and `msdb` databases on the original primary replica of the contained AG.
+  
+  1. Drop the contained `master` and `msdb` database from secondary replicas.
+
+  1. On the primary replica, recreate the contained AG using the original name and nodes, with `WITH (CONTAINED, REUSE_SYSTEM_DATABASES)` and `SEEDING_MODE = AUTOMATIC` syntax.
 
-  1. Recreate the contained AG using original nodes and name, using `WITH (CONTAINED, REUSE_SYSTEM_DATABASES)` syntax.
+When recreating a contained availability group, don't include contained system databases in the `CREATE AVAILABILITY GROUP` statement. [!INCLUDE [ssnoversion-md](../../../includes/ssnoversion-md.md)] detects them automatically when `REUSE_SYSTEM_DATABASES` is specified. In [!INCLUDE [sssql22-md](../../../includes/sssql22-md.md)] and earlier versions, include only small user databases that support automatic seeding. Add large databases separately after the contained AG is created, using `JOIN ONLY`.
 
 ### Contained availability group jobs
 
@@ -218,7 +221,7 @@ This specifies that the AG being created should be a contained AG.
 
 #### REUSE_SYSTEM_DATABASES
 
-The `REUSE_SYSTEM_DATABASES` option is only valid for contained AGs, and specifies that the newly created AG should reuse existing contained system databases for a previous contained AG of the same name. For example, if you had a contained AG with the name `MyContainedAG`, and wanted to drop and recreate it, you could use this option to reuse the contents of the original contained system databases.
+The `REUSE_SYSTEM_DATABASES` option is only valid for contained AGs, and specifies that the newly created AG should reuse existing contained system databases for a previous contained AG of the same name. For example, if you had a contained AG with the name `MyContainedAG`, and wanted to drop and recreate it, you could use this option to reuse the contents of the original contained system databases. When using this option, don't specify system database names. SQL Server automatically detects them.
 
 #### AUTOSEEDING_SYSTEM_DATABASES
 Applies to: [!INCLUDE [sssql25-md](../../../includes/sssql25-md.md)] and later

docs/database-engine/availability-groups/windows/overview-of-always-on-availability-groups-sql-server.md

@@ -4,7 +4,7 @@ description: "An introduction to the concepts that are central for configuring a
 author: MashaMSFT
 ms.author: mathoma
 ms.reviewer: randolphwest, vanto
-ms.date: 09/25/2024
+ms.date: 06/23/2025
 ms.service: sql
 ms.subservice: availability-groups
 ms.topic: concept-article
@@ -261,6 +261,7 @@ For more information, see [Automatic Page Repair (Availability Groups: Database
 - [Service Broker](../../configure-windows/sql-server-service-broker.md)
 - [SQL Server Agent](../../../ssms/agent/sql-server-agent.md)
 - [Reporting Services with Always On Availability Groups (SQL Server)](reporting-services-with-always-on-availability-groups-sql-server.md)
+- [Resource governor](../../../relational-databases/resource-governor/resource-governor.md)
 
 ## Related tasks
 

docs/relational-databases/resource-governor/resource-governor.md

@@ -4,7 +4,7 @@ description: Learn about the SQL Server resource governor feature that limits th
 author: WilliamDAssafMSFT
 ms.author: wiassaf
 ms.reviewer: dfurman
-ms.date: 06/10/2025
+ms.date: 06/23/2025
 ms.service: sql
 ms.subservice: performance
 ms.topic: conceptual
@@ -44,16 +44,17 @@ Some of the usage scenarios supported by resource governor are:
 - Isolate and limit runaway queries, or limit I/O resources for I/O intensive operations that can saturate the I/O subsystem and negatively impact other workloads.
 - Add fine-grained resource tracking for resource usage chargebacks and provide predictable billing to the consumers of server resources.
 
-## Resource governor limitations
-
-Resource governor has the following limitations:
+## Interoperability and limitations
 
+- Resource governor can be used with Always On [availability groups](../../database-engine/availability-groups/windows/overview-of-always-on-availability-groups-sql-server.md) and [failover cluster instances](../../sql-server/failover-clusters/windows/always-on-failover-cluster-instances-sql-server.md). The following considerations apply:
+  - When used in [!INCLUDE [ssNoVersion](../../includes/ssnoversion-md.md)], resource governor must be configured on each [!INCLUDE [ssNoVersion](../../includes/ssnoversion-md.md)] instance that hosts an availability group. Resource governor configuration doesn't propagate from the primary availability group replica to secondary replicas. We recommend that you use the same resource governor configuration for all [!INCLUDE [ssDEnoversion](../../includes/ssdenoversion-md.md)] instances hosting availability replicas. This ensures consistent behavior as availability group failovers occur.
+  - When used in [!INCLUDE [ssazuremi-md.md](../../includes/ssazuremi-md.md)], resource governor configuration propagates from the primary replica to all secondary replicas because the `master` database of the primary replica is replicated to all secondary replicas. This includes high availability and geo-replication secondaries. For more information, see [Resource governor](/azure/azure-sql/managed-instance/transact-sql-tsql-differences-sql-server#resource-governor).
+  - If you use contained availability groups, see [Interactions with other features](../../database-engine/availability-groups/windows/contained-availability-groups-overview.md#resource-governor) for more information.
 - Resource management is limited to the [!INCLUDE[ssDEnoversion](../../includes/ssdenoversion-md.md)]. Resource governor can't be used for [!INCLUDE[ssASnoversion](../../includes/ssasnoversion-md.md)], [!INCLUDE[ssISnoversion](../../includes/ssisnoversion-md.md)], and [!INCLUDE[ssRSnoversion](../../includes/ssrsnoversion-md.md)].
 - Resource governor does not provide workload monitoring or workload management across multiple [!INCLUDE[ssNoVersion](../../includes/ssnoversion-md.md)] instances.
 - Very short queries, such as queries in some OLTP workloads, might not use CPU long enough to apply CPU bandwidth controls. This might skew CPU usage statistics and limit the effectiveness of CPU resource governance.
 - The ability to govern physical I/O applies only to user operations and not system tasks. System tasks perform transaction log, checkpoint, and lazy writer I/O. Resource governor governs user physical reads I/O but not write I/O performed by system tasks.
 - You can't modify resource governance controls for the `internal` resource pool and workload group.
-- If you use contained availability groups, see [Interactions with other features](../../database-engine/availability-groups/windows/contained-availability-groups-overview.md#resource-governor) for more information.
 
 ## Resource concepts
 

docs/relational-databases/system-stored-procedures/catalog-stored-procedures-transact-sql.md

@@ -1,10 +1,10 @@
 ---
-title: "Catalog stored procedures (Transact-SQL)"
+title: "Catalog Stored Procedures (Transact-SQL)"
 description: "An index of catalog stored procedures in SQL Server Transact-SQL."
 author: markingmyname
 ms.author: maghan
 ms.reviewer: randolphwest
-ms.date: 05/24/2023
+ms.date: 06/23/2025
 ms.service: sql
 ms.subservice: system-objects
 ms.topic: "reference"

docs/relational-databases/system-stored-procedures/change-data-capture-stored-procedures-transact-sql.md

@@ -1,10 +1,10 @@
 ---
-title: "Change Data Capture stored procedures (Transact-SQL)"
+title: "Change Data Capture Stored Procedures (Transact-SQL)"
 description: "Change Data Capture stored procedures (Transact-SQL)"
 author: markingmyname
 ms.author: maghan
 ms.reviewer: randolphwest
-ms.date: 08/22/2024
+ms.date: 06/23/2025
 ms.service: sql
 ms.subservice: system-objects
 ms.topic: "reference"

docs/relational-databases/system-stored-procedures/change-tracking-stored-procedures-transact-sql.md

@@ -1,10 +1,10 @@
 ---
-title: "Change Tracking stored procedures (Transact-SQL)"
+title: "Change Tracking Stored Procedures (Transact-SQL)"
 description: "Change Tracking stored procedures (Transact-SQL)"
 author: JetterMcTedder
 ms.author: bspendolini
 ms.reviewer: randolphwest
-ms.date: 08/21/2024
+ms.date: 06/23/2025
 ms.service: sql
 ms.subservice: system-objects
 ms.topic: "reference"

docs/relational-databases/system-stored-procedures/core-sp-add-collector-type-transact-sql.md

@@ -4,7 +4,7 @@ description: "Adds a new entry to the core.supported_collector_types view in the
 author: markingmyname
 ms.author: maghan
 ms.reviewer: randolphwest
-ms.date: 08/21/2024
+ms.date: 06/23/2025
 ms.service: sql
 ms.subservice: system-objects
 ms.topic: "reference"

docs/relational-databases/system-stored-procedures/core-sp-create-snapshot-transact-sql.md

@@ -4,7 +4,7 @@ description: "Inserts a row in the management data warehouse core.snapshots view
 author: markingmyname
 ms.author: maghan
 ms.reviewer: randolphwest
-ms.date: 08/21/2024
+ms.date: 06/23/2025
 ms.service: sql
 ms.subservice: system-objects
 ms.topic: "reference"
@@ -92,7 +92,7 @@ The following example creates a snapshot for the Disk Usage collection set, adds
 ```sql
 USE <management_data_warehouse>;
 DECLARE @snapshot_id int;
-EXEC core.sp_create_snapshot
+EXECUTE core.sp_create_snapshot
     @collection_set_uid = '7B191952-8ECF-4E12-AEB2-EF646EF79FEF',
     @collector_type_uid = '302E93D1-3424-4BE7-AA8E-84813ECF2419',
     @machine_name = '<computername>',

docs/relational-databases/system-stored-procedures/core-sp-purge-data-transact-sql.md

@@ -4,7 +4,7 @@ description: "Removes data from the management data warehouse based on a retenti
 author: markingmyname
 ms.author: maghan
 ms.reviewer: randolphwest
-ms.date: 08/21/2024
+ms.date: 06/23/2025
 ms.service: sql
 ms.subservice: system-objects
 ms.topic: "reference"

docs/relational-databases/system-stored-procedures/core-sp-remove-collector-type-transact-sql.md

@@ -4,7 +4,7 @@ description: "Removes an entry from the core.supported_collector_types view in t
 author: markingmyname
 ms.author: maghan
 ms.reviewer: randolphwest
-ms.date: 08/21/2024
+ms.date: 06/23/2025
 ms.service: sql
 ms.subservice: system-objects
 ms.topic: "reference"