Skip to content

Commit 3a4d48b

Browse files
olahallengrenolahallengren
authored
Merge pull request #1121 from olahallengren/minor_updates
Improve logic for contained availability groups
2 parents 29cfb84 + 90d5968 commit 3a4d48b

7 files changed

Lines changed: 171 additions & 171 deletions

‎CommandExecute.sql‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ BEGIN
3838
--// Source: https://ola.hallengren.com //--
3939
--// License: https://ola.hallengren.com/license.html //--
4040
--// GitHub: https://github.com/olahallengren/sql-server-maintenance-solution //--
41-
--// Version: 2026-07-22 18:59:22 //--
41+
--// Version: 2026-07-22 20:03:34 //--
4242
----------------------------------------------------------------------------------------------------
4343

4444
SET NOCOUNT ON

‎DatabaseBackup.sql‎

Lines changed: 23 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ BEGIN
9494
--// Source: https://ola.hallengren.com //--
9595
--// License: https://ola.hallengren.com/license.html //--
9696
--// GitHub: https://github.com/olahallengren/sql-server-maintenance-solution //--
97-
--// Version: 2026-07-22 18:59:22 //--
97+
--// Version: 2026-07-22 20:03:34 //--
9898
----------------------------------------------------------------------------------------------------
9999

100100
SET NOCOUNT ON
@@ -124,6 +124,8 @@ BEGIN
124124
DECLARE @CurrentParameterMessage nvarchar(max)
125125

126126
DECLARE @HostPlatform nvarchar(max)
127+
DECLARE @ContainedAvailabilityGroupID uniqueidentifier
128+
DECLARE @ContainedAvailabilityGroupListenerConnection bit
127129
DECLARE @DirectorySeparator nvarchar(max)
128130

129131
DECLARE @Updated bit
@@ -173,7 +175,6 @@ BEGIN
173175
DECLARE @CurrentDate datetime2
174176
DECLARE @CurrentDateUTC datetime2
175177
DECLARE @CurrentCleanupDate datetime2
176-
DECLARE @CurrentContainedAvailabilityGroupListenerConnection bit
177178
DECLARE @CurrentAvailabilityGroupReplicaID uniqueidentifier
178179
DECLARE @CurrentAvailabilityGroupID uniqueidentifier
179180
DECLARE @CurrentAvailabilityGroup nvarchar(max)
@@ -322,6 +323,15 @@ BEGIN
322323
FROM sys.dm_os_host_info
323324
END
324325

326+
IF @Version >= 16 AND @EngineEdition NOT IN(5, 8)
327+
BEGIN
328+
SET @CurrentCommand = 'SELECT @ParamContainedAvailabilityGroupID = contained_availability_group_id FROM sys.dm_exec_sessions WHERE session_id = @@SPID'
329+
330+
EXECUTE sp_executesql @stmt = @CurrentCommand, @params = N'@ParamContainedAvailabilityGroupID uniqueidentifier OUTPUT', @ParamContainedAvailabilityGroupID = @ContainedAvailabilityGroupID OUTPUT
331+
END
332+
333+
SET @ContainedAvailabilityGroupListenerConnection = CASE WHEN @ContainedAvailabilityGroupID IS NOT NULL THEN 1 ELSE 0 END
334+
325335
DECLARE @AmazonRDS bit = CASE WHEN @EngineEdition IN (5, 8) THEN 0 WHEN EXISTS (SELECT * FROM sys.databases WHERE [name] = 'rdsadmin') AND SUSER_SNAME(0x01) = 'rdsa' THEN 1 ELSE 0 END
326336

327337
----------------------------------------------------------------------------------------------------
@@ -432,6 +442,12 @@ BEGIN
432442
RAISERROR('%s',10,1,@StartMessage) WITH NOWAIT
433443
END
434444

445+
IF @Version >= 16 AND @EngineEdition NOT IN(5, 8)
446+
BEGIN
447+
SET @StartMessage = 'Contained availability group connection: ' + CASE WHEN @ContainedAvailabilityGroupListenerConnection = 1 THEN 'Yes' WHEN @ContainedAvailabilityGroupListenerConnection = 0 THEN 'No' ELSE 'N/A' END
448+
RAISERROR('%s',10,1,@StartMessage) WITH NOWAIT
449+
END
450+
435451
SET @StartMessage = 'Database: ' + QUOTENAME(DB_NAME())
436452
RAISERROR('%s',10,1,@StartMessage) WITH NOWAIT
437453

@@ -2883,8 +2899,6 @@ BEGIN
28832899
WHEN @MaxTransferSize IS NULL AND @Compress = 'Y' AND @CurrentIsEncrypted = 1 AND @BackupSoftware IS NULL AND (@Version < 15.04043 AND NOT (@EngineEdition = 8 AND @ProductUpdateType = 'Continuous')) AND @Credential IS NULL THEN 65537
28842900
END
28852901

2886-
SET @CurrentContainedAvailabilityGroupListenerConnection = 0
2887-
28882902
IF @IsHadrEnabled = 1
28892903
BEGIN
28902904
SELECT @CurrentAvailabilityGroupReplicaID = databases.replica_id
@@ -2898,14 +2912,7 @@ BEGIN
28982912

28992913
IF @CurrentAvailabilityGroupReplicaID IS NULL AND @CurrentAvailabilityGroupID IS NULL AND @Version >= 16
29002914
BEGIN
2901-
SET @CurrentCommand = 'SELECT @ParamAvailabilityGroupID = contained_availability_group_id FROM sys.dm_exec_sessions WHERE session_id = @@SPID'
2902-
2903-
EXECUTE sp_executesql @stmt = @CurrentCommand, @params = N'@ParamAvailabilityGroupID uniqueidentifier OUTPUT', @ParamAvailabilityGroupID = @CurrentAvailabilityGroupID OUTPUT
2904-
2905-
IF @CurrentAvailabilityGroupID IS NOT NULL
2906-
BEGIN
2907-
SET @CurrentContainedAvailabilityGroupListenerConnection = 1
2908-
END
2915+
SET @CurrentAvailabilityGroupID = @ContainedAvailabilityGroupID
29092916

29102917
SELECT @CurrentAvailabilityGroupReplicaID = replica_id
29112918
FROM sys.dm_hadr_availability_replica_states
@@ -2972,7 +2979,7 @@ BEGIN
29722979
AND NOT @CurrentInStandby = 1
29732980
AND (@CurrentAvailabilityGroupRole = 'PRIMARY' OR @CurrentAvailabilityGroupRole IS NULL)
29742981
AND (@CurrentDistributedAvailabilityGroupRole = 'PRIMARY' OR @CurrentDistributedAvailabilityGroupRole IS NULL)
2975-
AND (@BackupType IN('DIFF','FULL') OR (@ChangeBackupType = 'Y' AND @CurrentBackupType = 'LOG' AND @CurrentRecoveryModel IN('FULL','BULK_LOGGED') AND @CurrentLogLSN IS NULL AND NOT (@CurrentDatabaseName = 'master' AND @CurrentContainedAvailabilityGroupListenerConnection = 0)))
2982+
AND (@BackupType IN('DIFF','FULL') OR (@ChangeBackupType = 'Y' AND @CurrentBackupType = 'LOG' AND @CurrentRecoveryModel IN('FULL','BULK_LOGGED') AND @CurrentLogLSN IS NULL AND NOT (@CurrentDatabaseName = 'master' AND @ContainedAvailabilityGroupListenerConnection = 0)))
29762983
BEGIN
29772984
SET @CurrentCommand = 'SELECT @ParamAllocatedExtentPageCount = SUM(allocated_extent_page_count), @ParamModifiedExtentPageCount = SUM(modified_extent_page_count) FROM sys.dm_db_file_space_usage'
29782985

@@ -2988,11 +2995,11 @@ BEGIN
29882995

29892996
IF @ChangeBackupType = 'Y'
29902997
BEGIN
2991-
IF @CurrentBackupType = 'LOG' AND @CurrentRecoveryModel IN('FULL','BULK_LOGGED') AND @CurrentLogLSN IS NULL AND NOT (@CurrentDatabaseName = 'master' AND @CurrentContainedAvailabilityGroupListenerConnection = 0) AND (@BackupInProgress = 0 OR @BackupInProgress IS NULL)
2998+
IF @CurrentBackupType = 'LOG' AND @CurrentRecoveryModel IN('FULL','BULK_LOGGED') AND @CurrentLogLSN IS NULL AND NOT (@CurrentDatabaseName = 'master' AND @ContainedAvailabilityGroupListenerConnection = 0) AND (@BackupInProgress = 0 OR @BackupInProgress IS NULL)
29922999
BEGIN
29933000
SET @CurrentBackupType = 'DIFF'
29943001
END
2995-
IF @CurrentBackupType = 'DIFF' AND ((@CurrentDatabaseName = 'master' AND @CurrentContainedAvailabilityGroupListenerConnection = 0) OR @CurrentDifferentialBaseLSN IS NULL OR (@CurrentModifiedExtentPageCount * 1. / NULLIF(@CurrentAllocatedExtentPageCount, 0) * 100 >= @MinModificationLevel) OR (COALESCE(CAST(@CurrentAllocatedExtentPageCount AS bigint) * 8192, CAST(@CurrentDatabaseSize AS bigint) * 8192) < CAST(@MinDatabaseSizeForDifferentialBackup AS bigint) * 1024 * 1024))
3002+
IF @CurrentBackupType = 'DIFF' AND ((@CurrentDatabaseName = 'master' AND @ContainedAvailabilityGroupListenerConnection = 0) OR @CurrentDifferentialBaseLSN IS NULL OR (@CurrentModifiedExtentPageCount * 1. / NULLIF(@CurrentAllocatedExtentPageCount, 0) * 100 >= @MinModificationLevel) OR (COALESCE(CAST(@CurrentAllocatedExtentPageCount AS bigint) * 8192, CAST(@CurrentDatabaseSize AS bigint) * 8192) < CAST(@MinDatabaseSizeForDifferentialBackup AS bigint) * 1024 * 1024))
29963003
BEGIN
29973004
SET @CurrentBackupType = 'FULL'
29983005
END
@@ -3080,12 +3087,6 @@ BEGIN
30803087

30813088
IF @CurrentAvailabilityGroup IS NOT NULL
30823089
BEGIN
3083-
IF @Version >= 16 AND @EngineEdition NOT IN(5, 8)
3084-
BEGIN
3085-
SET @StartMessage = 'Contained availability group connection: ' + CASE WHEN @CurrentContainedAvailabilityGroupListenerConnection = 1 THEN 'Yes' WHEN @CurrentContainedAvailabilityGroupListenerConnection = 0 THEN 'No' ELSE 'N/A' END
3086-
RAISERROR('%s',10,1,@StartMessage) WITH NOWAIT
3087-
END
3088-
30893090
SET @DatabaseMessage = 'Availability group: ' + ISNULL(@CurrentAvailabilityGroup,'N/A')
30903091
RAISERROR('%s',10,1,@DatabaseMessage) WITH NOWAIT
30913092

@@ -3185,7 +3186,7 @@ BEGIN
31853186
AND NOT (@CurrentBackupType = 'LOG' AND @CurrentRecoveryModel = 'SIMPLE')
31863187
AND NOT (@CurrentBackupType = 'LOG' AND @CurrentRecoveryModel IN('FULL','BULK_LOGGED') AND @CurrentLogLSN IS NULL)
31873188
AND NOT (@CurrentBackupType = 'DIFF' AND @CurrentDifferentialBaseLSN IS NULL)
3188-
AND NOT (@CurrentBackupType IN('DIFF','LOG') AND (@CurrentDatabaseName = 'master' AND @CurrentContainedAvailabilityGroupListenerConnection = 0))
3189+
AND NOT (@CurrentBackupType IN('DIFF','LOG') AND (@CurrentDatabaseName = 'master' AND @ContainedAvailabilityGroupListenerConnection = 0))
31893190
AND NOT (@CurrentAvailabilityGroup IS NOT NULL AND @CurrentBackupOperationSupportedOnSecondaryReplicas = 0 AND (@CurrentAvailabilityGroupRole <> 'PRIMARY' OR @CurrentAvailabilityGroupRole IS NULL))
31903191
AND NOT (@CurrentAvailabilityGroup IS NOT NULL AND @CurrentBackupOperationSupportedOnSecondaryReplicas = 1 AND (@CurrentIsPreferredBackupReplica <> 1 OR @CurrentIsPreferredBackupReplica IS NULL) AND @OverrideBackupPreference = 'N')
31913192
AND NOT (@CurrentDistributedAvailabilityGroup IS NOT NULL AND @CurrentBackupOperationSupportedOnSecondaryReplicas = 0 AND (@CurrentDistributedAvailabilityGroupRole <> 'PRIMARY' OR @CurrentDistributedAvailabilityGroupRole IS NULL))
@@ -4479,7 +4480,6 @@ BEGIN
44794480
SET @CurrentDate = NULL
44804481
SET @CurrentDateUTC = NULL
44814482
SET @CurrentCleanupDate = NULL
4482-
SET @CurrentContainedAvailabilityGroupListenerConnection = NULL
44834483
SET @CurrentAvailabilityGroupReplicaID = NULL
44844484
SET @CurrentAvailabilityGroupID = NULL
44854485
SET @CurrentAvailabilityGroup = NULL

‎DatabaseIntegrityCheck.sql‎

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ BEGIN
4040
--// Source: https://ola.hallengren.com //--
4141
--// License: https://ola.hallengren.com/license.html //--
4242
--// GitHub: https://github.com/olahallengren/sql-server-maintenance-solution //--
43-
--// Version: 2026-07-22 18:59:22 //--
43+
--// Version: 2026-07-22 20:03:34 //--
4444
----------------------------------------------------------------------------------------------------
4545

4646
SET NOCOUNT ON
@@ -71,6 +71,8 @@ BEGIN
7171
DECLARE @CurrentParameterMessage nvarchar(max)
7272

7373
DECLARE @HostPlatform nvarchar(max)
74+
DECLARE @ContainedAvailabilityGroupID uniqueidentifier
75+
DECLARE @ContainedAvailabilityGroupListenerConnection bit
7476

7577
DECLARE @QueueID int
7678
DECLARE @QueueStartTime datetime2
@@ -85,7 +87,6 @@ BEGIN
8587
DECLARE @CurrentDatabaseState nvarchar(max)
8688
DECLARE @CurrentInStandby bit
8789
DECLARE @CurrentRecoveryModel nvarchar(max)
88-
DECLARE @CurrentContainedAvailabilityGroupListenerConnection bit
8990
DECLARE @CurrentAvailabilityGroupReplicaID uniqueidentifier
9091
DECLARE @CurrentAvailabilityGroupID uniqueidentifier
9192
DECLARE @CurrentAvailabilityGroup nvarchar(max)
@@ -217,6 +218,15 @@ BEGIN
217218
FROM sys.dm_os_host_info
218219
END
219220

221+
IF @Version >= 16 AND @EngineEdition NOT IN(5, 8)
222+
BEGIN
223+
SET @CurrentCommand = 'SELECT @ParamContainedAvailabilityGroupID = contained_availability_group_id FROM sys.dm_exec_sessions WHERE session_id = @@SPID'
224+
225+
EXECUTE sp_executesql @stmt = @CurrentCommand, @params = N'@ParamContainedAvailabilityGroupID uniqueidentifier OUTPUT', @ParamContainedAvailabilityGroupID = @ContainedAvailabilityGroupID OUTPUT
226+
END
227+
228+
SET @ContainedAvailabilityGroupListenerConnection = CASE WHEN @ContainedAvailabilityGroupID IS NOT NULL THEN 1 ELSE 0 END
229+
220230
DECLARE @AmazonRDS bit = CASE WHEN @EngineEdition IN (5, 8) THEN 0 WHEN EXISTS (SELECT * FROM sys.databases WHERE [name] = 'rdsadmin') AND SUSER_SNAME(0x01) = 'rdsa' THEN 1 ELSE 0 END
221231

222232
----------------------------------------------------------------------------------------------------
@@ -273,6 +283,12 @@ BEGIN
273283
RAISERROR('%s',10,1,@StartMessage) WITH NOWAIT
274284
END
275285

286+
IF @Version >= 16 AND @EngineEdition NOT IN(5, 8)
287+
BEGIN
288+
SET @StartMessage = 'Contained availability group connection: ' + CASE WHEN @ContainedAvailabilityGroupListenerConnection = 1 THEN 'Yes' WHEN @ContainedAvailabilityGroupListenerConnection = 0 THEN 'No' ELSE 'N/A' END
289+
RAISERROR('%s',10,1,@StartMessage) WITH NOWAIT
290+
END
291+
276292
SET @StartMessage = 'Database: ' + QUOTENAME(DB_NAME())
277293
RAISERROR('%s',10,1,@StartMessage) WITH NOWAIT
278294

@@ -1425,8 +1441,6 @@ BEGIN
14251441
RAISERROR('%s',10,1,@DatabaseMessage) WITH NOWAIT
14261442
END
14271443

1428-
SET @CurrentContainedAvailabilityGroupListenerConnection = 0
1429-
14301444
IF @IsHadrEnabled = 1
14311445
BEGIN
14321446
SELECT @CurrentAvailabilityGroupReplicaID = databases.replica_id
@@ -1440,14 +1454,7 @@ BEGIN
14401454

14411455
IF @CurrentAvailabilityGroupReplicaID IS NULL AND @CurrentAvailabilityGroupID IS NULL AND @Version >= 16
14421456
BEGIN
1443-
SET @CurrentCommand = 'SELECT @ParamAvailabilityGroupID = contained_availability_group_id FROM sys.dm_exec_sessions WHERE session_id = @@SPID'
1444-
1445-
EXECUTE sp_executesql @stmt = @CurrentCommand, @params = N'@ParamAvailabilityGroupID uniqueidentifier OUTPUT', @ParamAvailabilityGroupID = @CurrentAvailabilityGroupID OUTPUT
1446-
1447-
IF @CurrentAvailabilityGroupID IS NOT NULL
1448-
BEGIN
1449-
SET @CurrentContainedAvailabilityGroupListenerConnection = 1
1450-
END
1457+
SET @CurrentAvailabilityGroupID = @ContainedAvailabilityGroupID
14511458

14521459
SELECT @CurrentAvailabilityGroupReplicaID = replica_id
14531460
FROM sys.dm_hadr_availability_replica_states
@@ -1499,12 +1506,6 @@ BEGIN
14991506

15001507
IF @CurrentAvailabilityGroup IS NOT NULL
15011508
BEGIN
1502-
IF @Version >= 16 AND @EngineEdition NOT IN(5, 8)
1503-
BEGIN
1504-
SET @StartMessage = 'Contained availability group connection: ' + CASE WHEN @CurrentContainedAvailabilityGroupListenerConnection = 1 THEN 'Yes' WHEN @CurrentContainedAvailabilityGroupListenerConnection = 0 THEN 'No' ELSE 'N/A' END
1505-
RAISERROR('%s',10,1,@StartMessage) WITH NOWAIT
1506-
END
1507-
15081509
SET @DatabaseMessage = 'Availability group: ' + ISNULL(@CurrentAvailabilityGroup,'N/A')
15091510
RAISERROR('%s',10,1,@DatabaseMessage) WITH NOWAIT
15101511

@@ -1962,7 +1963,6 @@ BEGIN
19621963
SET @CurrentDatabaseState = NULL
19631964
SET @CurrentInStandby = NULL
19641965
SET @CurrentRecoveryModel = NULL
1965-
SET @CurrentContainedAvailabilityGroupListenerConnection = NULL
19661966
SET @CurrentAvailabilityGroupReplicaID = NULL
19671967
SET @CurrentAvailabilityGroupID = NULL
19681968
SET @CurrentAvailabilityGroup = NULL

‎IndexOptimize.sql‎

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ BEGIN
5656
--// Source: https://ola.hallengren.com //--
5757
--// License: https://ola.hallengren.com/license.html //--
5858
--// GitHub: https://github.com/olahallengren/sql-server-maintenance-solution //--
59-
--// Version: 2026-07-22 18:59:22 //--
59+
--// Version: 2026-07-22 20:03:34 //--
6060
----------------------------------------------------------------------------------------------------
6161

6262
SET NOCOUNT ON
@@ -91,6 +91,8 @@ BEGIN
9191
DECLARE @CurrentParameterMessage nvarchar(max)
9292

9393
DECLARE @HostPlatform nvarchar(max)
94+
DECLARE @ContainedAvailabilityGroupID uniqueidentifier
95+
DECLARE @ContainedAvailabilityGroupListenerConnection bit
9496

9597
DECLARE @QueueID int
9698
DECLARE @QueueStartTime datetime2
@@ -107,7 +109,6 @@ BEGIN
107109
DECLARE @CurrentInStandby bit
108110
DECLARE @CurrentRecoveryModel nvarchar(max)
109111
DECLARE @CurrentDatabaseHasReadOnlyFileGroup bit
110-
DECLARE @CurrentContainedAvailabilityGroupListenerConnection bit
111112
DECLARE @CurrentAvailabilityGroupReplicaID uniqueidentifier
112113
DECLARE @CurrentAvailabilityGroupID uniqueidentifier
113114
DECLARE @CurrentAvailabilityGroup nvarchar(max)
@@ -367,6 +368,15 @@ BEGIN
367368
FROM sys.dm_os_host_info
368369
END
369370

371+
IF @Version >= 16 AND @EngineEdition NOT IN(5, 8)
372+
BEGIN
373+
SET @CurrentCommand = 'SELECT @ParamContainedAvailabilityGroupID = contained_availability_group_id FROM sys.dm_exec_sessions WHERE session_id = @@SPID'
374+
375+
EXECUTE sp_executesql @stmt = @CurrentCommand, @params = N'@ParamContainedAvailabilityGroupID uniqueidentifier OUTPUT', @ParamContainedAvailabilityGroupID = @ContainedAvailabilityGroupID OUTPUT
376+
END
377+
378+
SET @ContainedAvailabilityGroupListenerConnection = CASE WHEN @ContainedAvailabilityGroupID IS NOT NULL THEN 1 ELSE 0 END
379+
370380
DECLARE @AmazonRDS bit = CASE WHEN @EngineEdition IN (5, 8) THEN 0 WHEN EXISTS (SELECT * FROM sys.databases WHERE [name] = 'rdsadmin') AND SUSER_SNAME(0x01) = 'rdsa' THEN 1 ELSE 0 END
371381

372382
----------------------------------------------------------------------------------------------------
@@ -438,6 +448,12 @@ BEGIN
438448
RAISERROR('%s',10,1,@StartMessage) WITH NOWAIT
439449
END
440450

451+
IF @Version >= 16 AND @EngineEdition NOT IN(5, 8)
452+
BEGIN
453+
SET @StartMessage = 'Contained availability group connection: ' + CASE WHEN @ContainedAvailabilityGroupListenerConnection = 1 THEN 'Yes' WHEN @ContainedAvailabilityGroupListenerConnection = 0 THEN 'No' ELSE 'N/A' END
454+
RAISERROR('%s',10,1,@StartMessage) WITH NOWAIT
455+
END
456+
441457
SET @StartMessage = 'Database: ' + QUOTENAME(DB_NAME())
442458
RAISERROR('%s',10,1,@StartMessage) WITH NOWAIT
443459

@@ -1619,8 +1635,6 @@ BEGIN
16191635
RAISERROR('%s',10,1,@DatabaseMessage) WITH NOWAIT
16201636
END
16211637

1622-
SET @CurrentContainedAvailabilityGroupListenerConnection = 0
1623-
16241638
IF @IsHadrEnabled = 1
16251639
BEGIN
16261640
SELECT @CurrentAvailabilityGroupReplicaID = databases.replica_id
@@ -1634,14 +1648,7 @@ BEGIN
16341648

16351649
IF @CurrentAvailabilityGroupReplicaID IS NULL AND @CurrentAvailabilityGroupID IS NULL AND @Version >= 16
16361650
BEGIN
1637-
SET @CurrentCommand = 'SELECT @ParamAvailabilityGroupID = contained_availability_group_id FROM sys.dm_exec_sessions WHERE session_id = @@SPID'
1638-
1639-
EXECUTE sp_executesql @stmt = @CurrentCommand, @params = N'@ParamAvailabilityGroupID uniqueidentifier OUTPUT', @ParamAvailabilityGroupID = @CurrentAvailabilityGroupID OUTPUT
1640-
1641-
IF @CurrentAvailabilityGroupID IS NOT NULL
1642-
BEGIN
1643-
SET @CurrentContainedAvailabilityGroupListenerConnection = 1
1644-
END
1651+
SET @CurrentAvailabilityGroupID = @ContainedAvailabilityGroupID
16451652

16461653
SELECT @CurrentAvailabilityGroupReplicaID = replica_id
16471654
FROM sys.dm_hadr_availability_replica_states
@@ -1683,12 +1690,6 @@ BEGIN
16831690

16841691
IF @CurrentAvailabilityGroup IS NOT NULL
16851692
BEGIN
1686-
IF @Version >= 16 AND @EngineEdition NOT IN(5, 8)
1687-
BEGIN
1688-
SET @StartMessage = 'Contained availability group connection: ' + CASE WHEN @CurrentContainedAvailabilityGroupListenerConnection = 1 THEN 'Yes' WHEN @CurrentContainedAvailabilityGroupListenerConnection = 0 THEN 'No' ELSE 'N/A' END
1689-
RAISERROR('%s',10,1,@StartMessage) WITH NOWAIT
1690-
END
1691-
16921693
SET @DatabaseMessage = 'Availability group: ' + ISNULL(@CurrentAvailabilityGroup,'N/A')
16931694
RAISERROR('%s',10,1,@DatabaseMessage) WITH NOWAIT
16941695

@@ -2904,7 +2905,6 @@ BEGIN
29042905
SET @CurrentInStandby = NULL
29052906
SET @CurrentRecoveryModel = NULL
29062907
SET @CurrentDatabaseHasReadOnlyFileGroup = NULL
2907-
SET @CurrentContainedAvailabilityGroupListenerConnection = NULL
29082908
SET @CurrentAvailabilityGroupReplicaID = NULL
29092909
SET @CurrentAvailabilityGroupID = NULL
29102910
SET @CurrentAvailabilityGroup = NULL

0 commit comments

Comments
 (0)