Skip to content

Commit b85221a

Browse files
Jaferebe logship changes (#36645)
* Log shipping updates including contained availability group, TDS 8, and modernizing upgrade * Update docs/database-engine/availability-groups/windows/contained-availability-groups-overview.md --------- Co-authored-by: Tracey Torble <56347952+ttorble@users.noreply.github.com>
1 parent 381ed9e commit b85221a

14 files changed

Lines changed: 504 additions & 525 deletions

.openpublishing.redirection.json

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20285,6 +20285,11 @@
2028520285
"redirect_url": "/previous-versions/sql/2014/database-engine/log-shipping/upgrading-log-shipping-to-sql-server-2016-transact-sql",
2028620286
"redirect_document_id": false
2028720287
},
20288+
{
20289+
"source_path": "docs/database-engine/log-shipping/upgrading-log-shipping-to-sql-server-2016-transact-sql.md",
20290+
"redirect_url": "/sql/database-engine/log-shipping/upgrade-sql-server-log-shipping-transact-sql",
20291+
"redirect_document_id": false
20292+
},
2028820293
{
2028920294
"source_path": "docs/2014/database-engine/log-shipping/view-the-log-shipping-report-sql-server-management-studio.md",
2029020295
"redirect_url": "/previous-versions/sql/2014/database-engine/log-shipping/view-the-log-shipping-report-sql-server-management-studio",

azure-sql/virtual-machines/windows/log-shipping-configure.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ description: This article teaches you to configure Log Shipping for your SQL Ser
44
author: AbdullahMSFT
55
ms.author: amamun
66
ms.reviewer: mathoma, randolphwest
7-
ms.date: 02/26/2024
7+
ms.date: 02/23/2026
88
ms.service: azure-vm-sql-server
99
ms.subservice: hadr
1010
ms.topic: how-to
@@ -14,7 +14,7 @@ ms.topic: how-to
1414

1515
[!INCLUDE [appliesto-sqlvm](../../includes/appliesto-sqlvm.md)]
1616

17-
This article teaches you to configure [log shipping](/sql/database-engine/log-shipping/about-log-shipping-sql-server) between two [SQL Server on Azure Virtual Machines (VMs)](sql-server-on-azure-vm-iaas-what-is-overview.md).
17+
This article teaches you to configure [log shipping](/sql/database-engine/log-shipping/about-log-shipping-sql-server) between two [SQL Server on Azure Virtual Machines (VMs)](sql-server-on-azure-vm-iaas-what-is-overview.md).
1818

1919
## Overview
2020

@@ -189,14 +189,14 @@ To configure log shipping, follow these steps:
189189

190190
1. Under **History retention**, choose the length of time you want to retain a record of your log shipping history.
191191

192-
1. Select **OK** to save your settings.
192+
1. Select **OK** to save your settings.
193193

194194
1. On the **Database Properties** dialog box, use **OK** to begin the configuration process.
195195

196196
## Related content
197197

198-
- [Monitor log shipping](/sql/database-engine/log-shipping/monitor-log-shipping-transact-sql)
199-
- [Upgrading Log Shipping to SQL Server 2016 (Transact-SQL)](/sql/database-engine/log-shipping/upgrading-log-shipping-to-sql-server-2016-transact-sql)
198+
- [Monitor Log Shipping (Transact-SQL)](/sql/database-engine/log-shipping/monitor-log-shipping-transact-sql)
199+
- [Upgrade SQL Server with log shipping (Transact-SQL)](/sql/database-engine/log-shipping/upgrade-sql-server-log-shipping-transact-sql)
200200
- [Add a Secondary Database to a Log Shipping Configuration (SQL Server)](/sql/database-engine/log-shipping/add-a-secondary-database-to-a-log-shipping-configuration-sql-server)
201201
- [Remove a Secondary Database from a Log Shipping Configuration (SQL Server)](/sql/database-engine/log-shipping/remove-a-secondary-database-from-a-log-shipping-configuration-sql-server)
202202
- [Remove Log Shipping (SQL Server)](/sql/database-engine/log-shipping/remove-log-shipping-sql-server)

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

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ description: An overview of the contained availability group feature of Always O
44
author: MashaMSFT
55
ms.author: mathoma
66
ms.reviewer: randolphwest
7-
ms.date: 01/27/2026
7+
ms.date: 02/23/2026
88
ms.service: sql
99
ms.subservice: high-availability
1010
ms.topic: overview
@@ -194,12 +194,18 @@ To use change data capture with a contained AG, connect to the AG listener when
194194

195195
### Log shipping
196196

197-
You can configure log shipping if the source database is in the contained AG. However, a log shipping target isn't supported within a contained AG. Additionally, you need to modify the log shipping job after you configure CDC.
197+
You can configure log shipping if the source database is in the contained AG. However, a log shipping target isn't supported within a contained AG. Additionally, you need to modify the log shipping job after you configure log shipping.
198198

199199
To configure log shipping with a contained AG, follow these steps:
200200

201201
1. Connect to the contained AG listener.
202-
1. Configure [log shipping](../../log-shipping/configure-log-shipping-sql-server.md) as you normally would.
202+
203+
1. Configure [log shipping](../../log-shipping/configure-log-shipping-sql-server.md)
204+
205+
- Use `@primary_server_with_port_override` in [sp_add_log_shipping_primary_database](../../../relational-databases/system-stored-procedures/sp-add-log-shipping-primary-database-transact-sql.md#primary-server-with-port-override).
206+
207+
- If you use a local monitor in your log shipping topology, leave the `@monitor_server` value in [sp_add_log_shipping_primary_database](../../../relational-databases/system-stored-procedures/sp-add-log-shipping-primary-database-transact-sql.md#monitor-server) blank or *null*.
208+
203209
1. After you configure the log shipping job, alter the job to connect to the contained AG listener before taking a backup.
204210

205211
### Transparent data encryption (TDE)

docs/database-engine/availability-groups/windows/prereqs-migrating-log-shipping-to-always-on-availability-groups.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ description: "A description of the prerequisites necessary to convert log shippi
44
author: MashaMSFT
55
ms.author: mathoma
66
ms.reviewer: maghan
7-
ms.date: 02/01/2024
7+
ms.date: 02/23/2026
88
ms.service: sql
99
ms.subservice: availability-groups
1010
ms.topic: checklist
@@ -62,7 +62,7 @@ After you have created all the secondary databases for the availability group, i
6262

6363
**Log shipping**
6464

65-
- [Upgrading Log Shipping to SQL Server 2016 (Transact-SQL)](../../../database-engine/log-shipping/upgrading-log-shipping-to-sql-server-2016-transact-sql.md)
65+
- [Upgrade SQL Server with log shipping (Transact-SQL)](../../log-shipping/upgrade-sql-server-log-shipping-transact-sql.md)
6666

6767
- [Remove Log Shipping (SQL Server)](../../../database-engine/log-shipping/remove-log-shipping-sql-server.md)
6868

@@ -87,6 +87,6 @@ After you have created all the secondary databases for the availability group, i
8787
- [SQL Server Always On Team Blogs: The official SQL Server Always On Team Blog](/archive/blogs/sqlalwayson/)
8888
- [CSS SQL Server Engineers Blogs](/archive/blogs/psssql/)
8989
- [Migration Guide: Migrating to Always On Availability Groups from Prior Deployments Combining Database Mirroring and Log Shipping](/previous-versions/sql/sql-server-2012/jj635217(v=msdn.10))
90-
- [About Log Shipping (SQL Server)](../../../database-engine/log-shipping/about-log-shipping-sql-server.md)
91-
- [Overview of Always On Availability Groups (SQL Server)](../../../database-engine/availability-groups/windows/overview-of-always-on-availability-groups-sql-server.md)
92-
- [Monitoring of Availability Groups (SQL Server)](../../../database-engine/availability-groups/windows/monitoring-of-availability-groups-sql-server.md)
90+
- [About log shipping (SQL Server)](../../log-shipping/about-log-shipping-sql-server.md)
91+
- [What is an Always On availability group?](overview-of-always-on-availability-groups-sql-server.md)
92+
- [Tools to monitor Always On availability groups](monitoring-of-availability-groups-sql-server.md)

docs/database-engine/install-windows/choose-a-database-engine-upgrade-method.md

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,13 @@ title: Choose a Database Engine Upgrade Method
33
description: This article describes upgrade paths for the Database Engine in SQL Server, including upgrade in-place, migrate to a new installation, and a rolling upgrade.
44
author: rwestMSFT
55
ms.author: randolphwest
6-
ms.date: 06/03/2025
6+
ms.date: 02/23/2026
77
ms.service: sql
88
ms.subservice: install
99
ms.topic: upgrade-and-migration-article
10+
ms.custom:
11+
- sfi-image-nochange
1012
monikerRange: ">=sql-server-2016"
11-
ms.custom: sfi-image-nochange
1213
---
1314
# Choose a Database Engine upgrade method
1415

@@ -105,6 +106,6 @@ A rolling upgrade is required in [!INCLUDE [ssnoversion-md](../../includes/ssnov
105106
- Availability Groups: For detailed steps for performing a rolling upgrade in this environment, see [Upgrade availability group replicas](../availability-groups/windows/upgrading-always-on-availability-group-replica-instances.md)
106107
- Failover cluster instances: For detailed steps for performing a rolling upgrade in this environment, see [Upgrade a failover cluster instance](../../sql-server/failover-clusters/windows/upgrade-a-sql-server-failover-cluster-instance.md)
107108
- Mirrored instances: For detailed steps for performing a rolling upgrade in this environment, see [Upgrading Mirrored Instances](../database-mirroring/upgrading-mirrored-instances.md)
108-
- Log shipping instances: For detailed steps for performing a rolling upgrade in this environment, see [Upgrading Log Shipping to SQL Server 2016 (Transact-SQL)](../log-shipping/upgrading-log-shipping-to-sql-server-2016-transact-sql.md)
109+
- Log shipping instances: For detailed steps for performing a rolling upgrade in this environment, see [Upgrade SQL Server with log shipping (Transact-SQL)](../log-shipping/upgrade-sql-server-log-shipping-transact-sql.md)
109110
- A replication environment: For detailed steps for performing a rolling upgrade in this environment, see [Upgrade or patch replicated databases](upgrade-replicated-databases.md)
110111
- A [!INCLUDE [ssnoversion-md](../../includes/ssnoversion-md.md)] [!INCLUDE [ssrsnoversion-md](../../includes/ssrsnoversion-md.md)] scale-out environment: For detailed steps for performing a rolling upgrade in this environment, see [Upgrade and migrate Reporting Services](../../reporting-services/install-windows/upgrade-and-migrate-reporting-services.md)

docs/database-engine/log-shipping/about-log-shipping-sql-server.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ description: Learn about SQL Server log shipping, which sends transaction log ba
44
author: MikeRayMSFT
55
ms.author: mikeray
66
ms.reviewer: randolphwest
7-
ms.date: 11/18/2025
7+
ms.date: 02/23/2026
88
ms.service: sql
99
ms.subservice: log-shipping
1010
ms.topic: concept-article
@@ -146,7 +146,7 @@ Log shipping can be used with the following features or components of [!INCLUDE
146146
147147
## Related tasks
148148

149-
- [Upgrading Log Shipping to SQL Server 2016 (Transact-SQL)](upgrading-log-shipping-to-sql-server-2016-transact-sql.md)
149+
- [Upgrade SQL Server with log shipping (Transact-SQL)](upgrade-sql-server-log-shipping-transact-sql.md)
150150
- [Configure Log Shipping (SQL Server)](configure-log-shipping-sql-server.md)
151151
- [Add a Secondary Database to a Log Shipping Configuration (SQL Server)](add-a-secondary-database-to-a-log-shipping-configuration-sql-server.md)
152152
- [Remove a Secondary Database from a Log Shipping Configuration (SQL Server)](remove-a-secondary-database-from-a-log-shipping-configuration-sql-server.md)

0 commit comments

Comments
 (0)