Merge pull request #100966 from MicrosoftDocs/repo_sync_working_branch

huypub · web-flow · commit 39d0f67c47c5 · 2020-01-13T14:57:21.000-08:00
Confirm merge from repo_sync_working_branch to master to sync with https://github.com/Microsoft/azure-docs (branch master)
diff --git a/articles/azure-functions/functions-bindings-warmup.md b/articles/azure-functions/functions-bindings-warmup.md
@@ -26,11 +26,11 @@ The [Microsoft.Azure.WebJobs.Extensions](https://www.nuget.org/packages/Microsof
 
 ## Trigger
 
-The warmup trigger lets you define a function that will be run on an instance when it is added to your running app. You can use a warmup function to open connections, load dependencies, or run any other custom logic before your app will begin receiving traffic. 
+The warmup trigger lets you define a function that will be run on a new instance when it is added to your running app. You can use a warmup function to open connections, load dependencies, or run any other custom logic before your app will begin receiving traffic. 
 
 The warmup trigger is intended to create shared dependencies that will be used by the other functions in your app. [See examples of shared dependencies here](./manage-connections.md#client-code-examples).
 
-Note that the warmup trigger is only called during scale-up operations, not during restarts or other non-scale startups. You must ensure your logic can load all necessary dependencies without using the warmup trigger. Lazy loading is a good pattern to achieve this.
+Note that the warmup trigger is only called during scale-out operations, not during restarts or other non-scale startups. You must ensure your logic can load all necessary dependencies without using the warmup trigger. Lazy loading is a good pattern to achieve this.
 
 ## Trigger - example
 
diff --git a/articles/cosmos-db/sql-query-order-by.md b/articles/cosmos-db/sql-query-order-by.md
@@ -47,7 +47,7 @@ ORDER BY <sort_specification>
    The ORDER BY clause requires that the indexing policy include an index for the fields being sorted. The Azure Cosmos DB query runtime supports sorting against a property name and not against computed properties. Azure Cosmos DB supports multiple ORDER BY properties. In order to run a query with multiple ORDER BY properties, you should define a [composite index](index-policy.md#composite-indexes) on the fields being sorted.
    
 > [!Note] 
-> When using the .NET SDK 3.4.0 or above, if the properties being sorted against might be undefined for some documents then you need to explicitly create an index on those properties. The default indexing policy will not allow for the retrieval of the documents where the sort property is undefined.
+> If the properties being sorted against might be undefined for some documents and you want to retrieve them in an ORDER BY query, you must explicitly create an index on those properties. The default indexing policy won't allow for the retrieval of the documents where the sort property is undefined.
 
 ## Examples
 
diff --git a/articles/service-fabric/service-fabric-cluster-windows-server-add-remove-nodes.md b/articles/service-fabric/service-fabric-cluster-windows-server-add-remove-nodes.md
@@ -1,4 +1,4 @@
-﻿---
+---
 title: Add or remove nodes to a standalone Service Fabric cluster 
 description: Learn how to add or remove nodes to an Azure Service Fabric cluster on a physical or virtual machine running Windows Server, which could be on-premises or in any cloud.
 author: dkkapur
@@ -12,36 +12,56 @@ After you have [created your standalone Service Fabric cluster on Windows Server
 
 ## Add nodes to your cluster
 
-1. Prepare the VM/machine you want to add to your cluster by following the steps outlined in [Plan and prepare your Service Fabric cluster deployment](service-fabric-cluster-creation-for-windows-server.md)
-2. Identify which fault domain and upgrade domain you are going to add this VM/machine to
-3. Remote desktop (RDP) into the VM/machine that you want to add to the cluster
-4. Copy or [download the standalone package for Service Fabric for Windows Server](https://go.microsoft.com/fwlink/?LinkId=730690) to the VM/machine and unzip the package
-5. Run Powershell with elevated privileges, and navigate to the location of the unzipped package
-6. Run the *AddNode.ps1* script with the parameters describing the new node to add. The example below adds a new node called VM5, with type NodeType0 and IP address 182.17.34.52, into UD1 and fd:/dc1/r0. The *ExistingClusterConnectionEndPoint* is a connection endpoint for a node already in the existing cluster, which can be the IP address of *any* node in the cluster.
+1. Prepare the VM/machine you want to add to your cluster by following the steps outlined in [Plan and prepare your Service Fabric cluster deployment](service-fabric-cluster-standalone-deployment-preparation.md).
 
-	```
-	.\AddNode.ps1 -NodeName VM5 -NodeType NodeType0 -NodeIPAddressorFQDN 182.17.34.52 -ExistingClientConnectionEndpoint 182.17.34.50:19000 -UpgradeDomain UD1 -FaultDomain fd:/dc1/r0 -AcceptEULA
-	```
-	Once the script finishes running, you can check if the new node has been added by running the [Get-ServiceFabricNode](/powershell/module/servicefabric/get-servicefabricnode?view=azureservicefabricps) cmdlet.
+2. Identify which fault domain and upgrade domain you are going to add this VM/machine to.
 
-7. To ensure consistency across different nodes in the cluster, you must initiate a configuration upgrade. Run [Get-ServiceFabricClusterConfiguration](/powershell/module/servicefabric/get-servicefabricclusterconfiguration?view=azureservicefabricps) to get the latest configuration file and add the newly added node to "Nodes" section. It is also recommended to always have the latest cluster configuration available in the case that you need to redeploy a cluster with the same configuration.
+   If you use certificates to secure the cluster, certificates are expected to be installed in the local certificate stores in preparation for the node to join the cluster. The analog is applicable when using other forms of security.
+
+3. Remote desktop (RDP) into the VM/machine that you want to add to the cluster.
+
+4. Copy or [download the standalone package for Service Fabric for Windows Server](https://go.microsoft.com/fwlink/?LinkId=730690) to the VM/machine and unzip the package.
+
+5. Run PowerShell with elevated privileges and go to the location of the unzipped package.
+
+6. Run the *AddNode.ps1* script with the parameters describing the new node to add. The following example adds a new node called VM5, with type NodeType0 and IP address 182.17.34.52, into UD1 and fd:/dc1/r0. `ExistingClusterConnectionEndPoint` is a connection endpoint for a node already in the existing cluster, which can be the IP address of *any* node in the cluster. 
+
+   Unsecure (prototyping):
+
+   ```
+   .\AddNode.ps1 -NodeName VM5 -NodeType NodeType0 -NodeIPAddressorFQDN 182.17.34.52 -ExistingClientConnectionEndpoint 182.17.34.50:19000 -UpgradeDomain UD1 -FaultDomain fd:/dc1/r0 -AcceptEULA
+   ```
+
+   Secure (certificate-based):
+
+   ```	
+   $CertThumbprint= "***********************"
+	
+   .\AddNode.ps1 -NodeName VM5 -NodeType NodeType0 -NodeIPAddressorFQDN 182.17.34.52 -ExistingClientConnectionEndpoint 182.17.34.50:19000 -UpgradeDomain UD1 -FaultDomain fd:/dc1/r0 -X509Credential -ServerCertThumbprint $CertThumbprint  -AcceptEULA
+
+   ```
+
+   When the script finishes running, you can check whether the new node has been added by running the [Get-ServiceFabricNode](/powershell/module/servicefabric/get-servicefabricnode?view=azureservicefabricps) cmdlet.
+
+7. To ensure consistency across different nodes in the cluster, you must initiate a configuration upgrade. Run [Get-ServiceFabricClusterConfiguration](/powershell/module/servicefabric/get-servicefabricclusterconfiguration?view=azureservicefabricps) to get the latest configuration file and add the newly added node to the "Nodes" section. It is also recommended to always have the latest cluster configuration available in case you need to redeploy a cluster that has the same configuration.
+
+   ```
+	{
+	    "nodeName": "vm5",
+	    "iPAddress": "182.17.34.52",
+	    "nodeTypeRef": "NodeType0",
+	    "faultDomain": "fd:/dc1/r0",
+	    "upgradeDomain": "UD1"
+	}
+   ```
 
-	```
-		{
-		    "nodeName": "vm5",
-		    "iPAddress": "182.17.34.52",
-		    "nodeTypeRef": "NodeType0",
-		    "faultDomain": "fd:/dc1/r0",
-		    "upgradeDomain": "UD1"
-		}
-	```
 8. Run [Start-ServiceFabricClusterConfigurationUpgrade](/powershell/module/servicefabric/start-servicefabricclusterconfigurationupgrade?view=azureservicefabricps) to begin the upgrade.
 
-	```
-	Start-ServiceFabricClusterConfigurationUpgrade -ClusterConfigPath <Path to Configuration File>
+   ```
+   Start-ServiceFabricClusterConfigurationUpgrade -ClusterConfigPath <Path to Configuration File>
+   ```
 
-	```
-	You can monitor the progress of the upgrade on Service Fabric Explorer. Alternatively, you can run [Get-​Service​Fabric​Cluster​Upgrade](/powershell/module/servicefabric/get-servicefabricclusterupgrade?view=azureservicefabricps)
+   You can monitor the progress of the upgrade on Service Fabric Explorer. Alternatively, you can run [Get-ServiceFabricClusterUpgrade](/powershell/module/servicefabric/get-servicefabricclusterupgrade?view=azureservicefabricps).
 
 ### Add nodes to clusters configured with Windows Security using gMSA
 For clusters configured with Group Managed Service Account(gMSA)(https://technet.microsoft.com/library/hh831782.aspx), a new node can be added using a configuration upgrade:
@@ -61,7 +81,7 @@ For clusters configured with Group Managed Service Account(gMSA)(https://technet
 	```
 	Start-ServiceFabricClusterConfigurationUpgrade -ClusterConfigPath <Path to Configuration File>
 	```
-	You can monitor the progress of the upgrade on Service Fabric Explorer. Alternatively, you can run [Get-​Service​Fabric​Cluster​Upgrade](/powershell/module/servicefabric/get-servicefabricclusterupgrade?view=azureservicefabricps)
+	You can monitor the progress of the upgrade on Service Fabric Explorer. Alternatively, you can run [Get-ServiceFabricClusterUpgrade](/powershell/module/servicefabric/get-servicefabricclusterupgrade?view=azureservicefabricps)
 
 ### Add node types to your cluster
 In order to add a new node type, modify your configuration to include the new node type in "NodeTypes" section under "Properties" and begin a configuration upgrade using [Start-ServiceFabricClusterConfigurationUpgrade](/powershell/module/servicefabric/start-servicefabricclusterconfigurationupgrade?view=azureservicefabricps). Once the upgrade completes, you can add new nodes to your cluster with this node type.
@@ -99,7 +119,7 @@ Add the "NodesToBeRemoved" parameter to "Setup" section inside "FabricSettings"
 	Start-ServiceFabricClusterConfigurationUpgrade -ClusterConfigPath <Path to Configuration File>
 
 	```
-	You can monitor the progress of the upgrade on Service Fabric Explorer. Alternatively, you can run [Get-​Service​Fabric​Cluster​Upgrade](/powershell/module/servicefabric/get-servicefabricclusterupgrade?view=azureservicefabricps)
+	You can monitor the progress of the upgrade on Service Fabric Explorer. Alternatively, you can run [Get-ServiceFabricClusterUpgrade](/powershell/module/servicefabric/get-servicefabricclusterupgrade?view=azureservicefabricps).
 
 > [!NOTE]
 > Removal of nodes may initiate multiple upgrades. Some nodes are marked with `IsSeedNode=”true”` tag and can be identified by querying the cluster manifest using `Get-ServiceFabricClusterManifest`. Removal of such nodes may take longer than others since the seed nodes will have to be moved around in such scenarios. The cluster must maintain a minimum of 3 primary node type nodes.
