Skip to content

Commit b7b5b84

Browse files
committed
Merge branch 'master' of https://github.com/MicrosoftDocs/sql-docs-pr into 20180102_kubernetes
2 parents e9a7f48 + ba15e5e commit b7b5b84

58 files changed

Lines changed: 432 additions & 215 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.

docs/database-engine/availability-groups/windows/upgrading-always-on-availability-group-replica-instances.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ ms.workload: "On Demand"
3939
- [Hardware and Software Requirements for Installing SQL Server 2016](../../../sql-server/install/hardware-and-software-requirements-for-installing-sql-server.md): Review the software requirements for installing [!INCLUDE[ssCurrent](../../../includes/sscurrent-md.md)]. If additional software is required, install it on each node before you begin the upgrade process to minimize any downtime.
4040

4141
> [!NOTE]
42-
> Mixing versions of SQL Server in the same AG is not supported. To migrate to a new version using availablity groups, the only supported method is a distributed availability group which is in SQL Server 2016 Enterprise Edition or later.
42+
> Mixing versions of SQL Server in the same AG is not supported outside of a rolling upgrade which upgrades the replicas in place. This means a higher version of SQL Server cannot be added as a new replica to an existing AG. For example, a SQL Server 2017 replica cannot be added to an existing SQL Server 2016 AG. To migrate to a new version of SQL Server using availablity groups, the only supported method is a distributed availability group which is in SQL Server 2016 Enterprise Edition or later.
4343
4444
## Rolling Upgrade Best Practices for Always On Availability Groups
4545
The following best practices should be observed when performing server upgrades or updates in order to minimize downtime and data loss for your availability groups:

docs/integration-services/data-flow/odbc-flow-components.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ ms.workload: "Inactive"
2222
# ODBC Flow Components
2323
This topic describes the concepts necessary for creating an ODBC data flow using [!INCLUDE[ssISCurrent](../../includes/ssiscurrent-md.md)]
2424

25-
The Connector for Open Database Connectivity (ODBC) by Attunity for [!INCLUDE[ssISCurrent](../../includes/ssiscurrent-md.md)] helps SSIS developers easily create packages that load and unload data from ODBC-supported databases.
25+
The Connector for Open Database Connectivity (ODBC) for [!INCLUDE[ssISCurrent](../../includes/ssiscurrent-md.md)] helps SSIS developers easily create packages that load and unload data from ODBC-supported databases.
2626

2727
The ODBC Connector is designed to achieve optimal performance when loading data into or unloading data from an ODBC-supported database in the context of [!INCLUDE[ssISCurrent](../../includes/ssiscurrent-md.md)].
2828

docs/integration-services/data-flow/odbc-source.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ ms.workload: "Inactive"
5151
Depending on the error behavior setting, the ODBC source supports returning errors (data conversion, truncation) that occur during the extraction process in the error output. For more information, see [ODBC Destination Editor (Connection Manager Page)](../../integration-services/data-flow/odbc-destination-editor-connection-manager-page.md).
5252

5353
## Data Type Support
54-
For information about the data types supported by the ODBC source, see Connector for Open Database Connectivity (ODBC) by Attunity.
54+
For information about the data types supported by the ODBC source, see Connector for Open Database Connectivity (ODBC).
5555

5656
## Extract Options
5757
The ODBC source operates in either **Batch** or **Row-by-Row** mode. The mode used is determined by the **FetchMethod** property. The following list describes the modes.

docs/integration-services/extending-packages-scripting/task/connecting-to-data-sources-in-the-script-task.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -58,14 +58,14 @@ ms.workload: "On Demand"
5858
Public Sub Main()
5959

6060
Dim myADONETConnection As SqlClient.SqlConnection =
61-
DirectCast(Dts.Connections("Test ADO.NET Connection").AcquireConnection(Dts.Transaction),
62-
SqlClient.SqlConnection)
61+
DirectCast(Dts.Connections("Test ADO.NET Connection").AcquireConnection(Dts.Transaction),
62+
SqlClient.SqlConnection)
6363
MsgBox(myADONETConnection.ConnectionString,
6464
MsgBoxStyle.Information, "ADO.NET Connection")
6565

6666
Dim myFlatFileConnection As String =
67-
DirectCast(Dts.Connections("Test Flat File Connection").AcquireConnection(Dts.Transaction),
68-
String)
67+
DirectCast(Dts.Connections("Test Flat File Connection").AcquireConnection(Dts.Transaction),
68+
String)
6969
MsgBox(myFlatFileConnection, MsgBoxStyle.Information, "Flat File Connection")
7070

7171
Dts.TaskResult = ScriptResults.Success

docs/integration-services/integration-services-features-supported-by-the-editions-of-sql-server.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ The SQL Server Evaluation edition is available for a 180-day trial period.
5959
|-------------|----------------|--------------|---------|------------------------------------|------------------------|
6060
|Built-in data source connectors|Yes|Yes||||
6161
|Built in tasks and transformations|Yes|Yes||||
62-
|ODBC source and destination by Attunity|Yes|Yes||||
62+
|ODBC source and destination |Yes|Yes||||
6363
|Azure data source connectors and tasks|Yes|Yes||||
6464
|Hadoop/HDFS connectors and tasks|Yes|Yes||||
6565
|Basic data profiling tools|Yes|Yes||||

docs/integration-services/lift-shift/ssis-azure-connect-with-windows-auth.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
title: "Connect to on-premises data sources and Azure file shares with Windows Authentication | Microsoft Docs"
2+
title: "Connect to data sources and file shares with Windows Authentication | Microsoft Docs"
33
ms.date: "11/27/2017"
44
ms.topic: "article"
55
ms.prod: "sql-non-specified"

docs/integration-services/lift-shift/ssis-azure-lift-shift-ssis-packages-overview.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ For more info about prerequisites in Azure, see [Lift and shift SQL Server Integ
6464

6565
## SSIS features on Azure
6666

67-
When you provision an instance of SQL Database to host SSISDB, the Azure Feature Pack for SSIS and the Access Redistributable are also installed. These components provide connectivity to **Excel and Access** files and to various **Azure** data sources, in addition to the data sources supported by the built-in components. You can't install **third-party components** for SSIS (including third-party components from Microsoft, such as the Attunity and SAP BI components) at this time.
67+
When you provision an instance of SQL Database to host SSISDB, the Azure Feature Pack for SSIS and the Access Redistributable are also installed. These components provide connectivity to **Excel and Access** files and to various **Azure** data sources, in addition to the data sources supported by the built-in components. You can't install **third-party components** for SSIS at this time (including third-party components from Microsoft, such as the Oracle and Teradata components by Attunity and the SAP BI components).
6868

6969
The **name of the SQL Database** that hosts SSISDB becomes the first part of the four-part name to use when you deploy and manage packages from SSDT and SSMS - `<sql_database_name>.database.windows.net`.
7070

docs/integration-services/system-stored-procedures/catalog-create-execution-ssisdb-database.md

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -58,8 +58,14 @@ catalog.create_execution [@folder_name = folder_name
5858
[@runinscaleout =] *runinscaleout*
5959
Indicate whether the execution is in Scale Out. Use the value of 1 to execute the package in Scale Out. Use the value of 0 to execute the package without Scale Out. This parameter is optional. If not specified, its value is set to DEFAULT_EXECUTION_MODE in [SSISDB].[catalog].[catalog_properties]. The *runinscaleout* is **bit**.
6060

61-
[@useanyworker =] *useanyworker*
62-
Indicate whether any Scale Out Worker is allowed to do the execution. Use the value of 1 to execute the package with any Scale Out Worker. Use the value of 0 to indicate that not all Scale Out Workers are allowed to execute the package. This parameter is optional. If not specified, its value is set to 1. The *useanyworker* is **bit**.
61+
[@useanyworker =] *useanyworker*
62+
Indicate whether any Scale Out Worker is allowed to do the execution.
63+
64+
- Use the value of 1 to execute the package with any Scale Out Worker. When you set `@useanyworker` to true, any worker whose maximum task count (as specified in the worker configuration file) is not yet reached is available to run the package.
65+
66+
- Use the value of 0 to indicate that not all Scale Out Workers are allowed to execute the package. When you set `@useanyworker` to false, you have to specify the workers that are allowed to run the package by using Scale Out Manager or by calling the stored procedure `[catalog].[add_execution_worker]`.
67+
68+
This parameter is optional. If not specified, its value is set to 1. The *useanyworker* is **bit**.
6369

6470
[@execution_id =] *execution_id*
6571
Returns the unique identifier for an instance of execution. The *execution_id* is **bigint**.

docs/linux/sql-server-linux-create-availability-group.md

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,8 @@ ms.workload: "On Demand"
2121
[!INCLUDE[tsql-appliesto-sslinux-only](../includes/tsql-appliesto-sslinux-only.md)]
2222

2323
This tutorial covers how to create and configure an availability group (AG) for [!INCLUDE[ssnoversion-md](../includes/ssnoversion-md.md)] on Linux. Unlike [!INCLUDE[sssql15-md](../includes/sssql15-md.md)] and earlier on Windows, you can enable AGs with or without creating the underlying Pacemaker cluster first. Integration with the cluster, if needed, is not done until later.
24+
25+
The tutorial includes the following tasks:
2426

2527
> [!div class="checklist"]
2628
> * Enable availability groups.
@@ -589,12 +591,10 @@ The AG resource that is created is a special kind of resource called a clone. Th
589591
sudo pcs resource create <NameForAGResource> ocf:mssql:ag ag_name=<AGName> --master meta notify=true
590592
```
591593

592-
>[NOTE]
593-
>On RHEL 7.4, you may encounter a warning with the use of --master. To avoid this, use the following syntax:
594-
```bash
595-
sudo pcs resource create <NameForAGResource> ocf:mssql:ag ag_name=<AGName> master notify=true
596-
```
597-
594+
>[!NOTE]
595+
>On RHEL 7.4, you may encounter a warning with the use of --master. To avoid this, use
596+
>`sudo pcs resource create <NameForAGResource> ocf:mssql:ag ag_name=<AGName> master notify=true`
597+
598598
**SUSE Linux Enterprise Server (SLES)**
599599

600600
```bash
@@ -644,8 +644,7 @@ The AG resource that is created is a special kind of resource called a clone. Th
644644
```bash
645645
sudo pcs constraint colocation add <NameForIPResource> <NameForAGResource>-master INFINITY with-rsc-role=Master
646646
```
647-
648-
647+
649648
**SLES**
650649

651650
```bash
@@ -687,5 +686,5 @@ In this tutorial, you learned how to create and configure an availability group
687686
For most AG administration tasks, including upgrades and failing over, see:
688687

689688
> [!div class="nextstepaction"]
690-
> [Operate HA availability group for SQL Server on Linux](sql-server-linux-availability-group-failover-ha.md).
689+
> [Operate HA availability group for SQL Server on Linux](sql-server-linux-availability-group-failover-ha.md)
691690

docs/linux/sql-server-linux-shared-disk-cluster-red-hat-7-configure.md

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -175,7 +175,7 @@ On the NFS Server do the following:
175175

176176
Do the following steps on all cluster nodes.
177177

178-
1. From the NFS server, install `nfs-utils`
178+
1. Install `nfs-utils`
179179

180180
```bash
181181
sudo yum -y install nfs-utils
@@ -209,7 +209,7 @@ For additional information about using NFS, see the following resources:
209209
1. **On the primary node only**, save the database files to a temporary location.The following script, creates a new temporary directory, copies the database files to the new directory, and removes the old database files. As SQL Server runs as local user mssql, you need to make sure that after data transfer to the mounted share, local user has read-write access to the share.
210210

211211
```
212-
$ su mssql
212+
$ sudo su mssql
213213
$ mkdir /var/opt/mssql/tmp
214214
$ cp /var/opt/mssql/data/* /var/opt/mssql/tmp
215215
$ rm /var/opt/mssql/data/*
@@ -235,9 +235,9 @@ For additional information about using NFS, see the following resources:
235235
1. Copy the database and log files that you saved to `/var/opt/mssql/tmp` to the newly mounted share `/var/opt/mssql/data`. This only needs to be done **on the primary node**. Make sure that you give read write permissions to 'mssql' local user.
236236

237237
```
238-
$ chown mssql /var/opt/mssql/data
239-
$ chgrp mssql /var/opt/mssql/data
240-
$ su mssql
238+
$ sudo chown mssql /var/opt/mssql/data
239+
$ sudo chgrp mssql /var/opt/mssql/data
240+
$ sudo su mssql
241241
$ cp /var/opt/mssql/tmp/* /var/opt/mssql/data/
242242
$ rm /var/opt/mssql/tmp/*
243243
$ exit
@@ -260,8 +260,8 @@ At this point both instances of SQL Server are configured to run with the databa
260260

261261
```bash
262262
sudo touch /var/opt/mssql/secrets/passwd
263-
sudo echo '<loginName>' >> /var/opt/mssql/secrets/passwd
264-
sudo echo '<loginPassword>' >> /var/opt/mssql/secrets/passwd
263+
echo '<loginName>' | sudo tee -a /var/opt/mssql/secrets/passwd
264+
echo '<loginPassword>' | sudo tee -a /var/opt/mssql/secrets/passwd
265265
sudo chown root:root /var/opt/mssql/secrets/passwd
266266
sudo chmod 600 /var/opt/mssql/secrets/passwd
267267
```

0 commit comments

Comments
 (0)