Skip to content

Commit bedac54

Browse files
authored
Merge pull request #280020 from MicrosoftDocs/repo_sync_working_branch
Confirm merge from repo_sync_working_branch to main to sync with https://github.com/MicrosoftDocs/azure-docs (branch main)
2 parents c973d46 + f791c0f commit bedac54

File tree

5 files changed

+35
-2
lines changed

5 files changed

+35
-2
lines changed

articles/ai-services/openai/concepts/use-your-data.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -474,7 +474,7 @@ If the policy above doesn't meet your need, please consider other options, for e
474474

475475
## Token usage estimation for Azure OpenAI On Your Data
476476

477-
Azure OpenAI On Your Data Retrieval Augmented Generation (RAG) service that leverages both a search service (such as Azure AI Search) and generation (Azure OpenAI models) to let users get answers for their questions based on provided data.
477+
Azure OpenAI On Your Data Retrieval Augmented Generation (RAG) is a service that leverages both a search service (such as Azure AI Search) and generation (Azure OpenAI models) to let users get answers for their questions based on provided data.
478478

479479
As part of this RAG pipeline, there are three steps at a high-level:
480480

articles/machine-learning/how-to-attach-kubernetes-to-workspace.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,7 @@ Otherwise, if a [user-assigned managed identity is specified in Azure Machine Le
5151
|--|--|--|
5252
|Azure Relay|Azure Relay Owner|Only applicable for Arc-enabled Kubernetes cluster. Azure Relay isn't created for AKS cluster without Arc connected.|
5353
|Kubernetes - Azure Arc or Azure Kubernetes Service|Reader <br> Kubernetes Extension Contributor <br> Azure Kubernetes Service Cluster Admin |Applicable for both Arc-enabled Kubernetes cluster and AKS cluster.|
54+
|Azure Kubernetes Service|Contributor|Required only for AKS clusters that use the Trusted Access feature. The workspace uses user-assigned managed identity. See [AzureML access to AKS clusters with special configurations](https://github.com/Azure/AML-Kubernetes/blob/master/docs/azureml-aks-ta-support.md) for details.|
5455

5556

5657
> [!TIP]

articles/machine-learning/how-to-troubleshoot-kubernetes-compute.md

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -110,6 +110,8 @@ Below is a list of error types in **cluster scope** that you might encounter whe
110110
* [ERROR: GenericClusterError](#error-genericclustererror)
111111
* [ERROR: ClusterNotReachable](#error-clusternotreachable)
112112
* [ERROR: ClusterNotFound](#error-clusternotfound)
113+
* [ERROR: ClusterServiceNotFound](#error-clusterservicenotfound)
114+
* [ERROR: ClusterUnauthorized](#error-clusterunauthorized)
113115

114116
#### ERROR: GenericClusterError
115117

@@ -163,6 +165,33 @@ You can check the following items to troubleshoot the issue:
163165
* First, check the cluster resource ID in the Azure portal to verify whether Kubernetes cluster resource still exists and is running normally.
164166
* If the cluster exists and is running, then you can try to detach and reattach the compute to the workspace. Pay attention to more notes on [reattach](#error-genericcomputeerror).
165167

168+
#### ERROR: ClusterServiceNotFound
169+
170+
The error message is as follows:
171+
172+
````bash
173+
AzureML extension service not found in cluster.
174+
````
175+
176+
This error should occur when the extension-owned ingress service doesn't have enough backend pods.
177+
178+
You can:
179+
180+
* Access the cluster and check the status of the service `azureml-ingress-nginx-controller` and its backend pod under the `azureml` namespace.
181+
* If the cluster doesn't have any running backend pods, check the reason by describing the pod. For example, if the pod doesn't have enough resources to run, you can delete some pods to free enough resources for the ingress pod.
182+
183+
#### ERROR: ClusterUnauthorized
184+
185+
The error message is as follows:
186+
187+
````bash
188+
Request to Kubernetes cluster unauthorized.
189+
````
190+
191+
This error should only occur in the TA-enabled cluster, which means the access token expired during the deployment.
192+
193+
You can try again after several minutes.
194+
166195
> [!TIP]
167196
> More troubleshoot guide of common errors when creating/updating the Kubernetes online endpoints and deployments, you can find in [How to troubleshoot online endpoints](how-to-troubleshoot-online-endpoints.md).
168197

articles/sap/workloads/dbms-guide-ibm.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -223,7 +223,7 @@ Db2 high availability disaster recovery (HADR) with pacemaker is supported. Both
223223

224224
#### Windows Cluster Server
225225

226-
Microsoft Cluster Server (MSCS) isn't supported.
226+
Windows Server Failover Cluster (WSFC) also known as Microsoft Cluster Server (MSCS) isn't supported.
227227

228228
Db2 high availability disaster recovery (HADR) is supported. If the virtual machines of the HA configuration have working name resolution, the setup in Azure doesn't differ from any setup that is done on-premises. It isn't recommended to rely on IP resolution only.
229229

articles/storage/blobs/lifecycle-management-policy-configure.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,9 @@ A lifecycle management policy is composed of one or more rules that define a set
2323
- The number of days since the blob was last modified.
2424
- The number of days since the blob was last accessed. To use this condition in an action, you should first [optionally enable last access time tracking](#optionally-enable-access-time-tracking).
2525

26+
> [!NOTE]
27+
> Any operation that modifies the blob, including an update of the blob's metadata or properties, changes the last-modified time of the blob.
28+
2629
When the selected condition is true, then the management policy performs the specified action. For example, if you have defined an action to move a blob from the hot tier to the cool tier if it hasn't been modified for 30 days, then the lifecycle management policy will move the blob 30 days after the last write operation to that blob.
2730

2831
For a blob snapshot or version, the condition that is checked is the number of days since the snapshot or version was created.

0 commit comments

Comments
 (0)