Lokasi ngalangkungan proxy:   [ UP ]  
[Ngawartoskeun bug]   [Panyetelan cookie]                
Skip to content

Commit 0d9990a

Browse files
committed
Merge branch 'main' of https://github.com/MicrosoftDocs/sql-docs-pr into test
2 parents 389831c + caa9ea3 commit 0d9990a

45 files changed

Lines changed: 437 additions & 2361 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.openpublishing.redirection.json

Lines changed: 95 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46065,6 +46065,101 @@
4606546065
"redirect_url": "/sql/2014-toc/index?view=sql-server-2014",
4606646066
"redirect_document_id": false
4606746067
},
46068+
{
46069+
"source_path": "docs/integration-services/catalog/browse-all-principals-dialog-box.md",
46070+
"redirect_url": "/sql/integration-services/catalog/ssis-catalog",
46071+
"redirect_document_id": false
46072+
},
46073+
{
46074+
"source_path": "docs/integration-services/catalog/configure-dialog-box.md",
46075+
"redirect_url": "/sql/integration-services/catalog/ssis-catalog",
46076+
"redirect_document_id": false
46077+
},
46078+
{
46079+
"source_path": "docs/integration-services/catalog/folder-properties-dialog-box.md",
46080+
"redirect_url": "/sql/integration-services/catalog/ssis-catalog",
46081+
"redirect_document_id": false
46082+
},
46083+
{
46084+
"source_path": "docs/integration-services/catalog/package-properties-dialog-box.md",
46085+
"redirect_url": "/sql/integration-services/catalog/ssis-catalog",
46086+
"redirect_document_id": false
46087+
},
46088+
{
46089+
"source_path": "docs/integration-services/catalog/project-properties-dialog-box.md",
46090+
"redirect_url": "/sql/integration-services/catalog/ssis-catalog",
46091+
"redirect_document_id": false
46092+
},
46093+
{
46094+
"source_path": "docs/integration-services/catalog/project-versions-dialog-box.md",
46095+
"redirect_url": "/sql/integration-services/catalog/ssis-catalog",
46096+
"redirect_document_id": false
46097+
},
46098+
{
46099+
"source_path": "docs/integration-services/catalog/set-parameter-value-dialog-box.md",
46100+
"redirect_url": "/sql/integration-services/catalog/ssis-catalog",
46101+
"redirect_document_id": false
46102+
},
46103+
{
46104+
"source_path": "docs/integration-services/catalog/validate-dialog-box.md",
46105+
"redirect_url": "/sql/integration-services/catalog/ssis-catalog",
46106+
"redirect_document_id": false
46107+
},
46108+
{
46109+
"source_path": "docs/connect/odbc/windows/dsn-wizard-1.md",
46110+
"redirect_url": "/sql/connect/odbc/windows/odbc-administrator-dsn-creation",
46111+
"redirect_document_id": false
46112+
},
46113+
{
46114+
"source_path": "docs/connect/odbc/windows/dsn-wizard-2.md",
46115+
"redirect_url": "/sql/connect/odbc/windows/odbc-administrator-dsn-creation",
46116+
"redirect_document_id": false
46117+
},
46118+
{
46119+
"source_path": "docs/connect/odbc/windows/dsn-wizard-3.md",
46120+
"redirect_url": "/sql/connect/odbc/windows/odbc-administrator-dsn-creation",
46121+
"redirect_document_id": false
46122+
},
46123+
{
46124+
"source_path": "docs/connect/odbc/windows/dsn-wizard-4.md",
46125+
"redirect_url": "/sql/connect/odbc/windows/odbc-administrator-dsn-creation",
46126+
"redirect_document_id": false
46127+
},
46128+
{
46129+
"source_path": "docs/integration-services/connection-manager/add-analysis-services-connection-manager-dialog-box-ui-reference.md",
46130+
"redirect_url": "/sql/integration-services/connection-manager/analysis-services-connection-manager",
46131+
"redirect_document_id": false
46132+
},
46133+
{
46134+
"source_path": "docs/integration-services/connection-manager/add-file-connection-manager-dialog-box-ui-reference.md",
46135+
"redirect_url": "/sql/integration-services/connection-manager/file-connection-manager",
46136+
"redirect_document_id": false
46137+
},
46138+
{
46139+
"source_path": "docs/integration-services/connection-manager/suggest-column-types-dialog-box-ui-reference.md",
46140+
"redirect_url": "/sql/integration-services/connection-manager/file-connection-manager",
46141+
"redirect_document_id": false
46142+
},
46143+
{
46144+
"source_path": "docs/master-data-services/connect-to-a-master-data-services-database-dialog-box.md",
46145+
"redirect_url": "/sql/master-data-services/master-data-services-overview-mds",
46146+
"redirect_document_id": false
46147+
},
46148+
{
46149+
"source_path": "docs/master-data-services/create-database-mail-profile-and-account-dialog-box.md",
46150+
"redirect_url": "/sql/master-data-services/master-data-services-overview-mds",
46151+
"redirect_document_id": false
46152+
},
46153+
{
46154+
"source_path": "docs/master-data-services/create-web-application-dialog-box-master-data-services-configuration-manager.md",
46155+
"redirect_url": "/sql/master-data-services/master-data-services-overview-mds",
46156+
"redirect_document_id": false
46157+
},
46158+
{
46159+
"source_path": "docs/master-data-services/create-website-dialog-box-master-data-services-configuration-manager.md",
46160+
"redirect_url": "/sql/master-data-services/master-data-services-overview-mds",
46161+
"redirect_document_id": false
46162+
},
4606846163
{
4606946164
"source_path": "docs/2014/relational-databases/replication/what-s-new-replication.md",
4607046165
"redirect_url": "/sql/relational-databases/replication/sql-server-replication?view=sql-server-2014",

azure-sql/database/high-availability-sla.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -103,9 +103,9 @@ For more information on high availability in Hyperscale, see [Database High Avai
103103

104104
## Zone-redundant availability
105105

106-
Zone-redundant availability is based on storing your database to [zone-redundant storage (ZRS)](/azure/storage/common/storage-redundancy#zone-redundant-storage), which copies your data across three Azure availability zones in the primary region. Each availability zone is a separate physical location with independent power, cooling, and networking.
106+
Zone-redundant availability ensures your data is spread across three Azure availability zones in the primary region. Each availability zone is a separate physical location with independent power, cooling, and networking.
107107

108-
Zone-redundant availability is available to databases in the General Purpose, Premium, Business Critical and Hyperscale service tiers of the vCore purchasing model, and not the Basic and Standard service tiers of the DTU-based purchasing model. Zone-redundant availability ensures Recovery Point Objective (RPO) which indicates the amount of data loss is zero.
108+
Zone-redundant availability is available to databases in the Premium, Business Critical, General Purpose and Hyperscale service tiers, and not the Basic and Standard service tiers of the DTU-based purchasing model. Each service tier implements zone-redundant availability differently. See the details for each service tier in the following sections. All implementations ensure a Recovery Point Objective (RPO) with zero loss of committed data upon failover.
109109

110110
### <a id="general-purpose-service-tier-zone-redundant-availability"></a> General Purpose service tier
111111

@@ -157,7 +157,7 @@ Consider the following when configuring your General Purpose databases with zone
157157

158158
### <a id="premium-and-business-critical-service-tier-zone-redundant-availability"></a> Premium and Business Critical service tiers
159159

160-
By default, the cluster of nodes for the local storage availability model is created in the same datacenter. With the introduction of [Azure Availability Zones](/azure/availability-zones/az-overview), SQL Database can place different replicas of a Premium or Business Critical database in different availability zones in the same region. To eliminate a single point of failure, the control ring is also duplicated across multiple zones as three gateway rings (GW). The routing to a specific gateway ring is controlled by [Azure Traffic Manager](/azure/traffic-manager/traffic-manager-overview). Because the zone-redundant configuration in the Premium or Business Critical service tiers doesn't create additional database redundancy, you can enable it at no extra cost. By selecting a zone-redundant configuration, you can make your Premium or Business Critical databases and elastic pools resilient to a much larger set of failures, including catastrophic datacenter outages, without any changes to the application logic. You can also convert any existing Premium or Business Critical databases or elastic pools to zone-redundant configuration.
160+
When Zone Redundancy is enabled for Premium or Business Critical service tier, the replicas are placed in different availability zones in the same region. To eliminate a single point of failure, the control ring is also duplicated across multiple zones as three gateway rings (GW). The routing to a specific gateway ring is controlled by [Azure Traffic Manager](/azure/traffic-manager/traffic-manager-overview). Because the zone-redundant configuration in the Premium or Business Critical service tiers uses its existing replicas to place in different availablity zones, you can enable it at no extra cost. By selecting a zone-redundant configuration, you can make your Premium or Business Critical databases and elastic pools resilient to a much larger set of failures, including catastrophic datacenter outages, without any changes to the application logic. You can also convert any existing Premium or Business Critical databases or elastic pools to zone-redundant configuration.
161161

162162
The zone-redundant version of the high availability architecture is illustrated by the following diagram:
163163

docs/connect/odbc/windows/dsn-wizard-1.md

Lines changed: 0 additions & 45 deletions
This file was deleted.

docs/connect/odbc/windows/dsn-wizard-2.md

Lines changed: 0 additions & 73 deletions
This file was deleted.

0 commit comments

Comments
 (0)