Skip to content

Commit 37ed436

Browse files
committed
Merge branch 'master' of https://github.com/MicrosoftDocs/azure-docs-pr into rolyon-rbac-resource-access-link
2 parents 6ec7067 + ae20f09 commit 37ed436

File tree

3 files changed

+22
-26
lines changed

3 files changed

+22
-26
lines changed

articles/hdinsight/hdinsight-autoscale-clusters.md

Lines changed: 16 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ ms.reviewer: jasonh
77
ms.service: hdinsight
88
ms.topic: conceptual
99
ms.custom: hdinsightactive
10-
ms.date: 03/05/2020
10+
ms.date: 04/07/2020
1111
---
1212

1313
# Automatically scale Azure HDInsight clusters
@@ -34,9 +34,9 @@ The following table describes the cluster types and versions that are compatible
3434

3535
## How it works
3636

37-
You can choose load-based scaling or schedule-based scaling for your HDInsight cluster. Load-based scaling changes the number of nodes in your cluster, within a range that you set, to ensure optimal CPU utilization and minimize running cost.
37+
You can choose load-based scaling or schedule-based scaling for your HDInsight cluster. Load-based scaling changes the number of nodes in your cluster, within a range that you set, to ensure optimal CPU usage and minimize running cost.
3838

39-
Schedule-based scaling changes the number of nodes in your cluster based on conditions that take effect at specific times. These conditions scale the cluster to a desired number of nodes.
39+
Schedule-based scaling changes the number of nodes in your cluster based on conditions that take effect at specific times. These conditions scale the cluster to an intended number of nodes.
4040

4141
### Metrics monitoring
4242

@@ -51,7 +51,7 @@ Autoscale continuously monitors the cluster and collects the following metrics:
5151
|Used Memory per Node|The load on a worker node. A worker node on which 10 GB of memory is used, is considered under more load than a worker with 2 GB of used memory.|
5252
|Number of Application Masters per Node|The number of Application Master (AM) containers running on a worker node. A worker node that is hosting two AM containers, is considered more important than a worker node that is hosting zero AM containers.|
5353

54-
The above metrics are checked every 60 seconds. Autoscale makes scale-up and scale-down decisions based on these metrics.
54+
The above metrics are checked every 60 seconds. Autoscale makes decisions based on these metrics.
5555

5656
### Load-based scale conditions
5757

@@ -62,9 +62,9 @@ When the following conditions are detected, Autoscale will issue a scale request
6262
|Total pending CPU is greater than total free CPU for more than 3 minutes.|Total pending CPU is less than total free CPU for more than 10 minutes.|
6363
|Total pending memory is greater than total free memory for more than 3 minutes.|Total pending memory is less than total free memory for more than 10 minutes.|
6464

65-
For scale-up, the HDInsight service calculates how many new worker nodes are needed to meet the current CPU and memory requirements, and then issues a scale-up request to add the required number of nodes.
65+
For scale-up, Autoscale issues a scale-up request to add the required number of nodes. The scale-up is based on how many new worker nodes are needed to meet the current CPU and memory requirements.
6666

67-
For scale-down, based on the number of AM containers per node and the current CPU and memory requirements, Autoscale issues a request to remove a certain number of nodes. The service also detects which nodes are candidates for removal based on current job execution. The scale down operation first decommissions the nodes, and then removes them from the cluster.
67+
For scale-down, Autoscale issues a request to remove a certain number of nodes. The scale-down is based on the number of AM containers per node. And the current CPU and memory requirements. The service also detects which nodes are candidates for removal based on current job execution. The scale down operation first decommissions the nodes, and then removes them from the cluster.
6868

6969
## Get started
7070

@@ -74,7 +74,7 @@ To enable the Autoscale feature with load-based scaling, complete the following
7474

7575
1. On the **Configuration + pricing** tab, select the **Enable autoscale** checkbox.
7676
1. Select **Load-based** under **Autoscale type**.
77-
1. Enter the desired values for the following properties:
77+
1. Enter the intended values for the following properties:
7878

7979
* Initial **Number of nodes** for **Worker node**.
8080
* **Min** number of worker nodes.
@@ -103,11 +103,11 @@ The number of nodes must be between 3 and the maximum number of worker nodes tha
103103

104104
### Final creation steps
105105

106-
For both load-based and schedule-based scaling, select the VM type for worker nodes by selecting a VM from the drop-down list under **Node size**. After you choose the VM type for each node type, you can see the estimated cost range for the whole cluster. Adjust the VM types to fit your budget.
106+
Select the VM type for worker nodes by selecting a VM from the drop-down list under **Node size**. After you choose the VM type for each node type, you can see the estimated cost range for the whole cluster. Adjust the VM types to fit your budget.
107107

108108
![Enable worker node schedule-based autoscale node size](./media/hdinsight-autoscale-clusters/azure-portal-cluster-configuration-pricing-vmsize.png)
109109

110-
Your subscription has a capacity quota for each region. The total number of cores of your head nodes combined with the maximum number of worker nodes can't exceed the capacity quota. However, this quota is a soft limit; you can always create a support ticket to get it increased easily.
110+
Your subscription has a capacity quota for each region. The total number of cores of your head nodes and the maximum worker nodes can't exceed the capacity quota. However, this quota is a soft limit; you can always create a support ticket to get it increased easily.
111111

112112
> [!Note]
113113
> If you exceed the total core quota limit, You will receive an error message saying 'the maximum node exceeded the available cores in this region, please choose another region or contact the support to increase the quota.'
@@ -144,8 +144,6 @@ You can create an HDInsight cluster with load-based Autoscaling an Azure Resourc
144144
}
145145
```
146146

147-
For more information on creating clusters with Resource Manager templates, see [Create Apache Hadoop clusters in HDInsight by using Resource Manager templates](hdinsight-hadoop-create-linux-clusters-arm-templates.md).
148-
149147
#### Schedule-based autoscaling
150148

151149
You can create an HDInsight cluster with schedule-based Autoscaling an Azure Resource Manager template, by adding an `autoscale` node to the `computeProfile` > `workernode` section. The `autoscale` node contains a `recurrence` that has a `timezone` and `schedule` that describes when the change will take place.
@@ -188,7 +186,7 @@ To enable Autoscale on a running cluster, select **Cluster size** under **Settin
188186

189187
#### Using the REST API
190188

191-
To enable or disable Autoscale on a running cluster using the REST API, make a POST request to the Autoscale endpoint as shown in the code snippet below:
189+
To enable or disable Autoscale on a running cluster using the REST API, make a POST request to the Autoscale endpoint:
192190

193191
```
194192
https://management.azure.com/subscriptions/{subscription Id}/resourceGroups/{resourceGroup Name}/providers/Microsoft.HDInsight/clusters/{CLUSTERNAME}/roles/workernode/autoscale?api-version=2018-06-01-preview
@@ -202,7 +200,7 @@ Use the appropriate parameters in the request payload. The json payload below co
202200

203201
See the previous section on [enabling load-based autoscale](#load-based-autoscaling) for a full description of all payload parameters.
204202

205-
## Best practices
203+
## Guidelines
206204

207205
### Choosing load-based or schedule-based scaling
208206

@@ -219,9 +217,9 @@ It can take 10 to 20 minutes for a scaling operation to complete. When setting u
219217

220218
### Preparation for scaling down
221219

222-
During cluster scaling down process, Autoscale will decommission the nodes to meet the target size. If there are running tasks on those nodes, Autoscale will wait until the tasks are completed. Since each worker node also serves a role in HDFS, the temp data will be shifted to the remaining nodes. So you should make sure there's enough space on the remaining nodes to host all the temp data.
220+
During cluster scaling down process, Autoscale will decommission the nodes to meet the target size. If tasks are running on those nodes, Autoscale will wait until the tasks are completed. Since each worker node also serves a role in HDFS, the temp data will be shifted to the remaining nodes. So you should make sure there's enough space on the remaining nodes to host all the temp data.
223221

224-
The running jobs will continue to run and finish. The pending jobs will wait to be scheduled as normal with fewer available worker nodes.
222+
The running jobs will continue. The pending jobs will wait for scheduling with fewer available worker nodes.
225223

226224
### Minimum cluster size
227225

@@ -242,10 +240,10 @@ All of the cluster status messages that you might see are explained in the list
242240
| Running | The cluster is operating normally. All of the previous Autoscale activities have completed successfully. |
243241
| Updating | The cluster Autoscale configuration is being updated. |
244242
| HDInsight configuration | A cluster scale up or scale down operation is in progress. |
245-
| Updating Error | HDInsight encountered issues during the Autoscale configuration update. Customers can choose to either retry the update or disable autoscale. |
243+
| Updating Error | HDInsight met issues during the Autoscale configuration update. Customers can choose to either retry the update or disable autoscale. |
246244
| Error | Something is wrong with the cluster, and it isn't usable. Delete this cluster and create a new one. |
247245

248-
To view the current number of nodes in your cluster, go to the **Cluster size** chart on the **Overview** page for your cluster, or select **Cluster size** under **Settings**.
246+
To view the current number of nodes in your cluster, go to the **Cluster size** chart on the **Overview** page for your cluster. Or select **Cluster size** under **Settings**.
249247

250248
### Operation history
251249

@@ -257,4 +255,4 @@ Select **Metrics** under **Monitoring**. Then select **Add metric** and **Number
257255

258256
## Next steps
259257

260-
Read about best practices for scaling clusters manually in [Scaling best practices](hdinsight-scaling-best-practices.md)
258+
Read about guidelines for scaling clusters manually in [Scaling guidelines](hdinsight-scaling-best-practices.md)

articles/role-based-access-control/elevate-access-global-admin.md

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -13,20 +13,20 @@ ms.devlang: na
1313
ms.topic: conceptual
1414
ms.tgt_pltfrm: na
1515
ms.workload: identity
16-
ms.date: 12/03/2019
16+
ms.date: 04/17/2020
1717
ms.author: rolyon
1818
ms.reviewer: bagovind
1919

2020
---
21-
# Elevate access to manage all Azure subscriptions and management Groups
21+
# Elevate access to manage all Azure subscriptions and management groups
2222

2323
As a Global Administrator in Azure Active Directory (Azure AD), you might not have access to all subscriptions and management groups in your directory. This article describes the ways that you can elevate your access to all subscriptions and management groups.
2424

2525
[!INCLUDE [gdpr-dsr-and-stp-note](../../includes/gdpr-dsr-and-stp-note.md)]
2626

2727
## Why would you need to elevate your access?
2828

29-
If you are a Global Administrator, there might be times when you want to do the following:
29+
If you are a Global Administrator, there might be times when you want to do the following actions:
3030

3131
- Regain access to an Azure subscription or management group when a user has lost access
3232
- Grant another user or yourself access to an Azure subscription or management group
@@ -51,9 +51,7 @@ Follow these steps to elevate access for a Global Administrator using the Azure
5151

5252
1. Sign in to the [Azure portal](https://portal.azure.com) or the [Azure Active Directory admin center](https://aad.portal.azure.com) as a Global Administrator.
5353

54-
1. Search for and select **Azure Active Directory**.
55-
56-
![Select Azure Active Directory - screenshot](./media/elevate-access-global-admin/search-for-azure-active-directory.png)
54+
1. Open **Azure Active Directory**.
5755

5856
1. Under **Manage**, select **Properties**.
5957

@@ -94,7 +92,7 @@ To remove the User Access Administrator role assignment at root scope (`/`), fol
9492

9593
1. Set the **Access management for Azure resources** toggle back to **No**. Since this is a per-user setting, you must be signed in as the same user as was used to elevate access.
9694

97-
If you try to remove the User Access Administrator role assignment on the Access control (IAM) pane, you'll see the following message. To remove the role assignment, you must set set the toggle back to **No** or use Azure PowerShell, Azure CLI, or the REST API.
95+
If you try to remove the User Access Administrator role assignment on the Access control (IAM) pane, you'll see the following message. To remove the role assignment, you must set the toggle back to **No** or use Azure PowerShell, Azure CLI, or the REST API.
9896

9997
![Remove role assignments with root scope](./media/elevate-access-global-admin/iam-root-remove.png)
10098

@@ -229,7 +227,7 @@ You can list all of the deny assignments for a user at root scope (`/`).
229227

230228
### Remove elevated access
231229

232-
When you call `elevateAccess`, you create a role assignment for yourself, so to revoke those privileges you need to remove the User Access Administrator role assignment for yourself at root scope (`/`)
230+
When you call `elevateAccess`, you create a role assignment for yourself, so to revoke those privileges you need to remove the User Access Administrator role assignment for yourself at root scope (`/`).
233231

234232
1. Call [GET roleDefinitions](/rest/api/authorization/roledefinitions/get) where `roleName` equals User Access Administrator to determine the name ID of the User Access Administrator role.
235233

0 commit comments

Comments
 (0)