Skip to content

Commit c9622bf

Browse files
committed
Merge branch 'main' of https://github.com/MicrosoftDocs/azure-docs-pr into pl-tut-sql3
2 parents 4f5aea7 + 565c54b commit c9622bf

8 files changed

+33
-14
lines changed

.openpublishing.publish.config.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -473,7 +473,7 @@
473473
{
474474
"path_to_root": "azureml-examples-online-endpoint-vnet",
475475
"url": "https://github.com/azure/azureml-examples",
476-
"branch": "rsethur/mvnet",
476+
"branch": "main",
477477
"branch_mapping": {}
478478
},
479479
{

articles/cognitive-services/includes/quickstarts/management-node.md

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,8 +45,7 @@ Install the following NPM packages:
4545

4646
```console
4747
npm install @azure/arm-cognitiveservices
48-
npm install @azure/ms-rest-js
49-
npm install @azure/ms-rest-nodeauth
48+
npm install @azure/identity
5049
```
5150

5251
Your app's `package.json` file will be updated with the dependencies.

articles/databox/data-box-deploy-ordered.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ author: v-dalc
66
ms.service: databox
77
ms.subservice: pod
88
ms.topic: tutorial
9-
ms.date: 03/22/2022
9+
ms.date: 06/06/2022
1010
ms.author: alkohli
1111
ms.custom: devx-track-azurepowershell, contperf-fy22q3, devx-track-azurecli
1212
#Customer intent: As an IT admin, I need to be able to order Data Box to upload on-premises data from my server onto Azure.

articles/databox/data-box-heavy-deploy-picked-up.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ You are now ready to ship your device back.
7070
1. Ensure that the device is powered off and all the cables are removed. Spool and securely place the 4 power cords in the tray that you can access from the back of the device.
7171
2. The device ships LTL freight via FedEx in the US and DHL in the EU.
7272

73-
1. Reach out to [Data Box Operations](mailto:DataBoxOps@microsoft.com) to inform regarding the pickup and to get the return shipping label.
73+
1. Reach out to [Data Box Operations](mailto:adbops@microsoft.com) to inform regarding the pickup and to get the return shipping label.
7474
2. Call the local number for your shipping carrier to schedule the pickup.
7575
3. Ensure that the shipping label is displayed prominently on the exterior of the shipment.
7676
4. Make sure that the old shipping labels from the previous shipment are removed from the device.

articles/databox/data-box-heavy-quickstart-portal.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ author: alkohli
66
ms.service: databox
77
ms.subservice: heavy
88
ms.topic: quickstart
9-
ms.date: 11/04/2020
9+
ms.date: 06/13/2022
1010
ms.author: alkohli
1111
ms.custom: mode-ui, devx-track-azurecli
1212
#Customer intent: As an IT admin, I need to quickly deploy Data Box Heavy so as to import data into Azure.
@@ -211,7 +211,7 @@ This operation takes about 15-20 minutes to complete.
211211

212212
1. Remove the cables and return them to the tray at the back of the device.
213213
2. Schedule a pickup with your regional carrier.
214-
3. Reach out to [Data Box Operations](mailto:DataBoxOps@microsoft.com) to inform regarding the pickup and to get the return shipping label.
214+
3. Reach out to [Data Box Operations](mailto:adbops@microsoft.com) to inform regarding the pickup and to get the return shipping label.
215215
4. The return shipping label should be visible on the front clear panel of the device.
216216

217217
## Verify data

articles/route-server/tutorial-configure-route-server-with-quagga.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,16 +22,16 @@ In this tutorial, you learn how to:
2222
> * Configure Route Server peering
2323
> * Check learned routes
2424
25+
If you don't have an Azure subscription, create a [free account](https://azure.microsoft.com/free/?WT.mc_id=A261C142F) before you begin.
26+
2527
## Prerequisites
2628

27-
- An Azure account with an active subscription. [Create an account for free](https://azure.microsoft.com/free/?WT.mc_id=A261C142F)
29+
* An Azure subscription
2830

2931
## Create a virtual network
3032

3133
You'll need a virtual network to deploy both the Azure Route Server and the Quagga NVA into. Each deployment will have its own dedicated subnet.
3234

33-
1. Sign in to the [Azure portal](https://portal.azure.com).
34-
3535
1. On the top left-hand side of the screen, select **Create a resource** and search for **Virtual Network**. Then select **Create**.
3636

3737
:::image type="content" source="./media/tutorial-configure-route-server-with-quagga/create-new-virtual-network.png" alt-text="Screenshot of create a new virtual network resource.":::

articles/storage/blobs/data-lake-storage-migrate-on-premises-HDFS-cluster.md

Lines changed: 21 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ title: Migrate from on-prem HDFS store to Azure Storage with Azure Data Box
33
description: Migrate data from an on-premises HDFS store into Azure Storage (blob storage or Data Lake Storage Gen2) by using a Data Box device.
44
author: normesta
55
ms.service: storage
6-
ms.date: 02/14/2019
6+
ms.date: 06/16/2022
77
ms.author: normesta
88
ms.topic: how-to
99
ms.subservice: data-lake-storage-gen2
@@ -147,11 +147,30 @@ Follow these steps to copy data via the REST APIs of Blob/Object storage to your
147147
148148
To improve the copy speed:
149149
150-
- Try changing the number of mappers. (The above example uses `m` = 4 mappers.)
150+
- Try changing the number of mappers. (The default number of mappers is 20. The above example uses `m` = 4 mappers.)
151+
152+
- Try `-D fs.azure.concurrentRequestCount.out=<thread_number>` \. Replace `<thread_number>` with the number of threads per mapper. The product of the number of mappers and the number of threads per mapper, `m*<thread_number>`, should not exceed 32.
151153
152154
- Try running multiple `distcp` in parallel.
153155
154156
- Remember that large files perform better than small files.
157+
158+
- If you have files larger than 200 GB, we recommend changing the block size to 100MB with the following parameters:
159+
160+
```
161+
hadoop distcp \
162+
-libjars $azjars \
163+
-Dfs.azure.write.request.size= 104857600 \
164+
-Dfs.AbstractFileSystem.wasb.Impl=org.apache.hadoop.fs.azure.Wasb \
165+
-Dfs.azure.account.key.<blob_service_endpoint<>=<account_key> \
166+
-strategy dynamic \
167+
-Dmapreduce.map.memory.mb=16384 \
168+
-Dfs.azure.concurrentRequestCount.out=8 \
169+
-Dmapreduce.map.java.opts=-Xmx8196m \
170+
-m 4 \
171+
-update \
172+
/data/bigfile wasb://[email protected]/bigfile
173+
```
155174
156175
## Ship the Data Box to Microsoft
157176

includes/data-box-order-portal.md

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ author: v-dalc
33
ms.service: databox
44
ms.subservice: databox
55
ms.topic: include
6-
ms.date: 03/22/2022
6+
ms.date: 06/06/2022
77
ms.author: alkohli
88
ms.custom: contperf-fy22q3
99
---
@@ -266,8 +266,9 @@ Do the following steps in the Azure portal to order a device:
266266
1. Check the box corresponding to the agreement to privacy terms. When you select the checkbox, the order information is validated.
267267

268268
1. Once the order is validated, select **Order**.
269+
270+
:::image type="content" source="media/data-box-order-portal/data-box-import-10.png" alt-text="Screenshot of the Review Plus Order tab for a Data Box order. The validation status, terms checkbox, and Order button are highlighted.":::
269271

270-
[Screenshot of the Review Plus Order tab for a Data Box order. The validation status, terms checkbox, and Order button are highlighted.](media/data-box-order-portal/data-box-import-10.png)
271272

272273
The order takes a few minutes to be created. Your completed order will look similar to this one. You can select **Go to resource** to open the order.
273274

0 commit comments

Comments
 (0)